pyhon3* wheel fixes + TVH Fall 2021 update & Fix 403 Forbidden

cross/libhdhomerun/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = libhdhomerun
-PKG_VERS = 20210224
+PKG_VERS = 20210624
 PKG_EXT = tgz
 PKG_DIST_NAME = $(PKG_NAME)_$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://download.silicondust.com/hdhomerun

cross/libhdhomerun/digests

@@ -1,3 +1,3 @@
-libhdhomerun_20210224.tgz SHA1 053d1aed34d9ed22738de9064e030b4f1702178f
-libhdhomerun_20210224.tgz SHA256 b996389aa6f124a6d9dc1e75ec749e86d06102e2b3e7359d57163d4cc6e633f8
-libhdhomerun_20210224.tgz MD5 0918453d0517bcda26c088a7e0e8f3fb
+libhdhomerun_20210624.tgz SHA1 9db6089b956de4e58084b623937f5fc3231fff0b
+libhdhomerun_20210624.tgz SHA256 deaf463bbcc3eefa72f97199efb6213f7b0e2c8e91f1b3d2cbf52056a8715d15
+libhdhomerun_20210624.tgz MD5 233844b9238bd42cfdfbbd126a088fd2

cross/pip/Makefile

@@ -1,6 +1,6 @@
 PKG_NAME = pip
 # use the same version in native/python3/Makefile (python3_native_post_install)
-PKG_VERS = 21.2.4
+PKG_VERS = 21.3
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/p/$(PKG_NAME)

cross/pip/digests

@@ -1,3 +1,3 @@
-pip-21.2.4.tar.gz SHA1 c6c9348c79a7f8448cd14b9e53baf141ea185dee
-pip-21.2.4.tar.gz SHA256 0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
-pip-21.2.4.tar.gz MD5 efbdb4201a5e6383fb4d12e26f78f355
+pip-21.3.tar.gz SHA1 e6c8b84c60a290818079ce7ebc71ccbf9cd7d294
+pip-21.3.tar.gz SHA256 741a61baab1dbce2d8ca415effa48a2b6a964564f81a9f4f1fce4c433346c034
+pip-21.3.tar.gz MD5 fc20feba27bd36f046c2fbd59bc8f9ea

cross/python3/Makefile

