Add fix from upstream.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 148 insertions, 17 deletions

diff --git a/sys-process/lsof/ChangeLog b/sys-process/lsof/ChangeLog
index 2a0af6b19b2b..0795d691bfe8 100644
--- a/sys-process/lsof/ChangeLog
+++ b/sys-process/lsof/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/lsof
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.111 2015/04/14 22:50:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.112 2015/04/14 22:51:33 vapier Exp $
+
+*lsof-4.88-r1 (14 Apr 2015)
+
+  14 Apr 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/lsof-4.88-linux.dnode.c.patch, +lsof-4.88-r1.ebuild:
+  Add fix from upstream.
 
   14 Apr 2015; Mike Frysinger <vapier@gentoo.org> files/lsof-4.85-cross.patch:
   Fix building with gcc-5 #546636.
diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index 40cd373ee71e..3d911a5342de 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -2,29 +2,31 @@
 Hash: SHA256
 
 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-cross.patch 1061 SHA256 3bd94ea0d47e01626c3c6e7bbf4b25245cb221d8700194f01e93e264903abd60 SHA512 9326a2708910a39ba3b81253c21149f8e4fa44b207e4c2a88f86c9322d2b50e6360760fcb13e00f644aba57ad207106c280db00ebc2d1f3d49405b54681548e8 WHIRLPOOL 900bb6f38c83405e9315894af570669d96d2bbcd6240dbf65a78462471ef505ad1d30ee578ef6689d6b4aae4cb2ab212ef7cea3259003a060f5c08d41556e5ab
+AUX lsof-4.88-linux.dnode.c.patch 494 SHA256 8c824fe2ac4f4cb492a2d4539e8a921d50e337235c4f42650bade3728487b34b SHA512 253c0b3e3d50f805ffde21ba214e0a56fa554eb98fd126fd3edc4aa0401e24c2fbb72e30288fe8cc371a3f615f5365e6fc753e7dc2aa0a8367f132c7411b28f1 WHIRLPOOL 31aa05df4e7b3a1b0f9c8f37544a2c3d6be3d596a6ef844855cd3e99fb53291ded85e61690e91e274f5edcf805c73e7663723e8c43458d3a70e3abb6689fe2eb
 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
 DIST lsof_4.88.tar.bz2 778563 SHA256 fe6f9b0e26b779ccd0ea5a0b6327c2b5c38d207a6db16f61ac01bd6c44e5c99b SHA512 acf3901ac08bac5acaa123af835de03fcf86c1cb851a2cba5bb6d08c53dff62570e4129c18ffa241ae84a83d5e6fc5207fb12e43b5ff5a21a0c1967ca117848b WHIRLPOOL 74d85794e5f05920ac83b160b02e510442ebe3f390a8f30bbf514f31bb8ff74ad191f89bed5b3eee47033cc7d6fe01ba4d9d812050d7132e041899d96264076f
 EBUILD lsof-4.85-r2.ebuild 2384 SHA256 c15ed72a62bd90c308c1a892407ca60bb25129e2b20fd2bbdc663a68b612506c SHA512 026c55efeb974319b713a67053b069ead9c7a0f29dbe41912afa34a2c484f9540827a593b6d465a33a88339dadd5baecd06c10e26c6990f6169a0d1fd8ccdc1d WHIRLPOOL 1bb12e1157f7ad68fe29335d620acfa3df07d90f3dbbdcb77134fa01e1b2ec81f19308bc865b1356991ead0bfcc375d346dc191e9d08fed23a0a1241f609f772
 EBUILD lsof-4.87-r1.ebuild 2871 SHA256 50b781cccf02e1d4b0e399debb966abf1949f49ec3613621a793f04660bbc593 SHA512 3012421d3e375de23d565d64db190dbdfe4482f84575a28cca711469c9b308de1825d1b3f3b951b0a2129e835041717c095f76369c7c7b7d103fce65c90ce089 WHIRLPOOL c6a1182f9dc3fa07f1d21c5264fd4affdae487e5f3af8fca8f88f8c4fb37f8227c7f909e64b29f0bcb3a6670aa80a4b5f2f7bbc68cac2bdbbd0920bcac4d864d
