diff -Nru curl-7.88.1/debian/changelog curl-7.88.1/debian/changelog --- curl-7.88.1/debian/changelog 2023-02-20 22:35:53.000000000 +0000 +++ curl-7.88.1/debian/changelog 2023-03-08 20:57:09.000000000 +0000 @@ -1,3 +1,55 @@ +curl (7.88.1-6) unstable; urgency=medium + + * d/rules: Ignore test results from tests that fail on IPv6-only builders + (closes: #1032343) + * d/control: Don't install gnutls-bin for tests on ppc64el (tests hangs + forever) + + -- Samuel Henrique Wed, 08 Mar 2023 20:57:09 +0000 + +curl (7.88.1-5) unstable; urgency=medium + + * Fix stringification of _DEB_HOST_ARCH macro. + - d/p/Use-correct-path-when-loading-libnss-pem-ckbi-.so.patch: + Use _DEB_HOST_ARCH directly. + - d/rules: Quote _DEB_HOST_ARCH when passing it with -D. + + -- Sergio Durigan Junior Mon, 06 Mar 2023 10:22:32 -0500 + +curl (7.88.1-4) unstable; urgency=medium + + * d/p/Use-correct-path-when-loading-libnss-pem-ckbi-.so.patch: + Prepend "/nss/" before the library name. + + -- Sergio Durigan Junior Sun, 05 Mar 2023 18:38:13 -0500 + +curl (7.88.1-3) unstable; urgency=medium + + * d/p/Use-correct-path-when-loading-libnss-pem-ckbi-.so.patch: + Use correct paths when loading libnss{pem,ckbi}.so. (Closes: #726073) + * d/rules: Pass _DEB_HOST_ARCH via C{,XX}FLAGS; reenable NSS PEM tests. + * d/control: B-D on nss-plugin-pem (test only). + Also, make libcurl3-nss depend on nss-plugin-pem as well. + + -- Sergio Durigan Junior Sun, 05 Mar 2023 12:59:58 -0500 + +curl (7.88.1-2) unstable; urgency=medium + + * Multiple test improvements, which will increase the reliability of the + package, especially when backporting fixes on stable and oldstable: + - Test results are now critical to the build process, if a test fails, + the build will fail. + - Add two new test build-dependencies to increase coverage: locales-all + and gnutls-bin. + - Only run non-flaky tests. + - Print logs of failed tests. + - Run all tests even if there was a failure. + - Ignore results of known failing tests (for Debian). + - Disable valgrind through a test parameter instead of patching + upstream source code. + + -- Samuel Henrique Fri, 03 Mar 2023 08:28:19 +0000 + curl (7.88.1-1) unstable; urgency=medium * New upstream version 7.88.1 diff -Nru curl-7.88.1/debian/control curl-7.88.1/debian/control --- curl-7.88.1/debian/control 2023-02-20 22:35:53.000000000 +0000 +++ curl-7.88.1/debian/control 2023-03-08 20:57:09.000000000 +0000 @@ -25,12 +25,15 @@ libssl-dev, libtool, libzstd-dev, + locales-all , openssh-server , python3:native , python3-impacket , + gnutls-bin [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc ppc64 riscv64] , quilt, stunnel4 , - zlib1g-dev + zlib1g-dev, + nss-plugin-pem , Build-Conflicts: autoconf2.13, automake1.4 Standards-Version: 4.6.1 Vcs-Git: https://salsa.debian.org/debian/curl.git @@ -103,7 +106,7 @@ Package: libcurl3-nss Architecture: any Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, nss-plugin-pem Recommends: ca-certificates Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same diff -Nru curl-7.88.1/debian/patches/series curl-7.88.1/debian/patches/series --- curl-7.88.1/debian/patches/series 2023-02-20 22:35:53.000000000 +0000 +++ curl-7.88.1/debian/patches/series 2023-03-08 20:57:09.000000000 +0000 @@ -1,10 +1,10 @@ # Packaging patches. 04_workaround_as_needed_bug.patch -06_always-disable-valgrind.patch 08_enable-zsh.patch build-Divide-mit-krb5-gssapi-link-flags-between-LDFLAGS-a.patch 11_omit-directories-from-config.patch Remove-curl-s-LDFLAGS-from-curl-config-static-libs.patch +Use-correct-path-when-loading-libnss-pem-ckbi-.so.patch # Do not add patches below. # Used to generate packages for the other crypto libraries. diff -Nru curl-7.88.1/debian/patches/Use-correct-path-when-loading-libnss-pem-ckbi-.so.patch curl-7.88.1/debian/patches/Use-correct-path-when-loading-libnss-pem-ckbi-.so.patch --- curl-7.88.1/debian/patches/Use-correct-path-when-loading-libnss-pem-ckbi-.so.patch 1970-01-01 01:00:00.000000000 +0100 +++ curl-7.88.1/debian/patches/Use-correct-path-when-loading-libnss-pem-ckbi-.so.patch 2023-03-08 20:57:09.000000000 +0000 @@ -0,0 +1,28 @@ +From: Sergio Durigan Junior +Date: Sun, 5 Mar 2023 12:00:03 -0500 +Subject: Use correct path when loading libnss{pem,ckbi}.so + +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726073 +--- + lib/vtls/nss.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c +index 774cbdd..fbcd0ee 100644 +--- a/lib/vtls/nss.c ++++ b/lib/vtls/nss.c +@@ -255,8 +255,12 @@ static const char *trust_library = "nssckbi.dll"; + static const char *pem_library = "libnsspem.dylib"; + static const char *trust_library = "libnssckbi.dylib"; + #else +-static const char *pem_library = "libnsspem.so"; +-static const char *trust_library = "libnssckbi.so"; ++#ifndef _DEB_HOST_ARCH ++#error "_DEB_HOST_ARCH must be defined" ++#endif ++ ++static const char *pem_library = "/usr/lib/" _DEB_HOST_ARCH "/nss/libnsspem.so"; ++static const char *trust_library = "/usr/lib/" _DEB_HOST_ARCH "/nss/libnssckbi.so"; + #endif + + static SECMODModule *pem_module = NULL; diff -Nru curl-7.88.1/debian/rules curl-7.88.1/debian/rules --- curl-7.88.1/debian/rules 2023-02-20 22:35:53.000000000 +0000 +++ curl-7.88.1/debian/rules 2023-03-08 20:57:09.000000000 +0000 @@ -20,6 +20,15 @@ CONFIGURE_ARGS += --without-libssh --with-libssh2 endif + +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + +export DEB_CFLAGS_MAINT_APPEND = -D_DEB_HOST_ARCH=\"$(DEB_HOST_MULTIARCH)\" +export DEB_CXXFLAGS_MAINT_APPEND = -D_DEB_HOST_ARCH=\"$(DEB_HOST_MULTIARCH)\" + %: dh $@ @@ -58,11 +67,33 @@ cd debian/build-gnutls && dh_auto_build cd debian/build-nss && dh_auto_build +# Test parameters that are passed to runtests.pl. +# -n disables valgrind usage +TESTS_GENERAL_PARAMETERS := -n + +# These tests fail if a IPv6-only builder is used: +# https://bugs.debian.org/1032343 +# https://github.com/curl/curl/issues/10682 +TESTS_FAILS_ON_IPV6_ONLY_MACHINES += $(addprefix ~, 300 301 303 304 306 309 310 325 364 400 401 403 406 407 408 409 410 414 417 560 678 1112 1272 1561 1562 1630 1631 1632 2034 2037 2041 3000 3001) + +TESTS_GENERAL_PARAMETERS += $(TESTS_FAILS_ON_IPV6_ONLY_MACHINES) + override_dh_auto_test: ifeq ($(filter nocheck,$(DEB_BUILD_PROFILES)),) - -cd debian/build && dh_auto_test - -cd debian/build-gnutls && dh_auto_test - -cd debian/build-nss && dh_auto_test +# OpenSSL tests. + cd debian/build && VERBOSE=1 \ + TFLAGS="$(TESTS_GENERAL_PARAMETERS)" \ + $(MAKE) test-nonflaky + +# GnuTLS tests. + cd debian/build-gnutls && VERBOSE=1 \ + TFLAGS="$(TESTS_GENERAL_PARAMETERS)" \ + $(MAKE) test-nonflaky + +# NSS tests. + cd debian/build-nss && VERBOSE=1 \ + TFLAGS="$(TESTS_GENERAL_PARAMETERS)" \ + $(MAKE) test-nonflaky endif override_dh_install: