Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-settings

2026-03-31 14:41:55 -07:00 · 2013-01-16 04:03:27 +01:00
parent c116822736 ddf2d4a476
commit 8e76ae5f89
55 changed files with 692 additions and 159 deletions
--- 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
--- 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 &
--- 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
--- 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 @@

 	<string id="3110">Other</string>
 	<string id="3121">Download Directory</string>
+	<string id="3122">Enable uTP support</string>

 </strings>
--- a/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml
+++ b/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml
@@ -21,5 +21,6 @@
 		<setting type="sep" />
 		<setting label="3110" type="lsep"/>
 		<setting id="TRANSMISSION_DL_DIR" type="folder" label="3121" value="" default="/storage/downloads" />
+		<setting id="TRANSMISSION_UTP" type="bool" label="3122" default="false" />
    </category>
 </settings>
--- a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml
+++ b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml
@@ -6,4 +6,5 @@
    <setting id="TRANSMISSION_LIMIT_GLOBAL" value="" />
    <setting id="TRANSMISSION_LIMIT_TORRENT" value="" />
    <setting id="TRANSMISSION_DL_DIR" value="/storage/downloads" />
+    <setting id="TRANSMISSION_UTP" value="false" />
 </settings>
--- 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

--- 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"
--- 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
@@ -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 <dugsong@monkey.org>
+ 
+ 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
--- 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
--- 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
@@ -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
--- 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
--- 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 \
--- 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"
--- 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
--- 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"
--- a/packages/network/iptables/patches/iptables-1.4.17-link.patch
+++ 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 <jengelh@inai.de>
+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 <jengelh@inai.de>
+Acked-by: Mike Frysinger <vapier@gentoo.org>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ 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
+
--- 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
--- 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"
--- 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
@@ -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.
--- a/Show More
+++ b/Show More