* [gentoo-commits] proj/musl:master commit in: sys-process/procps/files/, sys-process/procps/
@ 2016-07-15 5:35 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2016-07-15 5:35 UTC (permalink / raw
To: gentoo-commits
commit: 88b4780c3fcf0a075757da0298412fee079fe78f
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sun Jul 10 19:39:21 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 05:38:05 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=88b4780c
sys-process/procps: in tree version works
Gentoo-Bug: https://bugs.gentoo.org/583978
sys-process/procps/Manifest | 14 -----
.../procps/files/procps-3.3.6-error_at_line.patch | 12 ----
.../procps/files/procps-3.3.8-kill-neg-pid.patch | 46 ----------------
.../procps/files/procps-3.3.8-no-GLOB_TILDE.patch | 12 ----
.../procps/files/procps-3.3.8-no-error_h.patch | 54 ------------------
.../procps/files/procps-3.3.9-configure.patch | 13 -----
.../procps/files/procps-3.3.9-no-error_h.patch | 64 ----------------------
sys-process/procps/metadata.xml | 15 -----
sys-process/procps/procps-3.3.10-r99.ebuild | 63 ---------------------
sys-process/procps/procps-3.3.8-r99.ebuild | 56 -------------------
sys-process/procps/procps-3.3.9-r99.ebuild | 56 -------------------
11 files changed, 405 deletions(-)
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
deleted file mode 100644
index 0e14650..0000000
--- a/sys-process/procps/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX procps-3.3.6-error_at_line.patch 325 SHA256 642eb70e9165f3cf18b7ca3afe370f93991b32bc0271c9e1064c774dd2fadbb3 SHA512 fd0fd437deb7c1ac683ca90f3e94d14b35f3e9d19422e84f59b74d7530f204a04a289e5397d986536adffb2a30611ec5a8486bc9f01a32708d9025d3fb7c98b9 WHIRLPOOL f0f2da5452a8a1817a48a76723f6d02eddb856e8e69bac8ec8d87891a7f94f10c8945dba5c501cdc0d3f52fe690940524d0ae2c32868a3aa48155e54ffd2c3af
-AUX procps-3.3.8-kill-neg-pid.patch 1446 SHA256 847c21f6619c7aa0f2847726a17595f986ec2fe0f361d95e17812639abe32a79 SHA512 3ed4e83d81f7dd574ff68bbcae9ad9f8649a39d46a17de5fd4297f215d8f70cd28e415b1d3c7b5142e7719343af28f4b393061a60eb012caece81dfe5ff6c271 WHIRLPOOL cf452118312e60a0bab7a4ec87bed9a9d2f5fb8bb563769a0430f11c72348e5be79bdfc031f67f4e97e0bf9b32f6ccd1ac590f392c95ee935b77b857ce1b1739
-AUX procps-3.3.8-no-GLOB_TILDE.patch 466 SHA256 17b3e7360d740c97b842e1c68cd863bb66b13b1539b6ead7435d75c1daf5f48a SHA512 9fc13cff6c310080f5af8a2fa83e88d88ff741046c988ae806ce010b37cfd38a770726bc98bb50b9532c5c1679f7da45b12803f55e4e40638daf4dd55c58b84f WHIRLPOOL d791950607fd06a8bfeccf21fd17a454f3c3a207f562bcebdd1c521f0afecdd8a358dec8a4277951eed0f71a7210ba89bae2f9e8887043e39169aab7bd9c6269
-AUX procps-3.3.8-no-error_h.patch 1394 SHA256 2535f3cafc047aff6ddb879dc31479d95b445130471934a48d9aaa25835b91f3 SHA512 0c4dd060f93dca15fc36a0a4640909dd1782dc7af96ada62ec42a0d4f2831ccd1e274c14136d0df679b7066316dc44203267c077a875f6183df131b90c6f2a26 WHIRLPOOL 8232a4c92687ea8334ab933947fee107a1e7d712dbd3dbff4030353e41fd83384772b24a6acaa8335245205d06dedcf3ad28a5f642dd141882a73332d5c36920
-AUX procps-3.3.9-configure.patch 462 SHA256 d5d1274b7a41d2e2c6ccdada90f5107cbbc416b6b977e44da3bde2e299085ab2 SHA512 197c22cd86e601f77a6fa86d6bfcae6019982d4faad50aaf1c002d093f961cb8f664169b8b90f17572511c7fdd2b3afe6cc655793abf8bce4257c603be47ade5 WHIRLPOOL 6ee6d5ad2c24a17722613847fced3e6d962f1a4f4af3f4bc9c87aec269ee43f825effcb5308f496a9c78f8ea61ca8295ff598142ee005abeaee62a9b76ee0da9
-AUX procps-3.3.9-no-error_h.patch 1587 SHA256 0ed0d24f05ff23f83bd8cafa45e07cd015d45b394dadad76f3deea2316211465 SHA512 f05db99409189c3e284d65faa7ca9d267ab8cb111d5958bb722f57919fe45cbb00332d0c1b1f9f666b492ba657e0ea6bf931b9c71d4dfc5b69775fcf18acf480 WHIRLPOOL f41d32288b340e8de389034b60afd6b3b011f565e63b27b98d429fe4be1f73e90a72f35e550706dc5d5f856e4b9b540b6cfcbc4ec504ae3aea9ff374d86027d8
-DIST procps-3.3.8-respect_epipe_in_fileutils.patch 1412 SHA256 4a56c88697fa6099a62a4169838c9c04df2c2c2bbc08e9ad9953e5b00df16d68 SHA512 317fc8e7c3fbd280182f55b399a30b2cfbc72268590825ea323537361cd761776afe1486509cb04ae937287ccf11578def5aac2eaa0fe660d04f0357282d9c14 WHIRLPOOL f8fdac8a172037edf51e1e777374293848afaa2180adc35adce5bf8ebefceb37df30082b27f6d6f1f5a571ba0f84bdfff9fc6c2343f120ce5c80b2f52e1804ac
-DIST procps-ng-3.3.10.tar.xz 657232 SHA256 1759229cd0d97da3d200d5599c4ea82726d61fae9c4b7d3edd52c544962791b7 SHA512 cbfa49e79a88a8e7066a9c316ef089f15fa825c5bfbc22ab8a83f53c6f367a7c586cef9c403e360d373d824c471533a15ddb11cd30c561650e6879fe687e7e4f WHIRLPOOL 723dd1c00578a7fa7e3ff47bed60283c30850cc8ae8069c704ba648792809a67c5944dbfd9b7b0159e0be83215b61e6b71b2d76e65b3619aed54223900ffed9b
-DIST procps-ng-3.3.8.tar.xz 553056 SHA256 a4109cfb6fe3bcfb5a0efb37efe04d0c8ce858bff3820d48cc258bad41bed46b SHA512 63ba13f9ef0f4558748c6b2d1b0719a1173bd87e38279e3b052a10e207e1b808626d031f16dd65b05c55708366df7350cb0a64da8dc20e7f9f1fdc1cd2417c71 WHIRLPOOL 671860af1f028c9c8c7bb0c035db86e3e13d9d754801e7a3f19105710bb9720bbfa627e4e748b823192286319fe4e7e736c1af5a3fb34116cbe93386b0d2bed6
-DIST procps-ng-3.3.9.tar.xz 560812 SHA256 00f0cb0fadf968ddf605b0ef119846af07386629244d4f3da711a2cecf4e8663 SHA512 62c7270aa48b4346a3198f306d1cb8474f64650bfb67e8cc6c4d41923e50c31c95b3a0367a464823fb50a6137ec0c6352006292ac85b50caf730ec8ec35eb553 WHIRLPOOL dac97433a87badd40b46e3155bf0e30652ed2961a41bc8fca074357431301d250632215512ad752634c9c4f3273a1c75caba1ecf4f5a3c510bee155660dde166
-EBUILD procps-3.3.10-r99.ebuild 1793 SHA256 d1b4167a22d1ad0a5ca4f143760454e2fb3edfd22754ad0c7dc33e19fea5d309 SHA512 efbf7891204d4842cbe9a4e9e2b2c9d380a8eb25f325be9e3995f3b9c4515d307bed2240b5fb9dd1b19ed532f9b4778f4160e593c671d9bc1a69e524787a60ed WHIRLPOOL 6eacf550758d0f72705fbea9ab133808d74c2082b125cfcef2c70f24dc7a92b4ffec58810bc34645ab178b0a62dd5c014b8a985c4effe3b86d9bac7645c02fe4
-EBUILD procps-3.3.8-r99.ebuild 1708 SHA256 2d56b5c335a6ccc9a81e001e4aedaa126c234d7be1c5f1acb43faaa98f719149 SHA512 e7af787334c663b2f1de33e5fe51baa5ef972b088b77b78028b3ee13d1129bd2caf0c6c6107f5af93f5f78f55280462e4a6ebdc1bc1980eef904ea1b2c18aac8 WHIRLPOOL 2a4c2fcb4027d9feb5e947800d3be0bd049a045cc382ff1e2d418f215a7ac77ae4bf7990cd6ef348b142f565a1f1ef7bc2b5f22cf7ba500cd25ec1ab6b930986
-EBUILD procps-3.3.9-r99.ebuild 1589 SHA256 189ea98c0f0f7db46f6aa34c914783326ac13a6f67bf0282a65da342b0686016 SHA512 8f6763c6d7ca68389da4b22b7fac85c79051312b1facbca744221b7d34985177af7e42f05936da7e09bb5a2802b2048a24ec3ad936157b8c439a45387dd21441 WHIRLPOOL efd7173ed2400acd54eee3f4c0a5aa125c8a229f42c5d02ca7c63ae8d6dfc5cced46cf15c24821ba13dacaaaea4ae84ce2b236b25323211d08bd5da78c4a1a62
-MISC metadata.xml 521 SHA256 2ee3b62f25fdcfc88808ec134b7c8f1f8c3c584f4e2481ae0d3ac5040f180476 SHA512 399650761c1ac469e4588555b69dddb3ce8022922151ca657cf9b4e73f10461a79fcbb80a2781ed71409ffe6ca03e5979342cb93b6740d2cda4e0e0fda22f330 WHIRLPOOL de20c01b8270c61e06592afc4e69a08d23e1e19b273d8c6c96e7b6856c2aafd208e223e4575191152550a622bc353bdb282641506190879682cc8f8da21916ea
diff --git a/sys-process/procps/files/procps-3.3.6-error_at_line.patch b/sys-process/procps/files/procps-3.3.6-error_at_line.patch
deleted file mode 100644
index 4329a49..0000000
--- a/sys-process/procps/files/procps-3.3.6-error_at_line.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-ps/display.c:65:7: warning: implicit declaration of function ‘error_at_line’ [-Wimplicit-function-declaration]
-
---- ps/display.c
-+++ ps/display.c
-@@ -25,6 +25,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <error.h> /* error_at_line */
-
- #include <sys/sysmacros.h>
- #include <sys/types.h>
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 0039748..0000000
--- 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/files/procps-3.3.8-no-GLOB_TILDE.patch b/sys-process/procps/files/procps-3.3.8-no-GLOB_TILDE.patch
deleted file mode 100644
index 09af420..0000000
--- a/sys-process/procps/files/procps-3.3.8-no-GLOB_TILDE.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar procps-ng-3.3.8.orig/sysctl.c procps-ng-3.3.8/sysctl.c
---- procps-ng-3.3.8.orig/sysctl.c 2013-05-25 21:39:41.000000000 +0000
-+++ procps-ng-3.3.8/sysctl.c 2014-01-17 16:28:37.241303653 +0000
-@@ -500,7 +500,7 @@
- int globerr;
- int j;
-
-- globerr = glob(filename, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf);
-+ globerr = glob(filename, GLOB_NOCHECK, NULL, &globbuf);
- if (globerr != 0 && globerr != GLOB_NOMATCH)
- xerr(EXIT_FAILURE, _("glob failed"));
-
diff --git a/sys-process/procps/files/procps-3.3.8-no-error_h.patch b/sys-process/procps/files/procps-3.3.8-no-error_h.patch
deleted file mode 100644
index e6ca793..0000000
--- a/sys-process/procps/files/procps-3.3.8-no-error_h.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naur procps-ng-3.3.8.orig/ps/display.c procps-ng-3.3.8/ps/display.c
---- procps-ng-3.3.8.orig/ps/display.c 2013-05-25 21:39:40.000000000 +0000
-+++ procps-ng-3.3.8/ps/display.c 2014-01-17 14:43:26.027950754 +0000
-@@ -25,7 +25,12 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+
-+#if HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#endif
-
- #include <sys/sysmacros.h>
- #include <sys/types.h>
-@@ -63,7 +68,11 @@
- case SIGUSR2:
- exit(EXIT_FAILURE);
- default:
-+#if HAVE_ERROR_H
- error_at_line(0, 0, __FILE__, __LINE__, "%s", _("please report this bug"));
-+#else
-+ err(1, "%s:%d: %s", __FILE__, __LINE__, _("please report this bug"));
-+#endif
- signal(signo, SIG_DFL); /* allow core file creation */
- kill(getpid(), signo);
- }
---- procps-ng-3.3.8.orig/ps/global.c 2013-05-25 21:39:40.000000000 +0000
-+++ procps-ng-3.3.8/ps/global.c 2014-01-17 14:42:00.972945998 +0000
-@@ -25,7 +27,12 @@
- #include <string.h>
- #include <termios.h>
- #include <unistd.h>
-+
-+#if HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#endif
-
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-@@ -522,6 +529,10 @@
- unsigned int linenum,
- const char *message)
- {
-+#if HAVE_ERROR_H
- error_at_line(0, 0, filename, linenum, "%s", message);
-+#else
-+ err(1, "%s:%d: %s", filename, linenum, message);
-+#endif
- exit(EXIT_FAILURE);
- }
diff --git a/sys-process/procps/files/procps-3.3.9-configure.patch b/sys-process/procps/files/procps-3.3.9-configure.patch
deleted file mode 100644
index 4822f62..0000000
--- a/sys-process/procps/files/procps-3.3.9-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/procps-ng-3.3.9/configure.ac
-+++ b/procps-ng-3.3.9/configure.ac
-@@ -235,7 +235,9 @@
- else
- AC_SEARCH_LIBS([dlopen], [dl], [],
- [AC_MSG_ERROR([dynamic linking unavailable, circumvent with --disable-numa])])
-- DL_LIB="$ac_cv_search_dlopen"
-+ if test "$ac_cv_search_dlopen" != "none required" ; then
-+ DL_LIB="$ac_cv_search_dlopen"
-+ fi
- fi
- AC_SUBST([DL_LIB])
-
diff --git a/sys-process/procps/files/procps-3.3.9-no-error_h.patch b/sys-process/procps/files/procps-3.3.9-no-error_h.patch
deleted file mode 100644
index 070e1fe..0000000
--- a/sys-process/procps/files/procps-3.3.9-no-error_h.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -aur a/procps-ng-3.3.9/lib/nsutils.c b/procps-ng-3.3.9/lib/nsutils.c
---- a/procps-ng-3.3.9/lib/nsutils.c
-+++ b/procps-ng-3.3.9/lib/nsutils.c
-@@ -1,5 +1,4 @@
- #include <errno.h>
--#include <error.h>
- #include <stdio_ext.h>
- #include <stdlib.h>
- #include <sys/types.h>
-diff -aur a/procps-ng-3.3.9/ps/display.c b/procps-ng-3.3.9/ps/display.c
---- a/procps-ng-3.3.9/ps/display.c
-+++ b/procps-ng-3.3.9/ps/display.c
-@@ -25,7 +25,12 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+
-+#if HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#endif
-
- #include <sys/sysmacros.h>
- #include <sys/types.h>
-@@ -63,7 +68,11 @@
- case SIGUSR2:
- exit(EXIT_FAILURE);
- default:
-+#if HAVE_ERROR_H
- error_at_line(0, 0, __FILE__, __LINE__, "%s", _("please report this bug"));
-+#else
-+ err(1, "%s:%d: %s", __FILE__, __LINE__, _("please report this bug"));
-+#endif
- signal(signo, SIG_DFL); /* allow core file creation */
- kill(getpid(), signo);
- }
-diff -aur a/procps-ng-3.3.9/ps/global.c b/procps-ng-3.3.9/ps/global.c
---- a/procps-ng-3.3.9/ps/global.c
-+++ b/procps-ng-3.3.9/ps/global.c
-@@ -25,7 +25,12 @@
- #include <string.h>
- #include <termios.h>
- #include <unistd.h>
-+
-+#if HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#endif
-
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-@@ -522,6 +527,10 @@
- unsigned int linenum,
- const char *message)
- {
-+#if HAVE_ERROR_H
- error_at_line(0, 0, filename, linenum, "%s", message);
-+#else
-+ err(1, "%s:%d: %s", filename, linenum, message);
-+#endif
- exit(EXIT_FAILURE);
- }
diff --git a/sys-process/procps/metadata.xml b/sys-process/procps/metadata.xml
deleted file mode 100644
index d98c01d..0000000
--- a/sys-process/procps/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-<use>
- <flag name="modern-top">Enables new startup defaults of top. Keeps old defaults if disabled</flag>
- <flag name="ncurses">Build programs that use ncurses: top, slabtop, watch</flag>
-</use>
-<upstream>
- <remote-id type="sourceforge">procps</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/sys-process/procps/procps-3.3.10-r99.ebuild b/sys-process/procps/procps-3.3.10-r99.ebuild
deleted file mode 100644
index 9d68a02..0000000
--- a/sys-process/procps/procps-3.3.10-r99.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 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/ http://gitorious.org/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"
-SRC_URI="http://dev.gentoo.org/~polynomial-c/${PN}-ng-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips x86"
-IUSE="+ncurses modern-top nls selinux static-libs systemd test"
-
-RDEPEND="!<sys-apps/sysvinit-2.88-r6
- ncurses? ( >=sys-libs/ncurses-5.7-r7 )
- 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
- sed -i -e 's:systemd-login:systemd:' configure || die #501306
-}
-
-src_configure() {
- use elibc_musl && append-cppflags -D_XOPEN_SOURCE_EXTENDED
- econf \
- --exec-prefix="${EPREFIX}" \
- --docdir='$(datarootdir)'/doc/${PF} \
- --disable-watch8bit \
- $(use_enable modern-top) \
- $(use_with ncurses) \
- $(use_enable nls) \
- $(use_enable selinux libselinux) \
- $(use_enable static-libs static) \
- $(use_with systemd)
-}
-
-src_install() {
- default
- #dodoc sysctl.conf
-
- mv "${ED}"/usr/bin/pidof "${ED}"/bin/ || die
-
- # The configure script is completely whacked in the head
- mv "${ED}"/lib* "${ED}"/usr/ || die
- gen_usr_ldscript -a procps
- prune_libtool_files
-}
diff --git a/sys-process/procps/procps-3.3.8-r99.ebuild b/sys-process/procps/procps-3.3.8-r99.ebuild
deleted file mode 100644
index 3a40d96..0000000
--- a/sys-process/procps/procps-3.3.8-r99.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="standard informational utilities and process-handling tools"
-# http://packages.debian.org/sid/procps
-HOMEPAGE="http://procps.sourceforge.net/ http://gitorious.org/procps"
-# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz"
-FEDORA_HASH="aecbeeda2ab308f8d09dddcb4cb9a572"
-SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz
- https://gitorious.org/${PN}/${PN}/commit/ce5e995921e770bfcda25e42fe090aeccdbf1291.patch -> ${P}-respect_epipe_in_fileutils.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="+ncurses nls static-libs unicode"
-
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.7-r7[unicode?] )"
-DEPEND="${RDEPEND}
- ncurses? ( virtual/pkgconfig )
- test? ( dev-util/dejagnu )"
-
-S=${WORKDIR}/${PN}-ng-${PV}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-kill-neg-pid.patch \
- "${DISTDIR}"/${P}-respect_epipe_in_fileutils.patch \
- "${FILESDIR}"/${P}-no-error_h.patch \
- "${FILESDIR}"/${P}-no-GLOB_TILDE.patch
-}
-
-src_configure() {
- use elibc_musl && export ac_cv_search_dlopen=
- use elibc_musl && append-cflags -D_XOPEN_SOURCE_EXTENDED
- econf \
- --exec-prefix="${EPREFIX}" \
- --docdir='$(datarootdir)'/doc/${PF} \
- $(use_with ncurses) \
- $(use_enable nls) \
- $(use_enable static-libs static) \
- $(use_enable unicode watch8bit)
-}
-
-src_install() {
- default
-# dodoc sysctl.conf
-
- # The configure script is completely whacked in the head
- mv "${ED}"/lib* "${ED}"/usr/ || die
- gen_usr_ldscript -a procps
- prune_libtool_files
-}
diff --git a/sys-process/procps/procps-3.3.9-r99.ebuild b/sys-process/procps/procps-3.3.9-r99.ebuild
deleted file mode 100644
index ec161f5..0000000
--- a/sys-process/procps/procps-3.3.9-r99.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="standard informational utilities and process-handling tools"
-# http://packages.debian.org/sid/procps
-HOMEPAGE="http://procps.sourceforge.net/ http://gitorious.org/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="amd64 arm ~mips ppc x86"
-IUSE="+ncurses nls static-libs test unicode"
-
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.7-r7[unicode?] )
- !<sys-apps/sysvinit-2.88-r6"
-DEPEND="${RDEPEND}
- ncurses? ( virtual/pkgconfig )
- test? ( dev-util/dejagnu )"
-
-S=${WORKDIR}/${PN}-ng-${PV}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch
- epatch "${FILESDIR}"/${PN}-3.3.8-no-GLOB_TILDE.patch
- epatch "${FILESDIR}"/${P}-no-error_h.patch
- epatch "${FILESDIR}"/${P}-configure.patch
- autoreconf
-}
-
-src_configure() {
- use elibc_musl && append-cppflags -D_XOPEN_SOURCE_EXTENDED
- econf \
- --exec-prefix="${EPREFIX}" \
- --docdir='$(datarootdir)'/doc/${PF} \
- $(use_with ncurses) \
- $(use_enable nls) \
- $(use_enable static-libs static) \
- $(use_enable unicode watch8bit)
-}
-
-src_install() {
- default
-# dodoc sysctl.conf
-
- # The configure script is completely whacked in the head
- mv "${ED}"/lib* "${ED}"/usr/ || die
- gen_usr_ldscript -a procps
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-process/procps/files/, sys-process/procps/
@ 2018-04-09 15:38 Jory Pratt
0 siblings, 0 replies; 4+ messages in thread
From: Jory Pratt @ 2018-04-09 15:38 UTC (permalink / raw
To: gentoo-commits
commit: a66f4c45b4a569ef492385fb6952e10948fb58a3
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 9 15:36:34 2018 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Apr 9 15:36:34 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a66f4c45
sys-process/procps - remove unused macro and glibc header, thanks parazyd
sys-process/procps/Manifest | 1 +
.../files/procps-3.3.11-sysctl-manpage.patch | 32 +++++++++
.../procps/files/procps-3.3.12-proc-tests.patch | 47 ++++++++++++
.../files/procps-3.3.13-remove_libio_h.patch | 25 +++++++
.../procps-3.3.13-remove_unneeded_macros.patch | 38 ++++++++++
.../procps/files/procps-3.3.8-kill-neg-pid.patch | 46 ++++++++++++
sys-process/procps/metadata.xml | 17 +++++
sys-process/procps/procps-3.3.13.ebuild | 83 ++++++++++++++++++++++
8 files changed, 289 insertions(+)
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
new file mode 100644
index 0000000..66b6b52
--- /dev/null
+++ b/sys-process/procps/Manifest
@@ -0,0 +1 @@
+DIST procps-ng-3.3.13.tar.xz 901156 BLAKE2B ee172016800d3570855873e38fc6ce1b05bb4f43e960097adf6ae806ca8140636d14b0fa8185b19b5580476f5943370d2f128f56ef7274bc66b30c80e0fe9c8b SHA512 9419a54b9875d4e33dd63face5c85cdbef1b8376416d469609128c9370c337a32b9b951c865e53c2ae6cfc8ce8eb7657f724a997cd3206d7af97ddf8a978e008
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/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 0000000..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/files/procps-3.3.13-remove_libio_h.patch b/sys-process/procps/files/procps-3.3.13-remove_libio_h.patch
new file mode 100644
index 0000000..720f30a
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.13-remove_libio_h.patch
@@ -0,0 +1,25 @@
+From 66d5f81b58c072ec43b7ed60864142076c9f146f Mon Sep 17 00:00:00 2001
+From: parazyd <parazyd@dyne.org>
+Date: Mon, 9 Apr 2018 17:13:21 +0200
+Subject: [PATCH 1/2] procio: Remove libio.h include.
+
+This is not needed and restores musl-libc compatibility.
+---
+ procio.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/procio.c b/procio.c
+index 479243e..ad9b4de 100644
+--- a/procio.c
++++ b/procio.c
+@@ -24,7 +24,6 @@
+ #endif
+ #include <errno.h>
+ #include <fcntl.h>
+-#include <libio.h>
+ #include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+--
+2.17.0
+
diff --git a/sys-process/procps/files/procps-3.3.13-remove_unneeded_macros.patch b/sys-process/procps/files/procps-3.3.13-remove_unneeded_macros.patch
new file mode 100644
index 0000000..8471fa3
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.13-remove_unneeded_macros.patch
@@ -0,0 +1,38 @@
+From d8a2fd4dc00c88d739add2dc653a0e7cee8f9d2e Mon Sep 17 00:00:00 2001
+From: parazyd <parazyd@dyne.org>
+Date: Mon, 9 Apr 2018 17:14:27 +0200
+Subject: [PATCH 2/2] proc/numa: Remove unneeded macros.
+
+These macros break compatibility with musl-libc, and are not needed.
+---
+ proc/numa.h | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/proc/numa.h b/proc/numa.h
+index c198d9d..1b2b4eb 100644
+--- a/proc/numa.h
++++ b/proc/numa.h
+@@ -22,7 +22,9 @@
+
+ #include <features.h>
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+ void numa_init (void);
+ void numa_uninit (void);
+@@ -30,6 +32,8 @@ void numa_uninit (void);
+ extern int (*numa_max_node) (void);
+ extern int (*numa_node_of_cpu) (int);
+
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif
+--
+2.17.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
new file mode 100644
index 0000000..0039748
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch
@@ -0,0 +1,46 @@
+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/metadata.xml b/sys-process/procps/metadata.xml
new file mode 100644
index 0000000..263e639
--- /dev/null
+++ b/sys-process/procps/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
+<use>
+ <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag>
+ <flag name="kill">Build the kill program</flag>
+ <flag name="modern-top">Enables new startup defaults of top. Keeps old defaults if disabled</flag>
+ <flag name="ncurses">Build programs that use ncurses: top, slabtop, watch</flag>
+</use>
+<upstream>
+ <remote-id type="sourceforge">procps</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/sys-process/procps/procps-3.3.13.ebuild b/sys-process/procps/procps-3.3.13.ebuild
new file mode 100644
index 0000000..bc1799b
--- /dev/null
+++ b/sys-process/procps/procps-3.3.13.ebuild
@@ -0,0 +1,83 @@
+# 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
+ "${FILESDIR}"/${PN}-3.3.13-remove_libio_h.patch
+ "${FILESDIR}"/${PN}-3.3.13-remove_unneeded_macros.patch
+
+ # 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] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-process/procps/files/, sys-process/procps/
@ 2018-04-12 16:23 Aric Belsito
0 siblings, 0 replies; 4+ messages in thread
From: Aric Belsito @ 2018-04-12 16:23 UTC (permalink / raw
To: gentoo-commits
commit: 1dffd0b6f700409d16b6cb7b01293d8ef50a2aa4
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Apr 12 16:22:26 2018 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Apr 12 16:22:42 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=1dffd0b6
sys-process/procps: remove 3.3.13
3.3.14, in ::gentoo, works.
sys-process/procps/Manifest | 1 -
.../files/procps-3.3.11-sysctl-manpage.patch | 32 ---------
.../procps/files/procps-3.3.12-proc-tests.patch | 47 ------------
.../files/procps-3.3.13-remove_libio_h.patch | 25 -------
.../procps-3.3.13-remove_unneeded_macros.patch | 38 ----------
.../procps/files/procps-3.3.8-kill-neg-pid.patch | 46 ------------
sys-process/procps/metadata.xml | 17 -----
sys-process/procps/procps-3.3.13.ebuild | 83 ----------------------
8 files changed, 289 deletions(-)
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
deleted file mode 100644
index 66b6b52..0000000
--- a/sys-process/procps/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST procps-ng-3.3.13.tar.xz 901156 BLAKE2B ee172016800d3570855873e38fc6ce1b05bb4f43e960097adf6ae806ca8140636d14b0fa8185b19b5580476f5943370d2f128f56ef7274bc66b30c80e0fe9c8b SHA512 9419a54b9875d4e33dd63face5c85cdbef1b8376416d469609128c9370c337a32b9b951c865e53c2ae6cfc8ce8eb7657f724a997cd3206d7af97ddf8a978e008
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
deleted file mode 100644
index 3523aad..0000000
--- a/sys-process/procps/files/procps-3.3.11-sysctl-manpage.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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/files/procps-3.3.12-proc-tests.patch b/sys-process/procps/files/procps-3.3.12-proc-tests.patch
deleted file mode 100644
index 9549252..0000000
--- a/sys-process/procps/files/procps-3.3.12-proc-tests.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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/files/procps-3.3.13-remove_libio_h.patch b/sys-process/procps/files/procps-3.3.13-remove_libio_h.patch
deleted file mode 100644
index 720f30a..0000000
--- a/sys-process/procps/files/procps-3.3.13-remove_libio_h.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 66d5f81b58c072ec43b7ed60864142076c9f146f Mon Sep 17 00:00:00 2001
-From: parazyd <parazyd@dyne.org>
-Date: Mon, 9 Apr 2018 17:13:21 +0200
-Subject: [PATCH 1/2] procio: Remove libio.h include.
-
-This is not needed and restores musl-libc compatibility.
----
- procio.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/procio.c b/procio.c
-index 479243e..ad9b4de 100644
---- a/procio.c
-+++ b/procio.c
-@@ -24,7 +24,6 @@
- #endif
- #include <errno.h>
- #include <fcntl.h>
--#include <libio.h>
- #include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
---
-2.17.0
-
diff --git a/sys-process/procps/files/procps-3.3.13-remove_unneeded_macros.patch b/sys-process/procps/files/procps-3.3.13-remove_unneeded_macros.patch
deleted file mode 100644
index 8471fa3..0000000
--- a/sys-process/procps/files/procps-3.3.13-remove_unneeded_macros.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d8a2fd4dc00c88d739add2dc653a0e7cee8f9d2e Mon Sep 17 00:00:00 2001
-From: parazyd <parazyd@dyne.org>
-Date: Mon, 9 Apr 2018 17:14:27 +0200
-Subject: [PATCH 2/2] proc/numa: Remove unneeded macros.
-
-These macros break compatibility with musl-libc, and are not needed.
----
- proc/numa.h | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/proc/numa.h b/proc/numa.h
-index c198d9d..1b2b4eb 100644
---- a/proc/numa.h
-+++ b/proc/numa.h
-@@ -22,7 +22,9 @@
-
- #include <features.h>
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- void numa_init (void);
- void numa_uninit (void);
-@@ -30,6 +32,8 @@ void numa_uninit (void);
- extern int (*numa_max_node) (void);
- extern int (*numa_node_of_cpu) (int);
-
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif
---
-2.17.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 0039748..0000000
--- 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/metadata.xml b/sys-process/procps/metadata.xml
deleted file mode 100644
index 263e639..0000000
--- a/sys-process/procps/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-<use>
- <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag>
- <flag name="kill">Build the kill program</flag>
- <flag name="modern-top">Enables new startup defaults of top. Keeps old defaults if disabled</flag>
- <flag name="ncurses">Build programs that use ncurses: top, slabtop, watch</flag>
-</use>
-<upstream>
- <remote-id type="sourceforge">procps</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/sys-process/procps/procps-3.3.13.ebuild b/sys-process/procps/procps-3.3.13.ebuild
deleted file mode 100644
index bc1799b..0000000
--- a/sys-process/procps/procps-3.3.13.ebuild
+++ /dev/null
@@ -1,83 +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
- "${FILESDIR}"/${PN}-3.3.13-remove_libio_h.patch
- "${FILESDIR}"/${PN}-3.3.13-remove_unneeded_macros.patch
-
- # 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] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-process/procps/files/, sys-process/procps/
@ 2021-03-29 17:41 Jory Pratt
0 siblings, 0 replies; 4+ messages in thread
From: Jory Pratt @ 2021-03-29 17:41 UTC (permalink / raw
To: gentoo-commits
commit: 6c860eccb31ff23e590be1319e1e2f22f6361983
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 29 17:41:13 2021 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 29 17:41:13 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=6c860ecc
sys-process/procps: Workaround busted musl build
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
sys-process/procps/Manifest | 1 +
.../files/procps-3.3.11-sysctl-manpage.patch | 32 ++++++++
.../procps/files/procps-3.3.12-proc-tests.patch | 47 ++++++++++++
.../procps/files/procps-3.3.17-musl-fix.patch | 72 ++++++++++++++++++
sys-process/procps/metadata.xml | 18 +++++
sys-process/procps/procps-3.3.17.ebuild | 85 ++++++++++++++++++++++
6 files changed, 255 insertions(+)
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
new file mode 100644
index 0000000..f9a2cf0
--- /dev/null
+++ b/sys-process/procps/Manifest
@@ -0,0 +1 @@
+DIST procps-ng-3.3.17.tar.xz 1008428 BLAKE2B 43aa1a21d4f0725b1c02457f343cf1fc66bc1771b25c6eaf689c9775c190e90545bfac1729f027abc4d3d13de37ffac4828554b5b25e12bcf6af9540de1695f3 SHA512 59e9a5013430fd9da508c4655d58375dc32e025bb502bb28fb9a92a48e4f2838b3355e92b4648f7384b2050064d17079bf4595d889822ebb5030006bc154a1a7
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/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 0000000..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/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 0000000..ec3d1f8
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.17-musl-fix.patch
@@ -0,0 +1,72 @@
+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/metadata.xml b/sys-process/procps/metadata.xml
new file mode 100644
index 0000000..c0aa0de
--- /dev/null
+++ b/sys-process/procps/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
+<use>
+ <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag>
+ <flag name="kill">Build the kill program</flag>
+ <flag name="modern-top">Enables new startup defaults of top. Keeps old defaults if disabled</flag>
+ <flag name="ncurses">Build programs that use ncurses: top, slabtop, watch</flag>
+</use>
+<upstream>
+ <remote-id type="sourceforge">procps</remote-id>
+ <remote-id type="cpe">cpe:/a:procps_project:procps</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/sys-process/procps/procps-3.3.17.ebuild b/sys-process/procps/procps-3.3.17.ebuild
new file mode 100644
index 0000000..eb286fa
--- /dev/null
+++ b/sys-process/procps/procps-3.3.17.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs 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 )"
+
+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}] )
+"
+BDEPEND="
+ elogind? ( virtual/pkgconfig )
+ ncurses? ( virtual/pkgconfig )
+ systemd? ( virtual/pkgconfig )
+ test? ( dev-util/dejagnu )
+"
+RDEPEND="${DEPEND}
+ kill? (
+ !sys-apps/coreutils[kill]
+ !sys-apps/util-linux[kill]
+ )
+ !<app-i18n/man-pages-l10n-4.2.0-r1
+ !<app-i18n/man-pages-de-2.12-r1
+ !<app-i18n/man-pages-pl-0.7-r1
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304
+ "${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036
+ "${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
+ 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 "${S}"/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() {
+ einstalldocs
+ find "${ED}" -type f -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-29 17:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-12 16:23 [gentoo-commits] proj/musl:master commit in: sys-process/procps/files/, sys-process/procps/ Aric Belsito
-- strict thread matches above, loose matches on Subject: below --
2021-03-29 17:41 Jory Pratt
2018-04-09 15:38 Jory Pratt
2016-07-15 5:35 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox