Package: release.debian.org
Control: affects -1 + src:curl
X-Debbugs-Cc: c...@packages.debian.org
User: release.debian....@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: sergi...@debian.org, samuel...@debian.org
Severity: normal

Please unblock package curl

[ Reason ]
Changes that affect the resulting binaries:
* d/rules: Remove -D_DEB_HOST_ARCH from curl-config's CFLAGS

We have accidentally introduced a small regression at 7.88.1-3 which
would make the dev packages not multi-arch compatible (even though we
set Multi-Arch: same).
This change fixes that by removing the unneeded build flag that gets
set in the curl-config file.

Changes that don't affect the resulting binaries:
* d/gbp.conf: Push gbp conf with sane defaults
* d/salsa-ci.yml: Disable dh_auto_test with DEB_BUILD_OPTIONS
* d/rules: Add new build profiles to limit builds to a single TLS backend
* d/tests: Add new autopkgtests that runs curl's test suite

The most important one from this list is the inclusion of
autopkgtests, which run all of curl's test suite for each TLS backend
that we support (openssl, gnutls and nss).

[ Impact ]
One multi-arch bugfix and extra reliability/stability of the package
with the inclusion of autopkgtests and salsa-ci (to make stable
updates easier).

[ Tests ]
All build tests passed.

[ Risks ]
No risks that I can think of.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

[ Other info ]
I have also attached a diffoscope diff from the amd64 binary to show
the multi-arch fix's delta.

I'm not in a rush to get the package in testing, but there's also no
harm in removing the bake time for the migration, so I would
appreciate it if that could be done (only if that's not too much work
for the release team).

unblock curl/7.88.1-8

-- 
Samuel Henrique <samueloph>

Attachment: curl_7.88.1-8.debdiff
Description: Binary data

