Upgrade to gnutls-3.3.11

diff --git a/config/packages-list b/config/packages-list
index 4c3a2a3..2dcffd9 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -132,7 +132,7 @@ GNOME_MEDIA="gnome-media-2.32.0"
 GNOME_MENUS="gnome-menus-2.30.5"
 GNUMERIC="gnumeric-1.10.17"
 GNUPG="gnupg-1.4.12"
-GNUTLS="gnutls-3.0.22"
+GNUTLS="gnutls-3.3.11"
 GOBJECT_INSTROSPECTION="gobject-introspection-1.32.1"
 GOFFICE="goffice-0.8.17"
 GPARTED="gparted-0.16.1"

diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 1c8b56a..772d000 100755 (executable)
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -158,7 +158,7 @@ ipkg ${GUILE2} \
 ipkg ${LIBGPG_ERROR}
 ipkg ${LIBGCRYPT}
 ipkg ${NETTLE} "--libdir=/usr/lib"
-ipkg -m acnb ${GNUTLS}
+ipkg -m acnb ${GNUTLS} "--with-default-trust-store-file=/etc/ssl-ca-bundle.crt"
 
 # Mail
 ipkg -l "${SASL2}-pass1" -s "cyrus-sasl" ${SASL2}

diff --git a/stage3/packages-update b/stage3/packages-update
index e34f31f..5e04d09 100755 (executable)
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -136,7 +136,7 @@ fpkg -m gnu ${GUILE2}
 fpkg -s "libgpg-error" ${LIBGPG_ERROR} ${GNUPG_URL}
 fpkg -s "libgcrypt"    ${LIBGCRYPT}    ${GNUPG_URL}
 fpkg -e "tar.gz" ${NETTLE} "http://www.lysator.liu.se/~nisse/archive"
-fpkg -e "tar.xz" -s "gnutls"       ${GNUTLS}       ${GNUPG_URL}
+fpkg -e "tar.xz" -s "gnutls/v$(get_pkg_ver2 ${GNUTLS})" ${GNUTLS} ${GNUPG_URL}
 
 fpkg -e "tar.gz" ${SASL2} "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail"
 fpkg -e "tgz" ${OPENLDAP} \