@@ -89,8 +89,8 @@ python3_post_install: $(WORK_DIR)/python-cc.mk
 	cp -R $(HOSTPYTHON_LIB_NATIVE) $(PYTHON_LIB_CROSS)/../
 	@$(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
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-python get-pip.py "pip==21.2.4"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py "pip==21.2.4"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-python get-pip.py "pip==21.3"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py "pip==21.3"
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "setuptools==58.2.0"
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "setuptools==58.2.0"
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "wheel==0.37.0"

cross/python38/Makefile

@@ -114,8 +114,8 @@ python38_post_install: $(WORK_DIR)/python-cc.mk
 	cp -R $(HOSTPYTHON_LIB_NATIVE) $(PYTHON_LIB_CROSS)/../
 	@$(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
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-python get-pip.py "pip==21.2.4"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py "pip==21.2.4"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-python get-pip.py "pip==21.3"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py "pip==21.3"
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "setuptools==58.2.0"
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "setuptools==58.2.0"
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "wheel==0.37.0"

cross/tvheadend/Makefile

@@ -1,8 +1,8 @@
 PKG_NAME = tvheadend
 PKG_VERS = 4.3
 PKG_EXT = tar.gz
-# git hash from June 12th 2021
-PKG_GIT_HASH = eb59284b8527e3c51eadfeca94ec1e9174cdbdb0
+# git hash from October 16th 2021
+PKG_GIT_HASH = 1ee9c5b9cc516d37cb55a9d924a4ca854a64f720
 PKG_DIST_NAME = $(PKG_GIT_HASH).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/tvheadend/tvheadend/archive
 PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)

cross/tvheadend/digests

@@ -1,3 +1,3 @@
-tvheadend-giteb59284b8527e3c51eadfeca94ec1e9174cdbdb0.tar.gz SHA1 0b27567b389131c0e0ee2c82507c9417da5d9908
-tvheadend-giteb59284b8527e3c51eadfeca94ec1e9174cdbdb0.tar.gz SHA256 df3d50cd46e7d6b9d951bc36950eb1a49ac82fd5c2b08c3abc37cf8fba15651c
-tvheadend-giteb59284b8527e3c51eadfeca94ec1e9174cdbdb0.tar.gz MD5 de451b133121556868ba28b899902308
+tvheadend-git1ee9c5b9cc516d37cb55a9d924a4ca854a64f720.tar.gz SHA1 36dc9a0547b4cf16b604d6a3549be85542fd107c
+tvheadend-git1ee9c5b9cc516d37cb55a9d924a4ca854a64f720.tar.gz SHA256 207b7282c1e3240a77ab5b5f77269b8ca26127b7f603ef4870b23dc634561f05
+tvheadend-git1ee9c5b9cc516d37cb55a9d924a4ca854a64f720.tar.gz MD5 7395c2f69d8627f51d22105893164d98

mk/spksrc.common.mk

@@ -17,7 +17,7 @@ RUN = cd $(WORK_DIR)/$(PKG_DIR) && env $(ENV)
 PIP ?= pip
 # Why ask for the same thing twice? Always cache downloads
 PIP_CACHE_OPT ?= --cache-dir $(PIP_DIR)
-PIP_WHEEL_ARGS = wheel --no-binary :all: $(PIP_CACHE_OPT) --no-deps --requirement $(WORK_DIR)/wheelhouse/requirements.txt --wheel-dir $(WORK_DIR)/wheelhouse
+PIP_WHEEL_ARGS = wheel --no-binary :all: $(PIP_CACHE_OPT) --no-deps --wheel-dir $(WHEELHOUSE)
 PIP_WHEEL = $(PIP) $(PIP_WHEEL_ARGS)
 
 # Available languages

mk/spksrc.directories.mk

@@ -51,6 +51,15 @@ ifeq ($(strip $(STAGING_INSTALL_PREFIX)),)
 STAGING_INSTALL_PREFIX = $(INSTALL_DIR)$(INSTALL_PREFIX)
 endif
 
+# python wheelhouse directories
+ifndef WHEELHOUSE
+WHEELHOUSE = $(WORK_DIR)/wheelhouse
+endif
+
+ifndef STAGING_INSTALL_WHEELHOUSE
+STAGING_INSTALL_WHEELHOUSE = $(STAGING_INSTALL_PREFIX)/share/wheelhouse
+endif
+
 define create_target_dir
 @mkdir -p `dirname $@`
 endef

mk/spksrc.python-wheel.mk

@@ -27,18 +27,18 @@ PYTHONPATH = $(PYTHON_LIB_NATIVE):$(INSTALL_DIR)$(INSTALL_PREFIX)/$(PYTHON_LIB_D
 build_python_wheel:
 ifeq ($(strip $(CROSSENV)),)
 # Python 2 way
-	@$(RUN) PYTHONPATH=$(PYTHONPATH) $(HOSTPYTHON) -c "import setuptools;__file__='setup.py';exec(compile(open(__file__).read().replace('\r\n', '\n'), __file__, 'exec'))" $(BUILD_ARGS) bdist_wheel -d $(WORK_DIR)/wheelhouse
+	@$(RUN) PYTHONPATH=$(PYTHONPATH) $(HOSTPYTHON) -c "import setuptools;__file__='setup.py';exec(compile(open(__file__).read().replace('\r\n', '\n'), __file__, 'exec'))" $(BUILD_ARGS) bdist_wheel -d $(WHEELHOUSE)
 else
 # Python 3 case: using crossenv helper
-	@. $(CROSSENV) && $(RUN) PYTHONPATH=$(PYTHONPATH) python -c "import setuptools;__file__='setup.py';exec(compile(open(__file__).read().replace('\r\n', '\n'), __file__, 'exec'))" $(BUILD_ARGS) bdist_wheel -d $(WORK_DIR)/wheelhouse
+	@. $(CROSSENV) && $(RUN) PYTHONPATH=$(PYTHONPATH) python -c "import setuptools;__file__='setup.py';exec(compile(open(__file__).read().replace('\r\n', '\n'), __file__, 'exec'))" $(BUILD_ARGS) bdist_wheel -d $(WHEELHOUSE)
 endif
 
 install_python_wheel: $(WHEEL_TARGET)
-	@if [ -d "$(WORK_DIR)/wheelhouse" ] ; then \
-		mkdir -p $(STAGING_INSTALL_PREFIX)/share/wheelhouse ; \
-		cd $(WORK_DIR)/wheelhouse && \
+	@if [ -d "$(WHEELHOUSE)" ] ; then \
+		mkdir -p $(STAGING_INSTALL_WHEELHOUSE) ; \
+		cd $(WHEELHOUSE) && \
 		  for w in *.whl; do \
-		    cp -f $$w $(STAGING_INSTALL_PREFIX)/share/wheelhouse/`echo $$w | cut -d"-" -f -3`-none-any.whl; \
+		    cp -f $$w $(STAGING_INSTALL_WHEELHOUSE)/`echo $$w | cut -d"-" -f -3`-none-any.whl; \
 		  done ; \
 	fi
 

mk/spksrc.spk.mk

@@ -398,6 +398,7 @@ spkclean:
 	       work-*/conf \
 	       work-*/scripts \
 	       work-*/staging \
+	       work-*/wheelhouse \
 	       work-*/package.tgz \
 	       work-*/INFO \
 	       work-*/PLIST \

mk/spksrc.wheel.mk

@@ -14,6 +14,9 @@
 
 WHEEL_COOKIE = $(WORK_DIR)/.$(COOKIE_PREFIX)wheel_done
 
+WHEELS_PURE_PYTHON = requirements.txt
+WHEELS_CROSS_COMPILE = requirements-cross.txt
+
 ifeq ($(strip $(PRE_WHEEL_TARGET)),)
 PRE_WHEEL_TARGET = pre_wheel_target
 else
@@ -43,53 +46,56 @@ pre_wheel_target: wheel_msg_target
 		if [ ! -z "$(PIP_CACHE_OPT)" ] ; then \
 			mkdir -p $(PIP_DIR) ; \
 		fi; \
-		mkdir -p $(WORK_DIR)/wheelhouse ; \
-		if [ -f "$(WHEELS)" ] ; then \
-			$(MSG) "Using existing requirements file" ; \
-			cp -f $(WHEELS) $(WORK_DIR)/wheelhouse/requirements.txt ; \
-		else \
-			$(MSG) "Creating requirements file" ; \
-			rm -f $(WORK_DIR)/wheelhouse/requirements.txt ; \
-			for wheel in $(WHEELS) ; \
-			do \
-				echo $$wheel >> $(WORK_DIR)/wheelhouse/requirements.txt ; \
-			done \
-		fi ; \
+		rm -fr $(WHEELHOUSE) ; \
+		mkdir -p $(WHEELHOUSE) ; \
+		for wheel in $(WHEELS) ; \
+		do \
+			if [ -f $$wheel ] ; then \
+				$(MSG) "Using existing $$wheel file" ; \
+				$(MSG) cp -f $$wheel $(WHEELHOUSE)/$$(basename $$wheel) ; \
+				cp -f $$wheel $(WHEELHOUSE)/$$(basename $$wheel) ; \
+				sed -i -e '$$a\\' $(WHEELHOUSE)/$$(basename $$wheel) ; \
+			else \
+				$(MSG) "Adding to $(WHEELS_PURE_PYTHON) file" ; \
+				echo $$wheel >> $(WHEELHOUSE)/$(WHEELS_PURE_PYTHON) ; \
+			fi ; \
+		done \
 	fi
 
 build_wheel_target: $(PRE_WHEEL_TARGET)
 	@if [ ! -z "$(WHEELS)" ] ; then \
 		$(foreach e,$(shell cat $(WORK_DIR)/python-cc.mk),$(eval $(e))) \
-		if [ ! -z "$(CROSS_COMPILE_WHEELS)" ] ; then \
+		if [ -f "$(WHEELHOUSE)/$(WHEELS_CROSS_COMPILE)" ]; then \
 			$(MSG) "Force cross-compile" ; \
 			if [ -z "$(CROSSENV)" ]; then \
-				$(RUN) _PYTHON_HOST_PLATFORM="$(TC_TARGET)" CFLAGS="$(CFLAGS) -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR) $(WHEELS_CFLAGS)" LDFLAGS="$(LDFLAGS) $(WHEELS_LDFLAGS)" $(PIP_WHEEL) --use-deprecated=legacy-resolver ; \
+				$(RUN) _PYTHON_HOST_PLATFORM="$(TC_TARGET)" CFLAGS="$(CFLAGS) -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR) $(WHEELS_CFLAGS)" LDFLAGS="$(LDFLAGS) $(WHEELS_LDFLAGS)" $(PIP_WHEEL) --requirement $(WHEELHOUSE)/$(WHEELS_CROSS_COMPILE) ; \
 			else \
-				. $(CROSSENV) && $(RUN) _PYTHON_HOST_PLATFORM="$(TC_TARGET)" CFLAGS="$(CFLAGS) -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR) $(WHEELS_CFLAGS)" LDFLAGS="$(LDFLAGS) $(WHEELS_LDFLAGS)" pip $(PIP_WHEEL_ARGS) --use-deprecated=legacy-resolver --no-build-isolation ; \
+				. $(CROSSENV) && $(RUN) _PYTHON_HOST_PLATFORM="$(TC_TARGET)" CFLAGS="$(CFLAGS) -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR) $(WHEELS_CFLAGS)" LDFLAGS="$(LDFLAGS) $(WHEELS_LDFLAGS)" pip $(PIP_WHEEL_ARGS) --no-build-isolation --requirement $(WHEELHOUSE)/$(WHEELS_CROSS_COMPILE) ; \
 			fi ; \
-		else \
+		fi ; \
+		if [ -f "$(WHEELHOUSE)/$(WHEELS_PURE_PYTHON)" ]; then \
 			$(MSG) "Force pure-python" ; \
 			export LD= LDSHARED= CPP= NM= CC= AS= RANLIB= CXX= AR= STRIP= OBJDUMP= READELF= CFLAGS= CPPFLAGS= CXXFLAGS= LDFLAGS= && \
-				$(RUN) $(PIP_WHEEL) ; \
+				$(RUN) $(PIP_WHEEL) --requirement $(WHEELHOUSE)/$(WHEELS_PURE_PYTHON) ; \
 		fi ; \
 	fi
 
 
 post_wheel_target: $(WHEEL_TARGET)
-	@if [ -d "$(WORK_DIR)/wheelhouse" ] ; then \
-		mkdir -p $(STAGING_INSTALL_PREFIX)/share/wheelhouse ; \
-		cd $(WORK_DIR)/wheelhouse ; \
-		cp requirements.txt $(STAGING_INSTALL_PREFIX)/share/wheelhouse/ ; \
+	@if [ -d "$(WHEELHOUSE)" ] ; then \
+		mkdir -p $(STAGING_INSTALL_WHEELHOUSE) ; \
+		cd $(WHEELHOUSE) ; \
+		cat requirements*.txt > $(STAGING_INSTALL_WHEELHOUSE)/$(WHEELS_PURE_PYTHON) ; \
 		if [ "$(EXCLUDE_PURE_PYTHON_WHEELS)" = "yes" ] ; then \
 			echo "Pure python wheels are excluded from the package wheelhouse." ; \
 			for w in *.whl; do \
 				if echo $${w} | grep -viq "-none-any\.whl" ; then \
-					cp -f $$w $(STAGING_INSTALL_PREFIX)/share/wheelhouse/`echo $$w | cut -d"-" -f -3`-none-any.whl; \
+					cp -f $$w $(STAGING_INSTALL_WHEELHOUSE)/`echo $$w | cut -d"-" -f -3`-none-any.whl; \
 				fi ; \
 			done ; \
 		else \
 			for w in *.whl; do \
-				cp -f $$w $(STAGING_INSTALL_PREFIX)/share/wheelhouse/`echo $$w | cut -d"-" -f -3`-none-any.whl; \
+				cp -f $$w $(STAGING_INSTALL_WHEELHOUSE)/`echo $$w | cut -d"-" -f -3`-none-any.whl; \
 			done ; \
 		fi ; \
 	fi

native/python3/Makefile

@@ -26,8 +26,8 @@ PIP_NATIVE = $(WORK_DIR)/../../../native/$(PKG_NAME)/work-native/install/usr/loc
 python3_native_post_install: $(WORK_DIR)/python-native.mk
 	@$(MSG) Installing pip, setuptools, cffi and cross env
 	@$(RUN) wget https://bootstrap.pypa.io/get-pip.py
-	@$(RUN) $(PYTHON) get-pip.py "pip==21.2.4"
-	@$(PIP) install "setuptools==58.2.0" "cffi==1.14.6" "crossenv>=1.1.4"
+	@$(RUN) $(PYTHON) get-pip.py "pip==21.3"
+	@$(PIP) install "setuptools==58.2.0" "cffi==1.14.6" "crossenv==1.0"
 
 $(WORK_DIR)/python-native.mk:
 	@echo PIP=$(PIP_NATIVE) >> $@

native/python38/Makefile

@@ -26,7 +26,7 @@ PIP_NATIVE = $(WORK_DIR)/../../../native/$(PKG_NAME)/work-native/install/usr/loc
 python38_native_post_install: $(WORK_DIR)/python-native.mk
 	@$(MSG) Installing pip, setuptools, cffi and cross env
 	@$(RUN) wget https://bootstrap.pypa.io/get-pip.py
-	@$(RUN) $(PYTHON) get-pip.py "pip==21.2.4"
+	@$(RUN) $(PYTHON) get-pip.py "pip==21.3"
 	@$(PIP) install "setuptools==58.2.0" "cffi==1.14.6" "crossenv==1.0"
 
 $(WORK_DIR)/python-native.mk:

spk/borgbackup/Makefile

@@ -16,7 +16,7 @@ SPK_DEPENDS = "python38"
 # pip freeze > requirements.txt
 # deactivate
 # adjust the first line in requirements.txt to "#borgbackup==1.1.17"
-WHEELS = src/requirements.txt
+WHEELS = src/requirements-cross.txt src/requirements.txt
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = Deduplicating backup program with compression and authenticated encryption.

spk/borgbackup/src/requirements-cross.txt

@@ -0,0 +1,3 @@
+pyrsistent==0.18.0
+ruamel.yaml.clib==0.2.6
+urllib3==1.26.6

spk/borgbackup/src/requirements.txt

@@ -8,9 +8,6 @@ idna==3.2
 jsonschema==3.2.0
 packaging==21.0
 pyparsing==2.4.7
-pyrsistent==0.18.0
 requests==2.26.0
 ruamel.yaml==0.17.16
-ruamel.yaml.clib==0.2.6
 six==1.16.0
-urllib3==1.26.6

spk/duplicity/Makefile

@@ -6,7 +6,7 @@ SPK_ICON = src/duplicity.png
 BUILD_DEPENDS = cross/python38
 DEPENDS = cross/cffi cross/lxml cross/duplicity cross/duply
 
-WHEELS = src/requirements.txt
+WHEELS = src/requirements-cross.txt src/requirements.txt
 
 SPK_DEPENDS = "python38>=3.8.8:gnupg>=2.1.6"
 

spk/duplicity/src/requirements-cross.txt

@@ -0,0 +1,54 @@
+##### basic requirements #####
+chardet==4.0.0
+future==0.18.2
+### idna==2.10    # idna==2.9 is included in python38
+python-gettext==4.0
+urllib3==1.26.4
+
+
+##### backend libraries #####
+# some libs no longer support py27
+# some libs never supported py36+
+#b2sdk                   ; python_version >= '3.6'
+#boto
+#boto3
+#boxsdk[jwt]             ; python_version >= '3.6'
+#dropbox
+### gdata                   ; python_version == '2.7'
+#google_auth_oauthlib
+#jottalib
+### mediafire           ###  Development Status 3 - Alpha: outdated (Nov 2016), not supported by Python >3.4
+#pydrive                 ; python_version >= '3.6'
+#pyrax                   ; python_version >= '3.6'
+#python-swiftclient
+#requests_oauthlib
+
+
+### backend libraries except gdata mediafire
+args==0.1.0
+b2sdk==1.7.0
+### cffi==1.14.5          # cffi==1.14.1 is included as cross compiled wheel
+clint==0.5.1
+### cryptography==3.4.7   # cryptography==2.9.2 is included in python38
+### importlib-metadata==4.0.1   # importlib-metadata==1.5.0 is included in python38
+ip-associations-python-novaclient-ext==0.2
+iso8601==0.1.14
+#jeepney==0.6.0  ### cross compile wheel fails to find flit_core
+jottalib==0.5.1
+### lxml==4.6.3             # lxml==4.6.3 is included as cross compiled wheel
+### msgpack-python==0.5.6   # msgpack-python==0.5.6 is included in python38
+netifaces==0.10.9
+oauth2client==4.1.3
+os-networksv2-python-novaclient-ext==0.26
+os-virtual-interfacesv2-python-novaclient-ext==0.20
+positional==1.2.1
+protobuf==3.15.8
+### pyasn1==0.4.8       # pyasn1==0.4.8 is included in python38
+pyasn1-modules==0.2.8
+### PyYAML==5.4.1       # PyYAML==5.3 is included as module in python38
+rackspace-auth-openstack==1.3
+rackspace-novaclient==2.1
+rax-default-network-flags-python-novaclient-ext==0.4.0
+rax-scheduled-images-python-novaclient-ext==0.3.1
+simplejson==3.17.2
+wrapt==1.12.1