From nobody Thu Feb 22 12:32:39 2024 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 4TgXbX0QMkz5CXGK; Thu, 22 Feb 2024 12:32:40 +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 4TgXbW5gBcz52JF; Thu, 22 Feb 2024 12:32:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708605159; 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=Mqie+TyAY+SJjiZcMW6wuacNAgib+/4UmASlW52FdPM=; b=Z1mRFDVhcIFu3kUnA701MIjfeXUKN7qBkH5NU5qBCgfqUfirxr99U8G02xfboxHzjieAxV 4jl+xdyIWj4O1pFtZHCm+TUGGf3RF4xr4YuqOiR1w4eE0uUgVArBu+5oBSyiNJJP62dccI w4RVYc63ctCf3058kISIgvpsvqDo/wWaWm3LRdECZ0KUfYrpvGdF6xdPirR5Z5S1QtremE /OmcfV7VYNiLjYb9Lv83Epm03Jq8L1Kg7wOfZry2WZTSnYhOkyymO6UWMAaoaLc6ZaSg3T Ejv5yjqgKuIrp6HD/BHqVj/oeZYoWYRkvRZIv11UwCc3sX1/NNCvxLsC6XxNHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708605159; 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=Mqie+TyAY+SJjiZcMW6wuacNAgib+/4UmASlW52FdPM=; b=BxpzS7HHITa23tR4fkW/uBg8WGX9A2fAXkOuheaeUaGS0mFVaNtkjEoWUUiUTKQ4SNvd/W tqOrtJk7888oNBPMnNnlYt4VzP4m8BauJNkbR8L4h4/DnXuFyXT9MIeHzeiPW0avbTk/ix jbsgVC+mlZoCAAa1RGC33od85CTNGPWT14LTW7My41LlSLpn0onNfmEUXvRuMs6eiTLeOy L1ulTj258OIFUnVefbg0LDBkVhjkVpTLnwPyI0l2lf0b1qadSAXImoLhHozQWXVzGAT2z+ jdCxBTIvLDrItGQFRJbFCcDMjO87UhEVrYREG2AzQJY6J2OCS6bkkEM2Nar5YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708605159; a=rsa-sha256; cv=none; b=fMwUwk223/+P8fC79+2bNQ3KU9kKdThq9s/w3IYGPOPDVFhdHxReCf9NxHw7Izqp4SwFsU +CKZI8Oy3LICrmfKPULY7v/Or3NhWl3KcfjfaWshByb9ABihUjZ67eS49ED9tResDZVyMH sluCCWFYdGTgL7nyaFglnRIZQoxotM8aWV5ThGCdPXemoCL8goPvJXSJL4Kv0P/YsIi90m LKbiVDY1U/E/++qogQQa2+ZEhb7D3cp5hIiQgyH9oeGpiJVq/gbac78/oqX0UW/n85MfuK mu5+z/5KElSXN/QjUogpUp/AnzzsaZjx/6k9M1mc5eBt2CnGItf3ua74CQk9hw== 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 4TgXbW4n2BzXKR; Thu, 22 Feb 2024 12:32:39 +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 41MCWdUs025204; Thu, 22 Feb 2024 12:32:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MCWd0c025201; Thu, 22 Feb 2024 12:32:39 GMT (envelope-from git) Date: Thu, 22 Feb 2024 12:32:39 GMT Message-Id: <202402221232.41MCWd0c025201@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 8f98bcec2fd8 - main - www/obhttpd: update to 7.4.20231129 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f98bcec2fd893ff2ecc52ba8ce6f08c827ef420 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=8f98bcec2fd893ff2ecc52ba8ce6f08c827ef420 commit 8f98bcec2fd893ff2ecc52ba8ce6f08c827ef420 Author: Nikola Kolev AuthorDate: 2024-02-19 11:36:25 +0000 Commit: Robert Clausecker CommitDate: 2024-02-22 12:31:51 +0000 www/obhttpd: update to 7.4.20231129 * Use LibreSSL 3.8.2 Changelog: https://github.com/koue/httpd/blob/master/ChangeLog PR: 275453 --- www/obhttpd/Makefile | 6 ++---- www/obhttpd/distinfo | 10 +++++----- www/obhttpd/files/extra-patch-libressl_tls_tls.c | 20 -------------------- 3 files changed, 7 insertions(+), 29 deletions(-) diff --git a/www/obhttpd/Makefile b/www/obhttpd/Makefile index 8497dfe70bf2..2c02dd5bb91a 100644 --- a/www/obhttpd/Makefile +++ b/www/obhttpd/Makefile @@ -1,6 +1,5 @@ PORTNAME= obhttpd -DISTVERSION= 7.3.20230714 -PORTREVISION= 1 +DISTVERSION= 7.4.20231129 CATEGORIES= www MASTER_SITES= OPENBSD/LibreSSL:libressl DISTFILES= libressl-${SSL}.tar.gz:libressl @@ -36,7 +35,7 @@ CFLAGS+= -Wall -fcommon \ USERS= www GROUPS= www -SSL= 3.5.4 +SSL= 3.8.2 LIBEVENT= 7.3.20230714 LIBIMSG= 7.3.20230714 @@ -56,7 +55,6 @@ post-patch: pre-configure: @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/libressl-${SSL}.tar.gz ${EXTRACT_AFTER_ARGS}) - @(${PATCH} -d ${WRKDIR}/libressl-${SSL} < ${PATCHDIR}/extra-patch-libressl_tls_tls.c) @(cd ${WRKDIR}/libressl-${SSL} && ${SETENV} ac_cv_header_endian_h=no ./configure && ${SETENV} ${MAKE_ENV} ${MAKE}) @(cd ${WRKSRC_libimsg} && ${SETENV} ${MAKE_ENV} ${MAKE}) @(cd ${WRKSRC_libevent} && ${SETENV} ${MAKE_ENV} ${MAKE}) diff --git a/www/obhttpd/distinfo b/www/obhttpd/distinfo index 7f0d3979f96b..4da6faf175cb 100644 --- a/www/obhttpd/distinfo +++ b/www/obhttpd/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1691792255 -SHA256 (libressl-3.5.4.tar.gz) = 0379da1344a2f71ad4a4e3be30ef9d82eecddce7f8dc2ae66631a1dfe14343ac -SIZE (libressl-3.5.4.tar.gz) = 4039834 -SHA256 (koue-httpd-7.3.20230714_GH0.tar.gz) = 82e1147d7c1d184d6049a4ce64c110705848bb7b5461929404383a2c0cffbd8d -SIZE (koue-httpd-7.3.20230714_GH0.tar.gz) = 175337 +TIMESTAMP = 1701364058 +SHA256 (libressl-3.8.2.tar.gz) = 6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954 +SIZE (libressl-3.8.2.tar.gz) = 4473978 +SHA256 (koue-httpd-7.4.20231129_GH0.tar.gz) = eb4c7bb4d07c94a187c985787a463189090caf55f3c094bb66fb20affe7162b7 +SIZE (koue-httpd-7.4.20231129_GH0.tar.gz) = 176508 SHA256 (koue-libevent-7.3.20230714_GH0.tar.gz) = 84fffbead795fd00ca758c460a2540bcb2f34bbc80b7837dbc94e18dc49ceebb SIZE (koue-libevent-7.3.20230714_GH0.tar.gz) = 92458 SHA256 (koue-libimsg-7.3.20230714_GH0.tar.gz) = 553082eb214882141d4492cf8f5384940b222f6ce9c91688bcd3608a5b9a6fc6 diff --git a/www/obhttpd/files/extra-patch-libressl_tls_tls.c b/www/obhttpd/files/extra-patch-libressl_tls_tls.c deleted file mode 100644 index 822da5bdfc00..000000000000 --- a/www/obhttpd/files/extra-patch-libressl_tls_tls.c +++ /dev/null @@ -1,20 +0,0 @@ ---- tls/tls.c.orig 2021-05-10 21:00:13.463847000 +0000 -+++ tls/tls.c 2021-05-10 21:02:18.217054000 +0000 -@@ -57,10 +57,13 @@ tls_do_init(void) - int - tls_init(void) - { -- static pthread_once_t once = PTHREAD_ONCE_INIT; -- -- if (pthread_once(&once, tls_do_init) != 0) -- return -1; -+ // fail if statically-linked -+ // -+ //static pthread_once_t once = PTHREAD_ONCE_INIT; -+ // -+ //if (pthread_once(&once, tls_do_init) != 0) -+ // return -1; -+ tls_do_init(); - - return tls_init_rv; - }