[patch] Patch for rsyslog-5.8.11 ebuild (and rsyslogd) to fix imgssapi support

rsyslog-5.8.11.gssapi.patch (text/plain), 1.65 KB, created by Richard Ostrow on 2012-09-13 15:05:32 UTC

diff -Nur old/files/5-stable/rsyslog-5.8.11_gssapi.patch new/files/5-stable/rsyslog-5.8.11_gssapi.patch
--- old/files/5-stable/rsyslog-5.8.11_gssapi.patch	1969-12-31 19:00:00.000000000 -0500
+++ new/files/5-stable/rsyslog-5.8.11_gssapi.patch	2012-09-13 10:48:12.646509821 -0400
@@ -0,0 +1,19 @@
+diff -ur old/tcpsrv.c new/tcpsrv.c
+--- old/tcpsrv.c	2012-04-27 04:10:25.000000000 -0400
++++ new/tcpsrv.c	2012-09-05 17:09:32.602784028 -0400
+@@ -695,9 +695,12 @@
+ 
+ 		if(pUsr == pThis->ppLstn) {
+ 			DBGPRINTF("New connect on NSD %p.\n", pThis->ppLstn[i]);
+-			SessAccept(pThis, pThis->ppLstnPort[i], &pNewSess, pThis->ppLstn[i]);
+-			CHKiRet(nspoll.Ctl(pPoll, pNewSess->pStrm, 0, pNewSess, NSDPOLL_IN, NSDPOLL_ADD));
+-			DBGPRINTF("New session created with NSD %p.\n", pNewSess);
++			if(SessAccept(pThis, pThis->ppLstnPort[i], &pNewSess, pThis->ppLstn[i]) == RS_RET_OK) {
++				DBGPRINTF("New session created with NSD %p.\n", pNewSess);
++				CHKiRet(nspoll.Ctl(pPoll, pNewSess->pStrm, 0, pNewSess, NSDPOLL_IN, NSDPOLL_ADD));
++			} else {
++				DBGPRINTF("Failed to establish a new session with NSD %p.\n", pNewSess);
++			}
+ 		} else {
+ 			pNewSess = (tcps_sess_t*) pUsr;
+ 			doReceive(pThis, &pNewSess, pPoll);
diff -Nur old/rsyslog-5.8.11.ebuild new/rsyslog-5.8.11.ebuild
--- old/rsyslog-5.8.11.ebuild	2012-09-13 10:48:27.843035163 -0400
+++ new/rsyslog-5.8.11.ebuild	2012-09-13 10:47:49.593744503 -0400
@@ -51,6 +51,7 @@
 		epatch ${ZEROPATH}/rsyslog-zeromq.patch
 		cp -r ${ZEROPATH}/{i,o}mzeromq "${S}/plugins"
 	fi
+	epatch "${FILESDIR}"/"${BRANCH}"/${PN}-5.8.11_gssapi.patch
 
 	# Don't force '-g' CFLAG
 	sed -i 's/CFLAGS="\(.*\) -g"/CFLAGS="\1"/g' configure.ac || die