Version bump. Thanks to upstream for letting me know.

Package-Manager: portage-2.0.53

7 files changed, 172 insertions, 5 deletions

diff --git a/net-analyzer/mwcollect/ChangeLog b/net-analyzer/mwcollect/ChangeLog
index 2729ce2857f1..9193b9cfdeb7 100644
--- a/net-analyzer/mwcollect/ChangeLog
+++ b/net-analyzer/mwcollect/ChangeLog
@@ -1,6 +1,14 @@
 # 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.5 2005/09/23 03:35:07 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/ChangeLog,v 1.6 2005/12/11 03:03:22 chriswhite Exp $
+
+*mwcollect-3.0.1 (11 Dec 2005)
+
+  11 Dec 2005; Chris White <chriswhite@gentoo.org>
+  +files/mwcollect-3.0.1-capacity.patch,
+  +files/mwcollect-3.0.1-modules.patch, +files/mwcollect-3.0.1-pic.patch,
+  +mwcollect-3.0.1.ebuild:
+  Version bump.  Thanks to upstream for letting me know.
 
 *mwcollect-2.1.2 (23 Sep 2005)
 
diff --git a/net-analyzer/mwcollect/Manifest b/net-analyzer/mwcollect/Manifest
index 0ecdee5c7594..b523340fe537 100644
--- a/net-analyzer/mwcollect/Manifest
+++ b/net-analyzer/mwcollect/Manifest
@@ -1,21 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 2f914ba64220a4bd1b5850649c50924b ChangeLog 1191
+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 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 8bb6090bb13375663448daa4eadcc207 files/mwcollect-3.0.1-pic.patch 382
 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)
 
-iD8DBQFDmbASI1lqEGTUzyQRApUGAJ9DX812jgopRkX6XMEvFD+doURb4ACg0BIQ
-//mV89yq3doHhrPzGcB9eoc=
-=FNh9
+iD8DBQFDm5cMFdQwWVoAgN4RAqIwAJ4zjIfsnYjY9vAhD20XgxZAQlsyqACfSSeg
+klzJqfqZJ38tCDsYT/3mmLo=
+=0THh
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/mwcollect/files/digest-mwcollect-3.0.1 b/net-analyzer/mwcollect/files/digest-mwcollect-3.0.1
new file mode 100644
index 000000000000..65de69ff9ad5
--- /dev/null
+++ b/net-analyzer/mwcollect/files/digest-mwcollect-3.0.1
@@ -0,0 +1 @@
+MD5 b8840504618bf1e8686e1f2e3a2ecc37 mwcollect-3.0.1.tar.bz2 58559
diff --git a/net-analyzer/mwcollect/files/mwcollect-3.0.1-capacity.patch b/net-analyzer/mwcollect/files/mwcollect-3.0.1-capacity.patch
new file mode 100644
index 000000000000..880f14fbd601
--- /dev/null
+++ b/net-analyzer/mwcollect/files/mwcollect-3.0.1-capacity.patch
@@ -0,0 +1,11 @@
+--- src/core/mwcollect.cpp.old	2005-11-01 01:51:39.000000000 +0900
++++ src/core/mwcollect.cpp	2005-11-01 01:51:52.000000000 +0900
+@@ -284,7 +284,7 @@
+ 				#ifdef LINUX_FLAVOURED
+ 				{ // we still may need to bind ports < 1024 / create raw sockets
+ 					cap_t capCapabilities = cap_init();
+-					cap_value_t cvValues[] = { CAP_NET_RAW, CAP_NET_BIND_SERVICE, };
++					cap_value_t cvValues[] = { CAP_NET_RAW, CAP_NET_BIND_SERVICE, CAP_SETUID,  };
+ 					
+ 					cap_set_flag(capCapabilities, CAP_PERMITTED, sizeof(cvValues) / sizeof(cap_value_t), cvValues, CAP_SET);
+ 					cap_set_flag(capCapabilities, CAP_INHERITABLE, sizeof(cvValues) / sizeof(cap_value_t), cvValues, CAP_SET);
diff --git a/net-analyzer/mwcollect/files/mwcollect-3.0.1-modules.patch b/net-analyzer/mwcollect/files/mwcollect-3.0.1-modules.patch
new file mode 100644
index 000000000000..0edb8fecf20e
--- /dev/null
+++ b/net-analyzer/mwcollect/files/mwcollect-3.0.1-modules.patch
@@ -0,0 +1,59 @@
+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;

+ 	}

diff --git a/net-analyzer/mwcollect/files/mwcollect-3.0.1-pic.patch b/net-analyzer/mwcollect/files/mwcollect-3.0.1-pic.patch
new file mode 100644
index 000000000000..be093efbaab9
--- /dev/null
+++ b/net-analyzer/mwcollect/files/mwcollect-3.0.1-pic.patch
@@ -0,0 +1,11 @@
+--- Makefile.MODULE.old	2005-12-11 10:52:56.000000000 +0900
++++ Makefile.MODULE	2005-12-11 10:54:21.000000000 +0900
+@@ -43,7 +43,7 @@
+ 
+ $(MODULE_LIBRARY): $(MODULE_OBJ)
+ 	echo '[M] $@'
+-	$(CXX) $(CXXFLAGS) -o $@ -shared $(MODULE_OBJ) $(LDFLAGS)
++	$(CXX) $(CXXFLAGS) -o $@ -shared -fPIC $(MODULE_OBJ) $(LDFLAGS)
+ 
+ $(SOURCE_DIRECTORY)/%.o: $(SOURCE_DIRECTORY)/%.cpp
+ 	echo '[C] $<'
diff --git a/net-analyzer/mwcollect/mwcollect-3.0.1.ebuild b/net-analyzer/mwcollect/mwcollect-3.0.1.ebuild
new file mode 100644
index 000000000000..fd3c43733be5
--- /dev/null
+++ b/net-analyzer/mwcollect/mwcollect-3.0.1.ebuild
@@ -0,0 +1,72 @@
+# 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 $
+
+inherit eutils
+
+DESCRIPTION="mwcollect collects worms and other autonomous spreading malware"
+HOMEPAGE="http://www.mwcollect.org/"
+SRC_URI="http://download.mwcollect.org/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="debug"
+# has issues right now
+#IUSE="debug prelude"
+
+DEPEND="dev-libs/libpcre
+	net-misc/curl
+	>=sys-libs/libcap-1"
+	#   has issues right now
+	#	prelude?( >=dev-libs/libprelude-0.9  )"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i \
+	-e "s:CXXFLAGS += -I./src/include:CXXFLAGS += ${CXXFLAGS} -fPIC -I./src/include:" \
+	Makefile || die "custom CFLAGS patching failed"
+
+	#sed -i \
+	#-e "s:\$(MODULE_OBJ) \$(LDFLAGS):\$(MODULE_OBJ) \$(LDFLAGS) -fPIC:" \
+	#Makefile.MODULE || die "pic patching failed"
+
+	sed -i \
+	-e "s:%loadModule(\":%loadModule(\"\/usr\/lib\/mwcollect\/:g" \
+	conf/mwcollect.conf || die "module load directory failed"
+
+	# sets CAP_SETUID for setresuid
+	epatch "${FILESDIR}"/${P}-capacity.patch
+
+	# fixes --user= and module loading
+	epatch "${FILESDIR}"/${P}-modules.patch
+
+	# fPIC patching
+	epatch "${FILESDIR}"/${P}-pic.patch
+}
+
+src_compile() {
+	use debug && export DEBUG="y"
+	# has issues right now
+	#use prelude && export MODULES="log-prelude" 
+
+	emake || die "Make failed"
+}
+
+src_install() {
+	dosbin bin/mwcollectd
+	insinto /usr/$(get_libdir)/mwcollect
+	doins bin/modules/*
+
+	insinto /etc/mwcollect
+	doins conf/* \
+		|| die "config file installation failed"
+
+	dodoc README* doc/core-design.txt
+	doman doc/mwcollectd.1
+
+	newinitd ${FILESDIR}/initd mwcollectd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/confd mwcollectd
+}