Merge remote-tracking branch 'upstream/master' into openelec-settings

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 &

packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml

@@ -16,6 +16,5 @@
 
 	<string id="3110">Other</string>
 	<string id="3121">Download Directory</string>
-	<string id="3122">Enable uTP support</string>
 
 </strings>

packages/addons/service/downloadmanager/transmission/source/resources/settings.xml

@@ -21,6 +21,5 @@
 		<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>

packages/addons/service/downloadmanager/transmission/source/settings-default.xml

@@ -6,5 +6,4 @@
     <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>

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

packages/addons/service/multimedia/tvheadend/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="tvheadend"
-PKG_VERSION="3.3.402"
+PKG_VERSION="3.3.403"
-PKG_REV="3"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"

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

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