From: Bruno Thomsen <bruno.thomsen@gmail.com>
To: ptxdist@pengutronix.de
Cc: Bruno Thomsen <bruno.thomsen@gmail.com>
Subject: [ptxdist] [PATCH 2/6] libgpg-error: version bump 1.42 -> 1.45
Date: Fri, 29 Jul 2022 11:26:50 +0200 [thread overview]
Message-ID: <20220729092654.3861-2-bruno.thomsen@gmail.com> (raw)
In-Reply-To: <20220729092654.3861-1-bruno.thomsen@gmail.com>
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
next prev parent reply other threads:[~2022-07-29 9:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2022-08-04 15:14 ` [ptxdist] [APPLIED] libgpg-error: version bump 1.42 -> 1.45 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220729092654.3861-2-bruno.thomsen@gmail.com \
--to=bruno.thomsen@gmail.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox