My local working dir was out of date. New patch below..
On Sat, Nov 10, 2018 at 06:25:37PM +0000, Mikolaj Kucharski wrote:
> Hi,
>
> Sorry for so late reply, but here is my version of sabnzbd update,
> which I tested a while a go and I'm pretty happy with it. This is
> version used to report the problem of failed downloads when free
> disk space is below threshold configured in sabnzbd:
>
> https://github.com/sabnzbd/sabnzbd/issues/1095
>
> What is in my version of update:
>
> - update to version 2.3.5
> - homepage supports https
> - dropped ${_MODPY_BUILD_DEPENDS}, build worked for me without it
> - added textproc/py-lxml to run depends, per advice in sabnzbd's logs
> - switched from news/py-yenc to news/py-sabyenc (see attached tarball of new
> port)
> - use WRKDIST, instead of WRKSRC (I hit a problem with WRKSRC)
> - allow spaces in arguments to launcher script
> - patch for GitHub sabnzbd/issues/1095
> - fix newuser/newgroup in plist
> - fix ownership of bin/sabnzbd (package install doesn't fix it though, pkg
> tools bug?)
> - plist regen
> - added 2 min timeout as I had situation when sabnzbd needed more time than
> usual to stop
>
> I wrote that update couple of weeks ago and didn't had time to look into
> it recently, so I would appreciate double-checking what I did.
>
> Regards,
> Mikolaj
>
Index: Makefile
===================================================================
RCS file: /cvs/ports/news/sabnzbd/Makefile,v
retrieving revision 1.13
diff -u -p -u -r1.13 Makefile
--- Makefile 28 May 2018 12:25:20 -0000 1.13
+++ Makefile 10 Nov 2018 18:35:57 -0000
@@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.13 2018/05/28 12:25:20 sthen Exp $
COMMENT = retrieve and process nzb-files via web interface
-VERSION = 1.2.1
+VERSION = 2.3.5
DISTNAME = SABnzbd-${VERSION}-src
-PKGNAME = sabnzbd-${VERSION}
+PKGNAME = sabnzbd-${VERSION:L}
CATEGORIES = news
-HOMEPAGE = http://sabnzbd.org/
+HOMEPAGE = https://sabnzbd.org/
MAINTAINER = Marcus Glocker <mar...@nazgul.ch>
-REVISION = 1
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
@@ -16,20 +15,20 @@ MASTER_SITES = https://github.com/sabn
MODULES = lang/python
-BUILD_DEPENDS = ${_MODPY_BUILD_DEPENDS}
RUN_DEPENDS = archivers/par2cmdline \
archivers/unrar \
archivers/unzip \
devel/py-cheetah \
devel/py-notify \
- news/py-yenc \
+ textproc/py-lxml \
+ news/py-sabyenc \
security/py-openssl
NO_BUILD = Yes
NO_TEST = Yes
PKG_ARCH = *
-WRKSRC = ${WRKDIR}/SABnzbd-${VERSION}
+WRKDIST = ${WRKDIR}/SABnzbd-${VERSION}
do-install:
${INSTALL_DATA_DIR} \
Index: distinfo
===================================================================
RCS file: /cvs/ports/news/sabnzbd/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- distinfo 25 Feb 2017 20:11:33 -0000 1.7
+++ distinfo 10 Nov 2018 18:35:57 -0000
@@ -1,2 +1,2 @@
-SHA256 (SABnzbd-1.2.1-src.tar.gz) =
MHL2R9PnQYGSybxYgc/JtYMUoA8NvNj4LxwRsTTENLs=
-SIZE (SABnzbd-1.2.1-src.tar.gz) = 2725395
+SHA256 (SABnzbd-2.3.5-src.tar.gz) =
4m+z6K/jXYLjGqHTVofKA/FodIIxomwSYXcXY1RfsrQ=
+SIZE (SABnzbd-2.3.5-src.tar.gz) = 2750437
Index: files/sabnzbd
===================================================================
RCS file: /cvs/ports/news/sabnzbd/files/sabnzbd,v
retrieving revision 1.2
diff -u -p -u -r1.2 sabnzbd
--- files/sabnzbd 20 May 2013 18:36:06 -0000 1.2
+++ files/sabnzbd 10 Nov 2018 18:35:57 -0000
@@ -1,3 +1,3 @@
#!/bin/sh
-exec ${MODPY_BIN}
${TRUEPREFIX}/lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.py $*
+exec ${MODPY_BIN}
${TRUEPREFIX}/lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.py "$@"
Index: patches/patch-sabnzbd_assembler_py
===================================================================
RCS file: patches/patch-sabnzbd_assembler_py
diff -N patches/patch-sabnzbd_assembler_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-sabnzbd_assembler_py 10 Nov 2018 18:35:57 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+- https://github.com/sabnzbd/sabnzbd/issues/1095
+
+Index: sabnzbd/assembler.py
+--- sabnzbd/assembler.py.orig
++++ sabnzbd/assembler.py
+@@ -81,11 +81,6 @@ class Assembler(Thread):
+ # Abort all direct unpackers, just to be sure
+ sabnzbd.directunpacker.abort_all()
+
+- # Place job back in queue and wait 30 seconds to hope it
gets resolved
+- self.process(job)
+- sleep(30)
+- continue
+-
+ # Prepare filename
+ nzo.verify_nzf_filename(nzf)
+ nzf.filename = sanitize_filename(nzf.filename)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/news/sabnzbd/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -r1.6 PLIST
--- pkg/PLIST 28 May 2018 12:25:20 -0000 1.6
+++ pkg/PLIST 10 Nov 2018 18:35:57 -0000
@@ -7,11 +7,7 @@
@owner
@group
@rcscript ${RCDIR}/sabnzbd
-@owner _sabnzbd
-@group _sabnzbd
bin/sabnzbd
-@owner
-@group
lib/python${MODPY_VERSION}/
lib/python${MODPY_VERSION}/site-packages/
lib/python${MODPY_VERSION}/site-packages/sabnzbd/
@@ -127,8 +123,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/wsgiserver/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/wsgiserver/ssl_builtin.py
lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/wsgiserver/ssl_builtin.pyc
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/wsgiserver/ssl_pyopenssl.py
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/wsgiserver/ssl_pyopenssl.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/wsgiserver/test_wsgiserver.py
lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/wsgiserver/test_wsgiserver.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/
@@ -138,6 +132,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/badfetch-es.tmpl
lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/badfetch-fi.tmpl
lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/badfetch-fr.tmpl
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/badfetch-he.tmpl
lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/badfetch-nb.tmpl
lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/badfetch-nl.tmpl
lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/badfetch-pl.tmpl
@@ -153,6 +148,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/email-es.tmpl
lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/email-fi.tmpl
lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/email-fr.tmpl
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/email-he.tmpl
lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/email-nb.tmpl
lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/email-nl.tmpl
lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/email-pl.tmpl
@@ -168,6 +164,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/rss-es.tmpl
lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/rss-fi.tmpl
lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/rss-fr.tmpl
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/rss-he.tmpl
lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/rss-nb.tmpl
lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/rss-nl.tmpl
lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/rss-pl.tmpl
@@ -180,8 +177,20 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sabnzbd/gntp/
lib/python${MODPY_VERSION}/site-packages/sabnzbd/gntp/__init__.py
lib/python${MODPY_VERSION}/site-packages/sabnzbd/gntp/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/gntp/cli.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/gntp/cli.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/gntp/config.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/gntp/config.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/gntp/core.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/gntp/core.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/gntp/errors.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/gntp/errors.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/gntp/notifier.py
lib/python${MODPY_VERSION}/site-packages/sabnzbd/gntp/notifier.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/gntp/shim.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/gntp/shim.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/gntp/version.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/gntp/version.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/icons/
lib/python${MODPY_VERSION}/site-packages/sabnzbd/icons/nzb.ico
lib/python${MODPY_VERSION}/site-packages/sabnzbd/icons/sabnzbd.ico
@@ -219,6 +228,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/bootstrap/js/
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/bootstrap/js/bootstrap.min.js
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/css/
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/css/chartist.min.css
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/css/login.css
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/css/style.css
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/ico/
@@ -229,12 +239,15 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/ico/apple-touch-icon-76x76-precomposed.png
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/ico/favicon.ico
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/ico/faviconpaused.ico
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/ico/safari-pinned-tab.svg
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/images/
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/images/logo-arrow.svg
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/images/logo-full.svg
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/images/logo-small.svg
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/js/
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/js/jquery-3.1.1.min.js
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/js/chartist.min.js
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/js/filesize.min.js
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/js/jquery-3.2.1.min.js
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/js/jquery-ui.min.js
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/js/jquery.tablesort.min.js
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/js/script.js
@@ -276,13 +289,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Glitter/templates/static/javascripts/jquery.peity.min.js
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Glitter/templates/static/javascripts/knockout-extensions.js
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Glitter/templates/static/javascripts/knockout-latest.js
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Glitter/templates/static/javascripts/moment.js
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Glitter/templates/static/javascripts/moment.min.js
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Glitter/templates/static/javascripts/momentjs_locale/
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Glitter/templates/static/javascripts/momentjs_locale/da.js
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Glitter/templates/static/javascripts/momentjs_locale/de.js
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Glitter/templates/static/javascripts/momentjs_locale/es.js
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Glitter/templates/static/javascripts/momentjs_locale/fi.js
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Glitter/templates/static/javascripts/momentjs_locale/fr.js
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Glitter/templates/static/javascripts/momentjs_locale/he.js
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Glitter/templates/static/javascripts/momentjs_locale/nb.js
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Glitter/templates/static/javascripts/momentjs_locale/nl.js
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Glitter/templates/static/javascripts/momentjs_locale/pl.js
@@ -439,14 +453,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/wizard/two.html
lib/python${MODPY_VERSION}/site-packages/sabnzbd/licenses/
lib/python${MODPY_VERSION}/site-packages/sabnzbd/licenses/License-CherryPy.txt
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/licenses/License-OrderedDict.txt
lib/python${MODPY_VERSION}/site-packages/sabnzbd/licenses/License-Python.txt
lib/python${MODPY_VERSION}/site-packages/sabnzbd/licenses/License-PythonParts.txt
lib/python${MODPY_VERSION}/site-packages/sabnzbd/licenses/License-configobj.txt
lib/python${MODPY_VERSION}/site-packages/sabnzbd/licenses/License-feedparser.txt
lib/python${MODPY_VERSION}/site-packages/sabnzbd/licenses/License-gntp.txt
lib/python${MODPY_VERSION}/site-packages/sabnzbd/licenses/License-kronos.txt
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/licenses/License-listquote.txt
lib/python${MODPY_VERSION}/site-packages/sabnzbd/licenses/License-pybonjour.txt
lib/python${MODPY_VERSION}/site-packages/sabnzbd/licenses/License-pynewsleecher.txt
lib/python${MODPY_VERSION}/site-packages/sabnzbd/licenses/License-rarfile.txt
@@ -474,6 +486,9 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sabnzbd/locale/fr/
lib/python${MODPY_VERSION}/site-packages/sabnzbd/locale/fr/LC_MESSAGES/
lib/python${MODPY_VERSION}/site-packages/sabnzbd/locale/fr/LC_MESSAGES/SABnzbd.mo
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/locale/he/
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/locale/he/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/locale/he/LC_MESSAGES/SABnzbd.mo
lib/python${MODPY_VERSION}/site-packages/sabnzbd/locale/nb/
lib/python${MODPY_VERSION}/site-packages/sabnzbd/locale/nb/LC_MESSAGES/
lib/python${MODPY_VERSION}/site-packages/sabnzbd/locale/nb/LC_MESSAGES/SABnzbd.mo
@@ -510,6 +525,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/email/es.po
lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/email/fi.po
lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/email/fr.po
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/email/he.po
lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/email/nb.po
lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/email/nl.po
lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/email/pl.po
@@ -527,6 +543,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/main/es.po
lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/main/fi.po
lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/main/fr.po
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/main/he.po
lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/main/nb.po
lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/main/nl.po
lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/main/pl.po
@@ -544,6 +561,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/nsis/es.po
lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/nsis/fi.po
lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/nsis/fr.po
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/nsis/he.po
lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/nsis/nb.po
lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/nsis/nl.po
lib/python${MODPY_VERSION}/site-packages/sabnzbd/po/nsis/pl.po
@@ -576,6 +594,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/decoder.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/decorators.py
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/decorators.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/directunpacker.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/directunpacker.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/dirscanner.py
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/dirscanner.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/downloader.py
@@ -606,6 +626,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/osxmenu.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/panic.py
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/panic.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/par2file.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/par2file.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/postproc.py
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/postproc.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/powersup.py
@@ -622,10 +644,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/scheduler.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/skintext.py
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/skintext.pyc
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/trylist.py
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/trylist.pyc
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/tvsort.py
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/tvsort.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/sorting.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/sorting.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/urlgrabber.py
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/urlgrabber.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/
@@ -633,6 +653,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/certgen.py
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/certgen.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/checkdir.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/checkdir.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/configobj.py
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/configobj.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/diskspeed.py
@@ -647,8 +669,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/json.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/kronos.py
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/kronos.pyc
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/listquote.py
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/listquote.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/pathbrowser.py
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/pathbrowser.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/pybonjour.py
@@ -661,20 +681,20 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/rsslib.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/servertests.py
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/servertests.pyc
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/sslinfo.py
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/sslinfo.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/systrayiconthread.py
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/systrayiconthread.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/upload.py
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/utils/upload.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/version.py
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/version.pyc
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/wizard.py
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/wizard.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/zconfig.py
lib/python${MODPY_VERSION}/site-packages/sabnzbd/sabnzbd/zconfig.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/scripts/
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/scripts/Deobfuscate.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/scripts/Deobfuscate.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/scripts/Sample-PostProc.cmd
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/scripts/Sample-PostProc.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/scripts/Sample-PostProc.pyc
lib/python${MODPY_VERSION}/site-packages/sabnzbd/scripts/Sample-PostProc.sh
lib/python${MODPY_VERSION}/site-packages/sabnzbd/six/
lib/python${MODPY_VERSION}/site-packages/sabnzbd/six/__init__.py
Index: pkg/sabnzbd.rc
===================================================================
RCS file: /cvs/ports/news/sabnzbd/pkg/sabnzbd.rc,v
retrieving revision 1.3
diff -u -p -u -r1.3 sabnzbd.rc
--- pkg/sabnzbd.rc 11 Jan 2018 19:27:08 -0000 1.3
+++ pkg/sabnzbd.rc 10 Nov 2018 18:35:57 -0000
@@ -6,6 +6,7 @@ datadir="/var/sabnzbd"
daemon="${MODPY_BIN}
${TRUEPREFIX}/lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.py -d"
daemon_flags="-b 0 -f ${datadir} -p ${datadir}/sabnzbd.pid"
+daemon_timeout=120
daemon_user="_sabnzbd"
. /etc/rc.d/rc.subr
