ulogd: moved to github
ulogd: moved to github

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

file:a/devel/gcc/Makefile (deleted)
--- a/devel/gcc/Makefile
+++ /dev/null
@@ -1,91 +1,1 @@
-#
-# Copyright (C) 2008 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:=gcc
-PKG_VERSION:=$(strip $(subst ",, $(CONFIG_GCC_VERSION)))#"))
-PKG_RELEASE:=1
-PATCH_DIR=$(TOPDIR)/toolchain/gcc/patches/$(PKG_VERSION)
-PKG_SOURCE_URL:=ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-$(PKG_VERSION) \
-    http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(PKG_VERSION) \
-	    ftp://ftp.gnu.org/gnu/gcc/releases/gcc-$(PKG_VERSION)
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_MD5SUM:=354853e0b2da90c527e35aabb8d6f1e6
-
-include $(INCLUDE_DIR)/package.mk
-
-SEP:=,
-TARGET_LANGUAGES:="c$(if $(CONFIG_INSTALL_LIBSTDCPP),$(SEP)c++)$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)"
-EXTRA_TARGET=$(if $(CONFIG_EXTRA_TARGET_ARCH),--enable-biarch --enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-uclibc)
-
-define Package/gcc
-  SECTION:=devel
-  CATEGORY:=Development
-  TITLE:=gcc
-  DEPENDS:=@TARGET_x86 @NO_STRIP
-endef
-
-define Package/gcc/description
-	build a native toolchain for compiling on target
-endef
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	$(SED) 's,\(version_string.. = "[0-9\.]*\).*\(";\),\1 (OpenWrt-2.0)\2,' $(PKG_BUILD_DIR)/gcc/version.c
-	$(SED) 's,\(bug_report_url.. = "\).*\(";\),\1<URL:https://dev.openwrt.org/>\2,' $(PKG_BUILD_DIR)/gcc/version.c
-	(cd $(PKG_BUILD_DIR)/libstdc++-v3; autoconf;);
-	$(SED) 's,gcc_no_link=yes,gcc_no_link=no,' $(PKG_BUILD_DIR)/libstdc++-v3/configure
-endef
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		SHELL="$(BASH)" \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(PKG_BUILD_DIR)/configure \
-			$(TARGET_CONFIGURE_ARGS) \
-			--build=$(GNU_HOST_NAME) \
-			--host=$(REAL_GNU_TARGET_NAME) \
-			--target=$(REAL_GNU_TARGET_NAME) \
-			--enable-languages=$(TARGET_LANGUAGES) \
-			--enable-shared \
-			--disable-__cxa_atexit \
-			--enable-target-optspace \
-			--with-gnu-ld \
-			--disable-nls \
-			--disable-libmudflap \
-			--disable-multilib \
-			$(EXTRA_TARGET) \
-			$(SOFT_FLOAT_CONFIG_OPTION) \
-			$(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
-	);
-endef
-
-define Build/Compile
-	export SHELL="$(BASH)"; $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) \
-			DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE_ARGS) all install
-	# Set up the symlinks to enable lying about target name.
-	set -e; \
-	(cd $(TOOLCHAIN_DIR); \
-		ln -sf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \
-		cd bin; \
-		for app in $(REAL_GNU_TARGET_NAME)-* ; do \
-			ln -sf $$$${app} \
-			$(GNU_TARGET_NAME)$$$${app##$(REAL_GNU_TARGET_NAME)}; \
-		done; \
-	);
-endef
-
-define Package/gcc/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	cp -r $(PKG_INSTALL_DIR)/* $(1)
-	cp -r $(TOOLCHAIN_DIR)/include $(1)/usr/
-	cp $(TOOLCHAIN_DIR)/lib/crt* $(1)/usr/lib/
-	cp $(TOOLCHAIN_DIR)/lib/libc.so $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,gcc))
-

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

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

--- a/libs/libdmapsharing/Makefile
+++ /dev/null
@@ -1,67 +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.
-#
-# This Makefile is a skeleton
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libdmapsharing
-PKG_VERSION:=2.9.15
-PKG_RELEASE:=1
-
-PKG_SOURCE:=libdmapsharing-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.flyn.org/projects/libdmapsharing/
-PKG_MD5SUM:=52c9e4d3de931d9013eeaccf7371bb2d
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/libdmapsharing-$(PKG_VERSION)
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-TARGET_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-define Package/libdmapsharing
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libsoup +mdnsresponder +gstreamer +gst-plugins-base +libgstapp
-  TITLE:=libdmapsharing
-  URL:=http://www.flyn.org/projects/libdmapsharing/
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-endef
-
-define Package/libdmapsharing/decription
-  Libdmapsharing is a DMAP library implementation in C
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/libdmapsharing-3.0/ \
-		$(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/*.so* \
-		$(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libdmapsharing/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/*.so* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libdmapsharing))
-

--- a/libs/libdmapsharing/patches/001-diable_pixbuf.patch
+++ /dev/null
@@ -1,25 +1,1 @@
-Index: libdmapsharing-2.9.15/configure.ac
-===================================================================
---- libdmapsharing-2.9.15.orig/configure.ac	2012-08-14 21:02:31.861158482 +0200
-+++ libdmapsharing-2.9.15/configure.ac	2012-08-14 21:03:42.448658906 +0200
-@@ -112,18 +112,7 @@
- AC_SUBST(GOBJECT_CFLAGS)
- AC_SUBST(GOBJECT_LIBS)
- 
--dnl Check for gdk-pixbuf, needed for DACP Now Playing Artwork
--PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0,
--  HAVE_GDKPIXBUF=yes,
--  HAVE_GDKPIXBUF=no)
--
--if test x"$HAVE_GDKPIXBUF" = "xyes"; then
--  AC_DEFINE(HAVE_GDKPIXBUF, 1, [Define if gdk-pixbuf support is enabled])
--else
--  AC_WARN(Gdk-pixbuf library not present, Now Playing artwork might be affected.)
--fi
--
--AM_CONDITIONAL(USE_GDKPIXBUF, test x"$HAVE_GDKPIXBUF" = "xyes")
-+HAVE_GDKPIXBUF=no
- 
- AC_SUBST(GDKPIXBUF_CFLAGS)
- AC_SUBST(GDKPIXBUF_LIBS)
 

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

file:a/libs/mysql/Makefile (deleted)
--- a/libs/mysql/Makefile
+++ /dev/null
@@ -1,187 +1,1 @@
-#
-# Copyright (C) 2006-2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/uclibc++.mk
-
-PKG_NAME:=mysql
-PKG_VERSION:=5.1.73
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=\
-	http://mysql.he.net/Downloads/MySQL-5.1/ \
-	http://www.linorg.usp.br/mysql/Downloads/MySQL-5.1/ \
-	http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQL-5.1/ \
-	http://mirror.switch.ch/ftp/mirror/mysql/Downloads/MySQL-5.1/ \
-	http://downloads.mysql.com/archives/mysql-5.1/
-
-PKG_MD5SUM:=887f869bcc757957067b9198f707f32f
-
-PKG_BUILD_DEPENDS:=libncurses libreadline
-PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
-
-PKG_FIXUP:=libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libmysqlclient/Default
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=$(CXX_DEPENDS) +zlib
-  TITLE:=MySQL client library
-  URL:=http://dev.mysql.com/
-endef
-
-define Package/mysql-server
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libmysqlclient +libpthread +libncursesw +libreadline
-  TITLE:=MySQL Server
-  URL:=http://dev.mysql.com/
-  SUBMENU:=database
-endef
-
-define Package/libmysqlclient
-  $(call Package/libmysqlclient/Default)
-endef
-
-define Package/libmysqlclient-r
-  $(call Package/libmysqlclient/Default)
-  TITLE += threadsafe
-  DEPENDS+= +libpthread
-endef
-
-TARGET_CXX=g++-uc
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--enable-thread-safe-client \
-	--disable-assembler \
-	--with-pthread \
-	--with-server \
-	--without-mysqlmanager \
-	--with-mysqld-user=root \
-	--with-unix-socket-path=/tmp \
-	--without-libwrap \
-	--with-low-memory \
-	--without-embedded-server \
-	--without-query-cache \
-	--without-ssl \
-	--without-docs \
-	--without-man \
-	--without-readline \
-	--without-debug \
-	--with-named-thread-libs=-lpthread
-
-CONFIGURE_VARS += \
-	mysql_cv_compress=yes \
-	mysql_cv_gethostname_style=glibc2 \
-	mysql_cv_gcc_atomic_builtins=yes \
-	mysql_cv_gcc_atomic_builtins_pthread_t=yes \
-	ac_cv_c_stack_direction=-1
-
-define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
-		SUBDIRS="include" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all
-	$(MAKE) -C "$(PKG_BUILD_DIR)" \
-		SUBDIRS="include" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-	g++ -I $(PKG_BUILD_DIR)/include \
-		-o $(PKG_BUILD_DIR)/sql/gen_lex_hash \
-		$(PKG_BUILD_DIR)/sql/gen_lex_hash.cc
-	+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)/libmysql" \
-		CC="g++" \
-		CFLAGS="$(HOST_CFLAGS)" \
-		CPPFLAGS="$(HOST_CFLAGS)" \
-		LDFLAGS="$(HOST_LDFLAGS)" \
-		conf_to_src
-	+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
-		SUBDIRS="libmysql" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all
-	$(MAKE) -C "$(PKG_BUILD_DIR)" \
-		SUBDIRS="libmysql" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-	+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
-		SUBDIRS="libmysql_r" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all
-	$(MAKE) -C "$(PKG_BUILD_DIR)" \
-		SUBDIRS="libmysql_r" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-	$(MAKE) -C "$(PKG_BUILD_DIR)" \
-		SUBDIRS="scripts" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		bin_SCRIPTS="mysql_config" \
-		install
-	+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all
-	$(MAKE) -C "$(PKG_BUILD_DIR)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-endef
-
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(2)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(1)/usr/bin/
-	ln -sf $(STAGING_DIR)/usr/bin/mysql_config $(2)/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/mysql $(1)/usr/include/
-	# NOTE: needed for MySQL-Python
-	$(CP) $(PKG_BUILD_DIR)/include/mysqld_error.h $(1)/usr/include/mysql/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql $(1)/usr/lib/
-	rm -f $(1)/usr/lib/mysql/libmysqlclient.la
-endef
-
-define Package/libmysqlclient/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(1)/usr/lib/
-endef
-define Package/libmysqlclient-r/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient_r.so.* $(1)/usr/lib/
-endef
-
-define Package/mysql-server/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mysql $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/mysqld $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/myisamchk $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mysqladmin $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mysqldump $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mysql_install_db $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/my_print_defaults $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) files/mysqld.init $(1)/etc/init.d/mysqld
-	$(INSTALL_CONF) conf/my.cnf $(1)/etc/
-	$(INSTALL_DIR) $(1)/usr/share/mysql
-	$(INSTALL_DIR) $(1)/usr/share/mysql/english
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/mysql/english/errmsg.sys $(1)/usr/share/mysql/english
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/mysql/fill_help_tables.sql $(1)/usr/share/mysql/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/mysql/mysql_system_tables.sql $(1)/usr/share/mysql/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/mysql/mysql_system_tables_data.sql $(1)/usr/share/mysql/
-endef
-
-define Package/mysql-server/conffiles
-/etc/my.cnf
-endef
-
-$(eval $(call BuildPackage,mysql-server))
-$(eval $(call BuildPackage,libmysqlclient))
-$(eval $(call BuildPackage,libmysqlclient-r))
-

file:a/libs/mysql/conf/my.cnf (deleted)
--- a/libs/mysql/conf/my.cnf
+++ /dev/null
@@ -1,55 +1,1 @@
-[client]
-port		= 3306
-socket		= /var/run/mysqld.sock
 
-[mysqld]
-user		= root
-socket		= /var/run/mysqld.sock
-port		= 3306
-basedir		= /usr
-
-############ Don't put this on the NAND #############
-# Figure out where you are going to put the databases
-# And run mysql_install_db --force
-datadir		= /mnt/data/mysql/
-
-######### This should also not go on the NAND #######
-tmpdir		= /mnt/data/tmp/
-
-skip-external-locking
-
-bind-address		= 127.0.0.1
-
-# Fine Tuning
-key_buffer		= 16M
-max_allowed_packet	= 16M
-thread_stack		= 192K
-thread_cache_size       = 8
-
-# Here you can see queries with especially long duration
-#log_slow_queries	= /var/log/mysql/mysql-slow.log
-#long_query_time = 2
-#log-queries-not-using-indexes
-
-# The following can be used as easy to replay backup logs or for replication.
-#server-id		= 1
-#log_bin			= /var/log/mysql/mysql-bin.log
-#expire_logs_days	= 10
-#max_binlog_size         = 100M
-#binlog_do_db		= include_database_name
-#binlog_ignore_db	= include_database_name
-
-
-[mysqldump]
-quick
-quote-names
-max_allowed_packet	= 16M
-
-[mysql]
-#no-auto-rehash	# faster start of mysql but no tab completition
-
-[isamchk]
-key_buffer		= 16M
-
-
-

--- a/libs/mysql/files/mysqld.init
+++ /dev/null
@@ -1,31 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2010-2011 OpenWrt.org
 
-START=95
-STOP=10
-
-SERVICE_DAEMONIZE=1
-SERVICE_WRITE_PID=1
-SERVICE_STOP_TIME=9
-
-error() {
-	echo "${initscript}:" "$@" 1>&2
-}
-
-start() {
-	local datadir=$(sed -n -e "s/^[[:space:]]*datadir[[:space:]]*=[[:space:]]*[\"']\?\([^\"']*\)[\"']\?/\1/p" /etc/my.cnf)
-	if [ ! -d "$datadir" ]; then
-		error "Error: datadir '$datadir' in /etc/my.cnf doesn't exist"
-		return 1
-	fi
-	if [ ! -f "$datadir/mysql/tables_priv.MYD" ]; then
-		error "Error: I didn't detect a privileges table, you might need to run mysql_install_db --force to initialize the system tables"
-		return 1
-	fi
-	service_start /usr/bin/mysqld
-}
-
-stop() {
-	service_stop /usr/bin/mysqld
-}
-

--- a/libs/mysql/patches/100-fix_hostname.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/scripts/mysql_install_db.sh
-+++ b/scripts/mysql_install_db.sh
-@@ -322,7 +322,7 @@ then
- fi
- 
- # Try to determine the hostname
--hostname=`@HOSTNAME@`
-+hostname=`cat /proc/sys/kernel/hostname`
- 
- # Check if hostname is valid
- if test "$cross_bootstrap" -eq 0 -a "$in_rpm" -eq 0 -a "$force" -eq 0
 

--- a/libs/mysql/patches/110-cross_compile.patch
+++ /dev/null
@@ -1,180 +1,1 @@
---- a/storage/innodb_plugin/plug.in
-+++ b/storage/innodb_plugin/plug.in
-@@ -56,10 +56,8 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin,  [
-   esac
-   AC_SUBST(INNODB_DYNAMIC_CFLAGS)
- 
--  AC_MSG_CHECKING(whether GCC atomic builtins are available)
--  # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
--  AC_TRY_RUN(
--    [
-+  AC_CACHE_CHECK([whether GCC atomic builtins are available],
-+		 [mysql_cv_gcc_atomic_builtins], [AC_TRY_RUN([
-       int main()
-       {
- 	long	x;
-@@ -96,21 +94,18 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin,  [
- 
- 	return(0);
-       }
--    ],
--    [
--      AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1],
--                [GCC atomic builtins are available])
--      AC_MSG_RESULT(yes)
--    ],
--    [
--      AC_MSG_RESULT(no)
--    ]
--  )
-+    ], [mysql_cv_gcc_atomic_builtins=yes],
-+       [mysql_cv_gcc_atomic_builtins=no],
-+       [mysql_cv_gcc_atomic_builtins=no])])
-+
-+  if test "x$mysql_cv_gcc_atomic_builtins" = xyes; then
-+    AC_DEFINE(HAVE_IB_GCC_ATOMIC_BUILTINS, 1,
-+              [Define to 1 if compiler provides atomic builtins.])
-+  fi
- 
--  AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins)
--  # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
--  AC_TRY_RUN(
--    [
-+
-+  AC_CACHE_CHECK([whether pthread_t can be used by GCC atomic builtins],
-+		 [mysql_cv_gcc_atomic_builtins_pthread_t], [AC_TRY_RUN([
-       #include <pthread.h>
-       #include <string.h>
- 
-@@ -127,16 +122,14 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin,  [
- 
-         return(0);
-       }
--    ],
--    [
--      AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1],
--                [pthread_t can be used by GCC atomic builtins])
--      AC_MSG_RESULT(yes)
--    ],
--    [
--      AC_MSG_RESULT(no)
--    ]
--  )
-+    ], [mysql_cv_gcc_atomic_builtins_pthread_t=yes],
-+       [mysql_cv_gcc_atomic_builtins_pthread_t=no],
-+       [mysql_cv_gcc_atomic_builtins_pthread_t=no])])
-+
-+  if test "x$mysql_cv_gcc_atomic_builtins_pthread_t" = xyes; then
-+    AC_DEFINE(HAVE_IB_ATOMIC_PTHREAD_T_GCC, 1,
-+              [Define to 1 if pthread_t can be used by GCC atomic builtins])
-+  fi
- 
-   AC_MSG_CHECKING(whether Solaris libc atomic functions are available)
-   # Define HAVE_IB_SOLARIS_ATOMICS if _all_ of the following
-@@ -156,7 +149,6 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin,  [
-     AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1],
-       [Define to 1 if Solaris libc atomic functions are available]
-     )
--  fi
- 
-   AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions)
-   # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
-@@ -230,6 +222,8 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin,  [
-       AC_MSG_RESULT(no)
-     ]
-   )
-+  fi
-+
-   ])
- 
- # vim: set ft=config:
---- a/sql/gen_lex_hash.cc
-+++ b/sql/gen_lex_hash.cc
-@@ -344,55 +344,6 @@ void print_find_structs()
- }
- 
- 
--static void usage(int version)
--{
--  printf("%s  Ver 3.6 Distrib %s, for %s (%s)\n",
--	 my_progname, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
--  if (version)
--    return;
--  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
--  puts("This program generates a perfect hashing function for the sql_lex.cc");
--  printf("Usage: %s [OPTIONS]\n\n", my_progname);
--  my_print_help(my_long_options);
--}
--
--
--extern "C" my_bool
--get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
--	       char *argument __attribute__((unused)))
--{
--  switch(optid) {
--  case 'V':
--    usage(1);
--    exit(0);
--  case 'I':
--  case '?':
--    usage(0);
--    exit(0);
--  case '#':
--    DBUG_PUSH(argument ? argument : default_dbug_option);
--    break;
--  }
--  return 0;
--}
--
--
--static int get_options(int argc, char **argv)
--{
--  int ho_error;
--
--  if ((ho_error= handle_options(&argc, &argv, my_long_options, get_one_option)))
--    exit(ho_error);
--
--  if (argc >= 1)
--  {
--    usage(0);
--     exit(1);
--  }
--  return(0);
--}
--
--
- int check_dup_symbols(SYMBOL *s1, SYMBOL *s2)
- {
-   if (s1->length!=s2->length || strncmp(s1->name,s2->name,s1->length))
-@@ -443,12 +394,6 @@ int check_duplicates()
- 
- int main(int argc,char **argv)
- {
--  MY_INIT(argv[0]);
--  DBUG_PROCESS(argv[0]);
--
--  if (get_options(argc,(char **) argv))
--    exit(1);
--
-   /* Broken up to indicate that it's not advice to you, gentle reader. */
-   printf("/*\n\n  Do " "not " "edit " "this " "file " "directly!\n\n*/\n");
- 
-@@ -549,7 +494,6 @@ static SYMBOL *get_hash_symbol(const cha
-   }\n\
- }\n"
- );
--  my_end(0);
-   exit(0);
- }
- 
---- a/sql/Makefile.am
-+++ b/sql/Makefile.am
-@@ -26,7 +26,6 @@ INCLUDES =		@ZLIB_INCLUDES@ \
- WRAPLIBS=		@WRAPLIBS@
- SUBDIRS =		share
- libexec_PROGRAMS =	mysqld
--EXTRA_PROGRAMS =	gen_lex_hash
- bin_PROGRAMS =		mysql_tzinfo_to_sql
- 
- noinst_LTLIBRARIES=	libndb.la \
 

--- 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/multimedia/gst-plugins-bad/Makefile
+++ /dev/null
@@ -1,246 +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:=gst-plugins-bad
-PKG_VERSION:=0.10.23
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-bad/
-PKG_MD5SUM:=e4822fa2cc933768e2998311a1565979
-
-PKG_BUILD_DEPENDS:= gstreamer gst-plugins-base liboil
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/gstreamer/Default
-  CATEGORY:=Multimedia
-  SECTION:=multimedia
-  TITLE:=GStreamer
-  URL:=http://gstreamer.freedesktop.org/
-endef
-
-define Package/gstreamer/description/Default
- GStreamer open source multimedia framework
-endef
-
-
-define Package/gst-plugins-bad
-$(call Package/gstreamer/Default)
-  TITLE+= plugins collection (bad)
-  DEPENDS+= $(GST_DEPENDS)
-endef
-
-define Package/gts-plugins-bad/description
-$(call Package/gstreamer/description/Default)
- .
- This meta package contains only dependencies to the other plugins from
- the bad plugins collection.
-endef
-
-
-GST_VERSION:=0.10
-
-CONFIGURE_ARGS += \
-	--disable-examples \
-	--disable-nls	\
-	\
-	--disable-directsound \
-	--disable-directdraw \
-	--disable-osx_video \
-	--disable-quicktime \
-	--disable-vcd \
-	--disable-alsa \
-	--disable-assrender \
-	--disable-amrwb \
-	--disable-apexsink \
-	--disable-bz2 \
-	--disable-cdaudio \
-	--disable-celt \
-	--disable-cog \
-	--disable-dc1394 \
-	--disable-directfb \
-	--disable-dirac \
-	--disable-dts \
-	--disable-divx \
-	--disable-resindvd \
-	--disable-metadata \
-	--disable-faac \
-	--disable-fbdev \
-	--disable-flite \
-	--disable-gsm \
-	--disable-jack \
-	--disable-jp2k \
-	--disable-kate \
-	--disable-ladspa \
-	--disable-lv2 \
-	--disable-modplug \
-	--disable-mimic \
-	--disable-mpeg2enc \
-	--disable-mplex \
-	--disable-musepack \
-	--disable-musicbrainz \
-	--disable-mythtv \
-	--disable-nas \
-	--disable-neon \
-	--disable-ofa \
-	--disable-rsvg \
-	--disable-timidity \
-	--disable-wildmidi \
-	--disable-sdl \
-	--disable-sdltest \
-	--disable-sndfile \
-	--disable-soundtouch \
-	--disable-spc \
-	--disable-gme \
-	--disable-swfdec \
-	--disable-theoradec \
-	--disable-xvid \
-	--disable-dvb \
-	--disable-wininet \
-	--disable-acm \
-	--disable-vdpau \
-	--disable-schro \
-	--disable-zbar \
-	--disable-vp8 \
-	--disable-librfb \
-	\
-	--without-libiconv-prefix \
-	--without-libintl-prefix \
-	--without-x \
-
-EXTRA_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-
-
-define Package/gst-plugins-ugly/install
-	/bin/true
-endef
-
-# 1: short name
-# 2: description
-# 3: dependencies on other gstreamer libraries (short name)
-# 4: dependencies on other packages
-define GstBuildLibrary
-
-  GST_DEPENDS += +libgst$(1)
-
-  define Package/libgst$(1)
-    $(call Package/gstreamer/Default)
-    TITLE+= $(2) library (base)
-    DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $(4)
-  endef
-
-  define Package/libgst$(1)/description
-   $(call Package/gstreamer/description/Default)
-   .
-   This package contains the GStreamer $(2) library.
-  endef
-
-  define Package/libgst$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/libgst$(1)-$(GST_VERSION).so.* \
-		$$(1)/usr/lib/ \
-	)
-  endef
-
-  $$(eval $$(call BuildPackage,libgst$(1)))
-endef
-$(eval $(call GstBuildLibrary,photography,photography,,))
-
-
-# 1: short name
-# 2: description
-# 3: dependencies on other gstreamer libraries (short name)
-# 4: dependencies on other gstreamer plugins (short name)
-# 5: dependencies on other packages
-define GstBuildPlugin
-
-  GST_DEPENDS += +gst-mod-$(1)
-
-  define Package/gst-mod-$(1)
-    $(call Package/gstreamer/Default)
-    TITLE+= $(2) plugin (bad)
-    DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $$(foreach p,$(4),+gst-mod-$$(p)) $(5)
-  endef
-
-  define Package/gst-mod-$(1)/description
-   $(call Package/gstreamer/description/Default)
-   .
-   This package contains the GStreamer $(2) plugin.
-  endef
-
-  define Package/gst-mod-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/gstreamer-$(GST_VERSION)
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/gstreamer-$(GST_VERSION)/libgst$(1).so* \
-		$$(1)/usr/lib/gstreamer-$(GST_VERSION)/ \
-	)
-  endef
-
-  $$(eval $$(call BuildPackage,gst-mod-$(1)))
-endef
-
-$(eval $(call GstBuildPlugin,adpcmdec,adpcm decoding support,,,))
-$(eval $(call GstBuildPlugin,adpcmenc,adpcm encoding support,,,))
-$(eval $(call GstBuildPlugin,aiff,aiff support,tag,,))
-$(eval $(call GstBuildPlugin,asfmux,asf muxing support,rtp,,))
-$(eval $(call GstBuildPlugin,autoconvert,autoconvert support,,,))
-$(eval $(call GstBuildPlugin,camerabin,camerabin support,interfaces photography tag,,))
-$(eval $(call GstBuildPlugin,legacyresample,legacyresample support,,,+liboil +librt))
-$(eval $(call GstBuildPlugin,bayer,bayer support,video,,))
-$(eval $(call GstBuildPlugin,cdxaparse,cdxaparse support,riff,,))
-$(eval $(call GstBuildPlugin,dataurisrc,dataurisrc support,,,))
-$(eval $(call GstBuildPlugin,dccp,dccp support,,,))
-$(eval $(call GstBuildPlugin,debugutilsbad,debugutils support,interfaces video,,))
-$(eval $(call GstBuildPlugin,dtmf,dtmf support,rtp,,))
-$(eval $(call GstBuildPlugin,dvdspu,dvdspu support,video,,))
-$(eval $(call GstBuildPlugin,faad,faad support,audio,,+libfaad2))
-$(eval $(call GstBuildPlugin,festival,festival support,audio,,))
-$(eval $(call GstBuildPlugin,freeze,freeze support,,,))
-$(eval $(call GstBuildPlugin,frei0r,frei0r support,controller video,,))
-$(eval $(call GstBuildPlugin,h264parse,h264parse support,,,))
-$(eval $(call GstBuildPlugin,hdvparse,hdvparse support,,,))
-$(eval $(call GstBuildPlugin,id3tag,id3tag support,tag,,))
-$(eval $(call GstBuildPlugin,jpegformat,jpegformat support,tag interfaces,,))
-$(eval $(call GstBuildPlugin,liveadder,liveadder support,audio,,))
-$(eval $(call GstBuildPlugin,mpegdemux,mpegdemux support,tag,,+liboil +librt))
-$(eval $(call GstBuildPlugin,mpegtsmux,mpegtsmux support,video,,))
-$(eval $(call GstBuildPlugin,mpegpsmux,mpegpsmux support,,,))
-$(eval $(call GstBuildPlugin,mpegvideoparse,mpegvideoparse support,,,))
-$(eval $(call GstBuildPlugin,mve,mve support,,,))
-$(eval $(call GstBuildPlugin,mxf,mxf support,video,,))
-$(eval $(call GstBuildPlugin,nsf,nsf support,,,))
-$(eval $(call GstBuildPlugin,nuvdemux,nuvdemux support,,,))
-$(eval $(call GstBuildPlugin,pcapparse,pcapparse support,,,))
-$(eval $(call GstBuildPlugin,pnm,pnm support,video,,))
-$(eval $(call GstBuildPlugin,rawparse,rawparse support,video audio,,))
-$(eval $(call GstBuildPlugin,rtpmux,rtpmux support,rtp,,))
-#$(eval $(call GstBuildPlugin,rfbsrc,rfb support,,,))
-$(eval $(call GstBuildPlugin,scaletempoplugin,scaletempo support,,,))
-$(eval $(call GstBuildPlugin,sdpelem,sdp support,interfaces rtp sdp,,))
-$(eval $(call GstBuildPlugin,segmentclip,segmentclip support,audio,,))
-$(eval $(call GstBuildPlugin,siren,siren support,rtp,,))
-#$(eval $(call GstBuildPlugin,soundtouch,soundtouch support,,,))
-$(eval $(call GstBuildPlugin,speed,speed support,,,))
-$(eval $(call GstBuildPlugin,subenc,subenc support,controller,,))
-$(eval $(call GstBuildPlugin,stereo,stereo support,audio controller,,))
-$(eval $(call GstBuildPlugin,tta,tta support,,,))
-$(eval $(call GstBuildPlugin,videomeasure,videomeasure support,video,,))
-$(eval $(call GstBuildPlugin,videosignal,videosignal support,video,,))
-$(eval $(call GstBuildPlugin,vmnc,vmnc support,,,))
-$(eval $(call GstBuildPlugin,mms,mms support,,,+libmms))
-
-$(eval $(call BuildPackage,gst-plugins-bad))
-

--- a/multimedia/gst-plugins-bad/patches/000-gettext.patch
+++ /dev/null
@@ -1,24 +1,1 @@
-diff -ur gst-plugins-bad-0.10.19.orig/configure.ac gst-plugins-bad-0.10.19/configure.ac
---- gst-plugins-bad-0.10.19.orig/configure.ac	2011-01-07 01:44:21.000000000 +0100
-+++ gst-plugins-bad-0.10.19/configure.ac	2011-01-07 01:45:31.000000000 +0100
-@@ -1772,7 +1772,6 @@
- ext/vp8/Makefile
- ext/xvid/Makefile
- ext/zbar/Makefile
--po/Makefile.in
- docs/Makefile
- docs/plugins/Makefile
- docs/version.entities
-diff -ur gst-plugins-bad-0.10.19.orig/Makefile.am gst-plugins-bad-0.10.19/Makefile.am
---- gst-plugins-bad-0.10.19.orig/Makefile.am	2011-01-07 01:44:21.000000000 +0100
-+++ gst-plugins-bad-0.10.19/Makefile.am	2011-01-07 01:46:17.000000000 +0100
-@@ -2,7 +2,7 @@
- 
- SUBDIRS = \
- 	gst-libs gst sys ext pkgconfig \
--	m4 common docs tests po tools
-+	m4 common docs tests tools
- 
- DIST_SUBDIRS = \
- 	gst gst-libs sys ext pkgconfig \
 

--- a/multimedia/gst-plugins-base/Makefile
+++ /dev/null
@@ -1,242 +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:=gst-plugins-base
-PKG_VERSION:=0.10.36
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-base/
-PKG_MD5SUM:=776c73883e567f67b9c4a2847d8d041a
-
-PKG_BUILD_DEPENDS:= gstreamer liboil
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_PACKAGE_gst-mod-alsa \
-	CONFIG_PACKAGE_gst-mod-app \
-	CONFIG_PACKAGE_gst-mod-audioconvert \
-	CONFIG_PACKAGE_gst-mod-audiorate \
-	CONFIG_PACKAGE_gst-mod-audioresample \
-	CONFIG_PACKAGE_gst-mod-audiotestsrc \
-	CONFIG_PACKAGE_gst-mod-gio \
-	CONFIG_PACKAGE_gst-mod-ogg \
-	CONFIG_PACKAGE_gst-mod-tcp \
-	CONFIG_PACKAGE_gst-mod-theora \
-	CONFIG_PACKAGE_gst-mod-videotestsrc \
-	CONFIG_PACKAGE_gst-mod-volume \
-	CONFIG_PACKAGE_gst-mod-vorbis \
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-# -liconv crept in from pkg-config, to be revisited later
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/gstreamer/Default
-  CATEGORY:=Multimedia
-  SECTION:=multimedia
-  TITLE:=GStreamer
-  URL:=http://gstreamer.freedesktop.org/
-endef
-
-define Package/gstreamer/description/Default
- GStreamer open source multimedia framework
-endef
-
-
-define Package/gst-plugins-base
-$(call Package/gstreamer/Default)
-  TITLE+= plugins collection (base)
-  DEPENDS+= $(GST_DEPENDS)
-endef
-
-define Package/gts-plugins-base/description
-$(call Package/gstreamer/description/Default)
- .
- This meta package contains only dependencies to the other libraries and
- plugins from the base plugins collection.
-endef
-
-
-GST_COND_SELECT = $(patsubst %,$(if $(CONFIG_PACKAGE_gst-mod-$(1)),--enable,--disable)-%,$(1))
-
-GST_VERSION:=0.10
-
-CONFIGURE_ARGS += \
-	--disable-examples \
-	\
-	$(call GST_COND_SELECT,alsa) \
-	--disable-alsa-test \
-	$(call GST_COND_SELECT,app) \
-	$(call GST_COND_SELECT,audioconvert) \
-	$(call GST_COND_SELECT,audiorate) \
-	$(call GST_COND_SELECT,audioresample) \
-	$(call GST_COND_SELECT,audiotestsrc) \
-	--disable-cdparanoia \
-	--disable-ffmpegcolorspace \
-	--disable-freetypetest \
-	$(call GST_COND_SELECT,gio) \
-	--disable-gnome_vfs \
-	--disable-gst_v4l \
-	--disable-libvisual \
-	$(call GST_COND_SELECT,ogg) \
-	--disable-oggtest \
-	--disable-pango \
-	--disable-subparse \
-	$(call GST_COND_SELECT,tcp) \
-	$(call GST_COND_SELECT,theora) \
-	--disable-videorate \
-	--disable-videoscale \
-	$(call GST_COND_SELECT,videotestsrc) \
-	$(call GST_COND_SELECT,volume) \
-	$(call GST_COND_SELECT,vorbis) \
-	--disable-vorbistest \
-	--disable-x \
-	--disable-xshm \
-	--disable-xvideo \
-	\
-	--without-libiconv-prefix \
-	--without-libintl-prefix \
-	--without-x \
-	\
-	--with-audioresample-format=int \
-
-EXTRA_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/gstreamer-$(GST_VERSION)
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/include/gstreamer-$(GST_VERSION)/* \
-		$(1)/usr/include/gstreamer-$(GST_VERSION)/ \
-	)
-	$(INSTALL_DIR) $(1)/usr/lib
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/libgst*-$(GST_VERSION).{a,la,so*} \
-		$(1)/usr/lib/ \
-	)
-	$(INSTALL_DIR) $(1)/usr/lib/gstreamer-$(GST_VERSION)
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/gstreamer-$(GST_VERSION)/libgst*.{la,so} \
-		$(1)/usr/lib/gstreamer-$(GST_VERSION)/ \
-	)
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/pkgconfig/gstreamer*-$(GST_VERSION).pc \
-		$(1)/usr/lib/pkgconfig/ \
-	)
-endef
-
-
-define Package/gst-plugins-base/install
-	/bin/true
-endef
-
-
-# 1: short name
-# 2: description
-# 3: dependencies on other gstreamer libraries (short name)
-# 4: dependencies on other packages
-define GstBuildLibrary
-
-  GST_DEPENDS += +libgst$(1)
-
-  define Package/libgst$(1)
-    $(call Package/gstreamer/Default)
-    TITLE+= $(2) library (base)
-    DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $(4)
-  endef
-
-  define Package/libgst$(1)/description
-   $(call Package/gstreamer/description/Default)
-   .
-   This package contains the GStreamer $(2) library.
-  endef
-
-  define Package/libgst$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/libgst$(1)-$(GST_VERSION).so.* \
-		$$(1)/usr/lib/ \
-	)
-  endef
-
-  $$(eval $$(call BuildPackage,libgst$(1)))
-endef
-
-$(eval $(call GstBuildLibrary,app,app,,))
-$(eval $(call GstBuildLibrary,audio,audio,interfaces pbutils,))
-$(eval $(call GstBuildLibrary,cdda,CDDA,tag,))
-$(eval $(call GstBuildLibrary,fft,FFT,,))
-$(eval $(call GstBuildLibrary,interfaces,interfaces,))
-$(eval $(call GstBuildLibrary,netbuffer,network buffer,,))
-$(eval $(call GstBuildLibrary,pbutils,utils,,))
-$(eval $(call GstBuildLibrary,riff,RIFF media,audio tag,,))
-$(eval $(call GstBuildLibrary,rtp,RTP,,))
-$(eval $(call GstBuildLibrary,rtsp,RTSP,,))
-$(eval $(call GstBuildLibrary,sdp,SDP,,))
-$(eval $(call GstBuildLibrary,tag,tag support,,))
-$(eval $(call GstBuildLibrary,video,video,,))
-
-
-# 1: short name
-# 2: description
-# 3: dependencies on other gstreamer libraries (short name)
-# 4: dependencies on other gstreamer plugins (short name)
-# 5: dependencies on other packages
-define GstBuildPlugin
-
-  GST_DEPENDS += +gst-mod-$(1)
-
-  define Package/gst-mod-$(1)
-    $(call Package/gstreamer/Default)
-    TITLE+= $(2) plugin (base)
-    DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $$(foreach p,$(4),+gst-mod-$$(p)) $(5)
-  endef
-
-  define Package/gst-mod-$(1)/description
-   $(call Package/gstreamer/description/Default)
-   .
-   This package contains the GStreamer $(2) plugin.
-  endef
-
-  define Package/gst-mod-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/gstreamer-$(GST_VERSION)
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/gstreamer-$(GST_VERSION)/libgst$(1).so* \
-		$$(1)/usr/lib/gstreamer-$(GST_VERSION)/ \
-	)
-  endef
-
-  $$(eval $$(call BuildPackage,gst-mod-$(1)))
-endef
-
-$(eval $(call GstBuildPlugin,alsa,ALSA,audio,,+alsa-lib))
-$(eval $(call GstBuildPlugin,app,app,app,,))
-$(eval $(call GstBuildPlugin,audioconvert,audio format conversion,audio,,))
-$(eval $(call GstBuildPlugin,audiorate,audio rate adjusting,,,))
-$(eval $(call GstBuildPlugin,audioresample,audio resampling,,,))
-$(eval $(call GstBuildPlugin,audiotestsrc,audio test,controller,,))
-$(eval $(call GstBuildPlugin,decodebin,media decoder,pbutils,,))
-$(eval $(call GstBuildPlugin,decodebin2,media decoder (v2),pbutils,,))
-$(eval $(call GstBuildPlugin,gio,GIO,,,))
-$(eval $(call GstBuildPlugin,ogg,Ogg,riff tag,,+libogg))
-$(eval $(call GstBuildPlugin,playbin,playback,video interfaces pbutils,,))
-$(eval $(call GstBuildPlugin,tcp,TCP,dataprotocol,,))
-$(eval $(call GstBuildPlugin,theora,Theora,video tag,ogg,+libtheora))
-$(eval $(call GstBuildPlugin,typefindfunctions,'typefind' functions,pbutils,,))
-$(eval $(call GstBuildPlugin,videotestsrc,video test,,,+liboil))
-$(eval $(call GstBuildPlugin,volume,volume,audio controller,,+liboil))
-$(eval $(call GstBuildPlugin,vorbis,Vorbis,audio tag,ogg,+libvorbis))
-
-$(eval $(call BuildPackage,gst-plugins-base))
-

--- a/multimedia/gst-plugins-base/patches/001-no_docs.patch
+++ /dev/null
@@ -1,35 +1,1 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -12,14 +12,12 @@ SUBDIRS = 			\
- 	gst sys $(SUBDIRS_EXT) 	\
- 	tools 			\
- 	tests 			\
--	docs			\
- 	po 			\
- 	common 			\
- 	m4
- 
- DIST_SUBDIRS = 			\
- 	pkgconfig		\
--	docs			\
- 	gst-libs		\
- 	gst sys ext		\
- 	tools 			\
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -464,14 +464,12 @@ SUBDIRS = \
- 	gst sys $(SUBDIRS_EXT) 	\
- 	tools 			\
- 	tests 			\
--	docs			\
- 	po 			\
- 	common 			\
- 	m4
- 
- DIST_SUBDIRS = \
- 	pkgconfig		\
--	docs			\
- 	gst-libs		\
- 	gst sys ext		\
- 	tools 			\
 

--- a/multimedia/gst-plugins-base/patches/002-no_tests.patch
+++ /dev/null
@@ -1,37 +1,1 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -11,7 +11,6 @@ SUBDIRS = 			\
- 	gst-libs 		\
- 	gst sys $(SUBDIRS_EXT) 	\
- 	tools 			\
--	tests 			\
- 	po 			\
- 	common 			\
- 	m4
-@@ -21,7 +20,6 @@ DIST_SUBDIRS = 			\
- 	gst-libs		\
- 	gst sys ext		\
- 	tools 			\
--	tests 			\
- 	po 			\
- 	common 			\
- 	m4
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -463,7 +463,6 @@ SUBDIRS = \
- 	gst-libs 		\
- 	gst sys $(SUBDIRS_EXT) 	\
- 	tools 			\
--	tests 			\
- 	po 			\
- 	common 			\
- 	m4
-@@ -473,7 +472,6 @@ DIST_SUBDIRS = \
- 	gst-libs		\
- 	gst sys ext		\
- 	tools 			\
--	tests 			\
- 	po 			\
- 	common 			\
- 	m4
 

--- a/multimedia/gst-plugins-base/patches/003-no_translations.patch
+++ /dev/null
@@ -1,47 +1,1 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1031,7 +1031,6 @@ docs/design/Makefile
- docs/libs/Makefile
- docs/plugins/Makefile
- docs/version.entities
--po/Makefile.in
- common/Makefile
- common/m4/Makefile
- m4/Makefile
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -11,7 +11,6 @@ SUBDIRS = 			\
- 	gst-libs 		\
- 	gst sys $(SUBDIRS_EXT) 	\
- 	tools 			\
--	po 			\
- 	common 			\
- 	m4
- 
-@@ -20,7 +19,6 @@ DIST_SUBDIRS = 			\
- 	gst-libs		\
- 	gst sys ext		\
- 	tools 			\
--	po 			\
- 	common 			\
- 	m4
- 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -463,7 +463,6 @@ SUBDIRS = \
- 	gst-libs 		\
- 	gst sys $(SUBDIRS_EXT) 	\
- 	tools 			\
--	po 			\
- 	common 			\
- 	m4
- 
-@@ -472,7 +471,6 @@ DIST_SUBDIRS = \
- 	gst-libs		\
- 	gst sys ext		\
- 	tools 			\
--	po 			\
- 	common 			\
- 	m4
- 
 

--- a/multimedia/gst-plugins-base/patches/004-vorbisdec-support_modern_Tremor_versions.patch
+++ /dev/null
@@ -1,132 +1,1 @@
-From 787e896bdeb6c67d13a918ec55d3826fa010fb90 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Wed, 25 Jan 2012 22:53:04 +0000
-Subject: vorbisdec: support modern Tremor versions
 
-Tremor changed to use standard libogg rather than its own incompatible
-copy back in Aug 2010 (r17375), causing gst-plugin-base build to fail.
-
-Tremolo so far unfortunately hasn't been updated. Restructure
-vorbisdeclib.h so the int/float logic is seperate from the ogg handling,
-and only use the legacy _ogg_packet_wrapper code for Tremolo.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=668726
----
-(limited to 'ext/vorbis/gstvorbisdeclib.h')
-
---- a/ext/vorbis/gstvorbisdeclib.h
-+++ b/ext/vorbis/gstvorbisdeclib.h
-@@ -29,11 +29,6 @@
- 
- #ifndef TREMOR
- 
--#include <vorbis/codec.h>
--
--typedef float                          vorbis_sample_t;
--typedef ogg_packet                     ogg_packet_wrapper;
--
- #define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to float audio"
- 
- #define GST_VORBIS_DEC_SRC_CAPS \
-@@ -47,6 +42,42 @@ typedef ogg_packet                     o
- 
- #define GST_VORBIS_DEC_GLIB_TYPE_NAME      GstVorbisDec
- 
-+#else /* TREMOR */
-+
-+#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer audio"
-+
-+#define GST_VORBIS_DEC_SRC_CAPS \
-+    GST_STATIC_CAPS ("audio/x-raw-int, "   \
-+        "rate = (int) [ 1, MAX ], "        \
-+        "channels = (int) [ 1, 6 ], "      \
-+        "endianness = (int) BYTE_ORDER, "  \
-+        "width = (int) { 16, 32 }, "       \
-+        "depth = (int) 16, "               \
-+        "signed = (boolean) true")
-+
-+#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH           (16)
-+
-+/* we need a different type name here */
-+#define GST_VORBIS_DEC_GLIB_TYPE_NAME      GstIVorbisDec
-+
-+/* and still have it compile */
-+typedef struct _GstVorbisDec               GstIVorbisDec;
-+typedef struct _GstVorbisDecClass          GstIVorbisDecClass;
-+
-+#endif /* TREMOR */
-+
-+#ifndef USE_TREMOLO
-+
-+#ifdef TREMOR
-+ #include <tremor/ivorbiscodec.h>
-+ typedef ogg_int32_t                    vorbis_sample_t;
-+#else
-+ #include <vorbis/codec.h>
-+ typedef float                          vorbis_sample_t;
-+#endif
-+
-+typedef ogg_packet                     ogg_packet_wrapper;
-+
- static inline guint8 *
- gst_ogg_packet_data (ogg_packet * p)
- {
-@@ -72,17 +103,11 @@ gst_ogg_packet_from_wrapper (ogg_packet_
-   return packet;
- }
- 
--#else
--
--#ifdef USE_TREMOLO
--  #include <Tremolo/ivorbiscodec.h>
--  #include <Tremolo/codec_internal.h>
--  typedef ogg_int16_t                    vorbis_sample_t;
--#else
--  #include <tremor/ivorbiscodec.h>
--  typedef ogg_int32_t                    vorbis_sample_t;
--#endif
-+#else /* USE_TREMOLO */
- 
-+#include <Tremolo/ivorbiscodec.h>
-+#include <Tremolo/codec_internal.h>
-+typedef ogg_int16_t                    vorbis_sample_t;
- typedef struct _ogg_packet_wrapper     ogg_packet_wrapper;
- 
- struct _ogg_packet_wrapper {
-@@ -91,26 +116,6 @@ struct _ogg_packet_wrapper {
-   ogg_buffer          buf;
- };
- 
--#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer audio"
--
--#define GST_VORBIS_DEC_SRC_CAPS \
--    GST_STATIC_CAPS ("audio/x-raw-int, "   \
--        "rate = (int) [ 1, MAX ], "        \
--        "channels = (int) [ 1, 6 ], "      \
--        "endianness = (int) BYTE_ORDER, "  \
--        "width = (int) { 16, 32 }, "       \
--        "depth = (int) 16, "               \
--        "signed = (boolean) true")
--
--#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH           (16)
--
--/* we need a different type name here */
--#define GST_VORBIS_DEC_GLIB_TYPE_NAME      GstIVorbisDec
--
--/* and still have it compile */
--typedef struct _GstVorbisDec               GstIVorbisDec;
--typedef struct _GstVorbisDecClass          GstIVorbisDecClass;
--
- /* compensate minor variation */
- #define vorbis_synthesis(a, b)             vorbis_synthesis (a, b, 1)
- 
-@@ -154,7 +159,7 @@ gst_ogg_packet_from_wrapper (ogg_packet_
-   return &(packet->packet);
- }
- 
--#endif
-+#endif /* USE_TREMOLO */
- 
- typedef void (*CopySampleFunc)(vorbis_sample_t *out, vorbis_sample_t **in,
-                            guint samples, gint channels, gint width);
-

--- a/multimedia/gst-plugins-good/Makefile
+++ /dev/null
@@ -1,176 +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:=gst-plugins-good
-PKG_VERSION:=0.10.31
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-good/
-PKG_MD5SUM:=
-
-PKG_BUILD_DEPENDS:= gstreamer gst-plugins-base liboil
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/gstreamer/Default
-  CATEGORY:=Multimedia
-  SECTION:=multimedia
-  TITLE:=GStreamer
-  URL:=http://gstreamer.freedesktop.org/
-endef
-
-define Package/gstreamer/description/Default
- GStreamer open source multimedia framework
-endef
-
-
-define Package/gst-plugins-good
-$(call Package/gstreamer/Default)
-  TITLE+= plugins collection (good)
-  DEPENDS+= $(GST_DEPENDS)
-endef
-
-define Package/gts-plugins-good/description
-$(call Package/gstreamer/description/Default)
- .
- This meta package contains only dependencies to the other plugins from
- the good plugins collection.
-endef
-
-
-GST_VERSION:=0.10
-
-CONFIGURE_ARGS += \
-	--disable-examples \
-	\
-	--disable-aalib \
-	--disable-alpha \
-	--disable-annodex \
-	--disable-apetag \
-	--disable-auparse \
-	--disable-avi \
-	--disable-bz2 \
-	--disable-cairo \
-	--disable-directsound \
-	--disable-dv1394 \
-	--disable-effectv \
-	--disable-esd \
-	--disable-flv \
-	--disable-flx \
-	--disable-gconf \
-	--disable-gconftool \
-	--disable-gdk_pixbuf \
-	--disable-goom \
-	--disable-goom2k1 \
-	--disable-gst_v4l2 \
-	--disable-hal \
-	--disable-jpeg \
-	--disable-law \
-	--disable-libcaca \
-	--disable-libdv \
-	--disable-libpng \
-	--disable-matroska \
-	--disable-monoscope \
-	--disable-osx_audio \
-	--disable-osx_video \
-	--disable-pulse \
-	--disable-qtdemux \
-	--disable-rtspmanager \
-	--disable-smpte \
-	--disable-shout2 \
-	--disable-speex \
-	--disable-sunaudio \
-	--disable-taglib \
-	--disable-videobox \
-	--disable-videocrop \
-	--disable-videofilter \
-	--disable-videomixer \
-	--disable-wavpack \
-	--disable-x \
-	--disable-xshm \
-	--disable-xvideo \
-	--disable-y4m \
-	--disable-zlib \
-	\
-	--without-libiconv-prefix \
-	--without-libintl-prefix \
-	--without-x \
-
-EXTRA_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-
-
-define Package/gst-plugins-good/install
-	/bin/true
-endef
-
-
-# 1: short name
-# 2: description
-# 3: dependencies on other gstreamer libraries (short name)
-# 4: dependencies on other gstreamer plugins (short name)
-# 5: dependencies on other packages
-define GstBuildPlugin
-
-  GST_DEPENDS += +gst-mod-$(1)
-
-  define Package/gst-mod-$(1)
-    $(call Package/gstreamer/Default)
-    TITLE+= $(2) plugin (good)
-    DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $$(foreach p,$(4),+gst-mod-$$(p)) $(5)
-  endef
-
-  define Package/gst-mod-$(1)/description
-   $(call Package/gstreamer/description/Default)
-   .
-   This package contains the GStreamer $(2) plugin.
-  endef
-
-  define Package/gst-mod-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/gstreamer-$(GST_VERSION)
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/gstreamer-$(GST_VERSION)/libgst$(1).so* \
-		$$(1)/usr/lib/gstreamer-$(GST_VERSION)/ \
-	)
-  endef
-
-  $$(eval $$(call BuildPackage,gst-mod-$(1)))
-endef
-
-$(eval $(call GstBuildPlugin,audiofx,audio effects,audio fft controller,,))
-$(eval $(call GstBuildPlugin,autodetect,format auto-detection,,,))
-$(eval $(call GstBuildPlugin,audioparsers,audio parsers,audio tag,,))
-$(eval $(call GstBuildPlugin,cutter,audio cutter,audio,,))
-$(eval $(call GstBuildPlugin,debug,debugging,,,))
-$(eval $(call GstBuildPlugin,equalizer,audio equalizer,audio controller,,))
-$(eval $(call GstBuildPlugin,flac,FLAC codec,audio pbutils tag,,+libflac))
-$(eval $(call GstBuildPlugin,id3demux,ID3v1/v2 demuxer,pbutils tag,,))
-$(eval $(call GstBuildPlugin,icydemux,icy demuxer,audio tag,,))
-$(eval $(call GstBuildPlugin,interleave,audio interleave,audio,,))
-$(eval $(call GstBuildPlugin,isomp4,isomp4,riff rtp tag pbutils audio,,))
-$(eval $(call GstBuildPlugin,level,audio level,audio,,))
-$(eval $(call GstBuildPlugin,multifile,multiple files access,video,,))
-$(eval $(call GstBuildPlugin,multipart,multipart stream handling,,,))
-$(eval $(call GstBuildPlugin,ossaudio,OSS audio support,audio interfaces,,))
-$(eval $(call GstBuildPlugin,replaygain,volume normalization,pbutils,,))
-$(eval $(call GstBuildPlugin,rtp,RTP,audio rtp tag pbutils,,))
-$(eval $(call GstBuildPlugin,rtsp,RTSP,interfaces rtp rtsp sdp,,))
-$(eval $(call GstBuildPlugin,souphttpsrc,soup input,tag,,+libsoup))
-$(eval $(call GstBuildPlugin,spectrum,spectrum data output,audio fft,,))
-$(eval $(call GstBuildPlugin,udp,UDP,netbuffer,,))
-$(eval $(call GstBuildPlugin,wavenc,Wav encoder,riff,,))
-$(eval $(call GstBuildPlugin,wavparse,Wav parser,audio riff tag,,))
-
-$(eval $(call BuildPackage,gst-plugins-good))
-

--- a/multimedia/gst-plugins-good/patches/001-no_docs.patch
+++ /dev/null
@@ -1,21 +1,1 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -9,7 +9,6 @@ endif
- ALWAYS_SUBDIRS =		\
- 	gst sys ext 		\
- 	tests			\
--	docs			\
- 	po			\
- 	common			\
- 	m4			\
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -476,7 +476,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk
- ALWAYS_SUBDIRS = \
- 	gst sys ext 		\
- 	tests			\
--	docs			\
- 	po			\
- 	common			\
- 	m4			\
 

--- a/multimedia/gst-plugins-good/patches/002-no_tests.patch
+++ /dev/null
@@ -1,21 +1,1 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,7 +8,6 @@ endif
- 
- ALWAYS_SUBDIRS =		\
- 	gst sys ext 		\
--	tests			\
- 	po			\
- 	common			\
- 	m4			\
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -475,7 +475,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk
- @USE_GCONFTOOL_TRUE@GCONF_DIR = gconf
- ALWAYS_SUBDIRS = \
- 	gst sys ext 		\
--	tests			\
- 	po			\
- 	common			\
- 	m4			\
 

--- a/multimedia/gst-plugins-good/patches/003-no_translations.patch
+++ /dev/null
@@ -1,31 +1,1 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1147,7 +1147,6 @@ sys/sunaudio/Makefile
- sys/v4l2/Makefile
- sys/waveform/Makefile
- sys/ximage/Makefile
--po/Makefile.in
- tests/Makefile
- tests/check/Makefile
- tests/examples/Makefile
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,7 +8,6 @@ endif
- 
- ALWAYS_SUBDIRS =		\
- 	gst sys ext 		\
--	po			\
- 	common			\
- 	m4			\
- 	pkgconfig
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -475,7 +475,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk
- @USE_GCONFTOOL_TRUE@GCONF_DIR = gconf
- ALWAYS_SUBDIRS = \
- 	gst sys ext 		\
--	po			\
- 	common			\
- 	m4			\
- 	pkgconfig
 

--- a/multimedia/gst-plugins-ugly/Makefile
+++ /dev/null
@@ -1,134 +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:=gst-plugins-ugly
-PKG_VERSION:=0.10.19
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/
-PKG_MD5SUM:=ba26045c8c8c91f0d48d327ccf53ac0c
-
-PKG_BUILD_DEPENDS:= gstreamer gst-plugins-base liboil
-PKG_CONFIG_Dba26045c8c8c91f0d48d327ccf53ac0cEPENDS:= \
-	CONFIG_PACKAGE_gst-mod-asf \
-	CONFIG_PACKAGE_gst-mod-lame \
-	CONFIG_PACKAGE_gst-mod-mad \
-	CONFIG_PACKAGE_gst-mod-mpeg2dec \
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/gstreamer/Default
-  CATEGORY:=Multimedia
-  SECTION:=multimedia
-  TITLE:=GStreamer
-  URL:=http://gstreamer.freedesktop.org/
-endef
-
-define Package/gstreamer/description/Default
- GStreamer open source multimedia framework
-endef
-
-
-define Package/gst-plugins-ugly
-$(call Package/gstreamer/Default)
-  TITLE+= plugins collection (ugly)
-  DEPENDS+= $(GST_DEPENDS)
-endef
-
-define Package/gts-plugins-ugly/description
-$(call Package/gstreamer/description/Default)
- .
- This meta package contains only dependencies to the other plugins from
- the ugly plugins collection.
-endef
-
-
-GST_COND_SELECT = $(patsubst %,$(if $(CONFIG_PACKAGE_gst-mod-$(1)),--enable,--disable)-%,$(1))
-
-GST_VERSION:=0.10
-
-CONFIGURE_ARGS += \
-	--disable-examples \
-	\
-	--disable-a52dec \
-	--disable-amrnb \
-	--disable-amrwb \
-	$(call GST_COND_SELECT,asf) \
-	--disable-cdio \
-	--disable-dvdlpcmdec \
-	--disable-dvdread \
-	--disable-dvdsub \
-	--disable-iec958 \
-	$(call GST_COND_SELECT,lame) \
-	$(call GST_COND_SELECT,mad) \
-	$(call GST_COND_SELECT,mpeg2dec) \
-	--disable-mpegaudioparse \
-	--disable-mpegstream \
-	--disable-realmedia \
-	--disable-sidplay \
-	--disable-synaesthesia \
-	--disable-twolame \
-	--disable-x264 \
-	\
-	--without-libiconv-prefix \
-	--without-libintl-prefix \
-
-EXTRA_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-
-
-define Package/gst-plugins-ugly/install
-	/bin/true
-endef
-
-
-# 1: short name
-# 2: description
-# 3: dependencies on other gstreamer libraries (short name)
-# 4: dependencies on other gstreamer plugins (short name)
-# 5: dependencies on other packages
-define GstBuildPlugin
-
-  GST_DEPENDS += +gst-mod-$(1)
-
-  define Package/gst-mod-$(1)
-    $(call Package/gstreamer/Default)
-    TITLE+= $(2) plugin (ugly)
-    DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $$(foreach p,$(4),+gst-mod-$$(p)) $(5)
-  endef
-
-  define Package/gst-mod-$(1)/description
-   $(call Package/gstreamer/description/Default)
-   .
-   This package contains the GStreamer $(2) plugin.
-  endef
-
-  define Package/gst-mod-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/gstreamer-$(GST_VERSION)
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/gstreamer-$(GST_VERSION)/libgst$(1).so* \
-		$$(1)/usr/lib/gstreamer-$(GST_VERSION)/ \
-	)
-  endef
-
-  $$(eval $$(call BuildPackage,gst-mod-$(1)))
-endef
-
-$(eval $(call GstBuildPlugin,asf,ASF demuxer,audio riff rtp rtsp sdp tag,,))
-$(eval $(call GstBuildPlugin,lame,MP3 encoder (using LAME),audio,,+lame-lib))
-$(eval $(call GstBuildPlugin,mad,MP3 decoder (using MAD),audio tag,,+libid3tag +libmad))
-$(eval $(call GstBuildPlugin,mpeg2dec,MPEG decoder,video,,+libmpeg2))
-
-$(eval $(call BuildPackage,gst-plugins-ugly))
-

--- a/multimedia/gst-plugins-ugly/patches/001-no_docs.patch
+++ /dev/null
@@ -1,23 +1,1 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
- 
- SUBDIRS = \
--	gst-libs gst ext docs m4 tests common pkgconfig po
-+	gst-libs gst ext m4 tests common pkgconfig po
- 
- # include before EXTRA_DIST for win32 assignment
- include $(top_srcdir)/common/win32.mak
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -395,7 +395,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
- SUBDIRS = \
--	gst-libs gst ext docs m4 tests common pkgconfig po
-+	gst-libs gst ext m4 tests common pkgconfig po
- 
- 
- # the MANIFEST contains all win32 related files that should be disted
 

--- a/multimedia/gst-plugins-ugly/patches/002-no_tests.patch
+++ /dev/null
@@ -1,23 +1,1 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
- 
- SUBDIRS = \
--	gst-libs gst ext m4 tests common pkgconfig po
-+	gst-libs gst ext m4 common pkgconfig po
- 
- # include before EXTRA_DIST for win32 assignment
- include $(top_srcdir)/common/win32.mak
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -395,7 +395,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
- SUBDIRS = \
--	gst-libs gst ext m4 tests common pkgconfig po
-+	gst-libs gst ext m4 common pkgconfig po
- 
- 
- # the MANIFEST contains all win32 related files that should be disted
 

--- a/multimedia/gst-plugins-ugly/patches/003-no_translations.patch
+++ /dev/null
@@ -1,35 +1,1 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -495,7 +495,6 @@ docs/version.entities
- tests/Makefile
- tests/check/Makefile
- m4/Makefile
--po/Makefile.in
- pkgconfig/Makefile
- pkgconfig/gstreamer-plugins-ugly-uninstalled.pc
- gst-plugins-ugly.spec
- )
- 
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
- 
- SUBDIRS = \
--	gst-libs gst ext m4 common pkgconfig po
-+	gst-libs gst ext m4 common pkgconfig
- 
- # include before EXTRA_DIST for win32 assignment
- include $(top_srcdir)/common/win32.mak
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -395,7 +395,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
- SUBDIRS = \
--	gst-libs gst ext m4 common pkgconfig po
-+	gst-libs gst ext m4 common pkgconfig
- 
- 
- # the MANIFEST contains all win32 related files that should be disted
 

--- a/multimedia/gstreamer/Makefile
+++ /dev/null
@@ -1,193 +1,1 @@
-#
-# Copyright (C) 2008-2013 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:=gstreamer
-PKG_VERSION:=0.10.36
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gstreamer/
-PKG_MD5SUM:=a0cf7d6877f694a1a2ad2b4d1ecb890b
-
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=autogen.sh aclocal.m4
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/gstreamer/Default
-  CATEGORY:=Multimedia
-  SECTION:=multimedia
-  TITLE:=GStreamer
-  URL:=http://gstreamer.freedesktop.org/
-endef
-
-define Package/gstreamer/description/Default
- GStreamer open source multimedia framework
-endef
-
-
-define Package/gstreamer
-$(call Package/gstreamer/Default)
-  TITLE+= framework
-  DEPENDS+= +libgstreamer \
-	+libgstcheck \
-	+libgstcontroller \
-	+libgstdataprotocol \
-	+libgstnet
-endef
-
-define Package/gstreamer/description
-$(call Package/gstreamer/description/Default)
- .
- This meta package contains only dependencies on the other GStreamer
- componenents.
-endef
-
-
-define Package/gstreamer-utils
-$(call Package/gstreamer/Default)
-  TITLE+= utilities
-  DEPENDS+= +libgstreamer
-endef
-
-define Package/gstreamer-utils/description
-$(call Package/gstreamer/description/Default)
- .
- This package contains the GStreamer utilities.
-endef
-
-
-define Package/libgstreamer
-$(call Package/gstreamer/Default)
-  TITLE+= library (core)
-  DEPENDS+= +glib2 +libpthread +libxml2
-endef
-
-define Package/libgstreamer/description
-$(call Package/gstreamer/description/Default)
- .
- This package contains the GStreamer core library.
-endef
-
-
-GST_VERSION:=0.10
-
-CONFIGURE_ARGS += \
-	--disable-examples \
-	--disable-tests \
-	--disable-valgrind \
-	--without-libiconv-prefix \
-	--without-libintl-prefix \
-	--without-x \
-
-EXTRA_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	-L$(ICONV_PREFIX)/lib -L$(INTL_PREFIX)/lib
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/gstreamer-$(GST_VERSION)
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/include/gstreamer-$(GST_VERSION)/* \
-		$(1)/usr/include/gstreamer-$(GST_VERSION)/ \
-	)
-	$(INSTALL_DIR) $(1)/usr/lib
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/libgst*-$(GST_VERSION).{a,la,so*} \
-		$(1)/usr/lib/ \
-	)
-	$(INSTALL_DIR) $(1)/usr/lib/gstreamer-$(GST_VERSION)
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/gstreamer-$(GST_VERSION)/libgst*.{la,so} \
-		$(1)/usr/lib/gstreamer-$(GST_VERSION)/ \
-	)
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/pkgconfig/gstreamer*-$(GST_VERSION).pc \
-		$(1)/usr/lib/pkgconfig/ \
-	)
-	$(INSTALL_DIR) $(2)/share/aclocal
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/share/aclocal/* \
-		$(2)/share/aclocal/ \
-	)
-endef
-
-define Package/gstreamer/install
-	/bin/true
-endef
-
-define Package/gstreamer-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/bin/gst-feedback* \
-		./usr/bin/gst-launch* \
-		./usr/bin/gst-inspect* \
-		./usr/bin/gst-typefind* \
-		./usr/bin/gst-xmlinspect* \
-		./usr/bin/gst-xmllaunch* \
-		$(1)/usr/bin/ \
-	)
-endef
-
-define Package/libgstreamer/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/libgstbase-$(GST_VERSION).so.* \
-		./usr/lib/libgstreamer-$(GST_VERSION).so.* \
-		$(1)/usr/lib/ \
-	)
-	$(INSTALL_DIR) $(1)/usr/lib/gstreamer-$(GST_VERSION)
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/gstreamer-$(GST_VERSION)/libgst*.so \
-		$(1)/usr/lib/gstreamer-$(GST_VERSION)/ \
-	)
-endef
-
-
-# 1: short name
-# 2: description
-# 3: dependencies on other gstreamer libraries (short name)
-# 4: dependencies on other packages
-define GstBuildLibrary
-
-  define Package/libgst$(1)
-    $(call Package/gstreamer/Default)
-    TITLE+= $(2) library (core)
-    DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $(4)
-  endef
-
-  define Package/libgst$(1)/description
-   $(call Package/gstreamer/description/Default)
-   .
-   This package contains the GStreamer $(2) library.
-  endef
-
-  define Package/libgst$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/libgst$(1)-$(GST_VERSION).so.* \
-		$$(1)/usr/lib/ \
-	)
-  endef
-
-  $$(eval $$(call BuildPackage,libgst$(1)))
-endef
-
-$(eval $(call GstBuildLibrary,check,check unit testing))
-$(eval $(call GstBuildLibrary,controller,dynamic parameter control))
-$(eval $(call GstBuildLibrary,dataprotocol,data protocol))
-$(eval $(call GstBuildLibrary,net,network classes))
-
-$(eval $(call BuildPackage,gstreamer))
-$(eval $(call BuildPackage,gstreamer-utils))
-$(eval $(call BuildPackage,libgstreamer))
-

--- a/multimedia/gstreamer/patches/001-no_docs.patch
+++ /dev/null
@@ -1,37 +1,1 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,7 +8,6 @@ aclocal_DATA = gst-element-check-@GST_MA
- 
- SUBDIRS = pkgconfig \
- 	gst libs plugins tools tests \
--	docs \
- 	po \
- 	m4 \
- 	common
-@@ -16,7 +15,6 @@ SUBDIRS = pkgconfig \
- # These are all the possible subdirs
- DIST_SUBDIRS = pkgconfig \
- 	gst libs plugins tools tests \
--	docs \
- 	po \
- 	m4 \
- 	common
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -469,7 +469,6 @@ aclocaldir = $(datadir)/aclocal
- aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
- SUBDIRS = pkgconfig \
- 	gst libs plugins tools tests \
--	docs \
- 	po \
- 	m4 \
- 	common
-@@ -478,7 +477,6 @@ SUBDIRS = pkgconfig \
- # These are all the possible subdirs
- DIST_SUBDIRS = pkgconfig \
- 	gst libs plugins tools tests \
--	docs \
- 	po \
- 	m4 \
- 	common
 

--- a/multimedia/gstreamer/patches/002-no_tests.patch
+++ /dev/null
@@ -1,40 +1,1 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -7,14 +7,14 @@ aclocaldir = $(datadir)/aclocal
- aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
- 
- SUBDIRS = pkgconfig \
--	gst libs plugins tools tests \
-+	gst libs plugins tools \
- 	po \
- 	m4 \
- 	common
- 
- # These are all the possible subdirs
- DIST_SUBDIRS = pkgconfig \
--	gst libs plugins tools tests \
-+	gst libs plugins tools \
- 	po \
- 	m4 \
- 	common
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -468,7 +468,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk
- aclocaldir = $(datadir)/aclocal
- aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
- SUBDIRS = pkgconfig \
--	gst libs plugins tools tests \
-+	gst libs plugins tools \
- 	po \
- 	m4 \
- 	common
-@@ -476,7 +476,7 @@ SUBDIRS = pkgconfig \
- 
- # These are all the possible subdirs
- DIST_SUBDIRS = pkgconfig \
--	gst libs plugins tools tests \
-+	gst libs plugins tools \
- 	po \
- 	m4 \
- 	common
 

--- a/multimedia/gstreamer/patches/003-no_translations.patch
+++ /dev/null
@@ -1,46 +1,1 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -763,7 +763,6 @@ libs/gst/net/Makefile
- plugins/Makefile
- plugins/indexers/Makefile
- plugins/elements/Makefile
--po/Makefile.in
- tests/Makefile
- tests/benchmarks/Makefile
- tests/check/Makefile
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,14 +8,12 @@ aclocal_DATA = gst-element-check-@GST_MA
- 
- SUBDIRS = pkgconfig \
- 	gst libs plugins tools \
--	po \
- 	m4 \
- 	common
- 
- # These are all the possible subdirs
- DIST_SUBDIRS = pkgconfig \
- 	gst libs plugins tools \
--	po \
- 	m4 \
- 	common
- 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -469,7 +469,6 @@ aclocaldir = $(datadir)/aclocal
- aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
- SUBDIRS = pkgconfig \
- 	gst libs plugins tools \
--	po \
- 	m4 \
- 	common
- 
-@@ -477,7 +476,6 @@ SUBDIRS = pkgconfig \
- # These are all the possible subdirs
- DIST_SUBDIRS = pkgconfig \
- 	gst libs plugins tools \
--	po \
- 	m4 \
- 	common
- 
 

--- a/multimedia/gstreamer/patches/004-add_gst_debug_log2_debug_symbol.patch
+++ /dev/null
@@ -1,43 +1,1 @@
---- a/gst/gstinfo.c
-+++ b/gst/gstinfo.c
-@@ -462,6 +462,39 @@ gst_debug_log (GstDebugCategory * catego
-   va_end (var_args);
- }
- 
-+typedef struct {
-+  const gchar *file;
-+  const gchar *function;
-+  const gint   line;
-+} GstDebugTraceLocation;
-+
-+
-+/**
-+ * gst_debug_log2:
-+ *  <at> category: category to log
-+ *  <at> level: level of the message is in
-+ *  <at> location: the file, function name, and line number of the location that
-+ *    emitted the message
-+ *  <at> object: the object this message relates to or NULL if none
-+ *  <at> format: a printf style format string
-+ *  <at> ...: optional arguments for the format
-+ *
-+ * Logs the given message using the currently registered debugging handlers.
-+ */
-+void
-+gst_debug_log2 (GstDebugCategory * category, GstDebugLevel level,
-+    const GstDebugTraceLocation * location,
-+    GObject * object, const gchar * format, ...)
-+{
-+#if 0
-+  va_list var_args;
-+
-+  va_start (var_args, format);
-+  gst_debug_log_valist2 (category, level, location, object, format, var_args);
-+  va_end (var_args);
-+#endif
-+}
-+
- #ifdef _MSC_VER
- /* based on g_basename(), which we can't use because it was deprecated */
- static inline const gchar *
 

--- a/multimedia/gstreamer/patches/005-YYLEX_PARAM_to_lex-param.patch
+++ /dev/null
@@ -1,28 +1,1 @@
-From 60516f4798894f958fc53b470e1283318d0f8706 Mon Sep 17 00:00:00 2001
-From: Kerrick Staley <kerrick@kerrickstaley.com>
-Date: Wed, 21 Aug 2013 06:59:29 +0000
-Subject: parse: make grammar.y work with Bison 3
 
-YYLEX_PARAM is no longer supported in Bison 3.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=706462
----
---- a/gst/parse/grammar.y
-+++ b/gst/parse/grammar.y
-@@ -26,7 +26,6 @@
-  */
- 
- #define YYERROR_VERBOSE 1
--#define YYLEX_PARAM scanner
- 
- #define YYENABLE_NLS 0
- 
-@@ -648,6 +647,7 @@ static int yyerror (void *scanner, graph
- %right '.'
- %left '!' '='
- 
-+%lex-param { void *scanner }
- %parse-param { void *scanner }
- %parse-param { graph_t *graph }
- %pure-parser
-

file:a/net/bind/Makefile (deleted)
--- a/net/bind/Makefile
+++ /dev/null
@@ -1,200 +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:=bind
-PKG_VERSION:=9.9.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:= \
-	ftp://ftp.isc.org/isc/bind9/$(PKG_VERSION) \
-	http://www.mirrorservice.org/sites/ftp.isc.org/isc/bind9/$(PKG_VERSION)
-PKG_MD5SUM:=f69757adc86776daed8e5acb0ee7c0ca
-
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=aclocal.m4 libtool.m4
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bind/Default
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+bind-libs
-  TITLE:=bind
-  URL:=https://www.isc.org/software/bind
-  SUBMENU:=IP Addresses and Names
-endef
-
-define Package/bind-libs
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libopenssl
-  TITLE:=bind shared libraries
-  URL:=https://www.isc.org/software/bind
-endef
-
-define Package/bind-server
-  $(call Package/bind/Default)
-  TITLE+= DNS server
-endef
-
-define Package/bind-client
-  $(call Package/bind/Default)
-  TITLE+= dynamic DNS client
-endef
-
-define Package/bind-tools
-  $(call Package/bind/Default)
-  TITLE+= administration tools (all)
-endef
-
-define Package/bind-rndc
-  $(call Package/bind/Default)
-  TITLE+= administration tools (rndc and rndc-confgen only)
-endef
-
-define Package/bind-check
-  $(call Package/bind/Default)
-  TITLE+= administration tools (named-checkconf and named-checkzone only)
-endef
-
-define Package/bind-dnssec
-  $(call Package/bind/Default)
-  TITLE+= administration tools (dnssec-keygen and dnssec-signzone only)
-endef
-
-define Package/bind-host
-  $(call Package/bind/Default)
-  TITLE+= simple DNS client
-endef
-
-define Package/bind-dig
-  $(call Package/bind/Default)
-  TITLE+= DNS excavation tool
-endef
-
-export BUILD_CC="$(TARGET_CC)"
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--with-randomdev="/dev/urandom" \
-	--disable-threads \
-	--disable-linux-caps \
-	--with-openssl="$(STAGING_DIR)/usr" \
-	--with-libtool \
-	--with-libxml2=no \
-	--enable-epoll=yes \
-	--with-gost=no \
-	--with-gssapi=no \
-	--with-ecdsa=no \
-	--with-readline=no
-
-CONFIGURE_VARS += \
-	BUILD_CC="$(TARGET_CC)" \
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/lib/dns \
-		BUILD_CC="$(HOSTCC)" \
-		CC="$(HOSTCC)" \
-		CFLAGS="-O2" \
-		LIBS="" \
-		gen
-	$(call Build/Compile/Default)
-endef
-
-define Package/bind-libs/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib
-endef
-
-define Package/bind-server/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/named $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/bind
-	$(CP) \
-		./files/bind/db.0 \
-		./files/bind/db.127 \
-		./files/bind/db.255 \
-		./files/bind/db.local \
-		./files/bind/db.root \
-		$(1)/etc/bind/
-	$(CP) ./files/bind/named.conf.example $(1)/etc/bind/named.conf
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/named.init $(1)/etc/init.d/named
-	find $(1)/etc/bind/ -name ".svn" | xargs rm -rf
-endef
-
-define Package/bind-server/conffiles
-/etc/bind/db.0
-/etc/bind/db.127
-/etc/bind/db.255
-/etc/bind/db.local
-/etc/bind/db.root
-/etc/bind/named.conf
-endef
-
-define Package/bind-client/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nsupdate $(1)/usr/bin/
-endef
-
-define Package/bind-tools/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dig $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/host $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-keygen $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-signzone $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/named-checkconf $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/named-checkzone $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rndc $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rndc-confgen $(1)/usr/sbin/
-endef
-
-define Package/bind-rndc/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rndc $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rndc-confgen $(1)/usr/sbin/
-endef
-
-define Package/bind-check/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/named-checkconf $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/named-checkzone $(1)/usr/sbin/
-endef
-
-define Package/bind-dnssec/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-keygen $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-signzone $(1)/usr/sbin/
-endef
-
-define Package/bind-host/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/host $(1)/usr/bin/
-endef
-
-define Package/bind-dig/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dig $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,bind-libs))
-$(eval $(call BuildPackage,bind-server))
-$(eval $(call BuildPackage,bind-client))
-$(eval $(call BuildPackage,bind-tools))
-$(eval $(call BuildPackage,bind-rndc))
-$(eval $(call BuildPackage,bind-check))
-$(eval $(call BuildPackage,bind-dnssec))
-$(eval $(call BuildPackage,bind-host))
-$(eval $(call BuildPackage,bind-dig))
-

--- a/net/bind/files/bind/db.0
+++ /dev/null
@@ -1,13 +1,1 @@
-;
-; BIND reverse data file for broadcast zone
-;
-$TTL	604800
-@	IN	SOA	localhost. root.localhost. (
-			      1		; Serial
-			 604800		; Refresh
-			  86400		; Retry
-			2419200		; Expire
-			 604800 )	; Negative Cache TTL
-;
-@	IN	NS	localhost.
 

--- a/net/bind/files/bind/db.127
+++ /dev/null
@@ -1,14 +1,1 @@
-;
-; BIND reverse data file for local loopback interface
-;
-$TTL	604800
-@	IN	SOA	localhost. root.localhost. (
-			      1		; Serial
-			 604800		; Refresh
-			  86400		; Retry
-			2419200		; Expire
-			 604800 )	; Negative Cache TTL
-;
-@	IN	NS	localhost.
-1.0.0	IN	PTR	localhost.
 

--- a/net/bind/files/bind/db.255
+++ /dev/null
@@ -1,13 +1,1 @@
-;
-; BIND reverse data file for broadcast zone
-;
-$TTL	604800
-@	IN	SOA	localhost. root.localhost. (
-			      1		; Serial
-			 604800		; Refresh
-			  86400		; Retry
-			2419200		; Expire
-			 604800 )	; Negative Cache TTL
-;
-@	IN	NS	localhost.
 

--- a/net/bind/files/bind/db.local
+++ /dev/null
@@ -1,14 +1,1 @@
-;
-; BIND data file for local loopback interface
-;
-$TTL	604800
-@	IN	SOA	localhost. root.localhost. (
-			      1		; Serial
-			 604800		; Refresh
-			  86400		; Retry
-			2419200		; Expire
-			 604800 )	; Negative Cache TTL
-;
-@	IN	NS	localhost.
-@	IN	A	127.0.0.1
 

--- a/net/bind/files/bind/db.root
+++ /dev/null
@@ -1,46 +1,1 @@
 
-; <<>> DiG 9.2.3 <<>> ns . @a.root-servers.net.
-;; global options:  printcmd
-;; Got answer:
-;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 18944
-;; flags: qr aa rd; QUERY: 1, ANSWER: 13, AUTHORITY: 0, ADDITIONAL: 13
-
-;; QUESTION SECTION:
-;.				IN	NS
-
-;; ANSWER SECTION:
-.			518400	IN	NS	A.ROOT-SERVERS.NET.
-.			518400	IN	NS	B.ROOT-SERVERS.NET.
-.			518400	IN	NS	C.ROOT-SERVERS.NET.
-.			518400	IN	NS	D.ROOT-SERVERS.NET.
-.			518400	IN	NS	E.ROOT-SERVERS.NET.
-.			518400	IN	NS	F.ROOT-SERVERS.NET.
-.			518400	IN	NS	G.ROOT-SERVERS.NET.
-.			518400	IN	NS	H.ROOT-SERVERS.NET.
-.			518400	IN	NS	I.ROOT-SERVERS.NET.
-.			518400	IN	NS	J.ROOT-SERVERS.NET.
-.			518400	IN	NS	K.ROOT-SERVERS.NET.
-.			518400	IN	NS	L.ROOT-SERVERS.NET.
-.			518400	IN	NS	M.ROOT-SERVERS.NET.
-
-;; ADDITIONAL SECTION:
-A.ROOT-SERVERS.NET.	3600000	IN	A	198.41.0.4
-B.ROOT-SERVERS.NET.	3600000	IN	A	192.228.79.201
-C.ROOT-SERVERS.NET.	3600000	IN	A	192.33.4.12
-D.ROOT-SERVERS.NET.	3600000	IN	A	128.8.10.90
-E.ROOT-SERVERS.NET.	3600000	IN	A	192.203.230.10
-F.ROOT-SERVERS.NET.	3600000	IN	A	192.5.5.241
-G.ROOT-SERVERS.NET.	3600000	IN	A	192.112.36.4
-H.ROOT-SERVERS.NET.	3600000	IN	A	128.63.2.53
-I.ROOT-SERVERS.NET.	3600000	IN	A	192.36.148.17
-J.ROOT-SERVERS.NET.	3600000	IN	A	192.58.128.30
-K.ROOT-SERVERS.NET.	3600000	IN	A	193.0.14.129
-L.ROOT-SERVERS.NET.	3600000	IN	A	199.7.83.42
-M.ROOT-SERVERS.NET.	3600000	IN	A	202.12.27.33
-
-;; Query time: 81 msec
-;; SERVER: 198.41.0.4#53(a.root-servers.net.)
-;; WHEN: Sun Feb  1 11:27:14 2004
-;; MSG SIZE  rcvd: 436
-
-

--- a/net/bind/files/bind/named.conf.example
+++ /dev/null
@@ -1,46 +1,1 @@
-// This is the primary configuration file for the BIND DNS server named.
 
-options {
-	directory "/tmp";
-
-	// If your ISP provided one or more IP addresses for stable 
-	// nameservers, you probably want to use them as forwarders.  
-	// Uncomment the following block, and insert the addresses replacing 
-	// the all-0's placeholder.
-
-	// forwarders {
-	// 	0.0.0.0;
-	// };
-
-	auth-nxdomain no;    # conform to RFC1035
-};
-
-// prime the server with knowledge of the root servers
-zone "." {
-	type hint;
-	file "/etc/bind/db.root";
-};
-
-// be authoritative for the localhost forward and reverse zones, and for
-// broadcast zones as per RFC 1912
-
-zone "localhost" {
-	type master;
-	file "/etc/bind/db.local";
-};
-
-zone "127.in-addr.arpa" {
-	type master;
-	file "/etc/bind/db.127";
-};
-
-zone "0.in-addr.arpa" {
-	type master;
-	file "/etc/bind/db.0";
-};
-
-zone "255.in-addr.arpa" {
-	type master;
-	file "/etc/bind/db.255";
-};
-

--- a/net/bind/files/named.init
+++ /dev/null
@@ -1,41 +1,1 @@
-#!/bin/sh /etc/rc.common
-START=50
 
-config_file=/etc/bind/named.conf
-pid_file=/var/run/named/named.pid
-
-start() {
-  if [ -e $pid_file ]
-  then
-     echo "  named already running with PID `cat $pid_file`"
-     return 1
-  fi
-  echo Starting isc-bind
-
-  /usr/sbin/named -c $config_file
-
-  if [ $? -ne 0 ]
-  then
-    echo "  isc-bind failed to start"
-  fi
-}
-
-stop() {
-  echo "Stopping isc-bind"
-  if [ -e $pid_file ]
-  then
-    kill `cat $pid_file`
-
-    if [ $? -ne 0 ]
-    then
-      echo "  PID " `cat $pid_file` not found
-      echo "  Is the named server running?"
-    fi
-
-    rm -f $pid_file
-
-    else
-    echo "  $pid_file not found"
-  fi
-}
-

--- a/net/bind/patches/001-no-tests.patch
+++ /dev/null
@@ -1,27 +1,1 @@
-Index: bind-9.9.4/bin/Makefile.in
-===================================================================
---- bind-9.9.4.orig/bin/Makefile.in
-+++ bind-9.9.4/bin/Makefile.in
-@@ -19,7 +19,7 @@ srcdir =	@srcdir@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig dnssec tools tests nsupdate \
-+SUBDIRS =	named rndc dig dnssec tools nsupdate \
- 		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
- TARGETS =
- 
-Index: bind-9.9.4/lib/Makefile.in
-===================================================================
---- bind-9.9.4.orig/lib/Makefile.in
-+++ bind-9.9.4/lib/Makefile.in
-@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
- # Attempt to disable parallel processing.
- .NOTPARALLEL:
- .NO_PARALLEL:
--SUBDIRS =	isc isccc dns isccfg bind9 lwres tests
-+SUBDIRS =	isc isccc dns isccfg bind9 lwres
- TARGETS =
- 
- @BIND9_MAKE_RULES@
 

