diff options
author | spz <spz@pkgsrc.org> | 2013-01-06 14:50:47 +0000 |
---|---|---|
committer | spz <spz@pkgsrc.org> | 2013-01-06 14:50:47 +0000 |
commit | c7f339b01f7767b8a680cb81e081f005a3600026 (patch) | |
tree | bc033043ff0c8cf53c894b101c41a9d04b4f74b1 /security | |
parent | 5beaa621cb47f6950a3e0a154d37b33ac1020825 (diff) | |
download | pkgsrc-c7f339b01f7767b8a680cb81e081f005a3600026.tar.gz |
update of gnupg
Fixes CVE-2012-6085
Upstream Changes:
* Add support for the old cipher algorithm IDEA.
* Minor bug fixes.
* Small changes to better cope with future OpenPGP and GnuPG
features.
Diffstat (limited to 'security')
-rw-r--r-- | security/gnupg/Makefile | 5 | ||||
-rw-r--r-- | security/gnupg/distinfo | 14 | ||||
-rw-r--r-- | security/gnupg/patches/patch-ak | 22 | ||||
-rw-r--r-- | security/gnupg/patches/patch-cipher_idea-stub.c | 26 | ||||
-rw-r--r-- | security/gnupg/patches/patch-mpi_mpi-inline.h | 29 |
5 files changed, 6 insertions, 90 deletions
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 7d5dd95209c..89a2dfd7cc5 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.114 2012/12/16 01:52:32 obache Exp $ +# $NetBSD: Makefile,v 1.115 2013/01/06 14:50:47 spz Exp $ -DISTNAME= gnupg-1.4.12 -PKGREVISION= 2 +DISTNAME= gnupg-1.4.13 CATEGORIES= security MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/ \ http://gd.tuwien.ac.at/privacy/gnupg/gnupg/ \ diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo index cffb35121cb..f79725d4570 100644 --- a/security/gnupg/distinfo +++ b/security/gnupg/distinfo @@ -1,12 +1,6 @@ -$NetBSD: distinfo,v 1.55 2012/11/07 21:07:37 wiz Exp $ +$NetBSD: distinfo,v 1.56 2013/01/06 14:50:47 spz Exp $ -SHA1 (gnupg-1.4.12.tar.bz2) = 9b78e20328d35525af7b8a9c1cf081396910e937 -RMD160 (gnupg-1.4.12.tar.bz2) = d5f4367c9a636d778b6ccb2711bfba6597c27fa0 -Size (gnupg-1.4.12.tar.bz2) = 3584133 bytes -SHA1 (idea.c.gz) = 82fded4ec31b97b3b2dd22741880b67cfee40f84 -RMD160 (idea.c.gz) = e35be5a031d10d52341ac5f029d28f811edd908d -Size (idea.c.gz) = 5216 bytes +SHA1 (gnupg-1.4.13.tar.bz2) = 17a75c54d292bd0923f0a1817a1b02ded37d1de1 +RMD160 (gnupg-1.4.13.tar.bz2) = a3d6f2ca2dd46d8b97e1790d0b1738dc4a1cedd6 +Size (gnupg-1.4.13.tar.bz2) = 3685873 bytes SHA1 (patch-ab) = 24e200a04f8f31e53e22dc80ed079570cb5de8d8 -SHA1 (patch-ak) = cf3afbd3de520c7cc15f8f026e90df6ea8c56367 -SHA1 (patch-cipher_idea-stub.c) = 0df4fd8820521b97ad239a0da9bc276d7962e404 -SHA1 (patch-mpi_mpi-inline.h) = 36887f60ef01958c9d988e6a7dbf8af7215f224e diff --git a/security/gnupg/patches/patch-ak b/security/gnupg/patches/patch-ak deleted file mode 100644 index 2e2e9129f5d..00000000000 --- a/security/gnupg/patches/patch-ak +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ak,v 1.4 2012/10/27 17:39:12 wiz Exp $ - -Add a patch to handle systems which have uint64_t but not the UINT64_C -macro. This could happen with UNIX98-type systems, such as the code on -our netbsd-1-5 branch, and would prevent this package from building on -such systems. Problem also reported to the original author. - ---- include/types.h.orig 2005-07-27 17:02:56.000000000 +0000 -+++ include/types.h -@@ -104,7 +104,12 @@ typedef unsigned long u32; - #undef u64 /* maybe there is a macro with this name */ - #if SIZEOF_UINT64_T == 8 - typedef uint64_t u64; -+#ifdef UINT64_C - #define U64_C(c) (UINT64_C(c)) -+#else -+ /* make a best guess, could happen with UNIX98 <inttypes.h> */ -+#define U64_C(c) (c) -+#endif - #define HAVE_U64_TYPEDEF - #elif SIZEOF_UNSIGNED_INT == 8 - typedef unsigned int u64; diff --git a/security/gnupg/patches/patch-cipher_idea-stub.c b/security/gnupg/patches/patch-cipher_idea-stub.c deleted file mode 100644 index 8e61eb215d0..00000000000 --- a/security/gnupg/patches/patch-cipher_idea-stub.c +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-cipher_idea-stub.c,v 1.1 2012/11/07 21:07:38 wiz Exp $ - -commit c3a5448379cdf07b408a265fe8f477901524170d -Author: Werner Koch <wk@gnupg.org> -Date: Wed Nov 7 21:38:27 2012 +0100 - - Fix usage of dlerror to conform to POSIX. - - * cipher/idea-stub.c: Clear last error before dlsym. - -- - - This is required for NetBSD. - - Reported-by: Thomas Klausner - ---- cipher/idea-stub.c.orig 2012-01-20 10:51:15.000000000 +0000 -+++ cipher/idea-stub.c -@@ -130,6 +130,8 @@ load_module (const char *name) - goto failure; - } - -+ dlerror (); /* Clear old errors or initialize dlerror. */ -+ - sym = dlsym (handle, "idea_get_info"); - if (dlerror ()) - sym = dlsym (handle, "_idea_get_info"); diff --git a/security/gnupg/patches/patch-mpi_mpi-inline.h b/security/gnupg/patches/patch-mpi_mpi-inline.h deleted file mode 100644 index a656fa30924..00000000000 --- a/security/gnupg/patches/patch-mpi_mpi-inline.h +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-mpi_mpi-inline.h,v 1.1 2012/11/07 12:23:24 wiz Exp $ - -From 5093bed27580e608de073bcc5953bd76b6b8b2de Mon Sep 17 00:00:00 2001 -From: Werner Koch <wk@gnupg.org> -Date: Tue, 6 Nov 2012 17:14:04 +0100 -Subject: [PATCH] Fix extern inline use for gcc > 4.3 in c99 mode - -* mpi/mpi-inline.h [!G10_MPI_INLINE_DECL]: Take care of changed extern -inline semantics in gcc. - ---- mpi/mpi-inline.h.orig 2012-01-20 10:51:16.000000000 +0000 -+++ mpi/mpi-inline.h -@@ -28,8 +28,15 @@ - #ifndef G10_MPI_INLINE_H - #define G10_MPI_INLINE_H - -+/* Starting with gcc 4.3 "extern inline" conforms in c99 mode to the -+ c99 semantics. To keep the useful old semantics we use an -+ attribute. */ - #ifndef G10_MPI_INLINE_DECL --#define G10_MPI_INLINE_DECL extern __inline__ -+# ifdef __GNUC_STDC_INLINE__ -+# define G10_MPI_INLINE_DECL extern inline __attribute__ ((__gnu_inline__)) -+# else -+# define G10_MPI_INLINE_DECL extern __inline__ -+# endif - #endif - - G10_MPI_INLINE_DECL mpi_limb_t |