From 924e57e69fd951a729b365695c367b083adc52b6 Mon Sep 17 00:00:00 2001
From: Konrad Rosenbaum <konrad@silmor.de>
Date: Fri, 5 Sep 2014 21:53:22 +0200
Subject: [PATCH] update GPG to 1.4.18

---
 .gitignore          |    1 +
 aurora/build-gpg.sh |   12 +++++++++---
 aurora/gnupg        |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0a07b4b..20615c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *~
 lib/
 bin/
+share/
 .ctmp
 Makefile*
 core
diff --git a/aurora/build-gpg.sh b/aurora/build-gpg.sh
index 20d59df..27a9db8 100755
--- a/aurora/build-gpg.sh
+++ b/aurora/build-gpg.sh
@@ -5,7 +5,7 @@ fmake(){
         echo -e 'all:\n\techo ok\n\n%:\n\techo ok $@\n\n' >./$1/Makefile
 }
 
-test -f /proc/cpuinfo__ && {
+test -f /proc/cpuinfo && {
   CPUS=$(expr $(grep ^processor </proc/cpuinfo |tail -1 |cut -d : -f 2) + 2)
   export MAKEFLAGS="-j $CPUS"
   echo Using $CPUS CPUs for Make.
@@ -14,14 +14,20 @@ test -f /proc/cpuinfo__ && {
 echo Cleaning up old binaries
 rm -rf gpg
 
+cd `dirname $0`
 cd gnupg
 echo Building GnuPG
 git clean -dfx
 git reset --hard
 ./autogen.sh
-./configure --disable-gnupg-iconv --enable-minimal --disable-card-support --disable-bzip2 --disable-exec --disable-keyserver-helpers --disable-nls --disable-asm --disable-rpath  --disable-regex --with-included-zlib --with-libcurl=no --disable-threads --without-libiconv-prefix --without-libintl-prefix --with-libusb=no --with-readline=no --prefix=`pwd`/../.. --enable-rsa
+./configure --disable-gnupg-iconv --enable-minimal \
+  --disable-card-support --disable-bzip2 --disable-exec --disable-keyserver-helpers \
+  --disable-nls --disable-asm --disable-rpath  --disable-regex --with-included-zlib \
+  --with-libcurl=no --disable-threads --without-libiconv-prefix --without-libintl-prefix \
+  --with-libusb=no --with-readline=no --enable-rsa \
+  --prefix=`pwd`/../gpg
 fmake doc
-make
+nice make
 make install
 
 cd ..
diff --git a/aurora/gnupg b/aurora/gnupg
index fb5c9de..6a7b763 160000
--- a/aurora/gnupg
+++ b/aurora/gnupg
@@ -1 +1 @@
-Subproject commit fb5c9deaa506249518705846cd9f4c178fe1c4e6
+Subproject commit 6a7b763e05d352a08f639d5eef9d0bac01c5c456
-- 
1.7.2.5