[OE-core] [master][scarthgap][PATCH] libgloss: Do not apply non-existent patch

2024-05-27 Thread Robert Joslyn via lists.openembedded.org 
From: Robert Joslyn 

When newlib and libgloss were updated to 4.3.0, SRC_URI was updated to
append a fix-rs6000-cflags.patch file when building on PowerPC, but this
file was not added to the repo.

Remove appending the missing patch.

Signed-off-by: Robert Joslyn 
---
 meta/recipes-core/newlib/libgloss_git.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-core/newlib/libgloss_git.bb 
b/meta/recipes-core/newlib/libgloss_git.bb
index 7e34e33c7a..3c97a7f296 100644
--- a/meta/recipes-core/newlib/libgloss_git.bb
+++ b/meta/recipes-core/newlib/libgloss_git.bb
@@ -6,7 +6,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/libgloss:"
 
 SRC_URI:append = " file://libgloss-build-without-nostdinc.patch"
 SRC_URI:append:powerpc = " file://fix-rs6000-crt0.patch"
-SRC_URI:append:powerpc = " file://fix-rs6000-cflags.patch"
 
 do_configure() {
${S}/libgloss/configure ${EXTRA_OECONF}
-- 
2.44.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199937): 
https://lists.openembedded.org/g/openembedded-core/message/199937
Mute This Topic: https://lists.openembedded.org/mt/106336521/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH] curl: Update to 8.8.0

