mirror of
https://git.freebsd.org/ports.git
synced 2025-05-13 07:41:50 -04:00
security/gnutls: Update to 3.8.7.1
patch-configure derived from https://gitlab.com/gnutls/gnutls/-/commit/74e505e986dd
This commit is contained in:
Tijl Coosemans
parent
19f6f803bc
commit
0148af9f05
5 changed files with 128 additions and 27 deletions
|
|
@ -1,7 +1,7 @@
|
|||
PORTNAME= gnutls
|
||||
DISTVERSION= 3.8.6
|
||||
DISTVERSION= 3.8.7.1
|
||||
CATEGORIES= security net
|
||||
MASTER_SITES= GNUPG/${PORTNAME}/v${DISTVERSION:R}
|
||||
MASTER_SITES= GNUPG/${PORTNAME}/v${DISTVERSION:C/(\.[^.]*).*/\1/}
|
||||
|
||||
MAINTAINER= tijl@FreeBSD.org
|
||||
COMMENT= GNU Transport Layer Security library
|
||||
|
|
@ -40,6 +40,8 @@ TEST_TARGET= check
|
|||
|
||||
LDFLAGS+= -Wl,--undefined-version
|
||||
|
||||
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/(\.[^.]*\.[^.]*).*/\1/}
|
||||
|
||||
INFO= gnutls
|
||||
|
||||
OPTIONS_DEFINE= DANE EXAMPLES IDN KTLS MAN3 NLS P11KIT SRP
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
TIMESTAMP = 1720863124
|
||||
SHA256 (gnutls-3.8.6.tar.xz) = 2e1588aae53cb32d43937f1f4eca28febd9c0c7aa1734fc5dd61a7e81e0ebcdd
|
||||
SIZE (gnutls-3.8.6.tar.xz) = 6517476
|
||||
SHA256 (2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d.patch) = 5e4bfa6946e5012cd518da453846ca9ed003dab18706814d502d84d6b4066627
|
||||
SIZE (2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d.patch) = 7531
|
||||
TIMESTAMP = 1723887362
|
||||
SHA256 (gnutls-3.8.7.1.tar.xz) = 9ca0ddaccce28a74fa18d738744190afb3b0daebef74e6ad686bf7bef99abd60
|
||||
SIZE (gnutls-3.8.7.1.tar.xz) = 6695404
|
||||
SHA256 (74e505e986ddc1782e973e92094eaf4219eea14e.diff) = 5e43cc0035eda3d1d5d95d1bdd0c1520d99cda44a853e34db90b34953baeaec6
|
||||
SIZE (74e505e986ddc1782e973e92094eaf4219eea14e.diff) = 4447
|
||||
|
|
|
|||
|
|
@ -1,18 +1,128 @@
|
|||
--- configure.orig 2016-03-03 07:52:15 UTC
|
||||
--- configure.orig 2024-08-15 09:56:06 UTC
|
||||
+++ configure
|
||||
@@ -47228,6 +47228,7 @@ fi
|
||||
$as_echo "$enable_dane" >&6; }
|
||||
@@ -87194,6 +87194,7 @@ if test "$enable_dane" != "no"; then
|
||||
printf "%s\n" "$enable_dane" >&6; }
|
||||
|
||||
if test "$enable_dane" != "no"; then
|
||||
+ oldlibs="$LIBS"
|
||||
LIBS="$oldlibs -lunbound"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unbound library" >&5
|
||||
$as_echo_n "checking for unbound library... " >&6; }
|
||||
@@ -47444,6 +47445,7 @@ else
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for unbound library" >&5
|
||||
printf %s "checking for unbound library... " >&6; }
|
||||
@@ -87930,6 +87931,7 @@ if test "$with_tpm" != "no"; then
|
||||
fi
|
||||
|
||||
if test "$with_tpm" != "no"; then
|
||||
+ oldlibs="$LIBS"
|
||||
LIBS="$oldlibs -ltspi"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tss library" >&5
|
||||
$as_echo_n "checking for tss library... " >&6; }
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tss library" >&5
|
||||
printf %s "checking for tss library... " >&6; }
|
||||
@@ -88234,11 +88236,6 @@ fi
|
||||
printf "%s\n" "yes" >&6; }
|
||||
|
||||
fi
|
||||
- if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then
|
||||
- GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
|
||||
- else
|
||||
- GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib"
|
||||
- fi
|
||||
ac_zlib=yes
|
||||
else
|
||||
|
||||
@@ -88902,6 +88899,13 @@ printf "%s\n" "#define Z_LIBRARY_SONAME \"$z_so\"" >>c
|
||||
LIBS="$save_LIBS"
|
||||
CFLAGS="$save_CFLAGS"
|
||||
|
||||
+elif test "$ZLIB_HAS_PKGCONFIG" = y && test "$ac_zlib" = yes
|
||||
+then
|
||||
+ if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then
|
||||
+ GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
|
||||
+ else
|
||||
+ GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib"
|
||||
+ fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -89064,11 +89068,6 @@ printf "%s\n" "#define HAVE_LIBBROTLI 1" >>confdefs.h
|
||||
|
||||
printf "%s\n" "#define HAVE_LIBBROTLI 1" >>confdefs.h
|
||||
|
||||
- if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
|
||||
- GNUTLS_REQUIRES_PRIVATE="Requires.private: libbrotlienc, libbrotlidec"
|
||||
- else
|
||||
- GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, libbrotlienc, libbrotlidec"
|
||||
- fi
|
||||
need_ltlibdl=yes
|
||||
else
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** LIBBROTLI was not found. You will not be able to use BROTLI compression." >&5
|
||||
@@ -89078,7 +89077,7 @@ fi
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
printf "%s\n" "no" >&6; }
|
||||
fi
|
||||
- if test "$with_libbrotlienc" != "no" && test "$with_libbrotlidec" != "no"; then
|
||||
+ if test "$with_libbrotlienc" = yes && test "$with_libbrotlidec" = yes; then
|
||||
HAVE_LIBBROTLI_TRUE=
|
||||
HAVE_LIBBROTLI_FALSE='#'
|
||||
else
|
||||
@@ -89184,6 +89183,13 @@ printf "%s\n" "#define BROTLIDEC_LIBRARY_SONAME \"$bro
|
||||
LIBS="$save_LIBS"
|
||||
CFLAGS="$save_CFLAGS"
|
||||
|
||||
+elif test "$with_libbrotlienc" = yes && test "$with_libbrotlidec" = yes
|
||||
+then
|
||||
+ if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
|
||||
+ GNUTLS_REQUIRES_PRIVATE="Requires.private: libbrotlienc, libbrotlidec"
|
||||
+ else
|
||||
+ GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, libbrotlienc, libbrotlidec"
|
||||
+ fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -89275,11 +89281,6 @@ printf "%s\n" "#define HAVE_LIBZSTD 1" >>confdefs.h
|
||||
|
||||
printf "%s\n" "#define HAVE_LIBZSTD 1" >>confdefs.h
|
||||
|
||||
- if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
|
||||
- GNUTLS_REQUIRES_PRIVATE="Requires.private: libzstd"
|
||||
- else
|
||||
- GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, libzstd"
|
||||
- fi
|
||||
need_ltlibdl=yes
|
||||
else
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** LIBZSTD was not found. You will not be able to use ZSTD compression." >&5
|
||||
@@ -89289,7 +89290,7 @@ fi
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
printf "%s\n" "no" >&6; }
|
||||
fi
|
||||
- if test "$with_libzstd" != "no"; then
|
||||
+ if test "$with_libzstd" = yes; then
|
||||
HAVE_LIBZSTD_TRUE=
|
||||
HAVE_LIBZSTD_FALSE='#'
|
||||
else
|
||||
@@ -89348,6 +89349,13 @@ printf "%s\n" "#define ZSTD_LIBRARY_SONAME \"$zstd_so\
|
||||
LIBS="$save_LIBS"
|
||||
CFLAGS="$save_CFLAGS"
|
||||
|
||||
+elif test "$with_libzstd" = yes
|
||||
+then
|
||||
+ if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
|
||||
+ GNUTLS_REQUIRES_PRIVATE="Requires.private: libzstd"
|
||||
+ else
|
||||
+ GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, libzstd"
|
||||
+ fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -89530,6 +89538,13 @@ printf "%s\n" "#define OQS_LIBRARY_SONAME \"$oqs_so\""
|
||||
LIBS="$save_LIBS"
|
||||
CFLAGS="$save_CFLAGS"
|
||||
|
||||
+elif test "$have_liboqs" = yes
|
||||
+then
|
||||
+ if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then
|
||||
+ GNUTLS_REQUIRES_PRIVATE="Requires.private: liboqs"
|
||||
+ else
|
||||
+ GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, liboqs"
|
||||
+ fi
|
||||
fi
|
||||
|
||||
if test "$need_ltlibdl" = yes; then
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
--- lib/compress.c.orig 2024-01-23 08:52:59 UTC
|
||||
+++ lib/compress.c
|
||||
@@ -72,7 +72,7 @@ static int zlib_init(void)
|
||||
#ifndef _WIN32
|
||||
if (_zlib_handle != NULL)
|
||||
return 0;
|
||||
- if ((_zlib_handle = dlopen("libz.so.1", RTLD_NOW | RTLD_GLOBAL)) ==
|
||||
+ if ((_zlib_handle = dlopen("libz.so.6", RTLD_NOW | RTLD_GLOBAL)) ==
|
||||
NULL)
|
||||
goto error;
|
||||
if ((_gnutls_zlib_compressBound =
|
||||
|
|
@ -35,7 +35,7 @@ lib/libgnutls-openssl.so.27
|
|||
lib/libgnutls-openssl.so.27.0.2
|
||||
lib/libgnutls.so
|
||||
lib/libgnutls.so.30
|
||||
lib/libgnutls.so.30.40.0
|
||||
lib/libgnutls.so.30.40.1
|
||||
lib/libgnutlsxx.so
|
||||
lib/libgnutlsxx.so.30
|
||||
lib/libgnutlsxx.so.30.0.0
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue