Rebase debian/patches for upstream/master

debian/patches/ZZZgnutls-build.patch

@@ -16,7 +16,7 @@ Last-Update: 2024-08-05
  7 files changed, 70 insertions(+), 8 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 0b3dc86..0dfc7b8 100644
+index 269d7bd..b87b7cf 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -264,6 +264,16 @@ AS_HELP_STRING([--with-gnutls=PATH],[where to look for GnuTLS, PATH points to th
@@ -37,10 +37,10 @@ index 0b3dc86..0dfc7b8 100644
  AC_ARG_WITH(mbedtls,dnl
  AS_HELP_STRING([--with-mbedtls=PATH],[where to look for mbedTLS, PATH points to the installation root]),[
 diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am
-index 8a731f5..bbfc4f7 100644
+index 91f90cf..13874e1 100644
 --- a/docs/examples/Makefile.am
 +++ b/docs/examples/Makefile.am
-@@ -55,7 +55,7 @@ endif
+@@ -50,7 +50,7 @@ endif
  LIBS = $(BLANK_AT_MAKETIME)
 
  # Dependencies
@@ -50,12 +50,12 @@ index 8a731f5..bbfc4f7 100644
  # This might hold -Werror
  CFLAGS += @CURL_CFLAG_EXTRAS@
 diff --git a/lib/Makefile.am b/lib/Makefile.am
-index cf9c679..31cde47 100644
+index 851cee2..725bfcf 100644
 --- a/lib/Makefile.am
 +++ b/lib/Makefile.am
-@@ -30,7 +30,11 @@ EXTRA_DIST = Makefile.mk config-win32.h config-win32ce.h config-plan9.h \
-  config-amigaos.h config-win32ce.h config-os400.h setup-os400.h         \
-  $(CMAKE_DIST) setup-win32.h .checksrc Makefile.soname optiontable.pl
+@@ -34,7 +34,11 @@ EXTRA_DIST = Makefile.mk config-win32.h config-win32ce.h config-plan9.h \
+  $(CMAKE_DIST) setup-win32.h Makefile.soname optiontable.pl libcurl.def \
+  $(CHECKSRC_DIST)
 
 +if GNUTLSBUILD
 +lib_LTLIBRARIES = libcurl-gnutls.la
@@ -65,7 +65,7 @@ index cf9c679..31cde47 100644
 
  if BUILD_UNITTESTS
  noinst_LTLIBRARIES = libcurlu.la
-@@ -66,55 +70,103 @@ AM_CFLAGS =
+@@ -70,55 +74,103 @@ AM_CFLAGS =
  # Makefile.inc provides the CSOURCES and HHEADERS defines
  include Makefile.inc
 
@@ -185,7 +185,7 @@ index ae978a4..7fd4c07 100644
    global: curl_*;
    local: *;
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 8de938f..41f89cf 100644
+index c1c223b..18391e9 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -72,7 +72,7 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
@@ -198,10 +198,10 @@ index 8de938f..41f89cf 100644
  # if unit tests are enabled, build a static library to link them with
  if BUILD_UNITTESTS
 diff --git a/tests/http/clients/Makefile.am b/tests/http/clients/Makefile.am
-index e9bdda9..acbf34f 100644
+index 007de3c..fca0563 100644
 --- a/tests/http/clients/Makefile.am
 +++ b/tests/http/clients/Makefile.am
-@@ -56,7 +56,7 @@ endif
+@@ -51,7 +51,7 @@ endif
  LIBS = $(BLANK_AT_MAKETIME)
 
  # Dependencies

debian/patches/build-Divide-mit-krb5-gssapi-link-flags-between-LDFLAGS-a.patch

@@ -17,10 +17,10 @@ Signed-off-by: Simon McVittie <[email protected]>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 0dfc7b8..b1ea6fc 100644
+index b87b7cf..dcd8ad6 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1968,7 +1968,8 @@ if test x"$want_gss" = xyes; then
+@@ -1958,7 +1958,8 @@ if test x"$want_gss" = xyes; then
            gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi`
            LIBS="$gss_libs $LIBS"
          elif test "$PKGCONFIG" != "no"; then