Add patch to check only first argument when using pidof -x, fixes rc-daemon.

Package-Manager: portage-2.1_pre7-r5

5 files changed, 66 insertions, 7 deletions

diff --git a/sys-process/pidof-bsd/ChangeLog b/sys-process/pidof-bsd/ChangeLog
index 4ca7a3491b13..10a4ce26ad4f 100644
--- a/sys-process/pidof-bsd/ChangeLog
+++ b/sys-process/pidof-bsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/pidof-bsd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/pidof-bsd/ChangeLog,v 1.1 2006/04/01 17:01:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/pidof-bsd/ChangeLog,v 1.2 2006/04/13 19:34:15 flameeyes Exp $
+
+*pidof-bsd-20050501-r2 (13 Apr 2006)
+
+  13 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/pidof-bsd-20050501-firstarg.patch, +pidof-bsd-20050501-r2.ebuild:
+  Add patch to check only first argument when using pidof -x, fixes rc-daemon.
 
 *pidof-bsd-20050501-r1 (01 Apr 2006)
 
diff --git a/sys-process/pidof-bsd/Manifest b/sys-process/pidof-bsd/Manifest
index a15a5078cebc..2dda1dd890cf 100644
--- a/sys-process/pidof-bsd/Manifest
+++ b/sys-process/pidof-bsd/Manifest
@@ -1,12 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c9ffc67d764afaf51844679b14eafbc2 ChangeLog 453
-RMD160 1db68f05ab9b8b5facbec508a8ed5ba3d507e63b ChangeLog 453
-SHA256 30d41654966dc6c22bc13de4426bf473c023ce00e463c1c0cccb9a65e73b47d6 ChangeLog 453
+MD5 360e4a4bc6fc16e50ff29eccc26c9365 ChangeLog 699
+RMD160 a108794f2a95a766c50693feac40b76488cd85ec ChangeLog 699
+SHA256 59514e5185e05cc1f4738fe3ed0dc6677d724f04bc496a8a2b823edaae82d39a ChangeLog 699
 MD5 f9b18b0eda11067150277402f75a049c files/digest-pidof-bsd-20050501-r1 250
 RMD160 f5d0cfefbbc271302ca64f57a40ed1d80029b979 files/digest-pidof-bsd-20050501-r1 250
 SHA256 73ddd421a0ef9f2c58364aa65a37226d03777c743e7fc0f5007c557967a627f0 files/digest-pidof-bsd-20050501-r1 250
+MD5 f9b18b0eda11067150277402f75a049c files/digest-pidof-bsd-20050501-r2 250
+RMD160 f5d0cfefbbc271302ca64f57a40ed1d80029b979 files/digest-pidof-bsd-20050501-r2 250
+SHA256 73ddd421a0ef9f2c58364aa65a37226d03777c743e7fc0f5007c557967a627f0 files/digest-pidof-bsd-20050501-r2 250
+MD5 0159354ad58d682c59680e1ebbe8b9cf files/pidof-bsd-20050501-firstarg.patch 485
+RMD160 5959417c6ac48e808cf77d27bc4b91690c7d8523 files/pidof-bsd-20050501-firstarg.patch 485
+SHA256 40bc0e215cce2b963c949bc84ac615970d10dd5f6e820a2bb826b5307ee9aee3 files/pidof-bsd-20050501-firstarg.patch 485
 MD5 2e17a247d71dbbdbbf7460cc7e672fed files/pidof-bsd-20050501-gfbsd.patch 2898
 RMD160 e62fa1d1c714014b51be61b95e2e599c92ec1622 files/pidof-bsd-20050501-gfbsd.patch 2898
 SHA256 333984dcdfe27db0478e168366ee31449e5b457764530a840908890d31a688eb files/pidof-bsd-20050501-gfbsd.patch 2898
