diff --git a/cross/dante-sockd/Makefile b/cross/dante-sockd/Makefile index 28a6f96a90b..35cb67d00ba 100644 --- a/cross/dante-sockd/Makefile +++ b/cross/dante-sockd/Makefile @@ -1,5 +1,5 @@ PKG_NAME = dante -PKG_VERS = 1.4.3 +PKG_VERS = 1.4.2 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.inet.no/dante/files @@ -14,10 +14,4 @@ LICENSE = BSD/CMU GNU_CONFIGURE = 1 CONFIGURE_ARGS = --disable-client --without-libwrap --without-bsdauth --without-gssapi --without-krb5 --without-upnp --without-pam -PRE_CONFIGURE_TARGET = dante_pre_configure - include ../../mk/spksrc.cross-cc.mk - -.PHONY: dante_pre_configure -dante_pre_configure: - $(RUN) autoreconf -i -f -v diff --git a/cross/dante-sockd/digests b/cross/dante-sockd/digests index e72f448dbc4..18c80d7cc55 100644 --- a/cross/dante-sockd/digests +++ b/cross/dante-sockd/digests @@ -1,3 +1,3 @@ -dante-1.4.3.tar.gz SHA1 1e264ec532774324b5508ba5f2ad226d479b4977 -dante-1.4.3.tar.gz SHA256 418a065fe1a4b8ace8fbf77c2da269a98f376e7115902e76cda7e741e4846a5d -dante-1.4.3.tar.gz MD5 28ae15fb9e4f5ce7fe17307d01edc075 +dante-1.4.2.tar.gz SHA1 542bf2579b0f63670310aff230b0f5162f6e33c9 +dante-1.4.2.tar.gz SHA256 4c97cff23e5c9b00ca1ec8a95ab22972813921d7fbf60fc453e3e06382fc38a7 +dante-1.4.2.tar.gz MD5 77551576d3e80bfaa941055a2959da81 diff --git a/cross/dante-sockd/patches/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch b/cross/dante-sockd/patches/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch deleted file mode 100644 index 97e9f04f0d2..00000000000 --- a/cross/dante-sockd/patches/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch +++ /dev/null @@ -1,35 +0,0 @@ -osdep.m4: Remove getaddrinfo() too low checks - -dante runs AC_PREPROC_IFELSE then it fills $ERRVALFILE by running the -following command: - -cat conftest.i | grep gaierrval: >>$2 - -As a result, $ERRVALFILE does not contain the expected values because -the expected value is not on the same line than gaierrval: - - gaierrval: - # 130 "conftest.c" 3 4 - -3 - -So drop these checks - -Signed-off-by: Fabrice Fontaine - -diff -Nuar dante-1.4.2-orig/osdep.m4 dante-1.4.2/osdep.m4 ---- osdep.m4-orig 2019-12-09 21:28:38.936003218 +0100 -+++ osdep.m4 2019-12-09 21:49:48.764019371 +0100 -@@ -956,13 +956,7 @@ - unset UNIQUEVALS UNIQUESYMBOLS - if test -s $ERRVALFILE; then - UNIQUEVALS=`sort $ERRVALFILE | uniq | wc -l | awk '{ print $1 }'` -- if test $UNIQUEVALS -le 1; then -- AC_MSG_FAILURE([error: getaddrinfo() error value count too low]) -- fi - UNIQUESYMBOLS=`cat $ERRVALFILE | wc -l | awk '{ print $1 }'` -- if test $UNIQUESYMBOLS -le 1; then -- AC_MSG_FAILURE([error: getaddrinfo() error symbol count too low]) -- fi - - if test $ERRNOCNT -ne $UNIQUESYMBOLS; then - AC_MSG_FAILURE([internal error: errno symbol count mismatch]) diff --git a/cross/python38/Makefile b/cross/python38/Makefile index 93a48dbaa8f..2629d442836 100644 --- a/cross/python38/Makefile +++ b/cross/python38/Makefile @@ -86,8 +86,8 @@ python38_post_install: $(WORK_DIR)/python-cc.mk @$(RUN) $(PYTHON_NATIVE) -m crossenv $(STAGING_INSTALL_PREFIX)/bin/python$(PKG_VERS_MAJOR_MINOR) $(WORK_DIR)/crossenv/ . $(WORK_DIR)/crossenv/bin/activate && $(RUN) wget https://bootstrap.pypa.io/get-pip.py -O - | build-python . $(WORK_DIR)/crossenv/bin/activate && $(RUN) wget https://bootstrap.pypa.io/get-pip.py -O - | python - . $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "setuptools==44.1.0" "wheel==0.36.2" "cffi==1.14.5" - . $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "setuptools==44.1.0" "wheel==0.36.2" "cffi==1.14.5" + . $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "setuptools>=58.0.0" "wheel>=0.36.2" "cffi>=1.14.5" + . $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "setuptools>=58.0.0" "wheel>=0.36.2" "cffi>=1.14.5" ifneq ($(PYTHON_LIB_NATIVE),$(PYTHON_LIB_CROSS)) cp $(PYTHON_LIB_CROSS)/_sysconfigdata_*.py $(PYTHON_LIB_NATIVE)/_sysconfigdata.py endif diff --git a/spk/dante-sockd/Makefile b/spk/dante-sockd/Makefile index a4bb3e9c314..c4788f69d5f 100644 --- a/spk/dante-sockd/Makefile +++ b/spk/dante-sockd/Makefile @@ -1,8 +1,10 @@ SPK_NAME = dante-sockd -SPK_VERS = 1.4.3 +SPK_VERS = 1.4.2 SPK_REV = 1 SPK_ICON = src/dante.png +REQUIRED_DSM = 5.0 + DEPENDS = cross/$(SPK_NAME) MAINTAINER = Anonym-tsk @@ -12,7 +14,7 @@ DESCRIPTION_FRE = Dante fournit le service socks et peut servir de firewall entr RELOAD_UI = yes STARTABLE = yes DISPLAY_NAME = Dante SOCKS-server -CHANGELOG = Update to version 1.4.3 and fix build on DSM7 +CHANGELOG = HOMEPAGE = https://www.inet.no/dante/ LICENSE = BSD/CMU diff --git a/spk/sickchill/Makefile b/spk/sickchill/Makefile index 7f7d181063f..4dc4f2bfde9 100644 --- a/spk/sickchill/Makefile +++ b/spk/sickchill/Makefile @@ -1,23 +1,23 @@ SPK_NAME = sickchill SPK_VERS = 20210729 -SPK_REV = 2 +SPK_REV = 3 SPK_ICON = src/sickchill.png -DEPENDS = cross/$(SPK_NAME) -SPK_DEPENDS = "python38:git" -PIP=pip3 +BUILD_DEPENDS = cross/python38 cross/poetry cross/lxml cross/cryptography +# cross/cffi cross/setuptools +DEPENDS = cross/PyNaCl cross/$(SPK_NAME) +SPK_DEPENDS = "python38" WHEELS = src/requirements.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. -DESCRIPTION_SPN = Gestor automático para bibliotecas de series. Busca nuevos episodios de tus series favoritas, y cuando son publicados hace su magia. STARTABLE = yes DISPLAY_NAME = SickChill -CHANGELOG = "Initial SickChill env fix and move to Python 3.8" +CHANGELOG = "Initial SickChill env fix and move to Python 3.8 without git" HOMEPAGE = https://sickchill.github.io/ -LICENSE = GPL +LICENSE = GPLv3+ SERVICE_USER = auto SERVICE_SETUP = src/service-setup.sh @@ -31,9 +31,6 @@ WIZARDS_DIR = src/wizard/ POST_STRIP_TARGET = sickchill_extra_install -# Pure Python package, make sure ARCH is not defined -override ARCH= - include ../../mk/spksrc.spk.mk .PHONY: sickchill_extra_install diff --git a/spk/sickchill/src/requirements.txt b/spk/sickchill/src/requirements.txt index 09ac88c85a7..fea86528d9c 100644 --- a/spk/sickchill/src/requirements.txt +++ b/spk/sickchill/src/requirements.txt @@ -1,88 +1,85 @@ appdirs==1.4.4 -attrdict==2.0.1 -babelfish==0.5.5 -beautifulsoup4==4.9.3 -###beekeeper==0.9.2 +babelfish==0.6.0 +beautifulsoup4==4.10.0 +beekeeper-alt==2021.7.16 bencode.py==4.0.0 -CacheControl==0.12.6 -certifi==2020.11.8 -###cffi==1.14.3 -chardet==3.0.4 -click==7.1.2 -cloudscraper==1.2.48 +cachecontrol==0.12.6 +certifi==2021.5.30 +cffi==1.14.6 +chardet==4.0.0 +charset-normalizer==2.0.3 +click==8.0.1 +cloudscraper==1.2.58 configobj==5.0.6 -###cryptography==3.2.1 -decorator==4.4.2 +decorator==5.0.9 deluge-client==1.9.0 -Deprecated==1.2.10 -dogpile.cache==1.0.2 +deprecated==1.2.12 +dogpile.cache==1.1.3 enzyme==0.4.1 -feedparser==6.0.2 +feedparser==6.0.8 future==0.18.2 gntp==1.0.3 -guessit==3.1.1 +greenlet==1.1.0 +guessit==3.3.1 html5lib==1.1 -httplib2==0.18.1 -idna==2.10 +httplib2==0.19.1 ifaddr==0.1.7 imagesize==1.2.0 -IMDbPY==2020.9.25 -ipaddress==1.0.23 -Js2Py==0.70 +IMDbPY==2021.4.18 +Js2Py==0.71 jsonrpclib-pelix==0.4.2 -###kodipydent==0.3.1 -###lxml==4.6.1 -Mako==1.1.3 -markdown2==2.3.10 -MarkupSafe==1.1.1 -msgpack==1.0.0 +kodipydent-alt==2021.7.16 +lxml==4.6.3 +Mako==1.1.4 +markdown2==2.4.0 +MarkupSafe==2.0.1 +msgpack==1.0.2 new-rtorrent-python==1.0.1a0 -oauthlib==3.1.0 -packaging==20.4 -pbr==5.5.1 +oauthlib==3.1.1 +packaging==20.9 +pbr==5.6.0 profilehooks==1.12.0 putio.py==8.7.0 pyaes==1.6.1 pycparser==2.20 -PyGithub==1.53 +pygithub==1.55 pyjsparser==2.7.1 -PyJWT==1.7.1 -pymediainfo==4.3 -PyNMA==1.0 -pyOpenSSL==19.1.0 +pyjwt==2.1.0 +pymediainfo==5.1.0 +###PyNaCl==1.4.0 +pynma==1.0 pyparsing==2.4.7 -PySocks==1.7.1 +pysocks==1.7.1 pysrt==1.1.2 -python-dateutil==2.8.1 -python-slugify==4.0.1 +###python-dateutil==2.8.2 +python-slugify==5.0.2 python-twitter==3.5 python3-fanart==2.0.0 -pytz==2020.4 -qbittorrent-api==2020.10.11 +pytz==2021.1 +qbittorrent-api==2021.5.22 rarfile==4.0 -rebulk==2.0.1 -requests==2.24.0 +rebulk==3.0.1 +requests==2.26.0 requests-oauthlib==1.3.0 requests-toolbelt==0.9.1 -Send2Trash==1.5.0 +send2trash==1.7.1 sgmllib3k==1.0.0 -six==1.15.0 -soupsieve==2.0.1 -SQLAlchemy==1.3.20 -stevedore==3.2.2 +six==1.16.0 +soupsieve==2.2.1 +SQLAlchemy==1.4.25 +stevedore==3.3.0 subliminal==2.1.0 text-unidecode==1.3 -timeago==1.0.14 -tmdbsimple==2.6.6 +timeago==1.0.15 +tmdbsimple==2.8.0 tornado==6.1 tus.py==1.3.4 tvdbsimple==1.0.6 -twilio==6.47.0 tzlocal==2.1 -Unidecode==1.1.1 -urllib3==1.26.0 -validators==0.18.1 +unidecode==1.2.0 +urllib3==1.26.6 +validators==0.18.2 webencodings==0.5.1 win-inet-pton==1.1.0 wrapt==1.12.1 -xmltodict==0.10.1 +xmltodict==0.12.0 diff --git a/spk/sickchill/src/service-setup.sh b/spk/sickchill/src/service-setup.sh index d7d324649c0..1de1f714b5f 100644 --- a/spk/sickchill/src/service-setup.sh +++ b/spk/sickchill/src/service-setup.sh @@ -1,12 +1,12 @@ PYTHON_DIR="/var/packages/python38/target" PIP=${SYNOPKG_PKGDEST}/env/bin/pip3 PATH="${SYNOPKG_PKGDEST}/bin:${SYNOPKG_PKGDEST}/env/bin:${PYTHON_DIR}/bin:${PATH}" -HOME="${SYNOPKG_PKGDEST}/var" -VIRTUALENV="${PYTHON_DIR}/bin/virtualenv" +HOME="${SYNOPKG_PKGVAR}" +VIRTUALENV="${PYTHON_DIR}/bin/python3 -m venv" PYTHON="${SYNOPKG_PKGDEST}/env/bin/python3" SC_INSTALL_DIR="${SYNOPKG_PKGDEST}/share/SickChill" SC_BINARY="${SC_INSTALL_DIR}/SickChill.py" -SC_DATA_DIR="${SYNOPKG_PKGDEST}/var/data" +SC_DATA_DIR="${SYNOPKG_PKGVAR}/data" SC_CFG_FILE="${SC_DATA_DIR}/config.ini" @@ -44,18 +44,26 @@ service_postinst() { ${VIRTUALENV} --system-site-packages ${SYNOPKG_PKGDEST}/env # Install the wheels - ${PIP} install --no-deps --no-index -U --force-reinstall -f ${SYNOPKG_PKGDEST}/share/wheelhouse ${SYNOPKG_PKGDEST}/share/wheelhouse/*.whl - + # ${PIP} install -U --force-reinstall -f ${SYNOPKG_PKGDEST}/share/wheelhouse ${SYNOPKG_PKGDEST}/share/wheelhouse/*.whl + # ${PIP} install --extra-index-url https://wheel-index.linuxserver.io/ubuntu/ -U --force-reinstall -f ${SYNOPKG_PKGDEST}/share/wheelhouse ${SYNOPKG_PKGDEST}/share/wheelhouse/*.whl + # ${PIP} install --no-deps --no-index --upgrade --force-reinstall --find-links ${wheelhouse} ${wheelhouse}/*.whl + wheelhouse=${SYNOPKG_PKGDEST}/share/wheelhouse + ${PIP} install --extra-index-url https://wheel-index.linuxserver.io/ubuntu/ --upgrade --force-reinstall --find-links ${wheelhouse} ${wheelhouse}/*.whl + if [ "${SYNOPKG_PKG_STATUS}" == "INSTALL" ]; then set_config fi - set_unix_permissions "${SYNOPKG_PKGDEST}" + if [ $SYNOPKG_DSM_VERSION_MAJOR -lt 7 ]; then + set_unix_permissions "${SYNOPKG_PKGDEST}" + fi } service_postupgrade() { set_config - set_unix_permissions "${SYNOPKG_PKGDEST}" + if [ $SYNOPKG_DSM_VERSION_MAJOR -lt 7 ]; then + set_unix_permissions "${SYNOPKG_PKGDEST}" + fi } service_preupgrade ()