diff --git a/packages/addons/service/downloadmanager/transmission/changelog.txt b/packages/addons/service/downloadmanager/transmission/changelog.txt
index 5b5c0c847d..5948f06547 100644
--- a/packages/addons/service/downloadmanager/transmission/changelog.txt
+++ b/packages/addons/service/downloadmanager/transmission/changelog.txt
@@ -1,5 +1,6 @@
3.0.3
- update to transmission-2.76
+- update libevent to libevent-2.0.21-stable
3.0.2
- update to transmission-2.74
diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start
index 295d5173fc..455fbf7a5e 100755
--- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start
+++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start
@@ -75,6 +75,12 @@ else
TRANSMISSION_ARG="$TRANSMISSION_ARG -T"
fi
+if [ "$TRANSMISSION_UTP" = "true" ]; then
+ TRANSMISSION_ARG="$TRANSMISSION_ARG --utp"
+else
+ TRANSMISSION_ARG="$TRANSMISSION_ARG --no-utp"
+fi
+
if [ ! "$(pidof transmission-daemon)" ];then
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
rm -rf "$LOCKDIR/$LOCKFILE"
@@ -83,6 +89,11 @@ if [ ! "$(pidof transmission-daemon)" ];then
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
break
fi
+ # XXX: sysctls for uTP. we may remove this later
+ if [ "$TRANSMISSION_UTP" = "true" ]; then
+ sysctl -w net.core.wmem_max=1048576 > /dev/null 2>&1
+ sysctl -w net.core.rmem_max=4194304 > /dev/null 2>&1
+ fi
EVENT_NOEPOLL=1 LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" eval transmission-daemon -f $TRANSMISSION_ARG &>$LOG_FILE
sleep 1
done &
diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.stop b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.stop
index 2a45c6f384..282f21faa9 100755
--- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.stop
+++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.stop
@@ -29,5 +29,5 @@ mkdir -p "$LOCKDIR"
touch "$LOCKDIR/$LOCKFILE"
if [ "$(pidof transmission-daemon)" ];then
- killall -9 transmission-daemon
+ killall transmission-daemon
fi
diff --git a/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml
index 8f0dd87c49..d5ff333d26 100644
--- a/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml
+++ b/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml
@@ -16,5 +16,6 @@
Other
Download Directory
+ Enable uTP support
diff --git a/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml
index 4149778c6f..9caf209ad7 100644
--- a/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml
+++ b/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml
@@ -21,5 +21,6 @@
+
diff --git a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml
index ab23f3521f..c3de30f8e6 100644
--- a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml
+++ b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml
@@ -6,4 +6,5 @@
+
diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.stop b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.stop
index c807be4b96..4cee53ecc3 100755
--- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.stop
+++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.stop
@@ -29,6 +29,6 @@ mkdir -p "$LOCKDIR"
touch "$LOCKDIR/$LOCKFILE"
if [ "$(pidof vdr.bin)" ];then
- killall -9 vdr.bin
+ killall vdr.bin
fi
diff --git a/packages/devel/libevent/meta b/packages/devel/libevent/meta
index 8e151870be..cc469168b3 100644
--- a/packages/devel/libevent/meta
+++ b/packages/devel/libevent/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libevent"
-PKG_VERSION="2.0.20-stable"
+PKG_VERSION="2.0.21-stable"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="BSD"
diff --git a/packages/devel/libevent/patches/libevent-2.0.21-stable-automake-1.13.patch b/packages/devel/libevent/patches/libevent-2.0.21-stable-automake-1.13.patch
new file mode 100644
index 0000000000..20be348621
--- /dev/null
+++ b/packages/devel/libevent/patches/libevent-2.0.21-stable-automake-1.13.patch
@@ -0,0 +1,46 @@
+diff --git a/configure.in b/configure.in
+index 18165f3..97007b5 100644
+--- a/configure.in
++++ b/configure.in
+@@ -7,12 +7,13 @@ dnl
+ dnl Original version Dug Song
+
+ AC_PREREQ(2.59c)
+-AC_INIT(event.c)
++AC_INIT([libevent], [2.0.21-stable])
++AC_CONFIG_SRCDIR([event.c])
+
+ AC_CONFIG_MACRO_DIR([m4])
+
+-AM_INIT_AUTOMAKE(libevent,2.0.21-stable)
+-AM_CONFIG_HEADER(config.h)
++AM_INIT_AUTOMAKE
++AC_CONFIG_HEADERS(config.h)
+ AC_DEFINE(NUMERIC_VERSION, 0x02001500, [Numeric representation of the version])
+
+ dnl Initialize prefix.
+diff --git a/test/Makefile.am b/test/Makefile.am
+index b10c41a..53e00e4 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -19,8 +19,6 @@ endif
+ EXTRA_PROGRAMS = regress
+ noinst_HEADERS = tinytest.h tinytest_macros.h regress.h tinytest_local.h
+
+-TESTS = $(top_srcdir)/test/test.sh
+-
+ BUILT_SOURCES =
+ if BUILD_REGRESS
+ BUILT_SOURCES += regress.gen.c regress.gen.h
+diff --git a/test/Makefile.in b/test/Makefile.in
+index 451bd3c..939ad57 100644
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -315,7 +315,6 @@ AUTOMAKE_OPTIONS = foreign
+ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include -I../include -DTINYTEST_LOCAL
+ EXTRA_DIST = regress.rpc regress.gen.h regress.gen.c rpcgen_wrapper.sh test.sh
+ noinst_HEADERS = tinytest.h tinytest_macros.h regress.h tinytest_local.h
+-TESTS = $(top_srcdir)/test/test.sh
+ BUILT_SOURCES = $(am__append_2)
+ test_init_SOURCES = test-init.c
+ test_init_LDADD = ../libevent_core.la
diff --git a/packages/initramfs/sysutils/v86d/build b/packages/initramfs/sysutils/v86d/build
index c04fc5de94..0704ba97f3 100755
--- a/packages/initramfs/sysutils/v86d/build
+++ b/packages/initramfs/sysutils/v86d/build
@@ -27,4 +27,4 @@ $SCRIPTS/unpack linux
cd $PKG_BUILD
./configure --with-x86emu
-make KDIR=$(kernel_path)
+make
diff --git a/packages/initramfs/sysutils/v86d/patches/v86d-0.1.10-dont-include-kernelheaders.patch b/packages/initramfs/sysutils/v86d/patches/v86d-0.1.10-dont-include-kernelheaders.patch
new file mode 100644
index 0000000000..c188f05538
--- /dev/null
+++ b/packages/initramfs/sysutils/v86d/patches/v86d-0.1.10-dont-include-kernelheaders.patch
@@ -0,0 +1,18 @@
+diff -Naur v86d-0.1.10/Makefile v86d-0.1.10.patch/Makefile
+--- v86d-0.1.10/Makefile 2011-02-25 22:27:39.000000000 +0100
++++ v86d-0.1.10.patch/Makefile 2013-01-14 19:20:13.385465794 +0100
+@@ -3,14 +3,12 @@
+ .PHONY: clean install install_testvbe x86emu lrmi
+
+ INSTALL = install
+-KDIR ?= /lib/modules/$(shell uname -r)/source
+
+ ifeq ($(call config_opt,CONFIG_KLIBC),true)
+ export CC = klcc
+ endif
+
+ CFLAGS ?= -Wall -g -O2
+-CFLAGS += -I$(KDIR)/include
+
+ ifeq ($(call config_opt,CONFIG_X86EMU),true)
+ CFLAGS += -Ilibs/x86emu
diff --git a/packages/mediacenter/xbmc-pvr-addons/meta b/packages/mediacenter/xbmc-pvr-addons/meta
index 2f9c901f4e..70179b23e2 100644
--- a/packages/mediacenter/xbmc-pvr-addons/meta
+++ b/packages/mediacenter/xbmc-pvr-addons/meta
@@ -25,11 +25,16 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/opdenkamp/xbmc-pvr-addons"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="mysql curl"
-PKG_BUILD_DEPENDS="toolchain mysql curl"
+PKG_DEPENDS="curl"
+PKG_BUILD_DEPENDS="toolchain curl"
PKG_PRIORITY="optional"
PKG_SECTION="mediacenter"
PKG_SHORTDESC="Various PVR addons for XBMC"
PKG_LONGDESC="This addons allows XBMC PVR to connect to various TV/PVR backends and tuners."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
+
+if [ "$MYSQL_SUPPORT" = yes ]; then
+ PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS mysql"
+ PKG_DEPENDS="$PKG_DEPENDS mysql"
+fi
diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 3ff2f9d1fa..14f200da22 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -146,6 +146,30 @@ else
XBMC_AVAHI="--disable-avahi"
fi
+if [ "$UPNP_SUPPORT" = yes ]; then
+ XBMC_UPNP="--enable-upnp"
+else
+ XBMC_UPNP="--disable-upnp"
+fi
+
+if [ "$MYSQL_SUPPORT" = yes ]; then
+ XBMC_MYSQL="--enable-mysql"
+else
+ XBMC_MYSQL="--disable-mysql"
+
+fi
+if [ "$SSHLIB_SUPPORT" = yes ]; then
+ XBMC_SSH="--enable-ssh"
+else
+ XBMC_SSH="--disable-ssh"
+fi
+
+if [ "$OPTICAL_DRIVE_SUPPORT" = yes ]; then
+ XBMC_OPTICAL="--enable-optical-drive"
+else
+ XBMC_OPTICAL="--disable-optical-drive"
+fi
+
if [ "$NFS_SUPPORT" = yes ]; then
XBMC_NFS="--enable-nfs"
else
@@ -281,12 +305,15 @@ cd $PKG_BUILD
--disable-mid \
--disable-hal \
$XBMC_AVAHI \
+ $XBMC_UPNP \
+ $XBMC_MYSQL \
+ $XBMC_SSH \
$XBMC_AIRPLAY \
$XBMC_AIRTUNES \
$XBMC_NONFREE \
--disable-asap-codec \
$XBMC_WEBSERVER \
- --enable-optical-drive \
+ $XBMC_OPTICAL \
$XBMC_BLURAY \
--enable-texturepacker --with-texturepacker-root="$ROOT/$TOOLCHAIN" \
--disable-external-libraries \
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index e9c833cadd..3e0dca1c55 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
PKG_SITE="http://www.xbmc.org"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="boost Python zlib bzip2 systemd pcre ffmpeg libass curl libssh rtmpdump fontconfig tinyxml freetype libmad libogg libmodplug faad2 flac libmpeg2 taglib yajl sqlite bc xbmc-addon-settings"
-PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 systemd lzo pcre swig ffmpeg libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 taglib yajl sqlite mysql"
+PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 systemd lzo pcre swig ffmpeg libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 taglib yajl sqlite"
PKG_PRIORITY="optional"
PKG_SECTION="mediacenter"
PKG_SHORTDESC="xbmc: XBMC Mediacenter"
@@ -130,6 +130,11 @@ if [ "$AVAHI_DAEMON" = yes ]; then
PKG_DEPENDS="$PKG_DEPENDS avahi"
fi
+if [ "$MYSQL_SUPPORT" = yes ]; then
+ PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS mysql"
+ PKG_DEPENDS="$PKG_DEPENDS mysql"
+fi
+
if [ "$AIRPLAY_SUPPORT" = yes ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libplist"
PKG_DEPENDS="$PKG_DEPENDS libplist"
diff --git a/packages/network/iptables/build b/packages/network/iptables/build
index 189aa263a0..d9a7117f47 100755
--- a/packages/network/iptables/build
+++ b/packages/network/iptables/build
@@ -24,9 +24,6 @@
cd $PKG_BUILD
-# remove for building with linux-3.2
- rm -f include/linux/types.h
-
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
@@ -34,8 +31,8 @@ cd $PKG_BUILD
--localstatedir=/var \
--disable-static \
--enable-shared \
- --with-kernel="$(kernel_path)" \
+ --with-kernel="$SYSROOT_PREFIX/usr" \
-make
+make V=1
$MAKEINSTALL
diff --git a/packages/network/iptables/meta b/packages/network/iptables/meta
index 29ef4b728d..960cdd6e66 100644
--- a/packages/network/iptables/meta
+++ b/packages/network/iptables/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="iptables"
-PKG_VERSION="1.4.16.3"
+PKG_VERSION="1.4.17"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
diff --git a/packages/network/iptables/patches/iptables-1.4.17-link.patch b/packages/network/iptables/patches/iptables-1.4.17-link.patch
new file mode 100644
index 0000000000..9c68fc3ed1
--- /dev/null
+++ b/packages/network/iptables/patches/iptables-1.4.17-link.patch
@@ -0,0 +1,84 @@
+From 68e77a26111ee6b8f10c735a76891a7de6d57ee6 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt
+Date: Tue, 1 Jan 2013 22:47:51 +0000
+Subject: [PATCH] build: resolve link failure for ip6t_NETMAP
+
+Link stage of libip6t_NETMAP failed since recently.
+
+ CCLD libip6t_NETMAP.so
+/usr/lib64/gcc/x86_64-suse-linux/4.7/../../../../x86_64-suse-linux/bin/ld:
+cannot find -lip6tc
+
+libip6t_NETMAP.c uses the "ipv6_prefix_length" function from
+libip6tc.so; "-lip6tc" is used in the Makefile, but, the directory to
+it is not specified.
+
+Why does the link succeed for some people? Because
+/usr/lib(64)/libip6tc.so satisfies -lip6tc, but not all environments,
+especially those without iptables development files, have that file,
+hence this link error can happen.
+
+By suggestion of Mike Frysinger, this patch uses libtool to produce
+and link the plugins.
+
+Signed-off-by: Jan Engelhardt
+Acked-by: Mike Frysinger
+Signed-off-by: Pablo Neira Ayuso
+---
+ extensions/GNUmakefile.in | 20 ++++++++++++--------
+ 1 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
+index e71e3ff..adad4d6 100644
+--- a/extensions/GNUmakefile.in
++++ b/extensions/GNUmakefile.in
+@@ -33,6 +33,7 @@ AM_VERBOSE_CXX = @echo " CXX " $@;
+ AM_VERBOSE_CXXLD = @echo " CXXLD " $@;
+ AM_VERBOSE_AR = @echo " AR " $@;
+ AM_VERBOSE_GEN = @echo " GEN " $@;
++AM_VERBOSE_NULL = @
+ endif
+
+ #
+@@ -75,7 +76,7 @@ install: ${targets_install}
+ if test -n "${targets_install}"; then install -pm0755 $^ "${DESTDIR}${xtlibdir}/"; fi;
+
+ clean:
+- rm -f *.o *.oo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
++ rm -f *.la *.o *.lo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
+ rm -f .*.d .*.dd;
+
+ distclean: clean
+@@ -89,19 +90,22 @@ init%.o: init%.c
+ #
+ # Shared libraries
+ #
+-lib%.so: lib%.oo
+- ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< -L../libxtables/.libs -lxtables ${$*_LIBADD};
++lib%.so: lib%.la
++ ${AM_VERBOSE_NULL} ln -fs .libs/$@ $@
+
+-lib%.oo: ${srcdir}/lib%.c
+- ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
++lib%.la: lib%.lo
++ ${AM_VERBOSE_CCLD} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir}
++
++lib%.lo: ${srcdir}/lib%.c
++ ${AM_VERBOSE_CC} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=compile ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init ${CFLAGS} -o $@ -c $<
+
+ libxt_NOTRACK.so: libxt_CT.so
+- ln -fs $< $@
++ ${AM_VERBOSE_GEN} ln -fs $< $@
+ libxt_state.so: libxt_conntrack.so
+- ln -fs $< $@
++ ${AM_VERBOSE_GEN} ln -fs $< $@
+
+ # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
+-ip6t_NETMAP_LIBADD = -lip6tc
++ip6t_NETMAP_LIBADD = ../libiptc/libip6tc.la
+ xt_RATEEST_LIBADD = -lm
+ xt_statistic_LIBADD = -lm
+
+--
+1.7.2.5
+
diff --git a/packages/network/openvpn/build b/packages/network/openvpn/build
index f6c6452ca8..66874186de 100755
--- a/packages/network/openvpn/build
+++ b/packages/network/openvpn/build
@@ -27,6 +27,10 @@ cd $PKG_BUILD
--build=$HOST_NAME \
--prefix=/usr \
--disable-server \
- --enable-password-save
+ --enable-password-save \
+ --disable-plugin-auth-pam \
+ --disable-plugin-down-root \
+ --enable-iproute2 IPROUTE="/bin/ip" \
+
make
diff --git a/packages/network/openvpn/meta b/packages/network/openvpn/meta
index 3f235c927e..dfb8bf0b07 100644
--- a/packages/network/openvpn/meta
+++ b/packages/network/openvpn/meta
@@ -19,12 +19,12 @@
################################################################################
PKG_NAME="openvpn"
-PKG_VERSION="2.2.2"
+PKG_VERSION="2.3.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://openvpn.net"
-PKG_URL="http://swupdate.openvpn.org/community/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://swupdate.openvpn.org/community/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="openssl"
PKG_BUILD_DEPENDS="toolchain lzo openssl"
PKG_PRIORITY="optional"
diff --git a/packages/network/openvpn/patches/openvpn-2.2.2-automake-1.13.patch b/packages/network/openvpn/patches/openvpn-2.2.2-automake-1.13.patch
deleted file mode 100644
index f693197228..0000000000
--- a/packages/network/openvpn/patches/openvpn-2.2.2-automake-1.13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur openvpn-2.2.2/configure.ac openvpn-2.2.2.patch/configure.ac
---- openvpn-2.2.2/configure.ac 2011-12-13 17:58:56.000000000 +0100
-+++ openvpn-2.2.2.patch/configure.ac 2013-01-12 00:50:12.273055490 +0100
-@@ -27,7 +27,7 @@
-
- m4_include(version.m4)
- AC_INIT([OpenVPN], [PRODUCT_VERSION], [openvpn-users@lists.sourceforge.net], [openvpn])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_SRCDIR(syshead.h)
-
- dnl Guess host type.
diff --git a/packages/network/openvpn/patches/openvpn-2.3.0-automake-1.13.patch b/packages/network/openvpn/patches/openvpn-2.3.0-automake-1.13.patch
new file mode 100644
index 0000000000..46dc975303
--- /dev/null
+++ b/packages/network/openvpn/patches/openvpn-2.3.0-automake-1.13.patch
@@ -0,0 +1,12 @@
+diff -Naur openvpn-2.3.0/configure.ac openvpn-2.3.0.patch/configure.ac
+--- openvpn-2.3.0/configure.ac 2012-11-29 21:47:57.000000000 +0100
++++ openvpn-2.3.0.patch/configure.ac 2013-01-16 03:36:51.567034700 +0100
+@@ -32,7 +32,7 @@
+ AC_DEFINE([OPENVPN_VERSION_RESOURCE], [PRODUCT_VERSION_RESOURCE], [Version in windows resource format])
+
+ AC_CONFIG_AUX_DIR([.])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_SRCDIR([src/openvpn/syshead.h])
+ AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE
diff --git a/packages/security/gnutls/meta b/packages/security/gnutls/meta
index d3f2514d52..37a20c5afe 100644
--- a/packages/security/gnutls/meta
+++ b/packages/security/gnutls/meta
@@ -19,12 +19,12 @@
################################################################################
PKG_NAME="gnutls"
-PKG_VERSION="3.0.25"
+PKG_VERSION="3.1.6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"
PKG_SITE="http://www.gnutls.org/"
-PKG_URL="http://ftp.gnu.org/gnu/gnutls/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="cryptodev-linux zlib nettle"
PKG_BUILD_DEPENDS="toolchain cryptodev-linux zlib nettle"
PKG_PRIORITY="optional"
diff --git a/packages/security/gnutls/patches/gnutls-3.0.25-automake-1.13.patch b/packages/security/gnutls/patches/gnutls-3.0.25-automake-1.13.patch
deleted file mode 100644
index adee8bbb49..0000000000
--- a/packages/security/gnutls/patches/gnutls-3.0.25-automake-1.13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gnutls-3.0.25/configure.ac gnutls-3.0.25.patch/configure.ac
---- gnutls-3.0.25/configure.ac 2012-10-12 17:08:55.000000000 +0200
-+++ gnutls-3.0.25.patch/configure.ac 2013-01-12 02:31:30.475591948 +0100
-@@ -27,7 +27,7 @@
-
- AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz dist-lzip -Wall -Werror -Wno-override])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- AC_MSG_RESULT([***
- *** Checking for compilation programs...
diff --git a/packages/security/gnutls/patches/gnutls-3.0.25-automake.patch b/packages/security/gnutls/patches/gnutls-3.0.25-automake.patch
deleted file mode 100644
index 833436011c..0000000000
--- a/packages/security/gnutls/patches/gnutls-3.0.25-automake.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur gnutls-3.0.20/configure.ac gnutls-3.0.20.patch/configure.ac
---- gnutls-3.0.20/configure.ac 2012-05-26 09:31:17.000000000 +0200
-+++ gnutls-3.0.20.patch/configure.ac 2012-06-13 22:02:17.364789323 +0200
-@@ -25,7 +25,7 @@
- AC_CONFIG_AUX_DIR([build-aux])
- AC_CONFIG_MACRO_DIR([m4])
-
--AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz dist-lzip -Wall -Werror -Wno-override])
-+AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz dist-lzip -Wall -Wno-override])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- AM_CONFIG_HEADER(config.h)
-
-@@ -35,6 +35,10 @@
-
- dnl Checks for programs.
- AC_PROG_CC
-+
-+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
-+m4_pattern_allow([AM_PROG_AR])
-+AM_PROG_AR
- AM_PROG_AS
- AC_PROG_CXX
- gl_EARLY
diff --git a/packages/security/gnutls/patches/gnutls-3.1.6-automake-1.13.patch b/packages/security/gnutls/patches/gnutls-3.1.6-automake-1.13.patch
new file mode 100644
index 0000000000..fa29af85a6
--- /dev/null
+++ b/packages/security/gnutls/patches/gnutls-3.1.6-automake-1.13.patch
@@ -0,0 +1,26 @@
+diff -Naur gnutls-3.1.6/configure.ac gnutls-3.1.6.patch/configure.ac
+--- gnutls-3.1.6/configure.ac 2013-01-02 19:01:38.000000000 +0100
++++ gnutls-3.1.6.patch/configure.ac 2013-01-16 00:59:04.022275973 +0100
+@@ -25,9 +25,9 @@
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_MACRO_DIR([m4])
+
+-AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz dist-lzip -Wall -Werror -Wno-override])
++AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz dist-lzip -Wall -Wno-override])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ AC_MSG_RESULT([***
+ *** Checking for compilation programs...
+@@ -35,6 +35,10 @@
+
+ dnl Checks for programs.
+ AC_PROG_CC
++
++# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
++m4_pattern_allow([AM_PROG_AR])
++AM_PROG_AR
+ AM_PROG_AS
+ AC_PROG_CXX
+ gl_EARLY
diff --git a/packages/sysutils/ConsoleKit/scripts/ck-system-restart b/packages/sysutils/ConsoleKit/scripts/ck-system-restart
index 8bf92d5d12..f1485b1b63 100755
--- a/packages/sysutils/ConsoleKit/scripts/ck-system-restart
+++ b/packages/sysutils/ConsoleKit/scripts/ck-system-restart
@@ -25,4 +25,10 @@ LOCKFILE="xbmc.disabled"
touch "$LOCKDIR/$LOCKFILE"
wait_on_xbmc_exit
killall sshd
+killall5 -15
+for seq in `seq 1 10` ; do
+ usleep 500000
+ clear > /dev/tty1
+ killall5 -18 || break
+done
reboot
diff --git a/packages/sysutils/ConsoleKit/scripts/ck-system-stop b/packages/sysutils/ConsoleKit/scripts/ck-system-stop
index 75700497ca..3ee00bb06d 100755
--- a/packages/sysutils/ConsoleKit/scripts/ck-system-stop
+++ b/packages/sysutils/ConsoleKit/scripts/ck-system-stop
@@ -25,4 +25,10 @@ LOCKFILE="xbmc.disabled"
touch "$LOCKDIR/$LOCKFILE"
wait_on_xbmc_exit
killall sshd
+killall5 -15
+for seq in `seq 1 10` ; do
+ usleep 500000
+ clear > /dev/tty1
+ killall5 -18 || break
+done
poweroff
diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf
index bf88897a03..03019de61d 100644
--- a/packages/sysutils/busybox/config/busybox.conf
+++ b/packages/sysutils/busybox/config/busybox.conf
@@ -896,7 +896,7 @@ CONFIG_FREE=y
CONFIG_FUSER=y
CONFIG_KILL=y
CONFIG_KILLALL=y
-# CONFIG_KILLALL5 is not set
+CONFIG_KILLALL5=y
# CONFIG_PGREP is not set
CONFIG_PIDOF=y
# CONFIG_FEATURE_PIDOF_SINGLE is not set
diff --git a/packages/sysutils/busybox/init.d/07_sysctl b/packages/sysutils/busybox/init.d/07_sysctl
index fc34f29e80..1a4452e0df 100644
--- a/packages/sysutils/busybox/init.d/07_sysctl
+++ b/packages/sysutils/busybox/init.d/07_sysctl
@@ -37,3 +37,8 @@ progress "setup sysctl"
if [ -f /etc/sysctl.conf ]; then
sysctl -p /etc/sysctl.conf > /dev/null 2>&1 &
fi
+
+ if [ -f /storage/.config/sysctl.conf ]; then
+ progress "set sysctls from /storage/.config/sysctl.conf"
+ sysctl -p /storage/.config/sysctl.conf > /dev/null 2>&1 &
+ fi
diff --git a/packages/sysutils/busybox/patches/busybox-1.20.2-include_resource.h.patch b/packages/sysutils/busybox/patches/busybox-1.20.2-include_resource.h.patch
deleted file mode 100644
index efa75d1a7d..0000000000
--- a/packages/sysutils/busybox/patches/busybox-1.20.2-include_resource.h.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Naur busybox-1.20.2/loginutils/passwd.c busybox-1.20.2.patch/loginutils/passwd.c
---- busybox-1.20.2/loginutils/passwd.c 2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2.patch/loginutils/passwd.c 2012-07-16 17:08:07.382745761 +0200
-@@ -15,6 +15,7 @@
-
- #include "libbb.h"
- #include
-+#include /* setrlimit */
-
- static void nuke_str(char *str)
- {
-diff -Naur busybox-1.20.2/miscutils/time.c busybox-1.20.2.patch/miscutils/time.c
---- busybox-1.20.2/miscutils/time.c 2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2.patch/miscutils/time.c 2012-07-16 17:08:07.383745781 +0200
-@@ -16,6 +16,7 @@
- //usage: "\n -v Verbose"
-
- #include "libbb.h"
-+#include /* getrusage */
-
- /* Information on the resources used by a child process. */
- typedef struct {
-diff -Naur busybox-1.20.2/networking/inetd.c busybox-1.20.2.patch/networking/inetd.c
---- busybox-1.20.2/networking/inetd.c 2012-07-02 16:08:25.000000000 +0200
-+++ busybox-1.20.2.patch/networking/inetd.c 2012-07-16 17:08:39.368394206 +0200
-@@ -165,6 +165,7 @@
- //usage: "\n (default: 0 - disabled)"
-
- #include
-+#include /* setrlimit */
- #include
-
- #include "libbb.h"
-diff -Naur busybox-1.20.2/networking/ntpd.c busybox-1.20.2.patch/networking/ntpd.c
---- busybox-1.20.2/networking/ntpd.c 2012-07-02 16:08:25.000000000 +0200
-+++ busybox-1.20.2.patch/networking/ntpd.c 2012-07-16 17:08:07.386745839 +0200
-@@ -46,6 +46,7 @@
- #include "libbb.h"
- #include
- #include /* For IPTOS_LOWDELAY definition */
-+#include /* setpriority */
- #include
- #ifndef IPTOS_LOWDELAY
- # define IPTOS_LOWDELAY 0x10
-diff -Naur busybox-1.20.2/networking/ntpd_simple.c busybox-1.20.2.patch/networking/ntpd_simple.c
---- busybox-1.20.2/networking/ntpd_simple.c 2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2.patch/networking/ntpd_simple.c 2012-07-16 17:08:07.386745839 +0200
-@@ -7,6 +7,7 @@
- */
- #include "libbb.h"
- #include /* For IPTOS_LOWDELAY definition */
-+#include /* setpriority */
- #ifndef IPTOS_LOWDELAY
- # define IPTOS_LOWDELAY 0x10
- #endif
-diff -Naur busybox-1.20.2/runit/chpst.c busybox-1.20.2.patch/runit/chpst.c
---- busybox-1.20.2/runit/chpst.c 2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2.patch/runit/chpst.c 2012-07-16 17:08:07.387745858 +0200
-@@ -91,6 +91,7 @@
- //usage: "\n a SIGXCPU after N seconds"
-
- #include "libbb.h"
-+#include /* getrlimit */
-
- /*
- Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit.
-diff -Naur busybox-1.20.2/shell/shell_common.c busybox-1.20.2.patch/shell/shell_common.c
---- busybox-1.20.2/shell/shell_common.c 2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2.patch/shell/shell_common.c 2012-07-16 17:08:07.388745877 +0200
-@@ -18,6 +18,7 @@
- */
- #include "libbb.h"
- #include "shell_common.h"
-+#include /* getrlimit */
-
- const char defifsvar[] ALIGN1 = "IFS= \t\n";
-
diff --git a/packages/sysutils/busybox/patches/busybox-1.20.2-pkg-config-selinux.patch b/packages/sysutils/busybox/patches/busybox-1.20.2-pkg-config-selinux.patch
new file mode 100644
index 0000000000..f39250c859
--- /dev/null
+++ b/packages/sysutils/busybox/patches/busybox-1.20.2-pkg-config-selinux.patch
@@ -0,0 +1,67 @@
+From b1cec5003b73080a8aa7ea277621bf1c71c3e8d6 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger
+Date: Sat, 20 Oct 2012 15:01:26 -0400
+Subject: [PATCH] build system: use pkg-config to look up selinux libs
+
+Newer versions of libselinux has started linking against more libs.
+Rather than continuing hardcoding things, switch to using pkg-config
+to query for its dependencies.
+
+Signed-off-by: Mike Frysinger
+---
+ Makefile | 1 +
+ Makefile.flags | 12 +++++++++++-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index fccde4a..3a0a5e1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -297,6 +297,7 @@ NM = $(CROSS_COMPILE)nm
+ STRIP = $(CROSS_COMPILE)strip
+ OBJCOPY = $(CROSS_COMPILE)objcopy
+ OBJDUMP = $(CROSS_COMPILE)objdump
++PKG_CONFIG ?= $(CROSS_COMPILE)pkg-config
+ AWK = awk
+ GENKSYMS = scripts/genksyms/genksyms
+ DEPMOD = /sbin/depmod
+diff --git a/Makefile.flags b/Makefile.flags
+index c43c8dc..15dcc1f 100644
+--- a/Makefile.flags
++++ b/Makefile.flags
+@@ -74,6 +74,12 @@ ARCH_FPIC ?= -fpic
+ ARCH_FPIE ?= -fpie
+ ARCH_PIE ?= -pie
+
++# Usage: $(eval $(call pkg_check_modules,VARIABLE-PREFIX,MODULES))
++define pkg_check_modules
++$(1)_CFLAGS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags $(2))
++$(1)_LIBS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs $(2))
++endef
++
+ ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y)
+ # on i386: 14% smaller libbusybox.so
+ # (code itself is 9% bigger, we save on relocs/PLT/GOT)
+@@ -85,6 +91,7 @@ endif
+
+ ifeq ($(CONFIG_STATIC),y)
+ CFLAGS_busybox += -static
++PKG_CONFIG_FLAGS += --static
+ endif
+
+ ifeq ($(CONFIG_PIE),y)
+@@ -127,7 +134,10 @@ LDLIBS += pam pam_misc pthread
+ endif
+
+ ifeq ($(CONFIG_SELINUX),y)
+-LDLIBS += selinux sepol
++SELINUX_PC_MODULES = libselinux libsepol
++$(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES)))
++CPPFLAGS += $(SELINUX_CFLAGS)
++LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%))
+ endif
+
+ ifeq ($(CONFIG_EFENCE),y)
+--
+1.7.12
+
diff --git a/packages/sysutils/busybox/patches/busybox-1.20.2-sys-resource.patch b/packages/sysutils/busybox/patches/busybox-1.20.2-sys-resource.patch
new file mode 100644
index 0000000000..7b18500847
--- /dev/null
+++ b/packages/sysutils/busybox/patches/busybox-1.20.2-sys-resource.patch
@@ -0,0 +1,123 @@
+From 5a5dfcad6ba96d12d68bd7b39279215a8fee70d3 Mon Sep 17 00:00:00 2001
+From: Tias Guns
+Date: Sun, 10 Jun 2012 14:19:01 +0200
+Subject: [PATCH] inetd: fix build failure in Android
+
+Signed-off-by: Tias Guns
+Signed-off-by: Denys Vlasenko
+(cherry picked from commit 64f763b42a43cbf36e401690ff6767c25575e520)
+---
+ networking/inetd.c | 1 +
+ 1 file changed, 1 insertion(+)
+--
+1.7.12
+
+From 246ea72843d5b7e9d4cd902dc5e9d71359196303 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger
+Date: Thu, 5 Jul 2012 23:19:09 -0400
+Subject: [PATCH] include sys/resource.h where needed
+
+We use functions from sys/resource.h in misc applets, but don't include
+the header. This breaks building with newer glibc versions, so add the
+include where needed.
+
+Signed-off-by: Mike Frysinger
+(cherry picked from commit c5fe9f7b723f949457263ef8e22ab807d5b549ce)
+---
+ loginutils/passwd.c | 1 +
+ miscutils/time.c | 1 +
+ networking/inetd.c | 1 +
+ networking/ntpd.c | 1 +
+ networking/ntpd_simple.c | 1 +
+ runit/chpst.c | 1 +
+ shell/shell_common.c | 1 +
+ 7 files changed, 7 insertions(+)
+
+diff --git a/loginutils/passwd.c b/loginutils/passwd.c
+index b83db00..a7006f0 100644
+--- a/loginutils/passwd.c
++++ b/loginutils/passwd.c
+@@ -15,6 +15,7 @@
+
+ #include "libbb.h"
+ #include
++#include /* setrlimit */
+
+ static void nuke_str(char *str)
+ {
+diff --git a/miscutils/time.c b/miscutils/time.c
+index 945f15f..ffed386 100644
+--- a/miscutils/time.c
++++ b/miscutils/time.c
+@@ -16,6 +16,7 @@
+ //usage: "\n -v Verbose"
+
+ #include "libbb.h"
++#include /* getrusage */
+
+ /* Information on the resources used by a child process. */
+ typedef struct {
+diff --git a/networking/inetd.c b/networking/inetd.c
+index 1308d74..00baf69 100644
+--- a/networking/inetd.c
++++ b/networking/inetd.c
+@@ -165,6 +165,8 @@
+ //usage: "\n (default: 0 - disabled)"
+
+ #include
++#include /* setrlimit */
++#include /* un.h may need this */
+ #include
+
+ #include "libbb.h"
+diff --git a/networking/ntpd.c b/networking/ntpd.c
+index 603801e..b885215 100644
+--- a/networking/ntpd.c
++++ b/networking/ntpd.c
+@@ -46,6 +46,7 @@
+ #include "libbb.h"
+ #include
+ #include /* For IPTOS_LOWDELAY definition */
++#include /* setpriority */
+ #include
+ #ifndef IPTOS_LOWDELAY
+ # define IPTOS_LOWDELAY 0x10
+diff --git a/networking/ntpd_simple.c b/networking/ntpd_simple.c
+index 4ad44e4..1b7c66b 100644
+--- a/networking/ntpd_simple.c
++++ b/networking/ntpd_simple.c
+@@ -7,6 +7,7 @@
+ */
+ #include "libbb.h"
+ #include /* For IPTOS_LOWDELAY definition */
++#include /* setpriority */
+ #ifndef IPTOS_LOWDELAY
+ # define IPTOS_LOWDELAY 0x10
+ #endif
+diff --git a/runit/chpst.c b/runit/chpst.c
+index ac296ba..ed72c8b 100644
+--- a/runit/chpst.c
++++ b/runit/chpst.c
+@@ -91,6 +91,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ //usage: "\n a SIGXCPU after N seconds"
+
+ #include "libbb.h"
++#include /* getrlimit */
+
+ /*
+ Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit.
+diff --git a/shell/shell_common.c b/shell/shell_common.c
+index 51c92d6..780e27e 100644
+--- a/shell/shell_common.c
++++ b/shell/shell_common.c
+@@ -18,6 +18,7 @@
+ */
+ #include "libbb.h"
+ #include "shell_common.h"
++#include /* getrlimit */
+
+ const char defifsvar[] ALIGN1 = "IFS= \t\n";
+
+--
+1.7.12
+
diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf
index b29b43d952..c0ce69ea35 100644
--- a/projects/ATV/linux/linux.i386.conf
+++ b/projects/ATV/linux/linux.i386.conf
@@ -1962,7 +1962,7 @@ CONFIG_DVB_USB_CE6230=m
CONFIG_DVB_USB_EC168=m
CONFIG_DVB_USB_AZ6007=m
CONFIG_DVB_USB_AZ6027=m
-# CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_LME2510=m
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m
# CONFIG_DVB_USB_MXL111SF is not set
@@ -2122,7 +2122,9 @@ CONFIG_DVB_LNBP22=m
CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
CONFIG_DVB_A8293=m
+CONFIG_DVB_IX2505V=m
CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
CONFIG_DVB_AF9033=m
#
diff --git a/projects/ATV/options b/projects/ATV/options
index 9b0944247d..b544ea619d 100755
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -175,6 +175,18 @@
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
+# build with UPnP support (yes / no)
+ UPNP_SUPPORT="yes"
+
+# build with MySQL support (yes / no)
+ MYSQL_SUPPORT="yes"
+
+# build xbmc with sshlib support (yes / no)
+ SSHLIB_SUPPORT="yes"
+
+# build xbmc with optical drive support (yes / no)
+ OPTICAL_DRIVE_SUPPORT="yes"
+
# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
AIRPLAY_SUPPORT="yes"
diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf
index fb65bda8b4..ed2b4fa34a 100644
--- a/projects/Fusion/linux/linux.i386.conf
+++ b/projects/Fusion/linux/linux.i386.conf
@@ -2229,7 +2229,7 @@ CONFIG_DVB_USB_CE6230=m
CONFIG_DVB_USB_EC168=m
CONFIG_DVB_USB_AZ6007=m
CONFIG_DVB_USB_AZ6027=m
-# CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_LME2510=m
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m
# CONFIG_DVB_USB_MXL111SF is not set
@@ -2416,7 +2416,9 @@ CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
CONFIG_DVB_A8293=m
CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
CONFIG_DVB_AF9033=m
#
diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf
index b7d68eceae..40d0c23d1f 100644
--- a/projects/Fusion/linux/linux.x86_64.conf
+++ b/projects/Fusion/linux/linux.x86_64.conf
@@ -2178,7 +2178,7 @@ CONFIG_DVB_USB_CE6230=m
CONFIG_DVB_USB_EC168=m
CONFIG_DVB_USB_AZ6007=m
CONFIG_DVB_USB_AZ6027=m
-# CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_LME2510=m
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m
# CONFIG_DVB_USB_MXL111SF is not set
@@ -2365,7 +2365,9 @@ CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
CONFIG_DVB_A8293=m
CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
CONFIG_DVB_AF9033=m
#
diff --git a/projects/Fusion/options b/projects/Fusion/options
index 975efb748d..00a188d25b 100755
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -174,6 +174,18 @@
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
+# build with UPnP support (yes / no)
+ UPNP_SUPPORT="yes"
+
+# build with MySQL support (yes / no)
+ MYSQL_SUPPORT="yes"
+
+# build xbmc with sshlib support (yes / no)
+ SSHLIB_SUPPORT="yes"
+
+# build xbmc with optical drive support (yes / no)
+ OPTICAL_DRIVE_SUPPORT="yes"
+
# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
AIRPLAY_SUPPORT="yes"
diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf
index 4c6ac0df8c..e4c8cd5867 100644
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@@ -2313,7 +2313,7 @@ CONFIG_DVB_USB_CE6230=m
CONFIG_DVB_USB_EC168=m
CONFIG_DVB_USB_AZ6007=m
CONFIG_DVB_USB_AZ6027=m
-# CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_LME2510=m
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m
# CONFIG_DVB_USB_MXL111SF is not set
@@ -2501,7 +2501,9 @@ CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
CONFIG_DVB_A8293=m
CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
CONFIG_DVB_AF9033=m
#
diff --git a/projects/Generic/options b/projects/Generic/options
index 829f09a4fe..71a0d6e8a9 100755
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -174,6 +174,18 @@
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
+# build with UPnP support (yes / no)
+ UPNP_SUPPORT="yes"
+
+# build with MySQL support (yes / no)
+ MYSQL_SUPPORT="yes"
+
+# build xbmc with sshlib support (yes / no)
+ SSHLIB_SUPPORT="yes"
+
+# build xbmc with optical drive support (yes / no)
+ OPTICAL_DRIVE_SUPPORT="yes"
+
# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
AIRPLAY_SUPPORT="yes"
diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf
index adb10b136a..a2c21afe2d 100644
--- a/projects/Generic_OSS/linux/linux.i386.conf
+++ b/projects/Generic_OSS/linux/linux.i386.conf
@@ -2311,7 +2311,7 @@ CONFIG_DVB_USB_CE6230=m
CONFIG_DVB_USB_EC168=m
CONFIG_DVB_USB_AZ6007=m
CONFIG_DVB_USB_AZ6027=m
-# CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_LME2510=m
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m
# CONFIG_DVB_USB_MXL111SF is not set
@@ -2499,7 +2499,9 @@ CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
CONFIG_DVB_A8293=m
CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
CONFIG_DVB_AF9033=m
#
diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options
index 194b9c466a..d6fb78b838 100755
--- a/projects/Generic_OSS/options
+++ b/projects/Generic_OSS/options
@@ -174,6 +174,18 @@
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
+# build with UPnP support (yes / no)
+ UPNP_SUPPORT="yes"
+
+# build with MySQL support (yes / no)
+ MYSQL_SUPPORT="yes"
+
+# build xbmc with sshlib support (yes / no)
+ SSHLIB_SUPPORT="yes"
+
+# build xbmc with optical drive support (yes / no)
+ OPTICAL_DRIVE_SUPPORT="yes"
+
# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
AIRPLAY_SUPPORT="yes"
diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf
index 6d9bb78a03..94c803c0be 100644
--- a/projects/ION/linux/linux.i386.conf
+++ b/projects/ION/linux/linux.i386.conf
@@ -2201,7 +2201,7 @@ CONFIG_DVB_USB_CE6230=m
CONFIG_DVB_USB_EC168=m
CONFIG_DVB_USB_AZ6007=m
CONFIG_DVB_USB_AZ6027=m
-# CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_LME2510=m
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m
# CONFIG_DVB_USB_MXL111SF is not set
@@ -2389,7 +2389,9 @@ CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
CONFIG_DVB_A8293=m
CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
CONFIG_DVB_AF9033=m
#
diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf
index 64c30215be..fac7b234d5 100644
--- a/projects/ION/linux/linux.x86_64.conf
+++ b/projects/ION/linux/linux.x86_64.conf
@@ -2136,7 +2136,7 @@ CONFIG_DVB_USB_CE6230=m
CONFIG_DVB_USB_EC168=m
CONFIG_DVB_USB_AZ6007=m
CONFIG_DVB_USB_AZ6027=m
-# CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_LME2510=m
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m
# CONFIG_DVB_USB_MXL111SF is not set
@@ -2324,7 +2324,9 @@ CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
CONFIG_DVB_A8293=m
CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
CONFIG_DVB_AF9033=m
#
diff --git a/projects/ION/options b/projects/ION/options
index f7c21849d0..ec08935ee8 100755
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -174,6 +174,18 @@
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
+# build with UPnP support (yes / no)
+ UPNP_SUPPORT="yes"
+
+# build with MySQL support (yes / no)
+ MYSQL_SUPPORT="yes"
+
+# build xbmc with sshlib support (yes / no)
+ SSHLIB_SUPPORT="yes"
+
+# build xbmc with optical drive support (yes / no)
+ OPTICAL_DRIVE_SUPPORT="yes"
+
# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
AIRPLAY_SUPPORT="yes"
diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf
index 78bd6d5173..fcf2d6f5d9 100644
--- a/projects/Intel/linux/linux.i386.conf
+++ b/projects/Intel/linux/linux.i386.conf
@@ -2218,7 +2218,7 @@ CONFIG_DVB_USB_CE6230=m
CONFIG_DVB_USB_EC168=m
CONFIG_DVB_USB_AZ6007=m
CONFIG_DVB_USB_AZ6027=m
-# CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_LME2510=m
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m
# CONFIG_DVB_USB_MXL111SF is not set
@@ -2406,7 +2406,9 @@ CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
CONFIG_DVB_A8293=m
CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
CONFIG_DVB_AF9033=m
#
diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf
index bb57a75a8e..782c11a7c8 100644
--- a/projects/Intel/linux/linux.x86_64.conf
+++ b/projects/Intel/linux/linux.x86_64.conf
@@ -2154,7 +2154,7 @@ CONFIG_DVB_USB_CE6230=m
CONFIG_DVB_USB_EC168=m
CONFIG_DVB_USB_AZ6007=m
CONFIG_DVB_USB_AZ6027=m
-# CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_LME2510=m
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m
# CONFIG_DVB_USB_MXL111SF is not set
@@ -2342,7 +2342,9 @@ CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
CONFIG_DVB_A8293=m
CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
CONFIG_DVB_AF9033=m
#
diff --git a/projects/Intel/options b/projects/Intel/options
index a2754dbe04..c7bbb49e8c 100755
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -174,6 +174,18 @@
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
+# build with UPnP support (yes / no)
+ UPNP_SUPPORT="yes"
+
+# build with MySQL support (yes / no)
+ MYSQL_SUPPORT="yes"
+
+# build xbmc with sshlib support (yes / no)
+ SSHLIB_SUPPORT="yes"
+
+# build xbmc with optical drive support (yes / no)
+ OPTICAL_DRIVE_SUPPORT="yes"
+
# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
AIRPLAY_SUPPORT="yes"
diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf
index 341aa1c303..3ff09ffbe1 100644
--- a/projects/RPi/linux/linux.arm.conf
+++ b/projects/RPi/linux/linux.arm.conf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.6.10 Kernel Configuration
+# Linux/arm 3.6.11 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1604,7 +1604,7 @@ CONFIG_DVB_USB_CE6230=m
CONFIG_DVB_USB_EC168=m
CONFIG_DVB_USB_AZ6007=m
CONFIG_DVB_USB_AZ6027=m
-# CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_LME2510=m
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m
# CONFIG_DVB_USB_MXL111SF is not set
@@ -1723,7 +1723,9 @@ CONFIG_DVB_LNBP22=m
CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
CONFIG_DVB_A8293=m
+CONFIG_DVB_IX2505V=m
CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
CONFIG_DVB_AF9033=m
#
@@ -1922,7 +1924,6 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
# CONFIG_USB_STORAGE_ENE_UB6250 is not set
-# CONFIG_USB_UAS is not set
CONFIG_USB_LIBUSUAL=y
#
diff --git a/projects/RPi/options b/projects/RPi/options
index cc9e2a08fe..570a89d588 100755
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -174,6 +174,18 @@
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
+# build with UPnP support (yes / no)
+ UPNP_SUPPORT="yes"
+
+# build with MySQL support (yes / no)
+ MYSQL_SUPPORT="yes"
+
+# build xbmc with sshlib support (yes / no)
+ SSHLIB_SUPPORT="yes"
+
+# build xbmc with optical drive support (yes / no)
+ OPTICAL_DRIVE_SUPPORT="yes"
+
# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
AIRPLAY_SUPPORT="yes"
diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf
index 87ce3f27a0..97c1a89f24 100644
--- a/projects/Ultra/linux/linux.x86_64.conf
+++ b/projects/Ultra/linux/linux.x86_64.conf
@@ -2019,7 +2019,7 @@ CONFIG_DVB_USB_CE6230=m
CONFIG_DVB_USB_EC168=m
CONFIG_DVB_USB_AZ6007=m
CONFIG_DVB_USB_AZ6027=m
-# CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_LME2510=m
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m
# CONFIG_DVB_USB_MXL111SF is not set
@@ -2179,7 +2179,9 @@ CONFIG_DVB_LNBP22=m
CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
CONFIG_DVB_A8293=m
+CONFIG_DVB_IX2505V=m
CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
CONFIG_DVB_AF9033=m
#
diff --git a/projects/Ultra/options b/projects/Ultra/options
index a954c61d04..1b3d95f45c 100755
--- a/projects/Ultra/options
+++ b/projects/Ultra/options
@@ -174,6 +174,18 @@
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
+# build with UPnP support (yes / no)
+ UPNP_SUPPORT="yes"
+
+# build with MySQL support (yes / no)
+ MYSQL_SUPPORT="yes"
+
+# build xbmc with sshlib support (yes / no)
+ SSHLIB_SUPPORT="yes"
+
+# build xbmc with optical drive support (yes / no)
+ OPTICAL_DRIVE_SUPPORT="yes"
+
# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
AIRPLAY_SUPPORT="yes"
diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf
index b596c9bd20..c5f794daf7 100644
--- a/projects/Virtual/linux/linux.i386.conf
+++ b/projects/Virtual/linux/linux.i386.conf
@@ -2220,7 +2220,7 @@ CONFIG_DVB_USB_CE6230=m
CONFIG_DVB_USB_EC168=m
CONFIG_DVB_USB_AZ6007=m
CONFIG_DVB_USB_AZ6027=m
-# CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_LME2510=m
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m
# CONFIG_DVB_USB_MXL111SF is not set
@@ -2408,7 +2408,9 @@ CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
CONFIG_DVB_A8293=m
CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
CONFIG_DVB_AF9033=m
#
diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf
index d7b04c6094..256901c1da 100644
--- a/projects/Virtual/linux/linux.x86_64.conf
+++ b/projects/Virtual/linux/linux.x86_64.conf
@@ -2155,7 +2155,7 @@ CONFIG_DVB_USB_CE6230=m
CONFIG_DVB_USB_EC168=m
CONFIG_DVB_USB_AZ6007=m
CONFIG_DVB_USB_AZ6027=m
-# CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_LME2510=m
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m
# CONFIG_DVB_USB_MXL111SF is not set
@@ -2343,7 +2343,9 @@ CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
CONFIG_DVB_A8293=m
CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
CONFIG_DVB_AF9033=m
#
diff --git a/projects/Virtual/options b/projects/Virtual/options
index c52937d55a..0e1bbe6937 100755
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@@ -169,6 +169,18 @@
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
+# build with UPnP support (yes / no)
+ UPNP_SUPPORT="yes"
+
+# build with MySQL support (yes / no)
+ MYSQL_SUPPORT="yes"
+
+# build xbmc with sshlib support (yes / no)
+ SSHLIB_SUPPORT="yes"
+
+# build xbmc with optical drive support (yes / no)
+ OPTICAL_DRIVE_SUPPORT="yes"
+
# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
AIRPLAY_SUPPORT="yes"
diff --git a/tools/mkpkg/mkpkg_xbmc-frodo b/tools/mkpkg/mkpkg_xbmc-frodo
new file mode 100755
index 0000000000..9e10af5008
--- /dev/null
+++ b/tools/mkpkg/mkpkg_xbmc-frodo
@@ -0,0 +1,78 @@
+#!/bin/sh
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+# This Program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This Program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC.tv; see the file COPYING. If not, write to
+# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+# http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="xbmc"
+PKG_VERSION=""
+GIT_REPO="-b Frodo git://github.com/xbmc/xbmc.git"
+DEST_DIR="$PKG_NAME-frodo"
+
+echo "getting sources..."
+ if [ ! -d $DEST_DIR-latest ]; then
+ git clone $GIT_REPO $DEST_DIR-latest
+ fi
+
+ cd $DEST_DIR-latest
+ git pull
+
+echo "getting version..."
+ GIT_REV=`git log -n1 --format=%h`
+ echo $GIT_REV
+ cd ..
+ PKG_VERSION="$GIT_REV"
+
+echo "copying sources..."
+ rm -rf $PKG_NAME-$PKG_VERSION
+ cp -R $DEST_DIR-latest $PKG_NAME-$PKG_VERSION
+ echo "$GIT_REV" > $PKG_NAME-$PKG_VERSION/git.version
+
+echo "cleaning sources..."
+ rm -rf $PKG_NAME-$PKG_VERSION/.git
+
+echo "seperating theme..."
+ rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION
+ mv $PKG_NAME-$PKG_VERSION/addons/skin.confluence $PKG_NAME-theme-Confluence-$PKG_VERSION
+
+echo "cleaning sources..."
+ rm -rf $PKG_NAME-$PKG_VERSION/visualisations
+ rm -rf $PKG_NAME-$PKG_VERSION/lib/libSDL-*
+ rm -rf $PKG_NAME-$PKG_VERSION/lib/libcurl-*
+ rm -rf $PKG_NAME-$PKG_VERSION/project
+
+ for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \
+ "PackageMaker" "Translator" "XBMCLive" "XprPack" \
+ "HardwareConfigure" "Mach5" "osx" "UpdateThumbs.py" "XBMCTex"; do
+ rm -rf $PKG_NAME-$PKG_VERSION/tools/$i
+ done
+
+ for i in dll a lib so bat; do
+ find $PKG_NAME-$PKG_VERSION -name *.$i -exec rm -rf {} ";"
+ done
+
+ # bundled win32 binaries
+ rm -r $PKG_NAME-$PKG_VERSION/xbmc/visualizations/XBMCProjectM/win32
+
+echo "packing sources..."
+ tar cvJf $PKG_NAME-$PKG_VERSION.tar.xz $PKG_NAME-$PKG_VERSION
+ tar cvJf $PKG_NAME-theme-Confluence-$PKG_VERSION.tar.xz $PKG_NAME-theme-Confluence-$PKG_VERSION
+
+echo "remove temporary sourcedir..."
+ rm -rf $PKG_NAME-$PKG_VERSION
+ rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION