Description Daniel Engberg 2022-03-31 09:14:06 UTC

Created attachment 232839 [details]
Patch for curl

Remove NSS option as it's deprecated upstream and doesn't build

Enabling it causes configure to fail with following message:
configure: error: NSS use must be confirmed using --with-nss-deprecated. NSS support will be dropped from curl in August 2022. See docs/DEPRECATE.md

Adding required switch makes the build fail with following error:
--- vtls/libcurl_la-nss.lo ---
vtls/nss.c:1391:50: error: use of undeclared identifier 'initparams'
  nss_context = NSS_InitContext("", "", "", "", &initparams, NSS_INIT_READONLY
                                                 ^
vtls/nss.c:1391:62: error: use of undeclared identifier 'NSS_INIT_READONLY'
  nss_context = NSS_InitContext("", "", "", "", &initparams, NSS_INIT_READONLY
                                                             ^
vtls/nss.c:1392:12: error: use of undeclared identifier 'NSS_INIT_NOCERTDB'
         | NSS_INIT_NOCERTDB   | NSS_INIT_NOMODDB       | NSS_INIT_FORCEOPEN
           ^
vtls/nss.c:1392:34: error: use of undeclared identifier 'NSS_INIT_NOMODDB'
         | NSS_INIT_NOCERTDB   | NSS_INIT_NOMODDB       | NSS_INIT_FORCEOPEN
                                 ^
vtls/nss.c:1392:59: error: use of undeclared identifier 'NSS_INIT_FORCEOPEN'
         | NSS_INIT_NOCERTDB   | NSS_INIT_NOMODDB       | NSS_INIT_FORCEOPEN
                                                          ^
vtls/nss.c:1393:12: error: use of undeclared identifier 'NSS_INIT_NOROOTINIT'
         | NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE | NSS_INIT_PK11RELOAD);
           ^
vtls/nss.c:1393:34: error: use of undeclared identifier 'NSS_INIT_OPTIMIZESPACE'
         | NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE | NSS_INIT_PK11RELOAD);
                                 ^
vtls/nss.c:1393:59: error: use of undeclared identifier 'NSS_INIT_PK11RELOAD'
         | NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE | NSS_INIT_PK11RELOAD);
                                                          ^
vtls/nss.c:1516:5: warning: implicit declaration of function 'NSS_ShutdownContext' is invalid in C99 [-Wimplicit-function-declaration]
    NSS_ShutdownContext(nss_context);
    ^
vtls/nss.c:2428:44: warning: implicit declaration of function 'NSS_GetVersion' is invalid in C99 [-Wimplicit-function-declaration]
  return msnprintf(buffer, size, "NSS/%s", NSS_GetVersion());
                                           ^
7 warnings and 17 errors generated.
*** [vtls/libcurl_la-nss.lo] Error code 1

While at it remove reference to Mbed TLS as it's not longer supported

Reference:
https://github.com/curl/curl/blob/master/docs/DEPRECATE.md

Compile tested on FreeBSD 13.0-STABLE #2 stable/13-n248607-93a95ebbf7c (amd64)