From f6aa1198eb14487d57bb5cb88fcc359376bfd3ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=A1k?= Date: Tue, 1 Aug 2023 13:27:00 +0200 Subject: [PATCH 01/56] knot: update to version 3.2.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan Hák --- net/knot/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/knot/Makefile b/net/knot/Makefile index 3ed0c35bf..205a2f850 100644 --- a/net/knot/Makefile +++ b/net/knot/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=knot -PKG_VERSION:=3.2.8 +PKG_VERSION:=3.2.9 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-dns/ -PKG_HASH:=ef419a428f327def77780bc90eda763b51e6121fe548543da84b9eb96a261a6e +PKG_HASH:=bc1f9eb8c9f67f52805f3acfa2d0153190245fa145b007fafa9068d2da292506 PKG_MAINTAINER:=Daniel Salzman PKG_LICENSE:=GPL-3.0 LGPL-2.0 0BSD BSD-3-Clause OLDAP-2.8 From 276e9a77220352dbe5c2ddaafbe594bd70b92509 Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Wed, 2 Aug 2023 19:05:54 +1000 Subject: [PATCH 02/56] runc: Update to 1.1.8 for docker v24.0.5 Signed-off-by: Gerard Ryan --- utils/runc/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/runc/Makefile b/utils/runc/Makefile index 669018056..265a81974 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 51d6788aed352bea0b9382ef2a0d8a36be6e7b51 Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Wed, 2 Aug 2023 19:06:25 +1000 Subject: [PATCH 03/56] dockerd: Update to 24.0.5 Signed-off-by: Gerard Ryan --- utils/dockerd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile index bddf58327..fb0929903 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 be96e7db6be4c691504d281b1671d77a845db2a2 Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Wed, 2 Aug 2023 19:06:48 +1000 Subject: [PATCH 04/56] docker: Update to 24.0.5 Signed-off-by: Gerard Ryan --- utils/docker/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/docker/Makefile b/utils/docker/Makefile index 206653731..fda077e52 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 From db02254ae53e66811be5ea6510ca8bc7aafb5ebb Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 2 Aug 2023 09:03:24 -0400 Subject: [PATCH 05/56] snort3: update to 3.1.67.0 Upstream bump Signed-off-by: John Audia --- net/snort3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/snort3/Makefile b/net/snort3/Makefile index c82070cec..acfdc1e17 100644 --- a/net/snort3/Makefile +++ b/net/snort3/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=snort3 -PKG_VERSION:=3.1.66.0 +PKG_VERSION:=3.1.67.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/ -PKG_HASH:=4481f882d767620e91fa6d97232ae9527cab06ba77087399c5dd91c72826e0bb +PKG_HASH:=fed8ea7cf00d69c10e5750a6507392730552594f4f4a0dd5d1bf259a691b9a54 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-only From 1b5ee689f3f8fa68580206274b5b67c06db3ec91 Mon Sep 17 00:00:00 2001 From: John Audia Date: Fri, 28 Jul 2023 17:52:17 -0400 Subject: [PATCH 06/56] lxc: update to 5.0.3 Bump to latest upstream release. Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia --- utils/lxc/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile index dcb2a79e1..00cc5fa13 100644 --- a/utils/lxc/Makefile +++ b/utils/lxc/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lxc -PKG_VERSION:=5.0.2 -PKG_RELEASE:=2 +PKG_VERSION:=5.0.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/ -PKG_HASH:=bea08d2e49efcee34fa58acd2bc95c0adc64d291c07f4cfaf4ac1d8ac5a36f45 +PKG_HASH:=2693a4c654dcfdafb3aa95c262051d8122afa1b6f5cef1920221ebbdee934d07 PKG_MAINTAINER:=Marko Ratkaj PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause GPL-2.0 From 31d02be16aeb8771cfa8420e888fc80e252d3931 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 31 Jul 2023 13:46:09 +0800 Subject: [PATCH 07/56] python-pathspec: Update to 0.11.2 Signed-off-by: Jeffery To --- lang/python/python-pathspec/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/python-pathspec/Makefile b/lang/python/python-pathspec/Makefile index 86bde00b8..f7aef9633 100644 --- a/lang/python/python-pathspec/Makefile +++ b/lang/python/python-pathspec/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-pathspec -PKG_VERSION:=0.11.1 +PKG_VERSION:=0.11.2 PKG_RELEASE:=1 PYPI_NAME:=pathspec -PKG_HASH:=2798de800fa92780e33acca925945e9a19a133b715067cf165b8866c15a31687 +PKG_HASH:=e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3 PKG_LICENSE:=MPL-2.0 PKG_LICENSE_FILES:=LICENSE From 360427948ee6b65856524e3ce911318be9f29c3b Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 31 Jul 2023 13:43:09 +0800 Subject: [PATCH 08/56] python-editables: Update to 0.5 Signed-off-by: Jeffery To --- lang/python/python-editables/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/python-editables/Makefile b/lang/python/python-editables/Makefile index 6a012b04a..127c31796 100644 --- a/lang/python/python-editables/Makefile +++ b/lang/python/python-editables/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-editables -PKG_VERSION:=0.4 +PKG_VERSION:=0.5 PKG_RELEASE:=1 PYPI_NAME:=editables -PKG_HASH:=dc322c42e7ccaf19600874035a4573898d88aadd07e177c239298135b75da772 +PKG_HASH:=309627d9b5c4adc0e668d8c6fa7bac1ba7c8c5d415c2d27f60f081f8e80d1de2 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE.txt From c2a725ec0029c78eb24eb5784bb99e6f7f69ffe7 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 28 Jul 2023 02:28:13 +0800 Subject: [PATCH 09/56] python-docutils: Update to 0.20.1 Signed-off-by: Jeffery To --- lang/python/python-docutils/Makefile | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/lang/python/python-docutils/Makefile b/lang/python/python-docutils/Makefile index 50875051f..bd85be0a2 100644 --- a/lang/python/python-docutils/Makefile +++ b/lang/python/python-docutils/Makefile @@ -1,14 +1,15 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=docutils -PKG_VERSION:=0.19 -PKG_RELEASE:=2 +PKG_NAME:=python-docutils +PKG_VERSION:=0.20.1 +PKG_RELEASE:=1 -PYPI_NAME:=$(PKG_NAME) -PKG_HASH:=33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6 +PYPI_NAME:=docutils +PKG_HASH:=f08a4e276c3a1583a86dce3e34aba3fe04d02bba2dd51ed16106244e8a923e3b PKG_MAINTAINER:=Daniel Danzberger -PKG_LICENSE:=MIT +PKG_LICENSE:=Public-Domain BSD-2-License Python-2.0.1 GPL-3.0-or-later +PKG_LICENSE_FILES:=COPYING.txt licenses/BSD-2-Clause.txt licenses/python-2-1-1.txt licenses/gpl-3-0.txt include ../pypi.mk include $(INCLUDE_DIR)/package.mk @@ -18,15 +19,16 @@ define Package/python3-docutils SUBMENU:=Python SECTION:=lang CATEGORY:=Languages - TITLE:=docutils - URL:=http://docutils.sourceforge.net + TITLE:=Documentation Utilities + URL:=https://docutils.sourceforge.io/ DEPENDS:=+python3 endef define Package/python3-docutils/description -Docutils is a modular system for processing documentation into useful formats, -such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, -an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax. +Docutils is a modular system for processing documentation into useful +formats, such as HTML, XML, and LaTeX. For input Docutils supports +reStructuredText, an easy-to-read, what-you-see-is-what-you-get +plaintext markup syntax. endef $(eval $(call Py3Package,python3-docutils)) From 54f9f2777c79ef41013b02320a7050e5bae16d39 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 28 Jul 2023 02:10:47 +0800 Subject: [PATCH 10/56] python-colorama: Update to 0.4.6 The package changed to the hatchling build backend. Signed-off-by: Jeffery To --- lang/python/python-colorama/Makefile | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/lang/python/python-colorama/Makefile b/lang/python/python-colorama/Makefile index 695f1824c..fca74e002 100644 --- a/lang/python/python-colorama/Makefile +++ b/lang/python/python-colorama/Makefile @@ -1,14 +1,17 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=colorama -PKG_VERSION:=0.4.1 -PKG_RELEASE:=2 +PKG_NAME:=python-colorama +PKG_VERSION:=0.4.6 +PKG_RELEASE:=1 -PYPI_NAME:=$(PKG_NAME) -PKG_HASH:=05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d +PYPI_NAME:=colorama +PKG_HASH:=08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 PKG_MAINTAINER:=Daniel Danzberger -PKG_LICENSE:=MIT +PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE_FILES:=LICENSE.txt + +PKG_BUILD_DEPENDS:=python-hatchling/host include ../pypi.mk include $(INCLUDE_DIR)/package.mk @@ -18,14 +21,14 @@ define Package/python3-colorama SUBMENU:=Python SECTION:=lang CATEGORY:=Languages - TITLE:=colorama + TITLE:=Cross-platform colored terminal text URL:=https://github.com/tartley/colorama - DEPENDS:=+python3 + DEPENDS:=+python3-light endef define Package/python3-colorama/description -Makes ANSI escape character sequences -(for producing colored terminal text and cursor positioning) work under MS Windows. +Makes ANSI escape character sequences (for producing colored terminal +text and cursor positioning) work under MS Windows. endef $(eval $(call Py3Package,python3-colorama)) From d6d4222e9751f974356cce6dbaf77c7b12dfc5ad Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 28 Jul 2023 01:57:04 +0800 Subject: [PATCH 11/56] python-cachelib: Update to 0.10.2 Signed-off-by: Jeffery To --- lang/python/python-cachelib/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lang/python/python-cachelib/Makefile b/lang/python/python-cachelib/Makefile index 6d70a666f..6fcef3b43 100644 --- a/lang/python/python-cachelib/Makefile +++ b/lang/python/python-cachelib/Makefile @@ -5,15 +5,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-cachelib -PKG_VERSION:=0.3.0 +PKG_VERSION:=0.10.2 PKG_RELEASE:=1 PYPI_NAME:=cachelib -PKG_HASH:=cc1856259f102c9273efa342100f70d9fafbd07b41ce05c501ee28e1dbbb5133 +PKG_HASH:=593faeee62a7c037d50fc835617a01b887503f972fb52b188ae7e50e9cb69740 PKG_MAINTAINER:=Stepan Henek PKG_LICENSE:=BSD-3-Clause -PKG_LICENSE_FILES:=LICENSE +PKG_LICENSE_FILES:=LICENSE.rst include ../pypi.mk include $(INCLUDE_DIR)/package.mk @@ -23,9 +23,9 @@ define Package/python3-cachelib SECTION:=lang CATEGORY:=Languages SUBMENU:=Python - TITLE:=cachelib - URL:=https://github.com/pallets/cachelib - DEPENDS:=+python3-light + TITLE:=Collection of cache libraries + URL:=https://github.com/pallets-eco/cachelib/ + DEPENDS:=+python3-light +python3-logging endef define Package/python3-cachelib/description From 2eabda9a1ecd7aff1f340f4175395680a041b0f1 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 28 Jul 2023 02:01:27 +0800 Subject: [PATCH 12/56] python-cachetools: Update to 5.3.1 Signed-off-by: Jeffery To --- lang/python/python-cachetools/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lang/python/python-cachetools/Makefile b/lang/python/python-cachetools/Makefile index de81b48f4..62bd760cf 100644 --- a/lang/python/python-cachetools/Makefile +++ b/lang/python/python-cachetools/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-cachetools -PKG_VERSION:=3.1.1 -PKG_RELEASE:=2 +PKG_VERSION:=5.3.1 +PKG_RELEASE:=1 PYPI_NAME:=cachetools -PKG_HASH:=8ea2d3ce97850f31e4a08b0e2b5e6c34997d7216a9d2c98e0f3978630d4da69a +PKG_HASH:=dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=MIT @@ -32,7 +32,9 @@ define Package/python3-cachetools endef define Package/python3-cachetools/description - This module provides various memoizing collections and decorators, including variants of the Python 3 Standard Library lru_cache function decorator. +This module provides various memoizing collections and decorators, +including variants of the Python 3 Standard Library's @lru_cache +function decorator. endef $(eval $(call Py3Package,python3-cachetools)) From 008de77a8a4312d561dcef84a02ce4748ff62610 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 28 Jul 2023 02:03:58 +0800 Subject: [PATCH 13/56] python-certifi: Update to 2023.7.22 Signed-off-by: Jeffery To --- 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 d5dd74519..c1341b2b8 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 197c34e62dfdf37eccd248f6f5c72bec1f63d4a8 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 28 Jul 2023 02:07:19 +0800 Subject: [PATCH 14/56] python-ciso8601: Update to 2.3.0 Signed-off-by: Jeffery To --- lang/python/python-ciso8601/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lang/python/python-ciso8601/Makefile b/lang/python/python-ciso8601/Makefile index 02a82cf67..ddcb41ce8 100644 --- a/lang/python/python-ciso8601/Makefile +++ b/lang/python/python-ciso8601/Makefile @@ -8,15 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-ciso8601 -PKG_VERSION:=2.1.3 +PKG_VERSION:=2.3.0 PKG_RELEASE:=1 PYPI_NAME:=ciso8601 -PKG_HASH:=bdbb5b366058b1c87735603b23060962c439ac9be66f1ae91e8c7dbd7d59e262 +PKG_HASH:=19e3fbd786d8bec3358eac94d8774d365b694b604fd1789244b87083f66c8900 PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE.txt +PKG_LICENSE_FILES:=LICENSE include ../pypi.mk include $(INCLUDE_DIR)/package.mk @@ -26,13 +26,14 @@ define Package/python3-ciso8601 SECTION:=lang CATEGORY:=Languages SUBMENU:=Python - TITLE:=Fast ISO8601 date time parser for Python written in C + TITLE:=Fast ISO8601 date time parser written in C URL:=https://github.com/closeio/ciso8601 DEPENDS:=+python3-light endef define Package/python3-ciso8601/description - ciso8601 converts ISO 8601 or RFC 3339 date time strings into Python datetime objects. +ciso8601 converts ISO 8601 or RFC 3339 date time strings into Python +datetime objects. endef $(eval $(call Py3Package,python3-ciso8601)) From c0552ae0d411c4768a1e9b9500e1570d86761b13 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 28 Jul 2023 02:16:26 +0800 Subject: [PATCH 15/56] python-contextlib2: Update to 21.6.0 Signed-off-by: Jeffery To --- lang/python/python-contextlib2/Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lang/python/python-contextlib2/Makefile b/lang/python/python-contextlib2/Makefile index df8d1ee9b..dcbed11c2 100644 --- a/lang/python/python-contextlib2/Makefile +++ b/lang/python/python-contextlib2/Makefile @@ -5,12 +5,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-contextlib2 -PKG_VERSION:=0.6.0.post1 +PKG_VERSION:=21.6.0 PKG_RELEASE:=1 -PKG_MAINTAINER:=Karel Kočí PYPI_NAME:=contextlib2 -PKG_HASH:=01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e +PKG_HASH:=ab1e2bfe1d01d968e1b7e8d9023bc51ef3509bba217bb730cee3827e1ee82869 + +PKG_MAINTAINER:=Karel Kočí +PKG_LICENSE:=PSF-2.0 Apache-2.0 +PKG_LICENSE_FILES:=LICENSE.txt include ../pypi.mk include $(INCLUDE_DIR)/package.mk @@ -20,13 +23,14 @@ define Package/python3-contextlib2 SECTION:=lang CATEGORY:=Languages SUBMENU:=Python - URL:=http://contextlib2.readthedocs.org - TITLE:=python3-contextlib2 + URL:=https://contextlib2.readthedocs.org + TITLE:=Backports and enhancements for the contextlib module DEPENDS:=+python3-light endef define Package/python-contextlib2/description - contextlib2 is a backport of the standard library’s contextlib module to earlier Python versions. +contextlib2 is a backport of the standard library's contextlib module to +earlier Python versions. endef $(eval $(call Py3Package,python3-contextlib2)) From 03f78eff74a5e37a61314e27f428768aeddbba46 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 28 Jul 2023 02:18:52 +0800 Subject: [PATCH 16/56] python-dns: Update to 2.4.1 Signed-off-by: Jeffery To --- lang/python/python-dns/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lang/python/python-dns/Makefile b/lang/python/python-dns/Makefile index f303733b6..03fbffee6 100644 --- a/lang/python/python-dns/Makefile +++ b/lang/python/python-dns/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-dns -PKG_VERSION:=2.3.0 +PKG_VERSION:=2.4.1 PKG_RELEASE:=1 PYPI_NAME:=dnspython -PKG_HASH:=224e32b03eb46be70e12ef6d64e0be123a64e621ab4c0822ff6d450d52a540b9 +PKG_HASH:=c33971c79af5be968bb897e95c2448e11a645ee84d93b265ce0b7aabe5dfdca8 PKG_LICENSE:=ISC PKG_LICENSE_FILES:=LICENSE @@ -28,13 +28,15 @@ define Package/python3-dns SUBMENU:=Python SECTION:=lang CATEGORY:=Languages - TITLE:=dnspython - URL:=http://www.dnspython.org/ + TITLE:=DNS toolkit + URL:=https://www.dnspython.org/ DEPENDS:=+python3 endef define Package/python3-dns/description - dnspython is a DNS toolkit for Python. It supports almost all record types. It can be used for queries, zone transfers, and dynamic updates. It supports TSIG authenticated messages and EDNS0. +dnspython is a DNS toolkit for Python. It supports almost all record +types. It can be used for queries, zone transfers, and dynamic updates. +It supports TSIG authenticated messages and EDNS0. endef $(eval $(call Py3Package,python3-dns)) From 731f0d70a8392f1d3abf1877334cfe25c6a0786f Mon Sep 17 00:00:00 2001 From: Sibren Vasse Date: Mon, 31 Jul 2023 11:18:37 +0200 Subject: [PATCH 17/56] openssh: update to 9.3p2 Signed-off-by: Sibren Vasse --- net/openssh/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/openssh/Makefile b/net/openssh/Makefile index f2112a40f..2923a8170 100644 --- a/net/openssh/Makefile +++ b/net/openssh/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssh -PKG_VERSION:=9.3p1 -PKG_RELEASE:=3 +PKG_VERSION:=9.3p2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ -PKG_HASH:=e9baba7701a76a51f3d85a62c383a3c9dcd97fa900b859bc7db114c1868af8a8 +PKG_HASH:=200ebe147f6cb3f101fd0cdf9e02442af7ddca298dffd9f456878e7ccac676e8 PKG_LICENSE:=BSD ISC PKG_LICENSE_FILES:=LICENCE From 730806a51ed839a5fb4d8da1c0c60505f6330ac6 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 4 Aug 2023 09:47:59 +0200 Subject: [PATCH 18/56] collectd: fix ampq1 vs. amqp1 typo The name 'ampq1' does not exist. Signed-off-by: Florian Eckert --- utils/collectd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index 47c60a0b1..c340d6eab 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=collectd PKG_VERSION:=5.12.0 -PKG_RELEASE:=44 +PKG_RELEASE:=45 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://collectd.org/files/ \ @@ -31,7 +31,7 @@ PKG_CONFIG_DEPENDS:= \ COLLECTD_PLUGINS_DISABLED:= \ amqp \ - ampq1 \ + amqp1 \ apple_sensors \ aquaero \ barometer \ From 1aac8ada877d282c593895e7ce5b31134cb08aac Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 4 Aug 2023 09:48:59 +0200 Subject: [PATCH 19/56] collectd: unify configure args handling for collectd-mod-smart If 'collectd-mod-smart' is not enabled, the use of lubudev does not need to be explicitly disabled. This library could be a dependency for other modules in the future. If this is explicitly disabled, then the other module cannot be built. Signed-off-by: Florian Eckert --- utils/collectd/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index c340d6eab..6890694a5 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=collectd PKG_VERSION:=5.12.0 -PKG_RELEASE:=45 +PKG_RELEASE:=46 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://collectd.org/files/ \ @@ -341,8 +341,6 @@ ifneq ($(CONFIG_PACKAGE_collectd-mod-smart),) CONFIGURE_ARGS+= \ --with-libatasmart="$(STAGING_DIR)/usr" \ --with-libudev="$(STAGING_DIR)/usr" -else - CONFIGURE_ARGS+= --without-libudev endif define Package/collectd/conffiles From e1ff9619a3c6d3ae9f5cf04a3b6ce8d91d45ad83 Mon Sep 17 00:00:00 2001 From: Hentioe Cl Date: Sat, 5 Aug 2023 10:01:49 +0300 Subject: [PATCH 20/56] irqbalance: add banned_cpulist option Configure CPUs to ignore with `IRQBALANCE_BANNED_CPULIST` environment variable Signed-off-by: Hentioe Cl [added PKG_RELEASE bump] --- utils/irqbalance/Makefile | 2 +- utils/irqbalance/files/irqbalance.config | 3 +++ utils/irqbalance/files/irqbalance.init | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/utils/irqbalance/Makefile b/utils/irqbalance/Makefile index 903900e75..6717c352e 100644 --- a/utils/irqbalance/Makefile +++ b/utils/irqbalance/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=irqbalance PKG_VERSION:=1.9.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/Irqbalance/irqbalance.git diff --git a/utils/irqbalance/files/irqbalance.config b/utils/irqbalance/files/irqbalance.config index b2afb7ed2..967b14d9a 100644 --- a/utils/irqbalance/files/irqbalance.config +++ b/utils/irqbalance/files/irqbalance.config @@ -8,6 +8,9 @@ config irqbalance 'irqbalance' # The default value is 10 seconds #option interval '10' + # Specify excluded cpulist + #option banned_cpulist '0' + # List of IRQ's to ignore #list banirq '36' #list banirq '69' diff --git a/utils/irqbalance/files/irqbalance.init b/utils/irqbalance/files/irqbalance.init index a221de08b..2c4248b38 100644 --- a/utils/irqbalance/files/irqbalance.init +++ b/utils/irqbalance/files/irqbalance.init @@ -22,6 +22,9 @@ start_service() { # 10 is the default config_get interval irqbalance interval 10 + # empty is the default + config_get banned_cpulist irqbalance banned_cpulist '' + # A list of IRQ's to ignore banirq="" handle_banirq_value() @@ -31,6 +34,9 @@ start_service() { config_list_foreach irqbalance banirq handle_banirq_value procd_open_instance "irqbalance" + if [ -n "$banned_cpulist" ]; then + procd_set_param env IRQBALANCE_BANNED_CPULIST="$banned_cpulist" + fi procd_set_param command /usr/sbin/irqbalance -f -c "$deepestcache" -t "$interval" "$banirq" procd_set_param respawn procd_close_instance From 4db53132ba66359e25fa6fd29aba87541551adf2 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 5 Aug 2023 01:47:18 +0100 Subject: [PATCH 21/56] lvm2: update LVM2 to 2.03.22 and DM to 1.02.196 Remove downstream patch 004-missing-includes.patch which was merged upstream in version 2.03.19 LVM2 changelog since version 2.03.17 version 2.03.22 - 02nd August 2023 ================================== Fix pv_major/pv_minor report field types so they are integers, not strings. Add lvmdevices --delnotfound to delete entries for missing devices. Always use cachepool name for metadata backup LV for lvconvert --repair. Make metadata backup LVs read-only after pool's lvconvert --repair. Improve VDO and Thin support with lvmlockd. Handle 'lvextend --usepolicies' for pools for all activation variants. Fix memleak in vgchange autoactivation setup. Update py-compile building script. Support conversion from thick to fully provisioned thin LV. Cache/Thin-pool can use error and zero volumes for testing. Individual thin volume can be cached, but cannot take snapshot. Better internal support for handling error and zero target (for testing). Resize COW above trimmed maximal size is does not return error. Support parsing of vdo geometry format version 4. Add lvm.conf thin_restore and cache_restore settings. Handle multiple mounts while resizing volume with a FS. Handle leading/trailing spaces in sys_wwid and sys_serial used by deivce_id. Enhance lvm_import_vdo and use snapshot when converting VDO volume. Fix parsing of VDO metadata. Fix failing -S|--select for non-reporting cmds if using LV info/status fields. Allow snapshots of raid+integrity LV. Fix multisegment RAID1 allocator to prevent using single disk for more legs. version 2.03.21 - 21st April 2023 ================================= Fix activation of vdo-pool for with 0 length headers (converted pools). Avoid printing internal init messages when creation integration devices. Allow (write)cache over raid+integrity LV. version 2.03.20 - 21st March 2023 ================================= Fix segfault if using -S|--select with log/report_command_log=1 setting. Configure now fails when requested lvmlockd dependencies are missing. Add some configure Gentoo enhancements for static builds. version 2.03.19 - 21st February 2023 ==================================== Configure supports --with-systemd-run executed from udev rules. Enhancement for build with MuslC systemd and non-bash system shells (dash). Do not reset SYSTEMD_READY variable in udev for PVs on MD and loop devices. Ensure udev is processing origin LV before its thick snapshots LVs. Fix and improve runtime memory size detection for VDO volumes. version 2.03.18 - 22nd December 2022 ==================================== Fix issues reported by coverity scan. Fix warning for thin pool overprovisioning on lvextend (2.03.17). Add support for writecache metadata_only and pause_writeback settings. Fix missing error messages in lvmdbusd. DM changelog since version 1.02.187: Version 1.02.196 - 02nd August 2023 =================================== Version 1.02.195 - 21st April 2023 ================================== Version 1.02.193 - 21st March 2023 ================================== Version 1.02.191 - 21st February 2023 ===================================== Improve parallel creation of /dev/mapper/control device node. Import previous ID_FS_* udev records in 13-dm-disk.rules for suspended DM dev. Remove NAME="mapper/control" rule from 10-dm.rules to avoid udev warnings. Version 1.02.189 - 22nd December 2022 ===================================== Improve 'dmsetup create' without given table line with new kernels. (Version 1.02.188 is missing) Signed-off-by: Daniel Golle --- utils/lvm2/Makefile | 6 +++--- utils/lvm2/patches/002-const-stdio.patch | 6 +++--- utils/lvm2/patches/003-no-mallinfo.patch | 6 +++--- utils/lvm2/patches/004-missing-includes.patch | 10 ---------- 4 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 utils/lvm2/patches/004-missing-includes.patch diff --git a/utils/lvm2/Makefile b/utils/lvm2/Makefile index 3ee3868eb..dc5239b68 100644 --- a/utils/lvm2/Makefile +++ b/utils/lvm2/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=LVM2 -PKG_VERSION:=2.03.17 -PKG_VERSION_DM:=1.02.187 +PKG_VERSION:=2.03.22 +PKG_VERSION_DM:=1.02.196 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://sourceware.org/pub/lvm2 -PKG_HASH:=7286cfa9651828c589389509546333b8da965dfa84a1a4c8ab3e681a47fabae7 +PKG_HASH:=4c5a6923bd1ace7ce04474608a84937ce053ba91b1ace9f0b0017268e732dc7c PKG_BUILD_DIR:=$(BUILD_DIR)/lvm2-$(BUILD_VARIANT)/$(PKG_NAME).$(PKG_VERSION) PKG_MAINTAINER:=Daniel Golle diff --git a/utils/lvm2/patches/002-const-stdio.patch b/utils/lvm2/patches/002-const-stdio.patch index b93d7b052..b6ed24449 100644 --- a/utils/lvm2/patches/002-const-stdio.patch +++ b/utils/lvm2/patches/002-const-stdio.patch @@ -9,7 +9,7 @@ /* Set in/out stream buffering before glibc */ if (set_buffering #ifdef SYS_gettid -@@ -2045,7 +2045,7 @@ void destroy_toolcontext(struct cmd_cont +@@ -2043,7 +2043,7 @@ void destroy_toolcontext(struct cmd_cont dm_hash_destroy(cmd->cft_def_hash); dm_device_list_destroy(&cmd->cache_dm_devs); @@ -20,7 +20,7 @@ if (is_valid_fd(STDIN_FILENO) && --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c -@@ -3419,6 +3419,7 @@ int lvm_split(char *str, int *argc, char +@@ -3432,6 +3432,7 @@ int lvm_split(char *str, int *argc, char /* Make sure we have always valid filedescriptors 0,1,2 */ static int _check_standard_fds(void) { @@ -28,7 +28,7 @@ int err = is_valid_fd(STDERR_FILENO); if (!is_valid_fd(STDIN_FILENO) && -@@ -3445,6 +3446,12 @@ static int _check_standard_fds(void) +@@ -3458,6 +3459,12 @@ static int _check_standard_fds(void) strerror(errno)); return 0; } diff --git a/utils/lvm2/patches/003-no-mallinfo.patch b/utils/lvm2/patches/003-no-mallinfo.patch index 82259c59b..6a0e025be 100644 --- a/utils/lvm2/patches/003-no-mallinfo.patch +++ b/utils/lvm2/patches/003-no-mallinfo.patch @@ -1,6 +1,6 @@ --- a/lib/mm/memlock.c +++ b/lib/mm/memlock.c -@@ -198,12 +198,15 @@ static void _allocate_memory(void) +@@ -199,12 +199,15 @@ static void _allocate_memory(void) * memory on free(), this is good enough for our purposes. */ while (missing > 0) { @@ -16,7 +16,7 @@ inf = MALLINFO(); if (hblks < inf.hblks) { -@@ -213,9 +216,12 @@ static void _allocate_memory(void) +@@ -214,9 +217,12 @@ static void _allocate_memory(void) free(areas[area]); _size_malloc_tmp /= 2; } else { @@ -29,7 +29,7 @@ if (area == max_areas && missing > 0) { /* Too bad. Warn the user and proceed, as things are -@@ -536,8 +542,13 @@ static void _lock_mem(struct cmd_context +@@ -537,8 +543,13 @@ static void _lock_mem(struct cmd_context * will not block memory locked thread * Note: assuming _memlock_count_daemon is updated before _memlock_count */ diff --git a/utils/lvm2/patches/004-missing-includes.patch b/utils/lvm2/patches/004-missing-includes.patch deleted file mode 100644 index 5fff3922e..000000000 --- a/utils/lvm2/patches/004-missing-includes.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/tools/vgimportdevices.c -+++ b/tools/vgimportdevices.c -@@ -15,6 +15,7 @@ - #include "tools.h" - #include "lib/cache/lvmcache.h" - #include "lib/device/device_id.h" -+#include - - struct vgimportdevices_params { - uint32_t added_devices; From 5c21b26a939470a44c25fec7a54416d052def1a9 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 5 Aug 2023 02:32:24 +0100 Subject: [PATCH 22/56] cryptsetup: update to version 2.6.1 Cryptsetup 2.6.1 Release Notes ============================== Stable bug-fix release with minor extensions. All users of cryptsetup 2.6.0 should upgrade to this version. Changes since version 2.6.0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ * bitlk: Fixes for BitLocker-compatible on-disk metadata parser (found by new cryptsetup OSS-Fuzz fuzzers). - Fix a possible memory leak if the metadata contains more than one description field. - Harden parsing of metadata entries for key and description entries. - Fix broken metadata parsing that can cause a crash or out of memory. * Fix possible iteration overflow in OpenSSL2 PBKDF2 crypto backend. OpenSSL2 uses a signed integer for PBKDF2 iteration count. As cryptsetup uses an unsigned value, this can lead to overflow and a decrease in the actual iteration count. This situation can happen only if the user specifies --pbkdf-force-iterations option. OpenSSL3 (and other supported crypto backends) are not affected. * Fix compilation for new ISO C standards (gcc with -std=c11 and higher). * fvault2: Fix compilation with very old uuid.h. * verity: Fix possible hash offset setting overflow. * bitlk: Fix use of startup BEK key on big-endian platforms. * Fix compilation with latest musl library. Recent musl no longer implements lseek64() in some configurations. Use lseek() as 64-bit offset is mandatory for cryptsetup. * Do not initiate encryption (reencryption command) when the header and data devices are the same. If data device reduction is not requsted, this leads to data corruption since LUKS metadata was written over the data device. * Fix possible memory leak if crypt_load() fails. * Always use passphrases with a minimal 8 chars length for benchmarking. Some enterprise distributions decided to set an unconditional check for PBKDF2 password length when running in FIPS mode. This questionable change led to unexpected failures during LUKS format and keyslot operations, where short passwords were used for benchmarking PBKDF2 speed. PBKDF2 benchmark calculations should not be affected by this change. Signed-off-by: Daniel Golle --- utils/cryptsetup/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/cryptsetup/Makefile b/utils/cryptsetup/Makefile index 575fb34a0..70a014222 100644 --- a/utils/cryptsetup/Makefile +++ b/utils/cryptsetup/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cryptsetup -PKG_VERSION:=2.6.0 -PKG_RELEASE:=2 +PKG_VERSION:=2.6.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/cryptsetup/v2.6 -PKG_HASH:=44397ba76e75a9cde5b02177bc63cd7af428a785788e3a7067733e7761842735 +PKG_HASH:=410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=GPL-2.0-or-later LGPL-2.1-or-later From 979a16c413dc1e4ffb42a2cbb4a6d078bc7bdc30 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 5 Aug 2023 02:12:35 +0100 Subject: [PATCH 23/56] libksba: update to version 1.6.4 Changes since version 1.6.2: 2023-06-19 Werner Koch Release 1.6.4. + commit 557999424ebd13e70d6fc17e648a5dd2a06f440b Correctly detect write errors while creating CMS objects. + commit 9ced7706f2738128aa5068727ea348c44f42e16e * src/cms.c (write_encrypted_cont): Take care of write errors. 2023-05-16 NIIBE Yutaka build: Sync libtool from libgpg-error for 64-bit Windows. + commit a920c2ff1a723031e8c6b8b61632bad46a740c83 * build-aux/ltmain.hs: Update from libgpg-error. 2023-05-12 NIIBE Yutaka tests: Use -no-fast-install LDFLAGS for Windows. + commit 74fb95dbaf70d97b67793b29497b1e7b29a5e2f1 * tests/Makefile.am [HAVE_W32_SYSTEM] (AM_LDFLAGS): Conditionalize. 2023-04-05 NIIBE Yutaka build: Update gpg-error.m4. + commit 53b9fa1d58ba522ca0eea4fe460719722e6e1ef5 * m4/gpg-error.m4: Update from libgpg-error master. 2022-12-06 Werner Koch Release 1.6.3. + commit bffa9b346071725363a483db547e7dced9721cb5 2022-11-23 Werner Koch Fix an integer overflow in the CRL signature parser. + commit f61a5ea4e0f6a80fd4b28ef0174bee77793cf070 * src/crl.c (parse_signature): N+N2 now checked for overflow. * src/ocsp.c (parse_response_extensions): Do not accept too large values. (parse_single_extensions): Ditto. 2022-11-02 NIIBE Yutaka build: Update m4/libgcrypt.m4. + commit 4076b60f7cef4fddc3d30f6e6d4078081dbc7167 * m4/libgcrypt.m4: Update from libgcrypt master. 2022-11-01 NIIBE Yutaka build: Prefer gpgrt-config when available. + commit 13307b22882a220d206341e1196e74fd37418c2f * src/ksba.m4: Overriding the decision by --with-libksba-prefix, use gpgrt-config ksba when gpgrt-config is available. 2022-10-24 NIIBE Yutaka build: Update gpg-error.m4. + commit c3c1627f34234e3d54fe1f3411ac499dd7e3b3b0 * m4/gpg-error.m4: Update from libgpg-error 1.46. Signed-off-by: Daniel Golle --- libs/libksba/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libksba/Makefile b/libs/libksba/Makefile index 558ea47f8..75558a463 100644 --- a/libs/libksba/Makefile +++ b/libs/libksba/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libksba -PKG_VERSION:=1.6.2 +PKG_VERSION:=1.6.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/$(PKG_NAME) -PKG_HASH:=fce01ccac59812bddadffacff017dac2e4762bdb6ebc6ffe06f6ed4f6192c971 +PKG_HASH:=bbb43f032b9164d86c781ffe42213a83bf4f2fee91455edfa4654521b8b03b6b PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=LGPL-3.0-or-later GPL-2.0-or-later From 5b6b0c67add664df5b55db388d0e85a4269c393e Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 5 Aug 2023 02:12:09 +0100 Subject: [PATCH 24/56] libassuan: update to version 2.5.6 Changes since version 2.5.5: 2023-06-19 Werner Koch Release 2.5.6. + commit 6b50ee6bcdd6aa81bd7cc3fb2379864c3ed479b8 2023-06-16 Werner Koch Flush data before clearing the confidential flag. + commit 0fc31770fa6277c57940b774d4049d7a3ad148e8 * src/context.c (assuan_end_confidential): Flush data. 2023-06-16 NIIBE Yutaka build: Fix listing m4 files. + commit e686c85e207e52130388c68018ac2e75b7fb574a * m4/Makefile.am (EXTRA_DIST): Add ax_cc_for_build.m4 and gpg-error.m4. Remove sys_socket_h.m4. build: Better cross build support. + commit 1939b040ca2301270a7f5be4e3049c551bf73dab * configure.ac: Use AX_CC_FOR_BUILD. * src/Makefile.am: Use EXEEXT_FOR_BUILD. * m4/ax_cc_for_build.m4: New from libgpg-error. tests: Use -no-fast-install LDFLAGS for Windows. + commit 32d9abf299ec5b217c5751d8dcf8cbb5989bdd9c * tests/Makefile.am [HAVE_W32_SYSTEM] (AM_LDFLAGS): Conditionalize. build: Update gpg-error.m4. + commit dbd5c48a36e6b6a28d12119a43ff2a65208dc152 * m4/gpg-error.m4: Update from libgpg-error master. build: Update gpg-error.m4. + commit d7533c4333bfa93537eaf639fd18a6b1377df11e * m4/gpg-error.m4: Update from libgpg-error 1.46. build: Update config.guess, config.sub, and config.rpath. + commit 84d5349d23031c13762a0d59c105a9dec8cc9e90 * build-aux/config.guess: Update from upstream. * build-aux/config.sub: Ditto. * build-aux/config.rpath: Update from gettext 0.21. build: Update gpg-error.m4. + commit f16fcb14c3661ff94e06612f3a3e46a5e98a62a8 * m4/gpg-error.m4: Update from libgpg-error. Don't access NULL by wipememory. + commit ff1f8ee7a8fb9729e08fb51419de9a8c93a4fdb6 * src/assuan-inquire.c (assuan_inquire): Check mb->buf. client: Wipe the inbound buffer when CONFIDENTIAL. + commit aac300389210031588a1f4c6d7f1efb4b45c4c95 * src/client.c (assuan_transact): Wipe the buffer. server,client: Wipe the outbound buffer when CONFIDENTIAL. + commit 5ac7e6ba19fa5ed472b50c1b12ba7cf94015c734 * src/assuan-buffer.c (assuan_send_data): Wipe the buffer. server: Wipe out the memory used by assuan_inquire if CONFIDENTIAL. + commit 4bfcd8a0f6f314581b40bed0cffe5f91441f4dff * src/assuan-inquire.c (assuan_inquire): Wipe the memory and inbound buffer. 2021-12-22 NIIBE Yutaka build: Update for newer autoconf. + commit 66d5fe281c8dcbbbc13edc8630aaf631b6cb5e85 * configure.ac (AC_PREREQ): Require >= 2.69. (AC_HEADER_STDC): Remove. * m4/sys_socket_h.m4: Remove. 2021-12-17 NIIBE Yutaka build,w32: Update configure script. + commit 576fbb033805b077ffe2270cb8a17c3f2dc830ae * configure.ac: Don't use gl_HEADER_SYS_SOCKET, but check winsock2.h. 2021-11-10 NIIBE Yutaka libtool: Link without -flat_namespace for macOS. + commit e342b58b6230d22c1225ed680f05e9d134a8f657 * m4/libtool.m4: Not setting 10.0 to MACOSX_DEPLOYMENT_TARGET when not defined. Only specify -flat_namespace to linker for specific (older) versions and hosts. 2021-08-05 NIIBE Yutaka build: Simplify configure.ac. + commit 669c76ee28c0b10c418bb47f95b1401631478c5a * configure.ac (AC_CHECK_HEADERS): Remove string.h. 2021-05-27 NIIBE Yutaka build: _DARWIN_C_SOURCE should be 1. + commit 335030e3d204afe33873df83c29302ff1caa0217 * configure.ac (*-apple-darwin*): Set _DARWIN_C_SOURCE 1. 2021-04-21 NIIBE Yutaka build: Update gpg-error.m4. + commit 8ec3e9f1dd88e14f42f31e8692a8664bd894226b * m4/gpg-error.m4: Update from libgpg-error. Signed-off-by: Daniel Golle --- libs/libassuan/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libassuan/Makefile b/libs/libassuan/Makefile index 2e1f05b10..5856ea62b 100644 --- a/libs/libassuan/Makefile +++ b/libs/libassuan/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libassuan -PKG_VERSION:=2.5.5 -PKG_RELEASE:=3 +PKG_VERSION:=2.5.6 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/$(PKG_NAME) -PKG_HASH:=8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4 +PKG_HASH:=e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=GPL-3.0-or-later From 19f7b7667e03c854f5d5da68dbaf7bab918208b3 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 5 Aug 2023 02:38:28 +0100 Subject: [PATCH 25/56] gpgme: update to version 1.21 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes since version 1.18 2023-07-07 Werner Koch Release 1.21.0. + commit 5bf3e6d0754a179b316f90a885371af99bc03ea1 2023-06-23 NIIBE Yutaka build: Add BUILT_SOURCE for better dependency. + commit 05ac1ce09ff199c715805cf601ea6d65e26c1fff * Makefile.am (BUILT_SOURCE): Add conf/config.h. 2023-06-21 Ingo Klöcker qt: Support reading signed/encrypted archives directly from a file. + commit 1c2459a5927866931808141ac6c4157cd5e3a157 * lang/qt/src/decryptverifyarchivejob.cpp, lang/qt/src/decryptverifyarchivejob.h (DecryptVerifyArchiveJob): Add member functions setInputFile, inputFile. * lang/qt/src/decryptverifyarchivejob_p.h (DecryptVerifyArchiveJobPrivate): Add member m_inputFilePath. * lang/qt/src/qgpgmedecryptverifyarchivejob.cpp (decrypt_verify): Move creation of indata to decrypt_verify_from_io_device. (decrypt_verify_from_io_device, decrypt_verify_from_file_name): New. (QGpgMEDecryptVerifyArchiveJob::start): Use decrypt_verify_from_io_device instead of decrypt_verify. (QGpgMEDecryptVerifyArchiveJobPrivate::startIt): Start the job with the values from member variables. * lang/qt/tests/run-decryptverifyarchivejob.cpp (createInput): Remove. (main): Remove creation of input. Make the job read the archive directly from the given archive name. core: Support reading the archive to decrypt/verify directly from a file + commit 1a9f192ab450288aea7a889527e78afd2c067b59 * src/engine-gpg.c (add_file_name_arg_or_data): New. (gpg_decrypt): Use add_file_name_arg_or_data instead of add_data for the ciphertext. (gpg_verify): Use add_file_name_arg_or_data instead of add_data for the signature and the signed text. * tests/run-decrypt.c (show_usage): New option --direct-file-io. (main): Parse new option. If option is given, then don't open input file, create simple data object instead of data object from stream and set input file name on input data. * tests/run-verify.c (show_usage): New option --direct-file-io. (main): Parse new option. If option is given, then don't open input files, create simple data objects instead of data objects from stream and set input file names on input data objects. 2023-06-19 Ingo Klöcker qt: Support writing signed/encrypted archives directly to a file. + commit e608315392cc5b7ddf51e16dce5fe7e99b83f011 * lang/qt/src/encryptarchivejob.cpp, lang/qt/src/encryptarchivejob.h (EncryptArchiveJob): Add member functions setRecipients, recipients, setInputPaths, inputPaths, setOutputFile, outputFile, setEncryptionFlags, encryptionFlags. * lang/qt/src/encryptarchivejob_p.h (EncryptArchiveJobPrivate): Add members m_recipients, m_inputPaths, m_outputFilePath, m_encryptionFlags. * lang/qt/src/qgpgmeencryptarchivejob.cpp (encrypt): Move creation of outdata to encrypt_to_io_device. (encrypt_to_io_device, encrypt_to_filename): New. (QGpgMEEncryptArchiveJob::start): Use encrypt_to_io_device instead of encrypt. (QGpgMEEncryptArchiveJobPrivate::startIt): Start the job with the values from member variables. * lang/qt/src/qgpgmesignarchivejob.cpp (sign): Move creation of outdata to sign_to_io_device. (sign_to_io_device, sign_to_filename): New. (QGpgMESignArchiveJob::start): Use sign_to_io_device instead of sign. (QGpgMESignArchiveJobPrivate::startIt): Start the job with the values from member variables. * lang/qt/src/qgpgmesignencryptarchivejob.cpp (sign_encrypt): Move creation of outdata to sign_encrypt_to_io_device. (sign_encrypt_to_io_device, sign_encrypt_to_filename): New. (QGpgMESignEncryptArchiveJob::start): Use sign_encrypt_to_io_device instead of sign_encrypt. (QGpgMESignEncryptArchiveJobPrivate::startIt): Start the job with the values from member variables. * lang/qt/src/signarchivejob.cpp, lang/qt/src/signarchivejob.h (SignArchiveJob): Add member functions setSigner, signers, setInputPaths, inputPaths, setOutputFile, outputFile. * lang/qt/src/signarchivejob_p.h (SignArchiveJobPrivate): Add members m_signers, m_inputPaths, m_outputFilePath. * lang/qt/src/signencryptarchivejob.cpp, lang/qt/src/signencryptarchivejob.h (SignEncryptArchiveJob): Add member functions setSigner, signers, setRecipients, recipients, setInputPaths, inputPaths, setOutputFile, outputFile, setEncryptionFlags, encryptionFlags. * lang/qt/src/signencryptarchivejob_p.h (SignEncryptArchiveJobPrivate): Add members m_signers, m_recipients, m_inputPaths, m_outputFilePath, m_encryptionFlags. * lang/qt/tests/run-encryptarchivejob.cpp (createOutput): Remove. (checkOutputFilePath): New. (main): Create file output writing to stdout if no archive name (or "-") is given. Exit if file with given archive name already exists. Make the jobs write the created archive directly to the given archive name. * lang/qt/tests/run-signarchivejob.cpp (createOutput): Remove. (checkOutputFilePath): New. (main): Create file output writing to stdout if no archive name (or "-") is given. Exit if file with given archive name already exists. Make the jobs write the created archive directly to the given archive name. core: Support writing the sign/encrypt output directly to a file. + commit c38b6200396f703917e4c66aca068f90cfbad325 * src/engine-gpg.c (gpg_encrypt): Pass output file name to gpg if output has file name set. (gpg_encrypt_sign): Ditto. (gpg_sign): Ditto. * tests/run-encrypt.c (show_usage): New option --output. (main): Parse new option. Set file name on output if --output is given. Do not print output if --output is given. * tests/run-sign.c (show_usage): New option --output. (main): Parse new option. Set file name on output if --output is given. Do not print output if --output is given. qt: Add a generic hook to start a job. + commit 8b9fabf5d55419a68c2b0fc7fd1a90517c881d78 * lang/qt/src/job.cpp, lang/qt/src/job.h (Job::startIt): New method. * lang/qt/src/job_p.h (JobPrivate::startIt): New pure virtual method. * lang/qt/src/qgpgmechangeexpiryjob.cpp (QGpgMEChangeExpiryJobPrivate::startIt): New. * lang/qt/src/qgpgmedecryptverifyarchivejob.cpp (QGpgMEDecryptVerifyArchiveJobPrivate::startIt): New. * lang/qt/src/qgpgmeencryptarchivejob.cpp (QGpgMEEncryptArchiveJobPrivate::startIt): New. * lang/qt/src/qgpgmeencryptjob.cpp (QGpgMEEncryptJobPrivate::startIt): New. * lang/qt/src/qgpgmeimportjob.cpp (QGpgMEImportJobPrivate::startIt): New. * lang/qt/src/qgpgmelistallkeysjob.cpp (QGpgMEListAllKeysJobPrivate::startIt): New. * lang/qt/src/qgpgmesignarchivejob.cpp (QGpgMESignArchiveJobPrivate::startIt): New. * lang/qt/src/qgpgmesignencryptarchivejob.cpp (QGpgMESignEncryptArchiveJobPrivate::startIt): New. * lang/qt/src/qgpgmesignencryptjob.cpp (QGpgMESignEncryptJobPrivate::startIt): New. qt: Make the run methods of ThreadedJobMixin public. + commit 23526c3ff26be11e4ebb1294b6f60202881a066c * lang/qt/src/threadedjobmixin.h (ThreadedJobMixin::run): Make all overloads public. qt: Rename JobPrivate::start to JobPrivate::startNow. + commit 4655b2dc6b33aca3bd6737eadadfb8afcf8694bd * lang/qt/src/job_p.h (JobPrivate::start): Rename to startNow. * lang/qt/src/job.cpp (Job::startNow): Adapt function call. * lang/qt/src/qgpgmechangeexpiryjob.cpp (QGpgMEChangeExpiryJobPrivate::start): Rename to startNow. * lang/qt/src/qgpgmedecryptverifyarchivejob.cpp (QGpgMEDecryptVerifyArchiveJobPrivate::start): Rename to startNow. * lang/qt/src/qgpgmeencryptarchivejob.cpp (QGpgMEEncryptArchiveJobPrivate::start): Rename to startNow. * lang/qt/src/qgpgmeencryptjob.cpp (QGpgMEEncryptJobPrivate::start): Rename to startNow. * lang/qt/src/qgpgmeimportjob.cpp (QGpgMEImportJobPrivate::start): Rename to startNow. * lang/qt/src/qgpgmelistallkeysjob.cpp (QGpgMEListAllKeysJobPrivate::start): Rename to startNow. * lang/qt/src/qgpgmesignarchivejob.cpp (QGpgMESignArchiveJobPrivate::start): Rename to startNow. * lang/qt/src/qgpgmesignencryptarchivejob.cpp (QGpgMESignEncryptArchiveJobPrivate::start): Rename to startNow. * lang/qt/src/qgpgmesignencryptjob.cpp (QGpgMESignEncryptJobPrivate::start): Rename to startNow. qt: Return const pointer to JobPrivate class for const pointer to Job. + commit 6f6b35df505af108669bd6ff8c351c970130eb45 * lang/qt/src/job.cpp, lang/qt/src/job_p.h (getJobPrivate): Replace with two overloads for non-const pointer and const pointer to Job. * lang/qt/src/job_p.h (jobPrivate): Replace with two template functions for non-const pointer and const pointer to Job. 2023-06-16 Andre Heinecke qt, cpp: Support larger size-hint on 32 bit builds. + commit 5811d069d3b391e9fd77c1062a2d96be41645422 * NEWS: Mention this. * lang/cpp/src/data.h, lang/cpp/src/data.cpp (Data::setSizeHint): New. * lang/qt/src/qgpgmedecryptjob.cpp, lang/qt/src/qgpgmedecryptverifyarchivejob.cpp, lang/qt/src/qgpgmedecryptverifyjob.cpp, lang/qt/src/qgpgmeencryptjob.cpp, lang/qt/src/qgpgmesignencryptjob.cpp, lang/qt/src/qgpgmesignjob.cpp, lang/qt/src/qgpgmeverifydetachedjob.cpp, lang/qt/src/qgpgmeverifyopaquejob.cpp: Set size for input IODevice. cpp: Expose gpgme_data_set_flag through cpp API. + commit cbcea4a09b1309a4bd822247a8dfcdcb73041f9c * lang/cpp/src/data.cpp (Data::setFlag): New. * lang/cpp/src/data.h: Update accordingly. * NEWS: Mention this. 2023-06-15 Werner Koch core: Send a input-size-hint for gpgsm. + commit 91bbb1e482da783b4d1b9d5f663a1a0af77fc0a4 * src/engine-gpgsm.c (send_input_size_hint): New. (gpgsm_decrypt): Send hint. (gpgsm_encrypt): Send hint. (gpgsm_sign): Send hint. (gpgsm_verify): Send hint. tests: Add option --cancel to run-encrypt. + commit 8796456d235d2d7a8a1ce7337abc1d4d149bcf9a * tests/run-encrypt.c (cancel_after_progress): New. (progress_cb): Take care of it. (main): Add option --cancel. core: Use 64 bit instead of gpgme_off_t for some internal functions. + commit eb68948c438814b99b81adf44b674738d0b1be34 * src/conversion.c (_gpgme_string_to_off): Return an u64 value. * src/data.c (_gpgme_data_get_size_hint): Ditto. (gpgme_data_set_flag): Use u64 for io-buffer-size due to string_to_off change. * src/data.h (struct gpgme_data): Change size_hint to u64. * src/engine-gpg.c (add_input_size_hint): Replace gpgme_off_t by u64. 2023-06-13 Andre Heinecke Fix definition of GPG_ERR_ENABLE_GETTEXT_MACROS. + commit 7e6d51aa6fc97bed12486540167e9b710c9a3378 * configure.ac: Add missing value. 2023-06-01 Ingo Klöcker doc,cpp: Treat GPG_ERR_FULLY_CANCELED as canceled. + commit 7990f70107bc8487f954c6885436a7661e162929 * doc/gpgme.texi (GPG_ERR_FULLY_CANCELED): New. * lang/cpp/src/context.cpp (Error::isCanceled): Also return true for GPG_ERR_FULLY_CANCELED. 2023-05-30 Biswapriyo Nath cpp,python: Respect --disable-gpg-test for tests. + commit e2103be390764f62b21a4e5d4fa90a7b78326787 lang/cpp/Makefile.am (SUBDIRS): Depend tests in RUN_GPG_TESTS. lang/python/Makefile.am (SUBDIRS): Ditto. 2023-05-30 Werner Koch core: For key signing and uid revoking allow an empty user id. + commit fbc3963d6229853fe9fb1fd599ef39ed0fe2eae6 * src/engine-gpg.c (gpg_keysign): Required USERID to be non-empty. 2023-05-23 Werner Koch python: Fix wrong use of write. + commit 36a68bc5308c0b4a541ca6adea5d3635217e8af2 * lang/python/helpers.c (pyPassphraseCb): Use gpgme_io_writen. (_gpg_interact_cb): Ditto. * lang/python/helpers.h (write) [W32]: Remove bad write macro. 2023-05-16 NIIBE Yutaka build: Sync to libtool from libgpg-error for 64-bit Windows. + commit e622e36f1f32641c66b28a0de95c75ae35f6ca05 * build-aux/ltmain.hs: Update from libgpg-error. 2023-04-26 NIIBE Yutaka Ingo Klöcker doc: Fix Python example code. + commit d44a473e27160a35268789e14dccd0ad55af0690 * lang/python/doc/src/gpgme-python-howto.org: Fix chmod race. * lang/python/examples/howto/export-secret-key.py: Likewise. * lang/python/examples/howto/export-secret-keys.py: Likewise. * lang/python/examples/howto/temp-homedir-config.py: Likewise. 2023-04-20 Werner Koch Release 1.20.0. + commit 451ed47434c5ffd2916adae25e5a128606b5ef98 core: Support the new macOS Homebrew location. + commit 7351ef32ce7c04d20ee32fc9b645a1931b3b0aba * src/posix-util.c (find_executable): Extend the path. 2023-04-19 Ingo Klöcker build,qt: Simplify check for moc. + commit a14155d2c1b2ddc167dbf278faf1d6b469575492 m4/qt6.m4: Remove alternative checks for moc that were taken over from Qt 5 and that are obsolete for Qt 6. Update NEWS. + commit e80bf34bf86f6f183145c31d598dda41c0496a4d * NEWS: Add news for recent changes 2023-04-18 Ingo Klöcker cpp: Fix Key::canSign() + commit 5bd84cfd3f092703bb4b9b993be7d89ca13b36b0 * lang/cpp/src/key.h (canReallySign): Deprecate. * lang/cpp/src/key.cpp (canSign): Remove workaround. Use implementation of canReallySign. (canReallySign): Use canSign(). (operator<<): Use canSign(). 2023-04-17 Werner Koch core: Avoid printf format warnings due to gpgme_ssize_t. + commit 7d1159c1e99bb1bae0ab698c85105dcdcb95b7ea * src/debug.h (_trace_sysres_ssize_t): Cast arg. core,w32: Fix invocation of gpgtar. + commit 0c29119e061cbdcb7342380938a25af91290f1a0 * src/dirinfo.c (EXEEXT_S): New. (get_gpgconf_item): Append ".exe" to gpg-wks-client and gpgtar. * src/gpgme-w32spawn.c (mystderr): Add code to ease debugging. 2023-04-06 NIIBE Yutaka build: Update gpg-error.m4. + commit 806a5d18b988449fbaa3c2e6380acf3ae4580f4a * m4/gpg-error.m4: Update from libgpg-error master. 2023-04-04 Ingo Klöcker w32: Always use UTF-8 for localized texts. + commit d256ba7cc57d9bfcfa05fb05cf66dc992efbb695 * configure.ac: Define GPG_ERR_ENABLE_GETTEXT_MACROS. * src/version.c (do_subsystem_inits) [W32]: Switch gettext to UTF-8. 2023-03-27 Werner Koch core: Minor code cleanup. + commit 34cc7daba12a2a6baa3cfa337762656c210686fa * src/engine-gpg.c (build_argv): Remove superfluous tes. 2023-03-27 Ingo Klöcker core: Initialize error variable. + commit b608c084b9220d8ed288eb916e88a236abac0707 * src/engine-gpg.c (build_argv): Initialize err. 2023-03-21 Werner Koch core,cpp: Add new key flags to gpgme_subkey_t. + commit 6d21256c9220df05bf92a695a787dde13fe44ca7 * src/gpgme.h.in (struct _gpgme_subkey): Add bit flags can_renc, can_timestamp, adn is_group_owned. Reduce size of _unused. * src/keylist.c (set_subkey_capability): Set them. * tests/run-keylist.c (main): Print them. * lang/cpp/src/key.h (Subkey::canRenc): New. (Subkey::canTimestamp): New. (Subkey::isGroupOwned): New. * lang/cpp/src/key.cpp: Implement new methods. (Subkey::isQualified): Print them. (std::ostream &operator<<): Print them. 2023-03-17 Werner Koch Release 1.19.0. + commit 96a30fdf30626a7cefd9c9e620a60817ef44fde2 2023-03-17 Ben Greiner (bnavigator) python: Update python.m4 configure script. + commit d086653cc346d5634bc742d5586e927fc9ee57cf * configure.ac: Unset PYTHON_LIBS. Support python 3.10. * m4/python.m4: Find correct version string for python >= 3.10. 2023-03-17 Ingo Klöcker tests: Package the ownertrust file. + commit e50724e1bbe55678dfcd2a1ea75157f6514fc58a tests/gpg/Makefile.am (EXTRA_DIST): Add ownertrust.txt. 2023-03-08 Werner Koch core: Also detect legacy X.509 v0 certificates. + commit c1f6535f144dedfbf5507f850d4da5b61fd5ec74 * src/data-identify.c (basic_detection): Loose the detection of X.509 certs. tests: Add option --binary to run-verify. + commit 76351c4877d60799a35afccd87037d5dd0871262 * tests/run-verify.c (main): Set encoding. 2023-02-14 Ingo Klöcker qt: Add signals for file-based and data-based progress. + commit 73e46b34658c0130de5ab9e3f4ce1ac4ee35c5e2 * lang/qt/src/decryptverifyarchivejob.h (DecryptVerifyArchiveJob): Add signals fileProgress and dataProgress. * lang/qt/src/encryptarchivejob.h (EncryptArchiveJob): Ditto. * lang/qt/src/signarchivejob.h (SignArchiveJob): Ditto. * lang/qt/src/signencryptarchivejob.h (SignEncryptArchiveJob): Ditto. * lang/qt/src/job_p.h (emitArchiveProgressSignals): New. * lang/qt/src/qgpgmedecryptverifyarchivejob.cpp (QGpgMEDecryptVerifyArchiveJob::QGpgMEDecryptVerifyArchiveJob): Emit appropriate signal when receiving Job::rawProgress signal. * lang/qt/src/qgpgmeencryptarchivejob.cpp (QGpgMEEncryptArchiveJob::QGpgMEEncryptArchiveJob): Ditto. * lang/qt/src/qgpgmesignarchivejob.cpp (QGpgMESignArchiveJob::QGpgMESignArchiveJob): Ditto. * lang/qt/src/qgpgmesignencryptarchivejob.cpp (QGpgMESignEncryptArchiveJob::QGpgMESignEncryptArchiveJob): Ditto. qt: Add simple and extended progress signals replacing old signal. + commit ea6f15ed602eeb9fa87766ba88acc78361a14b38 * lang/qt/src/job.h (Job): Add signals jobProgress and rawProgress. Deprecate signal progress. * lang/qt/src/multideletejob.cpp (MultiDeleteJob::slotResult): Emit new progress signals. * lang/qt/src/qgpgmerefreshsmimekeysjob.cpp (QGpgMERefreshSMIMEKeysJob::slotStatus): Ditto. * lang/qt/src/threadedjobmixin.h (ThreadedJobMixin::showProgress): Use modern overload of QMetaObject::invokeMethod to forward the progress signal and add the value of what. Add forwarding of progress to the new signals. * lang/qt/tests/t-encrypt.cpp (EncryptionTest::testProgress): Test the new signals instead of the deprecated one. 2023-02-10 Werner Koch core: Switch to logging via gpgrt. + commit 9c5506fde701f637381614dcfe22e3f9dc82955d * src/debug.c (errfp): Remove. (debug_init): Factor some code out to ... (safe_to_use_debug_file): new. (tid_log_callback): New. (debug_init): Rewrite to make use of gpgrt logging. (_gpgme_debug): Ditto. (_gpgme_debug_end): Remove extra LF testing code. * src/dirinfo.c (get_gpgconf_item): Remove now unneeded LFs. Realign output. 2023-02-10 Ingo Klöcker tests: Fix cleaning up at the end of the test. + commit 21283dfd1be1e56bc174cf5f12461888af7ab8b5 * tests/gpg/t-import.c (main): Unref key and release context. core: Allow finalization of signature verification of unencrypted data. + commit 41dc3bd22a3e0001abec8f2bea79b40ee5ad00be * src/decrypt-verify.c (decrypt_verify_status_handler): Call _gpgme_verify_status_handler on EOF even if _gpgme_decrypt_status_handler returned NO DATA error. * tests/gpg/t-decrypt-verify.c (normal_signed_message): New. (main): Add test with signed, but not encrypted data. 2023-02-09 Ingo Klöcker cpp: Improve debug output of some enums. + commit 3aaed9cfbfd6821b2e812fbdd24448953d6ca279 * lang/cpp/src/verificationresult.cpp (operator<<): Fix output of Signature::PKAStatus which doesn't represent flags. Print corresponding name of enum value if Signature::Summary or Notation::Flags are 0. tests: Stop daemons after setting up test environment. + commit 7098c14b231113055535abb14b4cde0c845f8728 * lang/python/tests/Makefile.am, lang/qt/tests/Makefile.am, tests/gpg/Makefile.am, tests/json/Makefile.am (pubring-stamp): Call `gpgconf --kill all` after importing test keys. 2023-02-08 Ingo Klöcker tests: Extend tests with an ultimately trusted key. + commit fcefc78f749a8f39cc587636647b24f8fa48efad * tests/gpg/Makefile.am (gpg-sample.stamp, pubring-stamp): Unify usage of tabs. (pubring-stamp): Import owner trust values. * tests/gpg/ownertrust.txt: New. * tests/gpg/t-decrypt-verify.c, tests/gpg/t-verify.c: Update expected values for signature summary and validity. * tests/gpg/t-keylist-secret-sig.c, tests/gpg/t-keylist-sig.c, tests/gpg/t-keylist.c: Update expected values of owner trust and uid validity. tests: Make t-edit-sign idempotent. + commit 844e6cd3b923834727f042b92d6a9a2db86b3fed * tests/gpg/t-edit-sign.c (test_key, test_key_fpr, import_key, delete_key): New. (main): Remove key_fpr. Import test key to sign. Delete test key after test. 2023-02-02 Ingo Klöcker qt,tests: Add test for the previous commit. + commit 52fd0bcde47a676ee1021c870b50e2add78d6973 * lang/qt/tests/t-decryptverify.cpp: New. * lang/qt/tests/Makefile.am: Add new test. cpp: Return successful verification for signed but not encrypted data. + commit 1698eec2ae3ec1a97c739e892d9cf288c0ec4ccd * lang/cpp/src/context.cpp (Context::decrypt): Use decryptionResult(). (Context::verifyDetachedSignature, Context::verifyOpaqueSignature): Use verificationResult(). (Context::verificationResult): Ignore "no data" error for signed but not encrypted data. (Context::decryptAndVerify): Use decryptionResult() and verificationResult(). qt: Add job for extracting encrypted and signed archives. + commit c407728064ca0c9b2f365437c6a7f2acc40e6d84 * lang/qt/src/decryptverifyarchivejob.cpp, lang/qt/src/decryptverifyarchivejob.h, lang/qt/src/decryptverifyarchivejob_p.h, lang/qt/src/qgpgmedecryptverifyarchivejob.cpp, lang/qt/src/qgpgmedecryptverifyarchivejob.h: New. * lang/qt/src/protocol.h (class Protocol): Add pure virtual member function decryptVerifyArchiveJob * lang/qt/src/protocol_p.h (Protocol::decryptVerifyArchiveJob): ... and implement it. * lang/qt/src/Makefile.am: Update accordingly. * lang/qt/tests/run-decryptverifyarchivejob.cpp: New. * lang/qt/tests/Makefile.am: Add new test runner. core: Make usage of input size hint compatible with gpgtar. + commit 7ad717f6ba00046a26a99d015d701a178ca30630 * src/engine-gpg.c (add_input_size_hint): Use add_gpg_arg_with_value to add the --input-size-hint option. cpp: Update decryption flags. + commit b3bdf14b37a313c21de61168e5e7545ab08fea13 * lang/cpp/src/context.h (DecryptArchive): New flag. qt: Allow checking if the sign/encrypt archive jobs are supported. + commit 55c948866fb8bf4adbf0c8f53edf51a4075b753e * lang/qt/src/encryptarchivejob.cpp, lang/qt/src/encryptarchivejob.h (isSupported): New. * lang/qt/src/signarchivejob.cpp, lang/qt/src/signarchivejob.h (isSupported): New. * lang/qt/src/signencryptarchivejob.cpp, lang/qt/src/signencryptarchivejob.h (isSupported): New. * lang/qt/tests/run-encryptarchivejob.cpp (main), lang/qt/tests/run-signarchivejob.cpp (main): Check if jobs are supported. cpp: Add const-overloads of version comparison operators. + commit 84780646910cdd91555a368650e3d92cf52b86bd * lang/cpp/src/engineinfo.h (EngineInfo::Version): Add const-overloads of all comparison operators. core: Allow usage of gpgtar also for new enough gpg 2.2. + commit 7f541547fc1783bb9ea119695fb76e2000bdfcf8 * src/engine-gpg.c (have_usable_gpgtar): New. (start): Always pass --status-fd to the called process. (gpg_decrypt, gpg_encrypt, gpg_encrypt_sign, gpg_sign, gpg_verify): Use have_usable_gpgtar() to check for suitable gpg. 2023-02-01 Werner Koch core,w32: More robust detection of GnuPG Desktop dir layout. + commit 5ab9c234d6b507f568fe1d2a2cbc82250a7828ee * src/w32-util.c (INST_TYPE_GPG4WIN, INST_TYPE_GPGDESK): New to replace the numeric constants. (find_version_file): New. (_gpgme_get_gpgconf_path): Guess a default for inst_type. 2023-01-31 Ingo Klöcker qt: Fix build without installed gpgme++ headers. + commit 343fb33bf02bea74caf4e615483f1a00dc06f7b8 * lang/qt/src/filelistdataprovider.cpp: Include error.h without folder prefix. qt: Remove unused and commented-out code. + commit d3a8c2c8b68b290a642c83c53a5989ee7fdc6331 * lang/qt/src/qgpgmeencryptarchivejob.cpp, lang/qt/src/qgpgmeencryptarchivejob.h (QGpgMEEncryptArchiveJob): Remove member function resultHook and member mResult. * lang/qt/src/qgpgmesignarchivejob.cpp, lang/qt/src/qgpgmesignarchivejob.h (QGpgMESignArchiveJob): Remove member function resultHook and member mResult. cpp: Fix debug output of SignatureMode. + commit 41a30f6d9f59b08213ab2c307036be9bc9b6f876 * lang/cpp/src/context.cpp (operator<<): Treat signature mode as combination of a 2-bit flag and a 1-bit flag. qt: Add job for creating encrypted signed archives. + commit 8c4436e73af369f79f125f56d020d01b184cafc6 * lang/qt/src/signencryptarchivejob.cpp, lang/qt/src/signencryptarchivejob.h, lang/qt/src/signencryptarchivejob_p.h, lang/qt/src/qgpgmesignencryptarchivejob.cpp, lang/qt/src/qgpgmesignencryptarchivejob.h: New. * lang/qt/src/protocol.h (class Protocol): Add pure virtual member function signEncryptArchiveJob * lang/qt/src/protocol_p.h (Protocol::signEncryptArchiveJob): ... and implement it. * lang/qt/src/Makefile.am: Update accordingly. * lang/qt/tests/run-encryptarchivejob.cpp (displayName): Remove. (CommandLineOptions): Initialize member armor. Add member sign. (parseCommandLine): Update application description. Add and parse option -s/--sign. (main): Use SignEncryptArchiveJob if sign option is set. qt,tests: Avoid leaking Context. + commit 2b98585c89c1654aa736777eeb92ff79d5fdd72b * lang/qt/tests/t-import.cpp: Wrap Context*s in unique_ptr. 2023-01-31 Werner Koch json: New operation "identify" and convenience option --identify. + commit 359378c5b3f3aaf274dfc33861978c3cf6ec60ca * src/gpgme-json.c (data_type_to_string): New. (op_identify): New. (process_request): Add to command list. (cmd_identify): New. (main): Add option --identify. 2023-01-30 Ingo Klöcker qt: Add job for creating signed archives. + commit 8d672b3b7e5c5d487f20fb742a29fbee21236885 * lang/qt/src/signarchivejob.cpp, lang/qt/src/signarchivejob.h, lang/qt/src/signarchivejob_p.h, lang/qt/src/qgpgmesignarchivejob.cpp, lang/qt/src/qgpgmesignarchivejob.h: New. * lang/qt/src/protocol.h (class Protocol): Add pure virtual member function signArchiveJob * lang/qt/src/protocol_p.h (Protocol::signArchiveJob): ... and implement it. * lang/qt/src/Makefile.am: Update accordingly. * lang/qt/tests/run-signarchivejob.cpp: New. * lang/qt/tests/Makefile.am: Add new test runner. cpp: Support new archive signing flag. + commit 2faa031af24959d5093da430d5f10fe30d77a75d * lang/cpp/src/global.h (enum SignatureMode): Add constant SignArchive. * lang/cpp/src/context.cpp (sigmode2sigmode): Rename to sigflags2sigflags (sigflags2sigflags): ... and rename argument mode to flags and treat it as flags. Adjust the callers. (operator<<): Change local CHECK macro to handle flags. Add new flag to debug stream. * lang/cpp/src/signingresult.cpp (CreatedSignature::mode): Handle new flags (even if it cannot occur currently). core: Use signature modes as flags. + commit 48b11f576260286bddef3833e25d0059638fe0bb * src/engine-backend.h (engine_ops.sign): Rename argument mode to flags. * src/engine-gpg.c (gpg_sign): Rename argument mode to flags. Check for invalid combination of flags. * src/engine-gpgsm.c (gpgsm_sign): Rename argument mode to flags. Check for unsupported flags. * src/engine-uiserver.c (gpgsm_sign): Rename argument mode to flags. Check for unsupported flags. * src/engine.c, src/engine.h (_gpgme_engine_op_sign): Rename argument mode to flags. * src/gpgme.h.in (GPGME_SIG_MODE_ARCHIVE): Change value to 4. (gpgme_op_sign_start, gpgme_op_sign): Rename argument mode to flags. * src/sign.c (sign_start): Rename argument mode to flags. Adjust check for invalid flags. (gpgme_op_sign_start, gpgme_op_sign): Rename argument mode to flags. 2023-01-27 Ingo Klöcker qt: Add job for creating encrypted archives. + commit 7afd135ccec73585e06272f98b4a0895e3ee6579 * lang/qt/src/encryptarchivejob.cpp, lang/qt/src/encryptarchivejob.h, lang/qt/src/encryptarchivejob_p.h, lang/qt/src/qgpgmeencryptarchivejob.cpp, lang/qt/src/qgpgmeencryptarchivejob.h: New. * lang/qt/src/protocol.h (class Protocol): Add pure virtual member function encryptArchiveJob * lang/qt/src/protocol_p.h (Protocol::encryptArchiveJob): ... and implement it. * lang/qt/src/Makefile.am: Update accordingly. * lang/qt/tests/run-encryptarchivejob.cpp: New. * lang/qt/tests/Makefile.am: Add new test runner. qt: Add data provider for list of file names. + commit 275a3a2c16d27e5bc87f7d80af2ee703a92b6758 * lang/qt/src/Makefile.am: Add new files and corresponding camel-case header. * lang/qt/src/dataprovider.h: Include interface from gpgme++ when not building. * lang/qt/src/filelistdataprovider.cpp, lang/qt/src/filelistdataprovider.h: New. cpp: Support new archive encryption flag. + commit d28ea8c6b3db008150e2bae99a33e30b55c4bc10 * lang/cpp/src/context.h (EncryptArchive): New flag. * lang/cpp/src/context.cpp (encryptflags2encryptflags): Convert EncryptArchive to corresponding gpgme encrypt flags. (operator<<): Add new flag to debug stream. cpp: Add convenience overload to set file name. + commit 261245a2e0e76568607c79a0c80372cb6f46444e * lang/cpp/src/data.h, lang/cpp/src/data.cpp (setFileName): Add overload. 2023-01-26 Ingo Klöcker cpp: Support all encryption flags. + commit 3e31f648e513bed0029b09104d416d25fca08868 * lang/cpp/src/context.h (WantAddress): New flag. * lang/cpp/src/context.cpp (encryptflags2encryptflags): Convert WantAddress to corresponding gpgme encrypt flags. (operator<<): Add new flag to debug stream. cpp: Pass ThrowKeyIds and EncryptWrap flags to GpgME. + commit 70aaf05a6a3eafd1ba96df71d03334337b1d071d * lang/cpp/src/context.cpp (encryptflags2encryptflags): Convert ThrowKeyIds and EncryptWrap to corresponding gpgme encrypt flags. (operator<<): Add flags to debug stream. core: Update required GnuPG version for new archive features. + commit 3580bb139b2e41f6c2397e506ee66f4892ceec62 * src/engine-gpg.c (gpg_decrypt, gpg_encrypt, gpg_encrypt_sign, gpg_sign, gpg_verify): Require gpg 2.4.1. 2023-01-25 Ingo Klöcker core: Support usage of gpgtar for verifying a signed archive. + commit 5b79b323971cb0794c45791851d85f8a66f0a441 * src/gpgme.h.in (gpgme_verify_flags_t): New enum. (GPGME_VERIFY_ARCHIVE): New const. (gpgme_op_verify_ext_start): New func. (gpgme_op_verify_ext): New func. * src/gpgme.def, src/libgpgme.vers: Add new functions. * src/verify.c (gpgme_op_verify_ext_start): New. (gpgme_op_verify_ext): New. (verify_start): Add arg FLAGS. Pass the flags to _gpgme_engine_op_verify. (gpgme_op_verify_start): Call gpgme_op_verify_ext_start with 0 for FLAGS. (gpgme_op_verify): Call gpgme_op_verify_ext with 0 for FLAGS. * src/engine.c, src/engine.h (_gpgme_engine_op_verify): Add arg FLAGS. * src/engine-backend.h (struct engine_ops): Add FLAGS to 'verify'. * src/engine-gpg.c (gpg_verify): Add arg FLAGS. Set use_gpgtar engine flag if GPGME_VERIFY_ARCHIVE flag is set. Check for new enough gpg. Use add_gpg_arg for gpg-only options without a value. Set extra options for gpgtar and pass input data to stdin when using gpgtar. * src/engine-gpgsm.c (gpgsm_verify): Add arg FLAGS. Return error if GPGME_VERIFY_ARCHIVE flag is set. * src/engine-uiserver.c (uiserver_verify): Ditto. * tests/run-verify.c (show_usage): New options --archive, --directory, and --diagnostics. (main): Parse new options. Verify and extract with gpgtar if --archive is given. Set file name of output data to value of --directory option. Print stderr of gpg/gpgtar if --diagnostics is given. 2023-01-24 Ingo Klöcker core: Support usage of gpgtar for decrypting an encrypted archive. + commit 95ea3bf831aeac201108876e73750692aa1ba3f5 * src/gpgme.h.in (GPGME_DECRYPT_ARCHIVE): New decryption flag. * src/engine-gpg.c (gpg_decrypt): Set use_gpgtar engine flag if GPGME_DECRYPT_ARCHIVE flag is set. Check for new enough gpg and incompatible flags. Use add_gpg_arg_with_value for gpg-only options with a value and add_gpg_arg for gpg-only options without a value. Set extra options for gpgtar and pass input data to stdin when using gpgtar. * tests/run-decrypt.c (show_usage): New options --archive and --directory. (main): Parse new options. Decrypt with gpgtar if --archive is given. Set file name of output data to value of --directory option. 2023-01-23 Ingo Klöcker core: Allow setting the base directory when creating an archive. + commit 419adf41afa40e5b34f646f2cb16d8aebda20048 * src/engine-gpg.c (gpg_encrypt, gpg_encrypt_sign, gpg_sign): Pass file name set in data with --directory option to gpgtar. * tests/run-encrypt.c (show_usage): New option --directory. (main): Parse new option. Set file name of input data to option value. * tests/run-sign.c (show_usage): New option --directory. (main): Parse new option. Set file name of input data to option value. 2023-01-19 Ingo Klöcker core: Support usage of gpgtar for creating an encrypted signed archive. + commit 29cfcd316d1bfc98ca663369a9503cc169dd3447 * src/engine-gpg.c (gpg_encrypt_sign): Set use_gpgtar engine flag if GPGME_ENCRYPT_ARCHIVE mode is set. Check for new enough gpg. Use add_gpg_arg_with_value for gpg-only options with a value and add_gpg_arg for gpg-only options without a value. Set extra options for gpgtar and pass input data to stdin when using gpgtar. * tests/run-encrypt.c (print_result): Rename to print_encrypt_result. Print header. (print_sign_result): New. (show_usage): New option --sign. (main): Parse new option. Sign and encrypt --sign is given. Print results of signing additionally to results of encryption. core: Support usage of gpgtar for creating a signed archive. + commit 0ca45e48b45af1978027e6fe26c7e406fd5ec74b * src/gpgme.h.in (GPGME_SIG_MODE_ARCHIVE): New signature mode. * src/engine-gpg.c (append_args_from_sender, append_args_from_sig_notations): Use add_gpg_arg_with_value for gpg-only options with a value. (gpg_sign): Set use_gpgtar engine flag if GPGME_SIG_MODE_ARCHIVE mode is set. Check for new enough gpg. Use add_gpg_arg_with_value for gpg-only options with a value and add_gpg_arg for gpg-only options without a value. Set extra options for gpgtar and pass input data to stdin when using gpgtar. * src/sign.c (sign_start): Add GPGME_SIG_MODE_ARCHIVE as valid mode. * tests/run-sign.c (show_usage): New options --archive and --diagnostics. (main): Parse new options. Sign with gpgtar if --archive is given. Print stderr of gpg/gpgtar if --diagnostics is given. core: Fix --set-filename argument. + commit aa201b0bb63d703a3794826fac2e2013fb0c34e7 * src/engine-gpg.c (gpg_encrypt): Append equal sign to argument name. 2023-01-18 Ingo Klöcker core: Support usage of gpgtar for encryption. + commit 5d8316da1d3dd0ab73743898e76c51932d0f13e2 * src/gpgme.h.in (GPGME_ENCRYPT_ARCHIVE): New encryption flag. * src/engine-gpg.c (arg_and_data_s): New field gpg_arg. (engine_gpg): New flag use_gpgtar. (_add_arg): Add argument gpg_arg and set it. (add_arg_ext, add_arg_with_locp, add_arg, add_arg_pfx, add_arg_len): Adjust call of _add_arg. (add_arg_with_locp): Add argument front. (add_gpg_arg, add_gpg_arg_with_value): New. (gpg_new): Use add_gpg_arg_with_value for gpg-only options with a value and add_gpg_arg for gpg-only options without. (build_argv): Consider usage of gpgtar when counting arguments to pass to gpg/gpgtar. Prepend "--gpg-args" to all gpg-only arguments if gpgtar is used. (start): Set program to use. Read diagnostics output from stderr when using gpgtar. Do not pass --status-fd to gpgtar for gpg < 2.4.1. Use add_gpg_arg_with_value for --lc-ctype and --lc-messages. (gpg_encrypt): Set use_gpgtar engine flag if GPGME_ENCRYPT_ARCHIVE flag is set. Check for new enough gpg and incompatible flags. Use add_gpg_arg_with_value for gpg-only options with a value and add_gpg_arg for gpg-only options without a value. Set extra options for gpgtar and pass input data to stdin when using gpgtar. * src/engine-gpgsm.c (gpgsm_encrypt): Return error if new flag is set. * src/engine-uiserver.c (uiserver_encrypt): Ditto. * tests/run-encrypt.c (show_usage): New options --archive and --diagnostics. (main): Parse new options. Encrypt with gpgtar if --archive is given. Print stderr of gpg/gpgtar if --diagnostics is given. core: Defer adding --status-fd and --logger-fd to argument list. + commit d56b3bc1cfa128d0246cfac59411adaad2579bc4 * src/engine-gpg.c (_append_to_arglist, _prepend_to_arglist): New. (_add_arg): Use _append_to_arglist and _prepend_to_arglist. (add_data_ext): New. Extends add_data. (add_data): Uses add_data_ext. (gpg_new): Do not add --status-fd and --logger-fd to argument list. (start): Prepend --logger-fd and --status-fd to the argument list. core: Extend gpgme_get_dirinfo to return the gpgtar name. + commit 12e490d97f2e7064bc9b5bea0d197790d10db106 * src/dirinfo.c (WANT_GPGTAR_NAME): New. (dirinfo): Add field gpgtar_name. (get_gpgconf_item): Build gpgtar_name on demand and return it. (_gpgme_get_default_gpgtar_name) : New. (gpgme_get_dirinfo): New value "gpgtar-name" for WHAT. * src/util.h (_gpgme_get_default_gpgtar_name): New. * tests/t-engine-info.c (main): Add gpgtar-name to the output. 2023-01-17 Ingo Klöcker core: Use "goto leave" pattern to clean up resources. + commit fbce7deb3b68af900f692591d5d05fa5c1a83f5f * src/engine-gpg.c (build_argv): Initialize fd_data_map and argv. Goto leave on error. Free fd_data_map and argv on error. 2023-01-16 Ingo Klöcker core: Do not add obsolete --no-sk-comments to command line. + commit 984ff7e3a2a9a261a0732cbdaf3b2f22d325b433 * src/engine-gpg.c (build_argv): Don't add "--no-sk-comments" to argv. 2023-01-05 Ingo Klöcker qt: Fix comparisons of integer expressions of different signedness. + commit 64da77620a451653e9b8c41bb0c9e58e22967123 * lang/qt/tests/t-import.cpp (ImportTest::testImportWithImportFilter): Make integer literal unsigned. cpp: Fix comparisons of integer expressions of different signedness. + commit 2e9d72a0be8579d6f1d3c74c64873a9c2f844272 * lang/cpp/src/gpgrevokekeyeditinteractor.cpp (GpgRevokeKeyEditInteractor::Private::nextState): Cast signed nextLine value to std::size_t. cpp: Expliticly declare compiler generated copy constructors. + commit dc9cc9aa0754d834388acabb5a68677f6512b960 * lang/cpp/src/configuration.h (Component, Option), lang/cpp/src/data.h (Data), lang/cpp/src/decryptionresult.h (DecryptionResult, DecryptionResult::Recipient), lang/cpp/src/encryptionresult.h (EncryptionResult, InvalidRecipient), lang/cpp/src/engineinfo.h (EngineInfo), lang/cpp/src/importresult.h (ImportResult, Import), lang/cpp/src/key.h (Key, Subkey, UserID, UserID::Signature), lang/cpp/src/keygenerationresult.h (KeyGenerationResult), lang/cpp/src/keylistresult.h (KeyListResult), lang/cpp/src/notation.h (Notation), lang/cpp/src/signingresult.h (SigningResult, InvalidSigningKey, CreatedSignature), lang/cpp/src/swdbresult.h (SwdbResult), lang/cpp/src/tofuinfo.h (TofuInfo), lang/cpp/src/verificationresult.h (VerificationResult, Signature), lang/cpp/src/vfsmountresult.h (VfsMountResult): Explitily declare compiler generated copy constructor. qt: Replace Q_DECL_OVERRIDE with override. + commit e16c368758e54b99d88529d3a10cecf36ed995b8 * lang/qt/src/defaultkeygenerationjob.h, lang/qt/src/hierarchicalkeylistjob.h, lang/qt/src/multideletejob.h, lang/qt/src/protocol_p.h, lang/qt/src/qgpgmeadduseridjob.h, lang/qt/src/qgpgmechangeexpiryjob.h, lang/qt/src/qgpgmechangeownertrustjob.h, lang/qt/src/qgpgmechangepasswdjob.h, lang/qt/src/qgpgmedecryptjob.h, lang/qt/src/qgpgmedecryptverifyjob.h, lang/qt/src/qgpgmedeletejob.h, lang/qt/src/qgpgmedownloadjob.h, lang/qt/src/qgpgmeencryptjob.h, lang/qt/src/qgpgmeexportjob.h, lang/qt/src/qgpgmegpgcardjob.h, lang/qt/src/qgpgmeimportfromkeyserverjob.h, lang/qt/src/qgpgmeimportjob.h, lang/qt/src/qgpgmekeyformailboxjob.h, lang/qt/src/qgpgmekeygenerationjob.h, lang/qt/src/qgpgmekeylistjob.h, lang/qt/src/qgpgmelistallkeysjob.h, lang/qt/src/qgpgmenewcryptoconfig.h, lang/qt/src/qgpgmequickjob.h, lang/qt/src/qgpgmerefreshsmimekeysjob.h, lang/qt/src/qgpgmesignencryptjob.h, lang/qt/src/qgpgmesignjob.h, lang/qt/src/qgpgmesignkeyjob.h, lang/qt/src/qgpgmetofupolicyjob.h, lang/qt/src/qgpgmeverifydetachedjob.h, lang/qt/src/qgpgmeverifyopaquejob.h, lang/qt/src/qgpgmewkdlookupjob.h, lang/qt/src/qgpgmewkspublishjob.h, lang/qt/src/threadedjobmixin.h, lang/qt/tests/t-support.h: Replace Q_DECL_OVERRIDE with override qt: Allow deferred start of import job. + commit 398375a0ab3b819694435c2e46b759d56b3735e0 * lang/qt/src/importjob.h (ImportJob::startLater): New pure virtual method. * lang/qt/src/qgpgmeimportjob.cpp, lang/qt/src/qgpgmeimportjob.h (QGpgMEImportJob::startLater): New method. * lang/qt/tests/t-import.cpp (ImportTest::testDeferredStart): New. 2023-01-04 Ingo Klöcker qt: Support deferred start of jobs. + commit 18c2c0b2509069951829bb0bdd9b39dc467f5e6e * lang/qt/src/job.cpp, lang/qt/src/job.h (Job::startNow): New method. * lang/qt/src/job_p.h (JobPrivate::start): New pure virtual method. * lang/qt/src/qgpgmechangeexpiryjob.cpp (QGpgMEChangeExpiryJobPrivate::start): New. * lang/qt/src/qgpgmeencryptjob.cpp (QGpgMEEncryptJobPrivate::start): New. * lang/qt/src/qgpgmeimportjob.cpp (QGpgMEImportJobPrivate::start): New. * lang/qt/src/qgpgmelistallkeysjob.cpp (QGpgMEListAllKeysJobPrivate::start): New. * lang/qt/src/qgpgmesignencryptjob.cpp (QGpgMESignEncryptJobPrivate::start): New. * lang/qt/src/threadedjobmixin.h (Thread::hasFunction): New method. (ThreadedJobMixin::run, ThreadedJobMixin::setWorkerFunction): New methods. qt: Explicitly instantiate private job classes. + commit 270d7523001a57a59ea0be617d8e71d4363e0d50 * lang/qt/src/Makefile.am: Add new files. * lang/qt/src/changeexpiryjob_p.h, lang/qt/src/encryptjob_p.h, lang/qt/src/importjob_p.h, lang/qt/src/listallkeysjob_p.h, lang/qt/src/signencryptjob_p.h: New. * lang/qt/src/changeexpiryjob.cpp, lang/qt/src/encryptjob.cpp, lang/qt/src/importjob.cpp, lang/qt/src/listallkeysjob.cpp, lang/qt/src/signencryptjob.cpp: Move JobPrivate subclasses to the new private header files. * lang/qt/src/job_p.h (jobPrivate): Remove lazy instantiation of private job classes. * lang/qt/src/qgpgmechangeexpiryjob.cpp (class QGpgMEChangeExpiryJobPrivate): New. (QGpgMEChangeExpiryJob::QGpgMEChangeExpiryJob): Instantiate private job class. * lang/qt/src/qgpgmeencryptjob.cpp (class QGpgMEEncryptJobPrivate): New. (QGpgMEEncryptJob::QGpgMEEncryptJob): Instantiate private job class. * lang/qt/src/qgpgmeimportjob.cpp (class QGpgMEImportJobPrivate): New. (QGpgMEImportJob::QGpgMEImportJob): Instantiate private job class. * lang/qt/src/qgpgmelistallkeysjob.cpp (class QGpgMEListAllKeysJobPrivate): New. (QGpgMEListAllKeysJob::QGpgMEListAllKeysJob): Instantiate private job class. * lang/qt/src/qgpgmesignencryptjob.cpp (class QGpgMESignEncryptJobPrivate): New. (QGpgMESignEncryptJob::QGpgMESignEncryptJob): Instantiate private job class. 2022-12-08 Ingo Klöcker cpp: Handle status errors in the base edit interactor. + commit e7953dcf1376631719c73d9fa34bcb96752d3794 * lang/cpp/src/editinteractor.cpp (edit_interactor_callback_impl): Handle status errors. * lang/cpp/src/gpgrevokekeyeditinteractor.cpp (GpgRevokeKeyEditInteractor::Private::nextState): Remove handling of status errors. cpp: Handle statuses that need no response in the base edit interactor. + commit c419376b85ff4a489f3bf7ad97ed656495792523 * lang/cpp/src/editinteractor.cpp (edit_interactor_callback_impl): Do not call nextState() if status needs no response. * lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp (GpgAddExistingSubkeyEditInteractor::Private::nextState), lang/cpp/src/gpgadduserideditinteractor.cpp (GpgAddUserIDEditInteractor::nextState), lang/cpp/src/gpggencardkeyinteractor.cpp (GpgGenCardKeyInteractor::nextState), lang/cpp/src/gpgrevokekeyeditinteractor.cpp (GpgRevokeKeyEditInteractor::Private::nextState), lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp (GpgSetExpiryTimeEditInteractor::nextState), lang/cpp/src/gpgsetownertrusteditinteractor.cpp (GpgSetOwnerTrustEditInteractor::nextState), lang/cpp/src/gpgsignkeyeditinteractor.cpp (GpgSignKeyEditInteractor::nextState): Remove handling of statuses that need no response. 2022-12-06 Ingo Klöcker qt: Write path values with Unix directory separators. + commit d04d7b174fb7f27b7434cade22eafdd85b2d424e * lang/qt/src/qgpgmenewcryptoconfig.cpp (QGpgMENewCryptoConfigEntry::setURLValue): Remove conversion to native directory separators. 2022-11-25 NIIBE Yutaka gpgme.m4: Fix AM_PATH_GPGME_PTHREAD. + commit f9cbf2c8a839d2c3df20157cfe65b67a4b0bcb5a * src/gpgme.m4 (AM_PATH_GPGME_PTHREAD): It's deprecated, since gpgme supports threads and GNU C library has integrated pthread features. 2022-11-15 Ingo Klöcker core: Allow nullptr for key on card-edit. + commit 5903fa454a47d788432192a7860b90b57efd6a10 * src/edit.c (interact_start, edit_start): Return error if key is null on edit-key. 2022-11-15 NIIBE Yutaka gpgme.m4: Include _AM_PATH_GPGRT_CONFIG implementation. + commit abd51848bdc8a5ea5929f9cfb819a408dc53d463 * src/gpgme.m4 (_AM_PATH_GPGRT_CONFIG): New. (_AM_PATH_GPGME_CONFIG): Require _AM_PATH_GPGRT_CONFIG. m4: Update gpg-error.m4. + commit 2b7fcbf2f280ca88d76f8398138580155213552a * m4/gpg-error.m4: Update from libgpg-error master. 2022-11-11 Ingo Klöcker core: Check for nullptr. + commit 6bcfbb3498f02dc86370cd4f2e3ccc5f9163d51a * src/edit.c (interact_start, edit_start): Return error if key is null. 2022-11-04 Ingo Klöcker qt: Allow disabling automatic trust database check on key listing. + commit b6593bda1f7bfaf6cf3b869b8379cbb2b619e00a * lang/qt/src/Makefile.am (qgpgme_sources): Add listallkeysjob.cpp. * lang/qt/src/listallkeysjob.cpp: New. * lang/qt/src/listallkeysjob.h (enum ListAllKeysJob::Option, typedef ListAllKeysJob::Options, ListAllKeysJob::setOptions, ListAllKeysJob::options): New. * lang/qt/src/qgpgmelistallkeysjob.cpp (list_keys): Set context flag "no-auto-check-trustdb" if requested. (QGpgMEListAllKeysJob::start, QGpgMEListAllKeysJob::exec): Add options to call of list_keys. core: New context flag "no-auto-check-trustdb" + commit 4f874ea431ba68ba70cf569741488502b1f61e66 * src/context.h (gpgme_context): Add field no_auto_check_trustdb. * src/gpgme.c (gpgme_set_ctx_flag, gpgme_get_ctx_flag): Add flag "no-auto-check-trustdb". * src/engine-gpg.c (engine_gpg): Add flags.no_auto_check_trustdb. (gpg_set_engine_flags): Set the flag. (build_argv): Pass option to gpg. * tests/run-keylist.c (show_usage, main): Add option --no-trust-check. 2022-11-02 NIIBE Yutaka build: Update libassuan.m4. + commit 9f5e11729260b814c4903e2fbccfb3855073abd2 * m4/libassuan.m4: Update from libassuan master. build: Prefer gpgrt-config when available. + commit 9f55dceca0cf2926d14cb4a70bd0cdc454d89f03 * src/gpgme.m4: Overriding the decision by --with-gpgme-prefix, use gpgrt-config gpgme when gpgrt-config is available. 2022-10-26 Werner Koch core: New global flags "inst-type". + commit 1c9694f8d50b1236d2e4f2acbe23f972da36e437 * src/gpgme.c (gpgme_set_global_flag): Add flag "inst-type". * src/w32-util.c (_gpgme_set_get_inst_type): New. (INST_TYPE_GPG4WIN_DIR): New. (INST_TYPE_GPGDESK_DIR): New. (_gpgme_get_gpgconf_path): Implement this flag. Replace fixed strings by the macros. * src/posix-util.c (_gpgme_set_get_inst_type): New dummy. 2022-10-26 NIIBE Yutaka python: Fix configure generating setup.py. + commit f1802682c3c8794edaca37966405bd1f070f5e01 * lang/python/setup.py.in: Handle the case, when substitutions may be empty. 2022-10-24 Werner Koch core: Protect against a theoretical integer overflow in parsetlv.c. + commit 830e017e5d5f51d956d1188860302655f3e727e9 * src/parsetlv.c (_gpgme_parse_tlv): Detect integer overflow. 2022-10-24 Ingo Klöcker cpp: Allow setting the curve to use when generating ECC keys. + commit d9ac1385950217893be6f0d6fdb3324b8647d16b lang/cpp/src/gpggencardkeyinteractor.h (class GpgGenCardKeyInteractor): Add enum Curve. Add member function setCurve. lang/cpp/src/gpggencardkeyinteractor.cpp (class GpgGenCardKeyInteractor::Private): Initialize simple members in-class. Add member curve. (GpgGenCardKeyInteractor::~GpgGenCardKeyInteractor): Use default d'tor. (GpgGenCardKeyInteractor::setCurve): New. (GpgGenCardKeyInteractor::action): Return curve defaulting to Curve25519. 2022-10-24 NIIBE Yutaka build: Update gpg-error.m4. + commit d36905bb80c43987f2ca6980d3973d2111f89991 * m4/gpg-error.m4: Update from libgpg-error 1.46. 2022-10-14 Ingo Klöcker build,qt: Check whether building with -fPIC is needed. + commit 2ff09f474fb908dff83cce79c9d84b4fa21f5d7b m4/qt6.m4: Use build test to check whether -fPIC is needed for building a Qt application. build,qt: Fail check for Qt if moc wasn't found. + commit 1792db58346cb39fd99332478d56dc190bae7836 * m4/qt5.m4, m4/qt6.m4: Perform build test only if moc was found. build,qt: Always compile the Qt 6 test application with -fpic. + commit f7a46714283bb8c107c68d0f1227abfe223b2365 * m4/qt6.m4: Do not add -fpic to GPGME_QT6_CFLAGS. Add -fpic to CPPFLAGS used for build test of simple Qt 6 application. 2022-10-11 Ingo Klöcker build,qt: Clean up all generated files. + commit e6a1b241b4e6a0a677ed8f0e4e287a5cc82d7fbb * lang/qt/src/Makefile.am (CLEANFILES): Add QGpgmeConfig-w32.cmake.in and QGpgmeQt6Config-w32.cmake.in. qt,tests: Port test to QRegularExpression. + commit b2fb26baeada7b39331f71a30c654bfb8b53cb30 * lang/qt/tests/t-trustsignatures.cpp: Use QRegularExpression instead of QRegExp. qt: Remove obsolete code. + commit 4938c24a466bf05e707d3e6cbf759705adc7e8d6 * lang/qt/src/qgpgmenewcryptoconfig.cpp (struct Select1St): Remove. build,qt: Allow building QGpgME for Qt 6. + commit 8d019bbb8d40de2cbed7ad6d3367c6a46a561fab * configure.ac: Look for Qt 5 and/or Qt 6. Require C++17 if Qt 6 binding is built. Build cmake files QGpgmeConfig* for Qt 5 and QGpgmeQt6Config* for Qt 6. (available_languages): Add "qt5" and "qt6". (WANT_QT5, WANT_QT6): New conditionals. * lang/qt/src/Makefile.am: Keep building libqgpgme for Qt 5. Build libqgpgmeqt6 for Qt 6. * lang/qt/tests/Makefile.am: Build tests for Qt 5 or Qt 6. * lang/qt/src/QGpgmeQt6Config-w32.cmake.in.in, lang/qt/src/QGpgmeQt6Config.cmake.in.in, lang/qt/src/QGpgmeQt6ConfigVersion.cmake.in, m4/qt6.m4: New. 2022-10-10 Ingo Klöcker build,qt: Explicitly namespace a few Qt variables for Qt5. + commit 8e908029ffa03d21662030d3111dcf556b722e1a m4/qt.m4: Rename to m4/qt5.m4: this. (FIND_QT): Rename to FIND_QT5. (GPGME_QT): Change variable prefix to GPGME_QT5. (GPGME_QTTEST: Change variable prefix to GPGME_QT5TEST. configure.ac, lang/qt/src/Makefile.am, lang/qt/tests/Makefile.am: Adjust accordingly. 2022-09-29 Werner Koch core: Fix SIG_CREATED status parsing for 0x1F sigs. + commit b1e5f3b183104a58d71821b7dbe44244d1c3f87f * src/sign.c (parse_sig_created): Special case the rfc4880 "1F" status. 2022-09-15 NIIBE Yutaka build:python: Don't use gpg-error-config/gpgme-config. + commit ae9258fbf3b9d434495ef11fc184a91fe7c4ca57 * lang/python/setup.py.in: Use @prefix@, @GPGME_CONFIG_LIBS@, @GPGME_CONFIG_CFLAGS@, and @GPG_ERROR_CFLAGS@ of configure. Fix for modern compiler. + commit fbd94076461ec55603d741121fa2ff6a861ea803 * src/argparse.c (show_version): It's no args. 2022-09-14 Ingo Klöcker cpp: Reject signing expired keys. + commit eedaaf70167f5dd7d8438235139b57527d3a961b * lang/cpp/src/gpgsignkeyeditinteractor.cpp (enum SignKeyState): Add new state REJECT_SIGN_EXPIRED. (makeTable): Add entries for new state to transition map. (GpgSignKeyEditInteractor::action): Handle new state. 2022-09-07 NIIBE Yutaka Fix parsing import status for invalid fingerprint. + commit 80670f60ba971145dd6792e00d31c08c10cc8159 * src/import.c (parse_import): Handle invalid fingerprint case. 2022-08-22 Ingo Klöcker build: Omit -I... and -L... for standard paths in pkgconfig file. + commit 1522813888257aafb6d108b49fb7b24005d2693a * configure.ac (GPGME_CONFIG_CFLAGS): Prefix with -I${includedir} for non-standard include paths. (GPGME_CONFIG_LIBS): Prefix with -L${libdir} for non-standard library paths. * src/gpgme.pc.in (Cflags): Remove hard-coded -I${includedir}. (Libs): Remove hard-coded -L${libdir}. build: Update ax_cxx_compile_stdcxx macro. + commit 73e96bfaa8176cf7b18bfa9edacaaf8d26989998 * m4/ax_cxx_compile_stdcxx.m4: Replace with current version from the autoconf archive. qt: Fix building with C++11. + commit 83176ad7d3e57ad7804d3c885e1b4fcd1d4d96f9 * lang/qt/src/qgpgmerefreshsmimekeysjob.cpp (QGpgMERefreshSMIMEKeysJob::start): Replace 'auto' in lambda with the actual type. * lang/qt/src/qgpgmesignkeyjob.cpp (class TrustSignatureProperties): Add default c'tor and c'tor initializing all members. * lang/qt/src/util.cpp (toFingerprints): Replace 'auto' in lambda with the actual type. * lang/qt/tests/run-exportjob.cpp (createExportJob): Replace 'auto' return type with actual type. qt: Fix building with Qt6. + commit 05661806848b8a6ef9005e4a420d8613ddc868f1 * lang/qt/src/util.cpp, lang/qt/src/util.h: Replace forward declaration with include. 2022-08-19 Ingo Klöcker cpp: Fix building with C++11. + commit f02c20cc9c5756690b07abfd02a43533547ba2ef * lang/cpp/src/importresult.cpp (ImportResult::mergeWith): Replace 'auto' in lambdas with the actual type. 2022-08-18 Ingo Klöcker qt,tests: Make test pass on 32-bit systems. + commit 2e7a61b898fccc1c20000b79dee83cd980901fa9 * lang/qt/tests/t-addexistingsubkey.cpp (AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Handle negative expiration date. cpp: Fix handling of "no key" or "invalid time" situations. + commit 2fa5c80aeba4528b3bdf41ec5740e7db5d4b6d2b * lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp (GpgAddExistingSubkeyEditInteractor::Private::nextState): Fix inverted logic of string comparisons. 2022-08-17 Ingo Klöcker qt,tests: Make sure expiration time is interpreted as unsigned number. + commit f2b48de26b8f8c48c293423eda712831544924f6 * lang/qt/tests/t-addexistingsubkey.cpp, lang/qt/tests/t-changeexpiryjob.cpp: Convert expiration time to uint_least32_t. qt,tests: Log the actual error code if the assertion fails. + commit 81d4b7f2d7077297d76af5728949d8f2bdff8cd5 * lang/qt/tests/t-addexistingsubkey.cpp ( AddExistingSubkeyJobTest::testAddExistingSubkeyAsync, AddExistingSubkeyJobTest::testAddExistingSubkeySync, AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Use QCOMPARE instead of QVERIFY for asserting equality. qt: Make sure expiration time is interpreted as unsigned number. + commit c977424a1d39751fc5055131ad3f7819d421dcc8 * lang/qt/src/qgpgmeaddexistingsubkeyjob.cpp (add_subkey): Convert expiration time to uint_least32_t. 2022-08-12 Andre Heinecke w32: Add another fallback to look for gpgconf.exe. + commit 5f51a9b4589200486b2833124cbd93455f6ce208 * src/w32-util.c (_gpgme_get_gpgconf_path): Add fallback for GnuPG VS-Desktop install scheme. 2022-08-11 Andre Heinecke Qt: Fix working with no gpgconf in CryptoConfig. + commit 586846209b08ce5e9545f53f21de884eb4079115 * lang/qt/src/cryptoconfig.cpp (CryptoConfig::entry): Add nullptr checks. Signed-off-by: Daniel Golle --- libs/gpgme/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/gpgme/Makefile b/libs/gpgme/Makefile index de1436d19..0e95f53f5 100644 --- a/libs/gpgme/Makefile +++ b/libs/gpgme/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gpgme -PKG_VERSION:=1.18.0 -PKG_RELEASE:=2 +PKG_VERSION:=1.21.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/$(PKG_NAME) -PKG_HASH:=361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e +PKG_HASH:=416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=GPL-3.0-or-later From 8639893b8cbeb2f008b5afc2135c56cf64cafdfb Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 8 Jul 2023 12:28:55 +0100 Subject: [PATCH 26/56] postgresql: update to version 15.3 Fixes security issues: * CVE-2023-2454 * CVE-2023-2455 See release notes for details: https://www.postgresql.org/about/news/postgresql-153-148-1311-1215-and-1120-released-2637/ Signed-off-by: Daniel Golle --- libs/postgresql/Makefile | 4 ++-- libs/postgresql/patches/700-no-arm-crc-march-change.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile index 719cc6b35..080a05efa 100644 --- a/libs/postgresql/Makefile +++ b/libs/postgresql/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=postgresql -PKG_VERSION:=15.2 +PKG_VERSION:=15.3 PKG_RELEASE:=1 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=PostgreSQL @@ -17,7 +17,7 @@ PKG_SOURCE_URL:=\ http://ftp.postgresql.org/pub/source/v$(PKG_VERSION) \ ftp://ftp.postgresql.org/pub/source/v$(PKG_VERSION) -PKG_HASH:=99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7 +PKG_HASH:=ffc7d4891f00ffbf5c3f4eab7fbbced8460b8c0ee63c5a5167133b9e6599d932 PKG_BUILD_FLAGS:=no-mips16 PKG_FIXUP:=autoreconf diff --git a/libs/postgresql/patches/700-no-arm-crc-march-change.patch b/libs/postgresql/patches/700-no-arm-crc-march-change.patch index 31dccffb4..33637f5d5 100644 --- a/libs/postgresql/patches/700-no-arm-crc-march-change.patch +++ b/libs/postgresql/patches/700-no-arm-crc-march-change.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -2236,9 +2236,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ +@@ -2239,9 +2239,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ # flags. If not, check if adding -march=armv8-a+crc flag helps. # CFLAGS_ARMV8_CRC32C is set if the extra flag is required. PGAC_ARMV8_CRC32C_INTRINSICS([]) From 7eaa2cd28454a2ef82fad49f26c7207ecf3f7db7 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 8 Jul 2023 12:29:13 +0100 Subject: [PATCH 27/56] libcurl-gnutls: update to version 8.2.1 See cURL changes for details: https://curl.se/changes.html Signed-off-by: Daniel Golle --- net/libcurl-gnutls/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/libcurl-gnutls/Makefile b/net/libcurl-gnutls/Makefile index 55801dc5d..d2e167a58 100644 --- a/net/libcurl-gnutls/Makefile +++ b/net/libcurl-gnutls/Makefile @@ -10,14 +10,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libcurl-gnutls PKG_SOURCE_NAME:=curl -PKG_VERSION:=7.86.0 +PKG_VERSION:=8.2.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(subst .,_,$(PKG_VERSION))/ \ https://dl.uxnr.de/mirror/curl/ \ https://curl.askapache.com/download/ \ https://curl.se/download/ -PKG_HASH:=2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b +PKG_HASH:=dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=MIT From bef5da553f40eb406e84be6c2738943c0c80e461 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 8 Jul 2023 12:29:30 +0100 Subject: [PATCH 28/56] gnunet: update to version 0.19.4 v0.19.4: - No changes v0.19.3: - We now detect MySQL's strange, version-dependent my_bool type on configure. - Add pkg-config definitions for gnunet messenger. Signed-off-by: Daniel Golle --- net/gnunet/Makefile | 4 ++-- net/gnunet/patches/010-endian.patch | 18 ------------------ 2 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 net/gnunet/patches/010-endian.patch diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile index 193c6c102..0b212fe44 100644 --- a/net/gnunet/Makefile +++ b/net/gnunet/Makefile @@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnunet -PKG_VERSION:=0.19.2 +PKG_VERSION:=0.19.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/gnunet -PKG_HASH:=86034d92ebf8f6623dad95f1031ded1466e064b96ffac9d3e9d47229ac2c22ff +PKG_HASH:=00a63df408d5987f5ba9a50441f2a77182bd9fb32f1e302ae563ac94e7ac009b PKG_LICENSE:=AGPL-3.0 PKG_LICENSE_FILES:=COPYING diff --git a/net/gnunet/patches/010-endian.patch b/net/gnunet/patches/010-endian.patch deleted file mode 100644 index cbb83c228..000000000 --- a/net/gnunet/patches/010-endian.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/src/include/gnunet_common.h -+++ b/src/include/gnunet_common.h -@@ -164,7 +164,6 @@ enum GNUNET_GenericReturnValue - * Endian operations - */ - --#if __BYTE_ORDER == __LITTLE_ENDIAN - #if defined(bswap_16) || defined(bswap_32) || defined(bswap_64) - #define BYTE_SWAP_16(x) bswap_16 (x) - #define BYTE_SWAP_32(x) bswap_32 (x) -@@ -184,6 +183,7 @@ enum GNUNET_GenericReturnValue - 56)) - #endif - -+#if __BYTE_ORDER == __LITTLE_ENDIAN - #define GNUNET_htobe16(x) BYTE_SWAP_16 (x) - #define GNUNET_htole16(x) (x) - #define GNUNET_be16toh(x) BYTE_SWAP_16 (x) From d1f4f875fa14fffc268fcd9167f2b6f284a7620e Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 6 Aug 2023 09:38:02 +0800 Subject: [PATCH 29/56] cloudreve: Update to 3.8.1 Signed-off-by: Tianling Shen --- net/cloudreve/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/cloudreve/Makefile b/net/cloudreve/Makefile index b919f5b85..245f595c3 100644 --- a/net/cloudreve/Makefile +++ b/net/cloudreve/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cloudreve -PKG_VERSION:=3.8.0 +PKG_VERSION:=3.8.1 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/cloudreve/Cloudreve.git PKG_SOURCE_VERSION:=$(PKG_VERSION) -PKG_MIRROR_HASH:=4c05afb2193ab83bf144d75963f4757c1445317e68b2690727375a8e01f7ba3d +PKG_MIRROR_HASH:=463e8580131c8a021b95ef7014f66556c7fdedad2c1b71627f9efaa86a758f03 PKG_LICENSE:=GPL-3.0-only PKG_LICENSE_FILES:=LICENSE From 4faa0e88fe78deaa9d4c4f8149f9f6f1dcbba8a0 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 6 Aug 2023 09:38:02 +0800 Subject: [PATCH 30/56] v2raya: Update to 2.1.0 Signed-off-by: Tianling Shen --- net/v2raya/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/v2raya/Makefile b/net/v2raya/Makefile index 658a11d40..3b4143c31 100644 --- a/net/v2raya/Makefile +++ b/net/v2raya/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2rayA -PKG_VERSION:=2.0.5 +PKG_VERSION:=2.1.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2rayA/v2rayA/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=a454f382bf199f939e4930c1ee260b212ad66e04fa5dcf9065bb92dd2be274fe +PKG_HASH:=97cffd5dd568fc3be22fa73768bbc218a0650548ddb0849506eeb168dde0291a PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service PKG_LICENSE:=AGPL-3.0-only @@ -59,7 +59,7 @@ define Download/v2raya-web URL:=https://codeload.github.com/v2rayA/v2raya-web/tar.gz/v$(PKG_VERSION)? URL_FILE:=$(WEB_FILE) FILE:=$(WEB_FILE) - HASH:=e0460ea4b251339258e037712dc7d7426e2929ce592becbd2182facaedbe7b81 + HASH:=5fbd8298316167d16aa15b9e8d48c243623cf3a8cfd9b3d36590c35948a93912 endef define Build/Prepare From 1003f84ead4ccd1b99c07392ad7542debe82e332 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 6 Aug 2023 09:38:03 +0800 Subject: [PATCH 31/56] v2fly-geodata: Update to latest version Signed-off-by: Tianling Shen --- net/v2ray-geodata/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/v2ray-geodata/Makefile b/net/v2ray-geodata/Makefile index 1224c037c..3eb1fef6a 100644 --- a/net/v2ray-geodata/Makefile +++ b/net/v2ray-geodata/Makefile @@ -12,22 +12,22 @@ PKG_MAINTAINER:=Tianling Shen include $(INCLUDE_DIR)/package.mk -GEOIP_VER:=202306150049 +GEOIP_VER:=202308030045 GEOIP_FILE:=geoip.dat.$(GEOIP_VER) define Download/geoip URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/ URL_FILE:=geoip.dat FILE:=$(GEOIP_FILE) - HASH:=811085edc67057690c783e735182db32e5a4b446ee5f6d70ef9e12960ce910da + HASH:=9b7fa7407f35e3087f3b052d12ed40974182c6e1864570b848c1ec901292ea82 endef -GEOSITE_VER:=20230620033122 +GEOSITE_VER:=20230803193133 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=caecb282d72bf6bfc7977257cadd436e59cb7eea8f6aabb0eae656ae4bf57d76 + HASH:=3d335d493f168eace5414ca1ff54e4f255f8e5b1a90261d2debb1cbefa0666a0 endef define Package/v2ray-geodata/template From 3ee4f030b525d8d7c56605735df1c44d1362f026 Mon Sep 17 00:00:00 2001 From: Volker Christian Date: Sat, 5 Aug 2023 20:00:00 +0200 Subject: [PATCH 32/56] file: Fix FTBFS due to missing dependency Fixes #21583 zstdlib and lzlib support is currently not neccessary for OpenWRT. Thus, Explicitly disable zstdlib and lzlib as they would be enabled automatically in case they are already installed. Signed-off-by: Volker Christian --- libs/file/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/file/Makefile b/libs/file/Makefile index 25941ecce..eaf8e501d 100644 --- a/libs/file/Makefile +++ b/libs/file/Makefile @@ -56,8 +56,10 @@ CONFIGURE_ARGS += \ --enable-xzlib \ --enable-zlib \ --disable-libseccomp \ + --disable-lzlib \ --disable-rpath \ --disable-warnings \ + --disable-zstdlib \ --without-pic MAKE_PATH := src From d7b0d3f83d61ce117db0a3e5899624e77a4f5555 Mon Sep 17 00:00:00 2001 From: R4SAS I2P Date: Sat, 5 Aug 2023 20:13:21 +0000 Subject: [PATCH 33/56] i2pd: update to version 2.48.0 Signed-off-by: R4SAS I2P --- net/i2pd/Makefile | 8 ++--- net/i2pd/patches/010-config.patch | 54 +++++++++++++++---------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/net/i2pd/Makefile b/net/i2pd/Makefile index b265c97ac..f4c3d5d79 100644 --- a/net/i2pd/Makefile +++ b/net/i2pd/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2015, 2016 gxcreator # Copyright (C) 2017 OpenWrt.org -# Copyright (C) 2021-2022 PurpleI2P team +# Copyright (C) 2021-2023 PurpleI2P team # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,13 +10,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=i2pd -PKG_VERSION:=2.46.1 +PKG_VERSION:=2.48.0 PKG_RELEASE:=1 PKG_BUILD_PARALLEL:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/PurpleI2P/i2pd/tar.gz/$(PKG_VERSION)? -PKG_HASH:=83bb5e2494d566d41ff3a85e4c93078d290d10e3cf1fbe7807bec9f0d024513e +PKG_HASH:=ccf417aa66ce37f72ea15b7fbcff4c71e823566ea74bda696b9c1e19aae08739 PKG_MAINTAINER:=David Yang PKG_LICENSE:=BSD-3-Clause @@ -55,7 +55,7 @@ define Package/i2pd/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/i2pd.init $(1)/etc/init.d/i2pd $(INSTALL_DIR) $(1)/usr/share/i2pd - $(CP) $(PKG_BUILD_DIR)/contrib/certificates $(1)/usr/share/i2pd + $(CP) $(PKG_BUILD_DIR)/contrib/certificates $(1)/usr/share/i2pd $(INSTALL_DIR) $(1)/etc/config $(INSTALL_CONF) ./files/i2pd.config $(1)/etc/config/i2pd $(INSTALL_DIR) $(1)/etc/i2pd diff --git a/net/i2pd/patches/010-config.patch b/net/i2pd/patches/010-config.patch index 3d3f49be7..ffd3b1760 100644 --- a/net/i2pd/patches/010-config.patch +++ b/net/i2pd/patches/010-config.patch @@ -18,72 +18,72 @@ -# certsdir = /var/lib/i2pd/certificates +certsdir = /usr/share/i2pd/certificates - ## Where to write pidfile (default: i2pd.pid, not used in Windows) + ## Where to write pidfile (default: /run/i2pd.pid, not used in Windows) # pidfile = /run/i2pd.pid @@ -35,7 +35,7 @@ # logfile = /var/log/i2pd/i2pd.log - ## Log messages above this level (debug, info, *warn, error, none) + ## Log messages above this level (debug, info, *warn, error, critical, none) ## If you set it to none, logging will be disabled -# loglevel = warn +loglevel = none ## Write full CLF-formatted date and time to log (default: write only time) # logclftime = true -@@ -115,9 +115,9 @@ ssu = false +@@ -118,9 +118,9 @@ ipv6 = false [http] ## Web Console settings - ## Uncomment and set to 'false' to disable Web Console + ## Enable the Web Console (default: true) -# enabled = true +enabled = true - ## Address and port service will listen on --address = 127.0.0.1 + ## Address and port service will listen on (default: 127.0.0.1:7070) +-# address = 127.0.0.1 +address = 192.168.1.1 - port = 7070 - ## Path to web console, default "/" + # port = 7070 + ## Path to web console (default: /) # webroot = / -@@ -135,9 +135,9 @@ port = 7070 +@@ -138,9 +138,9 @@ ipv6 = false [httpproxy] - ## Uncomment and set to 'false' to disable HTTP Proxy + ## Enable the HTTP proxy (default: true) -# enabled = true +enabled = true - ## Address and port service will listen on --address = 127.0.0.1 + ## Address and port service will listen on (default: 127.0.0.1:4444) +-# address = 127.0.0.1 +address = 192.168.1.1 - port = 4444 - ## Optional keys file for proxy local destination + # port = 4444 + ## Optional keys file for proxy local destination (default: http-proxy-keys.dat) # keys = http-proxy-keys.dat -@@ -151,9 +151,9 @@ port = 4444 +@@ -154,9 +154,9 @@ ipv6 = false [socksproxy] - ## Uncomment and set to 'false' to disable SOCKS Proxy + ## Enable the SOCKS proxy (default: true) -# enabled = true +enabled = true - ## Address and port service will listen on --address = 127.0.0.1 + ## Address and port service will listen on (default: 127.0.0.1:4447) +-# address = 127.0.0.1 +address = 192.168.1.1 - port = 4447 - ## Optional keys file for proxy local destination + # port = 4447 + ## Optional keys file for proxy local destination (default: socks-proxy-keys.dat) # keys = socks-proxy-keys.dat -@@ -167,7 +167,7 @@ port = 4447 +@@ -170,7 +170,7 @@ ipv6 = false [sam] - ## Comment or set to 'false' to disable SAM Bridge --enabled = true + ## Enable the SAM bridge (default: true) +-# enabled = false +enabled = false - ## Address and port service will listen on + ## Address and ports service will listen on (default: 127.0.0.1:7656, udp: 7655) # address = 127.0.0.1 # port = 7656 -@@ -202,7 +202,7 @@ enabled = true +@@ -206,7 +206,7 @@ ipv6 = false [upnp] ## Enable or disable UPnP: automatic port forwarding (enabled by default in WINDOWS, ANDROID) -# enabled = false +enabled = false - ## Name i2pd appears in UPnP forwardings list (default = I2Pd) + ## Name i2pd appears in UPnP forwardings list (default: I2Pd) # name = I2Pd -@@ -244,7 +244,7 @@ verify = true +@@ -248,7 +248,7 @@ verify = true [limits] ## Maximum active transit sessions (default: 5000) ## This value is doubled if floodfill mode is enabled! From fb9c8f8b89eb372ece33ce8278794f962c27febc Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 7 Aug 2023 02:19:42 +0800 Subject: [PATCH 34/56] golang: Update to 1.20.7 Includes fix for CVE-2023-29409 (crypto/tls: verifying certificate chains containing large RSA keys is slow). Signed-off-by: Jeffery To --- lang/golang/golang/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile index d9c8e56d2..0d89cea90 100644 --- a/lang/golang/golang/Makefile +++ b/lang/golang/golang/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk GO_VERSION_MAJOR_MINOR:=1.20 -GO_VERSION_PATCH:=6 +GO_VERSION_PATCH:=7 PKG_NAME:=golang PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH)) @@ -20,7 +20,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \ PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz PKG_SOURCE_URL:=$(GO_SOURCE_URLS) -PKG_HASH:=62ee5bc6fb55b8bae8f705e0cb8df86d6453626b4ecf93279e2867092e0b7f70 +PKG_HASH:=2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597 PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=BSD-3-Clause From a8964128135c9e777d1399c80e9543148ea3275d Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 6 Aug 2023 09:50:57 +0800 Subject: [PATCH 35/56] rust: Update to 1.71.1 Version 1.71.1 (2023-08-03) =========================== - Fix CVE-2023-38497: Cargo did not respect the umask when extracting dependencies - Fix bash completion for users of Rustup - Do not show `suspicious_double_ref_op` lint when calling `borrow()` - Fix ICE: substitute types before checking inlining compatibility - Fix ICE: don't use `can_eq` in `derive(..)` suggestion for missing method - Fix building Rust 1.71.0 from the source tarball Signed-off-by: Tianling Shen --- lang/rust/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 461915951..60df0e5cd 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk include ./rust-values.mk PKG_NAME:=rust -PKG_VERSION:=1.71.0 +PKG_VERSION:=1.71.1 PKG_RELEASE:=1 PKG_SOURCE:=rustc-$(PKG_VERSION)-src.tar.gz PKG_SOURCE_URL:=https://static.rust-lang.org/dist/ -PKG_HASH:=a667e4abdc5588ebfea35c381e319d840ffbf8d2dbfb79771730573642034c96 +PKG_HASH:=6fa90d50d1d529a75f6cc349784de57d7ec0ba2419b09bde7d335c25bd4e472e HOST_BUILD_DIR:=$(BUILD_DIR)/host/rust-$(RUSTC_TARGET_ARCH)/rustc-$(PKG_VERSION)-src PKG_MAINTAINER:=Luca Barbato From bc514e9689d2ae251893caca1b6efd045bdc0062 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Tue, 10 Jan 2023 20:00:25 -0800 Subject: [PATCH 36/56] flashrom: Update to 1.3.0, package libflashrom Notably, the meson args for programmers changed from a series of individual 'config_$foo>, config_$bar' to a list of 'programmer=$foo,$bar' The patches were all either already merged upstream (or similar ones, at least), or aren't useful (bitbang_spi is no longer a separated programmer; it's included in the defaults). Signed-off-by: Brian Norris --- utils/flashrom/Makefile | 30 ++++- utils/flashrom/flashrom.mk | 123 ++++++++++---------- utils/flashrom/patches/010-bitbang.patch | 20 ---- utils/flashrom/patches/020-raw-access.patch | 10 -- utils/flashrom/patches/030-ppc.patch | 11 -- utils/flashrom/patches/040-uclibc.patch | 11 -- 6 files changed, 92 insertions(+), 113 deletions(-) delete mode 100644 utils/flashrom/patches/010-bitbang.patch delete mode 100644 utils/flashrom/patches/020-raw-access.patch delete mode 100644 utils/flashrom/patches/030-ppc.patch delete mode 100644 utils/flashrom/patches/040-uclibc.patch diff --git a/utils/flashrom/Makefile b/utils/flashrom/Makefile index 6fee21da1..e75add75e 100644 --- a/utils/flashrom/Makefile +++ b/utils/flashrom/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=flashrom -PKG_VERSION:=1.2.1 +PKG_VERSION:=1.3.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://download.flashrom.org/releases -PKG_HASH:=89a7ff5beb08c89b8795bbd253a51b9453547a864c31793302296b56bbc56d65 +PKG_HASH:=a053234453ccd012e79f3443bdcc61625cf97b7fd7cb4cdd8bfbffbe8b149623 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-v$(PKG_VERSION) PKG_MAINTAINER:=Álvaro Fernández Rojas @@ -67,6 +67,17 @@ define Package/flashrom-usb VARIANT:=usb endef +define Package/libflashrom + $(Package/flashrom/default) + TITLE+= (library) + DEPENDS+= \ + +(TARGET_x86||TARGET_x86_64):dmidecode \ + +libftdi1 \ + +libusb-1.0 \ + +pciutils + VARIANT:=full +endef + define Package/flashrom/default/description flashrom is an utility for identifying, reading, writing, verifying and erasing flash chips. It's often used to flash BIOS/EFI/coreboot @@ -76,6 +87,16 @@ Package/flashrom/description = $(Package/flashrom/default/description) Package/flashrom-pci/description = $(Package/flashrom/default/description) Package/flashrom-spi/description = $(Package/flashrom/default/description) Package/flashrom-usb/description = $(Package/flashrom/default/description) +Package/libflashrom/description = $(Package/flashrom/default/description) + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libflashrom.so* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/flashrom.pc $(1)/usr/lib/pkgconfig/ +endef define Package/flashrom/install $(INSTALL_DIR) $(1)/usr/sbin @@ -93,8 +114,13 @@ define Package/flashrom-usb/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/flashrom $(1)/usr/sbin/flashrom-usb endef +define Package/libflashrom/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libflashrom.so* $(1)/usr/lib/ +endef $(eval $(call BuildPackage,flashrom)) $(eval $(call BuildPackage,flashrom-pci)) $(eval $(call BuildPackage,flashrom-spi)) $(eval $(call BuildPackage,flashrom-usb)) +$(eval $(call BuildPackage,libflashrom)) diff --git a/utils/flashrom/flashrom.mk b/utils/flashrom/flashrom.mk index f0fdff539..5ee91a8f0 100644 --- a/utils/flashrom/flashrom.mk +++ b/utils/flashrom/flashrom.mk @@ -1,11 +1,7 @@ # Flashrom variants -define DefaultProgrammer - MAKE_FLAGS += CONFIG_DEFAULT_PROGRAMMER=PROGRAMMER_$(1) -endef - ifeq ($(BUILD_VARIANT),full) - $(eval $(call DefaultProgrammer,LINUX_SPI)) + DEFAULT_PROGRAMMER_NAME := linux_spi FLASHROM_BASIC := true FLASHROM_FTDI := true FLASHROM_PCI := true @@ -14,7 +10,7 @@ ifeq ($(BUILD_VARIANT),full) FLASHROM_USB := true endif ifeq ($(BUILD_VARIANT),pci) - $(eval $(call DefaultProgrammer,INTERNAL)) + DEFAULT_PROGRAMMER_NAME := internal FLASHROM_BASIC := true FLASHROM_FTDI := false FLASHROM_PCI := true @@ -23,7 +19,7 @@ ifeq ($(BUILD_VARIANT),pci) FLASHROM_USB := false endif ifeq ($(BUILD_VARIANT),spi) - $(eval $(call DefaultProgrammer,LINUX_SPI)) + DEFAULT_PROGRAMMER_NAME := linux_spi FLASHROM_BASIC := true FLASHROM_FTDI := false FLASHROM_PCI := false @@ -32,7 +28,7 @@ ifeq ($(BUILD_VARIANT),spi) FLASHROM_USB := false endif ifeq ($(BUILD_VARIANT),usb) - $(eval $(call DefaultProgrammer,SERPROG)) + DEFAULT_PROGRAMMER_NAME := serprog FLASHROM_BASIC := true FLASHROM_FTDI := true FLASHROM_PCI := false @@ -41,59 +37,68 @@ ifeq ($(BUILD_VARIANT),usb) FLASHROM_USB := true endif -MESON_ARGS += \ - -Dconfig_dummy=$(FLASHROM_BASIC) \ - -Dconfig_linux_mtd=$(FLASHROM_BASIC) \ - -Dconfig_linux_spi=$(FLASHROM_BASIC) \ - -Dconfig_mstarddc_spi=$(FLASHROM_BASIC) \ - \ - -Dconfig_ft2232_spi=$(FLASHROM_FTDI) \ - -Dconfig_usbblaster_spi=$(FLASHROM_FTDI) \ - \ - -Dpciutils=$(FLASHROM_PCI) \ - -Dconfig_atavia=$(FLASHROM_PCI) \ - -Dconfig_drkaiser=$(FLASHROM_PCI) \ - -Dconfig_gfxnvidia=$(FLASHROM_PCI) \ - -Dconfig_internal=$(FLASHROM_PCI) \ - -Dconfig_it8212=$(FLASHROM_PCI) \ - -Dconfig_nicintel=$(FLASHROM_PCI) \ - -Dconfig_nicintel_spi=$(FLASHROM_PCI) \ - -Dconfig_nicintel_eeprom=$(FLASHROM_PCI) \ - -Dconfig_ogp_spi=$(FLASHROM_PCI) \ - -Dconfig_satasii=$(FLASHROM_PCI) \ - \ - -Dconfig_bitbang_spi=$(FLASHROM_RAW) \ - -Dconfig_rayer_spi=$(FLASHROM_RAW) \ - \ - -Dconfig_buspirate_spi=$(FLASHROM_SERIAL) \ - -Dconfig_pony_spi=$(FLASHROM_SERIAL) \ - -Dconfig_serprog=$(FLASHROM_SERIAL) \ - \ - -Dusb=$(FLASHROM_USB) \ - -Dconfig_ch341a_spi=$(FLASHROM_USB) \ - -Dconfig_dediprog=$(FLASHROM_USB) \ - -Dconfig_developerbox_spi=$(FLASHROM_USB) \ - -Dconfig_digilent_spi=$(FLASHROM_USB) \ - -Dconfig_pickit2_spi=$(FLASHROM_USB) \ - -Dconfig_stlinkv3_spi=$(FLASHROM_USB) +PROGRAMMER_ARGS := + +define Programmer + ifeq ($(2),true) + PROGRAMMER_ARGS += $(1) + endif +endef + +$(eval $(call Programmer,dummy,$(FLASHROM_BASIC))) +$(eval $(call Programmer,linux_mtd,$(FLASHROM_BASIC))) +$(eval $(call Programmer,linux_spi,$(FLASHROM_BASIC))) +$(eval $(call Programmer,mstarddc_spi,$(FLASHROM_BASIC))) + +$(eval $(call Programmer,ft2232_spi,$(FLASHROM_FTDI))) +$(eval $(call Programmer,usbblaster_spi,$(FLASHROM_FTDI))) + +$(eval $(call Programmer,atavia,$(FLASHROM_PCI))) +$(eval $(call Programmer,drkaiser,$(FLASHROM_PCI))) +$(eval $(call Programmer,gfxnvidia,$(FLASHROM_PCI))) +$(eval $(call Programmer,internal,$(FLASHROM_PCI))) +$(eval $(call Programmer,it8212,$(FLASHROM_PCI))) +$(eval $(call Programmer,nicintel,$(FLASHROM_PCI))) +$(eval $(call Programmer,nicintel_spi,$(FLASHROM_PCI))) +$(eval $(call Programmer,nicintel_eeprom,$(FLASHROM_PCI))) +$(eval $(call Programmer,ogp_spi,$(FLASHROM_PCI))) +$(eval $(call Programmer,satasii,$(FLASHROM_PCI))) + +$(eval $(call Programmer,rayer_spi,$(FLASHROM_RAW))) + +$(eval $(call Programmer,buspirate_spi,$(FLASHROM_SERIAL))) +$(eval $(call Programmer,pony_spi,$(FLASHROM_SERIAL))) +$(eval $(call Programmer,serprog,$(FLASHROM_SERIAL))) + +$(eval $(call Programmer,ch341a_spi,$(FLASHROM_USB))) +$(eval $(call Programmer,dediprog,$(FLASHROM_USB))) +$(eval $(call Programmer,developerbox_spi,$(FLASHROM_USB))) +$(eval $(call Programmer,digilent_spi,$(FLASHROM_USB))) +$(eval $(call Programmer,pickit2_spi,$(FLASHROM_USB))) +$(eval $(call Programmer,stlinkv3_spi,$(FLASHROM_USB))) # PCI ifeq ($(findstring i386,$(CONFIG_ARCH))$(findstring x86,$(CONFIG_ARCH)),) -MESON_ARGS += \ - -Dconfig_atahpt=false \ - -Dconfig_atapromise=false \ - -Dconfig_internal_dmi=true \ - -Dconfig_nic3com=false \ - -Dconfig_nicnatsemi=false \ - -Dconfig_nicrealtek=false \ - -Dconfig_satamv=false + MESON_ARGS += -Duse_internal_dmi=true + $(eval $(call Programmer,atahpt,false)) + $(eval $(call Programmer,atapromise,false)) + $(eval $(call Programmer,nic3com,false)) + $(eval $(call Programmer,nicnatsemi,false)) + $(eval $(call Programmer,nicrealtek,false)) + $(eval $(call Programmer,satamv,false)) else -MESON_ARGS += \ - -Dconfig_atahpt=$(FLASHROM_PCI) \ - -Dconfig_atapromise=$(FLASHROM_PCI) \ - -Dconfig_internal_dmi=$(if $(FLASHROM_PCI),false,true) - -Dconfig_nic3com=$(FLASHROM_PCI) \ - -Dconfig_nicnatsemi=$(FLASHROM_PCI) \ - -Dconfig_nicrealtek=$(FLASHROM_PCI) \ - -Dconfig_satamv=$(FLASHROM_PCI) + MESON_ARGS += -Duse_internal_dmi=$(if $(FLASHROM_PCI),false,true) + $(eval $(call Programmer,atahpt,$(FLASHROM_PCI))) + $(eval $(call Programmer,atapromise,$(FLASHROM_PCI))) + $(eval $(call Programmer,nic3com,$(FLASHROM_PCI))) + $(eval $(call Programmer,nicnatsemi,$(FLASHROM_PCI))) + $(eval $(call Programmer,nicrealtek,$(FLASHROM_PCI))) + $(eval $(call Programmer,satamv,$(FLASHROM_PCI))) endif + +comma := , +MESON_ARGS += \ + -Ddefault_programmer_name=$(DEFAULT_PROGRAMMER_NAME) \ + -Dprogrammer=$(subst $() $(),$(comma),$(PROGRAMMER_ARGS)) \ + -Dwerror=false \ + -Dtests=disabled diff --git a/utils/flashrom/patches/010-bitbang.patch b/utils/flashrom/patches/010-bitbang.patch deleted file mode 100644 index b5ff7cd3b..000000000 --- a/utils/flashrom/patches/010-bitbang.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -33,6 +33,7 @@ add_project_arguments('-DFLASHROM_VERSIO - config_atahpt = get_option('config_atahpt') - config_atapromise = get_option('config_atapromise') - config_atavia = get_option('config_atavia') -+config_bitbang_spi = get_option('config_bitbang_spi') - config_buspirate_spi = get_option('config_buspirate_spi') - config_ch341a_spi = get_option('config_ch341a_spi') - config_dediprog = get_option('config_dediprog') ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -4,6 +4,7 @@ option('usb', type : 'boolean', value : - option('config_atahpt', type : 'boolean', value : false, description : 'Highpoint (HPT) ATA/RAID controllers') - option('config_atapromise', type : 'boolean', value : false, description : 'Promise ATA controller') - option('config_atavia', type : 'boolean', value : true, description : 'VIA VT6421A LPC memory') -+option('config_bitbang_spi', type : 'boolean', value : true, description : 'Bitbang') - option('config_buspirate_spi', type : 'boolean', value : true, description : 'Bus Pirate SPI') - option('config_ch341a_spi', type : 'boolean', value : true, description : 'Winchiphead CH341A') - option('config_dediprog', type : 'boolean', value : true, description : 'Dediprog SF100') diff --git a/utils/flashrom/patches/020-raw-access.patch b/utils/flashrom/patches/020-raw-access.patch deleted file mode 100644 index 5550550a5..000000000 --- a/utils/flashrom/patches/020-raw-access.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -263,6 +263,7 @@ endif - if config_satasii - srcs += 'satasii.c' - cargs += '-DCONFIG_SATASII=1' -+ need_raw_access = true - endif - if config_serprog - srcs += 'serprog.c' diff --git a/utils/flashrom/patches/030-ppc.patch b/utils/flashrom/patches/030-ppc.patch deleted file mode 100644 index 41095fd63..000000000 --- a/utils/flashrom/patches/030-ppc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/hwaccess.c -+++ b/hwaccess.c -@@ -71,7 +71,7 @@ static inline void sync_primitive(void) - * See also https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/memory-barriers.txt - */ - #if IS_PPC // cf. http://lxr.free-electrons.com/source/arch/powerpc/include/asm/barrier.h -- asm("eieio" : : : "memory"); -+ __asm__ ("eieio" : : : "memory"); - #elif IS_SPARC - #if defined(__sparc_v9__) || defined(__sparcv9) - /* Sparc V9 CPUs support three different memory orderings that range from x86-like TSO to PowerPC-like diff --git a/utils/flashrom/patches/040-uclibc.patch b/utils/flashrom/patches/040-uclibc.patch deleted file mode 100644 index c07361de3..000000000 --- a/utils/flashrom/patches/040-uclibc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -25,7 +25,7 @@ conf = configuration_data() - cc = meson.get_compiler('c') - add_project_arguments(cc.get_supported_arguments(warning_flags), language : 'c') - add_project_arguments('-D_DEFAULT_SOURCE', language : 'c') --add_project_arguments('-D_POSIX_C_SOURCE', language : 'c') # required for fileno -+add_project_arguments('-D_POSIX_C_SOURCE=200809L', language : 'c') # required for fileno, nanosleep, and strndup - add_project_arguments('-D_BSD_SOURCE', language : 'c') # required for glibc < v2.19 - add_project_arguments('-DFLASHROM_VERSION="' + meson.project_version() + '"', language : 'c') - From fbc3629ecabb35d9d91eb4fedd8b56b5813a64ec Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 7 Aug 2023 14:00:25 +0800 Subject: [PATCH 37/56] python-ifaddr: Update to 0.2.0 Signed-off-by: Jeffery To --- lang/python/python-ifaddr/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lang/python/python-ifaddr/Makefile b/lang/python/python-ifaddr/Makefile index 0cdc10717..db9dd4222 100644 --- a/lang/python/python-ifaddr/Makefile +++ b/lang/python/python-ifaddr/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-ifaddr -PKG_VERSION:=0.1.7 +PKG_VERSION:=0.2.0 PKG_RELEASE:=1 PYPI_NAME:=ifaddr -PKG_HASH:=1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94 +PKG_HASH:=cc0cbfcaabf765d44595825fb96a99bb12c79716b73b44330ea38ee2b0c4aed4 PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=MIT @@ -26,7 +26,7 @@ define Package/python3-ifaddr SECTION:=lang CATEGORY:=Languages SUBMENU:=Python - TITLE:=Enumerate IP addresses on network adapters + TITLE:=Network interface and IP address enumeration library URL:=https://github.com/pydron/ifaddr DEPENDS:= \ +python3-light \ @@ -34,7 +34,8 @@ define Package/python3-ifaddr endef define Package/python3-ifaddr/description - ifaddr is a small Python library that allows you to find all the IPv4 and IPv6 addresses of the computer. +ifaddr is a small Python library that allows you to find all the +Ethernet and IP addresses of the computer. endef $(eval $(call Py3Package,python3-ifaddr)) From 4c1b74ede3a1d8c5b8b1594a01a2048325ee6c23 Mon Sep 17 00:00:00 2001 From: Jean-Paul Etienne Date: Sun, 6 Aug 2023 00:13:10 +0200 Subject: [PATCH 38/56] micropython: fix stackctrl compilation for GCC 13 On host PC using GCC 13, stackctrl.c fails to compile with the following error: ../py/stackctrl.c: In function 'mp_stack_ctrl_init': ../py/stackctrl.c:32:32: error: storing the address of local variable 'stack_dummy' in 'mp_state_ctx.thread.stack_top' [-Werror=dangling-pointer=] 32 | MP_STATE_THREAD(stack_top) = (char *)&stack_dummy; ../py/stackctrl.c:31:18: note: 'stack_dummy' declared here 31 | volatile int stack_dummy; | ^~~~~~~~~~~ In file included from ../py/runtime.h:29, from ../py/stackctrl.c:27: ../py/mpstate.h:296:23: note: 'mp_state_ctx' declared here 296 | extern mp_state_ctx_t mp_state_ctx; | ^~~~~~~~~~~~ cc1: all warnings being treated as errors Fixed accordingly by ignoring -dangling-pointer warning inside mp_stack_ctrl_init function. Signed-off-by: Jean-Paul Etienne --- .../patches/050-py-stackctrl-fix-gcc-13.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 lang/python/micropython/patches/050-py-stackctrl-fix-gcc-13.patch diff --git a/lang/python/micropython/patches/050-py-stackctrl-fix-gcc-13.patch b/lang/python/micropython/patches/050-py-stackctrl-fix-gcc-13.patch new file mode 100644 index 000000000..8cd7df66e --- /dev/null +++ b/lang/python/micropython/patches/050-py-stackctrl-fix-gcc-13.patch @@ -0,0 +1,31 @@ +From f1c6cb7725960487195daa5c5c196fd8d3563811 Mon Sep 17 00:00:00 2001 +From: Damien George +Date: Wed, 3 May 2023 15:23:24 +1000 +Subject: [PATCH] py/stackctrl: Add gcc pragmas to ignore dangling-pointer + warning. + +This warning became apparent in gcc 13. + +Signed-off-by: Damien George +--- + py/stackctrl.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/py/stackctrl.c ++++ b/py/stackctrl.c +@@ -28,8 +28,15 @@ + #include "py/stackctrl.h" + + void mp_stack_ctrl_init(void) { ++ #if __GNUC__ >= 13 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdangling-pointer" ++ #endif + volatile int stack_dummy; + MP_STATE_THREAD(stack_top) = (char *)&stack_dummy; ++ #if __GNUC__ >= 13 ++ #pragma GCC diagnostic pop ++ #endif + } + + void mp_stack_set_top(void *top) { From b5463d16f1b962c36784ff92252db49b5b3791b9 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Mon, 7 Aug 2023 10:10:15 +0000 Subject: [PATCH 39/56] nvme-cli: Fix categorization Signed-off-by: Luca Barbato --- libs/libnvme/Makefile | 3 +-- utils/nvme-cli/Makefile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/libnvme/Makefile b/libs/libnvme/Makefile index 0a459cc68..644443aab 100644 --- a/libs/libnvme/Makefile +++ b/libs/libnvme/Makefile @@ -20,9 +20,8 @@ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/meson.mk define Package/libnvme - SECTION:=utils + SECTION:=libs CATEGORY:=Libraries - SUBMENU:=Filesystem TITLE:=C Library for NVM Express on Linux URL:=https://github.com/linux-nvme/libnvme DEPENDS:=+libjson-c diff --git a/utils/nvme-cli/Makefile b/utils/nvme-cli/Makefile index b76efa91d..9a2ea41ff 100644 --- a/utils/nvme-cli/Makefile +++ b/utils/nvme-cli/Makefile @@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/meson.mk define Package/nvme-cli SECTION:=utils CATEGORY:=Utilities - SUBMENU:=Filesystem + SUBMENU:=Disc TITLE:=NVMe management command line interface URL:=https://nvmexpress.org/ DEPENDS:=+libnvme From ead95a26b68f4145937034d84abdf9e0f7fe1eb7 Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Mon, 7 Aug 2023 15:21:26 -0600 Subject: [PATCH 40/56] openssh: add server config subdirectory Most distros allow dropping site configuration files into /etc/sshd_config.d/ so that you don't have to tweak the main server configuration file. Signed-off-by: Philip Prindeville --- net/openssh/Makefile | 5 +++-- net/openssh/patches/900-sshd_config-include-dir.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 net/openssh/patches/900-sshd_config-include-dir.patch diff --git a/net/openssh/Makefile b/net/openssh/Makefile index 2923a8170..cd27c35d6 100644 --- a/net/openssh/Makefile +++ b/net/openssh/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssh PKG_VERSION:=9.3p2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ @@ -103,6 +103,7 @@ endef define Package/openssh-server/conffiles /etc/ssh/sshd_config +/etc/ssh/sshd_config.d/ /etc/ssh/ssh_host_ed25519_key /etc/ssh/ssh_host_ed25519_key.pub /etc/ssh/ssh_host_rsa_key @@ -223,7 +224,7 @@ define Package/openssh-keygen/install endef define Package/openssh-server/install - install -d -m0700 $(1)/etc/ssh + install -d -m0700 $(1)/etc/ssh $(1)/etc/ssh/sshd_config.d $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/ssh/sshd_config $(1)/etc/ssh/ sed -r -i 's,^#(HostKey /etc/ssh/ssh_host_(rsa|ed25519)_key)$$$$,\1,' $(1)/etc/ssh/sshd_config $(INSTALL_DIR) $(1)/etc/init.d diff --git a/net/openssh/patches/900-sshd_config-include-dir.patch b/net/openssh/patches/900-sshd_config-include-dir.patch new file mode 100644 index 000000000..1d2f16b2f --- /dev/null +++ b/net/openssh/patches/900-sshd_config-include-dir.patch @@ -0,0 +1,11 @@ +--- a/sshd_config ++++ b/sshd_config +@@ -10,6 +10,8 @@ + # possible, but leave them commented. Uncommented options override the + # default value. + ++Include /etc/ssh/sshd_config.d/*.conf ++ + #Port 22 + #AddressFamily any + #ListenAddress 0.0.0.0 From 173d163f0935bd21e667fcd9a895718112d71718 Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Tue, 8 Aug 2023 09:28:31 +0000 Subject: [PATCH 41/56] simple-adblock: force_dns_port validation bugfix Signed-off-by: Stan Grishin --- net/simple-adblock/Makefile | 2 +- net/simple-adblock/files/simple-adblock.init | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/simple-adblock/Makefile b/net/simple-adblock/Makefile index 216a97e37..5037303ec 100644 --- a/net/simple-adblock/Makefile +++ b/net/simple-adblock/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=simple-adblock PKG_VERSION:=1.9.5 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_MAINTAINER:=Stan Grishin PKG_LICENSE:=GPL-3.0-or-later diff --git a/net/simple-adblock/files/simple-adblock.init b/net/simple-adblock/files/simple-adblock.init index c35d03c2a..25240c8c1 100644 --- a/net/simple-adblock/files/simple-adblock.init +++ b/net/simple-adblock/files/simple-adblock.init @@ -1640,7 +1640,7 @@ load_validate_config() { uci_load_validate "$packageName" "$packageName" "$1" "${2}${3:+ $3}" \ 'enabled:bool:0' \ 'force_dns:bool:1' \ - 'force_dns_port:list(integer):53 853' \ + 'force_dns_port:list(integer):"53 853"' \ 'parallel_downloads:bool:1' \ 'debug:bool:0' \ 'compressed_cache:bool:0' \ From 7a234fa74e615a3184542ad0af955604f955fd4c Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Sun, 9 Jul 2023 20:59:36 -0600 Subject: [PATCH 42/56] xtables-addons: add MaxMind versions of xt_geoip_dl, etc. Signed-off-by: Philip Prindeville --- net/xtables-addons/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/xtables-addons/Makefile b/net/xtables-addons/Makefile index cb678ac9c..f96c12da8 100644 --- a/net/xtables-addons/Makefile +++ b/net/xtables-addons/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=xtables-addons PKG_VERSION:=3.24 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_HASH:=3e823f71720519ced31c4c7d2bfaf7120d9c01c59a0843dfcbe93c95c64d81c1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -158,7 +158,7 @@ endif define Package/iptgeoip/install $(INSTALL_DIR) $(1)/usr/lib/xtables-addons $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/xtables-addons/xt_geoip_{build,dl} \ + $(PKG_INSTALL_DIR)/usr/lib/xtables-addons/xt_geoip_{build,dl}{,_maxmind} \ $(1)/usr/lib/xtables-addons/ $(INSTALL_DIR) $(1)/usr/bin $(CP) \ From c3299c1a527ee891844294c1f1b18bb76041d711 Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Sun, 9 Jul 2023 21:21:58 -0600 Subject: [PATCH 43/56] xtables-addons: add packaging for xt_asn, et al Signed-off-by: Philip Prindeville --- net/xtables-addons/Makefile | 38 +++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/net/xtables-addons/Makefile b/net/xtables-addons/Makefile index f96c12da8..272e95917 100644 --- a/net/xtables-addons/Makefile +++ b/net/xtables-addons/Makefile @@ -129,6 +129,42 @@ define Package/iptaccount/install endef +define Package/iptasn + $(call Package/xtables-addons) + CATEGORY:=Network + TITLE:=iptables-mod-asn support scripts for MaxMind ASN databases + DEPENDS:=iptables +iptables-mod-asn \ + +perl +perlbase-getopt +perlbase-io +perl-text-csv_xs \ + +perl-net-cidr-lite \ + +wget-ssl +!BUSYBOX_CONFIG_ZCAT:gzip +endef + +define Package/iptasn/config + menu "Select iptasn options" + config IPTASN_PRESERVE + bool "Preserve across sysupgrades" + default n + help + Backup and restore during sysupgrade (requires >7MB) + endmenu +endef + +ifeq ($(CONFIG_IPTASN_PRESERVE),y) +define Package/iptasn/conffiles +/usr/share/xt_asn/ +endef +endif + +define Package/iptasn/install + $(INSTALL_DIR) $(1)/usr/lib/xtables-addons + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/xtables-addons/xt_asn_{build,dl} \ + $(1)/usr/lib/xtables-addons/ + $(INSTALL_DIR) $(1)/usr/share/xt_asn + touch $(1)/usr/share/xt_asn/.keep +endef + + define Package/iptgeoip $(call Package/xtables-addons) CATEGORY:=Network @@ -175,6 +211,7 @@ $(eval $(call BuildTemplate,compat-xtables,API compatibilty layer,,compat_xtable $(eval $(call BuildTemplate,nathelper-rtsp,RTSP Conntrack and NAT,,rtsp/nf_conntrack_rtsp rtsp/nf_nat_rtsp,+kmod-ipt-conntrack-extra +kmod-ipt-nat)) $(eval $(call BuildTemplate,account,ACCOUNT,xt_ACCOUNT,ACCOUNT/xt_ACCOUNT,+kmod-ipt-compat-xtables)) +$(eval $(call BuildTemplate,asn,asn,xt_asn,xt_asn,)) $(eval $(call BuildTemplate,chaos,CHAOS,xt_CHAOS,xt_CHAOS,+kmod-ipt-compat-xtables +kmod-ipt-delude +kmod-ipt-tarpit)) $(eval $(call BuildTemplate,condition,Condition,xt_condition,xt_condition,)) $(eval $(call BuildTemplate,delude,DELUDE,xt_DELUDE,xt_DELUDE,+kmod-ipt-compat-xtables)) @@ -197,4 +234,5 @@ $(eval $(call BuildTemplate,sysrq,SYSRQ,xt_SYSRQ,xt_SYSRQ,+kmod-ipt-compat-xtabl $(eval $(call BuildTemplate,tarpit,TARPIT,xt_TARPIT,xt_TARPIT,+kmod-ipt-compat-xtables)) $(eval $(call BuildPackage,iptaccount)) +$(eval $(call BuildPackage,iptasn)) $(eval $(call BuildPackage,iptgeoip)) From b1d28936cbfe9739f9480fefb34fa4ab8ff15bd8 Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 9 Aug 2023 15:40:54 -0400 Subject: [PATCH 44/56] libxcrypt: update to 4.4.36 Upstream bump required to fix build issues reported here: https://forum.openwrt.org/t/i-cannot-build-my-image-due-to-failure-in-libxcrypt/168114 Signed-off-by: John Audia --- libs/libxcrypt/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libxcrypt/Makefile b/libs/libxcrypt/Makefile index c6199824d..316e0f2cb 100644 --- a/libs/libxcrypt/Makefile +++ b/libs/libxcrypt/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libxcrypt -PKG_VERSION:=4.4.33 +PKG_VERSION:=4.4.36 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/besser82/libxcrypt/releases/download/v$(PKG_VERSION) -PKG_HASH:=e87acf9c652c573a4713d5582159f98f305d56ed5f754ce64f57d4194d6b3a6f +PKG_HASH:=e5e1f4caee0a01de2aee26e3138807d6d3ca2b8e67287966d1fefd65e1fd8943 PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1-or-later From 40a680ffd7d155798123a9eadcc3411f7a201259 Mon Sep 17 00:00:00 2001 From: Rani Hod Date: Wed, 19 Jul 2023 18:20:09 +0300 Subject: [PATCH 45/56] yt-dlp: add missing dependencies Added missing python3-{logging,uuid} dependencies. Signed-off-by: Rani Hod --- multimedia/yt-dlp/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/multimedia/yt-dlp/Makefile b/multimedia/yt-dlp/Makefile index 1ec3ebaed..7ec127416 100644 --- a/multimedia/yt-dlp/Makefile +++ b/multimedia/yt-dlp/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=yt-dlp PKG_VERSION:=2023.3.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=yt-dlp PKG_HASH:=265d5da97a76c15d7d9a4088a67b78acd5dcf6f8cfd8257c52f581ff996ff515 @@ -27,9 +27,11 @@ define Package/yt-dlp +python3-codecs \ +python3-ctypes \ +python3-email \ + +python3-logging \ +python3-openssl \ +python3-sqlite3 \ +python3-urllib \ + +python3-uuid \ +python3-xml endef From 466dfed2f20caf23da40928950a664d1e773d7f3 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Thu, 3 Aug 2023 23:44:45 +0800 Subject: [PATCH 46/56] python-engineio: Update to 4.5.1 Signed-off-by: Jeffery To --- lang/python/python-engineio/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/python/python-engineio/Makefile b/lang/python/python-engineio/Makefile index ab4b44908..4a2f51ff5 100644 --- a/lang/python/python-engineio/Makefile +++ b/lang/python/python-engineio/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-engineio -PKG_VERSION:=4.1.0 +PKG_VERSION:=4.5.1 PKG_RELEASE:=1 PYPI_NAME:=python-engineio -PKG_HASH:=21e1bcc62f5573a4bb1c805e69915c5a4c5aa953005dde6c2f707c24554c1020 +PKG_HASH:=b167a1b208fcdce5dbe96a61a6ca22391cfa6715d796c22de93e3adf9c07ae0c PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=MIT @@ -26,7 +26,7 @@ define Package/python3-engineio SUBMENU:=Python SECTION:=lang CATEGORY:=Languages - TITLE:=Engine.IO server + TITLE:=Engine.IO server and client URL:=https://github.com/miguelgrinberg/python-engineio DEPENDS:= \ +python3-light \ From 7e931594c7b20f11863d7816531dd583bce728b7 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Thu, 3 Aug 2023 23:47:42 +0800 Subject: [PATCH 47/56] python-socketio: Update to 5.8.0 Signed-off-by: Jeffery To --- lang/python/python-socketio/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/python/python-socketio/Makefile b/lang/python/python-socketio/Makefile index 9fde114ae..61a1128c0 100644 --- a/lang/python/python-socketio/Makefile +++ b/lang/python/python-socketio/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-socketio -PKG_VERSION:=5.2.1 +PKG_VERSION:=5.8.0 PKG_RELEASE:=1 PYPI_NAME:=python-socketio -PKG_HASH:=356a8a480fa316295b439d63a5f35a7a59fe65cee1ae35dee28e87d00e5aead6 +PKG_HASH:=e714f4dddfaaa0cb0e37a1e2deef2bb60590a5b9fea9c343dd8ca5e688416fd9 PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=MIT @@ -34,7 +34,7 @@ define Package/python3-socketio +python3-engineio \ +python3-asyncio \ +python3-logging \ - +python3-urllib + +python3-uuid endef define Package/python3-socketio/description From 58c9de9ede61a1a7b7c31cedc79140fd7a2c4344 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Thu, 3 Aug 2023 23:53:05 +0800 Subject: [PATCH 48/56] python-flask-socketio: Update to 5.3.5 Signed-off-by: Jeffery To --- lang/python/python-flask-socketio/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/python-flask-socketio/Makefile b/lang/python/python-flask-socketio/Makefile index 1113106f6..e71cd47d0 100644 --- a/lang/python/python-flask-socketio/Makefile +++ b/lang/python/python-flask-socketio/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-flask-socketio -PKG_VERSION:=5.3.1 +PKG_VERSION:=5.3.5 PKG_RELEASE:=1 PYPI_NAME:=Flask-SocketIO -PKG_HASH:=fd0ed0fc1341671d92d5f5b2f5503916deb7aa7e2940e6636cfa2c087c828bf9 +PKG_HASH:=5f01158d10db71aa78c969b631ce3b9148b47ab0de1995158f9577f85b004d25 PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=MIT From c579a4ab0e71b6112a593969ffb900faa46af7e5 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Thu, 3 Aug 2023 23:57:40 +0800 Subject: [PATCH 49/56] python-flask-babel: Update to 3.1.0 The package changed to the poetry-core build backend. Signed-off-by: Jeffery To --- lang/python/python-flask-babel/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lang/python/python-flask-babel/Makefile b/lang/python/python-flask-babel/Makefile index b7fb3d91e..f381cfcfa 100644 --- a/lang/python/python-flask-babel/Makefile +++ b/lang/python/python-flask-babel/Makefile @@ -8,16 +8,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-flask-babel -PKG_VERSION:=2.0.0 +PKG_VERSION:=3.1.0 PKG_RELEASE:=1 -PYPI_NAME:=Flask-Babel -PKG_HASH:=f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d +PYPI_NAME:=flask-babel +PYPI_SOURCE_NAME:=flask_babel +PKG_HASH:=be015772c5d7f046f3b99c508dcf618636eb93d21b713b356db79f3e79f69f39 PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE +PKG_BUILD_DEPENDS:=python-poetry-core/host + include ../pypi.mk include $(INCLUDE_DIR)/package.mk include ../python3-package.mk @@ -26,7 +29,7 @@ define Package/python3-flask-babel SECTION:=lang CATEGORY:=Languages SUBMENU:=Python - TITLE:=Flask Babel + TITLE:=i18n/l10n support for Flask applications URL:=https://github.com/python-babel/flask-babel DEPENDS:= \ +python3-light \ From f5411f260a1701c26885ef71d2d2499ff8e582cd Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 4 Aug 2023 00:01:50 +0800 Subject: [PATCH 50/56] python-flask-httpauth: Update to 4.8.0 Signed-off-by: Jeffery To --- lang/python/python-flask-httpauth/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/python/python-flask-httpauth/Makefile b/lang/python/python-flask-httpauth/Makefile index dd8536c5a..13fd50a50 100644 --- a/lang/python/python-flask-httpauth/Makefile +++ b/lang/python/python-flask-httpauth/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=python3-flask-httpauth -PKG_VERSION:=4.2.0 +PKG_NAME:=python-flask-httpauth +PKG_VERSION:=4.8.0 PKG_RELEASE:=1 PYPI_NAME:=Flask-HTTPAuth -PKG_HASH:=8c7e49e53ce7dc14e66fe39b9334e4b7ceb8d0b99a6ba1c3562bb528ef9da84a +PKG_HASH:=66568a05bc73942c65f1e2201ae746295816dc009edd84b482c44c758d75097a PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=MIT @@ -26,7 +26,7 @@ define Package/python3-flask-httpauth SUBMENU:=Python SECTION:=lang CATEGORY:=Languages - TITLE:=Basic and Digest HTTP authentication for Flask routes + TITLE:=HTTP authentication for Flask routes URL:=https://github.com/miguelgrinberg/flask-httpauth DEPENDS:= \ +python3-light \ From d91ddd5d75b84b39e97f1f5eedc9a1bc91e85614 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 4 Aug 2023 00:03:55 +0800 Subject: [PATCH 51/56] python-flask-login: Update to 0.6.2, update list of dependencies Signed-off-by: Jeffery To --- lang/python/python-flask-login/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lang/python/python-flask-login/Makefile b/lang/python/python-flask-login/Makefile index 4678edb50..7153bbfcb 100644 --- a/lang/python/python-flask-login/Makefile +++ b/lang/python/python-flask-login/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-flask-login -PKG_VERSION:=0.5.0 -PKG_RELEASE:=2 +PKG_VERSION:=0.6.2 +PKG_RELEASE:=1 PYPI_NAME:=Flask-Login -PKG_HASH:=6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b +PKG_HASH:=c0a7baa9fdc448cdd3dd6f0939df72eec5177b2f7abe6cb82fc934d29caac9c3 PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=MIT @@ -27,9 +27,9 @@ define Package/python3-flask-login SECTION:=lang CATEGORY:=Languages SUBMENU:=Python - TITLE:=User session management plugin for Flask + TITLE:=User authentication and session management for Flask URL:=https://github.com/maxcountryman/flask-login - DEPENDS:=+python3-light +python3-flask + DEPENDS:=+python3-light +python3-urllib +python3-flask +python3-werkzeug endef define Package/python3-flask-login/description From 68c434dd6a92917351ffd9d39c7dfed1b64f51ef Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 4 Aug 2023 00:07:14 +0800 Subject: [PATCH 52/56] python-flask-seasurf: Update to 1.1.1 Signed-off-by: Jeffery To --- lang/python/python-flask-seasurf/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lang/python/python-flask-seasurf/Makefile b/lang/python/python-flask-seasurf/Makefile index bfd372d0d..dd10c8e0d 100644 --- a/lang/python/python-flask-seasurf/Makefile +++ b/lang/python/python-flask-seasurf/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-flask-seasurf -PKG_VERSION:=0.3.0 +PKG_VERSION:=1.1.1 PKG_RELEASE:=1 PYPI_NAME:=Flask-SeaSurf -PKG_HASH:=10d4946fdd9745a8ae0a38a46c48a9add0cca4896333c0893b3133e3852c2e80 +PKG_HASH:=54537008c769ac0ada8237877327c3e7ed74dcd8b01e74a9120ee0232c5951a9 PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=BSD-3-Clause @@ -26,8 +26,8 @@ define Package/python3-flask-seasurf SECTION:=lang CATEGORY:=Languages SUBMENU:=Python - TITLE:=Flask SeaSurf - URL:=https://flask-seasurf.readthedocs.io/en/latest/ + TITLE:=Updated CSRF extension for Flask + URL:=https://github.com/maxcountryman/flask-seasurf DEPENDS:= \ +python3-flask \ +python3-light \ @@ -35,7 +35,8 @@ define Package/python3-flask-seasurf endef define Package/python3-flask-seasurf/description - SeaSurf is a Flask extension for preventing cross-site request forgery (CSRF). +SeaSurf is a Flask extension for preventing cross-site request forgery +(CSRF). endef $(eval $(call Py3Package,python3-flask-seasurf)) From aa6aa15f4b5e078ababd67f5655de5315ba6a030 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 7 Aug 2023 09:55:44 +0800 Subject: [PATCH 53/56] python-wheel: Update to 0.41.1 Signed-off-by: Jeffery To --- lang/python/python-wheel/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/python-wheel/Makefile b/lang/python/python-wheel/Makefile index d0c0e3791..8f8b48a53 100644 --- a/lang/python/python-wheel/Makefile +++ b/lang/python/python-wheel/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-wheel -PKG_VERSION:=0.41.0 +PKG_VERSION:=0.41.1 PKG_RELEASE:=1 PYPI_NAME:=wheel -PKG_HASH:=55a0f0a5a84869bce5ba775abfd9c462e3a6b1b7b7ec69d72c0b83d673a5114d +PKG_HASH:=12b911f083e876e10c595779709f8a88a59f45aacc646492a67fe9ef796c1b47 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE.txt From d86deca765a0bc8e801900fcce805d615ea9baad Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 7 Aug 2023 09:59:08 +0800 Subject: [PATCH 54/56] python-click: Update to 8.1.6 Signed-off-by: Jeffery To --- lang/python/python-click/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/python-click/Makefile b/lang/python/python-click/Makefile index 47134d203..1e6b6542d 100644 --- a/lang/python/python-click/Makefile +++ b/lang/python/python-click/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-click -PKG_VERSION:=8.1.4 +PKG_VERSION:=8.1.6 PKG_RELEASE:=1 PYPI_NAME:=click -PKG_HASH:=b97d0c74955da062a7d4ef92fadb583806a585b2ea81958a81bd72726cbb8e37 +PKG_HASH:=48ee849951919527a045bfe3bf7baa8a959c423134e1a5b98c05c20ba75a1cbd PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=BSD-3-Clause From 94315cfaa896756bcd8e088d3dc609b6232beb23 Mon Sep 17 00:00:00 2001 From: Georgi Valkov Date: Tue, 8 Aug 2023 10:27:26 +0300 Subject: [PATCH 55/56] gptfdisk: fix incorrect TARGET on non-linux host Fixed by defining TARGET=linux, as suggested in the README. By default TARGET is derived from the host using uname -s, which produces build errors on a non-linux hosts: TARGET is not set; trying to determine target based on host OS.... Detected OS is Darwin Build target is macos ... x86_64-openwrt-linux-musl-g++: error: unrecognized command-line option '-arch' Helped-by: Tianling Shen Signed-off-by: Georgi Valkov --- utils/gptfdisk/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/gptfdisk/Makefile b/utils/gptfdisk/Makefile index 35f34d0a4..4f667166e 100644 --- a/utils/gptfdisk/Makefile +++ b/utils/gptfdisk/Makefile @@ -75,6 +75,7 @@ endef TARGET_CXXFLAGS += -std=c++11 -fno-rtti TARGET_LDFLAGS += -Wl,--as-needed +MAKE_FLAGS += TARGET=linux define Package/gdisk/install $(INSTALL_DIR) $(1)/usr/bin From 1ebd94a79133a163bfd848f56be27c3580fa3c2f Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Thu, 10 Aug 2023 00:41:46 +0200 Subject: [PATCH 56/56] prometheus: drop package The package is terribly outdated and bundling it with the web UI is a task I don't find myself willing to take. Dropping it. FIX: #16008 Signed-off-by: Paul Spooren --- utils/prometheus/Makefile | 66 ------------------- utils/prometheus/files/etc/init.d/prometheus | 33 ---------- utils/prometheus/files/etc/prometheus.yml | 29 -------- .../etc/uci-defaults/prometheus-defaults | 13 ---- utils/prometheus/files/prometheus.yml | 29 -------- utils/prometheus/test.sh | 3 - 6 files changed, 173 deletions(-) delete mode 100644 utils/prometheus/Makefile delete mode 100755 utils/prometheus/files/etc/init.d/prometheus delete mode 100644 utils/prometheus/files/etc/prometheus.yml delete mode 100755 utils/prometheus/files/etc/uci-defaults/prometheus-defaults delete mode 100644 utils/prometheus/files/prometheus.yml delete mode 100644 utils/prometheus/test.sh diff --git a/utils/prometheus/Makefile b/utils/prometheus/Makefile deleted file mode 100644 index 131ce4b7a..000000000 --- a/utils/prometheus/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=prometheus -PKG_VERSION:=2.25.2 -PKG_RELEASE:=3 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/prometheus/prometheus/tar.gz/v${PKG_VERSION}? -PKG_HASH:=85f50c0cfb4db206a59d2c3301e02d685c3fe4b451b41ca943a4eb94935cf4d4 - -PKG_LICENSE:=Apache-2.0 -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Paul Spooren - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_BUILD_FLAGS:=no-mips16 - -GO_PKG:=github.com/prometheus/prometheus/ -GO_PKG_BUILD_PKG:=github.com/prometheus/prometheus/cmd/prometheus/ - -GO_PKG_LDFLAGS_X:=\ - github.com/prometheus/common/version.Version=v$(PKG_VERSION) \ - github.com/prometheus/common/version.Revision=$(PKG_VERSION) \ - github.com/prometheus/common/version.Branch="release" \ - github.com/prometheus/common/version.BuildUser=openwrt \ - github.com/prometheus/common/version.BuildDate=$(SOURCE_DATE_EPOCH) - -include $(INCLUDE_DIR)/package.mk -include ../../lang/golang/golang-package.mk - -define Package/prometheus/Default - TITLE:=Monitoring system & time series database - USERID:=prometheus=112:prometheus=112 - URL:=http://prometheus.io - DEPENDS:=$(GO_ARCH_DEPENDS) -endef - -define Package/prometheus -$(call Package/prometheus/Default) - SECTION:=utils - CATEGORY:=Utilities -endef - -define Package/prometheus/description -Prometheus, a Cloud Native Computing Foundation project, is a systems and -service monitoring system. It collects metrics from configured targets at given -intervals, evaluates rule expressions, displays the results, and can trigger -alerts if some condition is observed to be true. - -Default tsdb path is /srv/prometheus, you might want to edit /etc/config/prometheus -in order to place it on USB storage or external SD card. -endef - -define Package/prometheus/install - $(call GoPackage/Package/Install/Bin,$(1)) - - $(CP) ./files/* $(1)/ -endef - -define Package/prometheus/conffiles -/etc/prometheus.yml -endef - -$(eval $(call GoBinPackage,prometheus)) -$(eval $(call BuildPackage,prometheus)) diff --git a/utils/prometheus/files/etc/init.d/prometheus b/utils/prometheus/files/etc/init.d/prometheus deleted file mode 100755 index 99b4640b2..000000000 --- a/utils/prometheus/files/etc/init.d/prometheus +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=70 - -USE_PROCD=1 -PROG=/usr/bin/prometheus -CONFFILE=/etc/prometheus.yml - -start_service() { - local config_file - local storage_tsdb_path - local web_listen_address - config_load "prometheus" - config_get config_file prometheus config_file "$CONFFILE" - config_get storage_tsdb_path prometheus storage_tsdb_path "/srv/prometheus" - config_get web_listen_address prometheus web_listen_address "127.0.0.1:9090" - - # Create tsdb dir & permissions if needed - if [ ! -d "$storage_tsdb_path" ]; then - mkdir "$storage_tsdb_path" - chown prometheus:prometheus "$storage_tsdb_path" - fi; - - procd_open_instance - procd_set_param command "$PROG" - procd_append_param command --config.file="$config_file" - procd_append_param command --storage.tsdb.path="$storage_tsdb_path" - procd_append_param command --web.listen-address="$web_listen_address" - procd_append_param user "prometheus" - procd_set_param file "$config_file" - procd_set_param respawn - procd_close_instance -} diff --git a/utils/prometheus/files/etc/prometheus.yml b/utils/prometheus/files/etc/prometheus.yml deleted file mode 100644 index af33d8704..000000000 --- a/utils/prometheus/files/etc/prometheus.yml +++ /dev/null @@ -1,29 +0,0 @@ -# my global config -global: - scrape_interval: 15s # Set the scrape interval to every 15 seconds. Default is every 1 minute. - evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute. - # scrape_timeout is set to the global default (10s). - -# Alertmanager configuration -alerting: - alertmanagers: - - static_configs: - - targets: - # - alertmanager:9093 - -# Load rules once and periodically evaluate them according to the global 'evaluation_interval'. -rule_files: - # - "first_rules.yml" - # - "second_rules.yml" - -# A scrape configuration containing exactly one endpoint to scrape: -# Here it's Prometheus itself. -scrape_configs: - # The job name is added as a label `job=` to any timeseries scraped from this config. - - job_name: 'prometheus' - - # metrics_path defaults to '/metrics' - # scheme defaults to 'http'. - - static_configs: - - targets: ['localhost:9090'] diff --git a/utils/prometheus/files/etc/uci-defaults/prometheus-defaults b/utils/prometheus/files/etc/uci-defaults/prometheus-defaults deleted file mode 100755 index 9c537d2e8..000000000 --- a/utils/prometheus/files/etc/uci-defaults/prometheus-defaults +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -[ -e /etc/config/prometheus ] || touch /etc/config/prometheus - -uci -q get prometheus.prometheus || { - uci -q batch <` to any timeseries scraped from this config. - - job_name: 'prometheus' - - # metrics_path defaults to '/metrics' - # scheme defaults to 'http'. - - static_configs: - - targets: ['localhost:9090'] diff --git a/utils/prometheus/test.sh b/utils/prometheus/test.sh deleted file mode 100644 index 208945462..000000000 --- a/utils/prometheus/test.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -prometheus --version 2>&1 | grep "$2"