From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex@linutronix.de>
Subject: [PATCH 11/23] pinentry: update 1.2.0 -> 1.2.1
Date: Thu, 27 Oct 2022 22:15:59 +0200 [thread overview]
Message-ID: <20221027201611.3644334-11-alex@linutronix.de> (raw)
In-Reply-To: <20221027201611.3644334-1-alex@linutronix.de>
libcap support dropped upstream.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/lib/oeqa/selftest/cases/oescripts.py | 9 ++++-----
.../gpg-error_pkconf.patch | 13 +++++++------
.../libassuan_pkgconf.patch | 0
.../{pinentry_1.2.0.bb => pinentry_1.2.1.bb} | 5 ++---
4 files changed, 13 insertions(+), 14 deletions(-)
rename meta/recipes-support/pinentry/{pinentry-1.2.0 => pinentry-1.2.1}/gpg-error_pkconf.patch (95%)
rename meta/recipes-support/pinentry/{pinentry-1.2.0 => pinentry-1.2.1}/libassuan_pkgconf.patch (100%)
rename meta/recipes-support/pinentry/{pinentry_1.2.0.bb => pinentry_1.2.1.bb} (87%)
diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py
index ea08d9aff8..5b0691a9ff 100644
--- a/meta/lib/oeqa/selftest/cases/oescripts.py
+++ b/meta/lib/oeqa/selftest/cases/oescripts.py
@@ -148,7 +148,7 @@ class OEListPackageconfigTests(OEScriptTests):
results = runCmd('%s/contrib/list-packageconfig-flags.py' % self.scripts_dir)
expected_endlines = []
expected_endlines.append("RECIPE NAME PACKAGECONFIG FLAGS")
- expected_endlines.append("pinentry gtk2 libcap ncurses qt secret")
+ expected_endlines.append("pinentry gtk2 ncurses qt secret")
expected_endlines.append("tar acl selinux")
self.check_endlines(results, expected_endlines)
@@ -166,11 +166,10 @@ class OEListPackageconfigTests(OEScriptTests):
def test_packageconfig_flags_option_all(self):
results = runCmd('%s/contrib/list-packageconfig-flags.py -a' % self.scripts_dir)
expected_endlines = []
- expected_endlines.append("pinentry-1.2.0")
- expected_endlines.append("PACKAGECONFIG ncurses libcap")
+ expected_endlines.append("pinentry-1.2.1")
+ expected_endlines.append("PACKAGECONFIG ncurses")
expected_endlines.append("PACKAGECONFIG[qt] --enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase")
expected_endlines.append("PACKAGECONFIG[gtk2] --enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0")
- expected_endlines.append("PACKAGECONFIG[libcap] --with-libcap, --without-libcap, libcap")
expected_endlines.append("PACKAGECONFIG[ncurses] --enable-ncurses --with-ncurses-include-dir=${STAGING_INCDIR}, --disable-ncurses, ncurses")
expected_endlines.append("PACKAGECONFIG[secret] --enable-libsecret, --disable-libsecret, libsecret")
@@ -180,7 +179,7 @@ class OEListPackageconfigTests(OEScriptTests):
results = runCmd('%s/contrib/list-packageconfig-flags.py -p' % self.scripts_dir)
expected_endlines = []
expected_endlines.append("RECIPE NAME PACKAGECONFIG FLAGS")
- expected_endlines.append("pinentry gtk2 libcap ncurses qt secret")
+ expected_endlines.append("pinentry gtk2 ncurses qt secret")
self.check_endlines(results, expected_endlines)
diff --git a/meta/recipes-support/pinentry/pinentry-1.2.0/gpg-error_pkconf.patch b/meta/recipes-support/pinentry/pinentry-1.2.1/gpg-error_pkconf.patch
similarity index 95%
rename from meta/recipes-support/pinentry/pinentry-1.2.0/gpg-error_pkconf.patch
rename to meta/recipes-support/pinentry/pinentry-1.2.1/gpg-error_pkconf.patch
index 507c0c3917..bb7e43b1e7 100644
--- a/meta/recipes-support/pinentry/pinentry-1.2.0/gpg-error_pkconf.patch
+++ b/meta/recipes-support/pinentry/pinentry-1.2.1/gpg-error_pkconf.patch
@@ -1,4 +1,4 @@
-From 54a4c9d3e5f1897ed4b978d5cdee646ca7a4f637 Mon Sep 17 00:00:00 2001
+From 785777dc0bc6b69ff68c91547ec6b6634049662f Mon Sep 17 00:00:00 2001
From: Armin Kuster <akuster@mvista.com>
Date: Fri, 2 Sep 2005 11:50:01 +0000
Subject: [PATCH] Add gtk+, avahi, dbus-0.34 (.36 coming soon) and
@@ -11,14 +11,14 @@ Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Armin Kuster <akuster@mvista.com>
---
- m4/gpg-error.m4 | 159 ++----------------------------------------------
- 1 file changed, 4 insertions(+), 155 deletions(-)
+ m4/gpg-error.m4 | 160 ++----------------------------------------------
+ 1 file changed, 4 insertions(+), 156 deletions(-)
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
-index 56a5d07..c0bec1f 100644
+index 4b5cd40..7dfbb83 100644
--- a/m4/gpg-error.m4
+++ b/m4/gpg-error.m4
-@@ -26,159 +26,12 @@ dnl config script does not match the host specification the script
+@@ -26,160 +26,12 @@ dnl config script does not match the host specification the script
dnl is added to the gpg_config_script_warn variable.
dnl
AC_DEFUN([AM_PATH_GPG_ERROR],
@@ -135,6 +135,7 @@ index 56a5d07..c0bec1f 100644
- fi
- elif test "$GPG_ERROR_CONFIG" != "no"; then
- gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
+- unset GPGRT_CONFIG
- fi
- if test "$GPG_ERROR_CONFIG" != "no"; then
- req_major=`echo $min_gpg_error_version | \
@@ -182,7 +183,7 @@ index 56a5d07..c0bec1f 100644
if test x"$gpg_error_config_host" != xnone ; then
if test x"$gpg_error_config_host" != x"$host" ; then
AC_MSG_WARN([[
-@@ -193,10 +46,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
+@@ -194,10 +46,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
fi
fi
else
diff --git a/meta/recipes-support/pinentry/pinentry-1.2.0/libassuan_pkgconf.patch b/meta/recipes-support/pinentry/pinentry-1.2.1/libassuan_pkgconf.patch
similarity index 100%
rename from meta/recipes-support/pinentry/pinentry-1.2.0/libassuan_pkgconf.patch
rename to meta/recipes-support/pinentry/pinentry-1.2.1/libassuan_pkgconf.patch
diff --git a/meta/recipes-support/pinentry/pinentry_1.2.0.bb b/meta/recipes-support/pinentry/pinentry_1.2.1.bb
similarity index 87%
rename from meta/recipes-support/pinentry/pinentry_1.2.0.bb
rename to meta/recipes-support/pinentry/pinentry_1.2.1.bb
index e6cc71a547..7daf80f36e 100644
--- a/meta/recipes-support/pinentry/pinentry_1.2.0.bb
+++ b/meta/recipes-support/pinentry/pinentry_1.2.1.bb
@@ -16,14 +16,13 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
file://gpg-error_pkconf.patch \
"
-SRC_URI[sha256sum] = "10072045a3e043d0581f91cd5676fcac7ffee957a16636adedaa4f583a616470"
+SRC_URI[sha256sum] = "457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067"
inherit autotools pkgconfig
-PACKAGECONFIG ??= "ncurses libcap"
+PACKAGECONFIG ??= "ncurses"
PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING_INCDIR}, --disable-ncurses, ncurses"
-PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap"
PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase"
PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0"
--
2.30.2
next prev parent reply other threads:[~2022-10-27 20:16 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-27 20:15 [PATCH 01/23] unfs3: correct upstream version check Alexander Kanavin
2022-10-27 20:15 ` [PATCH 02/23] gnu-config: update to latest revision Alexander Kanavin
2022-10-27 20:15 ` [PATCH 03/23] go: update 1.19 -> 1.19.1 Alexander Kanavin
2022-10-28 16:13 ` [OE-core] " Alexandre Belloni
2022-10-27 20:15 ` [PATCH 04/23] llvm: update 14.0.6 -> 15.0.1 Alexander Kanavin
2022-10-27 20:15 ` [PATCH 05/23] grep: update 3.7 -> 3.8 Alexander Kanavin
2022-10-27 20:15 ` [PATCH 06/23] hdparm: update 9.64 -> 9.65 Alexander Kanavin
2022-10-27 20:15 ` [PATCH 07/23] stress-ng: update 0.14.03 -> 0.14.06 Alexander Kanavin
2022-10-27 20:15 ` [PATCH 08/23] vulkan: update 1.3.216.0 -> 1.3.224.1 Alexander Kanavin
2022-10-27 20:15 ` [PATCH 09/23] wayland-utils: update 1.0.0 -> 1.1.0 Alexander Kanavin
2022-10-27 20:15 ` [PATCH 10/23] libxft: update 2.3.4 -> 2.3.6 Alexander Kanavin
2022-10-27 20:15 ` Alexander Kanavin [this message]
2022-10-27 20:16 ` [PATCH 12/23] ovmf: upgrade edk2-stable202205 -> edk2-stable202208 Alexander Kanavin
2022-10-27 20:16 ` [PATCH 13/23] cmake: update 3.24.0 -> 3.24.2 Alexander Kanavin
2022-10-27 20:16 ` [PATCH 14/23] jquery: upgrade 3.6.0 -> 3.6.1 Alexander Kanavin
2022-10-27 20:16 ` [PATCH 15/23] python3-dbus: upgrade 1.2.18 -> 1.3.2 Alexander Kanavin
2022-10-27 20:16 ` [PATCH 16/23] python3-hatch-fancy-pypi-readme: add a recipe Alexander Kanavin
2022-10-27 20:16 ` [PATCH 17/23] python3-jsonschema: upgrade 4.9.1 -> 4.16.0 Alexander Kanavin
2022-10-27 20:16 ` [PATCH 18/23] shadow: update 4.12.1 -> 4.12.3 Alexander Kanavin
2022-10-27 20:16 ` [PATCH 19/23] lttng-modules: upgrade 2.13.4 -> 2.13.5 Alexander Kanavin
2022-10-27 20:16 ` [PATCH 20/23] libsoup: upgrade 3.0.7 -> 3.2.0 Alexander Kanavin
2022-10-27 20:16 ` [PATCH 21/23] libxslt: upgrade 1.1.35 -> 1.1.37 Alexander Kanavin
2022-10-27 20:16 ` [PATCH 22/23] quilt: backport a patch to address grep 3.8 failures Alexander Kanavin
2022-10-27 20:16 ` [PATCH 23/23] python3: update 3.10.6 -> 3.11.0 Alexander Kanavin
2022-10-28 2:00 ` [OE-core] " Tim Orling
2022-10-28 4:45 ` Alexander Kanavin
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=20221027201611.3644334-11-alex@linutronix.de \
--to=alex.kanavin@gmail.com \
--cc=alex@linutronix.de \
--cc=openembedded-core@lists.openembedded.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.