From 4c6258d55124ef58d2e7979c2076c13a9ed11e92 Mon Sep 17 00:00:00 2001 From: Justin Bronder Date: Fri, 1 Sep 2017 10:42:46 -0400 Subject: net-nntp/sabnzbd: bump 2.2.1 Fixes #628336 Package-Manager: Portage-2.3.6, Repoman-2.3.1 --- net-nntp/sabnzbd/Manifest | 2 +- .../files/patches/0001-use-system-configobj.patch | 10 +- .../files/patches/0002-use-system-feedparser.patch | 6 +- .../0003-cfg-disable-NtfOSD-by-default.patch | 25 ++++ .../sabnzbd/files/patches/0003-use-gntp-1.0.patch | 25 ---- .../0004-cfg-disable-NtfOSD-by-default.patch | 25 ---- net-nntp/sabnzbd/sabnzbd-2.1.0.ebuild | 132 ------------------- net-nntp/sabnzbd/sabnzbd-2.2.1.ebuild | 146 +++++++++++++++++++++ 8 files changed, 180 insertions(+), 191 deletions(-) create mode 100644 net-nntp/sabnzbd/files/patches/0003-cfg-disable-NtfOSD-by-default.patch delete mode 100644 net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch delete mode 100644 net-nntp/sabnzbd/files/patches/0004-cfg-disable-NtfOSD-by-default.patch delete mode 100644 net-nntp/sabnzbd/sabnzbd-2.1.0.ebuild create mode 100644 net-nntp/sabnzbd/sabnzbd-2.2.1.ebuild (limited to 'net-nntp') diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest index 2310c66af250..14e888f07448 100644 --- a/net-nntp/sabnzbd/Manifest +++ b/net-nntp/sabnzbd/Manifest @@ -1 +1 @@ -DIST SABnzbd-2.1.0-src.tar.gz 2683475 SHA256 bad49cc66381448e472280e143fbdd096788c51a9aada8317f12817ce7a855b6 SHA512 1c52b3b15de6493ed956b40a02d9c87fdd8fb96fdc587cf694f61f04f50c7f76de936dd171045a6ae5d82f6e4df68cd07bd04d149b8a1e5c9c4ba587a373327f WHIRLPOOL c27b5ca8541f7d56a499b3467e02d734cff9a6511651f5bc7893ced77cc9238dde10a1ba33340b3a1635cf63203b6ed3a859d91396dd800f8424b56129f52d92 +DIST SABnzbd-2.2.1-src.tar.gz 2731050 SHA256 5e29c44198d88245c6c8d0f78091c9a7915a07b464c1e66cf30eecf439c76a44 SHA512 58c8a86358c0c993e6c62415393d4aba557dd093c52c8270604b9db5396afbb6d423b002b339cb2aa81a6fe66dbdde416a6834c57ca0efd7a1461294eb088af1 WHIRLPOOL dad7e0d2bf99aeeafbbf0624374f0d58ce22e68441aa401707049e101a6f842819261b91f48e493957a1440bcbf26a282312126b009c8d578f9311de377f0c20 diff --git a/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch index 7da07926ca27..0f89dcd13414 100644 --- a/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch +++ b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch @@ -1,18 +1,18 @@ -From c12601b509ab66ac1b076679fe69fe7698455fb1 Mon Sep 17 00:00:00 2001 +From db9a217dd5a02b5be72d47b7618f877f39cb31bc Mon Sep 17 00:00:00 2001 From: Justin Bronder Date: Mon, 13 Feb 2017 18:20:39 -0500 -Subject: [PATCH 1/4] use system configobj +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 93dd9bb..aab1648 100644 +index 2f58ffd..04bfaab 100644 --- a/sabnzbd/config.py +++ b/sabnzbd/config.py -@@ -26,9 +26,10 @@ import threading - import shutil +@@ -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 diff --git a/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch b/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch index cb9d9310576c..68e39a975e7e 100644 --- a/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch +++ b/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch @@ -1,14 +1,14 @@ -From 7095a430201d0a9ec28e2c8f7e05f76eea59431e Mon Sep 17 00:00:00 2001 +From b8540c4c71e917623290f3ca8d4091228fab8903 Mon Sep 17 00:00:00 2001 From: Justin Bronder Date: Mon, 13 Feb 2017 18:21:28 -0500 -Subject: [PATCH 2/4] use system feedparser +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 9987e91..8ee1552 100644 +index 0315fca..18ac828 100644 --- a/sabnzbd/rss.py +++ b/sabnzbd/rss.py @@ -25,6 +25,8 @@ import time 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 +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 + 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 deleted file mode 100644 index da87c01a6bd7..000000000000 --- a/net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1530dc98302cd8a57cf8c3a4616341a7f2c08e50 Mon Sep 17 00:00:00 2001 -From: Justin Bronder -Date: Mon, 13 Feb 2017 18:23:46 -0500 -Subject: [PATCH 3/4] use >=gntp-1.0 - ---- - sabnzbd/notifier.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sabnzbd/notifier.py b/sabnzbd/notifier.py -index 38d0678..4742b3d 100644 ---- a/sabnzbd/notifier.py -+++ b/sabnzbd/notifier.py -@@ -39,7 +39,7 @@ from sabnzbd.constants import NOTIFY_KEYS - from sabnzbd.misc import split_host, make_script_path - from sabnzbd.newsunpack import external_script - --from gntp import GNTPRegister -+from gntp.core import GNTPRegister - from gntp.notifier import GrowlNotifier - try: - import Growl --- -2.13.0 - diff --git a/net-nntp/sabnzbd/files/patches/0004-cfg-disable-NtfOSD-by-default.patch b/net-nntp/sabnzbd/files/patches/0004-cfg-disable-NtfOSD-by-default.patch deleted file mode 100644 index 25856801af7c..000000000000 --- a/net-nntp/sabnzbd/files/patches/0004-cfg-disable-NtfOSD-by-default.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 31eec0d37bcb962afb1b0f0974411dae728dcd9f Mon Sep 17 00:00:00 2001 -From: Justin Bronder -Date: Sat, 5 Aug 2017 17:38:03 -0400 -Subject: [PATCH 4/4] 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 baf5678..f9646fb 100644 ---- a/sabnzbd/cfg.py -+++ b/sabnzbd/cfg.py -@@ -270,7 +270,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_prio_startup = OptionBool('ntfosd', 'ntfosd_prio_startup', True) - ntfosd_prio_download = OptionBool('ntfosd', 'ntfosd_prio_download', False) - ntfosd_prio_pp = OptionBool('ntfosd', 'ntfosd_prio_pp', False) --- -2.13.0 - diff --git a/net-nntp/sabnzbd/sabnzbd-2.1.0.ebuild b/net-nntp/sabnzbd/sabnzbd-2.1.0.ebuild deleted file mode 100644 index 672045429780..000000000000 --- a/net-nntp/sabnzbd/sabnzbd-2.1.0.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# Require python-2 with sqlite USE flag -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit python-single-r1 user systemd versionator - -MY_P="${P/sab/SAB}" - -DESCRIPTION="Binary newsgrabber with web-interface" -HOMEPAGE="https://sabnzbd.org/" -SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${PV}/${MY_P}-src.tar.gz" - -# Sabnzbd is GPL-2 but bundles software with the following licenses. -LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+7za +rar unzip" - -# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not -# be in python's sitedir. See: http://wiki.sabnzbd.org/unix-packaging - -# TODO: still bundled but not in portage: -# kronos, rsslib, ssmtplib, listquote, json-py, msgfmt, happyeyeballs -# pynewsleecher -# -# dev-python/rarfile is bundled as of 2.0.1 because sabnzbd is modifying it -# https://github.com/sabnzbd/sabnzbd/commit/de6d642b0dc6eaed63199a99d9a1a8b2e3d0018b -# -# Also note that cherrypy is still bundled. It's near impossible to find -# out where the bundled and heavily patched version came from (pulled from -# cherrypy subversion, patched somewhere, then imported to sabnzbd and patched -# further. Upstream is planning on making this easier with 0.8.0. -# https://github.com/sabnzbd/sabnzbd/issues/47 - -RDEPEND=" - ${PYTHON_DEPS} - >=app-arch/par2cmdline-0.4 - >=dev-python/cheetah-2.0.1 - dev-python/configobj - dev-python/cryptography - dev-python/feedparser - dev-python/gntp - dev-python/pythonutils - dev-python/sabyenc - net-misc/wget - 7za? ( app-arch/p7zip ) - rar? ( || ( app-arch/unrar app-arch/rar ) ) - unzip? ( >=app-arch/unzip-5.5.2 ) -" -DEPEND="${PYTHON_DEPS}" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - HOMEDIR="/var/lib/${PN}" - python-single-r1_pkg_setup - - # Create sabnzbd group - enewgroup "${PN}" - # Create sabnzbd user, put in sabnzbd group - enewuser "${PN}" -1 -1 "${HOMEDIR}" "${PN}" -} - -src_prepare() { - eapply "${FILESDIR}"/patches - - # remove bundled modules - rm -r sabnzbd/utils/{feedparser,configobj}.py || die - rm -r gntp || die - rm licenses/License-{feedparser,configobj,gntp}.txt || die - - eapply_user -} - -src_install() { - local d - - for d in cherrypy email icons interfaces locale po sabnzbd tools util; do - insinto "/usr/share/${PN}/${d}" - doins -r ${d}/* - done - - exeinto "/usr/share/${PN}" - doexe SABnzbd.py - - python_fix_shebang "${ED%/}/usr/share/${PN}" - python_optimize "${ED%/}/usr/share/${PN}" - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - - diropts -o "${PN}" -g "${PN}" - dodir "/etc/${PN}" - dodir "/var/log/${PN}" - - insinto "/etc/${PN}" - insopts -m 0600 -o "${PN}" -g "${PN}" - doins "${FILESDIR}/${PN}.ini" - - dodoc {ABOUT,ISSUES,README}.txt licenses/* - - systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service' -} - -pkg_postinst() { - einfo "Default directory: ${HOMEDIR}" - einfo - einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:" - einfo - einfo " gpasswd -a sabnzbd" - einfo - einfo "By default, SABnzbd+ will listen on TCP port 8080." - einfo - einfo "As Growl is not the default notification system on Gentoo, we disable it." - - local replacing - for replacing in ${REPLACING_VERSIONS}; do - if [ "$(get_major_version ${replacing})" == "1" ]; then - ewarn - ewarn "Upgrading to ${PN}-2.x.y converts schedule items to a format" - ewarn "that is not compatible with earlier ${PN}-1.x.y releases." - ewarn - break - fi - done -} diff --git a/net-nntp/sabnzbd/sabnzbd-2.2.1.ebuild b/net-nntp/sabnzbd/sabnzbd-2.2.1.ebuild new file mode 100644 index 000000000000..b08b1d3c5499 --- /dev/null +++ b/net-nntp/sabnzbd/sabnzbd-2.2.1.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +# Require python-2 with sqlite USE flag +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite" + +inherit python-single-r1 user systemd versionator + +MY_P="${P/sab/SAB}" + +DESCRIPTION="Binary newsgrabber with web-interface" +HOMEPAGE="https://sabnzbd.org/" +SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${PV}/${MY_P}-src.tar.gz" + +# Sabnzbd is GPL-2 but bundles software with the following licenses. +LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+7za +rar unzip" + +# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not +# be in python's sitedir. See: http://wiki.sabnzbd.org/unix-packaging + +# TODO: still bundled but not in portage: +# kronos, rsslib, ssmtplib, listquote, json-py, msgfmt, happyeyeballs +# pynewsleecher +# +# dev-python/rarfile is bundled as of 2.0.1 because sabnzbd is modifying it +# https://github.com/sabnzbd/sabnzbd/commit/de6d642b0dc6eaed63199a99d9a1a8b2e3d0018b +# +# Also note that cherrypy is still bundled. It's near impossible to find +# out where the bundled and heavily patched version came from (pulled from +# cherrypy subversion, patched somewhere, then imported to sabnzbd and patched +# further. Upstream is planning on making this easier with 0.8.0. +# https://github.com/sabnzbd/sabnzbd/issues/47 + +RDEPEND=" + ${PYTHON_DEPS} + >=app-arch/par2cmdline-0.4 + >=dev-python/cheetah-2.0.1 + dev-python/configobj + dev-python/cryptography + dev-python/feedparser + dev-python/gntp + dev-python/pythonutils + dev-python/sabyenc + net-misc/wget + 7za? ( app-arch/p7zip ) + rar? ( || ( app-arch/unrar app-arch/rar ) ) + unzip? ( >=app-arch/unzip-5.5.2 ) +" +DEPEND="${PYTHON_DEPS}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + HOMEDIR="/var/lib/${PN}" + python-single-r1_pkg_setup + + # Create sabnzbd group + enewgroup "${PN}" + # Create sabnzbd user, put in sabnzbd group + enewuser "${PN}" -1 -1 "${HOMEDIR}" "${PN}" +} + +src_prepare() { + eapply "${FILESDIR}"/patches + + # remove bundled modules + rm -r sabnzbd/utils/{feedparser,configobj}.py || die + rm -r gntp || die + rm licenses/License-{feedparser,configobj,gntp}.txt || die + + eapply_user +} + +src_install() { + local d + + for d in cherrypy email icons interfaces locale po sabnzbd tools util; do + insinto "/usr/share/${PN}/${d}" + doins -r ${d}/* + done + + exeinto "/usr/share/${PN}" + doexe SABnzbd.py + + python_fix_shebang "${ED%/}/usr/share/${PN}" + python_optimize "${ED%/}/usr/share/${PN}" + + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + + diropts -o "${PN}" -g "${PN}" + dodir "/etc/${PN}" + dodir "/var/log/${PN}" + + insinto "/etc/${PN}" + insopts -m 0600 -o "${PN}" -g "${PN}" + doins "${FILESDIR}/${PN}.ini" + + dodoc {ABOUT,ISSUES,README}.txt licenses/* + + systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service' +} + +pkg_postinst() { + einfo "Default directory: ${HOMEDIR}" + einfo + einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:" + einfo + einfo " gpasswd -a sabnzbd" + einfo + einfo "By default, SABnzbd+ will listen on TCP port 8080." + einfo + einfo "As Growl is not the default notification system on Gentoo, we disable it." + + local replacing + local major + local minor + for replacing in ${REPLACING_VERSIONS}; do + major=$(get_major_version ${replacing}) + minor=$(get_version_component_range 2 ${replacing}) + + if [ "${major}" == "1" ]; then + ewarn + ewarn "Upgrading to ${PN}-2.x.y converts schedule items to a format" + ewarn "that is not compatible with earlier ${PN}-1.x.y releases." + ewarn + break + elif [ "${major}" == "2" ] && [ ${minor} -lt 2 ]; then + ewarn + ewarn "Due to changes in this release, the queue will be converted when ${PN}" + ewarn "is started for the first time. Job order, settings and data will be" + ewarn "preserved, but all jobs will be unpaused and URLs that did not finish" + ewarn "fetching before the upgrade will be lost!" + ewarn + break + fi + + done +} -- cgit v1.2.3-18-g5258