diff options
| -rw-r--r-- | security/gnupg/Makefile | 6 | ||||
| -rw-r--r-- | security/gnupg/PLIST | 4 | ||||
| -rw-r--r-- | security/gnupg/distinfo | 16 | ||||
| -rw-r--r-- | security/gnupg/patches/patch-ac | 9 | ||||
| -rw-r--r-- | security/gnupg/patches/patch-ad | 9 | ||||
| -rw-r--r-- | security/gnupg/patches/patch-ae | 8 | ||||
| -rw-r--r-- | security/gnupg/patches/patch-af | 9 | ||||
| -rw-r--r-- | security/gnupg/patches/patch-ai | 35 | ||||
| -rw-r--r-- | security/gnupg/patches/patch-aj | 43 |
9 files changed, 29 insertions, 110 deletions
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index b1f57d07022..f1e1b41b1a5 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.55 2003/11/27 23:46:36 heinz Exp $ +# $NetBSD: Makefile,v 1.56 2003/12/25 14:05:02 wiz Exp $ -DISTNAME= gnupg-1.2.3 -PKGREVISION= 2 +DISTNAME= gnupg-1.2.4 CATEGORIES= security MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/ \ ftp://ftp.planetmirror.com/pub/gnupg/gnupg/ \ @@ -63,6 +62,7 @@ PLIST_SUBST+= OPENLDAP="@comment " .include "../../converters/libiconv/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/zlib/buildlink2.mk" +.include "../../archivers/bzip2/buildlink2.mk" .include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/gnupg/PLIST b/security/gnupg/PLIST index 88c3a8bfd54..9c39d7b7c30 100644 --- a/security/gnupg/PLIST +++ b/security/gnupg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2003/08/25 21:25:24 itojun Exp $ +@comment $NetBSD: PLIST,v 1.10 2003/12/25 14:05:02 wiz Exp $ bin/gpg bin/gpgsplit bin/gpgv @@ -12,6 +12,7 @@ man/man7/gnupg.7 share/gnupg/FAQ share/gnupg/faq.html share/gnupg/options.skel +${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gnupg.mo ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnupg.mo ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnupg.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnupg.mo @@ -32,6 +33,7 @@ ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnupg.mo ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnupg.mo ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnupg.mo ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnupg.mo +${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 diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo index 456565cb2f5..f941dbdbefd 100644 --- a/security/gnupg/distinfo +++ b/security/gnupg/distinfo @@ -1,14 +1,12 @@ -$NetBSD: distinfo,v 1.24 2003/12/01 14:16:17 he Exp $ +$NetBSD: distinfo,v 1.25 2003/12/25 14:05:02 wiz Exp $ -SHA1 (gnupg-1.2.3.tar.bz2) = 1a5f68b52aa04f7370a80c2dfa708accfc64d854 -Size (gnupg-1.2.3.tar.bz2) = 2294773 bytes +SHA1 (gnupg-1.2.4.tar.bz2) = 10972d11aeb9f88369557f351f0e9d95542e778b +Size (gnupg-1.2.4.tar.bz2) = 2377277 bytes SHA1 (idea.c.gz) = 82fded4ec31b97b3b2dd22741880b67cfee40f84 Size (idea.c.gz) = 5216 bytes SHA1 (patch-aa) = 3babbdc4386f0edaed4a6e1bb851312528d6ff9e -SHA1 (patch-ac) = ce5bbc1bb648f782ffc93704532fc8ca7f8a9524 -SHA1 (patch-ad) = 2783ded1fa83c755b4fe8a544066da631b88db8e -SHA1 (patch-ae) = fdcda5736583ba3c5807928d1b958e10e1d8fc06 -SHA1 (patch-af) = 0ddc5ad0692b365236e6bf643b44d8f70c5b6dd0 -SHA1 (patch-ai) = d590234e1fd272a0f7e7b30d7b885ca2f979daf4 -SHA1 (patch-aj) = 6e682cb89eb8ca185a6e0cc82ea9466b16f598b0 +SHA1 (patch-ac) = bf663caa3d7f9b9bb8c4b3f698038efc0683f9cd +SHA1 (patch-ad) = fc9e85c88e53738faa47f55b769e98dce2c190dc +SHA1 (patch-ae) = 287a24a881d6886e8a6be5f2826ffa2ea85aadbf +SHA1 (patch-af) = 5207b2ce4abb59729b9c6b75693b1e4013764280 SHA1 (patch-ak) = bf0d2648382f8737bdda4eac486f23ee76f43b4f diff --git a/security/gnupg/patches/patch-ac b/security/gnupg/patches/patch-ac index 2164e752c43..6789dc9dbca 100644 --- a/security/gnupg/patches/patch-ac +++ b/security/gnupg/patches/patch-ac @@ -1,11 +1,10 @@ -$NetBSD: patch-ac,v 1.13 2003/08/15 07:02:23 itojun Exp $ +$NetBSD: patch-ac,v 1.14 2003/12/25 14:05:02 wiz Exp $ ftp://ftp.kame.net/pub/kame/misc/gnupg-1.2.2-IPv6.diff.gz -diff -u -r1.1.1.1 -r1.2 ---- config.h.in 15 Aug 2003 05:12:06 -0000 1.1.1.1 -+++ config.h.in 15 Aug 2003 06:44:46 -0000 1.2 -@@ -537,3 +537,4 @@ +--- config.h.in.orig Tue Dec 23 20:28:49 2003 ++++ config.h.in +@@ -553,3 +553,4 @@ #include "g10defs.h" diff --git a/security/gnupg/patches/patch-ad b/security/gnupg/patches/patch-ad index cf38f216181..984a339f55e 100644 --- a/security/gnupg/patches/patch-ad +++ b/security/gnupg/patches/patch-ad @@ -1,11 +1,10 @@ -$NetBSD: patch-ad,v 1.4 2003/08/15 07:02:23 itojun Exp $ +$NetBSD: patch-ad,v 1.5 2003/12/25 14:05:02 wiz Exp $ ftp://ftp.kame.net/pub/kame/misc/gnupg-1.2.2-IPv6.diff.gz -diff -u -r1.1.1.1 -r1.2 ---- util/http.c 15 Aug 2003 05:12:28 -0000 1.1.1.1 -+++ util/http.c 15 Aug 2003 06:44:46 -0000 1.2 -@@ -753,6 +753,28 @@ +--- util/http.c.orig Tue Dec 23 18:33:34 2003 ++++ util/http.c +@@ -751,6 +751,28 @@ connect_server( const char *server, usho sock_close (sd); return -1; } diff --git a/security/gnupg/patches/patch-ae b/security/gnupg/patches/patch-ae index 9b851535d57..4d911bf1d69 100644 --- a/security/gnupg/patches/patch-ae +++ b/security/gnupg/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.5 2003/08/25 21:25:26 itojun Exp $ +$NetBSD: patch-ae,v 1.6 2003/12/25 14:05:02 wiz Exp $ ---- configure.ac.orig 2003-08-22 04:45:43.000000000 +0900 -+++ configure.ac 2003-08-26 06:21:17.000000000 +0900 -@@ -602,7 +602,7 @@ +--- configure.ac.orig Tue Dec 23 20:20:58 2003 ++++ configure.ac +@@ -609,7 +609,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 73b2de7c858..805fc8d8bd9 100644 --- a/security/gnupg/patches/patch-af +++ b/security/gnupg/patches/patch-af @@ -1,11 +1,10 @@ -$NetBSD: patch-af,v 1.3 2003/08/15 07:02:23 itojun Exp $ +$NetBSD: patch-af,v 1.4 2003/12/25 14:05:02 wiz Exp $ ftp://ftp.kame.net/pub/kame/misc/gnupg-1.2.2-IPv6.diff.gz -diff -u -r1.1.1.1 -r1.2 ---- configure 15 Aug 2003 05:12:08 -0000 1.1.1.1 -+++ configure 15 Aug 2003 06:47:49 -0000 1.2 -@@ -13111,7 +13111,7 @@ +--- configure.orig Tue Dec 23 20:28:22 2003 ++++ configure +@@ -13579,7 +13579,7 @@ done diff --git a/security/gnupg/patches/patch-ai b/security/gnupg/patches/patch-ai deleted file mode 100644 index 52deafefc02..00000000000 --- a/security/gnupg/patches/patch-ai +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2003/11/27 23:46:36 heinz Exp $ - ---- g10/keygen.c.orig Mon Jul 28 20:34:41 2003 -+++ g10/keygen.c -@@ -958,8 +958,6 @@ ask_algo (int addmode, unsigned int *r_u - tty_printf( _(" (%d) DSA (sign only)\n"), 2 ); - if( addmode ) - tty_printf( _(" (%d) ElGamal (encrypt only)\n"), 3 ); -- if (opt.expert) -- tty_printf( _(" (%d) ElGamal (sign and encrypt)\n"), 4 ); - tty_printf( _(" (%d) RSA (sign only)\n"), 5 ); - if (addmode) - tty_printf( _(" (%d) RSA (encrypt only)\n"), 6 ); -@@ -989,21 +987,6 @@ ask_algo (int addmode, unsigned int *r_u - algo = PUBKEY_ALGO_RSA; - *r_usage = PUBKEY_USAGE_SIG; - break; -- } -- else if( algo == 4 && opt.expert) -- { -- tty_printf(_( --"The use of this algorithm is only supported by GnuPG. You will not be\n" --"able to use this key to communicate with PGP users. This algorithm is also\n" --"very slow, and may not be as secure as the other choices.\n")); -- -- if( cpr_get_answer_is_yes("keygen.algo.elg_se", -- _("Create anyway? "))) -- { -- algo = PUBKEY_ALGO_ELGAMAL; -- *r_usage = PUBKEY_USAGE_ENC | PUBKEY_USAGE_SIG; -- break; -- } - } - else if( algo == 3 && addmode ) { - algo = PUBKEY_ALGO_ELGAMAL_E; diff --git a/security/gnupg/patches/patch-aj b/security/gnupg/patches/patch-aj deleted file mode 100644 index 5f26d5ca4e5..00000000000 --- a/security/gnupg/patches/patch-aj +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2003/11/27 23:46:36 heinz Exp $ - ---- g10/getkey.c.orig Mon Jul 28 20:34:41 2003 -+++ g10/getkey.c -@@ -1049,7 +1049,11 @@ get_seckey_byname2( GETKEY_CTX *retctx, - ctx.items[0].mode = KEYDB_SEARCH_MODE_FIRST; - rc = lookup( &ctx, &kb, 1 ); - if (!rc && sk ) -- sk_from_block ( &ctx, sk, kb ); -+ { -+ sk_from_block ( &ctx, sk, kb ); -+ if(sk->pubkey_algo==PUBKEY_ALGO_ELGAMAL) -+ rc=G10ERR_UNU_SECKEY; -+ } - release_kbnode ( kb ); - get_seckey_end( &ctx ); - } -@@ -1655,6 +1659,11 @@ merge_selfsigs_main( KBNODE keyblock, in - if ( x ) /* mask it down to the actual allowed usage */ - key_usage &= x; - } -+ -+ /* Type 20 Elgamal keys are not usable. */ -+ if(pk->pubkey_algo==PUBKEY_ALGO_ELGAMAL) -+ key_usage=0; -+ - pk->pubkey_usage = key_usage; - - if ( !key_expire_seen ) { -@@ -1869,6 +1878,13 @@ merge_selfsigs_subkey( KBNODE keyblock, - if ( x ) /* mask it down to the actual allowed usage */ - key_usage &= x; - } -+ -+ /* Type 20 Elgamal subkeys or any subkey on a type 20 primary are -+ not usable. */ -+ if(mainpk->pubkey_algo==PUBKEY_ALGO_ELGAMAL -+ || subpk->pubkey_algo==PUBKEY_ALGO_ELGAMAL) -+ key_usage=0; -+ - subpk->pubkey_usage = key_usage; - - p = parse_sig_subpkt (sig->hashed, SIGSUBPKT_KEY_EXPIRE, NULL); |