version up: gnutls 3.5.13 and dependencies

component/gnutls/buildout.cfg

 [buildout]
 extends =
+  ../gettext/buildout.cfg
   ../gmp/buildout.cfg
   ../nettle/buildout.cfg
   ../p11-kit/buildout.cfg
-  ../pkgconfig/buildout.cfg
-  ../lunzip/buildout.cfg
-  ../zlib/buildout.cfg
 
 parts = gnutls
 
-[gpg-error]
+[gpg-common]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.26.tar.bz2
-md5sum = 97456709dbbcbb69354317ffe3e347cd
-
-[gcrypt]
-recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.6.6.tar.bz2
-md5sum = 944cf6595021d0c33478148a315b335b
+url = http://www.gnupg.org/ftp/gcrypt/${:_buildout_section_name_}/${:_buildout_section_name_}-${:version}.tar.bz2
 configure-options =
-  --with-gpg-error-prefix=${gpg-error:location}
+  --enable-option-checking=fatal
+  --disable-dependency-tracking
 environment =
-  CPPFLAGS=-I${gpg-error:location}/include
-  LDFLAGS=-L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib
+  PATH=${gettext:location}/bin:%(PATH)s
+
+[libgpg-error]
+<= gpg-common
+version = 1.27
+md5sum = 5217ef3e76a7275a2a3b569a12ddc989
+configure-options +=
+  --disable-doc
+  --disable-tests
+
+[libgcrypt]
+<= gpg-common
+version = 1.7.7
+md5sum = d1769481b1b506a632fd66c5e5f62e41
+configure-options +=
+  --disable-doc
+configure-options +=
+  --with-gpg-error-prefix=${libgpg-error:location}
+environment +=
+  LDFLAGS=-Wl,-rpath=${libgpg-error:location}/lib
 
 [gnutls]
-recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-3.3.26.tar.xz
-md5sum = 9840c06019bfa7db07ed8fd5e63106d5
-configure-options =
+<= gpg-common
+url = http://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/gnutls-3.5.13.tar.xz
+md5sum = 4fd41ad86572933c2379b4cc321a0959
+configure-options +=
+  --disable-doc
   --disable-static
   --disable-libdane
   --disable-guile
-  --disable-crywrap
   --without-tpm
+  --with-included-unistring
+pkg-config-path = ${libtasn1:location}/lib/pkgconfig:${nettle:location}/lib/pkgconfig:${p11-kit:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
 environment =
   PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${nettle:location}/lib/pkgconfig:${p11-kit:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
-  CPPFLAGS=-I${gmp:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${nettle:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  PKG_CONFIG_PATH=${:pkg-config-path}
+  CPPFLAGS=-I${gmp:location}/include -I${libtasn1:location}/include
+  LDFLAGS=-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${nettle:location}/lib -Wl,-rpath=${zlib:location}/lib

component/libtasn1/buildout.cfg

@@ -4,8 +4,8 @@ parts =
 
 [libtasn1]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/libtasn1/libtasn1-4.8.tar.gz
-md5sum = 9a6767705725544f2b86670dcfb34107
+url = http://ftp.gnu.org/gnu/libtasn1/libtasn1-4.12.tar.gz
+md5sum = 5c724bd1f73aaf4a311833e1cd297b21
 configure-options =
   --disable-static
   --disable-gtk-doc-html

component/nettle/buildout.cfg

@@ -6,10 +6,10 @@ extends =
 
 [nettle]
 recipe = slapos.recipe.cmmi
-url = http://www.lysator.liu.se/~nisse/archive/nettle-2.7.1.tar.gz
-md5sum = 003d5147911317931dd453520eb234a5
+url = http://ftp.gnu.org/gnu/nettle/nettle-3.3.tar.gz
+md5sum = 10f969f78a463704ae73529978148dbe
 patches =
-  ${:_profile_base_location_}/nettle-lib-location.patch#41dd0ce2a73487929bdc637b75dd62c9
+  ${:_profile_base_location_}/nettle-lib-location.patch#3c5f5b285ffd5bc30436ee0f4c662084
 configure-option =
   --disable-static
   --disable-assembler

component/nettle/nettle-lib-location.patch

---- configure.orig	2013-07-05 15:37:28.000000000 +0200
-+++ configure	2013-07-05 15:47:48.000000000 +0200
-@@ -4680,52 +4680,6 @@
+--- configure.orig	2016-10-01 09:28:38.000000000 +0200
++++ configure	2017-06-22 11:22:13.865295091 +0200
+@@ -6779,58 +6779,6 @@
  if test "x$ABI" != xstandard ; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: Compiler uses $ABI-bit ABI. To change, set CC." >&5
  $as_echo "$as_me: Compiler uses $ABI-bit ABI. To change, set CC." >&6;}
@@ -43,6 +43,12 @@
 -      *:freebsd*:64)
 -	libdir='${exec_prefix}/lib'
 -	;;
+-      *:irix*:32)
+-	libdir='${exec_prefix}/lib32'
+-	;;
+-      *:irix*:64)
+-	libdir='${exec_prefix}/lib64'
+-	;;
 -      *)
 -        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Don't know where to install $ABI-bit libraries on this system." >&5
 -$as_echo "$as_me: WARNING: Don't know where to install $ABI-bit libraries on this system." >&2;};
