Changes 1.3.0:

* GPGME does not come with an internal libassuan version anymore.
  The external libassuan 1.1.0 release or later is required.  For
  application programmers on systems that can resolve inter-library
  dependencies at runtime, this is a transparent change.
* New engine GPGME_PROTOCOL_G13 to support the new g13 tool.
* New engine GPGME_PROTOCOL_UISERVER to support UI Servers.
* New API to change the passpgrase of a key.

12 files changed, 81 insertions, 133 deletions

diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index e06bbf585c6..97cd22b6806 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,25 +1,17 @@
-# $NetBSD: Makefile,v 1.62 2010/06/25 22:11:10 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.63 2011/03/03 11:39:47 adam Exp $
 
-DISTNAME=	gpgme-1.1.8
-PKGREVISION=	2
+DISTNAME=	gpgme-1.3.0
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gpgme/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnupg.org/related_software/gpgme/
 COMMENT=	GnuPG Made Easy
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PKG_OPTIONS_VAR=        PKG_OPTIONS.gpgme
-PKG_SUPPORTED_OPTIONS=	gpgsm
-PKG_SUGGESTED_OPTIONS=	gpgsm
-.include "../../mk/bsd.options.mk"
-.if empty(PKG_OPTIONS:Mgpgsm)
-DEPENDS+=		gnupg>=1.4.2:../../security/gnupg
-.endif
-
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 PTHREAD_OPTS+=		require
@@ -45,25 +37,7 @@ TEST_TARGET=		check
 CONFIGURE_ARGS+=	--without-pth --without-pth-test
 .endif
 
-BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.4
-.include "../../security/libgpg-error/buildlink3.mk"
-
-# we want the getenv_r() semantics of NetBSD-current
-BUILDLINK_API_DEPENDS.librfuncs+=	librfuncs>=1.0.7nb1
-.include "../../devel/librfuncs/buildlink3.mk"
-
-##
-## Option to build with gpgsm. This provides SMIME support
-##
-.if !empty(PKG_OPTIONS:Mgpgsm)
-.  include "../../security/gnupg2/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-gpgsm=${BUILDLINK_PREFIX.gnupg2}/bin/gpgsm
-CONFIGURE_ARGS+=	--with-gpg=${BUILDLINK_PREFIX.gnupg2}/bin/gpg2
-REPLACE_SH+=		tests/gpg/pinentry
-.else
-CONFIGURE_ARGS+=	--without-gpgsm
-CONFIGURE_ARGS+=	--without-gpgconf
-.endif
+.include "options.mk"
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -71,4 +45,10 @@ CONFIGURE_ARGS+=	--without-gpgconf
 CONFIGURE_ENV+=		ac_cv_lib_pthread_pthread_create=yes
 .endif
 
+BUILDLINK_API_DEPENDS.librfuncs+=	librfuncs>=1.0.7nb1
+.include "../../devel/librfuncs/buildlink3.mk"
+.include "../../security/libassuan2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.4
+.include "../../security/libgpg-error/buildlink3.mk"
+# we want the getenv_r() semantics of NetBSD-current
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index 2e477684233..ebb61763c9e 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,16 +1,13 @@
-$NetBSD: distinfo,v 1.27 2009/11/15 18:41:55 drochner Exp $
+$NetBSD: distinfo,v 1.28 2011/03/03 11:39:47 adam Exp $
 
