[ptxdist] [PATCH 1/6] npth: version bump 1.5 -> 1.6

mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed

* [ptxdist] [PATCH 1/6] npth: version bump 1.5 -> 1.6
@ 2022-07-29  9:26 Bruno Thomsen
  2022-07-29  9:26 ` [ptxdist] [PATCH 2/6] libgpg-error: version bump 1.42 -> 1.45 Bruno Thomsen
                   ` (5 more replies)
  0 siblings, 6 replies; 12+ messages in thread
From: Bruno Thomsen @ 2022-07-29  9:26 UTC (permalink / raw)
  To: ptxdist; +Cc: Bruno Thomsen

Ensure GnuPG has up-to-date dependencies.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 rules/npth.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/npth.make b/rules/npth.make
index 665668fd524f..baa9ab3aabab 100644
--- a/rules/npth.make
+++ b/rules/npth.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NPTH) += npth
 #
 # Paths and names
 #
-NPTH_VERSION		:= 1.5
-NPTH_MD5		:= 9ba2dc4302d2f32c66737c43ed191b1b
+NPTH_VERSION		:= 1.6
+NPTH_MD5		:= 375d1a15ad969f32d25f1a7630929854
 NPTH			:= npth-$(NPTH_VERSION)
 NPTH_SUFFIX		:= tar.bz2
 NPTH_URL		:= \

base-commit: 02f8e5e7cb2ae088b69bfd2d75ba9e702eeaac5f
-- 
2.37.1




^ permalink raw reply	[flat|nested] 12+ messages in thread

* [ptxdist] [PATCH 2/6] libgpg-error: version bump 1.42 -> 1.45
  2022-07-29  9:26 [ptxdist] [PATCH 1/6] npth: version bump 1.5 -> 1.6 Bruno Thomsen
@ 2022-07-29  9:26 ` Bruno Thomsen
  2022-08-04 15:14   ` [ptxdist] [APPLIED] " Michael Olbrich
  2022-07-29  9:26 ` [ptxdist] [PATCH 3/6] libgcrypt: version bump 1.8.8 -> 1.10.1 Bruno Thomsen
                   ` (4 subsequent siblings)
  5 siblings, 1 reply; 12+ messages in thread
From: Bruno Thomsen @ 2022-07-29  9:26 UTC (permalink / raw)
  To: ptxdist; +Cc: Bruno Thomsen

Drop Fedora cross compilation patch as issue has been fixed upstream.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 ...1-fix-the-last-cross-compilation-fix.patch | 55 -------------------
 patches/libgpg-error-1.42/series              |  4 --
 rules/libgpg-error.make                       |  4 +-
 3 files changed, 2 insertions(+), 61 deletions(-)
 delete mode 100644 patches/libgpg-error-1.42/0001-fix-the-last-cross-compilation-fix.patch
 delete mode 100644 patches/libgpg-error-1.42/series

diff --git a/patches/libgpg-error-1.42/0001-fix-the-last-cross-compilation-fix.patch b/patches/libgpg-error-1.42/0001-fix-the-last-cross-compilation-fix.patch
deleted file mode 100644
index 6776ff10fc7b..000000000000
--- a/patches/libgpg-error-1.42/0001-fix-the-last-cross-compilation-fix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Lucas Stach <l.stach@pengutronix.de>
-Date: Sat, 11 Sep 2021 01:52:35 +0200
-Subject: [PATCH] fix the last cross-compilation fix
-
-Instead of trying to figure out which way to call echo in order to supress
-the newline and apparently getting it wrong on some platforms (on a Fedora
-build host compilation fails due to stray \c characters in the generated
-files) use the POSIX recommended portable way of calling printf.
-
-Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
----
- src/gen-lock-obj.sh | 16 ++++------------
- 1 file changed, 4 insertions(+), 12 deletions(-)
-
-diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh
-index a710f0ccee5a..aea9edb6095a 100755
---- a/src/gen-lock-obj.sh
-+++ b/src/gen-lock-obj.sh
-@@ -38,14 +38,6 @@
- #     AWK=gawk ./gen-lock-obj.sh
- #
- 
--if test -n `echo -n`; then
--    ECHO_C='\c'
--    ECHO_N=''
--else
--    ECHO_C=''
--    ECHO_N='-n'
--fi
--
- if test "$1" = --disable-threads; then
-     cat <<EOF
- ## lock-obj-pub.$host.h - NO LOCK SUPPORT
-@@ -107,17 +99,17 @@ EOF
- #     USE_LONG_DOUBLE_FOR_ALIGNMENT
- #
- 
--echo ${ECHO_N} "#define GPGRT_LOCK_INITIALIZER {$LOCK_ABI_VERSION,{{${ECHO_C}"
-+printf "%s" "#define GPGRT_LOCK_INITIALIZER {$LOCK_ABI_VERSION,{{"
- 
- i=0
- while test "$i" -lt $ac_mtx_size; do
-     if test "$i" -ne 0 -a "$(( $i % 8 ))" -eq 0; then
-         echo ' \'
--        echo ${ECHO_N} "                                    ${ECHO_C}"
-+        printf "%s" "                                    "
-     fi
--    echo ${ECHO_N} "0${ECHO_C}"
-+    printf "%s" "0"
-     if test "$i" -lt $(($ac_mtx_size - 1)); then
--        echo ${ECHO_N} ",${ECHO_C}"
-+        printf "%s" ","
-     fi
-     i=$(( i + 1 ))
- done
diff --git a/patches/libgpg-error-1.42/series b/patches/libgpg-error-1.42/series
deleted file mode 100644
index fc21a0922fdc..000000000000
--- a/patches/libgpg-error-1.42/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-fix-the-last-cross-compilation-fix.patch
-# a840af6993790b90121e652373747e0a  - git-ptx-patches magic
diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make
index 194cd21db4a6..61e7e0a11990 100644
--- a/rules/libgpg-error.make
+++ b/rules/libgpg-error.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBGPG_ERROR) += libgpg-error
 #
 # Paths and names
 #
-LIBGPG_ERROR_VERSION	:= 1.42
-LIBGPG_ERROR_MD5	:= 133fed221ba8f63f5842858a1ff67cb3
+LIBGPG_ERROR_VERSION	:= 1.45
+LIBGPG_ERROR_MD5	:= 3bb15e0c29d3a680db7cef15143615e1
 LIBGPG_ERROR		:= libgpg-error-$(LIBGPG_ERROR_VERSION)
 LIBGPG_ERROR_SUFFIX	:= tar.bz2
 LIBGPG_ERROR_URL	:= \
-- 
2.37.1




^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [ptxdist] [APPLIED] libgpg-error: version bump 1.42 -> 1.45
  2022-07-29  9:26 ` [ptxdist] [PATCH 2/6] libgpg-error: version bump 1.42 -> 1.45 Bruno Thomsen
@ 2022-08-04 15:14   ` Michael Olbrich
  0 siblings, 0 replies; 12+ messages in thread
From: Michael Olbrich @ 2022-08-04 15:14 UTC (permalink / raw)
  To: ptxdist; +Cc: Bruno Thomsen

Thanks, applied as 5b7f3f031fb705265d9634969b52f3c236be91da.

Michael

[sent from post-receive hook]

On Thu, 04 Aug 2022 17:14:25 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Drop Fedora cross compilation patch as issue has been fixed upstream.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20220729092654.3861-2-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/libgpg-error-1.42/0001-fix-the-last-cross-compilation-fix.patch b/patches/libgpg-error-1.42/0001-fix-the-last-cross-compilation-fix.patch
> deleted file mode 100644
> index 6776ff10fc7b..000000000000
> --- a/patches/libgpg-error-1.42/0001-fix-the-last-cross-compilation-fix.patch
> +++ /dev/null
> @@ -1,55 +0,0 @@
> -From: Lucas Stach <l.stach@pengutronix.de>
> -Date: Sat, 11 Sep 2021 01:52:35 +0200
> -Subject: [PATCH] fix the last cross-compilation fix
> -
> -Instead of trying to figure out which way to call echo in order to supress
> -the newline and apparently getting it wrong on some platforms (on a Fedora
> -build host compilation fails due to stray \c characters in the generated
> -files) use the POSIX recommended portable way of calling printf.
> -
> -Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ----
> - src/gen-lock-obj.sh | 16 ++++------------
> - 1 file changed, 4 insertions(+), 12 deletions(-)
> -
> -diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh
> -index a710f0ccee5a..aea9edb6095a 100755
> ---- a/src/gen-lock-obj.sh
> -+++ b/src/gen-lock-obj.sh
> -@@ -38,14 +38,6 @@
> - #     AWK=gawk ./gen-lock-obj.sh
> - #
> - 
> --if test -n `echo -n`; then
> --    ECHO_C='\c'
> --    ECHO_N=''
> --else
> --    ECHO_C=''
> --    ECHO_N='-n'
> --fi
> --
> - if test "$1" = --disable-threads; then
> -     cat <<EOF
> - ## lock-obj-pub.$host.h - NO LOCK SUPPORT
> -@@ -107,17 +99,17 @@ EOF
> - #     USE_LONG_DOUBLE_FOR_ALIGNMENT
> - #
> - 
> --echo ${ECHO_N} "#define GPGRT_LOCK_INITIALIZER {$LOCK_ABI_VERSION,{{${ECHO_C}"
> -+printf "%s" "#define GPGRT_LOCK_INITIALIZER {$LOCK_ABI_VERSION,{{"
> - 
> - i=0
> - while test "$i" -lt $ac_mtx_size; do
> -     if test "$i" -ne 0 -a "$(( $i % 8 ))" -eq 0; then
> -         echo ' \'
> --        echo ${ECHO_N} "                                    ${ECHO_C}"
> -+        printf "%s" "                                    "
> -     fi
> --    echo ${ECHO_N} "0${ECHO_C}"
> -+    printf "%s" "0"
> -     if test "$i" -lt $(($ac_mtx_size - 1)); then
> --        echo ${ECHO_N} ",${ECHO_C}"
> -+        printf "%s" ","
> -     fi
> -     i=$(( i + 1 ))
> - done
> diff --git a/patches/libgpg-error-1.42/series b/patches/libgpg-error-1.42/series
> deleted file mode 100644
> index fc21a0922fdc..000000000000
> --- a/patches/libgpg-error-1.42/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-fix-the-last-cross-compilation-fix.patch
> -# a840af6993790b90121e652373747e0a  - git-ptx-patches magic
> diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make
> index 194cd21db4a6..61e7e0a11990 100644
> --- a/rules/libgpg-error.make
> +++ b/rules/libgpg-error.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBGPG_ERROR) += libgpg-error
>  #
>  # Paths and names
>  #
> -LIBGPG_ERROR_VERSION	:= 1.42
> -LIBGPG_ERROR_MD5	:= 133fed221ba8f63f5842858a1ff67cb3
> +LIBGPG_ERROR_VERSION	:= 1.45
> +LIBGPG_ERROR_MD5	:= 3bb15e0c29d3a680db7cef15143615e1
>  LIBGPG_ERROR		:= libgpg-error-$(LIBGPG_ERROR_VERSION)
>  LIBGPG_ERROR_SUFFIX	:= tar.bz2
>  LIBGPG_ERROR_URL	:= \



^ permalink raw reply	[flat|nested] 12+ messages in thread

* [ptxdist] [PATCH 3/6] libgcrypt: version bump 1.8.8 -> 1.10.1
  2022-07-29  9:26 [ptxdist] [PATCH 1/6] npth: version bump 1.5 -> 1.6 Bruno Thomsen
  2022-07-29  9:26 ` [ptxdist] [PATCH 2/6] libgpg-error: version bump 1.42 -> 1.45 Bruno Thomsen
@ 2022-07-29  9:26 ` Bruno Thomsen
  2022-08-04 15:14   ` [ptxdist] [APPLIED] " Michael Olbrich
  2022-07-29  9:26 ` [ptxdist] [PATCH 4/6] libksba: version bump 1.3.5 -> 1.6.0 Bruno Thomsen
                   ` (3 subsequent siblings)
  5 siblings, 1 reply; 12+ messages in thread
From: Bruno Thomsen @ 2022-07-29  9:26 UTC (permalink / raw)
  To: ptxdist; +Cc: Bruno Thomsen

5 new configure options:
--enable-force-soft-hwfeatures
--disable-shaext-support
--disable-ppc-crypto-support
--disable-instrumentation-munging
--with-fips-module-version=VERSION

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 rules/libgcrypt.make | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rules/libgcrypt.make b/rules/libgcrypt.make
index 8b0b39d0965a..3da2f434ce5e 100644
--- a/rules/libgcrypt.make
+++ b/rules/libgcrypt.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBGCRYPT) += libgcrypt
 #
 # Paths and names
 #
-LIBGCRYPT_VERSION	:= 1.8.8
-LIBGCRYPT_MD5		:= 252045343c586e5261134c91330f5b90
+LIBGCRYPT_VERSION	:= 1.10.1
+LIBGCRYPT_MD5		:= 8fadbe1fddafa341dce5ef3869f70e25
 LIBGCRYPT		:= libgcrypt-$(LIBGCRYPT_VERSION)
 LIBGCRYPT_SUFFIX	:= tar.bz2
 LIBGCRYPT_URL		:= https://www.gnupg.org/ftp/gcrypt/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX)
@@ -57,10 +57,12 @@ LIBGCRYPT_AUTOCONF := \
 	--$(call ptx/endis,LIBGCRYPT_ASM)-asm \
 	--disable-m-guard \
 	--disable-large-data-tests \
+	--disable-force-soft-hwfeatures \
 	--disable-hmac-binary-check \
 	--enable-jent-support \
 	--enable-padlock-support \
 	--enable-aesni-support \
+	--disable-shaext-support \
 	--enable-pclmul-support \
 	--enable-sse41-support \
 	--enable-drng-support \
@@ -68,7 +70,9 @@ LIBGCRYPT_AUTOCONF := \
 	--enable-avx2-support \
 	--$(call ptx/endis,PTXCONF_ARCH_ARM_NEON)-neon-support \
 	--enable-arm-crypto-support \
+	--disable-ppc-crypto-support \
 	--enable-O-flag-munging \
+	--disable-instrumentation-munging \
 	--disable-amd64-as-feature-detection \
 	--enable-optimization \
 	--enable-noexecstack \
-- 
2.37.1




^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [ptxdist] [APPLIED] libgcrypt: version bump 1.8.8 -> 1.10.1
  2022-07-29  9:26 ` [ptxdist] [PATCH 3/6] libgcrypt: version bump 1.8.8 -> 1.10.1 Bruno Thomsen
