diff options
Diffstat (limited to 'sys-process/psmisc')
| -rw-r--r-- | sys-process/psmisc/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-process/psmisc/Manifest | 11 | ||||
| -rw-r--r-- | sys-process/psmisc/files/psmisc-22.2-gcc2.patch | 40 | ||||
| -rw-r--r-- | sys-process/psmisc/files/psmisc-22.5-sockets.patch | 87 | ||||
| -rw-r--r-- | sys-process/psmisc/files/psmisc-22.5-user-header.patch | 11 | ||||
| -rw-r--r-- | sys-process/psmisc/psmisc-22.5-r2.ebuild | 52 | ||||
| -rw-r--r-- | sys-process/psmisc/psmisc-22.8.ebuild (renamed from sys-process/psmisc/psmisc-22.6.ebuild) | 14 |
7 files changed, 15 insertions, 207 deletions
diff --git a/sys-process/psmisc/ChangeLog b/sys-process/psmisc/ChangeLog index a049c4044e1f..720a8cc43988 100644 --- a/sys-process/psmisc/ChangeLog +++ b/sys-process/psmisc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-process/psmisc # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.90 2009/10/31 14:17:59 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.91 2009/12/11 11:45:40 ssuominen Exp $ + +*psmisc-22.8 (11 Dec 2009) + + 11 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> +psmisc-22.8.ebuild: + Version bump wrt #296498. 31 Oct 2009; Brent Baude <ranger@gentoo.org> psmisc-22.7.ebuild: Marking psmisc-22.7 ppc64 for bug 287739 diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest index c0f565e0c4e0..eb4de45c4d03 100644 --- a/sys-process/psmisc/Manifest +++ b/sys-process/psmisc/Manifest @@ -1,12 +1,7 @@ -AUX psmisc-22.2-gcc2.patch 1625 RMD160 8e1b80c56a5a3dfea3db3ae554f9a33f910b9699 SHA1 bb779b02988837bff2dbaec5aa7909d5e84a050f SHA256 6a710d66db02902db9b99d57abde991ab172b7a41b29b33eb3e552422e0843b5 AUX psmisc-22.5-no-nls.patch 736 RMD160 ac2c51cccc6c95f0aa47efe1ecaeb0d5eaefbce9 SHA1 0227573aa987bfb78ecef891673dc2792c98aba5 SHA256 b2137d22d62276cbd4a1b154c119df025d864054063302a91b5a1610f6c7102c -AUX psmisc-22.5-sockets.patch 4178 RMD160 f47532677c80a8411d8036940587fbc9246e3b67 SHA1 9e00314d9ecf181a359e4703de07495af51df6f5 SHA256 e47d0fc4803713e669ef45d4caca52826cd794dff476e2920f5ae02bb7475103 -AUX psmisc-22.5-user-header.patch 234 RMD160 a284b4898a868894a5956a689f5c64969422c2ce SHA1 c01a28043beb7acc4b05d96d016c16275af6a07b SHA256 68035208f6e4d94af61c79fcb3041a2607c8df19d751f0650dc46ca13ec7aedb -DIST psmisc-22.5.tar.gz 277404 RMD160 315e02a601b8729696244379038885365978ebbe SHA1 0fd6c52dd0dad464a9be7baa79fb810caf43c923 SHA256 f1cfe0b3b85cf06ef67d4648b59b896abce1a3f2a810d694567aff7e33273c02 -DIST psmisc-22.6.tar.gz 283532 RMD160 6dddf63e2b7879ae9083533914a7257ab49ac968 SHA1 cb15c23e9cfe618e9de5f066525bce7dc7b77421 SHA256 a13c81897c94b3d6e705fc9da07c610492e28cf7abd5ff8e992f0ec95a269d62 DIST psmisc-22.7.tar.gz 309178 RMD160 97341ce1953d2c226f01d92e952e7a001456be15 SHA1 8226ecc284c8cd1e151523df56a1ba9f9c0fa3f5 SHA256 049c874c3353798afe9223dde8450376bd8a5cc336f863fb9294238735d11dad -EBUILD psmisc-22.5-r2.ebuild 1469 RMD160 d7297e1b2f2483f9711280a7af5dab629a2a0d9c SHA1 39bdb9d2de36aea338e56361111bdeca2f4761ee SHA256 54a1c19f77c813ce502636ec6eb3e0058305978561a1359813f769fb2bdaa212 -EBUILD psmisc-22.6.ebuild 1614 RMD160 c02cf4c36b30cfc600079b277cddeb5fd152636b SHA1 8a67a23dc6ccf899aec4c2c2bac507fb73129eb9 SHA256 16bf4760a770fc655df474e601be8bf17fac4cbb44220ef00854b7be0775b40e +DIST psmisc-22.8.tar.gz 310358 RMD160 1e7fd6167de21d8fc5e81af00aa97b9cc9b07d80 SHA1 bce327dc1dad257a67c2fbe9ca7bf227d6d52a51 SHA256 db304ec5349564acc484d84df283466c37ff6938c420d928db1d199121097e8c EBUILD psmisc-22.7.ebuild 1567 RMD160 8fd6f390835d2ad65154e3ca633ebe1fd0a714af SHA1 16495bfb83c788327f5239b2249df11a77ad0cf9 SHA256 d160ee5e7c15658b1a476c2cdb75216ef6c05288e46071d9a5e74cee0cc1b9d3 -MISC ChangeLog 16329 RMD160 71ad8092e3b6849395f5dedb07c59c098abe2f03 SHA1 6c5600cce66bad56e215e9cac3172db3e0ed3d7c SHA256 52995967c0add61b3addd974b17067dc852b1eab5128ed964befe0277a42bbd8 +EBUILD psmisc-22.8.ebuild 1520 RMD160 8d5c137f839894e794acfb60a34cebecdaf1b84c SHA1 f1c0befa2826344606b43ebdb757dda4693d40da SHA256 d9d4aec2f7d55684106c654e757dff820ec34af53ed2749d3fb622e60fde3183 +MISC ChangeLog 16464 RMD160 587da933396ab399078301254da5ab45def57fcf SHA1 839436423c51b62168d6b26b86a150a55872d277 SHA256 b4823739ce5046fb3002be2c7d295f8b429d3e35d27ebc75e78a722a30b4e63f MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 diff --git a/sys-process/psmisc/files/psmisc-22.2-gcc2.patch b/sys-process/psmisc/files/psmisc-22.2-gcc2.patch deleted file mode 100644 index 181fb78b9c98..000000000000 --- a/sys-process/psmisc/files/psmisc-22.2-gcc2.patch +++ /dev/null @@ -1,40 +0,0 @@ -cheesy ass workaround for gcc-2: -i686-pc-linux-gnu-gcc -Wall -DLOCALEDIR=\"/usr/share/locale\" -march=i686 -O2 -pipe -o pstree pstree.o -lncurses -fuser.c:103: warning: preprocessing directive not recognized within macro arg -fuser.c:103: warning: preprocessing directive not recognized within macro arg -fuser.c:103: warning: preprocessing directive not recognized within macro arg -fuser.c:103: warning: preprocessing directive not recognized within macro arg -fuser.c:103: warning: preprocessing directive not recognized within macro arg -fuser.c:103: warning: preprocessing directive not recognized within macro arg -fuser.c: In function `usage': -fuser.c:98: undefined or invalid # directive -fuser.c:101: undefined or invalid # directive -make[3]: *** [fuser.o] Error 1 - ---- src/fuser.c -+++ src/fuser.c -@@ -82,6 +82,11 @@ static void usage (const char *errormsg) - if (errormsg != NULL) - fprintf(stderr, "%s\n", errormsg); - -+#ifdef WITH_IPV6 -+# define _IPv6(x) x -+#else -+# define _IPv6(x) -+#endif - fprintf (stderr, _( - "Usage: fuser [ -a | -s | -c ] [ -n SPACE ] [ -SIGNAL ] [ -kimuv ] NAME...\n" - " [ - ] [ -n SPACE ] [ -SIGNAL ] [ -kimuv ] NAME...\n" -@@ -101,10 +106,10 @@ static void usage (const char *errormsg) - " -u display user IDs\n" - " -v verbose output\n" - " -V display version information\n" --#ifdef WITH_IPV6 -+_IPv6( - " -4 search IPv4 sockets only\n" - " -6 search IPv6 sockets only\n" --#endif -+) - " - reset options\n\n" - " udp/tcp names: [local_port][,[rmt_host][,[rmt_port]]]\n\n")); - exit (1); diff --git a/sys-process/psmisc/files/psmisc-22.5-sockets.patch b/sys-process/psmisc/files/psmisc-22.5-sockets.patch deleted file mode 100644 index 99ea96828aa2..000000000000 --- a/sys-process/psmisc/files/psmisc-22.5-sockets.patch +++ /dev/null @@ -1,87 +0,0 @@ -=== modified file 'src/fuser.c' ---- src/fuser.c 2007-05-30 13:45:07 +0000 -+++ src/fuser.c 2007-05-30 13:48:30 +0000 -@@ -60,7 +60,8 @@ - #define NAME_FIELD 20 /* space reserved for file name */ - /* Function defines */ - static void add_matched_proc(struct names *name_list, const pid_t pid, const uid_t uid, const char access); --static void check_dir(const pid_t pid, const char *dirname, struct device_list *dev_head, struct inode_list *ino_head, const uid_t uid, const char access); -+static void check_dir(const pid_t pid, const char *dirname, struct device_list *dev_head, struct inode_list *ino_head, const uid_t uid, const char access, -+ struct unixsocket_list *sockets, dev_t netdev); - static void check_map(const pid_t pid, const char *filename, struct device_list *dev_head, struct inode_list *ino_head, const uid_t uid, const char access); - static struct stat *get_pidstat(const pid_t pid, const char *filename); - static uid_t getpiduid(const pid_t pid); -@@ -72,7 +73,7 @@ - void scan_mount_devices(const opt_type opts, struct mountdev_list **mount_devices); - void fill_unix_cache(struct unixsocket_list **unixsocket_head); - static dev_t find_net_dev(void); --static void scan_procs(struct names *names_head, struct inode_list *ino_head, struct device_list *dev_head); -+static void scan_procs(struct names *names_head, struct inode_list *ino_head, struct device_list *dev_head, struct unixsocket_list *sockets, dev_t netdev); - #ifdef NFS_CHECKS - static void scan_knfsd(struct names *names_head, struct device_list *dev_head); - #endif /* NFS_CHECKS */ -@@ -125,7 +126,7 @@ - "For more information about these matters, see the files named COPYING.\n")); - } - --static void scan_procs(struct names *names_head, struct inode_list *ino_head, struct device_list *dev_head) -+static void scan_procs(struct names *names_head, struct inode_list *ino_head, struct device_list *dev_head, struct unixsocket_list *sockets, dev_t netdev) - { - DIR *topproc_dir; - struct dirent *topproc_dent; -@@ -185,9 +186,9 @@ - } - } - } -- check_dir(pid, "lib", dev_head, ino_head, uid, ACCESS_MMAP); -- check_dir(pid, "mmap", dev_head, ino_head, uid, ACCESS_MMAP); -- check_dir(pid, "fd", dev_head, ino_head, uid, ACCESS_FILE); -+ check_dir(pid, "lib", dev_head, ino_head, uid, ACCESS_MMAP, sockets, netdev); -+ check_dir(pid, "mmap", dev_head, ino_head, uid, ACCESS_MMAP, sockets, netdev); -+ check_dir(pid, "fd", dev_head, ino_head, uid, ACCESS_FILE, sockets, netdev); - check_map(pid, "maps", dev_head, ino_head, uid, ACCESS_MMAP); - - } /* while topproc_dent */ -@@ -863,7 +864,7 @@ - #ifdef DEBUG - debug_match_lists(names_head, match_inodes, match_devices); - #endif -- scan_procs(names_head, match_inodes, match_devices); -+ scan_procs(names_head, match_inodes, match_devices, unixsockets, netdev); - #ifdef NFS_CHECKS - scan_knfsd(names_head, match_devices); - #endif /* NFS_CHECKS */ -@@ -983,13 +984,15 @@ - return st; - } - --static void check_dir(const pid_t pid, const char *dirname, struct device_list *dev_head, struct inode_list *ino_head, const uid_t uid, const char access) -+static void check_dir(const pid_t pid, const char *dirname, struct device_list *dev_head, struct inode_list *ino_head, const uid_t uid, const char access, -+ struct unixsocket_list *sockets, dev_t netdev) - { - char *dirpath, *filepath; - DIR *dirp; - struct dirent *direntry; - struct inode_list *ino_tmp; - struct device_list *dev_tmp; -+ struct unixsocket_list *sock_tmp; - struct stat st, lst; - - if ( (dirpath = malloc(MAX_PATHNAME)) == NULL) -@@ -1009,6 +1012,15 @@ - if (stat(filepath, &st) != 0) { - fprintf(stderr, _("Cannot stat file %s: %s\n"),filepath, strerror(errno)); - } else { -+ if (st.st_dev == netdev) { -+ for (sock_tmp = sockets; sock_tmp != NULL; sock_tmp = sock_tmp->next) { -+ if (sock_tmp->net_inode == st.st_ino) { -+ st.st_ino = sock_tmp->inode; -+ st.st_dev = sock_tmp->dev; -+ break; -+ } -+ } -+ } - for (dev_tmp = dev_head ; dev_tmp != NULL ; dev_tmp = dev_tmp->next) { - if (st.st_dev == dev_tmp->device) { - if (access == ACCESS_FILE && (lstat(filepath, &lst)==0) && (lst.st_mode & S_IWUSR)) { - diff --git a/sys-process/psmisc/files/psmisc-22.5-user-header.patch b/sys-process/psmisc/files/psmisc-22.5-user-header.patch deleted file mode 100644 index c982dde795fa..000000000000 --- a/sys-process/psmisc/files/psmisc-22.5-user-header.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/peekfd.c -+++ src/peekfd.c -@@ -26,7 +26,7 @@ - #include <sys/ptrace.h> - #include <sys/types.h> - #include <sys/wait.h> --#include <linux/user.h> -+#include <sys/user.h> - #include <stdlib.h> - #include <getopt.h> - #include <ctype.h> diff --git a/sys-process/psmisc/psmisc-22.5-r2.ebuild b/sys-process/psmisc/psmisc-22.5-r2.ebuild deleted file mode 100644 index b6fea3d0bce6..000000000000 --- a/sys-process/psmisc/psmisc-22.5-r2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.5-r2.ebuild,v 1.11 2007/10/06 14:14:01 vapier Exp $ - -inherit eutils autotools - -DESCRIPTION="A set of tools that use the proc filesystem" -HOMEPAGE="http://psmisc.sourceforge.net/" -SRC_URI="mirror://sourceforge/psmisc/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" -IUSE="ipv6 nls selinux X" - -RDEPEND=">=sys-libs/ncurses-5.2-r2 - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - sys-devel/libtool - nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-22.2-gcc2.patch - epatch "${FILESDIR}"/${P}-user-header.patch - epatch "${FILESDIR}"/${P}-sockets.patch - # this package doesnt actually need C++ - sed -i '/AC_PROG_CXX/d' configure.ac || die - use nls || epatch "${FILESDIR}"/${P}-no-nls.patch #193920 - eautoreconf -} - -src_compile() { - econf \ - $(use_enable selinux) \ - $(use_enable nls) \ - $(use_enable ipv6) \ - || die - emake || die -} - -src_install() { - emake install DESTDIR="${D}" || die - dodoc AUTHORS ChangeLog NEWS README - use X || rm "${D}"/usr/bin/pstree.x11 - # fuser is needed by init.d scripts - dodir /bin - mv "${D}"/usr/bin/fuser "${D}"/bin/ || die - # easier to do this than forcing regen of autotools - [[ -e ${D}/usr/bin/peekfd ]] || rm -f "${D}"/usr/share/man/man1/peekfd.1 -} diff --git a/sys-process/psmisc/psmisc-22.6.ebuild b/sys-process/psmisc/psmisc-22.8.ebuild index 7f9af055ea29..cb0b8d77c7e6 100644 --- a/sys-process/psmisc/psmisc-22.6.ebuild +++ b/sys-process/psmisc/psmisc-22.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.6.ebuild,v 1.8 2009/05/14 18:16:53 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.8.ebuild,v 1.1 2009/12/11 11:45:40 ssuominen Exp $ inherit eutils autotools @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/psmisc/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="ipv6 nls selinux X" RDEPEND=">=sys-libs/ncurses-5.2-r2 @@ -22,9 +22,6 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${PN}-22.5-sockets.patch - # this package doesnt actually need C++ - sed -i '/AC_PROG_CXX/d' configure.ac || die use nls || epatch "${FILESDIR}"/${PN}-22.5-no-nls.patch #193920 eautoreconf } @@ -34,15 +31,16 @@ src_compile() { # above when USE=-nls. this should get cleaned up so we dont have to patch # it out, but until then, let's not confuse users ... #220787 econf \ + --disable-dependency-tracking \ $(use_enable selinux) \ - $(use nls && use_enable nls) \ $(use_enable ipv6) \ - || die + $(use nls && use_enable nls) + emake || die } src_install() { - emake install DESTDIR="${D}" || die + emake DESTDIR="${D}" install || die dodoc AUTHORS ChangeLog NEWS README use X || rm "${D}"/usr/bin/pstree.x11 # fuser is needed by init.d scripts |