update to 1.4.1

changes:
-new APIs added
-FD passing enabled by default
-bugfixes

5 files changed, 33 insertions, 35 deletions

diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 42582600539..7257bef29e3 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2012/10/23 18:16:29 asau Exp $
+# $NetBSD: Makefile,v 1.70 2013/05/03 16:36:04 drochner Exp $
 
-DISTNAME=	gpgme-1.3.1
-PKGREVISION=	1
+DISTNAME=	gpgme-1.4.1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gpgme/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index 2fc53128154..9591c731d99 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.30 2011/08/11 11:15:00 adam Exp $
+$NetBSD: distinfo,v 1.31 2013/05/03 16:36:04 drochner Exp $
 
-SHA1 (gpgme-1.3.1.tar.bz2) = 7d19a95a2239da13764dad7f97541be884ec5a37
-RMD160 (gpgme-1.3.1.tar.bz2) = 95354069b515ef9aa80e9722645e908b10ea6dca
-Size (gpgme-1.3.1.tar.bz2) = 841093 bytes
-SHA1 (patch-aa) = ff9d08d2897c183c8cb2ce85f4d29b59d80919e2
-SHA1 (patch-ac) = 6ce21be79271f1ee018afe49eba7d103e6d793e3
+SHA1 (gpgme-1.4.1.tar.bz2) = d6110763e7459214fd72705e87ebc682e3b5815e
+RMD160 (gpgme-1.4.1.tar.bz2) = 6bcd9f06857437fabab583695ec993286f42ba34
+Size (gpgme-1.4.1.tar.bz2) = 958632 bytes
+SHA1 (patch-aa) = dcea4fd232a8e3e3656ae9cf5319060a009f3c59
+SHA1 (patch-ac) = 4e4c582cbe03679945d30bde62ca2716665186e9
 SHA1 (patch-ae) = 1259739c4690db656bc5b6113842b1d5c4623616
 SHA1 (patch-af) = 99787938b677f291a84eae57fa29be60890f444b
 SHA1 (patch-ag) = c45777a312bb5ed7f57852e9410270a4fafee9f8
 SHA1 (patch-ah) = 84c9ad8c0c0e16584261cbb9c92e3073ce94da48
-SHA1 (patch-aj) = 080a3549162d85df2e390892b14c3372a35ce18f
+SHA1 (patch-aj) = 42e765b524767e880357c844235baabef1beedf4
diff --git a/security/gpgme/patches/patch-aa b/security/gpgme/patches/patch-aa
index 6f19fe80bed..ea1ceafca0a 100644
--- a/security/gpgme/patches/patch-aa
+++ b/security/gpgme/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.10 2011/08/11 11:15:00 adam Exp $
+$NetBSD: patch-aa,v 1.11 2013/05/03 16:36:04 drochner Exp $
 
---- src/gpgme-config.in.orig	2009-10-23 13:44:56.000000000 +0000
+--- src/gpgme-config.in.orig	2012-05-02 08:42:23.000000000 +0000
 +++ src/gpgme-config.in
-@@ -35,8 +35,8 @@ libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
- cflags_pth="@PTH_CFLAGS@"
+@@ -33,8 +33,8 @@ gpg_error_libs="@GPG_ERROR_LIBS@"
+ thread_modules=""
  
  @HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread"
 -libs_pthread="-lpthread"
diff --git a/security/gpgme/patches/patch-ac b/security/gpgme/patches/patch-ac
index f780d46f820..056fde9b2c1 100644
--- a/security/gpgme/patches/patch-ac
+++ b/security/gpgme/patches/patch-ac
@@ -1,8 +1,16 @@
-$NetBSD: patch-ac,v 1.9 2011/08/11 11:15:00 adam Exp $
+$NetBSD: patch-ac,v 1.10 2013/05/03 16:36:04 drochner Exp $
 
---- configure.orig	2011-06-16 12:44:52.000000000 +0000
+--- configure.orig	2013-05-01 12:18:09.000000000 +0000
 +++ configure
-@@ -16866,7 +16866,7 @@ if test "${ac_cv_lib_pthread_pthread_cre
+@@ -2729,6 +2729,7 @@ $as_echo "$as_me: creating cache $cache_
+ fi
+ 
+ as_fn_append ac_header_list " locale.h"
++as_fn_append ac_header_list " rfuncs.h"
+ as_fn_append ac_header_list " sys/select.h"
+ as_fn_append ac_header_list " sys/uio.h"
+ as_fn_append ac_header_list " argp.h"
+@@ -17173,7 +17174,7 @@ if ${ac_cv_lib_pthread_pthread_create+:}
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -11,25 +19,16 @@ $NetBSD: patch-ac,v 1.9 2011/08/11 11:15:00 adam Exp $
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -17020,7 +17020,7 @@ fi
- 
- done
- 
--for ac_header in sys/select.h
-+for ac_header in rfuncs.h sys/select.h
- 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 :
-@@ -17417,7 +17417,7 @@ else
- /* end confdefs.h.  */
- __thread int foo;
+@@ -17768,7 +17769,7 @@ main ()
+   return 0;
+ }
  _ACEOF
 -if ac_fn_c_try_compile "$LINENO"; then :
 +if ac_fn_c_try_link "$LINENO"; then :
    gpgme_cv_tls_works=yes
  else
    gpgme_cv_tls_works=no
-@@ -18342,7 +18342,7 @@ IFS=$as_save_IFS
+@@ -18952,7 +18953,7 @@ IFS=$as_save_IFS
  esac
  fi
  GPGSM=$ac_cv_path_GPGSM
diff --git a/security/gpgme/patches/patch-aj b/security/gpgme/patches/patch-aj
index b12cf98a623..bf282f71feb 100644
--- a/security/gpgme/patches/patch-aj
+++ b/security/gpgme/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.6 2011/08/11 11:15:00 adam Exp $
+$NetBSD: patch-aj,v 1.7 2013/05/03 16:36:05 drochner Exp $
 
---- src/Makefile.in.orig	2010-01-11 11:06:54.000000000 +0000
+--- src/Makefile.in.orig	2013-05-01 12:18:06.000000000 +0000
 +++ src/Makefile.in
-@@ -558,7 +558,7 @@ libgpgme_pthread_la_LDFLAGS = $(no_undef
+@@ -551,7 +551,7 @@ libgpgme_pthread_la_LDFLAGS = $(no_undef
  
  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@ $(no_undefined) $(export_symbols) \
- 	$(libgpgme_version_script_cmd) -version-info \
+ @BUILD_W32_GLIB_TRUE@libgpgme_glib_la_LDFLAGS = $(no_undefined) \
+ @BUILD_W32_GLIB_TRUE@	$(export_symbols) $(libgpgme_version_script_cmd) -version-info \