@ 2022-08-04 15:14   ` Michael Olbrich
  0 siblings, 0 replies; 12+ messages in thread
From: Michael Olbrich @ 2022-08-04 15:14 UTC (permalink / raw)
  To: ptxdist; +Cc: Bruno Thomsen

Thanks, applied as 40e2a62009ed477983f56c8dcc788e08233e584b.

Michael

[sent from post-receive hook]

On Thu, 04 Aug 2022 17:14:26 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> 5 new configure options:
> --enable-force-soft-hwfeatures
> --disable-shaext-support
> --disable-ppc-crypto-support
> --disable-instrumentation-munging
> --with-fips-module-version=VERSION
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20220729092654.3861-3-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libgcrypt.make b/rules/libgcrypt.make
> index 8b0b39d0965a..3da2f434ce5e 100644
> --- a/rules/libgcrypt.make
> +++ b/rules/libgcrypt.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBGCRYPT) += libgcrypt
>  #
>  # Paths and names
>  #
> -LIBGCRYPT_VERSION	:= 1.8.8
> -LIBGCRYPT_MD5		:= 252045343c586e5261134c91330f5b90
> +LIBGCRYPT_VERSION	:= 1.10.1
> +LIBGCRYPT_MD5		:= 8fadbe1fddafa341dce5ef3869f70e25
>  LIBGCRYPT		:= libgcrypt-$(LIBGCRYPT_VERSION)
>  LIBGCRYPT_SUFFIX	:= tar.bz2
>  LIBGCRYPT_URL		:= https://www.gnupg.org/ftp/gcrypt/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX)
> @@ -57,10 +57,12 @@ LIBGCRYPT_AUTOCONF := \
>  	--$(call ptx/endis,LIBGCRYPT_ASM)-asm \
>  	--disable-m-guard \
>  	--disable-large-data-tests \
> +	--disable-force-soft-hwfeatures \
>  	--disable-hmac-binary-check \
>  	--enable-jent-support \
>  	--enable-padlock-support \
>  	--enable-aesni-support \
> +	--disable-shaext-support \
>  	--enable-pclmul-support \
>  	--enable-sse41-support \
>  	--enable-drng-support \
> @@ -68,7 +70,9 @@ LIBGCRYPT_AUTOCONF := \
>  	--enable-avx2-support \
>  	--$(call ptx/endis,PTXCONF_ARCH_ARM_NEON)-neon-support \
>  	--enable-arm-crypto-support \
> +	--disable-ppc-crypto-support \
>  	--enable-O-flag-munging \
> +	--disable-instrumentation-munging \
>  	--disable-amd64-as-feature-detection \
>  	--enable-optimization \
>  	--enable-noexecstack \



^ permalink raw reply	[flat|nested] 12+ messages in thread

* [ptxdist] [PATCH 4/6] libksba: version bump 1.3.5 -> 1.6.0
  2022-07-29  9:26 [ptxdist] [PATCH 1/6] npth: version bump 1.5 -> 1.6 Bruno Thomsen
  2022-07-29  9:26 ` [ptxdist] [PATCH 2/6] libgpg-error: version bump 1.42 -> 1.45 Bruno Thomsen
  2022-07-29  9:26 ` [ptxdist] [PATCH 3/6] libgcrypt: version bump 1.8.8 -> 1.10.1 Bruno Thomsen
@ 2022-07-29  9:26 ` Bruno Thomsen
  2022-08-04 15:14   ` [ptxdist] [APPLIED] " Michael Olbrich
  2022-07-29  9:26 ` [ptxdist] [PATCH 5/6] gnupg: version bump 2.2.23 -> 2.3.7 Bruno Thomsen
                   ` (2 subsequent siblings)
  5 siblings, 1 reply; 12+ messages in thread
From: Bruno Thomsen @ 2022-07-29  9:26 UTC (permalink / raw)
  To: ptxdist; +Cc: Bruno Thomsen

2 new configure options:
--enable-gcov
--disable-doc

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 rules/libksba.make | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rules/libksba.make b/rules/libksba.make
index 0604beb1fa53..8503fa6cad2d 100644
--- a/rules/libksba.make
+++ b/rules/libksba.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBKSBA) += libksba
 #
 # Paths and names
 #
-LIBKSBA_VERSION	:= 1.3.5
-LIBKSBA_MD5	:= 8302a3e263a7c630aa7dea7d341f07a2
+LIBKSBA_VERSION	:= 1.6.0
+LIBKSBA_MD5	:= d333b2e1381068d4f9a328240f062f0f
 LIBKSBA		:= libksba-$(LIBKSBA_VERSION)
 LIBKSBA_SUFFIX	:= tar.bz2
 LIBKSBA_URL	:= \
@@ -38,7 +38,9 @@ LIBKSBA_LICENSE_FILES := \
 #
 LIBKSBA_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	--disable-gcov \
 	--enable-build-timestamp="$(PTXDIST_BUILD_TIMESTAMP)" \
+	--disable-doc \
 	--enable-optimization
 
 # ----------------------------------------------------------------------------
-- 
2.37.1




^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [ptxdist] [APPLIED] libksba: version bump 1.3.5 -> 1.6.0
  2022-07-29  9:26 ` [ptxdist] [PATCH 4/6] libksba: version bump 1.3.5 -> 1.6.0 Bruno Thomsen
@ 2022-08-04 15:14   ` Michael Olbrich
  0 siblings, 0 replies; 12+ messages in thread
From: Michael Olbrich @ 2022-08-04 15:14 UTC (permalink / raw)
  To: ptxdist; +Cc: Bruno Thomsen

Thanks, applied as faf247a8448d4d9caae487beb54d285ac3a6a1b8.

Michael

[sent from post-receive hook]

On Thu, 04 Aug 2022 17:14:27 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> 2 new configure options:
> --enable-gcov
> --disable-doc
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20220729092654.3861-4-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libksba.make b/rules/libksba.make
> index 0604beb1fa53..8503fa6cad2d 100644
> --- a/rules/libksba.make
> +++ b/rules/libksba.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBKSBA) += libksba
>  #
>  # Paths and names
>  #
> -LIBKSBA_VERSION	:= 1.3.5
> -LIBKSBA_MD5	:= 8302a3e263a7c630aa7dea7d341f07a2
> +LIBKSBA_VERSION	:= 1.6.0
> +LIBKSBA_MD5	:= d333b2e1381068d4f9a328240f062f0f
>  LIBKSBA		:= libksba-$(LIBKSBA_VERSION)
>  LIBKSBA_SUFFIX	:= tar.bz2
>  LIBKSBA_URL	:= \
> @@ -38,7 +38,9 @@ LIBKSBA_LICENSE_FILES := \
>  #
>  LIBKSBA_AUTOCONF := \
>  	$(CROSS_AUTOCONF_USR) \
> +	--disable-gcov \
>  	--enable-build-timestamp="$(PTXDIST_BUILD_TIMESTAMP)" \
> +	--disable-doc \
>  	--enable-optimization
>  
>  # ----------------------------------------------------------------------------



^ permalink raw reply	[flat|nested] 12+ messages in thread

* [ptxdist] [PATCH 5/6] gnupg: version bump 2.2.23 -> 2.3.7
  2022-07-29  9:26 [ptxdist] [PATCH 1/6] npth: version bump 1.5 -> 1.6 Bruno Thomsen
                   ` (2 preceding siblings ...)
  2022-07-29  9:26 ` [ptxdist] [PATCH 4/6] libksba: version bump 1.3.5 -> 1.6.0 Bruno Thomsen
@ 2022-07-29  9:26 ` Bruno Thomsen
  2022-08-05  7:50   ` [ptxdist] [APPLIED] " Michael Olbrich
  2022-07-29  9:26 ` [ptxdist] [PATCH 6/6] gnupg: add license files and update spdx identifiers Bruno Thomsen
  2022-08-04 15:14 ` [ptxdist] [APPLIED] npth: version bump 1.5 -> 1.6 Michael Olbrich
  5 siblings, 1 reply; 12+ messages in thread
From: Bruno Thomsen @ 2022-07-29  9:26 UTC (permalink / raw)
  To: ptxdist; +Cc: Bruno Thomsen

3 options has been remove:
--enable-gpg
--disable-symcryptrun
--with-tar=PATH

6 options has been added:
--disable-keyboxd
--disable-tpm2d
--enable-log-clock
--with-tpm2daemon-pgm=PATH
--with-keyboxd-pgm=PATH
--with-tss=TSS

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 rules/gnupg.make | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/rules/gnupg.make b/rules/gnupg.make
index 25d267769443..acb4d2082050 100644
--- a/rules/gnupg.make
+++ b/rules/gnupg.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GNUPG) += gnupg
 #
 # Paths and names
 #
-GNUPG_VERSION	:= 2.2.23
-GNUPG_MD5	:= a094ff856a53a9a9fd5465657d998079
+GNUPG_VERSION	:= 2.3.7
+GNUPG_MD5	:= 1c6a6722b9cececcf10ca4e24106e34b
 GNUPG		:= gnupg-$(GNUPG_VERSION)
 GNUPG_SUFFIX	:= tar.bz2
 GNUPG_URL	:= \
@@ -32,13 +32,13 @@ GNUPG_LICENSE	:= GPL-3.0-or-later
 
 GNUPG_CONF_TOOL := autoconf
 GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \
-	--enable-gpg \
 	--disable-gpgsm \
 	--disable-scdaemon \
 	--disable-g13 \
 	--disable-dirmngr \
+	--disable-keyboxd \
+	--disable-tpm2d \
 	--disable-doc \
-	--disable-symcryptrun \
 	--disable-gpgtar \
 	--disable-wks-tools \
 	--disable-gpg-is-gpg2 \
@@ -83,6 +83,7 @@ GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \
 	--disable-nls \
 	--enable-endian-check \
 	--enable-optimization \
+	--disable-log-clock \
 	--disable-werror \
 	--disable-all-tests \
 	--disable-run-gnupg-user-socket \
-- 
2.37.1




^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [ptxdist] [APPLIED] gnupg: version bump 2.2.23 -> 2.3.7
  2022-07-29  9:26 ` [ptxdist] [PATCH 5/6] gnupg: version bump 2.2.23 -> 2.3.7 Bruno Thomsen