--- libcurl4-openssl-dev_7.88.1-7_amd64.deb
+++ libcurl4-openssl-dev_7.88.1-8_amd64.deb
├── file list
│ @@ -1,3 +1,3 @@
│ --rw-r--r--   0        0        0        4 2023-03-21 22:39:05.000000 debian-binary
│ --rw-r--r--   0        0        0     1672 2023-03-21 22:39:05.000000 control.tar.xz
│ --rw-r--r--   0        0        0   484468 2023-03-21 22:39:05.000000 data.tar.xz
│ +-rw-r--r--   0        0        0        4 2023-03-26 10:36:24.000000 debian-binary
│ +-rw-r--r--   0        0        0     1676 2023-03-26 10:36:24.000000 control.tar.xz
│ +-rw-r--r--   0        0        0   484612 2023-03-26 10:36:24.000000 data.tar.xz
├── control.tar.xz
│ ├── control.tar
│ │ ├── file list
│ │ │ @@ -1,3 +1,3 @@
│ │ │ -drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-21 22:39:05.000000 ./
│ │ │ --rw-r--r--   0 root         (0) root         (0)     1467 2023-03-21 22:39:05.000000 ./control
│ │ │ --rw-r--r--   0 root         (0) root         (0)     1524 2023-03-21 22:39:05.000000 ./md5sums
│ │ │ +drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-26 10:36:24.000000 ./
│ │ │ +-rw-r--r--   0 root         (0) root         (0)     1467 2023-03-26 10:36:24.000000 ./control
│ │ │ +-rw-r--r--   0 root         (0) root         (0)     1524 2023-03-26 10:36:24.000000 ./md5sums
│ │ ├── ./control
│ │ │ @@ -1,14 +1,14 @@
│ │ │  Package: libcurl4-openssl-dev
│ │ │  Source: curl
│ │ │ -Version: 7.88.1-7
│ │ │ +Version: 7.88.1-8
│ │ │  Architecture: amd64
│ │ │  Maintainer: Alessandro Ghedini <gh...@debian.org>
│ │ │  Installed-Size: 1763
│ │ │ -Depends: libcurl4 (= 7.88.1-7)
│ │ │ +Depends: libcurl4 (= 7.88.1-8)
│ │ │  Suggests: libcurl4-doc, libidn-dev, libkrb5-dev, libldap2-dev, librtmp-dev, libssh2-1-dev, libssl-dev, pkg-config, zlib1g-dev
│ │ │  Conflicts: libcurl4-gnutls-dev, libcurl4-nss-dev, libssl1.0-dev
│ │ │  Provides: libcurl-dev, libcurl-ssl-dev, libcurl3-dev, libcurl3-openssl-dev, libcurl4-dev
│ │ │  Section: libdevel
│ │ │  Priority: optional
│ │ │  Multi-Arch: same
│ │ │  Homepage: https://curl.se/
│ │ ├── ./md5sums
│ │ │ ├── ./md5sums
│ │ │ │┄ Files differ
├── data.tar.xz
│ ├── data.tar
│ │ ├── file list
│ │ │ @@ -1,36 +1,36 @@
│ │ │ -drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-21 22:39:05.000000 ./
│ │ │ -drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-21 22:39:05.000000 ./usr/
│ │ │ -drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-21 22:39:05.000000 ./usr/bin/
│ │ │ --rwxr-xr-x   0 root         (0) root         (0)     6465 2023-03-21 22:39:05.000000 ./usr/bin/curl-config
│ │ │ -drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-21 22:39:05.000000 ./usr/include/
│ │ │ -drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-21 22:39:05.000000 ./usr/include/x86_64-linux-gnu/
│ │ │ -drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-21 22:39:05.000000 ./usr/include/x86_64-linux-gnu/curl/
│ │ │ --rw-r--r--   0 root         (0) root         (0)   127742 2023-03-21 22:39:05.000000 ./usr/include/x86_64-linux-gnu/curl/curl.h
│ │ │ --rw-r--r--   0 root         (0) root         (0)     3046 2023-03-21 22:39:05.000000 ./usr/include/x86_64-linux-gnu/curl/curlver.h
│ │ │ --rw-r--r--   0 root         (0) root         (0)     4027 2023-03-21 22:39:05.000000 ./usr/include/x86_64-linux-gnu/curl/easy.h
│ │ │ --rw-r--r--   0 root         (0) root         (0)     2910 2023-03-21 22:39:05.000000 ./usr/include/x86_64-linux-gnu/curl/header.h
│ │ │ --rw-r--r--   0 root         (0) root         (0)     2116 2023-03-21 22:39:05.000000 ./usr/include/x86_64-linux-gnu/curl/mprintf.h
│ │ │ --rw-r--r--   0 root         (0) root         (0)    17317 2023-03-21 22:39:05.000000 ./usr/include/x86_64-linux-gnu/curl/multi.h
│ │ │ --rw-r--r--   0 root         (0) root         (0)     2401 2023-03-21 22:39:05.000000 ./usr/include/x86_64-linux-gnu/curl/options.h
│ │ │ --rw-r--r--   0 root         (0) root         (0)     1362 2023-03-21 22:39:05.000000 ./usr/include/x86_64-linux-gnu/curl/stdcheaders.h
│ │ │ --rw-r--r--   0 root         (0) root         (0)    19123 2023-03-21 22:39:05.000000 ./usr/include/x86_64-linux-gnu/curl/system.h
│ │ │ --rw-r--r--   0 root         (0) root         (0)    43468 2023-03-21 22:39:05.000000 ./usr/include/x86_64-linux-gnu/curl/typecheck-gcc.h
│ │ │ --rw-r--r--   0 root         (0) root         (0)     5395 2023-03-21 22:39:05.000000 ./usr/include/x86_64-linux-gnu/curl/urlapi.h
│ │ │ --rw-r--r--   0 root         (0) root         (0)     2740 2023-03-21 22:39:05.000000 ./usr/include/x86_64-linux-gnu/curl/websockets.h
│ │ │ -drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-21 22:39:05.000000 ./usr/lib/
│ │ │ -drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-21 22:39:05.000000 ./usr/lib/x86_64-linux-gnu/
│ │ │ --rw-r--r--   0 root         (0) root         (0)  1401668 2023-03-21 22:39:05.000000 ./usr/lib/x86_64-linux-gnu/libcurl.a
│ │ │ -drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-21 22:39:05.000000 ./usr/lib/x86_64-linux-gnu/pkgconfig/
│ │ │ --rw-r--r--   0 root         (0) root         (0)     1880 2023-03-21 22:39:05.000000 ./usr/lib/x86_64-linux-gnu/pkgconfig/libcurl.pc
│ │ │ -drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-21 22:39:05.000000 ./usr/share/
│ │ │ -drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-21 22:39:05.000000 ./usr/share/aclocal/
│ │ │ +drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-26 10:36:24.000000 ./
│ │ │ +drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-26 10:36:24.000000 ./usr/
│ │ │ +drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-26 10:36:24.000000 ./usr/bin/
│ │ │ +-rwxr-xr-x   0 root         (0) root         (0)     6428 2023-03-26 10:36:24.000000 ./usr/bin/curl-config
│ │ │ +drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-26 10:36:24.000000 ./usr/include/
│ │ │ +drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-26 10:36:24.000000 ./usr/include/x86_64-linux-gnu/
│ │ │ +drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-26 10:36:24.000000 ./usr/include/x86_64-linux-gnu/curl/
│ │ │ +-rw-r--r--   0 root         (0) root         (0)   127742 2023-03-26 10:36:24.000000 ./usr/include/x86_64-linux-gnu/curl/curl.h
│ │ │ +-rw-r--r--   0 root         (0) root         (0)     3046 2023-03-26 10:36:24.000000 ./usr/include/x86_64-linux-gnu/curl/curlver.h
│ │ │ +-rw-r--r--   0 root         (0) root         (0)     4027 2023-03-26 10:36:24.000000 ./usr/include/x86_64-linux-gnu/curl/easy.h
│ │ │ +-rw-r--r--   0 root         (0) root         (0)     2910 2023-03-26 10:36:24.000000 ./usr/include/x86_64-linux-gnu/curl/header.h
│ │ │ +-rw-r--r--   0 root         (0) root         (0)     2116 2023-03-26 10:36:24.000000 ./usr/include/x86_64-linux-gnu/curl/mprintf.h
│ │ │ +-rw-r--r--   0 root         (0) root         (0)    17317 2023-03-26 10:36:24.000000 ./usr/include/x86_64-linux-gnu/curl/multi.h
│ │ │ +-rw-r--r--   0 root         (0) root         (0)     2401 2023-03-26 10:36:24.000000 ./usr/include/x86_64-linux-gnu/curl/options.h
│ │ │ +-rw-r--r--   0 root         (0) root         (0)     1362 2023-03-26 10:36:24.000000 ./usr/include/x86_64-linux-gnu/curl/stdcheaders.h
│ │ │ +-rw-r--r--   0 root         (0) root         (0)    19123 2023-03-26 10:36:24.000000 ./usr/include/x86_64-linux-gnu/curl/system.h
│ │ │ +-rw-r--r--   0 root         (0) root         (0)    43468 2023-03-26 10:36:24.000000 ./usr/include/x86_64-linux-gnu/curl/typecheck-gcc.h
│ │ │ +-rw-r--r--   0 root         (0) root         (0)     5395 2023-03-26 10:36:24.000000 ./usr/include/x86_64-linux-gnu/curl/urlapi.h
│ │ │ +-rw-r--r--   0 root         (0) root         (0)     2740 2023-03-26 10:36:24.000000 ./usr/include/x86_64-linux-gnu/curl/websockets.h
│ │ │ +drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-26 10:36:24.000000 ./usr/lib/
│ │ │ +drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-26 10:36:24.000000 ./usr/lib/x86_64-linux-gnu/
│ │ │ +-rw-r--r--   0 root         (0) root         (0)  1401668 2023-03-26 10:36:24.000000 ./usr/lib/x86_64-linux-gnu/libcurl.a
│ │ │ +drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-26 10:36:24.000000 ./usr/lib/x86_64-linux-gnu/pkgconfig/
│ │ │ +-rw-r--r--   0 root         (0) root         (0)     1880 2023-03-26 10:36:24.000000 ./usr/lib/x86_64-linux-gnu/pkgconfig/libcurl.pc
│ │ │ +drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-26 10:36:24.000000 ./usr/share/
│ │ │ +drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-26 10:36:24.000000 ./usr/share/aclocal/
│ │ │  -rw-r--r--   0 root         (0) root         (0)    11190 2023-02-13 07:37:04.000000 ./usr/share/aclocal/libcurl.m4
│ │ │ -drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-21 22:39:05.000000 ./usr/share/doc/
│ │ │ -drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-21 22:39:05.000000 ./usr/share/doc/libcurl4-openssl-dev/
│ │ │ --rw-r--r--   0 root         (0) root         (0)     6587 2023-03-21 22:39:05.000000 ./usr/share/doc/libcurl4-openssl-dev/changelog.Debian.gz
│ │ │ +drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-26 10:36:24.000000 ./usr/share/doc/
│ │ │ +drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-26 10:36:24.000000 ./usr/share/doc/libcurl4-openssl-dev/
│ │ │ +-rw-r--r--   0 root         (0) root         (0)     6706 2023-03-26 10:36:24.000000 ./usr/share/doc/libcurl4-openssl-dev/changelog.Debian.gz
│ │ │  -rw-r--r--   0 root         (0) root         (0)    99408 2023-02-20 07:30:43.000000 ./usr/share/doc/libcurl4-openssl-dev/changelog.gz
│ │ │ --rw-r--r--   0 root         (0) root         (0)    19429 2023-03-21 22:39:05.000000 ./usr/share/doc/libcurl4-openssl-dev/copyright
│ │ │ -drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-21 22:39:05.000000 ./usr/share/man/
│ │ │ -drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-21 22:39:05.000000 ./usr/share/man/man1/
│ │ │ --rw-r--r--   0 root         (0) root         (0)     1788 2023-03-21 22:39:05.000000 ./usr/share/man/man1/curl-config.1.gz
│ │ │ -lrwxrwxrwx   0 root         (0) root         (0)        0 2023-03-21 22:39:05.000000 ./usr/lib/x86_64-linux-gnu/libcurl.so -> libcurl.so.4.8.0
│ │ │ +-rw-r--r--   0 root         (0) root         (0)    19429 2023-03-26 10:36:24.000000 ./usr/share/doc/libcurl4-openssl-dev/copyright
│ │ │ +drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-26 10:36:24.000000 ./usr/share/man/
│ │ │ +drwxr-xr-x   0 root         (0) root         (0)        0 2023-03-26 10:36:24.000000 ./usr/share/man/man1/
│ │ │ +-rw-r--r--   0 root         (0) root         (0)     1788 2023-03-26 10:36:24.000000 ./usr/share/man/man1/curl-config.1.gz
│ │ │ +lrwxrwxrwx   0 root         (0) root         (0)        0 2023-03-26 10:36:24.000000 ./usr/lib/x86_64-linux-gnu/libcurl.so -> libcurl.so.4.8.0
│ │ ├── ./usr/bin/curl-config
│ │ │ @@ -169,15 +169,15 @@
│ │ │          else
│ │ │            echo "curl was built with static libraries disabled" >&2
│ │ │            exit 1
│ │ │          fi
│ │ │          ;;
│ │ │  
│ │ │      --configure)
│ │ │ -        echo " '--build='\`dpkg-architecture -qDEB_BUILD_GNU_TYPE\` '--prefix=/usr' '--includedir=${prefix}/include' '--mandir=${prefix}/share/man' '--infodir=${prefix}/share/info' '--sysconfdir=/etc' '--localstatedir=/var' '--disable-option-checking' '--disable-silent-rules' '--libdir=${prefix}/lib/'\`dpkg-architecture -qDEB_HOST_MULTIARCH\` '--runstatedir=/run' '--disable-maintainer-mode' '--disable-dependency-tracking' '--disable-symbol-hiding' '--enable-versioned-symbols' '--enable-threaded-resolver' '--with-lber-lib=lber' '--with-gssapi=/usr' '--with-nghttp2' '--includedir=/usr/include/'\`dpkg-architecture -qDEB_HOST_MULTIARCH\` '--with-zsh-functions-dir=/usr/share/zsh/vendor-completions' '--without-libssh' '--with-libssh2' '--with-openssl' '--with-ca-path=/etc/ssl/certs' '--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt' 'build_alias='\`dpkg-architecture -qDEB_BUILD_GNU_TYPE\` 'CFLAGS=-g -O2  -fstack-protector-strong -Wformat -Werror=format-security -D_DEB_HOST_ARCH=\"x86_64-linux-gnu\"' 'LDFLAGS=-Wl,-z,relro -Wl,-z,now' 'CPPFLAGS=-Wdate-time -D_FORTIFY_SOURCE=2'"
│ │ │ +        echo " '--build='\`dpkg-architecture -qDEB_BUILD_GNU_TYPE\` '--prefix=/usr' '--includedir=${prefix}/include' '--mandir=${prefix}/share/man' '--infodir=${prefix}/share/info' '--sysconfdir=/etc' '--localstatedir=/var' '--disable-option-checking' '--disable-silent-rules' '--libdir=${prefix}/lib/'\`dpkg-architecture -qDEB_HOST_MULTIARCH\` '--runstatedir=/run' '--disable-maintainer-mode' '--disable-dependency-tracking' '--disable-symbol-hiding' '--enable-versioned-symbols' '--enable-threaded-resolver' '--with-lber-lib=lber' '--with-gssapi=/usr' '--with-nghttp2' '--includedir=/usr/include/'\`dpkg-architecture -qDEB_HOST_MULTIARCH\` '--with-zsh-functions-dir=/usr/share/zsh/vendor-completions' '--without-libssh' '--with-libssh2' '--with-openssl' '--with-ca-path=/etc/ssl/certs' '--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt' 'build_alias='\`dpkg-architecture -qDEB_BUILD_GNU_TYPE\` 'CFLAGS=-g -O2  -fstack-protector-strong -Wformat -Werror=format-security ' 'LDFLAGS=-Wl,-z,relro -Wl,-z,now' 'CPPFLAGS=-Wdate-time -D_FORTIFY_SOURCE=2'"
│ │ │          ;;
│ │ │  
│ │ │      *)
│ │ │          echo "unknown option: $1"
│ │ │          usage 1
│ │ │          ;;
│ │ │      esac
│ │ ├── ./usr/share/doc/libcurl4-openssl-dev/changelog.Debian.gz
│ │ │ ├── changelog.Debian
│ │ │ │ @@ -1,7 +1,20 @@
│ │ │ │ +curl (7.88.1-8) unstable; urgency=medium
│ │ │ │ +
│ │ │ │ +  [ Samuel Henrique ]
│ │ │ │ +  * d/gbp.conf: Push gbp conf with sane defaults
│ │ │ │ +  * d/salsa-ci.yml: Disable dh_auto_test with DEB_BUILD_OPTIONS
│ │ │ │ +  * d/rules: Add new build profiles to limit builds to a single TLS backend
│ │ │ │ +  * d/tests: Add new autopkgtests that runs curl's test suite
│ │ │ │ +
│ │ │ │ +  [ Sergio Durigan Junior ]
│ │ │ │ +  * d/rules: Remove -D_DEB_HOST_ARCH from curl-config's CFLAGS.
│ │ │ │ +
│ │ │ │ + -- Samuel Henrique <samuel...@debian.org>  Sun, 26 Mar 2023 11:36:24 +0100
│ │ │ │ +
│ │ │ │  curl (7.88.1-7) unstable; urgency=medium
│ │ │ │  
│ │ │ │    * Bump Standards-Version to 4.6.2
│ │ │ │    * d/p/06_always-disable-valgrind.patch: Remove unused patch
│ │ │ │    * d/patches: Refresh all patches
│ │ │ │    * Import 5 new upstream patches fixing CVES:
│ │ │ │      - CVE-2023-27533: TELNET option IAC injection

Reply via email to