summaryrefslogtreecommitdiff
path: root/net-nntp/sabnzbd/files/patches
diff options
context:
space:
mode:
Diffstat (limited to 'net-nntp/sabnzbd/files/patches')
-rw-r--r--net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch28
-rw-r--r--net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch34
-rw-r--r--net-nntp/sabnzbd/files/patches/0003-cfg-disable-NtfOSD-by-default.patch25
3 files changed, 87 insertions, 0 deletions
diff --git a/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch
new file mode 100644
index 000000000000..0f89dcd13414
--- /dev/null
+++ b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch
@@ -0,0 +1,28 @@
+From db9a217dd5a02b5be72d47b7618f877f39cb31bc Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Mon, 13 Feb 2017 18:20:39 -0500
+Subject: [PATCH 1/3] use system configobj
+
+---
+ sabnzbd/config.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/sabnzbd/config.py b/sabnzbd/config.py
+index 2f58ffd..04bfaab 100644
+--- a/sabnzbd/config.py
++++ b/sabnzbd/config.py
+@@ -30,9 +30,10 @@ from hashlib import md5
+ from urlparse import urlparse
+ import sabnzbd.misc
+ from sabnzbd.constants import CONFIG_VERSION, NORMAL_PRIORITY, DEFAULT_PRIORITY, MAX_WIN_DFOLDER
+-from sabnzbd.utils import configobj
+ from sabnzbd.decorators import synchronized
+
++import configobj
++
+ CONFIG_LOCK = threading.Lock()
+ SAVE_CONFIG_LOCK = threading.Lock()
+
+--
+2.13.0
+
diff --git a/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch b/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch
new file mode 100644
index 000000000000..68e39a975e7e
--- /dev/null
+++ b/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch
@@ -0,0 +1,34 @@
+From b8540c4c71e917623290f3ca8d4091228fab8903 Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Mon, 13 Feb 2017 18:21:28 -0500
+Subject: [PATCH 2/3] use system feedparser
+
+---
+ sabnzbd/rss.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sabnzbd/rss.py b/sabnzbd/rss.py
+index 0315fca..18ac828 100644
+--- a/sabnzbd/rss.py
++++ b/sabnzbd/rss.py
+@@ -25,6 +25,8 @@ import time
+ import datetime
+ import threading
+
++import feedparser
++
+ import sabnzbd
+ from sabnzbd.constants import RSS_FILE_NAME, DEFAULT_PRIORITY, NORMAL_PRIORITY, DUP_PRIORITY
+ from sabnzbd.decorators import synchronized
+@@ -35,8 +37,6 @@ from sabnzbd.misc import cat_convert, wildcard_to_re, cat_to_opts, \
+ import sabnzbd.emailer as emailer
+ from sabnzbd.encoding import unicoder, xml_name
+
+-import sabnzbd.utils.feedparser as feedparser
+-
+ __RSS = None # Global pointer to RSS-scanner instance
+
+
+--
+2.13.0
+
diff --git a/net-nntp/sabnzbd/files/patches/0003-cfg-disable-NtfOSD-by-default.patch b/net-nntp/sabnzbd/files/patches/0003-cfg-disable-NtfOSD-by-default.patch
new file mode 100644
index 000000000000..064d523a1e1e
--- /dev/null
+++ b/net-nntp/sabnzbd/files/patches/0003-cfg-disable-NtfOSD-by-default.patch
@@ -0,0 +1,25 @@
+From 459111cb4f6937d58de480cf06743474f5c1dd3d Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Sat, 5 Aug 2017 17:38:03 -0400
+Subject: [PATCH 3/3] cfg: disable NtfOSD by default
+
+---
+ sabnzbd/cfg.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sabnzbd/cfg.py b/sabnzbd/cfg.py
+index d8867db..59a341c 100644
+--- a/sabnzbd/cfg.py
++++ b/sabnzbd/cfg.py
+@@ -322,7 +322,7 @@ acenter_prio_queue_done = OptionBool('acenter', 'acenter_prio_queue_done', True)
+ acenter_prio_other = OptionBool('acenter', 'acenter_prio_other', False)
+
+ # [ntfosd]
+-ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', not sabnzbd.WIN32 and not sabnzbd.DARWIN)
++ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', False)
+ ntfosd_cats = OptionList('ntfosd', 'ntfosd_cats', ['*'])
+ ntfosd_prio_startup = OptionBool('ntfosd', 'ntfosd_prio_startup', True)
+ ntfosd_prio_download = OptionBool('ntfosd', 'ntfosd_prio_download', False)
+--
+2.13.0
+