diff options
35 files changed, 96 insertions, 311 deletions
diff --git a/CVSROOT/modules b/CVSROOT/modules index 9411043..ff17f56 100644 --- a/CVSROOT/modules +++ b/CVSROOT/modules @@ -2590,6 +2590,7 @@ gnumeric2 ports/math/gnumeric2 gnump3d ports/audio/gnump3d gnunet ports/net/gnunet gnupg ports/security/gnupg +gnupg-devel ports/security/gnupg-devel gnupg-idea ports/security/gnupg-idea gnuplot ports/math/gnuplot gnuplot+ ports/math/gnuplot+ @@ -5552,7 +5553,6 @@ neverball ports/games/neverball newfile ports/devel/newfile newmail ports/mail/newmail newmat ports/math/newmat -newpg ports/security/newpg newsbot ports/net/newsbot newscache ports/news/newscache newsfetch ports/news/newsfetch diff --git a/security/Makefile b/security/Makefile index 4de19c0..c5628ba 100644 --- a/security/Makefile +++ b/security/Makefile @@ -101,6 +101,7 @@ SUBDIR += gnome-ssh-askpass SUBDIR += gnomekeyring SUBDIR += gnupg + SUBDIR += gnupg-devel SUBDIR += gnupg-idea SUBDIR += gnutls SUBDIR += gnutls-devel @@ -191,7 +192,6 @@ SUBDIR += nessus-plugins SUBDIR += nessus-plugins-devel SUBDIR += nettle - SUBDIR += newpg SUBDIR += nikto SUBDIR += nmap SUBDIR += nmapfe diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile index c7dd8fa..fcad7fa 100644 --- a/security/gnupg-devel/Makefile +++ b/security/gnupg-devel/Makefile @@ -5,35 +5,29 @@ # $FreeBSD$ # -PORTNAME= newpg -PORTVERSION= 0.9.4 -PORTREVISION= 4 +PORTNAME= gnupg +PORTVERSION= 1.9.3 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} -MASTER_SITE_SUBDIR= alpha/aegypten +MASTER_SITE_SUBDIR= alpha/gnupg +PKGNAMESUFFIX= -devel MAINTAINER= lofi@freebsd.org COMMENT= Prerelease package of GnuPG extensions for GnuPG 2.0 -LIB_DEPENDS= gcrypt.6:${PORTSDIR}/security/libgcrypt \ - ksba.7:${PORTSDIR}/security/libksba \ +LIB_DEPENDS= gcrypt.12:${PORTSDIR}/security/libgcrypt \ + ksba.11:${PORTSDIR}/security/libksba \ pth.20:${PORTSDIR}/devel/pth RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg \ - pinentry-curses:${PORTSDIR}/security/pinentry \ dirmngr:${PORTSDIR}/security/dirmngr - -USE_AUTOCONF_VER=253 -USE_LIBTOOL_VER=13 + +GNU_CONFIGURE= yes +CONFIGURE_TARGET=# empty USE_GETTEXT= yes USE_GMAKE= yes USE_ICONV= 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= gnupg .include <bsd.port.pre.mk> @@ -53,6 +47,8 @@ PLIST_SUB+= WITH_OPENSC="@comment " pre-configure: ${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" \ ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure - cd ${WRKSRC}; autoconf + +post-install: + ${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/security/gnupg-devel/distinfo b/security/gnupg-devel/distinfo index 32f7143..3dbdd40 100644 --- a/security/gnupg-devel/distinfo +++ b/security/gnupg-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (newpg-0.9.4.tar.gz) = 6b478f1ce8e37a55064ffc69b7325ea8 -SIZE (newpg-0.9.4.tar.gz) = 606811 +MD5 (gnupg-1.9.3.tar.gz) = a03e0370613dabb5722ab51761895b84 +SIZE (gnupg-1.9.3.tar.gz) = 1237592 diff --git a/security/gnupg-devel/files/patch-agent::Makefile.in b/security/gnupg-devel/files/patch-agent::Makefile.in deleted file mode 100644 index df95201..0000000 --- a/security/gnupg-devel/files/patch-agent::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- agent/Makefile.in Wed Dec 4 14:13:12 2002 -+++ agent/Makefile.in.new Wed Jan 29 19:37:03 2003 -@@ -137,7 +137,7 @@ - pkglib_PROGRAMS = gpg-protect-tool - - AM_CPPFLAGS = -I$(top_srcdir)/common $(LIBGCRYPT_CFLAGS) $(PTH_CFLAGS) --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ $(INTLLIBS) - - gpg_agent_SOURCES = \ - gpg-agent.c agent.h \ diff --git a/security/gnupg-devel/files/patch-agent::gpg-agent.c b/security/gnupg-devel/files/patch-agent::gpg-agent.c deleted file mode 100644 index 8d3871d..0000000 --- a/security/gnupg-devel/files/patch-agent::gpg-agent.c +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/gpg-agent.c Wed Dec 4 13:08:25 2002 -+++ agent/gpg-agent.c.new Wed Jan 29 19:34:14 2003 -@@ -37,6 +37,9 @@ - # include <pth.h> - #endif - -+#include <sys/types.h> -+#include <sys/stat.h> -+ - #include <gcrypt.h> - - #define JNLIB_NEED_LOG_LOGV diff --git a/security/gnupg-devel/files/patch-agent_gpg-agent.c b/security/gnupg-devel/files/patch-agent_gpg-agent.c new file mode 100644 index 0000000..6c248d1 --- /dev/null +++ b/security/gnupg-devel/files/patch-agent_gpg-agent.c @@ -0,0 +1,12 @@ +--- agent/gpg-agent.c.orig Mon May 3 18:38:33 2004 ++++ agent/gpg-agent.c Mon May 3 18:39:16 2004 +@@ -37,6 +37,9 @@ + # include <pth.h> + #endif + ++#include <sys/types.h> ++#include <sys/stat.h> ++ + #define JNLIB_NEED_LOG_LOGV + #include "agent.h" + #include <assuan.h> /* malloc hooks */ diff --git a/security/gnupg-devel/files/patch-assuan::assuan-socket-connect.c b/security/gnupg-devel/files/patch-assuan::assuan-socket-connect.c deleted file mode 100644 index 74acc38..0000000 --- a/security/gnupg-devel/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/gnupg-devel/files/patch-assuan::assuan-socket-server.c b/security/gnupg-devel/files/patch-assuan::assuan-socket-server.c deleted file mode 100644 index af8a397..0000000 --- a/security/gnupg-devel/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/gnupg-devel/files/patch-common_fopencookie.c b/security/gnupg-devel/files/patch-common_fopencookie.c new file mode 100644 index 0000000..057149a --- /dev/null +++ b/security/gnupg-devel/files/patch-common_fopencookie.c @@ -0,0 +1,18 @@ +--- common/fopencookie.c.orig Mon May 3 18:14:56 2004 ++++ common/fopencookie.c Mon May 3 18:15:24 2004 +@@ -26,6 +26,15 @@ + + #include "util.h" + ++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) diff --git a/security/gnupg-devel/files/patch-configure b/security/gnupg-devel/files/patch-configure new file mode 100644 index 0000000..fafd869 --- /dev/null +++ b/security/gnupg-devel/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Mon May 3 18:34:49 2004 ++++ configure Mon May 3 18:35:25 2004 +@@ -15887,7 +15887,7 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_var=no" ++eval "$as_ac_var=yes" + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi diff --git a/security/gnupg-devel/files/patch-configure.ac b/security/gnupg-devel/files/patch-configure.ac deleted file mode 100644 index 00bdf48..0000000 --- a/security/gnupg-devel/files/patch-configure.ac +++ /dev/null @@ -1,12 +0,0 @@ ---- configure.ac.orig Thu Jan 30 00:43:39 2003 -+++ configure.ac Thu Jan 30 00:44:25 2003 -@@ -303,7 +303,7 @@ - AC_REPLACE_FUNCS(mkdtemp) - AC_REPLACE_FUNCS(fseeko ftello) - AC_REPLACE_FUNCS(isascii) --AC_REPLACE_FUNCS(putc_unlocked) -+AC_DEFINE(HAVE_PUTC_UNLOCKED, 1, [FreeBSD has it, trust me]) - - # We use jnlib, so tell other modules about it - AC_DEFINE(HAVE_JNLIB_LOGGING, 1, - diff --git a/security/gnupg-devel/files/patch-kbx::Makefile.in b/security/gnupg-devel/files/patch-kbx::Makefile.in deleted file mode 100644 index 8dbdaa5..0000000 --- a/security/gnupg-devel/files/patch-kbx::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- kbx/Makefile.in.orig Wed Jan 29 17:09:39 2003 -+++ kbx/Makefile.in Wed Jan 29 17:10:18 2003 -@@ -156,7 +156,7 @@ - libkeybox_a_SOURCES = $(common_sources) - - kbxutil_SOURCES = kbxutil.c $(common_sources) --kbxutil_LDADD = ../jnlib/libjnlib.a $(KSBA_LIBS) $(LIBGCRYPT_LIBS) -+kbxutil_LDADD = ../jnlib/libjnlib.a $(KSBA_LIBS) $(LIBGCRYPT_LIBS) $(INTLLIBS) - subdir = kbx - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h diff --git a/security/gnupg-devel/files/patch-kbx::keybox-blob.c b/security/gnupg-devel/files/patch-kbx::keybox-blob.c deleted file mode 100644 index 44b7059..0000000 --- a/security/gnupg-devel/files/patch-kbx::keybox-blob.c +++ /dev/null @@ -1,12 +0,0 @@ ---- kbx/keybox-blob.c.orig Mon Jul 22 11:26:51 2002 -+++ kbx/keybox-blob.c Wed Jan 29 17:00:14 2003 -@@ -119,8 +119,8 @@ - #include <ksba.h> - #endif - -+#include "../jnlib/types.h" - #include "keybox-defs.h" -- - - /* special values of the signature status */ - #define SF_NONE(a) ( !(a) ) diff --git a/security/gnupg-devel/files/patch-kbx_keybox-blob.c b/security/gnupg-devel/files/patch-kbx_keybox-blob.c new file mode 100644 index 0000000..ab27ccb --- /dev/null +++ b/security/gnupg-devel/files/patch-kbx_keybox-blob.c @@ -0,0 +1,10 @@ +--- kbx/keybox-blob.c.orig Mon May 3 18:37:26 2004 ++++ kbx/keybox-blob.c Mon May 3 18:37:51 2004 +@@ -112,6 +112,7 @@ + #include <assert.h> + #include <time.h> + ++#include "../jnlib/types.h" + #include "keybox-defs.h" + #include <gcrypt.h> + diff --git a/security/gnupg-devel/files/patch-kbx::keybox-dump.c b/security/gnupg-devel/files/patch-kbx_keybox-dump.c index b165dd4..7c761cf 100644 --- a/security/gnupg-devel/files/patch-kbx::keybox-dump.c +++ b/security/gnupg-devel/files/patch-kbx_keybox-dump.c @@ -1,5 +1,5 @@ ---- kbx/keybox-dump.c.orig Mon Jul 22 10:33:48 2002 -+++ kbx/keybox-dump.c Wed Jan 29 17:00:08 2003 +--- kbx/keybox-dump.c.orig Mon May 3 18:38:00 2004 ++++ kbx/keybox-dump.c Mon May 3 18:38:21 2004 @@ -24,6 +24,7 @@ #include <string.h> #include <errno.h> diff --git a/security/gnupg-devel/files/patch-scd::Makefile.in b/security/gnupg-devel/files/patch-scd::Makefile.in deleted file mode 100644 index 7d0202e..0000000 --- a/security/gnupg-devel/files/patch-scd::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- scd/Makefile.in Wed Dec 4 14:13:18 2002 -+++ scd/Makefile.in.new Wed Jan 29 19:46:49 2003 -@@ -138,7 +138,7 @@ - AM_CPPFLAGS = -I$(top_srcdir)/common $(OPENSC_CFLAGS) $(LIBGCRYPT_CFLAGS) \ - $(KSBA_CFLAGS) - --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ $(INTLLIBS) - - scdaemon_SOURCES = \ - scdaemon.c scdaemon.h \ diff --git a/security/gnupg-devel/files/patch-sm::Makefile.in b/security/gnupg-devel/files/patch-sm::Makefile.in deleted file mode 100644 index 0e5aa67..0000000 --- a/security/gnupg-devel/files/patch-sm::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- sm/Makefile.in.orig Wed Jan 29 17:15:33 2003 -+++ sm/Makefile.in Wed Jan 29 17:15:59 2003 -@@ -165,7 +165,7 @@ - - - gpgsm_LDADD = ../jnlib/libjnlib.a ../assuan/libassuan.a ../kbx/libkeybox.a \ -- ../common/libcommon.a $(LIBGCRYPT_LIBS) $(KSBA_LIBS) -+ ../common/libcommon.a $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(INTLLIBS) - - subdir = sm - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/security/gnupg-devel/pkg-descr b/security/gnupg-devel/pkg-descr index 3c78177..0b6d943 100644 --- a/security/gnupg-devel/pkg-descr +++ b/security/gnupg-devel/pkg-descr @@ -1,6 +1,6 @@ -NewPG is a temporary protect to work on GnuPG extensions. It will -be merged into the regular GnuPG sources for a GnuPG 2.0 release. +This version of gnupg is a temporary project to work on GnuPG extensions. It +will be merged into the regular GnuPG sources for a GnuPG 2.0 release. -WWW: http://www.gnupg.org/aegypten/ +WWW: http://www.gnupg.org/aegypten2/ michaelnottebrock@gmx.net diff --git a/security/gnupg-devel/pkg-message b/security/gnupg-devel/pkg-message new file mode 100644 index 0000000..ab812ef --- /dev/null +++ b/security/gnupg-devel/pkg-message @@ -0,0 +1,18 @@ + + + +############################################################################### + A T T E N T I O N + +In order to use gpg-agent, you need to install a pinentry dialog. + +The following ports of pinentry dialogs are available: + +security/pinentry-curses (ncurses based dialog) +security/pinentry-gtk (GTK 1.2 based dialog) +security/pinentry-qt (QT based dialog) + +############################################################################### + + + diff --git a/security/gnupg-devel/pkg-plist b/security/gnupg-devel/pkg-plist index 39fe66c..9ffeaef 100644 --- a/security/gnupg-devel/pkg-plist +++ b/security/gnupg-devel/pkg-plist @@ -1,7 +1,10 @@ bin/gpg-agent +bin/gpg2 bin/gpgsm +bin/gpgv2 bin/kbxutil %%WITH_OPENSC%%bin/scdaemon -lib/newpg/gpg-protect-tool -share/locale/de/LC_MESSAGES/newpg.mo -@dirrm lib/newpg +lib/gnupg/gpg-protect-tool +share/gnupg/options.skel +@dirrm share/gnupg +@dirrm lib/gnupg diff --git a/security/newpg/Makefile b/security/newpg/Makefile deleted file mode 100644 index c7dd8fa..0000000 --- a/security/newpg/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# New ports collection makefile for: newpg -# Date created: 29 Jan 2003 -# Whom: michaelnottebrock@gmx.net -# -# $FreeBSD$ -# - -PORTNAME= newpg -PORTVERSION= 0.9.4 -PORTREVISION= 4 -CATEGORIES= security -MASTER_SITES= ${MASTER_SITE_GNUPG} -MASTER_SITE_SUBDIR= alpha/aegypten - -MAINTAINER= lofi@freebsd.org -COMMENT= Prerelease package of GnuPG extensions for GnuPG 2.0 - -LIB_DEPENDS= gcrypt.6:${PORTSDIR}/security/libgcrypt \ - ksba.7:${PORTSDIR}/security/libksba \ - pth.20:${PORTSDIR}/devel/pth -RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg \ - pinentry-curses:${PORTSDIR}/security/pinentry \ - dirmngr:${PORTSDIR}/security/dirmngr - -USE_AUTOCONF_VER=253 -USE_LIBTOOL_VER=13 -USE_GETTEXT= yes -USE_GMAKE= yes -USE_ICONV= 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= gnupg - -.include <bsd.port.pre.mk> - -.if exists(${LOCALBASE}/bin/opensc-config) -WITH_OPENSC= yes -.endif - -.if defined(WITH_OPENSC) -BUILD_DEPENDS+= opensc-config:${PORTSDIR}/security/opensc -PLIST_SUB+= WITH_OPENSC="" -.else -CONFIGURE_ARGS+= --disable-scdaemon -PLIST_SUB+= WITH_OPENSC="@comment " -.endif - -pre-configure: - ${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" \ - ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure - cd ${WRKSRC}; autoconf - -.include <bsd.port.post.mk> diff --git a/security/newpg/distinfo b/security/newpg/distinfo deleted file mode 100644 index 32f7143..0000000 --- a/security/newpg/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (newpg-0.9.4.tar.gz) = 6b478f1ce8e37a55064ffc69b7325ea8 -SIZE (newpg-0.9.4.tar.gz) = 606811 diff --git a/security/newpg/files/patch-agent::Makefile.in b/security/newpg/files/patch-agent::Makefile.in deleted file mode 100644 index df95201..0000000 --- a/security/newpg/files/patch-agent::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- agent/Makefile.in Wed Dec 4 14:13:12 2002 -+++ agent/Makefile.in.new Wed Jan 29 19:37:03 2003 -@@ -137,7 +137,7 @@ - pkglib_PROGRAMS = gpg-protect-tool - - AM_CPPFLAGS = -I$(top_srcdir)/common $(LIBGCRYPT_CFLAGS) $(PTH_CFLAGS) --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ $(INTLLIBS) - - gpg_agent_SOURCES = \ - gpg-agent.c agent.h \ diff --git a/security/newpg/files/patch-agent::gpg-agent.c b/security/newpg/files/patch-agent::gpg-agent.c deleted file mode 100644 index 8d3871d..0000000 --- a/security/newpg/files/patch-agent::gpg-agent.c +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/gpg-agent.c Wed Dec 4 13:08:25 2002 -+++ agent/gpg-agent.c.new Wed Jan 29 19:34:14 2003 -@@ -37,6 +37,9 @@ - # include <pth.h> - #endif - -+#include <sys/types.h> -+#include <sys/stat.h> -+ - #include <gcrypt.h> - - #define JNLIB_NEED_LOG_LOGV diff --git a/security/newpg/files/patch-assuan::assuan-socket-connect.c b/security/newpg/files/patch-assuan::assuan-socket-connect.c deleted file mode 100644 index 74acc38..0000000 --- a/security/newpg/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/newpg/files/patch-assuan::assuan-socket-server.c b/security/newpg/files/patch-assuan::assuan-socket-server.c deleted file mode 100644 index af8a397..0000000 --- a/security/newpg/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/newpg/files/patch-configure.ac b/security/newpg/files/patch-configure.ac deleted file mode 100644 index 00bdf48..0000000 --- a/security/newpg/files/patch-configure.ac +++ /dev/null @@ -1,12 +0,0 @@ ---- configure.ac.orig Thu Jan 30 00:43:39 2003 -+++ configure.ac Thu Jan 30 00:44:25 2003 -@@ -303,7 +303,7 @@ - AC_REPLACE_FUNCS(mkdtemp) - AC_REPLACE_FUNCS(fseeko ftello) - AC_REPLACE_FUNCS(isascii) --AC_REPLACE_FUNCS(putc_unlocked) -+AC_DEFINE(HAVE_PUTC_UNLOCKED, 1, [FreeBSD has it, trust me]) - - # We use jnlib, so tell other modules about it - AC_DEFINE(HAVE_JNLIB_LOGGING, 1, - diff --git a/security/newpg/files/patch-kbx::Makefile.in b/security/newpg/files/patch-kbx::Makefile.in deleted file mode 100644 index 8dbdaa5..0000000 --- a/security/newpg/files/patch-kbx::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- kbx/Makefile.in.orig Wed Jan 29 17:09:39 2003 -+++ kbx/Makefile.in Wed Jan 29 17:10:18 2003 -@@ -156,7 +156,7 @@ - libkeybox_a_SOURCES = $(common_sources) - - kbxutil_SOURCES = kbxutil.c $(common_sources) --kbxutil_LDADD = ../jnlib/libjnlib.a $(KSBA_LIBS) $(LIBGCRYPT_LIBS) -+kbxutil_LDADD = ../jnlib/libjnlib.a $(KSBA_LIBS) $(LIBGCRYPT_LIBS) $(INTLLIBS) - subdir = kbx - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h diff --git a/security/newpg/files/patch-kbx::keybox-blob.c b/security/newpg/files/patch-kbx::keybox-blob.c deleted file mode 100644 index 44b7059..0000000 --- a/security/newpg/files/patch-kbx::keybox-blob.c +++ /dev/null @@ -1,12 +0,0 @@ ---- kbx/keybox-blob.c.orig Mon Jul 22 11:26:51 2002 -+++ kbx/keybox-blob.c Wed Jan 29 17:00:14 2003 -@@ -119,8 +119,8 @@ - #include <ksba.h> - #endif - -+#include "../jnlib/types.h" - #include "keybox-defs.h" -- - - /* special values of the signature status */ - #define SF_NONE(a) ( !(a) ) diff --git a/security/newpg/files/patch-kbx::keybox-dump.c b/security/newpg/files/patch-kbx::keybox-dump.c deleted file mode 100644 index b165dd4..0000000 --- a/security/newpg/files/patch-kbx::keybox-dump.c +++ /dev/null @@ -1,10 +0,0 @@ ---- kbx/keybox-dump.c.orig Mon Jul 22 10:33:48 2002 -+++ kbx/keybox-dump.c Wed Jan 29 17:00:08 2003 -@@ -24,6 +24,7 @@ - #include <string.h> - #include <errno.h> - -+#include "../jnlib/types.h" - #include "keybox-defs.h" - - static ulong diff --git a/security/newpg/files/patch-scd::Makefile.in b/security/newpg/files/patch-scd::Makefile.in deleted file mode 100644 index 7d0202e..0000000 --- a/security/newpg/files/patch-scd::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- scd/Makefile.in Wed Dec 4 14:13:18 2002 -+++ scd/Makefile.in.new Wed Jan 29 19:46:49 2003 -@@ -138,7 +138,7 @@ - AM_CPPFLAGS = -I$(top_srcdir)/common $(OPENSC_CFLAGS) $(LIBGCRYPT_CFLAGS) \ - $(KSBA_CFLAGS) - --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ $(INTLLIBS) - - scdaemon_SOURCES = \ - scdaemon.c scdaemon.h \ diff --git a/security/newpg/files/patch-sm::Makefile.in b/security/newpg/files/patch-sm::Makefile.in deleted file mode 100644 index 0e5aa67..0000000 --- a/security/newpg/files/patch-sm::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- sm/Makefile.in.orig Wed Jan 29 17:15:33 2003 -+++ sm/Makefile.in Wed Jan 29 17:15:59 2003 -@@ -165,7 +165,7 @@ - - - gpgsm_LDADD = ../jnlib/libjnlib.a ../assuan/libassuan.a ../kbx/libkeybox.a \ -- ../common/libcommon.a $(LIBGCRYPT_LIBS) $(KSBA_LIBS) -+ ../common/libcommon.a $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(INTLLIBS) - - subdir = sm - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/security/newpg/pkg-descr b/security/newpg/pkg-descr deleted file mode 100644 index 3c78177..0000000 --- a/security/newpg/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -NewPG is a temporary protect to work on GnuPG extensions. It will -be merged into the regular GnuPG sources for a GnuPG 2.0 release. - -WWW: http://www.gnupg.org/aegypten/ - -michaelnottebrock@gmx.net diff --git a/security/newpg/pkg-plist b/security/newpg/pkg-plist deleted file mode 100644 index 39fe66c..0000000 --- a/security/newpg/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -bin/gpg-agent -bin/gpgsm -bin/kbxutil -%%WITH_OPENSC%%bin/scdaemon -lib/newpg/gpg-protect-tool -share/locale/de/LC_MESSAGES/newpg.mo -@dirrm lib/newpg |
