Revbump to fix a typo in fuser which leads to -M option being enabled all the time. Committed straight to stable

Package-Manager: portage-2.2.15/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 73 insertions, 17 deletions

diff --git a/sys-process/psmisc/ChangeLog b/sys-process/psmisc/ChangeLog
index 3b78458cf9cb..9c7edae39b2d 100644
--- a/sys-process/psmisc/ChangeLog
+++ b/sys-process/psmisc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-process/psmisc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.165 2015/01/22 11:05:02 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.166 2015/01/28 19:22:59 polynomial-c Exp $
+
+*psmisc-22.21-r2 (28 Jan 2015)
+
+  28 Jan 2015; Lars Wendler <polynomial-c@gentoo.org> -psmisc-22.21-r1.ebuild,
+  +psmisc-22.21-r2.ebuild, +files/psmisc-22.21-fuser_typo_fix.patch:
+  Revbump to fix a typo in fuser which leads to -M option being enabled all the
+  time. Committed straight to stable.
 
 *psmisc-22.21-r1 (22 Jan 2015)
 
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 0f6b4046cc9e..04a97a1926d2 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -3,28 +3,29 @@ Hash: SHA256
 
 AUX psmisc-22.16-fuser-pic.patch 598 SHA256 075c1406d995cafb4d8fac83b984fc5a0e03215548def65da565c97644a0a817 SHA512 ada88e426a53c326b3c28b3747a66736e68d4d9218566929bbf2ccf647276d6c7ac7cf08c8df84347a6d3577670e6612258a04b491fea71ecdd266be7073a060 WHIRLPOOL 1cbdc68a87acd2bea28844053bf892fe2a3b2cb029bd71a763ba31a02cf600d0dd7c43699b2b2de8293072c9c0881083112c655f3e7b014b18c9ffe9bcafab93
 AUX psmisc-22.20-selinux.patch 9092 SHA256 3aabdfb164d19fc38ace4272833973dd5b0d8971a7f2b8e4ac4dae4e5ea9459e SHA512 9e146809d411d28cbccc305f32d1cacb09e803deddb9ef2762e45ef9d4276abf30e1bce6bd33f5297293f77c4033c38f7075ba5d5c9f43f1886de01b2203782c WHIRLPOOL 53ec1e82aa50d4a700e884d1ff274c5104c7b51caa066b63b6eb79f33b9d111cef23e961ea5bd9b1cf533d909a5d2a95cf2a5dc23666bf056a09cf7dbefd0b7c
+AUX psmisc-22.21-fuser_typo_fix.patch 1226 SHA256 51c251f07ad0a898a5654fe18d8955e08943025c5df2f73d0f65d00c4b6c3c92 SHA512 c2e46a19959f368935462bc93bde8bf5ee4a3b5530a66255cd9a83be04acbc6246e0a3900efeb1cb9f1bbaf5a1435c0c65d677f643664be25f87662e6048c930 WHIRLPOOL 48c6bc0bd4c4b521be621406d5b52d4df47687307ec681e5c20dfce77db22c7f1db322d40614a9eb59cfa3aebd287af8e23b6ce9cba21dd986f78718669c34e5
 DIST psmisc-22.16-r1.tar.gz 468223 SHA256 38ba34e9ddbfa755f9b7c54a4e1733e12d65121891dacda941f21d856ab41da8 SHA512 f6805f2fdd07f06a1f2ad70be065636a842dd73f4ec176b8173d7486d737561330a52392cf8712aa509fa303a174775a41a0fd73e89dad3a2958fa1d7e5b97f9 WHIRLPOOL 056dff216ac303e18af7fa1ed0a4fc97d91b701a7e69cce599079a13a478206107521d7fc2693eaca97c7c65c9417475c8c499b59a74f9d275a47afdd6a04254
 DIST psmisc-22.20.tar.gz 432501 SHA256 b17224e2385f6a799ffebba27eb7870771d42555e86814ef56b6d7e955765514 SHA512 5565163651c90afeb146c3305fddefc544bcd4cd5e98917fd57a9920e76c22e4bc0a197618539475a1410cfec9dd168b69983b2210a3ad9fc54368e9220503a6 WHIRLPOOL 97826e7d6d5def8a631a0726c3c1c8f67ab4f5f5b39e67d4a915f2741d8914b6c83d69293daacf25e92cef37990e1463ef7dc0843b47d5b0bfb1e3745fde669d
 DIST psmisc-22.21.tar.gz 457702 SHA256 97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a SHA512 766aeb45687090b88b17176c5117a603e83fe92a13c013aea72c8ee80048adf02e18c7daa52ddfb8b2135f7c9a1bcae38896cdfb8d0158728d85a446c5e0d5ae WHIRLPOOL cbd4af3e54ce01f43558184b57a24e44dfb6e05d8438bd11e2308ee62535bb93dc417b08e66603966cc5912d7fa88c29df1529995a42e2a8b7c3da663b01681f
 EBUILD psmisc-22.16.ebuild 1426 SHA256 0d05a1277910e0d60f5a2433aecbadc681e2194aeb908036feba6aacd0d379c7 SHA512 f652731fd903fa79fb8fce1900176e21d494774992a3b6fc4c049aae9e0fb20ac662fb5e6f84b37df07075d3219b94f40f682d9baea99051ad97b1bade08e02e WHIRLPOOL 4eb13a3e8f1edb2c4f831dc35d81994944d17e63cf61c2e24b1e072314098f0582d71a304583d93910c96307195f90c2b38d1a5aa16bd582ed6cba025006cb6e
 EBUILD psmisc-22.20.ebuild 1441 SHA256 ae2e6cec393b605f46531eac16eb2cceb1ffc55fcd71fa32ed4ef2c6be34a5fb SHA512 7bfea1acfb15489fe09b2dfdbace687b370f821d5b964fb49dc292f0f648e3a47dd45898a757d62fa4f3a6c816f227c1f9f3ac727a8eddbe3ce70852a4da4532 WHIRLPOOL b974d0ca13be59b49f9b7a9d7cf4fb957b27cc5faf0e70a569fb9bdb59b36dd1661902fb82166d1a45ea8ee05867abe4fd63aca9e9785e6c661c9dad5a2c50ca