2024-05-26 Thread Robert Joslyn via lists.openembedded.org 
On Sun, 2024-05-26 at 08:57 -0700, Robert Joslyn via
lists.openembedded.org wrote:
> From: Robert Joslyn 
> 
> Remove backported patch that is upsteam in this version. Disable test
> 1481 since it requires --libcurl option that is disabled by default.
> 
> Signed-off-by: Robert Joslyn 
> ---
>  ...41aadf4adf4f6aeb3f4c0ab489bb89610c36.patch | 64 -
> --
>  meta/recipes-support/curl/curl/disable-tests  |  1 +
>  .../curl/{curl_8.7.1.bb => curl_8.8.0.bb} |  4 +-
>  3 files changed, 2 insertions(+), 67 deletions(-)
>  delete mode 100644 meta/recipes-
> support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch
>  rename meta/recipes-support/curl/{curl_8.7.1.bb => curl_8.8.0.bb}
> (97%)
> 
> diff --git a/meta/recipes-
> support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch
> b/meta/recipes-
> support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch
> deleted file mode 100644
> index 98f7db93e8..00
> --- a/meta/recipes-
> support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch
> +++ /dev/null
> @@ -1,64 +0,0 @@
> -From 721941aadf4adf4f6aeb3f4c0ab489bb89610c36 Mon Sep 17 00:00:00
> 2001
> -From: Stefan Eissing 
> -Date: Mon, 1 Apr 2024 15:41:18 +0200
> -Subject: [PATCH] http: with chunked POST forced, disable length
> check on read
> - callback
> -
> -- when an application forces HTTP/1.1 chunked transfer encoding
> -  by setting the corresponding header and instructs curl to use
> -  the CURLOPT_READFUNCTION, disregard any POST length information.
> -- this establishes backward compatibility with previous curl
> versions
> -
> -Applications are encouraged to not force "chunked", but rather
> -set length information for a POST. By setting -1, curl will
> -auto-select chunked on HTTP/1.1 and work properly on other HTTP
> -versions.
> -
> -Reported-by: Jeff King
> -Fixes #13229
> -Closes #13257
> -Upstream-Status: Backport
> 
> - lib/http.c | 22 --
> - 1 file changed, 20 insertions(+), 2 deletions(-)
> -
> -diff --git a/lib/http.c b/lib/http.c
> -index 92c04e69cd8373..a764d3c4403c39 100644
>  a/lib/http.c
> -+++ b/lib/http.c
> -@@ -2046,8 +2046,19 @@ static CURLcode set_reader(struct Curl_easy
> *data, Curl_HttpReq httpreq)
> -   else
> - result = Curl_creader_set_null(data);
> - }
> --    else { /* we read the bytes from the callback */
> --  result = Curl_creader_set_fread(data, postsize);
> -+    else {
> -+  /* we read the bytes from the callback. In case "chunked"
> encoding
> -+   * is forced by the application, we disregard `postsize`.
> This is
> -+   * a backward compatibility decision to earlier versions
> where
> -+   * chunking disregarded this. See issue #13229. */
> -+  bool chunked = FALSE;
> -+  char *ptr = Curl_checkheaders(data, STRCONST("Transfer-
> Encoding"));
> -+  if(ptr) {
> -+    /* Some kind of TE is requested, check if 'chunked' is
> chosen */
> -+    chunked = Curl_compareheader(ptr, STRCONST("Transfer-
> Encoding:"),
> -+ STRCONST("chunked"));
> -+  }
> -+  result = Curl_creader_set_fread(data, chunked? -1 :
> postsize);
> - }
> - return result;
> - 
> -@@ -2115,6 +2126,13 @@ CURLcode Curl_http_req_set_reader(struct
> Curl_easy *data,
> - data->req.upload_chunky =
> -   Curl_compareheader(ptr,
> -  STRCONST("Transfer-Encoding:"),
> STRCONST("chunked"));
> -+    if(data->req.upload_chunky &&
> -+   Curl_use_http_1_1plus(data, data->conn) &&
> -+   (data->conn->httpversion >= 20)) {
> -+   infof(data, "suppressing chunked transfer encoding on
> connection "
> -+ "using HTTP version 2 or higher");
> -+   data->req.upload_chunky = FALSE;
> -+    }
> -   }
> -   else {
> - curl_off_t req_clen = Curl_creader_total_length(data);
> diff --git a/meta/recipes-support/curl/curl/disable-tests
> b/meta/recipes-support/curl/curl/disable-tests
> index 259576fd01..c4aa7783a1 100644
> --- a/meta/recipes-support/curl/curl/disable-tests
> +++ b/meta/recipes-support/curl/curl/disable-tests
> @@ -39,3 +39,4 @@
>  1404
>  1405
>  1465
> +1481
> diff --git a/meta/recipes-support/curl/curl_8.7.1.bb b/meta/recipes-
> support/curl/curl_8.8.0.bb
> similarity index 97%
> rename from meta/recipes-support/curl/curl_8.7.1.bb
> rename to meta/recipes-support/curl/curl_8.8.0.bb
> index 23b7c50a86..b932594159 100644
> --- a/meta/recipes-support/curl/cur

[OE-core] [PATCH v2] curl: Update to 8.8.0

2024-05-26 Thread Robert Joslyn via lists.openembedded.org 
From: Robert Joslyn 

Remove backported patch that is upsteam in this version. Disable test
1481 since it requires --libcurl option that is disabled by default.
Remove --disable-ntlm-wb option since support for ntlm_wb was removed in
this version

Signed-off-by: Robert Joslyn 
---
 ...41aadf4adf4f6aeb3f4c0ab489bb89610c36.patch | 64 ---
 meta/recipes-support/curl/curl/disable-tests  |  1 +
 .../curl/{curl_8.7.1.bb => curl_8.8.0.bb} |  4 +-
 3 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100644 
meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch
 rename meta/recipes-support/curl/{curl_8.7.1.bb => curl_8.8.0.bb} (97%)

diff --git 
a/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch 
b/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch
deleted file mode 100644
index 98f7db93e8..00
--- 
a/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 721941aadf4adf4f6aeb3f4c0ab489bb89610c36 Mon Sep 17 00:00:00 2001
-From: Stefan Eissing 
-Date: Mon, 1 Apr 2024 15:41:18 +0200
-Subject: [PATCH] http: with chunked POST forced, disable length check on read
- callback
-
-- when an application forces HTTP/1.1 chunked transfer encoding
-  by setting the corresponding header and instructs curl to use
-  the CURLOPT_READFUNCTION, disregard any POST length information.
-- this establishes backward compatibility with previous curl versions
-
-Applications are encouraged to not force "chunked", but rather
-set length information for a POST. By setting -1, curl will
-auto-select chunked on HTTP/1.1 and work properly on other HTTP
-versions.
-
-Reported-by: Jeff King
-Fixes #13229
-Closes #13257
-Upstream-Status: Backport

- lib/http.c | 22 --
- 1 file changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/lib/http.c b/lib/http.c
-index 92c04e69cd8373..a764d3c4403c39 100644
 a/lib/http.c
-+++ b/lib/http.c
-@@ -2046,8 +2046,19 @@ static CURLcode set_reader(struct Curl_easy *data, 
Curl_HttpReq httpreq)
-   else
- result = Curl_creader_set_null(data);
- }
--else { /* we read the bytes from the callback */
--  result = Curl_creader_set_fread(data, postsize);
-+else {
-+  /* we read the bytes from the callback. In case "chunked" encoding
-+   * is forced by the application, we disregard `postsize`. This is
-+   * a backward compatibility decision to earlier versions where
-+   * chunking disregarded this. See issue #13229. */
-+  bool chunked = FALSE;
-+  char *ptr = Curl_checkheaders(data, STRCONST("Transfer-Encoding"));
-+  if(ptr) {
-+/* Some kind of TE is requested, check if 'chunked' is chosen */
-+chunked = Curl_compareheader(ptr, STRCONST("Transfer-Encoding:"),
-+ STRCONST("chunked"));
-+  }
-+  result = Curl_creader_set_fread(data, chunked? -1 : postsize);
- }
- return result;
- 
-@@ -2115,6 +2126,13 @@ CURLcode Curl_http_req_set_reader(struct Curl_easy 
*data,
- data->req.upload_chunky =
-   Curl_compareheader(ptr,
-  STRCONST("Transfer-Encoding:"), STRCONST("chunked"));
-+if(data->req.upload_chunky &&
-+   Curl_use_http_1_1plus(data, data->conn) &&
-+   (data->conn->httpversion >= 20)) {
-+   infof(data, "suppressing chunked transfer encoding on connection "
-+ "using HTTP version 2 or higher");
-+   data->req.upload_chunky = FALSE;
-+}
-   }
-   else {
- curl_off_t req_clen = Curl_creader_total_length(data);
diff --git a/meta/recipes-support/curl/curl/disable-tests 
b/meta/recipes-support/curl/curl/disable-tests
index 259576fd01..c4aa7783a1 100644
--- a/meta/recipes-support/curl/curl/disable-tests
+++ b/meta/recipes-support/curl/curl/disable-tests
@@ -39,3 +39,4 @@
 1404
 1405
 1465
+1481
diff --git a/meta/recipes-support/curl/curl_8.7.1.bb 
b/meta/recipes-support/curl/curl_8.8.0.bb
similarity index 97%
rename from meta/recipes-support/curl/curl_8.7.1.bb
rename to meta/recipes-support/curl/curl_8.8.0.bb
index 23b7c50a86..b932594159 100644
--- a/meta/recipes-support/curl/curl_8.7.1.bb
+++ b/meta/recipes-support/curl/curl_8.8.0.bb
@@ -11,12 +11,11 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=eed2e5088e1ac619c9a1c747da291d75"
 
 SRC_URI = " \
 https://curl.se/download/${BP}.tar.xz \
-file://721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch \
 file://run-ptest \
 file://disable-tests \
 file://no-test-timeout.patch \
 "
-SRC_URI[sha256sum] = 
"6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd"
+SRC_URI[sha256sum] = 
"0f58bb95fc330c8a46eeb3df5701b0d90c9d9bfcc42bd1cd08791d12551d4400"
 
 # Curl has used many names over the years...
 CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl 
daniel_stenberg:curl"
@@ -73,7 +72,6 @@ PACKAGECONFIG[zstd] =

[OE-core] [PATCH] curl: Update to 8.8.0

2024-05-26 Thread Robert Joslyn via lists.openembedded.org 
From: Robert Joslyn 

Remove backported patch that is upsteam in this version. Disable test
1481 since it requires --libcurl option that is disabled by default.

Signed-off-by: Robert Joslyn 
---
 ...41aadf4adf4f6aeb3f4c0ab489bb89610c36.patch | 64 ---
 meta/recipes-support/curl/curl/disable-tests  |  1 +
 .../curl/{curl_8.7.1.bb => curl_8.8.0.bb} |  4 +-
 3 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100644 
meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch
 rename meta/recipes-support/curl/{curl_8.7.1.bb => curl_8.8.0.bb} (97%)

diff --git 
a/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch 
b/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch
deleted file mode 100644
index 98f7db93e8..00
--- 
a/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 721941aadf4adf4f6aeb3f4c0ab489bb89610c36 Mon Sep 17 00:00:00 2001
-From: Stefan Eissing 
-Date: Mon, 1 Apr 2024 15:41:18 +0200
-Subject: [PATCH] http: with chunked POST forced, disable length check on read
- callback
-
-- when an application forces HTTP/1.1 chunked transfer encoding
-  by setting the corresponding header and instructs curl to use
-  the CURLOPT_READFUNCTION, disregard any POST length information.
-- this establishes backward compatibility with previous curl versions
-
-Applications are encouraged to not force "chunked", but rather
-set length information for a POST. By setting -1, curl will
-auto-select chunked on HTTP/1.1 and work properly on other HTTP
-versions.
-
-Reported-by: Jeff King
-Fixes #13229
-Closes #13257
-Upstream-Status: Backport

- lib/http.c | 22 --
- 1 file changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/lib/http.c b/lib/http.c
-index 92c04e69cd8373..a764d3c4403c39 100644
 a/lib/http.c
-+++ b/lib/http.c
-@@ -2046,8 +2046,19 @@ static CURLcode set_reader(struct Curl_easy *data, 
Curl_HttpReq httpreq)
-   else
- result = Curl_creader_set_null(data);
- }
--else { /* we read the bytes from the callback */
--  result = Curl_creader_set_fread(data, postsize);
-+else {
-+  /* we read the bytes from the callback. In case "chunked" encoding
-+   * is forced by the application, we disregard `postsize`. This is
-+   * a backward compatibility decision to earlier versions where
-+   * chunking disregarded this. See issue #13229. */
-+  bool chunked = FALSE;
-+  char *ptr = Curl_checkheaders(data, STRCONST("Transfer-Encoding"));
-+  if(ptr) {
-+/* Some kind of TE is requested, check if 'chunked' is chosen */
-+chunked = Curl_compareheader(ptr, STRCONST("Transfer-Encoding:"),
-+ STRCONST("chunked"));
-+  }
-+  result = Curl_creader_set_fread(data, chunked? -1 : postsize);
- }
- return result;
- 
-@@ -2115,6 +2126,13 @@ CURLcode Curl_http_req_set_reader(struct Curl_easy 
*data,
- data->req.upload_chunky =
-   Curl_compareheader(ptr,
-  STRCONST("Transfer-Encoding:"), STRCONST("chunked"));
-+if(data->req.upload_chunky &&
-+   Curl_use_http_1_1plus(data, data->conn) &&
-+   (data->conn->httpversion >= 20)) {
-+   infof(data, "suppressing chunked transfer encoding on connection "
-+ "using HTTP version 2 or higher");
-+   data->req.upload_chunky = FALSE;
-+}
-   }
-   else {
- curl_off_t req_clen = Curl_creader_total_length(data);
diff --git a/meta/recipes-support/curl/curl/disable-tests 
b/meta/recipes-support/curl/curl/disable-tests
index 259576fd01..c4aa7783a1 100644
--- a/meta/recipes-support/curl/curl/disable-tests
+++ b/meta/recipes-support/curl/curl/disable-tests
@@ -39,3 +39,4 @@
 1404
 1405
 1465
+1481
diff --git a/meta/recipes-support/curl/curl_8.7.1.bb 
b/meta/recipes-support/curl/curl_8.8.0.bb
similarity index 97%
rename from meta/recipes-support/curl/curl_8.7.1.bb
rename to meta/recipes-support/curl/curl_8.8.0.bb
index 23b7c50a86..b932594159 100644
--- a/meta/recipes-support/curl/curl_8.7.1.bb
+++ b/meta/recipes-support/curl/curl_8.8.0.bb
@@ -11,12 +11,11 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=eed2e5088e1ac619c9a1c747da291d75"
 
 SRC_URI = " \
 https://curl.se/download/${BP}.tar.xz \
-file://721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch \
 file://run-ptest \
 file://disable-tests \
 file://no-test-timeout.patch \
 "
-SRC_URI[sha256sum] = 
"6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd"
+SRC_URI[sha256sum] = 
"0f58bb95fc330c8a46eeb3df5701b0d90c9d9bfcc42bd1cd08791d12551d4400"
 
 # Curl has used many names over the years...
 CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl 
daniel_stenberg:curl"
@@ -73,7 +72,6 @@ PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd"
 
 EXTRA_OECONF = " \
 --disable-libcurl-option \
---disable-ntlm-wb \

[OE-core] [PATCH] curl: Skip tests marked flaky

2023-09-27 Thread Robert Joslyn via lists.openembedded.org 
From: Robert Joslyn 

Some tests can fail intermittently and upstream has marked these as
flaky so they can easily be skipped. At present there are 12 tests
marked flaky with 10 of them running in the default recipe
configuration. Skip them to avoid the failures.

Signed-off-by: Robert Joslyn 
---
 meta/recipes-support/curl/curl/run-ptest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/curl/curl/run-ptest 
b/meta/recipes-support/curl/curl/run-ptest
index 95af2bd7b3..8f9c20f34d 100644
--- a/meta/recipes-support/curl/curl/run-ptest
+++ b/meta/recipes-support/curl/curl/run-ptest
@@ -1,6 +1,6 @@
 #!/bin/sh
 cd tests
-{ ./runtests.pl -a -n -s -j4 || echo "FAIL: curl" ; } | sed \
+{ ./runtests.pl -a -n -s -j4 !flaky || echo "FAIL: curl" ; } | sed \
  -e 's|\([^ ]* *\) \([^ ]* *\)...OK|PASS: \1 \2|' \
  -e 's|\([^ ]* *\) \([^ ]* *\)...FAILED|FAIL: \1 \2|' \
  -e 's/Warning: test[0-9]\+ not present in tests\/data\/Makefile.inc//'
-- 
2.41.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188349): 
https://lists.openembedded.org/g/openembedded-core/message/188349
Mute This Topic: https://lists.openembedded.org/mt/101630676/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH v2] curl: Update from 8.2.1 to 8.3.0

2023-09-27 Thread Robert Joslyn via lists.openembedded.org 

On 9/26/23 8:51 PM, Khem Raj wrote:

On Tue, Sep 26, 2023 at 7:55 PM Robert Joslyn
 wrote:

On 9/26/23 7:55 AM, Khem Raj wrote:

I am seeing a ptest failure on qemx86-64/glibc

Failed ptests:
{'curl': ['test_1474', 'curl']}

In looking at the test, it is marked as flaky with the comment:

# Because of the timing sensitivity (scheduling delays of 500 msec can cause
# the test to fail), this test is marked flaky to avoid it being run in
the CI
# builds which are often run on overloaded servers.

https://github.com/curl/curl/blob/curl-8_3_0/tests/data/test1474#L21

My server is pretty lightly loaded while running the tests, so that
could explain why I haven't seen it fail normally. I was able to induce
a failure by running a very heavy load while running that test on my
desktop (which is older and slower than my build server). If you'd like,
I can send a follow up patch to skip tests marked as flaky.


another run resulted in yet another failure

   test 0587...
FAIL: 587: protoc!
There was no content at all in the file log/2/server.input.
Server glitch? Total curl failure? Returned: 42

prior to this upgrade my test setup never saw curl failures and it has
same amount of load etc.


Test 587 is also marked flaky by upstream. There are 12 tests marked as 
flaky total, and since you've just hit two of them, I'm much more 
inclined to just skip them. Right before this version bump there was 
also an update to run the curl ptests in parallel, which could be 
contributing to the change in test behavior.


Thanks,

Robert


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188321): 
https://lists.openembedded.org/g/openembedded-core/message/188321
Mute This Topic: https://lists.openembedded.org/mt/101543494/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH v2] curl: Update from 8.2.1 to 8.3.0

2023-09-26 Thread Robert Joslyn via lists.openembedded.org 

On 9/26/23 7:55 AM, Khem Raj wrote:

I am seeing a ptest failure on qemx86-64/glibc

   Failed ptests:
   {'curl': ['test_1474', 'curl']}


In looking at the test, it is marked as flaky with the comment:

# Because of the timing sensitivity (scheduling delays of 500 msec can cause
# the test to fail), this test is marked flaky to avoid it being run in 
the CI

# builds which are often run on overloaded servers.

https://github.com/curl/curl/blob/curl-8_3_0/tests/data/test1474#L21

My server is pretty lightly loaded while running the tests, so that 
could explain why I haven't seen it fail normally. I was able to induce 
a failure by running a very heavy load while running that test on my 
desktop (which is older and slower than my build server). If you'd like, 
I can send a follow up patch to skip tests marked as flaky.


Thanks,

Robert


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188287): 
https://lists.openembedded.org/g/openembedded-core/message/188287
Mute This Topic: https://lists.openembedded.org/mt/101543494/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH v2] curl: Update from 8.2.1 to 8.3.0

2023-09-23 Thread Robert Joslyn via lists.openembedded.org 
From: Robert Joslyn 

NSS support was removed, so adjust PACKAGECONFIG options.

The --enable-crypto-auth option was removed and split into separate
options for basic-auth, bearer-auth, digest-auth, kerberos-auth,
negotiate-auth, and aws. Enable these new options since upstream enables
them by default.

Disable test 1279 since this requires libcurl and hangs the tests.

Signed-off-by: Robert Joslyn 
---
Changes from v1:
Enable aws authentication by default. Upstream enables it by default and
test 1964 fails with it disabled.

 meta/recipes-support/curl/curl/disable-tests   |  1 +
 .../curl/{curl_8.2.1.bb => curl_8.3.0.bb}  | 14 +-
 2 files changed, 10 insertions(+), 5 deletions(-)
 rename meta/recipes-support/curl/{curl_8.2.1.bb => curl_8.3.0.bb} (88%)

diff --git a/meta/recipes-support/curl/curl/disable-tests 
b/meta/recipes-support/curl/curl/disable-tests
index b687b2bb76..fdac795662 100644
--- a/meta/recipes-support/curl/curl/disable-tests
+++ b/meta/recipes-support/curl/curl/disable-tests
@@ -21,6 +21,7 @@
 # This test is scanning the source tree
 1222
 # These CRL tests need --libcurl option to be enabled
+1279
 1400
 1401
 1402
diff --git a/meta/recipes-support/curl/curl_8.2.1.bb 
b/meta/recipes-support/curl/curl_8.3.0.bb
similarity index 88%
rename from meta/recipes-support/curl/curl_8.2.1.bb
rename to meta/recipes-support/curl/curl_8.3.0.bb
index b86c6f3bba..646ac01914 100644
--- a/meta/recipes-support/curl/curl_8.2.1.bb
+++ b/meta/recipes-support/curl/curl_8.3.0.bb
@@ -14,7 +14,7 @@ SRC_URI = " \
 file://run-ptest \
 file://disable-tests \
 "
-SRC_URI[sha256sum] = 
"dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894"
+SRC_URI[sha256sum] = 
"376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63"
 
 # Curl has used many names over the years...
 CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl 
daniel_stenberg:curl"
@@ -24,21 +24,26 @@ inherit autotools pkgconfig binconfig multilib_header ptest
 # Entropy source for random PACKAGECONFIG option
 RANDOM ?= "/dev/urandom"
 
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} libidn 
openssl proxy random threaded-resolver verbose zlib"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} aws 
basic-auth bearer-auth digest-auth negotiate-auth libidn openssl proxy random 
threaded-resolver verbose zlib"
 PACKAGECONFIG:class-native = "ipv6 openssl proxy random threaded-resolver 
verbose zlib"
 PACKAGECONFIG:class-nativesdk = "ipv6 openssl proxy random threaded-resolver 
verbose zlib"
 
 # 'ares' and 'threaded-resolver' are mutually exclusive
 PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver"
+PACKAGECONFIG[aws] = "--enable-aws,--disable-aws"
+PACKAGECONFIG[basic-auth] = "--enable-basic-auth,--disable-basic-auth"
+PACKAGECONFIG[bearer-auth] = "--enable-bearer-auth,--disable-bearer-auth"
 PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli"
 PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual"
 # Don't use this in production
 PACKAGECONFIG[debug] = "--enable-debug,--disable-debug"
 PACKAGECONFIG[dict] = "--enable-dict,--disable-dict,"
+PACKAGECONFIG[digest-auth] = "--enable-digest-auth,--disable-digest-auth"
 PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls"
 PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher,"
 PACKAGECONFIG[imap] = "--enable-imap,--disable-imap,"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
+PACKAGECONFIG[kerberos-auth] = "--enable-kerberos-auth,--disable-kerberos-auth"
 PACKAGECONFIG[krb5] = "--with-gssapi,--without-gssapi,krb5"
 PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap"
 PACKAGECONFIG[ldaps] = "--enable-ldaps,--disable-ldaps,openldap"
@@ -47,6 +52,7 @@ PACKAGECONFIG[libidn] = 
"--with-libidn2,--without-libidn2,libidn2"
 PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2"
 PACKAGECONFIG[mbedtls] = 
"--with-mbedtls=${STAGING_DIR_TARGET},--without-mbedtls,mbedtls"
 PACKAGECONFIG[mqtt] = "--enable-mqtt,--disable-mqtt,"
+PACKAGECONFIG[negotiate-auth] = 
"--enable-negotiate-auth,--disable-negotiate-auth"
 PACKAGECONFIG[nghttp2] = "--with-nghttp2,--without-nghttp2,nghttp2"
 PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl"
 PACKAGECONFIG[pop3] = "--enable-pop3,--disable-pop3,"
@@ -56,7 +62,6 @@ PACKAGECONFIG[rtmpdump] = 
"--with-librtmp,--without-librtmp,rtmpdump"
 PACKAGECONFIG[rtsp] = "--enable-rtsp,--disable-rtsp,"
 PACKAGECONFIG[smb] = "--enable-smb,--disable-smb,"
 PACKAGECONFIG[smtp] = "--enable-smtp,--disable-smtp,"
-PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss"
 PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet,"
 PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp,"
 PACKAGECONFIG[threaded-resolver] = 
"--enable-threaded-resolver,--disable-threaded-resolverares"
@@ -67,11 +72,10 @@ PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd"
 EXTRA_OECONF = " \

Re: [OE-core] [PATCH] curl: Update from 8.2.1 to 8.3.0

2023-09-23 Thread Robert Joslyn via lists.openembedded.org 

On 9/20/23 10:12 PM, Alexander Kanavin wrote:

I applied the patch on current poky master with default config
(a83a16b7939e066b6686b62ae7ec66f12ef34f1e) and ran the tests locally:

root@qemux86-64:/usr/lib/curl/ptest/tests# ./runtests.pl -a -n -j4


The failure I am getting is:

test 1964...[HTTP AWS_SIGV4 with one provider and auth cred via URL,
but X-Xxx-Date header set manually]

  1964: protocol FAILED!
  There was no content at all in the file log/3/server.input.
  Server glitch? Total curl failure? Returned: 48

So you should be able to reproduce this. Did you rebase on my curl
changes that landed in master recently?

Alex



I didn't have your commit on my branch, sorry I should have checked 
that. I rebased on latest master and am now able to reproduce this. 
Adding aws to PACKAGECONFIG does fix it for me, so I think the test is 
just running even when the feature it's testing is disabled. I'm fine 
enabling aws authentication, upstream enables it by default anyway. I'll 
send a v2 doing this.


Thanks everyone for the help on this!

Robert


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188151): 
https://lists.openembedded.org/g/openembedded-core/message/188151
Mute This Topic: https://lists.openembedded.org/mt/101426058/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH] curl: Update from 8.2.1 to 8.3.0

2023-09-20 Thread Robert Joslyn via lists.openembedded.org 

On 9/20/23 3:20 PM, Richard Purdie wrote:

On Wed, 2023-09-20 at 14:50 -0700, Robert Joslyn wrote:

On 9/19/23 5:54 AM, Richard Purdie wrote:

On Tue, 2023-09-19 at 05:40 -0700, Robert Joslyn wrote:

On 9/18/23 4:59 AM, Richard Purdie wrote:

On Sun, 2023-09-17 at 18:57 -0700, Robert Joslyn via
lists.openembedded.org wrote:

NSS support was removed, so adjust PACKAGECONFIG options.

The --enable-crypto-auth option was removed and split into separate
options for basic-auth, bearer-auth, digest-auth, kerberos-auth,
negotiate-auth, and aws. Enable basic, bearer, digest, and negotiate by
default as these are probably the most common.

Disable test 1279 since this requires libcurl and hangs the tests.

Signed-off-by: Robert Joslyn 
---
meta/recipes-support/curl/curl/disable-tests   |  1 +
.../curl/{curl_8.2.1.bb => curl_8.3.0.bb}  | 14 +-
2 files changed, 10 insertions(+), 5 deletions(-)
rename meta/recipes-support/curl/{curl_8.2.1.bb => curl_8.3.0.bb} (88%)

diff --git a/meta/recipes-support/curl/curl/disable-tests 
b/meta/recipes-support/curl/curl/disable-tests
index b687b2bb76..fdac795662 100644
--- a/meta/recipes-support/curl/curl/disable-tests
+++ b/meta/recipes-support/curl/curl/disable-tests
@@ -21,6 +21,7 @@
# This test is scanning the source tree
1222
# These CRL tests need --libcurl option to be enabled
+1279
1400
1401
1402

Thanks for the patch. Unfortunately there were warnings generated on
the autobuilder test run for this:

https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/5452
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/5631

I'm not very familiar with the autobuilder infrastructure, but it looks
to be running something like "bitbake core-image-ptest-curl -c
testimage". When I run this, I do get a warning:

WARNING: core-image-ptest-curl-1.0-r0 do_testimage: There were failing
ptests.

Running with -v might help show a touch more information.


Unfortunately, I don't see any failing tests. When running the tests
manually (called runqemu, then ptest-runner curl in the VM) there are
some tests that print an error about not finding a library and get
skipped. I removed those test cases as well, but I still get the warning
about failing ptests.

What's the ptest code looking for to trigger a test failure? I should
have some more time to look at this later today, I'm probably just
missing something obvious.

Commands like:

resulttool report ./tmp/log/oeqa/

resulttool log --dump-ptest ./output-logs ./tmp/log/oeqa/

Might help amd/or have a look at the testimage log in core-image-ptest-
curl's WORKDIR/temp/log.do_testimage


Cheers,

Richard


In running this a few times, on my machine it's not curl but other tests
that fail. The autobuilder output only showed a curl failure, so I'm not
sure what's different in my environment. This is what resulttool shows:

s.robert@hezmana ~/yocto/poky-master/build $ resulttool report
./tmp/log/oeqa/
==
Test Result Status Summary (Counts/Percentages sorted by testseries, ID)
==
--
Test Series | ID  |
Passed | Failed | Skipped
--
oeqa | runtime_core-image-ptest-curl_qemux86-64_20230920012443 | 4725
(91%) | 7 (0%) | 448 (9%)
--
Total | 1 | 4725   | 7  | 448
--

==
qemux86-64 PTest Result Summary
==
--
Recipe | Passed | Failed | Skipped  | Time(s)
--
attr   | 2  | 0  | 0    | 0
bash   | 78 | 5  | 0    | 107
busybox    | 619    | 0  | 88   | 7
curl   | 847    | 0  | 0    | 188
openssh    | 81 | 0  | 1    | 712
openssl    | 0  | 0  | 0    | 0
perl   | 2570   | 1  | 192  | 549
util-linux | 524    | 1  | 166  | 36
zlib   | 1  | 0

Re: [OE-core] [PATCH] curl: Update from 8.2.1 to 8.3.0

2023-09-20 Thread Robert Joslyn via lists.openembedded.org 

On 9/19/23 5:54 AM, Richard Purdie wrote:

On Tue, 2023-09-19 at 05:40 -0700, Robert Joslyn wrote:

On 9/18/23 4:59 AM, Richard Purdie wrote:

On Sun, 2023-09-17 at 18:57 -0700, Robert Joslyn via
lists.openembedded.org wrote:

NSS support was removed, so adjust PACKAGECONFIG options.

The --enable-crypto-auth option was removed and split into separate
options for basic-auth, bearer-auth, digest-auth, kerberos-auth,
negotiate-auth, and aws. Enable basic, bearer, digest, and negotiate by
default as these are probably the most common.

Disable test 1279 since this requires libcurl and hangs the tests.

Signed-off-by: Robert Joslyn 
---
   meta/recipes-support/curl/curl/disable-tests   |  1 +
   .../curl/{curl_8.2.1.bb => curl_8.3.0.bb}  | 14 +-
   2 files changed, 10 insertions(+), 5 deletions(-)
   rename meta/recipes-support/curl/{curl_8.2.1.bb => curl_8.3.0.bb} (88%)

diff --git a/meta/recipes-support/curl/curl/disable-tests 
b/meta/recipes-support/curl/curl/disable-tests
index b687b2bb76..fdac795662 100644
--- a/meta/recipes-support/curl/curl/disable-tests
+++ b/meta/recipes-support/curl/curl/disable-tests
@@ -21,6 +21,7 @@
   # This test is scanning the source tree
   1222
   # These CRL tests need --libcurl option to be enabled
+1279
   1400
   1401
   1402

Thanks for the patch. Unfortunately there were warnings generated on
the autobuilder test run for this:

https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/5452
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/5631

I'm not very familiar with the autobuilder infrastructure, but it looks
to be running something like "bitbake core-image-ptest-curl -c
testimage". When I run this, I do get a warning:

WARNING: core-image-ptest-curl-1.0-r0 do_testimage: There were failing
ptests.

Running with -v might help show a touch more information.


Unfortunately, I don't see any failing tests. When running the tests
manually (called runqemu, then ptest-runner curl in the VM) there are
some tests that print an error about not finding a library and get
skipped. I removed those test cases as well, but I still get the warning
about failing ptests.

What's the ptest code looking for to trigger a test failure? I should
have some more time to look at this later today, I'm probably just
missing something obvious.

Commands like:

resulttool report ./tmp/log/oeqa/

resulttool log --dump-ptest ./output-logs ./tmp/log/oeqa/

Might help amd/or have a look at the testimage log in core-image-ptest-
curl's WORKDIR/temp/log.do_testimage


Cheers,

Richard

In running this a few times, on my machine it's not curl but other tests 
that fail. The autobuilder output only showed a curl failure, so I'm not 
sure what's different in my environment. This is what resulttool shows:


s.robert@hezmana ~/yocto/poky-master/build $ resulttool report 
./tmp/log/oeqa/

==
Test Result Status Summary (Counts/Percentages sorted by testseries, ID)
==
--
Test Series | ID  | 
Passed | Failed | Skipped

--
oeqa | runtime_core-image-ptest-curl_qemux86-64_20230920012443 | 4725 
(91%) | 7 (0%) | 448 (9%)

--
Total | 1 | 4725   | 7  | 448
--

==
qemux86-64 PTest Result Summary
==
--
Recipe | Passed | Failed | Skipped  | Time(s)
--
attr   | 2  | 0  | 0    | 0
bash   | 78 | 5  | 0    | 107
busybox    | 619    | 0  | 88   | 7
curl   | 847    | 0  | 0    | 188
openssh    | 81 | 0  | 1    | 712
openssl    | 0  | 0  | 0    | 0
perl   | 2570   | 1  | 192  | 549
util-linux | 524    | 1  | 166  | 36
zlib   | 1  | 0

Re: [OE-core] [PATCH] curl: Update from 8.2.1 to 8.3.0

2023-09-19 Thread Robert Joslyn via lists.openembedded.org 

On 9/18/23 4:59 AM, Richard Purdie wrote:

On Sun, 2023-09-17 at 18:57 -0700, Robert Joslyn via
lists.openembedded.org wrote:

NSS support was removed, so adjust PACKAGECONFIG options.

The --enable-crypto-auth option was removed and split into separate
options for basic-auth, bearer-auth, digest-auth, kerberos-auth,
negotiate-auth, and aws. Enable basic, bearer, digest, and negotiate by
default as these are probably the most common.

Disable test 1279 since this requires libcurl and hangs the tests.

Signed-off-by: Robert Joslyn 
---
  meta/recipes-support/curl/curl/disable-tests   |  1 +
  .../curl/{curl_8.2.1.bb => curl_8.3.0.bb}  | 14 +-
  2 files changed, 10 insertions(+), 5 deletions(-)
  rename meta/recipes-support/curl/{curl_8.2.1.bb => curl_8.3.0.bb} (88%)

diff --git a/meta/recipes-support/curl/curl/disable-tests 
b/meta/recipes-support/curl/curl/disable-tests
index b687b2bb76..fdac795662 100644
--- a/meta/recipes-support/curl/curl/disable-tests
+++ b/meta/recipes-support/curl/curl/disable-tests
@@ -21,6 +21,7 @@
  # This test is scanning the source tree
  1222
  # These CRL tests need --libcurl option to be enabled
+1279
  1400
  1401
  1402

Thanks for the patch. Unfortunately there were warnings generated on
the autobuilder test run for this:

https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/5452
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/5631


I'm not very familiar with the autobuilder infrastructure, but it looks 
to be running something like "bitbake core-image-ptest-curl -c 
testimage". When I run this, I do get a warning:


WARNING: core-image-ptest-curl-1.0-r0 do_testimage: There were failing 
ptests.


Unfortunately, I don't see any failing tests. When running the tests 
manually (called runqemu, then ptest-runner curl in the VM) there are 
some tests that print an error about not finding a library and get 
skipped. I removed those test cases as well, but I still get the warning 
about failing ptests.


What's the ptest code looking for to trigger a test failure? I should 
have some more time to look at this later today, I'm probably just 
missing something obvious.




I'd also wondered if you'd mind setting your from address correctly for
patches please? For more info see:

https://docs.yoctoproject.org/contributor-guide/submit-changes.html#fixing-your-from-identity


Thanks, for this, hopefully it's fixed now. My email provider recently 
changed, which does have DMARC enabled.



Thanks,

Robert


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#187861): 
https://lists.openembedded.org/g/openembedded-core/message/187861
Mute This Topic: https://lists.openembedded.org/mt/101426058/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH] curl: Update from 8.2.1 to 8.3.0

2023-09-17 Thread Robert Joslyn via lists.openembedded.org 
NSS support was removed, so adjust PACKAGECONFIG options.

The --enable-crypto-auth option was removed and split into separate
options for basic-auth, bearer-auth, digest-auth, kerberos-auth,
negotiate-auth, and aws. Enable basic, bearer, digest, and negotiate by
default as these are probably the most common.

Disable test 1279 since this requires libcurl and hangs the tests.

Signed-off-by: Robert Joslyn 
---
 meta/recipes-support/curl/curl/disable-tests   |  1 +
 .../curl/{curl_8.2.1.bb => curl_8.3.0.bb}  | 14 +-
 2 files changed, 10 insertions(+), 5 deletions(-)
 rename meta/recipes-support/curl/{curl_8.2.1.bb => curl_8.3.0.bb} (88%)

diff --git a/meta/recipes-support/curl/curl/disable-tests 
b/meta/recipes-support/curl/curl/disable-tests
index b687b2bb76..fdac795662 100644
--- a/meta/recipes-support/curl/curl/disable-tests
+++ b/meta/recipes-support/curl/curl/disable-tests
@@ -21,6 +21,7 @@
 # This test is scanning the source tree
 1222
 # These CRL tests need --libcurl option to be enabled
+1279
 1400
 1401
 1402
diff --git a/meta/recipes-support/curl/curl_8.2.1.bb 
b/meta/recipes-support/curl/curl_8.3.0.bb
similarity index 88%
rename from meta/recipes-support/curl/curl_8.2.1.bb
rename to meta/recipes-support/curl/curl_8.3.0.bb
index 068486a352..327c261b1a 100644
--- a/meta/recipes-support/curl/curl_8.2.1.bb
+++ b/meta/recipes-support/curl/curl_8.3.0.bb
@@ -14,7 +14,7 @@ SRC_URI = " \
 file://run-ptest \
 file://disable-tests \
 "
-SRC_URI[sha256sum] = 
"dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894"
+SRC_URI[sha256sum] = 
"376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63"
 
 # Curl has used many names over the years...
 CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl 
daniel_stenberg:curl"
@@ -24,21 +24,26 @@ inherit autotools pkgconfig binconfig multilib_header ptest
 # Entropy source for random PACKAGECONFIG option
 RANDOM ?= "/dev/urandom"
 
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} libidn 
openssl proxy random threaded-resolver verbose zlib"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} 
basic-auth bearer-auth digest-auth negotiate-auth libidn openssl proxy random 
threaded-resolver verbose zlib"
 PACKAGECONFIG:class-native = "ipv6 openssl proxy random threaded-resolver 
verbose zlib"
 PACKAGECONFIG:class-nativesdk = "ipv6 openssl proxy random threaded-resolver 
verbose zlib"
 
 # 'ares' and 'threaded-resolver' are mutually exclusive
 PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver"
+PACKAGECONFIG[aws] = "--enable-aws,--disable-aws"
+PACKAGECONFIG[basic-auth] = "--enable-basic-auth,--disable-basic-auth"
+PACKAGECONFIG[bearer-auth] = "--enable-bearer-auth,--disable-bearer-auth"
 PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli"
 PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual"
 # Don't use this in production
 PACKAGECONFIG[debug] = "--enable-debug,--disable-debug"
 PACKAGECONFIG[dict] = "--enable-dict,--disable-dict,"
+PACKAGECONFIG[digest-auth] = "--enable-digest-auth,--disable-digest-auth"
 PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls"
 PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher,"
 PACKAGECONFIG[imap] = "--enable-imap,--disable-imap,"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
+PACKAGECONFIG[kerberos-auth] = "--enable-kerberos-auth,--disable-kerberos-auth"
 PACKAGECONFIG[krb5] = "--with-gssapi,--without-gssapi,krb5"
 PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap"
 PACKAGECONFIG[ldaps] = "--enable-ldaps,--disable-ldaps,openldap"
@@ -47,6 +52,7 @@ PACKAGECONFIG[libidn] = 
"--with-libidn2,--without-libidn2,libidn2"
 PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2"
 PACKAGECONFIG[mbedtls] = 
"--with-mbedtls=${STAGING_DIR_TARGET},--without-mbedtls,mbedtls"
 PACKAGECONFIG[mqtt] = "--enable-mqtt,--disable-mqtt,"
+PACKAGECONFIG[negotiate-auth] = 
"--enable-negotiate-auth,--disable-negotiate-auth"
 PACKAGECONFIG[nghttp2] = "--with-nghttp2,--without-nghttp2,nghttp2"
 PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl"
 PACKAGECONFIG[pop3] = "--enable-pop3,--disable-pop3,"
@@ -56,7 +62,6 @@ PACKAGECONFIG[rtmpdump] = 
"--with-librtmp,--without-librtmp,rtmpdump"
 PACKAGECONFIG[rtsp] = "--enable-rtsp,--disable-rtsp,"
 PACKAGECONFIG[smb] = "--enable-smb,--disable-smb,"
 PACKAGECONFIG[smtp] = "--enable-smtp,--disable-smtp,"
-PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss"
 PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet,"
 PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp,"
 PACKAGECONFIG[threaded-resolver] = 
"--enable-threaded-resolver,--disable-threaded-resolverares"
@@ -67,11 +72,10 @@ PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd"
 EXTRA_OECONF = " \
 --disable-libcurl-option \
 --disable-ntlm-wb \
---enable-crypto-auth \