commit: 65384d139df9deeaf5ec60d01f883de6f068d172
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 00:31:59 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 00:31:59 2015 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=65384d13
sys-process/lsof: version bump.
Package-Manager: portage-2.2.18
RepoMan-Options: --force
Manifest-Sign-Key: 0xF52D4BBA
sys-process/lsof/Manifest | 9 +--
sys-process/lsof/files/lsof-4.85-arg.c.patch | 30 --------
.../lsof-4.85-fix-missing-netinet_tcp_h.patch | 11 ---
.../lsof/files/lsof-4.88-linux.dnode.c.patch | 21 ++++++
sys-process/lsof/lsof-4.85-r99.ebuild | 81 ----------------------
.../{lsof-4.87-r99.ebuild => lsof-4.88-r99.ebuild} | 13 ++--
6 files changed, 33 insertions(+), 132 deletions(-)
diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index bbecd3a..6056e5f 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -1,9 +1,6 @@
-AUX lsof-4.85-arg.c.patch 703 SHA256
a517f97ae897dc1d1c7c4e1eeb2fe4a4dab646004c07457709f823e41e57bd43 SHA512
fa0b510e02647ae13515491240f7a2aa169c19f14a3a02ac9735a067ca509613a0aaf00b4f01e8f00a032a6320d15495d876fad3b4903c48df926ef5e8a397df
WHIRLPOOL
80ee5f343120caa1ef104d6c0d542357eccf7e14981605cb8f5f82206e17a5f6d25675e3aeeb9c3cfdaa51e8c781aed8273f5e99dab115e0af926cfb0521353f
AUX lsof-4.85-cross.patch 1000 SHA256
5067c73c65d9cbe75213572423d0ddea02a12ba7f3509767082cd9b6faf8b174 SHA512
399df859f225a69a7211c81439883afba38562d72b0d320dcf19acf7b705031963e97469a322af919d05aa14af501af6137301c24a29f871f59253c6d6a647d7
WHIRLPOOL
b258a537f44d24c3e2bbc771476e98f79a3bcbf9b4d9d1e0f2779f9eae75e0a19eb8348a0d23ca2c9ad4d1835b859ec4f6ded74fd9fd5b8594d19bb1c8ff086b
-AUX lsof-4.85-fix-missing-netinet_tcp_h.patch 387 SHA256
b95910ad1b98e1b2a7b18abcc2bdebf25d2bffafa3005a51aaf4a9fa039f869a SHA512
d2cc166b97fcb47bde060f762953e296a1fb75a3460f416dc4e436a01e4f9efd0c6332c1cb471017abf252bd27272bd6a9c832f137e156b168c348ee3baee8d8
WHIRLPOOL
37f18c2ed5c2130dd12a8723e59573d3d144e8131ac12e77dba995ad2d87398071809726f63b7eeadb1b9b863bbbc3f494f2843034910b68d9a3102860c21104
AUX lsof-4.87-remove-glibc-check.patch 514 SHA256
c90a71adbdcc5fb6d32b7469196315cc5b6c1b71f351eef748b899ec3ea89671 SHA512
34efacf57c8e3bd1fa0f84ce58b8046177cb6dd075840837ea3f104570c63ceb9b7491bba8524b6c712440c86f11dc1a2d5bf475703c59345c4cb9c5624cabe6
WHIRLPOOL
dea979075595f26a8d03b09857ac9ffab9602dc4c39bafd6fdb8f804ae5d9d4f7dd282771522169ed4cbf236cc186f7677e20eb8ae44b0058dc1062f4656e23a
-DIST lsof_4.85.tar.bz2 763397 SHA256
49aa58e63539c45bada514a6a2e5a1c9f946ada1f4137dc9154cf4bf6054a1c1 SHA512
f38356d300e18feaac09043f19c3ef612ac22cb89608cbecbc3594dd170705be855ebc5ce80b069db4a5af9bb517b1f4e571c2e175aa579214014d7f77ac30cb
WHIRLPOOL
7cc1476bae92699b5b52e2e9a31713840308768b9536d2f4c904439458cd8778311facafffeea93f743db4488dc296fccfaf852d739f2b68859e10031289a6d3
-DIST lsof_4.87.tar.bz2 773664 SHA256
dfdd3709d82bc79ccdf3e404b84aafa9aede5948642a824ecaefd0aac589da2c SHA512
5e811225dd65366e3ef49628d567864fadda1dbda2d66a5e473123e73c468f5a3a577ae4e1b701a55ac49c2a759dab5c413663121c260a2804fca10ece902766
WHIRLPOOL
4ef01b855dbd8418e1533ebb293c3faacfa38c7a3cd30436d0a8174a974b7cd0eebfb79b23c4c3f13b66a65813a6fbdf5aa483d3f8d2689325fe7d0f48bfb5eb
-EBUILD lsof-4.85-r99.ebuild 2396 SHA256
e9103045427f760b42a906bfa8ad29fd79c4ad40587fd37bb4d7f7d8986737a3 SHA512
5afc59a98315c2c26eaf28ce2c2aa99719b3c49845eb3f163b79ad74442e1cf06c2d3bf27359f707829c1a850aa1d4994aa6419c7fd7873f7aff6e984243e918
WHIRLPOOL
8b9b2bb379c5e68bfa6c63e5c46f5085f680d3c285aa5bd381ebba6c90e39a592113d07206ef7634a40f3b948a64f864adeff9f074dd62b660d4757ae197e3be
-EBUILD lsof-4.87-r99.ebuild 2939 SHA256
875f3a3317470458290d62cbe45a39a7e159e5affaf11c9d1b6056fd29634102 SHA512
001699b94b3dfc8f6dc80d42ef96ebd48db6663e8946e709f21b228bfe9a23fc41a6efd2a3cbcae77063cadc56429993f4f41b2f8076ebfef7340a210daeda02
WHIRLPOOL
f0aab68fac77f221ff9a26d800ef77c4e004c3a0d9b463f40344cee0dd4bbdc9944d53c8c81998eb49388d90ab7d1a3339e9f252a87bde9a7c7d4a174f828567
+AUX lsof-4.88-linux.dnode.c.patch 494 SHA256
8c824fe2ac4f4cb492a2d4539e8a921d50e337235c4f42650bade3728487b34b SHA512
253c0b3e3d50f805ffde21ba214e0a56fa554eb98fd126fd3edc4aa0401e24c2fbb72e30288fe8cc371a3f615f5365e6fc753e7dc2aa0a8367f132c7411b28f1
WHIRLPOOL
31aa05df4e7b3a1b0f9c8f37544a2c3d6be3d596a6ef844855cd3e99fb53291ded85e61690e91e274f5edcf805c73e7663723e8c43458d3a70e3abb6689fe2eb
+DIST lsof_4.88.tar.bz2 778563 SHA256
fe6f9b0e26b779ccd0ea5a0b6327c2b5c38d207a6db16f61ac01bd6c44e5c99b SHA512
acf3901ac08bac5acaa123af835de03fcf86c1cb851a2cba5bb6d08c53dff62570e4129c18ffa241ae84a83d5e6fc5207fb12e43b5ff5a21a0c1967ca117848b
WHIRLPOOL
74d85794e5f05920ac83b160b02e510442ebe3f390a8f30bbf514f31bb8ff74ad191f89bed5b3eee47033cc7d6fe01ba4d9d812050d7132e041899d96264076f
+EBUILD lsof-4.88-r99.ebuild 2957 SHA256
c9897d1d795662fc9064f1ed513cda5f4f8f1e9f147396c5ecc3507387ac1e3d SHA512
dd617537bcfae2c133d90f7902f5e6e55e4bf8a8364a31d195678bb6ddd63d41ffc159ebe7a1db58719a719bc060977b5e40e3dc3421c91c9e2498b7ace0dc64
WHIRLPOOL
e7a331cf92831b97ac27684db9a0a4d547043fe25080c19d053ac5dc0f9744932204c4081c7e923ba5d4698b08317c6fa69dfdd411d4889429947c3a824e8731
MISC metadata.xml 238 SHA256
27f27d7c7ba9fb670a6867a79ff8af354e48735f9bd672d387d96b4bd49d415b SHA512
b8434ca8a5f116234268cca5c8d7cf20b3187e1f2c326bfe3693e2e85c2dac961618b39a20d0d5b7a01744b5159057e2861eeaff7fef6a08e0fc4c1b47bbf778
WHIRLPOOL
f3ada27de4f86d469929230f1649727d91cc303e007ae728038062a04522053f0b49559d5bc4b6dd203744ba117d1577d03d62a1cb5d7c24c86c268edf057761
diff --git a/sys-process/lsof/files/lsof-4.85-arg.c.patch
b/sys-process/lsof/files/lsof-4.85-arg.c.patch
deleted file mode 100644
index 98838cd..0000000
--- a/sys-process/lsof/files/lsof-4.85-arg.c.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-arg.c.patch Patches: lsof_4.85_src/arg.c
-
- Importance: major for all dialects supporting
- the +|-e option (e.g., Linux)
-
- Function: this patch corrects a bug in the
- accumulation of multiple +|-e
- option values
-
-*** /tmp/T0iAaaeo Thu Oct 20 14:08:43 2011
---- arg.c Thu Oct 20 14:03:49 2011
-***************
-*** 778,785 ****
- ep->pathl = i;
- ep->rdlnk = rdlnk;
- ep->mp = (struct mounts *)NULL;
-! if (!(ep->next = Efsysl))
-! Efsysl = ep;
- return(0);
- }
- #endif /* defined(HASEOPT) */
---- 778,785 ----
- ep->pathl = i;
- ep->rdlnk = rdlnk;
- ep->mp = (struct mounts *)NULL;
-! ep->next = Efsysl;
-! Efsysl = ep;
- return(0);
- }
- #endif /* defined(HASEOPT) */
diff --git a/sys-process/lsof/files/lsof-4.85-fix-missing-netinet_tcp_h.patch
b/sys-process/lsof/files/lsof-4.85-fix-missing-netinet_tcp_h.patch
deleted file mode 100644
index 919c7ae..0000000
--- a/sys-process/lsof/files/lsof-4.85-fix-missing-netinet_tcp_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur lsof_4.85.orig/lsof_4.85_src/lsof.h lsof_4.85/lsof_4.85_src/lsof.h
---- lsof_4.85.orig/lsof_4.85_src/lsof.h 2011-09-07 19:14:10.000000000
+0000
-+++ lsof_4.85/lsof_4.85_src/lsof.h 2014-02-21 19:31:43.322452780 +0000
-@@ -53,6 +53,7 @@
- #include <locale.h>
- # endif /* defined(HASSETLOCALE) */
-
-+#include <netinet/tcp.h>
- #include <netdb.h>
- #include <pwd.h>
- #include <stdio.h>
diff --git a/sys-process/lsof/files/lsof-4.88-linux.dnode.c.patch
b/sys-process/lsof/files/lsof-4.88-linux.dnode.c.patch
new file mode 100644
index 0000000..28640a9
--- /dev/null
+++ b/sys-process/lsof/files/lsof-4.88-linux.dnode.c.patch
@@ -0,0 +1,21 @@
+ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/patches/4.88/linux.dnode.c.patch
+
+*** dnode.c
+--- lsof_4.88_src/dialects/linux/dnode.c
+***************
+*** 580,586 ****
+ Lf->inp_ty = 1;
+
+ #if defined(HASEPTOPTS)
+! if (Lf->ntype == N_FIFO) {
+ (void) enter_pinfo();
+ Lf->sf |= SELPINFO;
+ }
+--- 580,586 ----
+ Lf->inp_ty = 1;
+
+ #if defined(HASEPTOPTS)
+! if ((Lf->ntype == N_FIFO) && FpipeE) {
+ (void) enter_pinfo();
+ Lf->sf |= SELPINFO;
+ }
diff --git a/sys-process/lsof/lsof-4.85-r99.ebuild
b/sys-process/lsof/lsof-4.85-r99.ebuild
deleted file mode 100644
index 5382919..0000000
--- a/sys-process/lsof/lsof-4.85-r99.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.85-r2.ebuild,v 1.12
2014/01/20 06:40:56 vapier Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/";
-SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
- ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-
ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/${MY_P}.tar.bz2";
-
-LICENSE="lsof"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="examples ipv6 rpc selinux static"
-
-RDEPEND="rpc? ( net-libs/libtirpc )
- selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
- rpc? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/${MY_P}/${MY_P}_src
-
-src_unpack() {
- unpack ${A}
- cd ${MY_P}
- unpack ./${MY_P}_src.tar
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-fix-missing-netinet_tcp_h.patch #for musl
- epatch "${FILESDIR}"/${P}-arg.c.patch #388555
- epatch "${FILESDIR}"/${PN}-4.85-cross.patch #432120
- # convert `test -r header.h` into a compile test
- sed -i -r \
- -e 's:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo
"#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:' \
- -e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo
"#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \
- Configure || die
-}
-
-target() { usex kernel_FreeBSD freebsd linux ; }
-src_configure() {
- use static && append-ldflags -static
-
- append-cppflags $(use rpc && $(tc-getPKG_CONFIG) libtirpc --cflags ||
echo "-DHASNOTRPC -DHASNORPC_H")
- append-cppflags $(usex ipv6 -{D,U}HASIPv6)
-
- export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
- $(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)"
-
- # Set LSOF_INCLUDE to a dummy location so the script doesn't poke
- # around in it and mix /usr/include paths with cross-compile/etc.
- touch .neverInv
- LINUX_HASSELINUX=$(usex selinux y n) \
- LSOF_INCLUDE=${T} \
- LSOF_CC=$(tc-getCC) \
- LSOF_AR="$(tc-getAR) rc" \
- LSOF_RANLIB=$(tc-getRANLIB) \
- LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \
- ./Configure -n $(target) || die
-}
-
-src_compile() {
- emake DEBUG="" all || die
-}
-
-src_install() {
- dobin lsof || die
-
- if use examples ; then
- insinto /usr/share/lsof/scripts
- doins scripts/* || die
- fi
-
- doman lsof.8 || die
- dodoc 00*
-}
diff --git a/sys-process/lsof/lsof-4.87-r99.ebuild
b/sys-process/lsof/lsof-4.88-r99.ebuild
similarity index 85%
rename from sys-process/lsof/lsof-4.87-r99.ebuild
rename to sys-process/lsof/lsof-4.88-r99.ebuild
index dd3753b..4cdfdf6 100644
--- a/sys-process/lsof/lsof-4.87-r99.ebuild
+++ b/sys-process/lsof/lsof-4.88-r99.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.87-r1.ebuild,v 1.13
2014/12/06 16:38:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.88-r1.ebuild,v 1.6
2015/07/17 20:05:46 maekke Exp $
EAPI="4"
@@ -14,7 +14,7 @@
SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
LICENSE="lsof"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh
sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~mips ~ppc x86"
IUSE="examples ipv6 rpc selinux static"
RDEPEND="rpc? ( net-libs/libtirpc )
@@ -31,8 +31,13 @@ src_unpack() {
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-4.87-remove-glibc-check.patch #for musl
+ epatch "${FILESDIR}"/${PN}-4.87-remove-glibc-check.patch
epatch "${FILESDIR}"/${PN}-4.85-cross.patch #432120
+ epatch "${FILESDIR}"/${P}-linux.dnode.c.patch
+ # fix POSIX compliance with `echo`
+ sed -i \
+ -e 's:echo -n:printf:' \
+ AFSConfig Configure Customize Inventory tests/CkTestDB || die
# convert `test -r header.h` into a compile test
sed -i -r \
-e 's:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo
"#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:' \
