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>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multipart MIME message.
--==_Exmh_1684678950_35090
Content-Type: text/plain; charset=us-ascii
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.
--==_Exmh_1684678950_35090
Content-Type: application/x-patch ; name="0001-CSES-ftp-curl-Fix-build-under-14-CURRENT.patch"
Content-Description: 0001-CSES-ftp-curl-Fix-build-under-14-CURRENT.patch
Content-Transfer-Encoding: base64
RnJvbSA1MWZmNjVjNDQ0MDNlYmE2MWU3Yzg1N2M1ZmI0ZTU2ZWFlOTQ1OGM2IE1vbiBTZXAg
MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBDeSBTY2h1YmVydCA8Y3lARnJlZUJTRC5vcmc+CkRh
dGU6IFN1biwgMjEgTWF5IDIwMjMgMDc6MTk6MDcgLTA3MDAKU3ViamVjdDogW1BBVENIXSBD
U0VTOiBmdHAvY3VybDogRml4IGJ1aWxkIHVuZGVyIDE0LUNVUlJFTlQKCi0tLQogZnRwL2N1
cmwvZmlsZXMvcGF0Y2gtbGliX2NmLWgyLXByb3h5LmMgfCAyMCArKysrKysrKwogZnRwL2N1
cmwvZmlsZXMvcGF0Y2gtbGliX2h0dHAuYyAgICAgICAgfCA2OCArKysrKysrKysrKysrKysr
KysrKysrKysrKwogZnRwL2N1cmwvZmlsZXMvcGF0Y2gtbGliX2h0dHAuaCAgICAgICAgfCA0
MSArKysrKysrKysrKysrKysrCiBmdHAvY3VybC9maWxlcy9wYXRjaC1saWJfaHR0cDEuaCAg
ICAgICB8IDIwICsrKysrKysrCiA0IGZpbGVzIGNoYW5nZWQsIDE0OSBpbnNlcnRpb25zKCsp
CiBjcmVhdGUgbW9kZSAxMDA2NDQgZnRwL2N1cmwvZmlsZXMvcGF0Y2gtbGliX2NmLWgyLXBy
b3h5LmMKIGNyZWF0ZSBtb2RlIDEwMDY0NCBmdHAvY3VybC9maWxlcy9wYXRjaC1saWJfaHR0
cC5jCiBjcmVhdGUgbW9kZSAxMDA2NDQgZnRwL2N1cmwvZmlsZXMvcGF0Y2gtbGliX2h0dHAu
aAogY3JlYXRlIG1vZGUgMTAwNjQ0IGZ0cC9jdXJsL2ZpbGVzL3BhdGNoLWxpYl9odHRwMS5o
CgpkaWZmIC0tZ2l0IGEvZnRwL2N1cmwvZmlsZXMvcGF0Y2gtbGliX2NmLWgyLXByb3h5LmMg
Yi9mdHAvY3VybC9maWxlcy9wYXRjaC1saWJfY2YtaDItcHJveHkuYwpuZXcgZmlsZSBtb2Rl
IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLmNmMDgyNGFkZjUyYgotLS0gL2Rldi9udWxs
CisrKyBiL2Z0cC9jdXJsL2ZpbGVzL3BhdGNoLWxpYl9jZi1oMi1wcm94eS5jCkBAIC0wLDAg
KzEsMjAgQEAKKy0tLSBsaWIvY2YtaDItcHJveHkuYy5vcmlnCTIwMjMtMDUtMTUgMDM6NTU6
NTkuMDAwMDAwMDAwIC0wNzAwCisrKysgbGliL2NmLWgyLXByb3h5LmMJMjAyMy0wNS0yMSAw
NzoxNDoxMS4xODYwNTUwMDAgLTA3MDAKK0BAIC03NzcsNyArNzc3LDcgQEAKKyAgICAgICAg
ICAgICAgICAgICAgICAgICAgIHN0cnVjdCBDdXJsX2NmaWx0ZXIgKmNmLAorICAgICAgICAg
ICAgICAgICAgICAgICAgICAgc3RydWN0IEN1cmxfZWFzeSAqZGF0YSwKKyAgICAgICAgICAg
ICAgICAgICAgICAgICAgIG5naHR0cDJfc2Vzc2lvbiAqaDIsCistICAgICAgICAgICAgICAg
ICAgICAgICAgICBzdHJ1Y3QgaHR0cF9yZXEgKnJlcSwKKysgICAgICAgICAgICAgICAgICAg
ICAgICAgIHN0cnVjdCBDdXJsX2h0dHBfcmVxICpyZXEsCisgICAgICAgICAgICAgICAgICAg
ICAgICAgICBjb25zdCBuZ2h0dHAyX3ByaW9yaXR5X3NwZWMgKnByaV9zcGVjLAorICAgICAg
ICAgICAgICAgICAgICAgICAgICAgdm9pZCAqc3RyZWFtX3VzZXJfZGF0YSwKKyAgICAgICAg
ICAgICAgICAgICAgICAgICAgIG5naHR0cDJfZGF0YV9zb3VyY2VfcmVhZF9jYWxsYmFjayBy
ZWFkX2NhbGxiYWNrLAorQEAgLTg0Niw3ICs4NDYsNyBAQAorIHsKKyAgIHN0cnVjdCBjZl9o
Ml9wcm94eV9jdHggKmN0eCA9IGNmLT5jdHg7CisgICBDVVJMY29kZSByZXN1bHQ7CistICBz
dHJ1Y3QgaHR0cF9yZXEgKnJlcSA9IE5VTEw7CisrICBzdHJ1Y3QgQ3VybF9odHRwX3JlcSAq
cmVxID0gTlVMTDsKKyAKKyAgIGluZm9mKGRhdGEsICJFc3RhYmxpc2ggSFRUUC8yIHByb3h5
IHR1bm5lbCB0byAlcyIsIHRzLT5hdXRob3JpdHkpOworIApkaWZmIC0tZ2l0IGEvZnRwL2N1
cmwvZmlsZXMvcGF0Y2gtbGliX2h0dHAuYyBiL2Z0cC9jdXJsL2ZpbGVzL3BhdGNoLWxpYl9o
dHRwLmMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi45ZjkzNWNh
NzlkMDEKLS0tIC9kZXYvbnVsbAorKysgYi9mdHAvY3VybC9maWxlcy9wYXRjaC1saWJfaHR0
cC5jCkBAIC0wLDAgKzEsNjggQEAKKy0tLSBsaWIvaHR0cC5jLm9yaWcJMjAyMy0wNS0xNSAw
Mzo1NTo1OS4wMDAwMDAwMDAgLTA3MDAKKysrKyBsaWIvaHR0cC5jCTIwMjMtMDUtMjEgMDc6
MTQ6MTMuNTM4ODAxMDAwIC0wNzAwCitAQCAtNDUzNywxMyArNDUzNywxMyBAQAorICAgcmV0
dXJuIGNvcHk7CisgfQorIAorLUNVUkxjb2RlIEN1cmxfaHR0cF9yZXFfbWFrZShzdHJ1Y3Qg
aHR0cF9yZXEgKipwcmVxLAorK0NVUkxjb2RlIEN1cmxfaHR0cF9yZXFfbWFrZShzdHJ1Y3Qg
Q3VybF9odHRwX3JlcSAqKnByZXEsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNv
bnN0IGNoYXIgKm1ldGhvZCwgc2l6ZV90IG1fbGVuLAorICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICBjb25zdCBjaGFyICpzY2hlbWUsIHNpemVfdCBzX2xlbiwKKyAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgY29uc3QgY2hhciAqYXV0aG9yaXR5LCBzaXplX3QgYV9sZW4s
CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIgKnBhdGgsIHNpemVf
dCBwX2xlbikKKyB7CistICBzdHJ1Y3QgaHR0cF9yZXEgKnJlcTsKKysgIHN0cnVjdCBDdXJs
X2h0dHBfcmVxICpyZXE7CisgICBDVVJMY29kZSByZXN1bHQgPSBDVVJMRV9PVVRfT0ZfTUVN
T1JZOworIAorICAgREVCVUdBU1NFUlQobWV0aG9kKTsKK0BAIC00NTgwLDcgKzQ1ODAsNyBA
QAorICAgcmV0dXJuIHJlc3VsdDsKKyB9CisgCistc3RhdGljIENVUkxjb2RlIHJlcV9hc3Np
Z25fdXJsX2F1dGhvcml0eShzdHJ1Y3QgaHR0cF9yZXEgKnJlcSwgQ1VSTFUgKnVybCkKKytz
dGF0aWMgQ1VSTGNvZGUgcmVxX2Fzc2lnbl91cmxfYXV0aG9yaXR5KHN0cnVjdCBDdXJsX2h0
dHBfcmVxICpyZXEsIENVUkxVICp1cmwpCisgeworICAgY2hhciAqdXNlciwgKnBhc3MsICpo
b3N0LCAqcG9ydDsKKyAgIHN0cnVjdCBkeW5idWYgYnVmOworQEAgLTQ2NDYsNyArNDY0Niw3
IEBACisgICByZXR1cm4gcmVzdWx0OworIH0KKyAKKy1zdGF0aWMgQ1VSTGNvZGUgcmVxX2Fz
c2lnbl91cmxfcGF0aChzdHJ1Y3QgaHR0cF9yZXEgKnJlcSwgQ1VSTFUgKnVybCkKKytzdGF0
aWMgQ1VSTGNvZGUgcmVxX2Fzc2lnbl91cmxfcGF0aChzdHJ1Y3QgQ3VybF9odHRwX3JlcSAq
cmVxLCBDVVJMVSAqdXJsKQorIHsKKyAgIGNoYXIgKnBhdGgsICpxdWVyeTsKKyAgIHN0cnVj
dCBkeW5idWYgYnVmOworQEAgLTQ2OTQsMTEgKzQ2OTQsMTEgQEAKKyAgIHJldHVybiByZXN1
bHQ7CisgfQorIAorLUNVUkxjb2RlIEN1cmxfaHR0cF9yZXFfbWFrZTIoc3RydWN0IGh0dHBf
cmVxICoqcHJlcSwKKytDVVJMY29kZSBDdXJsX2h0dHBfcmVxX21ha2UyKHN0cnVjdCBDdXJs
X2h0dHBfcmVxICoqcHJlcSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0
IGNoYXIgKm1ldGhvZCwgc2l6ZV90IG1fbGVuLAorICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgQ1VSTFUgKnVybCwgY29uc3QgY2hhciAqc2NoZW1lX2RlZmF1bHQpCisgeworLSAg
c3RydWN0IGh0dHBfcmVxICpyZXE7CisrICBzdHJ1Y3QgQ3VybF9odHRwX3JlcSAqcmVxOwor
ICAgQ1VSTGNvZGUgcmVzdWx0ID0gQ1VSTEVfT1VUX09GX01FTU9SWTsKKyAgIENVUkxVY29k
ZSB1YzsKKyAKK0BAIC00NzM4LDcgKzQ3MzgsNyBAQAorICAgcmV0dXJuIHJlc3VsdDsKKyB9
CisgCistdm9pZCBDdXJsX2h0dHBfcmVxX2ZyZWUoc3RydWN0IGh0dHBfcmVxICpyZXEpCisr
dm9pZCBDdXJsX2h0dHBfcmVxX2ZyZWUoc3RydWN0IEN1cmxfaHR0cF9yZXEgKnJlcSkKKyB7
CisgICBpZihyZXEpIHsKKyAgICAgZnJlZShyZXEtPnNjaGVtZSk7CitAQCAtNDc3OCw3ICs0
Nzc4LDcgQEAKKyB9CisgCisgQ1VSTGNvZGUgQ3VybF9odHRwX3JlcV90b19oMihzdHJ1Y3Qg
ZHluaGRzICpoMl9oZWFkZXJzLAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3Ry
dWN0IGh0dHBfcmVxICpyZXEsIHN0cnVjdCBDdXJsX2Vhc3kgKmRhdGEpCisrICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICBzdHJ1Y3QgQ3VybF9odHRwX3JlcSAqcmVxLCBzdHJ1Y3Qg
Q3VybF9lYXN5ICpkYXRhKQorIHsKKyAgIGNvbnN0IGNoYXIgKnNjaGVtZSA9IE5VTEwsICph
dXRob3JpdHkgPSBOVUxMOworICAgc3RydWN0IGR5bmhkc19lbnRyeSAqZTsKZGlmZiAtLWdp
dCBhL2Z0cC9jdXJsL2ZpbGVzL3BhdGNoLWxpYl9odHRwLmggYi9mdHAvY3VybC9maWxlcy9w
YXRjaC1saWJfaHR0cC5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw
MC4uMzZkYTRmZmQ2NDYwCi0tLSAvZGV2L251bGwKKysrIGIvZnRwL2N1cmwvZmlsZXMvcGF0
Y2gtbGliX2h0dHAuaApAQCAtMCwwICsxLDQxIEBACistLS0gbGliL2h0dHAuaC5vcmlnCTIw
MjMtMDUtMTUgMDM6NTU6NTkuMDAwMDAwMDAwIC0wNzAwCisrKysgbGliL2h0dHAuaAkyMDIz
LTA1LTIxIDA3OjE0OjEyLjUyMTgyMTAwMCAIC8qKgorICAqIEFsbCBhYm91dCBhIGNvcmUgSFRUUCByZXF1ZXN0LCBleGNsdWRpbmcgYm9k
eSBhbmQgdHJhaWxlcnMKKyAgKi8KKy1zdHJ1Y3QgaHR0cF9yZXEgeworK3N0cnVjdCBDdXJs
X2h0dHBfcmVxIHsKKyAgIGNoYXIgbWV0aG9kWzEyXTsKKyAgIGNoYXIgKnNjaGVtZTsKKyAg
IGNoYXIgKmF1dGhvcml0eTsKK0BAIC0yNzIsMTcgKzI3MiwxNyBAQAorIC8qKgorICAqIENy
ZWF0ZSBhIEhUVFAgcmVxdWVzdCBzdHJ1Y3QuCisgICovCistQ1VSTGNvZGUgQ3VybF9odHRw
X3JlcV9tYWtlKHN0cnVjdCBodHRwX3JlcSAqKnByZXEsCisrQ1VSTGNvZGUgQ3VybF9odHRw
X3JlcV9tYWtlKHN0cnVjdCBDdXJsX2h0dHBfcmVxICoqcHJlcSwKKyAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgY29uc3QgY2hhciAqbWV0aG9kLCBzaXplX3QgbV9sZW4sCisgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIgKnNjaGVtZSwgc2l6ZV90IHNf
bGVuLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICphdXRob3Jp
dHksIHNpemVfdCBhX2xlbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qg
Y2hhciAqcGF0aCwgc2l6ZV90IHBfbGVuKTsKKyAKKy1DVVJMY29kZSBDdXJsX2h0dHBfcmVx
X21ha2UyKHN0cnVjdCBodHRwX3JlcSAqKnByZXEsCisrQ1VSTGNvZGUgQ3VybF9odHRwX3Jl
cV9tYWtlMihzdHJ1Y3QgQ3VybF9odHRwX3JlcSAqKnByZXEsCisgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICBjb25zdCBjaGFyICptZXRob2QsIHNpemVfdCBtX2xlbiwKKyAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgIENVUkxVICp1cmwsIGNvbnN0IGNoYXIgKnNjaGVt
ZV9kZWZhdWx0KTsKKyAKKy12b2lkIEN1cmxfaHR0cF9yZXFfZnJlZShzdHJ1Y3QgaHR0cF9y
ZXEgKnJlcSk7Cisrdm9pZCBDdXJsX2h0dHBfcmVxX2ZyZWUoc3RydWN0IEN1cmxfaHR0cF9y
ZXEgKnJlcSk7CisgCisgI2RlZmluZSBIVFRQX1BTRVVET19NRVRIT0QgIjptZXRob2QiCisg
I2RlZmluZSBIVFRQX1BTRVVET19TQ0hFTUUgIjpzY2hlbWUiCitAQCAtMzA2LDcgKzMwNiw3
IEBACisgICogQHBhcmFtIGRhdGEgICAgICAgdGhlIGhhbmRsZSB0byBsb29rdXAgZGVmYXVs
dHMgbGlrZSAnIDpzY2hlbWUnIGZyb20KKyAgKi8KKyBDVVJMY29kZSBDdXJsX2h0dHBfcmVx
X3RvX2gyKHN0cnVjdCBkeW5oZHMgKmgyX2hlYWRlcnMsCistICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICBzdHJ1Y3QgaHR0cF9yZXEgKnJlcSwgc3RydWN0IEN1cmxfZWFzeSAqZGF0
YSk7CisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3QgQ3VybF9odHRwX3Jl
cSAqcmVxLCBzdHJ1Y3QgQ3VybF9lYXN5ICpkYXRhKTsKKyAKKyAvKioKKyAgKiBBbGwgYWJv
dXQgYSBjb3JlIEhUVFAgcmVzcG9uc2UsIGV4Y2x1ZGluZyBib2R5IGFuZCB0cmFpbGVycwpk
aWZmIC0tZ2l0IGEvZnRwL2N1cmwvZmlsZXMvcGF0Y2gtbGliX2h0dHAxLmggYi9mdHAvY3Vy
bC9maWxlcy9wYXRjaC1saWJfaHR0cDEuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw
MDAwMDAwMDAwMDAuLjhkN2ZhYzNiYmZkMgotLS0gL2Rldi9udWxsCisrKyBiL2Z0cC9jdXJs
L2ZpbGVzL3BhdGNoLWxpYl9odHRwMS5oCkBAIC0wLDAgKzEsMjAgQEAKKy0tLSBsaWIvaHR0
cDEuaC5vcmlnCTIwMjMtMDUtMTUgMDM6NTU6NTkuMDAwMDAwMDAwIC0wNzAwCisrKysgbGli
L2h0dHAxLmgJMjAyMy0wNS0yMSAwNzoxNDozMS45NTMzMDMwMDAgLTA3MDAKK0BAIC0zNCw3
ICszNCw3IEBACisgI2RlZmluZSBIMV9QQVJTRV9PUFRfU1RSSUNUICAgICAoMSA8PCAwKQor
IAorIHN0cnVjdCBoMV9yZXFfcGFyc2VyIHsKKy0gIHN0cnVjdCBodHRwX3JlcSAqcmVxOwor
KyAgc3RydWN0IEN1cmxfaHR0cF9yZXEgKnJlcTsKKyAgIHN0cnVjdCBidWZxIHNjcmF0Y2g7
CisgICBzaXplX3Qgc2NyYXRjaF9za2lwOworICAgY29uc3QgY2hhciAqbGluZTsKK0BAIC01
MSw3ICs1MSw3IEBACisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGNo
YXIgKnNjaGVtZV9kZWZhdWx0LCBpbnQgb3B0aW9ucywKKyAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgQ1VSTGNvZGUgKmVycik7CisgCistQ1VSTGNvZGUgQ3VybF9oMV9yZXFf
ZHByaW50KGNvbnN0IHN0cnVjdCBodHRwX3JlcSAqcmVxLAorK0NVUkxjb2RlIEN1cmxfaDFf
cmVxX2RwcmludChjb25zdCBzdHJ1Y3QgQ3VybF9odHRwX3JlcSAqcmVxLAorICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICBzdHJ1Y3QgZHluYnVmICpkYnVmKTsKKyAKKyAKLS0gCjIu
NDAuMQoK
--==_Exmh_1684678950_35090
Content-Type: text/plain; charset=us-ascii
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
--==_Exmh_1684678950_35090--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20230521142300.46237AD>