3 files changed, 6 insertions, 33 deletions
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index e244ed33136..de4bfff18a5 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.119 2013/05/10 20:18:39 riastradh Exp $
+# $NetBSD: Makefile,v 1.120 2013/07/25 11:50:45 wiz Exp $
 
-DISTNAME=	gnupg-1.4.13
-PKGREVISION=	2
+DISTNAME=	gnupg-1.4.14
 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 eb61a9cd641..eef4a108e30 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.60 2013/01/07 21:53:53 wiz Exp $
+$NetBSD: distinfo,v 1.61 2013/07/25 11:50:45 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 (gnupg-1.4.14.tar.bz2) = 6202181ba2871fb3448c751a573b4ae0c4770806
+RMD160 (gnupg-1.4.14.tar.bz2) = a834d1d4933b8927bfefb3936baa76f12ce7fc1d
+Size (gnupg-1.4.14.tar.bz2) = 3687929 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
deleted file mode 100644
index 9eeab67c9fd..00000000000
--- a/security/gnupg/patches/patch-cipher_idea.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$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);