[gentoo-commits] repo/gentoo:master commit in: sys-process/psmisc/, sys-process/psmisc/files/

[Lars Wendler]

commit:     6c1e6dc1b44372a36852071f5f35b22e686d6cea
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 24 11:13:02 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 11:27:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c1e6dc1

sys-process/psmisc: Revbump to fix "killall -SIG".

Upstream re-released version 23.2 with the killall fixes.

Closes: https://bugs.gentoo.org/664066
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 sys-process/psmisc/Manifest                        |  2 +-
 .../psmisc-23.2-killall_options_parsing.patch      | 79 ----------------------
 .../{psmisc-23.2.ebuild => psmisc-23.2-r1.ebuild}  |  6 +-
 3 files changed, 2 insertions(+), 85 deletions(-)

diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 3e422d1ce55..7d43e8db087 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,2 +1,2 @@
 DIST psmisc-23.1.tar.xz 296136 BLAKE2B e53f7b80f1106622d652dad772d4236a62a1eb58e277f078cf0392d5a0bd7963c66805e28f6d1300999f2e2e5dcb692b1ecb3f6d39cefa77ebbc87302cd730be SHA512 f678869ea555986a2538ada9630b74ce79304f3ee85cc9d69a3912d8d30ad491829eac0dcb69aae7003ee9b5de9645d2135b80a9e0b77824e60c417dc0be5f95
-DIST psmisc-23.2.tar.xz 298784 BLAKE2B 61d1ad385f176cbe3ca0edcdd41ed026ab52aca4190c31551392cf83d0bf293de22899b13238d7ebeb1627013a2dc734ca91ad7a0a313c9d92b7af662728bf21 SHA512 114dc4d9a4d66374ee75cd6c845230c24540aa1d7562253c6fd5695552698afcf3e2ad2d7e9675addc63201f7e6d9e697287c72a638705194155bec508211dc3
+DIST psmisc-23.2.tar.xz 303820 BLAKE2B 6c63a54b91e1e31f812bc47c10937e8767fa2990bef66ee779bf44887625719e7342da05137222a6636df7a0e520c39318faba3e7a1022c54fd9f3f172ecc851 SHA512 a8d4e91443b66de1c4418fd74b5eb6dd42caddc937e75dfb35a4e49b9b35236db779e2a480c1693bcc7feaf0957b1028850134040685e88e6ff7ffcb572e20e8

diff --git a/sys-process/psmisc/files/psmisc-23.2-killall_options_parsing.patch b/sys-process/psmisc/files/psmisc-23.2-killall_options_parsing.patch
deleted file mode 100644
index 48aecb24e5c..00000000000
--- a/sys-process/psmisc/files/psmisc-23.2-killall_options_parsing.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 258ee9166e585f87005d3a9686938a4fa26669f9 Mon Sep 17 00:00:00 2001
-From: Craig Small <csmall@×××××××.au>
-Date: Tue, 18 Sep 2018 21:17:00 +1000
-Subject: [PATCH] killall: Another go at option parsing
-
-This now seems to be working. There are some evil hacks, especially for
-the -ve option combination but it seems that we have a winner.
-
-Added a bunch more option parsing tests which picked up -ILL passed but
--VTALRM did not. Not sure why, but length seems my guess
-
-References:
- psmisc/psmisc#13
- psmisc/psmisc#12
----
-
-diff --git a/src/killall.c b/src/killall.c
-index 64c406a..2715515 100644
---- a/src/killall.c
-+++ b/src/killall.c
-@@ -857,7 +857,7 @@ main (int argc, char **argv)
- 
-     opterr = 0;
- #ifdef WITH_SELINUX
--    while ( (optc = getopt_long(argc,argv,"egy:o:ilqrs:u:vwZ:VIn:",options,NULL)) != -1) {
-+    while ( (optc = getopt_long_only(argc,argv,"egy:o:ilqrs:u:vwZ:VIn:",options,NULL)) != -1) {
- #else
-         while ( (optc = getopt_long_only(argc,argv,"egy:o:ilqrs:u:vwVIn:",options,NULL)) != -1) {
- #endif
-@@ -914,7 +914,7 @@ main (int argc, char **argv)
-                     ignore_case = 1;
-                 } else {
-                     sig_num = get_signal (argv[optind]+1, "killall");
--                    skip_error=1;
-+                    skip_error=optind;
-                 }
-                 break;
-             case 'V':
-@@ -922,8 +922,10 @@ main (int argc, char **argv)
-                 if (strcmp(argv[optind-1],"-V") == 0 || strncmp(argv[optind-1],"--",2) == 0) {
-                     print_version();
-                     return 0;
-+                } else {
-+                    sig_num = get_signal (argv[optind]+1, "killall");
-+                    skip_error=optind;
-                 }
--                sig_num = get_signal (argv[optind]+1, "killall");
-                 break;
-             case 'n': {
-                 long num;
-@@ -948,6 +950,15 @@ main (int argc, char **argv)
-                 break;
- #endif /*WITH_SELINUX*/
-             case '?':
-+                if (skip_error == optind)
-+                    break;
-+                /* Sigh, this is a hack because -ve could be -version or
-+                 * -verbose */
-+                if (strncmp(argv[optind-1], "-ve", 3) == 0) {
-+                    verbose=1;
-+                    exact=1;
-+                    break;
-+                }
-                 /* Signal names are in uppercase, so check to see if the argv
-                  * is upper case */
-                 if (argv[optind-1][1] >= 'A' && argv[optind-1][1] <= 'Z') {
-@@ -957,9 +968,6 @@ main (int argc, char **argv)
-                     if (argv[optind-1][1] >= '0' && argv[optind-1][1] <= '9') {
-                         sig_num = atoi(argv[optind-1]+1);
-                     } else {
--                        if (skip_error)
--                            skip_error=0;
--                        else
-                             usage(NULL);
-                     }
-                 }
--- 
-2.18.0
-

diff --git a/sys-process/psmisc/psmisc-23.2.ebuild b/sys-process/psmisc/psmisc-23.2-r1.ebuild
similarity index 92%
rename from sys-process/psmisc/psmisc-23.2.ebuild
rename to sys-process/psmisc/psmisc-23.2-r1.ebuild
index dd989ab0b6b..2157294a11d 100644
--- a/sys-process/psmisc/psmisc-23.2.ebuild
+++ b/sys-process/psmisc/psmisc-23.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,10 +21,6 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
-PATCHES=(
-	"${FILESDIR}/${P}-killall_options_parsing.patch"
-)
-
 src_configure() {
 	local myeconfargs=(
 		--disable-harden-flags