-EBUILD lsof-4.88.ebuild 2879 SHA256 808a9479b1caa6a38a96aa5fefd79e9d6ca08c3d55ab4bf97bf17981606c2b89 SHA512 cbb1410c6a01de56462d74505e03fcc5f41759a2c56fd54158697b7e20d6a10c660f1991a4398c3d2b65222412d5ae1a0fc187e6f5cca60e726f1b38805a3970 WHIRLPOOL c76a555fb79f3c47efd67d03bd6119bb6f9bcf5535223afc0e9d0bd46560a3978c1f9409ff181683f9981445fc665a057ee11cb4754294e2bf495e7cc6db078e
-MISC ChangeLog 17335 SHA256 b94c7e7c42daf5899a0f4ee30af9d73976ca7c39262da9d4cba7748c3bfff5ad SHA512 5c987c22bf82395db2876145ff9c04ed7b3d674a21e8b5fe468e384738e094945219cea69050d5feac51290fadf7ae0a46b08f4c0911744240e33fe8a9fbb895 WHIRLPOOL 14d176db7e3b53c43c6e63ac22f6ae869291b0497617e88d84b2ff6fe38b63ec6c79ceccb3b6fce2d0e98fae714d373db46708423859869759705dacce5daede
+EBUILD lsof-4.88-r1.ebuild 3066 SHA256 34ae2cb855f9dcd3957e9e0b84619595a523e03bdd52a69ffc4546db3aa8d667 SHA512 aea5aac5c61fbb5f2b252ced65f177cc1fb36b2a26400ac6589e9461604472d0ea372f28eec585e8b812325d8c8327047c4429f6cfe997a4c500dbc164cfd9fa WHIRLPOOL 2c0cee94d10e0a94ff36fc693bb32fb9c714ae0b76c8449e66c7be02576bda471f70e3e2492be4b341dfb1079ab1dc0aaeb7f1f1353d7977100f6ce5f959379a
+EBUILD lsof-4.88.ebuild 3016 SHA256 7d1d90c9782d502b7742526c99c66599ca69045fb7b76e0adefe5432b4516032 SHA512 fedecbdbe05e1b5387430ec42eaa965d36ec76182ffa18e487bd5ba35a07b07302477f1d0d31fea641ceb6bc8646001aabc0e79dd5df2d7250be1a615e1f19d7 WHIRLPOOL f3cb100315de1592c3d65d201250a5fccc9be0f6d5da520081ecc4d5e4840b007ba51fa0bf5e3601c5d5e2725d0efa1874d6e040dc133634238367df88d00ff7
+MISC ChangeLog 17724 SHA256 7e268fa1536b004623a0c3b9d363e8314465937308d60d9d632e36575c38cc62 SHA512 fa2a2310a5a983c53f7b265da8795b85cd7f5e9bee9fa38fd2f050c31fa058fb010db950409aa1ef60e1a3ec42223fb0c5f7c70696be5a177730e1c23f3a52de WHIRLPOOL 9a806dc3f872a131bef97430dfc08935fd093d11546dc5111cf06e55566c82daa21944d51b86b5d1514212a0eb1977495ed4f57404e559a4229f68f8b3e47010
 MISC metadata.xml 238 SHA256 27f27d7c7ba9fb670a6867a79ff8af354e48735f9bd672d387d96b4bd49d415b SHA512 b8434ca8a5f116234268cca5c8d7cf20b3187e1f2c326bfe3693e2e85c2dac961618b39a20d0d5b7a01744b5159057e2861eeaff7fef6a08e0fc4c1b47bbf778 WHIRLPOOL f3ada27de4f86d469929230f1649727d91cc303e007ae728038062a04522053f0b49559d5bc4b6dd203744ba117d1577d03d62a1cb5d7c24c86c268edf057761
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUgzEWAAoJELp701BxlEWfME4P/22Vn2j7QV14aWgehgmTEVxU
-ChJpFmMdkmU9wyW3GBADuY0M/8KOq7qUUx3JqDi7NVMZnkfzugpJFuEwsVnmnbmv
-lCUOEbwBXRMZh9V31ufh0xwiRovX32tEMsIB10OsdUkC6UaFmpLOmucPaSqO7MiV
-P9HVdL6plwHlVlQj6BkLjAitB4nvWuMUB2/VmGcYnNKXpb1F+J13wUnphWHUeaEY
-oormQwYwrcJWf0mIVWEiChudQwVENKLLxGxVUW0OEzHIynW7Rup9HXxxvdRwJnAr
-f006MOKxJdgIoR+G74W1d8vnzfype+2h3nzs04FcHfwlH8fADVd3eRGQW/Im9sXM
-ulvGsVkqWWS8AegBNU8G1BJ2XR9fnxxnTsBoqUc9l3HhZ6Tn+/uwx+P5hjL8gsRg
-uo2UdgiXsC+JIwep7V9EzWglZFdgB6UVKDBDIxsDYDAdaLyPq3lBTFt5/fThAGil
-AypgVl3Pt+BewpeSeWMuB+Wc9rqZObm73KFlOCBEYqYVA96WAuzACDbGAoTV7bHp
-PIYJnJ9nbWeVPqBWJW9c8ttNLWrFYoY5Q1BrBdmFp+Eg2eEJy8VxLFVUvoVYUTsT
-fmzmByQi18o+Cm1zHfZ4GrkpisaVGWDjsbxL9c7vD+LUAGf29d7WYCdg5uXA9Iq5
-fYKuzVxGIw2icuV1zF7Y
-=zVK9
+iQIcBAEBCAAGBQJVLZn2AAoJEPGu1DbS6WIA7xAP/0T3yBx1c5kQGapMlgNBInK4
+bkBN8gYmdSmXmGmx7rdKgVzJO7Sx+KN7rMXnmX6/n4nFb+53ElpnLqMEiVpz1aXw
+47DyeCiELknLa5RhmiX/jL0KiGMmrLjWTS5XfxUWQrfjZQ4u+xjfju8cyKcs4U/9
+R0SFifOvkC8gWeqecTzcbWvrhZzyKuibpTO9CRkywTBJ3R1dOSV1LW1INqXW9vCQ
+zEp2mFpcwJzzKXrgR0FZP/cyNDiLH0c15SPuTpgriccMNTTuwaF//44OahyzpkJ8
+gSIqZSWrC9cnjCUSARBFPsBOwYZRg+rAHi9Opo0/XwmNu6DQnTFyE8sG0SbZ+Xki
+FKkRNHRZG80PshdDza0nV0Ev86BigJP2ge0qQsZV8r7rD7O5FbaRCoyiar2fI9yI
+hRSmXVJjZyANqdamoF87VqltIXcdfVB0xEL6OrTArdsLzdR7zTwFcsBwKbtK5MqF
+YzQZOnkJ/TIiUmRGeWnjA9E5w7kznzTigL5aSttwevt1sngCZYGJyF85mgqvCtCN
+mISBypXJlDaGnVGBCgTCeeGPQz2xQjoz6CTSE/7AzKQgA0UadwsACkVVUZ1zg862
+Wu+zxWcs5prVaXWMg5/GojIJrCxA6FjChjOv3p3PXSx1cXdi0zru/pt7pNqbqr6Y
+xJvGlJ/w8BFO5pT90RRZ
+=8NN4
 -----END PGP SIGNATURE-----
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 000000000000..28640a9e65ed
--- /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.88-r1.ebuild b/sys-process/lsof/lsof-4.88-r1.ebuild
new file mode 100644
index 000000000000..346dcf923e6c
--- /dev/null
+++ b/sys-process/lsof/lsof-4.88-r1.ebuild
@@ -0,0 +1,102 @@
+# 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.88-r1.ebuild,v 1.1 2015/04/14 22:51:33 vapier Exp $
+
+EAPI="4"
+
+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://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/${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"
+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}"/${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:' \
+		-e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \
+		Configure || die
+}
+
+target() {
+	case ${CHOST} in
+	*-darwin*)  echo darwin  ;;
+	*-freebsd*) echo freebsd ;;
+	*-solaris*) echo solaris ;;
+	*-aix*)     echo aixgcc  ;;
+	*)          echo linux   ;;
+	esac
+}
+
+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
+}
+
+src_install() {
+	dobin lsof
+
+	if use examples ; then
+		insinto /usr/share/lsof/scripts
+		doins scripts/*
+	fi
+
+	doman lsof.8
+	dodoc 00*
+}
+
+pkg_postinst() {
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		einfo "Note: to use lsof on Solaris you need read permissions on"
+		einfo "/dev/kmem, i.e. you need to be root, or to be in the group sys"
+	elif [[ ${CHOST} == *-aix* ]] ; then
+		einfo "Note: to use lsof on AIX you need read permissions on /dev/mem and"
+		einfo "/dev/kmem, i.e. you need to be root, or to be in the group system"
+	fi
+}