From 4fa7a76eda5c07c22ed889d606e0c9991b7fede3 Mon Sep 17 00:00:00 2001 From: Christian Lachner Date: Tue, 4 Jul 2023 08:09:39 +0200 Subject: [PATCH 1/6] haproxy: update to v2.8.1 - Update haproxy PKG_VERSION and PKG_HASH - See changes: http://git.haproxy.org/?p=haproxy-2.8.git;a=shortlog Signed-off-by: Christian Lachner --- net/haproxy/Makefile | 4 ++-- net/haproxy/get-latest-patches.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index a1f858c4ca..217684d719 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy -PKG_VERSION:=2.8.0 +PKG_VERSION:=2.8.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.haproxy.org/download/2.8/src -PKG_HASH:=61cdafb5db7e9174d0757b8e4bcde938352306fb7cc8ff2b5f55c26dd48a6cf7 +PKG_HASH:=485552fcd9d5d5f41aad046f131fc0a7e849bef25a349a040750af0c6fc56807 PKG_MAINTAINER:=Thomas Heil , \ Christian Lachner diff --git a/net/haproxy/get-latest-patches.sh b/net/haproxy/get-latest-patches.sh index 6b60869c01..e36680e64e 100755 --- a/net/haproxy/get-latest-patches.sh +++ b/net/haproxy/get-latest-patches.sh @@ -1,7 +1,7 @@ #!/bin/sh CLONEURL=https://git.haproxy.org/git/haproxy-2.8.git -BASE_TAG=v2.8.0 +BASE_TAG=v2.8.1 TMP_REPODIR=tmprepo PATCHESDIR=patches From 56bbcf7acbd787b1f9a18c97e094a949561ceee5 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Thu, 27 Jul 2023 16:51:39 -0300 Subject: [PATCH 2/6] python-certifi: add github runtime test This loads the module, which should return the path of the CA bundle and verifies that the file exists. Signed-off-by: Eneas U de Queiroz (cherry picked from commit 219edcfa31ed2c55dc6bc4af049c92451157cf23) Signed-off-by: Jeffery To --- lang/python/python-certifi/test.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 lang/python/python-certifi/test.sh diff --git a/lang/python/python-certifi/test.sh b/lang/python/python-certifi/test.sh new file mode 100644 index 0000000000..b2802165b3 --- /dev/null +++ b/lang/python/python-certifi/test.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +case "$1" in + *-src) + ;; + python3-certifi) + BUNDLE=$(python3 -m certifi) || { + echo "Failed to run the certfi module script. Exit status=$?." >&2 + echo "Output='$BUNDLE'" >&2 + exit 1 + } + ls -l "$BUNDLE" + ;; + *) + echo "Unexpected package '$1'" >&2 + exit 1 + ;; +esac From 0fd40d720e2b21f1685df25ca4d379cca2c1af7a Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 28 Jul 2023 02:03:58 +0800 Subject: [PATCH 3/6] python-certifi: Update to 2023.7.22 Signed-off-by: Jeffery To (cherry picked from commit 008de77a8a4312d561dcef84a02ce4748ff62610) --- lang/python/python-certifi/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lang/python/python-certifi/Makefile b/lang/python/python-certifi/Makefile index d5dd745196..c1341b2b87 100644 --- a/lang/python/python-certifi/Makefile +++ b/lang/python/python-certifi/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-certifi -PKG_VERSION:=2022.9.24 +PKG_VERSION:=2023.7.22 PKG_RELEASE:=1 PKG_MAINTAINER:=Eneas U de Queiroz @@ -14,7 +14,7 @@ PKG_LICENSE:=MPL-2.0 PKG_LICENSE_FILES:=LICENSE PYPI_NAME:=certifi -PKG_HASH:=0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14 +PKG_HASH:=539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082 include ../pypi.mk include $(INCLUDE_DIR)/package.mk @@ -25,13 +25,14 @@ define Package/python3-certifi SECTION:=lang CATEGORY:=Languages TITLE:=Python package for Mozilla's CA Bundle - URL:=http://certifi.io/ + URL:=https://github.com/certifi/python-certifi DEPENDS:=+python3-light +python3-urllib endef define Package/python3-certifi/description - Certifi is a carefully curated collection of Root Certificates for validating the - trustworthiness of SSL certificates while verifying the identity of TLS hosts. +Certifi provides Mozilla's carefully curated collection of Root +Certificates for validating the trustworthiness of SSL certificates +while verifying the identity of TLS hosts. endef $(eval $(call Py3Package,python3-certifi)) From 6214bd80341003067b202fffad1b013e2b9b23f2 Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Wed, 2 Aug 2023 19:05:54 +1000 Subject: [PATCH 4/6] runc: Update to 1.1.8 for docker v24.0.5 Signed-off-by: Gerard Ryan (cherry picked from commit 276e9a77220352dbe5c2ddaafbe594bd70b92509) --- utils/runc/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/runc/Makefile b/utils/runc/Makefile index 6690180567..265a81974e 100644 --- a/utils/runc/Makefile +++ b/utils/runc/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=runc -PKG_VERSION:=1.1.7 -PKG_RELEASE:=2 +PKG_VERSION:=1.1.8 +PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/opencontainers/runc/tar.gz/v${PKG_VERSION}? -PKG_HASH:=f1885d6dfa188f8112328ac2355e5d67346174a2e2e795ec514a972bcbfcc2fa +PKG_HASH:=9076322ded5c7ae30471ea8a6a43e7c62fb357957592f5cb668abc2f7cb5e4bb PKG_MAINTAINER:=Gerard Ryan From 821ba40f1b35d6aaadf6996906e7c2406406fe9e Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Wed, 2 Aug 2023 19:06:25 +1000 Subject: [PATCH 5/6] dockerd: Update to 24.0.5 Signed-off-by: Gerard Ryan (cherry picked from commit 51d6788aed352bea0b9382ef2a0d8a36be6e7b51) --- utils/dockerd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile index bddf583273..fb09299036 100644 --- a/utils/dockerd/Makefile +++ b/utils/dockerd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dockerd -PKG_VERSION:=24.0.2 +PKG_VERSION:=24.0.5 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -10,8 +10,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_GIT_URL:=github.com/moby/moby PKG_GIT_REF:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)? -PKG_HASH:=f4bc7d7cc2ee3671371ae80fd624e61f0598e614b5c235012581f8ec1d593aa0 -PKG_GIT_SHORT_COMMIT:=659604f # SHA1 used within the docker executables +PKG_HASH:=837d7d667fb64508bf6e53cb5915b4b5ef356599294ffdd5ca8678168230cb38 +PKG_GIT_SHORT_COMMIT:=a61e2b4 # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan From 420aee737efe695d664dc4648f886619b609eea2 Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Wed, 2 Aug 2023 19:06:48 +1000 Subject: [PATCH 6/6] docker: Update to 24.0.5 Signed-off-by: Gerard Ryan (cherry picked from commit be96e7db6be4c691504d281b1671d77a845db2a2) --- utils/docker/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/docker/Makefile b/utils/docker/Makefile index 2066537313..fda077e52c 100644 --- a/utils/docker/Makefile +++ b/utils/docker/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=docker -PKG_VERSION:=24.0.2 +PKG_VERSION:=24.0.5 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -10,8 +10,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_GIT_URL:=github.com/docker/cli PKG_GIT_REF:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)? -PKG_HASH:=632357aa58d7f5e16ce87dbd73641c5f65c25b6501e3917ac4f0ce553a01e0bc -PKG_GIT_SHORT_COMMIT:=cb74dfc # SHA1 used within the docker executables +PKG_HASH:=fa32b5f3c2f85fba9ef6e1b5099a4b608fa20af45ba71b3da2194e8728037eec +PKG_GIT_SHORT_COMMIT:=ced0996 # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan