From cbef99afba3918ca246fb06a5f924b421e56b835 Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Fri, 26 Dec 2014 22:28:24 -0500
Subject: [PATCH] Upgrade to gnupg-2.0.26

Add new dependencies.
---
 config/packages-list   | 5 ++++-
 stage3/hv-install-1    | 7 ++++++-
 stage3/packages-update | 5 ++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/config/packages-list b/config/packages-list
index 5e441e9..aa23929 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -135,7 +135,7 @@ GNOME_ICON_THEME="gnome-icon-theme-3.12.0"
 GNOME_MEDIA="gnome-media-2.32.0"
 GNOME_MENUS="gnome-menus-2.30.5"
 GNUMERIC="gnumeric-1.10.17"
-GNUPG="gnupg-1.4.12"
+GNUPG="gnupg-2.0.26"
 GNUTLS="gnutls-3.3.11"
 GOBJECT_INSTROSPECTION="gobject-introspection-1.42.0"
 GOFFICE="goffice-0.8.17"
@@ -211,6 +211,7 @@ LESSTIF="lesstif-0.95.2"
 LFS_BOOTSCRIPTS="lfs-bootscripts-20070813"
 LIBA52="a52dec-0.7.4"
 LIBART="libart_lgpl-2.3.21"
+LIBASSUAN="libassuan-2.2.0"
 BOOST="boost_1_57_0"
 LIBARCHIVE="libarchive-3.0.4"
 LIBCROCO="libcroco-0.6.8"
@@ -228,6 +229,7 @@ LIBGPG_ERROR="libgpg-error-1.17"
 LIBGSF="libgsf-1.14.30"
 LIBID3TAG="libid3tag-0.15.1b"
 LIBJPEG="libjpeg-turbo-1.3.0"
+LIBKSBA="libksba-1.3.2"
 LIBMAD="libmad-0.15.1b"
 LIBMNG="libmng-2.0.2"
 LIBNL="libnl-3.2.22"
@@ -340,6 +342,7 @@ PORTMAP="portmap-6.0"
 PROCMAIL="procmail-3.22"
 PROCPS="procps-3.2.8"
 PSMISC="psmisc-22.17"
+PTH="pth-2.0.7"
 PYCAIRO="py2cairo-1.10.0"
 PYGOBJECT="pygobject-2.28.6"
 PYGTK="pygtk-2.24.0"
diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 0788db6..74e4feb 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -172,7 +172,12 @@ else
     ipkg ${MSMTP}
 fi
 
-ipkg ${GNUPG} "--libexecdir=/usr/lib"
+ipkg ${PTH} "\
+    --disable-static \
+    --mandir=/usr/share/man"
+ipkg ${LIBASSUAN}
+ipkg ${LIBKSBA}
+ipkg ${GNUPG} "-enable-symcryptrun"
 ipkg ${MUTT} "--enable-imap --with-ssl --with-sasl --enable-hcache"
 
 ipkg ${YASM}
diff --git a/stage3/packages-update b/stage3/packages-update
index 950d77d..2e344e8 100755
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -147,7 +147,10 @@ else
     fpkg -m sf -e "tar.bz2" ${MSMTP}
 fi
 
-fpkg -s "gnupg" ${GNUPG} "ftp://ftp.gnupg.org/gcrypt"
+fpkg -m gnu ${PTH}
+fpkg -s "libassuan" ${LIBASSUAN} ${GNUPG_URL}
+fpkg -s "libksba" ${LIBKSBA} ${GNUPG_URL}
+fpkg -s "gnupg" ${GNUPG} ${GNUPG_URL}
 fpkg -m sf ${MUTT}
 
 fpkg -e "tar.gz" ${YASM} "http://www.tortall.net/projects/yasm/releases"
-- 
2.20.1