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] 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