@@ -16,10 +22,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 9bb14a0cc5ee038cead950b6bf6ab6af pidof-bsd-20050501-r1.ebuild 586
 RMD160 c243da65076acb17f35ed8e78eac56c9a9b64d30 pidof-bsd-20050501-r1.ebuild 586
 SHA256 9f9b3ea930f417a7d43c285de859342e205b2ca077092047ec3ba253e481d1da pidof-bsd-20050501-r1.ebuild 586
+MD5 2b1c077f2eaebe27ea8e07543551b2d0 pidof-bsd-20050501-r2.ebuild 619
+RMD160 528090600e99ce35ff909ab6c8a38a373635548a pidof-bsd-20050501-r2.ebuild 619
+SHA256 2495b080b0ebcfa6a479de39a783a7c389ee293f8496571d9a68bf5243f50787 pidof-bsd-20050501-r2.ebuild 619
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFELrHqAiZjviIA2XgRAgF4AKC+yZJ4r47UZVeTyvx5fpWWl5/SzgCgwr4T
-b8p1KPSHxeNRrkaB/Fo46VA=
-=eUaL
+iD8DBQFEPqfHAiZjviIA2XgRApeTAJ9GZc8DoPk9bqgNJ1Hp+x2N6VvslgCgwJoA
+Ictbp1zsinv3zjIMfyzcWuY=
+=B/qP
 -----END PGP SIGNATURE-----
diff --git a/sys-process/pidof-bsd/files/digest-pidof-bsd-20050501-r2 b/sys-process/pidof-bsd/files/digest-pidof-bsd-20050501-r2
new file mode 100644
index 000000000000..a225f6856ac3
--- /dev/null
+++ b/sys-process/pidof-bsd/files/digest-pidof-bsd-20050501-r2
@@ -0,0 +1,3 @@
+MD5 58bcaf9a6e325ef6e5fd175175788e56 pidof-bsd-20050501.tar.gz 1769
+RMD160 1306e7f4b2d6231358d10b45705a16c925bb1d51 pidof-bsd-20050501.tar.gz 1769
+SHA256 c3ed8826178debe872f7717b8810d477d4611ab19af73bed97c5af1c552d20e6 pidof-bsd-20050501.tar.gz 1769
diff --git a/sys-process/pidof-bsd/files/pidof-bsd-20050501-firstarg.patch b/sys-process/pidof-bsd/files/pidof-bsd-20050501-firstarg.patch
new file mode 100644
index 000000000000..dfb15ae7b94b
--- /dev/null
+++ b/sys-process/pidof-bsd/files/pidof-bsd-20050501-firstarg.patch
@@ -0,0 +1,13 @@
+Index: pidof/pidof.c
+===================================================================
+--- pidof.orig/pidof.c
++++ pidof/pidof.c
+@@ -67,7 +67,7 @@ get_pid_of_process(const char *process_n
+ 					char **p_argv = NULL;
+ 					
+ 					if ((p_argv = kvm_getargv(kd, p+i, 0)) != NULL)
+-						for (; *p_argv != NULL; p_argv++)
++						if ( *p_argv != NULL )
+ 							if (strcmp(process_name, basename(*p_argv)) == 0) {
+ 								(void)printf("%d ", (int)p[i].ki_pid);
+ 								processes_found++;
diff --git a/sys-process/pidof-bsd/pidof-bsd-20050501-r2.ebuild b/sys-process/pidof-bsd/pidof-bsd-20050501-r2.ebuild
new file mode 100644
index 000000000000..87014a1aaf1b
--- /dev/null
+++ b/sys-process/pidof-bsd/pidof-bsd-20050501-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/pidof-bsd/pidof-bsd-20050501-r2.ebuild,v 1.1 2006/04/13 19:34:15 flameeyes Exp $
+
+inherit base bsdmk
+
+DESCRIPTION="pidof(1) utility for *BSD"
+HOMEPAGE="http://people.freebsd.org/~novel/pidof.html"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!sys-process/psmisc"
+
+S="${WORKDIR}/pidof"
+
+PATCHES="${FILESDIR}/${P}-gfbsd.patch
+	${FILESDIR}/${P}-firstarg.patch"
+
+src_install() {
+	into /
+	dobin pidof
+}
+