diff options
author | shannonjr <shannonjr> | 2007-05-12 11:08:31 +0000 |
---|---|---|
committer | shannonjr <shannonjr> | 2007-05-12 11:08:31 +0000 |
commit | 89ee5b8daba67835d4d20a500c588b5651f53819 (patch) | |
tree | b9591962df5815baada0f34957c7a6ac440b691d /security | |
parent | 364ed8eb1cae1bb759d82c75b8437cc729219d38 (diff) | |
download | pkgsrc-89ee5b8daba67835d4d20a500c588b5651f53819.tar.gz |
Update to Version 2.0.4. Changes are not described in release announcement.
Diffstat (limited to 'security')
-rw-r--r-- | security/gnupg2/Makefile | 10 | ||||
-rw-r--r-- | security/gnupg2/PLIST | 5 | ||||
-rw-r--r-- | security/gnupg2/distinfo | 22 | ||||
-rw-r--r-- | security/gnupg2/patches/patch-ac | 2 | ||||
-rw-r--r-- | security/gnupg2/patches/patch-af | 6 | ||||
-rw-r--r-- | security/gnupg2/patches/patch-ah | 30 | ||||
-rw-r--r-- | security/gnupg2/patches/patch-ai | 15 | ||||
-rw-r--r-- | security/gnupg2/patches/patch-aj | 19 |
8 files changed, 61 insertions, 48 deletions
diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile index cbec043e05d..2c0d1f7bc4c 100644 --- a/security/gnupg2/Makefile +++ b/security/gnupg2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2007/02/05 11:43:01 shannonjr Exp $ +# $NetBSD: Makefile,v 1.10 2007/05/12 11:08:31 shannonjr Exp $ # -DISTNAME= gnupg-2.0.2 +DISTNAME= gnupg-2.0.4 PKGNAME= ${DISTNAME:S/gnupg/gnupg2/} CATEGORIES= security MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/ @@ -9,8 +9,8 @@ EXTRACT_SUFX= .tar.bz2 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DISTFILES+= pth-2.0.7.tar.gz SITES.pth-2.0.7.tar.gz= ${MASTER_SITE_GNU:=pth/} -DISTFILES+= libassuan-1.0.0.tar.bz2 -SITES.libassuan-1.0.0.tar.bz2= ftp://ftp.gnupg.org/gcrypt/libassuan/ +DISTFILES+= libassuan-1.0.1.tar.bz2 +SITES.libassuan-1.0.1.tar.bz2= ftp://ftp.gnupg.org/gcrypt/libassuan/ MAINTAINER= shannonjr@NetBSD.org HOMEPAGE= ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/ @@ -62,7 +62,7 @@ pre-configure: cd ${WRKDIR}/pth-2.0.7 && \ ./configure --prefix=${WRKDIR}/pth --enable-pthread --enable-static --disable-shared && \ ${MAKE} install - cd ${WRKDIR}/libassuan-1.0.0 && \ + cd ${WRKDIR}/libassuan-1.0.1 && \ ${SETENV} ${CONFIGURE_ENV} ./autogen.sh && \ ${SETENV} ${CONFIGURE_ENV} ./configure --enable-maintainer-mode --prefix=${WRKDIR}/libassuan --with-pth-prefix=${WRKDIR}/pth && \ ${SETENV} ${PKGSRC_MAKE_ENV} ${MAKE} install diff --git a/security/gnupg2/PLIST b/security/gnupg2/PLIST index a016ba589fc..25e1bf6bc5c 100644 --- a/security/gnupg2/PLIST +++ b/security/gnupg2/PLIST @@ -1,7 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2006/11/17 12:13:11 shannonjr Exp $ +@comment $NetBSD: PLIST,v 1.2 2007/05/12 11:08:31 shannonjr Exp $ bin/gpg-agent +sbin/applygnupgdefaults libexec/gpg-preset-passphrase libexec/gpg-protect-tool +libexec/gnupg-pcsc-wrapper share/locale/be/LC_MESSAGES/gnupg2.mo share/locale/ca/LC_MESSAGES/gnupg2.mo share/locale/cs/LC_MESSAGES/gnupg2.mo @@ -31,3 +33,4 @@ share/locale/sv/LC_MESSAGES/gnupg2.mo share/locale/tr/LC_MESSAGES/gnupg2.mo share/locale/zh_CN/LC_MESSAGES/gnupg2.mo share/locale/zh_TW/LC_MESSAGES/gnupg2.mo +man/man8/applygnupgdefaults.8 diff --git a/security/gnupg2/distinfo b/security/gnupg2/distinfo index 9e598b481f5..2a3927412cf 100644 --- a/security/gnupg2/distinfo +++ b/security/gnupg2/distinfo @@ -1,18 +1,18 @@ -$NetBSD: distinfo,v 1.6 2007/02/05 11:43:01 shannonjr Exp $ +$NetBSD: distinfo,v 1.7 2007/05/12 11:08:31 shannonjr Exp $ -SHA1 (gnupg-2.0.2.tar.bz2) = 1a3165c5b601f3244b8885143d02bea4210495e3 -RMD160 (gnupg-2.0.2.tar.bz2) = 6cc52da761927e17842842c00598c4974208affa -Size (gnupg-2.0.2.tar.bz2) = 3969476 bytes -SHA1 (libassuan-1.0.0.tar.bz2) = 5256d74a80619779a9802305a9f1ad7fd04277a1 -RMD160 (libassuan-1.0.0.tar.bz2) = 63b0cc77eb731ccd635e51543001a675c15a835f -Size (libassuan-1.0.0.tar.bz2) = 260201 bytes +SHA1 (gnupg-2.0.4.tar.bz2) = cc230636bb4226f6d7ac2db9b259d8e7f5529f84 +RMD160 (gnupg-2.0.4.tar.bz2) = 7d31526012e32c2fe39fea62c01b5c17d16118ad +Size (gnupg-2.0.4.tar.bz2) = 3575021 bytes +SHA1 (libassuan-1.0.1.tar.bz2) = 4e12bd924e01c31c7d4c021b465c94ec55b1cb17 +RMD160 (libassuan-1.0.1.tar.bz2) = 0ff13f97d20c9fc8c08d92e5cf14bb26d9afa69b +Size (libassuan-1.0.1.tar.bz2) = 268874 bytes SHA1 (pth-2.0.7.tar.gz) = 9a71915c89ff2414de69fe104ae1016d513afeee RMD160 (pth-2.0.7.tar.gz) = 80bc66777ba20d9648b7aaf3f58d593be6416910 Size (pth-2.0.7.tar.gz) = 652640 bytes SHA1 (patch-aa) = 916346ad387ae4efd638b2c19bbedfe6f309eb2e SHA1 (patch-ab) = 501bce9a8474ac37a8e01eceae9b52f0e87868d5 SHA1 (patch-ac) = 8baffc127ae84ef0a3e8a68bb84c69489be3ac1f -SHA1 (patch-af) = 04fdcbf19c4d530fc735c04dd785c07692d8b96d -SHA1 (patch-ah) = 9a92310b97daa47d18dfd01b9f7b40d35c9a2317 -SHA1 (patch-ai) = e3662ca1bde0c1946fdb6cbd7fc2033cc54bdd8d -SHA1 (patch-aj) = 74773dd799b69be05896cf6afcc406d767360f87 +SHA1 (patch-af) = 0f5d068c1587f0e58a46555633a119b327bea225 +SHA1 (patch-ah) = e31a1e863be10884e03bfcdceffcdad79d19e9ab +SHA1 (patch-ai) = 4721bf8dd6c0e1e8fedb763c38776aeeba4e763c +SHA1 (patch-aj) = 20be6b455167962ffa556979d8d0f167dd14131e diff --git a/security/gnupg2/patches/patch-ac b/security/gnupg2/patches/patch-ac index d2ed48a28e5..9792898ce19 100644 --- a/security/gnupg2/patches/patch-ac +++ b/security/gnupg2/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.2 2007/02/05 11:43:01 shannonjr Exp $ +$NetBSD: patch-ac,v 1.3 2007/05/12 11:08:31 shannonjr Exp $ --- common/Makefile.am.orig 2007-01-31 05:11:51.000000000 -0700 +++ common/Makefile.am diff --git a/security/gnupg2/patches/patch-af b/security/gnupg2/patches/patch-af index 57b51e29912..10fe34bcbe4 100644 --- a/security/gnupg2/patches/patch-af +++ b/security/gnupg2/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.1.1.1 2006/11/17 12:13:11 shannonjr Exp $ +$NetBSD: patch-af,v 1.2 2007/05/12 11:08:31 shannonjr Exp $ ---- ../libassuan-1.0.0/src/Makefile.am.orig 2006-10-09 04:26:41.000000000 -0600 -+++ ../libassuan-1.0.0/src/Makefile.am +--- ../libassuan-1.0.1/src/Makefile.am.orig 2006-11-21 11:17:18.000000000 -0700 ++++ ../libassuan-1.0.1/src/Makefile.am @@ -26,6 +26,7 @@ MOSTLYCLEANFILES = assuan-errors.c if HAVE_PTH diff --git a/security/gnupg2/patches/patch-ah b/security/gnupg2/patches/patch-ah index 90917bb26d0..1572b17704c 100644 --- a/security/gnupg2/patches/patch-ah +++ b/security/gnupg2/patches/patch-ah @@ -1,6 +1,6 @@ -$NetBSD: patch-ah,v 1.2 2007/02/05 11:43:01 shannonjr Exp $ +$NetBSD: patch-ah,v 1.3 2007/05/12 11:08:31 shannonjr Exp $ ---- ./g10/encr-data.c.orig 2006-12-02 09:22:04.000000000 -0700 +--- ./g10/encr-data.c.orig 2007-02-22 03:44:22.000000000 -0700 +++ ./g10/encr-data.c @@ -39,35 +39,14 @@ static int mdc_decode_filter ( void *opa static int decode_filter ( void *opaque, int control, IOBUF a, @@ -52,8 +52,8 @@ $NetBSD: patch-ah,v 1.2 2007/02/05 11:43:01 shannonjr Exp $ + memset( &dfx, 0, sizeof dfx ); if ( opt.verbose && !dek->algo_info_printed ) { - const char *s = gcry_cipher_algo_name (dek->algo); -@@ -102,20 +77,20 @@ decrypt_data( void *procctx, PKT_encrypt + if (!gcry_cipher_test_algo (dek->algo)) +@@ -101,20 +76,20 @@ decrypt_data( void *procctx, PKT_encrypt goto leave; blocksize = gcry_cipher_get_algo_blklen (dek->algo); if ( !blocksize || blocksize > 16 ) @@ -78,7 +78,7 @@ $NetBSD: patch-ah,v 1.2 2007/02/05 11:43:01 shannonjr Exp $ GCRY_CIPHER_MODE_CFB, (GCRY_CIPHER_SECURE | ((ed->mdc_method || dek->algo >= 100)? -@@ -129,7 +104,7 @@ decrypt_data( void *procctx, PKT_encrypt +@@ -128,7 +103,7 @@ decrypt_data( void *procctx, PKT_encrypt /* log_hexdump( "thekey", dek->key, dek->keylen );*/ @@ -87,7 +87,7 @@ $NetBSD: patch-ah,v 1.2 2007/02/05 11:43:01 shannonjr Exp $ if ( gpg_err_code (rc) == GPG_ERR_WEAK_KEY ) { log_info(_("WARNING: message was encrypted with" -@@ -148,7 +123,7 @@ decrypt_data( void *procctx, PKT_encrypt +@@ -147,7 +122,7 @@ decrypt_data( void *procctx, PKT_encrypt goto leave; } @@ -96,7 +96,7 @@ $NetBSD: patch-ah,v 1.2 2007/02/05 11:43:01 shannonjr Exp $ if ( ed->len ) { -@@ -169,8 +144,8 @@ decrypt_data( void *procctx, PKT_encrypt +@@ -168,8 +143,8 @@ decrypt_data( void *procctx, PKT_encrypt temp[i] = c; } @@ -107,7 +107,7 @@ $NetBSD: patch-ah,v 1.2 2007/02/05 11:43:01 shannonjr Exp $ p = temp; /* log_hexdump( "prefix", temp, nprefix+2 ); */ if (dek->symmetric -@@ -180,18 +155,17 @@ decrypt_data( void *procctx, PKT_encrypt +@@ -179,18 +154,17 @@ decrypt_data( void *procctx, PKT_encrypt goto leave; } @@ -132,7 +132,7 @@ $NetBSD: patch-ah,v 1.2 2007/02/05 11:43:01 shannonjr Exp $ rc = gpg_error (GPG_ERR_INV_PACKET); else if ( ed->mdc_method ) { -@@ -210,28 +184,26 @@ decrypt_data( void *procctx, PKT_encrypt +@@ -209,28 +183,26 @@ decrypt_data( void *procctx, PKT_encrypt bytes are appended. */ int datalen = gcry_md_get_algo_dlen (ed->mdc_method); @@ -170,7 +170,7 @@ $NetBSD: patch-ah,v 1.2 2007/02/05 11:43:01 shannonjr Exp $ return rc; } -@@ -242,7 +214,7 @@ static int +@@ -241,7 +213,7 @@ static int mdc_decode_filter (void *opaque, int control, IOBUF a, byte *buf, size_t *ret_len) { @@ -179,7 +179,7 @@ $NetBSD: patch-ah,v 1.2 2007/02/05 11:43:01 shannonjr Exp $ size_t n, size = *ret_len; int rc = 0; int c; -@@ -254,11 +226,11 @@ mdc_decode_filter (void *opaque, int con +@@ -253,11 +225,11 @@ mdc_decode_filter (void *opaque, int con } else if( control == IOBUFCTRL_UNDERFLOW ) { @@ -194,7 +194,7 @@ $NetBSD: patch-ah,v 1.2 2007/02/05 11:43:01 shannonjr Exp $ { if( (c = iobuf_get(a)) == -1 ) break; -@@ -307,10 +279,8 @@ mdc_decode_filter (void *opaque, int con +@@ -306,10 +278,8 @@ mdc_decode_filter (void *opaque, int con if ( n ) { @@ -207,7 +207,7 @@ $NetBSD: patch-ah,v 1.2 2007/02/05 11:43:01 shannonjr Exp $ } else { -@@ -319,10 +289,6 @@ mdc_decode_filter (void *opaque, int con +@@ -318,10 +288,6 @@ mdc_decode_filter (void *opaque, int con } *ret_len = n; } @@ -218,7 +218,7 @@ $NetBSD: patch-ah,v 1.2 2007/02/05 11:43:01 shannonjr Exp $ else if ( control == IOBUFCTRL_DESC ) { *(char**)buf = "mdc_decode_filter"; -@@ -334,7 +300,7 @@ mdc_decode_filter (void *opaque, int con +@@ -333,7 +299,7 @@ mdc_decode_filter (void *opaque, int con static int decode_filter( void *opaque, int control, IOBUF a, byte *buf, size_t *ret_len) { @@ -227,7 +227,7 @@ $NetBSD: patch-ah,v 1.2 2007/02/05 11:43:01 shannonjr Exp $ size_t n, size = *ret_len; int rc = 0; -@@ -345,18 +311,11 @@ decode_filter( void *opaque, int control +@@ -344,18 +310,11 @@ decode_filter( void *opaque, int control if ( n == -1 ) n = 0; if ( n ) diff --git a/security/gnupg2/patches/patch-ai b/security/gnupg2/patches/patch-ai index c99b42490c0..132f24c381b 100644 --- a/security/gnupg2/patches/patch-ai +++ b/security/gnupg2/patches/patch-ai @@ -1,8 +1,17 @@ -$NetBSD: patch-ai,v 1.1 2006/12/12 13:11:35 shannonjr Exp $ +$NetBSD: patch-ai,v 1.2 2007/05/12 11:08:31 shannonjr Exp $ ---- autogen.sh.orig 2006-10-17 06:15:03.000000000 -0600 +--- autogen.sh.orig 2007-05-07 12:11:13.000000000 -0600 +++ autogen.sh -@@ -129,9 +129,9 @@ fi +@@ -40,7 +40,7 @@ MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-ms + + DIE=no + FORCE= +-if test "$1" == "--force"; then ++if test "$1" = "--force"; then + FORCE=" --force" + shift + fi +@@ -182,9 +182,9 @@ fi if check_version $AUTOMAKE $automake_vers_num $automake_vers; then check_version $ACLOCAL $automake_vers_num $autoconf_vers automake fi diff --git a/security/gnupg2/patches/patch-aj b/security/gnupg2/patches/patch-aj index fab2e798955..66298ada742 100644 --- a/security/gnupg2/patches/patch-aj +++ b/security/gnupg2/patches/patch-aj @@ -1,12 +1,13 @@ -$NetBSD: patch-aj,v 1.1 2006/12/18 07:14:51 smb Exp $ ---- po/Makefile.in.in.orig 2006-12-17 21:57:31.000000000 -0500 -+++ po/Makefile.in.in 2006-12-17 21:57:35.000000000 -0500 -@@ -30,7 +30,7 @@ - - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ +$NetBSD: patch-aj,v 1.2 2007/05/12 11:08:31 shannonjr Exp $ + +--- po/Makefile.in.in.orig 2007-05-07 11:56:51.000000000 -0600 ++++ po/Makefile.in.in +@@ -38,7 +38,7 @@ INSTALL_DATA = @INSTALL_DATA@ + # In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined + # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake + # versions, $(mkinstalldirs) and $(install_sh) are unused. -mkinstalldirs = $(SHELL) @install_sh@ -d +mkinstalldirs = @install_sh@ -d + install_sh = $(SHELL) @install_sh@ + MKDIR_P = @MKDIR_P@ mkdir_p = @mkdir_p@ - - GMSGFMT_ = @GMSGFMT@ |