Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 21 May 2023 07:23:00 -0700
From:      Cy Schubert <Cy.Schubert@cschubert.com>
To:        Antoine Brodin <antoine@freebsd.org>
Cc:        Renato Botelho <garga@freebsd.org>, ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org, Dima Panov <fluffy@freebsd.org>, FreeBSD Ports Management Team <portmgr@freebsd.org>
Subject:   Re: git: 5fae3323ed2f - main - ftp/curl: Update to 8.1.0
Message-ID:  <20230521142300.46237AD@slippy.cwsent.com>
In-Reply-To: <CAALwa8m7qgkYynct5SN=1T7=bdbFTcKEM9g9okZDn0jR8dvWDw@mail.gmail.com>
References:  <202305192106.34JL6ZuV084657@gitrepo.freebsd.org>  <95f41f1a-1d3b-cb12-1777-cf4dc8ba55d4@FreeBSD.org>  <CAALwa8m7qgkYynct5SN=1T7=bdbFTcKEM9g9okZDn0jR8dvWDw@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail 

[-- Attachment #1 --]
In message <CAALwa8m7qgkYynct5SN=1T7=bdbFTcKEM9g9okZDn0jR8dvWDw@mail.gmail.c
om>
, Antoine Brodin writes:
> On Fri, May 19, 2023 at 10:13=E2=80=AFPM Dima Panov <fluffy@freebsd.org> wr=
> ote:
> >
> > Moin-moin!
> >
> >
> > It fails to build on recent -current
> >
> > building for: FreeBSD xxx 14.0-CURRENT FreeBSD 14.0-CURRENT 1400088 amd64
> >
> > --- libcurl_la-connect.lo ---
> > In file included from connect.c:56:
> > In file included from ../lib/urldata.h:168:
> > ../lib/http.h:263:8: error: redefinition of 'http_req'
> > struct http_req {
> >         ^
> > /usr/include/netinet/tcp.h:466:8: note: previous definition is here
> > struct http_req {
> >         ^
> > 1 error generated.
> > *** [libcurl_la-connect.lo] Error code 1
>
> Hi,
>
> Do you plan to fix it or revert it?
>
> Antoine

It's an easy fix. Attached is my local fix.




[-- Attachment #2 --]
From 51ff65c44403eba61e7c857c5fb4e56eae9458c6 Mon Sep 17 00:00:00 2001
From: Cy Schubert <cy@FreeBSD.org>
Date: Sun, 21 May 2023 07:19:07 -0700
Subject: [PATCH] CSES: ftp/curl: Fix build under 14-CURRENT

---
 ftp/curl/files/patch-lib_cf-h2-proxy.c | 20 ++++++++
 ftp/curl/files/patch-lib_http.c        | 68 ++++++++++++++++++++++++++
 ftp/curl/files/patch-lib_http.h        | 41 ++++++++++++++++
 ftp/curl/files/patch-lib_http1.h       | 20 ++++++++
 4 files changed, 149 insertions(+)
 create mode 100644 ftp/curl/files/patch-lib_cf-h2-proxy.c
 create mode 100644 ftp/curl/files/patch-lib_http.c
 create mode 100644 ftp/curl/files/patch-lib_http.h
 create mode 100644 ftp/curl/files/patch-lib_http1.h

diff --git a/ftp/curl/files/patch-lib_cf-h2-proxy.c b/ftp/curl/files/patch-lib_cf-h2-proxy.c
new file mode 100644
index 000000000000..cf0824adf52b
--- /dev/null
+++ b/ftp/curl/files/patch-lib_cf-h2-proxy.c
@@ -0,0 +1,20 @@
+--- lib/cf-h2-proxy.c.orig	2023-05-15 03:55:59.000000000 -0700
++++ lib/cf-h2-proxy.c	2023-05-21 07:14:11.186055000 -0700
+@@ -777,7 +777,7 @@
+                           struct Curl_cfilter *cf,
+                           struct Curl_easy *data,
+                           nghttp2_session *h2,
+-                          struct http_req *req,
++                          struct Curl_http_req *req,
+                           const nghttp2_priority_spec *pri_spec,
+                           void *stream_user_data,
+                           nghttp2_data_source_read_callback read_callback,
+@@ -846,7 +846,7 @@
+ {
+   struct cf_h2_proxy_ctx *ctx = cf->ctx;
+   CURLcode result;
+-  struct http_req *req = NULL;
++  struct Curl_http_req *req = NULL;
+ 
+   infof(data, "Establish HTTP/2 proxy tunnel to %s", ts->authority);
+ 
diff --git a/ftp/curl/files/patch-lib_http.c b/ftp/curl/files/patch-lib_http.c
new file mode 100644
index 000000000000..9f935ca79d01
--- /dev/null
+++ b/ftp/curl/files/patch-lib_http.c
@@ -0,0 +1,68 @@
+--- lib/http.c.orig	2023-05-15 03:55:59.000000000 -0700
++++ lib/http.c	2023-05-21 07:14:13.538801000 -0700
+@@ -4537,13 +4537,13 @@
+   return copy;
+ }
+ 
+-CURLcode Curl_http_req_make(struct http_req **preq,
++CURLcode Curl_http_req_make(struct Curl_http_req **preq,
+                             const char *method, size_t m_len,
+                             const char *scheme, size_t s_len,
+                             const char *authority, size_t a_len,
+                             const char *path, size_t p_len)
+ {
+-  struct http_req *req;
++  struct Curl_http_req *req;
+   CURLcode result = CURLE_OUT_OF_MEMORY;
+ 
+   DEBUGASSERT(method);
+@@ -4580,7 +4580,7 @@
+   return result;
+ }
+ 
+-static CURLcode req_assign_url_authority(struct http_req *req, CURLU *url)
++static CURLcode req_assign_url_authority(struct Curl_http_req *req, CURLU *url)
+ {
+   char *user, *pass, *host, *port;
+   struct dynbuf buf;
+@@ -4646,7 +4646,7 @@
+   return result;
+ }
+ 
+-static CURLcode req_assign_url_path(struct http_req *req, CURLU *url)
++static CURLcode req_assign_url_path(struct Curl_http_req *req, CURLU *url)
+ {
+   char *path, *query;
+   struct dynbuf buf;
+@@ -4694,11 +4694,11 @@
+   return result;
+ }
+ 
+-CURLcode Curl_http_req_make2(struct http_req **preq,
++CURLcode Curl_http_req_make2(struct Curl_http_req **preq,
+                              const char *method, size_t m_len,
+                              CURLU *url, const char *scheme_default)
+ {
+-  struct http_req *req;
++  struct Curl_http_req *req;
+   CURLcode result = CURLE_OUT_OF_MEMORY;
+   CURLUcode uc;
+ 
+@@ -4738,7 +4738,7 @@
+   return result;
+ }
+ 
+-void Curl_http_req_free(struct http_req *req)
++void Curl_http_req_free(struct Curl_http_req *req)
+ {
+   if(req) {
+     free(req->scheme);
+@@ -4778,7 +4778,7 @@
+ }
+ 
+ CURLcode Curl_http_req_to_h2(struct dynhds *h2_headers,
+-                             struct http_req *req, struct Curl_easy *data)
++                             struct Curl_http_req *req, struct Curl_easy *data)
+ {
+   const char *scheme = NULL, *authority = NULL;
+   struct dynhds_entry *e;
diff --git a/ftp/curl/files/patch-lib_http.h b/ftp/curl/files/patch-lib_http.h
new file mode 100644
index 000000000000..36da4ffd6460
--- /dev/null
+++ b/ftp/curl/files/patch-lib_http.h
@@ -0,0 +1,41 @@
+--- lib/http.h.orig	2023-05-15 03:55:59.000000000 -0700
++++ lib/http.h	2023-05-21 07:14:12.521821000 ʊ
[X]HܙH\]Y\^Y[H[Z[\Š
Š\Xܙ\HŠX\ܙ\HŠ\Y]LNŠ\
[YNŠ\
]]ܚ]NŠL̋M
̍̋Mʊ
ܙX]HH\]Y\X
ŠPTH\ܙ\WXZJXܙ\H
\KTH\ܙ\WXZJX\ܙ\H
\Kۜ\
Y]^WW[ۜ\
[YK^W[ۜ\
]]ܚ]K^WW[ۜ\
]^W[NŠPTH\ܙ\WXZLXܙ\H
\KTH\ܙ\WXZLX\ܙ\H
\Kۜ\
Y]^WW[TH
\ۜ\
[YWY][
NŠ]Y\ܙ\WٜYJXܙ\H
\JNŠݛY\ܙ\WٜYJX\ܙ\H
\JNŠY[HUQQUY]Y[HUQSQH[YHL




\[H]HH[H\Y][ZH	[YIB
ŠTH\ܙ\WX[
XY\HXܙ\H
\KX\X\H
]JNŠX\ܙ\H
\KX\X\H
]JNŠʊ
[X]HܙH\ۜK^Y[H[Z[\™YKY]Kٝ\ٚ[\][XKٝ\ٚ[\][XK][H[HL

[^
٘XؘKKH]۝[ٝ\ٚ[\][XKL
KKKHXKܚYLL
KLMH΍MNNKL
XKLL
KLH
ΌMKMLL
L

Y[HWTWP
H
BXWܙ\W\\ŠHXܙ\H
\NŠX\ܙ\H
\NŠXYHܘ]Š^Wܘ]\Šۜ\
[NŠMLK
LK
ۜ\
[YWY][[[ۜTH
\NŠPTH\Wܙ\W[
ۜXܙ\H
\KTH\Wܙ\W[
ۜX\ܙ\H
\KX[Y
YNŠKHB
[-- Attachment #3 --]
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:  <cy@FreeBSD.org>   Web:  https://FreeBSD.org
NTP:           <cy@nwtime.org>    Web:  https://nwtime.org

			e^(i*pi)+1=0
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20230521142300.46237AD>