summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2013-01-07 21:53:53 +0000
committerwiz <wiz@pkgsrc.org>2013-01-07 21:53:53 +0000
commit5b06af2b110a3f69ba819be737eff41d920acc35 (patch)
treeef5eade819979b2f76194cb0d93adce1c4924ced
parenta33528c94276742ed431783edbdc5b6105fccfdf (diff)
downloadpkgsrc-5b06af2b110a3f69ba819be737eff41d920acc35.tar.gz
Fix idea on big-endian hosts.
From http://bugs.g10code.com/gnupg/issue1461 Reported by tez. Bump PKGREVISION.
-rw-r--r--security/gnupg/Makefile3
-rw-r--r--security/gnupg/distinfo3
-rw-r--r--security/gnupg/patches/patch-cipher_idea.c25
3 files changed, 29 insertions, 2 deletions
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index ea00b54c430..e9bd7228111 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.116 2013/01/07 21:47:32 wiz Exp $
+# $NetBSD: Makefile,v 1.117 2013/01/07 21:53:53 wiz Exp $
DISTNAME= gnupg-1.4.13
+PKGREVISION= 1
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 75b78ec5639..eb61a9cd641 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.59 2013/01/07 21:47:01 wiz Exp $
+$NetBSD: distinfo,v 1.60 2013/01/07 21:53:53 wiz Exp $
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-cipher_idea.c) = 09103b07c00b195ea3f46c963bccdc64148e5c31
diff --git a/security/gnupg/patches/patch-cipher_idea.c b/security/gnupg/patches/patch-cipher_idea.c
new file mode 100644
index 00000000000..9eeab67c9fd
--- /dev/null
+++ b/security/gnupg/patches/patch-cipher_idea.c
@@ -0,0 +1,25 @@
+$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);