* [gentoo-commits] repo/gentoo:master commit in: sys-process/psmisc/files/, sys-process/psmisc/
@ 2016-03-07 20:43 Mike Frysinger
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2016-03-07 20:43 UTC (permalink / raw
To: gentoo-commits
commit: ea403ac55a029c8eacb076269d86bd136ef3eb71
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 7 20:42:27 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Mar 7 20:43:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea403ac5
sys-process/psmisc: fix building w/newer glibc
.../psmisc/files/psmisc-22.21-sysmacros.patch | 26 ++++++++++++++++++++++
sys-process/psmisc/psmisc-22.21-r2.ebuild | 1 +
2 files changed, 27 insertions(+)
diff --git a/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch b/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch
new file mode 100644
index 0000000..440c5e6
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch
@@ -0,0 +1,26 @@
+From 367886e1c49238d1a02721f849564d77a163465b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 7 Mar 2016 14:52:22 -0500
+Subject: [PATCH] fuser: include sysmacros.h for makedev
+
+BSD/Linux define makedev in the sysmacros.h header. Include it directly
+instead of relying on types.h pulling it in for us.
+---
+ src/fuser.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/fuser.c b/src/fuser.c
+index da94d22..380046f 100644
+--- a/src/fuser.c
++++ b/src/fuser.c
+@@ -36,6 +36,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/socket.h>
++#include <sys/sysmacros.h>
+ #include <sys/wait.h>
+ #include <arpa/inet.h>
+ #include <netinet/in.h>
+--
+2.6.2
+
diff --git a/sys-process/psmisc/psmisc-22.21-r2.ebuild b/sys-process/psmisc/psmisc-22.21-r2.ebuild
index febfaa7..a2894e7 100644
--- a/sys-process/psmisc/psmisc-22.21-r2.ebuild
+++ b/sys-process/psmisc/psmisc-22.21-r2.ebuild
@@ -26,6 +26,7 @@ DOCS="AUTHORS ChangeLog NEWS README"
src_prepare() {
epatch "${FILESDIR}/${P}-fuser_typo_fix.patch"
+ epatch "${FILESDIR}/${P}-sysmacros.patch"
}
src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/psmisc/files/, sys-process/psmisc/
@ 2018-09-19 8:32 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2018-09-19 8:32 UTC (permalink / raw
To: gentoo-commits
commit: 27aa227016ac71f90eb8c6036ab4fb2600433b02
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 19 08:32:29 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Sep 19 08:32:29 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27aa2270
sys-process/psmisc: v23.2: Attempt to fix "killall -SIG"
Bug: https://bugs.gentoo.org/664066
Package-Manager: Portage-2.3.49, Repoman-2.3.10
.../psmisc-23.2-killall_options_parsing.patch | 79 ++++++++++++++++++++++
sys-process/psmisc/psmisc-23.2.ebuild | 4 ++
2 files changed, 83 insertions(+)
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
new file mode 100644
index 00000000000..48aecb24e5c
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-23.2-killall_options_parsing.patch
@@ -0,0 +1,79 @@
+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.ebuild
index 5b4a7b8c712..dd989ab0b6b 100644
--- a/sys-process/psmisc/psmisc-23.2.ebuild
+++ b/sys-process/psmisc/psmisc-23.2.ebuild
@@ -21,6 +21,10 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog NEWS README )
+PATCHES=(
+ "${FILESDIR}/${P}-killall_options_parsing.patch"
+)
+
src_configure() {
local myeconfargs=(
--disable-harden-flags
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/psmisc/files/, sys-process/psmisc/
@ 2019-03-14 14:16 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2019-03-14 14:16 UTC (permalink / raw
To: gentoo-commits
commit: b10dc8d58e5d94e5e2d5f001171667c6cf1fa039
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 14:14:59 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 14:16:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b10dc8d5
sys-process/psmisc: Added fix for killall to work with old kernels
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
...misc-23.2-killall_check_truncated_16_char.patch | 122 +++++++++++++++++++++
.../psmisc/files/psmisc-23.2-old_comm_len.patch | 28 +++++
sys-process/psmisc/psmisc-23.2-r2.ebuild | 56 ++++++++++
3 files changed, 206 insertions(+)
diff --git a/sys-process/psmisc/files/psmisc-23.2-killall_check_truncated_16_char.patch b/sys-process/psmisc/files/psmisc-23.2-killall_check_truncated_16_char.patch
new file mode 100644
index 00000000000..bfc2a24d5de
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-23.2-killall_check_truncated_16_char.patch
@@ -0,0 +1,122 @@
+From 1188315cd037d73bf946a0003b70c6423cc330d2 Mon Sep 17 00:00:00 2001
+From: Craig Small <csmall@enc.com.au>
+Date: Wed, 7 Nov 2018 20:13:09 +1100
+Subject: [PATCH] killall: match on 16 character commlen too
+
+The comm length increase meant killall could accomodate the
+larger comm name given out by newer kernels but it meant that
+if a user relied on the previous 16 character truncation then
+processes that used to match would fail.
+
+killall now checks to see if the the comm is the old COMM_LEN
+length and the given name is longer than old COMM_LEN and does
+a truncated match as well.
+
+References:
+ https://bugs.debian.org/912748
+---
+ ChangeLog | 3 +++
+ src/killall.c | 69 +++++++++++++++++++++++++++++++++++----------------
+ 2 files changed, 50 insertions(+), 22 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 7fd2abd..37962cb 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,6 @@
++Changes in 23.4
++===============
++ * killall: check also truncated 16 char comm names Debian #912748
+ Changes in 23.2
+ ===============
+ * misc: Command names increased from 16 to 64 characters
+diff --git a/src/killall.c b/src/killall.c
+index 2715515..09212a4 100644
+--- a/src/killall.c
++++ b/src/killall.c
+@@ -492,6 +492,49 @@ create_pid_table(int *max_pids, int *pids)
+ return pid_table;
+ }
+
++#define strcmp2(A,B,I) (I? strcasecmp((A),(B)):strcmp((A),(B)))
++#define strncmp2(A,B,L,I) (I? strncasecmp((A),(B),(L)):strncmp((A),(B),(L)))
++static int match_process_name(
++ const char *proc_comm,
++ const int comm_len,
++ const char *proc_cmdline,
++ const char *match_name,
++ const int match_len,
++ const int got_long
++ )
++{
++ /* process is old length but matching longer */
++ if (comm_len == OLD_COMM_LEN - 1 && match_len >= OLD_COMM_LEN - 1)
++ {
++ if (got_long)
++ {
++ return (0 == strncmp2 (match_name, proc_cmdline, OLD_COMM_LEN - 1,
++ ignore_case));
++ } else {
++ return (0 == strncmp2 (match_name, proc_comm, OLD_COMM_LEN - 1,
++ ignore_case));
++ }
++ }
++
++ if (comm_len == COMM_LEN - 1 && match_len >= COMM_LEN - 1)
++ {
++ if (got_long)
++ {
++ return (0 == strncmp2 (match_name, proc_cmdline, COMM_LEN - 1,
++ ignore_case));
++ } else {
++ return (0 == strncmp2 (match_name, proc_comm, COMM_LEN - 1,
++ ignore_case));
++ }
++ }
++ /* Not old new COMM_LEN so we match all of it */
++ if (got_long)
++ {
++ return (0 == strcmp2 (match_name, proc_cmdline, ignore_case));
++ }
++ return (0 == strcmp2 (match_name, proc_comm, ignore_case));
++}
++
+ #ifdef WITH_SELINUX
+ static int
+ kill_all(int signal, int name_count, char **namelist, struct passwd *pwent,
+@@ -599,28 +642,10 @@ kill_all (int signal, int name_count, char **namelist, struct passwd *pwent)
+ {
+ if (!name_info[j].st.st_dev)
+ {
+- if (length != COMM_LEN - 1 || name_info[j].name_length < COMM_LEN - 1)
+- {
+- if (ignore_case == 1)
+- {
+- if (strcasecmp (namelist[j], comm))
+- continue;
+- } else {
+- if (strcmp(namelist[j], comm))
+- continue;
+- }
+- } else {
+- if (ignore_case == 1)
+- {
+- if (got_long ? strcasecmp (namelist[j], command) :
+- strncasecmp (namelist[j], comm, COMM_LEN - 1))
+- continue;
+- } else {
+- if (got_long ? strcmp (namelist[j], command) :
+- strncmp (namelist[j], comm, COMM_LEN - 1))
+- continue;
+- }
+- }
++ if (!match_process_name(comm, length, command, namelist[j],
++ name_info[j].name_length, got_long))
++ continue;
++
+ } else {
+ int ok = 1;
+ if (asprintf (&path, PROC_BASE "/%d/exe", pid_table[i]) < 0)
+--
+2.18.1
+
diff --git a/sys-process/psmisc/files/psmisc-23.2-old_comm_len.patch b/sys-process/psmisc/files/psmisc-23.2-old_comm_len.patch
new file mode 100644
index 00000000000..ae237e69109
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-23.2-old_comm_len.patch
@@ -0,0 +1,28 @@
+From e2cf9f3e83e0fc0278ff39a4dfc8e3f2730eebca Mon Sep 17 00:00:00 2001
+From: Craig Small <csmall@enc.com.au>
+Date: Wed, 7 Nov 2018 20:19:38 +1100
+Subject: [PATCH] misc: Remember to add comm.h too
+
+The previous commit should have included comm.h too
+---
+ src/comm.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/comm.h b/src/comm.h
+index b54b998..b10eb36 100644
+--- a/src/comm.h
++++ b/src/comm.h
+@@ -33,4 +33,10 @@
+ */
+ #define COMM_LEN 64
+
++/*
++ * Older kernels had only 16 characters, which means we may have to check this
++ * too
++ */
++#define OLD_COMM_LEN 16
++
+ #endif
+--
+2.18.1
+
diff --git a/sys-process/psmisc/psmisc-23.2-r2.ebuild b/sys-process/psmisc/psmisc-23.2-r2.ebuild
new file mode 100644
index 00000000000..f06137e3682
--- /dev/null
+++ b/sys-process/psmisc/psmisc-23.2-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A set of tools that use the proc filesystem"
+HOMEPAGE="http://psmisc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="ipv6 nls selinux X"
+
+RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
+ nls? ( virtual/libintl )
+ selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+ >=sys-devel/libtool-2.2.6b
+ nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+PATCHES=(
+ "${FILESDIR}/${P}-old_comm_len.patch"
+ "${FILESDIR}/${P}-killall_check_truncated_16_char.patch"
+)
+
+src_configure() {
+ local myeconfargs=(
+ --disable-harden-flags
+ $(use_enable ipv6)
+ $(use_enable nls)
+ $(use_enable selinux)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # peekfd is a fragile crap hack #330631
+ nonfatal emake -C src peekfd || touch src/peekfd{.o,}
+ emake
+}
+
+src_install() {
+ default
+
+ use X || rm -f "${ED%/}"/usr/bin/pstree.x11
+
+ [[ -s ${ED%/}/usr/bin/peekfd ]] || rm -f "${ED%/}"/usr/bin/peekfd
+ [[ -e ${ED%/}/usr/bin/peekfd ]] || rm -f "${ED%/}"/usr/share/man/man1/peekfd.1
+
+ # fuser is needed by init.d scripts; use * wildcard for #458250
+ dodir /bin
+ mv "${ED%/}"/usr/bin/*fuser "${ED%/}"/bin || die
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/psmisc/files/, sys-process/psmisc/
@ 2021-03-18 8:30 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2021-03-18 8:30 UTC (permalink / raw
To: gentoo-commits
commit: 15b8669a37ecca9ef3a0558a306492dc26176e03
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 18 07:56:13 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar 18 07:56:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15b8669a
sys-process/psmisc: Revbump to fix a fuser regression
by reverting the offending upstream commit:
https://gitlab.com/psmisc/psmisc/-/issues/35
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../psmisc-23.4-fuser_regression_revert.patch | 45 +++++++++++++++++++
sys-process/psmisc/psmisc-23.4-r1.ebuild | 51 ++++++++++++++++++++++
2 files changed, 96 insertions(+)
diff --git a/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch b/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch
new file mode 100644
index 00000000000..59b2bfcef1d
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch
@@ -0,0 +1,45 @@
+https://gitlab.com/psmisc/psmisc/-/issues/35
+
+diff --git a/ChangeLog b/ChangeLog
+index df45ae3..be20ca0 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -5,8 +5,6 @@ Changes in 23.4
+ * pstree: fix layout when using -C !24
+ * pstree: add time namespace !25
+ * pstree: Dynamically link to selinux and use attr
+- * fuser: Get less confused about duplicate dev_id !10
+- * fuser: Only check pathname on non-block devices !31
+
+ Changes in 23.3
+ ===============
+diff --git a/src/fuser.c b/src/fuser.c
+index 03e6237..f9d78db 100644
+--- a/src/fuser.c
++++ b/src/fuser.c
+@@ -1566,7 +1566,6 @@ check_dir(const pid_t pid, const char *dirname, struct device_list *dev_head,
+ struct stat st, lst;
+ char *dirpath;
+ char filepath[PATH_MAX];
+- char real_filepath[PATH_MAX];
+
+ if (asprintf(&dirpath, "/proc/%d/%s", pid, dirname) < 0)
+ return;
+@@ -1605,17 +1604,6 @@ check_dir(const pid_t pid, const char *dirname, struct device_list *dev_head,
+ dev_tmp = dev_tmp->next) {
+ if (thedev != dev_tmp->device)
+ continue;
+-
+- /* check the paths match if it is not a block device */
+- if (! S_ISBLK(dev_tmp->name->st.st_mode)) {
+- if (readlink(filepath, real_filepath, PATH_MAX-1) < 0) {
+- if (strncmp(dev_tmp->name->filename, filepath, strlen(dev_tmp->name->filename)) != 0)
+- continue;
+- } else {
+- if (strncmp(dev_tmp->name->filename, real_filepath, strlen(dev_tmp->name->filename)) != 0)
+- continue;
+- }
+- }
+ if (access == ACCESS_FILE
+ && (lstat(filepath, &lst) == 0)
+ && (lst.st_mode & S_IWUSR)) {
diff --git a/sys-process/psmisc/psmisc-23.4-r1.ebuild b/sys-process/psmisc/psmisc-23.4-r1.ebuild
new file mode 100644
index 00000000000..7f5ad69fee4
--- /dev/null
+++ b/sys-process/psmisc/psmisc-23.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A set of tools that use the proc filesystem"
+HOMEPAGE="http://psmisc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="ipv6 nls selinux X"
+
+RDEPEND="!=app-i18n/man-pages-l10n-4.0.0-r0
+ >=sys-libs/ncurses-5.7-r7:0=
+ nls? ( virtual/libintl )
+ selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=sys-devel/libtool-2.2.6b
+ nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+PATCHES=(
+ # https://gitlab.com/psmisc/psmisc/-/issues/35
+ "${FILESDIR}/${PN}-23.4-fuser_regression_revert.patch"
+)
+
+src_configure() {
+ local myeconfargs=(
+ --disable-harden-flags
+ $(use_enable ipv6)
+ $(use_enable nls)
+ $(use_enable selinux)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ use X || rm -f "${ED}"/usr/bin/pstree.x11
+
+ [[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd
+ [[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1
+
+ # fuser is needed by init.d scripts; use * wildcard for #458250
+ dodir /bin
+ mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/psmisc/files/, sys-process/psmisc/
@ 2024-03-07 19:44 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-03-07 19:44 UTC (permalink / raw
To: gentoo-commits
commit: ef1042d390c67938faa924d4283654912f794f3c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 7 19:43:15 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 7 19:44:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef1042d3
sys-process/psmisc: drop 23.4-r1, 23.5
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-process/psmisc/Manifest | 2 -
.../psmisc-23.4-fuser_regression_revert.patch | 45 -------------
...psmisc-23.5-fix-killall-pidfd_send_signal.patch | 40 ------------
sys-process/psmisc/psmisc-23.4-r1.ebuild | 72 ---------------------
sys-process/psmisc/psmisc-23.5.ebuild | 73 ----------------------
5 files changed, 232 deletions(-)
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 7014008e2c43..29e0801c97df 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,4 +1,2 @@
-DIST psmisc-23.4.tar.xz 370000 BLAKE2B e762171c4d3252421a49b352fadb3e892f66862f003a313a0cc692f973364b06d2652a51d331314462784d94ad55189e74c4d7a023d5d7c917c5e5c05009f46b SHA512 b05781fdb283a6f132bd385d64437f8080e6bc0e11cd2e3e02227678682bb67b3c89edec34a6d067d77312811d072dc60b47ebb32b168c4c69bbc36df643a471
-DIST psmisc-23.5.tar.xz 394012 BLAKE2B 258b82c9fff3765f33cdcd4150489b3e585a47b9065b1cb4f5b432bea4aa7766aab15b160cfb948df9e835c7ac09a9f185d663ab1cd376bedea53bdaf73fd776 SHA512 e908220350491a595ceaf96025a9aa14d832cacc8901545d0864152053fedaf9dc10f45fb2870aa2a00e4d9d8947243038357e14a82b04ab5d20c53e7f841a8d
DIST psmisc-23.6.tar.xz 424736 BLAKE2B 468bf4e84695efcedb832f890b6201b7bc4aca7c5aabaf30e67f4471671421897ee7cd67f01d4b3d60c3e1c63752eb7384e627e75fa7db290cd749da08e2f788 SHA512 4daffbd1726e50d9344f8578dd4c10f0b8f7971929ec667490de31122e5f3828747e1bafb3ed3c37ed7e1758ab9ec43b8f4556b676a416a8efbc7c6c88b6985d
DIST psmisc-23.7.tar.xz 432208 BLAKE2B 5064f929bf320c3fe91d3e665479dcb0913b12f4dddd23e49e296509f89e29b5d147b411c33cca9892a43d955c8e431bccf00872ae86a9c9d2545295f05b69d7 SHA512 8180d24355b3b0f3102044916d078b1aa9a1af3d84f1e14db79e33e505390167012adbb1a8a5f47a692f3a14aba1eb5f1f8f37f328392e8635b89966af9b2128
diff --git a/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch b/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch
deleted file mode 100644
index 59b2bfcef1de..000000000000
--- a/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://gitlab.com/psmisc/psmisc/-/issues/35
-
-diff --git a/ChangeLog b/ChangeLog
-index df45ae3..be20ca0 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -5,8 +5,6 @@ Changes in 23.4
- * pstree: fix layout when using -C !24
- * pstree: add time namespace !25
- * pstree: Dynamically link to selinux and use attr
-- * fuser: Get less confused about duplicate dev_id !10
-- * fuser: Only check pathname on non-block devices !31
-
- Changes in 23.3
- ===============
-diff --git a/src/fuser.c b/src/fuser.c
-index 03e6237..f9d78db 100644
---- a/src/fuser.c
-+++ b/src/fuser.c
-@@ -1566,7 +1566,6 @@ check_dir(const pid_t pid, const char *dirname, struct device_list *dev_head,
- struct stat st, lst;
- char *dirpath;
- char filepath[PATH_MAX];
-- char real_filepath[PATH_MAX];
-
- if (asprintf(&dirpath, "/proc/%d/%s", pid, dirname) < 0)
- return;
-@@ -1605,17 +1604,6 @@ check_dir(const pid_t pid, const char *dirname, struct device_list *dev_head,
- dev_tmp = dev_tmp->next) {
- if (thedev != dev_tmp->device)
- continue;
--
-- /* check the paths match if it is not a block device */
-- if (! S_ISBLK(dev_tmp->name->st.st_mode)) {
-- if (readlink(filepath, real_filepath, PATH_MAX-1) < 0) {
-- if (strncmp(dev_tmp->name->filename, filepath, strlen(dev_tmp->name->filename)) != 0)
-- continue;
-- } else {
-- if (strncmp(dev_tmp->name->filename, real_filepath, strlen(dev_tmp->name->filename)) != 0)
-- continue;
-- }
-- }
- if (access == ACCESS_FILE
- && (lstat(filepath, &lst) == 0)
- && (lst.st_mode & S_IWUSR)) {
diff --git a/sys-process/psmisc/files/psmisc-23.5-fix-killall-pidfd_send_signal.patch b/sys-process/psmisc/files/psmisc-23.5-fix-killall-pidfd_send_signal.patch
deleted file mode 100644
index 0fc9c30a9635..000000000000
--- a/sys-process/psmisc/files/psmisc-23.5-fix-killall-pidfd_send_signal.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://gitlab.com/psmisc/psmisc/-/commit/6892e321e7042e3df60a5501a1c59d076e8a856f
-
-From 6892e321e7042e3df60a5501a1c59d076e8a856f Mon Sep 17 00:00:00 2001
-From: Craig Small <csmall@dropbear.xyz>
-Date: Mon, 18 Jul 2022 20:16:42 +1000
-Subject: [PATCH] killall: use kill if pidfd_send_signal() fails
-
-The pidfd_send_signal() system call appeared in Linux 5.1
-If psmisc is build on a system before then, or a non-Linux
-system, then kill() is used instead. However if psmisc is
-built on a Linux >= 5.1 system but run on a < 5.1 Linux
-system the system call fails and killall doesn't work.
-
-The fix, as proposed by Peter T. Breuer, is to try
-pidfd_send_signal() and if the return value is < 0 and
-errno is ENOSYS then we know at runtime the system call
-failed and we fall through to trusty old kill().
-
-Note, this means that killall on systems below 5.1 still
-have the race PID condition that the pidfd calls fix.
-
-References:
- https://bugs.debian.org/1015228
---- a/src/killall.c
-+++ b/src/killall.c
-@@ -326,7 +326,12 @@ my_send_signal(
- {
- #ifdef __NR_pidfd_send_signal
- if (pid > 0) /* Not PGID */
-- return syscall(__NR_pidfd_send_signal, pidfd, sig, NULL, 0);
-+ {
-+ int ret = syscall(__NR_pidfd_send_signal, pidfd, sig, NULL, 0);
-+ if (ret >= 0 || errno != ENOSYS)
-+ return ret;
-+ // fall through if no such syscall
-+ }
- #endif
- return kill(pid, sig);
- }
-GitLab
diff --git a/sys-process/psmisc/psmisc-23.4-r1.ebuild b/sys-process/psmisc/psmisc-23.4-r1.ebuild
deleted file mode 100644
index 0dfa46b26f57..000000000000
--- a/sys-process/psmisc/psmisc-23.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A set of tools that use the proc filesystem"
-HOMEPAGE="http://psmisc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 nls selinux test X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- !=app-i18n/man-pages-l10n-4.0.0-r0
- >=sys-libs/ncurses-5.7-r7:=
- nls? ( virtual/libintl )
- selinux? ( sys-libs/libselinux )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=dev-build/libtool-2.2.6b
- nls? ( sys-devel/gettext )
- test? ( dev-util/dejagnu )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=(
- # https://gitlab.com/psmisc/psmisc/-/issues/35
- "${FILESDIR}/${PN}-23.4-fuser_regression_revert.patch"
-)
-
-src_configure() {
- if tc-is-cross-compiler ; then
- # This isn't ideal but upstream don't provide a placement
- # when malloc is missing anyway, leading to errors like:
- # pslog.c:(.text.startup+0x108): undefined reference to `rpl_malloc'
- # See https://sourceforge.net/p/psmisc/bugs/71/
- # (and https://lists.gnu.org/archive/html/autoconf/2011-04/msg00019.html)
- export ac_cv_func_malloc_0_nonnull=yes \
- ac_cv_func_realloc_0_nonnull=yes
- fi
-
- # bug #802414
- touch testsuite/global-conf.exp || die
-
- local myeconfargs=(
- --disable-harden-flags
- $(use_enable ipv6)
- $(use_enable nls)
- $(use_enable selinux)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- use X || rm -f "${ED}"/usr/bin/pstree.x11
-
- [[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd
- [[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1
-
- # fuser is needed by init.d scripts; use * wildcard for #458250
- dodir /bin
- mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die
-}
diff --git a/sys-process/psmisc/psmisc-23.5.ebuild b/sys-process/psmisc/psmisc-23.5.ebuild
deleted file mode 100644
index a84a716f7b52..000000000000
--- a/sys-process/psmisc/psmisc-23.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A set of tools that use the proc filesystem"
-HOMEPAGE="http://psmisc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls selinux test X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- !=app-i18n/man-pages-l10n-4.0.0-r0
- >=sys-libs/ncurses-5.7-r7:=
- nls? ( virtual/libintl )
- selinux? ( sys-libs/libselinux )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=dev-build/libtool-2.2.6b
- nls? ( sys-devel/gettext )
- test? ( dev-util/dejagnu )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-killall-pidfd_send_signal.patch
-)
-
-src_configure() {
- if tc-is-cross-compiler ; then
- # This isn't ideal but upstream don't provide a placement
- # when malloc is missing anyway, leading to errors like:
- # pslog.c:(.text.startup+0x108): undefined reference to `rpl_malloc'
- # See https://sourceforge.net/p/psmisc/bugs/71/
- # (and https://lists.gnu.org/archive/html/autoconf/2011-04/msg00019.html)
- export ac_cv_func_malloc_0_nonnull=yes \
- ac_cv_func_realloc_0_nonnull=yes
- fi
-
- # No longer needed in > 23.5
- # https://gitlab.com/psmisc/psmisc/-/commit/3fac667430341bdcec733da6eacd88b03813467a
- # bug #802414
- touch testsuite/global-conf.exp || die
-
- local myeconfargs=(
- --disable-harden-flags
- --enable-ipv6
- $(use_enable nls)
- $(use_enable selinux)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- use X || rm -f "${ED}"/usr/bin/pstree.x11
-
- [[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd
- [[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1
-
- # fuser is needed by init.d scripts; use * wildcard for #458250
- dodir /bin
- mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-03-07 19:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-07 20:43 [gentoo-commits] repo/gentoo:master commit in: sys-process/psmisc/files/, sys-process/psmisc/ Mike Frysinger
-- strict thread matches above, loose matches on Subject: below --
2018-09-19 8:32 Lars Wendler
2019-03-14 14:16 Lars Wendler
2021-03-18 8:30 Lars Wendler
2024-03-07 19:44 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox