From 52268079a47baae6e6fa5924acf71e88e12d2d12 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 21 May 2012 09:21:57 +0000 Subject: main/transmission: upgrade to 2.52 and sync init.d script Copy init.d script from gentoo. fixes #1119 --- main/transmission/APKBUILD | 10 ++-- main/transmission/transmission-daemon.confd | 32 ++++++------- main/transmission/transmission-daemon.initd | 73 ++++++++++++++++++++++++----- 3 files changed, 81 insertions(+), 34 deletions(-) (limited to 'main/transmission') diff --git a/main/transmission/APKBUILD b/main/transmission/APKBUILD index 8c6f96232..bc0241137 100644 --- a/main/transmission/APKBUILD +++ b/main/transmission/APKBUILD @@ -1,7 +1,7 @@ # Maintainer:Carlo Landmeter pkgname=transmission -pkgver=2.51 -pkgrel=2 +pkgver=2.52 +pkgrel=0 pkgdesc="Lightweight GTK BitTorrent client" url="http://www.tansmissionbt.com" install="transmission-daemon.pre-install" @@ -69,6 +69,6 @@ cli() { "$subpkgdir"/usr/bin/ } -md5sums="dfe2faeb2b76b43954ec943affef2133 transmission-2.51.tar.bz2 -1ca57137d38c3429295a4699f535a240 transmission-daemon.initd -89478a70fcd93463e1dd8d751da994da transmission-daemon.confd" +md5sums="9490ed97a03f7b8b1ac8b0822c3dce92 transmission-2.52.tar.bz2 +37c927164a4443db004345c7e19f7795 transmission-daemon.initd +5caf0fc25dfd67c61627f1e0313f4245 transmission-daemon.confd" diff --git a/main/transmission/transmission-daemon.confd b/main/transmission/transmission-daemon.confd index c1f338f07..fcf37c791 100644 --- a/main/transmission/transmission-daemon.confd +++ b/main/transmission/transmission-daemon.confd @@ -1,18 +1,14 @@ -# -# transmission-daemon options -# -# -a --acl Access Control List. (Default: +127.0.0.1) -# -b --blocklist Enable peer blocklists -# -B --no-blocklist Disable peer blocklists -# -f --foreground Run in the foreground instead of daemonizing -# -g --config-dir Where to look for configuration files -# -p --port RPC port (Default: 9091) -# -t --auth Require authentication -# -T --no-auth Don't require authentication -# -u --username Set username for authentication -# -v --password Set password for authentication -# -w --download-dir Where to save downloaded data -# -# NOTE: webif does not work without the -f switch -# -TD_OPTS="-f -g /var/lib/transmission/.config -w /var/lib/transmission" +# This is the transmission-daemon configuration file. For other options and +# better explanation, take a look at transmission-daemon manual page Note: it's +# better to configure some settings (like username/password) in +# /var/transmission/config/settings.json to avoid other users see it with `ps` + +TRANSMISSION_OPTIONS="--encryption-preferred" + +# Run daemon as another user (username or username:groupname) +# If you change this setting, chown -R /var/transmission/config +#runas_user=transmission + +# Location of logfile (should be writeable for runas_user user) +# Set logfile=syslog to use syslog for logging +#logfile=/var/log/transmission/transmission.log diff --git a/main/transmission/transmission-daemon.initd b/main/transmission/transmission-daemon.initd index 4f0acd24f..58d8d11a5 100644 --- a/main/transmission/transmission-daemon.initd +++ b/main/transmission/transmission-daemon.initd @@ -1,22 +1,73 @@ #!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/files/transmission-daemon.initd.8,v 1.2 2011/12/04 10:35:07 swegener Exp $ + +extra_started_commands="reload" +description="Transmission is a fast, easy and free bittorrent client" +description_start="Start transmission-daemon server and web interface" +description_stop="Stop transmission-daemon server and web interface" +description_reload="Reload transmission-daemon settings" + +rundir=${rundir:-/var/run/transmission} +pidfile=${pidfile:-${rundir}/transmission.pid} +config_dir=${config_dir:-/var/transmission/config} +download_dir=${download_dir:-/var/transmission/downloads} +logfile=${logfile:-/var/log/transmission/transmission.log} +runas_user=${runas_user:-transmission:transmission} + +SSD_OPTIONS="" + +# compatibility for upgraders +TRANSMISSION_OPTIONS=${TRANSMISSION_OPTIONS:-$TD_OPTS} depend() { - need net + need net after firewall } +check_config() { + if [ ! -d "${rundir}" ]; then + mkdir "${rundir}" + if [ -n "${runas_user}" ]; then + chown -R ${runas_user} "${rundir}" + fi + fi + + # In case no config directory option passed use default + if ! $(echo ${TRANSMISSION_OPTIONS} | grep -q -e '\B-g' -e '\B--config-dir'); then + TRANSMISSION_OPTIONS="${TRANSMISSION_OPTIONS} --config-dir ${config_dir}" + # put download dir location on first run (and take it from config later) + if [ ! -f ${config_dir}/settings.json ]; then + TRANSMISSION_OPTIONS="${TRANSMISSION_OPTIONS} --download-dir ${download_dir}" + fi + fi + + if [ -n "${runas_user}" ]; then + SSD_OPTIONS="${SSD_OPTIONS} --user ${runas_user}" + fi +} + start() { - ebegin "Starting transmission-daemon" - start-stop-daemon --start --quiet --background --make-pidfile \ - --user transmission:transmission \ - --pidfile /var/run/transmission-daemon.pid \ - --exec /usr/bin/transmission-daemon -- ${TD_OPTS} - eend $? + check_config + + ebegin "Starting transmission daemon" + start-stop-daemon --start --quiet --pidfile ${pidfile} ${SSD_OPTIONS} \ + --exec /usr/bin/transmission-daemon -- --pid-file ${pidfile} \ + $(test ${logfile} != "syslog" && echo --logfile ${logfile}) \ + ${TRANSMISSION_OPTIONS} + eend $? } stop() { - ebegin "Stopping transmission-daemon" - start-stop-daemon --stop --quiet \ - --pidfile /var/run/transmission-daemon.pid \ - eend $? + ebegin "Stopping transmission daemon" + start-stop-daemon --stop --quiet --retry TERM/45/QUIT/15 --pidfile ${pidfile} + eend $? } + +reload() { + ebegin "Reloading transmission configuration" + start-stop-daemon --signal HUP --pidfile ${pidfile} + eend $? +} + -- cgit v1.2.3