* [gentoo-commits] repo/gentoo:master commit in: sys-process/procps/, sys-process/procps/files/
@ 2015-11-18 17:30 Ulrich Müller
0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Müller @ 2015-11-18 17:30 UTC (permalink / raw
To: gentoo-commits
commit: 2101b648546ada6454ce9fb7a573143ac198a444
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 17:25:51 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 17:29:30 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2101b648
sys-process/procps: [QA] Fix path in sysctl.8 man page.
Bug: 565304
Package-Manager: portage-2.2.24
.../files/procps-3.3.11-sysctl-manpage.patch | 32 ++++++++++++++++++++++
sys-process/procps/procps-3.3.11-r3.ebuild | 1 +
2 files changed, 33 insertions(+)
diff --git a/sys-process/procps/files/procps-3.3.11-sysctl-manpage.patch b/sys-process/procps/files/procps-3.3.11-sysctl-manpage.patch
new file mode 100644
index 0000000..3523aad
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.11-sysctl-manpage.patch
@@ -0,0 +1,32 @@
+--- procps-ng-3.3.11-orig/sysctl.8
++++ procps-ng-3.3.11/sysctl.8
+@@ -123,21 +123,21 @@
+ \fB\-V\fR, \fB\-\-version\fR
+ Display version information and exit.
+ .SH EXAMPLES
+-/sbin/sysctl \-a
++/usr/sbin/sysctl \-a
+ .br
+-/sbin/sysctl \-n kernel.hostname
++/usr/sbin/sysctl \-n kernel.hostname
+ .br
+-/sbin/sysctl \-w kernel.domainname="example.com"
++/usr/sbin/sysctl \-w kernel.domainname="example.com"
+ .br
+-/sbin/sysctl \-p/etc/sysctl.conf
++/usr/sbin/sysctl \-p/etc/sysctl.conf
+ .br
+-/sbin/sysctl \-a \-\-pattern forward
++/usr/sbin/sysctl \-a \-\-pattern forward
+ .br
+-/sbin/sysctl \-a \-\-pattern forward$
++/usr/sbin/sysctl \-a \-\-pattern forward$
+ .br
+-/sbin/sysctl \-a \-\-pattern 'net.ipv4.conf.(eth|wlan)0.arp'
++/usr/sbin/sysctl \-a \-\-pattern 'net.ipv4.conf.(eth|wlan)0.arp'
+ .br
+-/sbin/sysctl \-\-system \-\-pattern '^net.ipv6'
++/usr/sbin/sysctl \-\-system \-\-pattern '^net.ipv6'
+ .SH DEPRECATED PARAMETERS
+ The
+ .B base_reachable_time
diff --git a/sys-process/procps/procps-3.3.11-r3.ebuild b/sys-process/procps/procps-3.3.11-r3.ebuild
index 5b6a3ac..ecf5d10 100644
--- a/sys-process/procps/procps-3.3.11-r3.ebuild
+++ b/sys-process/procps/procps-3.3.11-r3.ebuild
@@ -39,6 +39,7 @@ S="${WORKDIR}/${PN}-ng-${PV}"
src_prepare() {
epatch "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209
epatch "${DISTDIR}"/${P}-remove_Unix98_output_limits.patch # 555200
+ epatch "${FILESDIR}"/${P}-sysctl-manpage.patch # 565304
}
src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/procps/, sys-process/procps/files/
@ 2016-12-18 4:44 Mike Frysinger
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2016-12-18 4:44 UTC (permalink / raw
To: gentoo-commits
commit: c66fba6a50fc550918df1804ef4afc90613ec28f
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 04:42:55 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 04:43:54 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c66fba6a
sys-process/procps: fix test failures under some kernel configs #583036
.../procps/files/procps-3.3.12-proc-tests.patch | 47 ++++++++++++++++++++++
sys-process/procps/procps-3.3.12.ebuild | 1 +
2 files changed, 48 insertions(+)
diff --git a/sys-process/procps/files/procps-3.3.12-proc-tests.patch b/sys-process/procps/files/procps-3.3.12-proc-tests.patch
new file mode 100644
index 00000000..9549252
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.12-proc-tests.patch
@@ -0,0 +1,47 @@
+https://bugs.gentoo.org/583036
+http://www.freelists.org/post/procps/Patch-Test-suite-fails-if-procpidsmaps-is-absent,1
+
+From: tobbs@opentrash.com
+To: procps@freelists.org
+Date: Sun, 11 Sep 2016 15:01:29 +0200
+Subject: [procps] [Patch] Test suite fails if /proc/<pid>/smaps is absent
+Message-Id: <20160911130129.9A8B3322A81@astra4649.startdedicated.de>
+
+Summary: Some Linux systems do not have /proc/<pid>/smaps, hence the test
+suite fails. Attached a patch to skip tests in that case it.
+
+When pmap is called with either -c, -x, or -x it tries to read
+/proc/<pid>/smaps (pmap.c, l. 540). If not present it exits.
+The file /proc/<pid>/smaps exits on Linux systems only if the kernel is
+compiled with the option CONFIG_PROC_PAGE_MONITOR (see man page proc(5)).
+
+In the test suite some tests check the output of pmap -X et al, but they
+fail if /proc/<pid>/smaps is not present, because pmap does not produce
+their expected output.
+
+Attached a patch which checks if /proc/<pid>/smaps exits, if not it
+skipps the test related to it.
+
+Note: It is unclear what the 'expected' behaviour/output of pmap should
+be if the file /proc/<pid>/smaps is not present. Maybe add an additional
+test to check the return code if /proc/<pid>/smaps is absent.
+
+--- a/testsuite/pmap.test/pmap.exp
++++ b/testsuite/pmap.test/pmap.exp
+@@ -45,6 +45,11 @@
+ spawn $pmap -qd $mypid
+ expect_table $test $pmap_procname $pmap_device_items "\$"
+
++if { [ file readable "/proc/self/smaps" ] == 0 } {
++ unsupported "Skipping test which require pmap to access /proc/<pid>/smaps, because kernel seems to be compiled without CONFIG_PROC_PAGE_MONITOR."
++
++} else {
++
+ set test "pmap extended output"
+ spawn $pmap -x $mypid
+ expect_table $test $pmap_ext_header $pmap_ext_items $pmap_ext_footer
+@@ -66,3 +71,4 @@
+ spawn $pmap -XX 1
+ expect_pass $test "$pmap_initname\$"
+
++}
diff --git a/sys-process/procps/procps-3.3.12.ebuild b/sys-process/procps/procps-3.3.12.ebuild
index fea54a1..bdfbd2f 100644
--- a/sys-process/procps/procps-3.3.12.ebuild
+++ b/sys-process/procps/procps-3.3.12.ebuild
@@ -35,6 +35,7 @@ S="${WORKDIR}/${PN}-ng-${PV}"
PATCHES=(
"${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209
"${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304
+ "${FILESDIR}"/${PN}-3.3.12-proc-tests.patch #583036
# Upstream fixes
"${FILESDIR}"/${P}-strtod_nol_err.patch
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/procps/, sys-process/procps/files/
@ 2018-05-29 9:55 Mikle Kolyada
0 siblings, 0 replies; 5+ messages in thread
From: Mikle Kolyada @ 2018-05-29 9:55 UTC (permalink / raw
To: gentoo-commits
commit: 0d16cd79f3457c7b113c53859a127e64489e5f7d
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 09:55:06 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue May 29 09:55:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d16cd79
sys-process/procps: Drop old
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sys-process/procps/Manifest | 2 -
.../procps/files/procps-3.3.12-elogind.patch | 265 ---------------------
.../files/procps-3.3.12-strtod_nol_err.patch | 110 ---------
.../procps/files/procps-3.3.8-kill-neg-pid.patch | 46 ----
sys-process/procps/procps-3.3.12-r1.ebuild | 91 -------
sys-process/procps/procps-3.3.12.ebuild | 78 ------
sys-process/procps/procps-3.3.14.ebuild | 81 -------
7 files changed, 673 deletions(-)
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index 3eeb0d0b057..446d7cbdee9 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -1,3 +1 @@
-DIST procps-ng-3.3.12.tar.xz 845484 BLAKE2B d317935e28de45ca5afa59ce33f85e286820a630c7fe036bddcf7a4418fa347cbc9cab39ef380f482ce13f47555598fd2419c67c3f861d7e4e2e89a9b2f4ae4a SHA512 ea816740ff72cc53d99b5d2e78a511b627ea5b295e0efff67605c56d1ab075abc6b0e2da3df4facbfe903fc9d679e892d351b6884a966d37c6f4bfd9141a924b
-DIST procps-ng-3.3.14.tar.xz 926924 BLAKE2B b18f8ec50a1449008b01a52be51a3a509266945b82fbb6964f54b9746d71b90e4a1a37be29b4bf07fedc70d4528fac7f7099d7b245bd9c6ed033e77eb49aae77 SHA512 45617924ae1520765c15d71b76278dc80cac04f5985f83c9b65a8ba379d9a80a2ff0dc14c5a6edee7d6cfa66ce50ec019e8b5203704175ff94547ae6ff2b18c5
DIST procps-ng-3.3.15.tar.xz 904416 BLAKE2B 9fc1384df1d51a13bdf3aaad173160a11c5a7e016a8c397a076b5115e350d2c6fd8ff8d9ad5d83b959020bcd6a1ef9e1bca02e9a63d56881816c5c7d7c9a8bc3 SHA512 bc83ccc1941e7be8266588fdfbba17e2424b30163a215873ee6dee96215d66249f5d5e46fec2278d030b42bd7599861c4878360042dacec4c221ce411453747c
diff --git a/sys-process/procps/files/procps-3.3.12-elogind.patch b/sys-process/procps/files/procps-3.3.12-elogind.patch
deleted file mode 100644
index 07c165310ce..00000000000
--- a/sys-process/procps/files/procps-3.3.12-elogind.patch
+++ /dev/null
@@ -1,265 +0,0 @@
---- procps-ng-3.3.12/configure 2016-07-10 07:32:09.862265237 +0200
-+++ procps-ng-3.3.12/configure 2016-07-10 07:32:09.862265237 +0200
-@@ -650,6 +650,10 @@
- BUILD_KILL_TRUE
- BUILD_PIDOF_FALSE
- BUILD_PIDOF_TRUE
-+WITH_ELOGIND_FALSE
-+WITH_ELOGIND_TRUE
-+ELOGIND_LIBS
-+ELOGIND_CFLAGS
- WITH_SYSTEMD_FALSE
- WITH_SYSTEMD_TRUE
- SYSTEMD_LIBS
-@@ -815,6 +819,7 @@
- enable_libselinux
- with_ncurses
- with_systemd
-+with_elogind
- enable_pidof
- enable_kill
- enable_skill
-@@ -845,7 +850,9 @@
- NCURSESW_CFLAGS
- NCURSESW_LIBS
- SYSTEMD_CFLAGS
--SYSTEMD_LIBS'
-+SYSTEMD_LIBS
-+ELOGIND_CFLAGS
-+ELOGIND_LIBS'
-
-
- # Initialize some variables set by options.
-@@ -1521,6 +1528,7 @@
- --without-libintl-prefix don't search for libintl in includedir and libdir
- --without-ncurses build only applications not needing ncurses
- --with-systemd enable systemd support
-+ --with-elogind enable elogind support
-
- Some influential environment variables:
- CC C compiler command
-@@ -1550,6 +1558,10 @@
- C compiler flags for SYSTEMD, overriding pkg-config
- SYSTEMD_LIBS
- linker flags for SYSTEMD, overriding pkg-config
-+ ELOGIND_CFLAGS
-+ C compiler flags for ELOGIND, overriding pkg-config
-+ ELOGIND_LIBS
-+ linker flags for ELOGIND, overriding pkg-config
-
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-@@ -17295,6 +17307,127 @@
- fi
-
-
-+
-+# Check whether --with-elogind was given.
-+if test "${with_elogind+set}" = set; then :
-+ withval=$with_elogind;
-+else
-+ with_elogind=no
-+
-+fi
-+
-+# Do not allow elogind if systemd is wanted and found
-+if test "x$with_systemd" != "xno"; then :
-+ with_elogind=no
-+fi
-+
-+if test "x$with_elogind" != "xno"; then :
-+
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libelogind" >&5
-+$as_echo_n "checking for libelogind... " >&6; }
-+
-+if test -n "$ELOGIND_CFLAGS"; then
-+ pkg_cv_ELOGIND_CFLAGS="$ELOGIND_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_ELOGIND_CFLAGS=`$PKG_CONFIG --cflags "libelogind" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$ELOGIND_LIBS"; then
-+ pkg_cv_ELOGIND_LIBS="$ELOGIND_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_ELOGIND_LIBS=`$PKG_CONFIG --libs "libelogind" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ ELOGIND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind" 2>&1`
-+ else
-+ ELOGIND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$ELOGIND_PKG_ERRORS" >&5
-+
-+ as_fn_error $? "Package requirements (libelogind) were not met:
-+
-+$ELOGIND_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables ELOGIND_CFLAGS
-+and ELOGIND_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details." "$LINENO" 5
-+elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables ELOGIND_CFLAGS
-+and ELOGIND_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details" "$LINENO" 5; }
-+else
-+ ELOGIND_CFLAGS=$pkg_cv_ELOGIND_CFLAGS
-+ ELOGIND_LIBS=$pkg_cv_ELOGIND_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+fi
-+
-+$as_echo "#define WITH_ELOGIND 1" >>confdefs.h
-+
-+
-+fi
-+ if test x$with_elogind != xno; then
-+ WITH_ELOGIND_TRUE=
-+ WITH_ELOGIND_FALSE='#'
-+else
-+ WITH_ELOGIND_TRUE='#'
-+ WITH_ELOGIND_FALSE=
-+fi
-+
-+
- # AC_ARG_ENABLEs
- # Check whether --enable-pidof was given.
- if test "${enable_pidof+set}" = set; then :
-@@ -17712,6 +17845,10 @@
- as_fn_error $? "conditional \"WITH_SYSTEMD\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${WITH_ELOGIND_TRUE}" && test -z "${WITH_ELOGIND_FALSE}"; then
-+ as_fn_error $? "conditional \"WITH_ELOGIND\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${BUILD_PIDOF_TRUE}" && test -z "${BUILD_PIDOF_FALSE}"; then
- as_fn_error $? "conditional \"BUILD_PIDOF\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
---- procps-ng-3.3.12/configure.ac 2016-07-09 23:49:25.817307031 +0200
-+++ procps-ng-3.3.12/configure.ac 2016-07-09 23:49:25.817307031 +0200
-@@ -155,6 +155,19 @@
- ])
- AM_CONDITIONAL([WITH_SYSTEMD], [test x$with_systemd != xno])
-
-+AC_ARG_WITH([elogind],
-+ [AS_HELP_STRING([--with-elogind], [enable elogind support])],
-+ [], [with_elogind=no]
-+)
-+# Do not allow elogind if systemd is wanted and found
-+AS_IF([test "x$with_systemd" != "xno"], [with_elogind=no])
-+
-+AS_IF([test "x$with_elogind" != "xno"], [
-+ PKG_CHECK_MODULES([ELOGIND], [libelogind])
-+ AC_DEFINE(WITH_ELOGIND, 1, [enable elogind support])
-+])
-+AM_CONDITIONAL([WITH_ELOGIND], [test x$with_elogind != xno])
-+
- # AC_ARG_ENABLEs
- AC_ARG_ENABLE([pidof],
- AS_HELP_STRING([--disable-pidof], [do not build pidof]),
---- procps-ng-3.3.12/Makefile.am 2016-07-10 00:40:44.235121270 +0200
-+++ procps-ng-3.3.12/Makefile.am 2016-07-10 00:40:44.235121270 +0200
-@@ -155,6 +155,10 @@
- proc_libprocps_la_LIBADD += @SYSTEMD_LIBS@
- endif
-
-+if WITH_ELOGIND
-+proc_libprocps_la_LIBADD += @ELOGIND_LIBS@
-+endif
-+
- proc_libprocps_la_LDFLAGS = \
- -version-info $(LIBprocps_CURRENT):$(LIBprocps_REVISION):$(LIBprocps_AGE) \
- -no-undefined \
---- procps-ng-3.3.12/Makefile.in 2016-07-10 07:32:11.170237828 +0200
-+++ procps-ng-3.3.12/Makefile.in 2016-07-10 07:32:11.170237828 +0200
-@@ -126,6 +126,7 @@
- @BUILD_SKILL_FALSE@ snice.1
-
- @WITH_SYSTEMD_TRUE@am__append_14 = @SYSTEMD_LIBS@
-+@WITH_ELOGIND_TRUE@am__append_15 = @ELOGIND_LIBS@
- TESTS = lib/test_strtod_nol$(EXEEXT)
- check_PROGRAMS = $(am__EXEEXT_5)
- noinst_PROGRAMS = lib/test_strutils$(EXEEXT) \
-@@ -688,6 +689,8 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ELOGIND_CFLAGS = @ELOGIND_CFLAGS@
-+ELOGIND_LIBS = @ELOGIND_LIBS@
- EXEEXT = @EXEEXT@
- FGREP = @FGREP@
- GMSGFMT = @GMSGFMT@
---- procps-ng-3.3.12/proc/readproc.c 2016-07-09 23:49:25.825306872 +0200
-+++ procps-ng-3.3.12/proc/readproc.c 2016-07-09 23:49:25.825306872 +0200
-@@ -40,6 +40,9 @@
- #ifdef WITH_SYSTEMD
- #include <systemd/sd-login.h>
- #endif
-+#ifdef WITH_ELOGIND
-+#include <elogind/sd-login.h>
-+#endif
-
- // sometimes it's easier to do this manually, w/o gcc helping
- #ifdef PROF
-@@ -518,7 +521,7 @@
- }
-
- static void sd2proc(proc_t *restrict p) {
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
- char buf[64];
- uid_t uid;
-
diff --git a/sys-process/procps/files/procps-3.3.12-strtod_nol_err.patch b/sys-process/procps/files/procps-3.3.12-strtod_nol_err.patch
deleted file mode 100644
index 1a298c87f70..00000000000
--- a/sys-process/procps/files/procps-3.3.12-strtod_nol_err.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 4ed44ab58e27a9a09902b9c5b49df484842b6c9a Mon Sep 17 00:00:00 2001
-From: Dr. Werner Fink <werner@suse.de>
-Date: Wed, 13 Jul 2016 20:08:51 +1000
-Subject: [PATCH] misc: fix strtod_nol_err tests
-
-A better way of implementing the string to double
-conversion and a better way of testing it.
-
-Signed-off-by: Craig Small <csmall@enc.com.au>
----
-diff --git a/include/strutils.h b/include/strutils.h
-index 85a6192..a5a15c9 100644
---- a/include/strutils.h
-+++ b/include/strutils.h
-@@ -7,6 +7,6 @@
-
- extern long strtol_or_err(const char *str, const char *errmesg);
- extern double strtod_or_err(const char *str, const char *errmesg);
--double strtod_nol_or_err(char *str, const char *errmesg);
-+extern double strtod_nol_or_err(char *str, const char *errmesg);
-
- #endif
-diff --git a/lib/strutils.c b/lib/strutils.c
-index e5245db..e0632c4 100644
---- a/lib/strutils.c
-+++ b/lib/strutils.c
-@@ -20,6 +20,8 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-+#include <float.h>
-+#include <math.h>
- #include <stdlib.h>
- #include <ctype.h>
-
-@@ -71,9 +73,9 @@ double strtod_or_err(const char *str, const char *errmesg)
- */
- double strtod_nol_or_err(char *str, const char *errmesg)
- {
-- double num;
-+ long double num;
- const char *cp, *radix;
-- double mult;
-+ long double mult;
- int negative = 0;
-
- if (str != NULL && *str != '\0') {
-@@ -95,29 +97,29 @@ double strtod_nol_or_err(char *str, const char *errmesg)
- mult=0.1;
- while(isdigit(*radix)) {
- radix++;
-- mult *= 10;
-+ mult *= 10.0;
- }
- while(isdigit(*cp)) {
-- num += (*cp - '0') * mult;
-- mult /= 10;
-+ num += (long double)(*cp - '0') * mult;
-+ mult /= 10.0;
- cp++;
- }
- /* got the integers */
- if (*cp == '\0')
-- return (negative?-num:num);
-+ return (double)(negative?-num:num);
- if (*cp != '.' && *cp != ',')
- error(EXIT_FAILURE, EINVAL, "%s: '%s'", errmesg, str);
-
- cp++;
- mult = 0.1;
- while(isdigit(*cp)) {
-- num += (*cp - '0') * mult;
-- mult /= 10;
-+ num += (long double)(*cp - '0') * mult;
-+ mult /= 10.0;
- cp++;
- }
- if (*cp == '\0')
-- return (negative?-num:num);
-+ return (double)(negative?-num:num);
- }
- error(EXIT_FAILURE, errno, "%s: '%s'", errmesg, str);
-- return 0;
-+ return (double)0;
- }
-diff --git a/lib/test_strtod_nol.c b/lib/test_strtod_nol.c
-index 0be798c..736768a 100644
---- a/lib/test_strtod_nol.c
-+++ b/lib/test_strtod_nol.c
-@@ -1,4 +1,5 @@
--
-+#include <float.h>
-+#include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include "strutils.h"
-@@ -33,8 +34,8 @@ int main(int argc, char *argv[])
- double val;
-
- for(i=0; tests[i].string != NULL; i++) {
-- if(strtod_nol_or_err(tests[i].string, "Cannot parse number") !=
-- tests[i].result) {
-+ val = strtod_nol_or_err(tests[i].string, "Cannot parse number");
-+ if(fabs(tests[i].result - val) > DBL_EPSILON) {
- fprintf(stderr, "FAIL: strtod_nol_or_err(\"%s\") != %f\n",
- tests[i].string, tests[i].result);
- return EXIT_FAILURE;
---
-libgit2 0.24.0
-
diff --git a/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch b/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch
deleted file mode 100644
index 00397480ca3..00000000000
--- a/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 396cbc4cf36166217d877e2ff7e0a290758b0bc2 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 27 Jun 2013 18:37:17 -0400
-Subject: [PATCH] kill: fix -PID handling
-
-Commit 19b6f48990b02aeca211b480625b95b2033c1017 tried to fix -PID
-handling, but the new logic ends up skipping over the arg. This is
-because getopt increments optind after it processed the -PID (even
-though it was an unknown option). We need to decrement it by one
-so the loop at the end of the code will process it for us.
-
-I also fixed some whitespace errors in that same commit.
-
-URL: http://code.google.com/p/chromium/issues/detail?id=255209
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- skill.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/skill.c b/skill.c
-index fb57305..074c5d7 100644
---- a/skill.c
-+++ b/skill.c
-@@ -390,7 +390,7 @@ static void __attribute__ ((__noreturn__))
- else
- sigopt++;
-
-- opterr=0; /* suppress errors on -123 */
-+ opterr = 0; /* suppress errors on -123 */
- while (loop == 1 && (i = getopt_long(argc, argv, "l::Ls:hV", longopts, NULL)) != -1)
- switch (i) {
- case 'l':
-@@ -423,7 +423,9 @@ static void __attribute__ ((__noreturn__))
- xwarnx(_("invalid argument %c"), optopt);
- kill_usage(stderr);
- }
-- loop=0;
-+ /* We need to back off by one since getopt() ate the -PID */
-+ --optind;
-+ loop = 0;
- break;
- default:
- kill_usage(stderr);
---
-1.8.2.1
-
diff --git a/sys-process/procps/procps-3.3.12-r1.ebuild b/sys-process/procps/procps-3.3.12-r1.ebuild
deleted file mode 100644
index 118aed2504b..00000000000
--- a/sys-process/procps/procps-3.3.12-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch toolchain-funcs flag-o-matic
-
-DESCRIPTION="standard informational utilities and process-handling tools"
-HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps"
-SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/5" # libprocps.so
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
-
-COMMON_DEPEND="
- elogind? ( sys-auth/elogind )
- ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] )
- selinux? ( sys-libs/libselinux )
- systemd? ( sys-apps/systemd )
-"
-DEPEND="${COMMON_DEPEND}
- elogind? ( virtual/pkgconfig )
- ncurses? ( virtual/pkgconfig )
- systemd? ( virtual/pkgconfig )
- test? ( dev-util/dejagnu )"
-RDEPEND="
- ${COMMON_DEPEND}
- kill? (
- !sys-apps/coreutils[kill]
- !sys-apps/util-linux[kill]
- )
- !<sys-apps/sysvinit-2.88-r6
-"
-
-S="${WORKDIR}/${PN}-ng-${PV}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209
- "${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304
- "${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036
-
- # Upstream fixes
- "${FILESDIR}"/${P}-strtod_nol_err.patch
-)
-
-src_prepare() {
- epatch "${PATCHES[@]}"
-
- # Requires special handling or autoreconf gets triggered which we don't
- # want to happen in a base-system package.
- EPATCH_OPTS="-Z" \
- epatch "${FILESDIR}"/${PN}-3.3.12-elogind.patch # 599504
-
- epatch_user
-}
-
-src_configure() {
- # http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
- append-lfs-flags #471102
- econf \
- --docdir='$(datarootdir)'/doc/${PF} \
- $(use_with elogind) \
- $(use_enable kill) \
- $(use_enable modern-top) \
- $(use_with ncurses) \
- $(use_enable nls) \
- $(use_enable selinux libselinux) \
- $(use_enable static-libs static) \
- $(use_with systemd) \
- $(use_enable unicode watch8bit)
-}
-
-src_test() {
- emake check </dev/null #461302
-}
-
-src_install() {
- default
- #dodoc sysctl.conf
-
- dodir /bin
- mv "${ED}"/usr/bin/ps "${ED}"/bin/ || die
- if use kill; then
- mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die
- fi
-
- gen_usr_ldscript -a procps
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-process/procps/procps-3.3.12.ebuild b/sys-process/procps/procps-3.3.12.ebuild
deleted file mode 100644
index 57528f8ba61..00000000000
--- a/sys-process/procps/procps-3.3.12.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="standard informational utilities and process-handling tools"
-HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps"
-SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/5" # libprocps.so
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+kill +ncurses modern-top nls selinux static-libs systemd test unicode"
-
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] )
- selinux? ( sys-libs/libselinux )
- systemd? ( >=sys-apps/systemd-209 )"
-DEPEND="${RDEPEND}
- ncurses? ( virtual/pkgconfig )
- systemd? ( virtual/pkgconfig )
- test? ( dev-util/dejagnu )"
-RDEPEND+="
- kill? (
- !sys-apps/coreutils[kill]
- !sys-apps/util-linux[kill]
- )
- !<sys-apps/sysvinit-2.88-r6"
-
-S="${WORKDIR}/${PN}-ng-${PV}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209
- "${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304
- "${FILESDIR}"/${PN}-3.3.12-proc-tests.patch #583036
-
- # Upstream fixes
- "${FILESDIR}"/${P}-strtod_nol_err.patch
-)
-
-src_prepare() {
- epatch "${PATCHES[@]}"
- epatch_user
-}
-
-src_configure() {
- # http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
- append-lfs-flags #471102
- econf \
- --docdir='$(datarootdir)'/doc/${PF} \
- $(use_enable kill) \
- $(use_enable modern-top) \
- $(use_with ncurses) \
- $(use_enable nls) \
- $(use_enable selinux libselinux) \
- $(use_enable static-libs static) \
- $(use_with systemd) \
- $(use_enable unicode watch8bit)
-}
-
-src_test() {
- emake check </dev/null #461302
-}
-
-src_install() {
- default
- #dodoc sysctl.conf
-
- dodir /bin
- mv "${ED}"/usr/bin/ps "${ED}"/bin/ || die
- if use kill; then
- mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die
- fi
-
- gen_usr_ldscript -a procps
- prune_libtool_files
-}
diff --git a/sys-process/procps/procps-3.3.14.ebuild b/sys-process/procps/procps-3.3.14.ebuild
deleted file mode 100644
index 5e9a2b13394..00000000000
--- a/sys-process/procps/procps-3.3.14.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="standard informational utilities and process-handling tools"
-HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps"
-SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/5" # libprocps.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
-
-COMMON_DEPEND="
- elogind? ( sys-auth/elogind )
- ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] )
- selinux? ( sys-libs/libselinux )
- systemd? ( sys-apps/systemd )
-"
-DEPEND="${COMMON_DEPEND}
- elogind? ( virtual/pkgconfig )
- ncurses? ( virtual/pkgconfig )
- systemd? ( virtual/pkgconfig )
- test? ( dev-util/dejagnu )"
-RDEPEND="
- ${COMMON_DEPEND}
- kill? (
- !sys-apps/coreutils[kill]
- !sys-apps/util-linux[kill]
- )
- !<sys-apps/sysvinit-2.88-r6
-"
-
-S="${WORKDIR}/${PN}-ng-${PV}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209
- "${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304
- "${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036
-
- # Upstream fixes
-)
-
-src_configure() {
- # http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
- append-lfs-flags #471102
- local myeconfargs=(
- --docdir='$(datarootdir)'/doc/${PF}
- $(use_with elogind)
- $(use_enable kill)
- $(use_enable modern-top)
- $(use_with ncurses)
- $(use_enable nls)
- $(use_enable selinux libselinux)
- $(use_enable static-libs static)
- $(use_with systemd)
- $(use_enable unicode watch8bit)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_test() {
- emake check </dev/null #461302
-}
-
-src_install() {
- default
- #dodoc sysctl.conf
-
- dodir /bin
- mv "${ED%/}"/usr/bin/ps "${ED%/}"/bin/ || die
- if use kill; then
- mv "${ED%/}"/usr/bin/kill "${ED}"/bin/ || die
- fi
-
- gen_usr_ldscript -a procps
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/procps/, sys-process/procps/files/
@ 2021-05-14 22:14 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2021-05-14 22:14 UTC (permalink / raw
To: gentoo-commits
commit: 2b243c164b0c2233e2301a6cd8d806bb28b7d41e
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 22:13:50 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri May 14 22:13:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b243c16
sys-process/procps: drop 3.3.16-r2, 3.3.16-r3
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-process/procps/Manifest | 1 -
.../procps-3.3.16-SC_ARG_MAX_sanity_check.patch | 60 ---------------
...ocps-3.3.16-toprc_backwards_compatibility.patch | 71 -----------------
sys-process/procps/procps-3.3.16-r2.ebuild | 87 ---------------------
sys-process/procps/procps-3.3.16-r3.ebuild | 88 ----------------------
5 files changed, 307 deletions(-)
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index 7c9362d1b1c..f9a2cf039d3 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -1,2 +1 @@
-DIST procps-ng-3.3.16.tar.xz 859736 BLAKE2B fbacc1edb0711cda0fecbf5f589c8cc18bd74f0430866e946f7c4612b78f383b9299840ab7fa5bbc65c581cc9484dbb37b111c493cf88f55ba247a343fd0c80d SHA512 d83da472df256b188c32082632202e7f8ebd1b161082387760876ae34d50221b3682299a2816a7d6a29afb40322743c31b87d92ca299c2944a6b55e50736d367
DIST procps-ng-3.3.17.tar.xz 1008428 BLAKE2B 43aa1a21d4f0725b1c02457f343cf1fc66bc1771b25c6eaf689c9775c190e90545bfac1729f027abc4d3d13de37ffac4828554b5b25e12bcf6af9540de1695f3 SHA512 59e9a5013430fd9da508c4655d58375dc32e025bb502bb28fb9a92a48e4f2838b3355e92b4648f7384b2050064d17079bf4595d889822ebb5030006bc154a1a7
diff --git a/sys-process/procps/files/procps-3.3.16-SC_ARG_MAX_sanity_check.patch b/sys-process/procps/files/procps-3.3.16-SC_ARG_MAX_sanity_check.patch
deleted file mode 100644
index 1b85c2c855f..00000000000
--- a/sys-process/procps/files/procps-3.3.16-SC_ARG_MAX_sanity_check.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From bb96fc42956c9ed926a1b958ab715f8b4a663dec Mon Sep 17 00:00:00 2001
-From: Craig Small <csmall@dropbear.xyz>
-Date: Sun, 5 Jan 2020 15:05:55 +1100
-Subject: [PATCH] pgrep: check sanity of SC_ARG_MAX
-
-A kernel change means we cannot trust what sysconf(SC_ARG_MAX)
-returns. We clamp it so its more than 4096 and less than 128*1024
-which is what findutils does.
-
-References:
- procps-ng/procps#152
- https://git.savannah.gnu.org/cgit/findutils.git/tree/lib/buildcmd.c#n535
- https://lwn.net/Articles/727862/
----
- pgrep.c | 22 +++++++++++++++++++++-
- 1 file changed, 21 insertions(+), 1 deletion(-)
-
-diff --git a/pgrep.c b/pgrep.c
-index 01563db..bde7448 100644
---- a/pgrep.c
-+++ b/pgrep.c
-@@ -485,6 +485,26 @@ static regex_t * do_regcomp (void)
- return preg;
- }
-
-+/*
-+ * SC_ARG_MAX used to return the maximum size a command line can be
-+ * however changes to the kernel mean this can be bigger than we can
-+ * alloc. Clamp it to 128kB like xargs and friends do
-+ * Should also not be smaller than POSIX_ARG_MAX which is 4096
-+ */
-+static size_t get_arg_max(void)
-+{
-+#define MIN_ARG_SIZE 4096u
-+#define MAX_ARG_SIZE (128u * 1024u)
-+
-+ size_t val = sysconf(_SC_ARG_MAX);
-+
-+ if (val < MIN_ARG_SIZE)
-+ val = MIN_ARG_SIZE;
-+ if (val > MAX_ARG_SIZE)
-+ val = MAX_ARG_SIZE;
-+
-+ return val;
-+}
- static struct el * select_procs (int *num)
- {
- PROCTAB *ptp;
-@@ -497,7 +517,7 @@ static struct el * select_procs (int *num)
- regex_t *preg;
- pid_t myself = getpid();
- struct el *list = NULL;
-- long cmdlen = sysconf(_SC_ARG_MAX) * sizeof(char);
-+ long cmdlen = get_arg_max() * sizeof(char);
- char *cmdline = xmalloc(cmdlen);
- char *cmdsearch = xmalloc(cmdlen);
- char *cmdoutput = xmalloc(cmdlen);
---
-GitLab
-
diff --git a/sys-process/procps/files/procps-3.3.16-toprc_backwards_compatibility.patch b/sys-process/procps/files/procps-3.3.16-toprc_backwards_compatibility.patch
deleted file mode 100644
index 19721205dfe..00000000000
--- a/sys-process/procps/files/procps-3.3.16-toprc_backwards_compatibility.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 5cd29e5093efa3c6ee9c5310b64347f1d54b707d Mon Sep 17 00:00:00 2001
-From: Jim Warner <james.warner@comcast.net>
-Date: Sat, 15 Feb 2020 00:00:00 -0600
-Subject: [PATCH] top: restore configuration file backward compatibility
-
-The Debian bug referenced below has nothing to do with
-locales. In fact, top was made locale independent back
-in release 3.3.13 (April, 2018). However, that bug did
-reveal some misplaced logic which this patch corrects.
-
-Prompted by the Qualys audit, all rcfile field strings
-were checked for potential duplicates which could only
-have resulted from some user's manual/malicious edits.
-
-Unfortunately, that code was executed before top had a
-chance to enforce the proper/maximum string length (in
-the event an extremely old rcfile had just been read).
-This created some potential string overrun references.
-
-In top's original 3.3.15 implementation, the potential
-overrun extended for 15 characters. That is the number
-of field characters added with 3.3.9 (December, 2013).
-But, since strchr() was used, no error exit was taken.
-
-In the revised 3.3.16 implementation, the strchr() was
-replaced with '&w->rc.fieldscur[n]'. This held overrun
-to a single position while producing an error message.
-
-So, this commit just moves that logic to a point where
-fieldscur is guaranteed to be longer than EU_MAXPFLGS.
-
-Reference(s):
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=951335
-. revised 3.3.16 validation logic
-commit 291d98ee5036567f93d21bc11142b0a7e2ee70ae
-. original 3.3.15 validation logic
-commit fdb58974e24c025a1f866f324c62f1d8f96234f8
-
-Signed-off-by: Jim Warner <james.warner@comcast.net>
----
-diff --git a/top/top.c b/top/top.c
-index 63ec5fe..b4fe21e 100644
---- a/top/top.c
-+++ b/top/top.c
-@@ -3939,11 +3939,6 @@ static const char *configs_file (FILE *fp, const char *name, float *delay) {
- // too bad fscanf is not as flexible with his format string as snprintf
- #error Hey, fix the above fscanf 'PFLAGSSIZ' dependency !
- #endif
-- // ensure there's been no manual alteration of fieldscur
-- for (n = 0 ; n < EU_MAXPFLGS; n++) {
-- if (&w->rc.fieldscur[n] != strrchr(w->rc.fieldscur, w->rc.fieldscur[n]))
-- return p;
-- }
- // be tolerant of missing release 3.3.10 graph modes additions
- if (3 > fscanf(fp, "\twinflags=%d, sortindx=%d, maxtasks=%d, graph_cpus=%d, graph_mems=%d\n"
- , &w->rc.winflags, &w->rc.sortindx, &w->rc.maxtasks, &w->rc.graph_cpus, &w->rc.graph_mems))
-@@ -3989,6 +3984,11 @@ static const char *configs_file (FILE *fp, const char *name, float *delay) {
- return p;
- break;
- }
-+ // ensure there's been no manual alteration of fieldscur
-+ for (n = 0 ; n < EU_MAXPFLGS; n++) {
-+ if (&w->rc.fieldscur[n] != strrchr(w->rc.fieldscur, w->rc.fieldscur[n]))
-+ return p;
-+ }
- #ifndef USE_X_COLHDR
- OFFw(w, NOHIFND_xxx | NOHISEL_xxx);
- #endif
---
-2.24.1
-
diff --git a/sys-process/procps/procps-3.3.16-r2.ebuild b/sys-process/procps/procps-3.3.16-r2.ebuild
deleted file mode 100644
index fc0db915eef..00000000000
--- a/sys-process/procps/procps-3.3.16-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal usr-ldscript
-
-DESCRIPTION="Standard informational utilities and process-handling tools"
-HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps"
-SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/8" # libprocps.so
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elogind? ( sys-auth/elogind )
- ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] )
- selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
-"
-DEPEND="${COMMON_DEPEND}
- elogind? ( virtual/pkgconfig )
- ncurses? ( virtual/pkgconfig )
- systemd? ( virtual/pkgconfig )
- test? ( dev-util/dejagnu )"
-RDEPEND="
- ${COMMON_DEPEND}
- kill? (
- !sys-apps/coreutils[kill]
- !sys-apps/util-linux[kill]
- )
- !<app-i18n/man-pages-de-2.12-r1
- !<app-i18n/man-pages-pl-0.7-r1
-"
-
-S="${WORKDIR}/${PN}-ng-${PV}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304
- "${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036
-
- # Upstream fixes
- "${FILESDIR}"/${P}-toprc_backwards_compatibility.patch #711676
-)
-
-multilib_src_configure() {
- # http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
- append-lfs-flags #471102
- local myeconfargs=(
- $(multilib_native_use_with elogind) # No elogind multilib support
- $(multilib_native_use_enable kill)
- $(multilib_native_use_enable modern-top)
- $(multilib_native_use_with ncurses)
- $(use_enable nls)
- $(use_enable selinux libselinux)
- $(use_enable static-libs static)
- $(use_with systemd)
- $(use_enable unicode watch8bit)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
- emake check </dev/null #461302
-}
-
-multilib_src_install() {
- default
- #dodoc sysctl.conf
-
- if multilib_is_native_abi ; then
- dodir /bin
- mv "${ED}"/usr/bin/ps "${ED}"/bin/ || die
- if use kill; then
- mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die
- fi
-
- gen_usr_ldscript -a procps
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/sys-process/procps/procps-3.3.16-r3.ebuild b/sys-process/procps/procps-3.3.16-r3.ebuild
deleted file mode 100644
index 96f077659ae..00000000000
--- a/sys-process/procps/procps-3.3.16-r3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal usr-ldscript
-
-DESCRIPTION="Standard informational utilities and process-handling tools"
-HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps"
-SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/8" # libprocps.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elogind? ( sys-auth/elogind )
- ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] )
- selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
-"
-DEPEND="${COMMON_DEPEND}
- elogind? ( virtual/pkgconfig )
- ncurses? ( virtual/pkgconfig )
- systemd? ( virtual/pkgconfig )
- test? ( dev-util/dejagnu )"
-RDEPEND="
- ${COMMON_DEPEND}
- kill? (
- !sys-apps/coreutils[kill]
- !sys-apps/util-linux[kill]
- )
- !<app-i18n/man-pages-de-2.12-r1
- !<app-i18n/man-pages-pl-0.7-r1
-"
-
-S="${WORKDIR}/${PN}-ng-${PV}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304
- "${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036
-
- # Upstream fixes
- "${FILESDIR}"/${P}-toprc_backwards_compatibility.patch #711676
- "${FILESDIR}"/${P}-SC_ARG_MAX_sanity_check.patch #767217
-)
-
-multilib_src_configure() {
- # http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
- append-lfs-flags #471102
- local myeconfargs=(
- $(multilib_native_use_with elogind) # No elogind multilib support
- $(multilib_native_use_enable kill)
- $(multilib_native_use_enable modern-top)
- $(multilib_native_use_with ncurses)
- $(use_enable nls)
- $(use_enable selinux libselinux)
- $(use_enable static-libs static)
- $(use_with systemd)
- $(use_enable unicode watch8bit)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
- emake check </dev/null #461302
-}
-
-multilib_src_install() {
- default
- #dodoc sysctl.conf
-
- if multilib_is_native_abi ; then
- dodir /bin
- mv "${ED}"/usr/bin/ps "${ED}"/bin/ || die
- if use kill ; then
- mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die
- fi
-
- gen_usr_ldscript -a procps
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/procps/, sys-process/procps/files/
@ 2021-08-30 2:35 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-08-30 2:35 UTC (permalink / raw
To: gentoo-commits
commit: 87f87c28f18c7cdd396f4e2e68dfaee778506eb8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 30 02:34:24 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 30 02:34:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87f87c28
sys-process/procps: add stop-gap musl patch for now
Conditionally apply a patch from ::musl for building on
musl (to facilitate stage building).
A different (better) approach was taken upstream and will
result in a --disable-w configure option in the next release,
but we're not there yet.
Closes: https://bugs.gentoo.org/794997
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../procps/files/procps-3.3.17-musl-fix.patch | 78 ++++++++++++++++++++++
sys-process/procps/procps-3.3.17-r1.ebuild | 8 +++
2 files changed, 86 insertions(+)
diff --git a/sys-process/procps/files/procps-3.3.17-musl-fix.patch b/sys-process/procps/files/procps-3.3.17-musl-fix.patch
new file mode 100644
index 00000000000..4402354c21e
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.17-musl-fix.patch
@@ -0,0 +1,78 @@
+Temporary stopgap patch (a different solution was used upstream
+in the next release, should be in the next after 3.3.17 -- we'll need to
+add --disable-w instead).
+
+https://bugs.gentoo.org/794997
+
+From 7bfe2b7c12b33aabca71491360c433d2d3f7bbf4 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Wed, 24 Feb 2021 21:14:31 +0000
+Subject: [PATCH 1/2] w.c: correct musl builds
+
+No need to redefine UT_ stuff to something that does not exist.
+
+UT_ is already provided in musl but via utmp.h header, so include
+it always.
+
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ w.c | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/w.c b/w.c
+index 9d07ac9e..d10639b8 100644
+--- a/w.c
++++ b/w.c
+@@ -57,9 +57,8 @@
+ #include <unistd.h>
+ #ifdef HAVE_UTMPX_H
+ # include <utmpx.h>
+-#else
+-# include <utmp.h>
+ #endif
++#include <utmp.h>
+ #include <arpa/inet.h>
+
+ static int ignoreuser = 0; /* for '-u' */
+@@ -72,12 +71,6 @@ typedef struct utmpx utmp_t;
+ typedef struct utmp utmp_t;
+ #endif
+
+-#if !defined(UT_HOSTSIZE) || defined(__UT_HOSTSIZE)
+-# define UT_HOSTSIZE __UT_HOSTSIZE
+-# define UT_LINESIZE __UT_LINESIZE
+-# define UT_NAMESIZE __UT_NAMESIZE
+-#endif
+-
+ #ifdef W_SHOWFROM
+ # define FROM_STRING "on"
+ #else
+--
+GitLab
+
+
+From 145165aba6c659f3f0f3567a323a3e6170408ea6 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Wed, 24 Feb 2021 21:16:14 +0000
+Subject: [PATCH 2/2] proc/escape.c: add missing include
+
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ proc/escape.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/proc/escape.c b/proc/escape.c
+index 2e8fb7dd..e1f4612d 100644
+--- a/proc/escape.c
++++ b/proc/escape.c
+@@ -21,6 +21,7 @@
+ #include <sys/types.h>
+ #include <string.h>
+ #include <limits.h>
++#include <langinfo.h>
+ #include "procps.h"
+ #include "escape.h"
+ #include "readproc.h"
+--
+GitLab
+
diff --git a/sys-process/procps/procps-3.3.17-r1.ebuild b/sys-process/procps/procps-3.3.17-r1.ebuild
index 77bbf988516..2fa54d22f40 100644
--- a/sys-process/procps/procps-3.3.17-r1.ebuild
+++ b/sys-process/procps/procps-3.3.17-r1.ebuild
@@ -42,6 +42,14 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036
)
+src_prepare() {
+ default
+
+ # Please drop this after 3.3.17 and instead use --disable-w on musl.
+ # bug #794997
+ use elibc_musl && eapply "${FILESDIR}"/${PN}-3.3.17-musl-fix.patch
+}
+
multilib_src_configure() {
# http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
append-lfs-flags #471102
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-08-30 2:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-18 4:44 [gentoo-commits] repo/gentoo:master commit in: sys-process/procps/, sys-process/procps/files/ Mike Frysinger
-- strict thread matches above, loose matches on Subject: below --
2021-08-30 2:35 Sam James
2021-05-14 22:14 David Seifert
2018-05-29 9:55 Mikle Kolyada
2015-11-18 17:30 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox