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/erlang/Makefile (deleted)
--- a/lang/erlang/Makefile
+++ /dev/null
@@ -1,332 +1,1 @@
-#
-# Copyright (C) 2009-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:=erlang
-PKG_VERSION:=R16B02
-PKG_RELEASE:=1
-
-PKG_SOURCE:=otp_src_$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:= http://www.erlang.org/download/ \
-	http://erlang.mirror.su.se/
-PKG_MD5SUM:= ca63bcde0e5ae0f2df9457f97b3115a4
-
-PKG_BUILD_DEPENDS:=erlang/host openssl
-
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/otp_src_$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/otp_src_$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/erlang/Default
-  SUBMENU:=Erlang
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Erlang/OTP programming language
-  URL:=http://www.erlang.org/
-endef
-
-define Package/erlang/Default/description
- Erlang/OTP is a general-purpose programming language and runtime
- environment. Erlang has built-in support for concurrency, distribution
- and fault tolerance.
-endef
-
-define Package/erlang
-$(call Package/erlang/Default)
-  DEPENDS+= +libncurses +librt +zlib
-  PROVIDES:= erlang-erts=5.10.3 erlang-kernel=2.16.3 erlang-sasl=2.3.3 erlang-stdlib=1.19.3
-endef
-
-define Package/erlang/description
-$(call Package/erlang/Default/description)
- .
- This package contains the runtime implementation and a minimal set of
- modules (erts, kernel, sasl & stdlib).
-endef
-
-
-define Package/erlang-asn1
-$(call Package/erlang/Default)
-  TITLE:=Abstract Syntax Notation One (ASN.1) support
-  VERSION:=2.0.3
-  DEPENDS+= +erlang +erlang-syntax-tools
-endef
-
-define Package/erlang-asn1/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides Abstract Syntax Notation One (ASN.1)
- support.
-endef
-
-
-define Package/erlang-compiler
-$(call Package/erlang/Default)
-  TITLE:=Byte code compiler
-  VERSION:=4.9.3
-  DEPENDS+= +erlang +erlang-hipe
-endef
-
-define Package/erlang-compiler/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides a byte code compiler for Erlang which
- produces highly compact code.
-endef
-
-
-define Package/erlang-crypto
-$(call Package/erlang/Default)
-  TITLE:=Cryptography support
-  VERSION:=3.1
-  DEPENDS+= +erlang +libopenssl
-endef
-
-define Package/erlang-crypto/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides functions for computation of message
- digests, and encryption and decryption functions.
-endef
-
-
-define Package/erlang-hipe
-$(call Package/erlang/Default)
-  TITLE:=High Performance Erlang
-  VERSION:=3.10.2.1
-  DEPENDS+= +erlang
-endef
-
-define Package/erlang-hipe/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides HiPE (High Performance Erlang)
- support.
-endef
-
-
-define Package/erlang-inets
-$(call Package/erlang/Default)
-  TITLE:=Internet clients and servers
-  VERSION:=5.9.6
-  DEPENDS+= +erlang
-endef
-
-define Package/erlang-inets/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides a container for Internet clients and
- servers. Currently a FTP client, a HTTP client and server, and a tftp
- client and server have been incorporated in Inets.
-endef
-
-
-define Package/erlang-mnesia
-$(call Package/erlang/Default)
-  TITLE:=Distributed database
-  VERSION:=4.10
-  DEPENDS+= +erlang
-endef
-
-define Package/erlang-mnesia/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides a distributed DataBase Management
- System (DBMS), appropriate for telecommunications applications and
- other Erlang applications which require continuous operation and
- exhibit soft real-time properties.
-endef
-
-
-define Package/erlang-runtime-tools
-$(call Package/erlang/Default)
-  TITLE:=Low-profile debugging/tracing tools
-  VERSION:=1.8.12
-  DEPENDS+= +erlang
-endef
-
-define Package/erlang-runtime-tools/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides low footprint tracing/debugging tools
- suitable for inclusion in a production system.
-endef
-
-
-define Package/erlang-snmp
-$(call Package/erlang/Default)
-  TITLE:=Simple Network Management Protocol (SNMP) support
-  VERSION:=4.24.2
-  DEPENDS+= +erlang +erlang-asn1
-endef
-
-define Package/erlang-snmp/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides Simple Network Management Protocol
- (SNMP) support including a MIB compiler and tools for creating SNMP
- agents.
-endef
-
-
-define Package/erlang-ssh
-$(call Package/erlang/Default)
-  TITLE:=Secure Shell (SSH) support
-  VERSION:=2.1.8
-  DEPENDS+= +erlang +erlang-crypto
-endef
-
-define Package/erlang-ssh/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides an implementation of the Secure Shell
- protocol, with SSH & SFTP support.
-endef
-
-
-define Package/erlang-ssl
-$(call Package/erlang/Default)
-  TITLE:=Secure Sockets Layer (SSL) support
-  VERSION:=5.3.1
-  DEPENDS+= +erlang +erlang-crypto
-endef
-
-define Package/erlang-ssl/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides support for secure communication over
- sockets.
-endef
-
-
-define Package/erlang-syntax-tools
-$(call Package/erlang/Default)
-  TITLE:=Abstract Erlang syntax trees handling support
-  VERSION:=1.6.11
-  DEPENDS+= +erlang
-endef
-
-define Package/erlang-syntax-tools/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides support for handling abstract Erlang
- syntax trees.
-endef
-
-
-# Host
-
-HOST_CONFIGURE_ARGS += \
-	--disable-hipe \
-	--disable-smp-support \
-	--without-javac
-
-define Host/Compile
-	$(MAKE) -C $(HOST_BUILD_DIR) all
-endef
-
-define Host/Install
-	$(MAKE) -C $(HOST_BUILD_DIR) install
-endef
-
-
-# Target
-
-CONFIGURE_ARGS += \
-	--disable-hipe \
-	--disable-smp-support \
-	--without-javac \
-	--enable-dynamic-ssl-lib
-
-CONFIGURE_VARS += \
-	SHLIB_LD="$(TARGET_CC)" \
-	TARGET_ARCH="$(TARGET_ARCH)" \
-	ac_cv_func_mmap_fixed_mapped=yes \
-	ac_cv_path_WX_CONFIG_PATH=no \
-	erl_xcomp_getaddrinfo=no \
-	erl_xcomp_sysroot="$(STAGING_DIR)"
-
-EXTRA_LDFLAGS+=-lz
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		noboot
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
-		install
-endef
-
-define Package/erlang/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	for f in epmd erl erlc escript run_erl; do \
-		$(CP) $(PKG_INSTALL_DIR)/usr/bin/$$$$f $(1)/usr/bin/ ; \
-	done
-	$(INSTALL_DIR) $(1)/usr/lib/erlang/bin
-	for f in erl erlc escript run_erl start start.boot start.script start_clean.boot start_erl start_sasl.boot to_erl; do \
-		$(CP) $(PKG_INSTALL_DIR)/usr/lib/erlang/bin/$$$$f $(1)/usr/lib/erlang/bin/ ; \
-	done
-	$(INSTALL_DIR) $(1)/usr/lib/erlang/lib
-	for m in erts kernel sasl stdlib; do \
-		$(CP) $(PKG_INSTALL_DIR)/usr/lib/erlang/lib/$$$$m-* $(1)/usr/lib/erlang/lib/ ; \
-		rm -rf $(1)/usr/lib/erlang/lib/$$$$m-*/examples ; \
-		rm -rf $(1)/usr/lib/erlang/lib/$$$$m-*/src ; \
-	done
-	$(INSTALL_DIR) $(1)/usr/lib/erlang
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/erlang/erts-* $(1)/usr/lib/erlang/
-	rm -rf $(1)/usr/lib/erlang/erts-*/{doc,include,lib,man,src}
-	rm -rf $(1)/usr/lib/erlang/erts-*/bin/*.src
-	$(INSTALL_DIR) $(1)/usr/lib/erlang/releases
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/erlang/releases/* $(1)/usr/lib/erlang/releases/
-	$(SED) 's,%ERL_ROOT%,/usr/lib/erlang,g' \
-		$(1)/usr/lib/erlang/releases/RELEASES.src
-	mv -f $(1)/usr/lib/erlang/releases/RELEASES.src \
-		$(1)/usr/lib/erlang/releases/RELEASES
-	for f in bin/erl bin/start erts-*/bin/erl erts-*/bin/start; do \
-		$(SED) 's,^\(ROOTDIR\)=.*,\1=/usr/lib/erlang,g' \
-			$(1)/usr/lib/erlang/$$$$f ; \
-	done
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/erl_interface/obj/*/*.a $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/lib/erl_interface/include/*.h $(1)/usr/include
-endef
-
-define BuildModule
-
-  define Package/erlang-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/erlang/lib
-	for m in $(2); do \
-		$(CP) $(PKG_INSTALL_DIR)/usr/lib/erlang/lib/$$$$$$$$m-* $$(1)/usr/lib/erlang/lib/ ; \
-		rm -rf $$(1)/usr/lib/erlang/lib/$$$$$$$$m-*/{examples,priv/obj,src} ; \
-	done
-  endef
-
-  $$(eval $$(call BuildPackage,erlang-$(1)))
-
-endef
-
-
-$(eval $(call HostBuild))
-$(eval $(call BuildPackage,erlang))
-$(eval $(call BuildModule,asn1,asn1))
-$(eval $(call BuildModule,compiler,compiler))
-$(eval $(call BuildModule,crypto,crypto))
-$(eval $(call BuildModule,hipe,hipe))
-$(eval $(call BuildModule,inets,inets))
-$(eval $(call BuildModule,mnesia,mnesia))
-$(eval $(call BuildModule,runtime-tools,runtime_tools))
-$(eval $(call BuildModule,snmp,snmp))
-$(eval $(call BuildModule,ssh,ssh))
-$(eval $(call BuildModule,ssl,ssl))
-$(eval $(call BuildModule,syntax-tools,syntax_tools))
-

