Check that api is not disabled before attempting to use it for shutdown. Thanks to eponymous, #494640

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

3 files changed, 32 insertions, 30 deletions

diff --git a/net-nntp/sabnzbd/ChangeLog b/net-nntp/sabnzbd/ChangeLog
index 93ad3031d21d..894dfe9d75e5 100644
--- a/net-nntp/sabnzbd/ChangeLog
+++ b/net-nntp/sabnzbd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nntp/sabnzbd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/ChangeLog,v 1.21 2014/04/26 19:59:46 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/ChangeLog,v 1.22 2014/06/19 16:50:52 jsbronder Exp $
+
+  19 Jun 2014; Justin Bronder <jsbronder@gentoo.org> files/sabnzbd.initd:
+  Check that api is not disabled before attempting to use it for shutdown.
+  Thanks to eponymous, #494640
 
 *sabnzbd-0.7.17 (26 Apr 2014)
 
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index a6eb7949cd6c..fb4f0241ecd5 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -6,18 +6,18 @@ AUX par2cmdline.patch 503 SHA256 2c732d21cc3c39abf3abaf1d26b18445f37a7515f1857e1
 AUX sabnzbd 281 SHA256 1224cb0157838e6d104592abd24b85eba832e23fbb57badd55e6877fd1bad17e SHA512 d3f064261c978fa4159b41636278f289bf549e2d83161652bce94e7a5ed3d1efdc3427cfdd84784bfc973ade589079417890fb8ced6eb04bad06628fbe6db66a WHIRLPOOL 6ee14687ed0a2f8be7dc7af1dd9e5d21ee07ee1788f3f7440094df9e0b28791f809ff1f9296df4771d1b50a62f19481f48ec674778a448bbb73267152d332f63
 AUX sabnzbd.confd 148 SHA256 071251fe47e594d65d017540cc2a84465dab242df5b621d500befcdd280bc458 SHA512 a06d2bf1663ec63da2754747cd5518a56604fcef84840cdaa160722c18ec0b42a3ee0ea7d6ecec6525d4bf264184f3627553bcab67395b31acc40b95b4c6f651 WHIRLPOOL 1e1c40dba40bdd73990295980ceb91ee4abf9cd5887f377e6305b7d3c1eda17595584dfd3c9b49c99b5749a146c815d9706cb989b3f1b0652fe92a8e0cc5d3bf
 AUX sabnzbd.ini 352 SHA256 66501a7708f157f866f75c3c25b75291f2c501f54b0b81ee47a92e34242dc537 SHA512 f986cf5b5243363969db655f301c88a971788bf8f9f69c8faf4f580d5852cad6f59567daad79461c31c3cea0474accb085dca3972c821c2cf2aed4063226b077 WHIRLPOOL 2355518ab720d63bbb1e5f6cce16c2de75fc87b28070610f4177bff34ef71bc0d366eb8d68d8f96b1b4f57e688741a834aac1848e3c0c249e109f4818579aa94
