diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start index 455fbf7a5e..295d5173fc 100755 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start +++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start @@ -75,12 +75,6 @@ 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" @@ -89,11 +83,6 @@ 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/resources/language/English/strings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml index d5ff333d26..8f0dd87c49 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,6 +16,5 @@ 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 9caf209ad7..4149778c6f 100644 --- a/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml +++ b/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml @@ -21,6 +21,5 @@ - diff --git a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml index c3de30f8e6..ab23f3521f 100644 --- a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml +++ b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml @@ -6,5 +6,4 @@ - diff --git a/packages/addons/service/multimedia/tvheadend/changelog.txt b/packages/addons/service/multimedia/tvheadend/changelog.txt index 636af1b6db..f3b59c4772 100644 --- a/packages/addons/service/multimedia/tvheadend/changelog.txt +++ b/packages/addons/service/multimedia/tvheadend/changelog.txt @@ -1,9 +1,9 @@ 3.0.4 -- update to TVHeadend 3.3.402 +- update to TVHeadend 3.3.403 3.0.3 - update to TVHeadend 3.3.328 -- add an option to preload capmt_ca.so library +- add an option to preload capmt_ca.so library 3.0.2 - update to TVHeadend 3.2.18 diff --git a/packages/addons/service/multimedia/tvheadend/meta b/packages/addons/service/multimedia/tvheadend/meta index 8e668c4c0f..5502c6f7af 100644 --- a/packages/addons/service/multimedia/tvheadend/meta +++ b/packages/addons/service/multimedia/tvheadend/meta @@ -19,8 +19,8 @@ ################################################################################ PKG_NAME="tvheadend" -PKG_VERSION="3.3.402" -PKG_REV="3" +PKG_VERSION="3.3.403" +PKG_REV="4" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html" diff --git a/packages/sysutils/busybox/config/sysctl.conf.sample b/packages/sysutils/busybox/config/sysctl.conf.sample new file mode 100644 index 0000000000..37270a79d4 --- /dev/null +++ b/packages/sysutils/busybox/config/sysctl.conf.sample @@ -0,0 +1,3 @@ +## transmission with uTP support +# net.core.wmem_max=1048576 +# net.core.rmem_max=4194304 diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install index 135928b0b7..49449deec0 100755 --- a/packages/sysutils/busybox/install +++ b/packages/sysutils/busybox/install @@ -50,6 +50,9 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $USER_PASSWORD`" cp $PKG_DIR/config/httpd.conf $INSTALL/etc echo "chmod 000 $INSTALL/etc/shadow" >> $FAKEROOT_SCRIPT + mkdir -p $INSTALL/usr/config + cp $PKG_DIR/config/sysctl.conf.sample $INSTALL/usr/config + # /etc/fstab is needed by... touch $INSTALL/etc/fstab