From nobody Sat Feb 08 11:03:07 2025 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 4Yqnxl3hSMz5mqSp; Sat, 08 Feb 2025 11:03:07 +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 4Yqnxl2Q29z3CXb; Sat, 08 Feb 2025 11:03:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739012587; 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=NQpCPbp1oYUuI+uROezwUsirHEPjcPTB/r9gNZnSbWk=; b=RkrtCwz+5eeLlO9uvRIyQV59EptC64WhCgZQ/Z//OwSBSB0XbNoZg8noeZMhMAISVgu47e zWkPHM7C2bj+cxpRqkCJRVCcw/yM+XyNoLne/wk+z8M5l3dt63NuitI+jU3Cf/rVU58jbG lmf8E/s6C60YmW2jsPws/BDl53cugXalhvROggi1Lj+IhffElWrzduU/SOeg+FXFkkw2OC QhzSgfS8GgVsB6af5bgKDmvjYaZCPgGwfA+Or4Wq3wb1txWbGutH69qte3xezZZDzXPJ6U NaiLI2g+vZhRrM2cZMeZ5ICptEAIU014PfVLISa1q/UUQfH0xGPPLw3F/5BKzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739012587; 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=NQpCPbp1oYUuI+uROezwUsirHEPjcPTB/r9gNZnSbWk=; b=U7EqPup01WFDK1ueY7XyQKA0SioqOotuiEuKq+Wbgfug98psiDEPicMMB+ajifKZ/1IaRl 07bF5K2cyUZXs59LEYmscjd4SOMzYEhQ7vDTcdXI7De4NlwGDTWVL3nb2xGblEtcs4Y5vJ v2nOwQzFWIrkQKsSp4vpCCNfpa2VQQm/J7/sM9YZzz8ynTXdl+Gi4DkTmI/xA+R78RshrU hkdkGW+0rpu0lZnzHMED/hRKDDI138191pr8YlXV3+wOySb9/7fgayMWXu9su1MHyGcvet AntL02NB/0qr2N/aotP8xaqSQVmAZwovtJtkJxR9BT0T/ISZzjzxwCNH8OIuKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739012587; a=rsa-sha256; cv=none; b=oQd6bVt+oVFTPVr5b2p85Ulu6ZujyT8Wc7TpZYZQoFYwfy50WgE0TzQXgCQxRZc124FRm7 2aYKztHsn0V1xf4ENT8ozBIUd608PT2R62fcnXpjvDtQgdzEMvrnTPZuGMHd0/M9WRS8f7 +9L7Wpqvw8r4U7n+Hg12DSqlJvgr3VIGrHCtBqA9NNTHwrv8D/T55OvPMzYYt38L4rj+Rm Ykv2SbPUfgvjq2SFByXNYHmdtY5fSvf+1nb3pUQ+V3J19bm4yY1eH/f31A3CNMbyYD68T3 b0xKyW6wzVC++KWXDVnjhOOVdOdtl10eqQVJ/YBx593QA4UUTnMXGdXR3qafHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yqnxl1hw4z16qp; Sat, 08 Feb 2025 11:03:07 +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 518B37jV099469; Sat, 8 Feb 2025 11:03:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 518B37QT099466; Sat, 8 Feb 2025 11:03:07 GMT (envelope-from git) Date: Sat, 8 Feb 2025 11:03:07 GMT Message-Id: <202502081103.518B37QT099466@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 22c8df7277da - main - www/mod_tls: Fix build on i386 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22c8df7277da84283c8527945c2793ed7c573733 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=22c8df7277da84283c8527945c2793ed7c573733 commit 22c8df7277da84283c8527945c2793ed7c573733 Author: Bernard Spil AuthorDate: 2025-02-08 11:01:55 +0000 Commit: Bernard Spil CommitDate: 2025-02-08 11:01:55 +0000 www/mod_tls: Fix build on i386 Obtained from: https://github.com/icing/mod_tls/pull/7 --- www/mod_tls/Makefile | 3 ++- www/mod_tls/files/patch-src_tls__cache.c | 46 ++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/www/mod_tls/Makefile b/www/mod_tls/Makefile index 66fd64fc1032..dc27d075fc80 100644 --- a/www/mod_tls/Makefile +++ b/www/mod_tls/Makefile @@ -1,5 +1,6 @@ PORTNAME= mod_tls PORTVERSION= 0.14.0 +PORTREVISION= 1 CATEGORIES= www security MASTER_SITES= https://github.com/icing/mod_tls/releases/download/v${DISTVERSION}/ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} @@ -11,7 +12,7 @@ WWW= https://github.com/icing/mod_tls LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= rustls-ffi==0.14.0:security/rustls-ffi +BUILD_DEPENDS= rustls-ffi>0.14.0:security/rustls-ffi LIB_DEPENDS= librustls.so:security/rustls-ffi INSTALL_TARGET= install-strip diff --git a/www/mod_tls/files/patch-src_tls__cache.c b/www/mod_tls/files/patch-src_tls__cache.c new file mode 100644 index 000000000000..bad88a64c3bf --- /dev/null +++ b/www/mod_tls/files/patch-src_tls__cache.c @@ -0,0 +1,46 @@ +From 0f869da21f79bd15435418f32fa51f3f7ca86743 Mon Sep 17 00:00:00 2001 +From: Daniel McCarney +Date: Thu, 6 Feb 2025 10:59:39 -0500 +Subject: [PATCH] tls_cache: fix implicit conversion err on i386/i686 + +Previously on arch's where `apr_ssize_t` is an `int` (e.g. i386) the +`tls_cache_get()` function produced an implicit conversion error of the +form: + +``` +error: implicit conversion changes signedness: 'unsigned int' to 'apr_ssize_t' (aka 'int') +``` + +This commit resolves this error by: + +1. Checking the two casts performed by this function are within the + range of the types being cast to. +2. Making the cast to `apr_ssize_t` explicit. +--- + src/tls_cache.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/tls_cache.c b/src/tls_cache.c +index 5fc874f..428a59e 100644 +--- src/tls_cache.c.orig ++++ src/tls_cache.c +@@ -231,6 +231,10 @@ static rustls_result tls_cache_get( + unsigned int vlen, klen; + const unsigned char *kdata; + ++ if (key->len > UINT_MAX || key->len > SSIZE_MAX) { ++ return RUSTLS_RESULT_INVALID_PARAMETER; ++ } ++ + if (!sc->global->session_cache) goto not_found; + tls_cache_lock(sc->global); + +@@ -241,7 +245,7 @@ static rustls_result tls_cache_get( + sc->global->session_cache, cc->server, kdata, klen, buf, &vlen, c->pool); + + if (APLOGctrace4(c)) { +- apr_ssize_t n = klen; ++ apr_ssize_t n = (apr_ssize_t) klen; + ap_log_cerror(APLOG_MARK, APLOG_TRACE4, rv, c, "retrieve key %d[%8x], found %d val", + klen, apr_hashfunc_default((const char*)kdata, &n), vlen); + }