From nobody Sat Aug 17 13:58:52 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WmL7J6NzGz5T5KF; Sat, 17 Aug 2024 13:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WmL7J5mpHz4gjC; Sat, 17 Aug 2024 13:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723903132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xLIPfC7DkTPORglqAGueAlDNYc//hmxtKfJKZYSNtzU=; b=mc7CObWme5w/VgsyDF0pC2oM/QDPQrmVBVpSnOfZrlOWst/3KvqF5XLxb1NMKueLv9tX6T OikMTTJzwtdKbVSAq116svm5u4Grx59hpjZlpC7tzIIx6/cMPBy3kpRd8T5vGMb711/db8 cwtZ3R7mKNtt7vlwfFcadSA/lsdJpuNp+B4Rnf+YcK9crpHhXkYIIfWOvZdJytO1EzKKit KFAUSBgrz3Gp4H32du3UF2odPllv2JzraO9laotAjnc4VFl/8GMoyHqdPmmLmH8e1l7GJU qMlxfPeyCDkJ82gaDq6UnVQLv6y0p1W9WwpWRnzs/7YUGFlAYMp+oMpC0Tpu5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723903132; a=rsa-sha256; cv=none; b=wK1FHho29gkmfzaStaxNGT7pwz+hf6SYML99yJjwR0+jWCQ1Fpsxtj1VenKbiQ494oHP9k IHpr/7dG2DCD2v8bPF/8KV30a82zr4O3x60k20jJw5T9tUjtCN4QqngEZd63oq2wR2hogJ Og5op7P4c5gxxB909M/elsWBvG6Wo4oc6iwg0h6TavU1CMLrcc5nT69SHv4r4T7KbMrprk E11z5xJxQtkAxZ4sVEZgIPjmkXTDQq9il1fYmGVb39ryElXOsQ5YupovXVQyfEReBsKKCb xvOAfZrxBfCk6j/64cTMwXL3GhAcLV7urn/XPMH1gHD80//MxgLMq00XNKXTEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723903132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xLIPfC7DkTPORglqAGueAlDNYc//hmxtKfJKZYSNtzU=; b=ivaHmaRFW52U+RvhYwYfpxYdf8quhFK7kjwKbNGPQV4TmoQp3Tl8hyCMSZT55a+zjZNgP8 c/twpL9KstU3Wm3d4nrsQuPvCYq/7ZInK4sPFaqp/uuu/6eCIiHmdfe9coyHT7llFzjU6U KfOcDM7URFJHYotPYs42tEx2TU2ngR+5z6M6fYak5Pg3VHUDdDDLIbkruMw6G2bMKCxeET aOC+6JnJV5FT0/cZmAcyyyJao/hOcf/lb76s+h59VoTC/kyyeTk00g4mnfzwTBxdOKVWHp eyOXEqt9fsPF/pVhJZCpjwA6lOJcwQGGaNhtvs9I7erB6dGclvDk+RyGpywc2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WmL7J5CXnzsW8; Sat, 17 Aug 2024 13:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47HDwqxm049563; Sat, 17 Aug 2024 13:58:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47HDwqFa049560; Sat, 17 Aug 2024 13:58:52 GMT (envelope-from git) Date: Sat, 17 Aug 2024 13:58:52 GMT Message-Id: <202408171358.47HDwqFa049560@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tijl Coosemans Subject: git: 0148af9f0568 - main - security/gnutls: Update to 3.8.7.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0148af9f05684d452c1a905d22f2f8e47b9c4322 Auto-Submitted: auto-generated The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=0148af9f05684d452c1a905d22f2f8e47b9c4322 commit 0148af9f05684d452c1a905d22f2f8e47b9c4322 Author: Tijl Coosemans AuthorDate: 2024-08-17 13:32:22 +0000 Commit: Tijl Coosemans CommitDate: 2024-08-17 13:57:50 +0000 security/gnutls: Update to 3.8.7.1 patch-configure derived from https://gitlab.com/gnutls/gnutls/-/commit/74e505e986dd --- security/gnutls/Makefile | 6 +- security/gnutls/distinfo | 10 +-- security/gnutls/files/patch-configure | 126 +++++++++++++++++++++++++++-- security/gnutls/files/patch-lib_compress.c | 11 --- security/gnutls/pkg-plist | 2 +- 5 files changed, 128 insertions(+), 27 deletions(-) diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index 1b94be0bfcd1..0e212be19ee1 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -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 diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo index f545b1da10f4..39bffe3facfb 100644 --- a/security/gnutls/distinfo +++ b/security/gnutls/distinfo @@ -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 diff --git a/security/gnutls/files/patch-configure b/security/gnutls/files/patch-configure index b2d839d195d3..c58be5212e13 100644 --- a/security/gnutls/files/patch-configure +++ b/security/gnutls/files/patch-configure @@ -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 diff --git a/security/gnutls/files/patch-lib_compress.c b/security/gnutls/files/patch-lib_compress.c deleted file mode 100644 index dcd4c6379c88..000000000000 --- a/security/gnutls/files/patch-lib_compress.c +++ /dev/null @@ -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 = diff --git a/security/gnutls/pkg-plist b/security/gnutls/pkg-plist index faf312f40560..c92a227c3dae 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.0 +lib/libgnutls.so.30.40.1 lib/libgnutlsxx.so lib/libgnutlsxx.so.30 lib/libgnutlsxx.so.30.0.0