diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2014-01-04 17:52:38 +0000 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-01-04 17:52:38 +0000 |
commit | 9225ed401649fc58bf3e642a28106f6d721e36f3 (patch) | |
tree | 5bb6698121b0c2eddc699329ed19a2f78c9336fe /sys-process/procps | |
parent | Removed old versions and files (diff) | |
download | gentoo-2-9225ed401649fc58bf3e642a28106f6d721e36f3.tar.gz gentoo-2-9225ed401649fc58bf3e642a28106f6d721e36f3.tar.bz2 gentoo-2-9225ed401649fc58bf3e642a28106f6d721e36f3.zip |
Removed old versions and files
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'sys-process/procps')
-rw-r--r-- | sys-process/procps/ChangeLog | 12 | ||||
-rw-r--r-- | sys-process/procps/files/procps-3.2.3-noproc.patch | 15 | ||||
-rw-r--r-- | sys-process/procps/files/procps-3.2.7-proc-mount.patch | 18 | ||||
-rw-r--r-- | sys-process/procps/files/procps-3.2.8-r1-forest-prefix.patch | 42 | ||||
-rw-r--r-- | sys-process/procps/files/procps-3.2.8-time_t.patch | 15 | ||||
-rw-r--r-- | sys-process/procps/files/procps-3.2.8-toprc-fixup.patch | 16 | ||||
-rw-r--r-- | sys-process/procps/files/procps-mips-define-pagesize.patch | 29 | ||||
-rw-r--r-- | sys-process/procps/procps-3.2.8_p11.ebuild | 91 | ||||
-rw-r--r-- | sys-process/procps/procps-3.3.4.ebuild | 45 | ||||
-rw-r--r-- | sys-process/procps/procps-3.3.8.ebuild | 50 |
10 files changed, 10 insertions, 323 deletions
diff --git a/sys-process/procps/ChangeLog b/sys-process/procps/ChangeLog index d5091ba25bb6..f1bf5c779401 100644 --- a/sys-process/procps/ChangeLog +++ b/sys-process/procps/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-process/procps -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.109 2013/12/26 14:41:10 maekke Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.110 2014/01/04 17:52:38 polynomial-c Exp $ + + 04 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> -procps-3.2.8_p11.ebuild, + -procps-3.3.4.ebuild, -procps-3.3.8.ebuild, -files/procps-3.2.3-noproc.patch, + -files/procps-3.2.7-proc-mount.patch, + -files/procps-3.2.8-r1-forest-prefix.patch, -files/procps-3.2.8-time_t.patch, + -files/procps-3.2.8-toprc-fixup.patch, + -files/procps-mips-define-pagesize.patch: + Removed old versions and files. 26 Dec 2013; Markus Meier <maekke@gentoo.org> procps-3.3.8-r1.ebuild: arm stable, bug #494822 diff --git a/sys-process/procps/files/procps-3.2.3-noproc.patch b/sys-process/procps/files/procps-3.2.3-noproc.patch deleted file mode 100644 index 6da48eb44f42..000000000000 --- a/sys-process/procps/files/procps-3.2.3-noproc.patch +++ /dev/null @@ -1,15 +0,0 @@ -If /proc isnt mounted, `top` will cause screen corruption ... - ---- procps-3.2.3/top.c -+++ procps-3.2.3/top.c -@@ -3201,6 +3201,10 @@ - { - (void)dont_care_argc; - before(*argv); -+ -+ if (access("/proc/stat", F_OK)) -+ std_err("/proc is not mounted, required for output data"); -+ - // +-------------+ - windows_stage1(); // top (sic) slice - configs_read(); // > spread etc, < diff --git a/sys-process/procps/files/procps-3.2.7-proc-mount.patch b/sys-process/procps/files/procps-3.2.7-proc-mount.patch deleted file mode 100644 index 386dada4f95f..000000000000 --- a/sys-process/procps/files/procps-3.2.7-proc-mount.patch +++ /dev/null @@ -1,18 +0,0 @@ -Slightly prettier error message - ---- proc/readproc.c -+++ proc/readproc.c -@@ -907,3 +907,3 @@ - if(file2str("/proc/self", "stat", sbuf, sizeof sbuf) == -1){ -- fprintf(stderr, "Error, do this: mount -t proc none /proc\n"); -+ fprintf(stderr, "Error, do this: mount -t proc proc /proc\n"); - _exit(47); ---- proc/sysinfo.c -+++ proc/sysinfo.c -@@ -31,4 +31,4 @@ - " To mount /proc at boot you need an /etc/fstab line like:\n" \ --" /proc /proc proc defaults\n" \ --" In the meantime, run \"mount /proc /proc -t proc\"\n" -+" proc /proc proc defaults\n" \ -+" In the meantime, run \"mount proc /proc -t proc\"\n" - diff --git a/sys-process/procps/files/procps-3.2.8-r1-forest-prefix.patch b/sys-process/procps/files/procps-3.2.8-r1-forest-prefix.patch deleted file mode 100644 index cee331e53ca2..000000000000 --- a/sys-process/procps/files/procps-3.2.8-r1-forest-prefix.patch +++ /dev/null @@ -1,42 +0,0 @@ -avoid gcc warnings like: - -ps/output.c:341:6: warning: the address of ‘forest_prefix’ will always evaluate as ‘true’ - ---- a/ps/output.c -+++ b/ps/output.c -@@ -338,7 +338,7 @@ static int pr_args(char *restrict const - unsigned flags; - int rightward=max_rightward; - -- if(forest_prefix){ -+ if(/*forest_prefix*/1){ - int fh = forest_helper(outbuf); - endp += fh; - rightward -= fh; -@@ -405,7 +405,7 @@ static int pr_cgroup(char *restrict cons - if(pp->cgroup && *pp->cgroup) { - char *endp = outbuf; - int rightward=max_rightward; -- if(forest_prefix){ -+ if(/*forest_prefix*/1){ - int fh = forest_helper(outbuf); - endp += fh; - rightward -= fh; -@@ -365,7 +365,7 @@ static int pr_comm(char *restrict const - unsigned flags; - int rightward=max_rightward; - -- if(forest_prefix){ -+ if(/*forest_prefix*/1){ - int fh = forest_helper(outbuf); - endp += fh; - rightward -= fh; -@@ -390,7 +390,7 @@ static int pr_fname(char *restrict const - char *endp = outbuf; - int rightward = max_rightward; - -- if(forest_prefix){ -+ if(/*forest_prefix*/1){ - int fh = forest_helper(outbuf); - endp += fh; - rightward -= fh; diff --git a/sys-process/procps/files/procps-3.2.8-time_t.patch b/sys-process/procps/files/procps-3.2.8-time_t.patch deleted file mode 100644 index 8053cda924c8..000000000000 --- a/sys-process/procps/files/procps-3.2.8-time_t.patch +++ /dev/null @@ -1,15 +0,0 @@ -seconds_since_1970 is unsigned long, so we can't pass it as time_t or -we corrupt memory if sizeof(time_t) > sizeof(unsigned long) - ---- ps/output.c -+++ ps/output.c -@@ -989,7 +989,8 @@ - const char *fmt; - int tm_year; - int tm_yday; -- our_time = localtime(&seconds_since_1970); /* not reentrant */ -+ time_t sec_1970 = seconds_since_1970; -+ our_time = localtime(&sec_1970); /* not reentrant */ - tm_year = our_time->tm_year; - tm_yday = our_time->tm_yday; - t = getbtime() + pp->start_time / Hertz; diff --git a/sys-process/procps/files/procps-3.2.8-toprc-fixup.patch b/sys-process/procps/files/procps-3.2.8-toprc-fixup.patch deleted file mode 100644 index 24890b0d1369..000000000000 --- a/sys-process/procps/files/procps-3.2.8-toprc-fixup.patch +++ /dev/null @@ -1,16 +0,0 @@ -X-Gentoo-Bug: 279819 -Upstream-Patch: http://procps.cvs.sourceforge.net/viewvc/procps/procps/top.c?r1=1.132&r2=1.134 ---- top.c 2008/03/24 04:41:26 1.132 -+++ top.c 2009/12/10 11:37:48 1.134 -@@ -2190,7 +2190,10 @@ - // Value a window's name and make the associated group name. - static void win_names (WIN_t *q, const char *name) - { -- sprintf(q->rc.winname, "%.*s", WINNAMSIZ -1, name); -+ // Note that src==dst is illegal in sprintf. -+ // Failure: amd64, glibc 2.9-20081201, gcc 4.3.4 -+ if(q->rc.winname != name) -+ sprintf(q->rc.winname, "%.*s", WINNAMSIZ -1, name); - sprintf(q->grpname, "%d:%.*s", q->winnum, WINNAMSIZ -1, name); - } - diff --git a/sys-process/procps/files/procps-mips-define-pagesize.patch b/sys-process/procps/files/procps-mips-define-pagesize.patch deleted file mode 100644 index 3802f4ccecfb..000000000000 --- a/sys-process/procps/files/procps-mips-define-pagesize.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naurp procps-3.2.3.orig/minimal.c procps-3.2.3/minimal.c ---- procps-3.2.3.orig/minimal.c 2004-05-04 20:26:14.000000000 -0400 -+++ procps-3.2.3/minimal.c 2004-08-20 02:01:35.868100752 -0400 -@@ -68,8 +68,8 @@ - /////////////////////////////////////////////////////////// - - #ifndef PAGE_SIZE --#warning PAGE_SIZE not defined, assuming it is 4096 --#define PAGE_SIZE 4096 -+#warning PAGE_SIZE not defined, using sysconf() to determine correct value -+#define PAGE_SIZE (sysconf(_SC_PAGESIZE)) - #endif - - -diff -Naurp procps-3.2.3.orig/ps/common.h procps-3.2.3/ps/common.h ---- procps-3.2.3.orig/ps/common.h 2004-04-25 17:03:18.000000000 -0400 -+++ procps-3.2.3/ps/common.h 2004-08-20 02:00:59.228670792 -0400 -@@ -16,6 +16,11 @@ - #include "../proc/readproc.h" - #include <asm/page.h> /* looks safe for glibc, we need PAGE_SIZE */ - -+#ifndef PAGE_SIZE -+#warning PAGE_SIZE not defined, using sysconf() to determine correct value -+#define PAGE_SIZE (sysconf(_SC_PAGESIZE)) -+#endif -+ - #if 0 - #define trace(args...) printf(## args) - #else diff --git a/sys-process/procps/procps-3.2.8_p11.ebuild b/sys-process/procps/procps-3.2.8_p11.ebuild deleted file mode 100644 index 855c0abe1bc7..000000000000 --- a/sys-process/procps/procps-3.2.8_p11.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8_p11.ebuild,v 1.9 2012/02/01 10:28:56 ssuominen Exp $ - -EAPI="2" - -inherit flag-o-matic eutils toolchain-funcs multilib - -DEB_VER=${PV#*_p} -MY_PV=${PV%_p*} -MY_P="${PN}-${MY_PV}" -DESCRIPTION="Standard informational utilities and process-handling tools" -HOMEPAGE="http://procps.sourceforge.net/" -SRC_URI="http://procps.sourceforge.net/${MY_P}.tar.gz - mirror://debian/pool/main/p/procps/${PN}_${MY_PV}-${DEB_VER}.debian.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="unicode" - -RDEPEND=">=sys-libs/ncurses-5.2-r2[unicode?]" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - local p d="${WORKDIR}"/debian/patches - pushd "${d}" >/dev/null - # makefile_dev_null: this bug is actually in gcc and is already fixed - for p in $(use unicode || echo watch_{unicode,ansi_colour}) makefile_dev_null ; do - rm ${p}.patch || die - sed -i "/^${p}/d" series || die - done - popd >/dev/null - EPATCH_SOURCE="${d}" \ - epatch $(<"${d}"/series) - # fixup debian watch_exec_beep.patch - sed -i '1i#include <sys/wait.h>' watch.c || die - - epatch "${FILESDIR}"/${PN}-3.2.7-proc-mount.patch - epatch "${FILESDIR}"/${PN}-3.2.3-noproc.patch - epatch "${FILESDIR}"/${PN}-3.2.8-toprc-fixup.patch - epatch "${FILESDIR}"/${PN}-3.2.8-r1-forest-prefix.patch - epatch "${FILESDIR}"/${PN}-3.2.8-time_t.patch - - # Clean up the makefile - # - we do stripping ourselves - # - punt fugly gcc flags - sed -i \ - -e '/install/s: --strip : :' \ - -e '/ALL_CFLAGS += $(call check_gcc,-fweb,)/d' \ - -e '/ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing=2,)/s,=2,,' \ - -e "/^lib64/s:=.*:=$(get_libdir):" \ - -e 's:-m64::g' \ - Makefile || die "sed Makefile" - - # mips 2.4.23 headers (and 2.6.x) don't allow PAGE_SIZE to be defined in - # userspace anymore, so this patch instructs procps to get the - # value from sysconf(). - epatch "${FILESDIR}"/${PN}-mips-define-pagesize.patch - - # lame unicode stuff checks glibc defines - sed -i "s:__GNU_LIBRARY__ >= 6:0 == $(use unicode; echo $?):" proc/escape.c || die -} - -src_compile() { - replace-flags -O3 -O2 - emake \ - CC="$(tc-getCC)" \ - CPPFLAGS="${CPPFLAGS}" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - || die "make failed" -} - -src_install() { - emake \ - ln_f="ln -sf" \ - ldconfig="true" \ - DESTDIR="${D}" \ - install \ - || die "install failed" - - insinto /usr/include/proc - doins proc/*.h || die - - dodoc sysctl.conf BUGS NEWS TODO ps/HACKING - - # compat symlink so people who shouldnt be using libproc can #170077 - dosym libproc-${MY_PV}.so /$(get_libdir)/libproc.so || die -} diff --git a/sys-process/procps/procps-3.3.4.ebuild b/sys-process/procps/procps-3.3.4.ebuild deleted file mode 100644 index 3cc3ce08e595..000000000000 --- a/sys-process/procps/procps-3.3.4.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# 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.4.ebuild,v 1.18 2013/11/28 22:01:38 vapier Exp $ - -EAPI="4" - -inherit toolchain-funcs - -DESCRIPTION="standard informational utilities and process-handling tools" -HOMEPAGE="http://procps.sourceforge.net/ http://gitorious.org/procps http://packages.debian.org/sid/procps" -SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz" - -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.2-r2[unicode?] )" -DEPEND="${RDEPEND} - ncurses? ( virtual/pkgconfig ) - test? ( dev-util/dejagnu )" - -S=${WORKDIR}/${PN}-ng-${PV} - -RESTRICT="test" # Fixed in 3.3.6, see bug #404389 - -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 - - # The configure script is completely whacked in the head - mv "${ED}"/lib* "${ED}"/usr/ || die - gen_usr_ldscript -a procps - find "${ED}"/usr -name '*.la' -delete -} diff --git a/sys-process/procps/procps-3.3.8.ebuild b/sys-process/procps/procps-3.3.8.ebuild deleted file mode 100644 index ce83073d1cfe..000000000000 --- a/sys-process/procps/procps-3.3.8.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# 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.ebuild,v 1.2 2013/11/28 22:01:38 vapier 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="aecbeeda2ab308f8d09dddcb4cb9a572" -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 ~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 -} - -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 - - # The configure script is completely whacked in the head - mv "${ED}"/lib* "${ED}"/usr/ || die - gen_usr_ldscript -a procps - prune_libtool_files -} |