Updated as per upstream request. Changed the conf.d and init.d files to better cordinate with the pid file creation.

(Portage version: 2.0.51.22-r1)

7 files changed, 19 insertions, 22 deletions

diff --git a/net-analyzer/mwcollect/ChangeLog b/net-analyzer/mwcollect/ChangeLog
index 8ed561096663..cabd0582b544 100644
--- a/net-analyzer/mwcollect/ChangeLog
+++ b/net-analyzer/mwcollect/ChangeLog
@@ -1,6 +1,13 @@
 # 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.3 2005/06/17 08:27:32 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/ChangeLog,v 1.4 2005/07/09 09:09:13 chriswhite Exp $
+
+*mwcollect-2.1.1 (09 Jul 2005)
+
+  09 Jul 2005; Chris White <chriswhite@gentoo.org> files/confd, files/initd,
+  -mwcollect-2.1.0.ebuild, +mwcollect-2.1.1.ebuild:
+  Updated as per upstream request. Changed the conf.d and init.d files to
+  better cordinate with the pid file creation.
 
   17 Jun 2005; David Holm <dholm@gentoo.org> mwcollect-2.1.0.ebuild:
   Added to ~ppc.
diff --git a/net-analyzer/mwcollect/Manifest b/net-analyzer/mwcollect/Manifest
index af805b06f9da..87e657a130ca 100644
--- a/net-analyzer/mwcollect/Manifest
+++ b/net-analyzer/mwcollect/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2eacc94c79e119102dae912b457e962a mwcollect-2.1.0.ebuild 1249
-MD5 a849f72da16bd70aca06d58efae61f4a ChangeLog 740
+MD5 797e7740f32ff2a85ab2569105e286e4 mwcollect-2.1.1.ebuild 1249
 MD5 d6686b70beeb04333a23a1bcf7cedffd metadata.xml 434
-MD5 f59158af5e1c4093564ccf55bbe01f23 files/confd 984
-MD5 74e0b4bdc8a808fc003c6012de634c5d files/initd 873
+MD5 a849f72da16bd70aca06d58efae61f4a ChangeLog 740
+MD5 2eacc94c79e119102dae912b457e962a mwcollect-2.1.0.ebuild 1249
+MD5 41680bc378c00c382d48cbe32ee2abc7 files/confd 957
+MD5 745a427e7a26e2b6c64399aed16d1b5b files/initd 900
 MD5 55d7fce54ad5e7342a076f413f5527a0 files/digest-mwcollect-2.1.0 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iQCVAwUBQsgL054WFLgrx1GWAQIn1QQAuq9L6foerNIK9I55786anctVr5TDoY+P
-gThPpvu2V/1wubSuAD4D7frBVIVZTgOLFd3gWR046op6OzNpbsXTLsM9zvmfPxbS
-Ke4abydNmlH6XeZPa2uxXMQHs3mygWmpOGx+qRoeW7sdPs7L2hB5mX4pOF77akDY
-mA/NAUeRlpQ=
-=ES2X
------END PGP SIGNATURE-----
+MD5 ee61af624456e7fc0ea870d40435fd70 files/digest-mwcollect-2.1.1 66
diff --git a/net-analyzer/mwcollect/files/confd b/net-analyzer/mwcollect/files/confd
index d86e2ec14ad0..dbff4807c9b8 100644
--- a/net-analyzer/mwcollect/files/confd
+++ b/net-analyzer/mwcollect/files/confd
@@ -16,7 +16,7 @@
 # Example:
 #         /usr/sbin/mwcollectd -L critical -C -L info -l /var/log/mwcollectd.log -c /etc/mwcollectd.conf
 
-OPTIONS="-D -p /var/run/mwcollectd.pid -c /etc/mwcollect/mwcollectd.conf"
+OPTIONS="-D -c /etc/mwcollect/mwcollectd.conf"
 
 # example: add log file
 # OPTIONS="$OPTIONS -l /var/log/mwcollect.log -L 3"
diff --git a/net-analyzer/mwcollect/files/digest-mwcollect-2.1.0 b/net-analyzer/mwcollect/files/digest-mwcollect-2.1.0
deleted file mode 100644
index daa9cd342bc7..000000000000
--- a/net-analyzer/mwcollect/files/digest-mwcollect-2.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7c277cf1c627130134b8e0d426a0957c mwcollect2.1.0.tar.bz2 36275
diff --git a/net-analyzer/mwcollect/files/digest-mwcollect-2.1.1 b/net-analyzer/mwcollect/files/digest-mwcollect-2.1.1
new file mode 100644
index 000000000000..c463787132e9
--- /dev/null
+++ b/net-analyzer/mwcollect/files/digest-mwcollect-2.1.1
@@ -0,0 +1 @@
+MD5 4c0f633b55fe09c86e37303fa9e5c78e mwcollect2.1.1.tar.bz2 43237
diff --git a/net-analyzer/mwcollect/files/initd b/net-analyzer/mwcollect/files/initd
index 03e2598ffb40..e295a27957df 100644
--- a/net-analyzer/mwcollect/files/initd
+++ b/net-analyzer/mwcollect/files/initd
@@ -22,7 +22,7 @@ start() {
 	# mwcollectd should have created its pid file
 	checkconfig && \
 	start-stop-daemon --start --quiet \
-		--exec /usr/sbin/mwcollectd -- ${OPTIONS}
+		--exec /usr/sbin/mwcollectd -- -p /var/run/mwcollectd.pid ${OPTIONS}
 	eend $?
 }
 
diff --git a/net-analyzer/mwcollect/mwcollect-2.1.0.ebuild b/net-analyzer/mwcollect/mwcollect-2.1.1.ebuild
index 6cffa9eb4abc..1383f0d94f28 100644
--- a/net-analyzer/mwcollect/mwcollect-2.1.0.ebuild
+++ b/net-analyzer/mwcollect/mwcollect-2.1.1.ebuild
@@ -1,10 +1,10 @@
 # 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-2.1.0.ebuild,v 1.2 2005/06/17 08:27:32 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/mwcollect-2.1.1.ebuild,v 1.1 2005/07/09 09:09:13 chriswhite Exp $
 
 DESCRIPTION="mwcollect collects worms and other autonomous spreading malware"
 HOMEPAGE="http://www.mwcollect.org/"
-MY_PV="2.1.0"
+MY_PV="2.1.1"
 MY_P=${PN}${MY_PV}
 S="${WORKDIR}/${MY_P}"
 SRC_URI="http://download.mwcollect.org/${MY_P}.tar.bz2"