libsoup: moved to github
libsoup: moved to github

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

file:a/lang/luasec/Makefile (deleted)
#  
# 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))  
 
 
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)
 
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))  
 
 
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))  
 
 
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))  
 
 
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))  
 
 
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))  
 
#  
# 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))  
 
 
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)
 
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))  
 
 
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))  
 
--- 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  
 
#  
# 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)
#  
# 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))  
 
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))  
 
# --- 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;  
}  
 
#  
# 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/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/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)
#  
# 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))  
 
# #
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006-2014 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
   
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
   
PKG_NAME:=giflib PKG_NAME:=giflib
PKG_VERSION:=4.1.6 PKG_VERSION:=5.1.0
PKG_RELEASE:=1 PKG_RELEASE:=1
   
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/giflib PKG_SOURCE_URL:=@SF/giflib
PKG_MD5SUM:=7125644155ae6ad33dbc9fc15a14735f PKG_MD5SUM:=c7e9f1c10b755ab955156d4c1ac7fc5d
   
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
   
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_REMOVE_FILES:=autogen.sh aclocal.m4 PKG_REMOVE_FILES:=autogen.sh aclocal.m4
   
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
   
define Package/giflib define Package/giflib
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=GIF libraries TITLE:=GIF libraries
URL:=http://sourceforge.net/projects/giflib URL:=http://sourceforge.net/projects/giflib
endef endef
   
