diff options
| -rw-r--r-- | security/gnupg/Makefile | 5 | ||||
| -rw-r--r-- | security/gnupg/distinfo | 9 | ||||
| -rw-r--r-- | security/gnupg/patches/patch-aa | 34 | ||||
| -rw-r--r-- | security/gnupg/patches/patch-ab | 20 |
4 files changed, 22 insertions, 46 deletions
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 0fe94ff96e7..b1b53cdb25d 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2002/10/09 14:16:55 itojun Exp $ +# $NetBSD: Makefile,v 1.36 2002/10/27 02:53:02 chris Exp $ # -DISTNAME= gnupg-1.2.0 +DISTNAME= gnupg-1.2.1 CATEGORIES= security MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/ \ ftp://ftp.planetmirror.com/pub/gnupg/ \ @@ -61,6 +61,7 @@ PLIST_SUBST+= OPENLDAP="@comment " regress: cd ${WRKSRC} && make check +.include "../../converters/libiconv/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/zlib/buildlink2.mk" diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo index b009d8d4d88..559c7937330 100644 --- a/security/gnupg/distinfo +++ b/security/gnupg/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.12 2002/10/09 14:16:55 itojun Exp $ +$NetBSD: distinfo,v 1.13 2002/10/27 02:53:02 chris Exp $ -SHA1 (gnupg-1.2.0.tar.bz2) = 67a2cf5d046967b7655890aa67d59f4509fe361e -Size (gnupg-1.2.0.tar.bz2) = 1849154 bytes +SHA1 (gnupg-1.2.1.tar.bz2) = 690be04da01ebe521be16389db580b487069dab3 +Size (gnupg-1.2.1.tar.bz2) = 1889079 bytes SHA1 (idea.c.gz) = cd29040234a33cbfa9b87752c8cbb2adbccd9e95 Size (idea.c.gz) = 4538 bytes -SHA1 (patch-aa) = 643a69496655af28df525c93d8e57f1b69e55b0d -SHA1 (patch-ab) = e57e8dc8b79a18f255d99853846528b5b7943388 +SHA1 (patch-aa) = 56601df46f7f93626d82293b4062e15ab645cc40 diff --git a/security/gnupg/patches/patch-aa b/security/gnupg/patches/patch-aa index 7c29a444418..f29358a3469 100644 --- a/security/gnupg/patches/patch-aa +++ b/security/gnupg/patches/patch-aa @@ -1,20 +1,16 @@ -$NetBSD: patch-aa,v 1.7 2002/10/09 14:16:56 itojun Exp $ +$NetBSD: patch-aa,v 1.8 2002/10/27 02:53:03 chris Exp $ ---- configure.orig Sat Sep 21 12:32:56 2002 -+++ configure Sun Sep 29 23:39:25 2002 -@@ -4792,8 +4792,14 @@ - NAME_OF_DEV_RANDOM="/dev/random" - NAME_OF_DEV_URANDOM="/dev/urandom" - case "${target}" in -- *-openbsd* | *-netbsd*) -+ *-openbsd*) - NAME_OF_DEV_RANDOM="/dev/srandom" -+ NAME_OF_DEV_URANDOM="/dev/urandom" -+ DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x" -+ ;; -+ -+ *-netbsd*) -+ NAME_OF_DEV_RANDOM="/dev/random" - NAME_OF_DEV_URANDOM="/dev/urandom" - ;; - esac +--- idea-stub.c.orig Sun Oct 27 02:21:54 2002 ++++ cipher/idea-stub.c Sun Oct 27 02:22:54 2002 +@@ -131,9 +131,9 @@ + } + + sym = dlsym (handle, "idea_get_info"); +- if (dlerror ()) ++ if ((sym == NULL) && (dlerror ())) + sym = dlsym (handle, "_idea_get_info"); +- if ((err=dlerror())) ++ if ((sym == NULL) && (err=dlerror())) + { + log_info ("invalid module `%s': %s\n", name, err); + goto failure; diff --git a/security/gnupg/patches/patch-ab b/security/gnupg/patches/patch-ab deleted file mode 100644 index 43ad5db1bfc..00000000000 --- a/security/gnupg/patches/patch-ab +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ab,v 1.14 2002/10/09 14:16:56 itojun Exp $ - ---- configure.ac.orig Sat Sep 21 12:19:15 2002 -+++ configure.ac Sun Sep 29 23:40:20 2002 -@@ -453,8 +453,14 @@ - NAME_OF_DEV_RANDOM="/dev/random" - NAME_OF_DEV_URANDOM="/dev/urandom" - case "${target}" in -- *-openbsd* | *-netbsd*) -+ *-openbsd*) - NAME_OF_DEV_RANDOM="/dev/srandom" -+ NAME_OF_DEV_URANDOM="/dev/urandom" -+ DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x" -+ ;; -+ -+ *-netbsd*) -+ NAME_OF_DEV_RANDOM="/dev/random" - NAME_OF_DEV_URANDOM="/dev/urandom" - ;; - esac |