upgrade to python 3.7

upgrade to boost 1.67 upgrade to libtorrent 1.2.9 build from deluge bleeding edge 2.0.4 update deluge icon adjust core.config with a single port, as required by deluge version 2.x
SynoCommunity · Oct 25, 2020 · e130a8c · e130a8c
1 parent 7814924
commit e130a8c
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 38 deletions.
diff --git a/cross/boost/Makefile b/cross/boost/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = boost
-PKG_VERS = 1.63.0
+PKG_VERS = 1.67.0
 PKG_EXT = tar.bz2
 PKG_DIR = $(PKG_NAME)_$(subst .,_,$(PKG_VERS))
 PKG_DIST_NAME = $(PKG_DIR).$(PKG_EXT)

diff --git a/cross/boost/PLIST b/cross/boost/PLIST
@@ -1,2 +1,2 @@
 lnk:lib/libboost_*.so
-lib:lib/libboost_*.so.1.63.0
+lib:lib/libboost_*.so.1.67.0
diff --git a/cross/boost/digests b/cross/boost/digests
@@ -1,3 +1,3 @@
-boost_1_63_0.tar.bz2 SHA1 9f1dd4fa364a3e3156a77dc17aa562ef06404ff6
-boost_1_63_0.tar.bz2 SHA256 beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0
-boost_1_63_0.tar.bz2 MD5 1c837ecd990bb022d07e7aab32b09847
+boost_1_67_0.tar.bz2 SHA1 694ae3f4f899d1a80eb7a3b31b33be73c423c1ae
+boost_1_67_0.tar.bz2 SHA256 2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba
+boost_1_67_0.tar.bz2 MD5 ced776cb19428ab8488774e1415535ab
diff --git a/cross/deluge/Makefile b/cross/deluge/Makefile
@@ -1,8 +1,8 @@
 PKG_NAME = deluge
-PKG_VERS = 2.0.3
-PKG_EXT = tar.xz
-PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = http://download.deluge-torrent.org/source/2.0
+PKG_VERS = 2.0.4-str0
+PKG_EXT = tar.gz
+PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/Strangelovian/deluge/archive
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/libtorrent

diff --git a/cross/deluge/digests b/cross/deluge/digests
@@ -1,3 +1,3 @@
-deluge-2.0.3.tar.xz SHA1 78fc8cf85141b474fe63fb063771583eefbfe449
-deluge-2.0.3.tar.xz SHA256 7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891
-deluge-2.0.3.tar.xz MD5 fbe784ebed006cd93c9a50f7c0530051
+2.0.4-str0.tar.gz SHA1 312a64fcc684552d7b7b4d5b23db1a6fedcc583e
+2.0.4-str0.tar.gz SHA256 eaec574367b529e49024c14cfc598b396899fda96e095e1bc0a739af13899efc
+2.0.4-str0.tar.gz MD5 1e65a5bd2452492efa6ea5e4645603f9
diff --git a/cross/libtorrent/Makefile b/cross/libtorrent/Makefile
@@ -1,12 +1,12 @@
 PKG_NAME = libtorrent
-PKG_VERS = 1.1.14
+PKG_VERS = 1.2.9
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-rasterbar-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://github.com/arvidn/$(PKG_NAME)/releases/download/$(PKG_NAME)-$(subst .,_,$(PKG_VERS))
+PKG_DIST_SITE = https://github.com/arvidn/$(PKG_NAME)/releases/download/$(PKG_NAME)-$(PKG_VERS)
 PKG_DIR = $(PKG_NAME)-rasterbar-$(PKG_VERS)
 
 # for boost python binding (BOOST_LIBRARIES = python), the dependency on cross/python must appear before cross/boost
-DEPENDS = cross/python cross/boost cross/geoip cross/libiconv cross/openssl
+DEPENDS = cross/python3 cross/boost cross/geoip cross/libiconv cross/openssl
 
 # cross/boost: archs lacking C++11 compiler (88f6281 and ppc archs except QorIQ)
 UNSUPPORTED_ARCHS = 88f6281 powerpc ppc824x ppc853x ppc854x
@@ -25,9 +25,8 @@ INSTALL_TARGET = install_destdir_target install_python_wheel
 GNU_CONFIGURE = 1
 -include $(WORK_DIR)/python-cc.mk
 CONFIGURE_ARGS  = --enable-python-binding --with-libiconv
-CONFIGURE_ARGS += --with-boost-system=boost_system --with-boost-python=boost_python
-CONFIGURE_ARGS += --with-boost-chrono=boost_chrono --with-boost-random=boost_random
-CONFIGURE_ARGS += PYTHON=$(WORK_DIR)/../../../native/python/work-native/install/usr/local/bin/python
+CONFIGURE_ARGS += --with-boost-system=boost_system --with-boost-python=boost_python37
+CONFIGURE_ARGS += PYTHON=$(WORK_DIR)/../../../native/python3/work-native/install/usr/local/bin/python3
 CONFIGURE_ARGS += LIB=-L/$(STAGING_INSTALL_PREFIX)/$(PYTHON_LIB_DIR)
 CONFIGURE_ARGS += PYTHON_CPPFLAGS=-I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR)
 ADDITIONAL_CFLAGS = -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR)

diff --git a/cross/libtorrent/PLIST b/cross/libtorrent/PLIST
@@ -1,3 +1,3 @@
 lnk:lib/libtorrent-rasterbar.so
-lnk:lib/libtorrent-rasterbar.so.9
-lib:lib/libtorrent-rasterbar.so.9.0.0
+lnk:lib/libtorrent-rasterbar.so.10
+lib:lib/libtorrent-rasterbar.so.10.0.0
diff --git a/cross/libtorrent/digests b/cross/libtorrent/digests
@@ -1,3 +1,3 @@
-libtorrent-rasterbar-1.1.14.tar.gz SHA1 7c54e1c06bed36f64bf705f533b449de3cddd3bc
-libtorrent-rasterbar-1.1.14.tar.gz SHA256 4c1fe55da9361c9d98e725ece7d88f183c09797b2e2667ca4d9386599f8dc36a
-libtorrent-rasterbar-1.1.14.tar.gz MD5 2955bfc076bad6dfacc62bdd7d9a4cdb
+libtorrent-rasterbar-1.2.9.tar.gz SHA1 5508e2aa671c79005bc132226ea8b26796094ace
+libtorrent-rasterbar-1.2.9.tar.gz SHA256 6c986225a1c2d9eb23c5b1ac0692d83208b721a05c968102a17ee3fde01bd709
+libtorrent-rasterbar-1.2.9.tar.gz MD5 f58360400198b43ee5a2a3e4c2ab204f
diff --git a/cross/libuuid/Makefile b/cross/libuuid/Makefile
@@ -12,4 +12,4 @@ COMMENT  = Portable uuid C library
 
 GNU_CONFIGURE = 1
 
-include ../../mk/spksrc.cross-cc.mk
+include ../../mk/spksrc.cross-cc.mk
diff --git a/spk/deluge/Makefile b/spk/deluge/Makefile
@@ -1,23 +1,22 @@
 SPK_NAME = deluge
-SPK_VERS = 2.0.3
-SPK_REV = 13
+SPK_VERS = 2.0.4
+SPK_REV = 1
 SPK_ICON = src/deluge.png
 
-BUILD_DEPENDS = cross/python cross/setuptools cross/pip cross/wheel
+BUILD_DEPENDS = cross/python3 cross/setuptools cross/pip cross/wheel
 DEPENDS = cross/$(SPK_NAME)
 WHEELS = src/requirements.txt
-SPK_DEPENDS = "python>=2.7.18"
+SPK_DEPENDS = "python3>=3.7.7"
 
 REQUIRED_DSM = 5.0
 # archs lacking C++11 compiler (88f6281, hi3535 and ppc archs except QorIQ) required by cross/libtorrent
 UNSUPPORTED_ARCHS = 88f6281 hi3535 powerpc ppc824x ppc853x ppc854x
 
-MAINTAINER = Safihre
+MAINTAINER = Strangelovian
 DESCRIPTION = Deluge is a full-featured BitTorrent client for Linux, OS X, Unix and Windows. It uses libtorrent in its backend and features multiple user-interfaces including: GTK+, web and console. It has been designed using the client server model with a daemon process that handles all the bittorrent activity. The Deluge daemon is able to run on headless machines with the user-interfaces being able to connect remotely from any platform. This package is intended for advanced users.
 RELOAD_UI = yes
 STARTABLE = yes
-CHANGELOG = "Update openssl to 1.1."
-
+CHANGELOG = Build 2.0.4 from bleeding edge, i.e. not released by the deluge team as of 08/30/2020
 DISPLAY_NAME = Deluge
 
 HOMEPAGE = http://deluge-torrent.org

diff --git a/spk/deluge/src/core.conf b/spk/deluge/src/core.conf
@@ -49,7 +49,7 @@
   "random_port": false, 
   "listen_ports": [
     6881, 
-    6891
+    6881
   ], 
   "max_connections_per_torrent": -1, 
   "del_copy_torrent_file": false, 

diff --git a/spk/deluge/src/deluge.png b/spk/deluge/src/deluge.png
diff --git a/spk/deluge/src/service-setup.sh b/spk/deluge/src/service-setup.sh
@@ -1,7 +1,7 @@
-PYTHON_DIR="/usr/local/python"
+PYTHON_DIR="/usr/local/python3"
 PATH="${SYNOPKG_PKGDEST}/bin:${SYNOPKG_PKGDEST}/env/bin:${PYTHON_DIR}/bin:${PATH}"
 VIRTUALENV="${PYTHON_DIR}/bin/virtualenv"
-PYTHON="${SYNOPKG_PKGDEST}/env/bin/python"
+PYTHON="${SYNOPKG_PKGDEST}/env/bin/python3"
 CORE_CFG_FILE="${SYNOPKG_PKGDEST}/var/core.conf"
 WATCH_CFG_FILE="${SYNOPKG_PKGDEST}/var/autoadd.conf"
 
@@ -59,10 +59,8 @@ service_postinst ()
         fi
     fi
 
-    # Discard legacy obsolete busybox user account
-    # Commands of busybox from spk/python
-    delgroup "${USER}" "users" >> ${INST_LOG}
-    deluser "${USER}" >> ${INST_LOG}
+    # Create logs directory, otherwise it does not start due to permissions errors
+    mkdir "$(dirname ${LOG_FILE})" >> ${INST_LOG} 2>&1
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,4 @@ COMMENT = Portable uuid C library

		GNU_CONFIGURE = 1

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