Update init.d scripts to use vars from the config file. Disable growl by default.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x4D7043C9

7 files changed, 59 insertions, 156 deletions

diff --git a/net-nntp/sabnzbd/ChangeLog b/net-nntp/sabnzbd/ChangeLog
index 218d813a4cec..7711adf56cb7 100644
--- a/net-nntp/sabnzbd/ChangeLog
+++ b/net-nntp/sabnzbd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-nntp/sabnzbd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/ChangeLog,v 1.14 2013/06/24 23:20:03 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/ChangeLog,v 1.15 2013/06/25 03:48:26 jsbronder Exp $
+
+*sabnzbd-0.7.13-r2 (25 Jun 2013)
+
+  25 Jun 2013; Justin Bronder <jsbronder@gentoo.org> +sabnzbd-0.7.13-r2.ebuild,
+  -sabnzbd-0.7.13-r1.ebuild, -sabnzbd-0.7.13.ebuild, files/sabnzbd.confd,
+  files/sabnzbd.ini, files/sabnzbd.initd:
+  Update init.d scripts to use vars from the config file.  Disable growl by
+  default.
 
 *sabnzbd-0.7.13-r1 (24 Jun 2013)
 
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 616dd54b5bc8..4a753f2b0665 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -1,22 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX growler-support-gntp-1.0.patch 886 SHA256 8a9daee5d8860c97d504a59842acf22de0a5197785a0a56a9f61793e0d250de9 SHA512 a06b32146a34bc8a1765e248a39a70490f54a4f898cd6aa364631d95793d1b225f413c7f4c4d7e52a06b906701f216ca73d457e90ac73d133333d0230c3d0a68 WHIRLPOOL 5cd32d5c1ad15adb86248de0952cc87d2e3878915f6e0105265a7c572dd354046506a19d8a05450b1ffde8b2017714ecfafd1bdd6bc025be16c3a316306d4c27
 AUX sabnzbd 281 SHA256 1224cb0157838e6d104592abd24b85eba832e23fbb57badd55e6877fd1bad17e SHA512 d3f064261c978fa4159b41636278f289bf549e2d83161652bce94e7a5ed3d1efdc3427cfdd84784bfc973ade589079417890fb8ced6eb04bad06628fbe6db66a WHIRLPOOL 6ee14687ed0a2f8be7dc7af1dd9e5d21ee07ee1788f3f7440094df9e0b28791f809ff1f9296df4771d1b50a62f19481f48ec674778a448bbb73267152d332f63
