From nobody Sat Sep 03 15:57:35 2022 X-Original-To: dev-commits-ports-all@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 4MKfYq6cKDz4blsY; Sat, 3 Sep 2022 15:57:35 +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 4MKfYq64KXz3dY5; Sat, 3 Sep 2022 15:57:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662220655; 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=zOeGfj+FIXiZ4flszNKnwPn/k4zQfY0qT3c3sFgbFjQ=; b=lvd7TQUwi0GeYjqkfr+uaJUF4j6BC1BrcWlwVbxRSiHivLy22OzGCf2eFIicD02hey1Af1 CoPV01o3jrapqyn7vBSLaew3b/nbHhS7FY6GOol7cNxIP6RAEiYqxX5aTINrdUHLhvXHDH RZ04NYxyRUY9Ev1ryqqLJKHkyBXpgLIPqMbagqJL7L37wToCZ8RYIXSJErv/m3BkUA6ID6 PrI0eTds4NPQka4TeU4SIy2r4MC741s+1f468t0E6VWGlcLsts9Ln7Fic6TTTyE2861vdo igB9WPrdkFAfpnf+IpIUgBN0qNOGQx0XvOsucWmXaSTKCIo4D/tsWnCh0/Gr6g== 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 4MKfYq55gNz1BTb; Sat, 3 Sep 2022 15:57:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 283FvZ7i085907; Sat, 3 Sep 2022 15:57:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 283FvZ8U085906; Sat, 3 Sep 2022 15:57:35 GMT (envelope-from git) Date: Sat, 3 Sep 2022 15:57:35 GMT Message-Id: <202209031557.283FvZ8U085906@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 50f24dd9de4a - main - www/mod_gnutls: update to 0.12.0 (+) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50f24dd9de4a59ae50f15855ba365ad6fde33134 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662220655; 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=zOeGfj+FIXiZ4flszNKnwPn/k4zQfY0qT3c3sFgbFjQ=; b=th5Bv6kQ6AeafvAIHPQBf0H/iBWpkXmwobVjoyaEm2Y0BMEEtoEgPbpsN4q1drTbnW41uE +WmEpvNPufcJtfJyNYuex+7BhumODJluI/Z1TXI56QScNOVtiV9do/wqUTTyzmx+NZMYKQ YLY2yROTTOQxPyLT8+ConuV6GNtn+JUkVfABGE2/BZUpGHGCJVwLnVwdKvNxjEprGnCnbw 8K/kpTf5mkBvuhyZw7g7ZtOzLIu5kpAdh4csLE38m08B/8xhdtTDNqTI+9xqr2GHe1zEfN MUeaBzpUBM1wX2omliA+WqLQSFIheddkg/NZQ4JE3Skf/ndMTU3/j1l6YjqOkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662220655; a=rsa-sha256; cv=none; b=H6dkQ2i81e5dtmftr2YkVGPoMs2fTijdr6dyJbeJfepj7d4G1abGMCvcNRM+BrpFZBCKkw 7LeE2Ewf6Vn65YlnuXa5cAMgfwd8cAzyPKp+r8lKmyhBqr3D3EhM9gCRLQAKMe/5r29VKb qMMcElHeD0wVy0wmmUndEjWiohZnVKtf30F/u5lBKibO7KrowPndAXrwCHotqgtJSCdF1W Vzm1HzXF9kANSZAmbOho/axQvbrgI3h5lWilScwgyQ6G/9hqgAXUEMQkGd5oB8NVUIDWkX yOHpaGlWOzdLAYtKVrw9ltHqxTovLDF7SBVUXVTGtdg+F5lgPhf4EQAftg36Fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=50f24dd9de4a59ae50f15855ba365ad6fde33134 commit 50f24dd9de4a59ae50f15855ba365ad6fde33134 Author: Dima Panov AuthorDate: 2022-09-03 15:55:52 +0000 Commit: Dima Panov CommitDate: 2022-09-03 15:57:30 +0000 www/mod_gnutls: update to 0.12.0 (+) Major change is three fixes that make mod_gnutls compatible with the Let's Encrypt OCSP responder for OCSP stapling. With hat: ports-secteam --- www/mod_gnutls/Makefile | 13 +++++++++---- www/mod_gnutls/distinfo | 6 +++--- www/mod_gnutls/files/patch-src_gnutls__io.c | 6 +++--- www/mod_gnutls/files/patch-src_gnutls__ocsp.c | 8 ++++---- www/mod_gnutls/files/patch-src_gnutls__sni.c | 15 +++++++++++++++ www/mod_gnutls/files/patch-src_gnutls__util.c | 4 ++-- 6 files changed, 36 insertions(+), 16 deletions(-) diff --git a/www/mod_gnutls/Makefile b/www/mod_gnutls/Makefile index 7848ff8ecb00..a99cd4871ca6 100644 --- a/www/mod_gnutls/Makefile +++ b/www/mod_gnutls/Makefile @@ -1,6 +1,5 @@ PORTNAME= mod_gnutls -PORTVERSION= 0.8.4 -PORTREVISION= 2 +PORTVERSION= 0.12.0 CATEGORIES= www security MASTER_SITES= https://mod.gnutls.org/downloads/ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} @@ -11,20 +10,26 @@ COMMENT= Extension for Apache httpd using GnuTLS library to provide HTTPS LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= ${RUN_DEPENDS} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR} LIB_DEPENDS= libgnutls.so:security/gnutls GNU_CONFIGURE= yes -USES= apache:2.4 compiler:c++11-lang cpe libtool pkgconfig tar:bzip2 +USES= apache:2.4 compiler:c++11-lang cpe libtool pkgconfig python:3.7+ tar:bzip2 CPE_VENDOR= ${PORTNAME}_project +BINARY_ALIAS= python3=${PYTHON_CMD} python=${PYTHON_CMD} + DBDIR= ${PREFIX}/var/db/${PORTNAME} PLIST_SUB= SED="${SED}" WWWGRP=${WWWGRP} WWWOWN=${WWWOWN} SUB_FILES= pkg-message SUB_LIST= DBDIR="${DBDIR}" -CFLAGS+= -Wno-deprecated-declarations +CFLAGS+= -Wno-deprecated-declarations -Wno-null-pointer-subtraction CONFIGURE_ARGS= --with-apxs="${APXS}" +INSTALL_TARGET= install-strip + post-install: ${MKDIR} "${STAGEDIR}${DBDIR}" diff --git a/www/mod_gnutls/distinfo b/www/mod_gnutls/distinfo index 427c8963aaf4..a9daa1ff7b24 100644 --- a/www/mod_gnutls/distinfo +++ b/www/mod_gnutls/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524324472 -SHA256 (mod_gnutls-0.8.4.tar.bz2) = f2dbd0d9a329568a166a1fc1eafc81ab955bdebd36b9546a9466f248c3adcdf7 -SIZE (mod_gnutls-0.8.4.tar.bz2) = 422811 +TIMESTAMP = 1661878634 +SHA256 (mod_gnutls-0.12.0.tar.bz2) = d986ff68de94b80e505f8b6bd68bd1ba146bf234b40d1f519695fe15592e995b +SIZE (mod_gnutls-0.12.0.tar.bz2) = 461643 diff --git a/www/mod_gnutls/files/patch-src_gnutls__io.c b/www/mod_gnutls/files/patch-src_gnutls__io.c index 2d3441f460b0..c0ed339dc410 100644 --- a/www/mod_gnutls/files/patch-src_gnutls__io.c +++ b/www/mod_gnutls/files/patch-src_gnutls__io.c @@ -1,6 +1,6 @@ ---- src/gnutls_io.c.orig 2016-12-25 18:36:37 UTC +--- src/gnutls_io.c.orig 2021-08-13 20:27:17 UTC +++ src/gnutls_io.c -@@ -23,7 +23,8 @@ +@@ -25,7 +25,8 @@ APLOG_USE_MODULE(gnutls); APLOG_USE_MODULE(gnutls); #endif @@ -10,7 +10,7 @@ #include #endif -@@ -572,18 +573,21 @@ apr_status_t mgs_filter_input(ap_filter_t * f, +@@ -576,18 +577,21 @@ apr_status_t mgs_filter_input(ap_filter_t * f, * might have different lengths. Read sizes should be too * small for 32 or 64 bit to matter, but we have to make * sure. */ diff --git a/www/mod_gnutls/files/patch-src_gnutls__ocsp.c b/www/mod_gnutls/files/patch-src_gnutls__ocsp.c index 458b418a08fd..fa04fa311575 100644 --- a/www/mod_gnutls/files/patch-src_gnutls__ocsp.c +++ b/www/mod_gnutls/files/patch-src_gnutls__ocsp.c @@ -1,6 +1,6 @@ ---- src/gnutls_ocsp.c.orig 2017-01-08 14:16:07 UTC +--- src/gnutls_ocsp.c.orig 2021-07-29 19:47:39 UTC +++ src/gnutls_ocsp.c -@@ -414,7 +414,8 @@ static gnutls_datum_t mgs_get_cert_fingerprint(apr_poo +@@ -446,7 +446,8 @@ static gnutls_datum_t mgs_get_cert_fingerprint(apr_poo /* Safe integer type conversion: The types of fingerprint.size * (unsigned int) and fplen (size_t) may have different * lengths. */ @@ -10,7 +10,7 @@ if (__builtin_expect(fplen <= UINT_MAX, 1)) { fingerprint.size = (unsigned int) fplen; -@@ -569,7 +570,8 @@ static apr_status_t do_ocsp_request(apr_pool_t *p, ser +@@ -603,7 +604,8 @@ static apr_status_t do_ocsp_request(apr_pool_t *p, ser } /* With the length restriction this really should not overflow. */ @@ -20,7 +20,7 @@ if (__builtin_expect(len > UINT_MAX, 0)) #else if (__builtin_add_overflow(len, 0, &response->size)) -@@ -580,7 +582,8 @@ static apr_status_t do_ocsp_request(apr_pool_t *p, ser +@@ -614,7 +616,8 @@ static apr_status_t do_ocsp_request(apr_pool_t *p, ser } else { diff --git a/www/mod_gnutls/files/patch-src_gnutls__sni.c b/www/mod_gnutls/files/patch-src_gnutls__sni.c new file mode 100644 index 000000000000..ec30d7ae220e --- /dev/null +++ b/www/mod_gnutls/files/patch-src_gnutls__sni.c @@ -0,0 +1,15 @@ +--- src/gnutls_sni.c.orig 2019-01-28 19:50:38 UTC ++++ src/gnutls_sni.c +@@ -18,7 +18,12 @@ + + #include + #include ++#if defined(__FreeBSD__) ++#include ++#define bswap_16(x) bswap16(x) ++#else + #include ++#endif + #include + #include + diff --git a/www/mod_gnutls/files/patch-src_gnutls__util.c b/www/mod_gnutls/files/patch-src_gnutls__util.c index 138353bcfc0a..da9e96b993ed 100644 --- a/www/mod_gnutls/files/patch-src_gnutls__util.c +++ b/www/mod_gnutls/files/patch-src_gnutls__util.c @@ -1,6 +1,6 @@ ---- src/gnutls_util.c.orig 2016-12-25 18:36:37 UTC +--- src/gnutls_util.c.orig 2021-07-11 11:33:26 UTC +++ src/gnutls_util.c -@@ -113,7 +113,8 @@ apr_status_t datum_from_file(apr_pool_t *p, const char +@@ -121,7 +121,8 @@ apr_status_t datum_from_file(apr_pool_t *p, const char /* safe integer type conversion: unsigned int and apr_size_t might * have different sizes */