Rebase debian/patches for upstream/master

debian/patches/ZZZgnutls-build.patch

@@ -7,16 +7,16 @@ Forwarded: not-needed
 Last-Update: 2024-08-05
 ---
  configure.ac                   | 10 ++++++++
- docs/examples/Makefile.am      |  4 +--
+ docs/examples/Makefile.am      |  2 +-
  lib/Makefile.am                | 56 ++++++++++++++++++++++++++++++++++++++++--
  lib/libcurl.vers.in            |  2 +-
- src/Makefile.am                |  4 +--
- tests/http/clients/Makefile.am |  4 +--
- tests/libtest/Makefile.am      |  8 +++---
- 7 files changed, 75 insertions(+), 13 deletions(-)
+ src/Makefile.am                |  2 +-
+ tests/http/clients/Makefile.am |  2 +-
+ tests/libtest/Makefile.am      |  4 +--
+ 7 files changed, 70 insertions(+), 8 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 9e1ecb7..c6c0876 100644
+index 0b3dc86..0dfc7b8 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,21 +37,18 @@ index 9e1ecb7..c6c0876 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 3cccbdd..fadd081 100644
+index 8a731f5..bbfc4f7 100644
 --- a/docs/examples/Makefile.am
 +++ b/docs/examples/Makefile.am
-@@ -51,9 +51,9 @@ LIBS = $(BLANK_AT_MAKETIME)
+@@ -55,7 +55,7 @@ endif
+ LIBS = $(BLANK_AT_MAKETIME)
 
  # Dependencies
- if USE_EXPLICIT_LIB_DEPS
 -LDADD = $(LIBDIR)/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
 +LDADD = $(LIBDIR)/$(LIBCURL_FILESTUB).la @LIBCURL_PC_LIBS_PRIVATE@
- else
--LDADD = $(LIBDIR)/libcurl.la
-+LDADD = $(LIBDIR)/$(LIBCURL_FILESTUB).la
- endif
 
  # This might hold -Werror
+ CFLAGS += @CURL_CFLAG_EXTRAS@
 diff --git a/lib/Makefile.am b/lib/Makefile.am
 index cf9c679..31cde47 100644
 --- a/lib/Makefile.am
@@ -188,54 +185,43 @@ index ae978a4..7fd4c07 100644
    global: curl_*;
    local: *;
 diff --git a/src/Makefile.am b/src/Makefile.am
-index a68e5c5..09e8047 100644
+index 8de938f..41f89cf 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -73,9 +73,9 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
+@@ -72,7 +72,7 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
+ # Prevent LIBS from being used for all link targets
  LIBS = $(BLANK_AT_MAKETIME)
 
- if USE_EXPLICIT_LIB_DEPS
 -curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
 +curl_LDADD = $(top_builddir)/lib/$(LIBCURL_FILESTUB).la @LIBCURL_PC_LIBS_PRIVATE@
- else
--curl_LDADD = $(top_builddir)/lib/libcurl.la @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
-+curl_LDADD = $(top_builddir)/lib/$(LIBCURL_FILESTUB).la @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
- endif
 
  # 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 efe0d95..5097e98 100644
+index e9bdda9..acbf34f 100644
 --- a/tests/http/clients/Makefile.am
 +++ b/tests/http/clients/Makefile.am
-@@ -52,9 +52,9 @@ LIBS = $(BLANK_AT_MAKETIME)
+@@ -56,7 +56,7 @@ endif
+ LIBS = $(BLANK_AT_MAKETIME)
 
  # Dependencies
- if USE_EXPLICIT_LIB_DEPS
 -LDADD = $(LIBDIR)/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
 +LDADD = $(LIBDIR)/$(LIBCURL_FILESTUB).la @LIBCURL_PC_LIBS_PRIVATE@
- else
--LDADD = $(LIBDIR)/libcurl.la
-+LDADD = $(LIBDIR)/$(LIBCURL_FILESTUB).la
- endif
 
  # This might hold -Werror
+ CFLAGS += @CURL_CFLAG_EXTRAS@
 diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
-index f03a687..413e0e6 100644
+index 2e360ca..3123810 100644
 --- a/tests/libtest/Makefile.am
 +++ b/tests/libtest/Makefile.am
-@@ -49,11 +49,11 @@ CLEANFILES = lib1521.c
+@@ -48,8 +48,8 @@ CLEANFILES = lib1521.c
+ # Prevent LIBS from being used for all link targets
  LIBS = $(BLANK_AT_MAKETIME)
 
- if USE_EXPLICIT_LIB_DEPS
 -SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
 -TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
 +SUPPORTFILES_LIBS = $(top_builddir)/lib/$(LIBCURL_FILESTUB).la @LIBCURL_PC_LIBS_PRIVATE@
 +TESTUTIL_LIBS = $(top_builddir)/lib/$(LIBCURL_FILESTUB).la @LIBCURL_PC_LIBS_PRIVATE@
- else
--SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_LIBS@
--TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_AND_TIME_LIBS@
-+SUPPORTFILES_LIBS = $(top_builddir)/lib/$(LIBCURL_FILESTUB).la @CURL_NETWORK_LIBS@
-+TESTUTIL_LIBS = $(top_builddir)/lib/$(LIBCURL_FILESTUB).la @CURL_NETWORK_AND_TIME_LIBS@
- endif
 
  # Dependencies (may need to be overridden)
+ LDADD = $(SUPPORTFILES_LIBS)

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

@@ -17,16 +17,16 @@ Signed-off-by: Simon McVittie <[email protected]>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index c6c0876..e2d6566 100644
+index 0dfc7b8..b1ea6fc 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1941,7 +1941,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
--           gss_libs=`$PKGCONFIG --libs mit-krb5-gssapi`
-+           LDFLAGS="$LDFLAGS `$PKGCONFIG --libs-only-L mit-krb5-gssapi`"
-+           gss_libs=`$PKGCONFIG --libs-only-l mit-krb5-gssapi`
-            LIBS="$gss_libs $LIBS"
+@@ -1968,7 +1968,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
+-          gss_libs=`$PKGCONFIG --libs mit-krb5-gssapi`
++          LDFLAGS="$LDFLAGS `$PKGCONFIG --libs-only-L mit-krb5-gssapi`"
++          gss_libs=`$PKGCONFIG --libs-only-l mit-krb5-gssapi`
+           LIBS="$gss_libs $LIBS"
          elif test -f "$KRB5CONFIG"; then
-            dnl krb5-config doesn't have --libs-only-L or similar, put everything
+           dnl krb5-config doesn't have --libs-only-L or similar, put everything