Ensure that fuser returns non zero if no files are found

Package-Manager: portage-2.1.1_rc1-r5

4 files changed, 56 insertions, 21 deletions

diff --git a/sys-process/fuser-bsd/ChangeLog b/sys-process/fuser-bsd/ChangeLog
index 89ef39a627de..fc2a4f94b73f 100644
--- a/sys-process/fuser-bsd/ChangeLog
+++ b/sys-process/fuser-bsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/fuser-bsd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fuser-bsd/ChangeLog,v 1.1 2006/09/10 12:45:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fuser-bsd/ChangeLog,v 1.2 2006/09/10 19:15:17 uberlord Exp $
+
+  10 Sep 2006; Roy Marples <uberlord@gentoo.org> +files/fuser-return.patch,
+  fuser-bsd-1142334561.ebuild:
+  Ensure that fuser returns non zero if no files are found
 
 *fuser-bsd-1142334561 (10 Sep 2006)
 
diff --git a/sys-process/fuser-bsd/Manifest b/sys-process/fuser-bsd/Manifest
index 29a37ccf8622..def73e98cb53 100644
--- a/sys-process/fuser-bsd/Manifest
+++ b/sys-process/fuser-bsd/Manifest
@@ -1,15 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX fuser-return.patch 708 RMD160 eb2bb300a2d5bcb47d701500b907ae94820e7460 SHA1 ace7949067328a3cd2d279274f38753ff030a77e SHA256 ec4aea08cd3bcde26d6a057ce95eb2d184b21c4cd7958e995737b963cf5b9060
+MD5 642f502a23e9d54b917960c193caf10a files/fuser-return.patch 708
+RMD160 eb2bb300a2d5bcb47d701500b907ae94820e7460 files/fuser-return.patch 708
+SHA256 ec4aea08cd3bcde26d6a057ce95eb2d184b21c4cd7958e995737b963cf5b9060 files/fuser-return.patch 708
 DIST fuser-1142334561.tar.bz2 11008 RMD160 55385162a218460993d44a6e5fa001f46d660b25 SHA1 d274a093fea5d3d6c85a3a77bd6eda13010baf1a SHA256 2edf0d189a77a55c84d58545de2cd446401ed42d2f06dd043db3c61f2087e5a2
-EBUILD fuser-bsd-1142334561.ebuild 597 RMD160 dd1c9b5600fa89c358e0c4090f40447b9592aa39 SHA1 0c513b5827700f1deecfefa9c3b4d459d4a8d020 SHA256 785d1f2849c6fe1c53b60ab00d6d960e233ca38332c1bb87d6d43a525a100a99
-MD5 288d8befe56a8a6c82bd5fab9b47b578 fuser-bsd-1142334561.ebuild 597
-RMD160 dd1c9b5600fa89c358e0c4090f40447b9592aa39 fuser-bsd-1142334561.ebuild 597
-SHA256 785d1f2849c6fe1c53b60ab00d6d960e233ca38332c1bb87d6d43a525a100a99 fuser-bsd-1142334561.ebuild 597
-MISC ChangeLog 433 RMD160 2ccf44ba8799a74f6fc99e0c939a5cfd33e85940 SHA1 5b544537c9b4a0e55c896fb67a097b5c749a36ea SHA256 6325f2e2f527fccaec844e9cc153421656be9ccae89b1c2f768021a10673b79c
-MD5 b82f45485a0978324901a7bff27aee96 ChangeLog 433
-RMD160 2ccf44ba8799a74f6fc99e0c939a5cfd33e85940 ChangeLog 433
-SHA256 6325f2e2f527fccaec844e9cc153421656be9ccae89b1c2f768021a10673b79c ChangeLog 433
+EBUILD fuser-bsd-1142334561.ebuild 687 RMD160 c2e5628ca5fd27547ce481c4f59b0b54e4080120 SHA1 d749074bca39f7a3e377a28a3022818af1c0d49d SHA256 7f7b22904f0c9bba99a5ed1aef2d56ed2765437e1a95fe8a76d2102271d07cf5
+MD5 29f2fcad6a319baafdfb5b6abde2ae94 fuser-bsd-1142334561.ebuild 687
+RMD160 c2e5628ca5fd27547ce481c4f59b0b54e4080120 fuser-bsd-1142334561.ebuild 687
+SHA256 7f7b22904f0c9bba99a5ed1aef2d56ed2765437e1a95fe8a76d2102271d07cf5 fuser-bsd-1142334561.ebuild 687
+MISC ChangeLog 599 RMD160 46d6ab1882877eba8a653c79fbaa847b1d9a7a1b SHA1 2389d8cd5950540b7d57ecb579d519cea2dd689b SHA256 505f8ac6e61a1c08a6ff70f1759800d52e28dcc5a46346041a303c2b9ded4b95
+MD5 277a355bce7f8bd16aa2b5fe1a7d2e16 ChangeLog 599
+RMD160 46d6ab1882877eba8a653c79fbaa847b1d9a7a1b ChangeLog 599
+SHA256 505f8ac6e61a1c08a6ff70f1759800d52e28dcc5a46346041a303c2b9ded4b95 ChangeLog 599
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -17,10 +18,3 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 79e82385e3f109a7420b742559033ebc files/digest-fuser-bsd-1142334561 250
 RMD160 b1d484c0424ce6475980e095d920baa8a9a0a4b1 files/digest-fuser-bsd-1142334561 250
 SHA256 fcb9da8bafce8a70b53eb8a2e700be1c1bc38051a8628dd6fab4ad05a8393226 files/digest-fuser-bsd-1142334561 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFBAj+AiZjviIA2XgRAgLrAKCyDg49HlsZDFzVjFo4lJtcKbOEWACguYrL