-AUX sabnzbd.confd 189 SHA256 684877bf6d36927b5e51a66c5f4bf539cdbb407d570ce4a35bdd309634bd5b11 SHA512 d62a867adca670d1679a2679b038bece85618083db4b7b3cc41bb86b389ce1e12f1d003499e93be94b1046228751f8424349847acc68e35165f0e64464c157c9 WHIRLPOOL 3ea13bbea28f4b78ad35f0efdfcaed44a2748e6b58bde5156feb643027a8adca7aaf42d55cbdcb08bdaa536fac90f429dfe361ef71e6f16716c6ac1f87c208a0
-AUX sabnzbd.ini 339 SHA256 4864a9a32b27f1435aec90802d0841fa459afb2734158ca5ab83e91070fc9b9e SHA512 94cd30bb1fb164aeb7f59c67de774ff0c7f4e6b46ab78cba6ed3e50dec59fd73e45c29369ecac53b5bfbaad13cc2dc132abc4822d6a596d3ba4eb0c5f7f33031 WHIRLPOOL 9a0c03787798830d57c12c504737dc607eab0946d4c029d64d14b4aebec16b3030527ade2718777a6e34ea2e637eaa743542e7c28dd4df6018c692704ea59225
-AUX sabnzbd.initd 1801 SHA256 fe4a95b6d02c1e62996813c8249f40a01c7181e8d44d1f034492cc5c34d0af20 SHA512 6a36d335199953f13a3626c8d7fc25be0a4f3c7165cb6b3c72ecb52deb242e98a50f5773ebf0bf3655146f62c4c23349258c0d427693e33db73a8af4474f1d03 WHIRLPOOL c6c2f4eb357af09e79599b031e77b0beae39abc3ee8dfbb09d7396ca7dd022a7415741692585027bebe47b9e2b54cc23322f0c32f5696aa29df4b2760ae63a00
+AUX sabnzbd.confd 148 SHA256 071251fe47e594d65d017540cc2a84465dab242df5b621d500befcdd280bc458 SHA512 a06d2bf1663ec63da2754747cd5518a56604fcef84840cdaa160722c18ec0b42a3ee0ea7d6ecec6525d4bf264184f3627553bcab67395b31acc40b95b4c6f651 WHIRLPOOL 1e1c40dba40bdd73990295980ceb91ee4abf9cd5887f377e6305b7d3c1eda17595584dfd3c9b49c99b5749a146c815d9706cb989b3f1b0652fe92a8e0cc5d3bf
+AUX sabnzbd.ini 366 SHA256 128e33cd9da1b6714d668301793f9ecc781805d44efe7df2b4fa023d3013a5c3 SHA512 8ad355d08f008998f1206a187abdd5fe3b77ed5f773ba560a4d1bd2f1075dc306d01e695e3e527a79c4a097320dc4bbc5519d30bdd86de27307c5e9a6f641714 WHIRLPOOL 549ad93571915cc60014905773fc34bbfb42950d3ff334bc03238bc0a70a159c405a19b2f349d83bae7c76797ff97eefe373c3c0ed96769cb20315db2e63d506
+AUX sabnzbd.initd 2410 SHA256 64ee769889fc4bcfe4a09cf6c95636a7f0dc130587046049eefeecf127c56a2e SHA512 e5d3707f8bc4b7930933d300954b7f71041be7be5151ff2395cc7bf1c1bd4783c202b9c8ddb9889e7a188b30c8ecc62337cd97bdd47bd42d55ff58552d98c48e WHIRLPOOL 9cab4288afaa1eda4d9fc28bd459a851f59ca7ddd3adace0694761b3dd064d9a7e6451a886fda7a9fa08a54a900e2c656d38f7def29f419bd960336ea6120446
 AUX sabnzbd.logrotate 393 SHA256 276dffb9351074547d46f71699412aeb6ed80b39d0cdea499f86ebf5b8ae4f51 SHA512 26edf5095a3f69a339ecc924370becc7a26bc37ab4c31d8acf13cbcbaeb885471795ab2c69c9a434eab47886133fa781c9305c81360044f932cc280a6c491045 WHIRLPOOL 63a1ed259f44999355690fc5646b7de0f74577aefc5ad517888a2015e3d49478fb72dd9e0b52d0624812c6ecfcdc1c5d486ff6c1f921cc21bdc65b302c6f21e1
 AUX use-system-configobj-and-feedparser.patch 1254 SHA256 39e01c79058f37257e6f873f0e2643631d0f7c207fad058f227cfd0833f9ca9a SHA512 c2cf92909bd171d63179e4c2cbedf3f61b26bde2944e455b9ca798dd11aca5cccb85830df9d2f5800e5a0757e5ca9b14c78a275a025838a9ade52b6219a0af27 WHIRLPOOL df4221e3322d7c48e338e6cc80ef207f1dddcdc477e2a428825d3bf9c37772c545b94bebabb86e507ecece19a6a20bfc34356f6114dad521d3ee6e75a88ba2f5
 DIST SABnzbd-0.7.13-src.tar.gz 2275234 SHA256 33ebef37e7cdbcc1e3a7436432d7701b3f2584b754176a4d9000ac125e25d690 SHA512 8462e7f39da0e2c829bebca97cbdbb5f6d314e04c408257064d68bf2d17fc37301e53daf695e8db6e5af82d844f6e99fbbed8c500e2bd3d3916a8b3431e1248c WHIRLPOOL cc9c14b6d86108038eee3c934aa1ecc2c95947d8493799b750cf59d1d44f81f5d13cc492fb0f4f8204cd64629e85f707b83b7f971bcb8ef296c65bf28f8bd1eb