@ 2022-08-05  7:50   ` Michael Olbrich
  0 siblings, 0 replies; 12+ messages in thread
From: Michael Olbrich @ 2022-08-05  7:50 UTC (permalink / raw)
  To: ptxdist; +Cc: Bruno Thomsen

Thanks, applied as 80b23fb0fd8d343c96414514c103da1a52e031e2.

Michael

[sent from post-receive hook]

On Fri, 05 Aug 2022 09:50:57 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> 3 options has been remove:
> --enable-gpg
> --disable-symcryptrun
> --with-tar=PATH
> 
> 6 options has been added:
> --disable-keyboxd
> --disable-tpm2d
> --enable-log-clock
> --with-tpm2daemon-pgm=PATH
> --with-keyboxd-pgm=PATH
> --with-tss=TSS
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20220729092654.3861-5-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/gnupg.make b/rules/gnupg.make
> index 25d267769443..acb4d2082050 100644
> --- a/rules/gnupg.make
> +++ b/rules/gnupg.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GNUPG) += gnupg
>  #
>  # Paths and names
>  #
> -GNUPG_VERSION	:= 2.2.23
> -GNUPG_MD5	:= a094ff856a53a9a9fd5465657d998079
> +GNUPG_VERSION	:= 2.3.7
> +GNUPG_MD5	:= 1c6a6722b9cececcf10ca4e24106e34b
>  GNUPG		:= gnupg-$(GNUPG_VERSION)
>  GNUPG_SUFFIX	:= tar.bz2
>  GNUPG_URL	:= \
> @@ -32,13 +32,13 @@ GNUPG_LICENSE	:= GPL-3.0-or-later
>  
>  GNUPG_CONF_TOOL := autoconf
>  GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \
> -	--enable-gpg \
>  	--disable-gpgsm \
>  	--disable-scdaemon \
>  	--disable-g13 \
>  	--disable-dirmngr \
> +	--disable-keyboxd \
> +	--disable-tpm2d \
>  	--disable-doc \
> -	--disable-symcryptrun \
>  	--disable-gpgtar \
>  	--disable-wks-tools \
>  	--disable-gpg-is-gpg2 \
> @@ -83,6 +83,7 @@ GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \
>  	--disable-nls \
>  	--enable-endian-check \
>  	--enable-optimization \
> +	--disable-log-clock \
>  	--disable-werror \
>  	--disable-all-tests \
>  	--disable-run-gnupg-user-socket \



^ permalink raw reply	[flat|nested] 12+ messages in thread

* [ptxdist] [PATCH 6/6] gnupg: add license files and update spdx identifiers
  2022-07-29  9:26 [ptxdist] [PATCH 1/6] npth: version bump 1.5 -> 1.6 Bruno Thomsen
                   ` (3 preceding siblings ...)
  2022-07-29  9:26 ` [ptxdist] [PATCH 5/6] gnupg: version bump 2.2.23 -> 2.3.7 Bruno Thomsen
@ 2022-07-29  9:26 ` Bruno Thomsen
  2022-07-29 10:38   ` Michael Olbrich
  2022-08-04 15:14 ` [ptxdist] [APPLIED] npth: version bump 1.5 -> 1.6 Michael Olbrich
  5 siblings, 1 reply; 12+ messages in thread
From: Bruno Thomsen @ 2022-07-29  9:26 UTC (permalink / raw)
  To: ptxdist; +Cc: Bruno Thomsen

Add license files with md5 hash.
Add more complete SPDX identifiers based on package COPYING* files.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 rules/gnupg.make | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/rules/gnupg.make b/rules/gnupg.make
index acb4d2082050..09132832791b 100644
--- a/rules/gnupg.make
+++ b/rules/gnupg.make
@@ -24,7 +24,14 @@ GNUPG_URL	:= \
 	ftp://ftp.gnupg.org/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX)
 GNUPG_SOURCE	:= $(SRCDIR)/$(GNUPG).$(GNUPG_SUFFIX)
 GNUPG_DIR	:= $(BUILDDIR)/$(GNUPG)
-GNUPG_LICENSE	:= GPL-3.0-or-later
+GNUPG_LICENSE	:= GPL-2.0-only AND GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only
+GNUPG_LICENSE_FILES := \
+	file://COPYING;md5=189af8afca6d6075ba6c9e0aa8077626 \
+	file://COPYING.CC0;md5=5364f88a4fb7a4d2d24c350fa08ddbad \
+	file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+	file://COPYING.LGPL21;md5=3c9636424f4ef15d6cb24f934190cfb0 \
+	file://COPYING.LGPL3;md5=a2b6bf2cb38ee52619e60f30a1fc7257 \
+	file://COPYING.other;md5=a231ccb4bb5b0651e08464e4e6f846d3
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.37.1




^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [ptxdist] [PATCH 6/6] gnupg: add license files and update spdx identifiers
  2022-07-29  9:26 ` [ptxdist] [PATCH 6/6] gnupg: add license files and update spdx identifiers Bruno Thomsen
@ 2022-07-29 10:38   ` Michael Olbrich
  0 siblings, 0 replies; 12+ messages in thread
From: Michael Olbrich @ 2022-07-29 10:38 UTC (permalink / raw)
  To: Bruno Thomsen; +Cc: ptxdist

On Fri, Jul 29, 2022 at 11:26:54AM +0200, Bruno Thomsen wrote:
> Add license files with md5 hash.
> Add more complete SPDX identifiers based on package COPYING* files.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> ---
>  rules/gnupg.make | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/gnupg.make b/rules/gnupg.make
> index acb4d2082050..09132832791b 100644
> --- a/rules/gnupg.make
> +++ b/rules/gnupg.make
> @@ -24,7 +24,14 @@ GNUPG_URL	:= \
>  	ftp://ftp.gnupg.org/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX)
>  GNUPG_SOURCE	:= $(SRCDIR)/$(GNUPG).$(GNUPG_SUFFIX)
>  GNUPG_DIR	:= $(BUILDDIR)/$(GNUPG)
> -GNUPG_LICENSE	:= GPL-3.0-or-later
> +GNUPG_LICENSE	:= GPL-2.0-only AND GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only

I think, those are all '-or-later'.

> +GNUPG_LICENSE_FILES := \
> +	file://COPYING;md5=189af8afca6d6075ba6c9e0aa8077626 \
> +	file://COPYING.CC0;md5=5364f88a4fb7a4d2d24c350fa08ddbad \

This is only used for tests, so I think we can skip it.

> +	file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> +	file://COPYING.LGPL21;md5=3c9636424f4ef15d6cb24f934190cfb0 \
> +	file://COPYING.LGPL3;md5=a2b6bf2cb38ee52619e60f30a1fc7257 \
> +	file://COPYING.other;md5=a231ccb4bb5b0651e08464e4e6f846d3

The licenses here should be listed as well. I'm seeing:

 - MIT
 - something for a test file, so skip it
 - Spencer-86
 - BSD-2-Clause-Views
 - Unicode-DFS-2016 (I think)

Michael

>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.37.1
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [ptxdist] [APPLIED] npth: version bump 1.5 -> 1.6
  2022-07-29  9:26 [ptxdist] [PATCH 1/6] npth: version bump 1.5 -> 1.6 Bruno Thomsen
                   ` (4 preceding siblings ...)
  2022-07-29  9:26 ` [ptxdist] [PATCH 6/6] gnupg: add license files and update spdx identifiers Bruno Thomsen
@ 2022-08-04 15:14 ` Michael Olbrich
  5 siblings, 0 replies; 12+ messages in thread
From: Michael Olbrich @ 2022-08-04 15:14 UTC (permalink / raw)
  To: ptxdist; +Cc: Bruno Thomsen

Thanks, applied as e4b0591eae74bd5b1b5b171524534321ffdfcee5.

Michael

[sent from post-receive hook]

On Thu, 04 Aug 2022 17:14:24 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Ensure GnuPG has up-to-date dependencies.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20220729092654.3861-1-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/npth.make b/rules/npth.make
> index 665668fd524f..baa9ab3aabab 100644
> --- a/rules/npth.make
> +++ b/rules/npth.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NPTH) += npth
>  #
>  # Paths and names
>  #
> -NPTH_VERSION		:= 1.5
> -NPTH_MD5		:= 9ba2dc4302d2f32c66737c43ed191b1b
> +NPTH_VERSION		:= 1.6
> +NPTH_MD5		:= 375d1a15ad969f32d25f1a7630929854
>  NPTH			:= npth-$(NPTH_VERSION)
>  NPTH_SUFFIX		:= tar.bz2
>  NPTH_URL		:= \



^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2022-08-05  7:51 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-29  9:26 [ptxdist] [PATCH 1/6] npth: version bump 1.5 -> 1.6 Bruno Thomsen
2022-07-29  9:26 ` [ptxdist] [PATCH 2/6] libgpg-error: version bump 1.42 -> 1.45 Bruno Thomsen
2022-08-04 15:14   ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-29  9:26 ` [ptxdist] [PATCH 3/6] libgcrypt: version bump 1.8.8 -> 1.10.1 Bruno Thomsen
2022-08-04 15:14   ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-29  9:26 ` [ptxdist] [PATCH 4/6] libksba: version bump 1.3.5 -> 1.6.0 Bruno Thomsen
2022-08-04 15:14   ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-29  9:26 ` [ptxdist] [PATCH 5/6] gnupg: version bump 2.2.23 -> 2.3.7 Bruno Thomsen
2022-08-05  7:50   ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-29  9:26 ` [ptxdist] [PATCH 6/6] gnupg: add license files and update spdx identifiers Bruno Thomsen
2022-07-29 10:38   ` Michael Olbrich
2022-08-04 15:14 ` [ptxdist] [APPLIED] npth: version bump 1.5 -> 1.6 Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox