From ea7d19804edd818f640a9aa5298dece33b808471 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 26 Jan 2013 14:16:01 +0200 Subject: [PATCH 1/7] tvheadend: update to tvheadend-3.3.403. bump addon version --- packages/addons/service/multimedia/tvheadend/changelog.txt | 4 ++-- packages/addons/service/multimedia/tvheadend/meta | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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" From 5fad8bb95fa30f37307fa33843832d365c086041 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 26 Jan 2013 15:36:27 +0200 Subject: [PATCH 2/7] transmission: add options to enable / disable LPD & DHT --- .../transmission/source/bin/transmission.start | 12 ++++++++++++ .../source/resources/language/English/strings.xml | 4 +++- .../transmission/source/resources/settings.xml | 2 ++ .../transmission/source/settings-default.xml | 2 ++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start index 455fbf7a5e..aa9972e29d 100755 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start +++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start @@ -81,6 +81,18 @@ else TRANSMISSION_ARG="$TRANSMISSION_ARG --no-utp" fi +if [ "$TRANSMISSION_LPD" = "true" ]; then + TRANSMISSION_ARG="$TRANSMISSION_ARG --lpd" +else + TRANSMISSION_ARG="$TRANSMISSION_ARG --no-lpd" +fi + +if [ "$TRANSMISSION_LPD" = "true" ]; then + TRANSMISSION_ARG="$TRANSMISSION_ARG --dht" +else + TRANSMISSION_ARG="$TRANSMISSION_ARG --no-dht" +fi + if [ ! "$(pidof transmission-daemon)" ];then if [ -f "$LOCKDIR/$LOCKFILE" ] ; then rm -rf "$LOCKDIR/$LOCKFILE" 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..f95f3bfd40 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,8 @@ Other Download Directory - Enable uTP support + Enable uTP for peer connections + Enable local peer discovery (LPD) + Enable distributed hash tables (DHT) diff --git a/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml index 9caf209ad7..ff158ca3e9 100644 --- a/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml +++ b/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml @@ -22,5 +22,7 @@ + + diff --git a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml index c3de30f8e6..56dfa7b9ac 100644 --- a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml +++ b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml @@ -7,4 +7,6 @@ + + From 4d6a95c553191274896a8f763086100d2993b3b9 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 26 Jan 2013 16:00:13 +0200 Subject: [PATCH 3/7] Revert "transmission: add options to enable / disable LPD & DHT" This reverts commit 5fad8bb95fa30f37307fa33843832d365c086041. --- .../transmission/source/bin/transmission.start | 12 ------------ .../source/resources/language/English/strings.xml | 4 +--- .../transmission/source/resources/settings.xml | 2 -- .../transmission/source/settings-default.xml | 2 -- 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start index aa9972e29d..455fbf7a5e 100755 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start +++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start @@ -81,18 +81,6 @@ else TRANSMISSION_ARG="$TRANSMISSION_ARG --no-utp" fi -if [ "$TRANSMISSION_LPD" = "true" ]; then - TRANSMISSION_ARG="$TRANSMISSION_ARG --lpd" -else - TRANSMISSION_ARG="$TRANSMISSION_ARG --no-lpd" -fi - -if [ "$TRANSMISSION_LPD" = "true" ]; then - TRANSMISSION_ARG="$TRANSMISSION_ARG --dht" -else - TRANSMISSION_ARG="$TRANSMISSION_ARG --no-dht" -fi - if [ ! "$(pidof transmission-daemon)" ];then if [ -f "$LOCKDIR/$LOCKFILE" ] ; then rm -rf "$LOCKDIR/$LOCKFILE" 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 f95f3bfd40..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,8 +16,6 @@ Other Download Directory - Enable uTP for peer connections - Enable local peer discovery (LPD) - Enable distributed hash tables (DHT) + 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 ff158ca3e9..9caf209ad7 100644 --- a/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml +++ b/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml @@ -22,7 +22,5 @@ - - diff --git a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml index 56dfa7b9ac..c3de30f8e6 100644 --- a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml +++ b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml @@ -7,6 +7,4 @@ - - From 2a80b33c0db188737810ffe1d02ef7a43211f536 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 26 Jan 2013 17:19:15 +0200 Subject: [PATCH 4/7] busybox: add sysctl.conf.sample --- packages/sysutils/busybox/config/sysctl.conf.sample | 3 +++ packages/sysutils/busybox/install | 12 +++--------- 2 files changed, 6 insertions(+), 9 deletions(-) create mode 100644 packages/sysutils/busybox/config/sysctl.conf.sample 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 64b61ca2e2..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 @@ -68,12 +71,3 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $USER_PASSWORD`" mkdir -p $INSTALL/usr/www/error echo "404" > $INSTALL/usr/www/error/404.html - - # cron support - if [ "$CRON_SUPPORT" = "yes" ] ; then - mkdir -p $INSTALL/etc/init.d - cp $PKG_DIR/scripts/09_crond $INSTALL/etc/init.d/ - else - rm -f $INSTALL/sbin/crond - rm -f $INSTALL/bin/crontab - fi From db9196f8fd486d48bb5b7f4a9ed2d985c54a7d5e Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 26 Jan 2013 17:20:24 +0200 Subject: [PATCH 5/7] Revert "transmission: net.core.{r,w}mem.max *workaround for uTP" This reverts commit 2cf0e0be30ebd6f6e73f1fb78adc897f1cb3ecd4. --- .../transmission/source/bin/transmission.start | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start index 455fbf7a5e..d024063421 100755 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start +++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start @@ -89,11 +89,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 & From 3a0a58f003e65c8e6130459abf0d8db17cedc208 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 26 Jan 2013 17:20:25 +0200 Subject: [PATCH 6/7] Revert "transmission: uTP is now disabled by default. add option to enable it." This reverts commit 0b3c1a4e6730b9884a1682cd503ca270dc0d02df. --- .../transmission/source/bin/transmission.start | 6 ------ .../source/resources/language/English/strings.xml | 1 - .../transmission/source/resources/settings.xml | 1 - .../transmission/source/settings-default.xml | 1 - 4 files changed, 9 deletions(-) diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start index d024063421..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" 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 @@ - From 30c4121a0c90aa0e52d6ad49d9042d4fd474d1c8 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 26 Jan 2013 17:24:27 +0200 Subject: [PATCH 7/7] busybox: oops, accidently removed cron support in 2a80b33c0. sry --- packages/sysutils/busybox/install | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install index 49449deec0..c7c8cc4769 100755 --- a/packages/sysutils/busybox/install +++ b/packages/sysutils/busybox/install @@ -71,3 +71,12 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $USER_PASSWORD`" mkdir -p $INSTALL/usr/www/error echo "404" > $INSTALL/usr/www/error/404.html + + # cron support + if [ "$CRON_SUPPORT" = "yes" ] ; then + mkdir -p $INSTALL/etc/init.d + cp $PKG_DIR/scripts/09_crond $INSTALL/etc/init.d/ + else + rm -f $INSTALL/sbin/crond + rm -f $INSTALL/bin/crontab + fi