Waldemar Brodkorb 3 долоо хоног өмнө
parent
commit
979679d03c

+ 9 - 25
package/lsof/Makefile

@@ -4,40 +4,24 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		lsof
-PKG_VERSION:=		4.89
-PKG_RELEASE:=		2
-PKG_HASH:=		5d08da7ebe049c9d9a6472d6afb81aa5af54c4733a3f8822cbc22b57867633c9
+PKG_VERSION:=		4.99.6
+PKG_RELEASE:=		1
+PKG_HASH:=		6081dedf841cd61f8a022ff7cbe04ed78918a47dea3c39528c8571474167aa0f
 PKG_DESCR:=		list open files
 PKG_SECTION:=		sys/utils
 PKG_DEPENDS:=		libtirpc
 PKG_BUILDDEP:=		libtirpc
-PKG_URL:=		http://people.freebsd.org/~abe/
-PKG_SITES:=		https://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/
+PKG_SITES:=		https://github.com/lsof-org/lsof/releases/download/$(PKG_VERSION)/
 
-PKG_LIBC_DEPENDS:=	uclibc-ng glibc
-
-DISTFILES:=             ${PKG_NAME}_${PKG_VERSION}.tar.gz
-WRKDIST=		${WRKDIR}/${PKG_NAME}_${PKG_VERSION}
-WRKSRC=			${WRKDIR}/${PKG_NAME}_${PKG_VERSION}/${PKG_NAME}_${PKG_VERSION}_src
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LSOF,lsof,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIG_STYLE:=		minimal
-CONFIGURE_PROG:=	Configure
-CONFIGURE_ARGS:=	-n linux
-XAKE_FLAGS+=		CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS} -I$(STAGING_TARGET_DIR)/usr/include/tirpc'
-XAKE_FLAGS+=		CFGL='${TARGET_LDFLAGS} -L./lib -llsof -ltirpc'
-INSTALL_STYLE:=		manual
-
-post-extract:
-	(cd ${WRKDIR}/${PKG_NAME}_${PKG_VERSION}; \
-		tar xf ${PKG_NAME}_${PKG_VERSION}_src.tar)
-
-do-install:
-	$(INSTALL_DIR) $(IDIR_LSOF)/usr/sbin
-	$(INSTALL_BIN) $(WRKBUILD)/lsof \
-		$(IDIR_LSOF)/usr/sbin
+lsof-install:
+	$(INSTALL_DIR) $(IDIR_LSOF)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/lsof \
+		$(IDIR_LSOF)/usr/bin
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 0 - 15
package/lsof/patches/patch-lsof_4_89_src_dialects_linux_dlsof_h

@@ -1,15 +0,0 @@
---- lsof_4.89.orig/lsof_4.89_src/dialects/linux/dlsof.h	2015-07-07 21:47:05.000000000 +0200
-+++ lsof_4.89/lsof_4.89_src/dialects/linux/dlsof.h	2017-06-06 02:02:34.512010265 +0200
-@@ -49,12 +49,7 @@
- #include <setjmp.h>
- #include <unistd.h>
- #include <netinet/in.h>
--
--# if	defined(GLIBCV) || defined(__UCLIBC__) || defined(NEEDS_NETINET_TCPH)
- #include <netinet/tcp.h>
--# else	/* !defined(GLIBCV) && !defined(__UCLIBC__) && !defined(NEEDS_NETINET_TCPH) */
--#include <linux/tcp.h>
--# endif	/* defined(GLIBCV) || defined(__UCLIBC__) || defined(NEEDS_NETINET_TCPH) */
- 
- # if	!defined(HASNORPC_H)
- #include <rpc/rpc.h>