-EBUILD sabnzbd-0.7.13-r1.ebuild 3200 SHA256 e71533badc8538b6cdcd11a374d9d97ffe01c168a7dbfcc51a60c099d14811f2 SHA512 da220c2ef621ff31de0e991237bf7e6c3c0f10f0ce75901cf2054111b8edf9b87eec505141ad7d33bb490d163b666e67c6755bf84db3a1aa075969664a99b084 WHIRLPOOL 19abfdbc1d736b9307db06da9fbad2c1f4c2507a86bb09e6d98ce5ea2697f67146c12320cfb04414f945029689da3117c9f9601c7c1dd7fe49159fcad8bb0fb5
-EBUILD sabnzbd-0.7.13.ebuild 3144 SHA256 dac56ef7524de67cd4fd50d8928373adb31103ad7e8665392a735021a26c9054 SHA512 58e8d22b64347c36f9a3531105239a82165a09ef71137390e121f6453b14f64d36bbbd4ffd02fb2bcf09aca76ace88bfbb41c57d18a2993cd396bd7c2a0a8d70 WHIRLPOOL 4b9d0350c3f211454127e7f071d70698ad2df8604dfe414e3f930c8f7e3a818423d19718918885a5bf309203ae96697c09ca47c8c20c3da2edba32aa02cb17b7
-MISC ChangeLog 2689 SHA256 c2ce89266b50ed1234119c6fcb476af6c4239201044ed79c61e78b4696a258bd SHA512 1d4dabe847430cd074be249ff7b7beed50fd9bcdbc273a30cd4ab3f911b56830589ae66b8bd0b5f9f1d21e80d54ff2f29efee56f485ab10cd26c7e1e7d61b23c WHIRLPOOL 5cf25b3cebe40005396476f3211921f5e39c0c43f817105b99d39a72d8df8ef5a210136717711cd9d12a277c1f9a3a0c930d04960fd421fd69e35af2b1bc9292
+EBUILD sabnzbd-0.7.13-r2.ebuild 3200 SHA256 b99a29487a00647719e6776bc886a67c94af2c5fbc99e7f303e7b116b04369a5 SHA512 3bd0868834d8b324946ea556cfbbe5a5d9b0f39d80df0d2b58a4f01173466ab5447d9df3660da80a3c744f965c611e3faf2401040509ad6905fa880c28361b1e WHIRLPOOL ad9fc24484bb74749a9d99bf75b666cbc2639b902dae1d120a6798390e6d322bf021e287d5d62fc63dda65b578292f6e5ca74296640e670ddf0e478af7a9218c
+MISC ChangeLog 3007 SHA256 5c5c63bc36492a55fb27a00f88159f5b0f1c72ebd1c5fde0023d9dbaa40aa887 SHA512 72dee5cafc6e438d01b83fc2aed37f783d2e1f0026d301487ea25c5d11924b9245fa1b5be31abfe52d4ec3371159c0547a5e780cf06e3a66a0947ef67102d5b7 WHIRLPOOL d41bf48df9eaa5732da6db5e006c5a7f6a51480518563c4692c8fb2325111cf04184b7697558d428c583db6f6139c48eda1ddaf12a76e4c59be2948728a9fbcd
 MISC metadata.xml 484 SHA256 8e26c45345b47dbcdd018d9006a4d7f42a1394da6e39e9e968b1362480ae5d7a SHA512 18630bf4e3afa57977c1c4d7f562888c3048c3778a9aff4bba2e969f3f1934d8f85c22fef30c453f5ea09f410ce16761b75c25ba7d73ce1a14ea4abffcd918a6 WHIRLPOOL a399aa5a061fba0278117af2c8e18f88bb8cb10e049ff0cc9d86d9316497dcc5c13e55ceeea03b848ab4f796665e6efa0fc3345c02a4dcbbaacdef782ab7cc2b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlHI1CQACgkQ4MrvBE1wQ8nTyACfT+B5u5mPJxURRnCPSimj+eXg
-Jt4An1GJiotqjY+c6cm/TwxLXXlDaPzl
-=McUZ
------END PGP SIGNATURE-----
diff --git a/net-nntp/sabnzbd/files/sabnzbd.confd b/net-nntp/sabnzbd/files/sabnzbd.confd
index 1dcaa94b8384..ec40168657bd 100644
--- a/net-nntp/sabnzbd/files/sabnzbd.confd
+++ b/net-nntp/sabnzbd/files/sabnzbd.confd
@@ -1,5 +1,3 @@
-SABNZBD_SERVER=0.0.0.0
-SABNZBD_PORT=8080
 SABNZBD_CONFIGFILE=/etc/sabnzbd/sabnzbd.ini
 SABNZBD_USER=sabnzbd
 SABNZBD_GROUP=sabnzbd
diff --git a/net-nntp/sabnzbd/files/sabnzbd.ini b/net-nntp/sabnzbd/files/sabnzbd.ini
index cfb55613f8dd..9c69155bdbd5 100644
--- a/net-nntp/sabnzbd/files/sabnzbd.ini
+++ b/net-nntp/sabnzbd/files/sabnzbd.ini
@@ -10,3 +10,5 @@ nzb_backup_dir = /var/lib/sabnzbd/backup
 auto_browser = 0

 host = 0.0.0.0

 port = 8080