file:a/net/dmapd/Makefile (deleted)
--- a/net/dmapd/Makefile
+++ /dev/null
@@ -1,62 +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:=dmapd
-PKG_VERSION:=0.0.50
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.flyn.org/projects/dmapd
-PKG_MD5SUM:=2e04d7fb8437f9e7bd370dc3af450aae
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=2
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/dmapd
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libdmapsharing +libdb47 +vips +GraphicsMagick
-  TITLE:= dmapd
-  URL:=http://www.flyn.org/projects/dmapd/
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-endef
-
-define Package/dmapd/decription
-	Dmapd is a DMAP server
-endef
-
-define Package/dmapd/conffiles
-/etc/dmapd.conf
-endef
-
-TARGET_LDFLAGS+=\
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-
-define Package/dmapd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/distro/dmapd.conf $(1)/etc/
-	$(INSTALL_BIN) ./files/dmapd.init $(1)/etc/init.d/dmapd
-	$(INSTALL_DIR) $(1)/usr/lib/dmapd/$(PKG_VERSION)/modules
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/sbin/dmapd \
-		$(1)/usr/sbin/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libdmapd.so* \
-		$(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/dmapd/$(PKG_VERSION)/modules/*.so \
-		$(1)/usr/lib/dmapd/$(PKG_VERSION)/modules/
-endef
-
-$(eval $(call BuildPackage,dmapd))
-

--- a/net/dmapd/files/dmapd.init
+++ /dev/null
@@ -1,31 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2012 OpenWrt.org
 
-START=60
-
-start() {
-	user_exists dmapd 56 || user_add dmapd 56
-	group_exists dmapd 56 || group_add dmapd 56
-	[ -d /var/run/dmapd ] || {
-		mkdir -m 0755 -p /var/run/dmapd
-		chown dmapd:dmapd /var/run/dmapd
-	}
-	[ -d /var/db/dmapd/DAAP ] || {
-		mkdir -m 0755 -p /var/db/dmapd/DAAP
-		chown dmapd:dmapd /var/db/dmapd/DAAP
-	}
-	[ -d /var/db/dmapd/DPAP ] || {
-		mkdir -m 0755 -p /var/db/dmapd/DPAP
-		chown dmapd:dmapd /var/db/dmapd/DPAP
-	}
-	mkdir -m 0755 -p /var/lock/subsys
-	mkdir -m 0755 -p /var/media/music
-	mkdir -m 0755 -p /var/media/pictures
-
-	service_start /usr/sbin/dmapd -m /var/media/music -p /var/media/pictures --vips-disc-threshold 64k
-}
-
-stop() {
-	service_stop /usr/sbin/dmapd
-}
-

--- a/net/dmapd/patches/001-dmapd_conf.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/distro/dmapd.conf
-+++ b/distro/dmapd.conf
-@@ -3,7 +3,7 @@
- Database-Dir=/var/db/dmapd
- 
- # Name that will be used to identify share:
--Share-Name=dmapd
-+Share-Name=OpenWrt
- 
- # User that dmapd will run as, current user if undefined:
- User=dmapd
 

--- a/net/ipsec-tools/Makefile
+++ /dev/null
@@ -1,96 +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
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ipsec-tools
-PKG_VERSION:=0.8.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/ipsec-tools
-PKG_MD5SUM:=d38b39f291ba2962387c3232e7335dd8
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ipsec-tools
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=VPN
-  DEPENDS:=+libopenssl +kmod-ipsec
-  TITLE:=IPsec management tools
-  URL:=http://ipsec-tools.sourceforge.net/
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--with-kernel-headers="$(LINUX_DIR)/include" \
-	--without-readline \
-	--with-openssl="$(STAGING_DIR)/usr" \
-	--without-libradius \
-	--without-libpam \
-	--enable-dpd \
-	--enable-hybrid \
-	--enable-security-context=no \
-	--enable-natt \
-	--enable-adminport \
-	--enable-frag \
-	 $(call autoconf_bool,CONFIG_IPV6,ipv6)
-
-# override CFLAGS holding "-Werror" that break builds on compile warnings
-MAKE_FLAGS+=\
-	CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)"
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	chmod -R u+w $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); touch \
-		configure.ac \
-		aclocal.m4 \
-		Makefile.in \
-		config.h.in \
-		configure \
-	);
-	$(call Build/Configure/Default)
-	echo "#undef HAVE_SHADOW_H" >> $(PKG_BUILD_DIR)/config.h
-endef
-
-define Package/ipsec-tools/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(1)/etc/
-	$(SED) 's|@sysconfdir_x@|/etc|g' $(1)/etc/racoon.conf
-	$(INSTALL_DIR) $(1)/etc/racoon
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/src/racoon/samples/psk.txt $(1)/etc/racoon/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/racoon.init $(1)/etc/init.d/racoon
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/plainrsa-gen $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/racoon $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/racoonctl $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/setkey $(1)/usr/sbin/
-endef
-
-define Package/ipsec-tools/conffiles
-/etc/racoon.conf
-/etc/racoon/psk.txt
-endef
-
-$(eval $(call BuildPackage,ipsec-tools))
-

--- a/net/ipsec-tools/files/racoon.init
+++ /dev/null
@@ -1,18 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2011 OpenWrt.org
-# Copyright (C) 2011 Artem Makhutov
 
-START=49
-
-SERVICE_USE_PID=1
-
-start() {
-	mkdir -m 0700 -p /var/racoon
-	[ -f /etc/ipsec.conf ] && /usr/sbin/setkey -f /etc/ipsec.conf
-	service_start /usr/sbin/racoon -f /etc/racoon.conf
-}
-
-stop() {
-	service_stop /usr/sbin/racoon
-}
-

--- a/net/ipsec-tools/patches/001-ipsec-tools-def-psk.patch
+++ /dev/null
@@ -1,25 +1,1 @@
---- a/src/racoon/oakley.c
-+++ b/src/racoon/oakley.c
-@@ -2424,8 +2424,21 @@ oakley_skeyid(iph1)
- 				plog(LLV_ERROR, LOCATION, iph1->remote,
- 					"couldn't find the pskey for %s.\n",
- 					saddrwop2str(iph1->remote));
-+			}
-+		}
-+		if (iph1->authstr == NULL) {
-+			/*
-+			 * If we could not locate a psk above try and locate
-+			 * the default psk, ie, "*".
-+			 */
-+			iph1->authstr = privsep_getpsk("*", 1);
-+			if (iph1->authstr == NULL) {
-+				plog(LLV_ERROR, LOCATION, iph1->remote,
-+					"couldn't find the the default pskey either.\n");
- 				goto end;
- 			}
-+			plog(LLV_NOTIFY, LOCATION, iph1->remote,
-+					"Using default PSK.\n");
- 		}
- 		plog(LLV_DEBUG, LOCATION, NULL, "the psk found.\n");
- 		/* should be secret PSK */
 

--- a/net/ipsec-tools/patches/001-no_libfl.patch
+++ /dev/null
@@ -1,23 +1,1 @@
---- a/src/racoon/cftoken.l
-+++ b/src/racoon/cftoken.l
-@@ -104,6 +104,8 @@ static struct include_stack {
- static int incstackp = 0;
- 
- static int yy_first_time = 1;
-+
-+int yywrap(void) { return 1; }
- %}
- 
- /* common seciton */
---- a/src/setkey/token.l
-+++ b/src/setkey/token.l
-@@ -86,6 +86,8 @@
- #if defined(SADB_X_EALG_AES) && ! defined(SADB_X_EALG_AESCBC)
- #define SADB_X_EALG_AESCBC  SADB_X_EALG_AES
- #endif
-+
-+int yywrap(void) { return 1; }
- %}
- 
- /* common section */
 

--- a/net/ipsec-tools/patches/002-patch8-utmp.patch
+++ /dev/null
@@ -1,73 +1,1 @@
---- a/src/racoon/isakmp_cfg.c
-+++ b/src/racoon/isakmp_cfg.c
-@@ -38,7 +38,7 @@
- #include <sys/socket.h>
- #include <sys/queue.h>
- 
--#include <utmpx.h>
-+#include <utmp.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <util.h>
- #endif
-@@ -1661,7 +1661,8 @@ isakmp_cfg_accounting_system(port, raddr
- 	int inout;
- {
- 	int error = 0;
--	struct utmpx ut;
-+	struct utmp ut;
-+	char term[UT_LINESIZE];
- 	char addr[NI_MAXHOST];
- 	
- 	if (usr == NULL || usr[0]=='\0') {
-@@ -1670,34 +1671,37 @@ isakmp_cfg_accounting_system(port, raddr
- 		return -1;
- 	}
- 
--	memset(&ut, 0, sizeof ut);
--	gettimeofday((struct timeval *)&ut.ut_tv, NULL);
--	snprintf(ut.ut_id, sizeof ut.ut_id, TERMSPEC, port);
-+	sprintf(term, TERMSPEC, port);
- 
- 	switch (inout) {
- 	case ISAKMP_CFG_LOGIN:
--		ut.ut_type = USER_PROCESS;
--		strncpy(ut.ut_user, usr, sizeof ut.ut_user);
-+		strncpy(ut.ut_name, usr, UT_NAMESIZE);
-+		ut.ut_name[UT_NAMESIZE - 1] = '\0';
-+		
-+		strncpy(ut.ut_line, term, UT_LINESIZE);
-+		ut.ut_line[UT_LINESIZE - 1] = '\0';
- 
- 		GETNAMEINFO_NULL(raddr, addr);
--		strncpy(ut.ut_host, addr, sizeof ut.ut_host);
-+		strncpy(ut.ut_host, addr, UT_HOSTSIZE);
-+		ut.ut_host[UT_HOSTSIZE - 1] = '\0';
-+
-+		ut.ut_time = time(NULL);
- 
- 		plog(LLV_INFO, LOCATION, NULL,
- 			"Accounting : '%s' logging on '%s' from %s.\n",
--			ut.ut_user, ut.ut_id, addr);
--
--		pututxline(&ut);
-+			ut.ut_name, ut.ut_line, ut.ut_host);
- 
-+		login(&ut);
-+		
- 		break;
- 	case ISAKMP_CFG_LOGOUT:	
--		ut.ut_type = DEAD_PROCESS;
- 
- 		plog(LLV_INFO, LOCATION, NULL,
- 			"Accounting : '%s' unlogging from '%s'.\n",
--			usr, ut.ut_id);
--
--		pututxline(&ut);
-+			usr, term);
- 
-+		logout(term);
-+		
- 		break;
- 	default:
- 		plog(LLV_ERROR, LOCATION, NULL, "Unepected inout\n");
 

--- a/net/ipsec-tools/patches/003-microsoft-fqdn-in-main.patch
+++ /dev/null
@@ -1,14 +1,1 @@
---- a/src/racoon/ipsec_doi.c
-+++ b/src/racoon/ipsec_doi.c
-@@ -3582,8 +3582,8 @@ ipsecdoi_checkid1(iph1)
- 	    iph1->approval->authmethod == OAKLEY_ATTR_AUTH_METHOD_PSKEY) {
- 		 if (id_b->type != IPSECDOI_ID_IPV4_ADDR
- 		  && id_b->type != IPSECDOI_ID_IPV6_ADDR) {
--			plog(LLV_ERROR, LOCATION, NULL,
--				"Expecting IP address type in main mode, "
-+			plog(LLV_WARNING, LOCATION, NULL,
-+				"Expecting IP address type in main mode (RFC2409) , "
- 				"but %s.\n", s_ipsecdoi_ident(id_b->type));
- 			return ISAKMP_NTYPE_INVALID_ID_INFORMATION;
- 		}
 

--- a/net/ipsec-tools/patches/005-isakmp-fix.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/src/racoon/isakmp.c
-+++ b/src/racoon/isakmp.c
-@@ -31,6 +31,8 @@
-  * SUCH DAMAGE.
-  */
- 
-+#define __packed __attribute__((__packed__))
-+
- #include "config.h"
- 
- #include <sys/types.h>
 

--- a/net/ipsec-tools/patches/006-linux-3.7-compat.patch
+++ /dev/null
@@ -1,51 +1,1 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -74,9 +74,10 @@ case "$host_os" in
- 	    [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ])
- 
-     AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, ,
--	[ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h,
--	  KERNEL_INCLUDE=/usr/src/linux/include ,
--	  [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] )
-+	[ AC_CHECK_HEADER($KERNEL_INCLUDE/uapi/linux/pfkeyv2.h, ,
-+	  [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h,
-+	    KERNEL_INCLUDE=/usr/src/linux/include ,
-+	    [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) ] )
-     AC_SUBST(KERNEL_INCLUDE)
-     # We need the configure script to run with correct kernel headers.
-     # However we don't want to point to kernel source tree in compile time,
-@@ -643,7 +644,14 @@ AC_EGREP_CPP(yes,
- #ifdef SADB_X_EXT_NAT_T_TYPE
- yes
- #endif
--], [kernel_natt="yes"])
-+], [kernel_natt="yes"], [
-+  AC_EGREP_CPP(yes,
-+  [#include <uapi/linux/pfkeyv2.h>
-+  #ifdef SADB_X_EXT_NAT_T_TYPE
-+  yes
-+  #endif
-+  ], [kernel_natt="yes"])
-+])
- 	;;
- freebsd*|netbsd*)
- # NetBSD case
---- a/src/include-glibc/Makefile.am
-+++ b/src/include-glibc/Makefile.am
-@@ -1,14 +1,7 @@
--
--.includes: ${top_builddir}/config.status
--	ln -snf $(KERNEL_INCLUDE)/linux
--	touch .includes
--
--all: .includes
--
- EXTRA_DIST = \
-   glibc-bugs.h \
-   net/pfkeyv2.h \
-   netinet/ipsec.h \
-   sys/queue.h
- 
--DISTCLEANFILES = .includes linux
-+DISTCLEANFILES = linux
 

file:a/net/memcached/Makefile (deleted)
--- a/net/memcached/Makefile
+++ /dev/null
@@ -1,69 +1,1 @@
-#
-# Copyright (C) 2009-2012 OpenWrt.org
-# Copyright (C) 2009-2012 Thomas Heil <heil@terminal-consulting.de>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=memcached
-PKG_VERSION:=1.4.12
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://memcached.googlecode.com/files
-PKG_MD5SUM:=4194de21b58a92de684ce69b8e501c44
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/memcached
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libevent +libpthread
-  TITLE:=The high-performance, distributed memory object caching system
-  MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
-  URL:=http://memcached.org/
-endef
-
-define Package/memcached/description
-  Free and open source, high-performance, distributed memory object caching system
-endef
-
-define Package/memcached/conffiles
-/etc/config/memcached
-endef
-
-ifeq ($(CONFIG_BIG_ENDIAN),y)
-CONFIGURE_VARS += ac_cv_c_endian=big
-else
-CONFIGURE_VARS += ac_cv_c_endian=little
-endif
-
-CONFIGURE_ARGS += \
-	--with-libevent=$(STAGING_DIR)/usr/include/libevent \
-	--disable-docs \
-	--disable-dtrace \
-	--disable-coverage \
-	--disable-sasl
-
-TARGET_CFLAGS += \
-	-std=gnu99
-
-TARGET_LDFLAGS = \
-	-L$(STAGING_DIR)/usr/lib/libevent -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
-
-define Package/memcached/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/memcached $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/memcached.config $(1)/etc/config/memcached
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/memcached.init $(1)/etc/init.d/memcached
-endef
-
-$(eval $(call BuildPackage,memcached))
-

--- a/net/memcached/files/memcached.config
+++ /dev/null
@@ -1,7 +1,1 @@
-config memcached
-	option user 'nobody'
-	option maxconn '1024'
-	option listen '0.0.0.0'
-	option port '11211'
-	option memory '64'
 

--- a/net/memcached/files/memcached.init
+++ /dev/null
@@ -1,28 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2010-2011 OpenWrt.org
 
-START=80
-
-start_instance () {
-	local section="$1"
-
-	config_get user "$section" user
-	config_get maxconn "$section" maxconn
-	config_get listen "$section" listen
-	config_get port "$section" port
-	config_get memory "$section" memory
-
-	service_start /usr/bin/memcached -d -u ${user:-nobody} \
-		-c ${maxconn:-1024} -l ${listen:-0.0.0.0} \
-		-p ${port:-11211} -U ${port:-11211} -m ${memory:-64}
-}
-
-start() {
-	config_load 'memcached'
-	config_foreach start_instance 'memcached'
-}
-
-stop() {
-	service_stop /usr/bin/memcached
-}
-

--- a/net/memcached/patches/100-fix_iov_max.patch
+++ /dev/null
@@ -1,24 +1,1 @@
---- a/memcached.c
-+++ b/memcached.c
-@@ -13,6 +13,10 @@
-  *      Anatoly Vorobey <mellon@pobox.com>
-  *      Brad Fitzpatrick <brad@danga.com>
-  */
-+#ifndef __need_IOV_MAX
-+#define __need_IOV_MAX
-+#endif
-+
- #include "memcached.h"
- #include <sys/stat.h>
- #include <sys/socket.h>
-@@ -29,9 +33,6 @@
- #define _P1003_1B_VISIBLE
- #endif
- /* need this to get IOV_MAX on some platforms. */
--#ifndef __need_IOV_MAX
--#define __need_IOV_MAX
--#endif
- #include <pwd.h>
- #include <sys/mman.h>
- #include <fcntl.h>
 

file:a/net/ntpclient/Makefile (deleted)
--- a/net/ntpclient/Makefile
+++ /dev/null
@@ -1,54 +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.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ntpclient
-PKG_VERSION:=2007_365
-PKG_RELEASE:=4
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://doolittle.icarus.com/ntpclient/
-PKG_MD5SUM:=cb98711f11769cdd22fc592844cef414
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-2007
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ntpclient
-  SUBMENU:=Time Synchronization
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=NTP (Network Time Protocol) client
-  URL:=http://doolittle.icarus.com/ntpclient/
-  DEPENDS:=+librt
-endef
-
-define Package/ntpclient/description
-	NTP client for setting system time from NTP servers.
-endef
-
-define Package/ntpclient/conffiles
-/etc/config/ntpclient
-endef
-
-MAKE_FLAGS += \
-	all adjtimex
-
-define Package/ntpclient/install
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_DATA) ./files/ntpclient.hotplug $(1)/etc/hotplug.d/iface/20-ntpclient
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/ntpclient.config $(1)/etc/config/ntpclient
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ntpclient $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/adjtimex $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rate.awk $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,ntpclient))
-

--- a/net/ntpclient/files/ntpclient.config
+++ /dev/null
@@ -1,24 +1,1 @@
-config ntpserver
-	option hostname '0.openwrt.pool.ntp.org'
-	option port     '123'
 
-config ntpserver
-	option hostname '1.openwrt.pool.ntp.org'
-	option port     '123'
-
-config ntpserver
-	option hostname '2.openwrt.pool.ntp.org'
-	option port     '123'
-
-config ntpserver
-	option hostname '3.openwrt.pool.ntp.org'
-	option port     '123'
-
-config ntpdrift
-	option freq     '0'
-
-config ntpclient
-	option interval	600
-	#option count	10
-	#option interface wan
-

--- a/net/ntpclient/files/ntpclient.hotplug
+++ /dev/null
@@ -1,79 +1,1 @@
-#!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
 
-. /lib/functions.sh
-
-unset SERVER
-unset PORT
-unset INTERVAL
-unset COUNT
-unset INTERFACE_GLOBAL
-
-NTPC=`which ntpclient`
-
-check_server() {
-	local hostname
-	local port
-	local interface
-	[ -n "$SERVER" ] && return
-	config_get hostname $1 hostname
-	config_get port $1 port
-	config_get interface $1 interface
-
-	[ -z "$interface" ] && interface=$INTERFACE_GLOBAL
-
-	[ -n "$interface" ] && {
-		# $INTERFACE is passed from hotplug event
-		[ "$interface" = "$INTERFACE" ] || return
-	}
-
-	[ -z "$hostname" ] && return
-	$NTPC -c 1 -p ${port:-123} -i 2 -h $hostname > /dev/null && { SERVER=$hostname; PORT=${port:-123}; }
-}
-
-set_drift() {
-	config_get freq $1 freq
-	[ -n "$freq" ] && adjtimex -f $freq >/dev/null
-}
-
-start_ntpclient() {
-	config_foreach set_drift ntpdrift
-	config_foreach check_server ntpserver
-	[ -z "$SERVER" ] && exit 0
-	logger starting ntpclient
-	$NTPC ${COUNT:+-c $COUNT} ${INTERVAL:+-i $INTERVAL} -s -l -D -p $PORT -h $SERVER 2> /dev/null
-}
-
-stop_ntpclient() {
-	logger stopping ntpclient
-	killall ntpclient
-}
-
-load_settings() {
-	local interval
-	local count
-	local iface
-	
-	config_get interval $1 interval
-	config_get count $1 count
-	config_get interface $1 interface
-	
-	[ -n "$count" ] && COUNT=$count
-	[ -n "$interval" ] && INTERVAL=$interval
-	[ -n "$interface" ] && INTERFACE_GLOBAL=$interface
-}
-
-config_load ntpclient
-config_foreach load_settings ntpclient
-
-NTP_RUNNING=`ps  | grep $NTPC | grep -v grep`
-
-case "${ACTION:-ifup}" in
-	ifup)
-		[ -z "$NTP_RUNNING" ] && start_ntpclient 
-	;;
-	ifdown)
-		[ -n "$NTP_RUNNING" ] && stop_ntpclient 
-	;;
-esac
-

--- a/net/ntpclient/patches/100-daemon.patch
+++ /dev/null
@@ -1,25 +1,1 @@
-Index: ntpclient-2007/ntpclient.c
-===================================================================
---- ntpclient-2007.orig/ntpclient.c	2008-08-12 03:11:34.000000000 +0200
-+++ ntpclient-2007/ntpclient.c	2008-08-12 03:11:36.000000000 +0200
-@@ -614,7 +614,7 @@
- 	ntpc.cross_check=1;
- 
- 	for (;;) {
--		c = getopt( argc, argv, "c:" DEBUG_OPTION "f:g:h:i:lp:q:" REPLAY_OPTION "st");
-+		c = getopt( argc, argv, "c:" DEBUG_OPTION "f:g:h:i:lp:q:" REPLAY_OPTION "stD");
- 		if (c == EOF) break;
- 		switch (c) {
- 			case 'c':
-@@ -663,6 +663,10 @@
- 				(ntpc.cross_check)=0;
- 				break;
- 
-+			case 'D':
-+				daemon();
-+				break;
-+
- 			default:
- 				usage(argv[0]);
- 				exit(1);
 

file:a/net/socat/Makefile (deleted)
--- a/net/socat/Makefile
+++ /dev/null
@@ -1,57 +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:=socat
-PKG_VERSION:=1.7.2.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download
-PKG_MD5SUM:=7ddfea7e9e85f868670f94d3ea08358b
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/socat
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libpthread
-  TITLE:=A multipurpose relay (SOcket CAT)
-  URL:=http://www.dest-unreach.org/socat/
-endef
-
-define Package/socat/description
-	SoCat (for SOcket CAT) establishes two bidirectional byte streams and
-	transfers data between them.
-	Data channels may be files, pipes, devices (terminal or modem, etc.), or
-	sockets (Unix, IPv4, IPv6, raw, UDP, TCP, SSL). It provides forking,
-	logging and tracing, different modes for interprocess communication and
-	many more options.
-endef
-
-CONFIGURE_ARGS += \
-	--disable-libwrap \
-	--disable-readline \
-	--disable-openssl \
-	--enable-termios
-
-CONFIGURE_VARS += \
-	sc_cv_termios_ispeed="no" \
-	sc_cv_sys_crdly_shift=9 \
-	sc_cv_sys_tabdly_shift=11 \
-	sc_cv_sys_csize_shift=4
-
-define Package/socat/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/socat $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,socat))
-

--- a/net/socat/patches/501-honor_ldflags.patch
+++ /dev/null
@@ -1,13 +1,1 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -38,7 +38,8 @@ INSTALL = @INSTALL@
- 
- #0 CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(INCLS)
- CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(CPPFLAGS)
--CLIBS = $(LIBS)
-+LDFLAGS = @LDFLAGS@
-+CLIBS = $(LDFLAGS) $(LIBS)
- #CLIBS = $(LIBS) -lm -lefence
- XIOSRCS = xioinitialize.c xiohelp.c xioparam.c xiodiag.c xioopen.c xioopts.c \
- 	xiosignal.c xiosigchld.c xioread.c xiowrite.c \
 

--- a/net/strongswan/Config.in
+++ /dev/null
@@ -1,29 +1,1 @@
-menu "Configuration"
-	depends on PACKAGE_strongswan
 
-# --with-random-device
-config STRONGSWAN_DEVICE_RANDOM
-	string
-	prompt "Set the device to read real random data from"
-	default "/dev/random"
-
-# --with-urandom-device
-config STRONGSWAN_DEVICE_URANDOM
-	string
-	prompt "Set the device to read pseudo random data from"
-	default "/dev/urandom"
-
-# --with-routing-table
-config STRONGSWAN_ROUTING_TABLE
-	string
-	prompt "Set the IPsec routing table ID"
-	default "220"
-
-#  --with-routing-table-prio
-config STRONGSWAN_ROUTING_TABLE_PRIO
-	string
-	prompt "Set the IPsec routing table priority"
-	default "220"
-
-endmenu
-

file:a/net/strongswan/Makefile (deleted)
--- a/net/strongswan/Makefile
+++ /dev/null
@@ -1,533 +1,1 @@
-#
-# Copyright (C) 2012-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:=strongswan
-PKG_VERSION:=5.1.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://download.strongswan.org/ http://download2.strongswan.org/
-PKG_MD5SUM:=1d1c108775242743cd8699215b2918c3
-
-PKG_MOD_AVAILABLE:= \
-	addrblock \
-	aes \
-	af-alg \
-	agent \
-	attr \
-	attr-sql \
-	blowfish \
-	ccm \
-	cmac \
-	constraints \
-	coupling \
-	ctr \
-	curl \
-	des \
-	dhcp \
-	dnskey \
-	duplicheck \
-	eap-identity \
-	eap-md5 \
-	eap-mschapv2 \
-	eap-radius \
-	farp \
-	fips-prf \
-	gcm \
-	gcrypt \
-	gmp \
-	ha \
-	hmac \
-	kernel-klips \
-	kernel-libipsec \
-	kernel-netlink \
-	kernel-pfkey \
-	ldap \
-	led \
-	load-tester \
-	nonce \
-	md4 \
-	md5 \
-	mysql \
-	openssl \
-	padlock \
-	pem \
-	pgp \
-	pkcs1 \
-	pkcs8 \
-	pkcs11 \
-	pubkey \
-	random \
-	resolve \
-	revocation \
-	sha1 \
-	sha2 \
-	smp \
-	socket-default \
-	socket-dynamic \
-	sql \
-	sqlite \
-	stroke \
-	test-vectors \
-	unity \
-	uci \
-	updown \
-	whitelist \
-	x509 \
-	xauth-eap \
-	xauth-generic \
-	xcbc
-
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_STRONGSWAN_DEVICE_RANDOM \
-	CONFIG_STRONGSWAN_DEVICE_URANDOM \
-	CONFIG_STRONGSWAN_ROUTING_TABLE \
-	CONFIG_STRONGSWAN_ROUTING_TABLE_PRIO \
-	$(patsubst %,CONFIG_PACKAGE_strongswan-mod-%,$(PKG_MOD_AVAILABLE)) \
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/strongswan/Default
-  SUBMENU:=VPN
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=StrongSwan
-  URL:=http://www.strongswan.org/
-endef
-
-define Package/strongswan/description/Default
- StrongSwan is an OpenSource IPsec implementation for the Linux operating system.
-endef
-
-define Package/strongswan
-$(call Package/strongswan/Default)
-  DEPENDS:= +libpthread +ip \
-	+kmod-crypto-authenc \
-	+kmod-ipsec +kmod-ipsec4 +kmod-ipsec6 \
-	+kmod-ipt-ipsec +iptables-mod-ipsec
-endef
-
-define Package/strongswan/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Package/strongswan/description
-$(call Package/strongswan/description/Default)
- This package contains shared libraries and scripts.
-endef
-
-define Package/strongswan-full
-$(call Package/strongswan/Default)
-  TITLE+= (full)
-  DEPENDS:= +strongswan \
-	+strongswan-charon \
-	+strongswan-libfast \
-	+strongswan-mod-addrblock \
-	+strongswan-mod-aes \
-	+strongswan-mod-af-alg \
-	+strongswan-mod-agent \
-	+strongswan-mod-attr \
-	+strongswan-mod-attr-sql \
-	+strongswan-mod-blowfish \
-	+strongswan-mod-ccm \
-	+strongswan-mod-cmac \
-	+strongswan-mod-constraints \
-	+strongswan-mod-coupling \
-	+strongswan-mod-ctr \
-	+strongswan-mod-curl \
-	+strongswan-mod-des \
-	+strongswan-mod-dhcp \
-	+strongswan-mod-dnskey \
-	+strongswan-mod-duplicheck \
-	+strongswan-mod-eap-identity \
-	+strongswan-mod-eap-md5 \
-	+strongswan-mod-eap-mschapv2 \
-	+strongswan-mod-eap-radius \
-	+strongswan-mod-farp \
-	+strongswan-mod-fips-prf \
-	+strongswan-mod-gcm \
-	+strongswan-mod-gcrypt \
-	+strongswan-mod-gmp \
-	+strongswan-mod-ha \
-	+strongswan-mod-hmac \
-	+strongswan-mod-kernel-netlink \
-	+strongswan-mod-ldap \
-	+strongswan-mod-led \
-	+strongswan-mod-load-tester \
-	+strongswan-mod-nonce \
-	+strongswan-mod-md4 \
-	+strongswan-mod-md5 \
-	+strongswan-mod-mysql \
-	+strongswan-mod-openssl \
-	+TARGET_x86:strongswan-mod-padlock \
-	+strongswan-mod-pem \
-	+strongswan-mod-pgp \
-	+strongswan-mod-pkcs1 \
-	+strongswan-mod-pkcs8 \
-	+strongswan-mod-pkcs11 \
-	+strongswan-mod-pubkey \
-	+strongswan-mod-random \
-	+strongswan-mod-resolve \
-	+strongswan-mod-revocation \
-	+strongswan-mod-sha1 \
-	+strongswan-mod-sha2 \
-	+strongswan-mod-smp \
-	+strongswan-mod-socket-default \
-	+strongswan-mod-sql \
-	+strongswan-mod-sqlite \
-	+strongswan-mod-stroke \
-	+strongswan-mod-test-vectors \
-	+strongswan-mod-uci \
-	+strongswan-mod-unity \
-	+strongswan-mod-updown \
-	+strongswan-mod-whitelist \
-	+strongswan-mod-x509 \
-	+strongswan-mod-xauth-eap \
-	+strongswan-mod-xauth-generic \
-	+strongswan-mod-xcbc \
-	+strongswan-utils \
-	@DEVEL
-endef
-
-define Package/strongswan-full/description
-$(call Package/strongswan/description/Default)
- This meta-package contains dependencies for all of the strongswan plugins
- except kernel-klips, kernel-libipsec, kernel-pfkey,
- socket-dynamic and which are ommitted in favor of the kernel-netlink and
- socket-default plugins.
-endef
-
-
-define Package/strongswan-default
-$(call Package/strongswan/Default)
-  TITLE+= (default)
-  DEPENDS:= +strongswan \
-	+strongswan-charon \
-	+strongswan-mod-aes \
-	+strongswan-mod-attr \
-	+strongswan-mod-constraints \
-	+strongswan-mod-des \
-	+strongswan-mod-dnskey \
-	+strongswan-mod-fips-prf \
-	+strongswan-mod-gmp \
-	+strongswan-mod-hmac \
-	+strongswan-mod-kernel-netlink \
-	+strongswan-mod-md5 \
-	+strongswan-mod-nonce \
-	+strongswan-mod-pem \
-	+strongswan-mod-pgp \
-	+strongswan-mod-pkcs1 \
-	+strongswan-mod-pubkey \
-	+strongswan-mod-random \
-	+strongswan-mod-resolve \
-	+strongswan-mod-revocation \
-	+strongswan-mod-sha1 \
-	+strongswan-mod-sha2 \
-	+strongswan-mod-socket-default \
-	+strongswan-mod-stroke \
-	+strongswan-mod-updown \
-	+strongswan-mod-x509 \
-	+strongswan-mod-xauth-generic \
-	+strongswan-mod-xcbc \
-	+strongswan-utils
-endef
-
-define Package/strongswan-default/description
-$(call Package/strongswan/description/Default)
- This meta-package contains only dependencies to match upstream defaults.
-endef
-
-define Package/strongswan-minimal
-$(call Package/strongswan/Default)
-  TITLE+= (minimal)
-  DEPENDS:= +strongswan \
-	+strongswan-charon \
-	+strongswan-mod-aes \
-	+strongswan-mod-gmp \
-	+strongswan-mod-hmac \
-	+strongswan-mod-kernel-netlink \
-	+strongswan-mod-nonce \
-	+strongswan-mod-pubkey \
-	+strongswan-mod-random \
-	+strongswan-mod-sha1 \
-	+strongswan-mod-socket-default \
-	+strongswan-mod-stroke \
-	+strongswan-mod-updown \
-	+strongswan-mod-x509 \
-	+strongswan-mod-xcbc
-endef
-
-define Package/strongswan-minimal/description
-$(call Package/strongswan/description/Default)
- This meta-package contains only dependencies for a minimal IKEv2 setup.
-endef
-
-define Package/strongswan-charon
-$(call Package/strongswan/Default)
-  TITLE+= IKEv1/IKEv2 keying daemon
-  DEPENDS:= +strongswan
-endef
-
-define Package/strongswan-charon/description
-$(call Package/strongswan/description/Default)
- This package contains charon, an IKEv2 keying daemon.
-endef
-
-define Package/strongswan-libfast
-$(call Package/strongswan/Default)
-  TITLE+= libfast
-  DEPENDS:= +strongswan \
-		+PACKAGE_strongswan-libfast:zlib \
-		+PACKAGE_strongswan-libfast:fcgi \
-		+PACKAGE_strongswan-libfast:clearsilver
-endef
-
-define Package/strongswan-libfast/description
-$(call Package/strongswan/description/Default)
- This package contains libfast, a lightweight framework to build native web
- applications using ClearSilver and FastCGI.
-endef
-
-define Package/strongswan-utils
-$(call Package/strongswan/Default)
-  TITLE+= utilities
-  DEPENDS:= +strongswan
-endef
-
-define Package/strongswan-utils/description
-$(call Package/strongswan/description/Default)
- This package contains the pki & scepclient utilities.
-endef
-
-define BuildPlugin
-  define Package/strongswan-mod-$(1)
-    $$(call Package/strongswan/Default)
-    TITLE:= StrongSwan $(2) plugin
-    DEPENDS:= +strongswan $(3)
-  endef
-
-  strongswan_mod_conf=$(wildcard $(PKG_INSTALL_DIR)/etc/strongswan.d/charon/$(1).conf)
-  define Package/strongswan-mod-$(1)/install
-	$(INSTALL_DIR) $$(1)/etc/strongswan.d/charon
-	$(if $(call strongswan_mod_conf,$(1)), \
-		$(INSTALL_DATA) \
-			$(call strongswan_mod_conf,$(1)) \
-			$$(1)/etc/strongswan.d/charon/ \
-	)
-	$(INSTALL_DIR) $$(1)/usr/lib/ipsec/plugins
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-$(1).so \
-		$$(1)/usr/lib/ipsec/plugins/
-	$(call Plugin/$(1)/install,$$(1))
-  endef
-
-  Package/strongswan-mod-$(1)/conffiles=$(patsubst $(PKG_INSTALL_DIR)%,%,$(call strongswan_mod_conf,$(1)))
-
-  $$(eval $$(call BuildPackage,strongswan-mod-$(1)))
-endef
-
-CONFIGURE_ARGS+= \
-	--disable-scripts \
-	--disable-static \
-	$(if $(CONFIG_PACKAGE_strongswan-libfast),--enable-fast,--disable-fast) \
-	$(if $(CONFIG_PACKAGE_strongswan-utils),--enable-tools,--disable-tools) \
-	--with-random-device="$(call qstrip,$(CONFIG_STRONGSWAN_DEVICE_RANDOM))" \
-	--with-urandom-device="$(call qstrip,$(CONFIG_STRONGSWAN_DEVICE_URANDOM))" \
-	--with-routing-table="$(call qstrip,$(CONFIG_STRONGSWAN_ROUTING_TABLE))" \
-	--with-routing-table-prio="$(call qstrip,$(CONFIG_STRONGSWAN_ROUTING_TABLE_PRIO))" \
-	$(foreach m,$(PKG_MOD_AVAILABLE), \
-	  $(if $(CONFIG_PACKAGE_strongswan-mod-$(m)),--enable-$(m),--disable-$(m)) \
-	)
-
-ifneq ($(CONFIG_PACKAGE_strongswan-libfast),)
-  EXTRA_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/ClearSilver
-endif
-
-EXTRA_LDFLAGS+= -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
-
-define Package/strongswan/conffiles
-/etc/ipsec.conf
-/etc/ipsec.secrets
-/etc/ipsec.user
-/etc/strongswan.conf
-endef
-
-define Package/strongswan/install
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) $(PKG_INSTALL_DIR)/etc/strongswan.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{libstrongswan.so.*,libhydra.so.*} $(1)/usr/lib/ipsec/
-	$(INSTALL_CONF) ./files/ipsec.secrets $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/ipsec.init $(1)/etc/init.d/ipsec
-endef
-
-define Package/strongswan-default/install
-	true
-endef
-
-define Package/strongswan-full/install
-	true
-endef
-
-define Package/strongswan-minimal/install
-	true
-endef
-
-define Package/strongswan-charon/install
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ipsec/charon $(1)/usr/lib/ipsec/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/libcharon.so.* $(1)/usr/lib/ipsec/
-endef
-
-define Package/strongswan-libfast/install
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/libfast.so.* $(1)/usr/lib/ipsec/
-endef
-
-define Package/strongswan-utils/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ipsec $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pki $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ipsec/scepclient $(1)/usr/lib/ipsec/
-endef
-
-define Plugin/duplicheck/install
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec/plugins
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/duplicheck $(1)/usr/lib/ipsec/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-duplicheck.so $(1)/usr/lib/ipsec/plugins/
-endef
-
-define Plugin/eap-radius/install
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec/plugins
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/libradius.so.* $(1)/usr/lib/ipsec/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-eap-radius.so $(1)/usr/lib/ipsec/plugins/
-endef
-
-define Plugin/attr-sql/install
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/pool $(1)/usr/lib/ipsec/
-endef
-
-define Plugin/stroke/install
-	$(INSTALL_DIR) $(1)/etc/ipsec.d/aacerts
-	$(INSTALL_DIR) $(1)/etc/ipsec.d/acerts
-	$(INSTALL_DIR) $(1)/etc/ipsec.d/cacerts
-	$(INSTALL_DIR) $(1)/etc/ipsec.d/certs
-	$(INSTALL_DIR) $(1)/etc/ipsec.d/crls
-	$(INSTALL_DIR) $(1)/etc/ipsec.d/ocspcerts
-	$(INSTALL_DIR) $(1)/etc/ipsec.d/private
-	$(INSTALL_DIR) $(1)/etc/ipsec.d/reqs
-
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/ipsec.conf $(1)/etc/
-
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec/plugins
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{starter,stroke} $(1)/usr/lib/ipsec/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-stroke.so $(1)/usr/lib/ipsec/plugins/
-endef
-
-define Plugin/updown/install
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec/plugins
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{_updown,_updown_espmark} $(1)/usr/lib/ipsec/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-updown.so $(1)/usr/lib/ipsec/plugins/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) ./files/ipsec.user $(1)/etc/
-endef
-
-define Plugin/whitelist/install
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec/plugins
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/whitelist $(1)/usr/lib/ipsec/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-whitelist.so $(1)/usr/lib/ipsec/plugins/
-endef
-
-define Plugin/kernel-libipsec/install
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/libipsec.so.* $(1)/usr/lib/ipsec/
-endef
-
-$(eval $(call BuildPackage,strongswan))
-$(eval $(call BuildPackage,strongswan-default))
-$(eval $(call BuildPackage,strongswan-full))
-$(eval $(call BuildPackage,strongswan-minimal))
-$(eval $(call BuildPackage,strongswan-charon))
-$(eval $(call BuildPackage,strongswan-libfast))
-$(eval $(call BuildPackage,strongswan-utils))
-$(eval $(call BuildPlugin,addrblock,RFC 3779 address block constraint support,))
-$(eval $(call BuildPlugin,aes,AES crypto,))
-$(eval $(call BuildPlugin,af-alg,AF_ALG crypto interface to Linux Crypto API,+kmod-crypto-user))
-$(eval $(call BuildPlugin,agent,SSH agent signing,))
-$(eval $(call BuildPlugin,attr,file based config,))
-$(eval $(call BuildPlugin,attr-sql,SQL based config,+strongswan-mod-sql))
-$(eval $(call BuildPlugin,blowfish,Blowfish crypto,))
-$(eval $(call BuildPlugin,ccm,CCM AEAD wrapper crypto,))
-$(eval $(call BuildPlugin,cmac,CMAC crypto,))
-$(eval $(call BuildPlugin,constraints,advanced X509 constraint checking,))
-$(eval $(call BuildPlugin,coupling,IKEv2 plugin to couple peer certificates permanently to authentication,))
-$(eval $(call BuildPlugin,ctr,Counter Mode wrapper crypto,))
-$(eval $(call BuildPlugin,curl,cURL fetcher plugin,+PACKAGE_strongswan-mod-curl:libcurl))
-$(eval $(call BuildPlugin,des,DES crypto,))
-$(eval $(call BuildPlugin,dhcp,DHCP based attribute provider,))
-$(eval $(call BuildPlugin,dnskey,DNS RR key decoding,))
-$(eval $(call BuildPlugin,duplicheck,advanced duplicate checking,))
-$(eval $(call BuildPlugin,eap-identity,EAP identity helper,))
-$(eval $(call BuildPlugin,eap-md5,EAP MD5 (CHAP) EAP auth,))
-$(eval $(call BuildPlugin,eap-mschapv2,EAP MS-CHAPv2 EAP auth,+strongswan-mod-md4 +strongswan-mod-des))
-$(eval $(call BuildPlugin,eap-radius,EAP RADIUS auth,))
-$(eval $(call BuildPlugin,farp,fake arp respsonses,))
-$(eval $(call BuildPlugin,fips-prf,FIPS PRF crypto,+strongswan-mod-sha1))
-$(eval $(call BuildPlugin,gcm,GCM AEAD wrapper crypto,))
-$(eval $(call BuildPlugin,gcrypt,libgcrypt,+PACKAGE_strongswan-mod-gcrypt:libgcrypt))
-$(eval $(call BuildPlugin,gmp,libgmp,+PACKAGE_strongswan-mod-gmp:libgmp))
-$(eval $(call BuildPlugin,ha,high availability cluster,))
-$(eval $(call BuildPlugin,hmac,HMAC crypto,))
-$(eval $(call BuildPlugin,kernel-klips,KLIPS kernel interface,))
-$(eval $(call BuildPlugin,kernel-libipsec,libipsec kernel interface,))
-$(eval $(call BuildPlugin,kernel-netlink,netlink kernel interface,))
-$(eval $(call BuildPlugin,kernel-pfkey,PK_KEY kernel interface,))
-$(eval $(call BuildPlugin,ldap,LDAP,+PACKAGE_strongswan-mod-ldap:libopenldap))
-$(eval $(call BuildPlugin,led,LED blink on IKE activity,))
-$(eval $(call BuildPlugin,load-tester,load testing,))
-$(eval $(call BuildPlugin,nonce,nonce genereation,))
-$(eval $(call BuildPlugin,md4,MD4 crypto,))
-$(eval $(call BuildPlugin,md5,MD5 crypto,))
-$(eval $(call BuildPlugin,mysql,MySQL database interface,+strongswan-mod-sql +PACKAGE_strongswan-mod-mysql:libmysqlclient-r))
-$(eval $(call BuildPlugin,openssl,OpenSSL crypto,+PACKAGE_strongswan-mod-openssl:libopenssl))
-$(eval $(call BuildPlugin,padlock,VIA PadLock crypto,@TARGET_x86))
-$(eval $(call BuildPlugin,pem,PEM decoding,))
-$(eval $(call BuildPlugin,pgp,PGP key decoding,))
-$(eval $(call BuildPlugin,pkcs1,PKCS1 key decoding,))
-$(eval $(call BuildPlugin,pkcs8,PKCS8 key decoding,))
-$(eval $(call BuildPlugin,pkcs11,PKCS11 key decoding,))
-$(eval $(call BuildPlugin,pubkey,raw public key,))
-$(eval $(call BuildPlugin,random,RNG,))
-$(eval $(call BuildPlugin,resolve,DNS resolver,))
-$(eval $(call BuildPlugin,revocation,X509 CRL/OCSP revocation,))
-$(eval $(call BuildPlugin,sha1,SHA1 crypto,))
-$(eval $(call BuildPlugin,sha2,SHA2 crypto,))
-$(eval $(call BuildPlugin,smp,SMP configuration and control interface,+PACKAGE_strongswan-mod-smp:libxml2))
-$(eval $(call BuildPlugin,socket-default,default socket implementation for charon,))
-$(eval $(call BuildPlugin,socket-dynamic,dynamic socket implementation for charon,))
-$(eval $(call BuildPlugin,sql,SQL database interface,))
-$(eval $(call BuildPlugin,sqlite,SQLite database interface,+strongswan-mod-sql +PACKAGE_strongswan-mod-sqlite:libsqlite3))
-$(eval $(call BuildPlugin,stroke,Stroke,+strongswan-utils))
-$(eval $(call BuildPlugin,test-vectors,crypto test vectors,))
-$(eval $(call BuildPlugin,uci,UCI config interface,+PACKAGE_strongswan-mod-uci:libuci))
-$(eval $(call BuildPlugin,unity,Cisco Unity extension,))
-$(eval $(call BuildPlugin,updown,updown firewall,))
-$(eval $(call BuildPlugin,whitelist,peer identity whitelisting,))
-$(eval $(call BuildPlugin,x509,x509 certificate,))
-$(eval $(call BuildPlugin,xauth-eap,EAP XAuth backend,))
-$(eval $(call BuildPlugin,xauth-generic,generic XAuth backend,))
-$(eval $(call BuildPlugin,xcbc,xcbc crypto,))
-

--- a/net/strongswan/files/ipsec.init
+++ /dev/null
@@ -1,21 +1,1 @@
-#!/bin/sh /etc/rc.common
 
-START=90
-STOP=10
-
-start() {
-	ipsec start
-}
-
-stop() {
-	ipsec stop
-}
-
-restart() {
-	ipsec restart
-}
-
-reload() {
-	ipsec update
-}
-

--- a/net/strongswan/files/ipsec.secrets
+++ /dev/null
@@ -1,2 +1,1 @@
-# /etc/ipsec.secrets - strongSwan IPsec secrets file
 

--- a/net/strongswan/files/ipsec.user
+++ /dev/null
@@ -1,7 +1,1 @@
-# This file is interpreted as shell script.
-# Put your custom ip rules here, they will
-# be executed with each call to the script
-# /usr/lib/ipsec/_updown which by default
-# strongswan executes.
 
-

