From e5206efa6e88d32e3819685adee35c49124ccf0e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 2 Sep 2023 16:16:36 +0100 Subject: gentoo auto-resync : 02:09:2023 - 16:16:36 --- sys-process/procps/Manifest | 6 ++ .../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, 253 insertions(+) create mode 100644 sys-process/procps/files/procps-4.0.4-fix-systemd-linkage.patch create mode 100644 sys-process/procps/files/procps-4.0.4-fix-tests-multilib.patch create mode 100644 sys-process/procps/files/procps-4.0.4-sysctl-manpage.patch create mode 100644 sys-process/procps/files/procps-4.0.4-xfail-pmap-test.patch create mode 100644 sys-process/procps/procps-4.0.4.ebuild (limited to 'sys-process/procps') diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest index 88a156785534..e204dc0cbaa3 100644 --- a/sys-process/procps/Manifest +++ b/sys-process/procps/Manifest @@ -1,6 +1,12 @@ AUX procps-3.3.11-sysctl-manpage.patch 941 BLAKE2B e10b6f85325d1ea23b327dffe4ba35662d5110492d0d5fcffad41edff21ddea4ea8c8bcb66582f63abd100a20d0d406e1c3fb176a8c290ba2cc6ecb02aa98248 SHA512 df8b233bde879fa675742baf8b38d43dd7c306fe52013ace715dff02c126d8c5ea12bd93087da10f5e722294eef59577b264309cbdc6f9f3727fa7111c5db313 AUX procps-3.3.12-proc-tests.patch 1835 BLAKE2B 99fe8d63620f37f98cddc60e8bcbaadbe5e7c54c4b0a65abad6ebe8a89f1b8f7f6bd29114b50678aa89cd0c89d26a95a10aa403d48bcc8371f16eaf34c823390 SHA512 ecc94717366a314ac4bba550b84472555f7b217be2174b68778d3364e16586ab9c21756d2041e2ac9d1449856fcd6aa691d8bd1a8558b4653d068dc1d59c2c71 AUX procps-3.3.17-musl-fix.patch 1907 BLAKE2B 211d5512d9546592b23815bf4085447f6d07c0ac07cb03be01b520a56dc60fdfd07e9c055b0b40196efa2748f54eb5d8070cda80c5001d74fa5f261f53bd234c SHA512 5cf9852e54c307fedbf17b3a331ea992ea2c137120b6f89e4eeb7643091c09872e7e3bdcd2e80b83c46c02b2a0e0d56792afb7fe0564fa4f97e56f304b5792bd +AUX procps-4.0.4-fix-systemd-linkage.patch 773 BLAKE2B 35eb8ad2d892cd23dc07cd5cdc888127bc31188973f44bdd5db14b174777b436fb6c3280c0084b8173e64baaea6f70f87a5645078e1fee22c829063d77739ed1 SHA512 69071bf1148df6e0696072c56a4501e50e93498b4a0092fbbbd0ed818af3d8128e81d35bcf091a827832a0261bfedd0b71d840dfd7028965bea810fbc88ae1a6 +AUX procps-4.0.4-fix-tests-multilib.patch 919 BLAKE2B aefecd115ff9f5ac64b3a9880a402b57fba65900faf80d44076ab4776894f97bbb1a8540d6627eb37134568f329142567b8c21736c7c46a9cf2ff798dc923119 SHA512 b820e9b9755278b3336fdda8df08148083e446fb89df4d91deb6d36f38546622f7cfc0ca20951f0a5ba26a62393ad05341f9d4c101727cc3aec9c8f09c8db975 +AUX procps-4.0.4-sysctl-manpage.patch 1063 BLAKE2B 47d0682ac517801a62c61c0d2486417c56e422e4f60a2bc2b42ab1c969204b820b6b2fd089f6fff04a093e9652d51782e497dd0cd5e82e0815ab8bcead0e719d SHA512 08e1001d9490eedfd54daba46e1eca0743e4e74321e79779dfadceb3f7bd91b06fe063e53559b7623ce08d1aec15dd4cee01180f5920c64844f1529f32a74c3a +AUX procps-4.0.4-xfail-pmap-test.patch 697 BLAKE2B 22f9ebf50f0a89a804eaeaf9515a4de83762fa8467c603d7b6b1646afd8d12c01daf1e000cca23cd2e2053346a0a05a97d17c67df2e85c8915cb59fb6d4c5447 SHA512 874c0ed1625a1c7beceb5cfee1f521f1ccc7f2f5b3e799f241072334430bd00faa2d043b86d42616a09ac3f1033a8f3334d28d5f91cb64a0daefc1a921041088 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 EBUILD procps-3.3.17-r2.ebuild 2587 BLAKE2B a2f0c26b0f1da996566b2798b44789a0e7c9ed6baf7fc248a318036092e180af55da5ff6bb4fd39a907bf3aeeaf66a612350b4f695d4e85355f9e4eaf8a9da91 SHA512 d2f052ab6f3da4cbaa286c63af409c8e6de6aab304249580eb4b243f7b4f2cd6dbb31d6b0ebef2001eabb540d6933d520ec0a6244bbddc036c7e421b417cb317 +EBUILD procps-4.0.4.ebuild 2830 BLAKE2B a8f4341802b89bb26094eca83e7cceab5a2aa35d0f1abbff32f48d1fb89884977930de57f90851c1e6913b8fa6cbe1813b7328937e5f9ed0944562bb68184dd4 SHA512 2a61feedd4da15a153c00464a09f8aac62e45e57be45ba87fd4a45b529845266f3d801b8ef82ca1d5372dfeb947c5984e93f2c081ceb80a921c5e82ebffd11e9 MISC metadata.xml 788 BLAKE2B b8352d682de7ad98344997d344783c444f326153bf5ed479d9e3032dac52b5f938c47ec83ca2d284617f98d0fbde2d9357ee7c205f74d7a2b2c586865a1de756 SHA512 cb6ebcf57a2800ae492fed52ad3de2ba7e767b121ccd6c20f8a0fd6c5fbbc97fb42d20e083ee3d3935fa6fa6e318bccd96d557c9b693507e64b22b8d3c92d1fd 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 000000000000..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 000000000000..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 000000000000..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="example.com" + .br +-/sbin/sysctl \-p/etc/sysctl.conf ++/usr/bin/sysctl \-p/etc/sysctl.conf + .br +-/sbin/sysctl \-a \-\-pattern forward ++/usr/bin/sysctl \-a \-\-pattern forward + .br +-/sbin/sysctl \-a \-\-pattern forward$ ++/usr/bin/sysctl \-a \-\-pattern forward$ + .br +-/sbin/sysctl \-a \-\-pattern 'net.ipv4.conf.(eth|wlan)0.arp' ++/usr/bin/sysctl \-a \-\-pattern 'net.ipv4.conf.(eth|wlan)0.arp' + .br +-/sbin/sysctl \-\-pattern '\[char94]net.ipv6' \-\-system ++/usr/bin/sysctl \-\-pattern '\[char94]net.ipv6' \-\-system + .SH DEPRECATED PARAMETERS + The + .B base_reachable_time diff --git a/sys-process/procps/files/procps-4.0.4-xfail-pmap-test.patch b/sys-process/procps/files/procps-4.0.4-xfail-pmap-test.patch new file mode 100644 index 000000000000..037fe657f4ea --- /dev/null +++ b/sys-process/procps/files/procps-4.0.4-xfail-pmap-test.patch @@ -0,0 +1,25 @@ +--- a/testsuite/pmap.test/pmap.exp ++++ b/testsuite/pmap.test/pmap.exp +@@ -87,13 +87,15 @@ proc expect_twice_total { test } { + } + } + +-set test "pmap X pid pid has same total" +-spawn $pmap -X $mypid $mypid +-expect_twice_total "$test" +- +-set test "pmap XX pid pid has same total" +-spawn $pmap -XX $mypid $mypid +-expect_twice_total "$test" ++# Fails in gentoo sandbox, needs investigation ++#set test "pmap X pid pid has same total" ++#spawn $pmap -X $mypid $mypid ++#expect_twice_total "$test" ++ ++# Fails in gentoo sandbox, needs investigation ++#set test "pmap XX pid pid has same total" ++#spawn $pmap -XX $mypid $mypid ++#expect_twice_total "$test" + + set test "pmap finding shm" + make_testshm_proc diff --git a/sys-process/procps/procps-4.0.4.ebuild b/sys-process/procps/procps-4.0.4.ebuild new file mode 100644 index 000000000000..58e8d0c5adb7 --- /dev/null +++ b/sys-process/procps/procps-4.0.4.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic multilib-minimal usr-ldscript + +DESCRIPTION="Standard informational utilities and process-handling tools" +HOMEPAGE="https://gitlab.com/procps-ng/procps" +# Per e.g. https://gitlab.com/procps-ng/procps/-/releases/v4.0.4, the dist tarballs +# are still hosted on SF. +SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz" +S="${WORKDIR}"/${PN}-ng-${PV} + +# See bug #913210 +LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+" +SLOT="0/0-ng" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 )" + +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}] ) +" +RDEPEND=" + ${DEPEND} + !