-EBUILD psmisc-22.21-r1.ebuild 1387 SHA256 1b96b44ab9f464db3bbe995b98c21ff4d53e7b6b7bd2fbd7b3af76de75ae1cd1 SHA512 c8b4d4d4684ecdcbf6d631973f9c6dbfb8c770ae37673e81470a3166886042d65940937bb2a03a13687ec73392cb346f5b450ce2badf98641bcba5a946a48787 WHIRLPOOL 6ee6f10c1b71df2c342c2c2f45c32c5a8146b6f5d1ea412edf97c3134cab9378e8d0acc2f7ec631f522e350fc270a5c0993bedc8fbe32595a4bb4b21f3d6fc1a
-MISC ChangeLog 26083 SHA256 3d29325c1ed7bdcf2222356f231c82990d1b412bf69f3c8193297beaa75131fc SHA512 f48e296c9bb784a4a3ffd3d679b7ef22d60223a61e73982e0ac4bb75c3fe306f3dcabc0e7c6a7c2ae54cd64f065278426548815754bae14656cbd2ea6b5811e1 WHIRLPOOL 7a1cc64733fcb067e2a13088c049cd89a0a658b6eb1f7d891532c76a05330e88f63e36535d947d150e776150a0c935e225803e3979d43734f879cf1b852299e1
+EBUILD psmisc-22.21-r2.ebuild 1454 SHA256 cef91f02b24cb81059a2f9c334177703da851a2694d42b56ac491e2f14071b36 SHA512 20323d82c306f38d1d76ac39cd551e6aaf4e80957bcd31e2da83decc19dac17f9ad8632394a19a7d388b24fca44614f1163554a923d4e59b5bfaa7837cd95668 WHIRLPOOL 93dc343e728549f5613bae28a628b1709da16d8762a7546a509bf5bfd6e5067ef06c123b5d27d13cc1a181fa3f45059b7e1e244d10641826b81b4ed0d18b8583
+MISC ChangeLog 26382 SHA256 cd632017faf840f74bc9d547fd618e74eeb2823ab3005c3c443826a9e8c39dfd SHA512 1a9933e03d9e23a7eedf748e15c9c5943f1396831e6957aa952e46eb10feb668f59a688c4ba0e7dae86e9468c4b430b584611c02ccaac38594e760f1a5f62ad3 WHIRLPOOL 401346bd21da180d638d34e0303678ace30f05e3f504155d295029815479de70d6bfa03791f811cdc385434ace1df64c4fecc781a11a65c8db14a4e2010c6f29
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUwNlfAAoJEPiazRVxLXTFQhkQAKA4usanr0UQ7N1yv4JFpYYl
-kg5TZE8+hsLzxCaiJD3L7Pd8d9JyL+jh1YhXrgBqFverxBGFfOUp3FRHhmmMSFTv
-3cZR4fw9nX1aJBbq43LLaJo5GJ/cBqNaw1BeCFRQjcRo8Aye+PxTPPVsgTVCSh/q
-8LMEDNu9TbS/MUzyybH29xmxwbTz717gw25srQ5K7PG0ObClYstbH5HPTk+vIrwx
-+Xtw8uZU4KJ8fspAwGcJR3iYkwAoyTDvyvrpVSFE5CNm6lZ6PfdZyGVvu2XXCn+g
-GY2/KlZVEsU8fE1QrLkahIeMbzgnTBECaZZJNC4z1tzLX4iOtMxexpabJUdbRcEe
-qEkUO+p/KceBosT8llz/ZfjJ8ZshtDIunMHXc/LHELdvwnm1crmgeBXpSqiGyGTh
-c+HKHte1jDrc3fz4DVRmVCyfsj7Qv5K6vwg60rTqpisEgjQQrrukv22JB3Eogk2P
-35Zs8a4G5XArLAz9mY4lOB80SyJ30QuqHEaDjTre1m9G3hDWv7TJW14JPP7An/8A
-fguIQq3iF1SYUj61TIk7SCxXVnDDTYfUyyIWqbY2/3K/MrBYOxqvRZdYZ2Ijw2dD
-pJT3F1rzZGv0ETRdmgS6KUNZwn8CcBQclCwCZYjaTWQ8wTiL9cnSE0q9GqVmsj23
-jKIVv8lQwuc7fIXByPxi
-=W4Gj
+iQIcBAEBCAAGBQJUyTcVAAoJEPiazRVxLXTFaz0QAJ5es2kgQ5oZxgfu0zZndq3t
+zRxySwOO/nOpbGM37CLOwzVox0+CdbKnyjik1Q62yoxG2unWGKu0ubfeNocimxUp
+weEQgwirRenBXCEa41SCw6tMGdkfyTDvRD8lmGI+hu+4T80ND0j2acskFxWr5cHn
+5LOaE8Ndmjzpgf1d195gwDyNOXO2eu0VUlYv76cT1/1uKnLgHuG3BxfJFSwa+Io6
+Slj3CsK45k2KrXMTCOMBO13Iwxs7uLdZU/nqLeww4O/qqm71SxXNfEZulHnfSGyN
+S7k7xtjI2O6NsBR8ukE6EZvrK+z7s9TwWxgkKEdiUhsvEK6RW6gznBT4B4/vo3WG
+qHFUZSEouqHl+8FcC7ZhKUHbDKdPWF+0zE2PxC8VVQ6nr5ujpsjHD6lXVlsqloIr
+PQTBFwcka2ZPVEIwrI/7RCPz99W29ADJ/Lpu5wPKkXdkxCVdzsxYMPMUx3cf6nL9
+4Ey70hBWoXO5kuZW8cQzhj2MmocXQHJHbIXojpiyVzULYezJkG16CVTke03ABP8U
+8FJ8Iy0SY2m6LsmCxI3s289eJFUMknP/k39/usi/SzpqpEwSUH4Tfp3g6M7fs85A
+oZLUzqPldJZ+eQuuL/jceIy6F2BAmFRc2xRRjoLWOrVdRxOl70b8vzEf6iLc/AhK
+dKYA6H2g88I80EOMf6Bp
+=ebbP
 -----END PGP SIGNATURE-----
