nmap: bump version to 6.47
nmap: bump version to 6.47

Signed-off-by: Nuno Goncalves <nunojpg@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@42473 3c298f89-4303-0410-b956-a3cf2f4a3e73

file:a/lang/luasoap/Makefile (deleted)
#  
# Copyright (C) 2011 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=luasoap  
PKG_VERSION:=2.0.2  
PKG_RELEASE:=2  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=https://github.com/downloads/tomasguisasola/luasoap/  
PKG_MD5SUM:=3aafa06f3a65e65f4ee08e12b89ec583  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/luasoap  
SUBMENU:=Lua  
SECTION:=lang  
CATEGORY:=Languages  
TITLE:=LuaSOAP  
URL:=https://github.com/tomasguisasola/luasoap  
DEPENDS:=+lua +luaexpat +luasec +luasocket  
endef  
 
define Package/luasoap/description  
LuaSOAP is a library of functions to deal with SOAP.  
endef  
 
define Build/Configure  
endef  
 
define Build/Compile  
endef  
 
define Package/luasoap/install  
$(INSTALL_DIR) $(1)/usr/lib/lua  
$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/soap.lua $(1)/usr/lib/lua/  
$(INSTALL_DIR) $(1)/usr/lib/lua/soap  
$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{client,server}.lua $(1)/usr/lib/lua/soap/  
$(INSTALL_DIR) $(1)/usr/lib/lua/soap/client  
$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/client/https.lua $(1)/usr/lib/lua/soap/client/  
$(INSTALL_DIR) $(1)/usr/lib/lua/soap/tests  
$(INSTALL_DATA) $(PKG_BUILD_DIR)/tests/test{,-http,-server}.lua $(1)/usr/lib/lua/soap/tests/  
endef  
 
$(eval $(call BuildPackage,luasoap))  
 
file:a/lang/luasql/Makefile (deleted)
#  
# Copyright (C) 2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=luasql  
PKG_VERSION:=2.1.1  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/2686/  
PKG_MD5SUM:=63bdd57de4b9d1be336ba112d8cb69eb  
 
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/luasql/Default  
SUBMENU:=Lua  
SECTION:=lang  
CATEGORY:=Languages  
TITLE:=Lua SQL binding  
URL:=http://www.keplerproject.org/luasql/  
DEPENDS:= +lua  
endef  
 
define Package/luasql/Default/description  
LuaSQL is a simple interface from Lua to a DBMS.  
endef  
 
 
define Package/luasql-mysql  
$(call Package/luasql/Default)  
TITLE+= for MySQL  
DEPENDS+= +libmysqlclient  
VARIANT:=mysql  
endef  
 
define Package/luasql-mysql/description  
$(call Package/luasql/Default/description)  
.  
This package contains the MySQL binding.  
endef  
 
 
define Package/luasql-pgsql  
$(call Package/luasql/Default)  
TITLE+= for PostgreSQL  
DEPENDS+= +libpq  
VARIANT:=postgres  
endef  
 
define Package/luasql-pgsql/description  
$(call Package/luasql/Default/description)  
.  
This package contains the PostgreSQL binding.  
endef  
 
 
define Package/luasql-sqlite3  
$(call Package/luasql/Default)  
TITLE+= for SQLite 3  
DEPENDS+= +libsqlite3  
VARIANT:=sqlite3  
endef  
 
define Package/luasql-sqlite3/description  
$(call Package/luasql/Default/description)  
.  
This package contains the SQLite 3 binding.  
endef  
 
 
TARGET_CFLAGS += $(FPIC) -std=gnu99  
TARGET_CPPFLAGS += -DLUA_USE_LINUX  
 
ifeq ($(BUILD_VARIANT),mysql)  
TARGET_CPPFLAGS += -I$(STAGING_DIR)/usr/include/mysql  
TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient -lz  
endif  
 
ifeq ($(BUILD_VARIANT),postgres)  
TARGET_LDFLAGS += -lpq  
endif  
 
ifeq ($(BUILD_VARIANT),sqlite3)  
TARGET_LDFLAGS += -lsqlite3 -lpthread  
endif  
 
define Build/Compile  
$(MAKE) -C $(PKG_BUILD_DIR) \  
T="$(BUILD_VARIANT)" \  
PREFIX="$(STAGING_DIR)/usr" \  
LUA_LIBDIR="$(STAGING_DIR)/usr/lib/lua" \  
DRIVER_INCS="$(TARGET_CPPFLAGS)" \  
DRIVER_LIBS="$(TARGET_LDFLAGS)" \  
CC="$(TARGET_CROSS)gcc" \  
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \  
lib  
$(MAKE) -C $(PKG_BUILD_DIR) \  
T="$(BUILD_VARIANT)" \  
LUA_LIBDIR="$(PKG_INSTALL_DIR)/usr/lib/lua" \  
install  
endef  
 
