Fixed modules patch in bug #115269 and added a new patch to fix pid writing.

(Portage version: 2.0.53)

6 files changed, 121 insertions, 75 deletions

diff --git a/net-analyzer/mwcollect/ChangeLog b/net-analyzer/mwcollect/ChangeLog
index 9193b9cfdeb7..0f66f99fa5fd 100644
--- a/net-analyzer/mwcollect/ChangeLog
+++ b/net-analyzer/mwcollect/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/mwcollect
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/ChangeLog,v 1.6 2005/12/11 03:03:22 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/ChangeLog,v 1.7 2005/12/12 10:54:27 chriswhite Exp $
+
+  12 Dec 2005; Chris White <chriswhite@gentoo.org>
+  files/mwcollect-3.0.1-modules.patch, +files/mwcollect-3.0.1-pid.patch,
+  files/initd, mwcollect-3.0.1.ebuild:
+  Fixed modules patch in bug #115269 and added a new patch to fix pid writing.
 
 *mwcollect-3.0.1 (11 Dec 2005)
 
diff --git a/net-analyzer/mwcollect/Manifest b/net-analyzer/mwcollect/Manifest
index b523340fe537..ef0931023dfc 100644
--- a/net-analyzer/mwcollect/Manifest
+++ b/net-analyzer/mwcollect/Manifest
@@ -1,26 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 507f32e267ea406e65dffe7359b55fd9 ChangeLog 1474
 MD5 dd4aab16ffc56b3eecd0fa6e3ea536b3 files/confd 560
 MD5 ee61af624456e7fc0ea870d40435fd70 files/digest-mwcollect-2.1.1 66
 MD5 e25a6bca07df41cad22a6901a200651a files/digest-mwcollect-2.1.2 66
 MD5 e5858653fce66aec74497f826c24257b files/digest-mwcollect-3.0.0 67
 MD5 f2249b3f742943a9e4f421794c2e4a23 files/digest-mwcollect-3.0.1 67
-MD5 1db05efae9034e8595129e4bf2dd285c files/initd 782
+MD5 e3153602840749cdacb2144ea9d35007 files/initd 753
 MD5 5d6b56a56d282b0e9919fd25dd1bc421 files/mwcollect-3.0.0-capacity.patch 676
 MD5 5d6b56a56d282b0e9919fd25dd1bc421 files/mwcollect-3.0.1-capacity.patch 676
-MD5 a726dc4579be24a9807e0ff2f1d8aeab files/mwcollect-3.0.1-modules.patch 1690
+MD5 ee437e038ad5c1da95f9c9924a9e1b01 files/mwcollect-3.0.1-modules.patch 1384
 MD5 8bb6090bb13375663448daa4eadcc207 files/mwcollect-3.0.1-pic.patch 382
+MD5 1df5b4b4ccdc36270e3441c72fe627d6 files/mwcollect-3.0.1-pid.patch 1132
 MD5 d6686b70beeb04333a23a1bcf7cedffd metadata.xml 434
 MD5 ff8c0112b4a425afa749446d3af74091 mwcollect-2.1.1.ebuild 1254
 MD5 4057526152e96a533f54cdd4b2d8fc11 mwcollect-2.1.2.ebuild 1254
 MD5 2ce40151fe7d2baaf67a5a8172553ae4 mwcollect-3.0.0.ebuild 1570
-MD5 56f9832b42d0fcbbd29fe9ac3a428d1c mwcollect-3.0.1.ebuild 1813
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDm5cMFdQwWVoAgN4RAqIwAJ4zjIfsnYjY9vAhD20XgxZAQlsyqACfSSeg
-klzJqfqZJ38tCDsYT/3mmLo=
-=0THh
------END PGP SIGNATURE-----
+MD5 f3020adf3c49bd4b37cbc11a7a9f730b mwcollect-3.0.1.ebuild 1878
diff --git a/net-analyzer/mwcollect/files/initd b/net-analyzer/mwcollect/files/initd
index 3a56848936f4..64314e5a0d7b 100644
--- a/net-analyzer/mwcollect/files/initd
+++ b/net-analyzer/mwcollect/files/initd
@@ -30,7 +30,7 @@ stop() {
 	ebegin "Stopping mwcollectd"
 	start-stop-daemon --stop --quiet \
 		--pidfile /var/run/mwcollect.pid \
-		--exec /usr/sbin/mwcollectd && rm /var/run/mwcollect.pid
+		--exec /usr/sbin/mwcollectd
 	eend $?
 }
 