-SHA1 (gpgme-1.1.8.tar.gz) = 5f119d57009f1b8682d7665ae985325d0885ec9b
-RMD160 (gpgme-1.1.8.tar.gz) = 6ee8856956cc8082fd19da457456b84d21d94841
-Size (gpgme-1.1.8.tar.gz) = 1085576 bytes
-SHA1 (patch-aa) = 4ef6915a2f8e062fcd2ffac83a4424c8897f734c
-SHA1 (patch-ab) = 1dced26dc46f89b601171574115b6e36a0b880fb
-SHA1 (patch-ac) = f10902e1f14f4d32443a591da5f4bb955895598e
-SHA1 (patch-ae) = 19acb330da9bce61ab7aed0037fd3cc9d4e4efa4
+SHA1 (gpgme-1.3.0.tar.bz2) = 0db69082abfbbbaf86c3ab0906f5137de900da73
+RMD160 (gpgme-1.3.0.tar.bz2) = 9699ba5cb991459e41af46112914cac221a9b69d
+Size (gpgme-1.3.0.tar.bz2) = 869470 bytes
+SHA1 (patch-aa) = 3ebd77d5a3b6a000528fad2b4e23d15d5618bbda
+SHA1 (patch-ab) = fc89b2512777afa10ab27490717a2675a2f545b2
+SHA1 (patch-ac) = 14193ac325b9f1507845345feee2c130ffd40276
+SHA1 (patch-ae) = b2e193ec6bb21f11f00ce4cb1dd44027346ab613
 SHA1 (patch-af) = 99787938b677f291a84eae57fa29be60890f444b
-SHA1 (patch-ag) = 9d48fa3679f895d7395ef9e07ea294079ed89b17
+SHA1 (patch-ag) = 9d6116da7edc727a4011bf8a5dc8d5ff2a902924
 SHA1 (patch-ah) = 84c9ad8c0c0e16584261cbb9c92e3073ce94da48
-SHA1 (patch-ai) = 290f5ff4375dd0e9c4ba09747357b335784daab5
-SHA1 (patch-aj) = 312c7f74b2fd092cbd24e94b3e3798702c8209a4
-SHA1 (patch-ba) = 0ab37246319860acb8b96679ac58c6b0ef01d3ed
-SHA1 (patch-bb) = b9e099f39a1cc88e45858ddc547be509692d44ca
+SHA1 (patch-aj) = 9d90e26e5ed233977d6dc9505be8e7665dec3c64
diff --git a/security/gpgme/options.mk b/security/gpgme/options.mk
new file mode 100644
index 00000000000..356e633ad6d
--- /dev/null
+++ b/security/gpgme/options.mk
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2011/03/03 11:39:47 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gpgme
+PKG_SUPPORTED_OPTIONS=	gpgsm
+PKG_SUGGESTED_OPTIONS=	gpgsm
+
+.include "../../mk/bsd.options.mk"
+
+##
+## Option to build with gpgsm. This provides SMIME support
+##
+.if !empty(PKG_OPTIONS:Mgpgsm)
+.  include "../../security/gnupg2/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-gpgsm=${BUILDLINK_PREFIX.gnupg2}/bin/gpgsm
+CONFIGURE_ARGS+=	--with-gpg=${BUILDLINK_PREFIX.gnupg2}/bin/gpg2
+REPLACE_SH+=		tests/gpg/pinentry
+.else
+DEPENDS+=		gnupg>=1.4.2:../../security/gnupg
+CONFIGURE_ARGS+=	--without-gpgconf
+CONFIGURE_ARGS+=	--without-gpgsm
+.endif
diff --git a/security/gpgme/patches/patch-aa b/security/gpgme/patches/patch-aa
index c41cd7d2bed..b887d244a3d 100644
--- a/security/gpgme/patches/patch-aa
+++ b/security/gpgme/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2009/11/15 18:41:55 drochner Exp $
+$NetBSD: patch-aa,v 1.9 2011/03/03 11:39:47 adam Exp $
 
---- src/gpgme-config.in.orig	2007-01-26 06:28:37.000000000 +0100
+--- src/gpgme-config.in.orig	2009-10-23 13:44:56.000000000 +0000
 +++ src/gpgme-config.in
-@@ -29,8 +29,8 @@ libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
+@@ -35,8 +35,8 @@ libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
  cflags_pth="@PTH_CFLAGS@"
  
  @HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread"
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.8 2009/11/15 18:41:55 drochner Exp $
  
  # Configure glib.
  libs_glib="@GLIB_LIBS@"
-@@ -114,7 +114,7 @@ while test $# -gt 0; do
+@@ -120,7 +120,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-ab b/security/gpgme/patches/patch-ab
index b6f71368a63..6841f375462 100644
--- a/security/gpgme/patches/patch-ab
+++ b/security/gpgme/patches/patch-ab
@@ -1,16 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2006/07/19 22:59:59 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2011/03/03 11:39:47 adam Exp $
 
