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
+}