--- a/lang/erlang/patches/101-emulator_includes.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/erts/emulator/Makefile.in
-+++ b/erts/emulator/Makefile.in
-@@ -591,7 +591,7 @@ endif
- 
- 
- $(OBJDIR)/%.o: beam/%.c
--	$(V_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
-+	$(V_CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@
- 
- else
- 
 

--- a/lang/erlang/patches/103-disable_emacs.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/lib/tools/Makefile
-+++ b/lib/tools/Makefile
-@@ -23,7 +23,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
- # Macros
- # ----------------------------------------------------
- 
--SUB_DIRECTORIES = c_src src doc/src examples priv emacs
-+SUB_DIRECTORIES = c_src src doc/src examples priv
- 
- include vsn.mk
- VSN = $(TOOLS_VSN)
 

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/lang/ruby/Makefile (deleted)
--- a/lang/ruby/Makefile
+++ /dev/null
@@ -1,484 +1,1 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-#
-# To Do:
-#  - split up encodings
-#  - allow selection of either native or pure version of a library where supported
-#  +-> some native libraries are probably only supported if ruby-dl is enabled
-# anything else?
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ruby
-PKG_VERSION:=1.9.3-p545
-PKG_RELEASE:=1
-
-PKG_LIBVER:=1.9
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.ruby-lang.org/pub/ruby/$(PKG_LIBVER)/
-PKG_MD5SUM:=4743c1dc48491070bae8fc8b423bc1a7
-
-PKG_BUILD_DEPENDS:=ruby/host
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/ruby/Default
-  SUBMENU:=Ruby
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Ruby scripting language
-  URL:=http://www.ruby-lang.org/
-endef
-
-define Package/ruby/Default/description
- Ruby is the interpreted scripting language for quick and  easy
- object-oriented programming.  It has many features to process text files
- and to do system management tasks (as in perl).  It is simple,
- straight-forward, and extensible.
-endef
-
-define Package/ruby
-$(call Package/ruby/Default)
-  TITLE+= (interpreter)
-  DEPENDS:=+libruby
-endef
-
-define Package/ruby/description
-$(call Package/ruby/Default/description)
-endef
-
-define Package/libruby
-$(call Package/ruby/Default)
-  SUBMENU:=
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= (shared library)
-  DEPENDS+= +libpthread +librt
-endef
-
-# Ongoing work to break up ruby's standard library into coherent pieces
-# with minimal dependencies between them
-
-define Package/ruby-core
-$(call Package/ruby/Default)
-  TITLE:=Ruby standard libraries
-  DEPENDS:=ruby +libdb47 +libffi
-endef
-
-define Package/ruby-cgi
-$(call Package/ruby/Default)
-  TITLE:=Ruby CGI support toolkit
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-dl
-$(call Package/ruby/Default)
-  TITLE+= (dynamic linker support) (adds 5MB+)
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-enc
-$(call Package/ruby/Default)
-  TITLE+= (character re-coding library) (adds 2MB+)
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-erb
-$(call Package/ruby/Default)
-  TITLE+= (embedded interpreter)
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-gdbm
-$(call Package/ruby/Default)
-  TITLE:=Ruby support for gdbm
-  DEPENDS:=ruby +libgdbm
-endef
-
-define Package/ruby-gems
-$(call Package/ruby/Default)
-  TITLE:=Ruby gems packet management
-  DEPENDS:=ruby +ruby-yaml +ruby-zlib +ruby-openssl +ruby-webrick +ruby-erb
-endef
-
-define Package/ruby-irb
-$(call Package/ruby/Default)
-  TITLE+= (interactive shell)
-  DEPENDS:=ruby +ruby-core
-endef
-
-define Package/ruby-json
-$(call Package/ruby/Default)
-  TITLE:=Ruby support for JSON
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-ncurses
-$(call Package/ruby/Default)
-  TITLE:=Ruby support for ncurses
-  DEPENDS:=ruby +libncurses +libncursesw
-endef
-
-define Package/ruby-nkf
-$(call Package/ruby/Default)
-  TITLE:=Ruby Network Kanji Filter
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-openssl
-$(call Package/ruby/Default)
-  TITLE:=Ruby support for openssl
-  DEPENDS:=ruby +libopenssl
-endef
-
-define Package/ruby-rdoc
-$(call Package/ruby/Default)
-  TITLE+= (documentation generator)
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-rake
-$(call Package/ruby/Default)
-  TITLE+=Ruby Rake (make replacement)
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-readline
-$(call Package/ruby/Default)
-  TITLE:=Ruby support for readline
-  DEPENDS:=ruby +libncurses +libreadline
-endef
-
-define Package/ruby-rexml
-$(call Package/ruby/Default)
-  TITLE:=Ruby XML toolkit
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-rss
-$(call Package/ruby/Default)
-  TITLE:=Ruby RSS toolkit
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-unit
-$(call Package/ruby/Default)
-  TITLE:=Ruby unit testing toolkit
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-webrick
-$(call Package/ruby/Default)
-  TITLE:=Ruby Web server toolkit
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-xmlrpc
-$(call Package/ruby/Default)
-  TITLE:=Ruby XML-RPC toolkit
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-yaml
-$(call Package/ruby/Default)
-  TITLE:=Ruby YAML toolkit
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-zlib
-$(call Package/ruby/Default)
-  TITLE:=Ruby support for zlib
-  DEPENDS:=ruby +zlib
-endef
-
-HOST_CONFIGURE_ARGS += \
-	--disable-install-doc \
-	--disable-install-rdoc \
-	--disable-install-capi
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-rpath \
-	--enable-ipv6 \
-	--with-ruby-version=minor \
-	--with-iconv-dir=$(ICONV_PREFIX) \
-
-TARGET_LDFLAGS += -L$(PKG_BUILD_DIR)
-
-MAKE_FLAGS += \
-	DESTDIR="$(PKG_INSTALL_DIR)" \
-	SHELL="/bin/bash"
-
-define Package/ruby/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ruby $(1)/usr/bin/
-endef
-
-define Package/libruby/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libruby.so.* $(1)/usr/lib/
-endef
-
-define Package/ruby-core/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby $(1)/usr/lib/
-	rm -rf	\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/*/curses.so \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/*/gdbm.so \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/kconv.rb \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/*/nkf.so \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/digest \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/digest.rb \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/*/digest \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/*/digest.so \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/openssl \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/openssl.rb \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/*/openssl.so \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/drb/ssl.rb \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/net/https.rb \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/webrick/ssl.rb \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/*/dl.so \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/*/enc \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/*/readline.so \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/irb/completion.rb \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/irb/ext/save-history.rb \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/*/zlib.so \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/erb.rb \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/json.rb \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/json \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/*/json \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/irb.rb \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/irb \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/rdoc \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/rake.rb \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/rake \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/rubygems.rb \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/rubygems \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/cgi.rb \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/cgi \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/rexml \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/rss \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/rss.rb \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/test \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/webrick \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/webrick.rb \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/xmlrpc \
-		\
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/yaml \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/yaml.rb \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/*/syck.so \
-
-	find $(1) -name '*.h' | xargs rm -f
-endef
-
-define Package/ruby-cgi/install
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/cgi $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/cgi.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-define Package/ruby-dl/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/*/dl.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-enc/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/*/enc \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-erb/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/erb $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/erb.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-define Package/ruby-gdbm/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/*/gdbm.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-gems/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/gem $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rubygems.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rubygems $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-define Package/ruby-irb/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/irb $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/irb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/irb.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-define Package/ruby-json/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/json.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/json \
-		usr/lib/ruby/$(PKG_LIBVER)/*/json \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-ncurses/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/*/curses.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-nkf/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/kconv.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/*/nkf.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-openssl/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/digest \
-		usr/lib/ruby/$(PKG_LIBVER)/digest.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/*/digest.so \
-		usr/lib/ruby/$(PKG_LIBVER)/*/digest/*.so \
-		usr/lib/ruby/$(PKG_LIBVER)/openssl \
-		usr/lib/ruby/$(PKG_LIBVER)/openssl.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/*/openssl.so \
-		usr/lib/ruby/$(PKG_LIBVER)/drb/ssl.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/net/https.rb \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-rdoc/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rdoc $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ri $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rdoc $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-define Package/ruby-rake/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rake $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rake.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rake $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-define Package/ruby-readline/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/*/readline.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-rexml/install
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rexml $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-
-define Package/ruby-rss/install
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rss $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rss.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-define Package/ruby-unit/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/testrb $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/test $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-define Package/ruby-webrick/install
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/webrick $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/webrick.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-define Package/ruby-xmlrpc/install
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/xmlrpc $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-define Package/ruby-yaml/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/yaml \
-		usr/lib/ruby/$(PKG_LIBVER)/yaml.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/*/syck.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-zlib/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/*/zlib.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Build/InstallDev
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		. \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-$(eval $(call BuildPackage,ruby))
-$(eval $(call BuildPackage,libruby))
-$(eval $(call BuildPackage,ruby-core))
-$(eval $(call BuildPackage,ruby-cgi))
-$(eval $(call BuildPackage,ruby-dl))
-$(eval $(call BuildPackage,ruby-enc))
-$(eval $(call BuildPackage,ruby-erb))
-$(eval $(call BuildPackage,ruby-gdbm))
-$(eval $(call BuildPackage,ruby-gems))
-$(eval $(call BuildPackage,ruby-json))
-$(eval $(call BuildPackage,ruby-irb))
-$(eval $(call BuildPackage,ruby-ncurses))
-$(eval $(call BuildPackage,ruby-nkf))
-$(eval $(call BuildPackage,ruby-openssl))
-$(eval $(call BuildPackage,ruby-rake))
-$(eval $(call BuildPackage,ruby-rdoc))
-$(eval $(call BuildPackage,ruby-readline))
-$(eval $(call BuildPackage,ruby-rexml))
-$(eval $(call BuildPackage,ruby-rss))
-$(eval $(call BuildPackage,ruby-unit))
-$(eval $(call BuildPackage,ruby-webrick))
-$(eval $(call BuildPackage,ruby-xmlrpc))
-$(eval $(call BuildPackage,ruby-yaml))
-$(eval $(call BuildPackage,ruby-zlib))
-$(eval $(call HostBuild))
-

--- a/lang/ruby/patches/001-ignore_wide_getaddrinfo_while_crosscompiling.patch
+++ /dev/null
@@ -1,11 +1,1 @@
---- a/ext/socket/extconf.rb    2013-02-14 23:20:13.581918676 -0200
-+++ b/ext/socket/extconf.rb    2013-02-14 23:21:25.761918667 -0200
-@@ -254,6 +254,7 @@
- end
- 
- getaddr_info_ok = (enable_config("wide-getaddrinfo") && :wide) ||
-+  (CROSS_COMPILING && :cross) ||
-   (checking_for("wide getaddrinfo") {try_run(<<EOF)} && :os)
- #{cpp_include(headers)}
- #include <stdlib.h>
 

file:a/libs/freetype/Makefile (deleted)
--- a/libs/freetype/Makefile
+++ /dev/null
@@ -1,76 +1,1 @@
-#
-# Copyright (C) 2006-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:=freetype
-PKG_VERSION:=2.4.8
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/freetype
-PKG_MD5SUM:=dbf2caca1d3afd410a29217a9809d397
-
-PKG_LICENSE:=FTL GPLv2 MIT ZLIB
-PKG_LICENSE_FILES:=docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT src/bdf/README src/pcf/README src/gzip/zlib.h
-
-PKG_FIXUP:=autoreconf
-PKG_LIBTOOL_PATHS:=builds/unix
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libfreetype
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=A free, high-quality and portable font engine
-  URL:=http://www.freetype.org/
-  DEPENDS:=+zlib +libbz2
-endef
-
-define Package/libfreetype/description
- The FreeType project is a team of volunteers who develop free,
- portable and high-quality software solutions for digital typography.
- They specifically target embedded systems and focus on bringing small,
- efficient and ubiquitous products.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(2)/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/freetype-config $(2)/bin/
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/freetype2 $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/ft2build.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/freetype2.pc $(1)/usr/lib/pkgconfig/
-
-	$(SED) \
-		's,^\(prefix\|exec_prefix\)=.*,\1="$(STAGING_DIR)/usr",g' \
-		 $(2)/bin/freetype-config
-endef
-
-
-define Package/libfreetype/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call HostBuild))
-$(eval $(call BuildPackage,libfreetype))
-

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))
-

--- a/libs/libdbi-drivers/Makefile
+++ /dev/null
@@ -1,138 +1,1 @@
-#
-# 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/libs/libdbi-drivers/patches/001_libsqlite3_fix.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- 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)
--- a/libs/libdbi/Makefile
+++ /dev/null
@@ -1,53 +1,1 @@
-#
-# 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))
-

file:a/libs/liblo/Makefile (deleted)
--- a/libs/liblo/Makefile
+++ /dev/null
@@ -1,84 +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:=liblo
-PKG_VERSION:=0.26
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/liblo
-PKG_MD5SUM:=5351de14262560e15e7f23865293b16f
-
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=autogen.sh aclocal.m4
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/liblo/Default
-  SUBMENU:=Sound
-  TITLE:=Lightweight Open Sound Control (OSC)
-  URL:=http://liblo.sourceforge.net/
-endef
-
-define Package/liblo
-$(call Package/liblo/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= library
-  DEPENDS:= +libpthread
-endef
-
-define Package/liblo-utils
-$(call Package/liblo/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+= utilities
-  DEPENDS:= +liblo
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/include/lo \
-		$(1)/usr/include/ \
-	)
-	$(INSTALL_DIR) $(1)/usr/lib
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/liblo.so* \
-		$(1)/usr/lib/ \
-	)
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/pkgconfig/liblo.pc \
-		$(1)/usr/lib/pkgconfig/ \
-	)
-endef
-
-define Package/liblo/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/liblo.so.* \
-		$(1)/usr/lib/ \
-	)
-endef
-
-define Package/liblo-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/bin/oscdump \
-		./usr/bin/oscsend \
-		$(1)/usr/bin/ \
-	)
-endef
-
-$(eval $(call BuildPackage,liblo))
-$(eval $(call BuildPackage,liblo-utils))
-

--- a/libs/libnetfilter-log/Makefile
+++ /dev/null
@@ -1,73 +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:=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))
-

--- a/libs/libnetfilter-queue/Makefile
+++ /dev/null
@@ -1,73 +1,1 @@
-#
-# 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))
-

--- a/multimedia/fswebcam/Makefile
+++ /dev/null
@@ -1,46 +1,1 @@
-#
-# Copyright (C) 2010-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:=fswebcam
-PKG_VERSION:=20110717
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://www.sanslogic.co.uk/fswebcam/files
-PKG_MD5SUM:=0b343a827771b7546cf4ede19a5ed000
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/fswebcam
-  SECTION:=multimedia
-  CATEGORY:=Multimedia
-  TITLE:=fswebcam
-  URL:=http://www.sanslogic.co.uk/fswebcam/
-  DEPENDS:=+libgd
-endef
-
-define Package/fswebcam/description
-  fswebcam is a neat and simple webcam app. It captures images from a V4L1/V4L2 compatible
-  device or file, averages them to reduce noise and draws a caption using the GD Graphics
-  Library which also handles compressing the image to PNG or JPEG. The resulting image
-  is saved to a file or sent to stdio where it can be piped to something like ncftpput or scp.
-endef
-
-EXTRA_CFLAGS+= $(TARGET_CPPFLAGS)
-EXTRA_LDFLAGS+= $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
-
-define Package/fswebcam/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/fswebcam $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,fswebcam))
-

--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -13,12 +13,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nmap
-PKG_VERSION:=6.46
+PKG_VERSION:=6.47
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://nmap.org/dist/
-PKG_MD5SUM:=5a36ad3a63d5b7ea5514f745a397436a
+PKG_MD5SUM:=edfe81f6763223c0a29bfa15a8526e2a
 
 PKG_INSTALL:=1
 

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/ulogd/Makefile (deleted)
--- a/net/ulogd/Makefile
+++ /dev/null
@@ -1,147 +1,1 @@
-#
-# 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))
-

--- a/net/ulogd/files/ulogd.default
+++ /dev/null
@@ -1,1 +1,1 @@
-OPTIONS="-d"
+

--- a/net/ulogd/files/ulogd.init
+++ /dev/null
@@ -1,18 +1,1 @@
-#!/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
-}
-

--- a/net/ulogd/patches/001-pcap_flags.patch
+++ /dev/null
@@ -1,13 +1,1 @@
-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 $<
-

--- a/net/ulogd/patches/002-inc.patch
+++ /dev/null
@@ -1,25 +1,1 @@
-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/net/ulogd/patches/003-fix-bad-rpath.patch
+++ /dev/null
@@ -1,34 +1,1 @@
---- 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'
- 
 

file:a/net/unbound/Makefile (deleted)
--- a/net/unbound/Makefile
+++ /dev/null
@@ -1,173 +1,1 @@
-#
-# Copyright (C) 2010-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:=unbound
-PKG_VERSION:=1.4.22
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.unbound.net/downloads
-PKG_MD5SUM:=59728c74fef8783f8bad1d7451eba97f
-
-PKG_BUILD_DEPENDS:=libexpat
-PKG_BUILD_PARALLEL:=1
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/unbound/Default
-  TITLE:=A validating, recursive & caching DNS resolver
-  URL:=http://www.unbound.net/
-  DEPENDS:=+libopenssl
-endef
-
-define Package/unbound
-  $(call Package/unbound/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=IP Addresses and Names
-  TITLE+= (daemon)
-  DEPENDS+= +libunbound
-endef
-
-define Package/unbound/description
-  This package contains the Unbound daemon.
-endef
-
-define Package/unbound-anchor
-  $(call Package/unbound/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=IP Addresses and Names
-  TITLE+= (anchor utility)
-  DEPENDS+= +unbound +libexpat
-endef
-
-define Package/unbound-anchor/description
-  This package contains the Unbound anchor utility.
-endef
-
-define Package/unbound-control
-  $(call Package/unbound/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=IP Addresses and Names
-  TITLE+= (control utility)
-  DEPENDS+= +unbound
-endef
-
-define Package/unbound-control/description
-  This package contains the Unbound control utility.
-endef
-
-define Package/unbound-control-setup
-  $(call Package/unbound/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=IP Addresses and Names
-  TITLE+= (control setup utility)
-  DEPENDS+= +unbound-control +openssl-util
-endef
-
-define Package/unbound-control-setup/description
-  This package contains the Unbound control setup utility.
-endef
-
-define Package/unbound-host
-  $(call Package/unbound/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=IP Addresses and Names
-  TITLE+= (DNS lookup utility)
-  DEPENDS+= +libunbound
-endef
-
-define Package/unbound-host/description
-  This package contains the Unbound DNS lookup utility.
-endef
-
-define Package/libunbound
-  $(call Package/unbound/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= (library)
-endef
-
-define Package/libunbound/description
-  This package contains the Unbound shared library.
-endef
-
-CONFIGURE_ARGS += \
-	--disable-ecdsa \
-	--disable-gost \
-	--enable-allsymbols \
-	--with-libexpat="$(STAGING_DIR)/usr" \
-	--with-ssl="$(STAGING_DIR)/usr" \
-	--without-pthreads
-
-define Package/unbound/conffiles
-/etc/unbound/unbound.conf
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/unbound.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libunbound.{so*,a,la} $(1)/usr/lib/
-endef
-
-define Package/unbound/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/sbin/unbound \
-		$(PKG_INSTALL_DIR)/usr/sbin/unbound-checkconf \
-		$(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/unbound
-	$(INSTALL_CONF) \
-		$(PKG_INSTALL_DIR)/etc/unbound/unbound.conf \
-		$(1)/etc/unbound/
-	$(INSTALL_CONF) ./files/root.key $(1)/etc/unbound/
-	$(INSTALL_CONF) ./files/named.cache $(1)/etc/unbound/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/unbound.init $(1)/etc/init.d/unbound
-endef
-
-define Package/unbound-anchor/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/unbound-anchor $(1)/usr/sbin/
-endef
-
-define Package/unbound-control/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/unbound-control $(1)/usr/sbin/
-endef
-
-define Package/unbound-control-setup/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/unbound-control-setup $(1)/usr/sbin/
-endef
-
-define Package/unbound-host/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/unbound-host $(1)/usr/sbin/
-endef
-
-define Package/libunbound/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libunbound.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,unbound))
-$(eval $(call BuildPackage,unbound-anchor))
-$(eval $(call BuildPackage,unbound-control))
-$(eval $(call BuildPackage,unbound-control-setup))
-$(eval $(call BuildPackage,unbound-host))
-$(eval $(call BuildPackage,libunbound))
-

--- a/net/unbound/files/named.cache
+++ /dev/null
@@ -1,90 +1,1 @@
-;       This file holds the information on root name servers needed to
-;       initialize cache of Internet domain name servers
-;       (e.g. reference this file in the "cache  .  <file>"
-;       configuration file of BIND domain name servers).
-;
-;       This file is made available by InterNIC 
-;       under anonymous FTP as
-;           file                /domain/named.cache
-;           on server           FTP.INTERNIC.NET
-;       -OR-                    RS.INTERNIC.NET
-;
-;       last update:    Mar 26, 2014
-;       related version of root zone:   2014032601
-;
-; formerly NS.INTERNIC.NET
-;
-.                        3600000  IN  NS    A.ROOT-SERVERS.NET.
-A.ROOT-SERVERS.NET.      3600000      A     198.41.0.4
-A.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:BA3E::2:30
-;
-; FORMERLY NS1.ISI.EDU
-;
-.                        3600000      NS    B.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET.      3600000      A     192.228.79.201
-;
-; FORMERLY C.PSI.NET
-;
-.                        3600000      NS    C.ROOT-SERVERS.NET.
-C.ROOT-SERVERS.NET.      3600000      A     192.33.4.12
-C.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2::C
-;
-; FORMERLY TERP.UMD.EDU
-;
-.                        3600000      NS    D.ROOT-SERVERS.NET.
-D.ROOT-SERVERS.NET.      3600000      A     199.7.91.13
-D.ROOT-SERVERS.NET.	 3600000      AAAA  2001:500:2D::D
-;
-; FORMERLY NS.NASA.GOV
-;
-.                        3600000      NS    E.ROOT-SERVERS.NET.
-E.ROOT-SERVERS.NET.      3600000      A     192.203.230.10
-;
-; FORMERLY NS.ISC.ORG
-;
-.                        3600000      NS    F.ROOT-SERVERS.NET.
-F.ROOT-SERVERS.NET.      3600000      A     192.5.5.241
-F.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2F::F
-;
-; FORMERLY NS.NIC.DDN.MIL
-;
-.                        3600000      NS    G.ROOT-SERVERS.NET.
-G.ROOT-SERVERS.NET.      3600000      A     192.112.36.4
-;
-; FORMERLY AOS.ARL.ARMY.MIL
-;
-.                        3600000      NS    H.ROOT-SERVERS.NET.
-H.ROOT-SERVERS.NET.      3600000      A     128.63.2.53
-H.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:1::803F:235
-;
-; FORMERLY NIC.NORDU.NET
-;
-.                        3600000      NS    I.ROOT-SERVERS.NET.
-I.ROOT-SERVERS.NET.      3600000      A     192.36.148.17
-I.ROOT-SERVERS.NET.      3600000      AAAA  2001:7FE::53
-;
-; OPERATED BY VERISIGN, INC.
-;
-.                        3600000      NS    J.ROOT-SERVERS.NET.
-J.ROOT-SERVERS.NET.      3600000      A     192.58.128.30
-J.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:C27::2:30
-;
-; OPERATED BY RIPE NCC
-;
-.                        3600000      NS    K.ROOT-SERVERS.NET.
-K.ROOT-SERVERS.NET.      3600000      A     193.0.14.129
-K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7FD::1
-;
-; OPERATED BY ICANN
-;
-.                        3600000      NS    L.ROOT-SERVERS.NET.
-L.ROOT-SERVERS.NET.      3600000      A     199.7.83.42
-L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:3::42
-;
-; OPERATED BY WIDE
-;
-.                        3600000      NS    M.ROOT-SERVERS.NET.
-M.ROOT-SERVERS.NET.      3600000      A     202.12.27.33
-M.ROOT-SERVERS.NET.      3600000      AAAA  2001:DC3::35
-; End of File
 

--- a/net/unbound/files/root.key
+++ /dev/null
@@ -1,2 +1,1 @@
-. IN DS 19036 8 2 49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5
 

--- a/net/unbound/files/unbound.init
+++ /dev/null
@@ -1,15 +1,1 @@
-#!/bin/sh /etc/rc.common
-#Copyright (C) 2010 Ondrej Caletka <o.caletka@sh.cvut.cz>
-START=61
 
-start () {
-	unbound
-}
-
-stop () {
-	PIDFILE='/var/run/unbound.pid'
-	if [ -f $PIDFILE ] ; then
-		kill $(cat $PIDFILE)
-	fi
-}
-

--- a/net/unbound/patches/001-conf.patch
+++ /dev/null
@@ -1,155 +1,1 @@
---- a/doc/example.conf.in
-+++ b/doc/example.conf.in
-@@ -38,6 +38,8 @@ server:
- 	# interface: 192.0.2.154
- 	# interface: 192.0.2.154@5003
- 	# interface: 2001:DB8::5
-+	interface: 0.0.0.0
-+	interface: ::0
- 
- 	# enable this feature to copy the source address of queries to reply.
- 	# Socket options are not supported on all platforms. experimental. 
-@@ -57,6 +59,7 @@ server:
- 	# port range that can be open simultaneously.  About double the
- 	# num-queries-per-thread, or, use as many as the OS will allow you.
- 	# outgoing-range: 4096
-+	outgoing-range: 60
- 
- 	# permit unbound to use this port number or port range for
- 	# making outgoing queries, using an outgoing interface.
-@@ -73,9 +76,11 @@ server:
- 
- 	# number of outgoing simultaneous tcp buffers to hold per thread.
- 	# outgoing-num-tcp: 10
-+	outgoing-num-tcp: 1
- 
- 	# number of incoming simultaneous tcp buffers to hold per thread.
- 	# incoming-num-tcp: 10
-+	incoming-num-tcp: 1
- 
- 	# buffer size for UDP port 53 incoming (SO_RCVBUF socket option).
- 	# 0 is system default.  Use 4m to catch query spikes for busy servers.
-@@ -99,18 +104,22 @@ server:
- 	# buffer size for handling DNS data. No messages larger than this
- 	# size can be sent or received, by UDP or TCP. In bytes.
- 	# msg-buffer-size: 65552
-+	msg-buffer-size: 8192
- 
- 	# the amount of memory to use for the message cache.
- 	# plain value in bytes or you can append k, m or G. default is "4Mb". 
- 	# msg-cache-size: 4m
-+	msg-cache-size: 100k
- 
- 	# the number of slabs to use for the message cache.
- 	# the number of slabs must be a power of 2.
- 	# more slabs reduce lock contention, but fragment memory usage.
- 	# msg-cache-slabs: 4
-+	msg-cache-slabs: 1
- 
- 	# the number of queries that a thread gets to service.
- 	# num-queries-per-thread: 1024
-+	num-queries-per-thread: 30
- 
- 	# if very busy, 50% queries run to completion, 50% get timeout in msec
- 	# jostle-timeout: 200
-@@ -121,11 +130,13 @@ server:
- 	# the amount of memory to use for the RRset cache.
- 	# plain value in bytes or you can append k, m or G. default is "4Mb". 
- 	# rrset-cache-size: 4m
-+	rrset-cache-size: 100k
- 
- 	# the number of slabs to use for the RRset cache.
- 	# the number of slabs must be a power of 2.
- 	# more slabs reduce lock contention, but fragment memory usage.
- 	# rrset-cache-slabs: 4
-+	rrset-cache-slabs: 1
- 
- 	# the time to live (TTL) value lower bound, in seconds. Default 0.
- 	# If more than an hour could easily give trouble due to stale data.
-@@ -143,9 +154,11 @@ server:
- 	# the number of slabs must be a power of 2.
- 	# more slabs reduce lock contention, but fragment memory usage.
- 	# infra-cache-slabs: 4
-+	infra-cache-slabs: 1
- 
- 	# the maximum number of hosts that are cached (roundtrip, EDNS, lame).
- 	# infra-cache-numhosts: 10000
-+	infra-cache-numhosts: 200
- 
- 	# Enable IPv4, "yes" or "no".
- 	# do-ip4: yes
-@@ -178,6 +191,8 @@ server:
- 	# access-control: ::0/0 refuse
- 	# access-control: ::1 allow
- 	# access-control: ::ffff:127.0.0.1 allow
-+	access-control: 0.0.0.0/0 allow
-+	access-control: ::0/0 allow
- 
- 	# if given, a chroot(2) is done to the given directory.
- 	# i.e. you can chroot to the working directory, for example,
-@@ -208,6 +223,7 @@ server:
- 	# and the given username is assumed. Default is user "unbound".
- 	# If you give "" no privileges are dropped.
- 	# username: "@UNBOUND_USERNAME@"
-+	username: ""
- 
- 	# the working directory. The relative files in this config are 
- 	# relative to this directory. If you give "" the working directory
-@@ -230,10 +246,12 @@ server:
- 
- 	# the pid file. Can be an absolute path outside of chroot/work dir.
- 	# pidfile: "@UNBOUND_PIDFILE@"
-+	pidfile: "/var/run/unbound.pid"
- 
- 	# file to read root hints from.
- 	# get one from ftp://FTP.INTERNIC.NET/domain/named.cache
- 	# root-hints: ""
-+	root-hints: "/etc/unbound/named.cache"
- 
- 	# enable to not answer id.server and hostname.bind queries.
- 	# hide-identity: no
-@@ -256,12 +274,15 @@ server:
- 	#	positive value: fetch that many targets opportunistically.
- 	# Enclose the list of numbers between quotes ("").
- 	# target-fetch-policy: "3 2 1 0 0"
-+	target-fetch-policy: "2 1 0 0 0 0"
- 
- 	# Harden against very small EDNS buffer sizes. 
- 	# harden-short-bufsize: no
-+	harden-short-bufsize: yes
- 
- 	# Harden against unseemly large queries.
- 	# harden-large-queries: no
-+	harden-large-queries: yes
- 
- 	# Harden against out of zone rrsets, to avoid spoofing attempts. 
- 	# harden-glue: yes
-@@ -342,7 +363,7 @@ server:
- 	# you start unbound (i.e. in the system boot scripts).  And enable:
- 	# Please note usage of unbound-anchor root anchor is at your own risk
- 	# and under the terms of our LICENSE (see that file in the source).
--	# auto-trust-anchor-file: "@UNBOUND_ROOTKEY_FILE@"
-+	auto-trust-anchor-file: "@UNBOUND_ROOTKEY_FILE@"
- 
- 	# File with DLV trusted keys. Same format as trust-anchor-file.
- 	# There can be only one DLV configured, it is trusted from root down.
-@@ -428,15 +449,18 @@ server:
- 	# the amount of memory to use for the key cache.
- 	# plain value in bytes or you can append k, m or G. default is "4Mb". 
- 	# key-cache-size: 4m
-+	key-cache-size: 100k
- 
- 	# the number of slabs to use for the key cache.
- 	# the number of slabs must be a power of 2.
- 	# more slabs reduce lock contention, but fragment memory usage.
- 	# key-cache-slabs: 4
-+	key-cache-slabs: 1
- 
- 	# the amount of memory to use for the negative cache (used for DLV).
- 	# plain value in bytes or you can append k, m or G. default is "1Mb". 
- 	# neg-cache-size: 1m
-+	neg-cache-size: 10k
- 
- 	# By default, for a number of zones a small default 'nothing here'
- 	# reply is built-in.  Query traffic is thus blocked.  If you
 

file:a/utils/gnupg/Makefile (deleted)
--- a/utils/gnupg/Makefile
+++ /dev/null
@@ -1,66 +1,1 @@
-#
-# Copyright (C) 2006-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:=gnupg
-PKG_VERSION:=1.4.16
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg \
-	ftp://ftp.gnupg.org/gcrypt/gnupg
-PKG_MD5SUM:=6df73c57d3ece1dd36dc2a7679f00fb0
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/gnupg
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+zlib +libncurses +libreadline
-  TITLE:=GNU privacy guard - a free PGP replacement
-  URL:=http://www.gnupg.org/
-endef
-
-define Package/gnupg/description
- GnuPG is GNU's tool for secure communication and data storage.
- It can be used to encrypt data and to create digital signatures.
- It includes an advanced key management facility and is compliant
- with the proposed OpenPGP Internet standard as described in RFC2440.
- .
- GnuPG does not use any patented algorithms so it cannot be compatible
- with PGP2 because it uses IDEA (which is patented worldwide).
-endef
-
-CONFIGURE_ARGS += \
-	--disable-rpath \
-	--disable-asm \
-	--disable-gnupg-iconv \
-	--disable-card-support \
-	--disable-agent-support \
-	--disable-bzip2 \
-	--disable-exec \
-	--disable-ldap \
-	--disable-hkp \
-	--disable-finger \
-	--disable-ftp \
-	--disable-dns-srv \
-	--enable-fake-curl \
-	--disable-regex \
-
-MAKE_FLAGS += \
-	SUBDIRS="m4 intl zlib util mpi cipher tools g10 keyserver ${checks}" \
-
-define Package/gnupg/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gpg $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,gnupg))
-

comments