+[growl]

+growl_enable = 0

diff --git a/net-nntp/sabnzbd/files/sabnzbd.initd b/net-nntp/sabnzbd/files/sabnzbd.initd
index 64c3d9888449..97c6b69c5d00 100644
--- a/net-nntp/sabnzbd/files/sabnzbd.initd
+++ b/net-nntp/sabnzbd/files/sabnzbd.initd
@@ -1,11 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/files/sabnzbd.initd,v 1.4 2013/03/08 02:46:45 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/files/sabnzbd.initd,v 1.5 2013/06/25 03:48:26 jsbronder Exp $
 
-# pid file name is hard-coded in sabnzbd, this must match
 RUNDIR=/var/run/sabnzbd
-PIDFILE=${RUNDIR}/sabnzbd-${SABNZBD_PORT}.pid
 
 depend() {
     need net
@@ -22,10 +20,9 @@ start() {
         --user ${SABNZBD_USER} \
         --group ${SABNZBD_GROUP} \
         --name sabnzbd \
-        --pidfile ${PIDFILE} \
+        --pidfile $(get_pidfile) \
         --exec /usr/bin/sabnzbd \
         -- \
-        --server ${SABNZBD_SERVER}:${SABNZBD_PORT} \
         --config-file ${SABNZBD_CONFIGFILE} \
         --logging ${SABNZBD_LOGGING} \
         --daemon \
@@ -34,34 +31,61 @@ start() {
     eend $?
 }
 
-stop() {
-    local api_key=$(awk '/^api_key =/{print $3}' ${SABNZBD_CONFIGFILE})
-    local hostname=${SABNZBD_SERVER}
-    local rc t
+get_var() {
+    echo $(echo $(grep "^$1" ${SABNZBD_CONFIGFILE} | head -n 1 | sed 's/\r//' | awk '{print $3}'))
+}
+
+get_pidfile () {
+    # pid file name is hard-coded in sabnzbd, this must match
+    local ssl=$(get_var 'enable_https')
+
+    if [ -z "${ssl}" ]; then
+        echo "${RUNDIR}/sabnzbd-8080.pid"
+    elif [ ${ssl} -eq 0 ]; then
+        echo "${RUNDIR}/sabnzbd-$(get_var 'port').pid"
+    else
+        echo "${RUNDIR}/sabnzbd-$(get_var 'https_port').pid"
+    fi
+}
 
-    ebegin "Stopping SABnzbd"
+get_addr() {
+    local host=$(get_var 'host')
+    #local ssl=$(get_var 'enable_https')
+    #local ssl_port=$(get_var 'https_port')
+    local port=$(get_var 'port')
 
-    if [ -z "${hostname}" -o "${hostname}" == "0.0.0.0" ]; then
-        hostname="localhost"
+    if [ "${host}" == "0.0.0.0" ]; then
+        host=localhost
     fi
 
-    /usr/bin/wget -q --delete-after \
-        "http://${hostname}:${SABNZBD_PORT}/sabnzbd/api?mode=shutdown&apikey=${api_key}"
+    # sabnzbd seems to only respond correctly to non ssl requests
+    echo ${host}:${port}
+}
+
+stop() {
+    local api_key=$(get_var 'api_key')
+    local rc t
+
+    ebegin "Stopping SABnzbd @ $(get_addr)"
+
+    /usr/bin/wget -q --delete-after --no-check-certificate \
+        "http://$(get_addr)/sabnzbd/api?mode=shutdown&apikey=${api_key}"
     rc=$?
 
     if [ ${rc} -eq 0 ]; then
         # Wait for sabnzbd to fully shutdown.
-        for ((t=0; t < 20; t++)); do
+        for ((t=0; t < 30; t++)); do
             sleep 0.5
-            [ ! -s ${PIDFILE} ] && break
+            [ ! -s $(get_pidfile) ] && break
         done
     fi
 
-    if [ -s ${PIDFILE} ]; then
+    if [ -s $(get_pidfile) ]; then
         # Using wget didn't work, resort to start-stop-daemon
+        einfo "Falling back to SIGTERM, this may not work if you restarted via the web interface"
         start-stop-daemon \
             --stop \
-            --pidfile ${PIDFILE} \
+            --pidfile $(get_pidfile) \
             --retry SIGTERM/1/SIGKILL/5
         rc=$?
     fi
diff --git a/net-nntp/sabnzbd/sabnzbd-0.7.13-r1.ebuild b/net-nntp/sabnzbd/sabnzbd-0.7.13-r2.ebuild
index 75a6b9f16c12..5974d5f05ba3 100644
--- a/net-nntp/sabnzbd/sabnzbd-0.7.13-r1.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-0.7.13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/sabnzbd-0.7.13-r1.ebuild,v 1.1 2013/06/24 23:20:03 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/sabnzbd-0.7.13-r2.ebuild,v 1.1 2013/06/25 03:48:26 jsbronder Exp $
 
 EAPI="4"
 
diff --git a/net-nntp/sabnzbd/sabnzbd-0.7.13.ebuild b/net-nntp/sabnzbd/sabnzbd-0.7.13.ebuild
deleted file mode 100644
index 7dea32997bfd..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-0.7.13.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/sabnzbd-0.7.13.ebuild,v 1.1 2013/06/21 23:20:31 jsbronder Exp $
-
-EAPI="4"
-
-# Require python-2 with sqlite USE flag
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="sqlite"
-
-inherit eutils python user
-
-MY_P="${P/sab/SAB}"
-
-DESCRIPTION="Binary newsgrabber with web-interface"
-HOMEPAGE="http://www.sabnzbd.org/"
-SRC_URI="mirror://sourceforge/sabnzbdplus/${MY_P}-src.tar.gz"
-
-# Sabnzbd is GPL-2 but bundles software with the following licenses.
-LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+rar +ssl unzip +yenc"
-
-# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not
-# be in python's sitedir.  See:  http://wiki.sabnzbd.org/unix-packaging
-
-# TODO:  still bundled but not in protage:
-# kronos, rarfile, rsslib, ssmtplib, listquote, json-py, msgfmt
-# pynewsleecher
-#
-# Also note that cherrypy is still bundled.  It's near impossible to find
-# out where the bundled and heavily patched version came from (pulled from
-# cherrypy subversion, patched somewhere, then imported to sabnzbd and patched
-# further.  Upstream is planning on making this easier with 0.8.0.
-# https://github.com/sabnzbd/sabnzbd/issues/47
-
-RDEPEND="
-	>=app-arch/par2cmdline-0.4
-	>=dev-python/cheetah-2.0.1
-	dev-python/configobj
-	dev-python/feedparser
-	dev-python/gntp
-	dev-python/pythonutils
-	net-misc/wget
-	rar? ( || ( app-arch/unrar app-arch/rar ) )
-	ssl? ( dev-python/pyopenssl )
-	unzip? ( >=app-arch/unzip-5.5.2 )
-	yenc? ( dev-python/yenc )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	HOMEDIR="/var/lib/${PN}"
-	python_set_active_version 2
-	python_pkg_setup
-
-	# Create sabnzbd group
-	enewgroup ${PN}
-	# Create sabnzbd user, put in sabnzbd group
-	enewuser "${PN}" -1 -1 "${HOMEDIR}" "${PN}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/use-system-configobj-and-feedparser.patch
-
-	# remove bundled modules
-	rm -r sabnzbd/utils/{feedparser,configobj}.py || die
-	rm -r gntp || die
-	rm licenses/License-{feedparser,configobj,gntp}.txt || die
-}
-
-src_install() {
-	local d
-
-	dodir /usr/share/${PN}/sabnzbd
-	insinto /usr/share/${PN}/
-	doins SABnzbd.py
-	fperms +x /usr/share/${PN}/SABnzbd.py
-	dobin "${FILESDIR}"/sabnzbd
-
-	for d in cherrypy email icons interfaces locale po sabnzbd tools util; do
-		insinto /usr/share/${PN}/${d}
-		doins -r ${d}/*
-	done
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/"${PN}.logrotate ${PN}
-
-	diropts -o ${PN} -g ${PN}
-	dodir /etc/${PN}
-	dodir /var/log/${PN}
-
-	insinto "/etc/${PN}"
-	insopts -m 0600 -o ${PN} -g ${PN}
-	doins "${FILESDIR}/${PN}.ini"
-
-	dodoc {ABOUT,CHANGELOG,ISSUES,README}.txt Sample-PostProc.sh licenses/*
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/${PN}
-
-	einfo "Default directory: ${HOMEDIR}"
-	einfo ""
-	einfo "Run: gpasswd -a <user> sabnzbd"
-	einfo "to add an user to the sabnzbd group so it can edit sabnzbd files"
-	einfo ""
-	einfo "By default sabnzbd will listen on 127.0.0.1:8080"
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-}