--- a/net/strongswan/patches/100-method_name_fix.patch
+++ /dev/null
@@ -1,41 +1,1 @@
---- a/src/libipsec/ip_packet.c
-+++ b/src/libipsec/ip_packet.c
-@@ -95,7 +95,7 @@ METHOD(ip_packet_t, get_next_header, u_i
- 	return this->next_header;
- }
- 
--METHOD(ip_packet_t, clone, ip_packet_t*,
-+METHOD(ip_packet_t, clone_, ip_packet_t*,
- 	private_ip_packet_t *this)
- {
- 	return ip_packet_create(chunk_clone(this->packet));
-@@ -183,7 +183,7 @@ ip_packet_t *ip_packet_create(chunk_t pa
- 			.get_destination = _get_destination,
- 			.get_next_header = _get_next_header,
- 			.get_encoding = _get_encoding,
--			.clone = _clone,
-+			.clone = _clone_,
- 			.destroy = _destroy,
- 		},
- 		.src = src,
---- a/src/libipsec/esp_packet.c
-+++ b/src/libipsec/esp_packet.c
-@@ -115,7 +115,7 @@ METHOD(packet_t, skip_bytes, void,
- 	return this->packet->skip_bytes(this->packet, bytes);
- }
- 
--METHOD(packet_t, clone, packet_t*,
-+METHOD(packet_t, clone_, packet_t*,
- 	private_esp_packet_t *this)
- {
- 	private_esp_packet_t *pkt;
-@@ -414,7 +414,7 @@ static private_esp_packet_t *esp_packet_
- 				.get_dscp = _get_dscp,
- 				.set_dscp = _set_dscp,
- 				.skip_bytes = _skip_bytes,
--				.clone = _clone,
-+				.clone = _clone_,
- 				.destroy = _destroy,
- 			},
- 			.get_source = _get_source,
 

--- a/net/strongswan/patches/201-kmodloader.patch
+++ /dev/null
@@ -1,29 +1,1 @@
---- a/src/starter/netkey.c
-+++ b/src/starter/netkey.c
-@@ -31,7 +31,7 @@ bool starter_netkey_init(void)
- 		/* af_key module makes the netkey proc interface visible */
- 		if (stat(PROC_MODULES, &stb) == 0)
- 		{
--			ignore_result(system("modprobe -qv af_key"));
-+			ignore_result(system("modprobe af_key 2>&1 >/dev/null"));
- 		}
- 
- 		/* now test again */
-@@ -45,11 +45,11 @@ bool starter_netkey_init(void)
- 	/* make sure that all required IPsec modules are loaded */
- 	if (stat(PROC_MODULES, &stb) == 0)
- 	{
--		ignore_result(system("modprobe -qv ah4"));
--		ignore_result(system("modprobe -qv esp4"));
--		ignore_result(system("modprobe -qv ipcomp"));
--		ignore_result(system("modprobe -qv xfrm4_tunnel"));
--		ignore_result(system("modprobe -qv xfrm_user"));
-+		ignore_result(system("modprobe ah4 2>&1 >/dev/null"));
-+		ignore_result(system("modprobe esp4 2>&1 >/dev/null"));
-+		ignore_result(system("modprobe ipcomp 2>&1 >/dev/null"));
-+		ignore_result(system("modprobe xfrm4_tunnel 2>&1 >/dev/null"));
-+		ignore_result(system("modprobe xfrm_user 2>&1 >/dev/null"));
- 	}
- 
- 	DBG2(DBG_APP, "found netkey IPsec stack");
 

--- a/net/strongswan/patches/203-uci.patch
+++ /dev/null
@@ -1,21 +1,1 @@
---- a/src/libcharon/plugins/uci/uci_parser.c
-+++ b/src/libcharon/plugins/uci/uci_parser.c
-@@ -78,7 +78,7 @@ METHOD(enumerator_t, section_enumerator_
- 		if (uci_lookup(this->ctx, &element, this->package,
- 					   this->current->name, "name") == UCI_OK)
- 		{	/* use "name" attribute as config name if available ... */
--			*value = uci_to_option(element)->value;
-+			*value = uci_to_option(element)->v.string;
- 		}
- 		else
- 		{	/* ... or the section name becomes config name */
-@@ -93,7 +93,7 @@ METHOD(enumerator_t, section_enumerator_
- 		if (value && uci_lookup(this->ctx, &element, this->package,
- 						  this->current->name, this->keywords[i]) == UCI_OK)
- 		{
--			*value = uci_to_option(element)->value;
-+			*value = uci_to_option(element)->v.string;
- 		}
- 	}
- 	va_end(args);
 

--- a/net/strongswan/patches/300-include-ipsec-user-script.patch
+++ /dev/null
@@ -1,18 +1,1 @@
---- a/src/_updown/_updown.in
-+++ b/src/_updown/_updown.in
-@@ -16,11 +16,9 @@
- # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- # for more details.
- 
--# CAUTION:  Installing a new version of strongSwan will install a new
--# copy of this script, wiping out any custom changes you make.  If
--# you need changes, make a copy of this under another name, and customize
--# that, and use the (left/right)updown parameters in ipsec.conf to make
--# strongSwan use yours instead of this default one.
-+# Add your custom ip rules to the /etc/ipsec.user file if you need that functionality.
-+
-+[ -e /etc/ipsec.user ] && . /etc/ipsec.user "$1"
- 
- # things that this script gets (from ipsec_pluto(8) man page)
- #
 

file:a/net/uanytun/Makefile (deleted)
--- a/net/uanytun/Makefile
+++ /dev/null
@@ -1,208 +1,1 @@
-#
-# Copyright (C) 2008 Christian Pointner,
-#                    <equinox@anytun.org>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# This Makefile builds uAnytun Package for OpenWRT
-#
-# $Id: $
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=uanytun
-PKG_VERSION:=0.3.3
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.anytun.org/download/
-PKG_MD5SUM:=ca39dab02e91b0737e2b3f0839e74f6a
-
-include $(INCLUDE_DIR)/package.mk
-
-
-define Package/uanytun/template
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=micro anycast tunneling daemon
-  URL:=http://www.anytun.org/
-  MAINTAINER:=Christian Pointner <equinox@anytun.org>
-  SUBMENU:=VPN
-endef
-
-define Package/uanytun/desc-template
-uAnytun is a tiny implementation of SATP the secure anycast tunneling protocol.
-  SATP defines a protocol used for communication between any combination of
-  unicast and anycast tunnel endpoints.  It has less protocol overhead than
-  IPSec in Tunnel mode and allows tunneling of every ETHER TYPE protocol (e.g.
-  ethernet, ip, arp ...). SATP directly includes cryptography and message
-  authentication based on the methodes used by SRTP.  It is intended to deliver
-  a generic, scaleable and secure solution for tunneling and relaying of packets
-  of any protocol.
-  Unlike Anytun which is a full featured implementation uAnytun has no support
-  for multiple connections or synchronisation. It is a small single threaded
-  implementation intended to act as a client on small platforms.
-endef
-
-
-define Package/uanytun
-  $(call Package/uanytun/template)
-  DEPENDS:=+kmod-tun +libgcrypt
-endef
-
-define Package/uanytun/conffiles
-/etc/config/uanytun
-endef
-
-define Package/uanytun/description
-  $(call Package/uanytun/desc-template)
-endef
-
-
-define Package/uanytun-sslcrypt
-  $(call Package/uanytun/template)
-  DEPENDS:=+kmod-tun +libopenssl
-endef
-
-define Package/uanytun-sslcrypt/conffiles
-/etc/config/uanytun-sslcrypt
-endef
-
-define Package/uanytun-sslcrypt/description
-  $(call Package/uanytun/desc-template)
-endef
-
-
-define Package/uanytun-nocrypt
-  $(call Package/uanytun/template)
-  DEPENDS:=+kmod-tun
-endef
-
-define Package/uanytun-nocrypt/conffiles
-/etc/config/uanytun-nocrypt
-endef
-
-define Package/uanytun-nocrypt/description
-  $(call Package/uanytun/desc-template)
-endef
-
-define Package/uanytun/configure
-	(cd $(1)/$(2)/src; \
-    touch include.mk; \
-    ln -s linux/tun.c .; \
-    echo '#ifndef UANYTUN_version_h_INCLUDED' > version.h; \
-    echo '#define UANYTUN_version_h_INCLUDED' >> version.h; \
-    echo '' >> version.h; \
-    echo '#define VERSION_STRING_0 "uanytun version '`cat $(1)/version`'"' >> version.h; \
-    echo '#define VERSION_STRING_1 "built on '`hostname`', '`date +"%d.%m.%Y %H:%M:%S %Z"`'"' >> version.h; \
-    echo '' >> version.h; \
-    echo '#endif' >> version.h \
-  )
-endef
-
-ifneq ($(CONFIG_PACKAGE_uanytun-nocrypt),)
- define Build/Configure/uanytun-nocrypt
-	rm -rf $(PKG_BUILD_DIR)/uanytun-nocrypt
-	mkdir -p $(PKG_BUILD_DIR)/uanytun-nocrypt
-	$(CP) -r $(PKG_BUILD_DIR)/src $(PKG_BUILD_DIR)/uanytun-nocrypt
-	$(call Package/uanytun/configure,$(PKG_BUILD_DIR),uanytun-nocrypt)
- endef
-
- define Build/Compile/uanytun-nocrypt
-	$(MAKE) -C $(PKG_BUILD_DIR)/uanytun-nocrypt/src \
-    $(TARGET_CONFIGURE_OPTS) \
-    NO_CRYPT_OBJ=1 \
-    TARGET=Linux \
-    CFLAGS="$(TARGET_CFLAGS) -DNO_CRYPT" \
-    LDFLAGS="$(TARGET_LDFLAGS) -ldl"
-	$(STRIP) $(PKG_BUILD_DIR)/uanytun-nocrypt/src/uanytun
- endef
-endif
-
-ifneq ($(CONFIG_PACKAGE_uanytun-sslcrypt),)
- define Build/Configure/uanytun-sslcrypt
-	rm -rf $(PKG_BUILD_DIR)/uanytun-sslcrypt
-	mkdir -p $(PKG_BUILD_DIR)/uanytun-sslcrypt
-	$(CP) -r $(PKG_BUILD_DIR)/src $(PKG_BUILD_DIR)/uanytun-sslcrypt
-	$(call Package/uanytun/configure,$(PKG_BUILD_DIR),uanytun-sslcrypt)
- endef
-
- define Build/Compile/uanytun-sslcrypt
-	$(MAKE) -C $(PKG_BUILD_DIR)/uanytun-sslcrypt/src \
-    $(TARGET_CONFIGURE_OPTS) \
-    TARGET=Linux \
-    CFLAGS="$(TARGET_CFLAGS) -DUSE_SSL_CRYPTO -I$(STAGING_DIR)/usr/include" \
-    LDFLAGS="$(TARGET_LDFLAGS) -ldl -lcrypto"
-	$(STRIP) $(PKG_BUILD_DIR)/uanytun-sslcrypt/src/uanytun
- endef
-endif
-
-ifneq ($(CONFIG_PACKAGE_uanytun),)
- define Build/Configure/uanytun-default
-	rm -rf $(PKG_BUILD_DIR)/uanytun
-	mkdir -p $(PKG_BUILD_DIR)/uanytun
-	$(CP) -r $(PKG_BUILD_DIR)/src $(PKG_BUILD_DIR)/uanytun
-	$(call Package/uanytun/configure,$(PKG_BUILD_DIR),uanytun)
- endef
-
- define Build/Compile/uanytun-default
-	$(MAKE) -C $(PKG_BUILD_DIR)/uanytun/src \
-    $(TARGET_CONFIGURE_OPTS) \
-    TARGET=Linux \
-    CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
-    LDFLAGS="$(TARGET_LDFLAGS) -ldl -lgcrypt -lgpg-error"
-	$(STRIP) $(PKG_BUILD_DIR)/uanytun/src/uanytun
- endef
-endif
-
-
-define Build/Configure
-	$(call Build/Configure/uanytun-nocrypt)
-	$(call Build/Configure/uanytun-sslcrypt)
-	$(call Build/Configure/uanytun-default)
-endef
-
-define Build/Compile
-	$(call Build/Compile/uanytun-nocrypt)
-	$(call Build/Compile/uanytun-sslcrypt)
-	$(call Build/Compile/uanytun-default)
-endef
-
-define Build/Clean
-	rm -rf $(PKG_BUILD_DIR)/uanytun-nocrypt
-	rm -rf $(PKG_BUILD_DIR)/uanytun-sslcrypt
-	rm -rf $(PKG_BUILD_DIR)/uanytun
-endef
-
-
-
-define Package/uanytun/install-generic
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/$(3) $(1)/etc/config/$(2)
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(2)/src/uanytun $(1)/usr/sbin/$(2)
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/uanytun.init $(1)/etc/init.d/$(2)
-	@sed -e 's/BIN=uanytun/BIN=$(2)/' -i $(1)/etc/init.d/$(2)
-endef
-
-define Package/uanytun/install
-  $(call Package/uanytun/install-generic,$(1),uanytun,uanytun.config)
-endef
-
-define Package/uanytun-sslcrypt/install
-  $(call Package/uanytun/install-generic,$(1),uanytun-sslcrypt,uanytun.config)
-endef
-
-define Package/uanytun-nocrypt/install
-  $(call Package/uanytun/install-generic,$(1),uanytun-nocrypt,uanytun-nocrypt.config)
-endef
-
-
-
-$(eval $(call BuildPackage,uanytun))
-$(eval $(call BuildPackage,uanytun-sslcrypt))
-$(eval $(call BuildPackage,uanytun-nocrypt))
-

--- a/net/uanytun/files/uanytun-nocrypt.config
+++ /dev/null
@@ -1,89 +1,1 @@
-config "client1"
-  option disabled 0
-  option username 'nobody'
-  option groupname 'nogroup'
-#  option chroot "/var/run/uanytun"
 
-#  option interface '<ip-address>'
-#  option port '4444'
-#  option sender_id '1'
-
-#  option dev 'anytun0'
-  option type 'tun'
-  option ifconfig '192.168.123.1/24'
-#  option post-up-script '/etc/uanytun/client1-post-up.sh'
-
-  option remote_host 'example.com'
-  option remote_port '4444'
-
-  option window_size 0
-  option mux 1
-
-  option log 'syslog:3,anytun-client1,daemon'
-
-
-config "client2"
-  option disabled 1
-  option username 'nobody'
-  option groupname 'nogroup'
-
-  option type 'tun'
-  option ifconfig '192.168.123.2/24'
-
-  option remote_host 'example.com'
-  option remote_port '4444'
-
-  option window_size 0
-  option mux 2
-
-  option log 'syslog:3,anytun-client2,daemon'
-
-
-config "client3"
-  option disabled 1
-  option username 'nobody'
-  option groupname 'nogroup'
-
-  option type 'tun'
-  option ifconfig '192.168.123.3/24'
-
-  option remote_host 'example.com'
-  option remote_port '4444'
-
-  option window_size 0
-  option mux 3
-
-  option log 'syslog:3,anytun-client3,daemon'
-
-
-config "p2p-a"
-  option disabled 1
-  option username 'nobody'
-  option groupname 'nogroup'
-
-  option type 'tun'
-  option ifconfig '192.168.223.1/24'
-
-  option remote_host 'p2p-b.example.com'
-  option remote_port '4444'
-
-  option window_size 0
-
-  option log 'syslog:3,anytun-p2p-a,daemon'
-
-
-config "p2p-b"
-  option disabled 1
-  option username 'nobody'
-  option groupname 'nogroup'
-
-  option type 'tun'
-  option ifconfig '192.168.223.2/24'
-
-  option remote_host 'p2p-a.example.com'
-  option remote_port '4444'
-
-  option window_size 0
-
-  option log 'syslog:3,anytun-p2p-b,daemon'
-

--- a/net/uanytun/files/uanytun.config
+++ /dev/null
@@ -1,117 +1,1 @@
-config "client1"
-  option disabled 0
-#  option username 'nobody'
-#  option groupname 'nogroup'
-#  option chroot "/var/run/uanytun"
 
-#  option interface '<ip-address>'
-#  option port '4444'
-#  option sender_id '1'
-
-  option cipher 'aes-ctr'
-#  option cipher 'null'
-#  option cipher 'aes-ctr-128'
-#  option cipher 'aes-ctr-192'
-#  option cipher 'aes-ctr-256'
-  option auth_algo 'sha1'
-#  option auth_algo 'null'
-#  option auth_tag_length 10
-
-#  option dev 'anytun0'
-  option type 'tun'
-  option ifconfig '192.168.123.1/24'
-#  option post-up-script '/etc/uanytun/client1-post-up.sh'
-
-  option remote_host 'example.com'
-  option remote_port '4444'
-
-  option window_size 0
-  option mux 1
-
-  option role 'client'
-#  option kd_prf 'null'
-#  option kd_prf 'aes-ctr'
-#  option kd_prf 'aes-ctr-128'
-#  option kd_prf 'aes-ctr-192'
-#  option kd_prf 'aes-ctr-256'
-#  option ld_kdr '0'
-#  option key '0123456789ABCDEF0123456789ABCDEF'
-#  option salt '0123456789ABCD0123456789ABCD'
-  option passphrase 'Creating_VPN_Tunnels_With_Anytun_Is_Easy'
-
-  option log 'syslog:3,anytun-client1,daemon'
-
-
-config "client2"
-  option disabled 1
-
-  option cipher 'aes-ctr'
-  option auth_algo 'sha1'
-  option type 'tun'
-  option ifconfig '192.168.123.2/24'
-
-  option remote_host 'example.com'
-  option remote_port '4444'
-
-  option window_size 0
-  option mux 2
-  option role 'client'
-  option passphrase 'Creating_VPN_Tunnels_With_Anytun_Is_Easy'
-
-  option log 'syslog:3,anytun-client2,daemon'
-
-
-config "client3"
-  option disabled 1
-
-  option cipher 'aes-ctr'
-  option auth_algo 'sha1'
-  option type 'tun'
-  option ifconfig '192.168.123.3/24'
-
-  option remote_host 'example.com'
-  option remote_port '4444'
-
-  option window_size 0
-  option mux 3
-  option role 'client'
-  option passphrase 'Creating_VPN_Tunnels_With_Anytun_Is_Easy'
-
-  option log 'syslog:3,anytun-client3,daemon'
-
-
-config "p2p-a"
-  option disabled 1
-
-  option cipher 'aes-ctr'
-  option auth_algo 'sha1'
-  option type 'tun'
-  option ifconfig '192.168.223.1/24'
-
-  option remote_host 'p2p-b.example.com'
-  option remote_port '4444'
-
-  option window_size 0
-  option role 'alice'
-  option passphrase 'Creating_P2P_VPN_Tunnels_With_Anytun_Is_Easy'
-
-  option log 'syslog:3,anytun-p2p-a,daemon'
-
-
-config "p2p-b"
-  option disabled 1
-
-  option cipher 'aes-ctr'
-  option auth_algo 'sha1'
-  option type 'tun'
-  option ifconfig '192.168.223.2/24'
-
-  option remote_host 'p2p-a.example.com'
-  option remote_port '4444'
-
-  option window_size 0
-  option role 'bob'
-  option passphrase 'Creating_P2P_VPN_Tunnels_With_Anytun_Is_Easy'
-
-  option log 'syslog:3,anytun-p2p-b,daemon'
-

--- a/net/uanytun/files/uanytun.init
+++ /dev/null
@@ -1,105 +1,1 @@
-#!/bin/sh /etc/rc.common
-START=50
 
-BIN=uanytun
-DAEMON=/usr/sbin/$BIN
-DESC=$BIN
-RUN_D=/var/run
-
-
-option_cb() {
-  local varname="$1"
-  local value="$2"
-
-  if ! echo "$CONFIG_OPTIONS" | grep " $varname " > /dev/null; then
-    CONFIG_OPTIONS="$CONFIG_OPTIONS $varname "
-  fi
-}
-
-foreach_config_forced() {
-  foreach_config $1 "forced"
-}
-
-foreach_config() {
-  local cfg="$1"
-  local name
-  local option
-  local value
-  local args=""
-  local forced=0
-
-  if [ -n "$2" ] && [ "x$2" == "xforced" ]; then
-    forced=1
-  fi
-
-  config_get name "$cfg" TYPE
-  for option in $CONFIG_OPTIONS
-  do
-    config_get value "$cfg" "$option"
-    if [ "x$option" == "xdisabled" ]; then
-      if [ $forced -eq 0 ] && [ $value -eq 1 ]; then
-        echo -n " $name(disabled)"
-        return
-      fi
-      continue
-    fi
-
-    option=`echo $option | tr '_' '-'`
-    if [ -n "$value" ]; then
-      args="$args --$option $value"
-    fi
-  done
-  echo -n " $name"
-  local status="OK"
-  $DAEMON --write-pid "$RUN_D/$BIN.$name.pid" $args || status="failed"
-  echo -n "($status)"
-}
-
-stop_vpn() {
-  local name=$1
-  local pidfile=$RUN_D/$BIN.$name.pid
-  echo -n " $name"
-  local status="OK"
-  if [ ! -f "$pidfile" ]; then
-    status="tunnel not active"    
-  else
-    kill `cat $pidfile` > /dev/null 2>&1 || status="failed"
-    rm -f $pidfile
-  fi
-  echo -n "($status)"
-}
-
-start() {
-  echo -n "Starting $DESC:"
-  config_load $BIN  
-  if [ $# -gt 0 ]; then
-    while [ $# -gt 0 ]; do
-      config_foreach foreach_config_forced "$1"
-      shift
-    done
-  else
-    config_foreach foreach_config ""
-  fi
-  echo "."
-}
-
-stop() {
-  echo -n "Stopping $DESC:"
-  local name
-  local pidfile
-
-  if [ $# -gt 0 ]; then
-    while [ $# -gt 0 ]; do
-      stop_vpn $1
-      shift
-    done
-  else
-    for pidfile in `ls $RUN_D/$BIN.*.pid 2> /dev/null`; do
-      name=${pidfile%%.pid}
-      name=${name##$RUN_D/$BIN.}
-      stop_vpn $name
-    done
-  fi
-  echo "."
-}
-

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/umurmur/Makefile (deleted)
--- a/net/umurmur/Makefile
+++ /dev/null
@@ -1,96 +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:=umurmur
-PKG_VERSION:=0.2.14
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://umurmur.googlecode.com/files
-PKG_MD5SUM:=e22121b4b91f4c9de43f858f6defa0b0
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/umurmur/Default
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Instant Messaging
-  TITLE:=uMurmur
-  DEPENDS:=+libconfig +libprotobuf-c
-  URL:=http://code.google.com/p/umurmur
-  MAINTAINER:=Martin Johansson <martin@fatbob.nu>
-endef
-
-define Package/umurmur/Default/description
-  Minimalistic Mumble server daemon.
-endef
-
-define Package/umurmur-openssl
-  $(call Package/umurmur/Default)
-  TITLE+= (with OpenSSL support)
-  DEPENDS+= +libopenssl
-  VARIANT:=openssl
-endef
-
-define Package/umurmur-openssl/description
-  $(call Package/umurmur/Default/description)
-  Uses OpenSSL library for SSL and crypto.
-endef
-
-define Package/umurmur-polarssl
-  $(call Package/umurmur/Default)
-  TITLE+= (with PolarSSL support)
-  DEPENDS+= +libpolarssl
-  VARIANT:=polarssl
-endef
-
-define Package/umurmur-polarssl/description
-  $(call Package/umurmur/Default/description)
-  Uses the PolarSSL library for SSL and crypto.
-endef
-
-define Build/Compile
-	CC="$(TARGET_CC)" \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	$(MAKE) -C $(PKG_BUILD_DIR)/src all
-endef
-
-define Package/umurmur-openssl/conffiles
-/etc/umurmur.conf
-endef
-
-Package/umurmur-polarssl/conffiles = $(Package/umurmur-openssl/conffiles)
-
-define Package/umurmur-openssl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/umurmurd $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/openwrt/files/umurmur.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/openwrt/files/umurmur.init $(1)/etc/init.d/umurmur
-	$(INSTALL_DIR) $(1)/etc/umurmur
-endef
-
-Package/umurmur-polarssl/install = $(Package/umurmur-openssl/install)
-
-ifeq ($(BUILD_VARIANT),openssl)
-  CONFIGURE_ARGS += \
-	--with-ssl=openssl
-endif
-
-ifeq ($(BUILD_VARIANT),polarssl)
-  CONFIGURE_ARGS += \
-	--with-ssl=polarssl
-endif
-
-$(eval $(call BuildPackage,umurmur-openssl))
-$(eval $(call BuildPackage,umurmur-polarssl))
-

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/bash/Makefile (deleted)
--- a/utils/bash/Makefile
+++ /dev/null
@@ -1,65 +1,1 @@
-#
-# Copyright (C) 2007-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:=bash
-PKG_VERSION:=4.2
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@GNU/bash
-PKG_MD5SUM:=3fb927c7c33022f1c327f14a81c0d4b0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bash
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=The GNU Bourne Again SHell
-  DEPENDS:=+libncurses
-  URL:=http://www.gnu.org/software/bash/
-endef
-
-define Package/bash/description
-	Bash is an sh-compatible command language interpreter that executes
-	commands read from the standard input or from a file. Bash also
-	incorporates useful features from the Korn and C shells (ksh and csh).
-endef
-
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--without-bash-malloc \
-                --bindir=/bin \
-	)
-endef
-
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/builtins LDFLAGS_FOR_BUILD= mkbuiltins
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		SHELL="/bin/bash" \
-		all install
-endef
-
-define Package/bash/postinst
-#!/bin/sh
-grep bash $${IPKG_INSTROOT}/etc/shells || \
-	echo "/bin/bash" >> $${IPKG_INSTROOT}/etc/shells
-	echo "/bin/rbash" >> $${IPKG_INSTROOT}/etc/shells
-endef
-
-define Package/bash/install
-	$(INSTALL_DIR) $(1)/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/bash $(1)/bin/
-	ln -sf bash $(1)/bin/rbash
-endef
-
-$(eval $(call BuildPackage,bash))
-

--- a/utils/bash/patches/001-compile-fix.patch
+++ /dev/null
@@ -1,16 +1,1 @@
---- a/execute_cmd.c
-+++ b/execute_cmd.c
-@@ -2202,7 +2202,11 @@ execute_pipeline (command, asynchronous,
-   /* If the `lastpipe' option is set with shopt, and job control is not
-      enabled, execute the last element of non-async pipelines in the
-      current shell environment. */
--  if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
-+  if (lastpipe_opt &&
-+#if defined(JOB_CONTROL)
-+               job_control == 0 && 
-+#endif
-+               asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
-     {
-       lstdin = move_to_high_fd (0, 0, 255);
-       if (lstdin > 0)
 

--- a/utils/bash/patches/002-force-internal-readline.patch
+++ /dev/null
@@ -1,25 +1,1 @@
---- a/configure
-+++ b/configure
-@@ -5748,8 +5748,7 @@ _ACEOF
- 		# static version specified as -llibname to override the
- 		# dynamic version
- 		case "${host_os}" in
--		darwin[89]*|darwin10*) READLINE_LIB='${READLINE_LIBRARY}' ;;
--		*)		READLINE_LIB=-lreadline ;;
-+		*) READLINE_LIB='${READLINE_LIBRARY}' ;;
- 		esac
- 	fi
- else
---- a/configure.in
-+++ b/configure.in
-@@ -540,8 +540,7 @@ if test $opt_readline = yes; then
- 		# static version specified as -llibname to override the
- 		# dynamic version
- 		case "${host_os}" in
--		darwin[[89]]*|darwin10*) READLINE_LIB='${READLINE_LIBRARY}' ;;
--		*)		READLINE_LIB=-lreadline ;;
-+		*) READLINE_LIB='${READLINE_LIBRARY}' ;;
- 		esac
- 	fi
- else
 

--- a/utils/bash/patches/101-upstream-bash42-001.patch
+++ /dev/null
@@ -1,66 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-001
-
-Bug-Reported-by:	Juergen Daubert <jue@jue.li>
-Bug-Reference-ID:	<20110214175132.GA19813@jue.netz>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00125.html
-
-Bug-Description:
-
-When running in Posix mode, bash does not correctly expand the right-hand
-side of a double-quoted word expansion containing single quotes.
-
-Patch (apply with `patch -p0'):
-
---- a/subst.c
-+++ b/subst.c
-@@ -1379,10 +1379,12 @@ extract_dollar_brace_string (string, sin
-   slen = strlen (string + *sindex) + *sindex;
- 
-   /* The handling of dolbrace_state needs to agree with the code in parse.y:
--     parse_matched_pair() */
--  dolbrace_state = 0;
--  if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
--    dolbrace_state = (flags & SX_POSIXEXP) ? DOLBRACE_QUOTE : DOLBRACE_PARAM;
-+     parse_matched_pair().  The different initial value is to handle the
-+     case where this function is called to parse the word in
-+     ${param op word} (SX_WORD). */
-+  dolbrace_state = (flags & SX_WORD) ? DOLBRACE_WORD : DOLBRACE_PARAM;
-+  if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && (flags & SX_POSIXEXP))
-+    dolbrace_state = DOLBRACE_QUOTE;
- 
-   i = *sindex;
-   while (c = string[i])
-@@ -7176,7 +7178,7 @@ parameter_brace_expand (string, indexp, 
-     {
-       /* Extract the contents of the ${ ... } expansion
- 	 according to the Posix.2 rules. */
--      value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#') ? SX_POSIXEXP : 0);
-+      value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#' || c =='/' || c == '^' || c == ',' || c ==':') ? SX_POSIXEXP|SX_WORD : SX_WORD);
-       if (string[sindex] == RBRACE)
- 	sindex++;
-       else
---- a/subst.h
-+++ b/subst.h
-@@ -56,6 +56,7 @@
- #define SX_NOLONGJMP	0x0040	/* don't longjmp on fatal error */
- #define SX_ARITHSUB	0x0080	/* extracting $(( ... )) (currently unused) */
- #define SX_POSIXEXP	0x0100	/* extracting new Posix pattern removal expansions in extract_dollar_brace_string */
-+#define SX_WORD		0x0200	/* extracting word in ${param op word} */
- 
- /* Remove backslashes which are quoting backquotes from STRING.  Modifies
-    STRING, and returns a pointer to it. */
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 0
-+#define PATCHLEVEL 1
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/102-upstream-bash42-002.patch
+++ /dev/null
@@ -1,51 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-002
-
-Bug-Reported-by:	Clark J. Wang <dearvoid@gmail.com>
-Bug-Reference-ID:	<AANLkTimGbW7aC4E5infXP6ku5WPci4t=xVc+L1SyHqrD@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html
-
-Bug-Description:
-
-The readline vi-mode `cc', `dd', and `yy' commands failed to modify the
-entire line.
-
-Patch (apply with `patch -p0'):
-
---- a/lib/readline/vi_mode.c
-+++ b/lib/readline/vi_mode.c
-@@ -1114,7 +1114,7 @@ rl_domove_read_callback (m)
-       rl_beg_of_line (1, c);
-       _rl_vi_last_motion = c;
-       RL_UNSETSTATE (RL_STATE_VIMOTION);
--      return (0);
-+      return (vidomove_dispatch (m));
-     }
- #if defined (READLINE_CALLBACKS)
-   /* XXX - these need to handle rl_universal_argument bindings */
---- a/lib/readline/callback.c
-+++ b/lib/readline/callback.c
-@@ -148,6 +148,9 @@ rl_callback_read_char ()
- 	  eof = _rl_vi_domove_callback (_rl_vimvcxt);
- 	  /* Should handle everything, including cleanup, numeric arguments,
- 	     and turning off RL_STATE_VIMOTION */
-+	  if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
-+	    _rl_internal_char_cleanup ();
-+
- 	  return;
- 	}
- #endif
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 1
-+#define PATCHLEVEL 2
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/103-upstream-bash42-003.patch
+++ /dev/null
@@ -1,232 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-003
-
-Bug-Reported-by:	Clark J. Wang <dearvoid@gmail.com>
-Bug-Reference-ID:	<AANLkTikZ_rVV-frR8Fh0PzhXnMKnm5XsUR-F3qtPPs5G@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00136.html
-
-Bug-Description:
-
-When using the pattern replacement and pattern removal word expansions, bash
-miscalculates the possible match length in the presence of an unescaped left
-bracket without a closing right bracket, resulting in a failure to match
-the pattern.
-
-Patch (apply with `patch -p0'):
-
---- a/lib/glob/gmisc.c
-+++ b/lib/glob/gmisc.c
-@@ -77,8 +77,8 @@ wmatchlen (wpat, wmax)
-      wchar_t *wpat;
-      size_t wmax;
- {
--  wchar_t wc, *wbrack;
--  int matlen, t, in_cclass, in_collsym, in_equiv;
-+  wchar_t wc;
-+  int matlen, bracklen, t, in_cclass, in_collsym, in_equiv;
- 
-   if (*wpat == 0)
-     return (0);
-@@ -118,58 +118,80 @@ wmatchlen (wpat, wmax)
- 	  break;
- 	case L'[':
- 	  /* scan for ending `]', skipping over embedded [:...:] */
--	  wbrack = wpat;
-+	  bracklen = 1;
- 	  wc = *wpat++;
- 	  do
- 	    {
- 	      if (wc == 0)
- 		{
--	          matlen += wpat - wbrack - 1;	/* incremented below */
--	          break;
-+		  wpat--;			/* back up to NUL */
-+	          matlen += bracklen;
-+	          goto bad_bracket;
- 	        }
- 	      else if (wc == L'\\')
- 		{
--		  wc = *wpat++;
--		  if (*wpat == 0)
--		    break;
-+		  /* *wpat == backslash-escaped character */
-+		  bracklen++;
-+		  /* If the backslash or backslash-escape ends the string,
-+		     bail.  The ++wpat skips over the backslash escape */
-+		  if (*wpat == 0 || *++wpat == 0)
-+		    {
-+		      matlen += bracklen;
-+		      goto bad_bracket;
-+		    }
- 		}
- 	      else if (wc == L'[' && *wpat == L':')	/* character class */
- 		{
- 		  wpat++;
-+		  bracklen++;
- 		  in_cclass = 1;
- 		}
- 	      else if (in_cclass && wc == L':' && *wpat == L']')
- 		{
- 		  wpat++;
-+		  bracklen++;
- 		  in_cclass = 0;
- 		}
- 	      else if (wc == L'[' && *wpat == L'.')	/* collating symbol */
- 		{
- 		  wpat++;
-+		  bracklen++;
- 		  if (*wpat == L']')	/* right bracket can appear as collating symbol */
--		    wpat++;
-+		    {
-+		      wpat++;
-+		      bracklen++;
-+		    }
- 		  in_collsym = 1;
- 		}
- 	      else if (in_collsym && wc == L'.' && *wpat == L']')
- 		{
- 		  wpat++;
-+		  bracklen++;
- 		  in_collsym = 0;
- 		}
- 	      else if (wc == L'[' && *wpat == L'=')	/* equivalence class */
- 		{
- 		  wpat++;
-+		  bracklen++;
- 		  if (*wpat == L']')	/* right bracket can appear as equivalence class */
--		    wpat++;
-+		    {
-+		      wpat++;
-+		      bracklen++;
-+		    }
- 		  in_equiv = 1;
- 		}
- 	      else if (in_equiv && wc == L'=' && *wpat == L']')
- 		{
- 		  wpat++;
-+		  bracklen++;
- 		  in_equiv = 0;
- 		}
-+	      else
-+		bracklen++;
- 	    }
- 	  while ((wc = *wpat++) != L']');
- 	  matlen++;		/* bracket expression can only match one char */
-+bad_bracket:
- 	  break;
- 	}
-     }
-@@ -213,8 +235,8 @@ umatchlen (pat, max)
-      char *pat;
-      size_t max;
- {
--  char c, *brack;
--  int matlen, t, in_cclass, in_collsym, in_equiv;
-+  char c;
-+  int matlen, bracklen, t, in_cclass, in_collsym, in_equiv;
- 
-   if (*pat == 0)
-     return (0);
-@@ -254,58 +276,80 @@ umatchlen (pat, max)
- 	  break;
- 	case '[':
- 	  /* scan for ending `]', skipping over embedded [:...:] */
--	  brack = pat;
-+	  bracklen = 1;
- 	  c = *pat++;
- 	  do
- 	    {
- 	      if (c == 0)
- 		{
--	          matlen += pat - brack - 1;	/* incremented below */
--	          break;
-+		  pat--;			/* back up to NUL */
-+		  matlen += bracklen;
-+		  goto bad_bracket;
- 	        }
- 	      else if (c == '\\')
- 		{
--		  c = *pat++;
--		  if (*pat == 0)
--		    break;
-+		  /* *pat == backslash-escaped character */
-+		  bracklen++;
-+		  /* If the backslash or backslash-escape ends the string,
-+		     bail.  The ++pat skips over the backslash escape */
-+		  if (*pat == 0 || *++pat == 0)
-+		    {
-+		      matlen += bracklen;
-+		      goto bad_bracket;
-+		    }
- 		}
- 	      else if (c == '[' && *pat == ':')	/* character class */
- 		{
- 		  pat++;
-+		  bracklen++;
- 		  in_cclass = 1;
- 		}
- 	      else if (in_cclass && c == ':' && *pat == ']')
- 		{
- 		  pat++;
-+		  bracklen++;
- 		  in_cclass = 0;
- 		}
- 	      else if (c == '[' && *pat == '.')	/* collating symbol */
- 		{
- 		  pat++;
-+		  bracklen++;
- 		  if (*pat == ']')	/* right bracket can appear as collating symbol */
--		    pat++;
-+		    {
-+		      pat++;
-+		      bracklen++;
-+		    }
- 		  in_collsym = 1;
- 		}
- 	      else if (in_collsym && c == '.' && *pat == ']')
- 		{
- 		  pat++;
-+		  bracklen++;
- 		  in_collsym = 0;
- 		}
- 	      else if (c == '[' && *pat == '=')	/* equivalence class */
- 		{
- 		  pat++;
-+		  bracklen++;
- 		  if (*pat == ']')	/* right bracket can appear as equivalence class */
--		    pat++;
-+		    {
-+		      pat++;
-+		      bracklen++;
-+		    }
- 		  in_equiv = 1;
- 		}
- 	      else if (in_equiv && c == '=' && *pat == ']')
- 		{
- 		  pat++;
-+		  bracklen++;
- 		  in_equiv = 0;
- 		}
-+	      else
-+		bracklen++;
- 	    }
- 	  while ((c = *pat++) != ']');
- 	  matlen++;		/* bracket expression can only match one char */
-+bad_bracket:
- 	  break;
- 	}
-     }
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 2
-+#define PATCHLEVEL 3
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/104-upstream-bash42-004.patch
+++ /dev/null
@@ -1,41 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-004
-
-Bug-Reported-by:	Mike Frysinger <vapier@gentoo.org>
-Bug-Reference-ID:	<201102182106.17834.vapier@gentoo.org>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00222.html
-
-Bug-Description:
-
-When used in contexts where word splitting and quote removal were not
-performed, such as pattern removal or pattern substitution, empty strings
-(either literal or resulting from quoted variables that were unset or
-null) were not matched correctly, resulting in failure.
-
-Patch (apply with `patch -p0'):
-
---- a/subst.c
-+++ b/subst.c
-@@ -3373,7 +3373,7 @@ expand_string_for_rhs (string, quoted, d
-   if (string == 0 || *string == '\0')
-     return (WORD_LIST *)NULL;
- 
--  td.flags = 0;
-+  td.flags = W_NOSPLIT2;		/* no splitting, remove "" and '' */
-   td.word = string;
-   tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at);
-   return (tresult);
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 3
-+#define PATCHLEVEL 4
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/105-upstream-bash42-005.patch
+++ /dev/null
@@ -1,115 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-005
-
-Bug-Reported-by:	Dennis Williamson <dennistwilliamson@gmail.com>
-Bug-Reference-ID:	<AANLkTikDbEV5rnbPc0zOfmZfBcg0xGetzLLzK+KjRiNa@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00147.html
-
-Bug-Description:
-
-Systems that use tzset() to set the local timezone require the TZ variable
-to be in the environment.  Bash must make sure the environment has been
-modified with any updated value for TZ before calling tzset().  This
-affects prompt string expansions and the `%T' printf conversion specification
-on systems that do not allow bash to supply a replacement for getenv(3).
-
-Patch (apply with `patch -p0'):
-
---- a/variables.h
-+++ b/variables.h
-@@ -313,6 +313,7 @@ extern void set_func_auto_export __P((co
- 
- extern void sort_variables __P((SHELL_VAR **));
- 
-+extern int chkexport __P((char *));
- extern void maybe_make_export_env __P((void));
- extern void update_export_env_inplace __P((char *, int, char *));
- extern void put_command_name_into_env __P((char *));
---- a/variables.c
-+++ b/variables.c
-@@ -3653,6 +3653,22 @@ n_shell_variables ()
-   return n;
- }
- 
-+int
-+chkexport (name)
-+     char *name;
-+{
-+  SHELL_VAR *v;
-+
-+  v = find_variable (name);
-+  if (exported_p (v))
-+    {
-+      array_needs_making = 1;
-+      maybe_make_export_env ();
-+      return 1;
-+    }
-+  return 0;
-+}
-+
- void
- maybe_make_export_env ()
- {
-@@ -4214,7 +4230,7 @@ static struct name_and_function special_
-   { "TEXTDOMAIN", sv_locale },
-   { "TEXTDOMAINDIR", sv_locale },
- 
--#if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE)
-+#if defined (HAVE_TZSET)
-   { "TZ", sv_tz },
- #endif
- 
-@@ -4558,12 +4574,13 @@ sv_histtimefmt (name)
- }
- #endif /* HISTORY */
- 
--#if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE)
-+#if defined (HAVE_TZSET)
- void
- sv_tz (name)
-      char *name;
- {
--  tzset ();
-+  if (chkexport (name))
-+    tzset ();
- }
- #endif
- 
---- a/parse.y
-+++ b/parse.y
-@@ -5135,6 +5135,9 @@ decode_prompt_string (string)
- 	    case 'A':
- 	      /* Make the current time/date into a string. */
- 	      (void) time (&the_time);
-+#if defined (HAVE_TZSET)
-+	      sv_tz ("TZ");		/* XXX -- just make sure */
-+#endif
- 	      tm = localtime (&the_time);
- 
- 	      if (c == 'd')
---- a/builtins/printf.def
-+++ b/builtins/printf.def
-@@ -465,6 +465,9 @@ printf_builtin (list)
- 		  secs = shell_start_time;	/* roughly $SECONDS */
- 		else
- 		  secs = arg;
-+#if defined (HAVE_TZSET)
-+		sv_tz ("TZ");		/* XXX -- just make sure */
-+#endif
- 		tm = localtime (&secs);
- 		n = strftime (timebuf, sizeof (timebuf), timefmt, tm);
- 		free (timefmt);
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 4
-+#define PATCHLEVEL 5
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/106-upstream-bash42-006.patch
+++ /dev/null
@@ -1,38 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-006
-
-Bug-Reported-by:	Allan McRae <allan@archlinux.org>
-Bug-Reference-ID:	<4D6D0D0B.50908@archlinux.org>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00001.html
-
-Bug-Description:
-
-A problem with bash42-005 caused it to dump core if TZ was unset.
-
-Patch (apply with `patch -p0'):
-
---- a/variables.c
-+++ b/variables.c
-@@ -3660,7 +3660,7 @@ chkexport (name)
-   SHELL_VAR *v;
- 
-   v = find_variable (name);
--  if (exported_p (v))
-+  if (v && exported_p (v))
-     {
-       array_needs_making = 1;
-       maybe_make_export_env ();
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 5
-+#define PATCHLEVEL 6
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/107-upstream-bash42-007.patch
+++ /dev/null
@@ -1,40 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-007
-
-Bug-Reported-by:	Matthias Klose <doko@debian.org>
-Bug-Reference-ID:	<4D6FD2AC.1010500@debian.org>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00015.html
-
-Bug-Description:
-
-When used in contexts where word splitting and quote removal were not
-performed, such as case statement word expansion, empty strings
-(either literal or resulting from quoted variables that were unset or
-null) were not expanded correctly, resulting in failure.
-
-Patch (apply with `patch -p0'):
-
---- a/subst.c
-+++ b/subst.c
-@@ -4609,6 +4609,7 @@ expand_word_unsplit (word, quoted)
-   if (ifs_firstc == 0)
- #endif
-     word->flags |= W_NOSPLIT;
-+  word->flags |= W_NOSPLIT2;
-   result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL);
-   expand_no_split_dollar_star = 0;
- 
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 6
-+#define PATCHLEVEL 7
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/108-upstream-bash42-008.patch
+++ /dev/null
@@ -1,66 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-008
-
-Bug-Reported-by:	Doug McMahon <mc2man@optonline.net>
-Bug-Reference-ID:	<1299441211.2535.11.camel@doug-XPS-M1330>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00050.html
-
-Bug-Description:
-
-Bash-4.2 does not attempt to save the shell history on receipt of a
-terminating signal that is handled synchronously.  Unfortunately, the
-`close' button on most X11 terminal emulators sends SIGHUP, which
-kills the shell.
-
-This is a very small patch to save the history in the case that an
-interactive shell receives a SIGHUP or SIGTERM while in readline and
-reading a command.
-
-The next version of bash will do this differently.
-
-Patch (apply with `patch -p0'):
-
---- a/sig.c
-+++ b/sig.c
-@@ -46,6 +46,7 @@
- 
- #if defined (READLINE)
- #  include "bashline.h"
-+#  include <readline/readline.h>
- #endif
- 
- #if defined (HISTORY)
-@@ -62,6 +63,7 @@ extern int parse_and_execute_level, shel
- #if defined (HISTORY)
- extern int history_lines_this_session;
- #endif
-+extern int no_line_editing;
- 
- extern void initialize_siglist ();
- 
-@@ -505,7 +507,10 @@ termsig_sighandler (sig)
-     {
- #if defined (HISTORY)
-       /* XXX - will inhibit history file being written */
--      history_lines_this_session = 0;
-+#  if defined (READLINE)
-+      if (interactive_shell == 0 || interactive == 0 || (sig != SIGHUP && sig != SIGTERM) || no_line_editing || (RL_ISSTATE (RL_STATE_READCMD) == 0))
-+#  endif
-+        history_lines_this_session = 0;
- #endif
-       terminate_immediately = 0;
-       termsig_handler (sig);
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 7
-+#define PATCHLEVEL 8
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/109-upstream-bash42-009.patch
+++ /dev/null
@@ -1,66 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-009
-
-Bug-Reported-by:	<piuma@piumalab.org>
-Bug-Reference-ID:	<4DAAC0DB.7060606@piumalab.org>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00075.html
-
-Bug-Description:
-
-Under certain circumstances, running `fc -l' two times in succession with a
-relative history offset at the end of the history will result in an incorrect
-calculation of the last history entry and a seg fault.
-
-Patch (apply with `patch -p0'):
-
---- a/builtins/fc.def
-+++ b/builtins/fc.def
-@@ -304,7 +304,7 @@ fc_builtin (list)
-   last_hist = i - rh - hist_last_line_added;
- 
-   /* XXX */
--  if (saved_command_line_count > 0 && i == last_hist && hlist[last_hist] == 0)
-+  if (i == last_hist && hlist[last_hist] == 0)
-     while (last_hist >= 0 && hlist[last_hist] == 0)
-       last_hist--;
-   if (last_hist < 0)
-@@ -475,7 +475,7 @@ fc_gethnum (command, hlist)
-      HIST_ENTRY **hlist;
- {
-   int sign, n, clen, rh;
--  register int i, j;
-+  register int i, j, last_hist;
-   register char *s;
- 
-   sign = 1;
-@@ -495,7 +495,15 @@ fc_gethnum (command, hlist)
-      has been enabled (interactive or not) should use it in the last_hist
-      calculation as if it were on. */
-   rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list);
--  i -= rh + hist_last_line_added;
-+  last_hist = i - rh - hist_last_line_added;
-+
-+  if (i == last_hist && hlist[last_hist] == 0)
-+    while (last_hist >= 0 && hlist[last_hist] == 0)
-+      last_hist--;
-+  if (last_hist < 0)
-+    return (-1);
-+
-+  i = last_hist;
- 
-   /* No specification defaults to most recent command. */
-   if (command == NULL)
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 8
-+#define PATCHLEVEL 9
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/110-upstream-bash42-010.patch
+++ /dev/null
@@ -1,57 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-010
-
-Bug-Reported-by:	Mike Frysinger <vapier@gentoo.org>
-Bug-Reference-ID:	<201104122356.20160.vapier@gentoo.org>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00058.html
-
-Bug-Description:
-
-Bash did not correctly print/reproduce here documents attached to commands
-inside compound commands such as arithmetic for loops and user-specified
-subshells.  This affected the execution of such commands inside a shell
-function when the function definition is saved and later restored using
-`.' or `eval'.
-
-Patch (apply with `patch -p0'):
-
---- a/print_cmd.c
-+++ b/print_cmd.c
-@@ -315,6 +315,7 @@ make_command_string_internal (command)
- 	  cprintf ("( ");
- 	  skip_this_indent++;
- 	  make_command_string_internal (command->value.Subshell->command);
-+	  PRINT_DEFERRED_HEREDOCS ("");
- 	  cprintf (" )");
- 	  break;
- 
-@@ -592,6 +593,7 @@ print_arith_for_command (arith_for_comma
-   newline ("do\n");
-   indentation += indentation_amount;
-   make_command_string_internal (arith_for_command->action);
-+  PRINT_DEFERRED_HEREDOCS ("");
-   semicolon ();
-   indentation -= indentation_amount;
-   newline ("done");
-@@ -653,6 +655,7 @@ print_group_command (group_command)
-     }
- 
-   make_command_string_internal (group_command->command);
-+  PRINT_DEFERRED_HEREDOCS ("");
- 
-   if (inside_function_def)
-     {
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 9
-+#define PATCHLEVEL 10
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/111-upstream-bash42-011.patch
+++ /dev/null
@@ -1,42 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-011
-
-Bug-Reported-by:	"David Parks" <davidparks21@yahoo.com>
-Bug-Reference-ID:	<014101cc82c6$46ac1540$d4043fc0$@com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-10/msg00031.html
-
-Bug-Description:
-
-Overwriting a value in an associative array causes the memory allocated to
-store the key on the second and subsequent assignments to leak.
-
-Patch (apply with `patch -p0'):
-
---- a/assoc.c
-+++ b/assoc.c
-@@ -77,6 +77,11 @@ assoc_insert (hash, key, value)
-   b = hash_search (key, hash, HASH_CREATE);
-   if (b == 0)
-     return -1;
-+  /* If we are overwriting an existing element's value, we're not going to
-+     use the key.  Nothing in the array assignment code path frees the key
-+     string, so we can free it here to avoid a memory leak. */
-+  if (b->key != key)
-+    free (key);
-   FREE (b->data);
-   b->data = value ? savestring (value) : (char *)0;
-   return (0);
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 10
-+#define PATCHLEVEL 11
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/112-upstream-bash42-012.patch
+++ /dev/null
@@ -1,146 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-012
-
-Bug-Reported-by:	Rui Santos <rsantos@grupopie.com>
-Bug-Reference-ID:	<4E04C6D0.2020507@grupopie.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00079.html
-
-Bug-Description:
-
-When calling the parser to recursively parse a command substitution within
-an arithmetic expansion, the shell overwrote the saved shell input line and
-associated state, resulting in a garbled command.
-
-Patch (apply with `patch -p0'):
-
---- a/parse.y
-+++ b/parse.y
-@@ -3842,6 +3842,7 @@ xparse_dolparen (base, string, indp, fla
-      int flags;
- {
-   sh_parser_state_t ps;
-+  sh_input_line_state_t ls;
-   int orig_ind, nc, sflags;
-   char *ret, *s, *ep, *ostring;
- 
-@@ -3849,10 +3850,12 @@ xparse_dolparen (base, string, indp, fla
-   orig_ind = *indp;
-   ostring = string;
- 
-+/*itrace("xparse_dolparen: size = %d shell_input_line = `%s'", shell_input_line_size, shell_input_line);*/
-   sflags = SEVAL_NONINT|SEVAL_NOHIST|SEVAL_NOFREE;
-   if (flags & SX_NOLONGJMP)
-     sflags |= SEVAL_NOLONGJMP;
-   save_parser_state (&ps);
-+  save_input_line_state (&ls);
- 
-   /*(*/
-   parser_state |= PST_CMDSUBST|PST_EOFTOKEN;	/* allow instant ')' */ /*(*/
-@@ -3861,6 +3864,8 @@ xparse_dolparen (base, string, indp, fla
- 
-   restore_parser_state (&ps);
-   reset_parser ();
-+  /* reset_parser clears shell_input_line and associated variables */
-+  restore_input_line_state (&ls);
-   if (interactive)
-     token_to_read = 0;
- 
-@@ -5908,6 +5913,12 @@ save_parser_state (ps)
-   ps->expand_aliases = expand_aliases;
-   ps->echo_input_at_read = echo_input_at_read;
- 
-+  ps->token = token;
-+  ps->token_buffer_size = token_buffer_size;
-+  /* Force reallocation on next call to read_token_word */
-+  token = 0;
-+  token_buffer_size = 0;
-+
-   return (ps);
- }
- 
-@@ -5949,6 +5960,42 @@ restore_parser_state (ps)
- 
-   expand_aliases = ps->expand_aliases;
-   echo_input_at_read = ps->echo_input_at_read;
-+
-+  FREE (token);
-+  token = ps->token;
-+  token_buffer_size = ps->token_buffer_size;
-+}
-+
-+sh_input_line_state_t *
-+save_input_line_state (ls)
-+     sh_input_line_state_t *ls;
-+{
-+  if (ls == 0)
-+    ls = (sh_input_line_state_t *)xmalloc (sizeof (sh_input_line_state_t));
-+  if (ls == 0)
-+    return ((sh_input_line_state_t *)NULL);
-+
-+  ls->input_line = shell_input_line;
-+  ls->input_line_size = shell_input_line_size;
-+  ls->input_line_len = shell_input_line_len;
-+  ls->input_line_index = shell_input_line_index;
-+
-+  /* force reallocation */
-+  shell_input_line = 0;
-+  shell_input_line_size = shell_input_line_len = shell_input_line_index = 0;
-+}
-+
-+void
-+restore_input_line_state (ls)
-+     sh_input_line_state_t *ls;
-+{
-+  FREE (shell_input_line);
-+  shell_input_line = ls->input_line;
-+  shell_input_line_size = ls->input_line_size;
-+  shell_input_line_len = ls->input_line_len;
-+  shell_input_line_index = ls->input_line_index;
-+
-+  set_line_mbstate ();
- }
- 
- /************************************************
---- a/shell.h
-+++ b/shell.h
-@@ -136,6 +136,9 @@ typedef struct _sh_parser_state_t {
-   int parser_state;
-   int *token_state;
- 
-+  char *token;
-+  int token_buffer_size;
-+
-   /* input line state -- line number saved elsewhere */
-   int input_line_terminator;
-   int eof_encountered;
-@@ -166,6 +169,16 @@ typedef struct _sh_parser_state_t {
-   
- } sh_parser_state_t;
- 
-+typedef struct _sh_input_line_state_t {
-+  char *input_line;
-+  int input_line_index;
-+  int input_line_size;
-+  int input_line_len;
-+} sh_input_line_state_t;
-+
- /* Let's try declaring these here. */
- extern sh_parser_state_t *save_parser_state __P((sh_parser_state_t *));
- extern void restore_parser_state __P((sh_parser_state_t *));
-+
-+extern sh_input_line_state_t *save_input_line_state __P((sh_input_line_state_t *));
-+extern void restore_input_line_state __P((sh_input_line_state_t *));
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 11
-+#define PATCHLEVEL 12
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/113-upstream-bash42-013.patch
+++ /dev/null
@@ -1,44 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-013
-
-Bug-Reported-by:	Marten Wikstrom <marten.wikstrom@keystream.se>
-Bug-Reference-ID:	<BANLkTikKECAh94ZEX68iQvxYuPeEM_xoSQ@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00049.html
-
-Bug-Description:
-
-An off-by-one error caused the shell to skip over CTLNUL characters,
-which are used internally to mark quoted null strings.  The effect
-was to have stray 0x7f characters left after expanding words like
-""""""""aa.
-
-Patch (apply with `patch -p0'):
-
---- a/subst.c
-+++ b/subst.c
-@@ -3706,7 +3706,10 @@ remove_quoted_nulls (string)
- 	    break;
- 	}
-       else if (string[i] == CTLNUL)
--	i++;
-+	{
-+	  i++;
-+	  continue;
-+	}
- 
-       prev_i = i;
-       ADVANCE_CHAR (string, slen, i);
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 12
-+#define PATCHLEVEL 13
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/114-upstream-bash42-014.patch
+++ /dev/null
@@ -1,39 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-014
-
-Bug-Reported-by:	Shawn Bohrer <sbohrer@rgmadvisors.com>
-Bug-Reference-ID:	<20110504152320.6E8F28130527@dev1.rgmadvisors.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00018.html
-
-Bug-Description:
-
-The regular expression matching operator did not correctly match
-expressions with an embedded ^A.
-
-Patch (apply with `patch -p0'):
-
---- a/pathexp.c
-+++ b/pathexp.c
-@@ -196,7 +196,7 @@ quote_string_for_globbing (pathname, qfl
- 	{
- 	  if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/')
- 	    continue;
--	  if ((qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0)
-+	  if (pathname[i+1] != CTLESC && (qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0)
- 	    continue;
- 	  temp[j++] = '\\';
- 	  i++;
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 13
-+#define PATCHLEVEL 14
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/115-upstream-bash42-015.patch
+++ /dev/null
@@ -1,72 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-015
-
-Bug-Reported-by:	<dnade.ext@orange-ftgroup.com>
-Bug-Reference-ID:	<728_1312188080_4E3666B0_728_118711_1_3B5D3E0F95CC5C478D6500CDCE8B691F7AAAA4AA3D@PUEXCB2B.nanterre.francetelecom.fr>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00000.html
-
-Bug-Description:
-
-When in a context where arithmetic evaluation is not taking place, the
-evaluator should not check for division by 0.
-
-Patch (apply with `patch -p0'):
-
---- a/expr.c
-+++ b/expr.c
-@@ -476,19 +476,23 @@ expassign ()
- 
-       if (special)
- 	{
-+	  if ((op == DIV || op == MOD) && value == 0)
-+	    {
-+	      if (noeval == 0)
-+		evalerror (_("division by 0"));
-+	      else
-+	        value = 1;
-+	    }
-+
- 	  switch (op)
- 	    {
- 	    case MUL:
- 	      lvalue *= value;
- 	      break;
- 	    case DIV:
--	      if (value == 0)
--		evalerror (_("division by 0"));
- 	      lvalue /= value;
- 	      break;
- 	    case MOD:
--	      if (value == 0)
--		evalerror (_("division by 0"));
- 	      lvalue %= value;
- 	      break;
- 	    case PLUS:
-@@ -804,7 +808,12 @@ exp2 ()
-       val2 = exppower ();
- 
-       if (((op == DIV) || (op == MOD)) && (val2 == 0))
--	evalerror (_("division by 0"));
-+	{
-+	  if (noeval == 0)
-+	    evalerror (_("division by 0"));
-+	  else
-+	    val2 = 1;
-+	}
- 
-       if (op == MUL)
- 	val1 *= val2;
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 14
-+#define PATCHLEVEL 15
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/116-upstream-bash42-016.patch
+++ /dev/null
@@ -1,38 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-016
-
-Bug-Reported-by:	Martin von Gagern <Martin.vGagern@gmx.net>
-Bug-Reference-ID:	<4E43AD9E.8060501@gmx.net>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00141.html
-
-Bug-Description:
-
-Bash should not check for mail while executing the `eval' builtin.
-
-Patch (apply with `patch -p0'):
-
---- a/parse.y
-+++ b/parse.y
-@@ -2499,7 +2499,7 @@ yylex ()
- 	 We do this only if it is time to do so. Notice that only here
- 	 is the mail alarm reset; nothing takes place in check_mail ()
- 	 except the checking of mail.  Please don't change this. */
--      if (prompt_is_ps1 && time_to_check_mail ())
-+      if (prompt_is_ps1 && parse_and_execute_level == 0 && time_to_check_mail ())
- 	{
- 	  check_mail ();
- 	  reset_mail_timer ();
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 15
-+#define PATCHLEVEL 16
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/117-upstream-bash42-017.patch
+++ /dev/null
@@ -1,43 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-017
-
-Bug-Reported-by:	Curtis Doty <Curtis@GreenKey.net>
-Bug-Reference-ID:	<20110621035324.A4F70849F59@mx1.iParadigms.net>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00053.html
-
-Bug-Description:
-
-Using `read -a foo' where foo was an already-declared associative array
-caused the shell to die with a segmentation fault.
-
-Patch (apply with `patch -p0'):
-
---- a/builtins/read.def
-+++ b/builtins/read.def
-@@ -642,6 +642,12 @@ assign_vars:
- 	  xfree (input_string);
- 	  return EXECUTION_FAILURE;	/* readonly or noassign */
- 	}
-+      if (assoc_p (var))
-+	{
-+          builtin_error (_("%s: cannot convert associative to indexed array"), arrayname);
-+	  xfree (input_string);
-+	  return EXECUTION_FAILURE;	/* existing associative array */
-+	}
-       array_flush (array_cell (var));
- 
-       alist = list_string (input_string, ifs_chars, 0);
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 16
-+#define PATCHLEVEL 17
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/118-upstream-bash42-018.patch
+++ /dev/null
@@ -1,58 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-018
-
-Bug-Reported-by:	Thomas Cort <tcort@minix3.org>
-Bug-Reference-ID:	<BANLkTik-ebGGw3k_1YtB=RyfV1bsqdxC_g@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00110.html
-
-Bug-Description:
-
-Bash fails to compile unless JOB_CONTROL is defined.
-
-Patch (apply with `patch -p0'):
-
---- a/execute_cmd.c
-+++ b/execute_cmd.c
-@@ -2196,6 +2196,7 @@ execute_pipeline (command, asynchronous,
-   if (ignore_return && cmd)
-     cmd->flags |= CMD_IGNORE_RETURN;
- 
-+#if defined (JOB_CONTROL)
-   lastpipe_flag = 0;
-   begin_unwind_frame ("lastpipe-exec");
-   lstdin = -1;
-@@ -2219,15 +2220,19 @@ execute_pipeline (command, asynchronous,
- 	  lastpipe_jid = stop_pipeline (0, (COMMAND *)NULL);	/* XXX */
- 	  add_unwind_protect (lastpipe_cleanup, lastpipe_jid);
- 	}
--      cmd->flags |= CMD_LASTPIPE;
-+      if (cmd)
-+	cmd->flags |= CMD_LASTPIPE;
-     }	  
-   if (prev >= 0)
-     add_unwind_protect (close, prev);
-+#endif
- 
-   exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close);
- 
-+#if defined (JOB_CONTROL)
-   if (lstdin > 0)
-     restore_stdin (lstdin);
-+#endif
- 
-   if (prev >= 0)
-     close (prev);
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 17
-+#define PATCHLEVEL 18
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/119-upstream-bash42-019.patch
+++ /dev/null
@@ -1,43 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-019
-
-Bug-Reported-by:	Diego Augusto Molina <diegoaugustomolina@gmail.com>
-Bug-Reference-ID:	<CAGOxLdHcSQu3ck9Qy3pRjj_NBU5tAPSAvNm-95-nLQ9Szwb6aA@mail.gmail.com>
-Bug-Reference-URL:	lists.gnu.org/archive/html/bug-bash/2011-09/msg00047.html
-
-Bug-Description:
-
-Using `declare' with attributes and an invalid array variable name or
-assignment reference resulted in a segmentation fault instead of a
-declaration error.
-
-Patch (apply with `patch -p0'):
-
---- a/builtins/declare.def
-+++ b/builtins/declare.def
-@@ -513,6 +513,11 @@ declare_internal (list, local_var)
- 	      *subscript_start = '[';	/* ] */
- 	      var = assign_array_element (name, value, 0);	/* XXX - not aflags */
- 	      *subscript_start = '\0';
-+	      if (var == 0)	/* some kind of assignment error */
-+		{
-+		  assign_error++;
-+		  NEXT_VARIABLE ();
-+		}
- 	    }
- 	  else if (simple_array_assign)
- 	    {
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 18
-+#define PATCHLEVEL 19
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/120-upstream-bash42-020.patch
+++ /dev/null
@@ -1,48 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-020
-
-Bug-Reported-by:	Vincent Sheffer <vince.sheffer@apisphere.com>
-Bug-Reference-ID:	<F13C1C4F-C44C-4071-BFED-4BB6D13CF92F@apisphere.com>
-Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-readline/2011-08/msg00000.html
-
-Bug-Description:
-
-The shared object helper script needs to be updated for Mac OS X 10.7
-(Lion, darwin11).
-
-Patch (apply with `patch -p0'):
-
---- a/support/shobj-conf
-+++ b/support/shobj-conf
-@@ -157,7 +157,7 @@ freebsd[4-9]*|freebsdelf*|dragonfly*)
- 	;;
- 
- # Darwin/MacOS X
--darwin[89]*|darwin10*)
-+darwin[89]*|darwin1[012]*)
- 	SHOBJ_STATUS=supported
- 	SHLIB_STATUS=supported
- 	
-@@ -186,7 +186,7 @@ darwin*|macosx*)
- 	SHLIB_LIBSUFF='dylib'
- 
- 	case "${host_os}" in
--	darwin[789]*|darwin10*)	SHOBJ_LDFLAGS=''
-+	darwin[789]*|darwin1[012]*)	SHOBJ_LDFLAGS=''
- 			SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
- 			;;
- 	*)		SHOBJ_LDFLAGS='-dynamic'
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 19
-+#define PATCHLEVEL 20
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/121-upstream-bash42-021.patch
+++ /dev/null
@@ -1,49 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-021
-
-Bug-Reported-by:	Dan Douglas <ormaaj@gmail.com>
-Bug-Reference-ID:	<4585554.nZWb4q7YoZ@smorgbox>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-12/msg00084.html
-
-Bug-Description:
-
-Using `read -N' to assign values to an array can result in NUL values being
-assigned to some array elements.  These values cause seg faults when referenced
-later.
-
-Patch (apply with `patch -p0'):
-
---- a/builtins/read.def
-+++ b/builtins/read.def
-@@ -737,7 +737,7 @@ assign_vars:
- 	      xfree (t1);
- 	    }
- 	  else
--	    var = bind_read_variable (varname, t);
-+	    var = bind_read_variable (varname, t ? t : "");
- 	}
-       else
- 	{
-@@ -798,7 +798,7 @@ assign_vars:
-       xfree (t);
-     }
-   else
--    var = bind_read_variable (list->word->word, input_string);
-+    var = bind_read_variable (list->word->word, input_string ? input_string : "");
- 
-   if (var)
-     {
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 20
-+#define PATCHLEVEL 21
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/122-upstream-bash42-022.patch
+++ /dev/null
@@ -1,47 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-022
-
-Bug-Reported-by:	Gregory Margo <gmargo@pacbell.net>
-Bug-Reference-ID:	<20110727174529.GA3333@pacbell.net>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-07/msg00102.html
-
-Bug-Description:
-
-The return value from lseek is `off_t'.  This can cause corrupted return
-values when the file offset is greater than 2**31 - 1.
-
-Patch (apply with `patch -p0'):
-
---- a/lib/sh/zread.c
-+++ b/lib/sh/zread.c
-@@ -160,14 +160,13 @@ void
- zsyncfd (fd)
-      int fd;
- {
--  off_t off;
--  int r;
-+  off_t off, r;
- 
-   off = lused - lind;
-   r = 0;
-   if (off > 0)
-     r = lseek (fd, -off, SEEK_CUR);
- 
--  if (r >= 0)
-+  if (r != -1)
-     lused = lind = 0;
- }
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 21
-+#define PATCHLEVEL 22
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/123-upstream-bash42-023.patch
+++ /dev/null
@@ -1,54 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-023
-
-Bug-Reported-by:	Ewan Mellor <Ewan.Mellor@eu.citrix.com>
-Bug-Reference-ID:	<6005BE083BF501439A84DC3523BAC82DC4B964FD12@LONPMAILBOX01.citrite.net>
-Bug-Reference-URL:	
-
-Bug-Description:
-
-Under some circumstances, an exit trap triggered by a bad substitution
-error when errexit is enabled will cause the shell to exit with an
-incorrect exit status (0).
-
-Patch (apply with `patch -p0'):
-
---- a/subst.c
-+++ b/subst.c
-@@ -7274,6 +7274,7 @@ parameter_brace_expand (string, indexp, 
-     default:
-     case '\0':
-     bad_substitution:
-+      last_command_exit_value = EXECUTION_FAILURE;
-       report_error (_("%s: bad substitution"), string ? string : "??");
-       FREE (value);
-       FREE (temp);
---- a/error.c
-+++ b/error.c
-@@ -200,7 +200,11 @@ report_error (format, va_alist)
- 
-   va_end (args);
-   if (exit_immediately_on_error)
--    exit_shell (1);
-+    {
-+      if (last_command_exit_value == 0)
-+	last_command_exit_value = 1;
-+      exit_shell (last_command_exit_value);
-+    }
- }
- 
- void
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 22
-+#define PATCHLEVEL 23
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/124-upstream-bash42-024.patch
+++ /dev/null
@@ -1,41 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-024
-
-Bug-Reported-by:	Jim Avera <james_avera@yahoo.com>
-Bug-Reference-ID:	<4F29E07A.80405@yahoo.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2012-02/msg00001.html
-
-Bug-Description:
-
-When `printf -v' is used to set an array element, the format string contains
-`%b', and the corresponding argument is the empty string, the buffer used
-to store the value to be assigned can be NULL, which results in NUL being
-assigned to the array element.  This causes a seg fault when it's used later.
-
-Patch (apply with `patch -p0'):
-
---- a/builtins/printf.def
-+++ b/builtins/printf.def
-@@ -255,6 +255,8 @@ printf_builtin (list)
- #endif
- 	    {
- 	      vflag = 1;
-+	      if (vbsize == 0)
-+		vbuf = xmalloc (vbsize = 16);
- 	      vblen = 0;
- 	      if (vbuf)
- 		vbuf[0] = 0;
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 23
-+#define PATCHLEVEL 24
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/125-upstream-bash42-025.patch
+++ /dev/null
@@ -1,112 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-025
-
-Bug-Reported-by:	Bill Gradwohl <bill@ycc.com>
-Bug-Reference-ID:	<CAFyvKis-UfuOWr5THBRKh=vYHDoKEEgdW8hN1RviTuYQ00Lu5A@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/help-bash/2012-03/msg00078.html
-
-Bug-Description:
-
-When used in a shell function, `declare -g -a array=(compound assignment)'
-creates a local variable instead of a global one.
-
-Patch (apply with `patch -p0'):
-
---- a/command.h
-+++ b/command.h
-@@ -97,6 +97,7 @@ enum command_type { cm_for, cm_case, cm_
- #define W_HASCTLESC	0x200000	/* word contains literal CTLESC characters */
- #define W_ASSIGNASSOC	0x400000	/* word looks like associative array assignment */
- #define W_ARRAYIND	0x800000	/* word is an array index being expanded */
-+#define W_ASSNGLOBAL	0x1000000	/* word is a global assignment to declare (declare/typeset -g) */
- 
- /* Possible values for subshell_environment */
- #define SUBSHELL_ASYNC	0x01	/* subshell caused by `command &' */
---- a/execute_cmd.c
-+++ b/execute_cmd.c
-@@ -3584,13 +3584,13 @@ fix_assignment_words (words)
- {
-   WORD_LIST *w;
-   struct builtin *b;
--  int assoc;
-+  int assoc, global;
- 
-   if (words == 0)
-     return;
- 
-   b = 0;
--  assoc = 0;
-+  assoc = global = 0;
- 
-   for (w = words; w; w = w->next)
-     if (w->word->flags & W_ASSIGNMENT)
-@@ -3607,12 +3607,17 @@ fix_assignment_words (words)
- #if defined (ARRAY_VARS)
- 	if (assoc)
- 	  w->word->flags |= W_ASSIGNASSOC;
-+	if (global)
-+	  w->word->flags |= W_ASSNGLOBAL;
- #endif
-       }
- #if defined (ARRAY_VARS)
-     /* Note that we saw an associative array option to a builtin that takes
-        assignment statements.  This is a bit of a kludge. */
--    else if (w->word->word[0] == '-' && strchr (w->word->word, 'A'))
-+    else if (w->word->word[0] == '-' && (strchr (w->word->word+1, 'A') || strchr (w->word->word+1, 'g')))
-+#else
-+    else if (w->word->word[0] == '-' && strchr (w->word->word+1, 'g'))
-+#endif
-       {
- 	if (b == 0)
- 	  {
-@@ -3622,10 +3627,11 @@ fix_assignment_words (words)
- 	    else if (b && (b->flags & ASSIGNMENT_BUILTIN))
- 	      words->word->flags |= W_ASSNBLTIN;
- 	  }
--	if (words->word->flags & W_ASSNBLTIN)
-+	if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'A'))
- 	  assoc = 1;
-+	if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'g'))
-+	  global = 1;
-       }
--#endif
- }
- 
- /* Return 1 if the file found by searching $PATH for PATHNAME, defaulting
---- a/subst.c
-+++ b/subst.c
-@@ -366,6 +366,11 @@ dump_word_flags (flags)
-       f &= ~W_ASSNBLTIN;
-       fprintf (stderr, "W_ASSNBLTIN%s", f ? "|" : "");
-     }
-+  if (f & W_ASSNGLOBAL)
-+    {
-+      f &= ~W_ASSNGLOBAL;
-+      fprintf (stderr, "W_ASSNGLOBAL%s", f ? "|" : "");
-+    }
-   if (f & W_COMPASSIGN)
-     {
-       f &= ~W_COMPASSIGN;
-@@ -2803,7 +2808,7 @@ do_assignment_internal (word, expand)
-     }
-   else if (assign_list)
-     {
--      if (word->flags & W_ASSIGNARG)
-+      if ((word->flags & W_ASSIGNARG) && (word->flags & W_ASSNGLOBAL) == 0)
- 	aflags |= ASS_MKLOCAL;
-       if (word->flags & W_ASSIGNASSOC)
- 	aflags |= ASS_MKASSOC;
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 24
-+#define PATCHLEVEL 25
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/126-upstream-bash42-026.patch
+++ /dev/null
@@ -1,49 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-026
-
-Bug-Reported-by:	Greg Wooledge <wooledg@eeg.ccf.org>
-Bug-Reference-ID:	<20120425180443.GO22241@eeg.ccf.org>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00172.html
-
-Bug-Description:
-
-The `lastpipe' option does not behave correctly on machines where the
-open file limit is less than 256.
-
-Patch (apply with `patch -p0'):
-
---- a/execute_cmd.c
-+++ b/execute_cmd.c
-@@ -2209,7 +2209,7 @@ execute_pipeline (command, asynchronous,
- #endif
-                asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
-     {
--      lstdin = move_to_high_fd (0, 0, 255);
-+      lstdin = move_to_high_fd (0, 1, -1);
-       if (lstdin > 0)
- 	{
- 	  do_piping (prev, pipe_out);
-@@ -2255,7 +2255,9 @@ execute_pipeline (command, asynchronous,
-       unfreeze_jobs_list ();
-     }
- 
-+#if defined (JOB_CONTROL)
-   discard_unwind_frame ("lastpipe-exec");
-+#endif
- 
-   return (exec_result);
- }
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 25
-+#define PATCHLEVEL 26
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/127-upstream-bash42-027.patch
+++ /dev/null
@@ -1,39 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-027
-
-Bug-Reported-by:	Mike Frysinger <vapier@gentoo.org>
-Bug-Reference-ID:	<201204211243.30163.vapier@gentoo.org>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00134.html
-
-Bug-Description:
-
-When the `extglob' shell option is enabled, pattern substitution does not
-work correctly in the presence of multibyte characters.
-
-Patch (apply with `patch -p0'):
-
---- a/subst.c
-+++ b/subst.c
-@@ -4166,7 +4166,7 @@ match_wpattern (wstring, indices, wstrle
-   simple = (wpat[0] != L'\\' && wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'[');
- #if defined (EXTENDED_GLOB)
-   if (extended_glob)
--    simple |= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/
-+    simple &= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/
- #endif
- 
-   /* If the pattern doesn't match anywhere in the string, go ahead and
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 26
-+#define PATCHLEVEL 27
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/128-upstream-bash42-028.patch
+++ /dev/null
@@ -1,47 +1,1 @@
-			     BASH PATCH REPORT
-			     =================
 
-Bash-Release:	4.2
-Patch-ID:	bash42-028
-
-Bug-Reported-by:	Mark Edgar <medgar123@gmail.com>
-Bug-Reference-ID:	<CABHMh_3d+ZgO_zaEtYXPwK4P7tC0ghZ4g=Ue_TRpsEMf5YDsqw@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2012-03/msg00109.html
-
-Bug-Description:
-
-When using a word expansion for which the right hand side is evaluated,
-certain expansions of quoted null strings include spurious ^? characters.
-
-Patch (apply with `patch -p0'):
-
---- a/subst.c
-+++ b/subst.c
-@@ -5809,6 +5809,16 @@ parameter_brace_expand_rhs (name, value,
- 	 is the only expansion that creates more than one word. */
-       if (qdollaratp && ((hasdol && quoted) || l->next))
- 	*qdollaratp = 1;
-+      /* If we have a quoted null result (QUOTED_NULL(temp)) and the word is
-+	 a quoted null (l->next == 0 && QUOTED_NULL(l->word->word)), the
-+	 flags indicate it (l->word->flags & W_HASQUOTEDNULL), and the
-+	 expansion is quoted (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
-+	 (which is more paranoia than anything else), we need to return the
-+	 quoted null string and set the flags to indicate it. */
-+      if (l->next == 0 && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && QUOTED_NULL(temp) && QUOTED_NULL(l->word->word) && (l->word->flags & W_HASQUOTEDNULL))
-+	{
-+	  w->flags |= W_HASQUOTEDNULL;
-+	}
-       dispose_words (l);
-     }
-   else if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && hasdol)
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 27
-+#define PATCHLEVEL 28
- 
- #endif /* _PATCHLEVEL_H_ */
-

--- a/utils/bash/patches/129-no_doc.patch
+++ /dev/null
@@ -1,15 +1,1 @@
-diff -urN bash-4.2/Makefile.in bash-4.2.new/Makefile.in
---- bash-4.2/Makefile.in	2010-12-01 01:22:42.000000000 +0100
-+++ bash-4.2.new/Makefile.in	2012-07-30 16:24:01.325057998 +0200
-@@ -724,10 +724,8 @@
- #	$(MAKE) -f $(srcdir)/Makefile $(MFLAGS) srcdir=$(srcdir)
- 
- doc documentation:  force
--	@(cd $(DOCDIR) ; $(MAKE) $(MFLAGS) )
- 
- info dvi ps: force
--	@(cd $(DOCDIR) ; $(MAKE) $(MFLAGS) CFLAGS='$(CCFLAGS)' $@ )
- 
- force:
- 
 

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

file:a/utils/lxc/Makefile (deleted)
--- a/utils/lxc/Makefile
+++ /dev/null
@@ -1,226 +1,1 @@
-#
-# Copyright (C) 2013-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:=lxc
-PKG_VERSION:=1.0.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://linuxcontainers.org/downloads/
-PKG_MD5SUM:=55873b1411a606397309aa6c4c4263b3
-
-PKG_BUILD_DEPENDS:=lua
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-LXC_APPLETS_BIN += \
-	attach autostart cgroup clone config console create destroy execute \
-	freeze info monitor snapshot start stop unfreeze unshare usernsexec wait
-
-LXC_APPLETS_LIB += \
-	monitord user-nic
-
-LXC_SCRIPTS += \
-	checkconfig ls top
-
-DEPENDS_APPLETS = +libpthread +libcap +liblxc
-
-DEPENDS_top = +lxc-lua +luafilesystem @BROKEN
-
-
-define Package/lxc/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=LXC userspace tools
-  URL:=http://lxc.sourceforge.net/
-  MAINTAINER:=Luka Perkov <luka@openwrt.org>
-endef
-
-define Package/lxc
-  $(call Package/lxc/Default)
-  MENU:=1
-endef
-
-define Package/lxc/description
- LXC is the userspace control package for Linux Containers, a lightweight
- virtual system mechanism sometimes described as "chroot on steroids".
-endef
-
-define Package/lxc-common
-  $(call Package/lxc/Default)
-  TITLE:=LXC common files
-  DEPENDS:= lxc
-endef
-
-define Package/lxc-hooks
-  $(call Package/lxc/Default)
-  TITLE:=LXC virtual machine hooks
-  DEPENDS:= lxc
-endef
-
-define Package/lxc-templates
-  $(call Package/lxc/Default)
-  TITLE:=LXC virtual machine templates
-  DEPENDS:= lxc @BROKEN
-endef
-
-define Package/liblxc
-  $(call Package/lxc/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=LXC userspace library
-  DEPENDS:= lxc +libcap +libpthread
-endef
-
-define Package/lxc-lua
-  $(call Package/lxc/Default)
-  TITLE:=LXC Lua bindings
-  DEPENDS:= lxc +liblua +liblxc +luafilesystem
-endef
-
-define Package/lxc-init
-  $(call Package/lxc/Default)
-  TITLE:=LXC Lua bindings
-  DEPENDS:= lxc +liblxc
-endef
-
-CONFIGURE_ARGS += \
-	--disable-apparmor \
-	--disable-doc \
-	--disable-examples \
-	--disable-seccomp
-	--enable-lua=yes \
-	--with-lua-pc="$(STAGING_DIR)/usr/lib/pkgconfig/lua.pc" \
-
-MAKE_FLAGS += \
-	LUA_INSTALL_CMOD="/usr/lib/lua" \
-	LUA_INSTALL_LMOD="/usr/lib/lua"
-
-define Build/Configure
-	( cd $(PKG_BUILD_DIR); ./autogen.sh );
-	$(call Build/Configure/Default)
-endef
-
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/lxc/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/lxc/* \
-		$(1)/usr/include/lxc/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/liblxc.so* \
-		$(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lxc.pc \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-
-define Package/lxc/install
-	true
-endef
-
-define Package/lxc-common/conffiles
-/etc/lxc/default.conf
-/etc/lxc/lxc.conf
-endef
-
-define Package/lxc-common/install
-	$(INSTALL_DIR) $(1)/usr/lib/lxc/rootfs
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/lxc/rootfs/README \
-		$(1)/usr/lib/lxc/rootfs/
-
-	$(INSTALL_DIR) $(1)/usr/share/lxc
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/share/lxc/lxc.functions \
-		$(1)/usr/share/lxc/
-
-	$(INSTALL_DIR) $(1)/etc/lxc/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/etc/lxc/default.conf \
-		$(1)/etc/lxc/
-endef
-
-define Package/lxc-hooks/install
-	$(INSTALL_DIR) $(1)/usr/share/lxc/hooks
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/share/lxc/hooks/mountcgroups \
-		$(1)/usr/share/lxc/hooks/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/share/lxc/hooks/mountecryptfsroot \
-		$(1)/usr/share/lxc/hooks/
-endef
-
-define Package/lxc-templates/install
-	$(INSTALL_DIR) $(1)/usr/share/lxc/templates/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/share/lxc/templates/lxc-* \
-		$(1)/usr/share/lxc/templates/
-endef
-
-define Package/liblxc/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/liblxc.so* \
-		$(1)/usr/lib/
-endef
-
-define Package/lxc-lua/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/share/lua/5.1/lxc.lua \
-		$(1)/usr/lib/lua/
-	$(INSTALL_DIR) $(1)/usr/lib/lua/lxc
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/lua/5.1/lxc/core.so \
-		$(1)/usr/lib/lua/lxc/
-endef
-
-define Package/lxc-init/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/sbin/init.lxc \
-		$(1)/sbin/
-endef
-
-define GenPlugin
-  define Package/lxc-$(1)
-    $(call Package/lxc/Default)
-    TITLE:=Utility lxc-$(1) from the LXC userspace tools
-    DEPENDS:= lxc +lxc-common $(2) $(DEPENDS_$(1))
-  endef
-
-  define Package/lxc-$(1)/install
-	$(INSTALL_DIR) $$(1)$(3)
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)$(3)/lxc-$(1) \
-		$$(1)$(3)/
-  endef
-
-  $$(eval $$(call BuildPackage,lxc-$(1)))
-endef
-
-
-$(eval $(call BuildPackage,lxc))
-$(eval $(call BuildPackage,lxc-common))
-$(eval $(call BuildPackage,lxc-hooks))
-$(eval $(call BuildPackage,lxc-templates))
-$(eval $(call BuildPackage,liblxc))
-$(eval $(call BuildPackage,lxc-lua))
-$(foreach u,$(LXC_APPLETS_BIN),$(eval $(call GenPlugin,$(u),$(DEPENDS_APPLETS),"/usr/bin")))
-$(foreach u,$(LXC_APPLETS_LIB),$(eval $(call GenPlugin,$(u),$(DEPENDS_APPLETS),"/usr/lib/lxc")))
-$(foreach u,$(LXC_SCRIPTS),$(eval $(call GenPlugin,$(u),,"/usr/bin")))
-

--- a/utils/lxc/patches/010-compile.patch
+++ /dev/null
@@ -1,34 +1,1 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -31,30 +31,6 @@ AC_CANONICAL_HOST
- AM_PROG_CC_C_O
- AC_GNU_SOURCE
- 
--# Detect the distribution. This is used for the default configuration and
--# for some distro-specific build options.
--AC_MSG_CHECKING([host distribution])
--AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, oracle, centos, fedora, suse, gentoo, debian, arch, slackware, paldo, openmandriva or pardus.]))
--if type lsb_release >/dev/null 2>&1 && test "z$with_distro" = "z"; then
--	with_distro=`lsb_release -is`
--fi
--if test "z$with_distro" = "z"; then
--	AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
--	AC_CHECK_FILE(/etc/oracle-release,with_distro="oracle")
--	AC_CHECK_FILE(/etc/centos-release,with_distro="centos")
--	AC_CHECK_FILE(/etc/fedora-release,with_distro="fedora")
--	AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
--	AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
--	AC_CHECK_FILE(/etc/debian_version,with_distro="debian")
--	AC_CHECK_FILE(/etc/arch-release,with_distro="arch")
--	AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware")
--	AC_CHECK_FILE(/etc/frugalware-release,with_distro="frugalware")
--	AC_CHECK_FILE(/etc/mandrakelinux-release, with_distro="openmandriva")
--	AC_CHECK_FILE(/etc/mandriva-release,with_distro="openmandriva")
--	AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus")
--fi
--with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]'`
--
- if test "z$with_distro" = "z"; then
- 	with_distro="unknown"
- fi
 

--- a/utils/lxc/patches/015-getline.patch
+++ /dev/null
@@ -1,16 +1,1 @@
---- a/src/lxc/utils.h
-+++ b/src/lxc/utils.h
-@@ -44,11 +44,7 @@ extern char *get_rundir(void);
- extern const char *lxc_global_config_value(const char *option_name);
- 
- /* Define getline() if missing from the C library */
--#ifndef HAVE_GETLINE
--#ifdef HAVE_FGETLN
--#include <../include/getline.h>
--#endif
--#endif
-+#include "../include/getline.h"
- 
- /* Define setns() if missing from the C library */
- #ifndef HAVE_SETNS
 

--- a/utils/lxc/patches/020-lxc-checkconfig.patch
+++ /dev/null
@@ -1,21 +1,1 @@
---- a/src/lxc/lxc-checkconfig.in
-+++ b/src/lxc/lxc-checkconfig.in
-@@ -4,6 +4,17 @@
- : ${CONFIG:=/proc/config.gz}
- : ${GREP:=zgrep}
- : ${MODNAME:=configs}
-+: ${ZGREP:=zgrep}
-+: ${GUNZIP:=gunzip}
-+
-+if [ -z $(which $ZGREP) ] && ! [ -z $(which $GUNZIP) ] && [ -x $(which $GUNZIP) ] &&  [ -f $CONFIG ] && [ "$CONFIG" == "/proc/config.gz" ] ; then
-+
-+	CONFIG_NEW="/tmp/config-$(uname -r)"
-+	$GUNZIP -c $CONFIG > $CONFIG_NEW
-+	CONFIG=$CONFIG_NEW
-+
-+	GREP=grep
-+fi
- 
- SETCOLOR_SUCCESS="printf \\033[1;32m"
- SETCOLOR_FAILURE="printf \\033[1;31m"
 

file:a/utils/ntfs-3g/Makefile (deleted)
--- a/utils/ntfs-3g/Makefile
+++ /dev/null
@@ -1,215 +1,1 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ntfs-3g
-PKG_RELEASE:=1
-
-PKG_VERSION:=2014.2.15
-PKG_SOURCE:=$(PKG_NAME)_ntfsprogs-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://www.tuxera.com/opensource/
-PKG_MD5SUM:=f11d563816249d730a00498983485f3a
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-# release contains fuseext/int hint
-PKG_RELEASE:=$(PKG_RELEASE)$(if $(CONFIG_PACKAGE_NTFS-3G_USE_LIBFUSE),-fuseext,-fuseint)
-
-# define build dir, respect fuseext/int
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ntfs-3g/common
-  SECTION:=utils
-  CATEGORY:=Utilities
-  URL:=http://www.tuxera.com
-  SUBMENU:=Filesystem
-  TITLE:=Stable Read/Write NTFS Driver
-  MAINTAINER:=Bud <wrt_buddhay@gmx.net>
-endef
-
-define Package/ntfs-3g
-  $(call Package/ntfs-3g/common)
-  DEPENDS+= +kmod-fuse +PACKAGE_NTFS-3G_USE_LIBFUSE:libfuse +libpthread
-endef
-
-define Package/ntfs-3g/description
-  Ntfs-3g is a NTFS driver, which can create, remove, rename,
-  move files, directories, hard links, and streams. It can read
-  and write files, including streams and sparse files. It can
-  handle special files like symbolic links, devices, and FIFOs.
-  Moreover it can also read transparently compressed files.
-
-  Contains:
-   - ntfs-3g
-   - ntfs-3g.probe
-   - mount.ntfs-3g (symlink to ntfs-3g)
-
-endef
-
-define Package/ntfs-3g/config
-config PACKAGE_NTFS-3G_USE_LIBFUSE
-	bool "use external FUSE library, selects package libfuse"
-	depends on PACKAGE_ntfs-3g
-	---help---
-	Ntfs-3g by default uses a minimalized lite version of FUSE.
-	If libfuse is part of your filesystem anyway (because of sshfs, owfs
-	etc.) it makes sense to activate this option and save some kilobytes
-	of space.
-
-endef
-
-define Package/ntfs-3g-low
-  $(call Package/ntfs-3g/common)
-  TITLE:=lowntfs-3g (alternative using the fuse low-level interface)
-  DEPENDS+= +ntfs-3g
-endef
-
-define Package/ntfs-3g-low/description
-  Contains:
-   - lowntfs-3g
-   - mount.lowntfs-3g (symlink to lowntfs-3g)
-
-  A driver variant using the fuse low-level interface missing some of the
-  enhanced functionality for streams or the like. You might want to check:
-  http://www.tuxera.com/community/ntfs-3g-manual/
-
-endef
-
-define Package/ntfs-3g-utils
-  $(call Package/ntfs-3g/common)
-  TITLE:=ntfs-3g utilities (ntfs-3g.secaudit, ntfs-3g.usermap)
-  DEPENDS+= +ntfs-3g
-endef
-
-define Package/ntfs-3g-utils/description
-  Additional ntfs-3g utilities. Not included by default for size
-  considerations. All binaries except ntfs-3g, ntfs-3g.probe.
-
-  Currently:
-   - ntfs-3g.secaudit
-   - ntfs-3g.usermap
-
-endef
-
-# TODO: write a proper description
-# new in 2001.4.12
-define Package/ntfsprogs_ntfs-3g
-  $(call Package/ntfs-3g/common)
-  TITLE:=ntfsprogs (ntfs-3g)
-  DEPENDS+= +ntfs-3g +libgcrypt +libuuid
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--with-uuid
-
-# configure/make according selection
-ifdef CONFIG_PACKAGE_NTFS-3G_USE_LIBFUSE
-	CONFIGURE_ARGS += --with-fuse=external
-	TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include/fuse $(TARGET_CPPFLAGS)
-else
-	CONFIGURE_ARGS += --with-fuse=internal
-	TARGET_CPPFLAGS:=-I../include/fuse-lite $(TARGET_CPPFLAGS)
-endif
-
-# enable disable ntfsprogs
-ifneq ($(CONFIG_PACKAGE_ntfsprogs_ntfs-3g)$(SDK)$(DEVELOPER),)
-	CONFIGURE_ARGS += --enable-ntfsprogs
-else
-	CONFIGURE_ARGS += --disable-ntfsprogs
-endif
-
-# redefine prepare to extract to our build dir
-# apply patches
-define Build/Prepare
-	rm -rf $(PKG_BUILD_DIR)/
-	mkdir -p $(PKG_BUILD_DIR)/
-	$(TAR) -xzf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) --strip 1
-	$(Build/Patch)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP)	$(PKG_INSTALL_DIR)/usr/include/ntfs-3g $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/libntfs-3g.{la,a,so*} $(1)/usr/lib/
-endef
-
-define Package/ntfs-3g/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ntfs-3g{,.probe} $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libntfs-3g.so.* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/sbin
-	$(CP) $(PKG_INSTALL_DIR)/sbin/mount.ntfs-3g $(1)/sbin/
-endef
-
-define Package/ntfs-3g/postinst
-#!/bin/sh
-FILE="$${IPKG_INSTROOT}/etc/filesystems"
-ID="ntfs-3g"
-
-if ! [ -f '/etc/filesystems' ]; then
-	echo "Create '$$FILE'."
-	touch "$$FILE"
-fi
-
-if ! grep -q -e '^ntfs-3g$$' "$$FILE"; then
-	echo "Add '$$ID' to known filesystems."
-	echo "$$ID" >> "$$FILE"
-fi
-
-endef
-
-define Package/ntfs-3g-low/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lowntfs-3g $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/sbin
-	$(CP) $(PKG_INSTALL_DIR)/sbin/mount.lowntfs-3g $(1)/sbin/
-endef
-
-define Package/ntfs-3g-low/postinst
-#!/bin/sh
-FILE="$${IPKG_INSTROOT}/etc/filesystems"
-ID="lowntfs-3g"
-
-if ! [ -f '/etc/filesystems' ]; then
-	echo "Create '$$FILE'."
-	touch "$$FILE"
-fi
-
-if ! grep -q -e '^ntfs-3g$$' "$$FILE"; then
-	echo "Add '$$ID' to known filesystems."
-	echo "$$ID" >> "$$FILE"
-fi
-
-endef
-
-define Package/ntfs-3g-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(FIND) $(PKG_INSTALL_DIR)/usr/bin/ -type f ! -name ntfs-3g.probe ! -name ntfs-3g -exec $(INSTALL_BIN) {} $(1)/usr/bin/ \;
-endef
-
-define Package/ntfsprogs_ntfs-3g/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(CP) $(PKG_INSTALL_DIR)/sbin/mkfs.ntfs $(1)/sbin/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(FIND) $(PKG_INSTALL_DIR)/usr/bin/ -type f ! -regex '.*[^/]*ntfs-3g[^/]*' -exec $(INSTALL_BIN) {} $(1)/usr/bin/ \;
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,ntfs-3g))
-$(eval $(call BuildPackage,ntfs-3g-low))
-$(eval $(call BuildPackage,ntfs-3g-utils))
-$(eval $(call BuildPackage,ntfsprogs_ntfs-3g))
-

--- a/utils/ntfsprogs/Makefile
+++ /dev/null
@@ -1,64 +1,1 @@
-#
-# Copyright (C) 2010-2011 OpenWrt.org
-# Copyright (C) 2010 Gianluigi Tiesi <sherpya@netfarm.it>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ntfsprogs
-PKG_VERSION:=2.0.0
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/linux-ntfs
-PKG_MD5SUM:=2c402b647bb7aeb1d3f8ce1cc354fd68
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_DEPENDS:=libgcrypt
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ntfsprogs
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=Filesystem
-  TITLE:=Linux-NTFS
-  DEPENDS:=+libuuid
-  URL:=http://www.linux-ntfs.org/
-  MAINTAINER:=Gianluigi Tiesi <sherpya@netfarm.it>
-endef
-
-define Package/ntfsprogs/description
- Tools for managing NTFS volumes from Linux
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--with-uuid \
-	--disable-crypto \
-	--disable-gnome-vfs \
-	--disable-ntfsmount
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/ntfs $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libntfs.{la,a,so*} $(1)/usr/lib/
-endef
-
-define Package/ntfsprogs/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libntfs.so.* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ntfsfix $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,ntfsprogs))
-

--- a/utils/ntfsprogs/patches/001-autoconf_fixes.patch
+++ /dev/null
@@ -1,53 +1,1 @@
---- a/libntfs/Makefile.am
-+++ b/libntfs/Makefile.am
-@@ -38,8 +38,8 @@ libntfs_la_CFLAGS = $(LIBNTFS_CFLAGS) \
- 	-DLTVERSION_LIBNTFS=\"$(LTVERSION_LIBNTFS)\"
- 
- if ENABLE_CRYPTO
--libntfs_la_LDFLAGS += `libgnutls-config --libs` `pkg-config --libs libconfig`
--libntfs_la_CFLAGS += `libgnutls-config --cflags` `pkg-config --cflags libconfig`
-+libntfs_la_LDFLAGS += $(GNUTLS_LIBS) $(libconfig_LIBS)
-+libntfs_la_CFLAGS += $(GNUTLS_CFLAGS) $(libconfig_CFLAGS)
- endif
- 
- libntfs_la_SOURCES =	\
---- a/libntfs/Makefile.in
-+++ b/libntfs/Makefile.in
-@@ -61,8 +61,8 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
--@ENABLE_CRYPTO_TRUE@am__append_1 = `libgnutls-config --libs` `pkg-config --libs libconfig`
--@ENABLE_CRYPTO_TRUE@am__append_2 = `libgnutls-config --cflags` `pkg-config --cflags libconfig`
-+@ENABLE_CRYPTO_TRUE@am__append_1 = $(GNUTLS_LIBS) $(libconfig_LIBS)
-+@ENABLE_CRYPTO_TRUE@am__append_2 = $(GNUTLS_CFLAGS) $(libconfig_CFLAGS)
- subdir = libntfs
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(srcdir)/libntfs-gnomevfs.8.in $(srcdir)/libntfs.8.in \
---- a/ntfsprogs/Makefile.am
-+++ b/ntfsprogs/Makefile.am
-@@ -125,8 +125,8 @@ ntfsdump_logfile_LDFLAGS= $(AM_LFLAGS)
- if ENABLE_CRYPTO
- ntfsdecrypt_SOURCES	= ntfsdecrypt.c utils.c utils.h
- ntfsdecrypt_LDADD	= $(AM_LIBS)
--ntfsdecrypt_LDFLAGS	= $(AM_LFLAGS) `libgnutls-config --libs`
--ntfsdecrypt_CFLAGS	= `libgnutls-config --cflags`
-+ntfsdecrypt_LDFLAGS	= $(AM_LFLAGS) $(GNUTLS_LIBS)
-+ntfsdecrypt_CFLAGS	= $(GNUTLS_CFLAGS)
- endif
- 
- # Extra targets
---- a/ntfsprogs/Makefile.in
-+++ b/ntfsprogs/Makefile.in
-@@ -449,8 +449,8 @@ ntfsdump_logfile_LDADD = $(AM_LIBS)
- ntfsdump_logfile_LDFLAGS = $(AM_LFLAGS)
- @ENABLE_CRYPTO_TRUE@ntfsdecrypt_SOURCES = ntfsdecrypt.c utils.c utils.h
- @ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDADD = $(AM_LIBS)
--@ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `libgnutls-config --libs`
--@ENABLE_CRYPTO_TRUE@ntfsdecrypt_CFLAGS = `libgnutls-config --cflags`
-+@ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) $(GNUTLS_LIBS)
-+@ENABLE_CRYPTO_TRUE@ntfsdecrypt_CFLAGS = $(GNUTLS_CFLAGS)
- all: all-am
- 
- .SUFFIXES:
 

file:a/utils/picocom/Makefile (deleted)
--- a/utils/picocom/Makefile
+++ /dev/null
@@ -1,44 +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:=picocom
-PKG_VERSION:=1.7
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://picocom.googlecode.com/files
-PKG_MD5SUM:=8eaba1d31407e8408674d6e57af447ef
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/picocom
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=A minimal dumb-terminal emulation program
-  URL:=http://code.google.com/p/picocom/
-  SUBMENU:=Terminal
-endef
-
-define Package/picocom/description
- minimal dumb-terminal emulation program
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" \
-		picocom
-endef
-
-define Package/picocom/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/picocom $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,picocom))
-

file:a/utils/pv/Makefile (deleted)
--- a/utils/pv/Makefile
+++ /dev/null
@@ -1,45 +1,1 @@
-#
-# Copyright (C) 2008 David Cooper
-# Copyright (C) 2008-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:=pv
-PKG_VERSION:=1.5.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.ivarch.com/programs/sources/
-PKG_MD5SUM:=fdcd0be1e333602f82a70921b87976b8
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/pv
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Shell pipeline element to meter data passing through
-  URL:=http://www.ivarch.com/programs/pv.shtml
-endef
-
-define Package/pv/description
- Pipe Viewer is a terminal-based tool for monitoring the progress of data
- through a pipeline. It can be inserted into any normal pipeline between
- two processes to give a visual indication of how quickly data is passing
- through, how long it has taken, how near to completion it is, and an
- estimate of how long it will be until completion.
-endef
-
-define Package/pv/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pv $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,pv))
-
-

comments