summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--security/gnupg/Makefile5
-rw-r--r--security/gnupg/PLIST3
-rw-r--r--security/gnupg/distinfo16
-rw-r--r--security/gnupg/patches/patch-ab6
-rw-r--r--security/gnupg/patches/patch-ac6
-rw-r--r--security/gnupg/patches/patch-ae6
-rw-r--r--security/gnupg/patches/patch-af21
-rw-r--r--security/gnupg/patches/patch-ag35
8 files changed, 38 insertions, 60 deletions
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 286c8ab0be3..cbdd32ef9dc 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.66 2004/05/07 15:25:13 cjep Exp $
+# $NetBSD: Makefile,v 1.67 2004/07/28 15:17:42 wiz Exp $
-DISTNAME= gnupg-1.2.4
-PKGREVISION= 1
+DISTNAME= gnupg-1.2.5
CATEGORIES= security
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/ \
ftp://ftp.planetmirror.com/pub/gnupg/gnupg/ \
diff --git a/security/gnupg/PLIST b/security/gnupg/PLIST
index 551da98d3f8..1fa65f12a50 100644
--- a/security/gnupg/PLIST
+++ b/security/gnupg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2004/03/09 23:04:37 seb Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/07/28 15:17:42 wiz Exp $
bin/gpg
bin/gpgsplit
bin/gpgv
@@ -36,6 +36,7 @@ ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnupg.mo
${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnupg.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnupg.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnupg.mo
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnupg.mo
@dirrm share/gnupg
@dirrm libexec/gnupg
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index 64393100f45..6e293f4ff2c 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.27 2004/03/30 15:13:12 tv Exp $
+$NetBSD: distinfo,v 1.28 2004/07/28 15:17:42 wiz Exp $
-SHA1 (gnupg-1.2.4.tar.bz2) = 10972d11aeb9f88369557f351f0e9d95542e778b
-Size (gnupg-1.2.4.tar.bz2) = 2377277 bytes
+SHA1 (gnupg-1.2.5.tar.bz2) = 0e6b633d1c9fae7051031491f34482c7c0402f6e
+Size (gnupg-1.2.5.tar.bz2) = 2488670 bytes
SHA1 (idea.c.gz) = 82fded4ec31b97b3b2dd22741880b67cfee40f84
Size (idea.c.gz) = 5216 bytes
SHA1 (patch-aa) = 3babbdc4386f0edaed4a6e1bb851312528d6ff9e
-SHA1 (patch-ab) = 074bdc631b1558d11b4b640ea3aa6a9be04a9368
-SHA1 (patch-ac) = bf663caa3d7f9b9bb8c4b3f698038efc0683f9cd
+SHA1 (patch-ab) = af66565a44b5db979dc1362733193f3d6888a34f
+SHA1 (patch-ac) = cc029e0b2dcc18b1d8de0c1145719bb2bf329467
SHA1 (patch-ad) = fc9e85c88e53738faa47f55b769e98dce2c190dc
-SHA1 (patch-ae) = 287a24a881d6886e8a6be5f2826ffa2ea85aadbf
-SHA1 (patch-af) = f794a577f42f80cf1b7d0149bdc7d932f6607f24
-SHA1 (patch-ag) = 1553d3919211a1a43ea2afe56a046580208fb096
+SHA1 (patch-ae) = 827cdfbc4ed04c382f593051188a5aad0977b0ed
+SHA1 (patch-af) = bdc03318447a78ac52b3dbefc59f90fcebc0b20d
+SHA1 (patch-ag) = 3f373c9b7e2b7ef10885b72a2df510cd585b9b8d
SHA1 (patch-ak) = bf0d2648382f8737bdda4eac486f23ee76f43b4f
diff --git a/security/gnupg/patches/patch-ab b/security/gnupg/patches/patch-ab
index cf7ba875a60..c5dbb32a6b4 100644
--- a/security/gnupg/patches/patch-ab
+++ b/security/gnupg/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.22 2004/03/01 19:12:25 wiz Exp $
+$NetBSD: patch-ab,v 1.23 2004/07/28 15:17:42 wiz Exp $
---- mpi/config.links.orig Wed Dec 3 11:10:16 2003
+--- mpi/config.links.orig 2004-01-13 12:21:39.000000000 +0100
+++ mpi/config.links
-@@ -200,6 +200,14 @@ case "${target}" in
+@@ -197,6 +197,14 @@ case "${target}" in
cat $srcdir/mpi/m68k/syntax.h >>./mpi/asm-syntax.h
path="m68k"
;;
diff --git a/security/gnupg/patches/patch-ac b/security/gnupg/patches/patch-ac
index 6789dc9dbca..909de271793 100644
--- a/security/gnupg/patches/patch-ac
+++ b/security/gnupg/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.14 2003/12/25 14:05:02 wiz Exp $
+$NetBSD: patch-ac,v 1.15 2004/07/28 15:17:42 wiz Exp $
ftp://ftp.kame.net/pub/kame/misc/gnupg-1.2.2-IPv6.diff.gz
---- config.h.in.orig Tue Dec 23 20:28:49 2003
+--- config.h.in.orig 2004-07-26 14:26:11.000000000 +0200
+++ config.h.in
-@@ -553,3 +553,4 @@
+@@ -616,3 +616,4 @@
#include "g10defs.h"
diff --git a/security/gnupg/patches/patch-ae b/security/gnupg/patches/patch-ae
index 4d911bf1d69..14dbbf4ea89 100644
--- a/security/gnupg/patches/patch-ae
+++ b/security/gnupg/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.6 2003/12/25 14:05:02 wiz Exp $
+$NetBSD: patch-ae,v 1.7 2004/07/28 15:17:42 wiz Exp $
---- configure.ac.orig Tue Dec 23 20:20:58 2003
+--- configure.ac.orig 2004-07-26 14:18:06.000000000 +0200
+++ configure.ac
-@@ -609,7 +609,7 @@ AC_CHECK_FUNCS(strerror stpcpy strsep st
+@@ -633,7 +633,7 @@ AC_CHECK_FUNCS(strerror stpcpy strsep st
AC_CHECK_FUNCS(strcasecmp strncasecmp ctermid times)
AC_CHECK_FUNCS(memmove gettimeofday getrusage setrlimit clock_gettime)
AC_CHECK_FUNCS(atexit raise getpagesize strftime nl_langinfo setlocale)
diff --git a/security/gnupg/patches/patch-af b/security/gnupg/patches/patch-af
index 674d92b612c..046eeedcbf0 100644
--- a/security/gnupg/patches/patch-af
+++ b/security/gnupg/patches/patch-af
@@ -1,28 +1,9 @@
-$NetBSD: patch-af,v 1.5 2004/03/30 15:13:12 tv Exp $
+$NetBSD: patch-af,v 1.6 2004/07/28 15:17:42 wiz Exp $
-Parts from:
ftp://ftp.kame.net/pub/kame/misc/gnupg-1.2.2-IPv6.diff.gz
--- configure.orig Tue Dec 23 14:28:22 2003
+++ configure
-@@ -4601,7 +4601,7 @@ extern "C" {
-
- EOF
- # Now generate the symbol file.
-- sed 's/^.* _\?\(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
-+ sed 's/^.* _\{0,1\}\(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
-
- cat <<EOF >> conftest.c
- #if defined (__STDC__) && __STDC__
-@@ -4621,7 +4621,7 @@ struct {
- dld_preloaded_symbols[] =
- {
- EOF
-- sed 's/^_\?\(.*\) _\?\(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
-+ sed 's/^_\{0,1\}/\(.*\) _\{0,1\}\(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
- cat <<\EOF >> conftest.c
- {0, (__ptr_t) 0}
- };
@@ -13579,7 +13579,7 @@ done
diff --git a/security/gnupg/patches/patch-ag b/security/gnupg/patches/patch-ag
index 748002eb618..2a082dac2b0 100644
--- a/security/gnupg/patches/patch-ag
+++ b/security/gnupg/patches/patch-ag
@@ -1,22 +1,19 @@
-$NetBSD: patch-ag,v 1.1 2004/03/30 15:13:12 tv Exp $
+$NetBSD: patch-ag,v 1.2 2004/07/28 15:17:42 wiz Exp $
---- acinclude.m4.orig Tue Apr 15 08:16:18 2003
-+++ acinclude.m4
-@@ -588,7 +588,7 @@ extern "C" {
+--- po/Makefile.in.in.orig 2002-06-29 15:43:03.000000000 +0200
++++ po/Makefile.in.in
+@@ -23,13 +23,13 @@ VPATH = @srcdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+ localedir = $(datadir)/locale
+ gettextsrcdir = $(datadir)/gettext/po
- EOF
- # Now generate the symbol file.
-- sed 's/^.* _\?\(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
-+ sed 's/^.* _\{0,1\}\(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
++mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*|../*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_srcdir)/$(MKINSTALLDIRS)" ;; esac`
- cat <<EOF >> conftest.c
- #if defined (__STDC__) && __STDC__
-@@ -610,7 +610,7 @@ dld_preloaded_symbols[] =
- changequote([,])dnl
- {
- EOF
-- sed 's/^_\?\(.*\) _\?\(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
-+ sed 's/^_\{0,1\}/\(.*\) _\{0,1\}\(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
- cat <<\EOF >> conftest.c
- {0, (__ptr_t) 0}
- };
+ CC = @CC@
+ GMSGFMT = @GMSGFMT@
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-17 03:43:44 +0000