Permalink
Browse files

sabnzbd version bump

  • Loading branch information...
1 parent 5e9867b commit 497421ccb29e9056f37159f5b89874ea9218e065 root committed Mar 11, 2012
View
@@ -1,5 +1,6 @@
-AUX sabnzbd.conf 723 RMD160 704a24d899970fb3051285a8f8dd650bb1584f48 SHA1 62c9b924debefe6111592f4e9d1620f4933b414d SHA256 b0eda99cdf1dc12d2818f3eb131a447cf054ace8bf921f90f9e28fbd01523bae
-AUX sabnzbd.ini 2415 RMD160 eec1fbb240c3e1b904d3757da7a2f6e60acad157 SHA1 82ccfd2689042a33ed2d26c587489e98ffeddd3c SHA256 e05345c728bb2285caaf8feec264aaef3adaf903c4fd1879d3222fd5a7ae304a
-AUX sabnzbd.init 509 RMD160 84fe7ab74e15eca5e630f05b60f9650a1faeaacc SHA1 b2568a3fea569017428c3e3a9852e1151db9f550 SHA256 92024dc4a466c6ef10e6ccec2c98f5d038d496ebd4d07222d1492d640d1c6113
-DIST SABnzbd-0.6.1-src.tar.gz 1888233 RMD160 0ac6823c2b850d4184b94f6a206241bcab04af1e SHA1 6e009f210235bb6b8278c59634bf2db1b5fb32f4 SHA256 b9b7e15c3e774aae42e248f19bc97bdbc17afe6bf27e236a7d565ddf5e11ae58
-EBUILD sabnzbd-0.6.1.ebuild 3849 RMD160 8710f0c02ed2511844da6589a1b265359c4689ac SHA1 38b7b89d0fb9951c065709a1dacfa40aecac760e SHA256 10d6979e9df501dab13a3c7156cfb046f0acbba230c650249b7cc7192c7266a6
+AUX sabnzbd-0.6.9-cherrypy-3.2.1-compat.patch 1602 RMD160 f7f383aa4a810d01ae210e3a52a2d61a89deb223 SHA1 891abf3e948297726cc4bb3a9a52d9b3fd7fd38b SHA256 d0d4f7f9c4ea4d43d14c0898498603192d0c634a833f0023f4bf9ed12a7d660a
+AUX sabnzbd.conf 603 RMD160 fdb81bad66d9f26dbb1c7693720f3d4d28c0aab3 SHA1 8f634f34585f9b42cc42e530d574ae9195ceea49 SHA256 96edf6ebf41acc1747ca00ea926645311f659a443dcc42ca57f383be41fdd749
+AUX sabnzbd.ini 4275 RMD160 f41bfaf7b85ca8549558f9ae57823933d769e75c SHA1 993818b7de78efdce9c47cf31b17e7fc78535c2b SHA256 5d63a2cfd56d86f0d5a6adbc64df9757dae4126c448c99e3790fe2f0512b0526
+AUX sabnzbd.init 498 RMD160 3c6d557761b603d4776cf2012e7966d4a1be6821 SHA1 d688888878b41d6b7fdb10ae0e185a0cccc1c776 SHA256 a72e686ff5cd489b077bf1c4c3060c513b3cd1fa63490bfad1d6fe29521e1290
+DIST SABnzbd-0.6.15-src.tar.gz 1949179 RMD160 863c0e42521467ffc52526368a0b9c1b9ba8d864 SHA1 e6d64ec35e837fe634d6e45234ec64c49cbb7e3b SHA256 a1f6cd461123b7787d99d87d509c08a9607f3d01d447af3d0f3826b760bf2eb6
+EBUILD sabnzbd-0.6.15.ebuild 3530 RMD160 e132775231386aca2439445e50adb2ef5429a640 SHA1 da554b9f078beed0748680340efa91da03f88625 SHA256 c7984b7433c9319ff297b46a077a594c578271bca210de803924c9e2f5c8b217
@@ -0,0 +1,33 @@
+diff -Nuarp SABnzbd-0.6.9-ori/SABnzbd.py SABnzbd-0.6.9/SABnzbd.py
+--- SABnzbd-0.6.9-ori/SABnzbd.py 2011-09-10 11:04:42.000000000 +0200
++++ SABnzbd-0.6.9/SABnzbd.py 2011-09-14 04:48:10.000000000 +0200
+@@ -47,6 +47,7 @@ if not cherrypy.__version__.startswith("
+
+ from cherrypy import _cpserver
+ from cherrypy import _cpwsgi_server
++from cherrypy.wsgiserver.ssl_pyopenssl import pyOpenSSLAdapter
+
+ SQLITE_DLL = True
+ try:
+@@ -1275,16 +1276,12 @@ def main():
+
+ if enable_https:
+ if https_port:
+- # Prepare an extra server for the HTTP port
+- http_server = _cpwsgi_server.CPWSGIServer()
+- http_server.bind_addr = (cherryhost, cherryport)
+- #secure_server.ssl_certificate = https_cert
+- #secure_server.ssl_private_key = https_key
+- adapter = _cpserver.ServerAdapter(cherrypy.engine, http_server, http_server.bind_addr)
++ # Prepare an extra server for the HTTPS port
++ https_server = _cpwsgi_server.CPWSGIServer()
++ https_server.bind_addr = (cherryhost, https_port)
++ https_server.ssl_adapter = pyOpenSSLAdapter(https_cert, https_key, None)
++ adapter = _cpserver.ServerAdapter(cherrypy.engine, https_server, https_server.bind_addr)
+ adapter.subscribe()
+- cherryport = https_port
+- cherrypy.config.update({'server.ssl_certificate' : https_cert,
+- 'server.ssl_private_key' : https_key })
+
+ if no_login:
+ sabnzbd.cfg.username.set('')
@@ -1,22 +1,22 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header$
# /etc/conf.d/sabnzbd
# Config file for sabnzbd init script
-# Which user to run sabnzbd as, you should change this.
+# Which user/group to run sabnzbd as
SAB_USER="sabnzbd"
-
-# This overrides the contents of /etc/sabnzbd.conf, needed for wget shutdown to work in init (short of writing some crazy regex for the config)
-SAB_HOSTNAME="localhost"
-SAB_PORT="8081"
+SAB_GROUP="sabnzbd"
# Location of config file.
# Make sure the user specified above can read this file. (if you want to change options from the webUI, give it write)
-SAB_CFG="/etc/sabnzbd/sabnzbd.ini"
+SAB_CFG="/etc/sabnzbd/sabnzbd.conf"
-SAB_PATH=/usr/share/sabnzbd/
+SAB_PATH=/usr/lib/sabnzbd/
SAB_PY=SABnzbd.py
+# Port (Change this to reflect your actual config)
+SAB_PORT="8080"
+
SAB_PID=/var/run/sabnzbd/sabnzbd-${SAB_PORT}.pid
Oops, something went wrong.

0 comments on commit 497421c

Please sign in to comment.