From 895c06b79226196dc33d3cbf03618942be031ca0 Mon Sep 17 00:00:00 2001 From: BKSteve Date: Thu, 13 Oct 2022 18:22:16 +0700 Subject: [PATCH 01/15] SickChill build test --- spk/sickchill/BROKEN | 3 - spk/sickchill/Makefile | 21 ++-- spk/sickchill/src/requirements-crossenv.txt | 20 ++-- spk/sickchill/src/requirements-pure.txt | 120 ++++++++++---------- spk/sickchill/src/service-setup.sh | 28 ++--- 5 files changed, 93 insertions(+), 99 deletions(-) delete mode 100644 spk/sickchill/BROKEN diff --git a/spk/sickchill/BROKEN b/spk/sickchill/BROKEN deleted file mode 100644 index d6e7b8ab37a..00000000000 --- a/spk/sickchill/BROKEN +++ /dev/null @@ -1,3 +0,0 @@ -source of 2021.11.10 is not available for download anymore. -all 2021.* sources are gone. -needs update to 2022.* diff --git a/spk/sickchill/Makefile b/spk/sickchill/Makefile index 4cd5e1a3cc4..aef47b996a9 100644 --- a/spk/sickchill/Makefile +++ b/spk/sickchill/Makefile @@ -1,27 +1,32 @@ SPK_NAME = sickchill -SPK_VERS = 20211110 -SPK_REV = 5 +SPK_VERS = 20221008 +SPK_REV = 6 SPK_ICON = src/sickchill.png BUILD_DEPENDS = cross/python310 -DEPENDS = cross/$(SPK_NAME) -SPK_DEPENDS = "python310" -# Required for lxml wheel -DEPENDS += cross/libxml2 +SPK_DEPENDS = "python310>=3.10.8" + +# [lxml] +DEPENDS += cross/libxml2Ch DEPENDS += cross/libxslt -# Required for PyNaCl +# [PyNaCl] DEPENDS += cross/libsodium ENV += SODIUM_INSTALL=system +# [cryptography] +DEPENDS += cross/cryptography +ENV += PYO3_CROSS_LIB_DIR=$(STAGING_INSTALL_PREFIX)/lib/ +ENV += PYO3_CROSS_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/ + WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt MAINTAINER = miigotu DESCRIPTION = Automatic Video Library Manager for TV Shows. It watches for new episodes of your favorite shows, and when they are posted it does its magic. STARTABLE = yes DISPLAY_NAME = SickChill -CHANGELOG = "1. Migration to Python 3.10
2. SickChill environment fix
3. Added DSM7 Support
4. cryptography resolution for armv7" +CHANGELOG = "Switched to a wheel based install, as source and git installs are no longer supported by upstream." HOMEPAGE = https://sickchill.github.io/ LICENSE = GPLv3+ diff --git a/spk/sickchill/src/requirements-crossenv.txt b/spk/sickchill/src/requirements-crossenv.txt index 3bd15300bf6..c84b270f934 100644 --- a/spk/sickchill/src/requirements-crossenv.txt +++ b/spk/sickchill/src/requirements-crossenv.txt @@ -1,10 +1,10 @@ -cffi==1.15.0 -cryptography==3.3.2 -greenlet==1.1.2 -lxml==4.6.4 -MarkupSafe==2.0.1 -msgpack==1.0.2 -PyNaCl==1.4.0 -SQLAlchemy==1.4.26 -tornado==6.1 -wrapt==1.13.3 +cffi==1.15.1 +cryptography==38.0.1 +greenlet==1.1.3.post0 +lxml==4.9.1 +MarkupSafe==2.1.1 +msgpack==1.0.4 +PyNaCl==1.5.0 +SQLAlchemy==1.4.41 +tornado==6.2 +wrapt==1.14.1 diff --git a/spk/sickchill/src/requirements-pure.txt b/spk/sickchill/src/requirements-pure.txt index c3cf4b615e9..41fcfb305f1 100644 --- a/spk/sickchill/src/requirements-pure.txt +++ b/spk/sickchill/src/requirements-pure.txt @@ -1,85 +1,83 @@ +sickchill==2022.10.8 + appdirs==1.4.4 babelfish==0.6.0 -beautifulsoup4==4.10.0 -beekeeper-alt==2021.7.16 +beautifulsoup4==4.11.1 +beekeeper-alt==2022.9.3 bencode.py==4.0.0 -CacheControl==0.12.9 -#certifi==2021.10.8 ==> python310:pure -chardet==4.0.0 -charset-normalizer==2.0.7 -click==8.0.3 -cloudscraper==1.2.58 -colorama==0.4.4 +CacheControl==0.12.11 +certifi==2022.9.24 +#cffi==1.15.1 ==> python 3.10 +chardet==5.0.0 +charset-normalizer==2.1.1 +cinemagoer==2022.2.11 +click==8.1.3 configobj==5.0.6 -decorator==5.1.0 +#cryptography==38.0.1 ==> crossenv +decorator==5.1.1 deluge-client==1.9.0 Deprecated==1.2.13 -dogpile.cache==1.1.4 +distlib==0.3.6 +dogpile.cache==1.1.8 enzyme==0.4.1 -feedparser==6.0.8 +filelock==3.8.0 future==0.18.2 gntp==1.0.3 -guessit==3.4.0 -html5lib==1.1 -httplib2==0.20.2 -idna==3.3 -ifaddr==0.1.7 -imagesize==1.2.0 -IMDbPY==2021.4.18 -importlib-metadata==1.7.0 +#greenlet==1.1.3.post0 ==> crossenv +guessit==3.4.3 +idna==3.4 +ifaddr==0.2.0 +imagesize==1.4.1 +IMDbPY==2022.7.9 ipaddress==1.0.23 -Js2Py==0.71 -jsonrpclib-pelix==0.4.3.1 -kodipydent-alt==2021.7.16 -Mako==1.1.5 -markdown2==2.4.1 +jsonrpclib-pelix==0.4.3.2 +kodipydent-alt==2022.9.3 +#lxml==4.9.1 ==> crossenv +Mako==1.2.3 +markdown2==2.4.5 +#MarkupSafe==2.1.1 ==> crossenv +#msgpack==1.0.4 ==> crossenv new-rtorrent-python==1.0.1a0 -oauthlib==3.1.1 -packaging==20.9 -pbr==5.7.0 -poetry==1.2.0a2 -poetry-core==1.1.0a6 -poetry-date-version-plugin==2021.7.16-6 +oauthlib==3.2.1 +packaging==21.3 +pbr==5.10.0 +platformdirs==2.5.2 profilehooks==1.12.0 putio.py==8.7.0 -pycparser==2.20 -pyopenssl==21.0.0 -pyaes==1.6.1 -pygithub==1.55 -pyjsparser==2.7.1 -PyJWT==2.3.0 -pymediainfo==5.1.0 +pycparser==2.21 +PyGithub==1.56 +PyJWT==2.5.0 +#PyNaCl==1.5.0 ==> crossenv PyNMA==1.0 -pyparsing==2.4.7 -pysocks==1.7.1 +pyOpenSSL==22.1.0 +pyparsing==3.0.9 pysrt==1.1.2 -python3-fanart==2.0.0 python-dateutil==2.8.2 -python-slugify==5.0.2 +python-slugify==6.1.2 python-twitter==3.5 -pytz==2021.3 -qbittorrent-api==2021.8.23 +python3-fanart==2.0.0 +pytz==2022.4 +qbittorrent-api==2022.8.38 rarfile==4.0 rebulk==3.1.0 -requests==2.26.0 -requests-oauthlib==1.3.0 -requests-toolbelt==0.9.1 -send2trash==1.8.0 -six==1.16.0 -sgmllib3k==1.0.0 -soupsieve==2.3 -stevedore==3.5.0 +requests==2.28.1 +requests-oauthlib==1.3.1 +Send2Trash==1.8.0 +#six==1.16.0 ==> python 3.10 +soupsieve==2.3.2.post1 +#SQLAlchemy==1.4.41 ==> crossenv +stevedore==4.0.0 subliminal==2.1.0 text-unidecode==1.3 -timeago==1.0.15 -tmdbsimple==2.8.0 +timeago==1.0.16 +tmdbsimple==2.9.1 +#tornado==6.2 ==> crossenv tus.py==1.3.4 tvdbsimple==1.0.6 -tzlocal==4.1 -Unidecode==1.3.2 -urllib3==1.26.7 -validators==0.18.2 -webencodings==0.5.1 +Unidecode==1.3.6 +urllib3==1.26.12 +validators==0.20.0 +virtualenv==20.16.5 win-inet-pton==1.1.0 -xmltodict==0.12.0 -zipp==3.6.0 +#wrapt==1.14.1 ==> crossenv +xmltodict==0.13.0 diff --git a/spk/sickchill/src/service-setup.sh b/spk/sickchill/src/service-setup.sh index f289571f4fa..5e5c75094ff 100755 --- a/spk/sickchill/src/service-setup.sh +++ b/spk/sickchill/src/service-setup.sh @@ -3,46 +3,40 @@ PATH="${SYNOPKG_PKGDEST}/env/bin:${SYNOPKG_PKGDEST}/bin:${PYTHON_DIR}:${PATH}" HOME="${SYNOPKG_PKGVAR}" PYTHON="${SYNOPKG_PKGDEST}/env/bin/python3" SC_INSTALL_DIR="${SYNOPKG_PKGDEST}/share/SickChill" -SC_BINARY="${SC_INSTALL_DIR}/SickChill.py" +SC_BINARY="${SYNOPKG_PKGDEST}/env/bin/SickChill" SC_DATA_DIR="${SYNOPKG_PKGVAR}/data" SC_CFG_FILE="${SC_DATA_DIR}/config.ini" GROUP="sc-download" -SERVICE_COMMAND="${PYTHON} ${SC_BINARY} --daemon --nolaunch --pidfile ${PID_FILE} --config ${SC_CFG_FILE} --datadir ${SC_DATA_DIR}" +SERVICE_COMMAND="${SC_BINARY} --daemon --nolaunch --pidfile ${PID_FILE} --config ${SC_CFG_FILE} --datadir ${SC_DATA_DIR}" set_config() { - . ${SYNOPKG_PKGDEST}/share/git_data - if [ -f "${SC_CFG_FILE}" ]; then if [ -n "${wizard_username}" ] && [ -n "${wizard_password}" ]; then sed -i "/^\s*web_username\s*=/s/\s*=\s*.*/ = ${wizard_username}/" ${SC_CFG_FILE} sed -i "/^\s*web_password\s*=/s/\s*=\s*.*/ = ${wizard_password}/" ${SC_CFG_FILE} fi - # update git commit to sickchill updater - sed -i "/^\s*branch\s*=/s/\s*=\s*.*/ = ${SC_GIT_BRANCH}/" ${SC_CFG_FILE} - sed -i "/^\s*cur_commit_hash\s*=/s/\s*=\s*.*/ = ${SC_GIT_COMMIT_HASH}/" ${SC_CFG_FILE} - sed -i "/^\s*cur_commit_branch\s*=/s/\s*=\s*.*/ = ${SC_GIT_COMMIT_BRANCH}/" ${SC_CFG_FILE} else mkdir -p ${SC_DATA_DIR} cat << EOF > ${SC_CFG_FILE} [General] web_username = ${wizard_username} web_password = ${wizard_password} -branch = ${SC_GIT_BRANCH} -cur_commit_hash = ${SC_GIT_COMMIT_HASH} -cur_commit_branch = ${SC_GIT_COMMIT_BRANCH} EOF fi } service_postinst() { - # Create a Python virtualenv + separator="====================================================" + + echo ${separator} install_python_virtualenv - - # Install the wheels - install_python_wheels --extra-index-url https://wheel-index.linuxserver.io/ubuntu/ + + echo ${separator} + install_python_wheels + # --find-links=https://wheel-index.linuxserver.io/ubuntu/ --extra-index-url=https://www.piwheels.org/simple if [ "${SYNOPKG_PKG_STATUS}" == "INSTALL" ]; then set_config @@ -62,10 +56,10 @@ service_postupgrade() { service_preupgrade () { - # We have to reset /env folder to 3.8 so remove entire folder as it gets rebuilt in postinst and this avoids any conflicts. + # We have to reset /env folder to 3.10 so remove entire folder as it gets rebuilt in postinst and this avoids any conflicts. # Revision 1 was python 3.7. For cleaner update remove share and lib folders for clean install, leave user data /var. if [ "${SYNOPKG_PKG_STATUS}" != "INSTALL" ] && [ "$(echo ${SYNOPKG_OLD_PKGVER} | sed -r 's/^.*-([0-9]+)$/\1/')" -le 1 ]; then - echo "Removing old ${SYNOPKG_PKGDEST}/env and /share for new Python 3.8 and old install" + echo "Removing old ${SYNOPKG_PKGDEST}/env and /share for new Python 3.10 and old install" rm -rf ${SYNOPKG_PKGDEST}/env rm -rf ${SYNOPKG_PKGDEST}/share rm -rf ${SYNOPKG_PKGDEST}/lib From dd74ed81ccf26b4ae155ddfdcdde91a1455d6e2d Mon Sep 17 00:00:00 2001 From: BKSteve Date: Thu, 13 Oct 2022 18:33:42 +0700 Subject: [PATCH 02/15] SickChill build test --- spk/sickchill/src/requirements-pure.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/spk/sickchill/src/requirements-pure.txt b/spk/sickchill/src/requirements-pure.txt index 41fcfb305f1..ee4be03de38 100644 --- a/spk/sickchill/src/requirements-pure.txt +++ b/spk/sickchill/src/requirements-pure.txt @@ -6,14 +6,14 @@ beautifulsoup4==4.11.1 beekeeper-alt==2022.9.3 bencode.py==4.0.0 CacheControl==0.12.11 -certifi==2022.9.24 -#cffi==1.15.1 ==> python 3.10 +# certifi==2022.9.24 ==> python 3.10 +# cffi==1.15.1 ==> crossenv chardet==5.0.0 charset-normalizer==2.1.1 cinemagoer==2022.2.11 click==8.1.3 configobj==5.0.6 -#cryptography==38.0.1 ==> crossenv +# cryptography==38.0.1 ==> crossenv / cross decorator==5.1.1 deluge-client==1.9.0 Deprecated==1.2.13 @@ -23,7 +23,7 @@ enzyme==0.4.1 filelock==3.8.0 future==0.18.2 gntp==1.0.3 -#greenlet==1.1.3.post0 ==> crossenv +# greenlet==1.1.3.post0 ==> crossenv guessit==3.4.3 idna==3.4 ifaddr==0.2.0 @@ -32,11 +32,11 @@ IMDbPY==2022.7.9 ipaddress==1.0.23 jsonrpclib-pelix==0.4.3.2 kodipydent-alt==2022.9.3 -#lxml==4.9.1 ==> crossenv +# lxml==4.9.1 ==> crossenv Mako==1.2.3 markdown2==2.4.5 -#MarkupSafe==2.1.1 ==> crossenv -#msgpack==1.0.4 ==> crossenv +# MarkupSafe==2.1.1 ==> crossenv +# msgpack==1.0.4 ==> crossenv new-rtorrent-python==1.0.1a0 oauthlib==3.2.1 packaging==21.3 @@ -47,7 +47,7 @@ putio.py==8.7.0 pycparser==2.21 PyGithub==1.56 PyJWT==2.5.0 -#PyNaCl==1.5.0 ==> crossenv +# PyNaCl==1.5.0 ==> crossenv PyNMA==1.0 pyOpenSSL==22.1.0 pyparsing==3.0.9 @@ -65,13 +65,13 @@ requests-oauthlib==1.3.1 Send2Trash==1.8.0 #six==1.16.0 ==> python 3.10 soupsieve==2.3.2.post1 -#SQLAlchemy==1.4.41 ==> crossenv +# SQLAlchemy==1.4.41 ==> crossenv stevedore==4.0.0 subliminal==2.1.0 text-unidecode==1.3 timeago==1.0.16 tmdbsimple==2.9.1 -#tornado==6.2 ==> crossenv +# tornado==6.2 ==> crossenv tus.py==1.3.4 tvdbsimple==1.0.6 Unidecode==1.3.6 @@ -79,5 +79,5 @@ urllib3==1.26.12 validators==0.20.0 virtualenv==20.16.5 win-inet-pton==1.1.0 -#wrapt==1.14.1 ==> crossenv +# wrapt==1.14.1 ==> crossenv xmltodict==0.13.0 From e133b6b343900464f43588b5230484b6a953b085 Mon Sep 17 00:00:00 2001 From: BKSteve Date: Thu, 13 Oct 2022 18:38:51 +0700 Subject: [PATCH 03/15] SickChill build test --- spk/sickchill/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spk/sickchill/Makefile b/spk/sickchill/Makefile index aef47b996a9..d35320edf5b 100644 --- a/spk/sickchill/Makefile +++ b/spk/sickchill/Makefile @@ -8,7 +8,7 @@ BUILD_DEPENDS = cross/python310 SPK_DEPENDS = "python310>=3.10.8" # [lxml] -DEPENDS += cross/libxml2Ch +DEPENDS += cross/libxml2 DEPENDS += cross/libxslt # [PyNaCl] From 5d18583bbfa54172897ba1311ebd5067d60482f2 Mon Sep 17 00:00:00 2001 From: BKSteve Date: Thu, 13 Oct 2022 19:42:48 +0700 Subject: [PATCH 04/15] SickChill build test --- spk/sickchill/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spk/sickchill/Makefile b/spk/sickchill/Makefile index d35320edf5b..53df0546cb5 100644 --- a/spk/sickchill/Makefile +++ b/spk/sickchill/Makefile @@ -16,9 +16,9 @@ DEPENDS += cross/libsodium ENV += SODIUM_INSTALL=system # [cryptography] -DEPENDS += cross/cryptography -ENV += PYO3_CROSS_LIB_DIR=$(STAGING_INSTALL_PREFIX)/lib/ -ENV += PYO3_CROSS_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/ +#DEPENDS += cross/cryptography +#ENV += PYO3_CROSS_LIB_DIR=$(STAGING_INSTALL_PREFIX)/lib/ +#ENV += PYO3_CROSS_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/ WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt From ef8259f7efb37c9a84e0048200cc49747cf9f04f Mon Sep 17 00:00:00 2001 From: BKSteve Date: Thu, 13 Oct 2022 19:45:18 +0700 Subject: [PATCH 05/15] SickChill build test --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index abbfa0160bf..1a58c8d9410 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ toolkit/*/work* local.mk *.DS_Store *~ + +# PyCharm project settings +.idea From 67648777921b48dbb09a7700b97e996734a70dfe Mon Sep 17 00:00:00 2001 From: BKSteve Date: Thu, 13 Oct 2022 19:48:59 +0700 Subject: [PATCH 06/15] SickChill build test --- spk/sickchill/src/requirements-pure.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spk/sickchill/src/requirements-pure.txt b/spk/sickchill/src/requirements-pure.txt index ee4be03de38..26fa9d9a923 100644 --- a/spk/sickchill/src/requirements-pure.txt +++ b/spk/sickchill/src/requirements-pure.txt @@ -13,7 +13,7 @@ charset-normalizer==2.1.1 cinemagoer==2022.2.11 click==8.1.3 configobj==5.0.6 -# cryptography==38.0.1 ==> crossenv / cross +# cryptography==38.0.1 ==> crossenv decorator==5.1.1 deluge-client==1.9.0 Deprecated==1.2.13 From 1c1d5a4c9d6cda0e5e69f0e1b1c94d28d59c410f Mon Sep 17 00:00:00 2001 From: BKSteve Date: Thu, 13 Oct 2022 22:27:00 +0700 Subject: [PATCH 07/15] SickChill build test cross/Cryptography --- spk/sickchill/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spk/sickchill/Makefile b/spk/sickchill/Makefile index 53df0546cb5..d35320edf5b 100644 --- a/spk/sickchill/Makefile +++ b/spk/sickchill/Makefile @@ -16,9 +16,9 @@ DEPENDS += cross/libsodium ENV += SODIUM_INSTALL=system # [cryptography] -#DEPENDS += cross/cryptography -#ENV += PYO3_CROSS_LIB_DIR=$(STAGING_INSTALL_PREFIX)/lib/ -#ENV += PYO3_CROSS_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/ +DEPENDS += cross/cryptography +ENV += PYO3_CROSS_LIB_DIR=$(STAGING_INSTALL_PREFIX)/lib/ +ENV += PYO3_CROSS_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/ WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt From 4c697f11294f879e3f0382ee336b0ab0638ac464 Mon Sep 17 00:00:00 2001 From: BKSteve Date: Fri, 14 Oct 2022 10:27:52 +0700 Subject: [PATCH 08/15] to 20221013 --- spk/sickchill/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spk/sickchill/Makefile b/spk/sickchill/Makefile index d35320edf5b..8d724116005 100644 --- a/spk/sickchill/Makefile +++ b/spk/sickchill/Makefile @@ -1,11 +1,11 @@ SPK_NAME = sickchill -SPK_VERS = 20221008 +SPK_VERS = 20221013 SPK_REV = 6 SPK_ICON = src/sickchill.png BUILD_DEPENDS = cross/python310 -SPK_DEPENDS = "python310>=3.10.8" +SPK_DEPENDS = "python310" # [lxml] DEPENDS += cross/libxml2 From 354e9bd1c169879e87f6ba98096337e0a335eb1e Mon Sep 17 00:00:00 2001 From: BKSteve Date: Fri, 14 Oct 2022 10:28:23 +0700 Subject: [PATCH 09/15] to 20221013 --- spk/sickchill/src/requirements-pure.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spk/sickchill/src/requirements-pure.txt b/spk/sickchill/src/requirements-pure.txt index 26fa9d9a923..d185060b9d9 100644 --- a/spk/sickchill/src/requirements-pure.txt +++ b/spk/sickchill/src/requirements-pure.txt @@ -1,4 +1,4 @@ -sickchill==2022.10.8 +sickchill==2022.10.13 appdirs==1.4.4 babelfish==0.6.0 From 1d6edc9ae3e7d028e537002a2c76d07e23792086 Mon Sep 17 00:00:00 2001 From: BKSteve Date: Fri, 14 Oct 2022 15:24:38 +0700 Subject: [PATCH 10/15] Pure reduction --- spk/sickchill/src/requirements-pure.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spk/sickchill/src/requirements-pure.txt b/spk/sickchill/src/requirements-pure.txt index d185060b9d9..f451fdd035c 100644 --- a/spk/sickchill/src/requirements-pure.txt +++ b/spk/sickchill/src/requirements-pure.txt @@ -17,10 +17,10 @@ configobj==5.0.6 decorator==5.1.1 deluge-client==1.9.0 Deprecated==1.2.13 -distlib==0.3.6 +# distlib==0.3.6 ==> python 3.10 dogpile.cache==1.1.8 enzyme==0.4.1 -filelock==3.8.0 +# filelock==3.8.0N ==> python 3.10 future==0.18.2 gntp==1.0.3 # greenlet==1.1.3.post0 ==> crossenv @@ -41,7 +41,7 @@ new-rtorrent-python==1.0.1a0 oauthlib==3.2.1 packaging==21.3 pbr==5.10.0 -platformdirs==2.5.2 +# platformdirs==2.5.2 ==> python 3.10 profilehooks==1.12.0 putio.py==8.7.0 pycparser==2.21 @@ -77,7 +77,7 @@ tvdbsimple==1.0.6 Unidecode==1.3.6 urllib3==1.26.12 validators==0.20.0 -virtualenv==20.16.5 +# virtualenv==20.16.5 ==> python 3.10 win-inet-pton==1.1.0 # wrapt==1.14.1 ==> crossenv xmltodict==0.13.0 From 8ec19eb084e631806d4c37db5bc7558cb3777e43 Mon Sep 17 00:00:00 2001 From: BKSteve Date: Sat, 15 Oct 2022 15:10:50 +0700 Subject: [PATCH 11/15] SC cleanup service --- spk/sickchill/src/service-setup.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/spk/sickchill/src/service-setup.sh b/spk/sickchill/src/service-setup.sh index 5e5c75094ff..c0521472f57 100755 --- a/spk/sickchill/src/service-setup.sh +++ b/spk/sickchill/src/service-setup.sh @@ -36,8 +36,7 @@ service_postinst() { echo ${separator} install_python_wheels - # --find-links=https://wheel-index.linuxserver.io/ubuntu/ --extra-index-url=https://www.piwheels.org/simple - + if [ "${SYNOPKG_PKG_STATUS}" == "INSTALL" ]; then set_config fi @@ -56,10 +55,12 @@ service_postupgrade() { service_preupgrade () { - # We have to reset /env folder to 3.10 so remove entire folder as it gets rebuilt in postinst and this avoids any conflicts. - # Revision 1 was python 3.7. For cleaner update remove share and lib folders for clean install, leave user data /var. + # We have to reset /env for Python and package changes, it gets rebuilt in postinst and this avoids any conflicts. + # For cleaner update remove bin, env, share and lib folders for fresh install, leave user data /var & /@appdata + if [ "${SYNOPKG_PKG_STATUS}" != "INSTALL" ] && [ "$(echo ${SYNOPKG_OLD_PKGVER} | sed -r 's/^.*-([0-9]+)$/\1/')" -le 1 ]; then echo "Removing old ${SYNOPKG_PKGDEST}/env and /share for new Python 3.10 and old install" + rm -rf ${SYNOPKG_PKGDEST}/bin rm -rf ${SYNOPKG_PKGDEST}/env rm -rf ${SYNOPKG_PKGDEST}/share rm -rf ${SYNOPKG_PKGDEST}/lib From c39006fa2ca006d4b01da6fd2f40f5916aa20f54 Mon Sep 17 00:00:00 2001 From: BKSteve Date: Sat, 15 Oct 2022 23:33:33 +0700 Subject: [PATCH 12/15] For 1 Cryptography --- spk/sickchill/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spk/sickchill/Makefile b/spk/sickchill/Makefile index 8d724116005..28e8d922df2 100644 --- a/spk/sickchill/Makefile +++ b/spk/sickchill/Makefile @@ -16,7 +16,7 @@ DEPENDS += cross/libsodium ENV += SODIUM_INSTALL=system # [cryptography] -DEPENDS += cross/cryptography +# DEPENDS += cross/cryptography ENV += PYO3_CROSS_LIB_DIR=$(STAGING_INSTALL_PREFIX)/lib/ ENV += PYO3_CROSS_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/ From 5235e23c995fd8d192f72ef5bf3a6118ef2bd77a Mon Sep 17 00:00:00 2001 From: BKSteve Date: Sun, 16 Oct 2022 22:30:16 +0700 Subject: [PATCH 13/15] Updating method change --- spk/sickchill/src/service-setup.sh | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/spk/sickchill/src/service-setup.sh b/spk/sickchill/src/service-setup.sh index c0521472f57..de52fabf5b1 100755 --- a/spk/sickchill/src/service-setup.sh +++ b/spk/sickchill/src/service-setup.sh @@ -1,13 +1,13 @@ +PACKAGE="sickchill" +TMP_DIR="/tmp/${PACKAGE}" PYTHON_DIR="/var/packages/python310/target/bin" PATH="${SYNOPKG_PKGDEST}/env/bin:${SYNOPKG_PKGDEST}/bin:${PYTHON_DIR}:${PATH}" HOME="${SYNOPKG_PKGVAR}" PYTHON="${SYNOPKG_PKGDEST}/env/bin/python3" -SC_INSTALL_DIR="${SYNOPKG_PKGDEST}/share/SickChill" SC_BINARY="${SYNOPKG_PKGDEST}/env/bin/SickChill" SC_DATA_DIR="${SYNOPKG_PKGVAR}/data" SC_CFG_FILE="${SC_DATA_DIR}/config.ini" - GROUP="sc-download" SERVICE_COMMAND="${SC_BINARY} --daemon --nolaunch --pidfile ${PID_FILE} --config ${SC_CFG_FILE} --datadir ${SC_DATA_DIR}" @@ -41,15 +41,19 @@ service_postinst() { set_config fi - if [ $SYNOPKG_DSM_VERSION_MAJOR -lt 7 ]; then + if [ "${SYNOPKG_DSM_VERSION_MAJOR}" -lt 7 ]; then set_unix_permissions "${SYNOPKG_PKGDEST}" fi } service_postupgrade() { set_config - if [ $SYNOPKG_DSM_VERSION_MAJOR -lt 7 ]; then - set_unix_permissions "${SYNOPKG_PKGDEST}" + if [ "${SYNOPKG_DSM_VERSION_MAJOR}" -lt 7 ]; then + if [ "${SYNOPKG_PKG_STATUS}" != "INSTALL" ]; then + mv ${TMP_DIR}/var ${SYNOPKG_PKGDEST}/ + rm -rf ${TMP_DIR} + fi + set_unix_permissions "${SYNOPKG_PKGDEST}" fi } @@ -58,11 +62,10 @@ service_preupgrade () # We have to reset /env for Python and package changes, it gets rebuilt in postinst and this avoids any conflicts. # For cleaner update remove bin, env, share and lib folders for fresh install, leave user data /var & /@appdata - if [ "${SYNOPKG_PKG_STATUS}" != "INSTALL" ] && [ "$(echo ${SYNOPKG_OLD_PKGVER} | sed -r 's/^.*-([0-9]+)$/\1/')" -le 1 ]; then - echo "Removing old ${SYNOPKG_PKGDEST}/env and /share for new Python 3.10 and old install" - rm -rf ${SYNOPKG_PKGDEST}/bin - rm -rf ${SYNOPKG_PKGDEST}/env - rm -rf ${SYNOPKG_PKGDEST}/share - rm -rf ${SYNOPKG_PKGDEST}/lib + if [ "${SYNOPKG_PKG_STATUS}" != "INSTALL" ] && [ "${SYNOPKG_DSM_VERSION_MAJOR}" -lt 7 ]; then + echo "Moving data ${SYNOPKG_PKGDEST}/var to ${TMP_DIR} whilst upgrading" + rm -rf ${TMP_DIR} + mkdir -p ${TMP_DIR} + mv ${SYNOPKG_PKGDEST}/var ${TMP_DIR}/ fi } From 910bc7ea1595c6b9082b27b954983641b4a82f4f Mon Sep 17 00:00:00 2001 From: BKSteve Date: Tue, 18 Oct 2022 11:17:11 +0700 Subject: [PATCH 14/15] Cleanup UI and upgrade --- spk/sickchill/Makefile | 2 +- spk/sickchill/src/service-setup.sh | 22 +---------------- spk/sickchill/src/wizard/install_uifile | 5 ++-- spk/sickchill/src/wizard/install_uifile_spn | 27 --------------------- spk/sickchill/src/wizard/upgrade_uifile | 2 +- spk/sickchill/src/wizard/upgrade_uifile_spn | 6 ----- 6 files changed, 6 insertions(+), 58 deletions(-) delete mode 100644 spk/sickchill/src/wizard/install_uifile_spn delete mode 100644 spk/sickchill/src/wizard/upgrade_uifile_spn diff --git a/spk/sickchill/Makefile b/spk/sickchill/Makefile index 28e8d922df2..c81b4bdd329 100644 --- a/spk/sickchill/Makefile +++ b/spk/sickchill/Makefile @@ -31,7 +31,7 @@ CHANGELOG = "Switched to a wheel based install, as source and git installs are n HOMEPAGE = https://sickchill.github.io/ LICENSE = GPLv3+ -SERVICE_USER = auto +SERVICE_USER = AUTO SERVICE_SETUP = src/service-setup.sh SERVICE_PORT = 8081 SERVICE_PORT_TITLE = $(DISPLAY_NAME) diff --git a/spk/sickchill/src/service-setup.sh b/spk/sickchill/src/service-setup.sh index de52fabf5b1..35ebd37a804 100755 --- a/spk/sickchill/src/service-setup.sh +++ b/spk/sickchill/src/service-setup.sh @@ -1,5 +1,3 @@ -PACKAGE="sickchill" -TMP_DIR="/tmp/${PACKAGE}" PYTHON_DIR="/var/packages/python310/target/bin" PATH="${SYNOPKG_PKGDEST}/env/bin:${SYNOPKG_PKGDEST}/bin:${PYTHON_DIR}:${PATH}" HOME="${SYNOPKG_PKGVAR}" @@ -11,6 +9,7 @@ SC_CFG_FILE="${SC_DATA_DIR}/config.ini" GROUP="sc-download" SERVICE_COMMAND="${SC_BINARY} --daemon --nolaunch --pidfile ${PID_FILE} --config ${SC_CFG_FILE} --datadir ${SC_DATA_DIR}" +separator="-----------------------------------------------" set_config() { if [ -f "${SC_CFG_FILE}" ]; then @@ -29,8 +28,6 @@ EOF } service_postinst() { - separator="====================================================" - echo ${separator} install_python_virtualenv @@ -49,23 +46,6 @@ service_postinst() { service_postupgrade() { set_config if [ "${SYNOPKG_DSM_VERSION_MAJOR}" -lt 7 ]; then - if [ "${SYNOPKG_PKG_STATUS}" != "INSTALL" ]; then - mv ${TMP_DIR}/var ${SYNOPKG_PKGDEST}/ - rm -rf ${TMP_DIR} - fi set_unix_permissions "${SYNOPKG_PKGDEST}" fi } - -service_preupgrade () -{ - # We have to reset /env for Python and package changes, it gets rebuilt in postinst and this avoids any conflicts. - # For cleaner update remove bin, env, share and lib folders for fresh install, leave user data /var & /@appdata - - if [ "${SYNOPKG_PKG_STATUS}" != "INSTALL" ] && [ "${SYNOPKG_DSM_VERSION_MAJOR}" -lt 7 ]; then - echo "Moving data ${SYNOPKG_PKGDEST}/var to ${TMP_DIR} whilst upgrading" - rm -rf ${TMP_DIR} - mkdir -p ${TMP_DIR} - mv ${SYNOPKG_PKGDEST}/var ${TMP_DIR}/ - fi -} diff --git a/spk/sickchill/src/wizard/install_uifile b/spk/sickchill/src/wizard/install_uifile index 164777e1767..53132037d88 100644 --- a/spk/sickchill/src/wizard/install_uifile +++ b/spk/sickchill/src/wizard/install_uifile @@ -10,7 +10,8 @@ "allowBlank": true } }] - },{ + }, + { "type": "password", "desc": "HTTP password (blank = no authentication)", "subitems": [{ @@ -22,6 +23,6 @@ }] }, { - "desc": "

