update to 1.1.4

this fixes the same problem which was fixed by gpg-1.4.7: depending
on use, additional text could get through undetected
this gpgme uses gpg in a save way -- since we have gpg-1.4.7 in pkgsrc
this is kindo belt-and-suspender, but anyway...

10 files changed, 80 insertions, 63 deletions

diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 0d19a4175a9..c54b9c682e2 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2006/11/17 12:16:00 shannonjr Exp $
+# $NetBSD: Makefile,v 1.49 2007/03/23 20:04:13 drochner Exp $
 #
 
-DISTNAME=	gpgme-1.1.0
-PKGREVISION=	2
+DISTNAME=	gpgme-1.1.4
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gpgme/ \
 		ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/
diff --git a/security/gpgme/PLIST b/security/gpgme/PLIST
index e3c771310d0..eb1e1d78f94 100644
--- a/security/gpgme/PLIST
+++ b/security/gpgme/PLIST
@@ -1,7 +1,11 @@
-@comment $NetBSD: PLIST,v 1.14 2006/03/31 23:56:29 jlam Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/03/23 20:04:13 drochner Exp $
 bin/gpgme-config
 include/gpgme.h
 info/gpgme.info
 lib/libgpgme-pthread.la
 lib/libgpgme.la
 share/aclocal/gpgme.m4
+share/common-lisp/source/gpgme/gpgme-package.lisp
+share/common-lisp/source/gpgme/gpgme.asd
+share/common-lisp/source/gpgme/gpgme.lisp
+@dirrm share/common-lisp/source/gpgme
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index 435517168ee..62a51a87b8d 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,17 +1,18 @@
-$NetBSD: distinfo,v 1.24 2006/10/20 15:25:22 shannonjr Exp $
+$NetBSD: distinfo,v 1.25 2007/03/23 20:04:13 drochner Exp $
 
-SHA1 (gpgme-1.1.0.tar.gz) = 2b4f6a8eb4bbc3bc8ad049840c8cbe695ad379f9
-RMD160 (gpgme-1.1.0.tar.gz) = f29903597e74ae637001a73ba9ae4cfd20802bf2
-Size (gpgme-1.1.0.tar.gz) = 862122 bytes
-SHA1 (patch-aa) = 3a9d2d9de847b2c763ab23d0af32064dee9d20c5
+SHA1 (gpgme-1.1.4.tar.gz) = c5f9fe3a4479cc90ee33eff7a0669482b2f8cbe5
+RMD160 (gpgme-1.1.4.tar.gz) = 894fc39079addaf91d661ab5cf3d41b30454a873
+Size (gpgme-1.1.4.tar.gz) = 943219 bytes
+SHA1 (patch-aa) = ef43e7f40642a4b7a6d70bd381144c495ebc9345
 SHA1 (patch-ab) = 1dced26dc46f89b601171574115b6e36a0b880fb
-SHA1 (patch-ac) = ad952491ace59bcdd522de489200cad33dddfe42
+SHA1 (patch-ac) = f10902e1f14f4d32443a591da5f4bb955895598e
 SHA1 (patch-ae) = f2b77e5f72ecae72f869afe968f77fb0f0d84c3f
 SHA1 (patch-af) = ac1d130c31c1893a7c70e84580b8b4464eb3954a
-SHA1 (patch-ag) = b499aba9894e24470b7ebb60643a3db5d36b7fd5
+SHA1 (patch-ag) = 9d48fa3679f895d7395ef9e07ea294079ed89b17
 SHA1 (patch-ah) = 90bc8b33658ce3ce03fd3d7c015cfec53d0bd1d3
 SHA1 (patch-ai) = 290f5ff4375dd0e9c4ba09747357b335784daab5
-SHA1 (patch-aj) = 4568d37ebca320ebb87da83000a98b2891ee9bec
-SHA1 (patch-ba) = de6c60af5e3ad426d51695a99d320f10528d2d7d
+SHA1 (patch-aj) = fc2b13f8400c250493d9ac7583eb3e79e6175b0f
+SHA1 (patch-ak) = 1618e3ad2c1933ba019d966b83d3bd3aa5cc070a
+SHA1 (patch-ba) = 0ab37246319860acb8b96679ac58c6b0ef01d3ed
 SHA1 (patch-bb) = b9e099f39a1cc88e45858ddc547be509692d44ca
-SHA1 (patch-bc) = af66585e1b0c3eb8bbf7c319d08c307fff5aaa62
+SHA1 (patch-bc) = 071a4df142ff789cd65f487e0bda763e2e5c74b0
diff --git a/security/gpgme/patches/patch-aa b/security/gpgme/patches/patch-aa
index 32e0b976f5e..991b1016c12 100644
--- a/security/gpgme/patches/patch-aa
+++ b/security/gpgme/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2006/02/11 14:11:07 joerg Exp $
+$NetBSD: patch-aa,v 1.7 2007/03/23 20:04:13 drochner Exp $
 
---- gpgme/gpgme-config.in.orig	2004-05-21 21:49:29.000000000 +0200
-+++ gpgme/gpgme-config.in	2004-08-22 17:25:14.000000000 +0200
-@@ -26,8 +26,8 @@ libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
+--- gpgme/gpgme-config.in.orig	2007-01-26 06:28:37.000000000 +0100
++++ gpgme/gpgme-config.in
+@@ -29,8 +29,8 @@ libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
  cflags_pth="@PTH_CFLAGS@"
  
  @HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread"
@@ -11,9 +11,9 @@ $NetBSD: patch-aa,v 1.6 2006/02/11 14:11:07 joerg Exp $
 +libs_pthread="@PTHREAD_LIBS@"
 +cflags_pthread="@PTHREAD_CFLAGS@"
  
- output=""
- 
-@@ -98,7 +98,7 @@ while test $# -gt 0; do
+ # Configure glib.
+ libs_glib="@GLIB_LIBS@"
+@@ -114,7 +114,7 @@ while test $# -gt 0; do
  	    ;;
  	--libs)
  	    if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
diff --git a/security/gpgme/patches/patch-ac b/security/gpgme/patches/patch-ac
index 7354bc2883c..b8212336512 100644
--- a/security/gpgme/patches/patch-ac
+++ b/security/gpgme/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.5 2006/07/19 22:59:59 wiz Exp $
+$NetBSD: patch-ac,v 1.6 2007/03/23 20:04:13 drochner Exp $
 
---- configure.orig	2005-10-01 21:13:49.000000000 +0000
+--- configure.orig	2007-03-05 11:14:49.000000000 +0100
 +++ configure
-@@ -19878,12 +19878,12 @@ _ACEOF
+@@ -21575,12 +21575,12 @@ _ACEOF
  
  	fi
- 	echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+ 	{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
++echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6; }
  if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -17,7 +17,7 @@ $NetBSD: patch-ac,v 1.5 2006/07/19 22:59:59 wiz Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20019,7 +20019,7 @@ fi
+@@ -22093,7 +22093,7 @@ fi
  
  # Checks for header files.
  
@@ -25,13 +25,13 @@ $NetBSD: patch-ac,v 1.5 2006/07/19 22:59:59 wiz Exp $
 +for ac_header in rfuncs.h sys/select.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -22190,7 +22190,7 @@ esac
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -24986,7 +24986,7 @@ IFS=$as_save_IFS
+ esac
  fi
  GPGSM=$ac_cv_path_GPGSM
- 
 -if test -n "$GPGSM"; then
 +if test "$GPGSM" != no; then
-   echo "$as_me:$LINENO: result: $GPGSM" >&5
- echo "${ECHO_T}$GPGSM" >&6
+   { echo "$as_me:$LINENO: result: $GPGSM" >&5
+ echo "${ECHO_T}$GPGSM" >&6; }
  else
diff --git a/security/gpgme/patches/patch-ag b/security/gpgme/patches/patch-ag
index 1dad237d997..a71f2dc28ce 100644
--- a/security/gpgme/patches/patch-ag
+++ b/security/gpgme/patches/patch-ag
@@ -1,14 +1,14 @@
-$NetBSD: patch-ag,v 1.1 2004/11/04 20:41:21 shannonjr Exp $
+$NetBSD: patch-ag,v 1.2 2007/03/23 20:04:13 drochner Exp $
 
---- config.h.in.orig	2004-11-04 11:57:44.000000000 -0700
+--- config.h.in.orig	2007-03-05 11:17:55.000000000 +0100
 +++ config.h.in
-@@ -52,6 +52,9 @@
+@@ -55,6 +55,9 @@
  /* Define to 1 if you have the `putc_unlocked' function. */
  #undef HAVE_PUTC_UNLOCKED
  
 +/* Define to 1 if you have the <rfuncs.h> header file. */
 +#undef HAVE_RFUNCS_H
 +
- /* Define to 1 if you have the <stdint.h> header file. */
- #undef HAVE_STDINT_H
+ /* Define to 1 if you have the `setenv' function. */
+ #undef HAVE_SETENV
  
diff --git a/security/gpgme/patches/patch-aj b/security/gpgme/patches/patch-aj
index 43325e288b7..5ac52c71903 100644
--- a/security/gpgme/patches/patch-aj
+++ b/security/gpgme/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.2 2006/07/19 22:59:59 wiz Exp $
+$NetBSD: patch-aj,v 1.3 2007/03/23 20:04:13 drochner Exp $
 
---- gpgme/Makefile.in.orig	2005-10-01 21:13:45.000000000 +0000
+--- gpgme/Makefile.in.orig	2007-03-05 11:14:44.000000000 +0100
 +++ gpgme/Makefile.in
