Attachment 255134 Details for Bug 282723 – Patch file

[patch] Patch file

security_gnutls.patch (text/plain), 6.76 KB, created by Yasuhiro Kimura on 2024-11-13 05:38:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2024-11-13 05:38:03 UTC

Size: 6.76 KB

patch

obsolete

>From 8b9c84af154d1c4b08bd7f3cf555ae43a9121fe8 Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@FreeBSD.org>
>Date: Wed, 13 Nov 2024 14:34:16 +0900
>Subject: [PATCH] security/gnutls: Update to 3.8.8
>
>ReleaseNotes:	https://lists.gnutls.org/pipermail/gnutls-help/2024-November/004865.html
>---
> security/gnutls/Makefile              |   2 +-
> security/gnutls/distinfo              |   8 +-
> security/gnutls/files/patch-configure | 126 ++------------------------
> security/gnutls/pkg-plist             |   2 +-
> 4 files changed, 13 insertions(+), 125 deletions(-)
>
>diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
>index 0e212be19ee1..1bb6cbf6202e 100644
>--- a/security/gnutls/Makefile
>+++ b/security/gnutls/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	gnutls
>-DISTVERSION=	3.8.7.1
>+DISTVERSION=	3.8.8
> CATEGORIES=	security net
> MASTER_SITES=	GNUPG/${PORTNAME}/v${DISTVERSION:C/(\.[^.]*).*/\1/}
> 
>diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
>index 39bffe3facfb..66d3afb8ee32 100644
>--- a/security/gnutls/distinfo
>+++ b/security/gnutls/distinfo
>@@ -1,5 +1,3 @@
>-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
>+TIMESTAMP = 1731473784
>+SHA256 (gnutls-3.8.8.tar.xz) = ac4f020e583880b51380ed226e59033244bc536cad2623f2e26f5afa2939d8fb
>+SIZE (gnutls-3.8.8.tar.xz) = 6696460
>diff --git a/security/gnutls/files/patch-configure b/security/gnutls/files/patch-configure
>index c58be5212e13..b2d839d195d3 100644
>--- a/security/gnutls/files/patch-configure
>+++ b/security/gnutls/files/patch-configure
>@@ -1,128 +1,18 @@
>---- configure.orig	2024-08-15 09:56:06 UTC
>+--- configure.orig	2016-03-03 07:52:15 UTC
> +++ configure
>-@@ -87194,6 +87194,7 @@ if test "$enable_dane" != "no"; then
>- printf "%s\n" "$enable_dane" >&6; }
>+@@ -47228,6 +47228,7 @@ fi
>+ $as_echo "$enable_dane" >&6; }
>  
>  if test "$enable_dane" != "no"; then
> +    oldlibs="$LIBS"
>      LIBS="$oldlibs -lunbound"
>-     { 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
>+     { $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
>  fi
>  
>  if test "$with_tpm" != "no"; then
> +    oldlibs="$LIBS"
>      LIBS="$oldlibs -ltspi"
>-     { 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
>+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tss library" >&5
>+ $as_echo_n "checking for tss library... " >&6; }
>diff --git a/security/gnutls/pkg-plist b/security/gnutls/pkg-plist
>index c92a227c3dae..d9cbcbe332e6 100644
>--- a/security/gnutls/pkg-plist
>+++ b/security/gnutls/pkg-plist
>@@ -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.1
>+lib/libgnutls.so.30.40.2
> lib/libgnutlsxx.so
> lib/libgnutlsxx.so.30
> lib/libgnutlsxx.so.30.0.0
>-- 
>2.47.0
>

Actions: View | Diff

Attachments on bug 282723: 255134 | 255813