Mon Jan 7 21:53:53 2013 UTC ()
Fix idea on big-endian hosts.
>From http://bugs.g10code.com/gnupg/issue1461

Reported by tez.

Bump PKGREVISION.


(wiz)
diff -r1.116 -r1.117 pkgsrc/security/gnupg/Makefile
diff -r1.59 -r1.60 pkgsrc/security/gnupg/distinfo
diff -r0 -r1.1 pkgsrc/security/gnupg/patches/patch-cipher_idea.c
cvs diff -r1.116 -r1.117 pkgsrc/security/gnupg/Makefile (switch to unified diff)

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

--- pkgsrc/security/gnupg/distinfo 2013/01/07 21:47:01 1.59
+++ pkgsrc/security/gnupg/distinfo 2013/01/07 21:53:53 1.60
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.59 2013/01/07 21:47:01 wiz Exp $ 1$NetBSD: distinfo,v 1.60 2013/01/07 21:53:53 wiz Exp $
2 2
3SHA1 (gnupg-1.4.13.tar.bz2) = 17a75c54d292bd0923f0a1817a1b02ded37d1de1 3SHA1 (gnupg-1.4.13.tar.bz2) = 17a75c54d292bd0923f0a1817a1b02ded37d1de1
4RMD160 (gnupg-1.4.13.tar.bz2) = a3d6f2ca2dd46d8b97e1790d0b1738dc4a1cedd6 4RMD160 (gnupg-1.4.13.tar.bz2) = a3d6f2ca2dd46d8b97e1790d0b1738dc4a1cedd6
5Size (gnupg-1.4.13.tar.bz2) = 3685873 bytes 5Size (gnupg-1.4.13.tar.bz2) = 3685873 bytes
6SHA1 (patch-ab) = 24e200a04f8f31e53e22dc80ed079570cb5de8d8 6SHA1 (patch-ab) = 24e200a04f8f31e53e22dc80ed079570cb5de8d8
 7SHA1 (patch-cipher_idea.c) = 09103b07c00b195ea3f46c963bccdc64148e5c31
File Added: pkgsrc/security/gnupg/patches/Attic/patch-cipher_idea.c
$NetBSD: patch-cipher_idea.c,v 1.1 2013/01/07 21:53:53 wiz Exp $

Fix for big-endian, from
http://bugs.g10code.com/gnupg/issue1461

--- cipher/idea.c.orig	2012-12-20 17:22:26.000000000 +0000
+++ cipher/idea.c
@@ -201,7 +201,7 @@ cipher( byte *outbuf, const byte *inbuf,
     x2 = *in++;
     x3 = *in++;
     x4 = *in;
-  #ifndef WORDS_BIGENDIAN
+  #ifndef BIG_ENDIAN_HOST
     x1 = (x1>>8) | (x1<<8);
     x2 = (x2>>8) | (x2<<8);
     x3 = (x3>>8) | (x3<<8);
@@ -234,7 +234,7 @@ cipher( byte *outbuf, const byte *inbuf,
     MUL(x4, *key);
 
     out = (u16*)outbuf;
-  #ifndef WORDS_BIGENDIAN
+  #ifndef BIG_ENDIAN_HOST
     *out++ = (x1>>8) | (x1<<8);
     *out++ = (x3>>8) | (x3<<8);
     *out++ = (x2>>8) | (x2<<8);