[packages/lsof] - dropped unused patch; add upstream patch that is fixing 'unwanted pipe file output'

[arekm]

commit fffadb3bc43f1487cb678c3a5114ae707c0a84da
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri May 15 08:34:27 2015 +0200

    - dropped unused patch; add upstream patch that is fixing 'unwanted pipe file output'

 lsof-4.88-pipe-files.patch  | 12 ++++++++++++
 lsof-linux-ipv6mapped.patch | 25 -------------------------
 lsof.spec                   |  4 +++-
 3 files changed, 15 insertions(+), 26 deletions(-)
---
diff --git a/lsof.spec b/lsof.spec
index f25895e..4f670fe 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -11,7 +11,7 @@ License:	Free
 Group:		Applications/System
 Source0:	ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/%{name}_%{version}.tar.bz2
 # Source0-md5:	1b29c10db4aa88afcaeeaabeef6790db
-Patch0:		%{name}-linux-ipv6mapped.patch
+Patch0:		lsof-4.88-pipe-files.patch
 URL:		http://people.freebsd.org/~abe/
 BuildRequires:	libselinux-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -50,6 +50,8 @@ Lsof - це скорочення від LiSt Open Files. Саме це прог
 %setup -q -c
 cd %{name}_%{version}
 tar xf %{name}_%{version}_src.tar
+cd %{name}_%{version}_src
+%patch0 -p1
 
 %build
 cd %{name}_%{version}/%{name}_%{version}_src
diff --git a/lsof-4.88-pipe-files.patch b/lsof-4.88-pipe-files.patch
new file mode 100644
index 0000000..638e0a7
--- /dev/null
+++ b/lsof-4.88-pipe-files.patch
@@ -0,0 +1,12 @@
+diff -upr lsof_4.88-rh.orig/dialects/linux/dnode.c lsof_4.88-rh/dialects/linux/dnode.c
+--- lsof_4.88-rh.orig/dialects/linux/dnode.c	2014-10-14 00:26:03.000000000 +0200
++++ lsof_4.88-rh/dialects/linux/dnode.c	2015-01-05 19:57:05.562294509 +0100
+@@ -580,7 +580,7 @@ process_proc_node(p, pbr, s, ss, l, ls)
+ 	    Lf->inp_ty = 1;
+ 
+ #if	defined(HASEPTOPTS)
+-	    if (Lf->ntype == N_FIFO) {
++	    if ((Lf->ntype == N_FIFO) && FpipeE) {
+ 	    	(void) enter_pinfo();
+ 		Lf->sf |= SELPINFO;
+ 	    }
diff --git a/lsof-linux-ipv6mapped.patch b/lsof-linux-ipv6mapped.patch
deleted file mode 100644
index 88efeff..0000000
--- a/lsof-linux-ipv6mapped.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urN lsof_4.45.orig/dialects/linux/proc/dsock.c lsof_4.45/dialects/linux/proc/dsock.c
---- lsof_4.45.orig/dialects/linux/proc/dsock.c	Fri Aug  6 14:41:52 1999
-+++ lsof_4.45/dialects/linux/proc/dsock.c	Fri Aug  6 14:45:07 1999
-@@ -1571,13 +1571,17 @@
- 	    Lf->inp_ty = 2;
- 	    (void) sprintf(dev_ch, "%ld", (long)s->st_ino);
- 	    enter_dev_ch(dev_ch);
--	    if (!IN6_IS_ADDR_UNSPECIFIED(&tp6->faddr) || tp6->fport)
-+	    if (!IN6_IS_ADDR_UNSPECIFIED(&tp6->faddr) || tp6->fport) {
- 		fa = (unsigned char *)&tp6->faddr;
--	    else
-+		if (IN6_IS_ADDR_V4MAPPED(&tp6->faddr))
-+		    Lf->type[3] = '4';
-+	    } else
- 		fa = (unsigned char *)NULL;
--	    if (!IN6_IS_ADDR_UNSPECIFIED(&tp6->laddr) || tp6->lport)
-+	    if (!IN6_IS_ADDR_UNSPECIFIED(&tp6->laddr) || tp6->lport) {
- 		la = (unsigned char *)&tp6->laddr;
--	    else
-+		if (IN6_IS_ADDR_V4MAPPED(&tp6->laddr))
-+		    Lf->type[3] = '4';
-+	    } else
- 		la = (unsigned char *)NULL;
- 	    ent_inaddr(la, tp6->lport, fa, tp6->fport, AF_INET6);
- 	    Lf->lts.type = tp6->proto;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lsof.git/commitdiff/fffadb3bc43f1487cb678c3a5114ae707c0a84da