@@ -52,4 +58,4 @@
 -  fi
  fi
  
- # Select assembler code
+ OPT_NETTLE_SOURCES=""

component/p11-kit/buildout.cfg

@@ -9,8 +9,9 @@ extends =
 
 [p11-kit]
 recipe = slapos.recipe.cmmi
-url = http://p11-glue.freedesktop.org/releases/p11-kit-0.23.1.tar.gz
-md5sum = 96f073270c489c9a594e1c9413f42db8
+url = https://github.com/p11-glue/p11-kit/releases/download/${:version}/p11-kit-${:version}.tar.gz
+version = 0.23.7
+md5sum = ebbefd123210594231adb4bde21b8560
 configure-options =
   --disable-static
   --disable-doc-html

component/qemu-kvm/buildout.cfg

@@ -37,7 +37,7 @@ configure-options =
   --enable-vnc-png
   --disable-vnc-jpeg
   --extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${ncurses:location}/include -I${zlib:location}/include -I${libpng:location}/include -I${libaio:location}/include -I${attr:location}/include -I${libcap:location}/include"
-  --extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib -L${gpg-error:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls -L${attr:location}/lib -Wl,-rpath=${attr:location}/lib -L${libcap:location}/lib -Wl,-rpath=${libcap:location}/lib"
+  --extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${libgpg-error:location}/lib -L${libgpg-error:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls -L${attr:location}/lib -Wl,-rpath=${attr:location}/lib -L${libcap:location}/lib -Wl,-rpath=${libcap:location}/lib"
   --disable-werror
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s

component/xorg/buildout.cfg

@@ -525,9 +525,9 @@ configure-options =
   --with-sha1=libgcrypt
 environment =
   PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${fixesproto:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xcmiscproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${bigreqsproto:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${fontsproto:location}/lib/pkgconfig:${videoproto:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${resourceproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${libXfont:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${freetype:pkg_config_depends}:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
-  CPPFLAGS=-I${bzip2:location}/include -I${gcrypt:location}/include -I${gpg-error:location}/include -I${zlib:location}/include
+  CPPFLAGS=-I${bzip2:location}/include -I${libgcrypt:location}/include -I${libgpg-error:location}/include -I${zlib:location}/include
   PATH=${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gcrypt:location}/lib -Wl,-rpath=${gcrypt:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libgcrypt:location}/lib -Wl,-rpath=${libgcrypt:location}/lib -L${libgpg-error:location}/lib -Wl,-rpath=${libgpg-error:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
 
 [libXi]
 recipe = slapos.recipe.cmmi