diff options
Diffstat (limited to 'security')
34 files changed, 49 insertions, 444 deletions
diff --git a/security/cryptplug/Makefile b/security/cryptplug/Makefile index cfa2a08880c1..602b89829e68 100644 --- a/security/cryptplug/Makefile +++ b/security/cryptplug/Makefile @@ -16,7 +16,7 @@ MAINTAINER= lofi@freebsd.org COMMENT= A collection of plug-ins to cryptographic engines BUILD_DEPENDS= gpgme-config:${PORTSDIR}/security/gpgme \ - gpg-agent:${PORTSDIR}/security/newpg + gpg-agent:${PORTSDIR}/security/gnupg-devel USE_LIBTOOL_VER=13 USE_GMAKE= yes diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile index e9af4effc172..68e589bfae14 100644 --- a/security/dirmngr/Makefile +++ b/security/dirmngr/Makefile @@ -6,45 +6,25 @@ # PORTNAME= dirmngr -PORTVERSION= 0.4.5 -PORTREVISION= 3 +PORTVERSION= 0.5.3 CATEGORIES= security -MASTER_SITES= ${MASTER_SITE_GNUPG} \ - http://tigress.com/lofi/:lofi/ -MASTER_SITE_SUBDIR= alpha/aegypten -DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \ - common.tar.gz:lofi +MASTER_SITES= ${MASTER_SITE_GNUPG} +MASTER_SITE_SUBDIR= alpha/dirmngr +DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz MAINTAINER= lofi@freebsd.org COMMENT= A client for managing and downloading certificate revocation lists -LIB_DEPENDS= db2.0:${PORTSDIR}/databases/db2 \ - gcrypt.6:${PORTSDIR}/security/libgcrypt \ - ksba.7:${PORTSDIR}/security/libksba +BUILD_DEPENDS= ${LOCALBASE}/lib/libassuan.a:${PORTSDIR}/security/libassuan +LIB_DEPENDS= gcrypt.12:${PORTSDIR}/security/libgcrypt \ + gpg-error:${PORTSDIR}/security/libgpg-error \ + ksba.11:${PORTSDIR}/security/libksba USE_OPENLDAP= yes USE_GETOPT_LONG=yes -USE_AUTOMAKE_VER= 15 USE_LIBTOOL_VER=13 USE_GMAKE= yes -INSTALLS_SHLIB= yes -USE_REINPLACE= yes -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -LDFLAGS+= -L${LOCALBASE}/lib -CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" -CONFIGURE_ARGS+=--with-included-gettext=no +USE_GETTEXT= yes INFO= dirmngr -PLIST_FILES= bin/dirmngr -.include <bsd.port.pre.mk> - -post-extract: - ${MV} ${WRKDIR}/common ${WRKSRC} - -pre-configure: - ${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" \ - ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure - cd ${WRKSRC}; ./autogen.sh - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/dirmngr/distinfo b/security/dirmngr/distinfo index 45d8efa8d75b..e2efeed26acb 100644 --- a/security/dirmngr/distinfo +++ b/security/dirmngr/distinfo @@ -1,4 +1,4 @@ -MD5 (dirmngr-0.4.5.tar.gz) = a6613347967f6679171c00808a17dfb2 -SIZE (dirmngr-0.4.5.tar.gz) = 271287 +MD5 (dirmngr-0.5.3.tar.gz) = 05ba1c4eb6f50f8a053ce67253becc1b +SIZE (dirmngr-0.5.3.tar.gz) = 509930 MD5 (common.tar.gz) = 4f5171946f83dfe64761344d7e86af05 SIZE (common.tar.gz) = 18282 diff --git a/security/dirmngr/files/patch-Makefile.am b/security/dirmngr/files/patch-Makefile.am deleted file mode 100644 index 61e3b58d358b..000000000000 --- a/security/dirmngr/files/patch-Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ ---- Makefile.am.orig Thu Feb 6 17:26:01 2003 -+++ Makefile.am Thu Feb 6 17:26:38 2003 -@@ -21,4 +21,4 @@ - - EXTRA_DIST = README-alpha autogen.sh - --SUBDIRS = jnlib assuan src doc tests -+SUBDIRS = jnlib assuan common src doc tests diff --git a/security/dirmngr/files/patch-assuan::assuan-handler.c b/security/dirmngr/files/patch-assuan::assuan-handler.c deleted file mode 100644 index 3c73877a6b13..000000000000 --- a/security/dirmngr/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/dirmngr/files/patch-assuan::assuan-socket-connect.c b/security/dirmngr/files/patch-assuan::assuan-socket-connect.c deleted file mode 100644 index 74acc38ea626..000000000000 --- a/security/dirmngr/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/dirmngr/files/patch-assuan::assuan-socket-server.c b/security/dirmngr/files/patch-assuan::assuan-socket-server.c deleted file mode 100644 index af8a39751c34..000000000000 --- a/security/dirmngr/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/dirmngr/files/patch-assuan::mkerrors b/security/dirmngr/files/patch-assuan::mkerrors deleted file mode 100644 index f5d45193a0d6..000000000000 --- a/security/dirmngr/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/dirmngr/files/patch-common::maperrors.c b/security/dirmngr/files/patch-common::maperrors.c deleted file mode 100644 index 3e49c27521da..000000000000 --- a/security/dirmngr/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/dirmngr/files/patch-configure.ac b/security/dirmngr/files/patch-configure.ac deleted file mode 100644 index 60c4f8ab71d7..000000000000 --- a/security/dirmngr/files/patch-configure.ac +++ /dev/null @@ -1,42 +0,0 @@ ---- configure.ac.orig Wed Nov 20 00:54:24 2002 -+++ configure.ac Thu Feb 6 17:47:12 2003 -@@ -300,6 +300,17 @@ - - # 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_CHECK_FUNCS(asprintf,,[ - AC_MSG_ERROR([[ -@@ -307,13 +318,6 @@ - *** asprintf(3) is needed to build this package. - *** We will provide an replacement in a later release. - ***]])]) --AC_CHECK_FUNCS(fopencookie,,[ -- AC_MSG_ERROR([[ --*** --*** fopencookie(3) is needed to build this package. --*** We will provide an replacement in a later release. --***]])]) -- - - # We use jnlib, so tell other modules about it - AC_DEFINE(HAVE_JNLIB_LOGGING, 1, -@@ -324,6 +328,7 @@ - Makefile - jnlib/Makefile - assuan/Makefile -+common/Makefile - src/Makefile - doc/Makefile - tests/Makefile diff --git a/security/dirmngr/files/patch-doc::dirmngr.info b/security/dirmngr/files/patch-doc::dirmngr.info deleted file mode 100644 index 0dbaabbd9e42..000000000000 --- a/security/dirmngr/files/patch-doc::dirmngr.info +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/dirmngr.info.orig Wed Apr 30 16:09:38 2003 -+++ doc/dirmngr.info Wed Apr 30 16:10:07 2003 -@@ -3,7 +3,7 @@ - - INFO-DIR-SECTION GNU Utilities - START-INFO-DIR-ENTRY --* dirmngr: (gnupg). X509/LDAP certificate and revocation list client. -+* dirmngr: (dirmngr). X509/LDAP certificate and revocation list client. - END-INFO-DIR-ENTRY - This file documents the use of dirmngr. - diff --git a/security/dirmngr/files/patch-src::Makefile.am b/security/dirmngr/files/patch-src::Makefile.am deleted file mode 100644 index c8d10b3e2256..000000000000 --- a/security/dirmngr/files/patch-src::Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ ---- src/Makefile.am.orig Thu Feb 6 18:00:41 2003 -+++ src/Makefile.am Thu Feb 6 18:01:22 2003 -@@ -32,8 +32,6 @@ - dirmngr_LDFLAGS = $(LDAP_RPATH) - - dirmngr_LDADD = ../jnlib/libjnlib.a ../assuan/libassuan.a \ -- $(LIBGCRYPT_LIBS) $(LIBKSBA_LIBS) $(LDAP_LIBS) $(DB_LIBS) -- -- -- -+ ../common/libcommon.a $(LIBGCRYPT_LIBS) \ -+ $(LIBKSBA_LIBS) $(LDAP_LIBS) $(DB_LIBS) - diff --git a/security/dirmngr/files/patch-tests::Makefile.am b/security/dirmngr/files/patch-tests::Makefile.am deleted file mode 100644 index 36963c03a168..000000000000 --- a/security/dirmngr/files/patch-tests::Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- tests/Makefile.am.orig Thu Feb 6 18:02:43 2003 -+++ tests/Makefile.am Thu Feb 6 18:02:59 2003 -@@ -10,7 +10,7 @@ - TESTS = - - noinst_PROGRAMS = test-dirmngr --LDADD = ../jnlib/libjnlib.a ../assuan/libassuan.a $(LIBGCRYPT_LIBS) $(LIBKSBA_LIBS) -+LDADD = ../jnlib/libjnlib.a ../assuan/libassuan.a ../common/libcommon.a $(LIBGCRYPT_LIBS) $(LIBKSBA_LIBS) - - - diff --git a/security/dirmngr/pkg-plist b/security/dirmngr/pkg-plist new file mode 100644 index 000000000000..84f95c267a2b --- /dev/null +++ b/security/dirmngr/pkg-plist @@ -0,0 +1,5 @@ +bin/dirmngr +share/locale/de/LC_MESSAGES/dirmngr.mo +@dirrm share/locale/de/LC_MESSAGES +@dirrm share/locale/de +@dirrm share/locale diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index ec9c8dbfd652..e4f0631964fc 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -31,7 +31,7 @@ WITH_GPGSM= yes .endif .if defined(WITH_GPGSM) -BUILD_DEPENDS+= gpgsm:${PORTSDIR}/security/newpg +BUILD_DEPENDS+= gpgsm:${PORTSDIR}/security/gnupg-devel .else CONFIGURE_ARGS+= --without-gpgsm .endif diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile index ec9c8dbfd652..e4f0631964fc 100644 --- a/security/gpgme03/Makefile +++ b/security/gpgme03/Makefile @@ -31,7 +31,7 @@ WITH_GPGSM= yes .endif .if defined(WITH_GPGSM) -BUILD_DEPENDS+= gpgsm:${PORTSDIR}/security/newpg +BUILD_DEPENDS+= gpgsm:${PORTSDIR}/security/gnupg-devel .else CONFIGURE_ARGS+= --without-gpgsm .endif diff --git a/security/libksba/Makefile b/security/libksba/Makefile index 64107590d3ca..fa478bf39dd0 100644 --- a/security/libksba/Makefile +++ b/security/libksba/Makefile @@ -13,7 +13,7 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}.sig MAINTAINER= lofi@FreeBSD.org -COMMENT= "KSBA is an X.509 Library" +COMMENT= KSBA is an X.509 Library LIB_DEPENDS= gpg-error.1:${PORTSDIR}/security/libgpg-error diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile index f157e45e1c7a..3f37281c5836 100644 --- a/security/pinentry/Makefile +++ b/security/pinentry/Makefile @@ -6,44 +6,29 @@ # PORTNAME= pinentry -PORTVERSION= 0.6.9 -PORTREVISION= 3 +PORTVERSION= 0.7.1 CATEGORIES= security -MASTER_SITES= ftp://ftp.klaralvdalens-datakonsult.se/pub/aegypten/alpha/latest/ \ - ${MASTER_SITE_GNUPG} \ - http://tigress.com/lofi/:lofi -MASTER_SITE_SUBDIR= alpha/aegypten -DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \ - common.tar.gz:lofi\ - jnlib.tar.gz:lofi +MASTER_SITES= ${MASTER_SITE_GNUPG} +MASTER_SITE_SUBDIR= pinentry MAINTAINER= lofi@freebsd.org -COMMENT= A collection of simple PIN or passphrase entry dialogs +COMMENT?= A collection of simple PIN or passphrase entry dialogs -LIB_DEPENDS= gcrypt.6:${PORTSDIR}/security/libgcrypt \ - ksba.7:${PORTSDIR}/security/libksba +LIB_DEPENDS= gcrypt.12:${PORTSDIR}/security/libgcrypt \ + ksba.11:${PORTSDIR}/security/libksba + +CONFLICTS?= pinentry-qt* pinentry-gtk* pinentry-curses* USE_GETOPT_LONG=yes -USE_AUTOMAKE_VER= 15 WANT_GNOME= yes USE_LIBTOOL_VER=13 USE_GMAKE= yes INSTALLS_SHLIB= yes USE_REINPLACE= yes -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -LDFLAGS+= -L${LOCALBASE}/lib -CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" -CONFIGURE_ARGS+=--with-included-gettext=no INFO= pinentry -.include <bsd.port.pre.mk> - -.if exists(${X11BASE}/bin/moc) -WITH_QT=yes -.endif - -.if defined(WITH_QT) +.if defined(PINENTRY_QT) || defined(PINENTRY_GTK) || defined(PINENTRY_CURSES) +.if defined(PINENTRY_QT) USE_QT_VER= 3 PLIST_SUB+= WITH_QT="" .else @@ -51,7 +36,7 @@ CONFIGURE_ARGS+=--disable-pinentry-qt PLIST_SUB+= WITH_QT="@comment " .endif -.if ${HAVE_GNOME:Mgtk12}!="" +.if defined(PINENTRY_GTK) USE_GNOME+= gtk12 PLIST_SUB+= WITH_GTK="" .else @@ -59,13 +44,22 @@ CONFIGURE_ARGS+=--disable-pinentry-gtk PLIST_SUB+= WITH_GTK="@comment " .endif -post-extract: - ${MV} ${WRKDIR}/common ${WRKSRC} - ${MV} ${WRKDIR}/jnlib ${WRKSRC} +.if defined(PINENTRY_CURSES) +PLIST_SUB+= WITH_CURSES="" +.else +CONFIGURE_ARGS+=--disable-pinentry-curses +PLIST_SUB+= WITH_CURSES="@comment " +.endif +.else +USE_QT_VER= 3 +USE_GNOME+= gtk12 +PLIST_SUB+= WITH_QT="" +PLIST_SUB+= WITH_GTK="" +PLIST_SUB+= WITH_CURSES="" +.endif pre-configure: ${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" \ ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure - cd ${WRKSRC}; ./autogen.sh -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/pinentry/distinfo b/security/pinentry/distinfo index 039f5bc25462..3492788ca8b7 100644 --- a/security/pinentry/distinfo +++ b/security/pinentry/distinfo @@ -1,6 +1,2 @@ -MD5 (pinentry-0.6.9.tar.gz) = 28f5638fdec96b3429ad02ef08e997f5 -SIZE (pinentry-0.6.9.tar.gz) = 310564 -MD5 (common.tar.gz) = 4f5171946f83dfe64761344d7e86af05 -SIZE (common.tar.gz) = 18282 -MD5 (jnlib.tar.gz) = 9e8d48da4e6f8db94da64d444f4b3687 -SIZE (jnlib.tar.gz) = 22676 +MD5 (pinentry-0.7.1.tar.gz) = 7861d63dea6434a5a05da84e83f209e6 +SIZE (pinentry-0.7.1.tar.gz) = 347047 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; diff --git a/security/pinentry/pkg-plist b/security/pinentry/pkg-plist index 54d3fe1e1f22..af02303c0488 100644 --- a/security/pinentry/pkg-plist +++ b/security/pinentry/pkg-plist @@ -1,3 +1,3 @@ -bin/pinentry-curses +%%WITH_CURSES%%bin/pinentry-curses %%WITH_GTK%%bin/pinentry-gtk %%WITH_QT%%bin/pinentry-qt |