diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-09-30 11:19:18 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-09-30 11:19:18 +0100 |
commit | 62f67115b5c46134c34f88f4b1cbdacc19384c0a (patch) | |
tree | 0a76b14de203a4c23040e5665e39df8de9867745 /sys-process/psmisc | |
parent | 265dbe5dbc14c199299496c6db8fce3f76647015 (diff) |
gentoo resync : 30.09.2018
Diffstat (limited to 'sys-process/psmisc')
-rw-r--r-- | sys-process/psmisc/Manifest | 5 | ||||
-rw-r--r-- | sys-process/psmisc/files/psmisc-23.2-killall_options_parsing.patch | 79 | ||||
-rw-r--r-- | sys-process/psmisc/psmisc-23.2-r1.ebuild (renamed from sys-process/psmisc/psmisc-23.2.ebuild) | 6 |
3 files changed, 3 insertions, 87 deletions
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest index 75465ea904a0..5240c6407df3 100644 --- a/sys-process/psmisc/Manifest +++ b/sys-process/psmisc/Manifest @@ -1,6 +1,5 @@ -AUX psmisc-23.2-killall_options_parsing.patch 2959 BLAKE2B bfd718d0e938b48411e38094d8e140b524414c936e62d32cd62a65e634f3db9f8b239fa0e12b3c834d04aed9aec552f5d388887d174062333f191e5431a710e7 SHA512 30c7bede4241f830e1c9e276d6969244eb80853f67b5db0c9a692ab2186f4acc09a4ae27924136e61f0602b228585b20af62cbb4099b5a1fc2eadc8d07bac2aa 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 EBUILD psmisc-23.1-r1.ebuild 1273 BLAKE2B 9c98494ae95fa7e7f9ba859b07905f82f7a24757e8b60b1555f0dd6a74514550550bdb8a6aef826f4be48d0e8390d6f536dd13f9fb82fe055efc262d99838863 SHA512 23ea8e69530e30ea5d9fc92060ee0d0f0aa9e52501ec169cb1033e7887aebad73b52a06c996f064c988d11d21574de1279ebd7ee29552991e09c419edbb7d9b1 -EBUILD psmisc-23.2.ebuild 1349 BLAKE2B b7f25106c62178076d8df6aad89c8e30b0431f45e18fd2117691eb834454e61a8546726961cb0f9b92af47783794bd0901062532e6574f016e828505ccf88f40 SHA512 e100f01ad837ec36ab81a6f0d0ab6be88baaf7504116e5108003f9c86dbd50432911fa83d2682c8ae5264a45fd9b012ac1bd19a42d2722f8a5c520f5fdb3a6bc +EBUILD psmisc-23.2-r1.ebuild 1283 BLAKE2B 33c7b2e180fd3e5a28cbdf69f0428d3197b2fb23aa01225649fc2799f43ad47f18e8be62d2d974e7d4a53e1c97177e49b6702ac2a48c4ce45ec248de03182c24 SHA512 21641e7161b35ddc7a8b3510928cc5b5800a6f660552520171918ee2d889962c759b0421d6001e458ee7451ea30d24f2642cc2a119ef7dfb89044aae55754252 MISC metadata.xml 326 BLAKE2B 899a2f3fa295d2e0e8d6114542a149db37c730b845d7ba720127ca2b9b85044c53ff7aa107f866a6e2ece895a8159e25350b17d9665fc9ff915aed3640ac22cf SHA512 580a0e66078b7304d0bf76e3c990e61ee4c073b49381b60c5f3f01e2b64d5f0c318eb5596f7da09a70fa52dc93769b25f37f531038e5d7ce6278dda10e18117c 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 48aecb24e5c4..000000000000 --- 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@enc.com.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 index dd989ab0b6ba..2157294a11d1 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 |