-AUX sabnzbd.initd 2181 SHA256 4cab29f36c2a74001b5c268bd87a52a909157de8a7a7d6af0fc59cf2ac0fce92 SHA512 5733fb31ea9a9105308f8bcd552f7abb5990e979379553bb6f134703e929bad460577f28b81b65da2d105a25c56c1a6253e7a92bc081da95bf17b515416e13a1 WHIRLPOOL f931768a26f8e7d6628ed6121ef404f5669175d3cced99fbe903497881c781a7798f4c07a930533db83976554e588ad4e032615442983b67148f3ada88e46704
+AUX sabnzbd.initd 2307 SHA256 5b55293014bb21cda6efe357ef6bea00bd4b1aa2d13b05c554ec4e9b71c4897e SHA512 57fe41b96432950012547c67fe49f31f10711dc02b1a618eb4cf9392c20baa409a89d40d75f024704f53ecd36af046334e0c666805d448cf27d0d4549ecc3fac WHIRLPOOL 66946d4c5f28fef2c4374c127ed858dcbe80b33e2f388e66ba0f1ebc96b700f89d62606d12bad5ef39c9e05536a578bc5ea9b0fdbae15ea60c35a0c880aaca39
 AUX use-system-configobj-and-feedparser.patch 1254 SHA256 39e01c79058f37257e6f873f0e2643631d0f7c207fad058f227cfd0833f9ca9a SHA512 c2cf92909bd171d63179e4c2cbedf3f61b26bde2944e455b9ca798dd11aca5cccb85830df9d2f5800e5a0757e5ca9b14c78a275a025838a9ade52b6219a0af27 WHIRLPOOL df4221e3322d7c48e338e6cc80ef207f1dddcdc477e2a428825d3bf9c37772c545b94bebabb86e507ecece19a6a20bfc34356f6114dad521d3ee6e75a88ba2f5
 DIST SABnzbd-0.7.16-src.tar.gz 2275768 SHA256 2c50496c8be81ac4498944a5209b2c6b3bdfecc48cf4e0df54552c5d985e5772 SHA512 ae97f093c34a100ab92949eb25a48db4c7d7d06c1fc082d3e8390d84e15dbdbbe4e682f47532cb84571039caab9aed377957522fa07b6a0f49c368eb77d66144 WHIRLPOOL 470f300f9f7b5f833d14c8170aee8690cddcfb9e442c3d9a6d108b155d6b2f7afab19010a7bf650c31e4ade5ca680433245a9c226948b52d8301861f5dc35965
 DIST SABnzbd-0.7.17-src.tar.gz 2310300 SHA256 a501517dbaf161deab2153118ff3b44512ee1d8984c3603bf17c593cf080eb09 SHA512 5f8ad391f698f5c8c069ea9a4be59124096ebd24793889db215cbc678dfd572c974083acd0d21b8b776d55cb9ebd8553952147ec2cd1768f3aab66cfba4ebaf3 WHIRLPOOL 6ec6a531c683607d36b533a1ae078ef87e5afdaa02e08588c8b5f045e735a1aa64c234e71c5d7218d15fed0eb64ef12f1a280ef65ed208b0d7a5e1408997fbca
 EBUILD sabnzbd-0.7.16.ebuild 3159 SHA256 82e00d736a339c92a5bb479f7eac4018e635704f6bc4a549d5ed0626f0487ad0 SHA512 9f3585c4a8dde9f8ae6d4d9cdf40259aa894b6bcd109f735907f0f2900a212001b199f8b2ae1fe8472c6441510f128ac87688206073017043ed8e852d21995e7 WHIRLPOOL 3c5d7d8afa64fd030b49ca289043f7354bb846ade980b163bb88a83446b3c9143c1f175f68437a9fbcdf53f5d56969c8380a72c1c339b8ba430523cf60dc6b5e
 EBUILD sabnzbd-0.7.17.ebuild 3165 SHA256 ff841c3e75b0d000c42917dc88650e1b813c9bbd6910755e2df9c87c5909869e SHA512 ed17c55def3a26ec6a7addfbaee2350dda904910f08da46be7d420aa90482965bbad0d95419fcbdd43d085c2c111feec13de86ab1b9f49c6008d056824c47d01 WHIRLPOOL 5d3ca090f2dbef615d0cf306f30df0f2ecdc423c805b976c8090c783db9f2d6c385e0ba83aaf7e5b222142496970e5c940c39c372a1c5f99d4d1de3df824dd61
-MISC ChangeLog 4041 SHA256 e76af0a4dc409f4bf64c001d12dff7350601a81a27078c299b34b023c3e77e18 SHA512 93e2800bab088d988b09b3437477cc235a0737dbe44af7c225da7718e963e0ab9c1b1cb906502db346a488b5ddde4dc935484874af626cabdbd1d2dfbf091a03 WHIRLPOOL 85e40f378c6aec43048e4346e7b9efc8c94688c227754659f1944e64bf987c24dccf39394886e94db605ec0a43a6b71182e80e010a7aa6a4f93dae270937fad2
+MISC ChangeLog 4222 SHA256 4392e8424fccbf31417df45383ff4dc571a6b9357dea745e75e061d2a196c46a SHA512 87a39721ac70d43bf5df1b038973cec992d6d0395e197fb49ac30ef83486eff24b041422bd011527161410e0ed82feb868f70aeeb024a34b5459df2205a6d659 WHIRLPOOL aeeb79b7ded1ae6ef45d9fda6e5341d31121d8b86754ab070f70da048993faf17af0589d820424a5ddf716a9c4fea020a7120b767483bf3973ba859f94af5cd5
 MISC metadata.xml 484 SHA256 8e26c45345b47dbcdd018d9006a4d7f42a1394da6e39e9e968b1362480ae5d7a SHA512 18630bf4e3afa57977c1c4d7f562888c3048c3778a9aff4bba2e969f3f1934d8f85c22fef30c453f5ea09f410ce16761b75c25ba7d73ce1a14ea4abffcd918a6 WHIRLPOOL a399aa5a061fba0278117af2c8e18f88bb8cb10e049ff0cc9d86d9316497dcc5c13e55ceeea03b848ab4f796665e6efa0fc3345c02a4dcbbaacdef782ab7cc2b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlNcEDYACgkQ4MrvBE1wQ8l24ACfetG2/NNoarMZlM+2RFrE4Pmn
