Sun Nov 15 18:41:55 2009 UTC ()
update to 1.1.8
changes:
-bugfixes
-API extensions
-documentation improvement
-The encoding of gpgme_data_t objects can affect the output encoding
 of export, sign and encrypt operations now
-Using GPGME_KEYLIST_MODE_LOCAL combined with
 GPGME_KEYLIST_MODE_EXTERN is now supported


(drochner)
diff -r1.56 -r1.57 pkgsrc/security/gpgme/Makefile
diff -r1.26 -r1.27 pkgsrc/security/gpgme/distinfo
diff -r1.7 -r1.8 pkgsrc/security/gpgme/patches/patch-aa
diff -r1.1 -r0 pkgsrc/security/gpgme/patches/patch-ad
diff -r1.1 -r0 pkgsrc/security/gpgme/patches/patch-ak
diff -r1.3 -r1.4 pkgsrc/security/gpgme/patches/patch-ae
diff -r1.3 -r1.4 pkgsrc/security/gpgme/patches/patch-aj
diff -r1.5 -r1.6 pkgsrc/security/gpgme/patches/patch-af
diff -r1.2 -r1.3 pkgsrc/security/gpgme/patches/patch-ah
diff -r1.2 -r0 pkgsrc/security/gpgme/patches/patch-bc
cvs diff -r1.56 -r1.57 pkgsrc/security/gpgme/Makefile (expand / switch to unified diff)

--- pkgsrc/security/gpgme/Makefile 2009/02/17 13:02:20 1.56
+++ pkgsrc/security/gpgme/Makefile 2009/11/15 18:41:55 1.57
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.56 2009/02/17 13:02:20 joerg Exp $ 1# $NetBSD: Makefile,v 1.57 2009/11/15 18:41:55 drochner Exp $
2# 2#
3 3
4DISTNAME= gpgme-1.1.4 4DISTNAME= gpgme-1.1.8
5PKGREVISION= 2 
6CATEGORIES= security 5CATEGORIES= security
7MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gpgme/ 6MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gpgme/
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gnupg.org/related_software/gpgme/ 9HOMEPAGE= http://www.gnupg.org/related_software/gpgme/
11COMMENT= GnuPG Made Easy 10COMMENT= GnuPG Made Easy
12 11
13PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
14 13
15PKG_OPTIONS_VAR= PKG_OPTIONS.gpgme 14PKG_OPTIONS_VAR= PKG_OPTIONS.gpgme
16PKG_SUPPORTED_OPTIONS= gpgsm 15PKG_SUPPORTED_OPTIONS= gpgsm
17.include "../../mk/bsd.options.mk" 16.include "../../mk/bsd.options.mk"
18.if empty(PKG_OPTIONS:Mgpgsm) 17.if empty(PKG_OPTIONS:Mgpgsm)
cvs diff -r1.26 -r1.27 pkgsrc/security/gpgme/distinfo (expand / switch to unified diff)

--- pkgsrc/security/gpgme/distinfo 2007/03/25 00:48:08 1.26
+++ pkgsrc/security/gpgme/distinfo 2009/11/15 18:41:55 1.27
@@ -1,19 +1,16 @@ @@ -1,19 +1,16 @@
1$NetBSD: distinfo,v 1.26 2007/03/25 00:48:08 joerg Exp $ 1$NetBSD: distinfo,v 1.27 2009/11/15 18:41:55 drochner Exp $
2 2
3SHA1 (gpgme-1.1.4.tar.gz) = c5f9fe3a4479cc90ee33eff7a0669482b2f8cbe5 3SHA1 (gpgme-1.1.8.tar.gz) = 5f119d57009f1b8682d7665ae985325d0885ec9b
4RMD160 (gpgme-1.1.4.tar.gz) = 894fc39079addaf91d661ab5cf3d41b30454a873 4RMD160 (gpgme-1.1.8.tar.gz) = 6ee8856956cc8082fd19da457456b84d21d94841
5Size (gpgme-1.1.4.tar.gz) = 943219 bytes 5Size (gpgme-1.1.8.tar.gz) = 1085576 bytes
6SHA1 (patch-aa) = ef43e7f40642a4b7a6d70bd381144c495ebc9345 6SHA1 (patch-aa) = 4ef6915a2f8e062fcd2ffac83a4424c8897f734c
7SHA1 (patch-ab) = 1dced26dc46f89b601171574115b6e36a0b880fb 7SHA1 (patch-ab) = 1dced26dc46f89b601171574115b6e36a0b880fb
8SHA1 (patch-ac) = f10902e1f14f4d32443a591da5f4bb955895598e 8SHA1 (patch-ac) = f10902e1f14f4d32443a591da5f4bb955895598e
9SHA1 (patch-ad) = 8da36b8f7b07873b5dc3a04c3cfe1dae65ecadce 9SHA1 (patch-ae) = 19acb330da9bce61ab7aed0037fd3cc9d4e4efa4
10SHA1 (patch-ae) = f2b77e5f72ecae72f869afe968f77fb0f0d84c3f 10SHA1 (patch-af) = 99787938b677f291a84eae57fa29be60890f444b
11SHA1 (patch-af) = ac1d130c31c1893a7c70e84580b8b4464eb3954a 
12SHA1 (patch-ag) = 9d48fa3679f895d7395ef9e07ea294079ed89b17 11SHA1 (patch-ag) = 9d48fa3679f895d7395ef9e07ea294079ed89b17
13SHA1 (patch-ah) = 90bc8b33658ce3ce03fd3d7c015cfec53d0bd1d3 12SHA1 (patch-ah) = 84c9ad8c0c0e16584261cbb9c92e3073ce94da48
14SHA1 (patch-ai) = 290f5ff4375dd0e9c4ba09747357b335784daab5 13SHA1 (patch-ai) = 290f5ff4375dd0e9c4ba09747357b335784daab5
15SHA1 (patch-aj) = fc2b13f8400c250493d9ac7583eb3e79e6175b0f 14SHA1 (patch-aj) = 312c7f74b2fd092cbd24e94b3e3798702c8209a4
16SHA1 (patch-ak) = 1618e3ad2c1933ba019d966b83d3bd3aa5cc070a 
17SHA1 (patch-ba) = 0ab37246319860acb8b96679ac58c6b0ef01d3ed 15SHA1 (patch-ba) = 0ab37246319860acb8b96679ac58c6b0ef01d3ed
18SHA1 (patch-bb) = b9e099f39a1cc88e45858ddc547be509692d44ca 16SHA1 (patch-bb) = b9e099f39a1cc88e45858ddc547be509692d44ca
19SHA1 (patch-bc) = 071a4df142ff789cd65f487e0bda763e2e5c74b0 
cvs diff -r1.7 -r1.8 pkgsrc/security/gpgme/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/security/gpgme/patches/patch-aa 2007/03/23 20:04:13 1.7
+++ pkgsrc/security/gpgme/patches/patch-aa 2009/11/15 18:41:55 1.8
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-aa,v 1.7 2007/03/23 20:04:13 drochner Exp $ 1$NetBSD: patch-aa,v 1.8 2009/11/15 18:41:55 drochner Exp $
2 2
3--- gpgme/gpgme-config.in.orig 2007-01-26 06:28:37.000000000 +0100 3--- src/gpgme-config.in.orig 2007-01-26 06:28:37.000000000 +0100
4+++ gpgme/gpgme-config.in 4+++ src/gpgme-config.in
5@@ -29,8 +29,8 @@ libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@" 5@@ -29,8 +29,8 @@ libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
6 cflags_pth="@PTH_CFLAGS@" 6 cflags_pth="@PTH_CFLAGS@"
7  7
8 @HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread" 8 @HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread"
9-libs_pthread="-lpthread" 9-libs_pthread="-lpthread"
10-cflags_pthread="" 10-cflags_pthread=""
11+libs_pthread="@PTHREAD_LIBS@" 11+libs_pthread="@PTHREAD_LIBS@"
12+cflags_pthread="@PTHREAD_CFLAGS@" 12+cflags_pthread="@PTHREAD_CFLAGS@"
13  13
14 # Configure glib. 14 # Configure glib.
15 libs_glib="@GLIB_LIBS@" 15 libs_glib="@GLIB_LIBS@"
16@@ -114,7 +114,7 @@ while test $# -gt 0; do 16@@ -114,7 +114,7 @@ while test $# -gt 0; do
17 ;; 17 ;;
File Deleted: pkgsrc/security/gpgme/patches/Attic/patch-ad
File Deleted: pkgsrc/security/gpgme/patches/Attic/patch-ak
cvs diff -r1.3 -r1.4 pkgsrc/security/gpgme/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/security/gpgme/patches/Attic/patch-ae 2006/07/19 22:59:59 1.3
+++ pkgsrc/security/gpgme/patches/Attic/patch-ae 2009/11/15 18:41:55 1.4
@@ -1,24 +1,14 @@ @@ -1,24 +1,14 @@
1$NetBSD: patch-ae,v 1.3 2006/07/19 22:59:59 wiz Exp $ 1$NetBSD: patch-ae,v 1.4 2009/11/15 18:41:55 drochner Exp $
2 2
3--- gpgme/engine-gpgsm.c.orig 2005-10-01 20:14:48.000000000 +0000 3--- src/engine-gpgsm.c.orig 2008-11-03 17:50:12.000000000 +0100
4+++ gpgme/engine-gpgsm.c 4+++ src/engine-gpgsm.c
5@@ -30,6 +30,9 @@ 5@@ -28,6 +28,9 @@
6 #include <sys/types.h> 6 #include <sys/types.h>
7 #include <assert.h> 7 #include <assert.h>
8 #include <unistd.h> 8 #include <unistd.h>
9+#if HAVE_RFUNCS_H 9+#if HAVE_RFUNCS_H
10+#include <rfuncs.h> 10+#include <rfuncs.h>
11+#endif 11+#endif
12 #include <locale.h> 12 #include <locale.h>
13 #include <fcntl.h> /* FIXME */ 13 #include <fcntl.h> /* FIXME */
14 #include <errno.h> 14 #include <errno.h>
15@@ -457,7 +460,8 @@ gpgsm_new (void **engine, const char *fi 
16  
17 if (isatty (1)) 
18 { 
19- if (ttyname_r (1, dft_ttyname, sizeof (dft_ttyname))) 
20+ /* ttyname_r() return numeric status */ 
21+ if (err = ttyname_r (1, dft_ttyname, sizeof (dft_ttyname))) 
22 { 
23 err = gpg_error_from_errno (errno); 
24 goto leave; 
cvs diff -r1.3 -r1.4 pkgsrc/security/gpgme/patches/Attic/patch-aj (expand / switch to unified diff)

--- pkgsrc/security/gpgme/patches/Attic/patch-aj 2007/03/23 20:04:13 1.3
+++ pkgsrc/security/gpgme/patches/Attic/patch-aj 2009/11/15 18:41:55 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-aj,v 1.3 2007/03/23 20:04:13 drochner Exp $ 1$NetBSD: patch-aj,v 1.4 2009/11/15 18:41:55 drochner Exp $
2 2
3--- gpgme/Makefile.in.orig 2007-03-05 11:14:44.000000000 +0100 3--- src/Makefile.in.orig 2007-03-05 11:14:44.000000000 +0100
4+++ gpgme/Makefile.in 4+++ src/Makefile.in
5@@ -438,7 +438,7 @@ libgpgme_pthread_la_DEPENDENCIES = $(ass 5@@ -438,7 +438,7 @@ libgpgme_pthread_la_DEPENDENCIES = $(ass
6 @LTLIBOBJS@ $(srcdir)/libgpgme.vers 6 @LTLIBOBJS@ $(srcdir)/libgpgme.vers
7  7
8 libgpgme_pthread_la_LIBADD = $(assuan_libobjs) @LTLIBOBJS@ \ 8 libgpgme_pthread_la_LIBADD = $(assuan_libobjs) @LTLIBOBJS@ \
9- -lpthread @GPG_ERROR_LIBS@ @NETLIBS@ 9- -lpthread @GPG_ERROR_LIBS@ @NETLIBS@
10+ $(PTHREAD_LDFLAGS) $(PTHREAD_LIBS) @GPG_ERROR_LIBS@ @NETLIBS@ 10+ $(PTHREAD_LDFLAGS) $(PTHREAD_LIBS) @GPG_ERROR_LIBS@ @NETLIBS@
11  11
12 libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ \ 12 libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ \
13 $(libgpgme_version_script_cmd) -version-info \ 13 $(libgpgme_version_script_cmd) -version-info \
cvs diff -r1.5 -r1.6 pkgsrc/security/gpgme/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/security/gpgme/patches/Attic/patch-af 2006/03/01 16:22:21 1.5
+++ pkgsrc/security/gpgme/patches/Attic/patch-af 2009/11/15 18:41:55 1.6
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-af,v 1.5 2006/03/01 16:22:21 drochner Exp $ 1$NetBSD: patch-af,v 1.6 2009/11/15 18:41:55 drochner Exp $
2 2
3--- gpgme/get-env.c.orig 2004-12-07 21:47:40.000000000 +0100 3--- src/get-env.c.orig 2004-12-07 21:47:40.000000000 +0100
4+++ gpgme/get-env.c 4+++ src/get-env.c
5@@ -22,6 +22,9 @@ 5@@ -22,6 +22,9 @@
6 #include <config.h> 6 #include <config.h>
7 #endif 7 #endif
8 #include <stdlib.h> 8 #include <stdlib.h>
9+#if HAVE_RFUNCS_H 9+#if HAVE_RFUNCS_H
10+#include <rfuncs.h> 10+#include <rfuncs.h>
11+#endif 11+#endif
12 #include <errno.h> 12 #include <errno.h>
13 #include <string.h> 13 #include <string.h>
14  14
15@@ -53,7 +56,25 @@ _gpgme_getenv (const char *name, char ** 15@@ -53,7 +56,25 @@ _gpgme_getenv (const char *name, char **
16  16
17 #else 17 #else
cvs diff -r1.2 -r1.3 pkgsrc/security/gpgme/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/security/gpgme/patches/Attic/patch-ah 2006/07/19 22:59:59 1.2
+++ pkgsrc/security/gpgme/patches/Attic/patch-ah 2009/11/15 18:41:55 1.3
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ah,v 1.2 2006/07/19 22:59:59 wiz Exp $ 1$NetBSD: patch-ah,v 1.3 2009/11/15 18:41:55 drochner Exp $
2 2
3--- gpgme/error.c.orig 2005-09-08 14:42:31.000000000 +0000 3--- src/error.c.orig 2005-09-08 14:42:31.000000000 +0000
4+++ gpgme/error.c 4+++ src/error.c
5@@ -22,6 +22,10 @@ 5@@ -22,6 +22,10 @@
6 #include <config.h> 6 #include <config.h>
7 #endif 7 #endif
8  8
9+#if HAVE_RFUNCS_H 9+#if HAVE_RFUNCS_H
10+#include <rfuncs.h> 10+#include <rfuncs.h>
11+#endif 11+#endif
12+ 12+
13 #include <gpgme.h> 13 #include <gpgme.h>
14  14
15 /* Return a pointer to a string containing a description of the error 15 /* Return a pointer to a string containing a description of the error
16@@ -43,7 +47,7 @@ gpgme_strerror (gpgme_error_t err) 16@@ -43,7 +47,7 @@ gpgme_strerror (gpgme_error_t err)
17 int 17 int
File Deleted: pkgsrc/security/gpgme/patches/Attic/patch-bc