From: <ow...@us...> - 2011-03-29 08:19:35
|
Revision: 5573 http://ipcop.svn.sourceforge.net/ipcop/?rev=5573&view=rev Author: owes Date: 2011-03-29 08:19:29 +0000 (Tue, 29 Mar 2011) Log Message: ----------- Upgrade rsyslog to 5.6.5 Modified Paths: -------------- ipcop/trunk/lfs/rsyslog ipcop/trunk/updates/1.9.19/ROOTFILES.i486-1.9.19 ipcop/trunk/updates/1.9.19/information.xml Added Paths: ----------- ipcop/trunk/src/patches/rsyslog-5.6.5_stack-size.patch Removed Paths: ------------- ipcop/trunk/src/patches/rsyslog-5.6.2_stack-size.patch Modified: ipcop/trunk/lfs/rsyslog =================================================================== --- ipcop/trunk/lfs/rsyslog 2011-03-28 20:04:05 UTC (rev 5572) +++ ipcop/trunk/lfs/rsyslog 2011-03-29 08:19:29 UTC (rev 5573) @@ -33,7 +33,7 @@ include Config PKG_NAME = rsyslog -VER = 5.6.2 +VER = 5.6.5 HOST_ARCH = all OTHER_SRC = yes @@ -51,7 +51,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6fc0bdf1b2de7f6466b4510194008e3c +$(DL_FILE)_MD5 = ab675f5856a35f6aa0cd6ab057443ead install : $(TARGET) Deleted: ipcop/trunk/src/patches/rsyslog-5.6.2_stack-size.patch =================================================================== --- ipcop/trunk/src/patches/rsyslog-5.6.2_stack-size.patch 2011-03-28 20:04:05 UTC (rev 5572) +++ ipcop/trunk/src/patches/rsyslog-5.6.2_stack-size.patch 2011-03-29 08:19:29 UTC (rev 5573) @@ -1,36 +0,0 @@ ---- rsyslog-4.4.2/threads.c.orig 2010-01-11 09:20:44.000000000 +0100 -+++ rsyslog-4.4.2/threads.c 2010-01-11 09:27:23.000000000 +0100 -@@ -39,6 +39,8 @@ - #include "linkedlist.h" - #include "threads.h" - -+static pthread_attr_t pthreadGlobalAttr; -+ - /* linked list of currently-known threads */ - static linkedList_t llThrds; - -@@ -220,7 +220,11 @@ - pThis->pUsrThrdMain = thrdMain; - pThis->pAfterRun = afterRun; - pThis->bNeedsCancel = bNeedsCancel; -+ -+ /* Give threads a smaller stack, 512 KiB should be sufficient */ -+ pthread_attr_init(&pthreadGlobalAttr); -+ pthread_attr_setstacksize(&pthreadGlobalAttr, 512 * 1024); -- i = pthread_create(&pThis->thrdID, NULL, thrdStarter, pThis); -+ i = pthread_create(&pThis->thrdID, &pthreadGlobalAttr, thrdStarter, pThis); - CHKiRet(llAppend(&llThrds, NULL, pThis)); - - finalize_it: ---- rsyslog-4.4.2/runtime/wtp.c.orig 2010-01-11 10:21:53.000000000 +0100 -+++ rsyslog-4.4.2/runtime/wtp.c 2010-01-11 10:24:51.000000000 +0100 -@@ -422,6 +422,9 @@ - - pWti = pThis->pWrkr[i]; - wtiSetState(pWti, WRKTHRD_RUNNING); -+ -+ /* Give threads a smaller stack, 512 KiB should be sufficient */ -+ pthread_attr_setstacksize(&pThis->attrThrd, 512 * 1024); - iState = pthread_create(&(pWti->thrdID), &pThis->attrThrd, wtpWorker, (void*) pWti); - ATOMIC_INC(&pThis->iCurNumWrkThrd, &pThis->mutCurNumWrkThrd); /* we got one more! */ - Copied: ipcop/trunk/src/patches/rsyslog-5.6.5_stack-size.patch (from rev 5572, ipcop/trunk/src/patches/rsyslog-5.6.2_stack-size.patch) =================================================================== --- ipcop/trunk/src/patches/rsyslog-5.6.5_stack-size.patch (rev 0) +++ ipcop/trunk/src/patches/rsyslog-5.6.5_stack-size.patch 2011-03-29 08:19:29 UTC (rev 5573) @@ -0,0 +1,36 @@ +--- rsyslog-4.4.2/threads.c.orig 2010-01-11 09:20:44.000000000 +0100 ++++ rsyslog-4.4.2/threads.c 2010-01-11 09:27:23.000000000 +0100 +@@ -39,6 +39,8 @@ + #include "threads.h" + #include "srUtils.h" + ++static pthread_attr_t pthreadGlobalAttr; ++ + /* linked list of currently-known threads */ + static linkedList_t llThrds; + +@@ -221,7 +221,11 @@ + pThis->pUsrThrdMain = thrdMain; + pThis->pAfterRun = afterRun; + pThis->bNeedsCancel = bNeedsCancel; ++ ++ /* Give threads a smaller stack, 512 KiB should be sufficient */ ++ pthread_attr_init(&pthreadGlobalAttr); ++ pthread_attr_setstacksize(&pthreadGlobalAttr, 512 * 1024); +- pthread_create(&pThis->thrdID, NULL, thrdStarter, pThis); ++ pthread_create(&pThis->thrdID, &pthreadGlobalAttr, thrdStarter, pThis); + CHKiRet(llAppend(&llThrds, NULL, pThis)); + + finalize_it: +--- rsyslog-4.4.2/runtime/wtp.c.orig 2010-01-11 10:21:53.000000000 +0100 ++++ rsyslog-4.4.2/runtime/wtp.c 2010-01-11 10:24:51.000000000 +0100 +@@ -422,6 +422,9 @@ + + pWti = pThis->pWrkr[i]; + wtiSetState(pWti, WRKTHRD_RUNNING); ++ ++ /* Give threads a smaller stack, 512 KiB should be sufficient */ ++ pthread_attr_setstacksize(&pThis->attrThrd, 512 * 1024); + iState = pthread_create(&(pWti->thrdID), &pThis->attrThrd, wtpWorker, (void*) pWti); + ATOMIC_INC(&pThis->iCurNumWrkThrd, &pThis->mutCurNumWrkThrd); /* we got one more! */ + Modified: ipcop/trunk/updates/1.9.19/ROOTFILES.i486-1.9.19 =================================================================== --- ipcop/trunk/updates/1.9.19/ROOTFILES.i486-1.9.19 2011-03-28 20:04:05 UTC (rev 5572) +++ ipcop/trunk/updates/1.9.19/ROOTFILES.i486-1.9.19 2011-03-29 08:19:29 UTC (rev 5573) @@ -178,7 +178,7 @@ /usr/lib/libreadline.so.6 /usr/lib/libreadline.so.6.2 ## -## rsyslog-5.6.2 +## rsyslog-5.6.5 /etc/rsyslog.conf /usr/lib/rsyslog/imklog.so /usr/lib/rsyslog/imuxsock.so Modified: ipcop/trunk/updates/1.9.19/information.xml =================================================================== --- ipcop/trunk/updates/1.9.19/information.xml 2011-03-28 20:04:05 UTC (rev 5572) +++ ipcop/trunk/updates/1.9.19/information.xml 2011-03-29 08:19:29 UTC (rev 5573) @@ -5,7 +5,7 @@ <size>0</size> <description>Patch expat for CVE-2009-3560 and CVE-2009-3720. Patch Perl for several CVEs.<br /> Upgrade bash to 4.2.8, iproute2 to 2.6.38, kernel to 2.6.32.36, logwatch to 7.4.0, memtest to 4.20, nano to 2.2.6, ntpd to 4.2.6p3, - pcre to 8.11, readline to 6.2, rsyslog to 5.6.2, shadow to 4.1.4.3, udev to 166, util-linux to 2.19, wanpipe to 3.5.18, + pcre to 8.11, readline to 6.2, rsyslog to 5.6.5, shadow to 4.1.4.3, udev to 166, util-linux to 2.19, wanpipe to 3.5.18, multiple CPAN libraries.<br /> <b>Mandatory reboot after upgrade.</b></description> <previousversion>1.9.18</previousversion> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |