diff --git a/utils/lsof/Makefile b/utils/lsof/Makefile index aad4730cd..dd070b05d 100644 --- a/utils/lsof/Makefile +++ b/utils/lsof/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2010 OpenWrt.org +# Copyright (C) 2007-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=lsof -PKG_VERSION:=4.81 -PKG_RELEASE:=2 +PKG_VERSION:=4.86 +PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).dfsg.1.orig.tar.gz +PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)+dfsg.orig.tar.gz PKG_SOURCE_URL:=http://ftp2.de.debian.org/debian/pool/main/l/lsof -PKG_MD5SUM:=138b628cb1b6a3b16b32b792f77abcce +PKG_MD5SUM:=23420509564a897b76055f9d84d19068 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).dfsg.1 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)+dfsg.orig include $(INCLUDE_DIR)/package.mk diff --git a/utils/lsof/patches/001-lsof_makefile.patch b/utils/lsof/patches/001-lsof_makefile.patch index acd636a6f..eb2b73519 100644 --- a/utils/lsof/patches/001-lsof_makefile.patch +++ b/utils/lsof/patches/001-lsof_makefile.patch @@ -1,7 +1,6 @@ -diff -ru lsof_4.77.orig/lsof_4.77_src/lib/Makefile.skel lsof_4.77/lsof_4.77_src/lib/Makefile.skel ---- lsof_4.77.orig/lib/Makefile.skel 2001-02-13 03:12:22.000000000 +0100 -+++ lsof_4.77/lib/Makefile.skel 2006-11-29 13:51:44.000000000 +0100 -@@ -21,8 +21,8 @@ +--- 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} diff --git a/utils/lsof/patches/002-lsof_noportmap.patch b/utils/lsof/patches/002-lsof_noportmap.patch index 5f0c17ebd..d0e88893c 100644 --- a/utils/lsof/patches/002-lsof_noportmap.patch +++ b/utils/lsof/patches/002-lsof_noportmap.patch @@ -1,6 +1,6 @@ ---- lsof_4.77/print.orig.c 2006-08-23 13:37:43.000000000 -0600 -+++ lsof_4.77/print.c 2006-08-23 13:38:29.000000000 -0600 -@@ -148,6 +148,7 @@ +--- a/print.c ++++ b/print.c +@@ -161,6 +161,7 @@ endnm(sz) static void fill_portmap() { @@ -8,11 +8,11 @@ char buf[128], *cp, *nm; CLIENT *c; int h, port, pr; -@@ -266,6 +267,7 @@ +@@ -279,6 +280,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 new file mode 100644 index 000000000..7cfcb4024 --- /dev/null +++ b/utils/lsof/patches/003-lsof_selinux.patch @@ -0,0 +1,11 @@ +--- a/Configure ++++ b/Configure +@@ -2806,7 +2806,7 @@ return(0); } + LSOF_TMP1=1 + fi # } + fi # } +- if test $LSOF_TMP1 -eq 1 # { ++ if 0 -eq 1 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASSELINUX" + LSOF_CFGL="$LSOF_CFGL -lselinux" diff --git a/utils/lsof/patches/003-lsof_uclibc.patch b/utils/lsof/patches/003-lsof_uclibc.patch deleted file mode 100644 index e53e37bbc..000000000 --- a/utils/lsof/patches/003-lsof_uclibc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru lsof_4.77.orig/lsof_4.77_src/dialects/linux/dlsof.h lsof_4.77/lsof_4.77_src/dialects/linux/dlsof.h ---- lsof_4.77.orig/dialects/linux/dlsof.h 2006-03-28 00:57:14.000000000 +0200 -+++ lsof_4.77/dialects/linux/dlsof.h 2006-11-29 14:03:07.000000000 +0100 -@@ -49,7 +49,7 @@ - #include - #include - --# if defined(GLIBCV) -+# if defined(GLIBCV) || defined __UCLIBC__ - #include - # else /* !defined(GLIBCV) */ - #include diff --git a/utils/lsof/patches/005-lsof_ccv.patch b/utils/lsof/patches/004-lsof_ccv.patch similarity index 75% rename from utils/lsof/patches/005-lsof_ccv.patch rename to utils/lsof/patches/004-lsof_ccv.patch index 11d882058..8f1867dc0 100644 --- a/utils/lsof/patches/005-lsof_ccv.patch +++ b/utils/lsof/patches/004-lsof_ccv.patch @@ -1,6 +1,6 @@ --- a/Configure +++ b/Configure -@@ -2547,6 +2547,9 @@ +@@ -2682,6 +2682,9 @@ LOCKF_OWNER4 if test "X$LSOF_CC" = "X" # { then LSOF_CC=cc @@ -9,4 +9,4 @@ + then LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'` fi # } - LSOF_DIALECT_DIR="" + if test "X$LINUX_CONF_CC" = "X" # { diff --git a/utils/lsof/patches/004-lsof_selinux.patch b/utils/lsof/patches/004-lsof_selinux.patch deleted file mode 100644 index 8188b3864..000000000 --- a/utils/lsof/patches/004-lsof_selinux.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur lsof-4.81.dfsg.1.orig/Configure lsof-4.81.dfsg.1/Configure ---- lsof-4.81.dfsg.1.orig/Configure 2009-04-20 03:03:28.863704499 -0400 -+++ lsof-4.81.dfsg.1/Configure 2009-04-20 03:05:58.467696265 -0400 -@@ -2646,7 +2646,7 @@ - LSOF_TMP1=1 - fi # } - fi # } -- if test $LSOF_TMP1 -eq 1 # { -+ if 0 -eq 1 # { - then - LSOF_CFGF="$LSOF_CFGF -DHASSELINUX" - LSOF_CFGL="$LSOF_CFGL -lselinux"