[gentoo-commits] repo/gentoo:master commit in: sys-process/procps/files/, sys-process/procps/
commit: 4941d04c47cc2d8b58599325fae989ce730b6a22 Author: Sam James gentoo org> AuthorDate: Sat Sep 2 09:57:15 2023 + Commit: Sam James gentoo org> CommitDate: Sat Sep 2 09:59:10 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4941d04c sys-process/procps: add 4.0.4 Closes: https://bugs.gentoo.org/584076 Closes: https://bugs.gentoo.org/625312 Closes: https://bugs.gentoo.org/675420 Closes: https://bugs.gentoo.org/835813 Closes: https://bugs.gentoo.org/913210 Bug: https://bugs.gentoo.org/913408 Signed-off-by: Sam James gentoo.org> sys-process/procps/Manifest| 1 + .../files/procps-4.0.4-fix-systemd-linkage.patch | 27 + .../files/procps-4.0.4-fix-tests-multilib.patch| 52 ++ .../procps/files/procps-4.0.4-sysctl-manpage.patch | 33 +++ .../files/procps-4.0.4-xfail-pmap-test.patch | 25 + sys-process/procps/procps-4.0.4.ebuild | 110 + 6 files changed, 248 insertions(+) diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest index f9a2cf039d39..a6fe2b6856a4 100644 --- a/sys-process/procps/Manifest +++ b/sys-process/procps/Manifest @@ -1 +1,2 @@ DIST procps-ng-3.3.17.tar.xz 1008428 BLAKE2B 43aa1a21d4f0725b1c02457f343cf1fc66bc1771b25c6eaf689c9775c190e90545bfac1729f027abc4d3d13de37ffac4828554b5b25e12bcf6af9540de1695f3 SHA512 59e9a5013430fd9da508c4655d58375dc32e025bb502bb28fb9a92a48e4f2838b3355e92b4648f7384b2050064d17079bf4595d889822ebb5030006bc154a1a7 +DIST procps-ng-4.0.4.tar.xz 1401540 BLAKE2B 63b972666ef9e92042be96739ffa15c787d0346b2d3ffcb0d240b0a4e999dc90024b2c5b058df683dd9d2c436ceb812abd0b115cc877a6ca1023988b86de443f SHA512 94375544e2422fefc23d7634063c49ef1be62394c46039444f85e6d2e87e45cfadc33accba5ca43c96897b4295bfb0f88d55a30204598ddb26ef66f0420cefb4 diff --git a/sys-process/procps/files/procps-4.0.4-fix-systemd-linkage.patch b/sys-process/procps/files/procps-4.0.4-fix-systemd-linkage.patch new file mode 100644 index ..32f4d6da6dc6 --- /dev/null +++ b/sys-process/procps/files/procps-4.0.4-fix-systemd-linkage.patch @@ -0,0 +1,27 @@ +https://gitlab.com/procps-ng/procps/-/commit/ca004d4657d5e8b468a4552ede429be53193a3a9 + +From ca004d4657d5e8b468a4552ede429be53193a3a9 Mon Sep 17 00:00:00 2001 +From: Craig Small +Date: Thu, 31 Aug 2023 22:24:23 +1000 +Subject: [PATCH] build-sys: Add systemd/elogind to w + +Depending on the compiler flags, w needs to be explictly linked +to libsystemd or elogind even though libproc2 is linked to it. + +Signed-off-by: Craig Small +--- a/Makefile.am b/Makefile.am +@@ -149,6 +149,13 @@ endif + + dist_man_MANS += man/w.1 + src_w_SOURCES = src/w.c local/fileutils.c ++src_w_LDADD = $(LDADD) ++if WITH_SYSTEMD ++src_w_LDADD += @SYSTEMD_LIBS@ ++endif ++if WITH_ELOGIND ++src_w_LDADD += @ELOGIND_LIBS@ ++endif + else + EXTRA_DIST += man/w.1 + endif diff --git a/sys-process/procps/files/procps-4.0.4-fix-tests-multilib.patch b/sys-process/procps/files/procps-4.0.4-fix-tests-multilib.patch new file mode 100644 index ..ed52af8582b9 --- /dev/null +++ b/sys-process/procps/files/procps-4.0.4-fix-tests-multilib.patch @@ -0,0 +1,52 @@ +https://gitlab.com/procps-ng/procps/-/merge_requests/205 + +From 4b6b91b393c0f5d3ec26910785cb3e3a463fcb57 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sat, 2 Sep 2023 10:46:38 +0100 +Subject: [PATCH] testsuite: skip tests where relevant binaries aren't built + +* With --without-ncurses, slabtop isn't built. +* With --disable-w, w isn't built. + +Signed-off-by: Sam James +--- a/testsuite/Makefile.am b/testsuite/Makefile.am +@@ -14,16 +14,23 @@ if LINUX + # 3d807ae853b8b4264da156065b34f1447658a8ba + DEJATOOL += \ + pmap ++ + if !CYGWIN +-DEJATOOL += \ +- slabtop \ +- sysctl ++if WITH_NCURSES ++DEJATOOL += slabtop ++endif ++ ++DEJATOOL += sysctl + endif + + if BUILD_KILL + DEJATOOL += kill + endif + ++if BUILD_W ++DEJATOOL += w ++endif ++ + DEJATOOL += \ + free \ + lib \ +@@ -31,10 +38,8 @@ DEJATOOL += \ + pkill \ + ps \ + pwdx \ +- slabtop \ + uptime \ +- vmstat \ +- w ++ vmstat + endif + + EXTRA_DIST = \ diff --git a/sys-process/procps/files/procps-4.0.4-sysctl-manpage.patch b/sys-process/procps/files/procps-4.0.4-sysctl-manpage.patch new file mode 100644 index ..3582f7e79306 --- /dev/null +++ b/sys-process/procps/files/procps-4.0.4-sysctl-manpage.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/565304 +--- a/man/sysctl.8 b/man/sysctl.8 +@@ -141,21 +141,21 @@ replaced (by having a new configuration file with the same name in a + directory of higher priority) or partially replaced (by having a configuration + file that is ordered later). + .SH EXAMPLES +-/sbin/sysctl \-a ++/usr/bin/sysctl \-a + .br +-/sbin/sysctl \-n kernel.hostname ++/usr/bin/sysctl \-n kernel.hostname + .br +-/sbin/sysctl \-w kernel.domainname="example.com" ++/usr/bin/sysctl \-w kernel.domainname
[gentoo-commits] repo/gentoo:master commit in: sys-process/procps/files/, sys-process/procps/
commit: 34d263dddc98200ed6fefffd0bb8b0fcb37762e7
Author: Lars Wendler gentoo org>
AuthorDate: Mon Jan 25 22:14:17 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon Jan 25 22:16:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34d263dd
sys-process/procps: Revbump to fix pgrep/pkill with kernel-5.10+
Reported-by: Timo Rothenpieler rothenpieler.org>
Closes: https://bugs.gentoo.org/767217
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler gentoo.org>
.../procps-3.3.16-SC_ARG_MAX_sanity_check.patch| 60 +++
sys-process/procps/procps-3.3.16-r3.ebuild | 88 ++
2 files changed, 148 insertions(+)
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
new file mode 100644
index 000..1b85c2c855f
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.16-SC_ARG_MAX_sanity_check.patch
@@ -0,0 +1,60 @@
+From bb96fc42956c9ed926a1b958ab715f8b4a663dec Mon Sep 17 00:00:00 2001
+From: Craig Small
+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/procps-3.3.16-r3.ebuild
b/sys-process/procps/procps-3.3.16-r3.ebuild
new file mode 100644
index 000..5e67f3649e5
--- /dev/null
+++ b/sys-process/procps/procps-3.3.16-r3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs 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]
+ )
+ !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}" econ
[gentoo-commits] repo/gentoo:master commit in: sys-process/procps/files/, sys-process/procps/
commit: d832efe0225a524ed86bab423bf90cef980a6480
Author: Lars Wendler gentoo org>
AuthorDate: Fri Mar 6 12:35:45 2020 +
Commit: Lars Wendler gentoo org>
CommitDate: Fri Mar 6 12:36:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d832efe0
sys-process/procps: Revbump for toprc backwards compatibility
Thanks-to: Massimo Burcheri gmail.com>
Closes: https://bugs.gentoo.org/711676
Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Lars Wendler gentoo.org>
...ocps-3.3.16-toprc_backwards_compatibility.patch | 71 ++
...ps-3.3.16-r1.ebuild => procps-3.3.16-r2.ebuild} | 1 +
2 files changed, 72 insertions(+)
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
new file mode 100644
index 000..19721205dfe
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.16-toprc_backwards_compatibility.patch
@@ -0,0 +1,71 @@
+From 5cd29e5093efa3c6ee9c5310b64347f1d54b707d Mon Sep 17 00:00:00 2001
+From: Jim Warner
+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
+---
+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-r1.ebuild
b/sys-process/procps/procps-3.3.16-r2.ebuild
similarity index 97%
rename from sys-process/procps/procps-3.3.16-r1.ebuild
rename to sys-process/procps/procps-3.3.16-r2.ebuild
index b7c8b18e232..8a5e2ae740e 100644
--- a/sys-process/procps/procps-3.3.16-r1.ebuild
+++ b/sys-process/procps/procps-3.3.16-r2.ebuild
@@ -43,6 +43,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036
# Upstream fixes
+ "${FILESDIR}"/${P}-toprc_backwards_compatibility.patch #711676
)
multilib_src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sys-process/procps/files/, sys-process/procps/
commit: 2d8d7761ed767b800e70f68268674b472ba60030
Author: Lars Wendler gentoo org>
AuthorDate: Tue May 30 14:09:46 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue May 30 14:22:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d8d7761
sys-process/procps: Revbump to add elogind support (bug #599504).
Thanks to Sven Eden for providing the procps patch and to asturm for
providing the initial ebuild patch.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../procps/files/procps-3.3.12-elogind.patch | 265 +
sys-process/procps/metadata.xml| 1 +
sys-process/procps/procps-3.3.12-r1.ebuild | 91 +++
3 files changed, 357 insertions(+)
diff --git a/sys-process/procps/files/procps-3.3.12-elogind.patch
b/sys-process/procps/files/procps-3.3.12-elogind.patch
new file mode 100644
index 000..07c165310ce
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.12-elogind.patch
@@ -0,0 +1,265 @@
+--- 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 "$ELOGI
[gentoo-commits] repo/gentoo:master commit in: sys-process/procps/files/, sys-process/procps/
commit: 468f718419a9f61fe2d11473f9a3ce79f7474a34
Author: Lars Wendler gentoo org>
AuthorDate: Tue Jan 17 15:30:21 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Jan 17 16:23:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=468f7184
sys-process/procps: Removed old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-process/procps/Manifest| 3 -
.../files/procps-3.3.10-pmap-unreadable.patch | 60 --
.../procps/files/procps-3.3.10-tests-no-tty.patch | 122 -
sys-process/procps/procps-3.3.10-r1.ebuild | 68
sys-process/procps/procps-3.3.11-r3.ebuild | 77 -
5 files changed, 330 deletions(-)
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index 681956a..bcd62c1 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -1,4 +1 @@
-DIST procps-3.3.11-remove_Unix98_output_limits.patch 8390 SHA256
8818abe9e4bfe192030891297fbc39230bd834642248e6277f38451d40ddacf1 SHA512
01763dd7cf55f4ac638a2515c2efd59ea184fbfeac4cc6381654a2df6bc848329c55dd92556d24a4b3b68e711a1af1f757ac347be2934b41791208b4edfedef1
WHIRLPOOL
57ddcf8b9ce92cd4c4b085306f6146cb67c3a74d0bd49619d14f4bf78e63133ef43fe5d9f3ddaeb8760a18175cdb390300742349b23efa0537ad9840c62929ff
-DIST procps-ng-3.3.10.tar.xz 657232 SHA256
1759229cd0d97da3d200d5599c4ea82726d61fae9c4b7d3edd52c544962791b7 SHA512
cbfa49e79a88a8e7066a9c316ef089f15fa825c5bfbc22ab8a83f53c6f367a7c586cef9c403e360d373d824c471533a15ddb11cd30c561650e6879fe687e7e4f
WHIRLPOOL
723dd1c00578a7fa7e3ff47bed60283c30850cc8ae8069c704ba648792809a67c5944dbfd9b7b0159e0be83215b61e6b71b2d76e65b3619aed54223900ffed9b
-DIST procps-ng-3.3.11.tar.xz 815920 SHA256
e9493169a2d2adc0bc045538707310c8e877b385e4e296143b62607d2bb044ed SHA512
8ab4770adeba4c7e3cf75bc189278cf7a162ece0f23b862e7f726faccee11bd4524aec622b895f3b4e0b272a739a327a01e91f48834feea513544f0515b250df
WHIRLPOOL
1da50ec4e8be9d76086a1112b00eea0daa39a7e579e846b92c12fea23a8303a7287e2d32d41feae93aad7b138768852b004544731fff882236ee3bd9511154ff
DIST procps-ng-3.3.12.tar.xz 845484 SHA256
6ed65ab86318f37904e8f9014415a098bec5bc53653e5d9ab404f95ca5e1a7d4 SHA512
ea816740ff72cc53d99b5d2e78a511b627ea5b295e0efff67605c56d1ab075abc6b0e2da3df4facbfe903fc9d679e892d351b6884a966d37c6f4bfd9141a924b
WHIRLPOOL
f6ff034c09224fb819cdadc0fc6e456a5e11bffa298a7d005a1089378a6bf19c464bb09d278618daecebcd02228d831efbe4d65a4f9f850f83c9dd030a3ab98b
diff --git a/sys-process/procps/files/procps-3.3.10-pmap-unreadable.patch
b/sys-process/procps/files/procps-3.3.10-pmap-unreadable.patch
deleted file mode 100644
index 6976748..
--- a/sys-process/procps/files/procps-3.3.10-pmap-unreadable.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://bugs.gentoo.org/404389
-
-From 92071e963e6ff50f0e221dde286f3229267b2ff9 Mon Sep 17 00:00:00 2001
-From: Craig Small
-Date: Sat, 24 Jan 2015 18:53:29 +1100
-Subject: [PATCH] pmap: print process even if smaps unreadable
-
-pmap would previously print the process name if
-/proc/PID/smaps could be opened, even if subsequent
-reads failed. This actually occurs with other users
-PIDs.
-
-Kernel 3.18rc1 introduced a change where the file could
-not been opened, meaning pmap -X 1 previously showed
-the process name and nothing else but NOW shows nothing
-make check failed because of this.
-
-This change prints the process name even before trying to open
-the file, returning it to previous behaviour.
-Thanks to Vincent Bernat for some analysis.
-
-References:
- https://bugs.debian.org/775624
-
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=29a40ace841cba9b661711f042d1821cdc4ad47c
-
-Signed-off-by: Craig Small
- NEWS | 1 +
- pmap.c | 8
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/pmap.c b/pmap.c
-index c83617c..17e0e30 100644
a/pmap.c
-+++ b/pmap.c
-@@ -533,6 +533,10 @@ static int one_proc(proc_t * p)
-*/
- int maxcmd = 0xf;
-
-+ escape_command(cmdbuf, p, sizeof cmdbuf, &maxcmd,
-+ ESC_ARGS | ESC_BRACKETS);
-+ printf("%u: %s\n", p->tgid, cmdbuf);
-+
- if (x_option || X_option || c_option) {
- sprintf(buf, "/proc/%u/smaps", p->tgid);
- if ((fp = fopen(buf, "r")) == NULL)
-@@ -543,10 +547,6 @@ static int one_proc(proc_t * p)
- return 1;
- }
-
-- escape_command(cmdbuf, p, sizeof cmdbuf, &maxcmd,
-- ESC_ARGS | ESC_BRACKETS);
-- printf("%u: %s\n", p->tgid, cmdbuf);
--
- if (X_option || c_option) {
- print_extended_maps(fp);
- return 0;
---
-2.4.0
-
diff --git a/sys-process/procps/files/procps-3.3.10-tests-no-tty.patch
b/sys-process/procps/files/procps-3.3.10-tests-no-tty.patch
deleted file mode 100644
index 7a774e5..
--- a/sys-process/procps/files/procps-3.3.10-tests-no-tty.patch
+++ /dev/null
@
[gentoo-commits] repo/gentoo:master commit in: sys-process/procps/files/, sys-process/procps/
commit: f0325836449ab2b0ae4429fd34de2f9eb533fd23
Author: Lars Wendler gentoo org>
AuthorDate: Fri Dec 9 10:29:32 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Fri Dec 9 10:29:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0325836
sys-process/procps: Fix strtod_nol_err check for x86.
Package-Manager: portage-2.3.3
.../files/procps-3.3.12-strtod_nol_err.patch | 110 +
sys-process/procps/procps-3.3.12.ebuild| 3 +
2 files changed, 113 insertions(+)
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
new file mode 100644
index ..1a298c8
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.12-strtod_nol_err.patch
@@ -0,0 +1,110 @@
+From 4ed44ab58e27a9a09902b9c5b49df484842b6c9a Mon Sep 17 00:00:00 2001
+From: Dr. Werner Fink
+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
+---
+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
++#include
+ #include
+ #include
+
+@@ -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
++#include
+ #include
+ #include
+ #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/procps-3.3.12.ebuild
b/sys-process/procps/procps-3.3.12.ebuild
index e0cf72c..412c5c8 100644
--- a/sys-process/procps/procps-3.3.12.ebuild
+++ b/sys-process/procps/procps-3.3.12.ebuild
@@ -35,6 +35,9 @@ 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
+
+ # Upstream fixes
+ "${FILESDIR}"/${P}-strtod_nol_err.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: sys-process/procps/files/, sys-process/procps/
commit: 0ba9fb240e3b8aac41ba62c0b1f6b8b3a32ed827
Author: Lars Wendler gentoo org>
AuthorDate: Mon Jul 18 07:48:57 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon Jul 18 07:48:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ba9fb24
sys-process/procps: Removed old.
Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler gentoo.org>
sys-process/procps/Manifest| 1 -
.../procps-3.3.9-sysctl-load-config-files.patch| 14 -
sys-process/procps/procps-3.3.9-r2.ebuild | 61 --
3 files changed, 76 deletions(-)
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index 4133c6f..d5cd762 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -2,4 +2,3 @@ DIST procps-3.3.11-remove_Unix98_output_limits.patch 7582
SHA256 0801b971c630d2d
DIST procps-ng-3.3.10.tar.xz 657232 SHA256
1759229cd0d97da3d200d5599c4ea82726d61fae9c4b7d3edd52c544962791b7 SHA512
cbfa49e79a88a8e7066a9c316ef089f15fa825c5bfbc22ab8a83f53c6f367a7c586cef9c403e360d373d824c471533a15ddb11cd30c561650e6879fe687e7e4f
WHIRLPOOL
723dd1c00578a7fa7e3ff47bed60283c30850cc8ae8069c704ba648792809a67c5944dbfd9b7b0159e0be83215b61e6b71b2d76e65b3619aed54223900ffed9b
DIST procps-ng-3.3.11.tar.xz 815920 SHA256
e9493169a2d2adc0bc045538707310c8e877b385e4e296143b62607d2bb044ed SHA512
8ab4770adeba4c7e3cf75bc189278cf7a162ece0f23b862e7f726faccee11bd4524aec622b895f3b4e0b272a739a327a01e91f48834feea513544f0515b250df
WHIRLPOOL
1da50ec4e8be9d76086a1112b00eea0daa39a7e579e846b92c12fea23a8303a7287e2d32d41feae93aad7b138768852b004544731fff882236ee3bd9511154ff
DIST procps-ng-3.3.12.tar.xz 845484 SHA256
6ed65ab86318f37904e8f9014415a098bec5bc53653e5d9ab404f95ca5e1a7d4 SHA512
ea816740ff72cc53d99b5d2e78a511b627ea5b295e0efff67605c56d1ab075abc6b0e2da3df4facbfe903fc9d679e892d351b6884a966d37c6f4bfd9141a924b
WHIRLPOOL
f6ff034c09224fb819cdadc0fc6e456a5e11bffa298a7d005a1089378a6bf19c464bb09d278618daecebcd02228d831efbe4d65a4f9f850f83c9dd030a3ab98b
-DIST procps-ng-3.3.9.tar.xz 560812 SHA256
00f0cb0fadf968ddf605b0ef119846af07386629244d4f3da711a2cecf4e8663 SHA512
62c7270aa48b4346a3198f306d1cb8474f64650bfb67e8cc6c4d41923e50c31c95b3a0367a464823fb50a6137ec0c6352006292ac85b50caf730ec8ec35eb553
WHIRLPOOL
dac97433a87badd40b46e3155bf0e30652ed2961a41bc8fca074357431301d250632215512ad752634c9c4f3273a1c75caba1ecf4f5a3c510bee155660dde166
diff --git
a/sys-process/procps/files/procps-3.3.9-sysctl-load-config-files.patch
b/sys-process/procps/files/procps-3.3.9-sysctl-load-config-files.patch
deleted file mode 100644
index c6b0a4a..000
--- a/sys-process/procps/files/procps-3.3.9-sysctl-load-config-files.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/520314
-http://gitorious.org/procps/procps/commit/7f6efed9bb85d1e212e06985ea3e06720f6ca949
-
sysctl.c
-+++ sysctl.c
-@@ -640,7 +640,7 @@
- }
-
-
-- if (stat(DEFAULT_PRELOAD, &ts) < 0 && S_ISREG(ts.st_mode)) {
-+ if (stat(DEFAULT_PRELOAD, &ts) == 0 && S_ISREG(ts.st_mode)) {
- if (!Quiet)
- printf(_("* Applying %s ...\n"), DEFAULT_PRELOAD);
- rc |= Preload(DEFAULT_PRELOAD);
diff --git a/sys-process/procps/procps-3.3.9-r2.ebuild
b/sys-process/procps/procps-3.3.9-r2.ebuild
deleted file mode 100644
index 4e8e0e6..000
--- a/sys-process/procps/procps-3.3.9-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="standard informational utilities and process-handling tools"
-# http://packages.debian.org/sid/procps
-HOMEPAGE="http://procps.sourceforge.net/ https://gitlab.com/procps-ng/procps";
-# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz"
-FEDORA_HASH="0980646fa25e0be58f7afb6b98f79d74"
-SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc
x86 ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="+ncurses nls selinux static-libs systemd test unicode"
-
-RDEPEND="!=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 )"
-
-S=${WORKDIR}/${PN}-ng-${PV}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch \
- "${FILESDIR}"/${P}-sysctl-load-config-files.patch
- sed -i -e 's:systemd-login:systemd:' configure || die #501306
-}
-
-src_configure() {
- econf \
- --exec-prefix="${EPREFIX}" \
- --docdir='$(datarootdir)'/doc/${PF} \
- $(use_with ncurses) \
-
