* [gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/files/
@ 2015-08-16 21:01 Kristian Fiskerstrand
0 siblings, 0 replies; 4+ messages in thread
From: Kristian Fiskerstrand @ 2015-08-16 21:01 UTC (permalink / raw
To: gentoo-commits
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
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/files/
@ 2016-07-07 7:47 Patrice Clement
0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2016-07-07 7:47 UTC (permalink / raw
To: gentoo-commits
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
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/files/
@ 2024-06-30 0:00 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2024-06-30 0:00 UTC (permalink / raw
To: gentoo-commits
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
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/files/
@ 2024-10-10 20:29 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2024-10-10 20:29 UTC (permalink / raw
To: gentoo-commits
commit: a182cb247633c5e881a090a35be7e1db61fc1fc2
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Oct 7 17:41:22 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 20:20:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a182cb24
app-crypt/pinentry: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/pinentry-1.2.1-automagic-capslock.patch | 99 -------
.../files/pinentry-1.2.1-include-memory.patch | 313 ---------------------
2 files changed, 412 deletions(-)
diff --git a/app-crypt/pinentry/files/pinentry-1.2.1-automagic-capslock.patch b/app-crypt/pinentry/files/pinentry-1.2.1-automagic-capslock.patch
deleted file mode 100644
index 081fad60eb03..000000000000
--- a/app-crypt/pinentry/files/pinentry-1.2.1-automagic-capslock.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-https://dev.gnupg.org/T6161
-https://bugs.gentoo.org/819939
-https://bugs.gentoo.org/837719
---- a/configure.ac
-+++ b/configure.ac
-@@ -508,8 +508,12 @@ fi
- dnl
- dnl Check for libX11 library
- dnl
-+AC_ARG_WITH(x,
-+ AS_HELP_STRING([--with-x],[use libX11]),
-+ [want_x11=$withval], [want_x11=maybe])
-+
- have_x11=no
--if test "$have_w32_system" != "yes"; then
-+AS_IF([test "$have_w32_system" != "yes" && test "$want_x11" != "no"], [
- PKG_CHECK_MODULES(
- LIBX11,
- [x11],
-@@ -519,18 +523,20 @@ if test "$have_w32_system" != "yes"; then
- have_x11=no
- ]
- )
-+])
-
-- if test "$have_x11" = "yes"; then
-- AC_DEFINE(HAVE_X11, 1,
-- [The pinentries can optionally use x11.])
-- fi
--fi
-+AS_IF([test "$have_x11" = "yes"], [AC_DEFINE(HAVE_X11, 1, [The pinentries can optionally use x11.])])
-
- dnl
- dnl Check for KF5WaylandClient library
- dnl
-+
-+AC_ARG_ENABLE(kf5-wayland,
-+ AS_HELP_STRING([--enable-kf5-wayland],[use KF5WaylandClient for capslock indication on Wayland]),
-+ [want_kf5_wayland=$enableval], [want_kf5_wayland=maybe])
-+
- have_kf5waylandclient=no
--if test "$have_w32_system" != "yes"; then
-+AS_IF([test "$have_w32_system" != "yes" && test "$want_kf5_wayland" != "no"], [
- PKG_CHECK_MODULES(
- KF5WAYLANDCLIENT,
- [KF5WaylandClient >= 5.60],
-@@ -540,7 +546,7 @@ if test "$have_w32_system" != "yes"; then
- have_kf5waylandclient=no
- ]
- )
--fi
-+])
-
- dnl
- dnl Check for Qt5 pinentry program.
---- a/m4/qt.m4
-+++ b/m4/qt.m4
-@@ -33,6 +33,10 @@ AC_DEFUN([FIND_QT],
- enable_pinentry_qt5=$enableval,
- enable_pinentry_qt5="try")
-
-+ AC_ARG_ENABLE(qtx11extras,
-+ AS_HELP_STRING([--enable-qtx11extras],[use Qt5X11Extras for capslock indication on X11]),
-+ [want_qtx11extras=$enableval], [want_qtx11extras=maybe])
-+
- have_qt5_libs="no";
- require_qt_cpp11="no";
-
-@@ -63,20 +67,22 @@ AC_DEFUN([FIND_QT],
- fi
- fi
-
-- if test "$have_x11" = "yes"; then
-+ have_qt5_x11extras=no
-+ AS_IF([test "$have_x11" = "yes" && test "$want_qtx11extras" != "no"], [
- PKG_CHECK_MODULES(
- PINENTRY_QT_X11_EXTRAS,
- Qt5X11Extras >= 5.1.0,
- [have_qt5_x11extras="yes"],
-- [
-- AC_MSG_WARN([pinentry-qt will be built without Caps Lock warning on X11])
-- have_qt5_x11extras="no"
-- ])
-- if test "$have_qt5_x11extras" = "yes"; then
-+ [have_qt5_x11extras="no"]
-+ )
-+ ])
-+
-+ AS_IF([test "$have_qt5_x11extras" = "yes"], [
- PINENTRY_QT_CFLAGS="$LIBX11_CFLAGS $PINENTRY_QT_CFLAGS $PINENTRY_QT_X11_EXTRAS_CFLAGS"
- PINENTRY_QT_LIBS="$LIBX11_LIBS $PINENTRY_QT_LIBS $PINENTRY_QT_X11_EXTRAS_LIBS"
-- fi
-- fi
-+ ], [
-+ AC_MSG_WARN([pinentry-qt will be built without Caps Lock warning on X11])
-+ ])
-
- AC_CHECK_TOOL(MOC, moc)
- AC_MSG_CHECKING([moc version])
diff --git a/app-crypt/pinentry/files/pinentry-1.2.1-include-memory.patch b/app-crypt/pinentry/files/pinentry-1.2.1-include-memory.patch
deleted file mode 100644
index 8c67950af6f3..000000000000
--- a/app-crypt/pinentry/files/pinentry-1.2.1-include-memory.patch
+++ /dev/null
@@ -1,313 +0,0 @@
-https://bugs.gentoo.org/925557
-https://dev.gnupg.org/D566
-
-From 8ab1682e80a2b4185ee9ef66cbb44340245966fc Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Mon, 20 Mar 2023 08:31:04 +0100
-Subject: [PATCH] Fix problem with inclusion of wrong memory.h.
-
-* secmem/memory.h: Rename to ...
-* secmem/secmem.h: this.
-* pinentry/pinentry.h: Include secmem.h. Remove almost all inclusions
-of memory.h or replace them by "../secmem/secmem.h".
---
-
-See-also: https://dev.gnupg.org/D566
----
- fltk/main.cxx | 1 -
- fltk/pinwindow.cxx | 2 +-
- gnome3/pinentry-gnome3.c | 2 --
- pinentry/password-cache.c | 2 +-
- pinentry/pinentry-curses.c | 7 +++----
- pinentry/pinentry-emacs.c | 2 +-
- pinentry/pinentry.c | 1 -
- pinentry/pinentry.h | 2 ++
- secmem/Makefile.am | 2 +-
- secmem/secmem++.h | 2 +-
- secmem/secmem.c | 2 +-
- secmem/{memory.h => secmem.h} | 0
- tqt/secqstring.h | 2 +-
- tty/pinentry-tty.c | 1 -
- w32/main.c | 1 -
- 15 files changed, 12 insertions(+), 17 deletions(-)
- rename secmem/{memory.h => secmem.h} (100%)
-
---- a/fltk/main.cxx 2019-03-05 23:09:48.000000000 -0800
-+++ b/fltk/main.cxx 2024-02-26 11:02:47.822134762 -0800
-@@ -34,7 +34,6 @@
- #include <getopt.h>
- #include <assert.h>
-
--#include "memory.h"
- #include <memory>
-
- #include <pinentry.h>
---- a/fltk/pinwindow.cxx 2017-12-03 08:13:05.000000000 -0800
-+++ b/fltk/pinwindow.cxx 2024-02-26 11:02:47.822134762 -0800
-@@ -32,7 +32,7 @@
- #include <FL/Fl_Return_Button.H>
- #include <FL/Fl_Pixmap.H>
-
--#include "memory.h"
-+#include "../secmem/secmem.h"
-
- #include "encrypt.xpm"
- #include "icon.xpm"
---- a/gnome3/pinentry-gnome3.c 2022-08-24 03:31:59.000000000 -0700
-+++ b/gnome3/pinentry-gnome3.c 2024-02-26 11:02:47.822134762 -0800
-@@ -30,8 +30,6 @@
-
- #include <assuan.h>
-
--#include "memory.h"
--
- #include "pinentry.h"
-
- #ifdef FALLBACK_CURSES
---- a/pinentry/password-cache.c 2017-12-03 08:13:15.000000000 -0800
-+++ b/pinentry/password-cache.c 2024-02-26 11:02:47.822134762 -0800
-@@ -31,7 +31,7 @@
- #endif
-
- #include "password-cache.h"
--#include "memory.h"
-+#include "../secmem/secmem.h"
-
- #ifdef HAVE_LIBSECRET
- static const SecretSchema *
---- a/pinentry/pinentry.c 2022-08-24 03:31:59.000000000 -0700
-+++ b/pinentry/pinentry.c 2024-02-26 11:02:47.822134762 -0800
-@@ -44,7 +44,6 @@
-
- #include <assuan.h>
-
--#include "memory.h"
- #include "secmem-util.h"
- #include "argparse.h"
- #include "pinentry.h"
---- a/pinentry/pinentry-curses.c 2022-08-24 03:31:59.000000000 -0700
-+++ b/pinentry/pinentry-curses.c 2024-02-26 11:02:47.822134762 -0800
-@@ -62,8 +62,6 @@
- #include <utime.h>
- #endif /*HAVE_UTIME_H*/
-
--#include <memory.h>
--
- #ifdef HAVE_WCHAR_H
- #include <wchar.h>
- #endif /*HAVE_WCHAR_H*/
-@@ -1017,10 +1015,11 @@
- #ifndef HAVE_DOSISH_SYSTEM
- int no_input = 1;
- #endif
--
- #ifdef HAVE_NCURSESW
- char *old_ctype = NULL;
-+#endif
-
-+#ifdef HAVE_NCURSESW
- if (pinentry->lc_ctype)
- {
- old_ctype = strdup (setlocale (LC_CTYPE, NULL));
---- a/pinentry/pinentry-emacs.c 2021-08-11 04:16:10.000000000 -0700
-+++ b/pinentry/pinentry-emacs.c 2024-02-26 11:02:47.822134762 -0800
-@@ -48,7 +48,7 @@
- #include <assuan.h>
-
- #include "pinentry-emacs.h"
--#include "memory.h"
-+#include "../secmem/secmem.h"
- #include "secmem-util.h"
-
- /* The communication mechanism is similar to emacsclient, but there
---- a/pinentry/pinentry.h 2022-08-24 03:31:59.000000000 -0700
-+++ b/pinentry/pinentry.h 2024-02-26 11:02:47.822134762 -0800
-@@ -21,6 +21,8 @@
- #ifndef PINENTRY_H
- #define PINENTRY_H
-
-+#include "../secmem/secmem.h"
-+
- #ifdef __cplusplus
- extern "C" {
- #if 0
---- a/secmem/Makefile.am 2017-12-03 08:13:05.000000000 -0800
-+++ b/secmem/Makefile.am 2024-02-26 11:02:47.822134762 -0800
-@@ -22,7 +22,7 @@
- noinst_LIBRARIES = libsecmem.a
-
- libsecmem_a_SOURCES = \
-- memory.h \
-+ secmem.h \
- secmem-util.h \
- util.h \
- secmem.c \
---- a/secmem/memory.h 2017-12-03 08:13:05.000000000 -0800
-+++ b/secmem/memory.h 1969-12-31 16:00:00.000000000 -0800
-@@ -1,55 +0,0 @@
--/* Quintuple Agent secure memory allocation
-- * Copyright (C) 1998,1999 Free Software Foundation, Inc.
-- * Copyright (C) 1999,2000 Robert Bihlmeyer <robbe@orcus.priv.at>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, see <https://www.gnu.org/licenses/>.
-- * SPDX-License-Identifier: GPL-2.0+
-- */
--
--#ifndef _MEMORY_H
--#define _MEMORY_H
--
--#include <sys/types.h>
--
--#ifdef __cplusplus
--extern "C" {
--#if 0
--}
--#endif
--#endif
--
--
--/* values for flags, hardcoded in secmem.c */
--#define SECMEM_WARN 0
--#define SECMEM_DONT_WARN 1
--#define SECMEM_SUSPEND_WARN 2
--
--void secmem_init( size_t npool );
--void secmem_term( void );
--void *secmem_malloc( size_t size );
--void *secmem_realloc( void *a, size_t newsize );
--void secmem_free( void *a );
--int m_is_secure( const void *p );
--void secmem_dump_stats(void);
--void secmem_set_flags( unsigned flags );
--unsigned secmem_get_flags(void);
--size_t secmem_get_max_size (void);
--
--#if 0
--{
--#endif
--#ifdef __cplusplus
--}
--#endif
--#endif /* _MEMORY_H */
---- a/secmem/secmem.c 2022-08-24 03:31:59.000000000 -0700
-+++ b/secmem/secmem.c 2024-02-26 11:02:47.822134762 -0800
-@@ -34,7 +34,7 @@
- #endif
- #include <string.h>
-
--#include "memory.h"
-+#include "secmem.h"
-
- #ifdef ORIGINAL_GPG_VERSION
- #include "types.h"
---- a/secmem/secmem++.h 2017-12-03 08:13:05.000000000 -0800
-+++ b/secmem/secmem++.h 2024-02-26 11:02:47.822134762 -0800
-@@ -19,7 +19,7 @@
- #ifndef __SECMEM_SECMEMPP_H__
- #define __SECMEM_SECMEMPP_H__
-
--#include "secmem/memory.h"
-+#include "../secmem/secmem.h"
- #include <cstddef>
-
- namespace secmem {
---- a/secmem/secmem.h 1969-12-31 16:00:00.000000000 -0800
-+++ b/secmem/secmem.h 2024-02-26 11:02:47.822134762 -0800
-@@ -0,0 +1,55 @@
-+/* Quintuple Agent secure memory allocation
-+ * Copyright (C) 1998,1999 Free Software Foundation, Inc.
-+ * Copyright (C) 1999,2000 Robert Bihlmeyer <robbe@orcus.priv.at>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
-+ * SPDX-License-Identifier: GPL-2.0+
-+ */
-+
-+#ifndef _MEMORY_H
-+#define _MEMORY_H
-+
-+#include <sys/types.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#if 0
-+}
-+#endif
-+#endif
-+
-+
-+/* values for flags, hardcoded in secmem.c */
-+#define SECMEM_WARN 0
-+#define SECMEM_DONT_WARN 1
-+#define SECMEM_SUSPEND_WARN 2
-+
-+void secmem_init( size_t npool );
-+void secmem_term( void );
-+void *secmem_malloc( size_t size );
-+void *secmem_realloc( void *a, size_t newsize );
-+void secmem_free( void *a );
-+int m_is_secure( const void *p );
-+void secmem_dump_stats(void);
-+void secmem_set_flags( unsigned flags );
-+unsigned secmem_get_flags(void);
-+size_t secmem_get_max_size (void);
-+
-+#if 0
-+{
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif /* _MEMORY_H */
---- a/tqt/secqstring.h 2017-12-03 08:33:12.000000000 -0800
-+++ b/tqt/secqstring.h 2024-02-26 11:02:47.822134762 -0800
-@@ -65,7 +65,7 @@
-
- extern "C"
- {
--#include "memory.h"
-+#include "../secmem/secmem.h"
- }
-
- /* We need the original qchar and qstring for transparent conversion
---- a/tty/pinentry-tty.c 2021-08-11 04:16:10.000000000 -0700
-+++ b/tty/pinentry-tty.c 2024-02-26 11:02:47.822134762 -0800
-@@ -41,7 +41,6 @@
- #include <gpg-error.h>
-
- #include "pinentry.h"
--#include "memory.h"
-
- #ifndef HAVE_DOSISH_SYSTEM
- static int timed_out;
---- a/w32/main.c 2022-08-24 03:31:59.000000000 -0700
-+++ b/w32/main.c 2024-02-26 11:02:47.822134762 -0800
-@@ -29,7 +29,6 @@
- #endif
-
- #include "pinentry.h"
--#include "memory.h"
-
- #include "resource.h"
- /* #include "msgcodes.h" */
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-10 20:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-16 21:01 [gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/files/ Kristian Fiskerstrand
-- strict thread matches above, loose matches on Subject: below --
2016-07-07 7:47 Patrice Clement
2024-06-30 0:00 Conrad Kostecki
2024-10-10 20:29 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox