From 9e393716f0f981398c61199d35327b264d77558f Mon Sep 17 00:00:00 2001 From: fbrosson Date: Sat, 17 Feb 2018 09:59:31 +0000 Subject: [PATCH] gnutls: bump to 3.6.2, add lib:libidn2 & debuginfo package. (#2220) --- ...s36-3.6.1.recipe => gnutls36-3.6.2.recipe} | 39 +++++++++++++++---- ...s-3.6.1.patchset => gnutls-3.6.2.patchset} | 12 +++--- 2 files changed, 37 insertions(+), 14 deletions(-) rename net-libs/gnutls/{gnutls36-3.6.1.recipe => gnutls36-3.6.2.recipe} (74%) rename net-libs/gnutls/patches/{gnutls-3.6.1.patchset => gnutls-3.6.2.patchset} (95%) diff --git a/net-libs/gnutls/gnutls36-3.6.1.recipe b/net-libs/gnutls/gnutls36-3.6.2.recipe similarity index 74% rename from net-libs/gnutls/gnutls36-3.6.1.recipe rename to net-libs/gnutls/gnutls36-3.6.2.recipe index e22c54245..0093cf9a9 100644 --- a/net-libs/gnutls/gnutls36-3.6.1.recipe +++ b/net-libs/gnutls/gnutls36-3.6.2.recipe @@ -6,24 +6,32 @@ communications protocols as well as APIs to parse and write X.509, PKCS #12, \ OpenPGP and other required structures. It is aimed to be portable and \ efficient with focus on security and interoperability." HOMEPAGE="https://www.gnutls.org/" -COPYRIGHT="2000-2017 Free Software Fundation Inc. +COPYRIGHT="2000-2018 Free Software Fundation Inc. 2004-2008 Simon Josefsson 2000-2004 Nikos Mavrogiannopoulos" LICENSE="GNU LGPL v2.1" REVISION="1" SOURCE_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz" -CHECKSUM_SHA256="20b10d2c9994bc032824314714d0e84c0f19bdb3d715d8ed55beb7364a8ebaed" +CHECKSUM_SHA256="bcd5db7b234e02267f36b5d13cf5214baac232b7056a506252b7574ea7738d1f" SOURCE_DIR="gnutls-$portVersion" PATCHES="gnutls-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc" SECONDARY_ARCHITECTURES="!x86_gcc2 x86" +libgnutls_opensslVersion="27.0.2" +libgnutlsVersion="30.20.2" +libgnutlsxxVersion="28.1.0" + +libgnutls_opensslVersionCompat="$libgnutls_opensslVersion compat >= ${libgnutls_opensslVersion%%.*}" +libgnutlsVersionCompat="$libgnutlsVersion compat >= ${libgnutlsVersion%%.*}" +libgnutlsxxVersionCompat="$libgnutlsxxVersion compat >= ${libgnutlsxxVersion%%.*}" + PROVIDES=" gnutls36$secondaryArchSuffix = $portVersion - lib:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27 - lib:libgnutls$secondaryArchSuffix = 30.20.1 compat >= 30 - lib:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28 + lib:libgnutls_openssl$secondaryArchSuffix = $libgnutls_opensslVersionCompat + lib:libgnutls$secondaryArchSuffix = $libgnutlsVersionCompat + lib:libgnutlsxx$secondaryArchSuffix = $libgnutlsxxVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -32,6 +40,7 @@ REQUIRES=" lib:libnettle$secondaryArchSuffix lib:libgmp$secondaryArchSuffix lib:libiconv$secondaryArchSuffix + lib:libidn2$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libtasn1$secondaryArchSuffix lib:libunistring$secondaryArchSuffix @@ -60,6 +69,7 @@ REQUIRES_bin=" lib:libnettle$secondaryArchSuffix lib:libgmp$secondaryArchSuffix lib:libiconv$secondaryArchSuffix + lib:libidn2$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libtasn1$secondaryArchSuffix lib:libunistring$secondaryArchSuffix @@ -73,9 +83,9 @@ CONFLICTS_bin=" PROVIDES_devel=" gnutls36${secondaryArchSuffix}_devel = $portVersion - devel:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27 - devel:libgnutls$secondaryArchSuffix = 30.20.1 compat >= 30 - devel:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28 + devel:libgnutls_openssl$secondaryArchSuffix = $libgnutls_opensslVersionCompat + devel:libgnutls$secondaryArchSuffix = $libgnutlsVersionCompat + devel:libgnutlsxx$secondaryArchSuffix = $libgnutlsxxVersionCompat " REQUIRES_devel=" gnutls36$secondaryArchSuffix == $portVersion base @@ -98,6 +108,7 @@ BUILD_REQUIRES=" devel:libnettle$secondaryArchSuffix devel:libgmp$secondaryArchSuffix devel:libiconv$secondaryArchSuffix + devel:libidn2$secondaryArchSuffix devel:libtasn1$secondaryArchSuffix devel:libunistring$secondaryArchSuffix devel:libz$secondaryArchSuffix @@ -105,6 +116,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf + cmd:autoheader cmd:automake cmd:autopoint cmd:find @@ -117,6 +129,16 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " +TEST_PREREQUIRES=" + cmd:cvs + cmd:git + " + +defineDebugInfoPackage gnutls36$secondaryArchSuffix \ + $libDir/libgnutls-openssl.so.$libgnutls_opensslVersion \ + $libDir/libgnutls.so.$libgnutlsVersion \ + $libDir/libgnutlsxx.so.$libgnutlsxxVersion + BUILD() { autoreconf -fi @@ -129,6 +151,7 @@ INSTALL() { make install + rm -f $infoDir/dir rm -f $libDir/libgnutls*.la prepareInstalledDevelLibs libgnutls-openssl libgnutls libgnutlsxx diff --git a/net-libs/gnutls/patches/gnutls-3.6.1.patchset b/net-libs/gnutls/patches/gnutls-3.6.2.patchset similarity index 95% rename from net-libs/gnutls/patches/gnutls-3.6.1.patchset rename to net-libs/gnutls/patches/gnutls-3.6.2.patchset index 6c9220d61..8ccc66ea9 100644 --- a/net-libs/gnutls/patches/gnutls-3.6.1.patchset +++ b/net-libs/gnutls/patches/gnutls-3.6.2.patchset @@ -47,7 +47,7 @@ index 9ace1a5..b087721 100644 #include #include diff --git a/tests/mini-record-failure.c b/tests/mini-record-failure.c -index 9f70ce3..810879e 100644 +index e346e7e..fff3f82 100644 --- a/tests/mini-record-failure.c +++ b/tests/mini-record-failure.c @@ -26,6 +26,9 @@ @@ -61,7 +61,7 @@ index 9f70ce3..810879e 100644 #if defined(_WIN32) -- -2.7.0 +2.16.1 From b2e1563f96d5fa6a3ca2d866e22161681c14b6a3 Mon Sep 17 00:00:00 2001 @@ -71,10 +71,10 @@ Subject: link mini-dtls-pthread without libpthread. diff --git a/tests/Makefile.am b/tests/Makefile.am -index eab4a16..3d1f10f 100644 +index 14a5c2c..06130f5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -140,8 +140,8 @@ str_idna_LDADD = $(CMOCKA_LDADD) +@@ -188,8 +188,8 @@ gnutls_record_overhead_CPPFLAGS = $(AM_CPPFLAGS) \ endif @@ -86,7 +86,7 @@ index eab4a16..3d1f10f 100644 # These tests need gnulib for memmem() resume_psk_CFLAGS = -DUSE_PSK -- -2.9.2 +2.16.1 From aa560535eef19064c892a1051492576fdd54183c Mon Sep 17 00:00:00 2001 @@ -109,7 +109,7 @@ index 1c95b12..fbc2862 100644 /* Check that FLT_RADIX is a constant expression. */ int a[] = { FLT_RADIX }; -- -2.8.4 +2.16.1 From b2826162157672e4b8ea7d0ceb03282e596734e1 Mon Sep 17 00:00:00 2001