summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--security/gpgme/Makefile7
-rw-r--r--security/gpgme/distinfo20
-rw-r--r--security/gpgme/patches/patch-ab8
-rw-r--r--security/gpgme/patches/patch-ac12
-rw-r--r--security/gpgme/patches/patch-ae8
-rw-r--r--security/gpgme/patches/patch-ah8
-rw-r--r--security/gpgme/patches/patch-ai14
-rw-r--r--security/gpgme/patches/patch-aj8
8 files changed, 42 insertions, 43 deletions
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 4359139cf31..a1051e3abe7 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2006/04/06 06:22:38 reed Exp $
+# $NetBSD: Makefile,v 1.43 2006/07/19 22:59:59 wiz Exp $
#
-DISTNAME= gpgme-1.0.3
-PKGREVISION= 3
+DISTNAME= gpgme-1.1.0
CATEGORIES= security
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gpgme/ \
ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/
@@ -11,7 +10,7 @@ MAINTAINER= oishi@ims.ac.jp
HOMEPAGE= http://www.gnupg.org/gpgme.html
COMMENT= GnuPG Made Easy
-DEPENDS+= gnupg>=1.2.2:../../security/gnupg
+DEPENDS+= gnupg>=1.4.2:../../security/gnupg
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index 43d63a626f5..d9899dc16db 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.22 2006/03/01 16:22:21 drochner Exp $
+$NetBSD: distinfo,v 1.23 2006/07/19 22:59:59 wiz Exp $
-SHA1 (gpgme-1.0.3.tar.gz) = 632436ff5c66405d9704983411aa031f29006dce
-RMD160 (gpgme-1.0.3.tar.gz) = cc8dc465c733eea8d7f0297127f9f97dd0876a53
-Size (gpgme-1.0.3.tar.gz) = 837866 bytes
+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 (patch-ab) = c47b732622deaa2eb3269d7ae753ab553c4fa54e
-SHA1 (patch-ac) = 1f27efa0a5c109c7a8b4f4e346487a5d2f8b26f2
-SHA1 (patch-ae) = 88d215ad657730349ffa19462799b64238a30426
+SHA1 (patch-ab) = 1dced26dc46f89b601171574115b6e36a0b880fb
+SHA1 (patch-ac) = ad952491ace59bcdd522de489200cad33dddfe42
+SHA1 (patch-ae) = f2b77e5f72ecae72f869afe968f77fb0f0d84c3f
SHA1 (patch-af) = ac1d130c31c1893a7c70e84580b8b4464eb3954a
SHA1 (patch-ag) = b499aba9894e24470b7ebb60643a3db5d36b7fd5
-SHA1 (patch-ah) = 852e362f143c754149e0600a7b7f3a47a569f41e
-SHA1 (patch-ai) = 5b7958ef6ed51936e948451e03dd835c1b90414c
-SHA1 (patch-aj) = 372136250ffea3e0db9d86859544b5d22a9782e6
+SHA1 (patch-ah) = 90bc8b33658ce3ce03fd3d7c015cfec53d0bd1d3
+SHA1 (patch-ai) = 290f5ff4375dd0e9c4ba09747357b335784daab5
+SHA1 (patch-aj) = 4568d37ebca320ebb87da83000a98b2891ee9bec
diff --git a/security/gpgme/patches/patch-ab b/security/gpgme/patches/patch-ab
index ae08b83e284..b6f71368a63 100644
--- a/security/gpgme/patches/patch-ab
+++ b/security/gpgme/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2004/11/06 17:40:15 jmmv Exp $
+$NetBSD: patch-ab,v 1.4 2006/07/19 22:59:59 wiz Exp $
---- tests/gpg/mkdemodirs.orig 2001-11-22 04:01:26.000000000 +0100
+--- tests/gpg/mkdemodirs.orig 2005-09-08 14:42:32.000000000 +0000
+++ tests/gpg/mkdemodirs
-@@ -2,7 +2,7 @@
+@@ -19,7 +19,7 @@
set -e
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.3 2004/11/06 17:40:15 jmmv Exp $
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'
-@@ -25,7 +25,9 @@ GPGDEMO="$GPG --homedir . --trustdb-name
+@@ -42,7 +42,9 @@ GPGDEMO="$GPG --homedir . --trustdb-name
echo -n "Creating:"
for name in $NAMES; do
echo -n " $name"
diff --git a/security/gpgme/patches/patch-ac b/security/gpgme/patches/patch-ac
index bd8688f5c59..7354bc2883c 100644
--- a/security/gpgme/patches/patch-ac
+++ b/security/gpgme/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.4 2005/11/04 17:16:34 joerg Exp $
+$NetBSD: patch-ac,v 1.5 2006/07/19 22:59:59 wiz Exp $
---- configure.orig 2004-10-22 12:52:27.000000000 -0600
+--- configure.orig 2005-10-01 21:13:49.000000000 +0000
+++ configure
-@@ -19726,12 +19726,12 @@ _ACEOF
- CFLAGS="$CFLAGS $PTH_CFLAGS"
+@@ -19878,12 +19878,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
@@ -17,7 +17,7 @@ $NetBSD: patch-ac,v 1.4 2005/11/04 17:16:34 joerg Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -19839,7 +19839,7 @@ fi
+@@ -20019,7 +20019,7 @@ fi
# Checks for header files.
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.4 2005/11/04 17:16:34 joerg Exp $
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -22011,7 +22011,7 @@ esac
+@@ -22190,7 +22190,7 @@ esac
fi
GPGSM=$ac_cv_path_GPGSM
diff --git a/security/gpgme/patches/patch-ae b/security/gpgme/patches/patch-ae
index 89157c5aef0..6e6814c43d4 100644
--- a/security/gpgme/patches/patch-ae
+++ b/security/gpgme/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2004/11/04 20:41:21 shannonjr Exp $
+$NetBSD: patch-ae,v 1.3 2006/07/19 22:59:59 wiz Exp $
---- gpgme/engine-gpgsm.c.orig 2004-10-22 12:29:21.000000000 -0600
+--- gpgme/engine-gpgsm.c.orig 2005-10-01 20:14:48.000000000 +0000
+++ gpgme/engine-gpgsm.c
-@@ -27,6 +27,9 @@
+@@ -30,6 +30,9 @@
#include <sys/types.h>
#include <assert.h>
#include <unistd.h>
@@ -12,7 +12,7 @@ $NetBSD: patch-ae,v 1.2 2004/11/04 20:41:21 shannonjr Exp $
#include <locale.h>
#include <fcntl.h> /* FIXME */
#include <errno.h>
-@@ -452,7 +455,8 @@ gpgsm_new (void **engine, const char *lc
+@@ -457,7 +460,8 @@ gpgsm_new (void **engine, const char *fi
if (isatty (1))
{
diff --git a/security/gpgme/patches/patch-ah b/security/gpgme/patches/patch-ah
index 0d11188d86d..7e2d2c6ce82 100644
--- a/security/gpgme/patches/patch-ah
+++ b/security/gpgme/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2004/11/04 20:41:21 shannonjr Exp $
+$NetBSD: patch-ah,v 1.2 2006/07/19 22:59:59 wiz Exp $
---- gpgme/error.c.orig 2003-09-30 13:36:20.000000000 -0600
+--- gpgme/error.c.orig 2005-09-08 14:42:31.000000000 +0000
+++ gpgme/error.c
-@@ -21,6 +21,10 @@
+@@ -22,6 +22,10 @@
#include <config.h>
#endif
@@ -13,7 +13,7 @@ $NetBSD: patch-ah,v 1.1 2004/11/04 20:41:21 shannonjr Exp $
#include <gpgme.h>
/* Return a pointer to a string containing a description of the error
-@@ -42,7 +46,7 @@ gpgme_strerror (gpgme_error_t err)
+@@ -43,7 +47,7 @@ gpgme_strerror (gpgme_error_t err)
int
gpgme_strerror_r (gpg_error_t err, char *buf, size_t buflen)
{
diff --git a/security/gpgme/patches/patch-ai b/security/gpgme/patches/patch-ai
index 39a17c2cbc8..1f2815fbd22 100644
--- a/security/gpgme/patches/patch-ai
+++ b/security/gpgme/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.1 2004/11/06 17:40:15 jmmv Exp $
+$NetBSD: patch-ai,v 1.2 2006/07/19 22:59:59 wiz Exp $
---- tests/gpg/Makefile.in.orig 2004-10-22 20:52:26.000000000 +0200
+--- tests/gpg/Makefile.in.orig 2005-10-01 21:13:46.000000000 +0000
+++ tests/gpg/Makefile.in
-@@ -732,7 +732,7 @@ all-local: ./pubring.gpg
- $(GPG) --homedir . --allow-secret-key-import --import Alpha/Secret.gpg Zulu/Secret.gpg
+@@ -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
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
+
+ ./gpg.conf:
+ # This is required for t-sig-notations.
diff --git a/security/gpgme/patches/patch-aj b/security/gpgme/patches/patch-aj
index 3cc25546676..43325e288b7 100644
--- a/security/gpgme/patches/patch-aj
+++ b/security/gpgme/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.1 2005/11/04 17:16:34 joerg Exp $
+$NetBSD: patch-aj,v 1.2 2006/07/19 22:59:59 wiz Exp $
---- gpgme/Makefile.in.orig 2005-11-02 14:59:53.000000000 +0000
+--- gpgme/Makefile.in.orig 2005-10-01 21:13:45.000000000 +0000
+++ gpgme/Makefile.in
-@@ -350,7 +350,7 @@ libgpgme_pthread_la_DEPENDENCIES = libgp
+@@ -346,7 +346,7 @@ libgpgme_pthread_la_DEPENDENCIES = libgp
@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_pth_la_CFLAGS = $(AM_CFLAGS) @PTH_CFLAGS@
libgpgme_pth_la_CPPFLAGS = $(AM_CPPFLAGS) @PTH_CPPFLAGS@
- libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-01 15:02:35 +0000