[packages_10.03.2] lsof, portmap, transocks, dsniff, snort, ipcad, nfs-server, unfs3...

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30314 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/dsniff/Makefile b/net/dsniff/Makefile
index a26f6fe..6b64504 100644 (file)
--- a/net/dsniff/Makefile
+++ b/net/dsniff/Makefile
@@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/dsniff
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libpcap +libnids +libnet0 +libopenssl +libgdbm $(LIBRPC_DEPENDS)
+  DEPENDS:=+libpcap +libnids +libnet0 +libopenssl +libgdbm
   TITLE:=A collection of tools for network auditing and penetration testing
   URL:=http://www.monkey.org/~dugsong/dsniff/
 endef
@@ -31,8 +31,6 @@ define Package/dsniff/description
        A collection of tools for network auditing and penetration testing.
 endef
 
-TARGET_LDFLAGS += $(LIBRPC)
-
 define Build/Configure
        $(call Build/Configure/Default, \
                --with-gdbm="$(STAGING_DIR)/usr" \

diff --git a/net/ipcad/Makefile b/net/ipcad/Makefile
index 1d541f9..125cce0 100644 (file)
--- a/net/ipcad/Makefile
+++ b/net/ipcad/Makefile
@@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/ipcad
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libpcap $(LIBRPC_DEPENDS)
+  DEPENDS:=+libpcap
   TITLE:=listens for traffic on the specified interfaces
   URL:=http://lionet.info/ipcad/
 endef
@@ -51,8 +51,6 @@ CONFIGURE_VARS += \
        ac_cv_header_linux_netfilter_ipv4_ip_queue_h=no \
        ac_cv_header_linux_netfilter_ipv4_ipt_ULOG_h=no \
 
-TARGET_LDFLAGS += $(LIBRPC)
-
 define Package/ipcad/install
        $(INSTALL_DIR) $(1)/etc
        $(CP) $(PKG_INSTALL_DIR)/etc/ipcad.conf $(1)/etc/

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 5aa5d08..95bfa6c 100644 (file)
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -25,7 +25,7 @@ define Package/netatalk
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Filesystem
-  DEPENDS:=+libdb47 +libgcrypt +libopenssl $(LIBRPC_DEPENDS)
+  DEPENDS:=+libdb47 +libgcrypt +libopenssl
   TITLE:=netatalk
   URL:=http://netatalk.sourceforge.net
   MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@@ -42,7 +42,6 @@ define Package/netatalk/conffiles
 endef
 
 TARGET_CFLAGS += -std=gnu99 -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-TARGET_LDFLAGS += $(LIBRPC)
 
 CONFIGURE_ARGS += \
        --disable-afs \

diff --git a/net/nfs-server/Makefile b/net/nfs-server/Makefile
index 6257fdf..d62a9e1 100644 (file)
--- a/net/nfs-server/Makefile
+++ b/net/nfs-server/Makefile
@@ -21,7 +21,7 @@ define Package/nfs-server
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Filesystem
-  DEPENDS:=+portmap $(LIBRPC_DEPENDS)
+  DEPENDS:=+portmap
   TITLE:=User Space NFS server
   URL:=http://packages.debian.org/nfs-user-server
 endef
@@ -35,7 +35,6 @@ define Build/Compile
 endef
 
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
-TARGET_LDFLAGS += $(LIBRPC)
 
 define Package/nfs-server/install
        $(INSTALL_DIR) $(1)/etc

diff --git a/net/openl2tp/Makefile b/net/openl2tp/Makefile
index f858c12..1618196 100644 (file)
--- a/net/openl2tp/Makefile
+++ b/net/openl2tp/Makefile
@@ -16,7 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/openl2tp
 PKG_MD5SUM:=e3d08dedfb9e6a9a1e24f6766f6dadd0
 
-PKG_BUILD_DEPENDS:=libreadline libncurses USE_UCLIBC:librpc
+PKG_BUILD_DEPENDS:=libreadline libncurses
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
 PPPD_VERSION:=2.4.4
@@ -46,7 +46,7 @@ define Package/openl2tp-full
 $(call Package/openl2tp/Default)
   TITLE+=(full)
   VARIANT:=full
-  DEPENDS+=+portmap +libreadline +libncurses $(LIBRPC_DEPENDS)
+  DEPENDS+=+portmap +libreadline +libncurses
 endef
 
 define Package/openl2tp-full/description
@@ -85,7 +85,7 @@ ifeq ($(BUILD_VARIANT),full)
   MAKE_FLAGS += \
        L2TP_FEATURE_RPC_MANAGEMENT=y \
        L2TP_FEATURE_LOCAL_STAT_FILE=y \
-       LIBS.dmalloc="-L$(STAGING_DIR)/usr/lib $(LIBRPC)" \
+       LIBS.dmalloc="-L$(STAGING_DIR)/usr/lib" \
 
 endif
 ifeq ($(BUILD_VARIANT),mini)

diff --git a/net/portmap/Makefile b/net/portmap/Makefile
index 70499aa..91ae1fe 100644 (file)
--- a/net/portmap/Makefile
+++ b/net/portmap/Makefile
@@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/portmap
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libwrap $(LIBRPC_DEPENDS)
+  DEPENDS:=+libwrap
   TITLE:=The RPC Portmapper
   URL:=http://neil.brown.name/portmap/
 endef
@@ -35,7 +35,7 @@ endef
 MAKE_FLAGS += \
        CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -DHOSTS_ACCESS -DFACILITY=LOG_DAEMON -DIGNORE_SIGCHLD" \
        RPCUSER="nobody" \
-       LDLIBS="$(TARGET_LDFLAGS) -lwrap $(LIBRPC)" \
+       LDLIBS="$(TARGET_LDFLAGS) -lwrap" \
        all
 
 define Package/portmap/install

diff --git a/net/snort/Makefile b/net/snort/Makefile
index d3eaeaf..f7dc228 100644 (file)
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -15,7 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://dl.snort.org/snort-current/
 PKG_MD5SUM:=63f4e76ae96a2d133f4c7b741bad5458
 
-PKG_BUILD_DEPENDS:=USE_UCLIBC:librpc
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1

diff --git a/net/transocks/Makefile b/net/transocks/Makefile
index 6e2cf14..3b6a476 100644 (file)
--- a/net/transocks/Makefile
+++ b/net/transocks/Makefile
@@ -25,7 +25,7 @@ define Build/Compile
        $(TARGET_CC) \
                -I$(STAGING_DIR)/usr/include \
                $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-               $(LIBRPC) -lsocks -o \
+               -lsocks -o \
                $(PKG_BUILD_DIR)/transocks \
                $(PKG_BUILD_DIR)/transocks.c
 endef
@@ -35,7 +35,7 @@ define Package/transocks
   CATEGORY:=Network
   SUBMENU:=Web Servers/Proxies
   TITLE:=Transparent SOCKSifying proxy
-  DEPENDS:=+libsocks $(LIBRPC_DEPENDS)
+  DEPENDS:=+libsocks
 endef
 
 define Package/transocks/install

diff --git a/net/unfs3/Makefile b/net/unfs3/Makefile
index 3764aae..326fdda 100644 (file)
--- a/net/unfs3/Makefile
+++ b/net/unfs3/Makefile
@@ -23,7 +23,7 @@ define Package/unfs3
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Filesystem
-  DEPENDS:=+portmap $(LIBRPC_DEPENDS)
+  DEPENDS:=+portmap
   TITLE:=User-space NFSv3 Server
   URL:=http://unfs3.sourceforge.net/
 endef
@@ -36,7 +36,6 @@ define Package/unfs3/description
 endef
 
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
-TARGET_LDFLAGS += $(LIBRPC)
 
 define Package/unfs3/install
        $(INSTALL_DIR) $(1)/etc/init.d

diff --git a/utils/lsof/Makefile b/utils/lsof/Makefile
index aad4730..9ca9aa4 100644 (file)
--- a/utils/lsof/Makefile
+++ b/utils/lsof/Makefile
@@ -21,12 +21,10 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).dfsg.1
 include $(INCLUDE_DIR)/package.mk
 
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
-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