From 4265063cb7a3494ca88ea444751d895f15a12d04 Mon Sep 17 00:00:00 2001 From: Peter Schiffer Date: Wed, 29 Jul 2015 12:58:53 +0200 Subject: [PATCH] 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 - 4.89-1 +- updated to 4.89 + * Wed Jun 17 2015 Fedora Release Engineering - 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