Fix idea on big-endian hosts. >From http://bugs.g10code.com/gnupg/issue1461 Reported by tez. Bump PKGREVISION.diff -r1.116 -r1.117 pkgsrc/security/gnupg/Makefile
(wiz)
@@ -1,16 +1,17 @@ | @@ -1,16 +1,17 @@ | |||
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 | |||
3 | DISTNAME= gnupg-1.4.13 | 3 | DISTNAME= gnupg-1.4.13 | |
4 | PKGREVISION= 1 | |||
4 | CATEGORIES= security | 5 | CATEGORIES= security | |
5 | MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/ \ | 6 | MASTER_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/ | |
9 | EXTRACT_SUFX= .tar.bz2 | 10 | EXTRACT_SUFX= .tar.bz2 | |
10 | 11 | |||
11 | MAINTAINER= wiz@NetBSD.org | 12 | MAINTAINER= wiz@NetBSD.org | |
12 | HOMEPAGE= http://www.gnupg.org/ | 13 | HOMEPAGE= http://www.gnupg.org/ | |
13 | COMMENT= GNU Privacy Guard, public-Key encryption and digital signatures | 14 | COMMENT= GNU Privacy Guard, public-Key encryption and digital signatures | |
14 | LICENSE= gnu-gpl-v3 | 15 | LICENSE= gnu-gpl-v3 | |
15 | 16 | |||
16 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 17 | PKG_INSTALLATION_TYPES= overwrite pkgviews |
@@ -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 | |||
3 | SHA1 (gnupg-1.4.13.tar.bz2) = 17a75c54d292bd0923f0a1817a1b02ded37d1de1 | 3 | SHA1 (gnupg-1.4.13.tar.bz2) = 17a75c54d292bd0923f0a1817a1b02ded37d1de1 | |
4 | RMD160 (gnupg-1.4.13.tar.bz2) = a3d6f2ca2dd46d8b97e1790d0b1738dc4a1cedd6 | 4 | RMD160 (gnupg-1.4.13.tar.bz2) = a3d6f2ca2dd46d8b97e1790d0b1738dc4a1cedd6 | |
5 | Size (gnupg-1.4.13.tar.bz2) = 3685873 bytes | 5 | Size (gnupg-1.4.13.tar.bz2) = 3685873 bytes | |
6 | SHA1 (patch-ab) = 24e200a04f8f31e53e22dc80ed079570cb5de8d8 | 6 | SHA1 (patch-ab) = 24e200a04f8f31e53e22dc80ed079570cb5de8d8 | |
7 | SHA1 (patch-cipher_idea.c) = 09103b07c00b195ea3f46c963bccdc64148e5c31 |
$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);