git: 5d4b24ad9fc9 - main - www/pound: update the port to version 4.14
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 15 Oct 2024 09:45:16 UTC
The branch main has been updated by danfe:
URL: https://cgit.FreeBSD.org/ports/commit/?id=5d4b24ad9fc9a2413ba5565245fcda0db4d64fc5
commit 5d4b24ad9fc9a2413ba5565245fcda0db4d64fc5
Author: Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2024-10-15 09:43:42 +0000
Commit: Alexey Dokuchaev <danfe@FreeBSD.org>
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])
- {