Re: [ptxdist] [APPLIED] libgpg-error: version bump 1.42 -> 1.45

[Michael Olbrich <m.olbrich@pengutronix.de>]

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	:= \