The first time SickChill is started it might take a few moments for the interface to become available!

Permissions for all download-related packages are managed with the group 'sc-download' in DSM.
Please read Permission Management for details.

" + "desc": "

The first time SickChill is started it will take a few moments for the interface to become available!

Permissions for SickChill are user 'sc-sickchill' all download-related packages are managed with the group 'sc-download (DSM6) and synocommunity (DSM7)'.
Please read Permission Management for details.

" }] }] diff --git a/spk/sickchill/src/wizard/install_uifile_spn b/spk/sickchill/src/wizard/install_uifile_spn deleted file mode 100644 index bded43dc707..00000000000 --- a/spk/sickchill/src/wizard/install_uifile_spn +++ /dev/null @@ -1,27 +0,0 @@ -[{ - "step_title": "Configurar credenciales (Puede editarlas tras la instalación desde la propia aplicación)", - "items": [{ - "type": "textfield", - "desc": "Nombre de usuario HTTP (deje en blanco para no requerir usuario)", - "subitems": [{ - "key": "wizard_username", - "desc": "Usuario", - "validator": { - "allowBlank": true - } - }] - },{ - "type": "password", - "desc": "Contraseña HTTP (en blanco = sin autenticación)", - "subitems": [{ - "key": "wizard_password", - "desc": "Contraseña", - "validator": { - "allowBlank": true - } - }] - }, - { - "desc": "Los permisos para los paquetes relacionados con descargas son manejados por el grupo 'sc-download' en DSM.
Por favor, lea Manejo de Permisos (en inglés) para mayor detalle." - }] -}] diff --git a/spk/sickchill/src/wizard/upgrade_uifile b/spk/sickchill/src/wizard/upgrade_uifile index 582a3a5a18d..00533a8fb49 100644 --- a/spk/sickchill/src/wizard/upgrade_uifile +++ b/spk/sickchill/src/wizard/upgrade_uifile @@ -1,6 +1,6 @@ [{ "step_title": "Attention!", "items": [{ - "desc": "

The first time SickChill is started it might take a few moments for the interface to become available!

Permissions for all download-related packages are managed with the group 'sc-download' in DSM.
Please read Permission Management for details.

" + "desc": "

The first time SickChill is started it will take a few moments for the interface to become available!

Permissions for SickChill are user 'sc-sickchill' all download-related packages are managed with the group 'sc-download (DSM6) and synocommunity (DSM7)'.
Please read Permission Management for details.

" }] }] diff --git a/spk/sickchill/src/wizard/upgrade_uifile_spn b/spk/sickchill/src/wizard/upgrade_uifile_spn deleted file mode 100644 index 7708d6ea98a..00000000000 --- a/spk/sickchill/src/wizard/upgrade_uifile_spn +++ /dev/null @@ -1,6 +0,0 @@ -[{ - "step_title": "¡Atención! Permisos DSM", - "items": [{ - "desc": "Los permisos para los paquetes relacionados con descargas son manejados por el grupo 'sc-download' en DSM.
Por favor, lea Manejo de Permisos (en inglés) para mayor detalle." - }] -}] From 25ded1c4b5da7a9d162d83d4b745aacea60428cc Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 18 Oct 2022 17:33:01 -0400 Subject: [PATCH 15/15] Removing cross/cryptography reference --- spk/sickchill/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/spk/sickchill/Makefile b/spk/sickchill/Makefile index c81b4bdd329..b5514815496 100644 --- a/spk/sickchill/Makefile +++ b/spk/sickchill/Makefile @@ -16,7 +16,6 @@ DEPENDS += cross/libsodium ENV += SODIUM_INSTALL=system # [cryptography] -# DEPENDS += cross/cryptography ENV += PYO3_CROSS_LIB_DIR=$(STAGING_INSTALL_PREFIX)/lib/ ENV += PYO3_CROSS_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/