summaryrefslogtreecommitdiff
path: root/security/pinentry/files
diff options
context:
space:
mode:
Diffstat (limited to 'security/pinentry/files')
-rw-r--r--security/pinentry/files/patch-Makefile.am11
-rw-r--r--security/pinentry/files/patch-assuan::assuan-handler.c27
-rw-r--r--security/pinentry/files/patch-assuan::assuan-socket-connect.c10
-rw-r--r--security/pinentry/files/patch-assuan::assuan-socket-server.c10
-rw-r--r--security/pinentry/files/patch-assuan::mkerrors10
-rw-r--r--security/pinentry/files/patch-common::maperrors.c10
-rw-r--r--security/pinentry/files/patch-configure.ac57
-rw-r--r--security/pinentry/files/patch-curses::Makefile.am12
-rw-r--r--security/pinentry/files/patch-gtk::Makefile.am11
-rw-r--r--security/pinentry/files/patch-pinentry::pinentry.c13
-rw-r--r--security/pinentry/files/patch-qt::Makefile.am13
-rw-r--r--security/pinentry/files/patch-qt::main.cpp11
-rw-r--r--security/pinentry/files/patch-qt::pinentrycontroller.cpp13
-rw-r--r--security/pinentry/files/patch-secmem::secmem.c10
14 files changed, 0 insertions, 218 deletions
diff --git a/security/pinentry/files/patch-Makefile.am b/security/pinentry/files/patch-Makefile.am
deleted file mode 100644
index 1d5529d8cea6..000000000000
--- a/security/pinentry/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig Thu Jan 30 07:49:00 2003
-+++ Makefile.am Thu Jan 30 07:50:41 2003
-@@ -39,7 +39,7 @@
- pinentry_qt =
- endif
-
--SUBDIRS = assuan secmem pinentry ${pinentry_curses} \
-+SUBDIRS = jnlib assuan common secmem pinentry ${pinentry_curses} \
- ${pinentry_gtk} ${pinentry_qt} doc
-
- signed-dist: $(distdir).tar.gz.sig
diff --git a/security/pinentry/files/patch-assuan::assuan-handler.c b/security/pinentry/files/patch-assuan::assuan-handler.c
deleted file mode 100644
index 3c73877a6b13..000000000000
--- a/security/pinentry/files/patch-assuan::assuan-handler.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- assuan/assuan-handler.c.orig Thu Jan 30 07:58:09 2003
-+++ assuan/assuan-handler.c Thu Jan 30 07:58:27 2003
-@@ -29,6 +29,24 @@
- #define digitp(a) ((a) >= '0' && (a) <= '9')
-
-
-+#if !HAVE_FOPENCOOKIE
-+/* Provide structure for our dummy replacement function. Usually this
-+ is defined in ../common/util.h but assuan should be self
-+ contained. */
-+/* Fixme: Remove fopencoookie :-(( */
-+typedef struct
-+{
-+ ssize_t (*read)(void*,char*,size_t);
-+ ssize_t (*write)(void*,const char*,size_t);
-+ int (*seek)(void*,off_t*,int);
-+ int (*close)(void*);
-+} _IO_cookie_io_functions_t;
-+typedef _IO_cookie_io_functions_t cookie_io_functions_t;
-+FILE *fopencookie (void *cookie, const char *opentype,
-+ cookie_io_functions_t funclist);
-+#endif /*!HAVE_FOPENCOOKIE*/
-+
-+
- static int
- dummy_handler (ASSUAN_CONTEXT ctx, char *line)
- {
diff --git a/security/pinentry/files/patch-assuan::assuan-socket-connect.c b/security/pinentry/files/patch-assuan::assuan-socket-connect.c
deleted file mode 100644
index 74acc38ea626..000000000000
--- a/security/pinentry/files/patch-assuan::assuan-socket-connect.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- assuan/assuan-socket-connect.c.orig Wed Jan 29 15:30:12 2003
-+++ assuan/assuan-socket-connect.c Wed Jan 29 15:30:28 2003
-@@ -23,6 +23,7 @@
- #include <stddef.h>
- #include <stdio.h>
- #include <errno.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <unistd.h>
diff --git a/security/pinentry/files/patch-assuan::assuan-socket-server.c b/security/pinentry/files/patch-assuan::assuan-socket-server.c
deleted file mode 100644
index af8a39751c34..000000000000
--- a/security/pinentry/files/patch-assuan::assuan-socket-server.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- assuan/assuan-socket-server.c.orig Wed Jan 29 15:27:13 2003
-+++ assuan/assuan-socket-server.c Wed Jan 29 15:27:38 2003
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <errno.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <unistd.h>
diff --git a/security/pinentry/files/patch-assuan::mkerrors b/security/pinentry/files/patch-assuan::mkerrors
deleted file mode 100644
index f5d45193a0d6..000000000000
--- a/security/pinentry/files/patch-assuan::mkerrors
+++ /dev/null
@@ -1,10 +0,0 @@
---- assuan/mkerrors.orig Thu Jan 30 07:49:26 2003
-+++ assuan/mkerrors Thu Jan 30 07:50:41 2003
-@@ -68,4 +68,5 @@
- return s;
- }
-
--EOF
-\ No newline at end of file
-+EOF
-+
diff --git a/security/pinentry/files/patch-common::maperrors.c b/security/pinentry/files/patch-common::maperrors.c
deleted file mode 100644
index 3e49c27521da..000000000000
--- a/security/pinentry/files/patch-common::maperrors.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- common/maperror.c.orig Thu Jan 30 08:00:00 2003
-+++ common/maperror.c Thu Jan 30 08:00:15 2003
-@@ -210,7 +210,6 @@
- case GNUPG_Certificate_Expired:
- rc = ASSUAN_Bad_Certificate;
- break;
-- case GNUPG_Bad_Certificate_Chain: rc = ASSUAN_Bad_Certificate_Chain; break;
- case GNUPG_Missing_Certificate: rc = ASSUAN_Missing_Certificate; break;
- case GNUPG_No_Data: rc = ASSUAN_No_Data_Available; break;
- case GNUPG_Bad_Signature: rc = ASSUAN_Bad_Signature; break;
diff --git a/security/pinentry/files/patch-configure.ac b/security/pinentry/files/patch-configure.ac
deleted file mode 100644
index ad535e7cacf3..000000000000
--- a/security/pinentry/files/patch-configure.ac
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.ac.orig Thu Jan 30 07:49:12 2003
-+++ configure.ac Thu Jan 30 07:50:41 2003
-@@ -59,14 +59,6 @@
- AC_CHECK_FUNCS(seteuid stpcpy)
- GNUPG_CHECK_MLOCK
-
--dnl Checks for libassuan.
--AC_CHECK_FUNCS(fopencookie,,[
-- AC_MSG_ERROR([[
--***
--*** fopencookie(3) is needed to build this package.
--*** We will provide an replacement in a later release.
--***]])])
--
- dnl Checks for libsecmem.
- GNUPG_CHECK_TYPEDEF(byte, HAVE_BYTE_TYPEDEF)
- GNUPG_CHECK_TYPEDEF(ulong, HAVE_ULONG_TYPEDEF)
-@@ -217,9 +209,39 @@
- dnl dnl End of checks for Qt pinentry.
- dnl fi
-
-+# Checks for typedefs, structures, and compiler characteristics.
-+AC_C_CONST
-+AC_C_INLINE
-+AC_TYPE_SIZE_T
-+AC_TYPE_SIGNAL
-+AC_DECL_SYS_SIGLIST
-+
-+GNUPG_CHECK_TYPEDEF(byte, HAVE_BYTE_TYPEDEF)
-+GNUPG_CHECK_TYPEDEF(ushort, HAVE_USHORT_TYPEDEF)
-+GNUPG_CHECK_TYPEDEF(ulong, HAVE_ULONG_TYPEDEF)
-+
-+GNUPG_SYS_SO_PEERCRED
-+
-+# Checks for library functions.
-+
-+# These are needed by libjnlib - fixme: we should have a macros for them
-+AC_CHECK_FUNCS(memicmp stpcpy strlwr strtoul memmove stricmp strtol)
-+AC_CHECK_FUNCS(getrusage setrlimit stat setlocale)
-+AC_CHECK_FUNCS(flockfile funlockfile)
-+
-+AC_CHECK_FUNCS(sigaction sigprocmask)
-+
-+AC_REPLACE_FUNCS(vasprintf)
-+AC_REPLACE_FUNCS(fopencookie)
-+# FIXME: Print a warning when fopencookie is not available.
-+AC_REPLACE_FUNCS(mkdtemp)
-+AC_REPLACE_FUNCS(fseeko ftello)
-+AC_REPLACE_FUNCS(isascii)
-
- AC_CONFIG_FILES([
-+jnlib/Makefile
- assuan/Makefile
-+common/Makefile
- secmem/Makefile
- pinentry/Makefile
- curses/Makefile
diff --git a/security/pinentry/files/patch-curses::Makefile.am b/security/pinentry/files/patch-curses::Makefile.am
deleted file mode 100644
index 36dce30e679c..000000000000
--- a/security/pinentry/files/patch-curses::Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
---- curses/Makefile.am.orig Thu Jan 30 07:49:42 2003
-+++ curses/Makefile.am Thu Jan 30 07:50:41 2003
-@@ -23,7 +23,7 @@
-
- AM_CPPFLAGS = $(NCURSES_INCLUDE) -I$(top_srcdir)/pinentry
- LDADD = ../pinentry/libpinentry.a ../pinentry/libpinentry-curses.a \
-- ../assuan/libassuan.a ../secmem/libsecmem.a \
-- $(LIBCAP) $(LIBCURSES) $(LIBICONV)
-+ ../assuan/libassuan.a ../secmem/libsecmem.a ../common/libcommon.a \
-+ $(LIBCAP) $(LIBCURSES) $(LIBICONV)
-
- pinentry_curses_SOURCES = pinentry-curses.c
diff --git a/security/pinentry/files/patch-gtk::Makefile.am b/security/pinentry/files/patch-gtk::Makefile.am
deleted file mode 100644
index 42ec50ec2448..000000000000
--- a/security/pinentry/files/patch-gtk::Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk/Makefile.am.orig Thu Jan 30 07:49:55 2003
-+++ gtk/Makefile.am Thu Jan 30 07:50:41 2003
-@@ -32,7 +32,7 @@
- AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(ncurses_include) \
- -I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry
- LDADD = ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
-- $(LIBCAP) $(GTK_LIBS) $(libcurses)
-+ ../common/libcommon.a $(LIBCAP) $(GTK_LIBS) $(libcurses)
-
- pinentry_gtk_SOURCES = pinentry-gtk.c \
- gtksecentry.c gtksecentry.h
diff --git a/security/pinentry/files/patch-pinentry::pinentry.c b/security/pinentry/files/patch-pinentry::pinentry.c
deleted file mode 100644
index 7eb174ed98c7..000000000000
--- a/security/pinentry/files/patch-pinentry::pinentry.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- pinentry/pinentry.c.orig Thu Jan 30 08:36:45 2003
-+++ pinentry/pinentry.c Thu Jan 30 08:37:10 2003
-@@ -22,6 +22,10 @@
- #include <config.h>
- #endif
-
-+#ifdef _GETOPT_H
-+#undef _GETOPT_H
-+#endif
-+
- #include <errno.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/security/pinentry/files/patch-qt::Makefile.am b/security/pinentry/files/patch-qt::Makefile.am
deleted file mode 100644
index a25aafba5f7b..000000000000
--- a/security/pinentry/files/patch-qt::Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
---- qt/Makefile.am.orig Thu Jan 30 07:50:05 2003
-+++ qt/Makefile.am Thu Jan 30 07:50:41 2003
-@@ -33,8 +33,8 @@
- AM_CPPFLAGS = -I$(top_srcdir)/assuan -I$(top_srcdir)/secmem $(QT_INCLUDES) $(ncurses_include)
- AM_CXXFLAGS = $(QT_CXXFLAGS)
- pinentry_qt_LDADD = $(top_builddir)/assuan/libassuan.a \
-- $(top_builddir)/secmem/libsecmem.a $(LIBCAP) \
-- $(QT_LIBS) $(libcurses)
-+ $(top_builddir)/secmem/libsecmem.a $(top_builddir)/common/libcommon.a \
-+ $(LIBCAP) $(QT_LIBS) $(libcurses)
- pinentry_qt_LDFLAGS = $(QT_LDFLAGS)
-
- pinentry_qt_SOURCES = pinentrydialog.h pinentrydialog.cpp \
diff --git a/security/pinentry/files/patch-qt::main.cpp b/security/pinentry/files/patch-qt::main.cpp
deleted file mode 100644
index a616738e8732..000000000000
--- a/security/pinentry/files/patch-qt::main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt/main.cpp.orig Wed Sep 24 20:10:31 2003
-+++ qt/main.cpp Wed Sep 24 20:10:49 2003
-@@ -111,7 +111,7 @@
-
- int qt_main( int argc, char *argv[] )
- {
-- secmem_init( 16384*4 ); /* this should be enough, if not, increase it! */
-+ secmem_init( 16384*8 ); /* this should be enough, if not, increase it! */
- secmem_set_flags(SECMEM_WARN);
- drop_privs();
- std::set_new_handler(my_new_handler);
diff --git a/security/pinentry/files/patch-qt::pinentrycontroller.cpp b/security/pinentry/files/patch-qt::pinentrycontroller.cpp
deleted file mode 100644
index 361749040e70..000000000000
--- a/security/pinentry/files/patch-qt::pinentrycontroller.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- qt/pinentrycontroller.cpp.orig Thu Feb 13 00:20:44 2003
-+++ qt/pinentrycontroller.cpp Thu Feb 13 00:21:32 2003
-@@ -256,9 +256,8 @@
- connect( _pinentry, SIGNAL( rejected() ),
- this, SLOT( slotRejected() ) );
- bool ret = _pinentry->exec();
-- FILE* fp = assuan_get_data_fp( _ctx );
- if( ret ) {
-- fputs( static_cast<const char*>(_pinentry->text().utf8()), fp );
-+ assuan_send_data ( _ctx, static_cast<const void*>(_pinentry->text().utf8()), _pinentry->text().utf8().length() );
- return 0;
- } else {
- assuan_set_error( _ctx, ASSUAN_Canceled, "Dialog cancelled by user" );
diff --git a/security/pinentry/files/patch-secmem::secmem.c b/security/pinentry/files/patch-secmem::secmem.c
deleted file mode 100644
index c6736cc695aa..000000000000
--- a/security/pinentry/files/patch-secmem::secmem.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- secmem/secmem.c.orig Thu Jan 30 07:50:34 2003
-+++ secmem/secmem.c Thu Jan 30 07:50:41 2003
-@@ -42,6 +42,7 @@
- #else /* ORIGINAL_GPG_VERSION */
-
- #include <sys/types.h>
-+#include "../jnlib/types.h"
-
- typedef union {
- int a;
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-03 11:33:33 +0000