Version bump, #340851 thank Dean Matzkov for report. Rewrote init script to make use of upstream defaults instead of hardcoding them, added reload target (#333767 by mark@tvk.rwth-aachen.de), should work with baselayout-1 (#336315 thank Domen Kožar for report) and also this should allow much more flexible configurations (like requested in bug #323933). Added warnings to store passwords in settings.json file for security reasons (#323933 wrt Heorhii Valakhanovich).

Package-Manager: portage-2.1.9.18/cvs/Linux x86_64

5 files changed, 217 insertions, 2 deletions

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index 9cd97e76e9f9..6b6ac48be3d2 100644
--- a/net-p2p/transmission/ChangeLog
+++ b/net-p2p/transmission/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-p2p/transmission
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.127 2010/10/15 11:23:56 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.128 2010/10/15 11:50:13 pva Exp $
+
+*transmission-2.10 (15 Oct 2010)
+
+  15 Oct 2010; Peter Volkov <pva@gentoo.org> +transmission-2.10.ebuild,
+  +files/transmission-daemon.confd.2, +files/transmission-daemon.initd.3:
+  Version bump, #340851 thank Dean Matzkov for report. Rewrote init script
+  to make use of upstream defaults instead of hardcoding them, added reload
+  target (#333767 by mark@tvk.rwth-aachen.de), should work with baselayout-1
+  (#336315 thank Domen Kožar for report) and also this should allow much
+  more flexible configurations (like requested in bug #323933). Added
+  warnings to store passwords in settings.json file for security reasons
+  (#323933 wrt Heorhii Valakhanovich).
 
   15 Oct 2010; Peter Volkov <pva@gentoo.org> -transmission-1.93.ebuild,
   -transmission-2.01.ebuild, -transmission-2.03.ebuild,
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index e873c435f11f..073456e70028 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,8 +1,12 @@
 AUX transmission-daemon.confd.1 1519 RMD160 decaf106064e8c393fce35758d6dc63e8302cc5c SHA1 372fd7f999a1c2f14fb24a8fe40094013774f673 SHA256 45ed8e0b966267d671acaff7d130cd843ba7aeac6773db2564e2aa9b2cbc2149
+AUX transmission-daemon.confd.2 656 RMD160 1d3a773fe7d8fc22ccda8737f70c677029484380 SHA1 8bb0ce3e739ec68e8f0b77ef341d25787e314efc SHA256 cc59f72d0048467aeac9199f1cc6a771a45176b65bc2e374bc9e1980faf3dcb8
 AUX transmission-daemon.initd.2 3953 RMD160 f78589fe9de1db4160aa7c6333cef1fc835c0888 SHA1 7ca57cd2135688d27401441667cc373e22434bd1 SHA256 0266ecb32e9a359b078a61c8ba40413d9d222b6622b6f7d5e8fc0a4e2ed7587d
+AUX transmission-daemon.initd.3 2361 RMD160 150f353d71779026daa4b4d1ff78116613dc29c7 SHA1 08e783f9705d70a7d4b3d990b5762c3735dc4f27 SHA256 7cd940c262c7b725d59f36c48eab11365e35dca5a41432f6162df996b41ff982
 DIST transmission-1.92.tar.bz2 4322109 RMD160 59e197b1c429a9135caa500cb9d4e67ef30db118 SHA1 129a3d67b4f7d22431df3c1aebdd8e4b76c64706 SHA256 daf037927a48cce9110023e2e1073e91c92d6e245e343835b99115f5d5a0bbed
 DIST transmission-2.04.tar.bz2 4264035 RMD160 977ff093125dbc692af1fa73c3a0729e0ed10d54 SHA1 301e22eeeb985782b61202deb1c36a883357fcc6 SHA256 c0010ee3f4d93d737da732bceb4e640dc404b0e7659980fb10dafb5bb0a83b4f
+DIST transmission-2.10.tar.bz2 4086821 RMD160 e8da12e1688ad18939a1ce1cd477de3b7cc16b29 SHA1 692a884fe4c23056a86b9c9001ae2f9f49e76fc0 SHA256 510ef2347e286ddcea3a977fd92b2eb7e3073a556c9940b4e19a190b0211aab6
 EBUILD transmission-1.92.ebuild 2537 RMD160 332cd387eacc5798edc68bba078deef90799f465 SHA1 02bbfa92834b2f629f9d16f2107f61580424aefb SHA256 862b3afc60344911fa73081cc7524f40f0655e74e961250c96b4ea0e564d7e11
 EBUILD transmission-2.04-r1.ebuild 2299 RMD160 674a1fd8e30a4cf6f81d5a06e5bbf93bd49a57b2 SHA1 dd2cd2dd1070dcea498fb7a80c672af706d2e49c SHA256 cf1460eb509e7cb7113a59bd04f461590e6b35940ad59c52404b4461fea02156
-MISC ChangeLog 19495 RMD160 32006effabef2c53cab9c55a418cd2094746f54d SHA1 49d21a3e3a90339ed6a7594ba7a48f7a6e88f4e7 SHA256 002e062560e98f3d3773e8a5d39d51ebea05508a1d4aa903a510e56d1e2964f1
+EBUILD transmission-2.10.ebuild 2920 RMD160 c08668acf608b9a1d57e50d07b5a71cd84d48752 SHA1 cc58da6f9bc877560522ffb81e4b5150961760d5 SHA256 22fa8793e08ebe1fb55b1b74fba43edeaf54de44d9fc08dcb89123230352591e
+MISC ChangeLog 20160 RMD160 e0cd577a0680f26cca96ba938b7219dbf94a9a0a SHA1 028254c4bd809b10d8a5b0343d4ac1232d2365e0 SHA256 26cab0dfcacb78c3ec61686d861fa4c82fbfa4b262e4522525f4f88e19cd42fd
 MISC metadata.xml 364 RMD160 be00dd8262b7de7ff847c0b8924ad0187cdcfc77 SHA1 86255961e5a1afb9a40ee375d8e942925c472b67 SHA256 e50226e57b5eeb05c307c7fb9f728881f28241696ca8d0b1d42bc1faadde5e23
diff --git a/net-p2p/transmission/files/transmission-daemon.confd.2 b/net-p2p/transmission/files/transmission-daemon.confd.2
new file mode 100644
index 000000000000..bdc5f7a2bd8b
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-daemon.confd.2
@@ -0,0 +1,13 @@
+# 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 <and download directory, check web settings>
+#runas_user=transmission
+
+# Location of logfile (should be writeable for runas_user user)
+#logfile=/var/log/transmission/transmission.log
diff --git a/net-p2p/transmission/files/transmission-daemon.initd.3 b/net-p2p/transmission/files/transmission-daemon.initd.3
new file mode 100644
index 000000000000..2aaf7a741871
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-daemon.initd.3
@@ -0,0 +1,81 @@
+#!/sbin/runscript
+# Copyright 1999-2010 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.3,v 1.1 2010/10/15 11:50:14 pva Exp $
+
+opts="start stop 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"
+
+pidfile=/var/run/transmission/transmission.pid
+config_dir=/var/transmission/config
+download_dir=/var/transmission/downloads
+logfile=${logfile:-/var/log/transmission/transmission.log}
+runas_user=${runas_user:-transmission:transmission}
+
+SSD_OPTIONS=""
+
+depend() {
+	need net
+}
+
+check_config() {
+	if [ ! -d /var/run/transmission/ ]; then
+		mkdir /var/run/transmission/
+		if [ -n "${runas_user}" ]; then
+			chown -R ${runas_user} /var/run/transmission/
+		fi
+	fi
+
+	# In case no config directory option passed use default
+	if ! $(echo ${TRANSMISSION_OPTIONS} | grep -q -e ' -g' -e ' --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
+		if [ -f /etc/init.d/sysfs ]; then
+			SSD_OPTIONS="${SSD_OPTIONS} --user ${runas_user}"
+		else
+			SSD_OPTIONS="${SSD_OPTIONS} --chuid ${runas_user}"
+		fi
+	fi
+
+	if [ -n "${logfile}" ]; then
+		if [ -f /etc/init.d/sysfs ]; then
+			SSD_OPTIONS="${SSD_OPTIONS} --stdout ${logfile} --stderr ${logfile}"
+		else
+			SSD_OPTIONS="${SSD_OPTIONS} >${logfile} 2>&1"
+		fi
+	fi
+}
+
+start() {
+	check_config
+
+	ebegin "Starting transmission daemon"
+	start-stop-daemon --start --quiet --background --make-pidfile \
+		--pidfile ${pidfile} ${SSD_OPTIONS} --exec \
+		/usr/bin/transmission-daemon -- --foreground \
+		${TRANSMISSION_OPTIONS}
+	eend $?
+}
+
+stop() {
+	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 $?
+}
+
diff --git a/net-p2p/transmission/transmission-2.10.ebuild b/net-p2p/transmission/transmission-2.10.ebuild
new file mode 100644
index 000000000000..b15ac84ff8ea
--- /dev/null
+++ b/net-p2p/transmission/transmission-2.10.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.10.ebuild,v 1.1 2010/10/15 11:50:13 pva Exp $
+
+EAPI=2
+inherit eutils fdo-mime gnome2-utils qt4-r2
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client"
+HOMEPAGE="http://www.transmissionbt.com/"
+SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.bz2"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="gnome gtk libnotify sound qt4"
+
+RDEPEND="
+	sys-libs/zlib
+	>=dev-libs/libevent-1.4.11
+	<dev-libs/libevent-2
+	>=dev-libs/openssl-0.9.4
+	|| ( >=net-misc/curl-7.16.3[ssl]
+		>=net-misc/curl-7.16.3[gnutls] )
+	gtk? ( >=dev-libs/glib-2.15.5:2
+		>=x11-libs/gtk+-2.12:2
+		>=dev-libs/dbus-glib-0.70
+		gnome? ( >=gnome-base/gconf-2.20.0 )
+		libnotify? ( >=x11-libs/libnotify-0.4.3 )
+		sound? ( >=media-libs/libcanberra-0.10 ) )
+	qt4? ( x11-libs/qt-gui:4[dbus] )"
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.2.6b
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	dev-util/pkgconfig
+	sys-apps/sed"
+
+pkg_setup() {
+	enewgroup transmission
+	enewuser transmission -1 -1 -1 transmission
+}
+
+src_prepare() {
+	sed -i -e 's:-ggdb3::g' configure || die
+}
+
+src_configure() {
+	# cli and daemon doesn't have external deps and are enabled by default
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable gtk) \
+		$(use gtk && use_enable libnotify) \
+		$(use gtk && use_enable sound libcanberra) \
+		$(use gtk && use_enable gnome gconf2)
+
+	use qt4 && cd qt && eqmake4 qtr.pro
+}
+
+src_compile() {
+	emake || die
+	use qt4 && cd qt && { emake || die; }
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS NEWS qt/README.txt
+	rm -f "${D}"/usr/share/${PN}/web/LICENSE
+
+	newinitd "${FILESDIR}"/${PN}-daemon.initd.3 ${PN}-daemon || die
+	newconfd "${FILESDIR}"/${PN}-daemon.confd.2 ${PN}-daemon || die
+
+	keepdir /var/{transmission/{config,downloads},log/transmission}
+	fowners -R transmission:transmission /var/{transmission/{,config,downloads},log/transmission}
+
+	if use qt4; then
+		cd qt
+		emake INSTALL_ROOT="${D}/usr" install || die
+		make_desktop_entry qtr "Transmission Qt BitTorrent Client" ${PN} \
+			"Network;FileTransfer;P2P;Qt"
+		use gtk || { doicon icons/transmission.png || die; }
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	# Keep default permissions on default dirs
+	chmod -R transmission:transmission /var/{transmission/{,config,downloads},log/transmission}
+
+	ewarn "If you use transmission-daemon, please, set 'rpc-username' and"
+	ewarn "'rpc-password' (in plain text, transmission-daemon will hash it on"
+	ewarn "start) in settings.json file located at /var/transmission/config or"
+	ewarn "any other appropriate config directory."
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}