Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SABnzbd to 4.1.0, update UnRar to 6.23 and add par2cmdline-turbo #5905

Merged
merged 3 commits into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions cross/par2cmdline-turbo/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
PKG_NAME = par2cmdline-turbo
PKG_VERS = 1.1.0
PKG_EXT = tar.gz
PKG_GIT_HASH = e00677a8249f438f0f52b0270af9e8c7116eeac0
PKG_DIST_NAME = $(PKG_GIT_HASH).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/animetosho/par2cmdline-turbo/archive
PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_GIT_HASH)
hgy59 marked this conversation as resolved.
Show resolved Hide resolved

DEPENDS =

HOMEPAGE = https://github.com/animetosho/par2cmdline-turbo
COMMENT = This is a simple fork of par2cmdline which replaces core computation routines with ParPars processing backend, improving par2cmdlines performance on x86/ARM platforms. par2cmdline is a PAR 2.0 compatible file verification and repair tool.
LICENSE = GPL

# Ensure C++11 compatibility
UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)

GNU_CONFIGURE = 1
ADDITIONAL_CFLAGS = -std=c11

PRE_CONFIGURE_TARGET = myPreConfigure
POST_INSTALL_TARGET = myPostInstall

include ../../mk/spksrc.cross-cc.mk

PAR2_TOOLS = par2create par2repair par2verify

.PHONY: myPreConfigure
myPreConfigure:
$(RUN) ./automake.sh

.PHONY: myPostInstall
myPostInstall:
(cd $(INSTALL_DIR)/$(INSTALL_PREFIX)/bin ; \
for tool in $(PAR2_TOOLS); \
do \
rm $${tool} ; \
ln -sf par2 $${tool} ; \
done \
)
File renamed without changes.
3 changes: 3 additions & 0 deletions cross/par2cmdline-turbo/digests
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
par2cmdline-turbo-gite00677a8249f438f0f52b0270af9e8c7116eeac0.tar.gz SHA1 17187908f279068a5306b88b6adcb3ad63d83356
par2cmdline-turbo-gite00677a8249f438f0f52b0270af9e8c7116eeac0.tar.gz SHA256 bb0ad1baa2625a6bd61122e43e84a1aa62a6da8d6ddc4eb024adfe5c4bf7f81a
par2cmdline-turbo-gite00677a8249f438f0f52b0270af9e8c7116eeac0.tar.gz MD5 fee6b5fd2997095ad52c25f344062a7b
37 changes: 0 additions & 37 deletions cross/par2cmdline/Makefile

This file was deleted.

3 changes: 0 additions & 3 deletions cross/par2cmdline/digests

This file was deleted.

24 changes: 0 additions & 24 deletions cross/par2cmdline/patches/88f6281/c++11-to-c++0x.patch

This file was deleted.

2 changes: 1 addition & 1 deletion cross/sabnzbd/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = SABnzbd
PKG_VERS = 4.0.3
PKG_VERS = 4.1.0
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS)-src.$(PKG_EXT)
PKG_DIST_SITE = https://github.com/sabnzbd/sabnzbd/releases/download/$(PKG_VERS)
Expand Down
6 changes: 3 additions & 3 deletions cross/sabnzbd/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
SABnzbd-4.0.3-src.tar.gz SHA1 5ac6cc688772408ef31641b79a24aa6d594a80fe
SABnzbd-4.0.3-src.tar.gz SHA256 dfb92a91b6f466c31c9fc9ffc1a1d4b3e6352698674c5ad30913d7a69fefa221
SABnzbd-4.0.3-src.tar.gz MD5 b3d1ca01039cb88f7c829412e3fd39f5
SABnzbd-4.1.0-src.tar.gz SHA1 7ed45efca18ee589ad24a6fa43ae22a47661aa6e
SABnzbd-4.1.0-src.tar.gz SHA256 24cdc711a9a9425b65b53dd5c084f78cc0f6d978c5c712481b7031751d569588
SABnzbd-4.1.0-src.tar.gz MD5 f1033e949168250aef5500ab919938e6
2 changes: 1 addition & 1 deletion cross/unrar/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = unrar
PKG_VERS = 6.2.6
PKG_VERS = 6.2.10
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)src-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://www.rarlab.com/rar
Expand Down
6 changes: 3 additions & 3 deletions cross/unrar/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
unrarsrc-6.2.6.tar.gz SHA1 501edda1b33c85b262982502968fbb96f05640b1
unrarsrc-6.2.6.tar.gz SHA256 0c2d4cbc8b34d0e3bec7b474e0f52bbcc6c4320ec089b4141223ee355f63c318
unrarsrc-6.2.6.tar.gz MD5 6c68f2bbcd9f06f9d37801ad4256e680
unrarsrc-6.2.10.tar.gz SHA1 58d02b23fe252c7a37f77250202a7018801deb51
unrarsrc-6.2.10.tar.gz SHA256 55fe6ebd5e48d6655bfda3fd19b55438ca05e13c7e69772420caad9fdb68ef42
unrarsrc-6.2.10.tar.gz MD5 0ab6486347a084e3c5759f4bbf02042f
11 changes: 7 additions & 4 deletions spk/sabnzbd/Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
SPK_NAME = sabnzbd
SPK_VERS = 4.0.3
SPK_REV = 65
SPK_VERS = 4.1.0
SPK_REV = 66
SPK_ICON = src/sabnzbd.png

PYTHON_PACKAGE = python311
DEPENDS = cross/busybox cross/par2cmdline cross/unrar cross/p7zip cross/$(SPK_NAME)
DEPENDS = cross/busybox cross/par2cmdline-turbo cross/unrar cross/p7zip cross/$(SPK_NAME)
SPK_DEPENDS = "python311>=3.11.5-8"

WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt
Expand All @@ -15,7 +15,7 @@ DESCRIPTION_FRE = SABnzbd rend Usenet aussi simple et automatisé que possible.
DESCRIPTION_SPN = SABnzbd hace que Usenet sea lo más simple posible, automatizando todo lo que se puede. Todo lo que tienes que hacer es agregar un archivo .nzb. SABnzbd empieza desde ahí. Tus archivos serán automáticamente descargados, verificados, reparados, descomprimidos y archivados.
DISPLAY_NAME = SABnzbd
STARTABLE = yes
CHANGELOG = "1. Update SABnzbd to 4.0.3<br/>2. Update to OpenSSL 3.1.2<br/>3. Fix for newer shared python"
CHANGELOG = "1. Update SABnzbd to 4.1.0.<br/>2. Use par2cmdline-turbo instead of par2cmdline.<br/>2. Update UnRar to 6.23 (security fixes)."

HOMEPAGE = https://sabnzbd.org
LICENSE = GPL
Expand Down Expand Up @@ -46,6 +46,9 @@ DEPENDS += cross/cryptography

include ../../mk/spksrc.python.mk

# prefer native python tools (pip, maturin, ...) used for orjson
ENV += PATH=$(realpath $(WORK_DIR)/../../../native/$(PYTHON_PACKAGE)/work-native/install/usr/local/bin):$(PATH)

.PHONY: sabnzbd_extra_install
sabnzbd_extra_install:
install -m 755 -d $(STAGING_DIR)/var/scripts
Expand Down
4 changes: 2 additions & 2 deletions spk/sabnzbd/src/requirements-crossenv.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# cross-compiled wheels
cffi==1.15.1
Cheetah3==3.2.6
sabctools==7.0.2
ujson==5.8.0
sabctools==7.1.2
orjson==3.9.7
18 changes: 9 additions & 9 deletions spk/sabnzbd/src/requirements-pure.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ feedparser==6.0.10
configobj==5.0.8
cheroot==10.0.0
cherrypy==18.8.0
jaraco.functools==3.7.0
jaraco.collections==4.2.0
jaraco.functools==3.9.0
jaraco.collections==4.3.0
jaraco.text==3.8.1 # Newer version introduces irrelevant extra dependencies
jaraco.classes==3.2.3
jaraco.classes==3.3.0
jaraco.context==4.3.0
more-itertools==9.1.0
more-itertools==10.1.0
zc.lockfile==3.0.post1
python-dateutil==2.8.2
tempora==5.3.0
pytz==2023.3
tempora==5.5.0
pytz==2023.3.post1
sgmllib3k==1.0.0
portend==3.1.0
chardet==5.1.0
portend==3.2.0
chardet==5.2.0
PySocks==1.7.1
puremagic==1.15
guessit==3.7.1
babelfish==0.6.0
rebulk==3.2.0
rebulk==3.2.0