From 236666043e8f9f43edb87bac346ba6631d2ea7b5 Mon Sep 17 00:00:00 2001 From: Max Brazhnikov Date: Mon, 10 Jan 2022 00:11:27 +0300 Subject: [PATCH] news/sabnzbdplus: update to 3.4.2 and switch from p7zip to 7-zip. PR: 258597 Submitted by: James French (maintainer) --- news/sabnzbdplus/Makefile | 6 +- news/sabnzbdplus/distinfo | 6 +- .../files/patch-sabnzbd_newsunpack.py | 11 +++ news/sabnzbdplus/pkg-plist | 70 +------------------ 4 files changed, 19 insertions(+), 74 deletions(-) create mode 100644 news/sabnzbdplus/files/patch-sabnzbd_newsunpack.py diff --git a/news/sabnzbdplus/Makefile b/news/sabnzbdplus/Makefile index afa9fde9eb95..2e556183200b 100644 --- a/news/sabnzbdplus/Makefile +++ b/news/sabnzbdplus/Makefile @@ -1,5 +1,5 @@ PORTNAME= sabnzbdplus -DISTVERSION= 3.3.0 +DISTVERSION= 3.4.2 PORTEPOCH= 1 CATEGORIES= news MASTER_SITES= https://github.com/sabnzbd/sabnzbd/releases/download/${DISTVERSION}/ @@ -20,6 +20,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah3>=0:devel/py-cheetah3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}portend>=0:net/py-portend@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sabyenc3>=0:news/py-sabyenc3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}guessit>0:multimedia/py-guessit@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}puremagic>0:sysutils/py-puremagic@${PY_FLAVOR} \ par2repair:archivers/par2cmdline \ unrar:archivers/unrar @@ -49,7 +51,7 @@ DBUS_DESC= DBUS support for system power management NOTIFY2_DESC= Notify2 support PYGOBJECT_DESC= PyGObject support for system tray icon (requires cairo) -7ZIP_RUN_DEPENDS= 7za:archivers/p7zip +7ZIP_RUN_DEPENDS= 7zz:archivers/7-zip DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} NOTIFY2_IMPLIES= DBUS NOTIFY2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify2>=0:devel/py-notify2@${PY_FLAVOR} diff --git a/news/sabnzbdplus/distinfo b/news/sabnzbdplus/distinfo index 0b9c4496e953..4f5fcaad94e9 100644 --- a/news/sabnzbdplus/distinfo +++ b/news/sabnzbdplus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1622527272 -SHA256 (SABnzbd-3.3.0-src.tar.gz) = bb5617f8e5d89720e69655275fc2a25023d8d7173dce2eae5ef45d9dd5df442e -SIZE (SABnzbd-3.3.0-src.tar.gz) = 2786354 +TIMESTAMP = 1634462649 +SHA256 (SABnzbd-3.4.2-src.tar.gz) = fd2c91e15aa667657dd7c960872fbff148467e88fe2d8c8e6e81fcc2e3402842 +SIZE (SABnzbd-3.4.2-src.tar.gz) = 2979084 diff --git a/news/sabnzbdplus/files/patch-sabnzbd_newsunpack.py b/news/sabnzbdplus/files/patch-sabnzbd_newsunpack.py new file mode 100644 index 000000000000..e4cc148b9b26 --- /dev/null +++ b/news/sabnzbdplus/files/patch-sabnzbd_newsunpack.py @@ -0,0 +1,11 @@ +--- sabnzbd/newsunpack.py.orig 2021-10-15 06:30:37 UTC ++++ sabnzbd/newsunpack.py +@@ -127,6 +127,8 @@ def find_programs(curdir): + if not sabnzbd.newsunpack.SEVEN_COMMAND: + sabnzbd.newsunpack.SEVEN_COMMAND = find_on_path("7za") + if not sabnzbd.newsunpack.SEVEN_COMMAND: ++ sabnzbd.newsunpack.SEVEN_COMMAND = find_on_path("7zz") ++ if not sabnzbd.newsunpack.SEVEN_COMMAND: + sabnzbd.newsunpack.SEVEN_COMMAND = find_on_path("7z") + + if not (sabnzbd.WIN32 or sabnzbd.DARWIN): diff --git a/news/sabnzbdplus/pkg-plist b/news/sabnzbdplus/pkg-plist index 5973b1777c9d..7e8097e656a0 100644 --- a/news/sabnzbdplus/pkg-plist +++ b/news/sabnzbdplus/pkg-plist @@ -45,6 +45,7 @@ bin/SABnzbd.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/certgen.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/checkdir.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/diskspeed.py +%%PYTHON_SITELIBDIR%%/sabnzbd/utils/file_extension.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/getperformance.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/happyeyeballs.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/internetspeed.py @@ -166,15 +167,12 @@ bin/SABnzbd.py %%DATADIR%%/interfaces/Glitter/licenses/LICENSE-Apache.txt %%DATADIR%%/interfaces/Glitter/licenses/LICENSE-CC.txt %%DATADIR%%/interfaces/Glitter/licenses/LICENSE-MIT.txt -%%DATADIR%%/interfaces/Glitter/templates/history.tmpl %%DATADIR%%/interfaces/Glitter/templates/include_history.tmpl %%DATADIR%%/interfaces/Glitter/templates/include_menu.tmpl %%DATADIR%%/interfaces/Glitter/templates/include_messages.tmpl %%DATADIR%%/interfaces/Glitter/templates/include_overlays.tmpl %%DATADIR%%/interfaces/Glitter/templates/include_queue.tmpl %%DATADIR%%/interfaces/Glitter/templates/main.tmpl -%%DATADIR%%/interfaces/Glitter/templates/nzo.tmpl -%%DATADIR%%/interfaces/Glitter/templates/queue.tmpl %%DATADIR%%/interfaces/Glitter/templates/static/bootstrap/css/bootstrap.min.css %%DATADIR%%/interfaces/Glitter/templates/static/bootstrap/fonts/glyphicons-halflings-regular.eot %%DATADIR%%/interfaces/Glitter/templates/static/bootstrap/fonts/glyphicons-halflings-regular.svg @@ -213,72 +211,6 @@ bin/SABnzbd.py %%DATADIR%%/interfaces/Glitter/templates/static/stylesheets/colorschemes/Night.css %%DATADIR%%/interfaces/Glitter/templates/static/stylesheets/glitter.css %%DATADIR%%/interfaces/Glitter/templates/static/stylesheets/glitter.mobile.css -%%DATADIR%%/interfaces/Glitter/templates/status.tmpl -%%DATADIR%%/interfaces/Plush/README.txt -%%DATADIR%%/interfaces/Plush/licenses/LICENSE-BSD.txt -%%DATADIR%%/interfaces/Plush/licenses/LICENSE-CC.txt -%%DATADIR%%/interfaces/Plush/licenses/LICENSE-GPL.txt -%%DATADIR%%/interfaces/Plush/licenses/LICENSE-GPL3.txt -%%DATADIR%%/interfaces/Plush/licenses/LICENSE-LGPL.txt -%%DATADIR%%/interfaces/Plush/licenses/LICENSE-MIT.txt -%%DATADIR%%/interfaces/Plush/licenses/LICENSE-WebToolkit.txt -%%DATADIR%%/interfaces/Plush/templates/_inc_footer.tmpl -%%DATADIR%%/interfaces/Plush/templates/_inc_header.tmpl -%%DATADIR%%/interfaces/Plush/templates/_inc_modals.tmpl -%%DATADIR%%/interfaces/Plush/templates/history.tmpl -%%DATADIR%%/interfaces/Plush/templates/main.tmpl -%%DATADIR%%/interfaces/Plush/templates/nzo.tmpl -%%DATADIR%%/interfaces/Plush/templates/queue.tmpl -%%DATADIR%%/interfaces/Plush/templates/static/javascripts/config.js -%%DATADIR%%/interfaces/Plush/templates/static/javascripts/lib.js -%%DATADIR%%/interfaces/Plush/templates/static/javascripts/plush.js -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/gold.css -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images-split.tar.gz -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/colorbox-border.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/colorbox-controls.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/loading-bar.gif -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/loading-spinner.gif -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/nav/addnzb-grey.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/nav/addnzb.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/nav/config.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/nav/connections-grey.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/nav/connections.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/nav/downloads-grey.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/nav/downloads.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/nav/help-grey.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/nav/help.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/nav/options.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/nav/refresh-grey.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/nav/refresh.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/nav/rss-grey.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/nav/rss.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/sound16.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/sprite-config.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/sprite-main.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/sprite-tilex.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/sprite-tiley.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/thumbdown20.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/thumbup20.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/vision16.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-bg_flat_0_eeeeee_40x100.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-bg_flat_55_c0402a_40x100.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-bg_flat_55_eeeeee_40x100.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-bg_glass_35_dddddd_1x400.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-bg_glass_60_eeeeee_1x400.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-bg_inset-hard_75_999999_1x100.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-icons_3383bb_256x240.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-icons_454545_256x240.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-icons_70b2e1_256x240.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-icons_999999_256x240.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-icons_fbc856_256x240.png -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/jquery-ui-1.8.15.custom.css -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/rateit/delete.gif -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/rateit/rateit.css -%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/rateit/star.gif -%%DATADIR%%/interfaces/Plush/templates/status.tmpl %%DATADIR%%/interfaces/wizard/README.TXT %%DATADIR%%/interfaces/wizard/inc_bottom.tmpl %%DATADIR%%/interfaces/wizard/inc_top.tmpl