From 356ed84cc163e37f82640135abbe7fba22d31cc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Glo=DFner?= <viper@hometux.de>
Date: Thu, 20 Apr 2006 22:14:46 +0000
Subject: gnupg: --enable-m-guard doesn't work as expected

---
 gnupg/.md5sum                  |  1 -
 gnupg/Pkgfile                  |  9 ++-------
 gnupg/gnupg-1.4.3-mguard.patch | 23 -----------------------
 3 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 gnupg/gnupg-1.4.3-mguard.patch

(limited to 'gnupg')

diff --git a/gnupg/.md5sum b/gnupg/.md5sum
index 8f78ccb84..ef750595c 100644
--- a/gnupg/.md5sum
+++ b/gnupg/.md5sum
@@ -1,3 +1,2 @@
-9c27490749384afffca5d7d18aaaf276  gnupg-1.4.3-mguard.patch
 d237d8fe1c4afa379f56dbda0e0b40e4  gnupg-1.4.3.tar.bz2
 9dc3bc086824a8c7a331f35e09a3e57f  idea.c.gz
diff --git a/gnupg/Pkgfile b/gnupg/Pkgfile
index 7d015220e..faee43840 100644
--- a/gnupg/Pkgfile
+++ b/gnupg/Pkgfile
@@ -5,17 +5,13 @@
 
 name=gnupg
 version=1.4.3
-release=2
+release=3
 source=(ftp://ftp.gnupg.org/gcrypt/gnupg/$name-$version.tar.bz2 \
-	ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz \
-	$name-$version-mguard.patch)
+	ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz)
 
 build () {
     cd $name-$version
 
-    # necessary because of --enable-m-guard
-    patch -p1 < $SRC/$name-$version-mguard.patch
-
     zcat ../idea.c.gz > cipher/idea.c
 
     ./configure \
@@ -23,7 +19,6 @@ build () {
 	--libexecdir=/usr/lib \
 	--enable-static-rnd=linux \
         --enable-dev-random \
-	--enable-m-guard \
         --disable-nls \
         --disable-ldap \
 	--enable-mailto
diff --git a/gnupg/gnupg-1.4.3-mguard.patch b/gnupg/gnupg-1.4.3-mguard.patch
deleted file mode 100644
index 66c1c2801..000000000
--- a/gnupg/gnupg-1.4.3-mguard.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nru gnupg-1.4.3-old/util/memory.c gnupg-1.4.3/util/memory.c
---- gnupg-1.4.3-old/util/memory.c	2006-04-06 23:28:07.875803000 +0000
-+++ gnupg-1.4.3/util/memory.c	2006-04-06 23:29:02.695229000 +0000
-@@ -509,15 +509,15 @@
-         if( len >= n ) /* we don't shrink for now */
-             return a;
-         if( p[-1] == MAGIC_SEC_BYTE )
--            b = FNAME(alloc_secure_clear)(n FNAMEARG);
-+            b = FNAMEXM(alloc_secure_clear)(n FNAMEARG);
-         else
--            b = FNAME(alloc_clear)(n FNAMEARG);
-+            b = FNAMEXM(alloc_clear)(n FNAMEARG);
-         FNAME(check)(NULL FNAMEARG);
-         memcpy(b, a, len );
--        FNAME(free)(p FNAMEARG);
-+        FNAMEX(free)(p FNAMEARG);
-     }
-     else
--        b = FNAME(alloc)(n FNAMEARG);
-+        b = FNAMEXM(alloc)(n FNAMEARG);
- #else
-     if( m_is_secure(a) ) {
- 	if( !(b = secmexrealloc( a, n )) )
-- 
cgit v1.2.3