Version bump of gnutls and libexpat.

gnutls: 3.5.18 -> 3.6.3
libexpat: 2.2.5 -> 2.2.6

diff --git a/packages/packages.current b/packages/packages.current
index 82512460410a08b670c864ab574f2d776f598126..c5d830d6c484e5038316b90a88d6c90dd338af59 100644 (file)
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -59,12 +59,13 @@ chk 9dc6981197a7d92f339192eea974f5eca48fcffe
 # gnutls
 server ftp://ftp.gnutls.org/gcrypt
 
-file gnutls/v3.5/gnutls-3.5.18.tar.xz
-chk 3f56903c4eba1af9440c64ef86688f984834f0d5
+file gnutls/v3.6/gnutls-3.6.3.tar.xz
+chk  ac96787a7fbd550a2b201e64c0e752821e90fed7
 
 # expat
 server https://github.com
-file libexpat/libexpat/releases/download/R_2_2_5/expat-2.2.5.tar.bz2
+file libexpat/libexpat/releases/download/R_2_2_6/expat-2.2.6.tar.bz2
+chk  c8947fc3119a797b55485f2f7bdaaeb49cc9df01
 
 # Various libraries, mostly those from sf.net
 # (Kept on our own mirror due to Sourceforge/github peculiarities.)

diff --git a/src/Makefile.am b/src/Makefile.am
index 17b4d903ff6f9ceaf00bca8142f159795c4b9415..7b1e48393b84eb6f6282c951f3144bd2b53a666c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -245,6 +245,8 @@ cm_pkg_gnutls_configure = \
        --with-included-unistring \
        --disable-gtk-doc-html \
        --disable-tests \
+       --disable-doc \
+       --disable-tools \
   --with-libtasn1-prefix=$(idir) \
   --with-libgcrypt-prefix=$(idir) \
        CPPFLAGS=\"-I$(idir)/include\" LDFLAGS=\"-L$(idir)/lib\"
@@ -278,6 +280,9 @@ cm_pkg_libxml2_configure = \
 cm_pkg_libxslt_configure = \
        --enable-shared --without-python
 
+cm_pkg_expat_configure = \
+       --without-docbook
+
 cm_pkg_cyrus_sasl_configure = \
        --without-openssl --disable-ldapd --without-saslauthd \
        --without-pwcheck --without-des --without-authdaemond \