Add fix from upstream.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

3 files changed, 130 insertions, 1 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/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
+}