#
-# 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.
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 -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}
---- 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()
{
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) */
--- /dev/null
+--- 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"
+++ /dev/null
-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 <unistd.h>
- #include <netinet/in.h>
-
--# if defined(GLIBCV)
-+# if defined(GLIBCV) || defined __UCLIBC__
- #include <netinet/tcp.h>
- # else /* !defined(GLIBCV) */
- #include <linux/tcp.h>
--- /dev/null
+--- a/Configure
++++ b/Configure
+@@ -2682,6 +2682,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" # {
+++ /dev/null
-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"
+++ /dev/null
---- a/Configure
-+++ b/Configure
-@@ -2547,6 +2547,9 @@
- 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 # }
- LSOF_DIALECT_DIR=""