lsof: update to 4.94.0
Upstream switched to GitHub and changed their tarball. Adjusted. Refreshed patches. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
parent
1d3c84d4e6
commit
2ecbc04423
5 changed files with 9 additions and 43 deletions
|
@ -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.91
|
PKG_VERSION:=4.94.0
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.bz2
|
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).linux.tar.bz2
|
||||||
PKG_SOURCE_URL:=https://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.fu-berlin.de/pub/unix/tools/lsof
|
PKG_SOURCE_URL:=https://github.com/lsof-org/lsof/releases/download/$(PKG_VERSION)
|
||||||
PKG_HASH:=c9da946a525fbf82ff80090b6d1879c38df090556f3fe0e6d782cb44172450a3
|
PKG_HASH:=c41709c2543ecf9de1e950795790a9786a2f225e51c3cc53d6a9a256f872472b
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)
|
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION).linux
|
||||||
|
|
||||||
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
|
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
|
||||||
PKG_LICENSE:=Unique
|
PKG_LICENSE:=Unique
|
||||||
|
@ -40,12 +40,6 @@ endif
|
||||||
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/tirpc
|
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/tirpc
|
||||||
TARGET_LDFLAGS += -ltirpc
|
TARGET_LDFLAGS += -ltirpc
|
||||||
|
|
||||||
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
|
||||||
$(SED) 's/rpc\/rpc/\/tirpc\/rpc\/rpc/g' $(PKG_BUILD_DIR)/Configure
|
$(SED) 's/rpc\/rpc/\/tirpc\/rpc\/rpc/g' $(PKG_BUILD_DIR)/Configure
|
||||||
cd $(PKG_BUILD_DIR); \
|
cd $(PKG_BUILD_DIR); \
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/print.c
|
--- a/print.c
|
||||||
+++ b/print.c
|
+++ b/print.c
|
||||||
@@ -161,6 +161,7 @@ endnm(sz)
|
@@ -160,6 +160,7 @@ endnm(sz)
|
||||||
static void
|
static void
|
||||||
fill_portmap()
|
fill_portmap()
|
||||||
{
|
{
|
||||||
|
@ -8,7 +8,7 @@
|
||||||
char buf[128], *cp, *nm;
|
char buf[128], *cp, *nm;
|
||||||
CLIENT *c;
|
CLIENT *c;
|
||||||
int h, port, pr;
|
int h, port, pr;
|
||||||
@@ -279,6 +280,7 @@ fill_portmap()
|
@@ -278,6 +279,7 @@ fill_portmap()
|
||||||
Pth[pr][h] = pt;
|
Pth[pr][h] = pt;
|
||||||
}
|
}
|
||||||
clnt_destroy(c);
|
clnt_destroy(c);
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index e4a25a2..3a6e78b 100755
|
|
||||||
--- a/Configure
|
--- a/Configure
|
||||||
+++ b/Configure
|
+++ b/Configure
|
||||||
@@ -2976,7 +2976,7 @@ return(0); }
|
@@ -2991,7 +2991,7 @@ return(0); }
|
||||||
LSOF_TMP1=1
|
LSOF_TMP1=1
|
||||||
fi # }
|
fi # }
|
||||||
fi # }
|
fi # }
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 3a6e78b..a2946c6 100755
|
|
||||||
--- a/Configure
|
--- a/Configure
|
||||||
+++ b/Configure
|
+++ b/Configure
|
||||||
@@ -2841,6 +2841,9 @@ LOCKF_OWNER4
|
@@ -2850,6 +2850,9 @@ LOCKF_OWNER4
|
||||||
if test "X$LSOF_CC" = "X" # {
|
if test "X$LSOF_CC" = "X" # {
|
||||||
then
|
then
|
||||||
LSOF_CC=cc
|
LSOF_CC=cc
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
diff --git a/dialects/linux/Makefile b/dialects/linux/Makefile
|
|
||||||
index 2bea108..ed8382e 100644
|
|
||||||
--- a/dialects/linux/Makefile
|
|
||||||
+++ b/dialects/linux/Makefile
|
|
||||||
@@ -78,8 +78,8 @@ version.h: FRC
|
|
||||||
@echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h;
|
|
||||||
@echo '#define LSOF_CC "${CC}"' >> version.h
|
|
||||||
@echo '#define LSOF_CCV "${CCV}"' >> version.h
|
|
||||||
- @echo '#define LSOF_CCDATE "'`date`'"' >> version.h
|
|
||||||
- @echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
|
|
||||||
+ @echo '#define LSOF_CCDATE "'`date -d @${SOURCE_DATE_EPOCH}`'"' >> version.h
|
|
||||||
+ @echo '#define LSOF_CCFLAGS ""' >> version.h
|
|
||||||
@echo '#define LSOF_CINFO "${CINFO}"' >> version.h
|
|
||||||
@if [ "X${LSOF_HOST}" = "X" ]; then \
|
|
||||||
echo '#define LSOF_HOST "'`uname -n`'"' >> version.h; \
|
|
||||||
@@ -90,7 +90,7 @@ version.h: FRC
|
|
||||||
echo '#define LSOF_HOST "${LSOF_HOST}"' >> version.h; \
|
|
||||||
fi \
|
|
||||||
fi
|
|
||||||
- @echo '#define LSOF_LDFLAGS "${CFGL}"' >> version.h
|
|
||||||
+ @echo '#define LSOF_LDFLAGS ""' >> version.h
|
|
||||||
@if [ "X${LSOF_LOGNAME}" = "X" ]; then \
|
|
||||||
echo '#define LSOF_LOGNAME "${LOGNAME}"' >> version.h; \
|
|
||||||
else \
|
|
Loading…
Reference in a new issue