-@@ -346,7 +346,7 @@ libgpgme_pthread_la_DEPENDENCIES = libgp
+@@ -438,7 +438,7 @@ libgpgme_pthread_la_DEPENDENCIES = $(ass
  	@LTLIBOBJS@ $(srcdir)/libgpgme.vers
  
- libgpgme_pthread_la_LIBADD = libgpgme-real.la $(assuan_libobjs) @LTLIBOBJS@ \
--	-lpthread @GPG_ERROR_LIBS@
-+	$(PTHREAD_LDFLAGS) $(PTHREAD_LIBS) @GPG_ERROR_LIBS@
+ libgpgme_pthread_la_LIBADD = $(assuan_libobjs) @LTLIBOBJS@ \
+-	-lpthread @GPG_ERROR_LIBS@ @NETLIBS@
++	$(PTHREAD_LDFLAGS) $(PTHREAD_LIBS) @GPG_ERROR_LIBS@ @NETLIBS@
  
- libgpgme_pth_la_CFLAGS = $(AM_CFLAGS) @PTH_CFLAGS@
- libgpgme_pth_la_CPPFLAGS = $(AM_CPPFLAGS) @PTH_CPPFLAGS@
+ libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ \
+ 	$(libgpgme_version_script_cmd) -version-info \
diff --git a/security/gpgme/patches/patch-ak b/security/gpgme/patches/patch-ak
new file mode 100644
index 00000000000..b8c47909485
--- /dev/null
+++ b/security/gpgme/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2007/03/23 20:04:13 drochner Exp $
+
+--- autogen.sh.orig	2007-03-06 18:12:50.000000000 +0100
++++ autogen.sh
+@@ -31,7 +31,7 @@ check_version () {
+ 
+ DIE=no
+ FORCE=
+-if test "$1" == "--force"; then
++if test "$1" = "--force"; then
+   FORCE=" --force"
+   shift
+ fi
diff --git a/security/gpgme/patches/patch-ba b/security/gpgme/patches/patch-ba
index 483734df1c8..c010b48228a 100644
--- a/security/gpgme/patches/patch-ba
+++ b/security/gpgme/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.3 2006/10/20 15:25:22 shannonjr Exp $
+$NetBSD: patch-ba,v 1.4 2007/03/23 20:04:13 drochner Exp $
 
---- assuan/assuan.h.orig	2005-10-01 14:14:48.000000000 -0600
+--- assuan/assuan.h.orig	2007-01-05 10:55:52.000000000 +0100
 +++ assuan/assuan.h
-@@ -24,6 +24,8 @@
+@@ -25,6 +25,8 @@
  #include <stdio.h>
  #include <sys/types.h>
  #include <unistd.h>
@@ -10,4 +10,4 @@ $NetBSD: patch-ba,v 1.3 2006/10/20 15:25:22 shannonjr Exp $
 +#include <sys/socket.h>
  
  
- /* To use this file with libraries the following macros are often
+ /* To use this file with libraries the following macros are useful:
diff --git a/security/gpgme/patches/patch-bc b/security/gpgme/patches/patch-bc
index 58a535f07e9..85f339afa39 100644
--- a/security/gpgme/patches/patch-bc
+++ b/security/gpgme/patches/patch-bc
@@ -1,27 +1,27 @@
-$NetBSD: patch-bc,v 1.1 2006/10/20 15:25:22 shannonjr Exp $
+$NetBSD: patch-bc,v 1.2 2007/03/23 20:04:13 drochner Exp $
 
---- assuan/Makefile.in.orig	2005-10-01 15:13:44.000000000 -0600
+--- assuan/Makefile.in.orig	2007-03-05 11:14:43.000000000 +0100
 +++ assuan/Makefile.in
 @@ -74,7 +74,7 @@ am_libassuan_la_OBJECTS = assuan-util.lo
  	assuan-listen.lo assuan-connect.lo assuan-client.lo \
  	assuan-pipe-server.lo assuan-socket-server.lo \
- 	assuan-pipe-connect.lo assuan-socket-connect.lo \
--	assuan-socket.lo funopen.lo assuan-io.lo \
-+	assuan-socket.lo assuan-io.lo \
- 	assuan-domain-connect.lo assuan-domain-server.lo \
- 	assuan-logging.lo
+ 	assuan-pipe-connect.lo assuan-socket-connect.lo assuan-uds.lo \
+-	funopen.lo assuan-io.lo assuan-logging.lo assuan-socket.lo
++	assuan-io.lo assuan-logging.lo assuan-socket.lo
  libassuan_la_OBJECTS = $(am_libassuan_la_OBJECTS)
-@@ -260,7 +260,6 @@ libassuan_la_SOURCES = \
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -275,7 +275,6 @@ libassuan_la_SOURCES = \
  	assuan-pipe-connect.c \
  	assuan-socket-connect.c  \
- 	assuan-socket.c \
+ 	assuan-uds.c \
 -	funopen.c \
  	assuan-io.c \
- 	assuan-domain-connect.c \
- 	assuan-domain-server.c \
-@@ -335,7 +334,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-socket-server.Plo@am__quote@
+ 	assuan-logging.c \
+ 	assuan-socket.c
+@@ -348,7 +347,6 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-socket.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-uds.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-util.Plo@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/funopen.Plo@am__quote@