define Build/Install/Default  
$(INSTALL_DIR) $(1)/usr/lib/lua/luasql  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lua/luasql/*.so $(1)/usr/lib/lua/luasql/  
endef  
 
Package/luasql-mysql/install = $(Build/Install/Default)  
Package/luasql-pgsql/install = $(Build/Install/Default)  
Package/luasql-sqlite3/install = $(Build/Install/Default)  
 
$(eval $(call BuildPackage,luasql-mysql))  
$(eval $(call BuildPackage,luasql-pgsql))  
$(eval $(call BuildPackage,luasql-sqlite3))  
 
file:a/libs/libcelt/Makefile (deleted)
#  
# Copyright (C) 2009-2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=celt  
PKG_VERSION:=0.7.0  
PKG_RELEASE:=2  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/celt/  
PKG_MD5SUM:=0bb72abec367f4ef12551f79dda11b23  
 
PKG_BUILD_DEPENDS:=libogg  
 
PKG_FIXUP:=autoreconf  
 
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/libcelt  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=CELT Codec  
URL:=http://www.celt-codec.org/  
endef  
 
define Package/libcelt/description  
The CELT codec is an experimental audio codec for use in low-delay speech and audio communication.  
endef  
 
define Build/Configure  
$(call Build/Configure/Default, \  
--without-ogg \  
)  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include/celt  
$(CP) $(PKG_INSTALL_DIR)/usr/include/celt/celt*.h \  
$(1)/usr/include/celt  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/* \  
$(1)/usr/lib/  
endef  
 
define Package/libcelt/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcelt.so* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,libcelt))  
 
#  
# Copyright (C) 2009-2014 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=libdbi-drivers  
PKG_VERSION:=0.9.0  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@SF/libdbi-drivers  
PKG_MD5SUM:=9f47b960e225eede2cdeaabf7d22f59f  
 
PKG_FIXUP:=autoreconf  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/libdbi-drivers/default  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=libdbi-drivers  
URL:=http://libdbi-drivers.sourceforge.net/  
endef  
 
define Package/libdbi-drivers/default/description  
libdbi-drivers project provides the database-specific drivers  
for the libdbi framework  
endef  
 
define Package/libdbi-drivers-mysql  
$(call Package/libdbi-drivers/default)  
DEPENDS:=libdbi +PACKAGE_libdbi-drivers-mysql:libmysqlclient  
TITLE:= libdbi-drivers-mysql  
endef  
 
define Package/libdbi-drivers-mysql2/description  
libdbi-driver for mysql  
endef  
 
define Package/libdbi-drivers-pgsql  
$(call Package/libdbi-drivers/default)  
DEPENDS:=libdbi +PACKAGE_libdbi-drivers-pgsql:libpq  
TITLE:= libdbi-drivers-pgsql  
endef  
 
define Package/libdbi-drivers-pgsql/description  
libdbi-driver for pgsql  
endef  
 
define Package/libdbi-drivers-sqlite2  
$(call Package/libdbi-drivers/default)  
DEPENDS:=libdbi +PACKAGE_libdbi-drivers-sqlite2:libsqlite2  
TITLE:= libdbi-drivers-sqlite2  
endef  
 
define Package/libdbi-drivers-sqlite2/description  
libdbi-driver for sqlite2  
endef  
 
define Package/libdbi-drivers-sqlite3  
$(call Package/libdbi-drivers/default)  
DEPENDS:=libdbi +PACKAGE_libdbi-drivers-sqlite3:libsqlite3  
TITLE:= libdbi-drivers-sqlite3  
endef  
 
define Package/libdbi-drivers-sqlite3/description  
libdbi-driver for sqlite3  
endef  
 
CONFIGURE_ARGS += \  
--enable-shared \  
--disable-static \  
--disable-rpath \  
--disable-docs \  
--with-dbi-incdir=$(STAGING_DIR)/usr/include \  
--with-dbi-libdir=$(STAGING_DIR)/usr/lib  
 
ifneq ($(CONFIG_PACKAGE_libdbi-drivers-mysql),)  
CONFIGURE_ARGS += \  
--with-mysql \  
--with-mysql-incdir=$(STAGING_DIR)/usr/include/mysql \  
--with-mysql-libdir=$(STAGING_DIR)/usr/lib/mysql  
TARGET_LDFLAGS += \  
-L$(STAGING_DIR)/usr/lib/mysql/  
endif  
 
ifneq ($(SDK)$(CONFIG_PACKAGE_libdbi-drivers-pgsql),)  
CONFIGURE_ARGS += \  
--with-pgsql \  
--with-pgsql-incdir=$(STAGING_DIR)/usr/include \  
--with-pgsql-libdir=$(STAGING_DIR)/usr/lib  
endif  
 
ifneq ($(SDK)$(CONFIG_PACKAGE_libdbi-drivers-sqlite2),)  
CONFIGURE_ARGS += \  
--with-sqlite \  
--with-sqlite-incdir=$(STAGING_DIR)/usr/include \  
--with-sqlite-libdir=$(STAGING_DIR)/usr/lib  
endif  
 
ifneq ($(SDK)$(CONFIG_PACKAGE_libdbi-drivers-sqlite3),)  
CONFIGURE_ARGS += \  
--with-sqlite3 \  
--with-sqlite3-incdir=$(STAGING_DIR)/usr/include \  
--with-sqlite3-libdir=$(STAGING_DIR)/usr/lib  
endif  
 
define Package/libdbi-drivers-mysql/install  
$(INSTALL_DIR) $(1)/usr/lib/dbd  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/drivers/mysql/.libs/libdbdmysql.so $(1)/usr/lib/dbd  
endef  
 
define Package/libdbi-drivers-pgsql/install  
$(INSTALL_DIR) $(1)/usr/lib/dbd  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/drivers/pgsql/.libs/libdbdpgsql.so $(1)/usr/lib/dbd  
endef  
 
define Package/libdbi-drivers-sqlite2/install  
$(INSTALL_DIR) $(1)/usr/lib/dbd  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/drivers/sqlite/.libs/libdbdsqlite.so $(1)/usr/lib/dbd  
endef  
 
define Package/libdbi-drivers-sqlite3/install  
$(INSTALL_DIR) $(1)/usr/lib/dbd  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/drivers/sqlite3/.libs/libdbdsqlite3.so $(1)/usr/lib/dbd  
endef  
 
 
#$(eval $(call BuildPackage,libdbi-drivers))  
$(eval $(call BuildPackage,libdbi-drivers-mysql))  
$(eval $(call BuildPackage,libdbi-drivers-pgsql))  
$(eval $(call BuildPackage,libdbi-drivers-sqlite2))  
$(eval $(call BuildPackage,libdbi-drivers-sqlite3))  
 
--- a/acinclude.m4  
+++ b/acinclude.m4  
@@ -310,7 +310,7 @@ if test "$ac_sqlite3" = "yes"; then  
AC_SEARCH_LIBS_VAR([sqlite3_exec], sqlite3, , , , SQLITE3_LIBS)  
SQLITE3_LDFLAGS=""  
else  
- SQLITE3_LIBS=-lsqlite  
+ SQLITE3_LIBS=-lsqlite3  
SQLITE3_LDFLAGS=-L$ac_sqlite3_libdir  
fi  
 
 
file:a/libs/libdbi/Makefile (deleted)
#  
# Copyright (C) 2009-2011 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=libdbi  
PKG_VERSION:=0.9.0  
PKG_RELEASE:=4  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@SF/libdbi  
PKG_MD5SUM:=05e2ceeac4bc85fbe40de8b4b22d9ab3  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/libdbi  
NAME:=libdbi  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE+= (library)  
URL:=http://libdbi.sourceforge.net/  
endef  
 
define Package/libdbi/description  
libdbi implements a database-independent abstraction layer in C.  
endef  
 
CONFIGURE_ARGS += \  
--enable-shared \  
--enable-static \  
--disable-docs  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/dbi $(1)/usr/include/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdbi.{a,so*} $(1)/usr/lib/  
endef  
 
define Package/libdbi/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdbi.so.* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,libdbi))  
 
#  
# Copyright (C) 2009-2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=libnetfilter_log  
PKG_VERSION:=1.0.0  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:= \  
http://www.netfilter.org/projects/libnetfilter_log/files/ \  
ftp://ftp.netfilter.org/pub/libnetfilter_log/ \  
http://mirrors.evolva.ro/netfilter.org/libnetfilter_log/  
PKG_MD5SUM:=acdb188a1e7504e95636d0770ade393c  
 
PKG_FIXUP:=autoreconf  
 
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/libnetfilter-log  
SECTION:=libs  
CATEGORY:=Libraries  
DEPENDS:=+libnfnetlink +kmod-nfnetlink-log  
TITLE:=API to packets logged by the kernel packet filter  
URL:=http://www.netfilter.org/projects/libnetfilter_log/  
endef  
 
define Package/libnetfilter-log/description  
libnetfilter_log is a userspace library providing interface to  
packets that have been logged by the kernel packet filter.  
endef  
 
TARGET_CFLAGS += $(FPIC)  
 
CONFIGURE_ARGS += \  
--enable-static \  
--enable-shared \  
 
CONFIGURE_VARS += \  
LIBNFNETLINK_CFLAGS="$(TARGET_CPPFLAGS)" \  
LIBNFNETLINK_LIBS="$(TARGET_LDFLAGS)"  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include/libnetfilter_log  
$(INSTALL_DATA) \  
$(PKG_INSTALL_DIR)/usr/include/libnetfilter_log/*.h \  
$(1)/usr/include/libnetfilter_log/  
 
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/lib/libnetfilter_log*.{so*,a,la} \  
$(1)/usr/lib/  
 
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig  
$(INSTALL_DATA) \  
$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnetfilter_log.pc \  
$(1)/usr/lib/pkgconfig/  
endef  
 
define Package/libnetfilter-log/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_log*.so.* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,libnetfilter-log))  
 
#  
# Copyright (C) 2007-2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=libnetfilter_queue  
PKG_VERSION:=1.0.0  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:= \  
http://www.netfilter.org/projects/libnetfilter_queue/files/ \  
ftp://ftp.netfilter.org/pub/libnetfilter_queue/ \  
http://mirrors.evolva.ro/netfilter.org/libnetfilter_queue/  
PKG_MD5SUM:=af6a9ea350f63a13609bc3b47b5c395c  
 
PKG_FIXUP:=autoreconf  
 
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/libnetfilter-queue  
SECTION:=libs  
CATEGORY:=Libraries  
DEPENDS:=+libnfnetlink +kmod-nfnetlink-queue  
TITLE:=API to packets queued by the kernel packet filter  
URL:=http://www.netfilter.org/projects/libnetfilter_queue/  
endef  
 
define Package/libnetfilter-queue/description  
libnetfilter_queue is a userspace library providing an API to packets  
that have been queued by the kernel packet filter.  
endef  
 
TARGET_CFLAGS += $(FPIC)  
 
CONFIGURE_ARGS += \  
--enable-static \  
--enable-shared \  
 
CONFIGURE_VARS += \  
LIBNFNETLINK_CFLAGS="$(TARGET_CPPFLAGS)" \  
LIBNFNETLINK_LIBS="$(TARGET_LDFLAGS)"  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include/libnetfilter_queue  
$(INSTALL_DATA) \  
$(PKG_INSTALL_DIR)/usr/include/libnetfilter_queue/*.h \  
$(1)/usr/include/libnetfilter_queue/  
 
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue*.{so*,a,la} \  
$(1)/usr/lib/  
 
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig  
$(INSTALL_DATA) \  
$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnetfilter_queue.pc \  
$(1)/usr/lib/pkgconfig/  
endef  
 
define Package/libnetfilter-queue/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue*.so.* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,libnetfilter-queue))  
 
# #
# Copyright (C) 2006-2014 OpenWrt.org # Copyright (C) 2006-2014 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.
   
#TODO #TODO
# #
# * uClibcpp not supported, performance +100x slower. libstdcpp is being used. https://bugs.busybox.net/show_bug.cgi?id=2545 # * uClibcpp not supported, performance +100x slower. libstdcpp is being used. https://bugs.busybox.net/show_bug.cgi?id=2545
# * liblua is still not recognized/blindly accepted. Impossible to compile with support # * liblua is still not recognized/blindly accepted. Impossible to compile with support
# #
   
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
   
PKG_NAME:=nmap PKG_NAME:=nmap
PKG_VERSION:=6.46 PKG_VERSION:=6.47
PKG_RELEASE:=1 PKG_RELEASE:=1
   
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://nmap.org/dist/ PKG_SOURCE_URL:=http://nmap.org/dist/
PKG_MD5SUM:=5a36ad3a63d5b7ea5514f745a397436a PKG_MD5SUM:=edfe81f6763223c0a29bfa15a8526e2a
   
PKG_INSTALL:=1 PKG_INSTALL:=1
   
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
   
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
   
NMAP_DEPENDS:=+libpcap +libstdcpp NMAP_DEPENDS:=+libpcap +libstdcpp
NCAT_DEPENDS:=+libpcap NCAT_DEPENDS:=+libpcap
NPING_DEPENDS:=+libpcap +libpthread +libstdcpp NPING_DEPENDS:=+libpcap +libpthread +libstdcpp
NDIFF_DEPENDS:=+python NDIFF_DEPENDS:=+python
   
define Package/nmap/default define Package/nmap/default
SUBMENU:=NMAP Suite SUBMENU:=NMAP Suite
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
URL:=http://nmap.org/ URL:=http://nmap.org/
endef endef
   
define Package/nmap define Package/nmap
$(call Package/nmap/default) $(call Package/nmap/default)
DEPENDS:=$(NMAP_DEPENDS) DEPENDS:=$(NMAP_DEPENDS)
VARIANT:=nossl VARIANT:=nossl
TITLE:=Utility for network exploration or security auditing TITLE:=Utility for network exploration or security auditing
endef endef
   
define Package/nmap-ssl define Package/nmap-ssl
$(call Package/nmap/default) $(call Package/nmap/default)
DEPENDS:=$(NMAP_DEPENDS) +libopenssl DEPENDS:=$(NMAP_DEPENDS) +libopenssl
VARIANT:=ssl VARIANT:=ssl
TITLE:=Nmap (with OpenSSL support) TITLE:=Nmap (with OpenSSL support)
endef endef
   
define Package/ncat define Package/ncat
$(call Package/nmap/default) $(call Package/nmap/default)
DEPENDS:=$(NCAT_DEPENDS) DEPENDS:=$(NCAT_DEPENDS)
VARIANT:=nossl VARIANT:=nossl
TITLE:=Much-improved reimplementation of Netcat TITLE:=Much-improved reimplementation of Netcat
endef endef
   
define Package/ncat-ssl define Package/ncat-ssl
$(call Package/nmap/default) $(call Package/nmap/default)
DEPENDS:=$(NCAT_DEPENDS) +libopenssl DEPENDS:=$(NCAT_DEPENDS) +libopenssl
VARIANT:=ssl VARIANT:=ssl
TITLE:=Ncat (with OpenSSL support) TITLE:=Ncat (with OpenSSL support)
endef endef
   
define Package/nping define Package/nping
$(call Package/nmap/default) $(call Package/nmap/default)
DEPENDS:=$(NPING_DEPENDS) DEPENDS:=$(NPING_DEPENDS)
VARIANT:=nossl VARIANT:=nossl
TITLE:=Network packet generation tool / ping utility TITLE:=Network packet generation tool / ping utility
endef endef
   
define Package/ndiff define Package/ndiff
$(call Package/nmap/default) $(call Package/nmap/default)
DEPENDS:=$(NDIFF_DEPENDS) DEPENDS:=$(NDIFF_DEPENDS)
VARIANT:=nossl VARIANT:=nossl
TITLE:=Utility to compare the results of Nmap scans TITLE:=Utility to compare the results of Nmap scans
endef endef
   
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--with-libdnet=included \ --with-libdnet=included \
--with-libpcre=included \ --with-libpcre=included \
--with-libpcap="$(STAGING_DIR)/usr" \ --with-libpcap="$(STAGING_DIR)/usr" \
--without-liblua --without-liblua
   
CONFIGURE_VARS += CXXFLAGS="$$$$CXXFLAGS -fno-builtin" CONFIGURE_VARS += CXXFLAGS="$$$$CXXFLAGS -fno-builtin"
   
ifeq ($(BUILD_VARIANT),ssl) ifeq ($(BUILD_VARIANT),ssl)
CONFIGURE_ARGS += --with-openssl="$(STAGING_DIR)/usr" CONFIGURE_ARGS += --with-openssl="$(STAGING_DIR)/usr"
else else
CONFIGURE_ARGS += --without-openssl CONFIGURE_ARGS += --without-openssl
endif endif
   
define Package/nmap/install define Package/nmap/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nmap $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nmap $(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/share/nmap $(INSTALL_DIR) $(1)/usr/share/nmap
$(CP) $(PKG_INSTALL_DIR)/usr/share/nmap/* $(1)/usr/share/nmap/ $(CP) $(PKG_INSTALL_DIR)/usr/share/nmap/* $(1)/usr/share/nmap/
endef endef
   
define Package/nmap-ssl/install define Package/nmap-ssl/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nmap $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nmap $(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/share/nmap $(INSTALL_DIR) $(1)/usr/share/nmap
$(CP) $(PKG_INSTALL_DIR)/usr/share/nmap/* $(1)/usr/share/nmap/ $(CP) $(PKG_INSTALL_DIR)/usr/share/nmap/* $(1)/usr/share/nmap/
endef endef
   
define Package/ncat/install define Package/ncat/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ncat $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ncat $(1)/usr/bin/
endef endef
   
define Package/ncat-ssl/install define Package/ncat-ssl/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ncat $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ncat $(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/share/ncat $(INSTALL_DIR) $(1)/usr/share/ncat
$(CP) $(PKG_INSTALL_DIR)/usr/share/ncat/ca-bundle.crt $(1)/usr/share/ncat/ $(CP) $(PKG_INSTALL_DIR)/usr/share/ncat/ca-bundle.crt $(1)/usr/share/ncat/
endef endef
   
define Package/ndiff/install define Package/ndiff/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ndiff $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ndiff $(1)/usr/bin/
endef endef
   
define Package/nping/install define Package/nping/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nping $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nping $(1)/usr/bin/
endef endef
   
   
$(eval $(call BuildPackage,nmap)) $(eval $(call BuildPackage,nmap))
$(eval $(call BuildPackage,nmap-ssl)) $(eval $(call BuildPackage,nmap-ssl))
$(eval $(call BuildPackage,ncat)) $(eval $(call BuildPackage,ncat))
$(eval $(call BuildPackage,ncat-ssl)) $(eval $(call BuildPackage,ncat-ssl))
$(eval $(call BuildPackage,nping)) $(eval $(call BuildPackage,nping))
$(eval $(call BuildPackage,ndiff)) $(eval $(call BuildPackage,ndiff))
   
file:a/net/opennhrp/Makefile (deleted)
#  
# Copyright (C) 2009-2011 OpenWrt.org  
# Copyright (C) 2009 Jakob Pfeiffer  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=opennhrp  
PKG_VERSION:=0.12.3  
PKG_RELEASE:=2  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:=@SF/opennhrp  
PKG_MD5SUM:=4d0ec7c0282e181ecca4d78e52067da3  
 
PKG_FIXUP:=autoreconf  
PKG_BUILD_PARALLEL:=1  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/opennhrp  
SECTION:=net  
CATEGORY:=Network  
SUBMENU:=VPN  
DEPENDS:=+libcares +ipsec-tools +ip +kmod-gre  
KCONFIG:=CONFIG_ARPD=y  
TITLE:=NBMA Next Hop Resolution Protocol  
URL:=http://opennhrp.sourceforge.net/  
endef  
 
define Package/opennhrp/description  
OpenNHRP implements NBMA Next Hop Resolution Protocol (as defined in RFC 2332).  
It makes it possible to create dynamic multipoint VPN Linux router using NHRP,  
GRE and IPsec. It aims to be Cisco DMVPN compatible.  
endef  
 
define Package/opennhrp/conffiles  
/etc/opennhrp/opennhrp.conf  
endef  
 
define Package/opennhrp/install  
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/opennhrp{,ctl} $(1)/usr/sbin/  
$(INSTALL_DIR) $(1)/etc/opennhrp  
$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/opennhrp/opennhrp.conf $(1)/etc/opennhrp/  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/opennhrp/opennhrp-script $(1)/etc/opennhrp/  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/opennhrp/racoon-ph1down.sh $(1)/etc/opennhrp/  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/opennhrp/racoon-ph1dead.sh $(1)/etc/opennhrp/  
$(INSTALL_DIR) $(1)/etc/init.d  
$(INSTALL_BIN) ./files/opennhrp.init $(1)/etc/init.d/opennhrp  
endef  
 
$(eval $(call BuildPackage,opennhrp))  
 
#!/bin/sh /etc/rc.common  
# Copyright (C) 2009-2011 OpenWrt.org  
# Copyright (C) 2009 Jakob Pfeiffer  
 
START=50  
 
SERVICE_USE_PID=1  
 
start() {  
service_start /usr/sbin/opennhrp -d  
}  
 
stop() {  
service_stop /usr/sbin/opennhrp  
}  
 
file:a/net/ulogd/Makefile (deleted)
#  
# Copyright (C) 2006-2011 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=ulogd  
PKG_VERSION:=1.24  
PKG_RELEASE:=2  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/ulogd/ \  
ftp://ftp.be.netfilter.org/pub/netfilter/ulogd/ \  
ftp://ftp.de.netfilter.org/pub/netfilter/ulogd/ \  
ftp://ftp.no.netfilter.org/pub/netfilter/ulogd/  
PKG_MD5SUM:=05b4ed2926b9a22aaeaf642917bbf8ff  
 
define Package/ulogd/Default  
SECTION:=net  
CATEGORY:=Network  
URL:=http://www.netfilter.org/projects/ulogd/index.html  
endef  
 
define Package/ulogd  
$(call Package/ulogd/Default)  
DEPENDS:=+iptables-mod-ulog  
TITLE:=Netfilter userspace logging daemon  
MENU:=1  
endef  
 
define Package/ulogd/conffiles  
/etc/default/ulogd  
/etc/ulogd.conf  
endef  
 
define Package/ulogd-mod-mysql  
$(call Package/ulogd/Default)  
DEPENDS:=ulogd +libmysqlclient  
TITLE:=Output plugin for logging to a MySQL database  
endef  
 
define Package/ulogd-mod-pcap  
$(call Package/ulogd/Default)  
DEPENDS:=ulogd +libpcap  
TITLE:=Output plugin for logging in pcap format  
endef  
 
define Package/ulogd-mod-pgsql  
$(call Package/ulogd/Default)  
DEPENDS:=ulogd +libpq  
TITLE:=Output plugin for logging to a PostgreSQL database  
endef  
 
define Package/ulogd-mod-sqlite  
$(call Package/ulogd/Default)  
DEPENDS:=ulogd +libsqlite3  
TITLE:=Output plugin for logging to an SQLite database  
endef  
 
define Package/ulogd-mod-extra  
$(call Package/ulogd/Default)  
DEPENDS:=ulogd  
TITLE:=Extra plugins  
endef  
 
define Package/ulogd-mod-extra/description  
This package contains the LOCAL, LOGEMU, OPRINT, PWSNIFF and SYSLOG plugins.  
endef  
 
include $(INCLUDE_DIR)/package.mk  
 
ifneq ($(Package/ulogd-mod-mysql),)  
ULOGD_MYSQL_OPTION:= --with-mysql="$(STAGING_DIR)/usr"  
endif  
 
ifneq ($(Package/ulogd-mod-pcap),)  
ULOGD_PCAP_HEADER:=yes  
else  
ULOGD_PCAP_HEADER:=no  
endif  
 
ifneq ($(Package/ulogd-mod-pgsql),)  
ULOGD_PGSQL_OPTION:= --with-pgsql="$(STAGING_DIR)/usr"  
endif  
 
ifneq ($(Package/ulogd-mod-sqlite),)  
ULOGD_SQLITE_OPTION:= --with-sqlite3="$(STAGING_DIR)/usr"  
endif  
 
define Build/Configure  
$(call Build/Configure/Default, \  
$(ULOGD_MYSQL_OPTION) \  
$(ULOGD_PGSQL_OPTION) \  
$(ULOGD_SQLITE_OPTION) \  
, \  
ac_cv_header_pcap_h=$(ULOGD_PCAP_HEADER) \  
)  
$(SED) 's/-lgcc_s//g' $(PKG_BUILD_DIR)/Rules.make  
endef  
 
define Build/Compile  
$(MAKE) -C $(PKG_BUILD_DIR) \  
DESTDIR="$(PKG_INSTALL_DIR)" \  
CFLAGS="$(TARGET_CFLAGS) \  
-Iinclude \  
-I$(PKG_BUILD_DIR)/include/ulogd \  
-I$(PKG_BUILD_DIR)/include \  
-I$(PKG_BUILD_DIR)/libipulog/include \  
-Wl,--export-dynamic \  
$(TARGET_CPPFLAGS)" \  
all install  
endef  
 
define Package/ulogd/install  
$(INSTALL_DIR) $(1)/etc  
$(CP) $(PKG_INSTALL_DIR)/etc/ulogd.conf $(1)/etc/  
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(1)/usr/sbin/  
$(INSTALL_DIR) $(1)/usr/lib/ulogd  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_BASE.so $(1)/usr/lib/ulogd/  
$(INSTALL_DIR) $(1)/etc/default  
$(INSTALL_DATA) ./files/ulogd.default $(1)/etc/default/ulogd  
$(INSTALL_DIR) $(1)/etc/init.d  
$(INSTALL_BIN) ./files/ulogd.init $(1)/etc/init.d/ulogd  
endef  
 
define BuildPlugin  
define Package/$(1)/install  
$(INSTALL_DIR) $$(1)/usr/lib/ulogd  
for m in $(2); do \  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_$$$$$$$${m}.so $$(1)/usr/lib/ulogd/ ; \  
done  
endef  
 
$$(eval $$(call BuildPackage,$(1)))  
endef  
 
$(eval $(call BuildPackage,ulogd))  
$(eval $(call BuildPlugin,ulogd-mod-mysql,MYSQL))  
$(eval $(call BuildPlugin,ulogd-mod-pcap,PCAP))  
$(eval $(call BuildPlugin,ulogd-mod-pgsql,PGSQL))  
$(eval $(call BuildPlugin,ulogd-mod-sqlite,SQLITE3))  
$(eval $(call BuildPlugin,ulogd-mod-extra,LOCAL LOGEMU OPRINT PWSNIFF SYSLOG))  
 
OPTIONS="-d"  
#!/bin/sh /etc/rc.common  
# Copyright (C) 2006-2011 OpenWrt.org  
 
START=50  
 
PROG="ulogd"  
COMMAND="/usr/sbin/$PROG"  
DEFAULT="/etc/default/$PROG"  
 
start() {  
[ -f $DEFAULT ] && . $DEFAULT  
service_start $COMMAND $OPTIONS  
}  
 
stop() {  
service_stop $COMMAND  
}  
 
diff -urN ulogd-1.23/pcap/Makefile.in ulogd-1.23.new/pcap/Makefile.in  
--- ulogd-1.23/pcap/Makefile.in 2004-03-23 23:36:04.000000000 +0100  
+++ ulogd-1.23.new/pcap/Makefile.in 2006-04-19 11:30:45.000000000 +0200  
@@ -14,7 +14,7 @@  
distrib:  
 
$(SHARED_LIBS): %.so: %_sh.o  
- $(LD) -shared -o $@ $< -lc -lpcap  
+ $(LD) -shared -o $@ $< @LDFLAGS@ -lc -lpcap  
 
%_sh.o: %.c  
$(CC) $(SH_CFLAGS) -o $@ -c $<  
 
diff -ruN ulogd-1.23-old/Rules.make.in ulogd-1.23-new/Rules.make.in  
--- ulogd-1.23-old/Rules.make.in 2005-02-19 22:32:40.000000000 +0100  
+++ ulogd-1.23-new/Rules.make.in 2005-05-27 07:45:18.000000000 +0200  
@@ -22,7 +22,7 @@  
CFLAGS+=-DULOGD_CONFIGFILE=\"$(ULOGD_CONFIGFILE)\"  
# doesn't work for subdirs  
#CFLAGS+=$(INCIPULOG) $(INCCONFFILE)  
-CFLAGS+=-I/lib/modules/`uname -r`/build/include  
+#CFLAGS+=-I/lib/modules/`uname -r`/build/include  
#CFLAGS+=@DEFS@  
#CFLAGS+=-g -DDEBUG -DDEBUG_MYSQL -DDEBUG_PGSQL  
 
diff -ruN ulogd-1.23-old/libipulog/Makefile.in ulogd-1.23-new/libipulog/Makefile.in  
--- ulogd-1.23-old/libipulog/Makefile.in 2004-03-23 23:36:06.000000000 +0100  
+++ ulogd-1.23-new/libipulog/Makefile.in 2005-05-27 07:44:21.000000000 +0200  
@@ -1,7 +1,7 @@  
#  
 
include @top_srcdir@/Rules.make  
-CFLAGS+=-Iinclude -I/usr/src/linux/include  
+CFLAGS+=-Iinclude  
 
libipulog.a: libipulog.o  
$(LD) -i $< -o $@  
 
--- a/configure  
+++ b/configure  
@@ -1728,7 +1728,7 @@ else  
EOF  
 
MYSQLINCLUDES=`$d/mysql_config --include`  
- MYSQLLIBS=`$d/mysql_config --libs`  
+ MYSQLLIBS=`$d/mysql_config --libs | sed 's/-rdynamic//'`  
 
DATABASE_DIR="${DATABASE_DIR} mysql"  
 
--- a/configure.in  
+++ b/configure.in  
@@ -60,7 +60,7 @@ then  
else  
AC_DEFINE(HAVE_MYSQL)  
MYSQLINCLUDES=`$d/mysql_config --include`  
- MYSQLLIBS=`$d/mysql_config --libs`  
+ MYSQLLIBS=`$d/mysql_config --libs | $(SED) 's/-rdynamic//'`  
 
DATABASE_DIR="${DATABASE_DIR} mysql"  
 
--- a/Makefile.in  
+++ b/Makefile.in  
@@ -63,7 +63,7 @@ recurse:  
@for d in $(SUBDIRS); do if ! make -C $$d; then exit 1; fi; done  
 
ulogd: ulogd.c $(LIBIPULOG) include/ulogd/ulogd.h conffile/conffile.o $(LIBIPULOG)/libipulog.a ulogd.conf  
- $(CC) $(CFLAGS) -rdynamic $< conffile/conffile.o $(LIBIPULOG)/libipulog.a -o $@ $(LIBS)  
+ $(CC) $(CFLAGS) $< conffile/conffile.o $(LIBIPULOG)/libipulog.a -o $@ $(LIBS)  
 
edit = sed -e 's,@libdir\@,$(ULOGD_LIB_PATH),g'  
 
 
comments