Mon Jan 7 08:33:09 2013 UTC ()
Pullup ticket #4002 - requested by spz
security/gnupg: security update

Revisions pulled up:
- security/gnupg/Makefile                                       1.115
- security/gnupg/distinfo                                       1.56
- security/gnupg/patches/patch-ak                               deleted
- security/gnupg/patches/patch-cipher_idea-stub.c               deleted
- security/gnupg/patches/patch-mpi_mpi-inline.h                 deleted

---
   Module Name:	pkgsrc
   Committed By:	spz
   Date:		Sun Jan  6 14:50:48 UTC 2013

   Modified Files:
   	pkgsrc/security/gnupg: Makefile distinfo
   Removed Files:
   	pkgsrc/security/gnupg/patches: patch-ak patch-cipher_idea-stub.c
   	    patch-mpi_mpi-inline.h

   Log Message:
   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.


(tron)
diff -r1.114 -r1.114.2.1 pkgsrc/security/gnupg/Makefile
diff -r1.55 -r1.55.2.1 pkgsrc/security/gnupg/distinfo
diff -r1.4 -r0 pkgsrc/security/gnupg/patches/patch-ak
diff -r1.1 -r0 pkgsrc/security/gnupg/patches/patch-cipher_idea-stub.c
diff -r1.1 -r0 pkgsrc/security/gnupg/patches/patch-mpi_mpi-inline.h
cvs diff -r1.114 -r1.114.2.1 pkgsrc/security/gnupg/Makefile (switch to unified diff)

--- pkgsrc/security/gnupg/Makefile 2012/12/16 01:52:32 1.114
+++ pkgsrc/security/gnupg/Makefile 2013/01/07 08:33:09 1.114.2.1
@@ -1,53 +1,52 @@ @@ -1,53 +1,52 @@
1# $NetBSD: Makefile,v 1.114 2012/12/16 01:52:32 obache Exp $ 1# $NetBSD: Makefile,v 1.114.2.1 2013/01/07 08:33:09 tron Exp $
2 2
3DISTNAME= gnupg-1.4.12 3DISTNAME= gnupg-1.4.13
4PKGREVISION= 2 
5CATEGORIES= security 4CATEGORIES= security
6MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/ \ 5MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/ \
7 http://gd.tuwien.ac.at/privacy/gnupg/gnupg/ \ 6 http://gd.tuwien.ac.at/privacy/gnupg/gnupg/ \
8 ftp://ftp.jyu.fi/pub/crypt/gcrypt/gnupg/ \ 7 ftp://ftp.jyu.fi/pub/crypt/gcrypt/gnupg/ \
9 ftp://ftp.ring.gr.jp/pub/net/gnupg/gnupg/ 8 ftp://ftp.ring.gr.jp/pub/net/gnupg/gnupg/
10EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
11# don't remove this -- we may add idea.c.gz to it in options.mk 10# don't remove this -- we may add idea.c.gz to it in options.mk
12DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 11DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
13 12
14MAINTAINER= wiz@NetBSD.org 13MAINTAINER= wiz@NetBSD.org
15HOMEPAGE= http://www.gnupg.org/ 14HOMEPAGE= http://www.gnupg.org/
16COMMENT= GNU Privacy Guard, public-Key encryption and digital signatures 15COMMENT= GNU Privacy Guard, public-Key encryption and digital signatures
17LICENSE= gnu-gpl-v3 16LICENSE= gnu-gpl-v3
18 17
19PKG_INSTALLATION_TYPES= overwrite pkgviews 18PKG_INSTALLATION_TYPES= overwrite pkgviews
20 19
21CRYPTO= yes 20CRYPTO= yes
22GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
23USE_PKGLOCALEDIR= yes 22USE_PKGLOCALEDIR= yes
24USE_TOOLS+= gmake msgfmt 23USE_TOOLS+= gmake msgfmt
25CONFIGURE_ARGS+= --with-static-rnd=auto 24CONFIGURE_ARGS+= --with-static-rnd=auto
26CONFIGURE_ARGS+= --with-mailprog=/usr/sbin/sendmail 25CONFIGURE_ARGS+= --with-mailprog=/usr/sbin/sendmail
27TEST_TARGET= check 26TEST_TARGET= check
28INFO_FILES= yes 27INFO_FILES= yes
29 28
30EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 29EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
31 30
32.include "options.mk" 31.include "options.mk"
33 32
34.if ${OPSYS} == "SunOS" || (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.[0-6]*)) 33.if ${OPSYS} == "SunOS" || (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.[0-6]*))
35CONFIGURE_ARGS+= --disable-gnupg-iconv 34CONFIGURE_ARGS+= --disable-gnupg-iconv
36.endif 35.endif
37 36
38.if (${OPSYS} == "AIX" || ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS") \ 37.if (${OPSYS} == "AIX" || ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS") \
39 && defined(ABI) && ${ABI} == 64 38 && defined(ABI) && ${ABI} == 64
40CONFIGURE_ARGS+= --disable-asm 39CONFIGURE_ARGS+= --disable-asm
41.endif 40.endif
42 41
43post-install: 42post-install:
44 ${INSTALL_DATA} ${WRKSRC}/doc/DETAILS \ 43 ${INSTALL_DATA} ${WRKSRC}/doc/DETAILS \
45 ${DESTDIR}${PREFIX}/share/gnupg 44 ${DESTDIR}${PREFIX}/share/gnupg
46 45
47.include "../../devel/readline/buildlink3.mk" 46.include "../../devel/readline/buildlink3.mk"
48.include "../../converters/libiconv/buildlink3.mk" 47.include "../../converters/libiconv/buildlink3.mk"
49.include "../../devel/gettext-lib/buildlink3.mk" 48.include "../../devel/gettext-lib/buildlink3.mk"
50.include "../../devel/zlib/buildlink3.mk" 49.include "../../devel/zlib/buildlink3.mk"
51.include "../../archivers/bzip2/buildlink3.mk" 50.include "../../archivers/bzip2/buildlink3.mk"
52 51
53.include "../../mk/bsd.pkg.mk" 52.include "../../mk/bsd.pkg.mk"
cvs diff -r1.55 -r1.55.2.1 pkgsrc/security/gnupg/distinfo (switch to unified diff)

