From d81e20d02344ad827ebe4b99ef494e1fc95865a9 Mon Sep 17 00:00:00 2001 From: TheRealKeto Date: Sat, 19 Nov 2022 14:39:00 -0500 Subject: [PATCH 1/5] python3-glances: Update to 3.3.0 * Update python3-glances to 3.3.0 * Introduce python3-defusedxml as a dependency Signed-off-by: TheRealKeto --- build_info/python3-defusedxml.control | 10 +++++++ build_info/python3-glances.control | 2 +- makefiles/python3-defusedxml.mk | 42 +++++++++++++++++++++++++++ makefiles/python3-glances.mk | 6 ++-- 4 files changed, 56 insertions(+), 4 deletions(-) create mode 100644 build_info/python3-defusedxml.control create mode 100644 makefiles/python3-defusedxml.mk diff --git a/build_info/python3-defusedxml.control b/build_info/python3-defusedxml.control new file mode 100644 index 0000000000..b78dfe59e0 --- /dev/null +++ b/build_info/python3-defusedxml.control @@ -0,0 +1,10 @@ +Package: python3-defusedxml +Version: @DEB_PYTHON3_DEFUSEDXML_V@ +Architecture: @DEB_ARCH@ +Maintainer: @DEB_MAINTAINER@ +Author: Christian Heimes +Depends: python3 +Section: Python +Priority: optional +Homepage: https://github.com/tiran/defusedxml +Description: XML bomb protection for Python stdlib modules diff --git a/build_info/python3-glances.control b/build_info/python3-glances.control index df858c32d9..596536f979 100644 --- a/build_info/python3-glances.control +++ b/build_info/python3-glances.control @@ -3,7 +3,7 @@ Version: @DEB_PYTHON3_GLANCES_V@ Architecture: @DEB_ARCH@ Maintainer: @DEB_MAINTAINER@ Author: Nicolas Hennion -Depends: python3, python3-psutil (>= 5.3.0) +Depends: python3, python3-psutil (>= 5.3.0), python3-defusedxml Section: Python Priority: optional Homepage: https://nicolargo.github.io/glances/ diff --git a/makefiles/python3-defusedxml.mk b/makefiles/python3-defusedxml.mk new file mode 100644 index 0000000000..814cba4c63 --- /dev/null +++ b/makefiles/python3-defusedxml.mk @@ -0,0 +1,42 @@ +ifneq ($(PROCURSUS),1) +$(error Use the main Makefile) +endif + +SUBPROJECTS += python3-defusedxml +PYTHON3_DEFUSEDXML_VERSION := 0.7.1 +DEB_PYTHON3_DEFUSEDXML_V ?= $(PYTHON3_DEFUSEDXML_VERSION) + +python3-defusedxml-setup: setup + $(call GITHUB_ARCHIVE,tiran,defusedxml,$(PYTHON3_DEFUSEDXML_VERSION),v$(PYTHON3_DEFUSEDXML_VERSION),python3-defusedxml) + $(call EXTRACT_TAR,python3-defusedxml-$(PYTHON3_DEFUSEDXML_VERSION).tar.gz,defusedxml-$(PYTHON3_DEFUSEDXML_VERSION),python3-defusedxml) + +ifneq ($(wildcard $(BUILD_WORK)/python3-defusedxml/.build_complete),) +python3-defusedxml: + @echo "Using previously built python3-defusedxml." +else +python3-defusedxml: python3-defusedxml-setup python3 + cd $(BUILD_WORK)/python3-defusedxml && $(DEFAULT_SETUP_PY_ENV) python3 ./setup.py \ + build \ + --executable="$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/python3" \ + install \ + --install-layout=deb \ + --root="$(BUILD_STAGE)/python3-defusedxml" \ + --prefix="$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)" + find $(BUILD_STAGE)/python3-defusedxml -name __pycache__ -prune -exec rm -rf {} \; + $(call AFTER_BUILD) +endif + +python3-defusedxml-package: python3-defusedxml-stage + # python3-defusedxml.mk Package Structure + rm -rf $(BUILD_DIST)/python3-defusedxml + + # python3-defusedxml.mk Prep python3-defusedxml + cp -a $(BUILD_STAGE)/python3-defusedxml $(BUILD_DIST) + + #python3-defusedxml.mk Make .debs + $(call PACK,python3-defusedxml,DEB_PYTHON3_DEFUSEDXML_V) + + # python3-defusedxml.mk Build cleanup + rm -rf $(BUILD_DIST)/python3-defusedxml + +.PHONY: python3-defusedxml python3-defusedxml-package diff --git a/makefiles/python3-glances.mk b/makefiles/python3-glances.mk index 8ffd553e6e..30f4d1aab1 100644 --- a/makefiles/python3-glances.mk +++ b/makefiles/python3-glances.mk @@ -3,12 +3,12 @@ $(error Use the main Makefile) endif SUBPROJECTS += python3-glances -PYTHON3_GLANCES_VERSION := 3.2.4.2 +PYTHON3_GLANCES_VERSION := 3.3.0 DEB_PYTHON3_GLANCES_V ?= $(PYTHON3_GLANCES_VERSION) python3-glances-setup: setup - $(call GITHUB_ARCHIVE,nicolargo,glances,$(PYTHON3_GLANCES_VERSION),v$(PYTHON3_GLANCES_VERSION)) - $(call EXTRACT_TAR,glances-$(PYTHON3_GLANCES_VERSION).tar.gz,glances-$(PYTHON3_GLANCES_VERSION),python3-glances) + $(call GITHUB_ARCHIVE,nicolargo,glances,$(PYTHON3_GLANCES_VERSION),v$(PYTHON3_GLANCES_VERSION),python3-glances) + $(call EXTRACT_TAR,python3-glances-$(PYTHON3_GLANCES_VERSION).tar.gz,glances-$(PYTHON3_GLANCES_VERSION),python3-glances) ifneq ($(wildcard $(BUILD_WORK)/python3-glances/.build_complete),) python3-glances: From 707ef377e9c70bbe5166c801c5c7732bfbf4e76a Mon Sep 17 00:00:00 2001 From: TheRealKeto Date: Sat, 19 Nov 2022 14:45:00 -0500 Subject: [PATCH 2/5] python3-psutil: Update to 5.9.4 * Update python3-psutil to 5.9.4 * Use GITHUB_ARCHIVE to download source tarball Signed-off-by: TheRealKeto --- makefiles/python3-psutil.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/makefiles/python3-psutil.mk b/makefiles/python3-psutil.mk index 6bf9fccb0a..0a00068076 100644 --- a/makefiles/python3-psutil.mk +++ b/makefiles/python3-psutil.mk @@ -3,12 +3,12 @@ $(error Use the main Makefile) endif SUBPROJECTS += python3-psutil -PYTHON3-PSUTIL_VERSION := 5.8.0 +PYTHON3-PSUTIL_VERSION := 5.9.4 DEB_PYTHON3-PSUTIL_V ?= $(PYTHON3-PSUTIL_VERSION) python3-psutil-setup: setup - $(call DOWNLOAD_FILES,$(BUILD_SOURCE) ,https://github.com/giampaolo/psutil/archive/refs/tags/release-$(PYTHON3-PSUTIL_VERSION).tar.gz) - $(call EXTRACT_TAR,release-$(PYTHON3-PSUTIL_VERSION).tar.gz,psutil-release-$(PYTHON3-PSUTIL_VERSION),python3-psutil) + $(call GITHUB_ARCHIVE,giampaolo,psutil,$(PYTHON3-PSUTIL_VERSION),release-$(PYTHON3-PSUTIL_VERSION),python3-psutil) + $(call EXTRACT_TAR,python3-psutil-$(PYTHON3-PSUTIL_VERSION).tar.gz,psutil-release-$(PYTHON3-PSUTIL_VERSION),python3-psutil) ifneq ($(wildcard $(BUILD_WORK)/python3-psutil/.build_complete),) python3-psutil: @@ -29,10 +29,9 @@ endif python3-psutil-package: python3-psutil-stage # python3-psutil.mk Package Structure rm -rf $(BUILD_DIST)/python3-psutil - mkdir -p $(BUILD_DIST)/python3-psutil/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX) # python3-psutil.mk Prep python3-psutil - cp -a $(BUILD_STAGE)/python3-psutil$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/lib $(BUILD_DIST)/python3-psutil/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX) + cp -a $(BUILD_STAGE)/python3-psutil $(BUILD_DIST) # python3-psutil.mk Sign $(call SIGN,python3-psutil,general.xml) From d044778acd6691967240e5092991a8e76d72eeb1 Mon Sep 17 00:00:00 2001 From: TheRealKeto Date: Wed, 23 Nov 2022 16:21:00 -0500 Subject: [PATCH 3/5] python3-psutil: Cleanup version variables Signed-off-by: TheRealKeto --- build_info/python3-psutil.control | 2 +- makefiles/python3-psutil.mk | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build_info/python3-psutil.control b/build_info/python3-psutil.control index be9f3cf600..ba429e46bf 100644 --- a/build_info/python3-psutil.control +++ b/build_info/python3-psutil.control @@ -1,5 +1,5 @@ Package: python3-psutil -Version: @DEB_PYTHON3-PSUTIL_V@ +Version: @DEB_PYTHON3_PSUTIL_V@ Architecture: @DEB_ARCH@ Maintainer: @DEB_MAINTAINER@ Section: Python diff --git a/makefiles/python3-psutil.mk b/makefiles/python3-psutil.mk index 0a00068076..6e6d2ee4bf 100644 --- a/makefiles/python3-psutil.mk +++ b/makefiles/python3-psutil.mk @@ -3,12 +3,12 @@ $(error Use the main Makefile) endif SUBPROJECTS += python3-psutil -PYTHON3-PSUTIL_VERSION := 5.9.4 -DEB_PYTHON3-PSUTIL_V ?= $(PYTHON3-PSUTIL_VERSION) +PYTHON3_PSUTIL_VERSION := 5.9.4 +DEB_PYTHON3_PSUTIL_V ?= $(PYTHON3_PSUTIL_VERSION) python3-psutil-setup: setup - $(call GITHUB_ARCHIVE,giampaolo,psutil,$(PYTHON3-PSUTIL_VERSION),release-$(PYTHON3-PSUTIL_VERSION),python3-psutil) - $(call EXTRACT_TAR,python3-psutil-$(PYTHON3-PSUTIL_VERSION).tar.gz,psutil-release-$(PYTHON3-PSUTIL_VERSION),python3-psutil) + $(call GITHUB_ARCHIVE,giampaolo,psutil,$(PYTHON3_PSUTIL_VERSION),release-$(PYTHON3_PSUTIL_VERSION),python3-psutil) + $(call EXTRACT_TAR,python3-psutil-$(PYTHON3_PSUTIL_VERSION).tar.gz,psutil-release-$(PYTHON3_PSUTIL_VERSION),python3-psutil) ifneq ($(wildcard $(BUILD_WORK)/python3-psutil/.build_complete),) python3-psutil: @@ -37,7 +37,7 @@ python3-psutil-package: python3-psutil-stage $(call SIGN,python3-psutil,general.xml) # python3-psutil.mk Make .debs - $(call PACK,python3-psutil,DEB_PYTHON3-PSUTIL_V) + $(call PACK,python3-psutil,DEB_PYTHON3_PSUTIL_V) # python3-psutil.mk Build cleanup rm -rf $(BUILD_DIST)/python3-psutil From 1f206f84a066b2fe99b85f76c901cee949548d43 Mon Sep 17 00:00:00 2001 From: TheRealKeto Date: Mon, 24 Apr 2023 20:52:00 -0400 Subject: [PATCH 4/5] python3-glances: Re-generate Makefile Signed-off-by: TheRealKeto --- makefiles/python3-glances.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/makefiles/python3-glances.mk b/makefiles/python3-glances.mk index 30f4d1aab1..e9a38e106c 100644 --- a/makefiles/python3-glances.mk +++ b/makefiles/python3-glances.mk @@ -29,10 +29,9 @@ endif python3-glances-package: python3-glances-stage # python3-glances.mk Package Structure rm -rf $(BUILD_DIST)/python3-glances - cp -a $(BUILD_STAGE)/python3-glances $(BUILD_DIST) - # python3-glances.mk Sign - $(call SIGN,python3-glances,general.xml) + # python3-glances.mk Prep python3-glances + cp -a $(BUILD_STAGE)/python3-glances $(BUILD_DIST) # python3-glances.mk Make .debs $(call PACK,python3-glances,DEB_PYTHON3_GLANCES_V) From c0713720b4e547202e03a3410aece9334a9242b1 Mon Sep 17 00:00:00 2001 From: TheRealKeto Date: Mon, 24 Apr 2023 21:19:00 -0400 Subject: [PATCH 5/5] python3-defusedxml: I hate everything. Signed-off-by: TheRealKeto --- makefiles/python3-defusedxml.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefiles/python3-defusedxml.mk b/makefiles/python3-defusedxml.mk index 814cba4c63..49b1d60eb4 100644 --- a/makefiles/python3-defusedxml.mk +++ b/makefiles/python3-defusedxml.mk @@ -33,7 +33,7 @@ python3-defusedxml-package: python3-defusedxml-stage # python3-defusedxml.mk Prep python3-defusedxml cp -a $(BUILD_STAGE)/python3-defusedxml $(BUILD_DIST) - #python3-defusedxml.mk Make .debs + # python3-defusedxml.mk Make .debs $(call PACK,python3-defusedxml,DEB_PYTHON3_DEFUSEDXML_V) # python3-defusedxml.mk Build cleanup