liblo: moved to github
liblo: moved to github

git-svn-id: svn://svn.openwrt.org/openwrt/packages@42252 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/luaexpat/Makefile (deleted)
--- a/lang/luaexpat/Makefile
+++ /dev/null
@@ -1,56 +1,1 @@
-#
-# Copyright (C) 2009 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:=luaexpat
-PKG_VERSION:=1.1
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/2469
-PKG_MD5SUM:=6ecb895ccf5cff1e7f2facd438b1f8d0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luaexpat
-  SUBMENU:=Lua
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=LuaExpat
-  URL:=http://www.keplerproject.org/luaexpat/
-  DEPENDS:=+lua +libexpat
-endef
-
-define Package/luaexpat/description
-  LuaExpat is a SAX XML parser based on the Expat library.
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-	$(CP) files/compat-5.1r5 $(PKG_BUILD_DIR)/compat-5.1r5
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-	EXPAT_INC="$(STAGING_DIR)/usr/include/" \
-	LUA_INC="$(STAGING_DIR)/usr/include/" \
-	LUA_LIBDIR="$(STAGING_DIR)/usr/lib/" \
-	COMPAT_DIR="$(PKG_BUILD_DIR)/compat-5.1r5" \
-	LIB_OPTION="-shared $(TARGET_LDFLAGS)" \
-	CC="$(TARGET_CC) $(TARGET_CFLAGS) $(FPIC) -std=c99" \
-	LD="$(TARGET_CROSS)ld -shared"
-endef
-
-define Package/luaexpat/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lxp.so.1.1.0 $(1)/usr/lib/lua/lxp.so
-	$(INSTALL_DIR) $(1)/usr/lib/lua/lxp
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lxp/lom.lua $(1)/usr/lib/lua/lxp
-endef
-
-$(eval $(call BuildPackage,luaexpat))
-

--- a/lang/luaexpat/files/compat-5.1r5/compat-5.1.c
+++ /dev/null
@@ -1,98 +1,1 @@
-/*
-** Compat-5.1
-** Copyright Kepler Project 2004-2006 (http://www.keplerproject.org/compat)
-** $Id: compat-5.1.c,v 1.13 2006/02/20 21:12:47 carregal Exp $
-*/
 
-#include <stdio.h>
-#include <string.h>
-#include "lua.h"
-#include "lauxlib.h"
-#include "compat-5.1.h"
-
-static void getfield(lua_State *L, int idx, const char *name) {
-    const char *end = strchr(name, '.');
-    lua_pushvalue(L, idx);
-    while (end) {
-        lua_pushlstring(L, name, end - name);
-        lua_gettable(L, -2);
-        lua_remove(L, -2);
-        if (lua_isnil(L, -1)) return;
-        name = end+1;
-        end = strchr(name, '.');
-    }
-    lua_pushstring(L, name);
-    lua_gettable(L, -2);
-    lua_remove(L, -2);
-}
-
-static void setfield(lua_State *L, int idx, const char *name) {
-    const char *end = strchr(name, '.');
-    lua_pushvalue(L, idx);
-    while (end) {
-        lua_pushlstring(L, name, end - name);
-        lua_gettable(L, -2);
-        /* create table if not found */
-        if (lua_isnil(L, -1)) {
-            lua_pop(L, 1);
-            lua_newtable(L);
-            lua_pushlstring(L, name, end - name);
-            lua_pushvalue(L, -2);
-            lua_settable(L, -4);
-        }
-        lua_remove(L, -2);
-        name = end+1;
-        end = strchr(name, '.');
-    }
-    lua_pushstring(L, name);
-    lua_pushvalue(L, -3);
-    lua_settable(L, -3);
-    lua_pop(L, 2);
-}
-
-LUALIB_API void luaL_module(lua_State *L, const char *libname,
-                              const luaL_reg *l, int nup) {
-  if (libname) {
-    getfield(L, LUA_GLOBALSINDEX, libname);  /* check whether lib already exists */
-    if (lua_isnil(L, -1)) { 
-      int env, ns;
-      lua_pop(L, 1); /* get rid of nil */
-      lua_pushliteral(L, "require");
-      lua_gettable(L, LUA_GLOBALSINDEX); /* look for require */
-      lua_getfenv(L, -1); /* getfenv(require) */
-      lua_remove(L, -2); /* remove function require */
-      env = lua_gettop(L);
-
-      lua_newtable(L); /* create namespace for lib */
-      ns = lua_gettop(L);
-      getfield(L, env, "package.loaded"); /* get package.loaded table */
-      if (lua_isnil(L, -1)) { /* create package.loaded table */
-          lua_pop(L, 1); /* remove previous result */
-          lua_newtable(L);
-          lua_pushvalue(L, -1);
-          setfield(L, env, "package.loaded");
-      }
-      else if (!lua_istable(L, -1))
-        luaL_error(L, "name conflict for library `%s'", libname);
-      lua_pushstring(L, libname);
-      lua_pushvalue(L, ns); 
-      lua_settable(L, -3); /* package.loaded[libname] = ns */
-      lua_pop(L, 1); /* get rid of package.loaded table */
-      lua_pushvalue(L, ns); /* copy namespace */
-      setfield(L, LUA_GLOBALSINDEX, libname);
-      lua_remove (L, env); /* remove env */
-    }
-    lua_insert(L, -(nup+1));  /* move library table to below upvalues */
-  }
-  for (; l->name; l++) {
-    int i;
-    lua_pushstring(L, l->name);
-    for (i=0; i<nup; i++)  /* copy upvalues to the top */
-      lua_pushvalue(L, -(nup+1));
-    lua_pushcclosure(L, l->func, nup);
-    lua_settable(L, -(nup+3));
-  }
-  lua_pop(L, nup);  /* remove upvalues */
-}
-
-

--- a/lang/luaexpat/files/compat-5.1r5/compat-5.1.h
+++ /dev/null
@@ -1,14 +1,1 @@
-/*
-** Compat-5.1
-** Copyright Kepler Project 2004-2006 (http://www.keplerproject.org/compat/)
-** $Id: compat-5.1.h,v 1.8 2006/02/20 21:12:47 carregal Exp $
-*/
 
-#ifndef COMPAT_H
-
-LUALIB_API void luaL_module(lua_State *L, const char *libname,
-                                       const luaL_reg *l, int nup);
-#define luaL_openlib luaL_module
-
-#endif
-

--- a/lang/luaexpat/files/compat-5.1r5/compat-5.1.lua
+++ /dev/null
@@ -1,268 +1,1 @@
---
--- Compat-5.1
--- Copyright Kepler Project 2004-2006 (http://www.keplerproject.org/compat)
--- According to Lua 5.1
--- $Id: compat-5.1.lua,v 1.22 2006/02/20 21:12:47 carregal Exp $
---
 
-_COMPAT51 = "Compat-5.1 R5"
-
-local LUA_DIRSEP = '/'
-local LUA_OFSEP = '_'
-local OLD_LUA_OFSEP = ''
-local POF = 'luaopen_'
-local LUA_PATH_MARK = '?'
-local LUA_IGMARK = ':'
-
-local assert, error, getfenv, ipairs, loadfile, loadlib, pairs, setfenv, setmetatable, type = assert, error, getfenv, ipairs, loadfile, loadlib, pairs, setfenv, setmetatable, type
-local find, format, gfind, gsub, sub = string.find, string.format, string.gfind, string.gsub, string.sub
-
---
--- avoid overwriting the package table if it's already there
---
-package = package or {}
-local _PACKAGE = package
-
-package.path = LUA_PATH or os.getenv("LUA_PATH") or
-             ("./?.lua;" ..
-              "/usr/local/share/lua/5.0/?.lua;" ..
-              "/usr/local/share/lua/5.0/?/?.lua;" ..
-              "/usr/local/share/lua/5.0/?/init.lua" )
- 
-package.cpath = LUA_CPATH or os.getenv("LUA_CPATH") or
-             "./?.so;" ..
-             "./l?.so;" ..
-             "/usr/local/lib/lua/5.0/?.so;" ..
-             "/usr/local/lib/lua/5.0/l?.so"
-
---
--- make sure require works with standard libraries
---
-package.loaded = package.loaded or {}
-package.loaded.debug = debug
-package.loaded.string = string
-package.loaded.math = math
-package.loaded.io = io
-package.loaded.os = os
-package.loaded.table = table 
-package.loaded.base = _G
-package.loaded.coroutine = coroutine
-local _LOADED = package.loaded
-
---
--- avoid overwriting the package.preload table if it's already there
---
-package.preload = package.preload or {}
-local _PRELOAD = package.preload
-
-
---
--- looks for a file `name' in given path
---
-local function findfile (name, pname)
-	name = gsub (name, "%.", LUA_DIRSEP)
-	local path = _PACKAGE[pname]
-	assert (type(path) == "string", format ("package.%s must be a string", pname))
-	for c in gfind (path, "[^;]+") do
-		c = gsub (c, "%"..LUA_PATH_MARK, name)
-		local f = io.open (c)
-		if f then
-			f:close ()
-			return c
-		end
-	end
-	return nil -- not found
-end
-
-
---
--- check whether library is already loaded
---
-local function loader_preload (name)
-	assert (type(name) == "string", format (
-		"bad argument #1 to `require' (string expected, got %s)", type(name)))
-	assert (type(_PRELOAD) == "table", "`package.preload' must be a table")
-	return _PRELOAD[name]
-end
-
-
---
--- Lua library loader
---
-local function loader_Lua (name)
-	assert (type(name) == "string", format (
-		"bad argument #1 to `require' (string expected, got %s)", type(name)))
-	local filename = findfile (name, "path")
-	if not filename then
-		return false
-	end
-	local f, err = loadfile (filename)
-	if not f then
-		error (format ("error loading module `%s' (%s)", name, err))
-	end
-	return f
-end
-
-
-local function mkfuncname (name)
-	name = gsub (name, "^.*%"..LUA_IGMARK, "")
-	name = gsub (name, "%.", LUA_OFSEP)
-	return POF..name
-end
-
-local function old_mkfuncname (name)
-	--name = gsub (name, "^.*%"..LUA_IGMARK, "")
-	name = gsub (name, "%.", OLD_LUA_OFSEP)
-	return POF..name
-end
-
---
--- C library loader
---
-local function loader_C (name)
-	assert (type(name) == "string", format (
-		"bad argument #1 to `require' (string expected, got %s)", type(name)))
-	local filename = findfile (name, "cpath")
-	if not filename then
-		return false
-	end
-	local funcname = mkfuncname (name)
-	local f, err = loadlib (filename, funcname)
-	if not f then
-		funcname = old_mkfuncname (name)
-		f, err = loadlib (filename, funcname)
-		if not f then
-			error (format ("error loading module `%s' (%s)", name, err))
-		end
-	end
-	return f
-end
-
-
-local function loader_Croot (name)
-	local p = gsub (name, "^([^.]*).-$", "%1")
-	if p == "" then
-		return
-	end
-	local filename = findfile (p, "cpath")
-	if not filename then
-		return
-	end
-	local funcname = mkfuncname (name)
-	local f, err, where = loadlib (filename, funcname)
-	if f then
-		return f
-	elseif where ~= "init" then
-		error (format ("error loading module `%s' (%s)", name, err))
-	end
-end
-
--- create `loaders' table
-package.loaders = package.loaders or { loader_preload, loader_Lua, loader_C, loader_Croot, }
-local _LOADERS = package.loaders
-
-
---
--- iterate over available loaders
---
-local function load (name, loaders)
-	-- iterate over available loaders
-	assert (type (loaders) == "table", "`package.loaders' must be a table")
-	for i, loader in ipairs (loaders) do
-		local f = loader (name)
-		if f then
-			return f
-		end
-	end
-	error (format ("module `%s' not found", name))
-end
-
--- sentinel
-local sentinel = function () end
-
---
--- new require
---
-function _G.require (modname)
-	assert (type(modname) == "string", format (
-		"bad argument #1 to `require' (string expected, got %s)", type(name)))
-	local p = _LOADED[modname]
-	if p then -- is it there?
-		if p == sentinel then
-			error (format ("loop or previous error loading module '%s'", modname))
-		end
-		return p -- package is already loaded
-	end
-	local init = load (modname, _LOADERS)
-	_LOADED[modname] = sentinel
-	local actual_arg = _G.arg
-	_G.arg = { modname }
-	local res = init (modname)
-	if res then
-		_LOADED[modname] = res
-	end
-	_G.arg = actual_arg
-	if _LOADED[modname] == sentinel then
-		_LOADED[modname] = true
-	end
-	return _LOADED[modname]
-end
-
-
--- findtable
-local function findtable (t, f)
-	assert (type(f)=="string", "not a valid field name ("..tostring(f)..")")
-	local ff = f.."."
-	local ok, e, w = find (ff, '(.-)%.', 1)
-	while ok do
-		local nt = rawget (t, w)
-		if not nt then
-			nt = {}
-			t[w] = nt
-		elseif type(t) ~= "table" then
-			return sub (f, e+1)
-		end
-		t = nt
-		ok, e, w = find (ff, '(.-)%.', e+1)
-	end
-	return t
-end
-
---
--- new package.seeall function
---
-function _PACKAGE.seeall (module)
-	local t = type(module)
-	assert (t == "table", "bad argument #1 to package.seeall (table expected, got "..t..")")
-	local meta = getmetatable (module)
-	if not meta then
-		meta = {}
-		setmetatable (module, meta)
-	end
-	meta.__index = _G
-end
-
-
---
--- new module function
---
-function _G.module (modname, ...)
-	local ns = _LOADED[modname]
-	if type(ns) ~= "table" then
-		ns = findtable (_G, modname)
-		if not ns then
-			error (string.format ("name conflict for module '%s'", modname))
-		end
-		_LOADED[modname] = ns
-	end
-	if not ns._NAME then
-		ns._NAME = modname
-		ns._M = ns
-		ns._PACKAGE = gsub (modname, "[^.]*$", "")
-	end
-	setfenv (2, ns)
-	for i, f in ipairs (arg) do
-		f (ns)
-	end
-end
-

--- a/lang/luaexpat/patches/001-compile-fix.patch
+++ /dev/null
@@ -1,11 +1,1 @@
---- a/config
-+++ b/config
-@@ -31,6 +31,6 @@
-         -Wshadow \
-         -Wwrite-strings
- 
--CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \
-+CFLAGS = $(CWARNS) -O2 -I$(LUA_INC) \
-    -I$(COMPAT_DIR) -I$(EXPAT_INC)
- CC = gcc
 

--- a/lang/luafilesystem/Makefile
+++ /dev/null
@@ -1,66 +1,1 @@
-#
-# Copyright (C) 2008-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:=luafilesystem
-PKG_VERSION:=1.6.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/keplerproject/luafilesystem.git
-PKG_SOURCE_VERSION:=2fd989cd6c777583be1c93616018c55b2cbb1bcf
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luafilesystem
-  SUBMENU:=Lua
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=LuaFileSystem
-  URL:=http://keplerproject.github.com/luafilesystem/
-  DEPENDS:=+liblua
-endef
-
-define Package/luafilesystem/description
- This package contains the LuaFileSystem library, a set of portable
- functions for directory creation, listing and deletion and for file
- locking.
-endef
-
-define Build/Configure
-endef
-
-TARGET_CFLAGS += $(FPIC) $(TARGET_CPPFLAGS)
-
-TARGET_LDFLAGS += -llua
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \
-		LDFLAGS="$(TARGET_LDFLAGS)"
-	$(TARGET_CROSS)ar r $(PKG_BUILD_DIR)/src/luafilesystem.a $(PKG_BUILD_DIR)/src/lfs.o
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/include
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib/lua
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lfs.h $(STAGING_DIR)/usr/include
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lfs.so $(STAGING_DIR)/usr/lib/lua
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/luafilesystem.a $(STAGING_DIR)/usr/lib/lua
-endef
-
-define Package/luafilesystem/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lfs.so $(1)/usr/lib/lua/lfs.so
-endef
-
-$(eval $(call BuildPackage,luafilesystem))
-

file:a/lang/luasec/Makefile (deleted)
--- a/lang/luasec/Makefile
+++ /dev/null
@@ -1,58 +1,1 @@
-#
-# Copyright (C) 2009-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luasec
-PKG_VERSION:=0.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/4255
-PKG_MD5SUM:=712158d60207bdbb6215fc7e07d8db24
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luasec
-  SUBMENU:=Lua
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=LuaSec
-  URL:=http://luasec.luaforge.net/
-  DEPENDS:=+lua +libopenssl +luasocket
-endef
-
-define Package/luasec/description
-  LuaSec is a binding for OpenSSL library to provide TLS/SSL communication.
-endef
-
-define Build/Configure
-endef
-
-MAKE_PATH = ./src
-
-MAKE_FLAGS += \
-	INCDIR="$(TARGET_CPPFLAGS)" \
-	LIBDIR="$(TARGET_LDFLAGS)" \
-	CC="$(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99" \
-	LD="$(TARGET_CROSS)ld -shared" \
-	LUACPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \
-	LUAPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \
-	linux \
-
-define Package/luasec/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lua/ssl.so $(1)/usr/lib/lua/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/ssl.lua $(1)/usr/lib/lua/
-	$(INSTALL_DIR) $(1)/usr/lib/lua/ssl
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/ssl/https.lua $(1)/usr/lib/lua/ssl/
-endef
-
-$(eval $(call BuildPackage,luasec))
-

file:a/lang/luasocket/Makefile (deleted)
--- a/lang/luasocket/Makefile
+++ /dev/null
@@ -1,62 +1,1 @@
-#
-# Copyright (C) 2009-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:=luasocket
-PKG_SOURCE_VERSION:=6d5e40c324c84d9c1453ae88e0ad5bdd0a631448
-PKG_VERSION:=3.0-rc1-20130909
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://github.com/diegonehab/luasocket.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luasocket
-  SUBMENU:=Lua
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=LuaSocket
-  URL:=http://luasocket.luaforge.net/
-  DEPENDS:=+lua
-endef
-
-define Package/luasocket/description
-  LuaSocket is the most comprehensive networking support
-  library for the Lua language. It provides easy access to
-  TCP, UDP, DNS, SMTP, FTP, HTTP, MIME and much more.
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/ \
-		LIBDIR="$(TARGET_LDFLAGS)" \
-		CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -std=gnu99" \
-		LD="$(TARGET_CROSS)ld -shared" \
-		all
-endef
-
-
-define Package/luasocket/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{ltn12,mime,socket}.lua $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mime.so.1.0.3 $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/socket.so.3.0-rc1 $(1)/usr/lib/lua
-	$(INSTALL_DIR) $(1)/usr/lib/lua/mime
-	ln -sf ../mime.so.1.0.3 $(1)/usr/lib/lua/mime/core.so
-	$(INSTALL_DIR) $(1)/usr/lib/lua/socket
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{ftp,http,smtp,tp,url,headers}.lua $(1)/usr/lib/lua/socket
-	ln -sf ../socket.so.3.0-rc1 $(1)/usr/lib/lua/socket/core.so
-endef
-
-$(eval $(call BuildPackage,luasocket))
-

--- a/lang/luasocket/patches/0001-Add-interface-support.patch
+++ /dev/null
@@ -1,238 +1,1 @@
-From 96fdf07acf78ecfc9be76a8b0591f38fe6f1a875 Mon Sep 17 00:00:00 2001
-From: Steven Barth <steven@midlink.org>
-Date: Sat, 9 Nov 2013 12:01:42 +0100
-Subject: [PATCH] Add interface resolving
 
----
- src/if.c        | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/if.h        |  27 ++++++++++++++
- src/luasocket.c |   2 +
- src/makefile    |   2 +
- src/options.c   |   9 +++++
- 5 files changed, 153 insertions(+)
- create mode 100644 src/if.c
- create mode 100644 src/if.h
-
-diff --git a/src/if.c b/src/if.c
-new file mode 100644
-index 0000000..db231aa
---- /dev/null
-+++ b/src/if.c
-@@ -0,0 +1,113 @@
-+/*
-+ * $Id: if.c $
-+ *
-+ * Author: Markus Stenberg <fingon@iki.fi>
-+ *
-+ * Copyright (c) 2012 cisco Systems, Inc.
-+ *
-+ * Created:       Tue Dec  4 14:50:34 2012 mstenber
-+ * Last modified: Wed Dec  5 18:51:08 2012 mstenber
-+ * Edit time:     24 min
-+ *
-+ */
-+
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <net/if.h>
-+
-+#include "if.h"
-+
-+#include "lauxlib.h"
-+
-+static int if_global_indextoname(lua_State *L);
-+static int if_global_nametoindex(lua_State *L);
-+static int if_global_nameindex(lua_State *L);
-+
-+static luaL_Reg func[] = {
-+    { "indextoname", if_global_indextoname},
-+    { "nametoindex", if_global_nametoindex},
-+    { "nameindex", if_global_nameindex},
-+    { NULL, NULL}
-+};
-+
-+int if_open(lua_State *L)
-+{
-+    lua_pushstring(L, "iface");
-+    lua_newtable(L);
-+    luaL_openlib(L, NULL, func, 0);
-+    lua_settable(L, -3);
-+    return 0;
-+}
-+
-+int if_global_indextoname(lua_State *L)
-+{
-+  unsigned int ifnumber;
-+  const char *name;
-+  char buf[IF_NAMESIZE+1];
-+
-+  if (!lua_isnumber(L, 1))
-+    {
-+      lua_pushnil(L);
-+      lua_pushstring(L, "indextoname expects only number argument");
-+      return 2;
-+    }
-+  ifnumber = lua_tonumber(L, 1);
-+  if (!(name = if_indextoname(ifnumber, buf)))
-+    {
-+      lua_pushnil(L);
-+      lua_pushstring(L, "nonexistent interface");
-+      return 2;
-+    }
-+  lua_pushstring(L, name);
-+  return 1;
-+}
-+
-+int if_global_nametoindex(lua_State *L)
-+{
-+  unsigned int ifnumber;
-+  if (!lua_isstring(L, 1))
-+    {
-+      lua_pushnil(L);
-+      lua_pushstring(L, "nametoindex expects only string argument");
-+      return 2;
-+    }
-+  if (!(ifnumber = if_nametoindex(lua_tostring(L, 1))))
-+    {
-+      lua_pushnil(L);
-+      lua_pushstring(L, "nonexistent interface");
-+      return 2;
-+    }
-+  lua_pushnumber(L, ifnumber);
-+  return 1;
-+}
-+
-+int if_global_nameindex(lua_State *L)
-+{
-+  struct if_nameindex *ni, *oni;
-+  int i = 1;
-+  oni = ni = if_nameindex();
-+  lua_newtable(L);
-+  while (ni && ni->if_index && *(ni->if_name))
-+    {
-+      /* at result[i], we store.. */
-+      lua_pushnumber(L, i);
-+
-+      /* new table with two items - index, name*/
-+      lua_newtable(L);
-+      lua_pushstring(L, "index");
-+      lua_pushnumber(L, ni->if_index);
-+      lua_settable(L, -3);
-+
-+      lua_pushstring(L, "name");
-+      lua_pushstring(L, ni->if_name);
-+      lua_settable(L, -3);
-+
-+      /* Then, actually store it */
-+      lua_settable(L, -3);
-+
-+      i++;
-+      ni++;
-+    }
-+  if_freenameindex(oni);
-+  return 1;
-+}
-diff --git a/src/if.h b/src/if.h
-new file mode 100644
-index 0000000..dc7faf8
---- /dev/null
-+++ b/src/if.h
-@@ -0,0 +1,27 @@
-+/*
-+ * $Id: if.h $
-+ *
-+ * Author: Markus Stenberg <fingon@iki.fi>
-+ *
-+ *  Copyright (c) 2012 cisco Systems, Inc.
-+ *
-+ * Created:       Tue Dec  4 14:37:24 2012 mstenber
-+ * Last modified: Tue Dec  4 14:51:43 2012 mstenber
-+ * Edit time:     7 min
-+ *
-+ */
-+
-+/* This module provides Lua wrapping for the advanced socket API
-+ * defined in RFC3542, or mainly, the access to the system's interface
-+ * list. It is necessary for use of recvmsg/sendmsg.
-+ *
-+ * TODO - Do something clever with Windows?
-+ */
-+#ifndef IF_H
-+#define IF_H
-+
-+#include "lua.h"
-+
-+int if_open(lua_State *L);
-+
-+#endif /* IF_H */
-diff --git a/src/luasocket.c b/src/luasocket.c
-index e6ee747..85d41a6 100644
---- a/src/luasocket.c
-+++ b/src/luasocket.c
-@@ -31,6 +31,7 @@
- #include "tcp.h"
- #include "udp.h"
- #include "select.h"
-+#include "if.h"
- 
- /*-------------------------------------------------------------------------*\
- * Internal function prototypes
-@@ -51,6 +52,7 @@ static const luaL_Reg mod[] = {
-     {"tcp", tcp_open},
-     {"udp", udp_open},
-     {"select", select_open},
-+    {"iface", if_open},
-     {NULL, NULL}
- };
- 
-diff --git a/src/makefile b/src/makefile
-index 8d3521e..09d4882 100644
---- a/src/makefile
-+++ b/src/makefile
-@@ -262,6 +262,7 @@ SOCKET_OBJS= \
- 	auxiliar.$(O) \
- 	options.$(O) \
- 	inet.$(O) \
-+	if.$(O) \
- 	$(SOCKET) \
- 	except.$(O) \
- 	select.$(O) \
-@@ -387,6 +388,7 @@ auxiliar.$(O): auxiliar.c auxiliar.h
- buffer.$(O): buffer.c buffer.h io.h timeout.h
- except.$(O): except.c except.h
- inet.$(O): inet.c inet.h socket.h io.h timeout.h usocket.h
-+if.$(O): if.c if.h
- io.$(O): io.c io.h timeout.h
- luasocket.$(O): luasocket.c luasocket.h auxiliar.h except.h \
- 	timeout.h buffer.h io.h inet.h socket.h usocket.h tcp.h \
-diff --git a/src/options.c b/src/options.c
-index 8ac2a14..1c73e6f 100644
---- a/src/options.c
-+++ b/src/options.c
-@@ -3,6 +3,9 @@
- * LuaSocket toolkit
- \*=========================================================================*/
- #include <string.h> 
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <net/if.h>
- 
- #include "lauxlib.h"
- 
-@@ -285,6 +288,12 @@ static int opt_ip6_setmembership(lua_State *L, p_socket ps, int level, int name)
-     if (!lua_isnil(L, -1)) {
-         if (lua_isnumber(L, -1)) {
-             val.ipv6mr_interface = (unsigned int) lua_tonumber(L, -1);
-+        } else if (lua_isstring(L, -1)) {
-+            if (!(val.ipv6mr_interface = if_nametoindex(lua_tostring(L, -1)))) {
-+                lua_pushnil(L);
-+                lua_pushstring(L, "nonexistent interface");
-+                return 2;
-+            }
-         } else
-           luaL_argerror(L, -1, "number 'interface' field expected");
-     }
--- 
-1.8.4.rc3
-
-

--- a/lang/perl-compress-bzip2/Makefile
+++ /dev/null
@@ -1,40 +1,1 @@
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-compress-bzip2
-PKG_VERSION:=2.09
-PKG_RELEASE:=3
-PKG_MD5SUM:=1699fde3e86f2a036f135ae606d456bf
-
-PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/A/AR/ARJAY
-PKG_SOURCE:=Compress-Bzip2-$(PKG_VERSION).tar.gz
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Compress-Bzip2-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-compress-bzip2
-  SUBMENU:=Perl
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Perl interface to bzip2 compression library
-  URL:=http://search.cpan.org/dist/Compress-Bzip2/
-  DEPENDS:=perl +libbz2
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,,BUILD_BZLIB=0)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-compress-bzip2/install
-	$(call perlmod/Install,$(1),Compress auto/Compress)
-endef
-
-
-$(eval $(call BuildPackage,perl-compress-bzip2))
-

file:a/lang/perl-dbi/Makefile (deleted)
--- a/lang/perl-dbi/Makefile
+++ /dev/null
@@ -1,40 +1,1 @@
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-dbi
-PKG_VERSION:=1.604
-PKG_RELEASE:=1
-PKG_MD5SUM:=358511d60eb3daba913d49236c469802
-
-PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/
-PKG_SOURCE:=DBI-$(PKG_VERSION).tar.gz
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/DBI-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-dbi
-SUBMENU:=Perl
-SECTION:=lang
-CATEGORY:=Languages
-TITLE:=Database independent interface for Perl
-URL:=http://search.cpan.org/dist/DBI/
-DEPENDS:=perl +perlbase-essential
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-dbi/install
-	$(call perlmod/Install,$(1),DB* auto/DBI,DBI/W32ODBC.pm auto/DBI/*.h)
-endef
-
-
-$(eval $(call BuildPackage,perl-dbi))
-

--- a/lang/perl-html-parser/Makefile
+++ /dev/null
@@ -1,40 +1,1 @@
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-html-parser
-PKG_VERSION:=3.56
-PKG_RELEASE:=1
-PKG_MD5SUM:=bddc432e5ed9df4d4153a62234f04fc2
-
-PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/G/GA/GAAS
-PKG_SOURCE:=HTML-Parser-$(PKG_VERSION).tar.gz
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Parser-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-html-parser
-SUBMENU:=Perl
-SECTION:=lang
-CATEGORY:=Languages
-TITLE:=A collection of modules that parse HTML text documents
-URL:=http://search.cpan.org/dist/HTML-Parser/
-DEPENDS:=perl +perl-html-tagset +perl-uri
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-html-parser/install
-	$(call perlmod/Install,$(1),HTML auto/HTML)
-endef
-
-
-$(eval $(call BuildPackage,perl-html-parser))
-

--- a/lang/perl-html-tagset/Makefile
+++ /dev/null
@@ -1,40 +1,1 @@
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-html-tagset
-PKG_VERSION:=3.20
-PKG_RELEASE:=1
-PKG_MD5SUM:=d2bfa18fe1904df7f683e96611e87437
-
-PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE
-PKG_SOURCE:=HTML-Tagset-$(PKG_VERSION).tar.gz
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Tagset-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-html-tagset
-SUBMENU:=Perl
-SECTION:=lang
-CATEGORY:=Languages
-TITLE:=Data tables pertaining to HTML
-URL:=http://search.cpan.org/dist/HTML-Tagset/
-DEPENDS:=perl
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-html-tagset/install
-	$(call perlmod/Install,$(1),HTML)
-endef
-
-
-$(eval $(call BuildPackage,perl-html-tagset))
-

--- a/lang/perl-html-tree/Makefile
+++ /dev/null
@@ -1,40 +1,1 @@
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-html-tree
-PKG_VERSION:=3.23
-PKG_RELEASE:=2
-PKG_MD5SUM:=6352f50be402301f79b580dd235d7762
-
-PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/P/PE/PETEK
-PKG_SOURCE:=HTML-Tree-$(PKG_VERSION).tar.gz
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Tree-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-html-tree
-SUBMENU:=Perl
-SECTION:=lang
-CATEGORY:=Languages
-TITLE:=represent and create HTML syntax trees
-URL:=http://search.cpan.org/dist/HTML-Tree/
-DEPENDS:=perl +perl-html-parser +perl-html-tagset
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-html-tree/install
-	$(call perlmod/Install,$(1),HTML)
-endef
-
-
-$(eval $(call BuildPackage,perl-html-tree))
-

--- a/lang/perl-lockfile-simple/Makefile
+++ /dev/null
@@ -1,40 +1,1 @@
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-lockfile-simple
-PKG_VERSION:=0.206
-PKG_RELEASE:=1
-PKG_MD5SUM:=d8966c3fb799aefcaaf80f845057a1fa
-
-PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/J/JV/JV
-PKG_SOURCE:=LockFile-Simple-$(PKG_VERSION).tar.gz
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/LockFile-Simple-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-lockfile-simple
-SUBMENU:=Perl
-SECTION:=lang
-CATEGORY:=Languages
-TITLE:=Simple advisory file locking
-URL:=http://search.cpan.org/dist/LockFile-Simple/
-DEPENDS:=perl
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-lockfile-simple/install
-	$(call perlmod/Install,$(1),LockFile auto/LockFile)
-endef
-
-
-$(eval $(call BuildPackage,perl-lockfile-simple))
-

--- a/lang/perl-net-telnet/Makefile
+++ /dev/null
@@ -1,45 +1,1 @@
-#
-# Copyright (C) 2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-net-telnet
-PKG_VERSION:=3.03
-PKG_RELEASE:=1
-PKG_MD5SUM:=2f7d34b09d6117baefe89d44cff9d5fc
-
-PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/J/JR/JROGERS
-PKG_SOURCE:=Net-Telnet-$(PKG_VERSION).tar.gz
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Net-Telnet-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-net-telnet
-SUBMENU:=Perl
-SECTION:=lang
-CATEGORY:=Languages
-TITLE:=Telnet client
-URL:=http://search.cpan.org/~jrogers/Net-Telnet-3.03/
-DEPENDS:=perl
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-net-telnet/install
-	$(call perlmod/Install,$(1),Net auto/Net)
-endef
-
-$(eval $(call BuildPackage,perl-net-telnet))
-

--- a/lang/perl-test-harness/Makefile
+++ /dev/null
@@ -1,43 +1,1 @@
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-test-harness
-PKG_VERSION:=3.25
-PKG_RELEASE:=1
-PKG_MD5SUM:=69a8a019eeb952fe97e3ac0767c726da
-
-PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/O/OV/OVID
-PKG_SOURCE:=Test-Harness-$(PKG_VERSION).tar.gz
-
-PKG_LICENSE:=GPLv2 ARTISTIC
-PKG_LICENSE_FILES:=
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Test-Harness-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-test-harness
-SUBMENU:=Perl
-SECTION:=lang
-CATEGORY:=Languages
-TITLE:=Perl Test Harness
-URL:=http://search.cpan.org/~ovid/Test-Harness-3.25/bin/prove
-DEPENDS:=+perl
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-test-harness/install
-	$(call perlmod/Install,$(1),App auto/Test TAP Test)
-endef
-
-
-$(eval $(call BuildPackage,perl-test-harness))
-

file:a/lang/perl-uri/Makefile (deleted)
--- a/lang/perl-uri/Makefile
+++ /dev/null
@@ -1,40 +1,1 @@
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-uri
-PKG_VERSION:=1.36
-PKG_RELEASE:=1
-PKG_MD5SUM:=a97bbdd38b31c6b2672fdc3060fae34b
-
-PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/G/GA/GAAS
-PKG_SOURCE:=URI-$(PKG_VERSION).tar.gz
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/URI-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-uri
-SUBMENU:=Perl
-SECTION:=lang
-CATEGORY:=Languages
-TITLE:=Manipulates and accesses URI strings
-URL:=http://search.cpan.org/dist/URI/
-DEPENDS:=perl
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-uri/install
-	$(call perlmod/Install,$(1),URI URI.pm)
-endef
-
-
-$(eval $(call BuildPackage,perl-uri))
-

--- a/lang/perl-www-curl/Makefile
+++ /dev/null
@@ -1,40 +1,1 @@
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-www-curl
-PKG_VERSION:=4.00
-PKG_RELEASE:=1
-PKG_MD5SUM:=f34eb29f59a811869a4f77bfc0df2f5d
-
-PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT
-PKG_SOURCE:=WWW-Curl-$(PKG_VERSION).tar.gz
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/WWW-Curl-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-www-curl
-SUBMENU:=Perl
-SECTION:=lang
-CATEGORY:=Languages
-TITLE:=Perl bindings to libcurl
-URL:=http://search.cpan.org/dist/WWW-Curl/
-DEPENDS:=perl +libcurl
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,$(STAGING_DIR)/usr/include,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-www-curl/install
-	$(call perlmod/Install,$(1),WWW/Curl WWW/Curl.pm auto/WWW/Curl)
-endef
-
-
-$(eval $(call BuildPackage,perl-www-curl))
-

--- a/lang/perl-www-curl/patches/100-perl-www-curl_disable_curl-config_hack.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- WWW-Curl-4.00.config/Makefile.PL	2008-04-21 23:18:39.000000000 +0200
-+++ WWW-Curl-4.00/Makefile.PL	2008-04-21 23:18:52.000000000 +0200
-@@ -11,7 +11,7 @@
- no_index		directory => 'template';
- # This is a hack. If you have libcurl installed, just specify curl.h below
- # and comment out this line.
--requires_external_bin	'curl-config';
-+#requires_external_bin	'curl-config';
- 
- # This utility helper generates the constants function from curl.h
- # It is normally only used by the maintainer, but if you're curl is older
 

--- a/lang/perl-www-mechanize/Makefile
+++ /dev/null
@@ -1,45 +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:=perl-www-mechanize
-PKG_VERSION:=1.58
-PKG_RELEASE:=1
-
-PKG_SOURCE:=WWW-Mechanize-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/
-PKG_MD5SUM:=c928d1bf3218bfe0c0d99096cf34db52
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/WWW-Mechanize-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-www-mechanize
-  SUBMENU:=Perl
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Perl WWW Mechanize
-  URL:=http://search.cpan.org/dist/WWW-Mechanize/
-  DEPENDS:=perl +perl-www
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,$(STAGING_DIR)/usr/include,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-www-mechanize/install
-	$(call perlmod/Install,$(1),WWW/Mechanize WWW/Mechanize.pm)
-endef
-
-$(eval $(call BuildPackage,perl-www-mechanize))
-

file:a/lang/perl-www/Makefile (deleted)
--- a/lang/perl-www/Makefile
+++ /dev/null
@@ -1,46 +1,1 @@
-#
-# Copyright (C) 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:=perl-www
-PKG_VERSION:=5.837
-PKG_RELEASE:=1
-PKG_MD5SUM:=9bbf1bce482b0bac98bb4f04253c03d0
-
-PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/G/GA/GAAS
-PKG_SOURCE:=libwww-perl-$(PKG_VERSION).tar.gz
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/libwww-perl-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-www
-SUBMENU:=Perl
-SECTION:=lang
-CATEGORY:=Languages
-TITLE:=WWW client/server library for Perl (aka LWP)
-URL:=http://search.cpan.org/dist/libwww-perl/
-DEPENDS:=perl +perl-html-parser +perl-html-tagset +perl-uri
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,-n,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-www/install
-	$(call perlmod/Install,$(1),File HTML HTTP LWP LWP.pm Net WWW)
-endef
-
-
-$(eval $(call BuildPackage,perl-www))
-

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>
 

--- a/libs/argp-standalone/Makefile
+++ /dev/null
@@ -1,38 +1,1 @@
-include $(TOPDIR)/rules.mk
 
-PKG_NAME:=argp-standalone
-PKG_VERSION:=1.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.lysator.liu.se/~nisse/misc/
-PKG_MD5SUM:=720704bac078d067111b32444e24ba69
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/argp-standalone
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Hierarchial argument parsing broken out from glibc
-  URL:=http://www.lysator.liu.se/~nisse/misc/
-endef
-
-define Package/argp-standalone/description
-  GNU libc hierarchial argument parsing library broken out from glibc.
-endef
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) $(FPIC)"
-
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP)   $(PKG_BUILD_DIR)/argp.h \
-		$(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP)   $(PKG_BUILD_DIR)/libargp.a \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,argp-standalone))
-

--- a/libs/argp-standalone/patches/001-throw-in-funcdef.patch
+++ /dev/null
@@ -1,80 +1,1 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# T2 SDE: package/.../rng-tools/throw-in-funcdef.patch.argp-standalone
-# Copyright (C) 2006 The T2 SDE Project
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- T2-COPYRIGHT-NOTE-END ---
 
-
-No __THROW in function implementation.
-	--jsaw
-
---- argp-standalone-1.4-test2/argp.h.orig	2006-01-06 02:29:59.000000000 +0100
-+++ argp-standalone-1.4-test2/argp.h	2006-01-06 02:41:10.000000000 +0100
-@@ -560,17 +560,17 @@
- # endif
- 
- # ifndef ARGP_EI
--#  define ARGP_EI extern __inline__
-+#  define ARGP_EI extern inline
- # endif
- 
- ARGP_EI void
--__argp_usage (__const struct argp_state *__state) __THROW
-+__argp_usage (__const struct argp_state *__state)
- {
-   __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
- }
- 
- ARGP_EI int
--__option_is_short (__const struct argp_option *__opt) __THROW
-+__option_is_short (__const struct argp_option *__opt)
- {
-   if (__opt->flags & OPTION_DOC)
-     return 0;
-@@ -582,7 +582,7 @@
- }
- 
- ARGP_EI int
--__option_is_end (__const struct argp_option *__opt) __THROW
-+__option_is_end (__const struct argp_option *__opt)
- {
-   return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
- }
---- argp-standalone-1.4-test2/argp-parse.c.orig	2006-01-06 02:47:48.000000000 +0100
-+++ argp-standalone-1.4-test2/argp-parse.c	2006-01-06 02:48:16.000000000 +0100
-@@ -1290,13 +1290,13 @@
- /* Defined here, in case a user is not inlining the definitions in
-  * argp.h */
- void
--__argp_usage (__const struct argp_state *__state) __THROW
-+__argp_usage (__const struct argp_state *__state)
- {
-   __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
- }
- 
- int
--__option_is_short (__const struct argp_option *__opt) __THROW
-+__option_is_short (__const struct argp_option *__opt) 
- {
-   if (__opt->flags & OPTION_DOC)
-     return 0;
-@@ -1310,7 +1310,7 @@
- }
- 
- int
--__option_is_end (__const struct argp_option *__opt) __THROW
-+__option_is_end (__const struct argp_option *__opt) 
- {
-   return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
- }
-

--- a/libs/cyrus-sasl/Makefile
+++ /dev/null
@@ -1,112 +1,1 @@
-#
-# Copyright (C) 2006-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:=cyrus-sasl
-PKG_VERSION:=2.1.23
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://ftp.andrew.cmu.edu/pub/cyrus-mail/
-PKG_MD5SUM:=2eb0e48106f0e9cd8001e654f267ecbc
-
-PKG_LICENSE:=BSD-4c BSD
-PKG_LICENSE_FILES:=COPYING cmulocal/COPYING saslauthd/COPYING
-
-PKG_BUILD_DEPENDS:=libopenssl
-
-PKG_FIXUP:=autoreconf
-PKG_MACRO_PATHS:=cmulocal config ../cmulocal ../config
-PKG_AUTOMAKE_PATHS:=. saslauthd sasldb
-PKG_REMOVE_FILES:=aclocal.m4 saslauthd/aclocal.m4 config/libtool.m4
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libsasl2
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=A general purpose authentication library
-  URL:=http://asg.web.cmu.edu/sasl/
-endef
-
-TARGET_CFLAGS += $(FPIC)
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-sample \
-	--enable-staticdlopen \
-	--disable-java \
-	--disable-alwaystrue \
-	--disable-checkapop \
-	--enable-cram \
-	--enable-digest \
-	--without-auth-sasldb \
-	--disable-otp \
-	--disable-srp \
-	--disable-srp-setpass \
-	--disable-krb4 \
-	--disable-gssapi \
-	--disable-gss_mutexes \
-	--enable-plain \
-	--enable-anon \
-	--disable-login \
-	--disable-ntlm \
-	--disable-sql \
-	--disable-ldapdb \
-	--without-dblib \
-	--without-gdbm \
-	--with-devrandom="/dev/urandom" \
-	--without-pam \
-	--without-saslauthd \
-	--without-authdaemond \
-	--without-pwcheck \
-	--with-ipctype=unix \
-	--with-openssl="$(STAGING_DIR)/usr" \
-	--without-des \
-	--without-opie \
-	--without-ldap \
-	--without-mysql \
-	--without-pgsql \
-	--without-sqlite \
-	--without-rc4 \
-	--without-dmalloc \
-	--without-sfio \
-	--disable-sample
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/include \
-		CC="$(HOSTCC)" \
-		LINK="$(HOSTCC) -o makemd5 -lc" \
-		CFLAGS="" \
-		CPPFLAGS="" \
-		makemd5
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/sasl $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsasl2.{a,so*} $(1)/usr/lib/
-	ln -sf libsasl2.a $(1)/usr/lib/libsasl.a
-	ln -sf libsasl2.so $(1)/usr/lib/libsasl.so
-	$(INSTALL_DIR) $(1)/usr/lib/sasl2
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.{a,so*} $(1)/usr/lib/sasl2/
-endef
-
-define Package/libsasl2/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsasl2.so.* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/sasl2
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.so.* $(1)/usr/lib/sasl2/
-endef
-
-$(eval $(call BuildPackage,libsasl2))
-

--- a/libs/cyrus-sasl/patches/001-automake-compat.patch
+++ /dev/null
@@ -1,126 +1,1 @@
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -44,6 +44,7 @@
- sasl_version = 2:23:0
- 
- INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
-+SASL_STATIC_SRC = $(patsubst %.o, %.c, $(SASL_STATIC_OBJS))
- 
- EXTRA_DIST = windlopen.c staticopen.h NTMakefile
- EXTRA_LIBRARIES = libsasl2.a
-@@ -93,7 +94,7 @@ libsasl2.a: libsasl2.la $(SASL_STATIC_OB
- 	rm -f $@
- 	ln -s .libs/$@ $@
- 
--$(SASL_STATIC_OBJS): linksrcs
-+$(SASL_STATIC_SRC): linksrcs
- 
- linksrcs:
- 	-ln -s $(SASL_STATIC_SRCS) .
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -176,6 +176,7 @@ SASL_KRB_LIB = @SASL_KRB_LIB@
- SASL_MECHS = @SASL_MECHS@
- SASL_STATIC_LIBS = @SASL_STATIC_LIBS@
- SASL_STATIC_OBJS = @SASL_STATIC_OBJS@
-+SASL_STATIC_SRC = $(patsubst %.o, %.c, $(SASL_STATIC_OBJS)) 
- SASL_STATIC_SRCS = @SASL_STATIC_SRCS@
- SASL_UTIL_HEADERS_EXTRA = @SASL_UTIL_HEADERS_EXTRA@
- SASL_UTIL_LIBS_EXTRA = @SASL_UTIL_LIBS_EXTRA@
-@@ -646,7 +647,7 @@ libsasl2.a: libsasl2.la $(SASL_STATIC_OB
- 	rm -f $@
- 	ln -s .libs/$@ $@
- 
--$(SASL_STATIC_OBJS): linksrcs
-+$(SASL_STATIC_SRC): linksrcs
- 
- linksrcs:
- 	-ln -s $(SASL_STATIC_SRCS) .
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -82,12 +82,12 @@ EXTRA_LTLIBRARIES = libplain.la libanony
- 	libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la
- 
- libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
--libplain_la_LDFLAGS = -version-info $(plain_version)
-+libplain_la_LDFLAGS = -version-info $(plain_version) $(AM_LDFLAGS)
- libplain_la_DEPENDENCIES = $(COMPAT_OBJS)
- libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
- 
- libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources)
--libanonymous_la_LDFLAGS = -version-info $(anonymous_version)
-+libanonymous_la_LDFLAGS = -version-info $(anonymous_version) $(AM_LDFLAGS)
- libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS)
- libanonymous_la_LIBADD = $(COMPAT_OBJS)
- 
-@@ -97,58 +97,58 @@ libkerberos4_la_DEPENDENCIES = $(COMPAT_
- libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS)
- 
- libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources)
--libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version)
-+libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version) $(AM_LDFLAGS)
- libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS)
- libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS)
- 
- libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources)
--libcrammd5_la_LDFLAGS = -version-info $(crammd5_version)
-+libcrammd5_la_LDFLAGS = -version-info $(crammd5_version) $(AM_LDFLAGS)
- libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS)
- libcrammd5_la_LIBADD = $(COMPAT_OBJS)
- 
- libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources)
--libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version)
-+libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version) $(AM_LDFLAGS)
- libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS)
- libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS)
- 
- liblogin_la_SOURCES = login.c login_init.c $(common_sources)
--liblogin_la_LDFLAGS = -version-info $(login_version)
-+liblogin_la_LDFLAGS = -version-info $(login_version) $(AM_LDFLAGS)
- liblogin_la_DEPENDENCIES = $(COMPAT_OBJS)
- liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
- 
- libsrp_la_SOURCES = srp.c srp_init.c $(common_sources)
--libsrp_la_LDFLAGS = -version-info $(srp_version)
-+libsrp_la_LDFLAGS = -version-info $(srp_version) $(AM_LDFLAGS)
- libsrp_la_DEPENDENCIES = $(COMPAT_OBJS)
- libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS)
- 
- libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources)
--libotp_la_LDFLAGS = -version-info $(otp_version)
-+libotp_la_LDFLAGS = -version-info $(otp_version) $(AM_LDFLAGS)
- libotp_la_DEPENDENCIES = $(COMPAT_OBJS)
- libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS)
- 
- libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources)
--libntlm_la_LDFLAGS = -version-info $(ntlm_version)
-+libntlm_la_LDFLAGS = -version-info $(ntlm_version) $(AM_LDFLAGS)
- libntlm_la_DEPENDENCIES = $(COMPAT_OBJS)
- libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS)
- 
- libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources)
--libpassdss_la_LDFLAGS = -version-info $(passdss_version)
-+libpassdss_la_LDFLAGS = -version-info $(passdss_version) $(AM_LDFLAGS)
- libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS)
- libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS)
- 
- # Auxprop Plugins
- libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources)
--libsasldb_la_LDFLAGS = -version-info $(sasldb_version)
-+libsasldb_la_LDFLAGS = -version-info $(sasldb_version) $(AM_LDFLAGS)
- libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
- libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
- 
- libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources)
--libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version)
-+libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version) $(AM_LDFLAGS)
- libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
- libldapdb_la_LIBADD = $(COMPAT_OBJS)
- 
- libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
--libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
-+libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) $(AM_LDFLAGS)
- libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
- libsql_la_LIBADD = $(COMPAT_OBJS)
- 
 

--- a/libs/cyrus-sasl/patches/200-fix_avr32_compile.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/config/config.sub
-+++ b/config/config.sub
-@@ -241,7 +241,7 @@ case $basic_machine in
- 		| mips64vr5000 | mips64vr5000el | mcore | s390 | s390x \
- 		| sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
- 		| v850 | c4x \
--		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
-+		| thumb | d10v | d30v | fr30 | avr | avr32 | openrisc | tic80 \
- 		| pj | pjl | h8500 | z8k)
- 		basic_machine=$basic_machine-unknown
- 		;;
 

file:a/libs/file/Makefile (deleted)
--- a/libs/file/Makefile
+++ /dev/null
@@ -1,95 +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:=file
-PKG_VERSION:=5.11
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.astron.com/pub/file/
-PKG_MD5SUM:=16a407bd66d6c7a832f3a5c0d609c27b
-
-PKG_LICENSE:=BSD-2c
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/file/Default
-  TITLE:=File type determination
-  URL:=ftp://ftp.astron.com/pub/file/
-  MAINTAINER:=Luka Perkov <openwrt@lukaperkov.net>
-endef
-
-define Package/file
-$(call package/file/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+= utility
-  DEPENDS:=+libmagic
-endef
-
-define Package/libmagic
-$(call package/file/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= library
-  DEPENDS:=+zlib
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-
-MAKE_PATH := src
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile/magic
-	( cd $(PKG_BUILD_DIR)/magic/Magdir; \
-		for f in `ls`; do \
-			cat $$$${f}; \
-		done \
-	) > $(PKG_BUILD_DIR)/magic/magic
-endef
-Hooks/Compile/Post += Build/Compile/magic
-
-define Build/Install/magic
-	$(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/share/file
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/magic/magic $(PKG_INSTALL_DIR)/usr/share/file/
-endef
-Hooks/Install/Post += Build/Install/magic
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/magic.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libmagic.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/file/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/file $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/share/misc
-	$(SED) "/^#/d" $(PKG_INSTALL_DIR)/usr/share/file/magic
-	$(SED) "/^$$$$/d" $(PKG_INSTALL_DIR)/usr/share/file/magic
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/file/magic $(1)/usr/share/misc/
-endef
-
-define Package/libmagic/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libmagic.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,file))
-$(eval $(call BuildPackage,libmagic))
-

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/giflib/Makefile
+++ b/libs/giflib/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=giflib
-PKG_VERSION:=4.1.6
+PKG_VERSION:=5.1.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/giflib
-PKG_MD5SUM:=7125644155ae6ad33dbc9fc15a14735f
+PKG_MD5SUM:=c7e9f1c10b755ab955156d4c1ac7fc5d
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING

file:a/libs/gsm/Makefile (deleted)
--- a/libs/gsm/Makefile
+++ /dev/null
@@ -1,97 +1,1 @@
-#
-# Copyright (C) 2006-2009 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:=gsm
-PKG_VERSION:=1.0.13
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://user.cs.tu-berlin.de/~jutta/gsm/
-PKG_MD5SUM:=c1ba392ce61dc4aff1c29ea4e92f6df4
-
-PKG_LICENSE:=FREE
-PKG_LICENSE_FILES:=COPYRIGHT
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-1.0-pl13
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/gsm/Default
-  TITLE:=GSM transcoding
-  URL:=http://user.cs.tu-berlin.de/~jutta/toast.html
-endef
-
-define Package/gsm/description/Default
- An implementation of the European GSM 06.10 provisional standard
- for full-rate speech transcoding, prI-ETS 300 036, which uses
- RPE/LTP (residual pulse excitation/long term prediction) coding
- at 13 kbit/s.
-endef
-
-define Package/libgsm
-$(call Package/gsm/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= library
-endef
-
-define Package/libgsm/description
-$(call Package/gsm/description/Default)
- This package contains a shared GSM transcoding library, used by other
- programs.
-endef
-
-define Package/gsm-utils
-$(call Package/gsm/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libgsm
-  TITLE+= utilities
-endef
-
-define Package/gsm-utils/description
-$(call Package/gsm/description/Default)
- This package contains GSM transcoding utilities.
-endef
-
-define Build/Configure
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		LD="$(TARGET_CC)" \
-		COPTS="$(TARGET_CFLAGS)" \
-		INSTALL_ROOT="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-define Package/libgsm/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgsm.so.* $(1)/usr/lib/
-endef
-
-define Package/gsm-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/toast $(1)/usr/bin/
-	(cd $(1)/usr/bin; ln -sf toast untoast; ln -sf toast tcat)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/gsm
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/gsm.h $(1)/usr/include/gsm/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgsm.{a,so*} $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libgsm))
-$(eval $(call BuildPackage,gsm-utils))
-

--- a/libs/gsm/patches/001-debian-libsgm-1.0.10-13.patch
+++ /dev/null
@@ -1,429 +1,1 @@
---- a/Makefile
-+++ b/Makefile
-@@ -8,10 +8,12 @@ SASR	= -DSASR
- ######### Define SASR if >> is a signed arithmetic shift (-1 >> 1 == -1)
- 
- # MULHACK = -DUSE_FLOAT_MUL
-+MULHACK =
- ######### Define this if your host multiplies floats faster than integers,
- ######### e.g. on a SPARCstation.
- 
- # FAST	= -DFAST
-+FAST	=
- ######### Define together with USE_FLOAT_MUL to enable the GSM library's
- ######### approximation option for incorrect, but good-enough results.
- 
-@@ -22,8 +24,8 @@ LTP_CUT	=
- ######### both integer and floating point multiplications.
- ######### This flag is still in the experimental stage.
- 
--WAV49	= -DWAV49
--# WAV49	=
-+# WAV49	= -DWAV49
-+WAV49	=
- ######### Define to enable the GSM library's option to pack GSM frames 
- ######### in the style used by the WAV #49 format.  If you want to write
- ######### a tool that produces .WAV files which contain GSM-encoded data,
-@@ -44,7 +46,8 @@ WAV49	= -DWAV49
- # CCFLAGS 	= -c -O
- 
- CC		= gcc -ansi -pedantic
--CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1
-+COPTS		= -O2
-+CCFLAGS 	= -c $(COPTS) -DNeedFunctionPrototypes=1
- 
- LD 		= $(CC)
- 
-@@ -78,10 +81,10 @@ INSTALL_ROOT	=
- # Leave GSM_INSTALL_ROOT empty to not install the GSM library outside of
- # this directory.
- 
--GSM_INSTALL_ROOT = $(INSTALL_ROOT)
-+GSM_INSTALL_ROOT = $(INSTALL_ROOT)/usr
- GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
--GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc
--GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
-+GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/include
-+GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/share/man/man3
- 
- 
- # Where do you want to install the toast binaries and their manpage?
-@@ -89,14 +92,14 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/ma
- # Leave TOAST_INSTALL_ROOT empty to not install the toast binaries outside
- # of this directory.
- 
--TOAST_INSTALL_ROOT	  = $(INSTALL_ROOT)
-+TOAST_INSTALL_ROOT	  = $(INSTALL_ROOT)/usr
- TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin
--TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1
-+TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/share/man/man1
- 
- #  Other tools
- 
- SHELL		= /bin/sh
--LN		= ln
-+LN		= ln -s
- BASENAME 	= basename
- AR		= ar
- ARFLAGS		= cr
-@@ -126,7 +129,7 @@ INC	= $(ROOT)/inc
- 
- # Flags
- 
--# DEBUG	= -DNDEBUG
-+DEBUG	= -DNDEBUG
- ######### Remove -DNDEBUG to enable assertions.
- 
- CFLAGS	= $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
-@@ -140,6 +143,7 @@ LFLAGS	= $(LDFLAGS) $(LDINC)
- # Targets
- 
- LIBGSM	= $(LIB)/libgsm.a
-+LIBGSMSO= $(LIB)/libgsm.so
- 
- TOAST	= $(BIN)/toast
- UNTOAST	= $(BIN)/untoast
-@@ -258,6 +262,9 @@ STUFF = 	ChangeLog			\
- 
- GSM_INSTALL_TARGETS =	\
- 		$(GSM_INSTALL_LIB)/libgsm.a		\
-+		$(GSM_INSTALL_LIB)/libgsm.so		\
-+		$(GSM_INSTALL_LIB)/libgsm.so.1		\
-+		$(GSM_INSTALL_LIB)/libgsm.so.1.0.10	\
- 		$(GSM_INSTALL_INC)/gsm.h		\
- 		$(GSM_INSTALL_MAN)/gsm.3		\
- 		$(GSM_INSTALL_MAN)/gsm_explode.3	\
-@@ -279,7 +286,7 @@ TOAST_INSTALL_TARGETS =	\
- 
- # Target rules
- 
--all:		$(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
-+all:		$(LIBGSM) $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST)
- 		@-echo $(ROOT): Done.
- 
- tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
-@@ -299,6 +306,11 @@ install:	toastinstall gsminstall
- 
- # The basic API: libgsm
- 
-+$(LIBGSMSO):	$(LIB) $(GSM_OBJECTS)
-+		$(LD) -o $@.1.0.10 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(GSM_OBJECTS) -lc
-+		ln -fs libgsm.so.1.0.10 lib/libgsm.so.1
-+		ln -fs libgsm.so.1.0.10 lib/libgsm.so
-+
- $(LIBGSM):	$(LIB) $(GSM_OBJECTS)
- 		-rm $(RMFLAGS) $(LIBGSM)
- 		$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
-@@ -308,15 +320,15 @@ $(LIBGSM):	$(LIB) $(GSM_OBJECTS)
- # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
- 
- $(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSM)
--		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
-+		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB)
- 
- $(UNTOAST):	$(BIN) $(TOAST)
- 		-rm $(RMFLAGS) $(UNTOAST)
--		$(LN) $(TOAST) $(UNTOAST)
-+		$(LN) toast $(UNTOAST)
- 
- $(TCAT):	$(BIN) $(TOAST)
- 		-rm $(RMFLAGS) $(TCAT)
--		$(LN) $(TOAST) $(TCAT)
-+		$(LN) toast $(TCAT)
- 
- 
- # The local bin and lib directories
-@@ -351,53 +363,66 @@ toastuninstall:
- 		fi
- 
- $(TOAST_INSTALL_BIN)/toast:	$(TOAST)
--		-rm $@
--		cp $(TOAST) $@
-+		mkdir -p $(TOAST_INSTALL_BIN)
-+		cp -f $(TOAST) $@
- 		chmod 755 $@
- 
- $(TOAST_INSTALL_BIN)/untoast:	$(TOAST_INSTALL_BIN)/toast
--		-rm $@
--		ln $? $@
-+		mkdir -p $(TOAST_INSTALL_BIN)
-+		ln -sf $? $@
- 
- $(TOAST_INSTALL_BIN)/tcat:	$(TOAST_INSTALL_BIN)/toast
--		-rm $@
--		ln $? $@
-+		mkdir -p $(TOAST_INSTALL_BIN)
-+		ln -sf $? $@
- 
- $(TOAST_INSTALL_MAN)/toast.1:	$(MAN)/toast.1
--		-rm $@
--		cp $? $@
-+		mkdir -p $(TOAST_INSTALL_MAN)
-+		cp -f $? $@
- 		chmod 444 $@
- 
- $(GSM_INSTALL_MAN)/gsm.3:	$(MAN)/gsm.3
--		-rm $@
--		cp $? $@
-+		mkdir -p $(GSM_INSTALL_MAN)
-+		cp -f $? $@
- 		chmod 444 $@
- 
- $(GSM_INSTALL_MAN)/gsm_option.3:	$(MAN)/gsm_option.3
--		-rm $@
--		cp $? $@
-+		mkdir -p $(GSM_INSTALL_MAN)
-+		cp -f $? $@
- 		chmod 444 $@
- 
- $(GSM_INSTALL_MAN)/gsm_explode.3:	$(MAN)/gsm_explode.3
--		-rm $@
--		cp $? $@
-+		mkdir -p $(GSM_INSTALL_MAN)
-+		cp -f $? $@
- 		chmod 444 $@
- 
- $(GSM_INSTALL_MAN)/gsm_print.3:	$(MAN)/gsm_print.3
--		-rm $@
--		cp $? $@
-+		mkdir -p $(GSM_INSTALL_MAN)
-+		cp -f $? $@
- 		chmod 444 $@
- 
- $(GSM_INSTALL_INC)/gsm.h:	$(INC)/gsm.h
--		-rm $@
--		cp $? $@
-+		mkdir -p $(GSM_INSTALL_INC)
-+		cp -f $? $@
- 		chmod 444 $@
- 
- $(GSM_INSTALL_LIB)/libgsm.a:	$(LIBGSM)
--		-rm $@
--		cp $? $@
-+		mkdir -p $(GSM_INSTALL_LIB)
-+		cp -f $? $@
- 		chmod 444 $@
- 
-+$(GSM_INSTALL_LIB)/libgsm.so:	$(LIBGSMSO)
-+		mkdir -p $(GSM_INSTALL_LIB)
-+		cp -f $? $@
-+
-+$(GSM_INSTALL_LIB)/libgsm.so.1:	$(LIBGSMSO)
-+		mkdir -p $(GSM_INSTALL_LIB)
-+		cp -f $? $@
-+
-+$(GSM_INSTALL_LIB)/libgsm.so.1.0.10:	$(LIBGSMSO)
-+		mkdir -p $(GSM_INSTALL_LIB)
-+		cp -f $? $@
-+		chmod 755 $@
-+
- 
- # Distribution
- 
-@@ -426,7 +451,9 @@ semi-clean:
- 
- clean:	semi-clean
- 		-rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add		\
--			$(TOAST) $(TCAT) $(UNTOAST)	\
-+			$(LIBGSMSO) $(LIB)/libgsm.so.1.0.10	\
-+			$(LIB)libgsm.so.1			\
-+			$(TOAST) $(TCAT) $(UNTOAST)		\
- 			$(ROOT)/gsm-1.0.tar.Z
- 
- 
---- a/inc/config.h
-+++ b/inc/config.h
-@@ -9,8 +9,8 @@
- #ifndef	CONFIG_H
- #define	CONFIG_H
- 
--/*efine	SIGHANDLER_T	int 		/* signal handlers are void	*/
--/*efine HAS_SYSV_SIGNAL	1		/* sigs not blocked/reset?	*/
-+/*efine	SIGHANDLER_T	int 		*//* signal handlers are void	*/
-+/*efine HAS_SYSV_SIGNAL	1		*//* sigs not blocked/reset?	*/
- 
- #define	HAS_STDLIB_H	1		/* /usr/include/stdlib.h	*/
- #define	HAS_LIMITS_H	1		/* /usr/include/limits.h	*/
-@@ -22,16 +22,16 @@
- #define	HAS_CHMOD 	1		/* chmod syscall		*/
- #define	HAS_FCHOWN 	1		/* fchown syscall		*/
- #define	HAS_CHOWN 	1		/* chown syscall		*/
--/*efine	HAS__FSETMODE 	1		/* _fsetmode -- set file mode	*/
-+/*efine	HAS__FSETMODE 	1		*//* _fsetmode -- set file mode	*/
- 
- #define	HAS_STRING_H 	1		/* /usr/include/string.h 	*/
--/*efine	HAS_STRINGS_H	1		/* /usr/include/strings.h 	*/
-+/*efine	HAS_STRINGS_H	1		*//* /usr/include/strings.h 	*/
- 
- #define	HAS_UNISTD_H	1		/* /usr/include/unistd.h	*/
- #define	HAS_UTIME	1		/* POSIX utime(path, times)	*/
--/*efine	HAS_UTIMES	1		/* use utimes()	syscall instead	*/
-+/*efine	HAS_UTIMES	1		*//* use utimes()	syscall instead	*/
- #define	HAS_UTIME_H	1		/* UTIME header file		*/
- #define	HAS_UTIMBUF	1		/* struct utimbuf		*/
--/*efine	HAS_UTIMEUSEC   1		/* microseconds in utimbuf?	*/
-+/*efine	HAS_UTIMEUSEC   1		*//* microseconds in utimbuf?	*/
- 
- #endif	/* CONFIG_H */
---- a/inc/gsm.h
-+++ b/inc/gsm.h
-@@ -54,6 +54,10 @@ typedef gsm_byte 		gsm_frame[33];		/* 33
- #define	GSM_OPT_FRAME_INDEX	5
- #define	GSM_OPT_FRAME_CHAIN	6
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- extern gsm  gsm_create 	GSM_P((void));
- extern void gsm_destroy GSM_P((gsm));	
- 
-@@ -66,6 +70,10 @@ extern int  gsm_decode  GSM_P((gsm, gsm_
- extern int  gsm_explode GSM_P((gsm, gsm_byte   *, gsm_signal *));
- extern void gsm_implode GSM_P((gsm, gsm_signal *, gsm_byte   *));
- 
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #undef	GSM_P
- 
- #endif	/* GSM_H */
---- a/inc/toast.h
-+++ b/inc/toast.h
-@@ -16,11 +16,12 @@
- 
- #include <stdio.h>
- #include <ctype.h>
-+#include <pthread.h>
- #include <signal.h>
- 
- #include <errno.h>
--#ifndef	HAS_ERRNO_DECL
--	 extern int	errno;
-+#ifndef errno
-+ extern int	errno;
- #endif
- 
- #ifdef	HAS_LIMITS_H
-@@ -37,6 +38,10 @@
- # endif
- #endif
- 
-+#ifdef  HAS_STDIO_H
-+# include <stdio.h>
-+#endif
-+
- #include "gsm.h"
- 
- #ifndef	S_ISREG
---- a/src/code.c
-+++ b/src/code.c
-@@ -9,8 +9,8 @@
- #include	"config.h"
- 
- 
--#ifdef	HAS_STDLIB_H
--#include	<stdlib.h>
-+#ifdef	HAS_STRING_H
-+#include	<string.h>
- #else
- #	include "proto.h"
- 	extern char	* memcpy P((char *, char *, int));
---- a/src/debug.c
-+++ b/src/debug.c
-@@ -49,7 +49,7 @@ void gsm_debug_longwords P4( (name, from
- 	fprintf( stderr, "%s [%d .. %d]: ", name, from, to );
- 	while (from <= to) {
- 
--		fprintf(stderr, "%d ", ptr[ from ] );
-+		fprintf(stderr, "%ld ", ptr[ from ] );
- 		from++;
- 		if (nprinted++ >= 7) {
- 			nprinted = 0;
-@@ -63,14 +63,14 @@ void gsm_debug_longword P2(  (name, valu
- 	char		* name,
- 	longword	  value	)
- {
--	fprintf(stderr, "%s: %d\n", name, (long)value );
-+	fprintf(stderr, "%s: %ld\n", name, (long)value );
- }
- 
- void gsm_debug_word P2(  (name, value),
- 	char	* name,
- 	word	  value	)
- {
--	fprintf(stderr, "%s: %d\n", name, (long)value);
-+	fprintf(stderr, "%s: %ld\n", name, (long)value);
- }
- 
- #endif
---- a/src/toast.c
-+++ b/src/toast.c
-@@ -251,8 +251,8 @@ static char * emalloc P1((len), size_t l
- {
- 	char * s;
- 	if (!(s = malloc(len))) {
--		fprintf(stderr, "%s: failed to malloc %d bytes -- abort\n",
--			progname, len);
-+		fprintf(stderr, "%s: failed to malloc %ld bytes -- abort\n",
-+			progname, (long) len);
- 		onintr();
- 		exit(1);
- 	}
-@@ -270,7 +270,7 @@ static char* normalname P3((name, want, 
- 	maxlen = strlen(name) + 1 + strlen(want) + strlen(cut);
- 	p = strcpy(emalloc(maxlen), name);
- 
--	if (s = suffix(p, cut)) strcpy(s, want);
-+	if ((s = suffix(p, cut))) strcpy(s, want);
- 	else if (*want && !suffix(p, want)) strcat(p, want);
- 
- 	return p;
-@@ -386,7 +386,7 @@ static void update_times P0()
- 		ut[0] = instat.st_atime;
- 		ut[1] = instat.st_mtime;
- 
--		(void) utime(outname, ut);
-+		(void) utime(outname, (struct utimbuf *)ut);
- 
- #endif	/* UTIMBUF */
- 	}
-@@ -416,7 +416,7 @@ static int okay_as_input P3((name,f,st),
- 	}
- 	if (st->st_nlink > 1 && !f_cat && !f_precious) {
- 		fprintf(stderr, 
--		      "%s: \"%s\" has %s other link%s -- unchanged.\n",
-+		      "%s: \"%s\" has %d other link%s -- unchanged.\n",
- 			progname,name,st->st_nlink - 1,"s" + (st->st_nlink<=2));
- 		return 0;
- 	}
-@@ -585,8 +585,8 @@ static int process_decode P0()
- 
- 		if (cc != sizeof(s)) {
- 			if (cc >= 0) fprintf(stderr,
--			"%s: incomplete frame (%d byte%s missing) from %s\n",
--					progname, sizeof(s) - cc,
-+			"%s: incomplete frame (%ld byte%s missing) from %s\n",
-+					progname, (long) sizeof(s) - cc,
- 					"s" + (sizeof(s) - cc == 1),
- 					inname ? inname : "stdin" );
- 			gsm_destroy(r);
-@@ -624,8 +624,6 @@ static int process_decode P0()
- 
- static int process P1((name), char * name)
- {
--	int step = 0;
--
- 	out     = (FILE *)0;
- 	in      = (FILE *)0;
- 
-@@ -779,7 +777,6 @@ int main P2((ac, av), int ac, char **av)
- 	case 'h': help();    exit(0);
- 
- 	default: 
--	usage:
- 		fprintf(stderr,
- 	"Usage: %s [-fcpdhvuaslFC] [files...] (-h for help)\n",
- 			progname);
 

file:a/libs/iksemel/Makefile (deleted)
--- a/libs/iksemel/Makefile
+++ /dev/null
@@ -1,69 +1,1 @@
-#
-# Copyright (C) 2006-2009 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:=iksemel
-PKG_VERSION:=1.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://iksemel.googlecode.com/files/
-PKG_MD5SUM:=532e77181694f87ad5eb59435d11c1ca
-
-PKG_FIXUP:=autoreconf
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libiksemel
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Iksemel Jabber Library
-  URL:=http://code.google.com/p/iksemel/
-  DEPENDS:= +libgnutls +libtasn1 +libgcrypt +libgpg-error
-endef
-
-define Package/libiksemel/description
-  Iksemel is an XML parser library mainly designed for Jabber applications.
-  It provides SAX, DOM, and special Jabber stream APIs. Library is coded
-  in ANSI C except the network code (which is POSIX compatible), thus
-  highly portable.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-TARGET_LDFLAGS += \
-	-Wl,-rpath-link,$(STAGING_DIR)/usr/lib \
-	-lgnutls -lgcrypt -lgpg-error
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--enable-static \
-		--with-libgnutls-prefix="$(STAGING_DIR)/usr" \
-		, \
-		LIBS="$(TARGET_LDFLAGS)" \
-	)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/iksemel.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libiksemel.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/iksemel.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libiksemel/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libiksemel.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libiksemel))
-

--- a/libs/iksemel/patches/001-missing-macros.patch
+++ /dev/null
@@ -1,164 +1,1 @@
---- /dev/null
-+++ b/gnutls.m4
-@@ -0,0 +1,160 @@
-+dnl Autoconf macros for libgnutls
-+dnl $id$
-+
-+# Modified for LIBGNUTLS -- nmav
-+# Configure paths for LIBGCRYPT
-+# Shamelessly stolen from the one of XDELTA by Owen Taylor
-+# Werner Koch   99-12-09
-+
-+dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-+dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS
-+dnl
-+AC_DEFUN([AM_PATH_LIBGNUTLS],
-+[dnl
-+dnl Get the cflags and libraries from the libgnutls-config script
-+dnl
-+AC_ARG_WITH(libgnutls-prefix,
-+          [  --with-libgnutls-prefix=PFX   Prefix where libgnutls is installed (optional)],
-+          libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
-+
-+  if test x$libgnutls_config_prefix != x ; then
-+     if test x${LIBGNUTLS_CONFIG+set} != xset ; then
-+        LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
-+     fi
-+  fi
-+
-+  AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
-+  min_libgnutls_version=ifelse([$1], ,0.1.0,$1)
-+  AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
-+  no_libgnutls=""
-+  if test "$LIBGNUTLS_CONFIG" = "no" ; then
-+    no_libgnutls=yes
-+  else
-+    LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
-+    LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
-+    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
-+
-+
-+      ac_save_CFLAGS="$CFLAGS"
-+      ac_save_LIBS="$LIBS"
-+      CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
-+      LIBS="$LIBS $LIBGNUTLS_LIBS"
-+dnl
-+dnl Now check if the installed libgnutls is sufficiently new. Also sanity
-+dnl checks the results of libgnutls-config to some extent
-+dnl
-+      rm -f conf.libgnutlstest
-+      AC_TRY_RUN([
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <gnutls/gnutls.h>
-+
-+int
-+main ()
-+{
-+    system ("touch conf.libgnutlstest");
-+
-+    if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
-+    {
-+      printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
-+             "$libgnutls_config_version", gnutls_check_version(NULL) );
-+      printf("*** was found! If libgnutls-config was correct, then it is best\n");
-+      printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
-+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-+      printf("*** required on your system.\n");
-+      printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
-+      printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
-+      printf("*** before re-running configure\n");
-+    }
-+    else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
-+    {
-+      printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
-+      printf("*** library (version %s)\n", gnutls_check_version(NULL) );
-+    }
-+    else
-+    {
-+      if ( gnutls_check_version( "$min_libgnutls_version" ) )
-+      {
-+        return 0;
-+      }
-+     else
-+      {
-+        printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
-+                gnutls_check_version(NULL) );
-+        printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
-+               "$min_libgnutls_version" );
-+        printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
-+        printf("*** \n");
-+        printf("*** If you have already installed a sufficiently new version, this error\n");
-+        printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
-+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-+        printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
-+        printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
-+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-+        printf("*** so that the correct libraries are found at run-time))\n");
-+      }
-+    }
-+  return 1;
-+}
-+],, no_libgnutls=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+       CFLAGS="$ac_save_CFLAGS"
-+       LIBS="$ac_save_LIBS"
-+  fi
-+
-+  if test "x$no_libgnutls" = x ; then
-+     AC_MSG_RESULT(yes)
-+     ifelse([$2], , :, [$2])
-+  else
-+     if test -f conf.libgnutlstest ; then
-+        :
-+     else
-+        AC_MSG_RESULT(no)
-+     fi
-+     if test "$LIBGNUTLS_CONFIG" = "no" ; then
-+       echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
-+       echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
-+       echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
-+       echo "*** full path to libgnutls-config."
-+     else
-+       if test -f conf.libgnutlstest ; then
-+        :
-+       else
-+          echo "*** Could not run libgnutls test program, checking why..."
-+          CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
-+          LIBS="$LIBS $LIBGNUTLS_LIBS"
-+          AC_TRY_LINK([
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <gnutls/gnutls.h>
-+],      [ return !!gnutls_check_version(NULL); ],
-+        [ echo "*** The test program compiled, but did not run. This usually means"
-+          echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
-+          echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
-+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-+          echo "*** is required on your system"
-+          echo "***"
-+          echo "*** If you have an old version installed, it is best to remove it, although"
-+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-+          echo "***" ],
-+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+          echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
-+          echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
-+          echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ])
-+          CFLAGS="$ac_save_CFLAGS"
-+          LIBS="$ac_save_LIBS"
-+       fi
-+     fi
-+     LIBGNUTLS_CFLAGS=""
-+     LIBGNUTLS_LIBS=""
-+     ifelse([$3], , :, [$3])
-+  fi
-+  rm -f conf.libgnutlstest
-+  AC_SUBST(LIBGNUTLS_CFLAGS)
-+  AC_SUBST(LIBGNUTLS_LIBS)
-+])
-+
-+dnl *-*wedit:notab*-*  Please keep this as the last line.
 

file:a/libs/libao/Makefile (deleted)
--- a/libs/libao/Makefile
+++ /dev/null
@@ -1,63 +1,1 @@
-#
-# Copyright (C) 2006 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:=libao
-PKG_VERSION:=1.1.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.xiph.org/releases/ao/
-PKG_MD5SUM:=2b2508c29bc97e4dc218fa162cf883c8
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libao
-  SECTION:=libs
-  DEPENDS:=+alsa-lib
-  CATEGORY:=Libraries
-  TITLE:=A cross platform audio library
-  URL:=http://www.xiph.org/ao/
-endef
-
-define Package/libao/description
-	Libao is a cross-platform audio library that allows programs to
-	output audio using a simple API on a wide variety of platforms.
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-esd \
-	--disable-arts \
-	--disable-nas \
-	--disable-pulse
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/ao $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libao.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ao.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libao/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libao.so.* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/ao/plugins-4
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ao/plugins-4/lib*.so $(1)/usr/lib/ao/plugins-4/
-endef
-
-$(eval $(call BuildPackage,libao))
-

--- 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/libexif/Makefile (deleted)
--- a/libs/libexif/Makefile
+++ /dev/null
@@ -1,63 +1,1 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libexif
-PKG_VERSION:=0.6.21
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/libexif
-PKG_MD5SUM:=27339b89850f28c8f1c237f233e05b27
-
-PKG_LICENSE:=LGPLv2.1
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libexif
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=library for jpeg files with exif tags
-  URL:=http://libexif.sourceforge.net/
-endef
-
-define Package/libexif/description
-  libexif is a library for parsing, editing, and saving EXIF data. It is
-  intended to replace lots of redundant implementations in command-line
-  utilities and programs with GUIs.
-endef
-
-CONFIGURE_ARGS+= \
-	--enable-shared \
-	--enable-static \
-	--disable-rpath \
-	--without-libiconv-prefix \
-	--without-libintl-prefix \
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libexif $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libexif*.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libexif.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libexif/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libexif*.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libexif))
-

--- a/libs/libexif/patches/100-no_doc.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -289,7 +289,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = m4m po libexif test doc binary contrib
-+SUBDIRS = m4m po libexif test binary contrib
- EXTRA_DIST = @PACKAGE_TARNAME@.spec README-Win32.txt libexif.pc.in \
- 	libexif-uninstalled.pc.in
- pkgconfigdir = $(libdir)/pkgconfig
 

--- a/libs/libgpg-error/Makefile
+++ /dev/null
@@ -1,80 +1,1 @@
-#
-# Copyright (C) 2005-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:=libgpg-error
-PKG_VERSION:=1.9
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgpg-error
-PKG_MD5SUM:=521b98aa9395e7eaf0ef2236233a0796
-
-PKG_BUILD_PARALLEL:=1
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libgpg-error
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=GnuPG error handling helper library
-  URL:=http://www.gnupg.org/related_software/libgpg-error/
-endef
-
-define Package/libgpg-error/description
-	An helper library for common error codes and descriptions.
-	This is a library that defines common error values for all GnuPG
-	components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
-	Libksba, DirMngr, Pinentry, SmartCard Daemon and possibly more in the
-	future.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-rpath
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(2)/bin $(1)/usr/bin
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/gpg-error-config \
-		$(2)/bin/
-	$(SED) \
-		's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
-		$(2)/bin/gpg-error-config
-	ln -sf $(STAGING_DIR)/host/bin/gpg-error-config $(1)/usr/bin/gpg-error-config
-
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/include/gpg-error.h \
-		$(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libgpg-error.{la,a,so*} \
-		$(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/usr/share/aclocal
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/share/aclocal/gpg-error.m4 \
-		$(1)/usr/share/aclocal/
-endef
-
-define Package/libgpg-error/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libgpg-error.so.* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libgpg-error))
-

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

file:a/libs/libmpeg2/Makefile (deleted)
--- a/libs/libmpeg2/Makefile
+++ /dev/null
@@ -1,61 +1,1 @@
-#
-# Copyright (C) 2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libmpeg2
-PKG_VERSION:=0.5.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=libmpeg2-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://libmpeg2.sourceforge.net/files/
-PKG_MD5SUM:=0f92c7454e58379b4a5a378485bbd8ef
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libmpeg2
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=MPEG-1 & -2 decoding library
-  URL:=http://libmpeg2.sourceforge.net/
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-endef
-
-define Package/libmpeg2/decription
-  Libmpeg2 is a library for decoding MPEG-1 and MPEG-2 video streams
-endef
-
-CONFIGURE_ARGS += \
-	--disable-sdl \
-	--without-x \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/mpeg2dec \
-		$(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libmpeg2{,convert}.{a,so*} \
-		$(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmpeg2{,convert}.pc \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libmpeg2/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libmpeg2{,convert}.so.* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libmpeg2))
-

--- a/libs/libmpeg2/patches/101-ppc_no_altivec.patch
+++ /dev/null
@@ -1,67 +1,1 @@
---- a/libmpeg2/motion_comp_altivec.c
-+++ b/libmpeg2/motion_comp_altivec.c
-@@ -25,6 +25,8 @@
- 
- #ifdef ARCH_PPC
- 
-+#ifdef __I_WANT_ALTIVEC__
-+
- #ifdef HAVE_ALTIVEC_H
- #include <altivec.h>
- #endif
-@@ -1007,4 +1009,6 @@ static void MC_avg_xy_8_altivec (uint8_t
- 
- MPEG2_MC_EXTERN (altivec)
- 
-+#endif /* __I_WANT_ALTIVEC__ */
-+
- #endif
---- a/libmpeg2/idct_altivec.c
-+++ b/libmpeg2/idct_altivec.c
-@@ -25,6 +25,8 @@
- 
- #ifdef ARCH_PPC
- 
-+#ifdef __I_WANT_ALTIVEC__
-+
- #ifdef HAVE_ALTIVEC_H
- #include <altivec.h>
- #endif
-@@ -283,4 +285,6 @@ void mpeg2_idct_altivec_init (void)
-     }
- }
- 
-+#endif /* __I_WANT_ALTIVEC__ */
-+
- #endif
---- a/libmpeg2/idct.c
-+++ b/libmpeg2/idct.c
-@@ -251,11 +251,13 @@ void mpeg2_idct_init (uint32_t accel)
-     } else
- #endif
- #ifdef ARCH_PPC
-+#ifdef __I_WANT_ALTIVEC__
-     if (accel & MPEG2_ACCEL_PPC_ALTIVEC) {
- 	mpeg2_idct_copy = mpeg2_idct_copy_altivec;
- 	mpeg2_idct_add = mpeg2_idct_add_altivec;
- 	mpeg2_idct_altivec_init ();
-     } else
-+#endif /* __I_WANT_ALTIVEC__ */
- #endif
- #ifdef ARCH_ALPHA
-     if (accel & MPEG2_ACCEL_ALPHA_MVI) {
---- a/libmpeg2/motion_comp.c
-+++ b/libmpeg2/motion_comp.c
-@@ -43,9 +43,11 @@ void mpeg2_mc_init (uint32_t accel)
-     else
- #endif
- #ifdef ARCH_PPC
-+#ifdef __I_WANT_ALTIVEC__
-     if (accel & MPEG2_ACCEL_PPC_ALTIVEC)
- 	mpeg2_mc = mpeg2_mc_altivec;
-     else
-+#endif /* __I_WANT_ALTIVEC__ */
- #endif
- #ifdef ARCH_ALPHA
-     if (accel & MPEG2_ACCEL_ALPHA)
 

--- a/libs/libmpeg2/patches/102-arm_data_preload_check.patch
+++ /dev/null
@@ -1,20 +1,1 @@
-diff -urN libmpeg2-0.5.1/libmpeg2/motion_comp_arm_s.S libmpeg2-0.5.1.new/libmpeg2/motion_comp_arm_s.S
---- libmpeg2-0.5.1/libmpeg2/motion_comp_arm_s.S	2008-07-09 21:16:05.000000000 +0200
-+++ libmpeg2-0.5.1.new/libmpeg2/motion_comp_arm_s.S	2012-07-30 15:22:58.664964215 +0200
-@@ -19,6 +19,15 @@
- @ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- 
-+@ Data preload is supported only by ARM V5TE and above
-+
-+#if (defined (__ARM_ARCH_2__) || defined (__ARM_ARCH_3__) \
-+     || defined (__ARM_ARCH_3M__) || defined (__ARM_ARCH_4__) \
-+     || defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_5__) \
-+     || defined (__ARM_ARCH_5T__))
-+.macro pld reg
-+.endm
-+#endif
- 	.text
- 
- @ ----------------------------------------------------------------
 

file:a/libs/liboil/Makefile (deleted)
--- a/libs/liboil/Makefile
+++ /dev/null
@@ -1,66 +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:=liboil
-PKG_VERSION:=0.3.17
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://liboil.freedesktop.org/download/
-PKG_MD5SUM:=47dc734f82faeb2964d97771cfd2e701
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/liboil
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=simple functions optimized for various CPUs
-  URL:=http://liboil.freedesktop.org/wiki/
-  DEPENDS:=+librt
-endef
-
-define Package/liboil/description
-  Liboil is a library of simple functions that are optimized for various CPUs.
-  These functions are generally loops implementing simple algorithms, such as
-  converting an array of N integers to floating-point numbers or multiplying
-  and summing an array of N numbers. Such functions are candidates for significant
-  optimization using various techniques, especially by using extended instructions
-  provided by modern CPUs (Altivec, MMX, SSE, etc.).
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-
-TARGET_CFLAGS += $(FPIC)
-
-# XXX: VFP_CFLAGS is set to '-mfpu=vfp' on arm by configure, but that breaks
-# final linking stages, so override it until we find why
-MAKE_FLAGS += \
-	VFP_CFLAGS="" \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/liboil-0.3/* $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liboil-0.3.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/liboil-0.3.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/liboil/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liboil-0.3.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,liboil))
-

--- a/libs/liboil/patches/001-no-tools-docs-examples.patch
+++ /dev/null
@@ -1,23 +1,1 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- 
- AUTOMAKE_OPTIONS = foreign
- 
--SUBDIRS = liboil testsuite examples doc
-+SUBDIRS = liboil
- 
- EXTRA_DIST = COPYING autogen.sh gtk-doc.make HACKING BUG-REPORTING
- 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -278,7 +278,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign
--SUBDIRS = liboil testsuite examples doc
-+SUBDIRS = liboil
- EXTRA_DIST = COPYING autogen.sh gtk-doc.make HACKING BUG-REPORTING
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
- pkgconfig_DATA = liboil-$(LIBOIL_MAJORMINOR).pc
 

--- a/libs/liboil/patches/002-pkgconfig.patch
+++ /dev/null
@@ -1,20 +1,1 @@
---- a/liboil.pc.in
-+++ b/liboil.pc.in
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=@includedir@/liboil-@LIBOIL_MAJORMINOR@
-+includedir=@includedir@
- toolsdir=${exec_prefix}/bin
- 
- 
-@@ -9,6 +9,6 @@ Name: liboil-@LIBOIL_MAJORMINOR@
- Description: Library of Optimized Inner Loops
- Version: @VERSION@
- Libs: -L${libdir} -loil-@LIBOIL_MAJORMINOR@ @LIBM@ @LIBRT@
--Cflags: -I${includedir}
-+Cflags: -I${includedir}/liboil-@LIBOIL_MAJORMINOR@
- 
- 
 

--- a/libs/libsamplerate/Makefile
+++ /dev/null
@@ -1,54 +1,1 @@
-#
-# Copyright (C) 2007-2009 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:=libsamplerate
-PKG_VERSION:=0.1.7
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.mega-nerd.com/SRC/
-PKG_MD5SUM:=ad093e60ec44f0a60de8e29983ddbc0f
-
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=autogen.sh
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libsamplerate
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libsndfile
-  TITLE:=Sample Rate Converter
-  URL:=http://www.mega-nerd.com/SRC/index.html
-endef
-
-define Package/libsamplerate/description
- Secret Rabbit Code (aka libsamplerate) is a Sample Rate
- Converter for audio.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--disable-fftw \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
-endef
-
-define Package/libsamplerate/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsamplerate.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libsamplerate))
-

--- a/libs/libsamplerate/patches/001-fix-m4-loop.patch
+++ /dev/null
@@ -1,19 +1,1 @@
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -135,7 +135,6 @@ if test $ac_cv_c_byte_order = unknown ; 
- 	fi
- 
- )
--]
- 
- if test $ac_cv_c_byte_order = big ; then
- 	ac_cv_c_big_endian=1
-@@ -154,6 +153,7 @@ else
- 	AC_MSG_WARN([[*****************************************************************]])
- 	fi
- 
-+]
- )# AC_C_FIND_ENDIAN
- 
- 
 

file:a/libs/libsoup/Makefile (deleted)
--- a/libs/libsoup/Makefile
+++ /dev/null
@@ -1,65 +1,1 @@
-include $(TOPDIR)/rules.mk
 
-PKG_NAME:=libsoup
-PKG_VERSION:=2.38.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.38
-PKG_MD5SUM:=d13fb4968acea24c26b83268a308f580
-
-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/libsoup
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=libsoup
-  URL:=http://live.gnome.org/LibSoup
-  DEPENDS:=+glib2 +libxml2 +libgnutls
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-ssl \
-		--disable-glibtest \
-		--without-apache-httpd \
-		--without-gnome \
-	)
-endef
-
-define package/libsoup/decription
-Libsoup is an HTTP library implementation in C
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/libsoup-2.4/libsoup}
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libsoup-2.4.{so*,la,a} \
-		$(1)/usr/lib/
-
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
-		$(1)/usr/lib/pkgconfig/
-
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/include/libsoup-2.4/libsoup/*.h \
-		$(1)/usr/include/libsoup-2.4/libsoup/
-endef
-
-define Package/libsoup/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libsoup-2.4.so* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libsoup))
-

file:a/libs/libtheora/Makefile (deleted)
--- a/libs/libtheora/Makefile
+++ /dev/null
@@ -1,65 +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:=libtheora
-PKG_VERSION:=1.1.1
-PKG_RELEASE:=1
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://downloads.xiph.org/releases/theora/
-PKG_MD5SUM:=292ab65cedd5021d6b7ddd117e07cd8e
-PKG_FIXUP:=autoreconf
-
-PKG_BUILD_DEPENDS:=libvorbis
-
-include $(INCLUDE_DIR)/package.mk
-
-PKG_INSTALL=1
-
-define Package/libtheora
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=libtheora
-  URL:=http://xiph.org/theora/
-  DEPENDS:=+libogg
-endef
-
-define Package/libtheora/description
-Theora is Xiph.Org's first publicly released video codec, intended
-for use within the Foundation's Ogg multimedia streaming system.
-Theora is derived directly from On2's VP3 codec; Currently the
-encoders are nearly identical, but Theora will make use of new
-features supported by the decoder to improve over what is
-is possible with VP3.
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--disable-examples \
-		--disable-oggtest \
-		--disable-vorbistest \
-		--disable-sdltest \
-	)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/theora/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/theora/* $(1)/usr/include/theora/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libtheora/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libtheora))
-

--- a/libs/libtheora/patches/001-no_docs_tests.patch
+++ /dev/null
@@ -1,34 +1,1 @@
-diff -urN libtheora-1.1.1/Makefile.am libtheora-1.1.1.new/Makefile.am
---- libtheora-1.1.1/Makefile.am	2009-07-14 01:55:02.000000000 +0200
-+++ libtheora-1.1.1.new/Makefile.am	2012-12-05 14:21:06.103521554 +0100
-@@ -8,7 +8,7 @@
- EXAMPLES_DIR =
- endif
- 
--SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR)
-+SUBDIRS = lib include m4 $(EXAMPLES_DIR)
- 
- 
- # we include the whole debian/ dir in EXTRA_DIST because there's a problem
-diff -urN libtheora-1.1.1/Makefile.in libtheora-1.1.1.new/Makefile.in
---- libtheora-1.1.1/Makefile.in	2009-10-01 20:04:07.000000000 +0200
-+++ libtheora-1.1.1.new/Makefile.in	2012-12-05 14:21:18.239521864 +0100
-@@ -164,7 +164,7 @@
- @THEORA_ENABLE_EXAMPLES_TRUE@EXAMPLES_DIR = examples
- @THEORA_ENABLE_EXAMPLES_FALSE@EXAMPLES_DIR = 
- 
--SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR)
-+SUBDIRS = lib include m4 $(EXAMPLES_DIR)
- 
- # we include the whole debian/ dir in EXTRA_DIST because there's a problem
- # with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
-@@ -200,7 +200,7 @@
- 	missing mkinstalldirs theora-uninstalled.pc.in theora.pc.in \
- 	theoradec-uninstalled.pc.in theoradec.pc.in \
- 	theoraenc-uninstalled.pc.in theoraenc.pc.in
--DIST_SUBDIRS = lib include doc tests m4 examples
-+DIST_SUBDIRS = lib include m4 examples
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
 

--- a/libs/libtheora/patches/002-no_sdl_check.patch
+++ /dev/null
@@ -1,15 +1,1 @@
---- libtheora-1.1.1/configure.ac	2009-10-01 20:00:33.000000000 +0200
-+++ libtheora-1.1.1.new/configure.ac	2012-12-05 14:22:26.319523608 +0100
-@@ -313,11 +313,6 @@
- dnl check for SDL
- HAVE_SDL=no
- 
--AM_PATH_SDL(,[
--  HAVE_SDL=yes
--  SDL_LIBS=`$SDL_CONFIG --libs`
--],AC_MSG_WARN([*** Unable to find SDL -- Not compiling example players ***]))
--
- dnl check for OSS
- HAVE_OSS=no
- AC_CHECK_HEADERS([sys/soundcard.h soundcard.h machine/soundcard.h],[
 

file:a/libs/libv4l/Makefile (deleted)
--- a/libs/libv4l/Makefile
+++ /dev/null
@@ -1,114 +1,1 @@
-#
-# Copyright (C) 2009-2012 OpenWrt.org
-# Copyright (C) 2009 David Cooper <dave@kupesoft.com>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=v4l-utils
-PKG_VERSION:=0.8.6
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.linuxtv.org/downloads/v4l-utils
-PKG_MD5SUM:=80062780ae90e5955473b09b31e9828a
-
-PKG_BUILD_DEPENDS:=argp-standalone
-
-include $(INCLUDE_DIR)/uclibc++.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libv4l/Default
-  TITLE:=Video 4 Linux
-  URL:=http://www.linuxtv.org/
-endef
-
-define Package/libv4l/Default/description
-  libv4l is a collection of libraries which adds a thin abstraction layer on
-  top of video4linux2 devices. The purpose of this (thin) layer is to make it
-  easy for application writers to support a wide variety of devices without
-  having to write separate code for different devices in the same class. libv4l
-  consists of 3 different libraries: libv4lconvert, libv4l1 and libv4l2.
-
-  libv4l1 offers the (deprecated) v4l1 API on top of v4l2 devices, independent
-  of the drivers for those devices supporting v4l1 compatibility (which many
-  v4l2 drivers do not).
-
-  libv4l2 offers the v4l2 API on top of v4l2 devices, while adding for the
-  application transparent libv4lconvert conversion where necessary.
-endef
-
-define Package/libv4l
-  $(call Package/libv4l/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= wrapper libraries
-  DEPENDS := +libpthread +librt
-endef
-
-define Package/libv4l/description
-  $(call Package/libv4l/Default/description)
-endef
-
-define Package/v4l-utils
-  $(call Package/libv4l/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+= utilities
-  DEPENDS := +libv4l $(CXX_DEPENDS)
-endef
-
-define Package/v4l-utils/description
-  $(call Package/libv4l/Default/description)
-  This package contains the video4linux utilities.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" PREFIX="/usr" \
-		DISABLE_LIBJPEG="1" \
-		$(CONFIGURE_VARS) \
-		all install
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" PREFIX="/usr" \
-		DISABLE_LIBJPEG="1" \
-		$(CONFIGURE_VARS) \
-		LINKTYPE="static" \
-		all install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libv4l{1,2,convert}.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libv4l{1,2,convert}.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libv4l/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libv4l{1,2,convert}.so.* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/libv4l
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libv4l/v4l{1compat,2convert}.so $(1)/usr/lib/libv4l/
-endef
-
-define Package/v4l-utils/install
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) $(PKG_INSTALL_DIR)/etc/rc_maps.cfg $(1)/etc/
-	$(CP) $(PKG_INSTALL_DIR)/etc/rc_keymaps $(1)/etc/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/{cx18,ivtv}-ctl $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/decode_tm6000 $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ir-keytable $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/v4l2-{compliance,ctl,sysfs-path} $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libv4l))
-$(eval $(call BuildPackage,v4l-utils))
-

--- a/libs/libv4l/patches/001-no-shm_open-fix.patch
+++ /dev/null
@@ -1,58 +1,1 @@
---- a/lib/libv4lconvert/control/libv4lcontrol.c
-+++ b/lib/libv4lconvert/control/libv4lcontrol.c
-@@ -525,7 +525,7 @@ static void v4lcontrol_get_flags_from_db
- 
- struct v4lcontrol_data *v4lcontrol_create(int fd, int always_needs_conversion)
- {
--	int shm_fd;
-+	int shm_fd, fdflags;
- 	int i, rc, got_usb_info, speed, init = 0;
- 	char *s, shm_name[256], pwd_buf[1024];
- 	struct v4l2_capability cap;
-@@ -638,33 +638,38 @@ struct v4lcontrol_data *v4lcontrol_creat
- 
- 	if (getpwuid_r(geteuid(), &pwd, pwd_buf, sizeof(pwd_buf), &pwd_p) == 0) {
- 		if (got_usb_info)
--			snprintf(shm_name, 256, "/libv4l-%s:%s:%04x:%04x:%s", pwd.pw_name,
-+			snprintf(shm_name, 256, "/dev/shm/libv4l-%s:%s:%04x:%04x:%s", pwd.pw_name,
- 					cap.bus_info, (int)vendor_id, (int)product_id, cap.card);
- 		else
--			snprintf(shm_name, 256, "/libv4l-%s:%s:%s", pwd.pw_name,
-+			snprintf(shm_name, 256, "/dev/shm/libv4l-%s:%s:%s", pwd.pw_name,
- 					cap.bus_info, cap.card);
- 	} else {
- 		perror("libv4lcontrol: error getting username using uid instead");
- 		if (got_usb_info)
--			snprintf(shm_name, 256, "/libv4l-%lu:%s:%04x:%04x:%s",
-+			snprintf(shm_name, 256, "/dev/shm/libv4l-%lu:%s:%04x:%04x:%s",
- 					(unsigned long)geteuid(), cap.bus_info,
- 					(int)vendor_id, (int)product_id, cap.card);
- 		else
--			snprintf(shm_name, 256, "/libv4l-%lu:%s:%s", (unsigned long)geteuid(),
-+			snprintf(shm_name, 256, "/dev/shm/libv4l-%lu:%s:%s", (unsigned long)geteuid(),
- 					cap.bus_info, cap.card);
- 	}
- 
- 	/* / is not allowed inside shm names */
--	for (i = 1; shm_name[i]; i++)
-+	for (i = 9; shm_name[i]; i++) /* start after "/dev/shm", i = 9 */
- 		if (shm_name[i] == '/')
- 			shm_name[i] = '-';
- 
- 	/* Open the shared memory object identified by shm_name */
--	shm_fd = shm_open(shm_name, (O_CREAT | O_EXCL | O_RDWR), (S_IREAD | S_IWRITE));
-+	shm_fd = open(shm_name, (O_CREAT | O_EXCL | O_RDWR), (S_IREAD | S_IWRITE));
- 	if (shm_fd >= 0)
- 		init = 1;
- 	else
--		shm_fd = shm_open(shm_name, O_RDWR, (S_IREAD | S_IWRITE));
-+		shm_fd = open(shm_name, O_RDWR, (S_IREAD | S_IWRITE));
-+
-+	/* This is all uClibc > 0.9.30 seems to do for shm_open() in librt/shm.c */
-+	fdflags = fcntl(shm_fd, F_GETFD, 0);
-+	if (fdflags >= 0)
-+		fdflags = fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC);
- 
- 	if (shm_fd >= 0) {
- 		/* Set the shared memory size */
 

--- a/libs/libv4l/patches/002-allow-disabling-libjpeg.patch
+++ /dev/null
@@ -1,161 +1,1 @@
---- a/lib/libv4lconvert/Makefile
-+++ b/lib/libv4lconvert/Makefile
-@@ -1,6 +1,6 @@
- override CPPFLAGS += -I../include -fvisibility=hidden
- 
--LIBS_libv4lconvert = -lrt -lm -ljpeg
-+LIBS_libv4lconvert = -lrt -lm
- 
- ifeq ($(LINKTYPE),static)
- CONVERT_LIB   = libv4lconvert.a
-@@ -10,16 +10,22 @@ override CPPFLAGS += -fPIC
- endif
- 
- CONVERT_OBJS  = libv4lconvert.o tinyjpeg.o sn9c10x.o sn9c20x.o pac207.o \
--		jl2005bcd.o \
- 		mr97310a.o flip.o crop.o jidctflt.o spca561-decompress.o \
- 		rgbyuv.o sn9c2028-decomp.o spca501.o sq905c.o bayer.o hm12.o \
--		stv0680.o cpia1.o se401.o jpgl.o jpeg.o jpeg_memsrcdest.o \
-+		stv0680.o cpia1.o se401.o jpgl.o jpeg.o \
- 		control/libv4lcontrol.o processing/libv4lprocessing.o \
- 		processing/whitebalance.o processing/autogain.o \
- 		processing/gamma.o helper.o
- TARGETS       = $(CONVERT_LIB) libv4lconvert.pc ov511-decomp ov518-decomp
- INCLUDES      = ../include/libv4lconvert.h
- 
-+ifeq ($(DISABLE_LIBJPEG),1)
-+override CFLAGS += -DDISABLE_LIBJPEG
-+else
-+LIBS_libv4lconvert += -ljpeg
-+CONVERT_OBJS += jl2005bcd.o jpeg_memsrcdest.o
-+endif
-+
- override CPPFLAGS += -DLIBDIR=\"$(LIBDIR)\" -DLIBSUBDIR=\"$(LIBSUBDIR)\"
- 
- all: $(TARGETS)
---- a/lib/libv4lconvert/jpeg.c
-+++ b/lib/libv4lconvert/jpeg.c
-@@ -19,7 +19,9 @@
- #include <errno.h>
- #include <stdlib.h>
- #include "libv4lconvert-priv.h"
-+#ifndef DISABLE_LIBJPEG
- #include "jpeg_memsrcdest.h"
-+#endif
- 
- int v4lconvert_decode_jpeg_tinyjpeg(struct v4lconvert_data *data,
- 	unsigned char *src, int src_size, unsigned char *dest,
-@@ -107,6 +109,8 @@ int v4lconvert_decode_jpeg_tinyjpeg(stru
- 	return 0;
- }
- 
-+#ifndef DISABLE_LIBJPEG
-+
- static void jerr_error_exit(j_common_ptr cinfo)
- {
- 	struct v4lconvert_data *data = cinfo->client_data;
-@@ -405,3 +409,6 @@ int v4lconvert_decode_jpeg_libjpeg(struc
- 
- 	return result;
- }
-+
-+#endif
-+
---- a/lib/libv4lconvert/libv4lconvert-priv.h
-+++ b/lib/libv4lconvert/libv4lconvert-priv.h
-@@ -22,7 +22,9 @@
- #include <stdio.h>
- #include <stdint.h>
- #include <sys/types.h>
-+#ifndef DISABLE_LIBJPEG
- #include <jpeglib.h>
-+#endif
- #include <setjmp.h>
- #include "libv4lconvert.h"
- #include "control/libv4lcontrol.h"
-@@ -50,11 +52,13 @@ struct v4lconvert_data {
- 	int64_t supported_src_formats; /* bitfield */
- 	char error_msg[V4LCONVERT_ERROR_MSG_SIZE];
- 	struct jdec_private *tinyjpeg;
-+#ifndef DISABLE_LIBJPEG
- 	struct jpeg_error_mgr jerr;
- 	int jerr_errno;
- 	jmp_buf jerr_jmp_state;
- 	struct jpeg_decompress_struct cinfo;
- 	int cinfo_initialized;
-+#endif
- 	struct v4l2_frmsizeenum framesizes[V4LCONVERT_MAX_FRAMESIZES];
- 	unsigned int no_framesizes;
- 	int bandwidth;
---- a/lib/libv4lconvert/libv4lconvert.c
-+++ b/lib/libv4lconvert/libv4lconvert.c
-@@ -78,7 +78,9 @@ static const struct v4lconvert_pixfmt su
- 	{ V4L2_PIX_FMT_SN9C2028,	 0,	 9,	 9,	1 },
- 	{ V4L2_PIX_FMT_PAC207,		 0,	 9,	 9,	1 },
- 	{ V4L2_PIX_FMT_MR97310A,	 0,	 9,	 9,	1 },
-+#ifndef DISABLE_LIBJPEG
- 	{ V4L2_PIX_FMT_JL2005BCD,	 0,	 9,	 9,	1 },
-+#endif
- 	{ V4L2_PIX_FMT_SQ905C,		 0,	 9,	 9,	1 },
- 	/* special */
- 	{ V4L2_PIX_FMT_SE401,		 0,	 8,	 9,	1 },
-@@ -186,8 +188,10 @@ void v4lconvert_destroy(struct v4lconver
- 		tinyjpeg_set_components(data->tinyjpeg, comps, 3);
- 		tinyjpeg_free(data->tinyjpeg);
- 	}
-+#ifndef DISABLE_LIBJPEG
- 	if (data->cinfo_initialized)
- 		jpeg_destroy_decompress(&data->cinfo);
-+#endif
- 	v4lconvert_helper_cleanup(data);
- 	free(data->convert1_buf);
- 	free(data->convert2_buf);
-@@ -634,10 +638,13 @@ static int v4lconvert_convert_pixfmt(str
- 	/* JPG and variants */
- 	case V4L2_PIX_FMT_MJPEG:
- 	case V4L2_PIX_FMT_JPEG:
-+#ifndef DISABLE_LIBJPEG
- 		if (data->flags & V4LCONVERT_USE_TINYJPEG) {
-+#endif
- 			result = v4lconvert_decode_jpeg_tinyjpeg(data,
- 							src, src_size, dest,
- 							fmt, dest_pix_fmt, 0);
-+#ifndef DISABLE_LIBJPEG
- 		} else {
- 			result = v4lconvert_decode_jpeg_libjpeg(data,
- 							src, src_size, dest,
-@@ -652,6 +659,7 @@ static int v4lconvert_convert_pixfmt(str
- 							fmt, dest_pix_fmt, 0);
- 			}
- 		}
-+#endif
- 		break;
- 	case V4L2_PIX_FMT_PJPG:
- 		result = v4lconvert_decode_jpeg_tinyjpeg(data, src, src_size,
-@@ -777,7 +785,9 @@ static int v4lconvert_convert_pixfmt(str
- 	case V4L2_PIX_FMT_SN9C10X:
- 	case V4L2_PIX_FMT_PAC207:
- 	case V4L2_PIX_FMT_MR97310A:
-+#ifndef DISABLE_LIBJPEG
- 	case V4L2_PIX_FMT_JL2005BCD:
-+#endif
- 	case V4L2_PIX_FMT_SN9C2028:
- 	case V4L2_PIX_FMT_SQ905C:
- 	case V4L2_PIX_FMT_STV0680: { /* Not compressed but needs some shuffling */
-@@ -816,6 +826,7 @@ static int v4lconvert_convert_pixfmt(str
- 			}
- 			tmpfmt.fmt.pix.pixelformat = V4L2_PIX_FMT_SBGGR8;
- 			break;
-+#ifndef DISABLE_LIBJPEG
- 		case V4L2_PIX_FMT_JL2005BCD:
- 			if (v4lconvert_decode_jl2005bcd(data, src, src_size,
- 							tmpbuf,
-@@ -826,6 +837,7 @@ static int v4lconvert_convert_pixfmt(str
- 			}
- 			tmpfmt.fmt.pix.pixelformat = V4L2_PIX_FMT_SRGGB8;
- 			break;
-+#endif
- 		case V4L2_PIX_FMT_SN9C2028:
- 			v4lconvert_decode_sn9c2028(src, tmpbuf, width, height);
- 			tmpfmt.fmt.pix.pixelformat = V4L2_PIX_FMT_SBGGR8;
 

--- a/libs/libv4l/patches/003-add-missing-libs.patch
+++ /dev/null
@@ -1,67 +1,1 @@
---- a/contrib/test/Makefile
-+++ b/contrib/test/Makefile
-@@ -28,7 +28,7 @@ pixfmt-test: pixfmt-test.o
- 	$(CC) $(LDFLAGS) -o $@ $^ -lX11
- 
- v4l2grab: v4l2grab.o ../../lib/libv4l2/libv4l2.so
--	$(CC) $(LDFLAGS) -o $@ $^ -L../../lib/libv4l2 -L../../lib/libv4lconvert -lv4l2 -lv4lconvert
-+	$(CC) $(LDFLAGS) -o $@ $^ -L../../lib/libv4l2 -L../../lib/libv4lconvert -lv4l2 -lv4lconvert -largp
- 
- ioctl-test: ioctl-test.o
- 	$(CC) $(LDFLAGS) -o $@ $^
---- a/utils/decode_tm6000/Makefile
-+++ b/utils/decode_tm6000/Makefile
-@@ -5,7 +5,7 @@ all: $(TARGETS)
- -include *.d
- 
- decode_tm6000: decode_tm6000.o ../libv4l2util/libv4l2util.a
--	$(CC) $(LDFLAGS) -o $@ $^
-+	$(CC) $(LDFLAGS) -o $@ $^ -largp
- 
- install: $(TARGETS)
- 	mkdir -p $(DESTDIR)$(PREFIX)/bin
---- a/utils/keytable/Makefile
-+++ b/utils/keytable/Makefile
-@@ -5,7 +5,7 @@ all: $(TARGETS)
- -include *.d
- 
- ir-keytable: keytable.o
--	$(CC) $(LDFLAGS) -o $@ $^
-+	$(CC) $(LDFLAGS) -o $@ $^ -largp
- 
- keytable.o: keytable.c parse.h
- 
---- a/utils/v4l2-compliance/Makefile
-+++ b/utils/v4l2-compliance/Makefile
-@@ -6,7 +6,7 @@ all: $(TARGETS)
- 
- v4l2-compliance: v4l2-compliance.o v4l2-test-debug.o v4l2-test-input-output.o \
- 	v4l2-test-controls.o v4l2-test-io-config.o v4l2-test-formats.o
--	$(CXX) $(LDFLAGS) -o $@ $^ -lv4l2 -lv4lconvert -lrt
-+	$(CXX) $(LDFLAGS) -o $@ $^ -lv4l2 -lv4lconvert -lrt -lpthread
- 
- install: $(TARGETS)
- 	mkdir -p $(DESTDIR)$(PREFIX)/bin
---- a/utils/v4l2-ctl/Makefile
-+++ b/utils/v4l2-ctl/Makefile
-@@ -13,7 +13,7 @@ ivtv-ctl: ivtv-ctl.o
- 	$(CC) $(LDFLAGS) -o $@ $^ -lm
- 
- v4l2-ctl: v4l2-ctl.o
--	$(CXX) $(LDFLAGS) -o $@ $^ -lv4l2 -lv4lconvert -lrt
-+	$(CXX) $(LDFLAGS) -o $@ $^ -lv4l2 -lv4lconvert -lrt -lpthread
- 
- install: $(TARGETS)
- 	mkdir -p $(DESTDIR)$(PREFIX)/bin
---- a/utils/v4l2-sysfs-path/Makefile
-+++ b/utils/v4l2-sysfs-path/Makefile
-@@ -5,7 +5,7 @@ all: $(TARGETS)
- -include *.d
- 
- v4l2-sysfs-path: v4l2-sysfs-path.o ../libmedia_dev/libmedia_dev.a
--	$(CC) $(LDFLAGS) -o $@ $^
-+	$(CC) $(LDFLAGS) -o $@ $^ -largp
- 
- install: $(TARGETS)
- 	mkdir -p $(DESTDIR)$(PREFIX)/bin
 

--- a/libs/libv4l/patches/004-disable-qv4l2.patch
+++ /dev/null
@@ -1,25 +1,1 @@
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -5,21 +5,6 @@ all install: 
- 		$(MAKE) -C $$i $@ || exit 1; \
- 	done
- 
--	# Test whether qmake is installed, and whether it is for qt4.
--	@if which qmake-qt4 >/dev/null 2>&1; then \
--		QMAKE=qmake-qt4; \
--	else \
--		QMAKE=qmake; \
--	fi; \
--	if which $$QMAKE >/dev/null 2>&1; then \
--		if $$QMAKE --version 2>&1 | grep '4\.[0-9][0-9]*\.[0-9][0-9]*' >/dev/null; then \
--			if [ ! -f qv4l2/Makefile ]; then \
--				(cd qv4l2 && $$QMAKE) || exit 1; \
--			fi; \
--			$(MAKE) -C qv4l2 -f Makefile.install $@; \
--		fi \
--	fi
--
- sync-with-kernel:
- 	$(MAKE) -C keytable $@
- 	$(MAKE) -C v4l2-dbg $@
 

file:a/libs/libxslt/Makefile (deleted)
--- a/libs/libxslt/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:=libxslt
-PKG_VERSION:=1.1.28
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://xmlsoft.org/sources/ \
-	ftp://fr.rpmfind.net/pub/libxml/
-PKG_MD5SUM:=9667bf6f9310b957254fdcf6596600b7
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libxslt
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libxml2
-  TITLE:=Gnome XSLT library
-  URL:=http://xmlsoft.org/XSLT/
-endef
-
-define Package/libxslt/description
-	A library for XML transformation using XSLT.
-endef
-
-define Package/libexslt
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libxslt
-  TITLE:=Gnome XSLT library Extention
-  URL:=http://xmlsoft.org/XSLT/EXSLT/
-endef
-
-define Package/libexslt/description
-	A extention for XSLT.
-endef
-
-define Package/xsltproc
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libxml2 +libxslt +libexslt
-  TITLE:=Gnome XSLT xsltproc Utility
-  URL:=http://xmlsoft.org/XSLT/
-endef
-
-define Package/xsltproc/description
-	XSLT XML transformation utility
-endef
-
-CONFIGURE_ARGS+= \
-	--enable-shared \
-	--enable-static \
-	--without-python \
-	--without-crypto \
-	--without-debug \
-	--without-mem-debug \
-	--without-debugger \
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/InstallDev/Xslt
-	$(INSTALL_DIR) $(1)/usr/bin $(2)/bin $(1)/usr/include/libxslt \
-		$(1)/usr/include/libexslt $(1)/usr/lib \
-		$(1)/usr/lib/pkgconfig $(2)/share/aclocal
-
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/xslt-config \
-		$(2)/bin/
-
-	ln -sf $(STAGING_DIR)/host/bin/xslt-config $(1)/usr/bin/xslt-config
-
-	$(SED) \
-		's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
-		$(2)/bin/xslt-config
-
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/include/libxslt/* \
-		$(1)/usr/include/libxslt/
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxslt.{la,a,so*} \
-		$(1)/usr/lib/
-
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxslt.pc \
-		$(1)/usr/lib/pkgconfig/
-
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/share/aclocal/* \
-		$(2)/share/aclocal
-endef
-
-define Build/InstallDev/Exslt
-	$(INSTALL_DIR) $(1)/usr/include/libexslt $(1)/usr/lib/pkgconfig
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/include/libexslt/* \
-		$(1)/usr/include/libexslt/
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libexslt.{la,a,so*} \
-		$(1)/usr/lib/
-
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libexslt.pc \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-define Build/InstallDev
-	 $(if $(CONFIG_PACKAGE_libxslt),$(call Build/InstallDev/Xslt,$(1),$(2)))
-	 $(if $(CONFIG_PACKAGE_libexslt),$(call Build/InstallDev/Exslt,$(1),$(2)))
-endef
-
-define Package/libxslt/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxslt.so.* \
-		$(1)/usr/lib/
-endef
-
-define Package/libexslt/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libexslt.so.* \
-		$(1)/usr/lib/
-endef
-
-define Package/xsltproc/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/xsltproc \
-		$(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libxslt))
-$(eval $(call BuildPackage,libexslt))
-$(eval $(call BuildPackage,xsltproc))
-

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 \
 

file:a/libs/openldap/Makefile (deleted)
--- a/libs/openldap/Makefile
+++ /dev/null
@@ -1,151 +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:=openldap
-PKG_VERSION:=2.4.39
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
-	ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
-	ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ \
-	ftp://ftp.plig.org/pub/OpenLDAP/openldap-release/
-PKG_MD5SUM:=b0d5ee4b252c841dec6b332d679cf943
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/openldap/Default
-  TITLE:=LDAP implementation
-  URL:=http://www.openldap.org/
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-endef
-
-define Package/openldap/Default/description
-	OpenLDAP Software is an open source implementation of the
-	Lightweight Directory Access Protocol (LDAP).
-endef
-
-define Package/libopenldap
-  $(call Package/openldap/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libopenssl +libsasl2 +libpthread
-  TITLE+= (libraries)
-endef
-
-define Package/libopenldap/description
-	$(call Package/openldap/Default/description)
-	This package contains the shared LDAP client libraries, needed by other programs.
-endef
-
-define Package/libopenldap/conffiles
-/etc/openldap/ldap.conf
-endef
-
-define Package/openldap-utils
-  $(call Package/openldap/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libopenldap
-  TITLE+= (utilities)
-endef
-
-define Package/openldap-utils/description
-	$(call Package/openldap/Default/description)
-	This package contains client programs required to access LDAP servers.
-endef
-
-define Package/openldap-server
-  $(call Package/openldap/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libopenldap +libuuid
-  TITLE+= (server)
-endef
-
-define Package/openldap-server/description
-	$(call Package/openldap/Default/description)
-	This package contains server programs required to provide LDAP services.
-endef
-
-define Package/openldap-server/conffiles
-/etc/openldap/slapd.conf
-endef
-
-TARGET_CFLAGS += $(FPIC) -lpthread
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-debug \
-	--enable-dynamic \
-	--enable-syslog \
-	--disable-local \
-	--disable-slurpd \
-	--with-cyrus-sasl \
-	--without-fetch \
-	--with-threads \
-	--with-tls \
-	--with-yielding_select="yes" \
-	--without-cyrus-sasl \
-	--without-threads \
-	--without-tls \
-	--enable-null \
-	--disable-bdb \
-	--disable-hdb \
-	--disable-monitor \
-	--disable-relay
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		HOSTCC="$(HOSTCC)" \
-		depend all install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/{lber,ldap}*.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/libopenldap/install
-	$(INSTALL_DIR) $(1)/etc/openldap
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/openldap/ldap.conf $(1)/etc/openldap/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.so.* $(1)/usr/lib/
-endef
-
-define Package/openldap-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ldap* $(1)/usr/bin/
-endef
-
-define Package/openldap-server/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/ldap.init $(1)/etc/init.d/ldap
-	$(INSTALL_DIR) $(1)/etc/openldap/schema
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/openldap/schema/* $(1)/etc/openldap/schema/
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/openldap/slapd.conf $(1)/etc/openldap/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	# XXX: OpenLDAP installs slapd into libexecdir, not sbindir:
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/slapd $(1)/usr/sbin/
-	# XXX: switch default backend to ldif, since bdb is disabled
-	$(SED) 's|^\(database\)\([ \t]\+\)bdb|\1\2ldif|g' \
-	    -e 's|^\(index\)|#\1|g' \
-	    $(1)/etc/openldap/slapd.conf
-endef
-
-$(eval $(call BuildPackage,libopenldap))
-$(eval $(call BuildPackage,openldap-utils))
-$(eval $(call BuildPackage,openldap-server))
-

--- a/libs/openldap/files/ldap.init
+++ /dev/null
@@ -1,20 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2011 OpenWrt.org
 
-START=60
-
-SERVICE_USE_PID=1
-
-start() {
-	mkdir -m 0755 -p /var/openldap-data
-	service_start /usr/sbin/slapd
-}
-
-stop() {
-	service_stop /usr/sbin/slapd
-}
-
-reload() {
-	service_reload /usr/sbin/slapd
-}
-

--- a/libs/openldap/patches/001-automake-compat.patch
+++ /dev/null
@@ -1,324 +1,1 @@
---- /dev/null
-+++ b/Makefile.am
-@@ -0,0 +1 @@
-+SUBDIRS = include libraries clients servers tests doc
---- a/libraries/Makefile.in
-+++ b/libraries/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SUBDIRS= \
- 	liblutil \
- 	liblber \
---- a/libraries/liblber/Makefile.in
-+++ b/libraries/liblber/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- LIBRARY = liblber.la
- 
- NT_SRCS = nt_err.c
---- a/libraries/libldap/Makefile.in
-+++ b/libraries/libldap/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- LIBRARY = libldap.la
- 
- PROGRAMS = apitest dntest ftest ltest urltest
---- a/libraries/libldap_r/Makefile.in
-+++ b/libraries/libldap_r/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- LIBRARY = libldap_r.la
- 
- PROGRAMS = apitest ltest
---- a/libraries/liblunicode/Makefile.in
-+++ b/libraries/liblunicode/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- LIBRARY = liblunicode.a
- 
- XXDIR = $(srcdir)/ucdata/
---- a/libraries/liblutil/Makefile.in
-+++ b/libraries/liblutil/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- LIBRARY	= liblutil.a
- PROGRAM = testavl
- 
---- a/libraries/librewrite/Makefile.in
-+++ b/libraries/librewrite/Makefile.in
-@@ -16,6 +16,8 @@
- ## Copyright 2000-2001 Pierangelo Masarati <ando@sys-net.it>
- ##
- 
-+SHELL = @SHELL@
-+
- SRCS = config.c context.c info.c ldapmap.c map.c params.c rule.c \
- 	session.c subst.c var.c xmap.c \
- 	parse.c rewrite.c
---- a/clients/tools/Makefile.in
-+++ b/clients/tools/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS	= ldapsearch.c ldapmodify.c ldapdelete.c ldapmodrdn.c \
- 		ldappasswd.c ldapwhoami.c ldapcompare.c \
- 		ldapexop.c ldapurl.c common.c
---- a/servers/slapd/Makefile.in
-+++ b/servers/slapd/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SLAPTOOLS=slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema
- PROGRAMS=slapd $(SLAPTOOLS)
- XPROGRAMS=sslapd libbackends.a .backend liboverlays.a
---- a/servers/slapd/overlays/Makefile.in
-+++ b/servers/slapd/overlays/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS = overlays.c \
- 	accesslog.c \
- 	auditlog.c \
---- a/tests/progs/Makefile.in
-+++ b/tests/progs/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- PROGRAMS = slapd-tester slapd-search slapd-read slapd-addel slapd-modrdn \
- 		slapd-modify slapd-bind slapd-mtread ldif-filter
- 
---- a/servers/slapd/back-bdb/Makefile.in
-+++ b/servers/slapd/back-bdb/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS = init.c tools.c config.c \
- 	add.c bind.c compare.c delete.c modify.c modrdn.c search.c \
- 	extended.c referral.c operational.c \
---- a/servers/slapd/back-dnssrv/Makefile.in
-+++ b/servers/slapd/back-dnssrv/Makefile.in
-@@ -18,6 +18,8 @@
- #  The DNSSRV backend was written by Kurt D. Zeilenga.
- #
- 
-+SHELL = @SHELL@
-+
- SRCS	= init.c bind.c search.c config.c referral.c
- OBJS	= init.lo bind.lo search.lo config.lo referral.lo
- 
---- a/servers/slapd/back-hdb/Makefile.in
-+++ b/servers/slapd/back-hdb/Makefile.in
-@@ -15,6 +15,8 @@
- #
- ## Copyright 2003 Howard Chu @ Symas Corp. See master COPYRIGHT file for terms.
- 
-+SHELL = @SHELL@
-+
- XXDIR = $(srcdir)/../back-bdb
- 
- XXSRCS = init.c tools.c config.c \
---- a/servers/slapd/back-ldap/Makefile.in
-+++ b/servers/slapd/back-ldap/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS	= init.c config.c search.c bind.c unbind.c add.c compare.c \
- 		delete.c modify.c modrdn.c extended.c chain.c \
- 		distproc.c monitor.c pbind.c
---- a/servers/slapd/back-ldif/Makefile.in
-+++ b/servers/slapd/back-ldif/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS = ldif.c
- OBJS = ldif.lo
- 
---- a/servers/slapd/back-mdb/Makefile.in
-+++ b/servers/slapd/back-mdb/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS = init.c tools.c config.c \
- 	add.c bind.c compare.c delete.c modify.c modrdn.c search.c \
- 	extended.c operational.c \
---- a/servers/slapd/back-meta/Makefile.in
-+++ b/servers/slapd/back-meta/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS	= init.c config.c search.c bind.c unbind.c add.c compare.c \
- 		delete.c modify.c modrdn.c suffixmassage.c map.c \
- 		conn.c candidates.c dncache.c
---- a/servers/slapd/back-monitor/Makefile.in
-+++ b/servers/slapd/back-monitor/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS = init.c search.c compare.c modify.c bind.c \
- 	operational.c \
- 	cache.c entry.c \
---- a/servers/slapd/back-ndb/Makefile.in
-+++ b/servers/slapd/back-ndb/Makefile.in
-@@ -17,6 +17,8 @@
- ## This work was initially developed by Howard Chu for inclusion
- ## in OpenLDAP Software. This work was sponsored by MySQL.
- 
-+SHELL = @SHELL@
-+
- SRCS = init.cpp tools.cpp config.cpp ndbio.cpp \
- 	add.cpp bind.cpp compare.cpp delete.cpp modify.cpp modrdn.cpp search.cpp
- 
---- a/servers/slapd/back-null/Makefile.in
-+++ b/servers/slapd/back-null/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS = null.c
- OBJS = null.lo
- 
---- a/servers/slapd/back-passwd/Makefile.in
-+++ b/servers/slapd/back-passwd/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS	= search.c config.c init.c
- OBJS	= search.lo config.lo init.lo
- 
---- a/servers/slapd/back-perl/Makefile.in
-+++ b/servers/slapd/back-perl/Makefile.in
-@@ -14,6 +14,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS	= init.c search.c close.c config.c bind.c compare.c \
- 		modify.c add.c modrdn.c delete.c
- OBJS	= init.lo search.lo close.lo config.lo bind.lo compare.lo \
---- a/servers/slapd/back-relay/Makefile.in
-+++ b/servers/slapd/back-relay/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS	= init.c op.c
- OBJS	= init.lo op.lo
- 
---- a/servers/slapd/back-shell/Makefile.in
-+++ b/servers/slapd/back-shell/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS	= init.c config.c fork.c search.c bind.c unbind.c add.c \
- 		delete.c modify.c modrdn.c compare.c result.c
- OBJS	= init.lo config.lo fork.lo search.lo bind.lo unbind.lo add.lo \
---- a/servers/slapd/back-sock/Makefile.in
-+++ b/servers/slapd/back-sock/Makefile.in
-@@ -17,6 +17,8 @@
- ## This work was initially developed by Brian Candler for inclusion
- ## in OpenLDAP Software.
- 
-+SHELL = @SHELL@
-+
- SRCS	= init.c config.c opensock.c search.c bind.c unbind.c add.c \
- 		delete.c modify.c modrdn.c compare.c result.c
- OBJS	= init.lo config.lo opensock.lo search.lo bind.lo unbind.lo add.lo \
---- a/servers/slapd/back-sql/Makefile.in
-+++ b/servers/slapd/back-sql/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS	= init.c config.c search.c bind.c compare.c operational.c \
- 		entry-id.c schema-map.c sql-wrap.c modify.c util.c \
- 		add.c delete.c modrdn.c api.c
---- a/servers/slapd/shell-backends/Makefile.in
-+++ b/servers/slapd/shell-backends/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- PROGRAMS = passwd-shell
- 
- SRCS = passwd-shell.c shellutil.c
---- a/servers/slapd/slapi/Makefile.in
-+++ b/servers/slapd/slapi/Makefile.in
-@@ -14,6 +14,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- LIBRARY = libslapi.la
- 
- #all-common: $(LIBRARY) $(PROGRAMS)
 

--- a/libs/openldap/patches/020-autofs-schema.patch
+++ /dev/null
@@ -1,27 +1,1 @@
---- /dev/null
-+++ b/servers/slapd/schema/autofs.schema
-@@ -0,0 +1,23 @@
-+attributetype ( 1.3.6.1.1.1.1.31 NAME 'automountMapName'
-+	DESC 'Automount map name'
-+	EQUALITY caseExactMatch
-+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-+
-+attributetype ( 1.3.6.1.1.1.1.32 NAME 'automountKey'
-+	DESC 'Automount key value'
-+	EQUALITY caseExactMatch
-+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-+
-+attributetype ( 1.3.6.1.1.1.1.33 NAME 'automountInformation'
-+	DESC 'Automount information'
-+	EQUALITY caseExactMatch
-+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-+
-+objectclass ( 1.3.6.1.1.1.2.16 NAME 'automountMap' SUP top STRUCTURAL
-+	MUST ( automountMapName )
-+	MAY ( description ) )
-+
-+objectclass ( 1.3.6.1.1.1.2.17 NAME 'automount' SUP top STRUCTURAL
-+	DESC 'Automount'
-+	MUST ( automountKey $ automountInformation )
-+	MAY description )
 

--- a/libs/openldap/patches/750-no-strip.patch
+++ /dev/null
@@ -1,23 +1,1 @@
---- a/clients/tools/Makefile.in
-+++ b/clients/tools/Makefile.in
-@@ -122,7 +122,7 @@ install-local:	FORCE
- 	-$(MKDIR) $(DESTDIR)$(bindir)
- 	@(								\
- 	    for prg in $(PROGRAMS); do					\
--		$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 $$prg$(EXEEXT)	\
-+		$(LTINSTALL) $(INSTALLFLAGS) -m 755 $$prg$(EXEEXT)	\
- 		    $(DESTDIR)$(bindir);				\
- 	    done							\
- 	)
---- a/servers/slapd/Makefile.in
-+++ b/servers/slapd/Makefile.in
-@@ -380,7 +380,7 @@ install-local-srv: install-slapd install
- install-slapd: FORCE
- 	-$(MKDIR) $(DESTDIR)$(libexecdir)
- 	-$(MKDIR) $(DESTDIR)$(localstatedir)/run
--	$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
-+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 \
- 		slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
- 	@for i in $(SUBDIRS); do \
- 	    if test -d $$i && test -f $$i/Makefile ; then \
 

file:a/libs/tiff/Makefile (deleted)
--- a/libs/tiff/Makefile
+++ /dev/null
@@ -1,106 +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.
-#
-# blogic@openwrt.org
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=tiff
-PKG_VERSION:=4.0.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download.osgeo.org/libtiff
-PKG_MD5SUM:=051c1068e6a0627f461948c365290410
-
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=autogen.sh aclocal.m4
-
-PKG_INSTALL:=1
-
-PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_libtiffxx
-
-include $(INCLUDE_DIR)/uclibc++.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tiff/Default
-  TITLE:=TIFF
-  URL:=http://www.remotesensing.org/libtiff/
-endef
-
-define Package/libtiff
-$(call Package/tiff/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= library
-  DEPENDS:=+zlib +libjpeg
-endef
-
-define Package/libtiffxx
-$(call Package/tiff/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= library(c++ bindings)
-  DEPENDS:=+libtiff $(CXX_DEPENDS)
-endef
-
-define Package/tiff-utils
-$(call Package/tiff/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+= utilities
-  DEPENDS:=+libtiff
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		$(if $(CONFIG_PACKAGE_libtiffxx), \
-			--enable-cxx, \
-			--disable-cxx \
-		) \
-		--disable-lzma \
-		--enable-ccitt \
-		--enable-packbits \
-		--enable-lzw \
-		--enable-thunder \
-		--enable-next \
-		--enable-logluv \
-		--enable-mdi \
-		--enable-zlib \
-		--enable-jpeg \
-		--disable-old-jpeg \
-		--disable-jbig \
-		--without-x \
-	)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/{lib,include}
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-endef
-
-define Package/libtiff/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtiff.so.* $(1)/usr/lib/
-endef
-
-define Package/libtiffxx/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtiffxx.so.* $(1)/usr/lib/
-endef
-
-define Package/tiff-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libtiff))
-$(eval $(call BuildPackage,libtiffxx))
-$(eval $(call BuildPackage,tiff-utils))
-

--- a/libs/tiff/patches/001-autoconf-compat.patch
+++ /dev/null
@@ -1,32 +1,1 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -25,7 +25,7 @@
- 
- docdir = $(LIBTIFF_DOCDIR)
- 
--AUTOMAKE_OPTIONS = 1.12 dist-zip foreign
-+AUTOMAKE_OPTIONS = dist-zip foreign
- ACLOCAL_AMFLAGS = -I m4
- 
- docfiles = \
-@@ -48,7 +48,7 @@ EXTRA_DIST = \
- 
- dist_doc_DATA = $(docfiles)
- 
--SUBDIRS = port libtiff tools build contrib test man html
-+SUBDIRS = port libtiff tools build contrib
- 
- release:
- 	(rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE)
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -23,7 +23,7 @@
- 
- # Process this file with automake to produce Makefile.in.
- 
--AUTOMAKE_OPTIONS = 1.12 color-tests parallel-tests foreign
-+AUTOMAKE_OPTIONS = color-tests parallel-tests foreign
- 
- LIBTIFF = $(top_builddir)/libtiff/libtiff.la
- 
 

file:a/libs/vips/Makefile (deleted)
--- a/libs/vips/Makefile
+++ /dev/null
@@ -1,80 +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:=vips
-PKG_VERSION:=7.34.0
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.vips.ecs.soton.ac.uk/supported/7.34/
-PKG_MD5SUM:=520658fb5890103e446df629fb832795
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-PKG_INSTALL=1
-
-define Package/vips
-  $(call Package/vips/Default)
-  SECTION:=multimedia
-  CATEGORY:=Multimedia
-  TITLE:=An image manipulation library
-  URL:=http://www.vips.ecs.soton.ac.uk/
-  DEPENDS:=+glib2 +libexif +libjpeg +libpng +libxml2 $(INTL_DEPENDS)
-endef
-
-TARGET_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-CONFIGURE_ARGS += \
-	--disable-cxx \
-	--disable-threads \
-	--without-cfitsio \
-	--without-fftw \
-	--without-lcms \
-	--without-magick \
-	--without-matio \
-	--without-OpenEXR \
-	--without-orc \
-	--without-pangoft2 \
-	--without-python \
-	--without-tiff \
-	--without-v4l \
-	--without-x \
-	--without-zip \
-	--with-jpeg \
-	--with-libexif \
-	--with-png \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/vips
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/* \
-		$(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/* \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-define Package/vips/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/*.so* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,vips))
-

--- a/libs/vips/patches/001-no_cpp.patch
+++ /dev/null
@@ -1,53 +1,1 @@
-diff -u --recursive vips-7.34.0-vanilla/libvips/Makefile.in vips-7.34.0/libvips/Makefile.in
---- vips-7.34.0-vanilla/libvips/Makefile.in	2013-06-18 12:41:41.166821516 -0500
-+++ vips-7.34.0/libvips/Makefile.in	2013-06-18 12:45:16.591314640 -0500
-@@ -109,7 +109,7 @@
- 	video/libvideo.la $(am__DEPENDENCIES_2)
- am_libvips_la_OBJECTS =
- libvips_la_OBJECTS = $(am_libvips_la_OBJECTS)
--libvips_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+libvips_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(libvips_la_LDFLAGS) $(LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-@@ -118,11 +118,11 @@
- am__mv = mv -f
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- 	$(LDFLAGS) -o $@
- SOURCES = $(libvips_la_SOURCES) $(nodist_EXTRA_libvips_la_SOURCES)
-@@ -583,11 +583,11 @@
- @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
- 
- dummy2.lo: cimg/dummy2.cc
--@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dummy2.lo -MD -MP -MF $(DEPDIR)/dummy2.Tpo -c -o dummy2.lo `test -f 'cimg/dummy2.cc' || echo '$(srcdir)/'`cimg/dummy2.cc
-+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dummy2.lo -MD -MP -MF $(DEPDIR)/dummy2.Tpo -c -o dummy2.lo `test -f 'cimg/dummy2.cc' || echo '$(srcdir)/'`cimg/dummy2.cc
- @am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/dummy2.Tpo $(DEPDIR)/dummy2.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cimg/dummy2.cc' object='dummy2.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dummy2.lo `test -f 'cimg/dummy2.cc' || echo '$(srcdir)/'`cimg/dummy2.cc
-+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dummy2.lo `test -f 'cimg/dummy2.cc' || echo '$(srcdir)/'`cimg/dummy2.cc
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-diff -u --recursive vips-7.34.0-vanilla/libvips/resample/Makefile.in vips-7.34.0/libvips/resample/Makefile.in
---- vips-7.34.0-vanilla/libvips/resample/Makefile.in	2013-06-18 12:41:41.170821358 -0500
-+++ vips-7.34.0/libvips/resample/Makefile.in	2013-06-18 12:42:06.869807374 -0500
-@@ -415,7 +415,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libresample.la: $(libresample_la_OBJECTS) $(libresample_la_DEPENDENCIES) $(EXTRA_libresample_la_DEPENDENCIES) 
--	$(CXXLINK)  $(libresample_la_OBJECTS) $(libresample_la_LIBADD) $(LIBS)
-+	$(LINK)  $(libresample_la_OBJECTS) $(libresample_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
 

--- a/multimedia/ffmpeg/Config.in
+++ /dev/null
@@ -1,315 +1,1 @@
-menu "Configuration"
-	depends on PACKAGE_libffmpeg-custom
 
-config FFMPEG_CUSTOM_PATENTED
-	bool "Include patented codecs and technologies"
-	default BUILD_PATENTED
-
-comment "Profiles ---"
-
-config FFMPEG_CUSTOM_FFSERVER_SUPPORT
-	bool "Include support for ffserver (FFmpeg streaming server)"
-	select FFMPEG_CUSTOM_MUXER_ffm
-	select FFMPEG_CUSTOM_DEMUXER_ffm
-	select FFMPEG_CUSTOM_DEMUXER_rtsp
-	select FFMPEG_CUSTOM_PROTOCOL_rtp
-
-config FFMPEG_CUSTOM_LIBDLNA_SUPPORT
-	bool "Include support for libdlna/ushare"
-	depends on FFMPEG_CUSTOM_PATENTED
-	select FFMPEG_CUSTOM_DECODER_ac3
-	select FFMPEG_CUSTOM_DECODER_atrac3
-	select FFMPEG_CUSTOM_DECODER_h264
-	select FFMPEG_CUSTOM_DECODER_jpegls
-	select FFMPEG_CUSTOM_DECODER_mp3
-	select FFMPEG_CUSTOM_DECODER_mpeg1video
-	select FFMPEG_CUSTOM_DECODER_mpeg2video
-	select FFMPEG_CUSTOM_DECODER_mpeg4
-	select FFMPEG_CUSTOM_DECODER_mpegvideo
-	select FFMPEG_CUSTOM_DECODER_wmav1
-	select FFMPEG_CUSTOM_DECODER_wmav2
-	select FFMPEG_CUSTOM_DECODER_png
-	select FFMPEG_CUSTOM_DEMUXER_ac3
-	select FFMPEG_CUSTOM_DEMUXER_h264
-	select FFMPEG_CUSTOM_DEMUXER_mp3
-	select FFMPEG_CUSTOM_DEMUXER_mpegvideo
-
-config FFMPEG_CUSTOM_MINIDLNA_SUPPORT
-	bool "Include support for minidlna"
-	depends on FFMPEG_CUSTOM_PATENTED
-	select FFMPEG_CUSTOM_DECODER_aac
-	select FFMPEG_CUSTOM_DECODER_ac3
-	select FFMPEG_CUSTOM_DECODER_flac
-	select FFMPEG_CUSTOM_DECODER_h264
-	select FFMPEG_CUSTOM_DECODER_jpegls
-	select FFMPEG_CUSTOM_DECODER_mp3
-	select FFMPEG_CUSTOM_DECODER_mpeg1video
-	select FFMPEG_CUSTOM_DECODER_mpeg2video
-	select FFMPEG_CUSTOM_DECODER_mpeg4
-	select FFMPEG_CUSTOM_DECODER_mpegvideo
-	select FFMPEG_CUSTOM_DECODER_wmav1
-	select FFMPEG_CUSTOM_DECODER_wmav2
-	select FFMPEG_CUSTOM_DECODER_png
-	select FFMPEG_CUSTOM_DEMUXER_aac
-	select FFMPEG_CUSTOM_DEMUXER_ac3
-	select FFMPEG_CUSTOM_DEMUXER_avi
-	select FFMPEG_CUSTOM_DEMUXER_flac
-	select FFMPEG_CUSTOM_DEMUXER_h264
-	select FFMPEG_CUSTOM_DEMUXER_matroska
-	select FFMPEG_CUSTOM_DEMUXER_mov
-	select FFMPEG_CUSTOM_DEMUXER_mp3
-	select FFMPEG_CUSTOM_DEMUXER_mpegvideo
-	select FFMPEG_CUSTOM_PROTOCOL_file
-
-comment "Encoders ---"
-
-config FFMPEG_CUSTOM_ENCODER_ac3
-	bool "AC3"
-	depends on FFMPEG_CUSTOM_PATENTED
-	select FFMPEG_CUSTOM_PARSER_ac3
-
-config FFMPEG_CUSTOM_ENCODER_jpegls
-	bool "JPEG-LS"
-
-config FFMPEG_CUSTOM_ENCODER_mpeg1video
-	bool "MPEG-1 Video"
-
-config FFMPEG_CUSTOM_ENCODER_mpeg2video
-	bool "MPEG-2 Video"
-	depends on FFMPEG_CUSTOM_PATENTED
-
-config FFMPEG_CUSTOM_ENCODER_mpeg4
-	bool "MPEG-4"
-	depends on FFMPEG_CUSTOM_PATENTED
-
-config FFMPEG_CUSTOM_ENCODER_pcm_s16be
-	bool "PCM signed 16-bit big-endian"
-
-config FFMPEG_CUSTOM_ENCODER_pcm_s16le
-	bool "PCM signed 16-bit little-endian"
-
-config FFMPEG_CUSTOM_ENCODER_png
-	bool "PNG"
-	select FFMPEG_CUSTOM_ENCODER_zlib
-
-config FFMPEG_CUSTOM_ENCODER_vorbis
-	bool "Vorbis"
-
-config FFMPEG_CUSTOM_ENCODER_zlib
-	bool "Zlib"
-
-comment "Decoders ---"
-
-config FFMPEG_CUSTOM_DECODER_aac
-	bool "AAC (Advanced Audio Coding)"
-	depends on FFMPEG_CUSTOM_PATENTED
-	select FFMPEG_CUSTOM_PARSER_aac
-
-config FFMPEG_CUSTOM_DECODER_ac3
-	bool "AC3"
-	depends on FFMPEG_CUSTOM_PATENTED
-	select FFMPEG_CUSTOM_PARSER_ac3
-
-config FFMPEG_CUSTOM_DECODER_atrac3
-	bool "ATRAC3"
-	depends on FFMPEG_CUSTOM_PATENTED
-
-config FFMPEG_CUSTOM_DECODER_flac
-	bool "FLAC"
-
-config FFMPEG_CUSTOM_DECODER_gif
-	bool "GIF"
-
-config FFMPEG_CUSTOM_DECODER_h264
-	bool "H.264"
-	depends on FFMPEG_CUSTOM_PATENTED
-
-config FFMPEG_CUSTOM_DECODER_jpegls
-	bool "JPEG-LS"
-
-config FFMPEG_CUSTOM_DECODER_mp2
-	bool "MP2 (MPEG Audio Layer 2)"
-	depends on FFMPEG_CUSTOM_PATENTED
-
-config FFMPEG_CUSTOM_DECODER_mp3
-	bool "MP3 (MPEG Audio Layer 2)"
-	depends on FFMPEG_CUSTOM_PATENTED
-
-config FFMPEG_CUSTOM_DECODER_mpegvideo
-	bool "MPEG Video"
-
-config FFMPEG_CUSTOM_DECODER_mpeg1video
-	bool "MPEG-1 Video"
-
-config FFMPEG_CUSTOM_DECODER_mpeg2video
-	bool "MPEG-2 Video"
-	depends on FFMPEG_CUSTOM_PATENTED
-
-config FFMPEG_CUSTOM_DECODER_mpeg4
-	bool "MPEG-4"
-	depends on FFMPEG_CUSTOM_PATENTED
-
-config FFMPEG_CUSTOM_DECODER_pcm_s16be
-	bool "PCM signed 16-bit big-endian"
-
-config FFMPEG_CUSTOM_DECODER_pcm_s16le
-	bool "PCM signed 16-bit little-endian"
-
-config FFMPEG_CUSTOM_DECODER_png
-	bool "PNG"
-	select FFMPEG_CUSTOM_DECODER_zlib
-
-config FFMPEG_CUSTOM_DECODER_vorbis
-	bool "Vorbis"
-
-config FFMPEG_CUSTOM_DECODER_wmav1
-	bool "WMAv1"
-	depends on FFMPEG_CUSTOM_PATENTED
-
-config FFMPEG_CUSTOM_DECODER_wmav2
-	bool "WMAv2"
-	depends on FFMPEG_CUSTOM_PATENTED
-
-config FFMPEG_CUSTOM_DECODER_zlib
-	bool "Zlib"
-
-comment "Muxers ---"
-
-config FFMPEG_CUSTOM_MUXER_ac3
-	bool "AC3"
-	depends on FFMPEG_CUSTOM_PATENTED
-
-config FFMPEG_CUSTOM_MUXER_ffm
-	bool "FFM (ffserver live feed)"
-
-config FFMPEG_CUSTOM_MUXER_h264
-	bool "H.264"
-	depends on FFMPEG_CUSTOM_PATENTED
-
-config FFMPEG_CUSTOM_MUXER_mp3
-	bool "MP3 (MPEG Audio Layer 3)"
-
-config FFMPEG_CUSTOM_MUXER_mp4
-	bool "MP4"
-
-config FFMPEG_CUSTOM_MUXER_mpeg1video
-	bool "MPEG-1 Video"
-
-config FFMPEG_CUSTOM_MUXER_mpeg2video
-	bool "MPEG-2 Video"
-
-config FFMPEG_CUSTOM_MUXER_mpegts
-	bool "MPEG-2 (TS)"
-
-config FFMPEG_CUSTOM_MUXER_ogg
-	bool "Ogg"
-
-config FFMPEG_CUSTOM_MUXER_rtp
-	bool "RTP"
-
-comment "Demuxers ---"
-
-config FFMPEG_CUSTOM_DEMUXER_aac
-	bool "AAC"
-
-config FFMPEG_CUSTOM_DEMUXER_avi
-	bool "AVI (Audio Video Interleave)"
-
-config FFMPEG_CUSTOM_DEMUXER_ac3
-	bool "AC3"
-
-config FFMPEG_CUSTOM_DEMUXER_flac
-	bool "FLAC"
-
-config FFMPEG_CUSTOM_DEMUXER_ffm
-	bool "FFM (ffserver live feed)"
-
-config FFMPEG_CUSTOM_DEMUXER_h264
-	bool "H.264"
-	depends on FFMPEG_CUSTOM_PATENTED
-
-config FFMPEG_CUSTOM_DEMUXER_matroska
-	bool "Matroska (MKA,MKV)"
-	select FFMPEG_CUSTOM_DECODER_zlib
-
-config FFMPEG_CUSTOM_DEMUXER_mov
-	bool "MOV/MP4/M4A/3GP/3G2/MJ2"
-	select FFMPEG_CUSTOM_DECODER_zlib
-
-config FFMPEG_CUSTOM_DEMUXER_mp3
-	bool "MP3 (MPEG Audio Layer 3)"
-	select FFMPEG_CUSTOM_PARSER_mpegaudio
-
-config FFMPEG_CUSTOM_DEMUXER_mpegvideo
-	bool "MPEG Video"
-
-config FFMPEG_CUSTOM_DEMUXER_mpegps
-	bool "MPEG-2 (PS)"
-
-config FFMPEG_CUSTOM_DEMUXER_mpegts
-	bool "MPEG-2 (TS)"
-
-config FFMPEG_CUSTOM_DEMUXER_ogg
-	bool "Ogg"
-
-config FFMPEG_CUSTOM_DEMUXER_rm
-	bool "RM"
-	help
-	  RealMedia format demuxer
-
-config FFMPEG_CUSTOM_DEMUXER_rtsp
-	bool "RTSP"
-	select FFMPEG_CUSTOM_DEMUXER_rm
-	select FFMPEG_CUSTOM_DEMUXER_sdp
-
-config FFMPEG_CUSTOM_DEMUXER_sdp
-	bool "SDP"
-	select FFMPEG_CUSTOM_DEMUXER_mpegts
-
-comment "Parsers ---"
-
-config FFMPEG_CUSTOM_PARSER_aac
-	bool "AAC (Advanced Audio Coding)"
-	depends on FFMPEG_CUSTOM_PATENTED
-
-config FFMPEG_CUSTOM_PARSER_ac3
-	bool "AC3"
-
-config FFMPEG_CUSTOM_PARSER_h264
-	bool "H.264"
-	depends on FFMPEG_CUSTOM_PATENTED
-	select FFMPEG_CUSTOM_DECODER_h264
-
-config FFMPEG_CUSTOM_PARSER_mpegaudio
-	bool "MPEG Audio"
-
-config FFMPEG_CUSTOM_PARSER_mpegvideo
-	bool "MPEG Video"
-
-config FFMPEG_CUSTOM_PARSER_mpeg4video
-	bool "MPEG-4 Video"
-
-comment "Protocols ---"
-
-config FFMPEG_CUSTOM_PROTOCOL_file
-	bool "file:"
-
-config FFMPEG_CUSTOM_PROTOCOL_http
-	bool "http:"
-
-config FFMPEG_CUSTOM_PROTOCOL_pipe
-	bool "pipe:"
-
-config FFMPEG_CUSTOM_PROTOCOL_rtp
-	bool "rtp:"
-	select FFMPEG_CUSTOM_PROTOCOL_udp
-
-config FFMPEG_CUSTOM_PROTOCOL_tcp
-	bool "tcp:"
-
-config FFMPEG_CUSTOM_PROTOCOL_udp
-	bool "udp:"
-
-endmenu
-
-

--- a/multimedia/ffmpeg/Makefile
+++ /dev/null
@@ -1,437 +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
-
-PKG_NAME:=ffmpeg
-PKG_VERSION:=0.11.5
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://ffmpeg.org/releases/
-PKG_MD5SUM:=ea25fc252c132141f12988ed5506bfe8
-
-PKG_LICENSE:=LGPLv2.1+ GPLv2+ LGPLv3
-PKG_LICENSE_FILES:=COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 COPYING.LGPLv3
-
-FFMPEG_CUSTOM_ENCODERS:= \
-	ac3 \
-	jpegls \
-	mpeg1video \
-	mpeg2video \
-	mpeg4 \
-	pcm_s16be \
-	pcm_s16le \
-	png \
-	vorbis \
-	zlib \
-
-FFMPEG_CUSTOM_DECODERS:= \
-	aac \
-	ac3 \
-	atrac3 \
-	flac \
-	gif \
-	h264 \
-	jpegls \
-	mp2 \
-	mp3 \
-	mpeg1video \
-	mpeg2video \
-	mpeg4 \
-	mpegvideo \
-	pcm_s16be \
-	pcm_s16le \
-	png \
-	vorbis \
-	wmav1 \
-	wmav2 \
-	zlib \
-
-FFMPEG_CUSTOM_MUXERS:= \
-	ac3 \
-	ffm \
-	h264 \
-	mp3 \
-	mp4 \
-	mpeg1video \
-	mpeg2video \
-	mpegts \
-	ogg \
-	rtp \
-
-FFMPEG_CUSTOM_DEMUXERS:= \
-	aac \
-	ac3 \
-	avi \
-	flac \
-	ffm \
-	h264 \
-	matroska \
-	mov \
-	mp3 \
-	mpegps \
-	mpegts \
-	mpegvideo \
-	ogg \
-	rm \
-	rtsp \
-	sdp \
-	v4l2 \
-
-FFMPEG_CUSTOM_PARSERS:= \
-	aac \
-	ac3 \
-	h264 \
-	mpegaudio \
-	mpeg4video \
-	mpegvideo \
-
-FFMPEG_CUSTOM_PROTOCOLS:= \
-	file http pipe rtp tcp udp
-
-FFMPEG_MINI_ENCODERS:= \
-
-FFMPEG_MINI_DECODERS:= \
-	aac \
-	ac3 \
-	atrac3 \
-	flac \
-	h263 \
-	h264 \
-	jpegls \
-	mp3 \
-	mpeg1video \
-	mpeg2video \
-	mpeg4 \
-	mpegvideo \
-	png \
-	wmav1 \
-	wmav2 \
-
-FFMPEG_MINI_MUXERS:= \
-	ffm \
-
-FFMPEG_MINI_DEMUXERS := \
-	aac \
-	ac3 \
-	asf \
-	avi \
-	ffm \
-	flac \
-	h264 \
-	matroska \
-	mov \
-	mp3 \
-	mpegts \
-	mpegvideo \
-	rtsp \
-
-FFMPEG_MINI_PARSERS:= \
-	ac3 \
-	flac \
-	h263 \
-	h264 \
-	mpeg4video \
-	mpegaudio \
-
-FFMPEG_MINI_PROTOCOLS := \
-	file http rtp tcp udp \
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_CONFIG_DEPENDS:= \
-	$(patsubst %,CONFIG_FFMPEG_CUSTOM_ENCODER_%,$(FFMPEG_CUSTOM_ENCODERS)) \
-	$(patsubst %,CONFIG_FFMPEG_CUSTOM_DECODER_%,$(FFMPEG_CUSTOM_DECODERS)) \
-	$(patsubst %,CONFIG_FFMPEG_CUSTOM_MUXER_%,$(FFMPEG_CUSTOM_DEMUXERS)) \
-	$(patsubst %,CONFIG_FFMPEG_CUSTOM_DEMUXER_%,$(FFMPEG_CUSTOM_DEMUXERS)) \
-	$(patsubst %,CONFIG_FFMPEG_CUSTOM_PARSER_%,$(FFMPEG_CUSTOM_PARSERS)) \
-	$(patsubst %,CONFIG_FFMPEG_CUSTOM_PROTOCOL_%,$(FFMPEG_CUSTOM_PROTOCOLS))
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ffmpeg/Default
- TITLE:=FFmpeg
- URL:=http://ffmpeg.mplayerhq.hu/
-endef
-
-define Package/ffmpeg/Default/description
- FFmpeg is a a software package that can record, convert and stream digital
- audio and video in numerous formats.
-endef
-
-
-define Package/ffmpeg
-$(call Package/ffmpeg/Default)
- SECTION:=multimedia
- CATEGORY:=Multimedia
- TITLE+= program
- DEPENDS+= +libpthread +libffmpeg-full
- VARIANT:=full
-endef
-
-define Package/ffmpeg/description
-$(call Package/ffmpeg/Default/description)
- .
- This package contains the FFmpeg command line tool.
-endef
-
-
-define Package/ffprobe
-$(call Package/ffmpeg/Default)
- SECTION:=multimedia
- CATEGORY:=Multimedia
- TITLE+= CLI media identifier
- DEPENDS+= +libffmpeg-full
- VARIANT:=full
-endef
-
-define Package/ffprobe/description
-$(call Package/ffmpeg/Default/description)
- .
- This package contains the FFprobe command line tool.
-endef
-
-
-define Package/ffserver
-$(call Package/ffserver/Default)
- SECTION:=multimedia
- CATEGORY:=Multimedia
- TITLE+= streaming server
- DEPENDS+= +libpthread +libffmpeg-full
- VARIANT:=full
-endef
-
-define Package/ffserver/description
-$(call Package/ffmpeg/Default/description)
- .
- This package contains the FFmpeg streaming server.
-endef
-
-
-define Package/libffmpeg/Default
-$(call Package/ffmpeg/Default)
- SECTION:=libs
- CATEGORY:=Libraries
- TITLE+= libraries
- DEPENDS+= +libpthread +zlib +libbz2
- PROVIDES:= libffmpeg
-endef
-
-
-define Package/libffmpeg-custom
-$(call Package/libffmpeg/Default)
- TITLE+= (mini)
- DEPENDS+= @DEVEL
- VARIANT:=custom
- MENU:=1
-endef
-
-define Package/libffmpeg-custom/config
-source "$(SOURCE)/Config.in"
-endef
-
-define Package/libffmpeg-custom/description
-$(call Package/ffmpeg/Default/description)
- .
- This package contains customized FFmpeg shared libraries.
-endef
-
-
-define Package/libffmpeg-full
-$(call Package/libffmpeg/Default)
- TITLE+= (full)
- DEPENDS+= @BUILD_PATENTED +alsa-lib
- VARIANT:=full
-endef
-
-define Package/libffmpeg-full/description
-$(call Package/ffmpeg/Default/description)
- .
- This package contains full-featured FFmpeg shared libraries.
-endef
-
-
-define Package/libffmpeg-mini
-$(call Package/libffmpeg/Default)
- TITLE+= (mini)
- DEPENDS+= @BUILD_PATENTED
- VARIANT:=mini
-endef
-
-define Package/libffmpeg-mini/description
-$(call Package/ffmpeg/Default/description)
- .
- This package contains minimal-featured FFmpeg shared libraries.
-endef
-
-
-FFMPEG_CONFIGURE:= \
-	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(FPIC)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	./configure \
-	--enable-cross-compile \
-	--cross-prefix="$(TARGET_CROSS)" \
-	--arch="$(ARCH)" \
-	--target-os=linux \
-	--prefix="/usr" \
-	--enable-shared \
-	--enable-static \
-	--disable-debug \
-	--pkg-config="pkg-config" \
-	\
-	--enable-gpl \
-	--enable-version3 \
-	\
-	--disable-altivec \
-	--disable-asm \
-	--disable-doc \
-	--disable-dxva2 \
-	--enable-pthreads \
-	--enable-small \
-	--disable-stripping \
-	--enable-zlib \
-	--disable-outdevs
-
-ifeq ($(BUILD_VARIANT),custom)
-
-  FFMPEG_ENABLE= \
-	$(foreach c, $(2), \
-		$(if $($(3)_$(c)),--enable-$(1)="$(c)") \
-	)
-
-  FFMPEG_CONFIGURE+= \
-	--disable-ffmpeg \
-	--disable-ffplay \
-	--disable-ffprobe \
-	--disable-ffserver \
-	--disable-avfilter \
-	--disable-postproc \
-	--disable-swresample \
-	--disable-swscale \
-	--disable-everything \
-	$(call FFMPEG_ENABLE,encoder,$(FFMPEG_CUSTOM_ENCODERS),CONFIG_FFMPEG_CUSTOM_ENCODER) \
-	$(call FFMPEG_ENABLE,decoder,$(FFMPEG_CUSTOM_DECODERS),CONFIG_FFMPEG_CUSTOM_DECODER) \
-	$(call FFMPEG_ENABLE,muxer,$(FFMPEG_CUSTOM_MUXERS),CONFIG_FFMPEG_CUSTOM_MUXER) \
-	$(call FFMPEG_ENABLE,demuxer,$(FFMPEG_CUSTOM_DEMUXERS),CONFIG_FFMPEG_CUSTOM_DEMUXER) \
-	$(call FFMPEG_ENABLE,parser,$(FFMPEG_CUSTOM_PARSERS),CONFIG_FFMPEG_CUSTOM_PARSER) \
-	$(call FFMPEG_ENABLE,protocol,$(FFMPEG_CUSTOM_PROTOCOLS),CONFIG_FFMPEG_CUSTOM_PROTOCOL) \
-
-endif
-
-ifeq ($(BUILD_VARIANT),mini)
-
-  FFMPEG_ENABLE= \
-	$(foreach c, $(2), \
-		--enable-$(1)="$(c)" \
-	)
-
-  FFMPEG_CONFIGURE+= \
-	--disable-ffmpeg \
-	--disable-ffplay \
-	--disable-ffprobe \
-	--disable-ffserver \
-	--disable-avfilter \
-	--disable-postproc \
-	--disable-swresample \
-	--disable-swscale \
-	--disable-everything \
-	$(call FFMPEG_ENABLE,encoder,$(FFMPEG_MINI_ENCODERS)) \
-	$(call FFMPEG_ENABLE,decoder,$(FFMPEG_MINI_DECODERS)) \
-	$(call FFMPEG_ENABLE,muxer,$(FFMPEG_MINI_MUXERS)) \
-	$(call FFMPEG_ENABLE,demuxer,$(FFMPEG_MINI_DEMUXERS)) \
-	$(call FFMPEG_ENABLE,parser,$(FFMPEG_MINI_PARSERS)) \
-	$(call FFMPEG_ENABLE,protocol,$(FFMPEG_MINI_PROTOCOLS)) \
-
-endif
-
-ifneq ($(CONFIG_TARGET_x86),)
-  TARGET_CFLAGS += -fomit-frame-pointer
-endif
-
-define Build/Configure
-	( cd $(PKG_BUILD_DIR); $(FFMPEG_CONFIGURE) )
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-define Build/InstallDev/custom
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/lib{avcodec,avdevice,avformat,avutil} $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avformat,avutil}.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lib{avcodec,avdevice,avformat,avutil}.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Build/InstallDev/full
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swresample,swscale} $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swresample,swscale}.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swresample,swscale}.pc $(1)/usr/lib/pkgconfig/
-endef
-
-Build/InstallDev/mini = $(Build/InstallDev/custom)
-
-# XXX: attempt at installing "best" dev files available
-ifeq ($(BUILD_VARIANT),custom)
-  # XXX: only install "custom" dev files if -full & -mini are not selected
-  ifeq ($(CONFIG_PACKAGE_libffmpeg-full)$(CONFIG_PACKAGE_libffmpeg-mini),)
-    Build/InstallDev = $(Build/InstallDev/custom)
-  endif
-endif
-ifeq ($(BUILD_VARIANT),full)
-  # XXX: always install "full" dev files if -full is selected
-  Build/InstallDev = $(Build/InstallDev/full)
-endif
-ifeq ($(BUILD_VARIANT),mini)
-  # XXX: only install "mini" dev files if -full is not selected
-  ifeq ($(CONFIG_PACKAGE_libffmpeg-full),)
-    Build/InstallDev = $(Build/InstallDev/mini)
-  endif
-endif
-
-define Package/ffmpeg/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ffmpeg $(1)/usr/bin/
-endef
-
-define Package/ffprobe/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ffprobe $(1)/usr/bin/
-endef
-
-define Package/ffserver/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ffserver $(1)/usr/bin/
-endef
-
-define Package/libffmpeg-custom/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avformat,avutil}.so.* $(1)/usr/lib/
-endef
-
-define Package/libffmpeg-full/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swresample,swscale}.so.* $(1)/usr/lib/
-endef
-
-Package/libffmpeg-mini/install = $(Package/libffmpeg-custom/install)
-
-$(eval $(call BuildPackage,ffmpeg))
-$(eval $(call BuildPackage,ffprobe))
-$(eval $(call BuildPackage,ffserver))
-$(eval $(call BuildPackage,libffmpeg-custom))
-$(eval $(call BuildPackage,libffmpeg-full))
-$(eval $(call BuildPackage,libffmpeg-mini))
-

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

--- a/multimedia/icecast/Makefile
+++ /dev/null
@@ -1,92 +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:=icecast
-PKG_VERSION:=2.3.2
-PKG_RELEASE:=4
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/icecast/
-PKG_MD5SUM:=ff516b3ccd2bcc31e68f460cd316093f
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-TREMOR_BUILD_DIR=$(PKG_BUILD_DIR)/libvorbisidec-1.2.0-dave
-TREMOR_DIR=$(TREMOR_BUILD_DIR)/ipkg-install/usr
-
-define Package/icecast
-  SECTION:=multimedia
-  CATEGORY:=Multimedia
-  DEPENDS:=+libcurl +libxml2 +libxslt +libogg +libopenssl
-  TITLE:=A streaming media server for Ogg/Vorbis and MP3 audio streams
-  URL:=http://www.icecast.org/
-endef
-
-define Package/icecast/description
-	Icecast is a streaming media server which currently supports Ogg
-	Vorbis and MP3 audio streams. It can be used to create an Internet
-	radio station or a privately running jukebox and many things in
-	between. It is very versatile in that new formats can be added
-	relatively easily and supports open standards for commuincation and
-	interaction.
-endef
-
-define Build/Prepare
-	$(Build/Prepare/Default)
-	$(SUBMAKE) -f libvorbisidec.mk \
-		BUILD_DIR="$(PKG_BUILD_DIR)" \
-		V=99 \
-		prepare
-endef
-
-define Build/Configure
-	$(MAKE) -f libvorbisidec.mk \
-		BUILD_DIR="$(PKG_BUILD_DIR)" \
-		V=99 \
-		compile
-	$(SED) 's,-lvorbis ,$(TREMOR_DIR)/lib/libvorbisidec.a -logg ,g' $(PKG_BUILD_DIR)/configure
-	$(call Build/Configure/Default, \
-		--enable-yp \
-		--with-curl="yes" \
-		--with-curl-config="$(STAGING_DIR)/usr/bin/curl-config" \
-		--with-ogg="$(STAGING_DIR)/usr" \
-		--with-speex="no" \
-		--with-theora="no" \
-		--with-vorbis="$(TREMOR_DIR)" \
-		--with-xslt-config="$(STAGING_DIR)/usr/bin/xslt-config" \
-		, \
-		CPPFLAGS="-I$(TREMOR_DIR)/include -I$(STAGING_DIR)/usr/include/libxml2 $(TARGET_CPPFLAGS)" \
-	)
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		INCLUDES="-I$(PKG_BUILD_DIR)/src -I$(TREMOR_DIR)/include" \
-		all install
-endef
-
-define Package/icecast/install
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) $(PKG_INSTALL_DIR)/etc/icecast.xml $(1)/etc/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/icecast $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/share/icecast
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/icecast/admin $(1)/usr/share/icecast/
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/icecast/web $(1)/usr/share/icecast/
-endef
-
-define Package/icecast/conffiles
-/etc/icecast.xml
-endef
-
-$(eval $(call BuildPackage,icecast))
-

--- a/multimedia/icecast/libvorbisidec.mk
+++ /dev/null
@@ -1,42 +1,1 @@
-# 
-# Copyright (C) 2006 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:=icecast-libvorbisidec
-PKG_VERSION:=1.2.0-dave
-PKG_RELEASE:=1
-
-PKG_SOURCE:=libvorbisidec-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://users.tpg.com.au/davico/openwrt/
-PKG_MD5SUM:=cb8e51aab92ef164f8e0e8853f7164fa
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/libvorbisidec-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-PATCH_DIR=./patches-libvorbisidec
-
-include $(INCLUDE_DIR)/package.mk
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--disable-shared \
-		--enable-static \
-	)
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-define Build/InstallDev
-	true
-endef
-
-$(eval $(call Build/DefaultTargets))
-

--- a/multimedia/icecast/patches/001-icecast-2.3.0-tremor.patch
+++ /dev/null
@@ -1,156 +1,1 @@
---- a/src/format_flac.c
-+++ b/src/format_flac.c
-@@ -18,7 +18,7 @@
- #endif
- 
- #include <stdlib.h>
--#include <ogg/ogg.h>
-+#include <tremor/ogg.h>
- #include <string.h>
- 
- typedef struct source_tag source_t;
---- a/src/format_midi.c
-+++ b/src/format_midi.c
-@@ -18,7 +18,7 @@
- #endif
- 
- #include <stdlib.h>
--#include <ogg/ogg.h>
-+#include <tremor/ogg.h>
- #include <string.h>
- 
- typedef struct source_tag source_t;
---- a/src/format_ogg.c
-+++ b/src/format_ogg.c
-@@ -24,7 +24,7 @@
- #include <stdlib.h>
- #include <string.h>
- 
--#include <ogg/ogg.h>
-+#include <tremor/ogg.h>
- 
- #include "refbuf.h"
- #include "source.h"
---- a/src/format_ogg.h
-+++ b/src/format_ogg.h
-@@ -18,7 +18,7 @@
- #ifndef __FORMAT_OGG_H__
- #define __FORMAT_OGG_H__
- 
--#include <ogg/ogg.h>
-+#include <tremor/ogg.h>
- #include "refbuf.h"
- #include "format.h"
- 
---- a/src/format_speex.c
-+++ b/src/format_speex.c
-@@ -18,7 +18,7 @@
- #endif
- 
- #include <stdlib.h>
--#include <ogg/ogg.h>
-+#include <tremor/ogg.h>
- #include <speex/speex_header.h>
- 
- typedef struct source_tag source_t;
---- a/src/format_theora.c
-+++ b/src/format_theora.c
-@@ -18,7 +18,7 @@
- #endif
- 
- #include <stdlib.h>
--#include <ogg/ogg.h>
-+#include <tremor/ogg.h>
- #include <theora/theora.h>
- 
- typedef struct source_tag source_t;
---- a/src/format_vorbis.c
-+++ b/src/format_vorbis.c
-@@ -18,8 +18,8 @@
- #endif
- 
- #include <stdlib.h>
--#include <ogg/ogg.h>
--#include <vorbis/codec.h>
-+#include <tremor/ogg.h>
-+#include <tremor/ivorbiscodec.h>
- #include <memory.h>
- #include <string.h>
- 
---- a/src/source.c
-+++ b/src/source.c
-@@ -19,7 +19,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/types.h>
--#include <ogg/ogg.h>
-+#include <tremor/ogg.h>
- #include <errno.h>
- 
- #ifndef _WIN32
---- a/src/format_kate.c
-+++ b/src/format_kate.c
-@@ -19,7 +19,7 @@
- 
- #include <stdlib.h>
- #include <string.h>
--#include <ogg/ogg.h>
-+#include <tremor/ogg.h>
- #ifdef HAVE_KATE
- #include <kate/oggkate.h>
- #endif
---- a/m4/vorbis.m4
-+++ b/m4/vorbis.m4
-@@ -38,9 +38,9 @@ if test "x$vorbis_prefix" != "x$ogg_pref
-             ])
- fi
- 
--VORBIS_LIBS="-lvorbis"
--VORBISFILE_LIBS="-lvorbisfile"
--VORBISENC_LIBS="-lvorbisenc"
-+VORBIS_LIBS="-lvorbisidec"
-+VORBISFILE_LIBS="-lvorbisidec"
-+VORBISENC_LIBS="-lvorbisidec"
- 
- xt_save_LIBS="$LIBS"
- xt_save_LDFLAGS="$LDFLAGS"
-@@ -58,18 +58,6 @@ AC_TRY_LINK_FUNC(ogg_stream_init, [xt_li
-             )
-         ])
- 
--if test "x$xt_lib_vorbis" = "xok"; then
--#
--# Now check if the installed Vorbis is sufficiently new.
--#
--AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
--#include <vorbis/codec.h>
--#include <vorbis/vorbisenc.h>
--        ], [
--struct ovectl_ratemanage_arg a;
--])],,[xt_lib_vorbis="old version found"])
--AC_MSG_RESULT([$xt_lib_vorbis])
--fi
- CPPFLAGS="$xt_save_CPPFLAGS"
- LIBS="$xt_save_LIBS"
- LDFLAGS="$xt_save_LDFLAGS"
---- a/m4/ogg.m4
-+++ b/m4/ogg.m4
-@@ -29,7 +29,7 @@ XIPH_GCC_WARNING([-I$ogg_prefix/include]
-       ])
- AC_CACHE_CHECK([for libogg], xt_cv_lib_ogg,
- [dnl
--OGG_LIBS="-logg"
-+OGG_LIBS="-lvorbisidec"
- 
- #
- # check if the installed Ogg is sufficiently new.
-@@ -42,7 +42,7 @@ LIBS="$LIBS $OGG_LIBS"
- LDFLAGS="$LDFLAGS $OGG_LDFLAGS"
- AC_TRY_LINK_FUNC(ogg_sync_init,
-     [ xt_cv_lib_ogg=ok ],
--    [ AC_TRY_LINK([#include <ogg/ogg.h>],, 
-+    [ AC_TRY_LINK([#include <tremor/ogg.h>],, 
-         [ xt_cv_lib_ogg="pre v1.0, needs updating" ],
-         [ xt_cv_lib_ogg="not found" ])
-     ])
 

--- a/multimedia/icecast/patches/010-fix_libcurl_test_crap.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/m4/xiph_curl.m4
-+++ b/m4/xiph_curl.m4
-@@ -52,7 +52,7 @@ AC_CHECK_HEADERS([curl/curl.h],, curl_ok
- AC_MSG_CHECKING(for libcurl)
- if test "$curl_ok" = "yes"
- then
--    AC_RUN_IFELSE(AC_LANG_SOURCE([
-+    AC_COMPILE_IFELSE(AC_LANG_SOURCE([
- #include <curl/curl.h>
- int main()
- {
 

--- a/multimedia/minidlna/Makefile
+++ /dev/null
@@ -1,92 +1,1 @@
-#
-# Copyright (C) 2010-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:=minidlna
-PKG_VERSION:=1.0.25
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_src.tar.gz
-PKG_SOURCE_URL:=@SF/minidlna
-PKG_MD5SUM:=d966256baf2f9b068b9de871ab5dade5
-
-PKG_BUILD_PARALLEL:=0
-PKG_BUILD_DEPENDS:=util-linux
-
-include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/minidlna
-  SECTION:=multimedia
-  CATEGORY:=Multimedia
-  TITLE:=UPnP A/V & DLNA Media Server
-  URL:=http://minidlna.sourceforge.net/
-  DEPENDS:= +libpthread +libexif +libjpeg +libsqlite3 +libffmpeg \
-  	+libid3tag +libflac +libvorbis +libuuid \
-  	$(ICONV_DEPENDS) $(INTL_DEPENDS)
-endef
-
-define Package/minidlna/description
-  MiniDLNA (aka ReadyDLNA) is server software with the aim of
-  being fully compliant with DLNA/UPnP-AV clients.
-endef
-
-define Package/minidlna/conffiles
-/etc/minidlna.conf
-endef
-
-TARGET_CPPFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/FLAC \
-	-I$(STAGING_DIR)/usr/include/libavcodec \
-	-I$(STAGING_DIR)/usr/include/libavformat \
-	-I$(STAGING_DIR)/usr/include/libavutil \
-	-I$(STAGING_DIR)/usr/include/libexif \
-	-I$(STAGING_DIR)/usr/include/uuid \
-	-I$(STAGING_DIR)/usr/include/vorbis \
-	-I$(ICONV_PREFIX)/include \
-	-I$(INTL_PREFIX)/include \
-	-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
-
-TARGET_LDFLAGS += \
-	-L$(ICONV_PREFIX)/lib \
-	-L$(INTL_PREFIX)/lib \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-
-MAKE_FLAGS +=\
-	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	ICONV_LIBS="-liconv $(if $(INTL_FULL),-lintl)" \
-
-MAKE_VARS +=\
-	PREFIX="$(STAGING_DIR)/usr" \
-	ICONV_PREFIX="$(ICONV_PREFIX)" \
-	INTL_PREFIX="$(INTL_PREFIX)" \
-	OS_NAME="OpenWrt Linux" \
-	OS_VERSION="$(LINUX_VERSION)" \
-	OS_URL="http://openwrt.org/" \
-	DB_PATH="/var/run/minidlna" \
-	LOG_PATH="/var/log" \
-
-
-define Package/minidlna/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/minidlna $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/minidlna.init $(1)/etc/init.d/minidlna
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/minidlna.config $(1)/etc/config/minidlna
-endef
-
-define Package/minidlna/conffiles
-/etc/config/minidlna
-endef
-
-$(eval $(call BuildPackage,minidlna))
-

--- a/multimedia/minidlna/files/minidlna.config
+++ /dev/null
@@ -1,18 +1,1 @@
-config minidlna config
-	option 'enabled' '0'
-	option port '8200'
-	option interface 'br-lan'
-	option friendly_name 'OpenWrt DLNA Server'
-	option db_dir '/var/run/minidlna'
-	option log_dir '/var/log'
-	option inotify '1'
-	option enable_tivo '0'
-	option strict_dlna '0'
-	option presentation_url ''
-	option notify_interval '900'
-	option serial '12345678'
-	option model_number '1'
-	option root_container '.'
-	list media_dir '/mnt'
-	option album_art_names 'Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg/AlbumArt.jpg/albumart.jpg/Album.jpg/album.jpg/Folder.jpg/folder.jpg/Thumb.jpg/thumb.jpg'
 

--- a/multimedia/minidlna/files/minidlna.init
+++ /dev/null
@@ -1,97 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2010 OpenWrt.org
 
-START=50
-
-SERVICE_USE_PID=1
-
-MINIDLNA_CONFIG_FILE="/tmp/minidlna.conf"
-
-minidlna_cfg_append() {
-	echo "$1" >> "$MINIDLNA_CONFIG_FILE"
-}
-
-minidlna_cfg_addbool() {
-	local cfg="$1"
-	local key="$2"
-	local def="$3"
-	local val
-
-	config_get_bool val "$cfg" "$key" "$def"
-	[ "$val" -gt 0 ] && val="yes" || val="no"
-	minidlna_cfg_append "$key=$val"
-}
-
-minidlna_cfg_addstr() {
-	local cfg="$1"
-	local key="$2"
-	local def="$3"
-	local val
-
-	config_get val "$cfg" "$key" "$def"
-	[ -n "$val" ] && minidlna_cfg_append "$key=$val"
-}
-
-minidlna_cfg_add_media_dir() {
-	local val=$1
-
-	minidlna_cfg_append "media_dir=$val"
-}
-
-minidlna_create_config() {
-	local cfg=$1
-	local port
-	local interface
-
-	config_get port $cfg port
-	config_get interface $cfg interface
-
-	[ -z "$interface" -o -t "$port" ] && return 1
-
-	echo "# this file is generated automatically, don't edit" > "$MINIDLNA_CONFIG_FILE"
-
-	minidlna_cfg_append "port=$port"
-	minidlna_cfg_append "network_interface=$interface"
-
-	minidlna_cfg_addstr $cfg friendly_name
-	minidlna_cfg_addstr $cfg db_dir
-	minidlna_cfg_addstr $cfg log_dir
-	minidlna_cfg_addbool $cfg inotify '1'
-	minidlna_cfg_addbool $cfg enable_tivo '0'
-	minidlna_cfg_addbool $cfg strict_dlna '0'
-	minidlna_cfg_addstr $cfg album_art_names
-	minidlna_cfg_addstr $cfg presentation_url
-	minidlna_cfg_addstr $cfg notify_interval '900'
-	minidlna_cfg_addstr $cfg serial '12345678'
-	minidlna_cfg_addstr $cfg model_number '1'
-	minidlna_cfg_addstr $cfg minissdpsocket
-	minidlna_cfg_addstr $cfg root_container '.'
-	config_list_foreach "$cfg" "media_dir" minidlna_cfg_add_media_dir
-
-	return 0
-}
-
-start() {
-	local enabled
-	local db_dir
-	local log_dir
-
-	config_load 'minidlna'
-	config_get_bool enabled config 'enabled' '0'
-
-	[ "$enabled" -gt 0 ] || return 1
-
-	minidlna_create_config config || return 1
-	
-	config_get db_dir config 'db_dir' '/var/run/minidlna'
-	config_get log_dir config 'log_dir' '/var/log'
-
-	mkdir -m 0755 -p $db_dir
-	mkdir -m 0755 -p $log_dir
-	service_start /usr/bin/minidlna -f "$MINIDLNA_CONFIG_FILE"
-}
-
-stop() {
-	service_stop /usr/bin/minidlna
-}
-

--- a/multimedia/minidlna/patches/010-genconfig-checks.patch
+++ /dev/null
@@ -1,93 +1,1 @@
---- a/genconfig.sh
-+++ b/genconfig.sh
-@@ -23,14 +23,18 @@ RM="rm -f"
- CONFIGFILE="config.h"
- CONFIGMACRO="__CONFIG_H__"
- 
-+PREFIX="${PREFIX:-/usr}"
-+ICONV_PREFIX="${ICONV_PREFIX:-$PREFIX}"
-+INTL_PREFIX="${INTL_PREFIX:-$PREFIX}"
-+
- # Database path
--DB_PATH="/tmp/minidlna"
-+DB_PATH="${DB_PATH:-/tmp/minidlna}"
- # Log path
--LOG_PATH="${DB_PATH}"
-+LOG_PATH="${LOG_PATH:-$DB_PATH}"
- 
- # detecting the OS name and version
--OS_NAME=`uname -s`
--OS_VERSION=`uname -r`
-+OS_NAME="${OS_NAME:-$(uname -s)}"
-+OS_VERSION="${OS_VERSION:-$(uname -r)}"
- TIVO="/*#define TIVO_SUPPORT*/"
- NETGEAR="/*#define NETGEAR*/"
- READYNAS="/*#define READYNAS*/"
-@@ -40,22 +44,22 @@ ${RM} ${CONFIGFILE}
- 
- # Detect if there are missing headers
- # NOTE: This check only works with a normal distro
--[ ! -e "/usr/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING"
--[ ! -e "/usr/include/jpeglib.h" ] && MISSING="libjpeg $MISSING"
--[ ! -e "/usr/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING"
--[ ! -e "/usr/include/id3tag.h" ] && MISSING="libid3tag $MISSING"
--[ ! -e "/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING"
--[ ! -e "/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING"
--[ ! -e "/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING"
--[ ! -e "/usr/include/ffmpeg/avutil.h" -a \
--  ! -e "/usr/include/libavutil/avutil.h" -a \
--  ! -e "/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING"
--[ ! -e "/usr/include/ffmpeg/avformat.h" -a \
--  ! -e "/usr/include/libavformat/avformat.h" -a \
--  ! -e "/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING"
--[ ! -e "/usr/include/ffmpeg/avcodec.h" -a \
--  ! -e "/usr/include/libavcodec/avcodec.h" -a \
--  ! -e "/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING"
-+[ ! -e "${PREFIX}/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING"
-+[ ! -e "${PREFIX}/include/jpeglib.h" ] && MISSING="libjpeg $MISSING"
-+[ ! -e "${PREFIX}/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING"
-+[ ! -e "${PREFIX}/include/id3tag.h" ] && MISSING="libid3tag $MISSING"
-+[ ! -e "${PREFIX}/include/ogg/ogg.h" ] && MISSING="libogg $MISSING"
-+[ ! -e "${PREFIX}/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING"
-+[ ! -e "${PREFIX}/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING"
-+[ ! -e "${PREFIX}/include/ffmpeg/avutil.h" -a \
-+  ! -e "${PREFIX}/include/libavutil/avutil.h" -a \
-+  ! -e "${PREFIX}/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING"
-+[ ! -e "${PREFIX}/include/ffmpeg/avformat.h" -a \
-+  ! -e "${PREFIX}/include/libavformat/avformat.h" -a \
-+  ! -e "${PREFIX}/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING"
-+[ ! -e "${PREFIX}/include/ffmpeg/avcodec.h" -a \
-+  ! -e "${PREFIX}/include/libavcodec/avcodec.h" -a \
-+  ! -e "${PREFIX}/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING"
- if [ -n "$MISSING" ]; then
- 	echo -e "\nERROR!  Cannot continue."
- 	echo -e "The following required libraries are either missing, or are missing development headers:\n"
-@@ -151,8 +155,7 @@ case $OS_NAME in
- 		fi
- 		;;
- 	*)
--		echo "Unknown OS : $OS_NAME"
--		exit 1
-+		echo "WARNING: Unknown OS : $OS_NAME" 1>&2
- 		;;
- esac
- 
-@@ -183,7 +186,7 @@ fi
- echo "" >> ${CONFIGFILE}
- 
- echo "/* Enable if the system iconv.h exists.  ID3 tag reading in various character sets will not work properly otherwise. */" >> ${CONFIGFILE}
--if [ -f /usr/include/iconv.h ]; then
-+if [ -f ${ICONV_PREFIX}/include/iconv.h ]; then
- echo "#define HAVE_ICONV_H" >> ${CONFIGFILE}
- else
- echo -e "\nWARNING!!  Iconv support not found.  ID3 tag reading may not work."
-@@ -192,7 +195,7 @@ fi
- echo "" >> ${CONFIGFILE}
- 
- echo "/* Enable if the system libintl.h exists for NLS support. */" >> ${CONFIGFILE}
--if [ -f /usr/include/libintl.h ]; then
-+if [ -f ${INTL_PREFIX}/include/libintl.h ]; then
- echo "#define ENABLE_NLS" >> ${CONFIGFILE}
- else
- echo "/*#define ENABLE_NLS*/" >> ${CONFIGFILE}
 

--- a/multimedia/minidlna/patches/020-makefile-tweaks.patch
+++ /dev/null
@@ -1,49 +1,1 @@
---- a/Makefile
-+++ b/Makefile
-@@ -10,19 +10,23 @@
- # or :
- # $ make install
- #
-+PREFIX ?= /usr
-+ICONV_PREFIX ?= $(PREFIX)
-+INTL_PREFIX ?= $(PREFIX)
- #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
- #CFLAGS = -Wall -g -Os -D_GNU_SOURCE
- CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
--	 -I/usr/include/ffmpeg \
--	 -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \
--	 -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
-+	 -I$(PREFIX)/include/ffmpeg \
-+	 -I$(PREFIX)/include/libavutil -I$(PREFIX)/include/libavcodec -I$(PREFIX)/include/libavformat \
-+	 -I$(PREFIX)/include/ffmpeg/libavutil -I$(PREFIX)/include/ffmpeg/libavcodec -I$(PREFIX)/include/ffmpeg/libavformat
-+
- #STATIC_LINKING: CFLAGS += -DSTATIC
- #STATIC_LINKING: LDFLAGS = -static
- CC = gcc
- RM = rm -f
- INSTALL = install
- 
--INSTALLPREFIX ?= $(DESTDIR)/usr
-+INSTALLPREFIX ?= $(DESTDIR)$(PREFIX)
- SBININSTALLDIR = $(INSTALLPREFIX)/sbin
- ETCINSTALLDIR = $(DESTDIR)/etc
- 
-@@ -37,7 +41,7 @@ BASEOBJS = minidlna.o upnphttp.o upnpdes
- 
- ALLOBJS = $(BASEOBJS) $(LNXOBJS)
- 
--LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis
-+LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis -luuid $(ICONV_LIBS)
- #STATIC_LINKING: LIBS = -lvorbis -logg -lm -lsqlite3 -lpthread -lexif -ljpeg -lFLAC -lm -lid3tag -lz -lavformat -lavutil -lavcodec -lm
- 
- TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
-@@ -64,7 +68,7 @@ install-conf:
- 	$(INSTALL) -d $(ETCINSTALLDIR)
- 	$(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)
- 
--minidlna:	$(BASEOBJS) $(LNXOBJS) $(LIBS)
-+minidlna:	$(BASEOBJS) $(LNXOBJS)
- 	@echo Linking $@
- 	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
- 
 

--- a/multimedia/minidlna/patches/030-missing-include.patch
+++ /dev/null
@@ -1,11 +1,1 @@
---- a/minidlna.c
-+++ b/minidlna.c
-@@ -58,6 +58,7 @@
- #include <fcntl.h>
- #include <sys/file.h>
- #include <sys/time.h>
-+#include <sys/stat.h>
- #include <time.h>
- #include <signal.h>
- #include <sys/param.h>
 

--- a/multimedia/minidlna/patches/040-minidlna-1.0.25-fix-libavformat-api-feature-check.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/metadata.c	2012-08-27 23:00:06.997932249 +0100
-+++ b/metadata.c	2012-08-27 23:10:07.716582960 +0100
-@@ -110,7 +110,7 @@ lav_open(AVFormatContext **ctx, const ch
- static inline void
- lav_close(AVFormatContext *ctx)
- {
--#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(2<<8)+0)
-+#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(17<<8)+0)
- 	avformat_close_input(&ctx);
- #else
- 	av_close_input_file(ctx);
 

--- a/multimedia/mjpg-streamer/Config.in
+++ /dev/null
@@ -1,24 +1,1 @@
-if PACKAGE_mjpg-streamer
 
-config MJPG_STREAMER_INPUT_FILE
-	bool "Install input file library"
-	default y
-
-config MJPG_STREAMER_INPUT_UVC
-	bool "Install input uvc library"
-	default y
-
-config MJPG_STREAMER_OUTPUT_FILE
-	bool "Install output file library"
-	default y
-
-config MJPG_STREAMER_OUTPUT_HTTP
-	bool "Install output http library"
-	default y
-
-config MJPG_STREAMER_WWW
-	bool "Install WWW files"
-	default y
-
-endif
-

--- a/multimedia/mjpg-streamer/Makefile
+++ /dev/null
@@ -1,75 +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
-
-PKG_NAME:=mjpg-streamer
-PKG_REV:=181
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://svn.code.sf.net/p/mjpg-streamer/code/mjpg-streamer
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_PROTO:=svn
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mjpg-streamer
-  SECTION:=multimedia
-  CATEGORY:=Multimedia
-  TITLE:=MJPG-streamer
-  DEPENDS:=+libpthread +libjpeg
-  URL:=http://mjpg-streamer.wiki.sourceforge.net/
-  MENU:=1
-endef
-
-define Package/mjpg-streamer/description
- Streaming application for Linux-UVC compatible webcams
-endef
-
-define Package/mjpg-streamer/config
-  source "$(SOURCE)/Config.in"
-endef
-
-EXTRA_CFLAGS += $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)
-
-define Package/mjpg-streamer/conffiles
-/etc/config/mjpg-streamer
-endef
-
-define Package/mjpg-streamer/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mjpg_streamer $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(CP) ./files/mjpg-streamer.config $(1)/etc/config/mjpg-streamer
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/mjpg-streamer.init $(1)/etc/init.d/mjpg-streamer
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/usb
-	$(INSTALL_DATA) ./files/mjpg-streamer.hotplug $(1)/etc/hotplug.d/usb/20-mjpg-streamer
-	$(INSTALL_DIR) $(1)/usr/lib
-ifeq ($(CONFIG_MJPG_STREAMER_INPUT_FILE),y)
-	$(CP) $(PKG_BUILD_DIR)/input_file.so $(1)/usr/lib
-endif
-ifeq ($(CONFIG_MJPG_STREAMER_INPUT_UVC),y)
-	$(CP) $(PKG_BUILD_DIR)/input_uvc.so $(1)/usr/lib
-endif
-ifeq ($(CONFIG_MJPG_STREAMER_OUTPUT_FILE),y)
-	$(CP) $(PKG_BUILD_DIR)/output_file.so $(1)/usr/lib
-endif
-ifeq ($(CONFIG_MJPG_STREAMER_OUTPUT_HTTP),y)
-	$(CP) $(PKG_BUILD_DIR)/output_http.so $(1)/usr/lib
-endif
-ifeq ($(CONFIG_MJPG_STREAMER_WWW),y)
-	$(INSTALL_DIR) $(1)/www/webcam
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/* $(1)/www/webcam
-endif
-endef
-
-$(eval $(call BuildPackage,mjpg-streamer))
-

--- a/multimedia/mjpg-streamer/files/mjpg-streamer.config
+++ /dev/null
@@ -1,11 +1,1 @@
-config mjpg-streamer 'core'
-	option enabled '0'
-	option input 'uvc'
-	option output 'http'
-	option device '/dev/video0'
-	option resolution '640x480'
-	option fps '5'
-	option www '/www/webcam'
-	option port '8080'
 
-

--- a/multimedia/mjpg-streamer/files/mjpg-streamer.hotplug
+++ /dev/null
@@ -1,11 +1,1 @@
-case "$ACTION" in
-	add)
-		# start process
-		/etc/init.d/mjpg-streamer start
-		;;
-	remove)
-		# stop process
-		/etc/init.d/mjpg-streamer stop
-		;;
-esac
 

--- a/multimedia/mjpg-streamer/files/mjpg-streamer.init
+++ /dev/null
@@ -1,84 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2013 OpenWrt.org
 
-START=90
-STOP=10
-
-USE_PROCD=1
-PROG=/usr/bin/mjpg_streamer
-
-error() {
-	echo "${initscript}:" "$@" 1>&2
-}
-
-start_instance() {
-	local s="$1"
-
-	config_get_bool enabled "$1" 'enabled' 0
-	[ $enabled -eq 0 ] && return
-
-	config_get input "$s" 'input'
-	if [ -z "$input" ]; then
-		error "in section '$s' option input is missing"
-		return 1
-	fi
-
-	config_get output "$s" 'output'
-	if [ -z "$output" ]; then
-		error "in section '$s' option output is missing"
-		return 1
-	fi
-
-	local input_arg
-	if [ "x$input" = 'xuvc' ]; then
-		input_arg="input_uvc.so"
-
-		config_get device "$s" 'device'
-		if [ ! -c "$device" ]; then
-			error "device '$device' does not exist"
-			return 1
-		fi
-		input_arg="${input_arg} --device $device"
-
-		config_get fps "$s" 'fps'
-		[ -n "$fps" ] && input_arg="${input_arg} --fps $fps"
-
-		config_get resolution "$s" 'resolution'
-		[ -n "$resolution" ] && input_arg="${input_arg} --resolution $resolution"
-	fi
-
-	if [ -z "$input_arg" ]; then
-		error "unsuported input option '$input' in section '$s'"
-		return 1
-	fi
-
-	local output_arg
-	if [ "x$output" = 'xhttp' ]; then
-		output_arg="output_http.so"
-
-		config_get port "$s" 'port'
-		[ -n "$port" ] && output_arg="${output_arg} --port $port"
-
-		config_get www "$s" 'www'
-		[ -n "$www" ] && output_arg="${output_arg} --www $www"
-	fi
-
-	if [ -z "$output_arg" ]; then
-		error "unsuported output option '$output' in section '$s'"
-		return 1
-	fi
-
-	procd_open_instance
-	procd_set_param command "$PROG" --input "$input_arg" --output "$output_arg"
-	procd_close_instance
-}
-
-start_service() {
-	config_load 'mjpg-streamer'
-	config_foreach start_instance 'mjpg-streamer'
-}
-
-service_triggers() {
-	procd_add_reload_trigger 'mjpg-streamer'
-}
-

--- a/multimedia/motion/Makefile
+++ /dev/null
@@ -1,53 +1,1 @@
-#
-# 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:=motion
-PKG_VERSION:=20110826-051001
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.lavrsen.dk/sources/motion-daily \
-		@SF/motion
-PKG_MD5SUM:=e703fce57ae2215cb05f25e3027f5818
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/motion
-  SECTION:=multimedia
-  CATEGORY:=Multimedia
-  DEPENDS:=+libjpeg +libpthread
-  TITLE:=webcam motion sensing and logging
-  URL:=http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome
-endef
-
-define Package/motion/conffiles
-/etc/motion.conf
-endef
-
-CONFIGURE_ARGS+= \
-	--without-optimizecpu \
-	--without-ffmpeg \
-	--without-jpeg-mmx \
-	--without-sdl \
-	--without-mysql \
-	--without-pgsql \
-	--without-sqlite3 \
-
-define Package/motion/install
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) $(PKG_INSTALL_DIR)/etc/motion-dist.conf $(1)/etc/motion.conf
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/motion $(1)/usr/bin/
-
-endef
-
-$(eval $(call BuildPackage,motion))
-

--- a/multimedia/motion/patches/002-honor_cppflags.patch
+++ /dev/null
@@ -1,20 +1,1 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -31,6 +31,7 @@ examplesdir = $(datadir)/@PACKAGE_NAME@-
- # install.                                                                     #
- ################################################################################
- CFLAGS       = @CFLAGS@ -Wall -DVERSION=\"@PACKAGE_VERSION@\" -Dsysconfdir=\"$(sysconfdir)\" 
-+CPPFLAGS     = @CPPFLAGS@
- LDFLAGS      = @LDFLAGS@
- LIBS         = @LIBS@ 
- VIDEO_OBJ    = @VIDEO@
-@@ -118,7 +119,7 @@ endif
- ################################################################################
- $(DEPEND_FILE): *.h $(SRC)
- 	@echo "Generating dependencies, please wait..."
--	@$(CC) $(CFLAGS) -M $(SRC) > .tmp
-+	@$(CC) $(CFLAGS) $(CPPFLAGS) -M $(SRC) > .tmp
- 	@mv -f .tmp $(DEPEND_FILE)
- 	@echo
- 
 

file:a/net/aria2/Config.in (deleted)
--- a/net/aria2/Config.in
+++ /dev/null
@@ -1,29 +1,1 @@
-menu "Aria2 configuration"
-	depends on PACKAGE_aria2
 
-choice
-	prompt "SSL library"
-	default ARIA2_OPENSSL
-
-config ARIA2_OPENSSL
-	bool "OpenSSL"
-
-config ARIA2_GNUTLS
-	bool "GNUTLS"
-
-config ARIA2_NOSSL
-	bool "No SSL support"
-
-endchoice
-
-config ARIA2_BITTORRENT
-	bool "Enable bittorrent support"
-	depends on ARIA2_OPENSSL
-	default n
-
-config ARIA2_METALINK
-	bool "Enable metalink support"
-	default N
-
-endmenu
-

file:a/net/aria2/Makefile (deleted)
--- a/net/aria2/Makefile
+++ /dev/null
@@ -1,71 +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:=aria2
-PKG_VERSION:=1.18.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/aria2
-PKG_MD5SUM:=d10fc5ee6e708760134e4cb963ecc98e
-PKG_INSTALL:=1
-
-PKG_MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
-PKG_CONFIG_DEPENDS := \
-  ARIA2_NOSSL \
-  ARIA2_OPENSSL \
-  ARIA2_GNUTLS \
-  ARIA2_BITTORRENT \
-  ARIA2_METALINK
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/aria2/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Package/aria2
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=File Transfer
-  TITLE:=lightweight download utility
-  URL:=http://aria2.sourceforge.net/
-  DEPENDS:=+zlib +ARIA2_METALINK:libxml2 +libstdcpp +ARIA2_OPENSSL:libopenssl +ARIA2_GNUTLS:libgnutls
-endef
-
-define Package/aria2/description
- aria2 is a lightweight multi-protocol & multi-source command-line download
- utility
-endef
-
-CONFIGURE_ARGS += \
-	--disable-nls \
-	$(if $(CONFIG_ARIA2_NOSSL),--disable,--enable)-ssl \
-	$(if $(CONFIG_ARIA2_OPENSSL),--with,--without)-openssl \
-	$(if $(CONFIG_ARIA2_GNUTLS),--with,--without)-gnutls \
-	$(if $(CONFIG_ARIA2_BITTORRENT),--enable,--disable)-bittorrent \
-	$(if $(CONFIG_ARIA2_METALINK),--enable,--disable)-metalink \
-	$(if $(CONFIG_ARIA2_METALINK),--with,--without)-libxml2 \
-	--without-libnettle \
-	--without-libgmp \
-	--without-libgcrypt \
-	--without-libexpat \
-	--without-libcares \
-	--without-sqlite3 \
-	--with-libz
-
-define Package/aria2/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aria2c $(1)/usr/bin
-endef
-
-$(eval $(call BuildPackage,aria2))
-

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/dhcpcd/Makefile (deleted)
--- a/net/dhcpcd/Makefile
+++ /dev/null
@@ -1,46 +1,1 @@
-#
-# Copyright (C) 2007-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:=dhcpcd
-PKG_VERSION:=6.1.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://roy.marples.name/pub/dhcpcd
-PKG_MD5SUM:=6070040c57492925af9ac6aed980de2a
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/dhcpcd
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=IP Addresses and Names
-  TITLE:=DHCP client for automatically configuring IPv4 networking
-  DEPENDS:=+librt
-  URL:=http://roy.marples.name/projects/dhcpcd
-endef
-
-define Package/dhcpcd/description
-	Simple configuration: supports executions of a script when the
-	IP address changes.
-endef
-
-define Package/dhcpcd/install
-	$(INSTALL_DIR) $(1)/sbin $(1)/etc $(1)/etc/dhcpcd.enter-hook
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dhcpcd $(1)/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/dhcpcd-run-hooks $(1)/sbin/
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/dhcpcd.conf $(1)/etc/dhcpcd.conf
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/usr/lib/dhcpcd-hooks/* $(1)/etc/dhcpcd.enter-hook/
-endef
-
-$(eval $(call BuildPackage,dhcpcd))
-
-

--- a/net/dhcpcd/patches/001-configure_add_cflags_to_getifaddrs_test.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/configure
-+++ b/configure
-@@ -369,7 +369,7 @@ int main(void) {
- 	return getifaddrs(&ifap);
- }
- EOF
--if $XCC _getifaddrs.c -o _getifaddrs 2>/dev/null; then
-+if $XCC $CFLAGS _getifaddrs.c -o _getifaddrs 2>/dev/null; then
- 	echo "yes"
- else
- 	echo "no"
 

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
 

file:a/net/horst/Makefile (deleted)
--- a/net/horst/Makefile
+++ /dev/null
@@ -1,44 +1,1 @@
-#
-# Copyright (C) 2006 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:=horst
-PKG_VERSION:=3.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://br1.einfach.org/horst_dl/
-PKG_MD5SUM:=076d836733fb6ce53a590eddf92ad358
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/horst
-	SECTION:=net
-	CATEGORY:=Network
-        SUBMENU:=wireless
-	DEPENDS:=+libncurses
-	MAINTAINER:=Bruno Randolf <br1@einfach.org>
-	TITLE:=Highly Optimized 802.11 Radio Scanning Tool
-	URL:=http://br1.einfach.org/horst/
-endef
-
-define Package/horst/description
-	[horst] is a scanning and analysis tool for 802.11 wireless networks
-	and especially IBSS (ad-hoc) mode and mesh networks (OLSR).
-endef
-
-define Package/horst/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/horst $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/horst.sh $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,horst))
-

--- a/net/horst/patches/100-compile-fixes.patch
+++ /dev/null
@@ -1,22 +1,1 @@
---- a/Makefile
-+++ b/Makefile
-@@ -34,9 +34,7 @@ CFLAGS+=-DPCAP
- LIBS+=-lpcap
- endif
- 
--buildstamp=.build_debug$(DEBUG)pcap$(PCAP)
--
--all: $(buildstamp) $(NAME)
-+all: $(NAME)
- 
- # include dependencies
- average.o: average.h util.h
-@@ -73,7 +71,3 @@ clean:
- 	-rm -f *.o *~
- 	-rm -f $(NAME)
- 	-rm -f .build_*
--
--$(buildstamp):
--	make clean
--	touch $@
 

file:a/net/iodine/Makefile (deleted)
--- a/net/iodine/Makefile
+++ /dev/null
@@ -1,70 +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:=iodine
-PKG_VERSION:=0.6.0-rc1
-PKG_RELEASE:=5
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://code.kryo.se/iodine/
-PKG_MD5SUM:=a15bb4faba020d217016fde6e231074a
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/iodine/Default
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Firewall Tunnel
-  DEPENDS:= +kmod-tun +zlib
-  TITLE:=IP over DNS tunneling
-  URL:=http://code.kryo.se/iodine/
-endef
-
-define Package/iodine
-  $(call Package/iodine/Default)
-  TITLE+= client version
-endef
-
-define Package/iodine/description
- iodine client version
-endef
-
-define Package/iodined
-  $(call Package/iodine/Default)
-  TITLE+= server version
-endef
-
-define Package/iodined/description
- iodine server version
-endef
-
-define Build/Configure
-endef
-
-define Package/iodine/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/iodine $(1)/usr/sbin
-endef
-
-define Package/iodined/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/iodined.init $(1)/etc/init.d/iodined
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/iodined.config $(1)/etc/config/iodined
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/iodined $(1)/usr/sbin
-endef
-
-define Package/iodined/conffiles
-/etc/config/iodined
-endef
-
-$(eval $(call BuildPackage,iodine))
-$(eval $(call BuildPackage,iodined))
-

--- a/net/iodine/files/iodined.config
+++ /dev/null
@@ -1,6 +1,1 @@
-config iodined
-        option address     ''
-        option password    ''
-        option tunnelip    '10.0.0.1'
-        option tld     	   ''
 

--- a/net/iodine/files/iodined.init
+++ /dev/null
@@ -1,24 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
 
-START=50
-
-start_instance () {
-	local section="$1"
-	config_get address  "$section" 'address'
-	config_get password "$section" 'password'
-	config_get tunnelip "$section" 'tunnelip'
-	config_get tld      "$section" 'tld'
-	
-	service_start /usr/sbin/iodined -l "$address" -P "$password" "$tunnelip" "$tld"
-}
-
-start() {
-	config_load 'iodined'
-	config_foreach start_instance 'iodined'
-}
-
-stop() {
-	service_stop /usr/sbin/iodined
-}
-

--- a/net/iodine/patches/010-cross-compile.patch
+++ /dev/null
@@ -1,23 +1,1 @@
---- a/src/osflags
-+++ b/src/osflags
-@@ -16,9 +16,6 @@ link)
- 		windows32)
- 			echo '-lws2_32 -liphlpapi';
- 		;;
--		Linux)
--			[ -e /usr/include/selinux/selinux.h ] && echo '-lselinux';
--		;;
- 	esac
- 	;;
- cflags)
-@@ -26,9 +23,6 @@ cflags)
- 		BeOS)
- 			echo '-Dsocklen_t=int';
- 		;;
--		Linux)
--			[ -e /usr/include/selinux/selinux.h ] && echo '-DHAVE_SETCON';
--		;;
- 	esac
- ;;
- *)
 

--- 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/krb5/Makefile (deleted)
--- a/net/krb5/Makefile
+++ /dev/null
@@ -1,129 +1,1 @@
-include $(TOPDIR)/rules.mk
 
-PKG_NAME:=krb5
-PKG_VERSION:=1.11
-PKG_RELEASE:=1
-
-PKG_SOURCE:=krb5-$(PKG_VERSION)-signed.tar
-PKG_SOURCE_URL:=http://web.mit.edu/kerberos/dist/krb5/$(PKG_VERSION)/
-PKG_MD5SUM:=1a13c53899806c4da99a798a04d25545
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-MAKE_PATH:=src
-
-define Package/krb5/Default
-	SECTION:=net
-	CATEGORY:=Network
-	TITLE:=Kerberos
-	URL:=http://web.mit.edu/kerberos/
-	MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-endef
-
-define Package/krb5-libs
-	SECTION:=net
-	CATEGORY:=Network
-	TITLE:=Kerberos
-	DEPENDS:=+libncurses
-	TITLE:=Kerberos 5 Shared Libraries
-	URL:=http://web.mit.edu/kerberos/
-	MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-endef
-
-define Package/krb5-server
-	$(call Package/krb5/Default)
-	DEPENDS:=+krb5-libs +libpthread
-	TITLE:=Kerberos 5 Server
-endef
-
-define Package/krb5-client
-	$(call Package/krb5/Default)
-	DEPENDS:=+krb5-libs
-	TITLE:=Kerberos 5 Client
-endef
-
-define Package/krb5/description
-	Kerberos
-endef
-
-define Build/Prepare
-	# Krb5 tarball contains signature and a second tarball
-	# containing source code.
-	tar xf "$(DL_DIR)/$(PKG_SOURCE)" -C "$(BUILD_DIR)"
-	tar xzf "$(BUILD_DIR)/krb5-$(PKG_VERSION).tar.gz" -C "$(BUILD_DIR)"
-	patch -p1 -d "$(PKG_BUILD_DIR)" < "$(PATCH_DIR)/001-fix-build-warning.patch"
-endef
-
-CONFIGURE_PATH = ./src
-
-CONFIGURE_VARS += \
-	cross_compiling=yes \
-	krb5_cv_attr_constructor_destructor=yes,yes \
-	ac_cv_func_regcomp=yes \
-	ac_cv_printf_positional=yes \
-	ac_cv_file__etc_environment=no \
-	ac_cv_file__etc_TIMEZONE=no
-
-CONFIGURE_ARGS += \
-	--without-tcl \
-	--without-libedit \
-	--localstatedir=/etc
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include \
-		$(1)/usr/include/krb5
-	$(INSTALL_DIR) $(1)/usr
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib \
-		$(1)/usr
-	rm -f $(1)/usr/lib/libcom_err*
-endef
-
-define Package/krb5-libs/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/krb5
-	$(INSTALL_DIR) $(1)/usr/lib/krb5/plugins
-	$(INSTALL_DIR) $(1)/usr/lib/krb5/plugins/kdb
-	$(INSTALL_DIR) $(1)/usr/lib/krb5/plugins/libkrb5
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/krb5/plugins/kdb/db2.so $(1)/usr/lib/krb5/plugins/kdb
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib
-endef
-
-define Package/krb5-client/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/kdestroy $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/kinit $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/klist $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/kpasswd $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ksu $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/kvno $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/krb5-send-pr $(1)/usr/sbin
-endef
-
-# Removed some server-side software to reduce package size. This should be
-# put in a separate package if needed.
-define Package/krb5-server/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/krb5kdc $(1)/etc/init.d/krb5kdc
-#	$(INSTALL_DIR) $(1)/usr/bin
-#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sclient $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kadmin.local $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kadmind $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kdb5_util $(1)/usr/sbin
-#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kprop $(1)/usr/sbin
-#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kpropd $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/krb5kdc $(1)/usr/sbin
-#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/sim_server $(1)/usr/sbin
-endef
-
-$(eval $(call BuildPackage,krb5-libs))
-$(eval $(call BuildPackage,krb5-server))
-$(eval $(call BuildPackage,krb5-client))
-

file:a/net/krb5/files/krb5kdc (deleted)
--- a/net/krb5/files/krb5kdc
+++ /dev/null
@@ -1,20 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009 OpenWrt.org
 
-START=60
-
-start() {
-	mkdir -p /var/tmp
-	mkdir -p /etc/krb5kdc
-	
-	[ -f /etc/krb5kdc/principal ] || ( echo; echo ) | kdb5_util create -s
-	
-	/usr/sbin/krb5kdc
-	/usr/sbin/kadmind
-}
-
-stop() {
-	killall krb5kdc 2> /dev/null
-	killall kadmind 2> /dev/null
-}
-

--- a/net/krb5/patches/001-fix-build-warning.patch
+++ /dev/null
@@ -1,13 +1,1 @@
-diff -ur krb5-1.11-vanilla/src/lib/krb5/krb/preauth2.c krb5-1.11/src/lib/krb5/krb/preauth2.c
---- krb5-1.11-vanilla/src/lib/krb5/krb/preauth2.c	2012-12-18 03:47:05.000000000 +0100
-+++ krb5-1.11/src/lib/krb5/krb/preauth2.c	2013-02-18 03:53:20.580840173 +0100
-@@ -956,7 +956,7 @@
-     size_t i, h;
-     int out_pa_list_size = 0;
-     krb5_pa_data **out_pa_list = NULL;
--    krb5_error_code ret, module_ret;
-+    krb5_error_code ret, module_ret = 0;
-     krb5_responder_fn responder = opte->opt_private->responder;
-     static const int paorder[] = { PA_INFO, PA_REAL };
- 
 

--- /dev/null
+++ b/net/l2tpv3tun/Makefile
@@ -1,1 +1,51 @@
+#
+# Copyright (C) 2009-2010 Thomas Heil <heil@terminal-consulting.de>
+# Copyright (C) 2010-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:=l2tpv3tun
+PKG_VERSION:=0.2
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=ftp://www.openl2tp.org/releases
+PKG_MD5SUM:=d3b4a9af652cca9f34d3eea4a7ff6041
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/l2tpv3tun
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libnl-tiny +ip +kmod-l2tp +kmod-l2tp-ip +kmod-l2tp-eth
+  TITLE:=Control utility for static L2TP v3 (Pseudowire) tunnels
+  MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
+  URL:=http://www.openl2tp.org
+endef
+
+define Package/l2tpv3tun/description
+  The l2tpv3tun utility is a command line frontend for configuring static
+  L2TP v3 pseudowire tunnels.
+endef
+
+MAKE_FLAGS += \
+	CC="$(TARGET_CC)" \
+	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/libnl-tiny/" \
+	LD="$(TARGET_CC)" \
+	LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/ -lnl-tiny"
+
+define Package/l2tpv3tun/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/l2tpv3tun $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/lib/network
+	$(INSTALL_BIN) ./files/l2tp.sh $(1)/lib/network/
+endef
+
+$(eval $(call BuildPackage,l2tpv3tun))
+

--- /dev/null
+++ b/net/l2tpv3tun/files/l2tp.sh
@@ -1,1 +1,214 @@
-
+# l2tp.sh - L2TPv3 tunnel backend
+# Copyright (c) 2010 OpenWrt.org
+
+l2tp_next_tunnel_id() {
+	local max=0
+	local val
+	for val in $(
+		local l
+		l2tpv3tun show tunnel | while read l; do
+			case "$l" in
+				Tunnel*,*encap*) l="${l#Tunnel }"; echo "${l%%,*}";;
+			esac
+		done
+	); do
+		[ "$val" -gt "$max" ] && max="$val"
+	done
+	echo $((max + 1))
+}
+
+l2tp_next_session_id() {
+	local tunnel="$1"
+	local max=0
+	local val
+	for val in $(
+		local l
+		l2tpv3tun show session${tunnel:+ tunnel_id "$tunnel"} | while read l; do
+			case "$l" in
+				Session*in*) l="${l#Session }"; echo "${l%% *}";;
+			esac
+		done
+	); do
+		[ "$val" -gt "$max" ] && max="$val"
+	done
+	echo $((max + 1))
+}
+
+l2tp_tunnel_exists() {
+	test -n "$(l2tpv3tun show tunnel tunnel_id "$1" 2>/dev/null)"
+}
+
+l2tp_session_exists() {
+	test -n "$(l2tpv3tun show session tunnel_id "$1" session_id "$2" 2>/dev/null)"
+}
+
+l2tp_ifname() {
+	l2tpv3tun show session tunnel_id "$1" session_id "$2" 2>/dev/null | \
+		sed -ne 's/^.*interface name: //p'
+}
+
+l2tp_lock() {
+	lock /var/lock/l2tp-setup
+}
+
+l2tp_unlock() {
+	lock -u /var/lock/l2tp-setup
+}
+
+l2tp_log() {
+	logger -t "ifup-l2tp" "$@"
+}
+
+
+# Hook into scan_interfaces() to synthesize a .device option
+# This is needed for /sbin/ifup to properly dispatch control
+# to setup_interface_l2tp() even if no .ifname is set in
+# the configuration.
+scan_l2tp() {
+	local dev
+	config_get dev "$1" device
+	config_set "$1" device "${dev:+$dev }l2tp-$1"
+}
+
+coldplug_interface_l2tp() {
+	setup_interface_l2tp "l2tp-$1" "$1"
+}
+
+setup_interface_l2tp() {
+	local iface="$1"
+	local cfg="$2"
+	local link="l2tp-$cfg"
+
+	l2tp_lock
+
+	# prevent recursion
+	local up="$(uci_get_state network "$cfg" up 0)"
+	[ "$up" = 0 ] || {
+		l2tp_unlock
+		return 0
+	}
+
+	local tunnel_id
+	config_get tunnel_id "$cfg" tunnel_id
+	[ -n "$tunnel_id" ] || {
+		tunnel_id="$(l2tp_next_tunnel_id)"
+		uci_set_state network "$cfg" tunnel_id "$tunnel_id"
+		l2tp_log "No tunnel ID specified, assuming $tunnel_id"
+	}
+
+	local peer_tunnel_id
+	config_get peer_tunnel_id "$cfg" peer_tunnel_id
+	[ -n "$peer_tunnel_id" ] || {
+		peer_tunnel_id="$tunnel_id"
+		uci_set_state network "$cfg" peer_tunnel_id "$peer_tunnel_id"
+		l2tp_log "No peer tunnel ID specified, assuming $peer_tunnel_id"
+	}
+
+	local encap
+	config_get encap "$cfg" encap udp
+
+	local sport dport
+	[ "$encap" = udp ] && {
+		config_get sport "$cfg" sport 1701
+		config_get dport "$cfg" dport 1701
+	}
+
+	local peeraddr
+	config_get peeraddr "$cfg" peeraddr
+	[ -z "$peeraddr" ] && config_get peeraddr "$cfg" peer6addr
+
+	local localaddr
+	case "$peeraddr" in
+		*:*) config_get localaddr "$cfg" local6addr ;;
+		*)   config_get localaddr "$cfg" localaddr  ;;
+	esac
+
+	[ -n "$localaddr" -a -n "$peeraddr" ] || {
+		l2tp_log "Missing local or peer address for tunnel $cfg - skipping"
+		return 1
+	}
+
+	(
+		while ! l2tp_tunnel_exists "$tunnel_id"; do
+			[ -n "$sport" ] && l2tpv3tun show tunnel 2>/dev/null | grep -q "ports: $sport/" && {
+				l2tp_log "There already is a tunnel with src port $sport - skipping"
+				l2tp_unlock
+				return 1
+			}
+
+			l2tpv3tun add tunnel tunnel_id "$tunnel_id" peer_tunnel_id "$peer_tunnel_id" \
+				encap "$encap" local "$localaddr" remote "$peeraddr" \
+				${sport:+udp_sport "$sport"} ${dport:+udp_dport "$dport"}
+
+			# Wait for tunnel
+			sleep 1
+		done
+
+
+		local session_id
+		config_get session_id "$cfg" session_id
+		[ -n "$session_id" ] || {
+			session_id="$(l2tp_next_session_id "$tunnel_id")"
+			uci_set_state network "$cfg" session_id "$session_id"
+			l2tp_log "No session ID specified, assuming $session_id"
+		}
+
+		local peer_session_id
+		config_get peer_session_id "$cfg" peer_session_id
+		[ -n "$peer_session_id" ] || {
+			peer_session_id="$session_id"
+			uci_set_state network "$cfg" peer_session_id "$peer_session_id"
+			l2tp_log "No peer session ID specified, assuming $peer_session_id"
+		}
+
+
+		while ! l2tp_session_exists "$tunnel_id" "$session_id"; do
+			l2tpv3tun add session ifname "$link" tunnel_id "$tunnel_id" \
+				session_id "$session_id" peer_session_id "$peer_session_id"
+
+			# Wait for session
+			sleep 1
+		done
+
+
+		local dev
+		config_get dev "$cfg" device
+
+		local ifn
+		config_get ifn "$cfg" ifname
+
+		uci_set_state network "$cfg" ifname "${ifn:-$dev}"
+		uci_set_state network "$cfg" device "$dev"
+
+		local mtu
+		config_get mtu "$cfg" mtu 1462
+
+		local ttl
+		config_get ttl "$cfg" ttl
+
+		ip link set mtu "$mtu" ${ttl:+ ttl "$ttl"} dev "$link"
+
+		# IP setup inherited from proto static
+		prepare_interface "$link" "$cfg"
+		setup_interface_static "${ifn:-$dev}" "$cfg"
+
+		ip link set up dev "$link"
+
+		uci_set_state network "$cfg" up 1
+		l2tp_unlock
+	) &
+}
+
+stop_interface_l2tp() {
+	local cfg="$1"
+	local link="l2tp-$cfg"
+
+	local tunnel=$(uci_get_state network "$cfg" tunnel_id)
+	local session=$(uci_get_state network "$cfg" session_id)
+
+	[ -n "$tunnel" ] && [ -n "$session" ] && {
+		l2tpv3tun del session tunnel_id "$tunnel" session_id "$session"
+		l2tpv3tun del tunnel tunnel_id "$tunnel"
+	}
+}
+

--- /dev/null
+++ b/net/l2tpv3tun/patches/010-custom_ifname.patch
@@ -1,1 +1,21 @@
+--- a/main.c
++++ b/main.c
+@@ -560,6 +560,7 @@ static void usage(void)
+ 	fprintf(stderr, "          session_id ID peer_session_id ID\n");
+ 	fprintf(stderr, "          [ cookie HEXSTR ] [ peer_cookie HEXSTR ]\n");
+ 	fprintf(stderr, "          [ offset OFFSET ] [ peer_offset OFFSET ]\n");
++	fprintf(stderr, "          [ ifname IFNAME ]\n");
+ 	fprintf(stderr, "       %s del tunnel tunnel_id ID\n", L2TP_CMD_ROOT);
+ 	fprintf(stderr, "       %s del session tunnel_id ID session_id ID\n", L2TP_CMD_ROOT);
+ 	fprintf(stderr, "       %s show tunnel [ tunnel_id ID ]\n", L2TP_CMD_ROOT);
+@@ -671,6 +672,9 @@ static int parse_args(int argc, char **a
+ 			p->peer_cookie_len = slen / 2;
+ 			if (hex2mem(*argv, p->peer_cookie, p->peer_cookie_len) < 0)
+ 				invarg("cookie must be a hex string\n", *argv);
++		} else if (strcmp(*argv, "ifname") == 0) {
++			NEXT_ARG();
++			p->ifname = *argv;
+ 		} else if (strcmp(*argv, "tunnel") == 0) {
+ 			p->tunnel = 1;
+ 		} else if (strcmp(*argv, "session") == 0) {
 

--- /dev/null
+++ b/net/l2tpv3tun/patches/100-nl_handle_alloc.patch
@@ -1,1 +1,24 @@
+--- a/main.c
++++ b/main.c
+@@ -100,7 +100,7 @@ struct l2tp_data {
+ };
+ 
+ /* netlink socket */
+-static struct nl_handle *nl_sock;
++static struct nl_sock *nl_sock;
+ static int nl_family;
+ 
+ /*****************************************************************************
+@@ -788,9 +788,9 @@ static int do_show(int argc, char **argv
+ 
+ int do_ipl2tp(int argc, char **argv)
+ {
+-	nl_sock = nl_handle_alloc();
++	nl_sock = nl_socket_alloc();
+ 	if (!nl_sock) {
+-		perror("nl_handle_alloc");
++		perror("nl_socket_alloc");
+ 		return 1;
+ 	}
+ 
 

file:a/net/lighttpd/Makefile (deleted)
--- a/net/lighttpd/Makefile
+++ /dev/null
@@ -1,181 +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
-
-PKG_NAME:=lighttpd
-PKG_VERSION:=1.4.35
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://download.lighttpd.net/lighttpd/releases-1.4.x
-PKG_MD5SUM:=c7ae774eab4cb7ac85e41b712f4ee9ba
-
-PKG_LICENSE:=BSD-3c
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/lighttpd/Default
-  SUBMENU:=Web Servers/Proxies
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=http://www.lighttpd.net/
-endef
-
-define Package/lighttpd
-  $(call Package/lighttpd/Default)
-  MENU:=1
-  DEPENDS:=+LIGHTTPD_SSL:libopenssl +libpcre +libpthread
-  TITLE:=A flexible and lightweight web server
-endef
-
-define Package/lighttpd/config
-config LIGHTTPD_SSL
-	bool "SSL support"
-	depends on PACKAGE_lighttpd
-	default y
-	help
-	  Implements SSL support in lighttpd (using libopenssl). This
-	  option is required if you enable the SSL engine in your
-	  lighttpd confguration file.
-endef
-
-CONFIGURE_ARGS+= \
-	--libdir=/usr/lib/lighttpd \
-	--sysconfdir=/etc/lighttpd \
-	--enable-shared \
-	--enable-static \
-	--disable-rpath \
-	--without-attr \
-	--without-bzip2 \
-	--without-fam \
-	--without-gdbm \
-	--without-ldap \
-	--without-lua \
-	--without-memcache \
-	--with-pcre \
-	--without-valgrind \
-	 $(call autoconf_bool,CONFIG_IPV6,ipv6)
-
-CONFIGURE_VARS+= \
-	PCRE_LIB="-lpcre" \
-
-ifneq ($(strip $(CONFIG_LIGHTTPD_SSL)),)
-  CONFIGURE_ARGS+= \
-	--with-openssl="$(STAGING_DIR)/usr"
-else
-  CONFIGURE_ARGS+= \
-	--without-openssl
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_lighttpd-mod-mysql-vhost),)
-  CONFIGURE_ARGS+= \
-	--with-mysql
-else
-  CONFIGURE_ARGS+= \
-	--without-mysql
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_lighttpd-mod-webdav),)
-  CONFIGURE_ARGS+= \
-	--with-webdav-locks \
-	--with-webdav-props
-  # XXX: needed by sqlite3 to prevent segfaults in mod_webdav.so
-  CONFIGURE_VARS+= \
-	LIBS="-lpthread"
-else
-  CONFIGURE_ARGS+= \
-	--without-webdav-locks \
-	--without-webdav-props
-endif
-
-define Build/Configure
-$(call Build/Configure/Default)
-	# XXX: override pcre (mis)detection by ./configure when cross-compiling
-	echo "#define HAVE_LIBPCRE 1" >>$(PKG_BUILD_DIR)/config.h
-	echo "#define HAVE_PCRE_H 1" >>$(PKG_BUILD_DIR)/config.h
-endef
-
-define Package/lighttpd/conffiles
-/etc/lighttpd/lighttpd.conf
-endef
-
-define Package/lighttpd/install
-	$(INSTALL_DIR) $(1)/etc/lighttpd
-	$(INSTALL_DATA) ./files/lighttpd.conf $(1)/etc/lighttpd/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/config/conf.d/mime.conf $(1)/etc/lighttpd/
-	$(INSTALL_DIR) $(1)/etc/lighttpd/conf.d
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/lighttpd.init $(1)/etc/init.d/lighttpd
-	$(INSTALL_DIR) $(1)/usr/lib/lighttpd
-	for m in dirlisting indexfile staticfile; do \
-		$(CP) $(PKG_INSTALL_DIR)/usr/lib/lighttpd/mod_$$$${m}.so $(1)/usr/lib/lighttpd/ ; \
-	done
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/lighttpd $(1)/usr/sbin/
-endef
-
-define BuildPlugin
-  define Package/lighttpd-mod-$(1)
-    $(call Package/lighttpd/Default)
-    DEPENDS:=lighttpd
-    ifneq ($(3),)
-      DEPENDS+= $(3)
-    endif
-    TITLE:=$(2) module
-  endef
-
-  define Package/lighttpd-mod-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/lighttpd
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lighttpd/mod_$(1).so $$(1)/usr/lib/lighttpd
-	$(INSTALL_DIR) $$(1)/etc/lighttpd/conf.d
-	if [ -f $(PKG_BUILD_DIR)/doc/config/conf.d/$(1).conf ]; then \
-		$(CP) $(PKG_BUILD_DIR)/doc/config/conf.d/$(1).conf $$(1)/etc/lighttpd/conf.d/$(4)-$(1).conf ; \
-	else \
-		echo 'server.modules += ( "mod_$(1)" )' > $$(1)/etc/lighttpd/conf.d/$(4)-$(1).conf ; \
-	fi
-  endef
-
-  $$(eval $$(call BuildPackage,lighttpd-mod-$(1)))
-endef
-
-$(eval $(call BuildPackage,lighttpd))
-$(eval $(call BuildPlugin,access,Access restrictions,,10))
-$(eval $(call BuildPlugin,accesslog,Access logging,,10))
-$(eval $(call BuildPlugin,alias,Directory alias,,10))
-$(eval $(call BuildPlugin,auth,Authentication,,05))
-$(eval $(call BuildPlugin,cgi,CGI,,10))
-$(eval $(call BuildPlugin,cml,Cache Meta Language,,10))
-$(eval $(call BuildPlugin,compress,Compress output,+PACKAGE_lighttpd-mod-compress:zlib,10))
-$(eval $(call BuildPlugin,evasive,Evasive,,10))
-$(eval $(call BuildPlugin,evhost,Exnhanced Virtual-Hosting,,10))
-$(eval $(call BuildPlugin,expire,Expire,,10))
-$(eval $(call BuildPlugin,extforward,Extract client,,10))
-$(eval $(call BuildPlugin,fastcgi,FastCGI,,10))
-$(eval $(call BuildPlugin,flv_streaming,FLV streaming,,10))
-$(eval $(call BuildPlugin,magnet,Magnet,,10))
-$(eval $(call BuildPlugin,mysql_vhost,Mysql virtual hosting,+PACKAGE_lighttpd-mod-mysql_vhost:libmysqlclient,10))
-$(eval $(call BuildPlugin,proxy,Proxy,,10))
-$(eval $(call BuildPlugin,redirect,URL redirection,+PACKAGE_lighttpd-mod-redirect:libpcre,10))
-$(eval $(call BuildPlugin,rewrite,URL rewriting,+PACKAGE_lighttpd-mod-rewrite:libpcre,10))
-$(eval $(call BuildPlugin,rrdtool,RRDtool,,10))
-$(eval $(call BuildPlugin,scgi,SCGI,,10))
-$(eval $(call BuildPlugin,secdownload,Secure and fast download,,10))
-$(eval $(call BuildPlugin,setenv,Environment variable setting,,10))
-$(eval $(call BuildPlugin,simple_vhost,Simple virtual hosting,,10))
-$(eval $(call BuildPlugin,ssi,SSI,+libpcre,10))
-$(eval $(call BuildPlugin,status,Server status display,,10))
-$(eval $(call BuildPlugin,trigger_b4_dl,Trigger before download,+PACKAGE_lighttpd-mod-trigger_b4_dl:libpcre,10))
-$(eval $(call BuildPlugin,userdir,User directory,,10))
-$(eval $(call BuildPlugin,usertrack,User tracking,,10))
-$(eval $(call BuildPlugin,webdav,WebDAV,+PACKAGE_lighttpd-mod-webdav:libsqlite3 +PACKAGE_lighttpd-mod-webdav:libuuid +PACKAGE_lighttpd-mod-webdav:libxml2,10))
-
-

--- a/net/lighttpd/files/lighttpd.conf
+++ /dev/null
@@ -1,39 +1,1 @@
-# lighttpd configuration file
-# 
-server.modules = (
-)
 
-### only root can use these options
-#server.chroot               = "/"
-
-######### Options that are good to be but not neccesary to be changed #######
-#server.port                 = 81
-#server.bind                 = "localhost"
-server.document-root        = "/www"
-server.upload-dirs          = ( "/tmp" )
-server.errorlog             = "/var/log/lighttpd/error.log"
-server.pid-file             = "/var/run/lighttpd.pid"
-#server.username             = "www-data"
-#server.groupname            = "www-data"
-#server.tag                  = "lighttpd"
-#server.errorlog-use-syslog  = "enable"
-#server.network-backend      = "write"
-
-index-file.names            = ( "index.php", "index.html",
-                                "index.htm", "default.htm",
-                               " index.lighttpd.html" )
-
-static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
-
-## Use ipv6 if available
-#include_shell "/usr/share/lighttpd/use-ipv6.pl"
-
-#dir-listing.encoding        = "utf-8"
-#server.dir-listing          = "enable"
-
-include       "/etc/lighttpd/mime.conf"
-include_shell "cat /etc/lighttpd/conf.d/*.conf"
-
-
-
-

--- a/net/lighttpd/files/lighttpd.init
+++ /dev/null
@@ -1,17 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
 
-SERVICE_USE_PID=1
-
-START=50
-
-start() {
-	mkdir -m 0755 -p /var/log/lighttpd
-	service_start /usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf
-}
-
-stop() {
-	service_stop /usr/sbin/lighttpd
-}
-
-

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/netatalk/Makefile (deleted)
--- a/net/netatalk/Makefile
+++ /dev/null
@@ -1,86 +1,1 @@
-#
-# Copyright (C) 2009-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:=netatalk
-PKG_VERSION:=2.2.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/netatalk
-PKG_MD5SUM:=40753a32340c24e4ec395aeb55ef056e
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/netatalk
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Filesystem
-  DEPENDS:=+libdb47 +libgcrypt +libopenssl $(LIBRPC_DEPENDS)
-  TITLE:=netatalk
-  URL:=http://netatalk.sourceforge.net
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-endef
-
-define Package/netatalk/decription
-  Netatalk is a freely-available Open Source AFP fileserver.
-  It also provides a kernel level implementation of the AppleTalk
-  Protocol Suite.
-endef
-
-define Package/netatalk/conffiles
-/etc/netatalk/afpd.conf
-endef
-
-TARGET_CFLAGS += -std=gnu99
-TARGET_LDFLAGS += $(LIBRPC)
-
-CONFIGURE_ARGS += \
-	--disable-afs \
-	--enable-hfs \
-	--disable-debugging \
-	--disable-shell-check \
-	--disable-timelord \
-	--disable-a2boot \
-	--disable-cups \
-	--disable-tcp-wrappers \
-	--with-cnid-default-backend=dbd \
-	--with-bdb="$(STAGING_DIR)/usr/" \
-	--with-libgcrypt-dir="$(STAGING_DIR)/usr" \
-	--with-ssl-dir="$(STAGING_DIR)/usr" \
-	--with-uams-path="/usr/lib/uams" \
-	--without-pam \
-	--disable-admin-group \
-	--disable-srvloc \
-	--disable-zeroconf \
-	$(if $(CONFIG_SHADOW_PASSWORDS),--with-shadow,--without-shadow) \
-	--without-ldap
-
-define Package/netatalk/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/usr/lib/uams
-	$(INSTALL_DIR) $(1)/etc/netatalk
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/afppasswd $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/afpd $(1)/usr/sbin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/cnid_dbd $(1)/usr/sbin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/cnid_metad $(1)/usr/sbin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/uams/*.so $(1)/usr/lib/uams/
-	$(CP) ./files/AppleVolumes.default $(1)/etc/netatalk/
-	$(CP) $(PKG_INSTALL_DIR)/etc/netatalk/AppleVolumes.system $(1)/etc/netatalk/
-	$(INSTALL_CONF) ./files/afpd.conf $(1)/etc/netatalk/
-	$(INSTALL_BIN) ./files/afpd.init $(1)/etc/init.d/afpd
-endef
-
-$(eval $(call BuildPackage,netatalk))
-

--- a/net/netatalk/files/AppleVolumes.default
+++ /dev/null
@@ -1,3 +1,1 @@
--
-/tmp Temp allow:root,nobody cnidscheme:dbd
 

--- a/net/netatalk/files/afpd.conf
+++ /dev/null
@@ -1,2 +1,1 @@
-- -noddp -uampath /usr/lib/uams -uamlist uams_guest.so,uams_passwd.so,uams_dhx_passwd.so,uams_randnum.so,uams_dhx2.so -passwdfile /etc/netatalk/afppasswd -savepassword -passwdminlen 0 -nosetpassword -defaultvol /etc/netatalk/AppleVolumes.default -systemvol /etc/netatalk/AppleVolumes.system -nouservol -guestname "nobody" -sleep 1 -icon
 

--- a/net/netatalk/files/afpd.init
+++ /dev/null
@@ -1,24 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2010-2012 OpenWrt.org
 
-START=70
-
-MAXCONS="7"
-
-start()
-{
-	service_start /usr/sbin/cnid_metad
-	service_start /usr/sbin/afpd -c ${MAXCONS}
-}
-
-stop()
-{
-	service_stop /usr/sbin/afpd
-	service_stop /usr/sbin/cnid_metad
-}
-
-reload()
-{
-	service_reload /usr/sbin/afpd
-}
-

--- a/net/netatalk/patches/001-automake-compat.patch
+++ /dev/null
@@ -1,10 +1,1 @@
---- a/macros/iconv.m4
-+++ b/macros/iconv.m4
-@@ -114,6 +114,5 @@ int main() {
- 
-         CFLAGS="$savedcflags"
-         LDFLAGS="$savedldflags"
--	CPPFLAGS="$saved_CPPFLAGS"
- 	
- ])
 

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/p910nd/Makefile (deleted)
--- a/net/p910nd/Makefile
+++ /dev/null
@@ -1,57 +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:=p910nd
-PKG_VERSION:=0.95
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/p910nd
-PKG_MD5SUM:=c7ac6afdf7730ac8387a8e87198d4491
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/p910nd
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Printing
-  TITLE:=A small non-spooling printer server
-  URL:=http://p910nd.sourceforge.net
-endef
-
-define Package/p910nd/conffiles
-/etc/config/p910nd
-endef
-
-define Package/p910nd/description
- p910nd is a small daemon that copies any data received on
- the port it is listening on to the corresponding printer
- port. It is primarily intended for diskless Linux hosts
- running as printer drivers but there is no reason why it
- could not be used on diskful hosts. Port 9100 is copied
- to /dev/lp0, 9101 to /dev/lp1 and 9102 to /dev/lp2. The
- default is port 9100 to /dev/lp0.
-endef
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -DLOCKFILE_DIR=\"\\\"/tmp\"\\\""
-
-define Package/p910nd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/p910nd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/p910nd.config $(1)/etc/config/p910nd
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/p910nd.init $(1)/etc/init.d/p910nd
-endef
-
-$(eval $(call BuildPackage,p910nd))
-

--- a/net/p910nd/files/p910nd.config
+++ /dev/null
@@ -1,6 +1,1 @@
-config p910nd
-	option device        /dev/usb/lp0
-	option port          0
-	option bidirectional 1
-	option enabled       0
 

--- a/net/p910nd/files/p910nd.init
+++ /dev/null
@@ -1,52 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2007 OpenWrt.org
-START=50
 
-append_bool() {
-	local section="$1"
-	local option="$2"
-	local value="$3"
-	local _val
-	config_get_bool _val "$section" "$option" '0'
-	[ "$_val" -gt 0 ] && append args "$3"
-}
-
-append_string() {
-	local section="$1"
-	local option="$2"
-	local value="$3"
-	local _val
-	config_get _val "$section" "$option"
-	[ -n "$_val" ] && append args "$3$_val"
-}
-
-start_service() {
-	local section="$1"
-	args=""
-
-	append_bool "$section" bidirectional "-b"
-	append_string "$section" device "-f "
-	append_string "$section" bind "-i "
-	append_string "$section" port ""
-	config_get_bool "enabled" "$section" "enabled" '1'
-	[ "$enabled" -gt 0 ] && /usr/sbin/p910nd $args
-}
-
-stop_service() {
-	local section="$1"
-	config_get port "$section" port
-
-	PID_F=/var/run/p910${port}d.pid
-	[ -f $PID_F ] && kill $(cat $PID_F)
-}
-
-start() {
-	config_load "p910nd"
-	config_foreach start_service p910nd
-}
-
-stop() {
-	config_load "p910nd"
-	config_foreach stop_service p910nd
-}
-

file:a/net/prosody/Makefile (deleted)
--- a/net/prosody/Makefile
+++ /dev/null
@@ -1,88 +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:=prosody
-PKG_VERSION:=0.6.2
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://prosody.im/downloads/source
-PKG_MD5SUM:=5da59bc906419ad3b4faa21516a6ca18
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/prosody
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Instant Messaging
-  DEPENDS:=+luafilesystem +libidn +luaexpat +luasec
-  TITLE:=XMPP server
-  URL:=http://prosody.im/
-endef
-
-define Package/prosody/description
-  Prosody is an exciting new server for Jabber/XMPP
-  written in Lua. It aims to be easy to use, and light
-  on resources
-endef
-
-define Package/prosody/conffiles
-/etc/prosody/prosody.cfg.lua
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Configure
-	# this is *NOT* GNU autoconf stuff
-	(cd $(PKG_BUILD_DIR); ./configure \
-		--prefix=/usr \
-		--with-lua="$(STAGING_DIR)/host/bin" \
-		--with-lua-include="$(STAGING_DIR)/usr/include" \
-		--with-lua-lib="$(STAGING_DIR)/usr/lib" \
-		--cflags="$(TARGET_CFLAGS)" \
-		--datadir="/etc/prosody/data" \
-	)
-endef
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -std=gnu99" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	PREFIX="/usr" \
-
-define Package/prosody/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/prosody.init $(1)/etc/init.d/prosody
-	$(INSTALL_DIR) $(1)/etc/prosody
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/prosody/prosody.cfg.lua $(1)/etc/prosody/
-	$(INSTALL_DIR) $(1)/etc/prosody/certs
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/prosody/certs/localhost.{cert,key} $(1)/etc/prosody/certs/
-	$(INSTALL_DIR) $(1)/etc/prosody/data
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/prosody{,ctl} $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/prosody
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/prosody/prosody.version $(1)/usr/lib/prosody/
-	$(INSTALL_DIR) $(1)/usr/lib/prosody/core
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/core/*.lua $(1)/usr/lib/prosody/core/
-	$(INSTALL_DIR) $(1)/usr/lib/prosody/fallbacks
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/fallbacks/*.lua $(1)/usr/lib/prosody/fallbacks/
-	$(INSTALL_DIR) $(1)/usr/lib/prosody/modules
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/modules/*.lua $(1)/usr/lib/prosody/modules/
-	$(INSTALL_DIR) $(1)/usr/lib/prosody/modules/muc
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/modules/muc/*.lua $(1)/usr/lib/prosody/modules/muc/
-	$(INSTALL_DIR) $(1)/usr/lib/prosody/net
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/net/*.lua $(1)/usr/lib/prosody/net/
-	$(INSTALL_DIR) $(1)/usr/lib/prosody/util
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/util/*.lua $(1)/usr/lib/prosody/util/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/prosody/util/*.so $(1)/usr/lib/prosody/util/
-endef
-
-$(eval $(call BuildPackage,prosody))
-

--- a/net/prosody/files/prosody.init
+++ /dev/null
@@ -1,42 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2010-2011 OpenWrt.org
 
-START=99
-
-EXTRA_COMMANDS="status"
-EXTRA_HELP="	status	Print the status of the service"
-
-BIN=/usr/bin/prosodyctl
-LOG_D=/var/log/prosody
-RUN_D=/var/run/prosody
-PID_F=$RUN_D/prosody.pid
-RUN_USER=prosody
-RUN_GROUP=prosody
-
-start() {
-	user_exists prosody 54 || user_add prosody 54
-	group_exists prosody 54 || group_add prosody 54
-	[ -d /var/run/prosody ] || {
-		mkdir -m 0755 -p /var/run/prosody
-		chown prosody:prosody /var/run/prosody
-	}
-	[ -d /var/log/prosody ] || {
-		mkdir -m 0755 -p /var/log/prosody
-		chown prosody:prosody /var/log/prosody
-	}
-
-	$BIN start
-}
-
-stop() {
-	$BIN stop
-}
-
-reload() {
-	[ -f $PID_F ] && kill -HUP $(cat $PID_F)
-}
-
-status() {
-	$BIN status
-}
-

--- a/net/prosody/patches/001-conf.patch
+++ /dev/null
@@ -1,38 +1,1 @@
---- a/prosody.cfg.lua.dist
-+++ b/prosody.cfg.lua.dist
-@@ -47,7 +47,7 @@ modules_enabled = {
- 		"register"; -- Allow users to register on this server using a client and change passwords
- 	
- 	-- Other specific functionality
--		--"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
-+		"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
- 		--"console"; -- Opens admin telnet interface on localhost port 5582
- 		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
- 		--"httpserver"; -- Serve static files from a directory over HTTP
-@@ -65,6 +65,9 @@ modules_disabled = {
- -- Disable account creation by default, for security
- -- For more information see http://prosody.im/doc/creating_accounts
- allow_registration = false;
-+
-+-- File to write pid in
-+pidfile = "/var/run/prosody/prosody.pid";
- 	
- -- These are the SSL/TLS-related settings. If you don't want
- -- to use SSL/TLS, you may comment or remove this
-@@ -73,6 +76,15 @@ ssl = {
- 	certificate = "certs/localhost.cert";
- }
- 
-+-- Errors to syslog
-+-- All to /var/log/prosody/
-+log = {
-+	{ levels = { "error" }; to = "syslog";  };
-+	{ levels = { "error" }; to = "file"; filename = "/var/log/prosody/prosody.err";  };
-+	-- Change "info" to "debug" for more verbose logging
-+	{ levels = { min = "info" }; to = "file"; filename = "/var/log/prosody/prosody.log";  };
-+}
-+
- ----------- Virtual hosts -----------
- -- You need to add a VirtualHost entry for each domain you wish Prosody to serve.
- -- Settings under each VirtualHost entry apply *only* to that host.
 

--- a/net/radsecproxy/Makefile
+++ /dev/null
@@ -1,57 +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:=radsecproxy
-PKG_VERSION:=1.6.5
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://software.uninett.no/radsecproxy/
-PKG_MD5SUM:=f74f82a7ae2cdf2b1d9d271a5c360617
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/radsecproxy
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libopenssl +libpthread
-  TITLE:=radsecproxy
-  URL:=http://software.uninett.no/radsecproxy
-endef
-
-define Package/radsecproxy/description
-  A generic radius proxy for UDP/TLS (RadSec)
-endef
-
-CONFIGURE_ARGS+= \
-	--with-ssl="$(STAGING_DIR)/usr"
-
-#TARGET_CFLAGS += -ansi
-#TARGET_CFLAGS += -std=c99
-TARGET_CFLAGS += -Wno-long-long
-
-
-define Package/radsecproxy/install
-	$(INSTALL_DIR) $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radsecproxy $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/
-	$(CP) $(PKG_BUILD_DIR)/radsecproxy.conf-example $(1)/etc/radsecproxy.conf
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) ./files/radsecproxy.init $(1)/etc/init.d/radsecproxy
-endef
-
-define Package/radsecproxy/conffiles
-/etc/radsecproxy.conf
-endef
-
-$(eval $(call BuildPackage,radsecproxy))
-
-

--- a/net/radsecproxy/files/radsecproxy.init
+++ /dev/null
@@ -1,17 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
 
-START=70
-
-USE_PROCD=1
-PROG=/usr/sbin/radsecproxy
-CONFFILE=/etc/radsecproxy.conf
-
-start_service() {
-	procd_open_instance
-	procd_set_param command $PROG -f -c $CONFFILE
-	procd_set_param file $CONFFILE
-	procd_set_param respawn
-	procd_close_instance
-}
-

--- a/net/radsecproxy/patches/100-missing-return.patch
+++ /dev/null
@@ -1,59 +1,1 @@
---- a/dtls.c
-+++ b/dtls.c
-@@ -523,6 +523,7 @@ void *udpdtlsserverrd(void *arg) {
- 	free(params);
- 	cacheexpire(sessioncache, &lastexpiry);
-     }
-+    return NULL;
- }
- 
- int dtlsconnect(struct server *server, struct timeval *when, int timeout, char *text) {
-@@ -642,6 +643,7 @@ void *udpdtlsclientrd(void *arg) {
- 	if (udp2bio(s, conf->servers->rbios, cnt))
- 	    debug(DBG_DBG, "radudpget: got DTLS in UDP from %s", addr2string((struct sockaddr *)&from));
-     }
-+    return NULL;
- }
- 
- void *dtlsclientrd(void *arg) {
---- a/radsecproxy.c
-+++ b/radsecproxy.c
-@@ -3203,6 +3203,8 @@ void *sighandler(void *arg) {
-             debug(DBG_WARN, "sighandler: ignoring signal %d", sig);
-         }
-     }
-+
-+    return NULL;
- }
- 
- int createpidfile(const char *pidfile) {
-@@ -3289,6 +3291,8 @@ int radsecproxy_main(int argc, char **ar
-     /* just hang around doing nothing, anything to do here? */
-     for (;;)
- 	sleep(1000);
-+
-+    return 0;
- }
- 
- /* Local Variables: */
---- a/udp.c
-+++ b/udp.c
-@@ -266,6 +266,8 @@ void *udpclientrd(void *arg) {
- 	buf = radudpget(*s, NULL, &server, NULL);
- 	replyh(server, buf);
-     }
-+
-+    return NULL;
- }
- 
- void *udpserverrd(void *arg) {
-@@ -310,6 +312,8 @@ void *udpserverwr(void *arg) {
- 	debug(DBG_DBG, "udpserverwr: refcount %d", reply->refcount);
- 	freerq(reply);
-     }
-+
-+    return NULL;
- }
- 
- void addclientudp(struct client *client) {
 

--- a/net/radsecproxy/patches/200-logdest-on-foreground.patch
+++ /dev/null
@@ -1,32 +1,1 @@
-diff --git a/radsecproxy.c b/radsecproxy.c
-index 563c4a8..9fa076d 100644
---- a/radsecproxy.c
-+++ b/radsecproxy.c
-@@ -3382,18 +3382,16 @@ int radsecproxy_main(int argc, char **argv) {
- 	options.loglevel = loglevel;
-     else if (options.loglevel)
- 	debug_set_level(options.loglevel);
--    if (!foreground) {
--	debug_set_destination(options.logdestination
--                              ? options.logdestination
--                              : "x-syslog:///", LOG_TYPE_DEBUG);
-+    debug_set_destination(options.logdestination
-+			  ? options.logdestination
-+			  : "x-syslog:///", LOG_TYPE_DEBUG);
- #if defined(WANT_FTICKS)
--    	if (options.ftickssyslogfacility) {
--            debug_set_destination(options.ftickssyslogfacility,
--                                  LOG_TYPE_FTICKS);
--            free(options.ftickssyslogfacility);
--    	}
--#endif
-+    if (options.ftickssyslogfacility) {
-+	debug_set_destination(options.ftickssyslogfacility,
-+			      LOG_TYPE_FTICKS);
-+	free(options.ftickssyslogfacility);
-     }
-+#endif
-     free(options.logdestination);
- 
-     if (!list_first(clconfs))
 

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/tinc/Makefile (deleted)
--- a/net/tinc/Makefile
+++ /dev/null
@@ -1,60 +1,1 @@
-#
-# Copyright (C) 2007-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:=tinc
-PKG_VERSION:=1.0.23
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.tinc-vpn.org/packages
-PKG_MD5SUM:=762c0d47bdf1b33a40b19165d9c2761f
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tinc
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+liblzo +libopenssl +kmod-tun
-  TITLE:=VPN tunneling daemon
-  URL:=http://www.tinc-vpn.org/
-  SUBMENU:=VPN
-endef
-
-define Package/tinc/description
-  tinc is a Virtual Private Network (VPN) daemon that uses tunnelling and
-  encryption to create a secure private network between hosts on the Internet.
-endef
-
-TARGET_CFLAGS += -std=gnu99
-
-CONFIGURE_ARGS += \
-	--with-kernel="$(LINUX_DIR)" \
-	--with-zlib="$(STAGING_DIR)/usr" \
-	--with-lzo-include="$(STAGING_DIR)/usr/include/lzo"
-
-define Package/tinc/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tincd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) files/$(PKG_NAME).config $(1)/etc/config/$(PKG_NAME)
-	$(INSTALL_DIR) $(1)/etc/tinc
-	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(INSTALL_DATA) files/tinc.upgrade $(1)/lib/upgrade/keep.d/tinc
-endef
-
-define Package/tinc/conffiles
-/etc/config/tinc
-endef
-
-$(eval $(call BuildPackage,tinc))
-

--- a/net/tinc/files/tinc.config
+++ /dev/null
@@ -1,57 +1,1 @@
-config tinc-net NETNAME
-	option enabled 0
 
-	## Daemon Configuration	(cmd arguments)
-	#option generate_keys 0
-	#option key_size 2048
-	#option logfile /tmp/log/tinc.NETNAME.log
-	#option debug 3
-
-	## Server Configuration (tinc.conf)
-	#option AddressFamily any
-	#option BindToAddress 127.0.0.1
-	#option BindToInterface lo
-
-	#list ConnectTo peer1
-
-	#option DirectOnly 0
-	#option Forwarding internal
-	#option GraphDumpFile /tmp/log/tinc.NETNAME.dot
-	#option Hostnames 0
-	#option IffOneQueue 0
-	#option Interface NETNAME
-	#option KeyExpire 3600
-	#option MACExpire 600
-	#option MaxTimeout 900
-	#option Mode router
-
-	option Name NODENAME
-
-	#option PingInterval 60
-	#option PingTimeout 5
-	#option PriorityInheritance 0
-	#option PrivateKeyFile /etc/tinc/NETNAME/rsa_key.priv
-	#option ProcessPriority normal
-	#option ReplayWindow 16
-	#option StrictSubnets 0
-	#option TunnelServer 0
-	#option UDPRcvBuf x
-	#option UDPSndBuf x
-
-config tinc-host NODENAME
-	option enabled 0
-
-	option net NETNAME
-
-	#list Address example.com
-	#option Cipher blowfish
-	#option ClampMSS yes
-	#option Compression 0
-	#option Digest sha1
-	#option IndirectData 0
-	#option MACLength 4
-	#option PMTU 1514
-	#option PMTUDiscovery yes
-	#option Port 655
-	#option Subnet 192.168.1.0/24
-

--- a/net/tinc/files/tinc.init
+++ /dev/null
@@ -1,242 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2011 OpenWrt.org
-# Copyright (C) 2011 Linus Lüssing
-#  Based on Jo-Philipp Wich's OpenVPN init script
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
 
-START=42
-
-SERVICE_USE_PID=1
-
-BIN=/usr/sbin/tincd
-EXTRA_COMMANDS="up down"
-
-LIST_SEP="
-"
-TMP_TINC="/tmp/tinc"
-
-append_param() {
-	local v="$1"
-	case "$v" in
-		*_*_*_*) v=${v%%_*}-${v#*_}; v=${v%%_*}-${v#*_}; v=${v%%_*}-${v#*_} ;;
-		*_*_*)   v=${v%%_*}-${v#*_}; v=${v%%_*}-${v#*_} ;;
-		*_*)     v=${v%%_*}-${v#*_} ;;
-	esac
-	ARGS="$ARGS --$v"
-	return 0
-}
-
-append_conf_bools() {
-	local p; local v; local s="$1"; local f="$2"; shift; shift
-	for p in $*; do
-		config_get_bool v "$s" "$p"
-		[ "$v" == 1 ] && echo "$p = yes" >> "$f"
-		[ "$v" == 0 ] && echo "$p = no" >> "$f"
-	done
-}
-
-append_params() {
-	local p; local v; local s="$1"; shift
-	for p in $*; do
-		config_get v "$s" "$p"
-		IFS="$LIST_SEP"
-		for v in $v; do
-			[ -n "$v" ] && append_param "$p" && ARGS="$ARGS=$v"
-		done
-		unset IFS
-	done
-}
-
-append_conf_params() {
-	local p; local v; local s="$1"; local f="$2"; shift; shift
-	for p in $*; do
-		config_get v "$s" "$p"
-		IFS="$LIST_SEP"
-		for v in $v; do
-			# Look up OpenWRT interface names
-			[ "$p" = "BindToInterface" ] && {
-				local ifname=$(uci -P /var/state get network.$v.ifname 2>&-)
-				[ -n "$ifname" ] && v="$ifname"
-			}
-
-			[ -n "$v" ] && echo "$p = $v" >> "$f"
-		done
-		unset IFS
-	done
-}
-
-section_enabled() {
-	config_get_bool enabled "$1" 'enabled' 0
-	[ $enabled -gt 0 ]
-}
-
-prepare_host() {
-	local s="$1"
-	local n
-
-	# net disabled?
-	config_get n "$s" net
-	section_enabled "$n" || return 1
-
-	if [ "$#" = "2" ]; then
-		[ "$2" != "$n" ] && return 1
-	fi
-
-	# host disabled?
-	section_enabled "$s" || {
-		[ -f "$TMP_TINC/$n/hosts/$s" ] && rm "$TMP_TINC/$n/hosts/$s"
-		return 1
-	}
-
-	[ ! -f "/etc/tinc/$n/hosts/$s" ] && {
-		echo -n "tinc: Warning, public key for $s for network $n "
-		echo -n "missing in /etc/tinc/$n/hosts/$s, "
-		echo "skipping configuration of $s"
-		return 1
-	}
-
-	# append flags
-	append_conf_bools "$s" "$TMP_TINC/$n/hosts/$s" \
-		ClampMSS IndirectData PMTUDiscovery TCPOnly
-
-	# append params
-	append_conf_params "$s" "$TMP_TINC/$n/hosts/$s" \
-		Address Cipher Compression Digest MACLength PMTU \
-		Port PublicKey PublicKeyFile Subnet
-}
-
-check_gen_own_key() {
-	local s="$1"; local n; local k
-
-	config_get n "$s" Name
-	config_get_bool k "$s" generate_keys 0
-	[ "$k" == 0 ] && return 0
-
-	([ -z "$n" ] || [ -f "$TMP_TINC/$s/hosts/$n" ] || [ -f "$TMP_TINC/$s/rsa_key.priv" ]) && \
-		return 0
-	[ ! -d "$TMP_TINC/$s/hosts" ] && mkdir -p "$TMP_TINC/$s/hosts"
-
-	config_get k "$s" key_size
-	if [ -z "$k" ]; then
-		$BIN -c "$TMP_TINC/$s" --generate-keys </dev/null
-	else
-		$BIN -c "$TMP_TINC/$s" "--generate-keys=$k" </dev/null
-	fi
-
-	[ ! -d "/etc/tinc/$s/hosts" ] && mkdir -p "/etc/tinc/$s/hosts"
-	cp "$TMP_TINC/$s/rsa_key.priv" "/etc/tinc/$s/"
-	[ -n "$n" ] && cp "$TMP_TINC/$s/hosts/$n" "/etc/tinc/$s/hosts/"
-}
-
-prepare_net() {
-	local s="$1"
-	local n
-
-	section_enabled "$s" || return 1
-
-        # rm old config
-        rm -rf "$TMP_TINC/$s/"
-
-	[ ! -d "$TMP_TINC/$s" ] && mkdir -p "$TMP_TINC/$s"
-	[ -d "/etc/tinc/$s" ] && cp -r "/etc/tinc/$s" "$TMP_TINC/"
-
-	# append flags
-	append_conf_bools "$s" "$TMP_TINC/$s/tinc.conf" \
-		DecrementTTL DirectOnly Hostnames IffOneQueue \
-		LocalDiscovery PriorityInheritance StrictSubnets TunnelServer \
-		ClampMSS IndirectData PMTUDiscovery TCPOnly
-
-	# append params
-	append_conf_params "$s" "$TMP_TINC/$s/tinc.conf" \
-		AddressFamily BindToAddress ConnectTo BindToInterface \
-		Broadcast Device DeviceType Forwarding \
-		GraphDumpFile Interface KeyExpire MACExpire \
-		MaxTimeout Mode Name PingInterval PingTimeout \
-		PrivateKey PrivateKeyFile ProcessPriority ReplayWindow \
-		UDPRcvBuf UDPSndBuf \
-		Address Cipher Compression Digest MACLength PMTU \
-		Port PublicKey PublicKeyFile Subnet
-
-	check_gen_own_key "$s" && return 0
-}
-
-start_instance() {
-	local s="$1"
-
-	section_enabled "$s" || return 1
-
-	ARGS=""
-
-	# append params
-	append_params "$s" logfile debug
-
-	SERVICE_PID_FILE="/var/run/tinc.$s.pid"
-	service_start $BIN -c "$TMP_TINC/$s" -n $s $ARGS --pidfile="$SERVICE_PID_FILE"
-}
-
-stop_instance() {
-	local s="$1"
-
-	section_enabled "$s" || return 1
-
-	SERVICE_PID_FILE="/var/run/tinc.$s.pid"
-	service_stop $BIN
-	# rm old config
-	rm -rf "$TMP_TINC/$s/"
-}
-
-reload_instance() {
-	local s="$1"
-
-	section_enabled "$s" || return 1
-
-	SERVICE_PID_FILE="/var/run/tinc.$s.pid"
-	service_reload $BIN
-}
-
-start() {
-	config_load 'tinc'
-
-	config_foreach prepare_net 'tinc-net'
-	config_foreach prepare_host 'tinc-host'
-
-	config_foreach start_instance 'tinc-net'
-}
-
-stop() {
-	config_load 'tinc'
-	config_foreach stop_instance 'tinc-net'
-}
-
-reload() {
-	config_load 'tinc'
-	config_foreach reload_instance 'tinc-net'
-}
-
-up() {
-	local exists
-	local instance
-	config_load 'tinc'
-	for instance in "$@"; do
-		config_get exists "$instance" 'TYPE'
-		if [ "$exists" == "tinc-net" ]; then
-			prepare_net "$instance"
-			config_foreach prepare_host 'tinc-host' "$instance"
-			start_instance "$instance"
-		fi
-	done
-}
-
-down() {
-	local exists
-	local instance
-	config_load 'tinc'
-	for instance in "$@"; do
-		config_get exists "$instance" 'TYPE'
-		if [ "$exists" == "tinc-net" ]; then
-			stop_instance "$instance"
-		fi
-	done
-}
-

--- a/net/tinc/files/tinc.upgrade
+++ /dev/null
@@ -1,2 +1,1 @@
-/etc/tinc/
 

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/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/net/vsftpd/Makefile (deleted)
--- a/net/vsftpd/Makefile
+++ /dev/null
@@ -1,86 +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
-
-PKG_NAME:=vsftpd
-PKG_VERSION:=3.0.2
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://security.appspot.com/downloads/
-PKG_MD5SUM:=8b00c749719089401315bd3c44dddbb2
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/vsftpd/Default
-  SUBMENU:=File Transfer
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=A fast and secure FTP server
-  URL:=http://vsftpd.beasts.org/
-  MAINTAINER:=Cezary Jackiewicz <cezary@eko.one.pl>
-endef
-
-
-define Package/vsftpd
-$(call Package/vsftpd/Default)
-  VARIANT:=notls
-  TITLE+= (no TLS)
-endef
-
-define Package/vsftpd-tls
-$(call Package/vsftpd/Default)
-  VARIANT:=tls
-  TITLE+= (TLS)
-  DEPENDS+=+libopenssl
-endef
-
-define Package/vsftpd/conffiles
-/etc/vsftpd.conf
-endef
-
-Package/vsftpd-tls/conffiles=$(Package/vsftpd/conffiles)
-
-ifeq ($(BUILD_VARIANT),notls)
- define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		vsftpd
- endef
-endif
-
-ifeq ($(BUILD_VARIANT),tls)
- define Build/Compile
-	$(SED) 's/#undef VSF_BUILD_SSL/#define VSF_BUILD_SSL/' $(PKG_BUILD_DIR)/builddefs.h
-	$(SED) 's/-lcrypt -lnsl/-lcrypt -lnsl -lssl -lcrypto/' $(PKG_BUILD_DIR)/Makefile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		vsftpd
- endef
-endif
-
-define Package/vsftpd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) ./files/$(PKG_NAME).conf $(1)/etc/$(PKG_NAME).conf
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
-endef
-
-Package/vsftpd-tls/install=$(Package/vsftpd/install)
-
-$(eval $(call BuildPackage,vsftpd))
-$(eval $(call BuildPackage,vsftpd-tls))
-

--- a/net/vsftpd/files/vsftpd.conf
+++ /dev/null
@@ -1,18 +1,1 @@
-background=YES
-listen=YES
-anonymous_enable=NO
-local_enable=YES
-write_enable=YES
-local_umask=022
-check_shell=NO
-#dirmessage_enable=YES
-#ftpd_banner=Welcome to blah FTP service.
-session_support=NO
-#syslog_enable=YES
-#userlist_enable=YES
-#userlist_deny=NO
-#userlist_file=/etc/vsftpd.users
-#xferlog_enable=YES
-#xferlog_file=/var/log/vsftpd.log
-#xferlog_std_format=YES
 

--- a/net/vsftpd/files/vsftpd.init
+++ /dev/null
@@ -1,14 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
 
-START=50
-
-start() {
-	mkdir -m 0755 -p /var/run/vsftpd
-	service_start /usr/sbin/vsftpd
-}
-
-stop() {
-	service_stop /usr/sbin/vsftpd
-}
-

--- a/net/vsftpd/patches/001-destdir.patch
+++ /dev/null
@@ -1,48 +1,1 @@
---- a/Makefile
-+++ b/Makefile
-@@ -22,6 +22,8 @@ OBJS	=	main.o utility.o prelogin.o ftpcm
-     seccompsandbox.o
- 
- 
-+DESTDIR =
-+
- .c.o:
- 	$(CC) -c $*.c $(CFLAGS) $(IFLAGS)
- 
-@@ -29,21 +31,20 @@ vsftpd: $(OBJS) 
- 	$(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS)
- 
- install:
--	if [ -x /usr/local/sbin ]; then \
--		$(INSTALL) -m 755 vsftpd /usr/local/sbin/vsftpd; \
--	else \
--		$(INSTALL) -m 755 vsftpd /usr/sbin/vsftpd; fi
--	if [ -x /usr/local/man ]; then \
--		$(INSTALL) -m 644 vsftpd.8 /usr/local/man/man8/vsftpd.8; \
--		$(INSTALL) -m 644 vsftpd.conf.5 /usr/local/man/man5/vsftpd.conf.5; \
--	elif [ -x /usr/share/man ]; then \
--		$(INSTALL) -m 644 vsftpd.8 /usr/share/man/man8/vsftpd.8; \
--		$(INSTALL) -m 644 vsftpd.conf.5 /usr/share/man/man5/vsftpd.conf.5; \
--	else \
--		$(INSTALL) -m 644 vsftpd.8 /usr/man/man8/vsftpd.8; \
--		$(INSTALL) -m 644 vsftpd.conf.5 /usr/man/man5/vsftpd.conf.5; fi
--	if [ -x /etc/xinetd.d ]; then \
--		$(INSTALL) -m 644 xinetd.d/vsftpd /etc/xinetd.d/vsftpd; fi
-+	mkdir -p $(DESTDIR)/usr/sbin
-+	$(INSTALL) -m 755 vsftpd $(DESTDIR)/usr/sbin/
-+	mkdir -p $(DESTDIR)/usr/share/man/man8
-+	$(INSTALL) -m 644 vsftpd.8 $(DESTDIR)/usr/share/man/man8/
-+	mkdir -p $(DESTDIR)/usr/share/man/man5
-+	$(INSTALL) -m 644 vsftpd.conf.5 $(DESTDIR)/usr/share/man/man5/
-+	mkdir -p $(DESTDIR)/etc/xinetd.d
-+	$(INSTALL) -m 644 xinetd.d/vsftpd $(DESTDIR)/etc/xinetd.d/
-+
-+uninstall:
-+	rm -f $(DESTDIR)/usr/sbin/vsftpd
-+	rm -f $(DESTDIR)/usr/share/man/man8/vsftpd.8
-+	rm -f $(DESTDIR)/usr/share/man/man5/vsftpd.conf.5
-+	rm -f $(DESTDIR)/etc/xinetd.d/vsftpd
- 
- clean:
- 	rm -f *.o *.swp vsftpd
 

--- a/net/vsftpd/patches/002-find_libs.patch
+++ /dev/null
@@ -1,14 +1,1 @@
---- a/Makefile
-+++ b/Makefile
-@@ -8,8 +8,8 @@ CFLAGS	=	-O2 -fPIE -fstack-protector --p
- 	-D_FORTIFY_SOURCE=2 \
- 	#-pedantic -Wconversion
- 
--LIBS	=	`./vsf_findlibs.sh`
--LINK	=	-Wl,-s
-+LIBS	=	-lcrypt -lnsl
-+LINK	=
- LDFLAGS	=	-fPIE -pie -Wl,-z,relro -Wl,-z,now
- 
- OBJS	=	main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
 

--- a/net/vsftpd/patches/003-chroot.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/tunables.c
-+++ b/tunables.c
-@@ -254,7 +254,7 @@ tunables_load_defaults()
-   /* -rw------- */
-   tunable_chown_upload_mode = 0600;
- 
--  install_str_setting("/usr/share/empty", &tunable_secure_chroot_dir);
-+  install_str_setting("/var/run/vsftpd", &tunable_secure_chroot_dir);
-   install_str_setting("ftp", &tunable_ftp_username);
-   install_str_setting("root", &tunable_chown_username);
-   install_str_setting("/var/log/xferlog", &tunable_xferlog_file);
 

--- a/net/vsftpd/patches/004-disable-capabilities.patch
+++ /dev/null
@@ -1,13 +1,1 @@
---- a/sysdeputil.c
-+++ b/sysdeputil.c
-@@ -165,6 +165,9 @@
- #endif
- /* END config */
- 
-+#undef VSF_SYSDEP_HAVE_CAPABILITIES
-+#undef VSF_SYSDEP_HAVE_LIBCAP
-+
- /* PAM support - we include our own dummy version if the system lacks this */
- #include <security/pam_appl.h>
- 
 

--- a/net/vsftpd/patches/005-disable-pam.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/builddefs.h
-+++ b/builddefs.h
-@@ -2,7 +2,7 @@
- #define VSF_BUILDDEFS_H
- 
- #undef VSF_BUILD_TCPWRAPPERS
--#define VSF_BUILD_PAM
-+#undef VSF_BUILD_PAM
- #undef VSF_BUILD_SSL
- 
- #endif /* VSF_BUILDDEFS_H */
 

file:a/net/znc/Makefile (deleted)
--- a/net/znc/Makefile
+++ /dev/null
@@ -1,287 +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:=znc
-PKG_VERSION:=1.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://znc.in/releases \
-		http://znc.in/releases/archive
-PKG_MD5SUM:=ef18e5402a82cc3fcab5c2ac5c2e6f3b
-
-PKG_BUILD_PARALLEL:=1
-
-
-define Package/znc/default
-  SUBMENU:=Instant Messaging
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=ZNC
-  URL:=http://en.znc.in/
-  MAINTAINER:=Jonas Gorski <jogo@openwrt.org>
-endef
-
-define Package/znc
-  $(Package/znc/default)
-  DEPENDS:=+libopenssl +libpthread $(CXX_DEPENDS)
-  MENU:=1
-endef
-
-define Package/znc/description
-	ZNC is an IRC bouncer with many advanced features like detaching,
-	multiple users, per channel playback buffer, SSL, IPv6, transparent DCC
-	bouncing, and c++ module support to name a few.
-endef
-