From ea2673958e8c224f556122e8a430f0f33bc853ba Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Sat, 14 Jun 2014 17:39:29 +0000 Subject: [PATCH] lsof: moved to github SVN-Revision: 41188 --- utils/lsof/Makefile | 55 --------------------- utils/lsof/patches/001-lsof_makefile.patch | 13 ----- utils/lsof/patches/002-lsof_noportmap.patch | 18 ------- utils/lsof/patches/003-lsof_selinux.patch | 11 ----- utils/lsof/patches/004-lsof_ccv.patch | 12 ----- 5 files changed, 109 deletions(-) delete mode 100644 utils/lsof/Makefile delete mode 100644 utils/lsof/patches/001-lsof_makefile.patch delete mode 100644 utils/lsof/patches/002-lsof_noportmap.patch delete mode 100644 utils/lsof/patches/003-lsof_selinux.patch delete mode 100644 utils/lsof/patches/004-lsof_ccv.patch diff --git a/utils/lsof/Makefile b/utils/lsof/Makefile deleted file mode 100644 index d5dfa174eb..0000000000 --- a/utils/lsof/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright (C) 2007-2014 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/kernel.mk - -PKG_NAME:=lsof -PKG_VERSION:=4.86 -PKG_RELEASE:=2 - -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:=23420509564a897b76055f9d84d19068 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)+dfsg.orig - -include $(INCLUDE_DIR)/package.mk - -TARGET_LDFLAGS += $(LIBRPC) - -define Package/lsof - SECTION:=utils - CATEGORY:=Utilities - DEPENDS:=$(LIBRPC_DEPENDS) - TITLE:=LiSt Open Files - a diagnostic tool - URL:=http://people.freebsd.org/~abe/ -endef - -define Build/Configure - cd $(PKG_BUILD_DIR); \ - LINUX_CLIB="-DGLIBCV=2" \ - LSOF_CC="$(TARGET_CC)" \ - LSOF_INCLUDE="-I$(STAGING_DIR)/usr/include" \ - LSOF_VSTR="$(LINUX_VERSION)" \ - LSOF_CFGF="$(TARGET_CFLAGS)" \ - LSOF_CFGL="$(TARGET_LDFLAGS)" \ - LSOF_AR="$(TARGET_CROSS)ar cr" \ - LSOF_RANLIB="$(TARGET_CROSS)ranlib" \ - ./Configure -n linux -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) -endef - -define Package/lsof/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/lsof $(1)/usr/bin -endef - -$(eval $(call BuildPackage,lsof)) diff --git a/utils/lsof/patches/001-lsof_makefile.patch b/utils/lsof/patches/001-lsof_makefile.patch deleted file mode 100644 index eb2b73519f..0000000000 --- a/utils/lsof/patches/001-lsof_makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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} -- ${AR} -- ${RANLIB} -+ ${AR} ${LIB} ${OBJ} -+ ${RANLIB} ${LIB} - - clean: FRC - rm -f ${LIB} ${OBJ} errs Makefile.bak a.out core diff --git a/utils/lsof/patches/002-lsof_noportmap.patch b/utils/lsof/patches/002-lsof_noportmap.patch deleted file mode 100644 index d0e88893c6..0000000000 --- a/utils/lsof/patches/002-lsof_noportmap.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/print.c -+++ b/print.c -@@ -161,6 +161,7 @@ endnm(sz) - static void - fill_portmap() - { -+#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_RPC__) - char buf[128], *cp, *nm; - CLIENT *c; - int h, port, pr; -@@ -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 deleted file mode 100644 index c74c1e3f95..0000000000 --- a/utils/lsof/patches/003-lsof_selinux.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Configure -+++ b/Configure -@@ -2806,7 +2806,7 @@ return(0); } - LSOF_TMP1=1 - fi # } - fi # } -- if test $LSOF_TMP1 -eq 1 # { -+ if test 0 -eq 1 # { - then - LSOF_CFGF="$LSOF_CFGF -DHASSELINUX" - LSOF_CFGL="$LSOF_CFGL -lselinux" diff --git a/utils/lsof/patches/004-lsof_ccv.patch b/utils/lsof/patches/004-lsof_ccv.patch deleted file mode 100644 index 8f1867dc01..0000000000 --- a/utils/lsof/patches/004-lsof_ccv.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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" # { -- 2.30.2