aboutsummaryrefslogtreecommitdiff
path: root/utils/lsof/patches
diff options
context:
space:
mode:
Diffstat (limited to 'utils/lsof/patches')
-rw-r--r--utils/lsof/patches/000-disable-man.patch18
-rw-r--r--utils/lsof/patches/001-lsof_makefile.patch13
-rw-r--r--utils/lsof/patches/002-lsof_noportmap.patch18
-rw-r--r--utils/lsof/patches/003-lsof_selinux.patch11
-rw-r--r--utils/lsof/patches/004-lsof_ccv.patch12
5 files changed, 18 insertions, 54 deletions
diff --git a/utils/lsof/patches/000-disable-man.patch b/utils/lsof/patches/000-disable-man.patch
new file mode 100644
index 000000000..cf9a391f0
--- /dev/null
+++ b/utils/lsof/patches/000-disable-man.patch
@@ -0,0 +1,18 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -208,13 +208,8 @@ EXTRA_DIST += 00.README.FIRST 00CREDITS
+ # Testing
+ EXTRA_DIST += tests/00README tests/TestDB tests/CkTestDB tests/Makefile tests/LsofTest.h check.bash
+
+-# Manpages
+-lsof.man: Lsof.8 version 00DIALECTS
+- soelim < Lsof.8 > $@
+-man8_MANS = lsof.man
+-EXTRA_DIST += Lsof.8
+ # Fix distcheck error
+ clean-local:
+ rm -rf lsof.man
+ distclean-local:
+- rm -rf lockf_owner.h lockf.h
+\ No newline at end of file
++ rm -rf lockf_owner.h lockf.h
diff --git a/utils/lsof/patches/001-lsof_makefile.patch b/utils/lsof/patches/001-lsof_makefile.patch
deleted file mode 100644
index eb2b73519..000000000
--- a/utils/lsof/patches/001-lsof_makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/lib/Makefile.skel
-+++ b/lib/Makefile.skel
-@@ -21,8 +21,8 @@ OBJ= ckkv.o cvfs.o dvch.o fino.o isfn.o
- all: ${LIB}
-
- ${LIB}: ${OBJ}
-- ${AR}
-- ${RANLIB}
-+ ${AR} ${LIB} ${OBJ}
-+ ${RANLIB} ${LIB}
-
- clean: FRC
- rm -f ${LIB} ${OBJ} errs Makefile.bak a.out core
diff --git a/utils/lsof/patches/002-lsof_noportmap.patch b/utils/lsof/patches/002-lsof_noportmap.patch
deleted file mode 100644
index 825f255b7..000000000
--- a/utils/lsof/patches/002-lsof_noportmap.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/print.c
-+++ b/print.c
-@@ -160,6 +160,7 @@ endnm(sz)
- static void
- fill_portmap()
- {
-+#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_RPC__)
- char buf[128], *cp, *nm;
- CLIENT *c;
- int h, port, pr;
-@@ -278,6 +279,7 @@ fill_portmap()
- Pth[pr][h] = pt;
- }
- clnt_destroy(c);
-+#endif
- }
- #endif /* !defined(HASNORPC_H) */
-
diff --git a/utils/lsof/patches/003-lsof_selinux.patch b/utils/lsof/patches/003-lsof_selinux.patch
deleted file mode 100644
index ee1426d12..000000000
--- a/utils/lsof/patches/003-lsof_selinux.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Configure
-+++ b/Configure
-@@ -2991,7 +2991,7 @@ return(0); }
- LSOF_TMP1=1
- fi # }
- fi # }
-- if test $LSOF_TMP1 -eq 1 # {
-+ if test 0 -eq 1 # {
- then
- LSOF_CFGF="$LSOF_CFGF -DHASSELINUX"
- LSOF_CFGL="$LSOF_CFGL -lselinux"
diff --git a/utils/lsof/patches/004-lsof_ccv.patch b/utils/lsof/patches/004-lsof_ccv.patch
deleted file mode 100644
index 1f4e57c52..000000000
--- a/utils/lsof/patches/004-lsof_ccv.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Configure
-+++ b/Configure
-@@ -2850,6 +2850,9 @@ LOCKF_OWNER4
- if test "X$LSOF_CC" = "X" # {
- then
- LSOF_CC=cc
-+ fi # }
-+ if test "X$LSOF_CCV" = "X" # {
-+ then
- LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
- fi # }
- if test "X$LINUX_CONF_CC" = "X" # {