lftp: moved to github
lftp: moved to github


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

--- a/devel/diffutils/Makefile
+++ /dev/null
@@ -1,60 +1,1 @@
-#
-# Copyright (C) 2008-2012 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:=diffutils
-PKG_VERSION:=3.0
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@GNU/diffutils
-PKG_MD5SUM:=684aaba1baab743a2a90e52162ff07da
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/diffutils
-  SECTION:=devel
-  CATEGORY:=Development
-  DEPENDS:=+USE_EGLIBC:librt
-  TITLE:=diffutils
-  URL:=http://www.gnu.org/software/diffutils/
-endef
-
-define Package/diffutils/description
-  The Diffutils package contains programs that show the differences between
-  files or directories.
-endef
-
-CONFIGURE_VARS += \
-	ac_cv_func_mempcpy=n \
-
-define Package/diffutils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{sdiff,diff3,diff,cmp} $(1)/usr/bin/
-endef
-
-define Package/diffutils/preinst
-#!/bin/sh
-for x in sdiff diff3 diff cmp; do
-  [ -L "$${IPKG_INSTROOT}/usr/bin/$$x" ] && rm -f "$${IPKG_INSTROOT}/usr/bin/$$x"
-done
-exit 0
-endef
-
-define Package/diffutils/postrm
-#!/bin/sh
-for x in sdiff diff3 diff cmp; do
-  /bin/busybox $$x -h 2>&1 | grep -q BusyBox && ln -sf ../../bin/busybox /usr/bin/$$x
-done
-exit 0
-endef
-
-$(eval $(call BuildPackage,diffutils))
-

file:a/lang/luasoap/Makefile (deleted)
--- a/lang/luasoap/Makefile
+++ /dev/null
@@ -1,51 +1,1 @@
-#
-# 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)
--- a/lang/luasql/Makefile
+++ /dev/null
@@ -1,122 +1,1 @@
-#
-# 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)
--- a/libs/libcelt/Makefile
+++ /dev/null
@@ -1,58 +1,1 @@
-#
-# 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))
-

file:a/libs/libnatpmp/Makefile (deleted)
--- a/libs/libnatpmp/Makefile
+++ /dev/null
@@ -1,84 +1,1 @@
-#
-# Copyright (C) 2011-2012 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:=libnatpmp
-PKG_VERSION:=20110808
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://miniupnp.free.fr/files
-PKG_MD5SUM:=22a1225b890471a7750a9bf26eb863f7
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libnatpmp/Default
-  TITLE:=NAT Port Mapping Protocol (NAT-PMP)
-  URL:=http://miniupnp.free.fr/libnatpmp.html
-endef
-
-define Package/libnatpmp/Default/description
-  libnatpmp is an attempt to make a portable and fully compliant implementation
-  of the protocol for the client side. It is based on non blocking sockets and
-  all calls of the API are asynchronous. It is therefore very easy to integrate
-  the NAT-PMP code to any event driven code.
-endef
-
-define Package/libnatpmp
-  $(call Package/libnatpmp/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= library
-endef
-
-define Package/libnatpmp/description
-  $(call Package/libnatpmp/Default/description)
-  This package contains the shared library.
-endef
-
-define Package/natpmpc
-  $(call Package/libnatpmp/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Firewall
-  TITLE+= client
-  DEPENDS:=+libnatpmp
-endef
-
-define Package/natpmpc/description
-  $(call Package/libnatpmp/Default/description)
-  This package contains the natpmp client.
-endef
-
-MAKE_FLAGS += \
-	COPTS="$(TARGET_CFLAGS)" \
-	PREFIX="$(PKG_INSTALL_DIR)" \
-	OS="Linux"
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/natpmp.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnatpmp*.{so*,a} $(1)/usr/lib/
-endef
-
-define Package/libnatpmp/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libnatpmp.so.* $(1)/usr/lib/
-endef
-
-define Package/natpmpc/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/natpmpc $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libnatpmp))
-$(eval $(call BuildPackage,natpmpc))
-

--- a/libs/libnatpmp/patches/001-cross_compile.patch
+++ /dev/null
@@ -1,13 +1,1 @@
---- a/Makefile
-+++ b/Makefile
-@@ -11,7 +11,8 @@ INSTALL = install
- # APIVERSION is used in soname
- APIVERSION = 1
- #LDFLAGS = -Wl,--no-undefined
--CFLAGS = -O -fPIC -Wall -DENABLE_STRNATPMPERR
-+COPTS = -O
-+CFLAGS = $(COPTS) -fPIC -Wall -DENABLE_STRNATPMPERR
- 
- LIBOBJS = natpmp.o getgateway.o
- 
 

file:a/libs/neon/Makefile (deleted)
--- a/libs/neon/Makefile
+++ /dev/null
@@ -1,64 +1,1 @@
-#
-# Copyright (C) 2007-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:=neon
-PKG_VERSION:=0.29.6
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.webdav.org/neon
-PKG_MD5SUM:=591e0c82e6979e7e615211b386b8f6bc
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libneon
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=HTTP and WebDAV client library
-  URL:=http://www.webdav.org/neon/
-  DEPENDS:=+libopenssl +libexpat
-endef
-
-TARGET_CFLAGS += $(FPIC)
-TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--with-expat \
-	--with-ssl="openssl" \
-	--without-egd \
-	--without-libproxy \
-
-CONFIGURE_VARS += \
-	LDFLAGS="$$$$LDFLAGS -lcrypto -lssl"
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/neon-config $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/neon $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libneon.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/neon.pc $(1)/usr/lib/pkgconfig/
-	$(SED) 's,-I$$$${includedir}/,-I$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/neon-config
-	$(SED) 's,-L$$$${libdir},,g' $(1)/usr/bin/neon-config
-endef
-
-define Package/libneon/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libneon.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libneon))
-

--- a/libs/neon/patches/001-automake-compat.patch
+++ /dev/null
@@ -1,6 +1,1 @@
---- /dev/null
-+++ b/Makefile.am
-@@ -0,0 +1,2 @@
-+SUBDIRS = .
-+ACLOCAL_AMFLAGS = -I macros
 