---- tests/gpg/mkdemodirs.orig	2005-09-08 14:42:32.000000000 +0000
-+++ tests/gpg/mkdemodirs
-@@ -19,7 +19,7 @@
- 
- set -e
- 
--GPG="gpg --batch --quiet --no-secmem-warning"
-+GPG="${GPG:-gpg} --batch --quiet --no-secmem-warning"
- NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India
-        Juliet Kilo Lima Mike November Oscar Papa Quebec Romeo
-        Sierra Tango Uniform Victor Whisky XRay Yankee Zulu'
+--- tests/gpg/mkdemodirs.in.orig	2009-06-15 11:59:37.000000000 +0000
++++ tests/gpg/mkdemodirs.in
 @@ -42,7 +42,9 @@ GPGDEMO="$GPG --homedir . --trustdb-name
  echo -n "Creating:"
  for name in $NAMES; do
@@ -21,4 +12,4 @@ $NetBSD: patch-ab,v 1.4 2006/07/19 22:59:59 wiz Exp $
 +    fi
      mkdir $name
      $GPGDEMO --export-secret-key -o - $name > $name/Secret.gpg
-     $GPG --homedir $name --allow-secret-key-import --import $name/Secret.gpg
+     $GPG --homedir $name --import $name/Secret.gpg
diff --git a/security/gpgme/patches/patch-ac b/security/gpgme/patches/patch-ac
index b8212336512..21b18f6d2f9 100644
--- a/security/gpgme/patches/patch-ac
+++ b/security/gpgme/patches/patch-ac
@@ -1,37 +1,31 @@
-$NetBSD: patch-ac,v 1.6 2007/03/23 20:04:13 drochner Exp $
+$NetBSD: patch-ac,v 1.7 2011/03/03 11:39:47 adam Exp $
 
---- configure.orig	2007-03-05 11:14:49.000000000 +0100
+--- configure.orig	2010-01-11 11:06:55.000000000 +0000
 +++ configure
-@@ -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; }
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16809,7 +16809,7 @@ if test "${ac_cv_lib_pthread_pthread_cre
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -22093,7 +22093,7 @@ fi
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
- # Checks for header files.
+@@ -16921,7 +16921,7 @@ fi
  
+ 
+ # Checks for header files.
 -for ac_header in sys/select.h
 +for ac_header in rfuncs.h sys/select.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-@@ -24986,7 +24986,7 @@ IFS=$as_save_IFS
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
+ if test "x$ac_cv_header_sys_select_h" = x""yes; then :
+@@ -18105,7 +18105,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; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPGSM" >&5
+ $as_echo "$GPGSM" >&6; }
  else
diff --git a/security/gpgme/patches/patch-ae b/security/gpgme/patches/patch-ae
index bff6732ada6..68cd2c26efb 100644
--- a/security/gpgme/patches/patch-ae
+++ b/security/gpgme/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2009/11/15 18:41:55 drochner Exp $
+$NetBSD: patch-ae,v 1.5 2011/03/03 11:39:48 adam Exp $
 
 --- src/engine-gpgsm.c.orig	2008-11-03 17:50:12.000000000 +0100
 +++ src/engine-gpgsm.c
-@@ -28,6 +28,9 @@
+@@ -29,6 +29,9 @@
  #include <sys/types.h>
  #include <assert.h>
  #include <unistd.h>
diff --git a/security/gpgme/patches/patch-ag b/security/gpgme/patches/patch-ag
index a71f2dc28ce..459447db656 100644
--- a/security/gpgme/patches/patch-ag
+++ b/security/gpgme/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.2 2007/03/23 20:04:13 drochner Exp $
+$NetBSD: patch-ag,v 1.3 2011/03/03 11:39:48 adam Exp $
 
---- config.h.in.orig	2007-03-05 11:17:55.000000000 +0100
+--- config.h.in.orig	2010-01-11 11:06:53.000000000 +0000
 +++ config.h.in
-@@ -55,6 +55,9 @@
- /* Define to 1 if you have the `putc_unlocked' function. */
- #undef HAVE_PUTC_UNLOCKED
+@@ -70,6 +70,9 @@
+ /* Define if we have pthread. */
+ #undef HAVE_PTHREAD
  
 +/* Define to 1 if you have the <rfuncs.h> header file. */
 +#undef HAVE_RFUNCS_H
diff --git a/security/gpgme/patches/patch-ai b/security/gpgme/patches/patch-ai
deleted file mode 100644
index 1f2815fbd22..00000000000
--- a/security/gpgme/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2006/07/19 22:59:59 wiz Exp $
-
---- tests/gpg/Makefile.in.orig	2005-10-01 21:13:46.000000000 +0000
-+++ tests/gpg/Makefile.in
-@@ -764,7 +764,7 @@ all-local: ./pubring.gpg ./gpg.conf
- 		--import Alpha/Secret.gpg Zulu/Secret.gpg
- 
- ./Alpha/Secret.gpg: secdemo.asc 
--	srcdir=$(srcdir) $(srcdir)/mkdemodirs 
-+	srcdir=$(srcdir) GPG=$(GPG) $(srcdir)/mkdemodirs 
- 
- ./gpg.conf:
- # This is required for t-sig-notations.
diff --git a/security/gpgme/patches/patch-aj b/security/gpgme/patches/patch-aj
index 41286299a91..d83f3010357 100644
--- a/security/gpgme/patches/patch-aj
+++ b/security/gpgme/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.4 2009/11/15 18:41:55 drochner Exp $
+$NetBSD: patch-aj,v 1.5 2011/03/03 11:39:48 adam Exp $
 
---- src/Makefile.in.orig	2007-03-05 11:14:44.000000000 +0100
+--- src/Makefile.in.orig	2010-01-11 11:06:54.000000000 +0000
 +++ src/Makefile.in
-@@ -438,7 +438,7 @@ libgpgme_pthread_la_DEPENDENCIES = $(ass
- 	@LTLIBOBJS@ $(srcdir)/libgpgme.vers
+@@ -544,7 +544,7 @@ libgpgme_pthread_la_LDFLAGS = $(no_undef
  
- libgpgme_pthread_la_LIBADD = $(assuan_libobjs) @LTLIBOBJS@ \
--	-lpthread @GPG_ERROR_LIBS@ @NETLIBS@
-+	$(PTHREAD_LDFLAGS) $(PTHREAD_LIBS) @GPG_ERROR_LIBS@ @NETLIBS@
+ libgpgme_pthread_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers
+ libgpgme_pthread_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
+-	-lpthread @GPG_ERROR_LIBS@
++	$(PTHREAD_LDFLAGS) $(PTHREAD_LIBS) @GPG_ERROR_LIBS@
  
- libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ \
+ libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ $(no_undefined) $(export_symbols) \
  	$(libgpgme_version_script_cmd) -version-info \
diff --git a/security/gpgme/patches/patch-ba b/security/gpgme/patches/patch-ba
deleted file mode 100644
index c010b48228a..00000000000
--- a/security/gpgme/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.4 2007/03/23 20:04:13 drochner Exp $
-
---- assuan/assuan.h.orig	2007-01-05 10:55:52.000000000 +0100
-+++ assuan/assuan.h
-@@ -25,6 +25,8 @@
- #include <stdio.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <sys/time.h>
-+#include <sys/socket.h>
- 
- 
- /* To use this file with libraries the following macros are useful:
diff --git a/security/gpgme/patches/patch-bb b/security/gpgme/patches/patch-bb
deleted file mode 100644
index 866a138456f..00000000000
--- a/security/gpgme/patches/patch-bb
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2006/10/20 15:25:22 shannonjr Exp $
-
---- assuan/assuan-errors.c.orig	2005-10-01 15:15:12.000000000 -0600
-+++ assuan/assuan-errors.c
-@@ -107,4 +107,3 @@ assuan_strerror (AssuanError err)
- 
-   return s;
- }
--