--- pkgsrc/security/gnupg/distinfo 2012/11/07 21:07:37 1.55
+++ pkgsrc/security/gnupg/distinfo 2013/01/07 08:33:09 1.55.2.1
@@ -1,12 +1,6 @@ @@ -1,12 +1,6 @@
1$NetBSD: distinfo,v 1.55 2012/11/07 21:07:37 wiz Exp $ 1$NetBSD: distinfo,v 1.55.2.1 2013/01/07 08:33:09 tron Exp $
2 2
3SHA1 (gnupg-1.4.12.tar.bz2) = 9b78e20328d35525af7b8a9c1cf081396910e937 3SHA1 (gnupg-1.4.13.tar.bz2) = 17a75c54d292bd0923f0a1817a1b02ded37d1de1
4RMD160 (gnupg-1.4.12.tar.bz2) = d5f4367c9a636d778b6ccb2711bfba6597c27fa0 4RMD160 (gnupg-1.4.13.tar.bz2) = a3d6f2ca2dd46d8b97e1790d0b1738dc4a1cedd6
5Size (gnupg-1.4.12.tar.bz2) = 3584133 bytes 5Size (gnupg-1.4.13.tar.bz2) = 3685873 bytes
6SHA1 (idea.c.gz) = 82fded4ec31b97b3b2dd22741880b67cfee40f84 
7RMD160 (idea.c.gz) = e35be5a031d10d52341ac5f029d28f811edd908d 
8Size (idea.c.gz) = 5216 bytes 
9SHA1 (patch-ab) = 24e200a04f8f31e53e22dc80ed079570cb5de8d8 6SHA1 (patch-ab) = 24e200a04f8f31e53e22dc80ed079570cb5de8d8
10SHA1 (patch-ak) = cf3afbd3de520c7cc15f8f026e90df6ea8c56367 
11SHA1 (patch-cipher_idea-stub.c) = 0df4fd8820521b97ad239a0da9bc276d7962e404 
12SHA1 (patch-mpi_mpi-inline.h) = 36887f60ef01958c9d988e6a7dbf8af7215f224e 
File Deleted: pkgsrc/security/gnupg/patches/Attic/patch-ak
File Deleted: pkgsrc/security/gnupg/patches/Attic/patch-cipher_idea-stub.c
File Deleted: pkgsrc/security/gnupg/patches/Attic/patch-mpi_mpi-inline.h