Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lsof: update to 4.89

Browse source 
- build from original tarball
- fix ipv6 support: enable if not completely disabled
- drop useless LSOF_INCLUDE override

Signed-off-by: Maxim Storchak <m.storchak@gmail.com>
This commit is contained in:
Maxim Storchak 2015-08-03 00:14:04 +03:00
parent 345cbdc10e
commit e3924f5866
3 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
utils/lsof/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2007-2014 OpenWrt.org # Copyright (C) 2007-2015 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=lsof PKG_NAME:=lsof
PKG_VERSION:=4.86 PKG_VERSION:=4.89
PKG_RELEASE:=3 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)+dfsg.orig.tar.gz PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://ftp2.de.debian.org/debian/pool/main/l/lsof PKG_SOURCE_URL:=https://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://sunsite.ualberta.ca/pub/Mirror/lsof/ ftp://ftp.fu-berlin.de/pub/unix/tools/lsof
PKG_MD5SUM:=23420509564a897b76055f9d84d19068 PKG_MD5SUM:=1b9cd34f3fb86856a125abbf2be3a386
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)+dfsg.orig PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com> PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_LICENSE:=Unique PKG_LICENSE:=Unique
PKG_LICENSE_FILES:=00README PKG_LICENSE_FILES:=00README
@ -32,17 +32,22 @@ define Package/lsof
URL:=http://people.freebsd.org/~abe/ URL:=http://people.freebsd.org/~abe/
endef endef
ifeq ($(CONFIG_IPV6),y) ifneq ($(CONFIG_IPV6),n)
LINUX_CLIB_IPV6="-DHASIPv6" LINUX_CLIB_IPV6=-DHASIPv6
else else
LINUX_CLIB_IPV6= LINUX_CLIB_IPV6=
endif endif
define Build/Prepare
$(PKG_UNPACK)
(cd $(PKG_BUILD_DIR) && tar -xf $(PKG_NAME)_$(PKG_VERSION)_src.tar && mv $(PKG_NAME)_$(PKG_VERSION)_src/* .)
$(Build/Patch)
endef
define Build/Configure define Build/Configure
cd $(PKG_BUILD_DIR); \ cd $(PKG_BUILD_DIR); \
LINUX_CLIB="-DGLIBCV=2 $(LINUX_CLIB_IPV6)" \ LINUX_CLIB="-DGLIBCV=2 $(LINUX_CLIB_IPV6)" \
LSOF_CC="$(TARGET_CC)" \ LSOF_CC="$(TARGET_CC)" \
LSOF_INCLUDE="-I$(STAGING_DIR)/usr/include" \
LSOF_VSTR="$(LINUX_VERSION)" \ LSOF_VSTR="$(LINUX_VERSION)" \
LSOF_CFGF="$(TARGET_CFLAGS)" \ LSOF_CFGF="$(TARGET_CFLAGS)" \
LSOF_CFGL="$(TARGET_LDFLAGS)" \ LSOF_CFGL="$(TARGET_LDFLAGS)" \

4
utils/lsof/patches/003-lsof_selinux.patch
View file

@ -1,6 +1,8 @@
diff --git a/Configure b/Configure
index e4a25a2..3a6e78b 100755
--- a/Configure --- a/Configure
+++ b/Configure +++ b/Configure
@@ -2806,7 +2806,7 @@ return(0); } @@ -2923,7 +2923,7 @@ return(0); }
LSOF_TMP1=1 LSOF_TMP1=1
fi # } fi # }
fi # } fi # }

4
utils/lsof/patches/004-lsof_ccv.patch
View file

@ -1,6 +1,8 @@
diff --git a/Configure b/Configure
index 3a6e78b..a2946c6 100755
--- a/Configure --- a/Configure
+++ b/Configure +++ b/Configure
@@ -2682,6 +2682,9 @@ LOCKF_OWNER4 @@ -2788,6 +2788,9 @@ LOCKF_OWNER4
if test "X$LSOF_CC" = "X" # { if test "X$LSOF_CC" = "X" # {
then then
LSOF_CC=cc LSOF_CC=cc