diff --git a/cross/par2cmdline-turbo/Makefile b/cross/par2cmdline-turbo/Makefile new file mode 100644 index 00000000000..be2bac4d326 --- /dev/null +++ b/cross/par2cmdline-turbo/Makefile @@ -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) + +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 \ + ) diff --git a/cross/par2cmdline/PLIST b/cross/par2cmdline-turbo/PLIST similarity index 100% rename from cross/par2cmdline/PLIST rename to cross/par2cmdline-turbo/PLIST diff --git a/cross/par2cmdline-turbo/digests b/cross/par2cmdline-turbo/digests new file mode 100644 index 00000000000..0192a8e6a58 --- /dev/null +++ b/cross/par2cmdline-turbo/digests @@ -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 diff --git a/cross/par2cmdline/Makefile b/cross/par2cmdline/Makefile deleted file mode 100644 index c368fd41578..00000000000 --- a/cross/par2cmdline/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -PKG_NAME = par2cmdline -PKG_VERS = 0.8.1 -PKG_EXT = tar.gz -PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://github.com/Parchive/par2cmdline/releases/download/v$(PKG_VERS) -PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -DEPENDS = - -HOMEPAGE = https://github.com/Parchive/par2cmdline -COMMENT = par2cmdline is a PAR 2.0 compatible file verification and repair tool. -LICENSE = GPL - -GNU_CONFIGURE = 1 -CONFIGURE_ARGS = -ADDITIONAL_LDFLAGS =-static - -POST_INSTALL_TARGET = myPostInstall -PRE_CONFIGURE_TARGET = myPreConfigure - -include ../../mk/spksrc.cross-cc.mk - -PAR2_TOOLS = par2create par2repair par2verify - -.PHONY: myPreConfigure -myPreConfigure: - $(RUN) ./automake.sh - - -myPostInstall: - (cd $(INSTALL_DIR)/$(INSTALL_PREFIX)/bin ; \ - for tool in $(PAR2_TOOLS); \ - do \ - rm $${tool} ; \ - ln -sf par2 $${tool} ; \ - done \ - ) - diff --git a/cross/par2cmdline/digests b/cross/par2cmdline/digests deleted file mode 100644 index 121665dda04..00000000000 --- a/cross/par2cmdline/digests +++ /dev/null @@ -1,3 +0,0 @@ -par2cmdline-0.8.1.tar.gz SHA1 96713067eb29ef18aba64c5c168c64d6f72c8300 -par2cmdline-0.8.1.tar.gz SHA256 7b2fcc19b54c7080939fc2cbaca33ae40ac33759a526292933c94a85ba850d11 -par2cmdline-0.8.1.tar.gz MD5 416869e09b401114ff4afc92d7028751 diff --git a/cross/par2cmdline/patches/88f6281/c++11-to-c++0x.patch b/cross/par2cmdline/patches/88f6281/c++11-to-c++0x.patch deleted file mode 100644 index 93ecff2ec9e..00000000000 --- a/cross/par2cmdline/patches/88f6281/c++11-to-c++0x.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -uprN ../par2cmdline-0.8.1.orig/Makefile.am ./Makefile.am ---- ../par2cmdline-0.8.1.orig/Makefile.am 2020-02-09 14:29:09.000000000 +0000 -+++ ./Makefile.am 2022-08-29 10:53:46.532922839 +0000 -@@ -57,7 +57,7 @@ par2_SOURCES = src/par2cmdline.cpp \ - par2_LDADD = libpar2.a - - LDADD = -lstdc++ --AM_CXXFLAGS = -Wall -std=c++11 $(OPENMP_CXXFLAGS) -+AM_CXXFLAGS = -Wall -std=c++0x $(OPENMP_CXXFLAGS) - - EXTRA_DIST = PORTING ROADMAP \ - man/par2.1 \ -diff -uprN ../par2cmdline-0.8.1.orig/Makefile.in ./Makefile.in ---- ../par2cmdline-0.8.1.orig/Makefile.in 2020-02-09 14:54:10.000000000 +0000 -+++ ./Makefile.in 2022-08-29 10:53:55.193034929 +0000 -@@ -650,7 +650,7 @@ par2_SOURCES = src/par2cmdline.cpp \ - - par2_LDADD = libpar2.a - LDADD = -lstdc++ --AM_CXXFLAGS = -Wall -std=c++11 $(OPENMP_CXXFLAGS) -+AM_CXXFLAGS = -Wall -std=c++0x $(OPENMP_CXXFLAGS) - EXTRA_DIST = PORTING ROADMAP \ - man/par2.1 \ - automake.sh \ diff --git a/cross/sabnzbd/Makefile b/cross/sabnzbd/Makefile index a1576d8238b..0549a21230b 100644 --- a/cross/sabnzbd/Makefile +++ b/cross/sabnzbd/Makefile @@ -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) diff --git a/cross/sabnzbd/digests b/cross/sabnzbd/digests index a2262e036a1..6f060eb479f 100644 --- a/cross/sabnzbd/digests +++ b/cross/sabnzbd/digests @@ -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 diff --git a/cross/unrar/Makefile b/cross/unrar/Makefile index 945061d4c63..c64b24bf7e0 100644 --- a/cross/unrar/Makefile +++ b/cross/unrar/Makefile @@ -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 diff --git a/cross/unrar/digests b/cross/unrar/digests index 9d0f035a78f..a7884b59bdc 100644 --- a/cross/unrar/digests +++ b/cross/unrar/digests @@ -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 diff --git a/spk/sabnzbd/Makefile b/spk/sabnzbd/Makefile index 59e04fe8131..ea63a1ef3ef 100644 --- a/spk/sabnzbd/Makefile +++ b/spk/sabnzbd/Makefile @@ -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 @@ -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
2. Update to OpenSSL 3.1.2
3. Fix for newer shared python" +CHANGELOG = "1. Update SABnzbd to 4.1.0.
2. Use par2cmdline-turbo instead of par2cmdline.
2. Update UnRar to 6.23 (security fixes)." HOMEPAGE = https://sabnzbd.org LICENSE = GPL @@ -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 diff --git a/spk/sabnzbd/src/requirements-crossenv.txt b/spk/sabnzbd/src/requirements-crossenv.txt index 501a0211495..0e065bf9f36 100644 --- a/spk/sabnzbd/src/requirements-crossenv.txt +++ b/spk/sabnzbd/src/requirements-crossenv.txt @@ -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 diff --git a/spk/sabnzbd/src/requirements-pure.txt b/spk/sabnzbd/src/requirements-pure.txt index 5a53d4d155e..be9ad81969b 100644 --- a/spk/sabnzbd/src/requirements-pure.txt +++ b/spk/sabnzbd/src/requirements-pure.txt @@ -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 \ No newline at end of file