From e0aa365d041d0deb0c5484cc2fa79293c35ddd83 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Tue, 19 Feb 2008 10:36:00 +0000
Subject: [PATCH 01/71] - Autorebuild for GCC 4.3

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 8ecb96e..37fb7bc 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.78
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Distributable
 Group: Development/Debuggers
 
@@ -59,6 +59,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 4.78-8
+- Autorebuild for GCC 4.3
+
 * Wed Oct  3 2007 Karel Zak <kzak@redhat.com> 4.78-7
 - update selinux and inode patches (new versions are based on upstream)
 

From 5d534cc73ca36b5cd054e1928440e88022299476 Mon Sep 17 00:00:00 2001
From: kzak <kzak@fedoraproject.org>
Date: Mon, 19 May 2008 23:50:03 +0000
Subject: [PATCH 02/71] - upgrade to 4.80 - lsof_4.78C-inode.patch - merged
 upstream - lsof_4.78C-selinux.patch - merged upstream -
 lsof_4.78C-threads.patch - rebased

---
 .cvsignore                                    |   2 +-
 lsof.spec                                     |  20 +-
 lsof_4.78C-inode.patch                        | 337 ------------------
 lsof_4.78C-selinux.patch                      | 113 ------
 ...C-threads.patch => lsof_4.80-threads.patch |  47 +--
 sources                                       |   2 +-
 upstream2downstream.sh                        |   4 +-
 7 files changed, 38 insertions(+), 487 deletions(-)
 delete mode 100644 lsof_4.78C-inode.patch
 delete mode 100644 lsof_4.78C-selinux.patch
 rename lsof_4.78C-threads.patch => lsof_4.80-threads.patch (71%)

diff --git a/.cvsignore b/.cvsignore
index 863218e..a4940a5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lsof_4.78C-rh.tar.bz2
+lsof_4.80-rh.tar.bz2
diff --git a/lsof.spec b/lsof.spec
index 37fb7bc..e1cc70b 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.78
-Release: 8%{?dist}
+Version: 4.80
+Release: 1%{?dist}
 License: Distributable
 Group: Development/Debuggers
 
@@ -11,7 +11,7 @@ Group: Development/Debuggers
 # The script you can found in CVS or download from:
 # http://cvs.fedoraproject.org/viewcvs/rpms/lsof/devel/upstream2downstream.sh
 #
-%define lsofrh lsof_4.78C-rh
+%define lsofrh lsof_4.80-rh
 Source0: %{lsofrh}.tar.bz2
 URL: ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof
 
@@ -19,9 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libselinux-devel
 
-Patch1: lsof_4.78C-threads.patch
-Patch2: lsof_4.78C-inode.patch
-Patch3: lsof_4.78C-selinux.patch
+Patch1: lsof_4.80-threads.patch
 
 %description
 Lsof stands for LiSt Open Files, and it does just that: it lists
@@ -32,10 +30,6 @@ UNIX system.
 %setup -q -n %{lsofrh}
 # 184338 - allow lsof access nptl threads
 %patch1 -p1
-# 243976 - mmap'd files with large inode numbers confuse lsof
-%patch2 -p1
-# 280651 - lsof prints entries in multiple lines when SElinux is disabled
-%patch3 -p1
 
 %build
 LSOF_VSTR=2.6.16 LINUX_BASE=/proc ./Configure -n linux
@@ -59,6 +53,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Tue May 20 2008 Karel Zak <kzak@redhat.com> 4.80-1
+- upgrade to 4.80
+  - lsof_4.78C-inode.patch - merged upstream
+  - lsof_4.78C-selinux.patch - merged upstream
+  - lsof_4.78C-threads.patch - rebased
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 4.78-8
 - Autorebuild for GCC 4.3
 
diff --git a/lsof_4.78C-inode.patch b/lsof_4.78C-inode.patch
deleted file mode 100644
index bff5baf..0000000
--- a/lsof_4.78C-inode.patch
+++ /dev/null
@@ -1,337 +0,0 @@
-diff -up lsof_4.78C-rh/dialects/linux/dnode.c.inode lsof_4.78C-rh/dialects/linux/dnode.c
---- lsof_4.78C-rh/dialects/linux/dnode.c.inode	2006-06-12 19:10:05.000000000 +0200
-+++ lsof_4.78C-rh/dialects/linux/dnode.c	2007-10-03 14:01:54.000000000 +0200
-@@ -191,7 +191,7 @@ get_locks(p)
- 	char buf[MAXPATHLEN], *ec, **fp;
- 	dev_t dev;
- 	int ex, i, h, mode, pid;
--	unsigned long inode;
-+	INODETYPE inode;
- 	struct llock *lp, *np;
- 	FILE *ls;
- 	long maj, min;
-@@ -267,7 +267,7 @@ get_locks(p)
- 	 */
- 	    ec = (char *)NULL;
- 	    if (!fp[7] || !*fp[7]
--	    ||  (inode = strtoul(fp[7], &ec, 0)) == ULONG_MAX
-+	    ||  (inode = strtoull(fp[7], &ec, 0)) == ULONG_MAX
- 	    ||  !ec || *ec)
- 		continue;
- 	/*
-@@ -297,7 +297,7 @@ get_locks(p)
- 	    for (lp = LckH[h]; lp; lp = lp->next) {
- 		if (lp->pid == pid
- 		&&  lp->dev == dev
--		&&  lp->inode == (INODETYPE)inode
-+		&&  lp->inode == inode
- 		&&  lp->type == type)
- 		    break;
- 	    }
-@@ -307,14 +307,15 @@ get_locks(p)
- 	 * Allocate a new llock structure and link it to the PID hash bucket.
- 	 */
- 	    if (!(lp = (struct llock *)malloc(sizeof(struct llock)))) {
-+		(void) snpf(buf, sizeof(buf), InodeFmt_d, inode);
- 		(void) fprintf(stderr,
--		    "%s: can't allocate llock: PID %d; dev %x; inode %ld\n",
--		    Pn, pid, (int)dev, inode);
-+		    "%s: can't allocate llock: PID %d; dev %x; inode %s\n",
-+		    Pn, pid, (int)dev, buf);
- 		Exit(1);
- 	    }
- 	    lp->pid = pid;
- 	    lp->dev = dev;
--	    lp->inode = (INODETYPE)inode;
-+	    lp->inode = inode;
- 	    lp->type = type;
- 	    lp->next = LckH[h];
- 	    LckH[h] = lp;
-diff -up lsof_4.78C-rh/dialects/linux/dproc.c.inode lsof_4.78C-rh/dialects/linux/dproc.c
---- lsof_4.78C-rh/dialects/linux/dproc.c.inode	2007-10-03 14:01:54.000000000 +0200
-+++ lsof_4.78C-rh/dialects/linux/dproc.c	2007-10-03 14:01:54.000000000 +0200
-@@ -41,6 +41,9 @@ static char *rcsid = "$Id: dproc.c,v 1.1
- #include <selinux/selinux.h>
- #endif	/* defined(HASSELINUX) */
- 
-+#if     !defined(ULLONG_MAX)
-+#define ULLONG_MAX              18446744073709551615ULL
-+#endif  /* !defined(ULLONG_MAX) */
- 
- /*
-  * Local definitions
-@@ -790,7 +793,10 @@ process_proc_map(p, s, ss)
- 	    dev = (dev_t)makedev((int)maj, (int)min);
- 	    if (!fp[5] || !*fp[5])
- 		continue;
--	    inode = (INODETYPE)atoi(fp[5]);
-+	    ep = (char *)NULL;
-+	    if ((inode = strtoull(fp[5], &ep, 0)) == ULLONG_MAX
-+	    ||  !ep || *ep)
-+		continue;
- 	    if (!dev && !inode)
- 		continue;
- 	/*
-diff -up lsof_4.78C-rh/dialects/linux/dsock.c.inode lsof_4.78C-rh/dialects/linux/dsock.c
---- lsof_4.78C-rh/dialects/linux/dsock.c.inode	2006-06-12 19:10:05.000000000 +0200
-+++ lsof_4.78C-rh/dialects/linux/dsock.c	2007-10-03 14:02:39.000000000 +0200
-@@ -350,7 +350,8 @@ get_ax25(p)
- 	FILE *as;
- 	char buf[MAXPATHLEN], *da, *dev_ch, *ep, **fp, *sa;
- 	int h, nf;
--	unsigned long inode, rq, sq, state;
-+	INODETYPE inode;
-+	unsigned long rq, sq, state;
- 	MALLOC_S len;
- 	unsigned char rqs, sqs;
- /*
-@@ -410,12 +411,12 @@ get_ax25(p)
- 	 */
- 	    ep = (char *)NULL;
- 	    if (!fp[23] || !*fp[23]
--	    ||  (inode = strtoul(fp[23], &ep, 0)) == ULONG_MAX
-+	    ||  (inode = strtoull(fp[23], &ep, 0)) == ULONG_MAX
- 	    ||  !ep || *ep)
- 		continue;
- 	    h = INOHASH((INODETYPE)inode);
- 	    for (ap = AX25sin[h]; ap; ap = ap->next) {
--		if ((INODETYPE)inode == ap->inode)
-+		if (inode == ap->inode)
- 		    break;
- 	    }
- 	    if (ap)
-@@ -496,7 +497,7 @@ get_ax25(p)
- 	    }
- 	    ap->da = da;
- 	    ap->dev_ch = dev_ch;
--	    ap->inode = (INODETYPE)inode;
-+	    ap->inode = inode;
- 	    ap->rq = rq;
- 	    ap->rqs = rqs;
- 	    ap->sa = sa;
-@@ -521,7 +522,8 @@ get_ipx(p)
- 	char buf[MAXPATHLEN], *ep, **fp, *la, *ra;
- 	int fl = 1;
- 	int h;
--	unsigned long inode, rxq, state, txq;
-+	INODETYPE inode;
-+	unsigned long rxq, state, txq;
- 	struct ipxsin *ip, *np;
- 	MALLOC_S len;
- 	FILE *xs;
-@@ -588,12 +590,12 @@ get_ipx(p)
- 	 */
- 	    ep = (char *)NULL;
- 	    if (!fp[6] || !*fp[6]
--	    ||  (inode = strtoul(fp[6], &ep, 0)) == ULONG_MAX
-+	    ||  (inode = strtoull(fp[6], &ep, 0)) == ULONG_MAX
- 	    ||  !ep || *ep)
- 		continue;
--	    h = INOHASH((INODETYPE)inode);
-+	    h = INOHASH(inode);
- 	    for (ip = Ipxsin[h]; ip; ip = ip->next) {
--		if ((INODETYPE)inode == ip->inode)
-+		if (inode == ip->inode)
- 		    break;
- 	    }
- 	    if (ip)
-@@ -653,7 +655,7 @@ get_ipx(p)
- 		    Pn, sizeof(struct ipxsin));
- 		Exit(1);
- 	    }
--	    ip->inode = (INODETYPE)inode;
-+	    ip->inode = inode;
- 	    ip->la = la;
- 	    ip->ra = ra;
- 	    ip->txq = txq;
-@@ -676,7 +678,7 @@ get_raw(p)
- {
- 	char buf[MAXPATHLEN], *ep, **fp, *la, *ra, *sp;
- 	int h;
--	unsigned long inode;
-+	INODETYPE inode;
- 	int nf = 12;
- 	struct rawsin *np, *rp;
- 	MALLOC_S lal, ral, spl;
-@@ -741,12 +743,12 @@ get_raw(p)
- 	 */
- 	    ep = (char *)NULL;
- 	    if (!fp[9] || !*fp[9]
--	    ||  (inode = strtoul(fp[9], &ep, 0)) == ULONG_MAX
-+	    ||  (inode = strtoull(fp[9], &ep, 0)) == ULONG_MAX
- 	    ||  !ep || *ep)
- 		continue;
--	    h = INOHASH((INODETYPE)inode);
-+	    h = INOHASH(inode);
- 	    for (rp = Rawsin[h]; rp; rp = rp->next) {
--		if ((INODETYPE)inode == rp->inode)
-+		if (inode == rp->inode)
- 		    break;
- 	    }
- 	    if (rp)
-@@ -800,7 +802,7 @@ get_raw(p)
- 		    Pn, sizeof(struct rawsin));
- 		Exit(1);
- 	    }
--	    rp->inode = (INODETYPE)inode;
-+	    rp->inode = inode;
- 	    rp->la = la;
- 	    rp->lal = lal;
- 	    rp->ra = ra;
-@@ -825,9 +827,10 @@ get_tcpudp(p, pr, clr)
- 	int clr;			/* 1 == clear the table */
- {
- 	char buf[MAXPATHLEN], *ep, **fp;
--	unsigned long faddr, fport, inode, laddr, lport, rxq, state, txq;
-+	unsigned long faddr, fport, laddr, lport, rxq, state, txq;
- 	int h, nf;
- 	FILE *fs;
-+	INODETYPE inode;
- 	struct tcp_udp *np, *tp;
- /*
-  * Delete previous table contents.  Allocate a table for the first time.
-@@ -902,7 +905,7 @@ get_tcpudp(p, pr, clr)
- 	    ||  (fport = strtoul(fp[4], &ep, 16)) == ULONG_MAX || !ep || *ep)
- 		continue;
- 	/*
--	 * Get the state, queue sizes, and inode.
-+	 * Get the state and queue sizes.
- 	 */
- 	    ep = (char *)NULL;
- 	    if (!fp[5] || !*fp[5]
-@@ -921,11 +924,11 @@ get_tcpudp(p, pr, clr)
- 	 */
- 	    ep = (char *)NULL;
- 	    if (!fp[13] || !*fp[13]
--	    ||  (inode = strtoul(fp[13], &ep, 0)) == ULONG_MAX || !ep || *ep)
-+	    ||  (inode = strtoull(fp[13], &ep, 0)) == ULONG_MAX || !ep || *ep)
- 		continue;
--	    h = INOHASH((INODETYPE)inode);
-+	    h = INOHASH(inode);
- 	    for (tp = TcpUdp[h]; tp; tp = tp->next) {
--		if (tp->inode == (INODETYPE)inode)
-+		if (tp->inode == inode)
- 		    break;
- 	    }
- 	    if (tp)
-@@ -939,7 +942,7 @@ get_tcpudp(p, pr, clr)
- 		    Pn, sizeof(struct tcp_udp));
- 		Exit(1);
- 	    }
--	    tp->inode = (INODETYPE)inode;
-+	    tp->inode = inode;
- 	    tp->faddr = faddr;
- 	    tp->fport = (int)(fport & 0xffff);
- 	    tp->laddr = laddr;
-@@ -966,7 +969,7 @@ get_raw6(p)
- {
- 	char buf[MAXPATHLEN], *ep, **fp, *la, *ra, *sp;
- 	int h;
--	unsigned long inode;
-+	INODETYPE inode;
- 	int nf = 12;
- 	struct rawsin *np, *rp;
- 	MALLOC_S lal, ral, spl;
-@@ -1031,12 +1034,12 @@ get_raw6(p)
- 	 */
- 	    ep = (char *)NULL;
- 	    if (!fp[9] || !*fp[9]
--	    ||  (inode = strtoul(fp[9], &ep, 0)) == ULONG_MAX
-+	    ||  (inode = strtoull(fp[9], &ep, 0)) == ULONG_MAX
- 	    ||  !ep || *ep)
- 		continue;
--	    h = INOHASH((INODETYPE)inode);
-+	    h = INOHASH(inode);
- 	    for (rp = Rawsin6[h]; rp; rp = rp->next) {
--		if ((INODETYPE)inode == rp->inode)
-+		if (inode == rp->inode)
- 		    break;
- 	    }
- 	    if (rp)
-@@ -1090,7 +1093,7 @@ get_raw6(p)
- 		    Pn, sizeof(struct rawsin));
- 		Exit(1);
- 	    }
--	    rp->inode = (INODETYPE)inode;
-+	    rp->inode = inode;
- 	    rp->la = la;
- 	    rp->lal = lal;
- 	    rp->ra = ra;
-@@ -1116,9 +1119,10 @@ get_tcpudp6(p, pr, clr)
- {
- 	char buf[MAXPATHLEN], *ep, **fp;
- 	struct in6_addr faddr, laddr;
--	unsigned long fport, inode, lport, rxq, state, txq;
-+	unsigned long fport, lport, rxq, state, txq;
- 	int h, nf;
- 	FILE *fs;
-+	INODETYPE inode;
- 	struct tcp_udp6 *np6, *tp6;
- /*
-  * Delete previous table contents.  Allocate a table for the first time.
-@@ -1189,7 +1193,7 @@ get_tcpudp6(p, pr, clr)
- 	    ||  (fport = strtoul(fp[4], &ep, 16)) == ULONG_MAX || !ep || *ep)
- 		continue;
- 	/*
--	 * Get the state, queue sizes, and inode.
-+	 * Get the state and queue sizes.
- 	 */
- 	    ep = (char *)NULL;
- 	    if (!fp[5] || !*fp[5]
-@@ -1208,11 +1212,11 @@ get_tcpudp6(p, pr, clr)
- 	 */
- 	    ep = (char *)NULL;
- 	    if (!fp[13] || !*fp[13]
--	    ||  (inode = strtoul(fp[13], &ep, 0)) == ULONG_MAX || !ep || *ep)
-+	    ||  (inode = strtoull(fp[13], &ep, 0)) == ULONG_MAX || !ep || *ep)
- 		continue;
--	    h = INOHASH((INODETYPE)inode);
-+	    h = INOHASH(inode);
- 	    for (tp6 = TcpUdp6[h]; tp6; tp6 = tp6->next) {
--		if (tp6->inode == (INODETYPE)inode)
-+		if (tp6->inode == inode)
- 		    break;
- 	    }
- 	    if (tp6)
-@@ -1226,7 +1230,7 @@ get_tcpudp6(p, pr, clr)
- 		    Pn, sizeof(struct tcp_udp6));
- 		Exit(1);
- 	    }
--	    tp6->inode = (INODETYPE)inode;
-+	    tp6->inode = inode;
- 	    tp6->faddr = faddr;
- 	    tp6->fport = (int)(fport & 0xffff);
- 	    tp6->laddr = laddr;
-@@ -1254,7 +1258,7 @@ get_unix(p)
- 	char buf[MAXPATHLEN], *ep, **fp, *path, *pcb;
- 	int fl = 1;
- 	int h, nf;
--	unsigned long inode;
-+	INODETYPE inode;
- 	MALLOC_S len;
- 	struct uxsin *np, *up;
- 	FILE *us;
-@@ -1319,11 +1323,11 @@ get_unix(p)
- 	 */
- 	    ep = (char *)NULL;
- 	    if (!fp[6] || !*fp[6]
--	    ||  (inode = strtoul(fp[6], &ep, 0)) == ULONG_MAX || !ep || *ep)
-+	    ||  (inode = strtoull(fp[6], &ep, 0)) == ULONG_MAX || !ep || *ep)
- 		continue;
--	    h = INOHASH((INODETYPE)inode);
-+	    h = INOHASH(inode);
- 	    for (up = Uxsin[h]; up; up = up->next) {
--		if ((INODETYPE)inode == up->inode)
-+		if (inode == up->inode)
- 		    break;
- 	    }
- 	    if (up)
-@@ -1362,7 +1366,7 @@ get_unix(p)
- 		    Pn, sizeof(struct uxsin));
- 		Exit(1);
- 	    }
--	    up->inode = (INODETYPE)inode;
-+	    up->inode = inode;
- 	    up->pcb = pcb;
- 	    up->sb_def = 0;
- 	    if ((up->path = path) && (*path == '/')) {
diff --git a/lsof_4.78C-selinux.patch b/lsof_4.78C-selinux.patch
deleted file mode 100644
index 106dce2..0000000
--- a/lsof_4.78C-selinux.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff -up lsof_4.78C-rh/proc.c.selinux lsof_4.78C-rh/proc.c
---- lsof_4.78C-rh/proc.c.selinux	2006-06-12 19:10:02.000000000 +0200
-+++ lsof_4.78C-rh/proc.c	2007-10-03 12:15:57.000000000 +0200
-@@ -968,7 +968,7 @@ print_proc()
- #endif	/* defined(HASZONES) */
-  
- #if	defined(HASSELINUX)
--	    if (FieldSel[LSOF_FIX_CNTX].st && Fcntx && Lp->cntx)
-+	    if (FieldSel[LSOF_FIX_CNTX].st && Fcntx && Lp->cntx && CntxStatus)
- 		(void) printf("%c%s%c", LSOF_FID_CNTX, Lp->cntx, Terminator);
- #endif	/* defined(HASSELINUX) */
- 
-diff -up lsof_4.78C-rh/store.c.selinux lsof_4.78C-rh/store.c
---- lsof_4.78C-rh/store.c.selinux	2006-06-12 19:10:03.000000000 +0200
-+++ lsof_4.78C-rh/store.c	2007-10-03 12:15:57.000000000 +0200
-@@ -70,7 +70,9 @@ lsof_rx_t *CmdRx = (lsof_rx_t *)NULL;
- cntxlist_t *CntxArg = (cntxlist_t *)NULL;
- 				/* security context arguments supplied with
- 				 * -Z */
--int CntxColW;			/* security context  column width */
-+int CntxColW;			/* security context column width */
-+int CntxStatus = 0;		/* security context status: 0 == disabled,
-+				 * 1 == enabled */
- #endif	/* defined(HASSELINUX) */
- 
- #if	defined(HASDCACHE)
-diff -up lsof_4.78C-rh/dialects/linux/dproc.c.selinux lsof_4.78C-rh/dialects/linux/dproc.c
---- lsof_4.78C-rh/dialects/linux/dproc.c.selinux	2007-10-03 12:15:57.000000000 +0200
-+++ lsof_4.78C-rh/dialects/linux/dproc.c	2007-10-03 12:17:22.000000000 +0200
-@@ -468,7 +468,7 @@ gather_proc_info()
- 		    Lp->cntx = (char *)NULL;
- 		    if (!Fwarn) {
- 			(void) snpf(nmabuf, sizeof(nmabuf),
--			    "(getpidcon: %s)\n", strerror(errno));
-+			    "(getpidcon: %s)", strerror(errno));
- 			if (!(Lp->cntx = strdup(nmabuf))) {
- 			    (void) fprintf(stderr,
- 				"%s: no context error space: PID %ld",
-diff -up lsof_4.78C-rh/usage.c.selinux lsof_4.78C-rh/usage.c
---- lsof_4.78C-rh/usage.c.selinux	2006-06-12 19:10:03.000000000 +0200
-+++ lsof_4.78C-rh/usage.c	2007-10-03 12:15:57.000000000 +0200
-@@ -787,7 +788,10 @@ usage(xv, fh, version)
- 		    continue;
- #endif	/* !defined(HASZONES) */
-  
--#if	!defined(HASSELINUX)
-+#if	defined(HASSELINUX)
-+		if ((FieldSel[i].id == LSOF_FID_CNTX) && !CntxStatus)
-+		    continue;
-+#else	/* !defined(HASSELINUX) */
- 		if (FieldSel[i].id == LSOF_FID_CNTX)
- 		    continue;
- #endif	/* !defined(HASSELINUX) */
-diff -up lsof_4.78C-rh/main.c.selinux lsof_4.78C-rh/main.c
---- lsof_4.78C-rh/main.c.selinux	2006-06-12 19:10:02.000000000 +0200
-+++ lsof_4.78C-rh/main.c	2007-10-03 12:15:57.000000000 +0200
-@@ -84,14 +84,20 @@ main(argc, argv)
- 	int version = 0;
- 	int xover = 0;
- 
--#if	defined(HASSELINUX)
--	cntxlist_t *cntxp;
--#endif	/* defined(HASSELINUX) */
--
- #if	defined(HASZONES)
- 	znhash_t *zp;
- #endif	/* defined(HASZONES) */
- 
-+#if	defined(HASSELINUX)
-+/*
-+ * This stanza must be immediately before the "Save progam name." code, since
-+ * it contains code itself.
-+ */
-+	cntxlist_t *cntxp;
-+
-+	CntxStatus = is_selinux_enabled() ? 1 : 0;
-+#endif	/* defined(HASSELINUX) */
-+
- /*
-  * Save program name.
-  */
-@@ -414,7 +420,10 @@ main(argc, argv)
- 			    continue;
- #endif	/* !defined(HASZONES) */
-  
--#if	!defined(HASSELINUX)
-+#if	defined(HASSELINUX)
-+			if ((FieldSel[i].id == LSOF_FID_CNTX) && !CntxStatus)
-+			    continue;
-+#else	/* !defined(HASSELINUX) */
- 			if (FieldSel[i].id == LSOF_FID_CNTX)
- 			    continue;
- #endif	/* !defined(HASSELINUX) */
-@@ -822,7 +831,7 @@ main(argc, argv)
-  
- #if	defined(HASSELINUX)
- 	    case 'Z':
--		if (!is_selinux_enabled()) {
-+		if (!CntxStatus) {
- 		   (void) fprintf(stderr, "%s: -Z limited to SELinux\n", Pn);
- 		    err = 1;
- 		} else {
-diff -up lsof_4.78C-rh/lsof.h.selinux lsof_4.78C-rh/lsof.h
---- lsof_4.78C-rh/lsof.h.selinux	2006-06-12 19:10:02.000000000 +0200
-+++ lsof_4.78C-rh/lsof.h	2007-10-03 12:15:57.000000000 +0200
-@@ -548,6 +548,7 @@ typedef struct cntxlist {
- 	struct cntxlist *next;		/* next zone hash entry */
- } cntxlist_t;
- extern cntxlist_t *CntxArg;
-+extern int CntxStatus;
- # endif	/* defined(HASSELINUX) */
- 
- # if	defined(HASDCACHE)
diff --git a/lsof_4.78C-threads.patch b/lsof_4.80-threads.patch
similarity index 71%
rename from lsof_4.78C-threads.patch
rename to lsof_4.80-threads.patch
index 6f28078..b80a2f6 100644
--- a/lsof_4.78C-threads.patch
+++ b/lsof_4.80-threads.patch
@@ -1,8 +1,9 @@
---- lsof_4.78C-rh/dialects/linux/dproc.c.kzak	2006-06-12 19:10:05.000000000 +0200
-+++ lsof_4.78C-rh/dialects/linux/dproc.c	2006-08-10 00:14:23.000000000 +0200
-@@ -69,7 +69,8 @@
- _PROTOTYPE(static int read_proc_stat,(char *p, int pid, char **cmd, int *ppid,
- 	   int *pgid));
+diff -up lsof_4.80-rh/dialects/linux/dproc.c.th lsof_4.80-rh/dialects/linux/dproc.c
+--- lsof_4.80-rh/dialects/linux/dproc.c.th	2008-04-15 15:32:34.000000000 +0200
++++ lsof_4.80-rh/dialects/linux/dproc.c	2008-05-20 01:21:39.000000000 +0200
+@@ -84,7 +84,8 @@ _PROTOTYPE(static void process_proc_map,
+ _PROTOTYPE(static int process_id,(char *idp, int idpl, char *cmd, UID_ARG uid,
+ 				  int pid, int ppid, int pgid));
  _PROTOTYPE(static int statEx,(char *p, struct stat *s, int *ss));
 - 
 +_PROTOTYPE(static int get_other_thread,(int pid, char **tid));
@@ -10,17 +11,17 @@
  
  #if	defined(HASSELINUX)
  _PROTOTYPE(static int cmp_cntx_eq,(char *pcntx, char *ucntx));
-@@ -148,6 +149,7 @@
- 	static char *path = (char *)NULL;
- 	static int pathl = 0;
- 	int pgid, pid, ppid;
+@@ -154,6 +155,7 @@ gather_proc_info()
+ 	struct dirent *dp;
+ 	struct stat sb;
+ 	int lwp, n, nl, pgid, pid, ppid, rv, tx;
 +	char *tid = NULL;
- 	static char *pidpath = (char *)NULL;
- 	static MALLOC_S pidpathl = 0;
- 	static MALLOC_S pidx = 0;
-@@ -253,6 +255,13 @@
- 	    }
- 	    if (f)
+ 	static char *lwppath = (char *)NULL;
+ 	static int lwppathl = 0;
+ 	static char *path = (char *)NULL;
+@@ -246,6 +248,13 @@ gather_proc_info()
+ 	while ((dp = readdir(ps))) {
+ 	    if (nm2id(dp->d_name, &pid, &n))
  		continue;
 +
 +	    tid = NULL;
@@ -32,7 +33,7 @@
  	/*
  	 * Build path to PID's directory.
  	 */
-@@ -266,7 +275,14 @@
+@@ -259,7 +268,14 @@ gather_proc_info()
  		    Exit(1);
  		}
  	    }
@@ -48,8 +49,8 @@
  	    n += (pidx + 1);
  	/*
  	 * Process the PID's stat info.
-@@ -897,6 +913,64 @@
- 	(void) fclose(ms);
+@@ -1016,6 +1032,64 @@ process_id(idp, idpl, cmd, uid, pid, ppi
+ 	return(0);
  }
  
 +/* fill tid if the initial thread is zombie, 
@@ -112,15 +113,15 @@
 +}
  
  /*
-  * read_proc_stat() - read process status
-@@ -931,12 +1005,6 @@
- 	if ((nf = get_fields(buf, (char *)NULL, &fp, (int *)NULL, 0)) < 5)
+  * process_proc_map() - process the memory map of a process
+@@ -1259,12 +1333,6 @@ read_id_stat(ty, p, id, cmd, ppid, pgid)
  	    return(1);
+ 	}
  /*
 - * Convert the first field to an integer; its conversion must match the
-- * PID argument.
+- * ID argument.
 - */
--	if (atoi(fp[0]) != pid)
+-	if (!fp[0] || (atoi(fp[0]) != id))
 -	    return(1);
 -/*
   * Get the command name from the second field.  Strip a starting '(' and
diff --git a/sources b/sources
index 4658793..0741442 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a604dacc4544486634d5421f7d6d31b  lsof_4.78C-rh.tar.bz2
+f5db1a8e2cb8337ed043ca68178955e6  lsof_4.80-rh.tar.bz2
diff --git a/upstream2downstream.sh b/upstream2downstream.sh
index 4ef3e89..fb127bb 100755
--- a/upstream2downstream.sh
+++ b/upstream2downstream.sh
@@ -10,13 +10,13 @@
 #
 
 UPSTREAM="$1"
-NAME=$(basename $UPSTREAM .tar.gz)
+NAME=$(basename $UPSTREAM .tar.bz2)
 MYPWD=$(pwd)
 TMP=$(mktemp -d)
 
 echo
 echo -n "Extracting upstream code..."
-tar -zxf $UPSTREAM  -C $TMP
+tar -jxf $UPSTREAM  -C $TMP
 cd $TMP/$NAME
 tar xf "$NAME"_src.tar
 echo " done."

From a02b0601221b22ce64c32f9ebb5e1df68b854f14 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Thu, 7 Aug 2008 17:50:34 +0000
Subject: [PATCH 03/71] fix license tag

---
 lsof.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lsof.spec b/lsof.spec
index e1cc70b..25e2138 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,8 +1,8 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.80
-Release: 1%{?dist}
-License: Distributable
+Release: 2%{?dist}
+License: zlib
 Group: Development/Debuggers
 
 # lsof contains licensed code that we cannot ship.  Therefore we use
@@ -53,6 +53,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Thu Aug  7 2008 Tom "spot" Callaway <tcallawa@redhat.com> 4.80-2
+- fix license tag
+
 * Tue May 20 2008 Karel Zak <kzak@redhat.com> 4.80-1
 - upgrade to 4.80
   - lsof_4.78C-inode.patch - merged upstream

From a7e8a17b775b0f167bab7075f0faa687c1bd90b2 Mon Sep 17 00:00:00 2001
From: kzak <kzak@fedoraproject.org>
Date: Tue, 2 Dec 2008 12:16:44 +0000
Subject: [PATCH 04/71] - upgrade to 4.81 - lsof_4.80-threads.patch - rebased

---
 .cvsignore                                    |  2 +-
 lsof.spec                                     | 14 ++++++----
 ...0-threads.patch => lsof_4.81-threads.patch | 28 +++++++++----------
 sources                                       |  2 +-
 upstream2downstream.sh                        |  6 ++--
 5 files changed, 28 insertions(+), 24 deletions(-)
 rename lsof_4.80-threads.patch => lsof_4.81-threads.patch (81%)

diff --git a/.cvsignore b/.cvsignore
index a4940a5..6679372 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lsof_4.80-rh.tar.bz2
+lsof_4.81-rh.tar.bz2
diff --git a/lsof.spec b/lsof.spec
index 25e2138..23ca2a6 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.80
-Release: 2%{?dist}
+Version: 4.81
+Release: 1%{?dist}
 License: zlib
 Group: Development/Debuggers
 
@@ -11,7 +11,7 @@ Group: Development/Debuggers
 # The script you can found in CVS or download from:
 # http://cvs.fedoraproject.org/viewcvs/rpms/lsof/devel/upstream2downstream.sh
 #
-%define lsofrh lsof_4.80-rh
+%define lsofrh lsof_4.81-rh
 Source0: %{lsofrh}.tar.bz2
 URL: ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof
 
@@ -19,7 +19,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libselinux-devel
 
-Patch1: lsof_4.80-threads.patch
+# 184338 - allow lsof access nptl threads
+Patch1: lsof_4.81-threads.patch
 
 %description
 Lsof stands for LiSt Open Files, and it does just that: it lists
@@ -28,7 +29,6 @@ UNIX system.
 
 %prep
 %setup -q -n %{lsofrh}
-# 184338 - allow lsof access nptl threads
 %patch1 -p1
 
 %build
@@ -53,6 +53,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Tue Dec  2 2008 Karel Zak <kzak@redhat.com> 4.81-1
+- upgrade to 4.81
+  - lsof_4.80-threads.patch - rebased
+
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa@redhat.com> 4.80-2
 - fix license tag
 
diff --git a/lsof_4.80-threads.patch b/lsof_4.81-threads.patch
similarity index 81%
rename from lsof_4.80-threads.patch
rename to lsof_4.81-threads.patch
index b80a2f6..399819f 100644
--- a/lsof_4.80-threads.patch
+++ b/lsof_4.81-threads.patch
@@ -1,7 +1,7 @@
-diff -up lsof_4.80-rh/dialects/linux/dproc.c.th lsof_4.80-rh/dialects/linux/dproc.c
---- lsof_4.80-rh/dialects/linux/dproc.c.th	2008-04-15 15:32:34.000000000 +0200
-+++ lsof_4.80-rh/dialects/linux/dproc.c	2008-05-20 01:21:39.000000000 +0200
-@@ -84,7 +84,8 @@ _PROTOTYPE(static void process_proc_map,
+diff -up lsof_4.81-rh/dialects/linux/dproc.c.kzak lsof_4.81-rh/dialects/linux/dproc.c
+--- lsof_4.81-rh/dialects/linux/dproc.c.kzak	2008-10-21 18:17:25.000000000 +0200
++++ lsof_4.81-rh/dialects/linux/dproc.c	2008-12-02 10:54:54.000000000 +0100
+@@ -89,7 +89,8 @@ _PROTOTYPE(static void process_proc_map,
  _PROTOTYPE(static int process_id,(char *idp, int idpl, char *cmd, UID_ARG uid,
  				  int pid, int ppid, int pgid));
  _PROTOTYPE(static int statEx,(char *p, struct stat *s, int *ss));
@@ -11,7 +11,7 @@ diff -up lsof_4.80-rh/dialects/linux/dproc.c.th lsof_4.80-rh/dialects/linux/dpro
  
  #if	defined(HASSELINUX)
  _PROTOTYPE(static int cmp_cntx_eq,(char *pcntx, char *ucntx));
-@@ -154,6 +155,7 @@ gather_proc_info()
+@@ -159,6 +160,7 @@ gather_proc_info()
  	struct dirent *dp;
  	struct stat sb;
  	int lwp, n, nl, pgid, pid, ppid, rv, tx;
@@ -19,7 +19,7 @@ diff -up lsof_4.80-rh/dialects/linux/dproc.c.th lsof_4.80-rh/dialects/linux/dpro
  	static char *lwppath = (char *)NULL;
  	static int lwppathl = 0;
  	static char *path = (char *)NULL;
-@@ -246,6 +248,13 @@ gather_proc_info()
+@@ -252,6 +254,13 @@ gather_proc_info()
  	while ((dp = readdir(ps))) {
  	    if (nm2id(dp->d_name, &pid, &n))
  		continue;
@@ -33,7 +33,7 @@ diff -up lsof_4.80-rh/dialects/linux/dproc.c.th lsof_4.80-rh/dialects/linux/dpro
  	/*
  	 * Build path to PID's directory.
  	 */
-@@ -259,7 +268,14 @@ gather_proc_info()
+@@ -265,7 +274,14 @@ gather_proc_info()
  		    Exit(1);
  		}
  	    }
@@ -49,12 +49,12 @@ diff -up lsof_4.80-rh/dialects/linux/dproc.c.th lsof_4.80-rh/dialects/linux/dpro
  	    n += (pidx + 1);
  	/*
  	 * Process the PID's stat info.
-@@ -1016,6 +1032,64 @@ process_id(idp, idpl, cmd, uid, pid, ppi
+@@ -1007,6 +1023,64 @@ process_id(idp, idpl, cmd, uid, pid, ppi
  	return(0);
  }
  
-+/* fill tid if the initial thread is zombie, 
-+ * but other thread still alive 
++/* fill tid if the initial thread is zombie,
++ * but other thread still alive
 + *
 + * returns -1=error, 0=nothing, 1=ok
 + */
@@ -80,7 +80,7 @@ diff -up lsof_4.80-rh/dialects/linux/dproc.c.th lsof_4.80-rh/dialects/linux/dpro
 +		return -1;
 +	if (_pid != pid)
 +		return -1;		/* corrupted /proc? */
-+	if (pstate!='Z') 
++	if (pstate!='Z')
 +		return 0;		/* ignore normal proceses */
 +
 +	snpf(path, sizeof(path), "%s/%d/task", PROCFS, pid);
@@ -88,12 +88,12 @@ diff -up lsof_4.80-rh/dialects/linux/dproc.c.th lsof_4.80-rh/dialects/linux/dpro
 +	/* open /proc/<pid>/task */
 +	if (!(tdp = opendir(path)))
 +		return 0;		/* kernel < 2.6.x */
-+	
++
 +	/* look for first alive thread */
 +	while ((td = readdir(tdp))) {
 +		if (strcmp(td->d_name, ".")==0 || strcmp(td->d_name, "..")==0)
 +			continue;
-+		
++
 +		/* /proc/<pid>/task/<tid>/stat */
 +		snpf(path, sizeof(path), "%s/%d/task/%s/stat", PROCFS, pid, td->d_name);
 +		if (!(f = fopen(path, "r")))
@@ -114,7 +114,7 @@ diff -up lsof_4.80-rh/dialects/linux/dproc.c.th lsof_4.80-rh/dialects/linux/dpro
  
  /*
   * process_proc_map() - process the memory map of a process
-@@ -1259,12 +1333,6 @@ read_id_stat(ty, p, id, cmd, ppid, pgid)
+@@ -1250,12 +1324,6 @@ read_id_stat(ty, p, id, cmd, ppid, pgid)
  	    return(1);
  	}
  /*
diff --git a/sources b/sources
index 0741442..19bab65 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f5db1a8e2cb8337ed043ca68178955e6  lsof_4.80-rh.tar.bz2
+b5ef18418760dd304b223a4acb3e14d7  lsof_4.81-rh.tar.bz2
diff --git a/upstream2downstream.sh b/upstream2downstream.sh
index fb127bb..16d3746 100755
--- a/upstream2downstream.sh
+++ b/upstream2downstream.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 #
-# This script removes non-linux dialects from upstream source package before release.
-# There is a problem with copyrights for some UN*Xes ... also .. this script merges all
-# to the one normal tarball and rename all to lsof_X.XX-rh.
+# This script removes non-linux dialects from upstream source package before
+# release.  There is a problem with copyrights for some UN*Xes ... also .. this
+# script merges all to the one normal tarball and rename all to lsof_X.XX-rh.
 #
 # Usage:  ./upstream2downstream  <usptream-tarball>
 #

From 35cfceda22b129db3b9ec861fd5bba800b4acc63 Mon Sep 17 00:00:00 2001
From: kzak <kzak@fedoraproject.org>
Date: Fri, 30 Jan 2009 11:58:48 +0000
Subject: [PATCH 05/71] - fix #480694 - lsof manpage mismarked and formats
 badly

---
 lsof.spec           |  8 +++++++-
 lsof_4.81-man.patch | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 lsof_4.81-man.patch

diff --git a/lsof.spec b/lsof.spec
index 23ca2a6..41f689b 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.81
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: zlib
 Group: Development/Debuggers
 
@@ -21,6 +21,8 @@ BuildRequires: libselinux-devel
 
 # 184338 - allow lsof access nptl threads
 Patch1: lsof_4.81-threads.patch
+# 480694 - lsof manpage mismarked and formats badly
+Patch2: lsof_4.81-man.patch
 
 %description
 Lsof stands for LiSt Open Files, and it does just that: it lists
@@ -30,6 +32,7 @@ UNIX system.
 %prep
 %setup -q -n %{lsofrh}
 %patch1 -p1
+%patch2 -p1
 
 %build
 LSOF_VSTR=2.6.16 LINUX_BASE=/proc ./Configure -n linux
@@ -53,6 +56,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Fri Jan 30 2009 Karel Zak <kzak@redhat.com> 4.81-2
+- fix #480694 - lsof manpage mismarked and formats badly
+
 * Tue Dec  2 2008 Karel Zak <kzak@redhat.com> 4.81-1
 - upgrade to 4.81
   - lsof_4.80-threads.patch - rebased
diff --git a/lsof_4.81-man.patch b/lsof_4.81-man.patch
new file mode 100644
index 0000000..a20db67
--- /dev/null
+++ b/lsof_4.81-man.patch
@@ -0,0 +1,36 @@
+diff -up lsof_4.81-rh/lsof.8.kzak lsof_4.81-rh/lsof.8
+--- lsof_4.81-rh/lsof.8.kzak	2009-01-30 12:19:34.000000000 +0100
++++ lsof_4.81-rh/lsof.8	2009-01-30 12:54:00.000000000 +0100
+@@ -127,27 +127,27 @@ listing of all network files OR files be
+ by user ``foo''.
+ The exceptions are:
+ .IP
+-.TP \w'1) 'u
++.TP \w'1)'u+1
+ 1)
+ the `^' (negated) login name or user ID (UID), specified with the
+ .B \-u
+ option;
+-.TP \w'1) 'u
++.TP \w'1)'u+1
+ 2)
+ the `^' (negated) process ID (PID), specified with the
+ .B \-p
+ option;
+-.TP \w'1) 'u
++.TP \w'1)'u+1
+ 3)
+ the `^' (negated) process group ID (PGID), specified with the
+ .B \-g
+ option;
+-.TP \w'1) 'u
++.TP \w'1)'u+1
+ 4)
+ the `^' (negated) command, specified with the
+ .B \-c
+ option;
+-.TP \w'1) 'u
++.TP \w'1)'u+1
+ 5)
+ the ('^') negated TCP or UDP protocol state names, specified with the
+ .BI \-s " [p:s]"

From 269a8cc7473c2a92c6e5e493dc149394955fb386 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Wed, 25 Feb 2009 21:14:54 +0000
Subject: [PATCH 06/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 41f689b..a4927db 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.81
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: zlib
 Group: Development/Debuggers
 
@@ -56,6 +56,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.81-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Jan 30 2009 Karel Zak <kzak@redhat.com> 4.81-2
 - fix #480694 - lsof manpage mismarked and formats badly
 

From d3a1eb9c905077ef21e0b8acf1aa7a92b41661b7 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Sat, 25 Jul 2009 11:21:50 +0000
Subject: [PATCH 07/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index a4927db..96c6703 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.81
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: zlib
 Group: Development/Debuggers
 
@@ -56,6 +56,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.81-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.81-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 

From df43de004be2a8808d6354a57d9d0327dfcde9dc Mon Sep 17 00:00:00 2001
From: kzak <kzak@fedoraproject.org>
Date: Mon, 27 Jul 2009 09:09:34 +0000
Subject: [PATCH 08/71] - upgrade to 4.82 (see the 00DIST file for list of
 changes) - backport an upstream patch from 4.83A-linux - remove
 lsof_4.81-man.patch (fixed upstream)

---
 .cvsignore                    |  2 +-
 lsof.spec                     | 15 ++++++++++-----
 lsof_4.81-man.patch           | 36 -----------------------------------
 lsof_4.83A-selinux-typo.patch | 16 ++++++++++++++++
 sources                       |  2 +-
 5 files changed, 28 insertions(+), 43 deletions(-)
 delete mode 100644 lsof_4.81-man.patch
 create mode 100644 lsof_4.83A-selinux-typo.patch

diff --git a/.cvsignore b/.cvsignore
index 6679372..4fd07ce 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lsof_4.81-rh.tar.bz2
+lsof_4.82-rh.tar.bz2
diff --git a/lsof.spec b/lsof.spec
index 96c6703..0d31147 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.81
-Release: 4%{?dist}
+Version: 4.82
+Release: 1%{?dist}
 License: zlib
 Group: Development/Debuggers
 
@@ -11,7 +11,7 @@ Group: Development/Debuggers
 # The script you can found in CVS or download from:
 # http://cvs.fedoraproject.org/viewcvs/rpms/lsof/devel/upstream2downstream.sh
 #
-%define lsofrh lsof_4.81-rh
+%define lsofrh lsof_%{version}-rh
 Source0: %{lsofrh}.tar.bz2
 URL: ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof
 
@@ -21,8 +21,8 @@ BuildRequires: libselinux-devel
 
 # 184338 - allow lsof access nptl threads
 Patch1: lsof_4.81-threads.patch
-# 480694 - lsof manpage mismarked and formats badly
-Patch2: lsof_4.81-man.patch
+# Backport of upstream patch
+Patch2: lsof_4.83A-selinux-typo.patch
 
 %description
 Lsof stands for LiSt Open Files, and it does just that: it lists
@@ -56,6 +56,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Mon Jul 27 2009 Karel Zak <kzak@redhat.com> 4.82-1
+- upgrade to 4.82 (see the 00DIST file for list of changes)
+- backport an upstream patch from 4.83A-linux
+- remove lsof_4.81-man.patch (fixed upstream)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.81-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/lsof_4.81-man.patch b/lsof_4.81-man.patch
deleted file mode 100644
index a20db67..0000000
--- a/lsof_4.81-man.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up lsof_4.81-rh/lsof.8.kzak lsof_4.81-rh/lsof.8
---- lsof_4.81-rh/lsof.8.kzak	2009-01-30 12:19:34.000000000 +0100
-+++ lsof_4.81-rh/lsof.8	2009-01-30 12:54:00.000000000 +0100
-@@ -127,27 +127,27 @@ listing of all network files OR files be
- by user ``foo''.
- The exceptions are:
- .IP
--.TP \w'1) 'u
-+.TP \w'1)'u+1
- 1)
- the `^' (negated) login name or user ID (UID), specified with the
- .B \-u
- option;
--.TP \w'1) 'u
-+.TP \w'1)'u+1
- 2)
- the `^' (negated) process ID (PID), specified with the
- .B \-p
- option;
--.TP \w'1) 'u
-+.TP \w'1)'u+1
- 3)
- the `^' (negated) process group ID (PGID), specified with the
- .B \-g
- option;
--.TP \w'1) 'u
-+.TP \w'1)'u+1
- 4)
- the `^' (negated) command, specified with the
- .B \-c
- option;
--.TP \w'1) 'u
-+.TP \w'1)'u+1
- 5)
- the ('^') negated TCP or UDP protocol state names, specified with the
- .BI \-s " [p:s]"
diff --git a/lsof_4.83A-selinux-typo.patch b/lsof_4.83A-selinux-typo.patch
new file mode 100644
index 0000000..50e08a6
--- /dev/null
+++ b/lsof_4.83A-selinux-typo.patch
@@ -0,0 +1,16 @@
+
+ Upstream patch, backported from 4.83A-linux.
+                          -- kzak 27-Jul-2009
+
+diff -up lsof_4.82-rh/Configure.kzak lsof_4.82-rh/Configure
+--- lsof_4.82-rh/Configure.kzak	2009-07-27 09:50:15.000000000 +0200
++++ lsof_4.82-rh/Configure	2009-07-27 09:50:43.000000000 +0200
+@@ -2700,7 +2700,7 @@ return(0); }
+ 	LSOF_TMP1=1
+       fi	# }
+     else
+-      if test "X$LINUX_HASSELINUX" = "XY" -o "X$LINUX_HASSELINUX" = "xY" # {
++      if test "X$LINUX_HASSELINUX" = "XY" -o "X$LINUX_HASSELINUX" = "Xy" # {
+       then
+ 	LSOF_TMP1=1
+       fi	# }
diff --git a/sources b/sources
index 19bab65..0f4b6ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b5ef18418760dd304b223a4acb3e14d7  lsof_4.81-rh.tar.bz2
+1361fa10f97f4c151aaec52815cd9d60  lsof_4.82-rh.tar.bz2

From 8fc1fcdfadf6fe98810035ee83ef3c701157cbb1 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Wed, 25 Nov 2009 23:51:36 +0000
Subject: [PATCH 09/71] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9fb67bd..4df1a18 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: lsof
-# $Id: Makefile,v 1.1 2004/09/09 08:01:36 cvsdist Exp $
+# $Id: Makefile,v 1.2 2007/10/15 19:06:58 notting Exp $
 NAME := lsof
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From d722c5e68f260b06e74444a1ea62013b2c6e40de Mon Sep 17 00:00:00 2001
From: kzak <kzak@fedoraproject.org>
Date: Thu, 11 Feb 2010 11:14:40 +0000
Subject: [PATCH 10/71] - upgrade to 4.83 (see the 00DIST file for list of
 changes) - remove lsof_4.83A-selinux-typo.patch (fixed upstream)

---
 lsof.spec                     |  9 +++++----
 lsof_4.83A-selinux-typo.patch | 16 ----------------
 2 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 lsof_4.83A-selinux-typo.patch

diff --git a/lsof.spec b/lsof.spec
index 0d31147..7872a9f 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,6 +1,6 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.82
+Version: 4.83
 Release: 1%{?dist}
 License: zlib
 Group: Development/Debuggers
@@ -21,8 +21,6 @@ BuildRequires: libselinux-devel
 
 # 184338 - allow lsof access nptl threads
 Patch1: lsof_4.81-threads.patch
-# Backport of upstream patch
-Patch2: lsof_4.83A-selinux-typo.patch
 
 %description
 Lsof stands for LiSt Open Files, and it does just that: it lists
@@ -32,7 +30,6 @@ UNIX system.
 %prep
 %setup -q -n %{lsofrh}
 %patch1 -p1
-%patch2 -p1
 
 %build
 LSOF_VSTR=2.6.16 LINUX_BASE=/proc ./Configure -n linux
@@ -56,6 +53,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Thu Feb 11 2010 Karel Zak <kzak@redhat.com> 4.83-1
+- upgrade to 4.83 (see the 00DIST file for list of changes)
+- remove lsof_4.83A-selinux-typo.patch (fixed upstream)
+
 * Mon Jul 27 2009 Karel Zak <kzak@redhat.com> 4.82-1
 - upgrade to 4.82 (see the 00DIST file for list of changes)
 - backport an upstream patch from 4.83A-linux
diff --git a/lsof_4.83A-selinux-typo.patch b/lsof_4.83A-selinux-typo.patch
deleted file mode 100644
index 50e08a6..0000000
--- a/lsof_4.83A-selinux-typo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
- Upstream patch, backported from 4.83A-linux.
-                          -- kzak 27-Jul-2009
-
-diff -up lsof_4.82-rh/Configure.kzak lsof_4.82-rh/Configure
---- lsof_4.82-rh/Configure.kzak	2009-07-27 09:50:15.000000000 +0200
-+++ lsof_4.82-rh/Configure	2009-07-27 09:50:43.000000000 +0200
-@@ -2700,7 +2700,7 @@ return(0); }
- 	LSOF_TMP1=1
-       fi	# }
-     else
--      if test "X$LINUX_HASSELINUX" = "XY" -o "X$LINUX_HASSELINUX" = "xY" # {
-+      if test "X$LINUX_HASSELINUX" = "XY" -o "X$LINUX_HASSELINUX" = "Xy" # {
-       then
- 	LSOF_TMP1=1
-       fi	# }

From d8adf260865a6c58ba6f2eb13fa5e93bb437856d Mon Sep 17 00:00:00 2001
From: kzak <kzak@fedoraproject.org>
Date: Thu, 11 Feb 2010 11:16:14 +0000
Subject: [PATCH 11/71] - upload new sources

---
 .cvsignore | 2 +-
 sources    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 4fd07ce..60dc2e9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lsof_4.82-rh.tar.bz2
+lsof_4.83-rh.tar.bz2
diff --git a/sources b/sources
index 0f4b6ba..949956d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1361fa10f97f4c151aaec52815cd9d60  lsof_4.82-rh.tar.bz2
+ac9c43f18accdfc257f85b71de7cbcc4  lsof_4.83-rh.tar.bz2

From f428764912c4a205229b60c31378a951d1c95d34 Mon Sep 17 00:00:00 2001
From: kzak <kzak@fedoraproject.org>
Date: Fri, 19 Feb 2010 13:05:53 +0000
Subject: [PATCH 12/71] - minor changes in spec file (#226108 - Merge Review)

---
 lsof.spec              | 13 ++++++++-----
 upstream2downstream.sh |  2 ++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lsof.spec b/lsof.spec
index 7872a9f..fc98c92 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.83
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: zlib
 Group: Development/Debuggers
 
@@ -20,7 +20,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libselinux-devel
 
 # 184338 - allow lsof access nptl threads
-Patch1: lsof_4.81-threads.patch
+Patch0: lsof_4.81-threads.patch
 
 %description
 Lsof stands for LiSt Open Files, and it does just that: it lists
@@ -29,7 +29,7 @@ UNIX system.
 
 %prep
 %setup -q -n %{lsofrh}
-%patch1 -p1
+%patch0 -p1
 
 %build
 LSOF_VSTR=2.6.16 LINUX_BASE=/proc ./Configure -n linux
@@ -47,12 +47,15 @@ install -p lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
 rm -rf ${RPM_BUILD_ROOT}
 
 %files
-%defattr(644,root,root,755)
+%defattr(-,root,root,-)
 %doc 00*
-%attr(0755,root,root) %{_sbindir}/lsof
+%{_sbindir}/lsof
 %{_mandir}/man*/*
 
 %changelog
+* Fri Feb 19 2010 Karel Zak <kzak@redhat.com> 4.83-2
+- minor changes in spec file (#226108 - Merge Review)
+
 * Thu Feb 11 2010 Karel Zak <kzak@redhat.com> 4.83-1
 - upgrade to 4.83 (see the 00DIST file for list of changes)
 - remove lsof_4.83A-selinux-typo.patch (fixed upstream)
diff --git a/upstream2downstream.sh b/upstream2downstream.sh
index 16d3746..24cc993 100755
--- a/upstream2downstream.sh
+++ b/upstream2downstream.sh
@@ -5,6 +5,8 @@
 # script merges all to the one normal tarball and rename all to lsof_X.XX-rh.
 #
 # Usage:  ./upstream2downstream  <usptream-tarball>
+# 
+# This code is in the public domain; do with it what you wish.
 #
 # Copyright (C) 2007 Karel Zak <kzak@redhat.com>
 #

From 0eff75fd30e1d22d7dbf09d1127f44af672c090b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 02:36:37 +0000
Subject: [PATCH 13/71] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 2 files changed, 21 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 4df1a18..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: lsof
-# $Id: Makefile,v 1.2 2007/10/15 19:06:58 notting Exp $
-NAME := lsof
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

From 05395dd0ff5aa0aa41e461f03e3898b3a8b4ff31 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 15 Sep 2010 09:46:54 +0200
Subject: [PATCH 14/71] 4.84-1: upgrade to 4.84

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 .gitignore              |   2 +
 lsof.spec               |  17 +++---
 lsof_4.81-threads.patch | 129 ----------------------------------------
 sources                 |   2 +-
 4 files changed, 12 insertions(+), 138 deletions(-)
 delete mode 100644 lsof_4.81-threads.patch

diff --git a/.gitignore b/.gitignore
index 60dc2e9..9145c09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 lsof_4.83-rh.tar.bz2
+/lsof_4.84-rh.tar.bz2
+*~
diff --git a/lsof.spec b/lsof.spec
index fc98c92..d9ef5c4 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,15 +1,15 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.83
-Release: 2%{?dist}
+Version: 4.84
+Release: 1%{?dist}
 License: zlib
 Group: Development/Debuggers
 
 # lsof contains licensed code that we cannot ship.  Therefore we use
 # upstream2downstream.sh script to remove the code before shipping it.
 #
-# The script you can found in CVS or download from:
-# http://cvs.fedoraproject.org/viewcvs/rpms/lsof/devel/upstream2downstream.sh
+# The script you can found in SCM or download from:
+# http://pkgs.fedoraproject.org/gitweb/?p=lsof.git;a=blob_plain;f=upstream2downstream.sh
 #
 %define lsofrh lsof_%{version}-rh
 Source0: %{lsofrh}.tar.bz2
@@ -19,9 +19,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libselinux-devel
 
-# 184338 - allow lsof access nptl threads
-Patch0: lsof_4.81-threads.patch
-
 %description
 Lsof stands for LiSt Open Files, and it does just that: it lists
 information about files that are open by the processes running on a
@@ -29,7 +26,7 @@ UNIX system.
 
 %prep
 %setup -q -n %{lsofrh}
-%patch0 -p1
+#%patch0 -p1
 
 %build
 LSOF_VSTR=2.6.16 LINUX_BASE=/proc ./Configure -n linux
@@ -53,6 +50,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Wed Sep 15 2010 Karel Zak <kzak@redhat.com> 4.84-1
+- upgrade to 4.84
+- remove lsof_4.81-threads.patch, "lsof -K" provides basic support for tasks now
+
 * Fri Feb 19 2010 Karel Zak <kzak@redhat.com> 4.83-2
 - minor changes in spec file (#226108 - Merge Review)
 
diff --git a/lsof_4.81-threads.patch b/lsof_4.81-threads.patch
deleted file mode 100644
index 399819f..0000000
--- a/lsof_4.81-threads.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -up lsof_4.81-rh/dialects/linux/dproc.c.kzak lsof_4.81-rh/dialects/linux/dproc.c
---- lsof_4.81-rh/dialects/linux/dproc.c.kzak	2008-10-21 18:17:25.000000000 +0200
-+++ lsof_4.81-rh/dialects/linux/dproc.c	2008-12-02 10:54:54.000000000 +0100
-@@ -89,7 +89,8 @@ _PROTOTYPE(static void process_proc_map,
- _PROTOTYPE(static int process_id,(char *idp, int idpl, char *cmd, UID_ARG uid,
- 				  int pid, int ppid, int pgid));
- _PROTOTYPE(static int statEx,(char *p, struct stat *s, int *ss));
-- 
-+_PROTOTYPE(static int get_other_thread,(int pid, char **tid));
-+
- 
- #if	defined(HASSELINUX)
- _PROTOTYPE(static int cmp_cntx_eq,(char *pcntx, char *ucntx));
-@@ -159,6 +160,7 @@ gather_proc_info()
- 	struct dirent *dp;
- 	struct stat sb;
- 	int lwp, n, nl, pgid, pid, ppid, rv, tx;
-+	char *tid = NULL;
- 	static char *lwppath = (char *)NULL;
- 	static int lwppathl = 0;
- 	static char *path = (char *)NULL;
-@@ -252,6 +254,13 @@ gather_proc_info()
- 	while ((dp = readdir(ps))) {
- 	    if (nm2id(dp->d_name, &pid, &n))
- 		continue;
-+
-+	    tid = NULL;
-+	    if (get_other_thread(pid, &tid) < 0)
-+		continue;
-+	    if (tid)
-+		n += sizeof("task/") + strlen(tid);
-+
- 	/*
- 	 * Build path to PID's directory.
- 	 */
-@@ -265,7 +274,14 @@ gather_proc_info()
- 		    Exit(1);
- 		}
- 	    }
--	    (void) snpf(pidpath + pidx, pidpathl - pidx, "%s/", dp->d_name);
-+	    if (tid) {
-+		/* /proc/<pid> is useless (zombie), we have to use /proc/<pid>/task/<tid>
-+		 * where is still running thread
-+		 */
-+		(void) snpf(pidpath + pidx, pidpathl - pidx, "%s/task/%s/", dp->d_name, tid);
-+		free(tid);
-+	    } else
-+		(void) snpf(pidpath + pidx, pidpathl - pidx, "%s/", dp->d_name);
- 	    n += (pidx + 1);
- 	/*
- 	 * Process the PID's stat info.
-@@ -1007,6 +1023,64 @@ process_id(idp, idpl, cmd, uid, pid, ppi
- 	return(0);
- }
- 
-+/* fill tid if the initial thread is zombie,
-+ * but other thread still alive
-+ *
-+ * returns -1=error, 0=nothing, 1=ok
-+ */
-+static int
-+get_other_thread(pid, tid)
-+	int pid;
-+	char **tid;
-+{
-+	char path[MAXPATHLEN];
-+	DIR *tdp;
-+	struct dirent *td;
-+	char pstate;
-+	FILE *f;
-+	int _pid;
-+	int re = 0, x;
-+
-+	snpf(path, sizeof(path), "%s/%d/stat", PROCFS, pid);
-+	if (!(f = fopen(path, "r")))
-+		return -1;
-+	x = fscanf(f, "%d %*s %c", &_pid, &pstate);
-+	fclose(f);
-+	if (x!=2)
-+		return -1;
-+	if (_pid != pid)
-+		return -1;		/* corrupted /proc? */
-+	if (pstate!='Z')
-+		return 0;		/* ignore normal proceses */
-+
-+	snpf(path, sizeof(path), "%s/%d/task", PROCFS, pid);
-+
-+	/* open /proc/<pid>/task */
-+	if (!(tdp = opendir(path)))
-+		return 0;		/* kernel < 2.6.x */
-+
-+	/* look for first alive thread */
-+	while ((td = readdir(tdp))) {
-+		if (strcmp(td->d_name, ".")==0 || strcmp(td->d_name, "..")==0)
-+			continue;
-+
-+		/* /proc/<pid>/task/<tid>/stat */
-+		snpf(path, sizeof(path), "%s/%d/task/%s/stat", PROCFS, pid, td->d_name);
-+		if (!(f = fopen(path, "r")))
-+			continue;
-+		x = fscanf(f, "%*d %*s %c", &pstate);
-+		fclose(f);
-+		if (x!=1)
-+			continue;
-+		if (pstate!='Z') {
-+			re = 1;
-+			*tid = strdup(td->d_name);
-+			break;
-+		}
-+	}
-+	closedir(tdp);
-+	return re;
-+}
- 
- /*
-  * process_proc_map() - process the memory map of a process
-@@ -1250,12 +1324,6 @@ read_id_stat(ty, p, id, cmd, ppid, pgid)
- 	    return(1);
- 	}
- /*
-- * Convert the first field to an integer; its conversion must match the
-- * ID argument.
-- */
--	if (!fp[0] || (atoi(fp[0]) != id))
--	    return(1);
--/*
-  * Get the command name from the second field.  Strip a starting '(' and
-  * an ending ')'.  Allocate space to hold the result and return the space
-  * pointer.
diff --git a/sources b/sources
index 949956d..0e83c4d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac9c43f18accdfc257f85b71de7cbcc4  lsof_4.83-rh.tar.bz2
+131cabfb2f6804558c2ead7d57285def  lsof_4.84-rh.tar.bz2

From afe8ce913ef3d8d5dc185bad91b8f141afa5659b Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@redhat.com>
Date: Wed, 29 Sep 2010 14:45:15 -0700
Subject: [PATCH 15/71] - Rebuilt for gcc bug 634757

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index d9ef5c4..2f7c0b6 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.84
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: zlib
 Group: Development/Debuggers
 
@@ -50,6 +50,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Wed Sep 29 2010 jkeating - 4.84-2
+- Rebuilt for gcc bug 634757
+
 * Wed Sep 15 2010 Karel Zak <kzak@redhat.com> 4.84-1
 - upgrade to 4.84
 - remove lsof_4.81-threads.patch, "lsof -K" provides basic support for tasks now

From e19fea3ded04a3eea309edc97656ccce13568b8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 13 Jan 2011 21:18:47 +0200
Subject: [PATCH 16/71] 4.84-3: fix man page permissions

---
 lsof.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lsof.spec b/lsof.spec
index 2f7c0b6..73c2e4b 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.84
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: zlib
 Group: Development/Debuggers
 
@@ -38,7 +38,7 @@ rm -rf ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
 install -p -m 0755 lsof ${RPM_BUILD_ROOT}%{_prefix}/sbin
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
-install -p lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
+install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -50,6 +50,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jan 13 2011 Ville Skyttä <ville.skytta@iki.fi> - 4.84-3
+- Fix man page permissions.
+
 * Wed Sep 29 2010 jkeating - 4.84-2
 - Rebuilt for gcc bug 634757
 

From ee5a322c35dec6230b7658a60bd96716b0219fd6 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Tue, 8 Feb 2011 08:02:06 -0600
Subject: [PATCH 17/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 73c2e4b..481b041 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.84
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: zlib
 Group: Development/Debuggers
 
@@ -50,6 +50,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.84-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Thu Jan 13 2011 Ville Skyttä <ville.skytta@iki.fi> - 4.84-3
 - Fix man page permissions.
 

From 0fa22f732c23c35aa882716f3284c30753a5e0d0 Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Fri, 30 Sep 2011 10:55:58 +0200
Subject: [PATCH 18/71] resolves: #741882 update to 4.85

---
 .gitignore | 4 +---
 lsof.spec  | 8 ++++++--
 sources    | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9145c09..ac0c0d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-lsof_4.83-rh.tar.bz2
-/lsof_4.84-rh.tar.bz2
-*~
+/lsof_4.85-rh.tar.bz2
diff --git a/lsof.spec b/lsof.spec
index 481b041..e39df57 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.84
-Release: 4%{?dist}
+Version: 4.85
+Release: 1%{?dist}
 License: zlib
 Group: Development/Debuggers
 
@@ -50,6 +50,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Fri Sep 30 2011 Peter Schiffer <pschiffe@redhat.com> - 4.85-1
+- resolves: #741882
+  update to 4.85
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.84-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 0e83c4d..0ac70c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-131cabfb2f6804558c2ead7d57285def  lsof_4.84-rh.tar.bz2
+e85c0f72c1e437b2e59989657659d8e9  lsof_4.85-rh.tar.bz2

From be712424add052c0e1787f774fe93aa01d1fcdbb Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 13 Jan 2012 02:58:17 -0600
Subject: [PATCH 19/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index e39df57..adffd5c 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.85
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: zlib
 Group: Development/Debuggers
 
@@ -50,6 +50,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.85-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Fri Sep 30 2011 Peter Schiffer <pschiffe@redhat.com> - 4.85-1
 - resolves: #741882
   update to 4.85

From b9e74d16d6826ee1a904c2aed8cbd53ee6cda362 Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Fri, 20 Apr 2012 17:55:38 +0200
Subject: [PATCH 20/71] - resolves: #811520   update to 4.86

---
 .gitignore | 2 +-
 lsof.spec  | 8 ++++++--
 sources    | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index ac0c0d6..615f06c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/lsof_4.85-rh.tar.bz2
+/lsof_4.86-rh.tar.bz2
diff --git a/lsof.spec b/lsof.spec
index adffd5c..517b258 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.85
-Release: 2%{?dist}
+Version: 4.86
+Release: 1%{?dist}
 License: zlib
 Group: Development/Debuggers
 
@@ -50,6 +50,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Fri Apr 20 2012 Peter Schiffer <pschiffe@redhat.com> - 4.86-1
+- resolves: #811520
+  update to 4.86
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.85-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 0ac70c0..03792a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e85c0f72c1e437b2e59989657659d8e9  lsof_4.85-rh.tar.bz2
+0c81abdf6d7049c1a63bb936c1c260eb  lsof_4.86-rh.tar.bz2

From 62c74990e337cad944ab7b5db06b26bf7f3945a5 Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Mon, 4 Jun 2012 19:36:03 +0200
Subject: [PATCH 21/71] - added support for files on anon_inodefs

---
 lsof-4.86-anoninodfs.patch | 136 +++++++++++++++++++++++++++++++++++++
 lsof.spec                  |   9 ++-
 2 files changed, 143 insertions(+), 2 deletions(-)
 create mode 100644 lsof-4.86-anoninodfs.patch

diff --git a/lsof-4.86-anoninodfs.patch b/lsof-4.86-anoninodfs.patch
new file mode 100644
index 0000000..528b7a9
--- /dev/null
+++ b/lsof-4.86-anoninodfs.patch
@@ -0,0 +1,136 @@
+diff -X excludes -ruN lsof_4.86_src/dialects/linux/dnode.c _lsof_4.86_src/dialects/linux/dnode.c
+--- lsof_4.86_src/dialects/linux/dnode.c	2012-04-11 01:40:00.000000000 +0900
++++ _lsof_4.86_src/dialects/linux/dnode.c	2012-06-04 13:19:05.290490391 +0900
+@@ -401,6 +401,10 @@
+ 		/* Lf->ntype = Ntype = N_REGLR;		by alloc_lfile() */
+ 		process_proc_sock(p, s, ss, l, ls);
+ 		return;
++	    case 0:
++		if (!strcmp(p, "anon_inode"))
++		    Lf->ntype = Ntype = N_ANON_INODE;
++		break;
+ 	    }
+ 	}
+ 	if (Selinet)
+@@ -503,9 +507,13 @@
+ 		tn = "VTXT";
+ 		break;
+ 	    default:
+-		(void) snpf(Lf->type, sizeof(Lf->type), "%04o",
+-		    ((type >> 12) & 0xf));
+-		tn = (char *)NULL;
++		if (Ntype == N_ANON_INODE) {
++		    tn = "a_inode";
++		} else {
++		    (void) snpf(Lf->type, sizeof(Lf->type), "%04o",
++				((type >> 12) & 0xf));
++		    tn = (char *)NULL;
++		}
+ 	    }
+ 	} else
+ 	    tn = "unknown";
+diff -X excludes -ruN lsof_4.86_src/dialects/linux/dproc.c _lsof_4.86_src/dialects/linux/dproc.c
+--- lsof_4.86_src/dialects/linux/dproc.c	2012-04-11 01:40:01.000000000 +0900
++++ _lsof_4.86_src/dialects/linux/dproc.c	2012-06-04 13:29:44.684989913 +0900
+@@ -81,7 +81,7 @@
+  */
+ 
+ _PROTOTYPE(static int get_fdinfo,(char *p, struct l_fdinfo *fi));
+-_PROTOTYPE(static int getlinksrc,(char *ln, char *src, int srcl));
++_PROTOTYPE(static int getlinksrc,(char *ln, char *src, int srcl, char** rest));
+ _PROTOTYPE(static int isefsys,(char *path, char *type, int l,
+ 			       efsys_list_t **rep, struct lfile **lfr));
+ _PROTOTYPE(static int nm2id,(char *nm, int *id, int *idl));
+@@ -440,14 +440,18 @@
+ 
+ 
+ static int
+-getlinksrc(ln, src, srcl)
++getlinksrc(ln, src, srcl, rest)
+ 	char *ln;			/* link path */
+ 	char *src;			/* link source path return address */
+ 	int srcl;			/* length of src[] */
++	char **rest;                    /* string after `:' of link source path */
+ {
+ 	char *cp;
+ 	int ll;
+ 
++	if (rest)
++	    *rest = NULL;
++
+ 	if ((ll = readlink(ln, src, srcl - 1)) < 1
+ 	||  ll >= srcl)
+ 	    return(-1);
+@@ -457,6 +461,8 @@
+ 	if ((cp = strchr(src, ':'))) {
+ 	    *cp = '\0';
+ 	    ll = strlen(src);
++	    if (rest)
++		*rest = cp + 1;
+ 	}
+ 	return(ll);
+ }
+@@ -795,6 +801,7 @@
+ 	static char *pathi = (char *)NULL;
+ 	static int pathil = 0;
+ 	int txts = 0;
++	char* rest;
+ 
+ #if	defined(HASSELINUX)
+ 	cntxlist_t *cntxp;
+@@ -825,7 +832,7 @@
+ 	    (void) make_proc_path(idp, idpl, &path, &pathl, "cwd");
+ 	    alloc_lfile(CWD, -1);
+ 	    efs = 0;
+-	    if (getlinksrc(path, pbuf, sizeof(pbuf)) < 1) {
++	    if (getlinksrc(path, pbuf, sizeof(pbuf), NULL) < 1) {
+ 		if (!Fwarn) {
+ 		    (void) memset((void *)&sb, 0, sizeof(sb));
+ 		    lnk = ss = 0;
+@@ -873,7 +880,7 @@
+ 	if (!Ckscko) {
+ 	    (void) make_proc_path(idp, idpl, &path, &pathl, "root");
+ 	    alloc_lfile(RTD, -1);
+-	    if (getlinksrc(path, pbuf, sizeof(pbuf)) < 1) {
++	    if (getlinksrc(path, pbuf, sizeof(pbuf), NULL) < 1) {
+ 		if (!Fwarn) {
+ 		    (void) memset((void *)&sb, 0, sizeof(sb));
+ 		    lnk = ss = 0;
+@@ -921,7 +928,7 @@
+ 	    txts = 0;
+ 	    (void) make_proc_path(idp, idpl, &path, &pathl, "exe");
+ 	    alloc_lfile("txt", -1);
+-	    if (getlinksrc(path, pbuf, sizeof(pbuf)) < 1) {
++	    if (getlinksrc(path, pbuf, sizeof(pbuf), NULL) < 1) {
+ 		(void) memset((void *)&sb, 0, sizeof(sb));
+ 		lnk = ss = 0;
+ 		if (!Fwarn) {
+@@ -1044,7 +1051,7 @@
+ 		continue;
+ 	    (void) make_proc_path(dpath, i, &path, &pathl, fp->d_name);
+ 	    (void) alloc_lfile((char *)NULL, fd);
+-	    if (getlinksrc(path, pbuf, sizeof(pbuf)) < 1) {
++	    if (getlinksrc(path, pbuf, sizeof(pbuf), &rest) < 1) {
+ 		(void) memset((void *)&sb, 0, sizeof(sb));
+ 		lnk = ss = 0;
+ 		if (!Fwarn) {
+@@ -1137,6 +1144,8 @@
+ 		}
+ 		if (pn) {
+ 		    process_proc_node(lnk ? pbuf : path, &sb, ss, &lsb, ls);
++		    if (Lf->ntype == N_ANON_INODE)
++			enter_nm(rest);
+ 		    if (Lf->sf)
+ 			link_lfile();
+ 		}
+diff -X excludes -ruN lsof_4.86_src/lsof.h _lsof_4.86_src/lsof.h
+--- lsof_4.86_src/lsof.h	2011-09-08 04:14:10.000000000 +0900
++++ _lsof_4.86_src/lsof.h	2012-06-04 13:27:40.190724414 +0900
+@@ -349,6 +349,7 @@
+ #define	N_VXFS		51		/* Veritas file system node */
+ #define	N_XFS		52		/* XFS node */
+ #define	N_ZFS		53		/* ZFS node */
++#define N_ANON_INODE	54              /* inode on linux anon_inodefs */
+ 
+ # if	!defined(OFFDECDIG)
+ #define	OFFDECDIG	8		/* maximum number of digits in the
diff --git a/lsof.spec b/lsof.spec
index 517b258..871a661 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.86
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: zlib
 Group: Development/Debuggers
 
@@ -15,6 +15,8 @@ Group: Development/Debuggers
 Source0: %{lsofrh}.tar.bz2
 URL: ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof
 
+Patch0: lsof-4.86-anoninodfs.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libselinux-devel
@@ -26,7 +28,7 @@ UNIX system.
 
 %prep
 %setup -q -n %{lsofrh}
-#%patch0 -p1
+%patch0 -p1
 
 %build
 LSOF_VSTR=2.6.16 LINUX_BASE=/proc ./Configure -n linux
@@ -50,6 +52,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Mon Jun 04 2012 Peter Schiffer <pschiffe@redhat.com> - 4.86-2
+- added support for files on anon_inodefs
+
 * Fri Apr 20 2012 Peter Schiffer <pschiffe@redhat.com> - 4.86-1
 - resolves: #811520
   update to 4.86

From f731f136cbbd6b4486f666ca695f1cca67a9b8d6 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 19 Jul 2012 17:21:47 -0500
Subject: [PATCH 22/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 871a661..1c5cbca 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.86
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: zlib
 Group: Development/Debuggers
 
@@ -52,6 +52,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.86-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Mon Jun 04 2012 Peter Schiffer <pschiffe@redhat.com> - 4.86-2
 - added support for files on anon_inodefs
 

From 37e86b1997006a3b163fa1a8f2e20c2ba3a3d8d0 Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Tue, 28 Aug 2012 20:57:54 +0200
Subject: [PATCH 23/71] - .spec file cleanup

---
 lsof.spec | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/lsof.spec b/lsof.spec
index 1c5cbca..0f145f4 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,8 +1,10 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.86
-Release: 3%{?dist}
-License: zlib
+Release: 4%{?dist}
+# Sendmail .. lib/snpf.c
+# LGPLv2+  .. lib/regex.c, regex.h
+License: zlib and Sendmail and LGPLv2+
 Group: Development/Debuggers
 
 # lsof contains licensed code that we cannot ship.  Therefore we use
@@ -10,14 +12,12 @@ Group: Development/Debuggers
 #
 # The script you can found in SCM or download from:
 # http://pkgs.fedoraproject.org/gitweb/?p=lsof.git;a=blob_plain;f=upstream2downstream.sh
-#
-%define lsofrh lsof_%{version}-rh
-Source0: %{lsofrh}.tar.bz2
-URL: ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof
 
-Patch0: lsof-4.86-anoninodfs.patch
+%global lsofrh lsof_%{version}-rh
+URL: http://people.freebsd.org/~abe/
+Source: %{lsofrh}.tar.bz2
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch: lsof-4.86-anoninodfs.patch
 
 BuildRequires: libselinux-devel
 
@@ -28,30 +28,27 @@ UNIX system.
 
 %prep
 %setup -q -n %{lsofrh}
-%patch0 -p1
+%patch -p1 -b .anoninodfs
 
 %build
-LSOF_VSTR=2.6.16 LINUX_BASE=/proc ./Configure -n linux
-
+./Configure -n linux
 make DEBUG="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
-install -p -m 0755 lsof ${RPM_BUILD_ROOT}%{_prefix}/sbin
+install -p -m 0755 lsof ${RPM_BUILD_ROOT}%{_sbindir}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
-install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
+install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
 
 %files
-%defattr(-,root,root,-)
-%doc 00*
+%doc 00* README.lsof_*
 %{_sbindir}/lsof
 %{_mandir}/man*/*
 
 %changelog
+* Tue Aug 28 2012 Peter Schiffer <pschiffe@redhat.com> - 4.86-4
+- .spec file cleanup
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.86-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

From c70eb9d28fe685bd0f6549e968493f5c317df1c7 Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Thu, 3 Jan 2013 13:47:33 +0100
Subject: [PATCH 24/71] - resolves: #891508   updated to 4.87

---
 .gitignore                 |   2 +-
 lsof-4.86-anoninodfs.patch | 136 -------------------------------------
 lsof.spec                  |  14 ++--
 sources                    |   2 +-
 upstream2downstream.sh     |   4 +-
 5 files changed, 12 insertions(+), 146 deletions(-)
 delete mode 100644 lsof-4.86-anoninodfs.patch

diff --git a/.gitignore b/.gitignore
index 615f06c..9361889 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/lsof_4.86-rh.tar.bz2
+/lsof_4.87-rh.tar.xz
diff --git a/lsof-4.86-anoninodfs.patch b/lsof-4.86-anoninodfs.patch
deleted file mode 100644
index 528b7a9..0000000
--- a/lsof-4.86-anoninodfs.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-diff -X excludes -ruN lsof_4.86_src/dialects/linux/dnode.c _lsof_4.86_src/dialects/linux/dnode.c
---- lsof_4.86_src/dialects/linux/dnode.c	2012-04-11 01:40:00.000000000 +0900
-+++ _lsof_4.86_src/dialects/linux/dnode.c	2012-06-04 13:19:05.290490391 +0900
-@@ -401,6 +401,10 @@
- 		/* Lf->ntype = Ntype = N_REGLR;		by alloc_lfile() */
- 		process_proc_sock(p, s, ss, l, ls);
- 		return;
-+	    case 0:
-+		if (!strcmp(p, "anon_inode"))
-+		    Lf->ntype = Ntype = N_ANON_INODE;
-+		break;
- 	    }
- 	}
- 	if (Selinet)
-@@ -503,9 +507,13 @@
- 		tn = "VTXT";
- 		break;
- 	    default:
--		(void) snpf(Lf->type, sizeof(Lf->type), "%04o",
--		    ((type >> 12) & 0xf));
--		tn = (char *)NULL;
-+		if (Ntype == N_ANON_INODE) {
-+		    tn = "a_inode";
-+		} else {
-+		    (void) snpf(Lf->type, sizeof(Lf->type), "%04o",
-+				((type >> 12) & 0xf));
-+		    tn = (char *)NULL;
-+		}
- 	    }
- 	} else
- 	    tn = "unknown";
-diff -X excludes -ruN lsof_4.86_src/dialects/linux/dproc.c _lsof_4.86_src/dialects/linux/dproc.c
---- lsof_4.86_src/dialects/linux/dproc.c	2012-04-11 01:40:01.000000000 +0900
-+++ _lsof_4.86_src/dialects/linux/dproc.c	2012-06-04 13:29:44.684989913 +0900
-@@ -81,7 +81,7 @@
-  */
- 
- _PROTOTYPE(static int get_fdinfo,(char *p, struct l_fdinfo *fi));
--_PROTOTYPE(static int getlinksrc,(char *ln, char *src, int srcl));
-+_PROTOTYPE(static int getlinksrc,(char *ln, char *src, int srcl, char** rest));
- _PROTOTYPE(static int isefsys,(char *path, char *type, int l,
- 			       efsys_list_t **rep, struct lfile **lfr));
- _PROTOTYPE(static int nm2id,(char *nm, int *id, int *idl));
-@@ -440,14 +440,18 @@
- 
- 
- static int
--getlinksrc(ln, src, srcl)
-+getlinksrc(ln, src, srcl, rest)
- 	char *ln;			/* link path */
- 	char *src;			/* link source path return address */
- 	int srcl;			/* length of src[] */
-+	char **rest;                    /* string after `:' of link source path */
- {
- 	char *cp;
- 	int ll;
- 
-+	if (rest)
-+	    *rest = NULL;
-+
- 	if ((ll = readlink(ln, src, srcl - 1)) < 1
- 	||  ll >= srcl)
- 	    return(-1);
-@@ -457,6 +461,8 @@
- 	if ((cp = strchr(src, ':'))) {
- 	    *cp = '\0';
- 	    ll = strlen(src);
-+	    if (rest)
-+		*rest = cp + 1;
- 	}
- 	return(ll);
- }
-@@ -795,6 +801,7 @@
- 	static char *pathi = (char *)NULL;
- 	static int pathil = 0;
- 	int txts = 0;
-+	char* rest;
- 
- #if	defined(HASSELINUX)
- 	cntxlist_t *cntxp;
-@@ -825,7 +832,7 @@
- 	    (void) make_proc_path(idp, idpl, &path, &pathl, "cwd");
- 	    alloc_lfile(CWD, -1);
- 	    efs = 0;
--	    if (getlinksrc(path, pbuf, sizeof(pbuf)) < 1) {
-+	    if (getlinksrc(path, pbuf, sizeof(pbuf), NULL) < 1) {
- 		if (!Fwarn) {
- 		    (void) memset((void *)&sb, 0, sizeof(sb));
- 		    lnk = ss = 0;
-@@ -873,7 +880,7 @@
- 	if (!Ckscko) {
- 	    (void) make_proc_path(idp, idpl, &path, &pathl, "root");
- 	    alloc_lfile(RTD, -1);
--	    if (getlinksrc(path, pbuf, sizeof(pbuf)) < 1) {
-+	    if (getlinksrc(path, pbuf, sizeof(pbuf), NULL) < 1) {
- 		if (!Fwarn) {
- 		    (void) memset((void *)&sb, 0, sizeof(sb));
- 		    lnk = ss = 0;
-@@ -921,7 +928,7 @@
- 	    txts = 0;
- 	    (void) make_proc_path(idp, idpl, &path, &pathl, "exe");
- 	    alloc_lfile("txt", -1);
--	    if (getlinksrc(path, pbuf, sizeof(pbuf)) < 1) {
-+	    if (getlinksrc(path, pbuf, sizeof(pbuf), NULL) < 1) {
- 		(void) memset((void *)&sb, 0, sizeof(sb));
- 		lnk = ss = 0;
- 		if (!Fwarn) {
-@@ -1044,7 +1051,7 @@
- 		continue;
- 	    (void) make_proc_path(dpath, i, &path, &pathl, fp->d_name);
- 	    (void) alloc_lfile((char *)NULL, fd);
--	    if (getlinksrc(path, pbuf, sizeof(pbuf)) < 1) {
-+	    if (getlinksrc(path, pbuf, sizeof(pbuf), &rest) < 1) {
- 		(void) memset((void *)&sb, 0, sizeof(sb));
- 		lnk = ss = 0;
- 		if (!Fwarn) {
-@@ -1137,6 +1144,8 @@
- 		}
- 		if (pn) {
- 		    process_proc_node(lnk ? pbuf : path, &sb, ss, &lsb, ls);
-+		    if (Lf->ntype == N_ANON_INODE)
-+			enter_nm(rest);
- 		    if (Lf->sf)
- 			link_lfile();
- 		}
-diff -X excludes -ruN lsof_4.86_src/lsof.h _lsof_4.86_src/lsof.h
---- lsof_4.86_src/lsof.h	2011-09-08 04:14:10.000000000 +0900
-+++ _lsof_4.86_src/lsof.h	2012-06-04 13:27:40.190724414 +0900
-@@ -349,6 +349,7 @@
- #define	N_VXFS		51		/* Veritas file system node */
- #define	N_XFS		52		/* XFS node */
- #define	N_ZFS		53		/* ZFS node */
-+#define N_ANON_INODE	54              /* inode on linux anon_inodefs */
- 
- # if	!defined(OFFDECDIG)
- #define	OFFDECDIG	8		/* maximum number of digits in the
diff --git a/lsof.spec b/lsof.spec
index 0f145f4..49825cc 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.86
-Release: 4%{?dist}
+Version: 4.87
+Release: 1%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -15,9 +15,8 @@ Group: Development/Debuggers
 
 %global lsofrh lsof_%{version}-rh
 URL: http://people.freebsd.org/~abe/
-Source: %{lsofrh}.tar.bz2
-
-Patch: lsof-4.86-anoninodfs.patch
+Source0: %{lsofrh}.tar.xz
+Source1: upstream2downstream.sh
 
 BuildRequires: libselinux-devel
 
@@ -28,7 +27,6 @@ UNIX system.
 
 %prep
 %setup -q -n %{lsofrh}
-%patch -p1 -b .anoninodfs
 
 %build
 ./Configure -n linux
@@ -46,6 +44,10 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jan  3 2013 Peter Schiffer <pschiffe@redhat.com> - 4.87-1
+- resolves: #891508
+  updated to 4.87
+
 * Tue Aug 28 2012 Peter Schiffer <pschiffe@redhat.com> - 4.86-4
 - .spec file cleanup
 
diff --git a/sources b/sources
index 03792a1..8c8012c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0c81abdf6d7049c1a63bb936c1c260eb  lsof_4.86-rh.tar.bz2
+60ee5b17ce374be2fe1f3c7f1e2da1ee  lsof_4.87-rh.tar.xz
diff --git a/upstream2downstream.sh b/upstream2downstream.sh
index 24cc993..33c7f65 100755
--- a/upstream2downstream.sh
+++ b/upstream2downstream.sh
@@ -33,13 +33,13 @@ rm -rf "$NAME"-rh/dialects/{aix,darwin,du,freebsd,hpux,n+obsd,n+os,osr,sun,uw}
 echo " done."
 
 echo -n "Creating final downstream tarball..."
-tar jcf $MYPWD/"$NAME"-rh.tar.bz2 "$NAME"-rh
+tar Jcf $MYPWD/"$NAME"-rh.tar.xz "$NAME"-rh
 echo " done."
 
 rm -rf $TMP
 cd $MYPWD
 
 echo
-echo "Linux-only tarball: $MYPWD/"$NAME"-rh.tar.bz2"
+echo "Linux-only tarball: $MYPWD/"$NAME"-rh.tar.xz"
 echo
 

From 50d2cc3188eb6c3f777ee89d077db93f77de4826 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 13 Feb 2013 23:54:29 -0600
Subject: [PATCH 25/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 49825cc..18efc2e 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.87
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -44,6 +44,9 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{_mandir}/man*/*
 
 %changelog
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.87-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Thu Jan  3 2013 Peter Schiffer <pschiffe@redhat.com> - 4.87-1
 - resolves: #891508
   updated to 4.87

From ef4cc55c9956bfb6d9db7ce43a2455ce55edff76 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 3 Aug 2013 03:16:20 -0500
Subject: [PATCH 26/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 18efc2e..700ae0d 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.87
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -44,6 +44,9 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{_mandir}/man*/*
 
 %changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.87-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.87-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

From 7afb5bd8a49d44aa516d67bc7d220e88718ecc2a Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 7 Jun 2014 02:04:42 -0500
Subject: [PATCH 27/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 700ae0d..3321cea 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.87
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -44,6 +44,9 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{_mandir}/man*/*
 
 %changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.87-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.87-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

From 91bf0a20a92bc37e1dfe75401658c2b800bb0d2f Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Sun, 17 Aug 2014 07:47:00 +0000
Subject: [PATCH 28/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 3321cea..fbb6cd8 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.87
-Release: 4%{?dist}
+Release: 5%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -44,6 +44,9 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{_mandir}/man*/*
 
 %changelog
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.87-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.87-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

From c22d601728f54684d6869d8a5a08999e72c2e470 Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Wed, 15 Oct 2014 15:05:57 +0200
Subject: [PATCH 29/71] updated to 4.88

---
 .gitignore | 2 +-
 lsof.spec  | 9 ++++++---
 sources    | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9361889..4aad627 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/lsof_4.87-rh.tar.xz
+/lsof_4.88-rh.tar.xz
diff --git a/lsof.spec b/lsof.spec
index fbb6cd8..887152a 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.87
-Release: 5%{?dist}
+Version: 4.88
+Release: 1%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -10,7 +10,7 @@ Group: Development/Debuggers
 # lsof contains licensed code that we cannot ship.  Therefore we use
 # upstream2downstream.sh script to remove the code before shipping it.
 #
-# The script you can found in SCM or download from:
+# The script can be found in SCM or downloaded from:
 # http://pkgs.fedoraproject.org/gitweb/?p=lsof.git;a=blob_plain;f=upstream2downstream.sh
 
 %global lsofrh lsof_%{version}-rh
@@ -44,6 +44,9 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{_mandir}/man*/*
 
 %changelog
+* Wed Oct 15 2014 Peter Schiffer <pschiffe@redhat.com> - 4.88-1
+-  updated to 4.88
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.87-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 8c8012c..0eb4829 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-60ee5b17ce374be2fe1f3c7f1e2da1ee  lsof_4.87-rh.tar.xz
+53d92cf95df5c630052bc0d65fff53fb  lsof_4.88-rh.tar.xz

From b50ab1ec3048fdd417c2f35fa33920c28813a351 Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Mon, 5 Jan 2015 20:09:24 +0100
Subject: [PATCH 30/71] added upstream patch fixing unwanted pipe file output

---
 lsof-4.88-pipe-files.patch | 12 ++++++++++++
 lsof.spec                  |  9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 lsof-4.88-pipe-files.patch

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.spec b/lsof.spec
index 887152a..236faf3 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.88
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -18,6 +18,9 @@ URL: http://people.freebsd.org/~abe/
 Source0: %{lsofrh}.tar.xz
 Source1: upstream2downstream.sh
 
+# upstream patch: eliminates unwanted pipe file output
+Patch0: lsof-4.88-pipe-files.patch
+
 BuildRequires: libselinux-devel
 
 %description
@@ -27,6 +30,7 @@ UNIX system.
 
 %prep
 %setup -q -n %{lsofrh}
+%patch0 -p1 -b .pipe-files
 
 %build
 ./Configure -n linux
@@ -44,6 +48,9 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{_mandir}/man*/*
 
 %changelog
+* Mon Jan  5 2015 Peter Schiffer <pschiffe@redhat.com> - 4.88-2
+-  added upstream patch fixing unwanted pipe file output
+
 * Wed Oct 15 2014 Peter Schiffer <pschiffe@redhat.com> - 4.88-1
 -  updated to 4.88
 

From cec2677e52086911266a6877e1687a5425d139b7 Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Tue, 6 Jan 2015 15:30:55 +0100
Subject: [PATCH 31/71] updated upstream2downstream.sh

keep RELEASE.SUMMARY file from original upstream tarball
---
 upstream2downstream.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstream2downstream.sh b/upstream2downstream.sh
index 33c7f65..247ee29 100755
--- a/upstream2downstream.sh
+++ b/upstream2downstream.sh
@@ -25,7 +25,7 @@ echo " done."
 
 echo -n "Moving files to downstream directory..."
 mv "$NAME"_src/ "$NAME"-rh
-mv README* 00* "$NAME"-rh
+mv README* 00* RELEASE* "$NAME"-rh
 echo " done."
 
 echo -n "Removing non-Linux dialects..."

From 85e76d53405723c29b841dd4a2985a941e3030a9 Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Tue, 6 Jan 2015 23:06:31 +0100
Subject: [PATCH 32/71] cleaned .spec file

---
 lsof.spec | 115 ++++--------------------------------------------------
 sources   |   2 +-
 2 files changed, 8 insertions(+), 109 deletions(-)

diff --git a/lsof.spec b/lsof.spec
index 236faf3..2f1aec5 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -6,15 +6,15 @@ Release: 2%{?dist}
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
 Group: Development/Debuggers
+URL: http://people.freebsd.org/~abe/
 
 # lsof contains licensed code that we cannot ship.  Therefore we use
 # upstream2downstream.sh script to remove the code before shipping it.
 #
 # The script can be found in SCM or downloaded from:
-# http://pkgs.fedoraproject.org/gitweb/?p=lsof.git;a=blob_plain;f=upstream2downstream.sh
+# http://pkgs.fedoraproject.org/cgit/lsof.git/tree/upstream2downstream.sh
 
 %global lsofrh lsof_%{version}-rh
-URL: http://people.freebsd.org/~abe/
 Source0: %{lsofrh}.tar.xz
 Source1: upstream2downstream.sh
 
@@ -24,9 +24,8 @@ Patch0: lsof-4.88-pipe-files.patch
 BuildRequires: libselinux-devel
 
 %description
-Lsof stands for LiSt Open Files, and it does just that: it lists
-information about files that are open by the processes running on a
-UNIX system.
+Lsof stands for LiSt Open Files, and it does just that: it lists information
+about files that are open by the processes running on a UNIX system.
 
 %prep
 %setup -q -n %{lsofrh}
@@ -43,13 +42,14 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
 
 %files
-%doc 00* README.lsof_*
+%doc 00* README* RELEASE*
 %{_sbindir}/lsof
 %{_mandir}/man*/*
 
 %changelog
-* Mon Jan  5 2015 Peter Schiffer <pschiffe@redhat.com> - 4.88-2
+* Tue Jan  6 2015 Peter Schiffer <pschiffe@redhat.com> - 4.88-2
 -  added upstream patch fixing unwanted pipe file output
+-  cleaned .spec file
 
 * Wed Oct 15 2014 Peter Schiffer <pschiffe@redhat.com> - 4.88-1
 -  updated to 4.88
@@ -212,104 +212,3 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
 - update to 4.73
 - remove lsof_4.72-sock.patch, already in the upstream code
 
-* Fri Jul 30 2004 Jakub Jelinek <jakub@redhat.com> 4.72-1
-- update to 4.72
-- use st_dev/st_ino comparison for sockets by name if possible
-  (#126419)
-
-* Fri Jul 18 2003 Jakub Jelinek <jakub@redhat.com> 4.68-1
-- update to 4.68 (#99064)
-
-* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
-- rebuilt
-
-* Thu Dec 12 2002 Tim Powers <timp@redhat.com> 4.63-3
-- rebuild on all arches
-
-* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Fri Jun 21 2002 Jakub Jelinek <jakub@redhat.com> 4.63-1
-- update to 4.63 (#66333).
-
-* Thu May 23 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Sun Jun 24 2001 Elliot Lee <sopwith@redhat.com>
-- Bump release + rebuild.
-
-* Thu Sep  7 2000 Jeff Johnson <jbj@redhat.com>
-- update to 4.51.
-
-* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
-- automatic rebuild
-
-* Wed Jun 14 2000 Jeff Johnson <jbj@redhat.com>
-- FHS packaging.
-
-* Sun Mar 26 2000 Florian La Roche <Florian.LaRoche@redhat.com>
-- change to root:root perms
-
-* Wed Feb 02 2000 Cristian Gafton <gafton@redhat.com>
-- fix description
-- man pages are compressed
-
-* Wed Dec 22 1999 Jeff Johnson <jbj@redhat.com>
-- update to 4.47.
-
-* Tue Aug  3 1999 Jeff Johnson <jbj@redhat.com>
-- update to 4.45.
-
-* Fri Jun 25 1999 Jeff Johnson <jbj@redhat.com>
-- update to 4.44.
-
-* Fri May 14 1999 Jeff Johnson <jbj@redhat.com>
-- upgrade to 4.43 with sparc64 tweak (#2803)
-
-* Thu Apr 08 1999 Preston Brown <pbrown@redhat.com>
-- upgrade to 4.42 (security fix)
-
-* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com> 
-- auto rebuild in the new build environment (release 5)
-
-* Fri Mar 19 1999 Jeff Johnson <jbj@redhat.com>
-- turn off setgid kmem "just in case".
-
-* Thu Feb 18 1999 Jeff Johnson <jbj@redhat.com>
-- buffer overflow patch.
-- upgrade to 4.40.
-
-* Wed Dec 30 1998 Jeff Johnson <jbj@redhat.com>
-- update to "official" 4.39 release.
-
-* Wed Dec 16 1998 Jeff Johnson <jbj@redhat.com>
-- update to 4.39B (linux) with internal kernel src.
-
-* Tue Dec 15 1998 Jeff Johnson <jbj@redhat.com>
-- update to 4.39A (linux)
-
-* Sat Sep 19 1998 Jeff Johnson <jbj@redhat.com>
-- update to 4.37
-
-* Thu Sep 10 1998 Jeff Johnson <jbj@redhat.com>
-- update to 4.36
-
-* Thu Jul 23 1998 Jeff Johnson <jbj@redhat.com>
-- upgrade to 4.35.
-- rewrap for RH 5.2.
-
-* Mon Jun 29 1998 Maciej Lesniewski <nimir@kis.p.lodz.pl>
-  [4.34-1]
-- New version
-- Spec rewriten to use %%{name} and %%{version} macros
-- Removed old log enteries
-
-* Tue Apr 28 1998 Maciej Lesniewski <nimir@kis.p.lodz.pl>
-- Built under RH5
-- install macro was changed
diff --git a/sources b/sources
index 0eb4829..9a7f8d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53d92cf95df5c630052bc0d65fff53fb  lsof_4.88-rh.tar.xz
+d34a76fae58992a351619af689431fff  lsof_4.88-rh.tar.xz

From ce9f6eca9c4fae607ddd9874cd42171145ad6c1c Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 17 Jun 2015 18:35:04 +0000
Subject: [PATCH 33/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 2f1aec5..772f9e0 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.88
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -47,6 +47,9 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.88-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Tue Jan  6 2015 Peter Schiffer <pschiffe@redhat.com> - 4.88-2
 -  added upstream patch fixing unwanted pipe file output
 -  cleaned .spec file

From 4265063cb7a3494ca88ea444751d895f15a12d04 Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Wed, 29 Jul 2015 12:58:53 +0200
Subject: [PATCH 34/71] Updated to 4.89

- resolves: #1242685
---
 .gitignore                 |  2 +-
 lsof-4.88-pipe-files.patch | 12 ------------
 lsof.spec                  | 11 +++++------
 sources                    |  2 +-
 4 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 lsof-4.88-pipe-files.patch

diff --git a/.gitignore b/.gitignore
index 4aad627..c8ecc3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/lsof_4.88-rh.tar.xz
+/lsof_4.89-rh.tar.xz
diff --git a/lsof-4.88-pipe-files.patch b/lsof-4.88-pipe-files.patch
deleted file mode 100644
index 638e0a7..0000000
--- a/lsof-4.88-pipe-files.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.spec b/lsof.spec
index 772f9e0..2611789 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.88
-Release: 3%{?dist}
+Version: 4.89
+Release: 1%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -18,9 +18,6 @@ URL: http://people.freebsd.org/~abe/
 Source0: %{lsofrh}.tar.xz
 Source1: upstream2downstream.sh
 
-# upstream patch: eliminates unwanted pipe file output
-Patch0: lsof-4.88-pipe-files.patch
-
 BuildRequires: libselinux-devel
 
 %description
@@ -29,7 +26,6 @@ about files that are open by the processes running on a UNIX system.
 
 %prep
 %setup -q -n %{lsofrh}
-%patch0 -p1 -b .pipe-files
 
 %build
 ./Configure -n linux
@@ -47,6 +43,9 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jul 29 2015 Peter Schiffer <pschiffe@redhat.com> - 4.89-1
+-  updated to 4.89
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.88-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 9a7f8d0..d5e48b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d34a76fae58992a351619af689431fff  lsof_4.88-rh.tar.xz
+bfb349a2488212cb48c634e8e804ca19  lsof_4.89-rh.tar.xz

From 7c7dbdede5697ef08f51873110fa12894ceaf48c Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Mon, 30 Nov 2015 13:27:53 +0100
Subject: [PATCH 35/71] Moved lsof to /usr/bin, it's not sysadmin only utility

- resolves #1260300
---
 lsof-man-page-section.patch | 10 ++++++++++
 lsof.spec                   | 20 ++++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 lsof-man-page-section.patch

diff --git a/lsof-man-page-section.patch b/lsof-man-page-section.patch
new file mode 100644
index 0000000..60ec974
--- /dev/null
+++ b/lsof-man-page-section.patch
@@ -0,0 +1,10 @@
+diff -upr lsof_4.89-rh.orig/lsof.8 lsof_4.89-rh/lsof.8
+--- lsof_4.89-rh.orig/lsof.8	2015-11-30 13:09:37.785075681 +0100
++++ lsof_4.89-rh/lsof.8	2015-11-30 13:10:11.663029129 +0100
+@@ -1,5 +1,5 @@
+ .ds VN 4.89
+-.TH LSOF 8 Revision-\*(VN
++.TH LSOF 1 Revision-\*(VN
+ \" Register )P is used neither by this file nor any groff macro.  However,
+ \" some versions of nroff require it.
+ .if !\n(.g \{\
diff --git a/lsof.spec b/lsof.spec
index 2611789..58fff8c 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.89
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -18,6 +18,9 @@ URL: http://people.freebsd.org/~abe/
 Source0: %{lsofrh}.tar.xz
 Source1: upstream2downstream.sh
 
+# BZ#1260300 - move lsof man page to section 1
+Patch0: lsof-man-page-section.patch
+
 BuildRequires: libselinux-devel
 
 %description
@@ -26,23 +29,28 @@ about files that are open by the processes running on a UNIX system.
 
 %prep
 %setup -q -n %{lsofrh}
+%patch0 -p1 -b .man-page-section
 
 %build
 ./Configure -n linux
 make DEBUG="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
-mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
-install -p -m 0755 lsof ${RPM_BUILD_ROOT}%{_sbindir}
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
-install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
+mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
+install -p -m 0755 lsof ${RPM_BUILD_ROOT}%{_bindir}
+mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
+install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 
 %files
 %doc 00* README* RELEASE*
-%{_sbindir}/lsof
+%{_bindir}/lsof
 %{_mandir}/man*/*
 
 %changelog
+* Mon Nov 30 2015 Peter Schiffer <pschiffe@redhat.com> - 4.89-2
+- resolves #1260300
+  moved lsof to /usr/bin, it's not sysadmin only utility
+
 * Wed Jul 29 2015 Peter Schiffer <pschiffe@redhat.com> - 4.89-1
 -  updated to 4.89
 

From da6ea248de3275bd262ace8e3c40d36f653d7348 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 4 Feb 2016 04:30:13 +0000
Subject: [PATCH 36/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 58fff8c..6b3233c 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.89
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -47,6 +47,9 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.89-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Mon Nov 30 2015 Peter Schiffer <pschiffe@redhat.com> - 4.89-2
 - resolves #1260300
   moved lsof to /usr/bin, it's not sysadmin only utility

From 0f53d54d988fe5c6b422ffcc095d9f0e91cdaeef Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sat, 5 Mar 2016 16:27:22 +0000
Subject: [PATCH 37/71] Only ship end user useful docs, don't ship bits for
 building

---
 lsof.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lsof.spec b/lsof.spec
index 6b3233c..73479a7 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.89
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -42,11 +42,14 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
 install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 
 %files
-%doc 00* README* RELEASE*
+%doc 00README 00CREDITS 00FAQ 00LSOF-L 00QUICKSTART
 %{_bindir}/lsof
 %{_mandir}/man*/*
 
 %changelog
+* Sat Mar  5 2016 Peter Robinson <pbrobinson@fedoraproject.org> 4.89-4
+- Only ship end user useful docs, don't ship bits for building
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.89-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From 1cff8ff2e4bca66433aa3839bff41ee8330d55e2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 10 Feb 2017 20:03:22 +0000
Subject: [PATCH 38/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 73479a7..2eb88b0 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.89
-Release: 4%{?dist}
+Release: 5%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -47,6 +47,9 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.89-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Sat Mar  5 2016 Peter Robinson <pbrobinson@fedoraproject.org> 4.89-4
 - Only ship end user useful docs, don't ship bits for building
 

From 4cf900348d647859a10c2d0a4b646b2cb27788a8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 26 Jul 2017 20:23:39 +0000
Subject: [PATCH 39/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 2eb88b0..8d5efec 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.89
-Release: 5%{?dist}
+Release: 6%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -47,6 +47,9 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.89-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.89-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From 612246fb1e90ebb4d96b5786118ee5654ce711d7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 3 Aug 2017 02:46:43 +0000
Subject: [PATCH 40/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 8d5efec..4522dea 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.89
-Release: 6%{?dist}
+Release: 7%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -47,6 +47,9 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.89-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.89-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From 0415bb7b4b96f2c76fa26ccafca47fb9a4a0f62b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 8 Feb 2018 00:16:10 +0000
Subject: [PATCH 41/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 4522dea..387c3d3 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.89
-Release: 7%{?dist}
+Release: 8%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -47,6 +47,9 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.89-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.89-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 

From f0789f5c04a5973c5e150693b055b6dd6638c971 Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Wed, 21 Feb 2018 16:35:19 +0100
Subject: [PATCH 42/71] Updated to 4.90

- resolves: #1545963
---
 .gitignore                  |  2 +-
 lsof-man-page-section.patch |  2 +-
 lsof.spec                   | 11 ++++++++---
 sources                     |  2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index c8ecc3a..eeea22f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/lsof_4.89-rh.tar.xz
+/lsof_4.90-rh.tar.xz
diff --git a/lsof-man-page-section.patch b/lsof-man-page-section.patch
index 60ec974..d06ab79 100644
--- a/lsof-man-page-section.patch
+++ b/lsof-man-page-section.patch
@@ -2,7 +2,7 @@ diff -upr lsof_4.89-rh.orig/lsof.8 lsof_4.89-rh/lsof.8
 --- lsof_4.89-rh.orig/lsof.8	2015-11-30 13:09:37.785075681 +0100
 +++ lsof_4.89-rh/lsof.8	2015-11-30 13:10:11.663029129 +0100
 @@ -1,5 +1,5 @@
- .ds VN 4.89
+ .ds VN 4.90
 -.TH LSOF 8 Revision-\*(VN
 +.TH LSOF 1 Revision-\*(VN
  \" Register )P is used neither by this file nor any groff macro.  However,
diff --git a/lsof.spec b/lsof.spec
index 387c3d3..081f053 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.89
-Release: 8%{?dist}
+Version: 4.90
+Release: 1%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -21,6 +21,7 @@ Source1: upstream2downstream.sh
 # BZ#1260300 - move lsof man page to section 1
 Patch0: lsof-man-page-section.patch
 
+BuildRequires: gcc
 BuildRequires: libselinux-devel
 
 %description
@@ -33,7 +34,7 @@ about files that are open by the processes running on a UNIX system.
 
 %build
 ./Configure -n linux
-make DEBUG="$RPM_OPT_FLAGS" %{?_smp_mflags}
+%make_build DEBUG="$RPM_OPT_FLAGS"
 
 %install
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
@@ -47,6 +48,10 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Wed Feb 21 2018 Peter Schiffer <pschiffe@redhat.com> - 4.90-1
+- resolves: #1545963
+  updated to 4.90
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.89-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index d5e48b7..4971896 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bfb349a2488212cb48c634e8e804ca19  lsof_4.89-rh.tar.xz
+SHA512 (lsof_4.90-rh.tar.xz) = 13b7f7f55a7e5c9f1e3bb55c73d4cf6a622c4018f65b567406195649d783ac3254d5ce848ce30a91223ae80fc1738e145dd110a311ba1a49987f759347a6cbd0

From 4c02d877e42111ccb594116f553afe38292bb30b Mon Sep 17 00:00:00 2001
From: Rafael dos Santos <rdossant@redhat.com>
Date: Fri, 13 Apr 2018 22:01:39 +0200
Subject: [PATCH 43/71] Use standard Fedora build flags

- Resolves #1548552

Signed-off-by: Rafael dos Santos <rdossant@redhat.com>
---
 lsof.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lsof.spec b/lsof.spec
index 081f053..e5ce569 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -34,7 +34,7 @@ about files that are open by the processes running on a UNIX system.
 
 %build
 ./Configure -n linux
-%make_build DEBUG="$RPM_OPT_FLAGS"
+%make_build DEBUG="%{build_cflags}" CFGL="%{build_ldflags} -L./lib -llsof -lselinux"
 
 %install
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
@@ -48,6 +48,9 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Fri Apr 13 2018 Rafael dos Santos <rdossant@redhat.com> - 4.90-2
+- Use standard Fedora build flags (bug #1548552)
+
 * Wed Feb 21 2018 Peter Schiffer <pschiffe@redhat.com> - 4.90-1
 - resolves: #1545963
   updated to 4.90

From f1c2bfc28c74d1c2a2f4d3e4815b6c564b4388b3 Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Tue, 22 May 2018 16:35:48 +0200
Subject: [PATCH 44/71] Update to 4.91, use tirpc for rpc

- resolves: #1560993 #1574669
---
 .gitignore                  |  2 +-
 lsof-man-page-section.patch |  2 +-
 lsof-tirpc.patch            | 11 +++++++++++
 lsof.spec                   | 16 +++++++++++++---
 sources                     |  2 +-
 5 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 lsof-tirpc.patch

diff --git a/.gitignore b/.gitignore
index eeea22f..af77bc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/lsof_4.90-rh.tar.xz
+/lsof_4.91-rh.tar.xz
diff --git a/lsof-man-page-section.patch b/lsof-man-page-section.patch
index d06ab79..5faae78 100644
--- a/lsof-man-page-section.patch
+++ b/lsof-man-page-section.patch
@@ -2,7 +2,7 @@ diff -upr lsof_4.89-rh.orig/lsof.8 lsof_4.89-rh/lsof.8
 --- lsof_4.89-rh.orig/lsof.8	2015-11-30 13:09:37.785075681 +0100
 +++ lsof_4.89-rh/lsof.8	2015-11-30 13:10:11.663029129 +0100
 @@ -1,5 +1,5 @@
- .ds VN 4.90
+ .ds VN 4.91
 -.TH LSOF 8 Revision-\*(VN
 +.TH LSOF 1 Revision-\*(VN
  \" Register )P is used neither by this file nor any groff macro.  However,
diff --git a/lsof-tirpc.patch b/lsof-tirpc.patch
new file mode 100644
index 0000000..efe343e
--- /dev/null
+++ b/lsof-tirpc.patch
@@ -0,0 +1,11 @@
+--- lsof_4.91-rh/Configure.orig	2018-05-22 15:54:57.275682247 +0200
++++ lsof_4.91-rh/Configure	2018-05-22 15:55:22.314556548 +0200
+@@ -2945,7 +2945,7 @@ return(0); }
+ 
+     # Test for <rpc/rpc.h>.
+ 
+-    if ! test -r ${LSOF_INCLUDE}/rpc/rpc.h	# {
++    if ! test -r ${LSOF_INCLUDE}/tirpc/rpc/rpc.h	# {
+     then
+       LSOF_CFGF="$LSOF_CFGF -DHASNORPC_H"
+     fi	# }
diff --git a/lsof.spec b/lsof.spec
index e5ce569..0aa8dbc 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.90
-Release: 2%{?dist}
+Version: 4.91
+Release: 1%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -20,9 +20,12 @@ Source1: upstream2downstream.sh
 
 # BZ#1260300 - move lsof man page to section 1
 Patch0: lsof-man-page-section.patch
+# BZ#1574669 - glibc deprecated Sun RPC, use TIRPC instead
+Patch1: lsof-tirpc.patch
 
 BuildRequires: gcc
 BuildRequires: libselinux-devel
+BuildRequires: libtirpc-devel
 
 %description
 Lsof stands for LiSt Open Files, and it does just that: it lists information
@@ -31,10 +34,11 @@ about files that are open by the processes running on a UNIX system.
 %prep
 %setup -q -n %{lsofrh}
 %patch0 -p1 -b .man-page-section
+%patch1 -p1 -b .tirpc
 
 %build
 ./Configure -n linux
-%make_build DEBUG="%{build_cflags}" CFGL="%{build_ldflags} -L./lib -llsof -lselinux"
+%make_build DEBUG="%{build_cflags} -I/usr/include/tirpc" CFGL="%{build_ldflags} -L./lib -llsof -lselinux -ltirpc"
 
 %install
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
@@ -48,6 +52,12 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Tue May 22 2018 Peter Schiffer <pschiffe@redhat.com> - 4.91-1
+- resolves: #1560993
+  updated to 4.91
+- resolves: #1574669
+  use tirpc library for rpc
+
 * Fri Apr 13 2018 Rafael dos Santos <rdossant@redhat.com> - 4.90-2
 - Use standard Fedora build flags (bug #1548552)
 
diff --git a/sources b/sources
index 4971896..d7bf953 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lsof_4.90-rh.tar.xz) = 13b7f7f55a7e5c9f1e3bb55c73d4cf6a622c4018f65b567406195649d783ac3254d5ce848ce30a91223ae80fc1738e145dd110a311ba1a49987f759347a6cbd0
+SHA512 (lsof_4.91-rh.tar.xz) = c73037ef2b69ebb49ba4badc19508adafe0eff8216a4d7007aa084d8ba246cba4f5fd1d729a5e53fa2d55cb7f27dbaf340c72575b297e5ac331a1d547e986e70

From bd1c16e28d296e1cf4069d40cf23e8805ef4845a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 13 Jul 2018 09:24:29 +0000
Subject: [PATCH 45/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 0aa8dbc..d20ea82 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -52,6 +52,9 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.91-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Tue May 22 2018 Peter Schiffer <pschiffe@redhat.com> - 4.91-1
 - resolves: #1560993
   updated to 4.91

From 870a16364de4eee7a6f94ac9857e57964684c3f5 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:17:53 +0100
Subject: [PATCH 46/71] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 lsof.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index d20ea82..28301f3 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -5,7 +5,6 @@ Release: 2%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
-Group: Development/Debuggers
 URL: http://people.freebsd.org/~abe/
 
 # lsof contains licensed code that we cannot ship.  Therefore we use

From 5c329912979b411b03f20945143a469d28a5c4bd Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 1 Feb 2019 09:05:07 +0000
Subject: [PATCH 47/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 28301f3..2716cde 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.91
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -51,6 +51,9 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.91-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.91-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From 3b359ddacc0d81d8c5f41a51098c546ee1c13f29 Mon Sep 17 00:00:00 2001
From: Jan Rybar <jrybar@redhat.com>
Date: Wed, 12 Jun 2019 14:37:24 +0200
Subject: [PATCH 48/71] Rebase to lsof-4.93.2

Upstream moved to GitHub and tarball structure changed
Manpage patch needed to reflect the tarball changes
---
 .gitignore                  |  1 +
 lsof-man-page-section.patch |  8 ++++----
 lsof.spec                   | 21 +++++++++++++--------
 sources                     |  2 +-
 upstream2downstream.sh      | 18 +++++++++---------
 5 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index af77bc0..b925983 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /lsof_4.91-rh.tar.xz
+/lsof-4.93.2-rh.tar.xz
diff --git a/lsof-man-page-section.patch b/lsof-man-page-section.patch
index 5faae78..861baec 100644
--- a/lsof-man-page-section.patch
+++ b/lsof-man-page-section.patch
@@ -1,8 +1,8 @@
-diff -upr lsof_4.89-rh.orig/lsof.8 lsof_4.89-rh/lsof.8
---- lsof_4.89-rh.orig/lsof.8	2015-11-30 13:09:37.785075681 +0100
-+++ lsof_4.89-rh/lsof.8	2015-11-30 13:10:11.663029129 +0100
+diff -up ./Lsof.8.ori ./Lsof.8
+--- ./Lsof.8.ori	2019-05-28 15:32:49.945667234 +0200
++++ ./Lsof.8	2019-05-28 15:33:06.182865931 +0200
 @@ -1,5 +1,5 @@
- .ds VN 4.91
+ .so ./version
 -.TH LSOF 8 Revision-\*(VN
 +.TH LSOF 1 Revision-\*(VN
  \" Register )P is used neither by this file nor any groff macro.  However,
diff --git a/lsof.spec b/lsof.spec
index 2716cde..d059168 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,11 +1,11 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.91
-Release: 3%{?dist}
+Version: 4.93.2
+Release: 1%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
-URL: http://people.freebsd.org/~abe/
+URL: https://github.com/lsof-org/lsof
 
 # lsof contains licensed code that we cannot ship.  Therefore we use
 # upstream2downstream.sh script to remove the code before shipping it.
@@ -13,18 +13,17 @@ URL: http://people.freebsd.org/~abe/
 # The script can be found in SCM or downloaded from:
 # http://pkgs.fedoraproject.org/cgit/lsof.git/tree/upstream2downstream.sh
 
-%global lsofrh lsof_%{version}-rh
+%global lsofrh lsof-%{version}-rh
 Source0: %{lsofrh}.tar.xz
 Source1: upstream2downstream.sh
 
 # BZ#1260300 - move lsof man page to section 1
 Patch0: lsof-man-page-section.patch
-# BZ#1574669 - glibc deprecated Sun RPC, use TIRPC instead
-Patch1: lsof-tirpc.patch
 
 BuildRequires: gcc
 BuildRequires: libselinux-devel
 BuildRequires: libtirpc-devel
+BuildRequires: groff-base
 
 %description
 Lsof stands for LiSt Open Files, and it does just that: it lists information
@@ -33,17 +32,18 @@ about files that are open by the processes running on a UNIX system.
 %prep
 %setup -q -n %{lsofrh}
 %patch0 -p1 -b .man-page-section
-%patch1 -p1 -b .tirpc
 
 %build
 ./Configure -n linux
 %make_build DEBUG="%{build_cflags} -I/usr/include/tirpc" CFGL="%{build_ldflags} -L./lib -llsof -lselinux -ltirpc"
+# rebase to 4.93 introduced change in Lsof.8 with unhandled .so inclusion
+soelim -r Lsof.8 > lsof.1
 
 %install
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 install -p -m 0755 lsof ${RPM_BUILD_ROOT}%{_bindir}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
-install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
+install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 
 %files
 %doc 00README 00CREDITS 00FAQ 00LSOF-L 00QUICKSTART
@@ -51,6 +51,11 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Tue May 28 2019 Jan Rybar <jrybar@redhat.com> - 4.93.2-1
+- Rebase to lsof-4.93.2
+- Upstream moved to GitHub and tarball structure changed
+- Manpage patch needed to reflect the tarball changes
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.91-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index d7bf953..e76cf8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lsof_4.91-rh.tar.xz) = c73037ef2b69ebb49ba4badc19508adafe0eff8216a4d7007aa084d8ba246cba4f5fd1d729a5e53fa2d55cb7f27dbaf340c72575b297e5ac331a1d547e986e70
+SHA512 (lsof-4.93.2-rh.tar.xz) = 5bc7b42c7a270882c3d5288766c3e6c809b1264abff38072c1ece083635b745c0773ef5509c1a51d65bb998c9b1ea4e72889979aafd4a672aac5b81cbe71f1ff
diff --git a/upstream2downstream.sh b/upstream2downstream.sh
index 247ee29..0dd7b87 100755
--- a/upstream2downstream.sh
+++ b/upstream2downstream.sh
@@ -12,27 +12,27 @@
 #
 
 UPSTREAM="$1"
-NAME=$(basename $UPSTREAM .tar.bz2)
+NAME=$(basename $UPSTREAM .tar.gz)
 MYPWD=$(pwd)
 TMP=$(mktemp -d)
 
 echo
 echo -n "Extracting upstream code..."
-tar -jxf $UPSTREAM  -C $TMP
+tar -xf $UPSTREAM  -C $TMP
 cd $TMP/$NAME
-tar xf "$NAME"_src.tar
-echo " done."
-
-echo -n "Moving files to downstream directory..."
-mv "$NAME"_src/ "$NAME"-rh
-mv README* 00* RELEASE* "$NAME"-rh
 echo " done."
 
 echo -n "Removing non-Linux dialects..."
-rm -rf "$NAME"-rh/dialects/{aix,darwin,du,freebsd,hpux,n+obsd,n+os,osr,sun,uw}
+rm -rf ./dialects/{aix,darwin,du,freebsd,hpux,n+obsd,n+os,osr,sun,uw}
+echo " done."
+
+echo -n "Removing unused distribution scripts..."
+rm -rf ./support
 echo " done."
 
 echo -n "Creating final downstream tarball..."
+cd ..
+mv $NAME $NAME-rh
 tar Jcf $MYPWD/"$NAME"-rh.tar.xz "$NAME"-rh
 echo " done."
 

From 007cdc12040ca7a8453ac245ae62f32429d3714c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jul 2019 15:16:10 +0000
Subject: [PATCH 49/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index d059168..a8fd25e 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.93.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -51,6 +51,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.93.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Tue May 28 2019 Jan Rybar <jrybar@redhat.com> - 4.93.2-1
 - Rebase to lsof-4.93.2
 - Upstream moved to GitHub and tarball structure changed

From e929047ed287832b32b8fc807dda11ff1ba8fe02 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jan 2020 11:21:50 +0000
Subject: [PATCH 50/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index a8fd25e..06b2dd0 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.93.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -51,6 +51,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.93.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.93.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From dbb35c43706c136901dd02a57c73c5aa7e7d5836 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jul 2020 06:21:34 +0000
Subject: [PATCH 51/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 06b2dd0..2f21768 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.93.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -51,6 +51,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.93.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.93.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 102cdfba93f6b54bed325f66ec90b05fa1fe2e4e Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Tue, 5 Jan 2021 03:28:19 +0000
Subject: [PATCH 52/71] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 lsof.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lsof.spec b/lsof.spec
index 2f21768..c77ca69 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -24,6 +24,7 @@ BuildRequires: gcc
 BuildRequires: libselinux-devel
 BuildRequires: libtirpc-devel
 BuildRequires: groff-base
+BuildRequires: make
 
 %description
 Lsof stands for LiSt Open Files, and it does just that: it lists information

From 9604b26dc289d421c299dd39fb384e64c50b96f6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 18:45:37 +0000
Subject: [PATCH 53/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index c77ca69..75660b0 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.93.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -52,6 +52,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.93.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.93.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From 013af6d92d27c4b4a1d7e1210c7d1c105a896484 Mon Sep 17 00:00:00 2001
From: Jan Rybar <jrybar@redhat.com>
Date: Thu, 28 Jan 2021 17:53:58 +0100
Subject: [PATCH 54/71] Rebase to 4.94.0

---
 .gitignore | 1 +
 lsof.spec  | 7 +++++--
 sources    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index b925983..f25d2cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /lsof_4.91-rh.tar.xz
 /lsof-4.93.2-rh.tar.xz
+/lsof-4.94.0-rh.tar.xz
diff --git a/lsof.spec b/lsof.spec
index 75660b0..4c61b1d 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.93.2
-Release: 5%{?dist}
+Version: 4.94.0
+Release: 1%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -52,6 +52,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jan 28 2021 Jan Rybar <jrybar@redhat.com> - 4.94.0-1
+- Rebase to 4.94.0
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.93.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index e76cf8c..211fd52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lsof-4.93.2-rh.tar.xz) = 5bc7b42c7a270882c3d5288766c3e6c809b1264abff38072c1ece083635b745c0773ef5509c1a51d65bb998c9b1ea4e72889979aafd4a672aac5b81cbe71f1ff
+SHA512 (lsof-4.94.0-rh.tar.xz) = 61ce5c85ee263b38281fe5e591d2da391e52e061293e884b2afc72b7372a1b412b97ed4246e19a339d012fd7102df997004a01d74e9afa035bd8764be7d0af7e

From 43b439851fcc69e14982b8e39a86a07f436d961f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 22 Jul 2021 13:13:41 +0000
Subject: [PATCH 55/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 4c61b1d..bfd4973 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.94.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -52,6 +52,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.94.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Thu Jan 28 2021 Jan Rybar <jrybar@redhat.com> - 4.94.0-1
 - Rebase to 4.94.0
 

From 3ac7af198dcfad19d8029dd676e4e01785194f9d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jan 2022 18:09:26 +0000
Subject: [PATCH 56/71] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index bfd4973..2bb6747 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.94.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -52,6 +52,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.94.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.94.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 5152bc91ae08e9c5ca8cc44f1af12e9022a689ff Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 21 Jul 2022 19:57:11 +0000
Subject: [PATCH 57/71] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 2bb6747..a9dd496 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.94.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -52,6 +52,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.94.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.94.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From c2295475c1bd06fca58d5f25c4cae41b0f038030 Mon Sep 17 00:00:00 2001
From: Jan Rybar <jrybar@redhat.com>
Date: Sat, 3 Sep 2022 16:16:09 +0200
Subject: [PATCH 58/71] rebase to 4.95.0 Resolves: bz#1896532

---
 .gitignore | 1 +
 lsof.spec  | 7 +++++--
 sources    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f25d2cc..1121ffa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /lsof_4.91-rh.tar.xz
 /lsof-4.93.2-rh.tar.xz
 /lsof-4.94.0-rh.tar.xz
+/lsof-4.95.0-rh.tar.xz
diff --git a/lsof.spec b/lsof.spec
index a9dd496..df9b348 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.94.0
-Release: 4%{?dist}
+Version: 4.95.0
+Release: 1%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -52,6 +52,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Fri Sep 02 2022 Jan Rybar <jrybar@redhat.com> - 4.95.0-1
+- rebase to 4.95.0
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.94.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 211fd52..11e4221 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lsof-4.94.0-rh.tar.xz) = 61ce5c85ee263b38281fe5e591d2da391e52e061293e884b2afc72b7372a1b412b97ed4246e19a339d012fd7102df997004a01d74e9afa035bd8764be7d0af7e
+SHA512 (lsof-4.95.0-rh.tar.xz) = 305adc829f2bc4b2f3fcec7060b0bc457feec970bce663e34a37adce42ace09258e0d4a9ec5c3e064feb7637b0f1a47f1c764bad9d25bc756ae8f823aa6e2a53

From f130d9e01cda20308bdd296efd17c6ee697bbb25 Mon Sep 17 00:00:00 2001
From: Jan Rybar <jrybar@redhat.com>
Date: Tue, 20 Sep 2022 21:55:50 +0200
Subject: [PATCH 59/71] Rebase to 4.96.3

---
 .gitignore                  | 1 +
 lsof-man-page-section.patch | 8 ++++----
 lsof.spec                   | 5 ++++-
 sources                     | 1 +
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1121ffa..e0720ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /lsof-4.93.2-rh.tar.xz
 /lsof-4.94.0-rh.tar.xz
 /lsof-4.95.0-rh.tar.xz
+/lsof-4.96.3-rh.tar.xz
diff --git a/lsof-man-page-section.patch b/lsof-man-page-section.patch
index 861baec..47da375 100644
--- a/lsof-man-page-section.patch
+++ b/lsof-man-page-section.patch
@@ -1,10 +1,10 @@
 diff -up ./Lsof.8.ori ./Lsof.8
---- ./Lsof.8.ori	2019-05-28 15:32:49.945667234 +0200
-+++ ./Lsof.8	2019-05-28 15:33:06.182865931 +0200
+--- ./Lsof.8.ori	2022-09-20 19:46:03.560004892 +0200
++++ ./Lsof.8	2022-09-20 19:46:17.578086787 +0200
 @@ -1,5 +1,5 @@
  .so ./version
 -.TH LSOF 8 Revision-\*(VN
 +.TH LSOF 1 Revision-\*(VN
- \" Register )P is used neither by this file nor any groff macro.  However,
- \" some versions of nroff require it.
+ .\" Register )P is used neither by this file nor any groff macro.  However,
+ .\" some versions of nroff require it.
  .if !\n(.g \{\
diff --git a/lsof.spec b/lsof.spec
index df9b348..c589719 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,6 +1,6 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.95.0
+Version: 4.96.3
 Release: 1%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
@@ -52,6 +52,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Tue Sep 20 2022 Jan Rybar <jrybar@redhat.com> - 4.96.3-1
+- rebase to 4.96.3
+
 * Fri Sep 02 2022 Jan Rybar <jrybar@redhat.com> - 4.95.0-1
 - rebase to 4.95.0
 
diff --git a/sources b/sources
index 11e4221..d5264de 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (lsof-4.95.0-rh.tar.xz) = 305adc829f2bc4b2f3fcec7060b0bc457feec970bce663e34a37adce42ace09258e0d4a9ec5c3e064feb7637b0f1a47f1c764bad9d25bc756ae8f823aa6e2a53
+SHA512 (lsof-4.96.3-rh.tar.xz) = 6f289662aa8c2d075d04d7a272c20cf6f06ddeb3af5b70650c1ba607e1517d6c19ee320a2207af61aed67cb8f11be994350c656b990ad9db696c41ab5019128c

From 9b1730c7b0f3b7e658e0578c863d60bea430d938 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 21 Nov 2022 11:02:08 +0100
Subject: [PATCH 60/71] Fix C89isms in Configure

Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
---
 lsof-Configure.patch | 27 +++++++++++++++++++++++++++
 lsof.spec            |  7 ++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 lsof-Configure.patch

diff --git a/lsof-Configure.patch b/lsof-Configure.patch
new file mode 100644
index 0000000..96b5ceb
--- /dev/null
+++ b/lsof-Configure.patch
@@ -0,0 +1,27 @@
+Avoid C89isms during configure checks.
+
+Submitted upstream: <https://github.com/lsof-org/lsof/pull/265>
+
+diff --git a/Configure b/Configure
+index d8adfda3e47f87df..ed1e1d60840b3852 100755
+--- a/Configure
++++ b/Configure
+@@ -2189,7 +2189,7 @@ LOCKF_OWNER4
+ #include <netinet/in.h>
+ #include <netinet/in_pcb.h>
+ #include <netinet/tcp_var.h>
+-main() {
++int main() {
+ struct xtcpcb pcb; pcb.t_maxseg = 0;
+ }
+ .LSOF_END_HERE_DOC4
+@@ -2755,7 +2755,8 @@ struct xtcpcb pcb; pcb.t_maxseg = 0;
+       rm -f ${LSOF_TMPC}.*
+       cat > $LSOF_TMPC.c << .LSOF_END_HERE_DOC1
+ #include <features.h>
+-main() {
++#include <stdio.h>
++int main() {
+ #if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
+ printf("-DGLIBCV=%d\n",__GLIBC__*100+__GLIBC_MINOR__);
+ #elif defined(__GLIBC__)
diff --git a/lsof.spec b/lsof.spec
index c589719..1a53776 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.96.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -19,6 +19,7 @@ Source1: upstream2downstream.sh
 
 # BZ#1260300 - move lsof man page to section 1
 Patch0: lsof-man-page-section.patch
+Patch1: lsof-Configure.patch
 
 BuildRequires: gcc
 BuildRequires: libselinux-devel
@@ -33,6 +34,7 @@ about files that are open by the processes running on a UNIX system.
 %prep
 %setup -q -n %{lsofrh}
 %patch0 -p1 -b .man-page-section
+%patch1 -p1
 
 %build
 ./Configure -n linux
@@ -52,6 +54,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Mon Nov 21 2022 Florian Weimer <fweimer@redhat.com> - 4.96.3-2
+- Fix C89isms in Configure
+
 * Tue Sep 20 2022 Jan Rybar <jrybar@redhat.com> - 4.96.3-1
 - rebase to 4.96.3
 

From f4bfc8382473f173e9b8cdaad21637db4b4b5c02 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 19 Jan 2023 18:21:59 +0000
Subject: [PATCH 61/71] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 1a53776..4a89e8a 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.96.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -54,6 +54,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.96.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Mon Nov 21 2022 Florian Weimer <fweimer@redhat.com> - 4.96.3-2
 - Fix C89isms in Configure
 

From d0c998b5d6e39ebccf612867430d37d12603e5de Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jul 2023 13:07:47 +0000
Subject: [PATCH 62/71] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 4a89e8a..83f8437 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.96.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License: zlib and Sendmail and LGPLv2+
@@ -54,6 +54,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.96.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.96.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 787bec859b08509592a79729d8e3c5147d2e7f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Fri, 29 Sep 2023 14:11:57 +0000
Subject: [PATCH 63/71] Migrate to SPDX license

the zlib license has been found to not match zlib and got new SPDX identifier. See:
 https://gitlab.com/fedora/legal/fedora-license-data/-/issues/307
 https://github.com/spdx/license-list-XML/issues/2100

I removed the LGPLv2 because I could not find any such text in regex.c or regex.h.

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2
---
 lsof.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lsof.spec b/lsof.spec
index 83f8437..7809a93 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -3,8 +3,7 @@ Name: lsof
 Version: 4.96.3
 Release: 4%{?dist}
 # Sendmail .. lib/snpf.c
-# LGPLv2+  .. lib/regex.c, regex.h
-License: zlib and Sendmail and LGPLv2+
+License: lsof AND Sendmail
 URL: https://github.com/lsof-org/lsof
 
 # lsof contains licensed code that we cannot ship.  Therefore we use

From 8da3b153d4a151b4a7a504c9a7779efb04dbf914 Mon Sep 17 00:00:00 2001
From: Jan Rybar <jrybar@redhat.com>
Date: Fri, 20 Oct 2023 20:03:40 +0200
Subject: [PATCH 64/71] Rebase to lsof-4.98.0

---
 .gitignore           |  1 +
 lsof-Configure.patch | 27 ---------------------------
 lsof.spec            | 19 +++++++++++--------
 sources              |  3 +--
 4 files changed, 13 insertions(+), 37 deletions(-)
 delete mode 100644 lsof-Configure.patch

diff --git a/.gitignore b/.gitignore
index e0720ce..f785c3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /lsof-4.94.0-rh.tar.xz
 /lsof-4.95.0-rh.tar.xz
 /lsof-4.96.3-rh.tar.xz
+/lsof-4.98.0-rh.tar.xz
diff --git a/lsof-Configure.patch b/lsof-Configure.patch
deleted file mode 100644
index 96b5ceb..0000000
--- a/lsof-Configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Avoid C89isms during configure checks.
-
-Submitted upstream: <https://github.com/lsof-org/lsof/pull/265>
-
-diff --git a/Configure b/Configure
-index d8adfda3e47f87df..ed1e1d60840b3852 100755
---- a/Configure
-+++ b/Configure
-@@ -2189,7 +2189,7 @@ LOCKF_OWNER4
- #include <netinet/in.h>
- #include <netinet/in_pcb.h>
- #include <netinet/tcp_var.h>
--main() {
-+int main() {
- struct xtcpcb pcb; pcb.t_maxseg = 0;
- }
- .LSOF_END_HERE_DOC4
-@@ -2755,7 +2755,8 @@ struct xtcpcb pcb; pcb.t_maxseg = 0;
-       rm -f ${LSOF_TMPC}.*
-       cat > $LSOF_TMPC.c << .LSOF_END_HERE_DOC1
- #include <features.h>
--main() {
-+#include <stdio.h>
-+int main() {
- #if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
- printf("-DGLIBCV=%d\n",__GLIBC__*100+__GLIBC_MINOR__);
- #elif defined(__GLIBC__)
diff --git a/lsof.spec b/lsof.spec
index 7809a93..67bedb3 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,9 +1,8 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.96.3
-Release: 4%{?dist}
-# Sendmail .. lib/snpf.c
-License: lsof AND Sendmail
+Version: 4.98.0
+Release: 1%{?dist}
+License: lsof AND GPL-3.0-or-later
 URL: https://github.com/lsof-org/lsof
 
 # lsof contains licensed code that we cannot ship.  Therefore we use
@@ -18,13 +17,14 @@ Source1: upstream2downstream.sh
 
 # BZ#1260300 - move lsof man page to section 1
 Patch0: lsof-man-page-section.patch
-Patch1: lsof-Configure.patch
 
 BuildRequires: gcc
 BuildRequires: libselinux-devel
 BuildRequires: libtirpc-devel
 BuildRequires: groff-base
 BuildRequires: make
+BuildRequires: automake
+BuildRequires: autoconf
 
 %description
 Lsof stands for LiSt Open Files, and it does just that: it lists information
@@ -32,11 +32,11 @@ about files that are open by the processes running on a UNIX system.
 
 %prep
 %setup -q -n %{lsofrh}
-%patch0 -p1 -b .man-page-section
-%patch1 -p1
+%autopatch -p1
+#%patch1 -p1
 
 %build
-./Configure -n linux
+%configure
 %make_build DEBUG="%{build_cflags} -I/usr/include/tirpc" CFGL="%{build_ldflags} -L./lib -llsof -lselinux -ltirpc"
 # rebase to 4.93 introduced change in Lsof.8 with unhandled .so inclusion
 soelim -r Lsof.8 > lsof.1
@@ -53,6 +53,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Fri Oct 20 2023 Jan Rybar <jrybar@redhat.com> - 4.98.0-1
+- rebase to lsof-4.98
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.96.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index d5264de..339a190 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (lsof-4.95.0-rh.tar.xz) = 305adc829f2bc4b2f3fcec7060b0bc457feec970bce663e34a37adce42ace09258e0d4a9ec5c3e064feb7637b0f1a47f1c764bad9d25bc756ae8f823aa6e2a53
-SHA512 (lsof-4.96.3-rh.tar.xz) = 6f289662aa8c2d075d04d7a272c20cf6f06ddeb3af5b70650c1ba607e1517d6c19ee320a2207af61aed67cb8f11be994350c656b990ad9db696c41ab5019128c
+SHA512 (lsof-4.98.0-rh.tar.xz) = a0938c4c431d2aed7ce7e09560b45acefb5c2730c707817b3013f564defa381391ee113e7989fc21eec4703f4ac112104ec0edd9d51a024797116416a4717683

From f469b0d7c718f0fb0766af5e1fc500d92e48d5a9 Mon Sep 17 00:00:00 2001
From: Jan Rybar <jrybar@redhat.com>
Date: Mon, 23 Oct 2023 12:42:13 +0200
Subject: [PATCH 65/71] version bump due to licence fix

---
 lsof.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lsof.spec b/lsof.spec
index 67bedb3..a97b2d5 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,8 +1,8 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.98.0
-Release: 1%{?dist}
-License: lsof AND GPL-3.0-or-later
+Release: 2%{?dist}
+License: lsof
 URL: https://github.com/lsof-org/lsof
 
 # lsof contains licensed code that we cannot ship.  Therefore we use
@@ -53,6 +53,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Mon Oct 23 2023 Jan Rybar <jrybar@redhat.com> - 4.98.0-2
+- version bump due to licence fix
+
 * Fri Oct 20 2023 Jan Rybar <jrybar@redhat.com> - 4.98.0-1
 - rebase to lsof-4.98
 

From 3040efd024f11becf41f4a1d4b2168e3f09fc055 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 21 Jan 2024 06:17:24 +0000
Subject: [PATCH 66/71] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index a97b2d5..ba7920d 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.98.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: lsof
 URL: https://github.com/lsof-org/lsof
 
@@ -53,6 +53,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.98.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Mon Oct 23 2023 Jan Rybar <jrybar@redhat.com> - 4.98.0-2
 - version bump due to licence fix
 

From 76099262dcb9388046a26b0ce9dded0253c735e5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jan 2024 04:52:58 +0000
Subject: [PATCH 67/71] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index ba7920d..d72b0e6 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.98.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: lsof
 URL: https://github.com/lsof-org/lsof
 
@@ -53,6 +53,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.98.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.98.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 6ec9f9e2fe2f1c163239790f1ffb7ec7557b5354 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 18 Jul 2024 16:04:36 +0000
Subject: [PATCH 68/71] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index d72b0e6..02a8671 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.98.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: lsof
 URL: https://github.com/lsof-org/lsof
 
@@ -53,6 +53,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.98.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.98.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From c6355d7f40182913af700550506309bba8e22f3e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jan 2025 16:05:57 +0000
Subject: [PATCH 69/71] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 02a8671..3824888 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.98.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: lsof
 URL: https://github.com/lsof-org/lsof
 
@@ -53,6 +53,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.98.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.98.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From 8a517987f7ee25a76ff89c5bb704deb3807f57c3 Mon Sep 17 00:00:00 2001
From: Jan Rybar <jrybar@redhat.com>
Date: Mon, 27 Jan 2025 11:31:20 +0100
Subject: [PATCH 70/71] FTBFS: stricter check, incompatible types

---
 f42-ftbfs.patch | 31 +++++++++++++++++++++++++++++++
 lsof.spec       | 11 +++++++----
 2 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 f42-ftbfs.patch

diff --git a/f42-ftbfs.patch b/f42-ftbfs.patch
new file mode 100644
index 0000000..626bfab
--- /dev/null
+++ b/f42-ftbfs.patch
@@ -0,0 +1,31 @@
+diff --git a/misc.c b/misc.c
+index 9f443ea..a4bb3db 100644
+--- a/misc.c
++++ b/misc.c
+@@ -58,7 +58,7 @@ _PROTOTYPE(static void closePipes,(void));
+ _PROTOTYPE(static int dolstat,(char *path, char *buf, int len));
+ _PROTOTYPE(static int dostat,(char *path, char *buf, int len));
+ _PROTOTYPE(static int doreadlink,(char *path, char *buf, int len));
+-_PROTOTYPE(static int doinchild,(int (*fn)(), char *fp, char *rbuf, int rbln));
++_PROTOTYPE(static int doinchild,(int (*fn)(char *, char *, int), char *fp, char *rbuf, int rbln));
+ 
+ #if	defined(HASINTSIGNAL)
+ _PROTOTYPE(static int handleint,(int sig));
+@@ -234,7 +234,7 @@ compdev(a1, a2)
+ 
+ static int
+ doinchild(fn, fp, rbuf, rbln)
+-	int (*fn)();			/* function to perform */
++	int (*fn)(char *, char *, int);			/* function to perform */
+ 	char *fp;			/* function parameter */
+ 	char *rbuf;			/* response buffer */
+ 	int rbln;			/* response buffer length */
+@@ -296,7 +296,7 @@ doinchild(fn, fp, rbuf, rbln)
+ 			     */
+ 			    struct stat _;
+ 		    } r;
+-		    int (*r_fn)();
++		    int (*r_fn)(char *, char *, int);
+ 		/*
+ 		 * Close sufficient open file descriptors except Pipes[0] and
+ 		 * Pipes[3].
diff --git a/lsof.spec b/lsof.spec
index 3824888..35fa64d 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.98.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: lsof
 URL: https://github.com/lsof-org/lsof
 
@@ -17,6 +17,7 @@ Source1: upstream2downstream.sh
 
 # BZ#1260300 - move lsof man page to section 1
 Patch0: lsof-man-page-section.patch
+Patch1: f42-ftbfs.patch
 
 BuildRequires: gcc
 BuildRequires: libselinux-devel
@@ -25,15 +26,14 @@ BuildRequires: groff-base
 BuildRequires: make
 BuildRequires: automake
 BuildRequires: autoconf
+BuildRequires: git
 
 %description
 Lsof stands for LiSt Open Files, and it does just that: it lists information
 about files that are open by the processes running on a UNIX system.
 
 %prep
-%setup -q -n %{lsofrh}
-%autopatch -p1
-#%patch1 -p1
+%autosetup -n %{lsofrh} -S git
 
 %build
 %configure
@@ -53,6 +53,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Fri Jan 24 2025 Jan Rybar <jrybar@redhat.com> - 4.98.0-7
+- FTBFS: stricter check, incompatible types
+
 * Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.98.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From c1db20ed4a411403a470cab8a5dd8697ba10c56b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 24 Jul 2025 20:54:35 +0000
Subject: [PATCH 71/71] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 lsof.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lsof.spec b/lsof.spec
index 35fa64d..04379d5 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.98.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: lsof
 URL: https://github.com/lsof-org/lsof
 
@@ -53,6 +53,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.98.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Fri Jan 24 2025 Jan Rybar <jrybar@redhat.com> - 4.98.0-7
 - FTBFS: stricter check, incompatible types