-d2UAZFuv/R08XUeDyYAPGDs=
-=WjxM
------END PGP SIGNATURE-----
diff --git a/sys-process/fuser-bsd/files/fuser-return.patch b/sys-process/fuser-bsd/files/fuser-return.patch
new file mode 100644
index 000000000000..f06f46b36a42
--- /dev/null
+++ b/sys-process/fuser-bsd/files/fuser-return.patch
@@ -0,0 +1,30 @@
+--- fuser.orig/fuser.c	2006-09-10 18:58:37 +0000
++++ fuser/fuser.c	2006-09-10 19:00:12 +0000
+@@ -608,6 +608,7 @@
+ 	char		*ep;
+ 	char		*kernimg = NULL; /* We are using curr. sys by default */
+ 	char		*mcore = NULL;
++	int		retval = 1; /* Return 1 unless we find any open files */
+ 
+ 	while ((ch = getopt(argc, argv, "C:K:cfkms:u")) != -1)
+ 		switch(ch) {
+@@ -694,6 +695,9 @@
+ 			ufl = get_uflags(rfile, pinfo);
+ 
+ 			if (ufl != 0) {
++				/* Found a file, so return 0 */
++				retval = 0;
++
+ 				print_file_info(pinfo->pid, \
+ 				    pinfo->uid, ufl);
+ 				if ((flags & KFLAG) != 0)
+@@ -707,8 +711,7 @@
+ 	SLIST_FREE(&prclist, next, pinfo_free);
+ 	(void)kvm_close(kd);
+
+-	return 0;
+-		
++	return retval;
+ }
+ 
+ /*
diff --git a/sys-process/fuser-bsd/fuser-bsd-1142334561.ebuild b/sys-process/fuser-bsd/fuser-bsd-1142334561.ebuild
index 8b2d8143c3d4..784042fad8e8 100644
--- a/sys-process/fuser-bsd/fuser-bsd-1142334561.ebuild
+++ b/sys-process/fuser-bsd/fuser-bsd-1142334561.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fuser-bsd/fuser-bsd-1142334561.ebuild,v 1.1 2006/09/10 12:45:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fuser-bsd/fuser-bsd-1142334561.ebuild,v 1.2 2006/09/10 19:15:17 uberlord Exp $
 
-inherit base bsdmk
+inherit base bsdmk eutils
 
 MY_P="${PN/-bsd/}-${PV}"
 
@@ -20,6 +20,13 @@ RDEPEND="!sys-process/psmisc"
 
 S="${WORKDIR}/${PN/-bsd/}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/fuser-return.patch"
+}
+
 src_install() {
 	into /
 	dosbin fuser