-6dMAmwaUJszm5Dun4FTACR3NyxYpo3Nf
-=09w5
+iEYEAREIAAYFAlOjFP0ACgkQ4MrvBE1wQ8kzPQCgi1MdqP24A3k0HRkwcjxlNPOd
+GhwAnih2tMuJvuAyusok2u+wAFwulOpq
+=7J3n
 -----END PGP SIGNATURE-----
diff --git a/net-nntp/sabnzbd/files/sabnzbd.initd b/net-nntp/sabnzbd/files/sabnzbd.initd
index 238748d68157..5cfc91b9e70a 100644
--- a/net-nntp/sabnzbd/files/sabnzbd.initd
+++ b/net-nntp/sabnzbd/files/sabnzbd.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 RUNDIR=/var/run/sabnzbd
@@ -11,11 +11,11 @@ depend() {
 get_var() {
     echo $(sed -n \
         '/^\[misc]/,/^'$1'/ s/^'$1' = \([[:alnum:].]\+\)[\r|\n|\r\n]*$/\1/p' \
-        ${SABNZBD_CONFIGFILE})
+        "${SABNZBD_CONFIGFILE}")
 }
 
 get_port() {
-    if [ "$(get_var 'enable_https')" == "1" ]; then
+    if [ "$(get_var 'enable_https')" -eq 1 ]; then
         echo $(get_var 'https_port')
     else
         echo $(get_var 'port')
@@ -24,22 +24,16 @@ get_port() {
 
 get_addr() {
     local host=$(get_var 'host')
-    local port=$(get_port)
-    local protocol
+    local protocol='http'
 
     [ "${host}" == "0.0.0.0" ] && host=localhost
-    if [ "$(get_var 'enable_https')" == "1" ]; then
-        protocol="https"
-    else
-        protocol="http"
-    fi
+    [ "$(get_var 'enable_https')" -eq 1 ] && protocol='https'
 
-    echo ${protocol}://${host}:${port}
+    echo "${protocol}://${host}:$(get_port)"
 }
 
 get_pidfile() {
-    local port=$(get_port)
-    echo "${RUNDIR}/sabnzbd-${port}.pid"
+    echo "${RUNDIR}/sabnzbd-$(get_port).pid"
 }
 
 start() {
@@ -54,13 +48,13 @@ start() {
         --group ${SABNZBD_GROUP} \
         --name sabnzbd \
         --background \
-        --pidfile $(get_pidfile) \
+        --pidfile "$(get_pidfile)" \
         --exec /usr/bin/sabnzbd \
         -- \
-        --config-file ${SABNZBD_CONFIGFILE} \
-        --logging ${SABNZBD_LOGGING} \
+        --config-file "${SABNZBD_CONFIGFILE}" \
+        --logging "${SABNZBD_LOGGING}" \
         --daemon \
-        --pid ${RUNDIR}
+        --pid "${RUNDIR}"
 
     eend $?
 }
@@ -79,20 +73,24 @@ start_pre() {
 stop() {
     local api_key=$(get_var 'api_key')
     local addr=$(get_addr)
-    local pidfile=$(get_pidfile)
     local rc=1
 
     ebegin "Stopping SABnzbd @ ${addr}"
+    # This can only work if we have enabled the API
+    if [ -n "${api_key}" -a "$(get_var 'disable_api_key')" -ne 1 ]; then
+        local ret
+        einfo "Attempting web-based shutdown @ ${addr}"
+
+        # SABnzbd will return "ok" if shutdown is successful
+        ret=$(/usr/bin/curl -k -s "${addr}/sabnzbd/api?mode=shutdown&apikey=${api_key}")
+        [ "${ret}" == "ok" ] && rc=0
+    fi
 
-    # SABnzbd will return "ok" if shutdown is successful
-    rc=$(/usr/bin/curl -k -s "${addr}/sabnzbd/api?mode=shutdown&apikey=${api_key}")
-    if [ "${rc}" == "ok" ]; then
-		rc=0
-	else
+    if [ "${rc}" -ne 0 ]; then
         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