diff --git a/net-analyzer/mwcollect/files/mwcollect-3.0.1-modules.patch b/net-analyzer/mwcollect/files/mwcollect-3.0.1-modules.patch
index 0edb8fecf20e..8ebd5916285b 100644
--- a/net-analyzer/mwcollect/files/mwcollect-3.0.1-modules.patch
+++ b/net-analyzer/mwcollect/files/mwcollect-3.0.1-modules.patch
@@ -1,59 +1,58 @@
-Index: mwcollect3/trunk/src/core/mwcollect.cpp

-===================================================================

---- mwcollect3/trunk/src/core/mwcollect.cpp (revision 250)

-+++ mwcollect3/trunk/src/core/mwcollect.cpp (revision 251)

-@@ -246,4 +246,14 @@

- 			}

- 			

-+			if(!pCollector->start())

-+			{

-+				g_pLogManager->log(LT_LEVEL_CRITICAL | LT_STATUS, "Startup failed, aborting!");

-+				

-+				delete pCollector;

-+				delete g_pLogManager;

-+				

-+				return -1;

-+			}

-+			

- 			if(szChuid)

- 			{ // needs to be done before chrooting

-@@ -285,4 +295,5 @@

- 			if(szChuid)

- 			{

-+				DEBUG("Changing UID to %s (%i) %s setting capabilties.", szChuid, (int) uid, bCaps ? "with" : "without");

- 			

- 				#ifdef LINUX_FLAVOURED

-@@ -313,14 +324,4 @@

- 			}

- 			

--			if(!pCollector->start())

--			{

--				g_pLogManager->log(LT_LEVEL_CRITICAL | LT_STATUS, "Startup failed, aborting!");

--				

--				delete pCollector;

--				delete g_pLogManager;

--				

--				return -1;

--			}

--			

- 			if(bDaemon && (pid = fork()))

- 			{

-Index: mwcollect3/trunk/src/log-file/log-file.cpp

-===================================================================

---- mwcollect3/trunk/src/log-file/log-file.cpp (revision 134)

-+++ mwcollect3/trunk/src/log-file/log-file.cpp (revision 251)

-@@ -7,4 +7,7 @@

- 

- #include "log-file.h"

-+

-+#include <errno.h>

-+#include <string.h>

- 

- 

-@@ -41,5 +44,5 @@

- 	if(!(pFile = fopen(szFileName, "at")))

- 	{

--		LOG(LT_LEVEL_CRITICAL | LT_STATUS, "Could not open logfile \"%s\" for writing!", szFileName);

-+		LOG(LT_LEVEL_CRITICAL | LT_STATUS, "Could not open logfile \"%s\" for writing: %s!", szFileName, strerror(errno));

- 		return false;

- 	}

+--- src/core/mwcollect.cpp (revision 250)
++++ src/core/mwcollect.cpp (revision 251)
+@@ -246,4 +246,14 @@
+ 			}
+ 			
++			if(!pCollector->start())
++			{
++				g_pLogManager->log(LT_LEVEL_CRITICAL | LT_STATUS, "Startup failed, aborting!");
++				
++				delete pCollector;
++				delete g_pLogManager;
++				
++				return -1;
++			}
++			
+ 			if(szChuid)
+ 			{ // needs to be done before chrooting
+@@ -285,4 +295,5 @@
+ 			if(szChuid)
+ 			{
++				DEBUG("Changing UID to %s (%i) %s setting capabilties.", szChuid, (int) uid, bCaps ? "with" : "without");
+ 			
+ 				#ifdef LINUX_FLAVOURED
+@@ -303,16 +303,6 @@
+ 				}	
+ 			}
+ 			
+-			if(!pCollector->start())
+-			{
+-				g_pLogManager->log(LT_LEVEL_CRITICAL | LT_STATUS, "Startup failed, aborting!");
+-				
+-				delete pCollector;
+-				delete g_pLogManager;
+-				
+-				return -1;
+-			}
+-			
+ 			if(bDaemon && (pid = fork()))
+ 			{
+ 				FILE * pPidFile = fopen(szPidFile, "wt");
+--- src/log-file/log-file.cpp (revision 134)
++++ src/log-file/log-file.cpp (revision 251)
+@@ -7,4 +7,7 @@
+ 
+ #include "log-file.h"
++
++#include <errno.h>
++#include <string.h>
+ 
+ 
+@@ -40,7 +40,7 @@
+ 	
+ 	if(!(pFile = fopen(szFileName, "at")))
+ 	{
+-		LOG(LT_LEVEL_CRITICAL | LT_STATUS, "Could not open logfile \"%s\" for writing!", szFileName);
++		LOG(LT_LEVEL_CRITICAL | LT_STATUS, "Could not open logfile \"%s\" for writing!", szFileName, strerror(errno));
+ 		return false;
+ 	}
diff --git a/net-analyzer/mwcollect/files/mwcollect-3.0.1-pid.patch b/net-analyzer/mwcollect/files/mwcollect-3.0.1-pid.patch
new file mode 100644
index 000000000000..6374d1fd7bad
--- /dev/null
+++ b/net-analyzer/mwcollect/files/mwcollect-3.0.1-pid.patch
@@ -0,0 +1,48 @@
+--- src/core/mwcollect.cpp.old	2005-12-12 19:38:36.000000000 +0900
++++ src/core/mwcollect.cpp	2005-12-12 19:39:45.000000000 +0900
+@@ -286,6 +286,22 @@
+ 		}
+ 		
+ 		{
++			if(bDaemon && (pid = fork()))
++			{
++				FILE * pPidFile = fopen(szPidFile, "wt");
++				
++				if(!pPidFile)
++				{
++					LOG(LT_LEVEL_CRITICAL | LT_STATUS, "Could not open %s for writing (PID)!", szPidFile);
++					return 0;
++				}
++				
++				fprintf(pPidFile, "%u", pid);
++				fclose(pPidFile);
++				
++				return 0;
++			}
++					
+ 			if(szChuid)
+ 			{
+ 				DEBUG("Changing UID to %s (%i) %s setting capabilties.", szChuid, (int) uid, bCaps ? "with" : "without");
+@@ -314,22 +330,6 @@
+ 				}	
+ 			}
+ 			
+-			if(bDaemon && (pid = fork()))
+-			{
+-				FILE * pPidFile = fopen(szPidFile, "wt");
+-				
+-				if(!pPidFile)
+-				{
+-					LOG(LT_LEVEL_CRITICAL | LT_STATUS, "Could not open %s for writing (PID)!", szPidFile);
+-					return 0;
+-				}
+-				
+-				fprintf(pPidFile, "%u", pid);
+-				fclose(pPidFile);
+-				
+-				return 0;
+-			}
+-					
+ 			g_pLogManager->log(LT_LEVEL_MEDIUM | LT_STATUS, "mwcollect " MWCD_VERSION " up and running.");
+ 			
+ 			if(szTestShellcode)
diff --git a/net-analyzer/mwcollect/mwcollect-3.0.1.ebuild b/net-analyzer/mwcollect/mwcollect-3.0.1.ebuild
index fd3c43733be5..271939e5f5ab 100644
--- a/net-analyzer/mwcollect/mwcollect-3.0.1.ebuild
+++ b/net-analyzer/mwcollect/mwcollect-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/mwcollect-3.0.1.ebuild,v 1.1 2005/12/11 03:03:22 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/mwcollect-3.0.1.ebuild,v 1.2 2005/12/12 10:54:27 chriswhite Exp $
 
 inherit eutils
 
@@ -44,6 +44,9 @@ src_unpack() {
 
 	# fPIC patching
 	epatch "${FILESDIR}"/${P}-pic.patch
+
+	# pid file writing issues
+	epatch "${FILESDIR}"/${P}-pid.patch
 }
 
 src_compile() {