file:a/net/lftp/Makefile (deleted)
--- a/net/lftp/Makefile
+++ /dev/null
@@ -1,61 +1,1 @@
-#
-# Copyright (C) 2008-2012 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:=lftp
-PKG_VERSION:=4.3.6
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://lftp.cybermirror.org \
-  http://lftp.cybermirror.org/old
-PKG_MD5SUM:=ffcdbaec5d1416cb6dd754efd43fa61a
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/uclibc++.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/lftp
-  SUBMENU:=File Transfer
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libncurses +libopenssl +libreadline $(CXX_DEPENDS) +libexpat
-  TITLE:=Sophisticated file transfer program
-  URL:=http://lftp.yar.ru/
-endef
-
-define Package/lftp/description
-  lftp is sophisticated file transfer program with command line interface. It
-  supports FTP, HTTP, FISH, SFTP and FILE (local FS) protocols. GNU Readline
-  library is used for input. BitTorrent protocol is supported as built-in
-  `torrent' command.
-endef
-
-CONFIGURE_ARGS += \
-	--without-libiconv-prefix \
-	--without-libintl-prefix \
-	--without-gnutls \
-	--without-libresolv \
-	--with-openssl="$(STAGING_DIR)/usr" \
-	--disable-static
-
-CONFIGURE_VARS += \
-	LIBS="-lz -lutil -lcurses -ldl" \
-	i_cv_posix_fallocate_works=no
-
-MAKE_VARS += \
-	LD="$(TARGET_CXX)"
-
-define Package/lftp/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lftp $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,lftp))
-

--- a/net/lftp/patches/001-libintl.patch
+++ /dev/null
@@ -1,19 +1,1 @@
---- a/lib/gettext.h
-+++ b/lib/gettext.h
-@@ -22,7 +22,6 @@
- #if ENABLE_NLS
- 
- /* Get declarations of GNU message catalog functions.  */
--# include <libintl.h>
- 
- /* You can set the DEFAULT_TEXT_DOMAIN macro to specify the domain used by
-    the gettext() and ngettext() macros.  This is an alternative to calling
-@@ -54,7 +53,6 @@
- #if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
- # include <cstdlib>
- # if (__GLIBC__ >= 2 && !defined __UCLIBC__) || _GLIBCXX_HAVE_LIBINTL_H
--#  include <libintl.h>
- # endif
- #endif
- 
 

file:a/net/nmap/Makefile (deleted)
--- a/net/nmap/Makefile
+++ /dev/null
@@ -1,140 +1,1 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
 
-#TODO
-#
-# * 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
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=nmap
-PKG_VERSION:=6.46
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://nmap.org/dist/
-PKG_MD5SUM:=5a36ad3a63d5b7ea5514f745a397436a
-
-PKG_INSTALL:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-NMAP_DEPENDS:=+libpcap +libstdcpp
-NCAT_DEPENDS:=+libpcap
-NPING_DEPENDS:=+libpcap +libpthread +libstdcpp
-NDIFF_DEPENDS:=+python
-
-define Package/nmap/default
-  SUBMENU:=NMAP Suite
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=http://nmap.org/
-endef
-
-define Package/nmap
-$(call Package/nmap/default)
-  DEPENDS:=$(NMAP_DEPENDS)
-  VARIANT:=nossl
-  TITLE:=Utility for network exploration or security auditing
-endef
-
-define Package/nmap-ssl
-$(call Package/nmap/default)
-  DEPENDS:=$(NMAP_DEPENDS) +libopenssl
-  VARIANT:=ssl
-  TITLE:=Nmap (with OpenSSL support)
-endef
-
-define Package/ncat
-$(call Package/nmap/default)
-  DEPENDS:=$(NCAT_DEPENDS)
-  VARIANT:=nossl
-  TITLE:=Much-improved reimplementation of Netcat
-endef
-
-define Package/ncat-ssl
-$(call Package/nmap/default)
-  DEPENDS:=$(NCAT_DEPENDS) +libopenssl
-  VARIANT:=ssl
-  TITLE:=Ncat (with OpenSSL support)
-endef
-
-define Package/nping
-$(call Package/nmap/default)
-  DEPENDS:=$(NPING_DEPENDS)
-  VARIANT:=nossl
-  TITLE:=Network packet generation tool / ping utility
-endef
-
-define Package/ndiff
-$(call Package/nmap/default)
-  DEPENDS:=$(NDIFF_DEPENDS)
-  VARIANT:=nossl
-  TITLE:=Utility to compare the results of Nmap scans
-endef
-
-CONFIGURE_ARGS += \
-	--with-libdnet=included \
-	--with-libpcre=included \
-	--with-libpcap="$(STAGING_DIR)/usr" \
-	--without-liblua
-
-CONFIGURE_VARS += CXXFLAGS="$$$$CXXFLAGS -fno-builtin"
-
-ifeq ($(BUILD_VARIANT),ssl)
-	CONFIGURE_ARGS += --with-openssl="$(STAGING_DIR)/usr"
-else
-	CONFIGURE_ARGS += --without-openssl
-endif
-
-define Package/nmap/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nmap $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/share/nmap
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/nmap/* $(1)/usr/share/nmap/
-endef
-
-define Package/nmap-ssl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nmap $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/share/nmap
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/nmap/* $(1)/usr/share/nmap/
-endef
-
-define Package/ncat/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ncat $(1)/usr/bin/
-endef
-
-define Package/ncat-ssl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ncat $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/share/ncat
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/ncat/ca-bundle.crt $(1)/usr/share/ncat/
-endef
-
-define Package/ndiff/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ndiff $(1)/usr/bin/
-endef
-
-define Package/nping/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nping $(1)/usr/bin/
-endef
-
-
-$(eval $(call BuildPackage,nmap))
-$(eval $(call BuildPackage,nmap-ssl))
-$(eval $(call BuildPackage,ncat))
-$(eval $(call BuildPackage,ncat-ssl))
-$(eval $(call BuildPackage,nping))
-$(eval $(call BuildPackage,ndiff))
-

file:a/net/opennhrp/Makefile (deleted)
--- a/net/opennhrp/Makefile
+++ /dev/null
@@ -1,58 +1,1 @@
-#
-# 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))
-

--- a/net/opennhrp/files/opennhrp.init
+++ /dev/null
@@ -1,16 +1,1 @@
-#!/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/tor/Makefile (deleted)
--- a/net/tor/Makefile
+++ /dev/null
@@ -1,119 +1,1 @@
-#
-# Copyright (C) 2008-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:=tor
-PKG_VERSION:=0.2.4.22
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://www.torproject.org/dist \
-	https://archive.torproject.org/tor-package-archive
-PKG_MD5SUM:=5a7eee0d9df87233255d78b25c6f8270
-
-PKG_BUILD_DEPENDS:=libminiupnpc libnatpmp
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tor/Default
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=https://www.torproject.org/
-endef
-
-define Package/tor/Default/description
- Tor is a toolset for a wide range of organizations and people that want to
- improve their safety and security on the Internet. Using Tor can help you
- anonymize web browsing and publishing, instant messaging, IRC, SSH, and
- more. Tor also provides a platform on which software developers can build
- new applications with built-in anonymity, safety, and privacy features.
-endef
-
-define Package/tor
-$(call Package/tor/Default)
-  TITLE:=An anonymous Internet communication system
-  DEPENDS:=+libevent2 +libopenssl +libpthread +librt +SSP_SUPPORT:libssp
-endef
-
-define Package/tor/description
-$(call Package/tor/Default/description)
- This package contains the tor daemon.
-endef
-
-define Package/tor-fw-helper
-$(call Package/tor/Default)
-  TITLE:=Firewall helper for tor
-  DEPENDS:=+tor +libminiupnpc +libnatpmp
-endef
-
-define Package/tor-fw-helper/description
-$(call Package/tor/Default/description)
- This package contains a helper for automatically configuring port forwarding.
-endef
-
-define Package/tor-geoip
-$(call Package/tor/Default)
-  TITLE:=GeoIP db for tor
-  DEPENDS:=+tor
-endef
-
-define Package/tor-geoip/description
-$(call Package/tor/Default/description)
- This package contains a GeoIP database mapping IP addresses to countries.
-endef
-
-define Package/tor/conffiles
-/etc/tor/torrc
-endef
-
-CONFIGURE_ARGS += \
-	--with-libevent-dir="$(STAGING_DIR)/usr" \
-	--with-ssl-dir="$(STAGING_DIR)/usr" \
-	--enable-upnp \
-	--with-libminiupnpc-dir="$(STAGING_DIR)/usr" \
-	--enable-nat-pmp \
-	--with-libnatpmp-dir="$(STAGING_DIR)/usr" \
-	--disable-asciidoc
-
-ifneq ($(CONFIG_SSP_SUPPORT),y)
-	CONFIGURE_ARGS += \
-		--disable-gcc-hardening
-	MAKE_FLAGS += \
-		CFLAGS="$(TARGET_CFLAGS)"
-else
-	MAKE_FLAGS += \
-		CFLAGS="$(TARGET_CFLAGS) -fPIC"	
-endif
-
-CONFIGURE_VARS += \
-	CROSS_COMPILE="yes"
-
-define Package/tor/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tor $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/tor.init $(1)/etc/init.d/tor
-	$(INSTALL_DIR) $(1)/etc/tor
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/tor/torrc.sample $(1)/etc/tor/torrc
-endef
-
-define Package/tor-fw-helper/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tor-fw-helper $(1)/usr/bin/
-endef
-
-define Package/tor-geoip/install
-	$(INSTALL_DIR) $(1)/usr/share/tor
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/tor/geoip $(1)/usr/share/tor/
-endef
-
-$(eval $(call BuildPackage,tor))
-$(eval $(call BuildPackage,tor-fw-helper))
-$(eval $(call BuildPackage,tor-geoip))
-

file:a/net/tor/files/tor.init (deleted)
--- a/net/tor/files/tor.init
+++ /dev/null
@@ -1,29 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
 
-START=50
-STOP=50
-
-USE_PROCD=1
-
-start_service() {
-	user_exists tor 52 || user_add tor 52 52 /var/lib/tor
-	group_exists tor 52 || group_add tor 52
-	[ -f /var/run/tor.pid ] || {
-		touch /var/run/tor.pid
-		chown tor:tor /var/run/tor.pid
-	}
-	[ -d /var/lib/tor ] || {
-		mkdir -m 0755 -p /var/lib/tor
-		chmod 0700 /var/lib/tor
-		chown tor:tor /var/lib/tor
-	}
-	[ -d /var/log/tor ] || {
-		mkdir -m 0755 -p /var/log/tor
-		chown tor:tor /var/log/tor
-	}
-	procd_open_instance
-	procd_set_param command /usr/sbin/tor --runasdaemon 0
-	procd_close_instance
-}
-

--- a/net/tor/patches/001-torrc.patch
+++ /dev/null
@@ -1,22 +1,1 @@
---- a/src/config/torrc.sample.in
-+++ b/src/config/torrc.sample.in
-@@ -45,11 +45,11 @@
- ## Uncomment this to start the process in the background... or use
- ## --runasdaemon 1 on the command line. This is ignored on Windows;
- ## see the FAQ entry if you want Tor to run as an NT service.
--#RunAsDaemon 1
-+RunAsDaemon 1
- 
- ## The directory for keeping all the keys/etc. By default, we store
- ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
--#DataDirectory @LOCALSTATEDIR@/lib/tor
-+DataDirectory @LOCALSTATEDIR@/lib/tor
- 
- ## The port on which Tor will listen for local connections from Tor
- ## controller applications, as documented in control-spec.txt.
-@@ -187,3 +187,4 @@
- ## address manually to your friends, uncomment this line:
- #PublishServerDescriptor 0
- 
-+User tor
 

comments