From nobody Tue Oct 15 09:45:16 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 4XSTjS2KvDz5YgKD; Tue, 15 Oct 2024 09:45:16 +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 4XSTjS1qrYz4Lqq; Tue, 15 Oct 2024 09:45:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728985516; 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=tfsiw3nG7U00Trvk8l1aPbnRVHsFU2SolyTT0WXl9Io=; b=vfXKXLvw3MT2ReTd5DKOLFdnAQ9U5QPio+xRF9ygIr4gs/POUL6cF4Yt9EDE7S5T+JeINZ q1Zd3hRD/I9e5ikgJPNpGVhBOBfHaRaXw9K2NcyyTL9SG+cHpffhuLOB+/lXDKwKWSMZKZ /B50pu0D0w3E8EXdFgjUw36xydLnpfmWOl4jL6xTw8bijI7HqapzuMGgYZ+tLtA0yAj40y n2uDpfn5Dj14yYsxh++4BJtk40dFXGZnwFoi+AJnuZ5IpUddhjb8H5lWmtWqdp4WC8u8Zx 6PTiFzHfs6X+rXtxxhAVh5NFtbB+KdoWMaZxuI0dv89lmPDXzSz27TE2/fCeYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728985516; 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=tfsiw3nG7U00Trvk8l1aPbnRVHsFU2SolyTT0WXl9Io=; b=JFqtZeH6A0c4paDg1dvLOg9aa6gOK2/Mby0tyPDmM5I4U48lhl98LURGtQl7okdRObqSNt UThQUYxbtuK6OFQt6keq+ZvhCiO3Qr4Wr4ra60kvLPGVpezCBvC1dBlmgkFSMKu2IQyALy KlFPDKAW1AuLnPfnDDuGxGF5GJe9ENiB4o/VWl7IDTFENj8m0XgFh/WLroPweGIEgLKA7W EYY6AIVPygtUjzROtNiH6mpcajJQhNHn2+jDDCNthxqEkPf3a+vyA3wYhcK2QFxnqo1m9i GR2NRaEELj4aA/GHOEl71HTqYQLJV8bJ+Q/rqHN++22B93S2wj/KWZZzmufCKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728985516; a=rsa-sha256; cv=none; b=BH45WdNXuf1Qq0+P5CLFW4rR/9uZGsEsRnUdqMnmaziFzmpp4/LR4uCxboNQwr2XHoy/GG CHPAzNN0sSqjPHAgyuAnY2CBHS73yfwyxx6SN63+ZHREoh7EijMvIOFrsZCQ0DgHmLau/4 L/tfpokI1uVgQOK3bnvOQpACr+CuiK8fD4xHeYnoR9UGTmryTYKEH8+/gPygJglCfVtUBL RR1IVbUqGKqcptjIjYD+hhW1VCOHOqqmDhB+oEGjsG/gkGW453g8QKhpbnnxsReEbBVYjW j/0ec77iu2vAGPX7F4Nx1rukhBehhzbsiiRa15dvUb+ChkFmSuhIqnk2ISQO3w== 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 4XSTjS0rQ8zGXL; Tue, 15 Oct 2024 09:45:16 +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 49F9jG1P044304; Tue, 15 Oct 2024 09:45:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49F9jGWt044301; Tue, 15 Oct 2024 09:45:16 GMT (envelope-from git) Date: Tue, 15 Oct 2024 09:45:16 GMT Message-Id: <202410150945.49F9jGWt044301@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 5d4b24ad9fc9 - main - www/pound: update the port to version 4.14 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d4b24ad9fc9a2413ba5565245fcda0db4d64fc5 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d4b24ad9fc9a2413ba5565245fcda0db4d64fc5 commit 5d4b24ad9fc9a2413ba5565245fcda0db4d64fc5 Author: Alexey Dokuchaev AuthorDate: 2024-10-15 09:43:42 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-10-15 09:43:42 +0000 www/pound: update the port to version 4.14 Requested by: maintainer --- www/pound/Makefile | 3 +- www/pound/distinfo | 6 +- www/pound/files/patch-src_http.c | 189 --------------------------------------- 3 files changed, 4 insertions(+), 194 deletions(-) diff --git a/www/pound/Makefile b/www/pound/Makefile index 5ab59487d599..82bf952981b2 100644 --- a/www/pound/Makefile +++ b/www/pound/Makefile @@ -1,6 +1,5 @@ PORTNAME= pound -PORTVERSION= 4.13 -PORTREVISION= 1 +PORTVERSION= 4.14 CATEGORIES= www net MASTER_SITES= https://github.com/graygnuorg/pound/releases/download/v${PORTVERSION}/ diff --git a/www/pound/distinfo b/www/pound/distinfo index cd09e7bb9746..e162b9d16830 100644 --- a/www/pound/distinfo +++ b/www/pound/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1724500294 -SHA256 (pound-4.13.tar.gz) = c5c526f2d2d98a8fb7c4e24ea5d2ecb79da44910643bb924aa65235b4a3ad570 -SIZE (pound-4.13.tar.gz) = 702915 +TIMESTAMP = 1728811457 +SHA256 (pound-4.14.tar.gz) = 265e45e9312a4aca295508b9c65edb783a2ec86c3d7d2f5c76330e304a0d1626 +SIZE (pound-4.14.tar.gz) = 968886 diff --git a/www/pound/files/patch-src_http.c b/www/pound/files/patch-src_http.c deleted file mode 100644 index 0f80c3556466..000000000000 --- a/www/pound/files/patch-src_http.c +++ /dev/null @@ -1,189 +0,0 @@ ---- src/http.c.orig 2024-08-20 06:46:04 UTC -+++ src/http.c -@@ -241,6 +241,14 @@ isws (int c) - { - return c == ' ' || c == '\t'; - } -+ -+static char const * -+trimwsl (char const *s) -+{ -+ while (*s && isws (*s)) -+ s++; -+ return s; -+} - - static int - submatch_realloc (struct submatch *sm, GENPAT re) -@@ -1162,7 +1170,7 @@ get_line (BIO *in, char *const buf, int bufsize) - case 0: - if (BIO_should_retry (in)) - continue; -- return COPY_EOF; -+ return i == 0 ? COPY_EOF : COPY_OK; - case -1: - return COPY_READ_ERR; - default: -@@ -1312,15 +1320,11 @@ get_content_length (char const *arg, int mode) - CONTENT_LENGTH n; - - if (mode == CL_HEADER) -- { -- while (isws (*arg)) -- arg++; -- } -+ arg = trimwsl (arg); - - if (strtoclen (arg, mode == CL_HEADER ? 10 : 16, &n, &p)) - return NO_CONTENT_LENGTH; -- while (isws (*p)) -- p++; -+ p = (char*) trimwsl (p); - if (*p) - { - if (!(mode == CL_CHUNK && *p == ';')) -@@ -3219,6 +3223,30 @@ static int - } - - static int -+set_header_from_bio (BIO *bio, struct http_request *req, -+ char const *hdr, struct stringbuf *sb) -+{ -+ char buf[MAXBUF]; -+ int rc; -+ char *str; -+ -+ if ((rc = get_line (bio, buf, sizeof (buf))) == COPY_OK) -+ { -+ stringbuf_reset (sb); -+ stringbuf_printf (sb, "%s: %s", hdr, trimwsl (buf)); -+ if ((str = stringbuf_finish (sb)) == NULL -+ || http_header_list_append (&req->headers, str, H_REPLACE)) -+ { -+ return -1; -+ } -+ } -+ else if (rc != COPY_EOF) -+ logmsg (LOG_ERR, "(%"PRItid") error reading data: %s", -+ POUND_TID (), copy_status_string (rc)); -+ return 0; -+} -+ -+static int - add_ssl_headers (POUND_HTTP *phttp) - { - int res = 0; -@@ -3248,72 +3276,40 @@ add_ssl_headers (POUND_HTTP *phttp) - if (phttp->lstn->clnt_check > 0 && phttp->x509 != NULL - && (bio = BIO_new (BIO_s_mem ())) != NULL) - { -+ int i; -+ -+ BIO_set_mem_eof_return (bio, 0); - X509_NAME_print_ex (bio, X509_get_subject_name (phttp->x509), 8, - XN_FLAG_ONELINE & ~ASN1_STRFLGS_ESC_MSB); -- if (get_line (bio, buf, sizeof (buf)) != COPY_OK) -+ if (set_header_from_bio (bio, &phttp->request, "X-SSL-Subject", &sb)) - { - res = -1; - goto end; - } - -- stringbuf_printf (&sb, "X-SSL-Subject: %s", buf); -- if ((str = stringbuf_finish (&sb)) == NULL -- || http_header_list_append (&phttp->request.headers, str, H_REPLACE)) -- { -- res = -1; -- goto end; -- } -- stringbuf_reset (&sb); -- - X509_NAME_print_ex (bio, X509_get_issuer_name (phttp->x509), 8, - XN_FLAG_ONELINE & ~ASN1_STRFLGS_ESC_MSB); -- if (get_line (bio, buf, sizeof (buf)) != COPY_OK) -+ if (set_header_from_bio (bio, &phttp->request, "X-SSL-Issuer", &sb)) - { - res = -1; - goto end; - } - -- stringbuf_printf (&sb, "X-SSL-Issuer: %s", buf); -- if ((str = stringbuf_finish (&sb)) == NULL -- || http_header_list_append (&phttp->request.headers, str, H_REPLACE)) -- { -- res = -1; -- goto end; -- } -- stringbuf_reset (&sb); -- - ASN1_TIME_print (bio, X509_get_notBefore (phttp->x509)); -- if (get_line (bio, buf, sizeof (buf)) != COPY_OK) -+ if (set_header_from_bio (bio, &phttp->request, "X-SSL-notBefore", &sb)) - { - res = -1; - goto end; - } - -- stringbuf_printf (&sb, "X-SSL-notBefore: %s", buf); -- if ((str = stringbuf_finish (&sb)) == NULL -- || http_header_list_append (&phttp->request.headers, str, H_REPLACE)) -- { -- res = -1; -- goto end; -- } -- stringbuf_reset (&sb); -- - ASN1_TIME_print (bio, X509_get_notAfter (phttp->x509)); -- if (get_line (bio, buf, sizeof (buf)) != COPY_OK) -+ if (set_header_from_bio (bio, &phttp->request, "X-SSL-notAfter", &sb)) - { - res = -1; - goto end; - } - -- stringbuf_printf (&sb, "X-SSL-notAfter: %s", buf); -- if ((str = stringbuf_finish (&sb)) == NULL -- || http_header_list_append (&phttp->request.headers, str, H_REPLACE)) -- { -- res = -1; -- goto end; -- } - stringbuf_reset (&sb); -- - stringbuf_printf (&sb, "X-SSL-serial: %ld", - ASN1_INTEGER_get (X509_get_serialNumber (phttp->x509))); - if ((str = stringbuf_finish (&sb)) == NULL -@@ -3326,9 +3322,13 @@ add_ssl_headers (POUND_HTTP *phttp) - - PEM_write_bio_X509 (bio, phttp->x509); - stringbuf_add_string (&sb, "X-SSL-certificate: "); -+ i = 0; - while (get_line (bio, buf, sizeof (buf)) == COPY_OK) - { -+ if (i > 0) -+ stringbuf_add_string (&sb, "\r\n\t"); - stringbuf_add_string (&sb, buf); -+ i++; - } - if ((str = stringbuf_finish (&sb)) == NULL - || http_header_list_append (&phttp->request.headers, str, H_REPLACE)) -@@ -3580,7 +3580,7 @@ http_response_validate (struct http_request *req) - static int - http_response_validate (struct http_request *req) - { -- char *str = req->request; -+ char const *str = req->request; - int http_ver; - - if (!(strncmp (str, "HTTP/1.", 7) == 0 && -@@ -3589,9 +3589,7 @@ http_response_validate (struct http_request *req) - return 0; - req->version = http_ver - '0'; - -- for (str += 8; isws (*str); str++) -- if (!*str) -- return 0; -+ str = trimwsl (str + 8); - - switch (str[0]) - {