[gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/files/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/files/

[Kristian Fiskerstrand]

commit:     8d7d872ca8f29c7d5034940ae54dac915fa06357
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 20:58:31 2015 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 20:59:27 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d7d872c

app-crypt/pinentry: Remove unused patch file

pinentry-0.9.4-actually_respect_users_pm.patch is no longer used
since the bump to 0.9.5. Cleaning up.

Package-Manager: portage-2.2.20.1

 .../pinentry-0.9.4-actually_respect_users_pm.patch | 49 ----------------------
 1 file changed, 49 deletions(-)

diff --git a/app-crypt/pinentry/files/pinentry-0.9.4-actually_respect_users_pm.patch b/app-crypt/pinentry/files/pinentry-0.9.4-actually_respect_users_pm.patch
deleted file mode 100644
index cfc96a3..0000000
--- a/app-crypt/pinentry/files/pinentry-0.9.4-actually_respect_users_pm.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 444598586d0abf70d5a27d2aafcd6c14989621db Mon Sep 17 00:00:00 2001
-From: "Neal H. Walfield" <neal@gnu.org>
-Date: Sun, 7 Jun 2015 14:36:39 +0200
-Subject: [PATCH] gnome3: Actually respect the user's choice of using a
- password manager.
-
-* gnome3/pinentry-gnome3.c (create_prompt) [HAVE_LIBSECRET]: Only show
-the libsecret prompt in this case.
-(gnome3_cmd_handler) [HAVE_LIBSECRET]: Set PE->MAY_CACHE_PASSWORD
-according to the user's choice.
----
- gnome3/pinentry-gnome3.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/gnome3/pinentry-gnome3.c b/gnome3/pinentry-gnome3.c
-index 74ec89c..0fea8f0 100644
---- a/gnome3/pinentry-gnome3.c
-+++ b/gnome3/pinentry-gnome3.c
-@@ -145,6 +145,7 @@ create_prompt (pinentry_t pe, int confirm)
-   /* XXX: gcr expects a string; we have a int.  */
-   // gcr_prompt_set_caller_window (prompt, pe->parent_wid);
- 
-+#ifdef HAVE_LIBSECRET
-   if (! confirm && pe->allow_external_password_cache && pe->keyinfo)
-     {
-       if (pe->default_pwmngr)
-@@ -157,6 +158,7 @@ create_prompt (pinentry_t pe, int confirm)
- 	gcr_prompt_set_choice_label
- 	  (prompt, "Automatically unlock this key, whenever I'm logged in");
-     }
-+#endif
- 
-   return prompt;
- }
-@@ -203,6 +205,11 @@ gnome3_cmd_handler (pinentry_t pe)
- 	  if (pe->repeat_passphrase)
- 	    pe->repeat_okay = 1;
- 
-+#ifdef HAVE_LIBSECRET
-+	  if (pe->allow_external_password_cache && pe->keyinfo)
-+	    pe->may_cache_password = gcr_prompt_get_choice_chosen (prompt);
-+#endif
-+
- 	  ret = 1;
- 	}
-     }
--- 
-2.1.4
-

[gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/files/

[Patrice Clement]

commit:     8a489bfd6c39e400be5d9dd34215452bb2b3f7c3
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jul  3 17:20:08 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 07:18:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a489bfd

app-crypt/pinentry: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/1826

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../pinentry-0.9.6-Remove-detection-of-Qt5.patch   | 60 ----------------------
 1 file changed, 60 deletions(-)

diff --git a/app-crypt/pinentry/files/pinentry-0.9.6-Remove-detection-of-Qt5.patch b/app-crypt/pinentry/files/pinentry-0.9.6-Remove-detection-of-Qt5.patch
deleted file mode 100644
index 0ab9160..0000000
--- a/app-crypt/pinentry/files/pinentry-0.9.6-Remove-detection-of-Qt5.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From eb2cd9487749be01a1ad34ce6036366208147290 Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <kristian.fiskerstrand@sumptuouscapital.com>
-Date: Mon, 21 Sep 2015 19:09:04 +0200
-Subject: [PATCH] m4/qt.m4: Remove detection of Qt5
-
----
- m4/qt.m4 | 36 +-----------------------------------
- 1 file changed, 1 insertion(+), 35 deletions(-)
-
-diff --git a/m4/qt.m4 b/m4/qt.m4
-index 0a7ea99..2982bb8 100644
---- a/m4/qt.m4
-+++ b/m4/qt.m4
-@@ -28,42 +28,8 @@ dnl The moc lookup code is based on libpoppler (rev. d821207)
- 
- AC_DEFUN([FIND_QT],
- [
--  PKG_CHECK_MODULES(PINENTRY_QT,
--                    Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Widgets >= 5.0.0,
--                    [have_qt5_libs="yes"],
--                    [have_qt5_libs="no"])
-+  have_qt5_libs="no"
- 
--  if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then
--    PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -fpic"
--  fi
--
--  if test "$have_qt5_libs" = "yes"; then
--    AC_CHECK_TOOL(MOC, moc)
--    AC_MSG_CHECKING([moc version])
--    mocversion=`$MOC -v 2>&1`
--    mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
--    if test x"$mocversiongrep" != x"$mocversion"; then
--      AC_MSG_RESULT([no])
--      # moc was not the qt5 one, try with moc-qt5
--      AC_CHECK_TOOL(MOC2, moc-qt5)
--      mocversion=`$MOC2 -v 2>&1`
--      mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
--      if test x"$mocversiongrep" != x"$mocversion"; then
--        AC_CHECK_TOOL(QTCHOOSER, qtchooser)
--        qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
--        mocversion=`$qt5tooldir/moc -v 2>&1`
--        mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
--        if test x"$mocversiongrep" != x"$mocversion"; then
--          # no valid moc found
--          have_qt5_libs="no";
--        else
--          MOC=$qt5tooldir/moc
--        fi
--      else
--        MOC=$MOC2
--      fi
--    fi
--  fi
-   if test "$have_qt5_libs" != "yes"; then
-     PKG_CHECK_MODULES(PINENTRY_QT,
-                       QtCore >= 4.4.0 QtGui >= 4.4.0,
--- 
-2.4.6
-

[gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/files/

[Conrad Kostecki]

commit:     b45977634fea6bd3bd1c42e769e614322b6ec40c
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Jun 29 09:13:16 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 23:56:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4597763

app-crypt/pinentry: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/pinentry-1.2.1-libassuan-3.patch         | 46 ----------------------
 1 file changed, 46 deletions(-)

diff --git a/app-crypt/pinentry/files/pinentry-1.2.1-libassuan-3.patch b/app-crypt/pinentry/files/pinentry-1.2.1-libassuan-3.patch
deleted file mode 100644
index 35b71998e87a..000000000000
--- a/app-crypt/pinentry/files/pinentry-1.2.1-libassuan-3.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://bugs.gentoo.org/934771
-https://git.gnupg.org/cgi-bin/gitweb.cgi?p=pinentry.git;a=commit;h=a39ba412ab24721d4edb6476156371f8bf1d3ff9
-
-From a39ba412ab24721d4edb6476156371f8bf1d3ff9 Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka <gniibe@fsij.org>
-Date: Fri, 28 Jul 2023 14:09:11 +0900
-Subject: [PATCH] build: Update libassuan.m4 for libassuan version 3 in future.
-
-* m4/libassuan.m4: Update from libassuan master.
-
---
-
-New libassuan 3 has backward compatible API.
-
-Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---- a/m4/libassuan.m4
-+++ b/m4/libassuan.m4
-@@ -9,7 +9,7 @@ dnl This file is distributed in the hope that it will be useful, but
- dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
- dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- dnl SPDX-License-Identifier: FSFULLR
--# Last-changed: 2022-11-01
-+# Last-changed: 2023-07-26
- 
- dnl
- dnl Common code used for libassuan detection [internal]
-@@ -89,6 +89,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
- 
-   if test $ok = yes; then
-     AC_MSG_RESULT([yes ($libassuan_config_version)])
-+    AC_DEFINE(LIBASSUAN_API_REQUESTED, $req_libassuan_api, Requested API version for libassuan)
-   else
-     AC_MSG_RESULT(no)
-   fi
-@@ -104,6 +105,8 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
-         AC_MSG_CHECKING([LIBASSUAN API version])
-         if test "$req_libassuan_api" -eq "$tmp" ; then
-           AC_MSG_RESULT(okay)
-+        elif test "$req_libassuan_api" -eq 2 -a "$tmp" -eq 3; then
-+          AC_MSG_RESULT(okay)
-         else
-           ok=no
-           AC_MSG_RESULT([does not match.  want=$req_libassuan_api got=$tmp.])
--- 
-2.30.2
-