[Ipcop-svn] SF.net SVN: ipcop:[4728] ipcop/trunk

[<ow...@us...>]

Revision: 4728
          http://ipcop.svn.sourceforge.net/ipcop/?rev=4728&view=rev
Author:   owes
Date:     2010-07-14 06:12:27 +0000 (Wed, 14 Jul 2010)

Log Message:
-----------
Upgrade rsyslog to 4.6.3

Modified Paths:
--------------
    ipcop/trunk/lfs/rsyslog

Added Paths:
-----------
    ipcop/trunk/src/patches/rsyslog-4.6.3_stack-size.patch

Removed Paths:
-------------
    ipcop/trunk/src/patches/rsyslog-4.6.1_stack-size.patch

Modified: ipcop/trunk/lfs/rsyslog
===================================================================
--- ipcop/trunk/lfs/rsyslog	2010-07-13 16:05:54 UTC (rev 4727)
+++ ipcop/trunk/lfs/rsyslog	2010-07-14 06:12:27 UTC (rev 4728)
@@ -33,7 +33,7 @@
 include Config
 
 PKG_NAME   = rsyslog
-VER        = 4.6.1
+VER        = 4.6.3
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
@@ -51,7 +51,7 @@
 
 $(DL_FILE)				= $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5				= 50e8271c5940782961ed99bad8711c20
+$(DL_FILE)_MD5				= 41ff79a72a931a612fda251cfd400f4e
 
 install : $(TARGET)
 

Deleted: ipcop/trunk/src/patches/rsyslog-4.6.1_stack-size.patch
===================================================================
--- ipcop/trunk/src/patches/rsyslog-4.6.1_stack-size.patch	2010-07-13 16:05:54 UTC (rev 4727)
+++ ipcop/trunk/src/patches/rsyslog-4.6.1_stack-size.patch	2010-07-14 06:12:27 UTC (rev 4728)
@@ -1,47 +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
-@@ -37,6 +37,8 @@
- #include "linkedlist.h"
- #include "threads.h"
- 
-+static pthread_attr_t pthreadGlobalAttr;
-+
- /* linked list of currently-known threads */
- static linkedList_t llThrds;
- 
-@@ -159,7 +159,11 @@
- 	pThis->bIsActive = 1;
- 	pThis->pUsrThrdMain = thrdMain;
- 	pThis->pAfterRun = afterRun;
-+
-+	/* 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
-@@ -56,6 +56,7 @@
- /* static data */
- DEFobjStaticHelpers
- DEFobjCurrIf(glbl)
-+static pthread_attr_t pthreadGlobalAttr;
- 
- /* forward-definitions */
- 
-@@ -506,7 +506,11 @@
- 
- 	pWti = pThis->pWrkr[i];
- 	wtiSetState(pWti, eWRKTHRD_RUN_CREATED, 0, LOCK_MUTEX);
-+
-+	/* Give threads a smaller stack, 512 KiB should be sufficient */
-+	pthread_attr_init(&pthreadGlobalAttr);
-+	pthread_attr_setstacksize(&pthreadGlobalAttr, 512 * 1024);
--	iState = pthread_create(&(pWti->thrdID), NULL, wtpWorker, (void*) pWti);
-+	iState = pthread_create(&(pWti->thrdID), &pthreadGlobalAttr, wtpWorker, (void*) pWti);
- 	dbgprintf("%s: started with state %d, num workers now %d\n",
- 		  wtpGetDbgHdr(pThis), iState, pThis->iCurNumWrkThrd);
- 

Copied: ipcop/trunk/src/patches/rsyslog-4.6.3_stack-size.patch (from rev 4725, ipcop/trunk/src/patches/rsyslog-4.6.1_stack-size.patch)
===================================================================
--- ipcop/trunk/src/patches/rsyslog-4.6.3_stack-size.patch	                        (rev 0)
+++ ipcop/trunk/src/patches/rsyslog-4.6.3_stack-size.patch	2010-07-14 06:12:27 UTC (rev 4728)
@@ -0,0 +1,47 @@
+--- 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
+@@ -37,6 +37,8 @@
+ #include "linkedlist.h"
+ #include "threads.h"
+ 
++static pthread_attr_t pthreadGlobalAttr;
++
+ /* linked list of currently-known threads */
+ static linkedList_t llThrds;
+ 
+@@ -159,7 +159,11 @@
+ 	pThis->bIsActive = 1;
+ 	pThis->pUsrThrdMain = thrdMain;
+ 	pThis->pAfterRun = afterRun;
++
++	/* 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
+@@ -56,6 +56,7 @@
+ /* static data */
+ DEFobjStaticHelpers
+ DEFobjCurrIf(glbl)
++static pthread_attr_t pthreadGlobalAttr;
+ 
+ /* forward-definitions */
+ 
+@@ -506,7 +506,11 @@
+ 
+ 	pWti = pThis->pWrkr[i];
+ 	wtiSetState(pWti, eWRKTHRD_RUN_CREATED, 0, LOCK_MUTEX);
++
++	/* Give threads a smaller stack, 512 KiB should be sufficient */
++	pthread_attr_init(&pthreadGlobalAttr);
++	pthread_attr_setstacksize(&pthreadGlobalAttr, 512 * 1024);
+-	iState = pthread_create(&(pWti->thrdID), NULL, wtpWorker, (void*) pWti);
++	iState = pthread_create(&(pWti->thrdID), &pthreadGlobalAttr, wtpWorker, (void*) pWti);
+ 	dbgprintf("%s: started with state %d, num workers now %d\n",
+ 		  wtpGetDbgHdr(pThis), iState, pThis->iCurNumWrkThrd);
+ 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.