public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/hardened-dev:musl commit in: sys-process/procps/, sys-process/procps/files/
@ 2014-01-18 14:32 Anthony G. Basile
  0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2014-01-18 14:32 UTC (permalink / raw
  To: gentoo-commits

commit:     86ef401a1d083a640d512c2febfb1abbbbd17dd6
Author:     layman <layman <AT> localhost>
AuthorDate: Fri Jan 17 17:27:15 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 14:31:54 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=86ef401a

sys-process/procps: error.h, GLOB_TILDE, -D_XOPEN_SOURCE_EXTENDED

Package-Manager: portage-2.2.7
RepoMan-Options: --force

---
 .../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 +++++++++++++++++++++
 sys-process/procps/metadata.xml                    |  8 ++++
 sys-process/procps/procps-3.3.8-r99.ebuild         | 56 ++++++++++++++++++++++
 6 files changed, 188 insertions(+)

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
new file mode 100644
index 0000000..4329a49
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.6-error_at_line.patch
@@ -0,0 +1,12 @@
+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
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/files/procps-3.3.8-no-GLOB_TILDE.patch b/sys-process/procps/files/procps-3.3.8-no-GLOB_TILDE.patch
new file mode 100644
index 0000000..09af4208
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.8-no-GLOB_TILDE.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..e6ca793
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.8-no-error_h.patch
@@ -0,0 +1,54 @@
+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/metadata.xml b/sys-process/procps/metadata.xml
new file mode 100644
index 0000000..16e9fa3
--- /dev/null
+++ b/sys-process/procps/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+<use>
+ <flag name='ncurses'>Build programs that use ncurses: top, slabtop, watch</flag>
+</use>
+</pkgmetadata>

diff --git a/sys-process/procps/procps-3.3.8-r99.ebuild b/sys-process/procps/procps-3.3.8-r99.ebuild
new file mode 100644
index 0000000..5d69c20
--- /dev/null
+++ b/sys-process/procps/procps-3.3.8-r99.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.3.8-r1.ebuild,v 1.10 2013/12/26 14:41:10 maekke Exp $
+
+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="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
+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
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/hardened-dev:musl commit in: sys-process/procps/, sys-process/procps/files/
@ 2014-05-18 16:07 Anthony G. Basile
  0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2014-05-18 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     fa980b7e7ba0dde1d1c21c4b3793a7651060a141
Author:     Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sat May 17 06:41:22 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun May 18 16:08:57 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=fa980b7e

sys-process/procps: bump to 3.3.9

Remove an unecessary #include of error.h

---
 .../procps/files/procps-3.3.9-no-error_h.patch     | 64 ++++++++++++++++++++++
 sys-process/procps/procps-3.3.9-r99.ebuild         | 55 +++++++++++++++++++
 2 files changed, 119 insertions(+)

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
new file mode 100644
index 0000000..070e1fe
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.9-no-error_h.patch
@@ -0,0 +1,64 @@
+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/procps-3.3.9-r99.ebuild b/sys-process/procps/procps-3.3.9-r99.ebuild
new file mode 100644
index 0000000..14dca88
--- /dev/null
+++ b/sys-process/procps/procps-3.3.9-r99.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.3.9.ebuild,v 1.6 2014/05/14 18:16:01 ssuominen Exp $
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips 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}"/${P}-no-error_h.patch
+	epatch "${FILESDIR}"/${PN}-3.3.8-no-GLOB_TILDE.patch
+}
+
+src_configure() {
+	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
+
+	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
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/hardened-dev:musl commit in: sys-process/procps/, sys-process/procps/files/
@ 2014-05-19 23:36 Anthony G. Basile
  0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2014-05-19 23:36 UTC (permalink / raw
  To: gentoo-commits

commit:     7ea10d48900febf20a2298445202b92b9bd8b2a6
Author:     Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Mon May 19 19:29:01 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon May 19 23:38:21 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=7ea10d48

sys-process/procps: Fix up when built with USE=ncurses

---
 sys-process/procps/files/procps-3.3.9-configure.patch | 13 +++++++++++++
 sys-process/procps/procps-3.3.9-r99.ebuild            |  9 +++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/sys-process/procps/files/procps-3.3.9-configure.patch b/sys-process/procps/files/procps-3.3.9-configure.patch
new file mode 100644
index 0000000..4822f62
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.9-configure.patch
@@ -0,0 +1,13 @@
+--- 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/procps-3.3.9-r99.ebuild b/sys-process/procps/procps-3.3.9-r99.ebuild
index 14dca88..7ef23a8 100644
--- a/sys-process/procps/procps-3.3.9-r99.ebuild
+++ b/sys-process/procps/procps-3.3.9-r99.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="standard informational utilities and process-handling tools"
 # http://packages.debian.org/sid/procps
@@ -28,11 +28,14 @@ S=${WORKDIR}/${PN}-ng-${PV}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch
-	epatch "${FILESDIR}"/${P}-no-error_h.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} \
@@ -46,8 +49,6 @@ 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


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/hardened-dev:musl commit in: sys-process/procps/, sys-process/procps/files/
@ 2014-05-19 23:46 Anthony G. Basile
  0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2014-05-19 23:46 UTC (permalink / raw
  To: gentoo-commits

commit:     295cf3d196647f09efa1c9684f48e104b84514e1
Author:     Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Mon May 19 19:29:01 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon May 19 23:48:23 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=295cf3d1

sys-process/procps: Fix up when built with USE=ncurses

---
 sys-process/procps/files/procps-3.3.9-configure.patch | 13 +++++++++++++
 sys-process/procps/procps-3.3.9-r99.ebuild            |  9 +++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/sys-process/procps/files/procps-3.3.9-configure.patch b/sys-process/procps/files/procps-3.3.9-configure.patch
new file mode 100644
index 0000000..4822f62
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.9-configure.patch
@@ -0,0 +1,13 @@
+--- 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/procps-3.3.9-r99.ebuild b/sys-process/procps/procps-3.3.9-r99.ebuild
index 14dca88..7ef23a8 100644
--- a/sys-process/procps/procps-3.3.9-r99.ebuild
+++ b/sys-process/procps/procps-3.3.9-r99.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="standard informational utilities and process-handling tools"
 # http://packages.debian.org/sid/procps
@@ -28,11 +28,14 @@ S=${WORKDIR}/${PN}-ng-${PV}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch
-	epatch "${FILESDIR}"/${P}-no-error_h.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} \
@@ -46,8 +49,6 @@ 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


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-05-19 23:46 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-18 14:32 [gentoo-commits] proj/hardened-dev:musl commit in: sys-process/procps/, sys-process/procps/files/ Anthony G. Basile
  -- strict thread matches above, loose matches on Subject: below --
2014-05-18 16:07 Anthony G. Basile
2014-05-19 23:36 Anthony G. Basile
2014-05-19 23:46 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