define Package/giflib/description define Package/giflib/description
giflib is a library for reading and writing gif images. giflib is a library for reading and writing gif images.
It is API and ABI compatible with libungif which was in wide use while It is API and ABI compatible with libungif which was in wide use while
the LZW compression algorithm was patented. the LZW compression algorithm was patented.
endef endef
   
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += --enable-x11=no CONFIGURE_ARGS += --enable-x11=no
   
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE) -C $(PKG_BUILD_DIR)
endef endef
   
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/{lib,include} $(INSTALL_DIR) $(1)/usr/{lib,include}
$(CP) $(PKG_BUILD_DIR)/lib/.libs/lib*so* $(1)/usr/lib $(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/.libs/libgif.a $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/lib/libgif.la $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/lib/libgif.la $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/lib/*.h $(1)/usr/include/ $(CP) $(PKG_BUILD_DIR)/lib/*.h $(1)/usr/include/
endef endef
   
define Package/giflib/install define Package/giflib/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/lib/.libs/lib*so* $(1)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/lib/.libs/lib*so* $(1)/usr/lib/
endef endef
   
$(eval $(call BuildPackage,giflib)) $(eval $(call BuildPackage,giflib))
   
file:a/libs/gsm/Makefile (deleted)
#  
# 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/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)
#  
# 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))  
 
--- /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)
#  
# 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))  
 
#  
# 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/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)
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/libv4l/Makefile (deleted)
#  
# 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/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/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/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/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/openldap/Makefile (deleted)
#  
# 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))  
 
#!/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  
}  
 
--- /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)  
 
--- /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/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/vips/Makefile (deleted)
#  
# 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))  
 
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)  
 
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  
 
 
#  
# 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))  
 
#  
# 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))  
 
#  
# 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/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/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()  
{  
 
#  
# 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))  
 
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'  
 
#!/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/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/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/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/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);  
 
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  
 
#  
# 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))  
 
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'  
 
 
case "$ACTION" in  
add)  
# start process  
/etc/init.d/mjpg-streamer start  
;;  
remove)  
# stop process  
/etc/init.d/mjpg-streamer stop  
;;  
esac  
 
#!/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'  
}  
 
#  
# 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/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)
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)
#  
# 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/dhcpcd/Makefile (deleted)
#  
# 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/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/horst/Makefile (deleted)
#  
# 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/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)
#  
# 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))  
 
config iodined  
option address ''  
option password ''  
option tunnelip '10.0.0.1'  
option tld ''  
 
#!/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/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  
;;  
*)  
 
  #
  # 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))
 
  # 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"
  }
  }
 
  --- 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) {
 
  --- 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/netatalk/Makefile (deleted)
#  
# 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))  
 
-  
/tmp Temp allow:root,nobody cnidscheme:dbd  
 
- -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  
 
#!/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/macros/iconv.m4  
+++ b/macros/iconv.m4  
@@ -114,6 +114,5 @@ int main() {  
 
CFLAGS="$savedcflags"  
LDFLAGS="$savedldflags"  
- CPPFLAGS="$saved_CPPFLAGS"  
 
])  
 
file:a/net/p910nd/Makefile (deleted)
#  
# 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))  
 
config p910nd  
option device /dev/usb/lp0  
option port 0  
option bidirectional 1  
option enabled 0  
 
#!/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)
#  
# 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))  
 
#!/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/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.  
 
#  
# 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))  
 
 
#!/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/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) {  
 
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/tinc/Makefile (deleted)
#  
# 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))  
 
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  
 
#!/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  
}  
 
/etc/tinc/  
 
file:a/net/vsftpd/Makefile (deleted)
#  
# 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))  
 
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  
 
#!/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/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/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/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/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/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/sound/lame/Makefile (deleted)
#  
# Copyright (C) 2007-2008 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:=lame  
PKG_VERSION:=398-2  
PKG_RELEASE:=3  
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@SF/lame  
PKG_MD5SUM:=719dae0ee675d0c16e0e89952930ed35  
PKG_FIXUP:=autoreconf  
 
PKG_LICENSE:=LGPLv2  
PKG_LICENSE_FILES:=COPYING LICENSE  
 
include $(INCLUDE_DIR)/package.mk  
 
PKG_INSTALL=1  
 
define Package/lame/Default  
SECTION:=sound  
CATEGORY:=Sound  
URL:=http://sourceforge.net/projects/lame  
DEPENDS:=@BUILD_PATENTED  
endef  
 
define Package/lame  
$(call Package/lame/Default)  
TITLE:=lame  
MENU:=1  
DEPENDS += +libncurses  
endef  
 
define Package/lame/description  
lame mp3 encoder  
endef  
 
define Package/lame-lib  
$(call Package/lame/Default)  
TITLE:=lame-lib  
endef  
 
define Package/lame-lib/description  
lame mp3 encoder libs  
endef  
 
define Build/Configure  
$(call Build/Configure/Default, \  
--disable-nasm \  
)  
endef  
 
 
define Package/lame/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lame $(1)/usr/bin/  
endef  
 
define Package/lame-lib/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include/lame  
$(INSTALL_DATA) \  
$(PKG_INSTALL_DIR)/usr/include/lame/*.h \  
$(1)/usr/include/lame/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/lib/*.{la,so*} \  
$(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,lame-lib))  
$(eval $(call BuildPackage,lame))  
 
--- a/configure.in  
+++ b/configure.in  
@@ -385,7 +385,7 @@ CONFIG_MATH_LIB="${USE_LIBM}"  
 
dnl configure use of features  
 
-AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")  
+HAVE_GTK="no"  
 
dnl ElectricFence malloc debugging  
AC_MSG_CHECKING(use of ElectricFence malloc debugging)  
--- a/frontend/Makefile.am  
+++ b/frontend/Makefile.am  
@@ -51,7 +51,7 @@ mp3rtp_SOURCES = mp3rtp.c rtp.c rtp.h $(  
mp3x_SOURCES = mp3x.c gtkanal.c gpkplotting.c $(common_sources)  
endif  
 
-CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@  
+CFLAGS = @CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@  
LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static  
 
INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)  
--- a/frontend/Makefile.in  
+++ b/frontend/Makefile.in  
@@ -113,7 +113,7 @@ AUTOMAKE = @AUTOMAKE@  
AWK = @AWK@  
CC = @CC@  
CCDEPMODE = @CCDEPMODE@  
-CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@  
+CFLAGS = @CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@  
CONFIG_DEFS = @CONFIG_DEFS@  
CONFIG_MATH_LIB = @CONFIG_MATH_LIB@  
CPP = @CPP@  
 
file:a/sound/mocp/Makefile (deleted)
#  
# 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:=moc  
PKG_VERSION:=2.5.0-beta2  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:=http://ftp.daper.net/pub/soft/moc/unstable/  
PKG_MD5SUM:=da87b90b57934234589b63e347921458  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
include $(INCLUDE_DIR)/nls.mk  
 
define Package/moc  
SECTION:=sound  
CATEGORY:=Sound  
DEPENDS:=+libcurl +BUILD_PATENTED:libmad +libvorbis $(ICONV_DEPENDS) +alsa-utils +libid3tag +libflac +libsamplerate +PACKAGE_libncursesw:libncursesw +!PACKAGE_libncursesw:libncurses +libffmpeg +libltdl +libmagic +faad2 +libdb47  
TITLE:=Music On Console  
URL:=http://moc.daper.net/  
endef  
 
define Package/moc/description  
MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use.  
endef  
 
define Build/Configure  
$(call Build/Configure/Default, \  
$(if $(CONFIG_BUILD_PATENTED),,--without-mp3) \  
--enable-shared \  
--disable-static \  
--disable-debug \  
--without-speex \  
--without-samplerate \  
--without-curl \  
--without-flac \  
--without-musepack \  
--without-rcc \  
$(if $(CONFIG_PACKAGE_libncursesw),--with-ncursesw --without-ncurses,--with-ncurses --without-ncursesw) \  
)  
endef  
 
define Package/moc/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mocp $(1)/usr/bin/  
$(INSTALL_DIR) $(1)/usr/lib/moc/decoder_plugins  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/moc/decoder_plugins/*.so $(1)/usr/lib/moc/decoder_plugins  
endef  
 
$(eval $(call BuildPackage,moc))  
 
file:a/sound/sox/Makefile (deleted)
#  
# Copyright (C) 2008 David Cooper <dave@kupesoft.com>  
# 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:=sox  
PKG_VERSION:=14.4.1  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:=@SF/sox  
PKG_MD5SUM:=ff9ca6aca972549de0e80e8e30ed379c  
 
PKG_LICENSE:=LGPLv2.1 GPLv2  
PKG_LICENSE_FILES:=COPYING LICENSE.LGPL LICENSE.GPL  
 
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
TARGET_LDFLAGS+= \  
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib  
 
define Package/sox  
SECTION:=sound  
CATEGORY:=Sound  
DEPENDS:=+BUILD_PATENTED:lame-lib +BUILD_PATENTED:libmad +BUILD_PATENTED:libid3tag +libvorbis +libvorbisidec +libgsm +alsa-lib +libsndfile +libflac +ffmpeg +libmagic +libpng +libao  
TITLE:=Sox is a general purpose sound converter/player/recorder  
URL:=http://sox.sourceforge.net/  
MAINTAINER:=Hamish Guthrie <hcg@openwrt.org>  
endef  
 
define Package/sox/description  
SoX is a command line utility that can convert various formats  
of computer audio files in to other formats. It can also apply  
various effects to these sound files during the conversion.  
As an added bonus, SoX can play and record audio files on  
several unix-style platforms.  
endef  
 
define Build/Configure  
$(call Build/Configure/Default, \  
--disable-external-gsm \  
--disable-oss \  
--enable-alsa \  
--disable-libao \  
--without-libltdl \  
--with-ogg \  
--with-flac \  
--with-ffmpeg \  
--without-amr-wb \  
--without-amr-nb \  
--without-samplerate \  
--without-ladspa \  
--$(if $(CONFIG_BUILD_PATENTED),with-mad,without-mad) \  
--$(if $(CONFIG_BUILD_PATENTED),with-lame,without-lame) \  
--$(if $(CONFIG_BUILD_PATENTED),with-id3tag,without-id3tag) \  
)  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/include \  
$(1)/usr/include/  
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/lib/libsox.{a,so*,la} \  
$(1)/usr/lib/  
$(INSTALL_DATA) \  
$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \  
$(1)/usr/lib/pkgconfig/  
endef  
 
define Package/sox/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/{play,rec,sox} $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsox.so* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,sox))  
 
--- a/src/Makefile.am  
+++ b/src/Makefile.am  
@@ -144,7 +144,7 @@ EXTRA_DIST = monkey.wav optional-fmts.am  
CMakeLists.txt soxconfig.h.cmake \  
tests.sh testall.sh tests.bat testall.bat test-comments  
 
-all: sox$(EXEEXT) play rec soxi sox_sample_test$(EXEEXT) example0$(EXEEXT) example1$(EXEEXT) example2$(EXEEXT) example3$(EXEEXT) example4$(EXEEXT) example5$(EXEEXT)  
+all: sox$(EXEEXT) play rec  
 
play rec: sox$(EXEEXT)  
if test "$(PLAYRECLINKS)" = "yes"; then \  
--- sox-14.4.1/src/Makefile.in  
+++ sox-14.4.1/src/Makefile.in  
@@ -2904,7 +2904,7 @@  
uninstall-libLTLIBRARIES uninstall-pkglibLTLIBRARIES  
 
 
-all: sox$(EXEEXT) play rec soxi sox_sample_test$(EXEEXT) example0$(EXEEXT) example1$(EXEEXT) example2$(EXEEXT) example3$(EXEEXT) example4$(EXEEXT) example5$(EXEEXT)  
+all: sox$(EXEEXT) play rec  
 
play rec: sox$(EXEEXT)  
if test "$(PLAYRECLINKS)" = "yes"; then \  
 
--- sox-14.4.1.orig/src/formats.c  
+++ sox-14.4.1/src/formats.c  
@@ -409,7 +409,7 @@ static void UNUSED rewind_pipe(FILE * fp  
#if defined _FSTDIO || defined _NEWLIB_VERSION || defined __APPLE__  
fp->_p -= PIPE_AUTO_DETECT_SIZE;  
fp->_r += PIPE_AUTO_DETECT_SIZE;  
-#elif defined __GLIBC__  
+#elif defined __GLIBC__ && ! defined __UCLIBC__  
fp->_IO_read_ptr = fp->_IO_read_base;  
#elif defined _MSC_VER || defined _WIN32 || defined _WIN64 || defined _ISO_STDIO_ISO_H  
fp->_ptr = fp->_base;  
@@ -417,7 +417,6 @@ static void UNUSED rewind_pipe(FILE * fp  
/* To fix this #error, either simply remove the #error line and live without  
* file-type detection with pipes, or add support for your compiler in the  
* lines above. Test with cat monkey.wav | ./sox --info - */  
- #error FIX NEEDED HERE  
#define NO_REWIND_PIPE  
(void)fp;  
#endif  
 
--- a/configure  
+++ b/configure  
@@ -15825,9 +15825,9 @@  
cat >>confdefs.h <<_ACEOF  
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1  
_ACEOF  
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_open_input_file in -lavformat" >&5  
-$as_echo_n "checking for av_open_input_file in -lavformat... " >&6; }  
-if ${ac_cv_lib_avformat_av_open_input_file+:} false; then :  
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avformat_open_input in -lavformat" >&5  
+$as_echo_n "checking for avformat_open_input in -lavformat... " >&6; }  
+if ${ac_cv_lib_avformat_avformat_open_input+:} false; then :  
$as_echo_n "(cached) " >&6  
else  
ac_check_lib_save_LIBS=$LIBS  
@@ -15841,27 +15841,27 @@  
#ifdef __cplusplus  
extern "C"  
#endif  
-char av_open_input_file ();  
+char avformat_open_input ();  
int  
main ()  
{  
-return av_open_input_file ();  
+return avformat_open_input ();  
;  
return 0;  
}  
_ACEOF  
if ac_fn_c_try_link "$LINENO"; then :  
- ac_cv_lib_avformat_av_open_input_file=yes  
+ ac_cv_lib_avformat_avformat_open_input=yes  
else  
- ac_cv_lib_avformat_av_open_input_file=no  
+ ac_cv_lib_avformat_avformat_open_input=no  
fi  
rm -f core conftest.err conftest.$ac_objext \  
conftest$ac_exeext conftest.$ac_ext  
LIBS=$ac_check_lib_save_LIBS  
fi  
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_open_input_file" >&5  
-$as_echo "$ac_cv_lib_avformat_av_open_input_file" >&6; }  
-if test "x$ac_cv_lib_avformat_av_open_input_file" = xyes; then :  
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_avformat_open_input" >&5  
+$as_echo "$ac_cv_lib_avformat_avformat_open_input" >&6; }  
+if test "x$ac_cv_lib_avformat_avformat_open_input" = xyes; then :  
for ac_header in libavcodec/avcodec.h ffmpeg/avcodec.h  
do :  
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`  
diff -Naur sox-14.4.0-orig/src/ffmpeg.c sox-14.4.0/src/ffmpeg.c  
--- sox-14.4.0-orig/src/ffmpeg.c 2012-06-12 00:35:53.459027469 -0400  
+++ sox-14.4.0/src/ffmpeg.c 2012-06-12 00:36:26.539028545 -0400  
@@ -93,7 +93,7 @@  
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)  
enc->error_resilience = 1;  
#else  
- enc->error_recognition = 1;  
+ enc->err_recognition = 1;  
#endif  
 
if (!codec || avcodec_open(enc, codec) < 0)  
@@ -157,7 +157,7 @@  
static int startread(sox_format_t * ft)  
{  
priv_t * ffmpeg = (priv_t *)ft->priv;  
- AVFormatParameters params;  
+ AVDictionary *params;  
int ret;  
int i;  
 
@@ -172,7 +172,7 @@  
 
/* Open file and get format */  
memset(&params, 0, sizeof(params));  
- if ((ret = av_open_input_file(&ffmpeg->ctxt, ft->filename, NULL, 0, &params)) < 0) {  
+ if ((ret = avformat_open_input(&ffmpeg->ctxt, ft->filename, NULL, &params)) < 0) {  
lsx_fail("ffmpeg cannot open file for reading: %s (code %d)", ft->filename, ret);  
return SOX_EOF;  
}  
@@ -231,7 +231,7 @@  
/* If input buffer empty, read more data */  
if (ffmpeg->audio_buf_index * 2 >= ffmpeg->audio_buf_size) {  
if ((ret = av_read_frame(ffmpeg->ctxt, pkt)) < 0 &&  
- (ret == AVERROR_EOF || url_ferror(ffmpeg->ctxt->pb)))  
+ (ret == AVERROR_EOF || ffmpeg->ctxt->pb->error))  
break;  
ffmpeg->audio_buf_size = audio_decode_frame(ffmpeg, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE);  
ffmpeg->audio_buf_index = 0;  
@@ -373,13 +373,6 @@  
return SOX_EOF;  
}  
 
- /* set the output parameters (must be done even if no  
- parameters). */  
- if (av_set_parameters(ffmpeg->ctxt, NULL) < 0) {  
- lsx_fail("ffmpeg invalid output format parameters");  
- return SOX_EOF;  
- }  
-  
/* Next line for debugging */  
/* dump_format(ffmpeg->ctxt, 0, ft->filename, 1); */  
 
@@ -391,14 +384,14 @@  
 
/* open the output file, if needed */  
if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) {  
- if (url_fopen(&ffmpeg->ctxt->pb, ft->filename, URL_WRONLY) < 0) {  
+ if (avio_open(&ffmpeg->ctxt->pb, ft->filename, AVIO_FLAG_WRITE) < 0) {  
lsx_fail("ffmpeg could not open `%s'", ft->filename);  
return SOX_EOF;  
}  
}  
 
/* write the stream header, if any */  
- av_write_header(ffmpeg->ctxt);  
+ avformat_write_header(ffmpeg->ctxt, NULL);  
 
return SOX_SUCCESS;  
}  
@@ -478,7 +471,7 @@  
#if (LIBAVFORMAT_VERSION_INT < 0x340000)  
url_fclose(&ffmpeg->ctxt->pb);  
#else  
- url_fclose(ffmpeg->ctxt->pb);  
+ avio_close(ffmpeg->ctxt->pb);  
#endif  
}  
 
 
file:a/utils/ccrypt/Makefile (deleted)
#  
# 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/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)
#  
# 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))  
 
#!/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  
}  
 
#  
# 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))  
 
#!/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