rng-tools: moved to github
rng-tools: moved to github

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

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

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

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

file:a/libs/giflib/Makefile (deleted)
--- a/libs/giflib/Makefile
+++ /dev/null
@@ -1,60 +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:=giflib
-PKG_VERSION:=4.1.6
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/giflib
-PKG_MD5SUM:=7125644155ae6ad33dbc9fc15a14735f
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=autogen.sh aclocal.m4
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/giflib
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=GIF libraries
-  URL:=http://sourceforge.net/projects/giflib
-endef
-
-define Package/giflib/description
-  giflib is a library for reading and writing gif images.
-  It is API and ABI compatible with libungif which was in wide use while
-  the LZW compression algorithm was patented.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-CONFIGURE_ARGS += --enable-x11=no
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/{lib,include}
-	$(CP) $(PKG_BUILD_DIR)/lib/.libs/lib*so* $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/.libs/libgif.a $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libgif.la $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/*.h $(1)/usr/include/
-endef
-
-define Package/giflib/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/.libs/lib*so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,giflib))
-

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

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

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

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

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/utils/ccrypt/Makefile (deleted)
--- a/utils/ccrypt/Makefile
+++ /dev/null
@@ -1,38 +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:=ccrypt
-PKG_VERSION:=1.10
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/ccrypt
-PKG_MD5SUM:=44ddd763465c254df83f5d38851d04d7
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ccrypt
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=ccrypt is a utility for encrypting and decrypting files and streams
-  URL:=http://ccrypt.sourceforge.net/
-endef
-
-define Package/ccrypt/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ccrypt $(1)/usr/bin/
-	ln -s ccrypt $(1)/usr/bin/ccencrypt
-	ln -s ccrypt $(1)/usr/bin/ccdecrypt
-	ln -s ccrypt $(1)/usr/bin/ccat
-endef
-
-$(eval $(call BuildPackage,ccrypt))
-

--- a/utils/ccrypt/patches/001-no-intl.patch
+++ /dev/null
@@ -1,90 +1,1 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -123,17 +123,6 @@ AC_MSG_RESULT($UINT32_TYPE)
- AC_DEFINE_UNQUOTED(UINT32_TYPE,$UINT32_TYPE,unsigned 32 bit integer type)
- 
- dnl ----------------------------------------------------------------------
--dnl Internationalization
--
--GETTEXT_PACKAGE=ccrypt
--AC_SUBST(GETTEXT_PACKAGE)
--AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
--
--AM_GNU_GETTEXT
--AM_GNU_GETTEXT_VERSION([0.14.3])
--IT_PO_SUBDIR(po)
--
--dnl ----------------------------------------------------------------------
- dnl Libtool (needed by intl/)
- 
- LT_INIT
-@@ -153,9 +142,7 @@ AC_SUBST(TAR)
- dnl ----------------------------------------------------------------------
- AC_CONFIG_FILES([doc/ccrypt.1
- 	   doc/ccguess.1
--	   po/Makefile.in 
- 	   m4/Makefile 
--	   intl/Makefile 
- 	   Makefile 
- 	   src/Makefile 
- 	   emacs/Makefile
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -4,7 +4,7 @@
- 
- ## Process this file with automake to produce Makefile.in
- 
--SUBDIRS = m4 po intl src emacs doc check
-+SUBDIRS = m4 src emacs doc check
- 
- EXTRA_DIST = m4/ChangeLog config.rpath README-WIN
- 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -36,7 +36,7 @@ host_triplet = @host@
- subdir = .
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
--	$(top_srcdir)/configure $(top_srcdir)/intl/Makefile.in \
-+	$(top_srcdir)/configure \
- 	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS config.guess \
- 	config.rpath config.sub depcomp elisp-comp install-sh \
- 	ltmain.sh missing mkinstalldirs
-@@ -66,7 +66,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
-  configure.lineno config.status.lineno
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = intl/Makefile
-+CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- SOURCES =
- DIST_SOURCES =
-@@ -277,7 +277,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = m4 po intl src emacs doc check
-+SUBDIRS = m4 src emacs doc check
- EXTRA_DIST = m4/ChangeLog config.rpath README-WIN
- ACLOCAL_AMFLAGS = -I m4
- all: config.h
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -56,4 +56,4 @@ uninstall-local:
- # internationalization stuff
- localedir = $(datadir)/locale
- INCLUDES = -I../intl -I$(top_srcdir)/intl -DLOCALEDIR=\"$(localedir)\"
--LIBS = @LIBINTL@ @LIBS@
-+LIBS = @LIBS@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -159,7 +159,7 @@ LDFLAGS = @LDFLAGS@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBINTL@ @LIBS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LIPO = @LIPO@
- LN_S = @LN_S@
 

file:a/utils/haveged/Makefile (deleted)
--- a/utils/haveged/Makefile
+++ /dev/null
@@ -1,68 +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.
-#
-# $Id: Makefile 1 2012-01-12 03:50:18Z Olipro $
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=haveged
-PKG_VERSION:=1.9.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.issihosts.com/$(PKG_NAME)
-PKG_MD5SUM:=015ff58cd10607db0e0de60aeca2f5f8
-
-#ensure this is consistent with the dir in the tarball!!!
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/haveged/template
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Feeds the kernel entropy pool by timing CPU loops.
-  URL:=http://www.issihosts.com/haveged/
-endef
-
-define Package/haveged
-  $(call Package/haveged/template)
-  DEPENDS:=+libhavege
-endef
-
-define Package/libhavege
-  $(call Package/haveged/template)
-  TITLE:=Library for haveged
-endef
-
-CONFIGURE_ARGS+= \
-      --enable-daemon=yes
-      --enable-threads=no
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/src/havege.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/src/.libs/libhavege.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/haveged/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/haveged.init $(1)/etc/init.d/haveged
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/.libs/haveged $(1)/usr/sbin/
-endef
-
-define Package/libhavege/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/src/.libs/libhavege.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,haveged))
-$(eval $(call BuildPackage,libhavege))
-

--- a/utils/haveged/files/haveged.init
+++ /dev/null
@@ -1,17 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2012 OpenWrt.org
 
-START=98
-
-HAVEGED_THRESHOLD=1024
-HAVEGED_DCACHE=32
-HAVEGED_ICACHE=32
-
-start() {
-	service_start /usr/sbin/haveged -w $HAVEGED_THRESHOLD -d $HAVEGED_DCACHE -i $HAVEGED_ICACHE -v 1
-}
-
-stop() {
-	service_stop /usr/sbin/haveged
-}
-

--- a/utils/rng-tools/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:=rng-tools
-PKG_VERSION:=3
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/gkernel/rng-tools/3/
-PKG_MD5SUM:=fa305916ec101c85c0065aeceb81a38d
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/rng-tools
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+USE_UCLIBC:argp-standalone
-  TITLE:=Daemon for adding entropy to kernel entropy pool
-  URL:=http://sourceforge.net/projects/gkernel/
-endef
-
-ifdef CONFIG_USE_UCLIBC
-CONFIGURE_VARS += \
-    LIBS="-largp"
-endif
-
-define Package/rng-tools/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/rngd.init $(1)/etc/init.d/rngd
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rngtest $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rngd $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,rng-tools))
-

--- a/utils/rng-tools/files/rngd.init
+++ /dev/null
@@ -1,17 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2011 OpenWrt.org
 
-START=98
-
-RNGD_INTERVAL=30
-RNGD_AMOUNT=4000
-RNGD_DEVICE="/dev/urandom"
-
-start() {
-	service_start /sbin/rngd -r $RNGD_DEVICE -W $RNGD_AMOUNT -t $RNGD_INTERVAL
-}
-
-stop() {
-	service_stop /sbin/rngd
-}
-

comments