diff --git a/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch b/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch
new file mode 100644
index 000000000000..5c5fd990f9ca
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch
@@ -0,0 +1,44 @@
+From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001
+From: Brad Jorsch <anomie@users.sourceforge.net>
+Date: Fri, 28 Feb 2014 21:55:02 +1100
+Subject: [PATCH] Typo in fuser makes -M on all the time
+
+Brad found that fuser had the -M option on all the time.
+A simple but significant typo caused this, thanks the the patch.
+
+Bug-Debian: http://bugs.debian.org/740275
+
+Signed-off-by: Craig Small <csmall@enc.com.au>
+---
+ ChangeLog   | 4 ++++
+ src/fuser.c | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index fd1cccf..e5f784c 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++Changes in 22.22
++================
++	* Fixed typo in fuser which has -M on Debian #740275
++
+ Changes in 22.21
+ ================
+ 	* Missing comma in fuser(1) added Debian #702391
+diff --git a/src/fuser.c b/src/fuser.c
+index b485f65..389b302 100644
+--- a/src/fuser.c
++++ b/src/fuser.c
+@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[])
+ 		usage(_("No process specification given"));
+ 
+ 	/* Check if -M flag was used and if so check mounts */
+-	if (opts * OPT_ISMOUNTPOINT) {
++	if (opts & OPT_ISMOUNTPOINT) {
+ 	    check_mountpoints(&mounts, &names_head, &names_tail);
+ 	}
+ 
+-- 
+2.2.2
+
diff --git a/sys-process/psmisc/psmisc-22.21-r1.ebuild b/sys-process/psmisc/psmisc-22.21-r2.ebuild
index f061a1dcd6dc..6990ea7a15bc 100644
--- a/sys-process/psmisc/psmisc-22.21-r1.ebuild
+++ b/sys-process/psmisc/psmisc-22.21-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.21-r1.ebuild,v 1.1 2015/01/22 11:05:02 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.21-r2.ebuild,v 1.1 2015/01/28 19:22:59 polynomial-c Exp $
 
 EAPI="4"
 
@@ -24,6 +24,10 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fuser_typo_fix.patch"
+}
+
 src_configure() {
 	econf \
 		$(use_enable selinux) \