From nobody Tue Apr 02 23:24:58 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 4V8P9k5CM9z5G0L9; Tue, 2 Apr 2024 23:24:58 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8P9k390mz46jh; Tue, 2 Apr 2024 23:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712100298; 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=CVIbAXHurpTvE+TmW6b8+FMjdD1ZaRARR+XfmZPvrVE=; b=RviMnHNSon75h6Gm3CDzHY2RpX7cUiomP4qiNqqCHe+ApXBBySwTsbm0W4LPHgyOcimuH+ FV71Zrr7TW1sPyUxPBoE8q4uXBjoWpDHdrBJNbgNORJ8H3PCg3o4hItaMS1M87B9SSWaiB AV4jd8RuL6glnPK31gtDxSjKZj4P+t61bL63engrPoZBX1ZvQjciurfpK2+tPIDeyQlXQw Kcijip8kPZjw7ogY60QRyz4a8yimVujVoIKg5tgkowp5ZsBzBxijMlZ0M1Y1DA6OVfu2X2 jvyztaExdWimfHj6YGSntWICLkBDYf/Kir4At8o8UQX5Xix9kRiJZiN7fxQ6Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712100298; a=rsa-sha256; cv=none; b=InAyWZVOTa70/7duItn7UB8tsttstlonUc0JwT8k8BLYiZDZplSXggdsw9aL0kMp16WME3 Eoq1LpFwJAPaTmKuas3mqT9d8iPaTGG934u3uQM+fI5YDapSgzmI265EIUmm9d3uFeTB7J bNu0kwjVGCoVwQxm4AaZWhQLbVixJyyP8oJOjUbXBpDxrDNJAgkBL3u2JUKNIkSy2uw2xW 7LfPS4iqpnxC/RXu2FdiES4xzf7r/uQj3Cl3FsVVfW3twDj37IxrziRGBmmMjUMPC4OH89 StaDXsTIJCWXuyXSNvNCB2NqbRqif1EUOfhTR+t1/gPfTwZ9v6KVjXywqAu+7Q== 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=1712100298; 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=CVIbAXHurpTvE+TmW6b8+FMjdD1ZaRARR+XfmZPvrVE=; b=T77ffF4mAk9/SeAB67UkpodkTiZclP2vQHkUuzJwlOg9vhmm8tnJmJNwEQzBjW3Mi/+OE4 gJ+LZLSnjZ0K2N3/PIzPAuGiYPh3hLPGn7VXVuUFt03GXSyJsfgHmQYCmIoEPKtIFfw4db FqP4MWsbFI18PGJIocWMwEu3hcKt+JdzbW/ot9W29q6Kp4wj12b2G5dMVNi/1US+Rq0Ugh 4rOevfsnDRfCaLosHiNGqUe2PLFUVQxn71ksVqtaH6/tUhNd4gULKn1llr0DDnuJOSJBFV Xejga7y2H0imPulQteaZnQVLpUTAOe68Oba/0M2awiurgy500ztA+v8/87MG1Q== 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 4V8P9k2nGzz189H; Tue, 2 Apr 2024 23:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 432NOwhp086804; Tue, 2 Apr 2024 23:24:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432NOwDb086801; Tue, 2 Apr 2024 23:24:58 GMT (envelope-from git) Date: Tue, 2 Apr 2024 23:24:58 GMT Message-Id: <202404022324.432NOwDb086801@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: dd015eeb653c - main - security/gnutls: Fix zlib support 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: dd015eeb653cb73ab694196b5ce20d0a03fd8c16 Auto-Submitted: auto-generated The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=dd015eeb653cb73ab694196b5ce20d0a03fd8c16 commit dd015eeb653cb73ab694196b5ce20d0a03fd8c16 Author: Tijl Coosemans AuthorDate: 2024-04-02 20:28:48 +0000 Commit: Tijl Coosemans CommitDate: 2024-04-02 23:23:31 +0000 security/gnutls: Fix zlib support PR: 278104 --- security/gnutls/Makefile | 2 +- security/gnutls/files/patch-lib_compress.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index 2151187cb697..c8f289e86ada 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -1,6 +1,6 @@ PORTNAME= gnutls DISTVERSION= 3.8.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security net MASTER_SITES= GNUPG/${PORTNAME}/v${DISTVERSION:R} diff --git a/security/gnutls/files/patch-lib_compress.c b/security/gnutls/files/patch-lib_compress.c new file mode 100644 index 000000000000..dcd4c6379c88 --- /dev/null +++ b/security/gnutls/files/patch-lib_compress.c @@ -0,0 +1,11 @@ +--- 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 =