haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 14:38:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

gnutls: bump to 3.6.2, add lib:libidn2 & debuginfo package. (#2220)

Browse Source
This commit is contained in:
fbrosson
2018-02-17 09:59:31 +00:00
committed by GitHub
parent b3a658b097
commit 9e393716f0
2 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
net-libs/gnutls/gnutls36-3.6.1.recipe → net-libs/gnutls/gnutls36-3.6.2.recipe
View File

@@ -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 \ OpenPGP and other required structures. It is aimed to be portable and \
efficient with focus on security and interoperability." efficient with focus on security and interoperability."
HOMEPAGE="https://www.gnutls.org/" HOMEPAGE="https://www.gnutls.org/"
COPYRIGHT="2000-2017 Free Software Fundation Inc. COPYRIGHT="2000-2018 Free Software Fundation Inc.
2004-2008 Simon Josefsson 2004-2008 Simon Josefsson
2000-2004 Nikos Mavrogiannopoulos" 2000-2004 Nikos Mavrogiannopoulos"
LICENSE="GNU LGPL v2.1" LICENSE="GNU LGPL v2.1"
REVISION="1" REVISION="1"
SOURCE_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz" SOURCE_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz"
CHECKSUM_SHA256="20b10d2c9994bc032824314714d0e84c0f19bdb3d715d8ed55beb7364a8ebaed" CHECKSUM_SHA256="bcd5db7b234e02267f36b5d13cf5214baac232b7056a506252b7574ea7738d1f"
SOURCE_DIR="gnutls-$portVersion" SOURCE_DIR="gnutls-$portVersion"
PATCHES="gnutls-$portVersion.patchset" PATCHES="gnutls-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc" ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc"
SECONDARY_ARCHITECTURES="!x86_gcc2 x86" 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=" PROVIDES="
gnutls36$secondaryArchSuffix = $portVersion gnutls36$secondaryArchSuffix = $portVersion
lib:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27 lib:libgnutls_openssl$secondaryArchSuffix = $libgnutls_opensslVersionCompat
lib:libgnutls$secondaryArchSuffix = 30.20.1 compat >= 30 lib:libgnutls$secondaryArchSuffix = $libgnutlsVersionCompat
lib:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28 lib:libgnutlsxx$secondaryArchSuffix = $libgnutlsxxVersionCompat
" "
REQUIRES=" REQUIRES="
haiku$secondaryArchSuffix haiku$secondaryArchSuffix
@@ -32,6 +40,7 @@ REQUIRES="
lib:libnettle$secondaryArchSuffix lib:libnettle$secondaryArchSuffix
lib:libgmp$secondaryArchSuffix lib:libgmp$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix lib:libiconv$secondaryArchSuffix
lib:libidn2$secondaryArchSuffix
lib:libintl$secondaryArchSuffix lib:libintl$secondaryArchSuffix
lib:libtasn1$secondaryArchSuffix lib:libtasn1$secondaryArchSuffix
lib:libunistring$secondaryArchSuffix lib:libunistring$secondaryArchSuffix
@@ -60,6 +69,7 @@ REQUIRES_bin="
lib:libnettle$secondaryArchSuffix lib:libnettle$secondaryArchSuffix
lib:libgmp$secondaryArchSuffix lib:libgmp$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix lib:libiconv$secondaryArchSuffix
lib:libidn2$secondaryArchSuffix
lib:libintl$secondaryArchSuffix lib:libintl$secondaryArchSuffix
lib:libtasn1$secondaryArchSuffix lib:libtasn1$secondaryArchSuffix
lib:libunistring$secondaryArchSuffix lib:libunistring$secondaryArchSuffix
@@ -73,9 +83,9 @@ CONFLICTS_bin="
PROVIDES_devel=" PROVIDES_devel="
gnutls36${secondaryArchSuffix}_devel = $portVersion gnutls36${secondaryArchSuffix}_devel = $portVersion
devel:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27 devel:libgnutls_openssl$secondaryArchSuffix = $libgnutls_opensslVersionCompat
devel:libgnutls$secondaryArchSuffix = 30.20.1 compat >= 30 devel:libgnutls$secondaryArchSuffix = $libgnutlsVersionCompat
devel:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28 devel:libgnutlsxx$secondaryArchSuffix = $libgnutlsxxVersionCompat
" "
REQUIRES_devel=" REQUIRES_devel="
gnutls36$secondaryArchSuffix == $portVersion base gnutls36$secondaryArchSuffix == $portVersion base
@@ -98,6 +108,7 @@ BUILD_REQUIRES="
devel:libnettle$secondaryArchSuffix devel:libnettle$secondaryArchSuffix
devel:libgmp$secondaryArchSuffix devel:libgmp$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix devel:libiconv$secondaryArchSuffix
devel:libidn2$secondaryArchSuffix
devel:libtasn1$secondaryArchSuffix devel:libtasn1$secondaryArchSuffix
devel:libunistring$secondaryArchSuffix devel:libunistring$secondaryArchSuffix
devel:libz$secondaryArchSuffix devel:libz$secondaryArchSuffix
@@ -105,6 +116,7 @@ BUILD_REQUIRES="
BUILD_PREREQUIRES=" BUILD_PREREQUIRES="
cmd:aclocal cmd:aclocal
cmd:autoconf cmd:autoconf
cmd:autoheader
cmd:automake cmd:automake
cmd:autopoint cmd:autopoint
cmd:find cmd:find
@@ -117,6 +129,16 @@ BUILD_PREREQUIRES="
cmd:pkg_config$secondaryArchSuffix 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() BUILD()
{ {
autoreconf -fi autoreconf -fi
@@ -129,6 +151,7 @@ INSTALL()
{ {
make install make install
rm -f $infoDir/dir
rm -f $libDir/libgnutls*.la rm -f $libDir/libgnutls*.la
prepareInstalledDevelLibs libgnutls-openssl libgnutls libgnutlsxx prepareInstalledDevelLibs libgnutls-openssl libgnutls libgnutlsxx

12
net-libs/gnutls/patches/gnutls-3.6.1.patchset → net-libs/gnutls/patches/gnutls-3.6.2.patchset
View File

@@ -47,7 +47,7 @@ index 9ace1a5..b087721 100644
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
diff --git a/tests/mini-record-failure.c b/tests/mini-record-failure.c 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 --- a/tests/mini-record-failure.c
+++ b/tests/mini-record-failure.c +++ b/tests/mini-record-failure.c
@@ -26,6 +26,9 @@ @@ -26,6 +26,9 @@
@@ -61,7 +61,7 @@ index 9f70ce3..810879e 100644
#if defined(_WIN32) #if defined(_WIN32)
-- --
2.7.0 2.16.1
From b2e1563f96d5fa6a3ca2d866e22161681c14b6a3 Mon Sep 17 00:00:00 2001 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 diff --git a/tests/Makefile.am b/tests/Makefile.am
index eab4a16..3d1f10f 100644 index 14a5c2c..06130f5 100644
--- a/tests/Makefile.am --- a/tests/Makefile.am
+++ b/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 endif
@@ -86,7 +86,7 @@ index eab4a16..3d1f10f 100644
# These tests need gnulib for memmem() # These tests need gnulib for memmem()
resume_psk_CFLAGS = -DUSE_PSK resume_psk_CFLAGS = -DUSE_PSK
-- --
2.9.2 2.16.1
From aa560535eef19064c892a1051492576fdd54183c Mon Sep 17 00:00:00 2001 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. */ /* Check that FLT_RADIX is a constant expression. */
int a[] = { FLT_RADIX }; int a[] = { FLT_RADIX };
-- --
2.8.4 2.16.1
From b2826162157672e4b8ea7d0ceb03282e596734e1 Mon Sep 17 00:00:00 2001 From b2826162157672e4b8ea7d0ceb03282e596734e1 Mon Sep 17 00:00:00 2001