1 |
commit: 4c6258d55124ef58d2e7979c2076c13a9ed11e92 |
2 |
Author: Justin Bronder <jsbronder <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 1 14:42:46 2017 +0000 |
4 |
Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 1 14:42:46 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c6258d5 |
7 |
|
8 |
net-nntp/sabnzbd: bump 2.2.1 |
9 |
|
10 |
Fixes #628336 |
11 |
|
12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
13 |
|
14 |
net-nntp/sabnzbd/Manifest | 2 +- |
15 |
.../files/patches/0001-use-system-configobj.patch | 10 ++++----- |
16 |
.../files/patches/0002-use-system-feedparser.patch | 6 +++--- |
17 |
...ch => 0003-cfg-disable-NtfOSD-by-default.patch} | 10 ++++----- |
18 |
.../sabnzbd/files/patches/0003-use-gntp-1.0.patch | 25 ---------------------- |
19 |
.../{sabnzbd-2.1.0.ebuild => sabnzbd-2.2.1.ebuild} | 16 +++++++++++++- |
20 |
6 files changed, 29 insertions(+), 40 deletions(-) |
21 |
|
22 |
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest |
23 |
index 2310c66af25..14e888f0744 100644 |
24 |
--- a/net-nntp/sabnzbd/Manifest |
25 |
+++ b/net-nntp/sabnzbd/Manifest |
26 |
@@ -1 +1 @@ |
27 |
-DIST SABnzbd-2.1.0-src.tar.gz 2683475 SHA256 bad49cc66381448e472280e143fbdd096788c51a9aada8317f12817ce7a855b6 SHA512 1c52b3b15de6493ed956b40a02d9c87fdd8fb96fdc587cf694f61f04f50c7f76de936dd171045a6ae5d82f6e4df68cd07bd04d149b8a1e5c9c4ba587a373327f WHIRLPOOL c27b5ca8541f7d56a499b3467e02d734cff9a6511651f5bc7893ced77cc9238dde10a1ba33340b3a1635cf63203b6ed3a859d91396dd800f8424b56129f52d92 |
28 |
+DIST SABnzbd-2.2.1-src.tar.gz 2731050 SHA256 5e29c44198d88245c6c8d0f78091c9a7915a07b464c1e66cf30eecf439c76a44 SHA512 58c8a86358c0c993e6c62415393d4aba557dd093c52c8270604b9db5396afbb6d423b002b339cb2aa81a6fe66dbdde416a6834c57ca0efd7a1461294eb088af1 WHIRLPOOL dad7e0d2bf99aeeafbbf0624374f0d58ce22e68441aa401707049e101a6f842819261b91f48e493957a1440bcbf26a282312126b009c8d578f9311de377f0c20 |
29 |
|
30 |
diff --git a/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch |
31 |
index 7da07926ca2..0f89dcd1341 100644 |
32 |
--- a/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch |
33 |
+++ b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch |
34 |
@@ -1,18 +1,18 @@ |
35 |
-From c12601b509ab66ac1b076679fe69fe7698455fb1 Mon Sep 17 00:00:00 2001 |
36 |
+From db9a217dd5a02b5be72d47b7618f877f39cb31bc Mon Sep 17 00:00:00 2001 |
37 |
From: Justin Bronder <jsbronder@×××××.com> |
38 |
Date: Mon, 13 Feb 2017 18:20:39 -0500 |
39 |
-Subject: [PATCH 1/4] use system configobj |
40 |
+Subject: [PATCH 1/3] use system configobj |
41 |
|
42 |
--- |
43 |
sabnzbd/config.py | 3 ++- |
44 |
1 file changed, 2 insertions(+), 1 deletion(-) |
45 |
|
46 |
diff --git a/sabnzbd/config.py b/sabnzbd/config.py |
47 |
-index 93dd9bb..aab1648 100644 |
48 |
+index 2f58ffd..04bfaab 100644 |
49 |
--- a/sabnzbd/config.py |
50 |
+++ b/sabnzbd/config.py |
51 |
-@@ -26,9 +26,10 @@ import threading |
52 |
- import shutil |
53 |
+@@ -30,9 +30,10 @@ from hashlib import md5 |
54 |
+ from urlparse import urlparse |
55 |
import sabnzbd.misc |
56 |
from sabnzbd.constants import CONFIG_VERSION, NORMAL_PRIORITY, DEFAULT_PRIORITY, MAX_WIN_DFOLDER |
57 |
-from sabnzbd.utils import configobj |
58 |
|
59 |
diff --git a/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch b/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch |
60 |
index cb9d9310576..68e39a975e7 100644 |
61 |
--- a/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch |
62 |
+++ b/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch |
63 |
@@ -1,14 +1,14 @@ |
64 |
-From 7095a430201d0a9ec28e2c8f7e05f76eea59431e Mon Sep 17 00:00:00 2001 |
65 |
+From b8540c4c71e917623290f3ca8d4091228fab8903 Mon Sep 17 00:00:00 2001 |
66 |
From: Justin Bronder <jsbronder@×××××.com> |
67 |
Date: Mon, 13 Feb 2017 18:21:28 -0500 |
68 |
-Subject: [PATCH 2/4] use system feedparser |
69 |
+Subject: [PATCH 2/3] use system feedparser |
70 |
|
71 |
--- |
72 |
sabnzbd/rss.py | 4 ++-- |
73 |
1 file changed, 2 insertions(+), 2 deletions(-) |
74 |
|
75 |
diff --git a/sabnzbd/rss.py b/sabnzbd/rss.py |
76 |
-index 9987e91..8ee1552 100644 |
77 |
+index 0315fca..18ac828 100644 |
78 |
--- a/sabnzbd/rss.py |
79 |
+++ b/sabnzbd/rss.py |
80 |
@@ -25,6 +25,8 @@ import time |
81 |
|
82 |
diff --git a/net-nntp/sabnzbd/files/patches/0004-cfg-disable-NtfOSD-by-default.patch b/net-nntp/sabnzbd/files/patches/0003-cfg-disable-NtfOSD-by-default.patch |
83 |
similarity index 71% |
84 |
rename from net-nntp/sabnzbd/files/patches/0004-cfg-disable-NtfOSD-by-default.patch |
85 |
rename to net-nntp/sabnzbd/files/patches/0003-cfg-disable-NtfOSD-by-default.patch |
86 |
index 25856801af7..064d523a1e1 100644 |
87 |
--- a/net-nntp/sabnzbd/files/patches/0004-cfg-disable-NtfOSD-by-default.patch |
88 |
+++ b/net-nntp/sabnzbd/files/patches/0003-cfg-disable-NtfOSD-by-default.patch |
89 |
@@ -1,25 +1,25 @@ |
90 |
-From 31eec0d37bcb962afb1b0f0974411dae728dcd9f Mon Sep 17 00:00:00 2001 |
91 |
+From 459111cb4f6937d58de480cf06743474f5c1dd3d Mon Sep 17 00:00:00 2001 |
92 |
From: Justin Bronder <jsbronder@×××××.com> |
93 |
Date: Sat, 5 Aug 2017 17:38:03 -0400 |
94 |
-Subject: [PATCH 4/4] cfg: disable NtfOSD by default |
95 |
+Subject: [PATCH 3/3] cfg: disable NtfOSD by default |
96 |
|
97 |
--- |
98 |
sabnzbd/cfg.py | 2 +- |
99 |
1 file changed, 1 insertion(+), 1 deletion(-) |
100 |
|
101 |
diff --git a/sabnzbd/cfg.py b/sabnzbd/cfg.py |
102 |
-index baf5678..f9646fb 100644 |
103 |
+index d8867db..59a341c 100644 |
104 |
--- a/sabnzbd/cfg.py |
105 |
+++ b/sabnzbd/cfg.py |
106 |
-@@ -270,7 +270,7 @@ acenter_prio_queue_done = OptionBool('acenter', 'acenter_prio_queue_done', True) |
107 |
+@@ -322,7 +322,7 @@ acenter_prio_queue_done = OptionBool('acenter', 'acenter_prio_queue_done', True) |
108 |
acenter_prio_other = OptionBool('acenter', 'acenter_prio_other', False) |
109 |
|
110 |
# [ntfosd] |
111 |
-ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', not sabnzbd.WIN32 and not sabnzbd.DARWIN) |
112 |
+ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', False) |
113 |
+ ntfosd_cats = OptionList('ntfosd', 'ntfosd_cats', ['*']) |
114 |
ntfosd_prio_startup = OptionBool('ntfosd', 'ntfosd_prio_startup', True) |
115 |
ntfosd_prio_download = OptionBool('ntfosd', 'ntfosd_prio_download', False) |
116 |
- ntfosd_prio_pp = OptionBool('ntfosd', 'ntfosd_prio_pp', False) |
117 |
-- |
118 |
2.13.0 |
119 |
|
120 |
|
121 |
diff --git a/net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch b/net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch |
122 |
deleted file mode 100644 |
123 |
index da87c01a6bd..00000000000 |
124 |
--- a/net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch |
125 |
+++ /dev/null |
126 |
@@ -1,25 +0,0 @@ |
127 |
-From 1530dc98302cd8a57cf8c3a4616341a7f2c08e50 Mon Sep 17 00:00:00 2001 |
128 |
-From: Justin Bronder <jsbronder@×××××.com> |
129 |
-Date: Mon, 13 Feb 2017 18:23:46 -0500 |
130 |
-Subject: [PATCH 3/4] use >=gntp-1.0 |
131 |
- |
132 |
---- |
133 |
- sabnzbd/notifier.py | 2 +- |
134 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
135 |
- |
136 |
-diff --git a/sabnzbd/notifier.py b/sabnzbd/notifier.py |
137 |
-index 38d0678..4742b3d 100644 |
138 |
---- a/sabnzbd/notifier.py |
139 |
-+++ b/sabnzbd/notifier.py |
140 |
-@@ -39,7 +39,7 @@ from sabnzbd.constants import NOTIFY_KEYS |
141 |
- from sabnzbd.misc import split_host, make_script_path |
142 |
- from sabnzbd.newsunpack import external_script |
143 |
- |
144 |
--from gntp import GNTPRegister |
145 |
-+from gntp.core import GNTPRegister |
146 |
- from gntp.notifier import GrowlNotifier |
147 |
- try: |
148 |
- import Growl |
149 |
--- |
150 |
-2.13.0 |
151 |
- |
152 |
|
153 |
diff --git a/net-nntp/sabnzbd/sabnzbd-2.1.0.ebuild b/net-nntp/sabnzbd/sabnzbd-2.2.1.ebuild |
154 |
similarity index 86% |
155 |
rename from net-nntp/sabnzbd/sabnzbd-2.1.0.ebuild |
156 |
rename to net-nntp/sabnzbd/sabnzbd-2.2.1.ebuild |
157 |
index 67204542978..b08b1d3c549 100644 |
158 |
--- a/net-nntp/sabnzbd/sabnzbd-2.1.0.ebuild |
159 |
+++ b/net-nntp/sabnzbd/sabnzbd-2.2.1.ebuild |
160 |
@@ -120,13 +120,27 @@ pkg_postinst() { |
161 |
einfo "As Growl is not the default notification system on Gentoo, we disable it." |
162 |
|
163 |
local replacing |
164 |
+ local major |
165 |
+ local minor |
166 |
for replacing in ${REPLACING_VERSIONS}; do |
167 |
- if [ "$(get_major_version ${replacing})" == "1" ]; then |
168 |
+ major=$(get_major_version ${replacing}) |
169 |
+ minor=$(get_version_component_range 2 ${replacing}) |
170 |
+ |
171 |
+ if [ "${major}" == "1" ]; then |
172 |
ewarn |
173 |
ewarn "Upgrading to ${PN}-2.x.y converts schedule items to a format" |
174 |
ewarn "that is not compatible with earlier ${PN}-1.x.y releases." |
175 |
ewarn |
176 |
break |
177 |
+ elif [ "${major}" == "2" ] && [ ${minor} -lt 2 ]; then |
178 |
+ ewarn |
179 |
+ ewarn "Due to changes in this release, the queue will be converted when ${PN}" |
180 |
+ ewarn "is started for the first time. Job order, settings and data will be" |
181 |
+ ewarn "preserved, but all jobs will be unpaused and URLs that did not finish" |
182 |
+ ewarn "fetching before the upgrade will be lost!" |
183 |
+ ewarn |
184 |
+ break |
185 |
fi |
186 |
+ |
187 |
done |
188 |
} |