From dc3c05b55f04ade66b39fd66384102b725647ea9 Mon Sep 17 00:00:00 2001 From: Ramakrishnan Muthukrishnan Date: Thu, 3 Aug 2023 18:35:34 -0400 Subject: [PATCH] Build with GnuTLS. Origin: vendor Forwarded: not-needed Reviewed-by: Alessandro Ghedini Last-Update: 2018-05-23 Gbp-Pq: Name 90_gnutls.patch --- docs/examples/Makefile.am | 4 ++-- lib/Makefile.am | 42 +++++++++++++++++----------------- lib/libcurl.vers.in | 2 +- src/Makefile.am | 4 ++-- tests/http/clients/Makefile.am | 4 ++-- tests/http/clients/Makefile.in | 32 +++++++++++++------------- tests/libtest/Makefile.am | 8 +++---- 7 files changed, 48 insertions(+), 48 deletions(-) diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am index 80ccc592..750000e8 100644 --- a/docs/examples/Makefile.am +++ b/docs/examples/Makefile.am @@ -51,9 +51,9 @@ LIBS = $(BLANK_AT_MAKETIME) # Dependencies if USE_EXPLICIT_LIB_DEPS -LDADD = $(LIBDIR)/libcurl.la @LIBCURL_LIBS@ +LDADD = $(LIBDIR)/libcurl-gnutls.la @LIBCURL_LIBS@ else -LDADD = $(LIBDIR)/libcurl.la +LDADD = $(LIBDIR)/libcurl-gnutls.la endif # This might hold -Werror diff --git a/lib/Makefile.am b/lib/Makefile.am index 3c0a7091..30c38f91 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -31,7 +31,7 @@ EXTRA_DIST = Makefile.mk config-win32.h config-win32ce.h config-plan9.h \ config-os400.h setup-os400.h $(CMAKE_DIST) setup-win32.h .checksrc \ Makefile.soname -lib_LTLIBRARIES = libcurl.la +lib_LTLIBRARIES = libcurl-gnutls.la if BUILD_UNITTESTS noinst_LTLIBRARIES = libcurlu.la @@ -67,55 +67,55 @@ AM_CFLAGS = # Makefile.inc provides the CSOURCES and HHEADERS defines include Makefile.inc -libcurl_la_SOURCES = $(CSOURCES) $(HHEADERS) -libcurlu_la_SOURCES = $(CSOURCES) $(HHEADERS) +libcurl_gnutls_la_SOURCES = $(CSOURCES) $(HHEADERS) +libcurlu_gnutls_la_SOURCES = $(CSOURCES) $(HHEADERS) -libcurl_la_CPPFLAGS_EXTRA = -libcurl_la_LDFLAGS_EXTRA = -libcurl_la_CFLAGS_EXTRA = +libcurl_gnutls_la_CPPFLAGS_EXTRA = +libcurl_gnutls_la_LDFLAGS_EXTRA = +libcurl_gnutls_la_CFLAGS_EXTRA = if CURL_LT_SHLIB_USE_VERSION_INFO -libcurl_la_LDFLAGS_EXTRA += $(VERSIONINFO) +libcurl_gnutls_la_LDFLAGS_EXTRA += $(VERSIONINFO) endif if CURL_LT_SHLIB_USE_NO_UNDEFINED -libcurl_la_LDFLAGS_EXTRA += -no-undefined +libcurl_gnutls_la_LDFLAGS_EXTRA += -no-undefined endif if CURL_LT_SHLIB_USE_MIMPURE_TEXT -libcurl_la_LDFLAGS_EXTRA += -mimpure-text +libcurl_gnutls_la_LDFLAGS_EXTRA += -mimpure-text endif if CURL_LT_SHLIB_USE_VERSIONED_SYMBOLS -libcurl_la_LDFLAGS_EXTRA += -Wl,--version-script=libcurl.vers +libcurl_gnutls_la_LDFLAGS_EXTRA += -Wl,--version-script=libcurl.vers else # if symbol-hiding is enabled, hide them! if DOING_CURL_SYMBOL_HIDING -libcurl_la_LDFLAGS_EXTRA += -export-symbols-regex '^curl_.*' +libcurl_gnutls_la_LDFLAGS_EXTRA += -export-symbols-regex '^curl_.*' endif endif if USE_CPPFLAG_CURL_STATICLIB -libcurl_la_CPPFLAGS_EXTRA += -DCURL_STATICLIB +libcurl_gnutls_la_CPPFLAGS_EXTRA += -DCURL_STATICLIB else if HAVE_WINDRES -libcurl_la_SOURCES += $(LIB_RCFILES) +libcurl_gnutls_la_SOURCES += $(LIB_RCFILES) $(LIB_RCFILES): $(top_srcdir)/include/curl/curlver.h endif endif if DOING_CURL_SYMBOL_HIDING -libcurl_la_CPPFLAGS_EXTRA += -DCURL_HIDDEN_SYMBOLS -libcurl_la_CFLAGS_EXTRA += $(CFLAG_CURL_SYMBOL_HIDING) +libcurl_gnutls_la_CPPFLAGS_EXTRA += -DCURL_HIDDEN_SYMBOLS +libcurl_gnutls_la_CFLAGS_EXTRA += $(CFLAG_CURL_SYMBOL_HIDING) endif -libcurl_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcurl_la_CPPFLAGS_EXTRA) -libcurl_la_LDFLAGS = $(AM_LDFLAGS) $(libcurl_la_LDFLAGS_EXTRA) $(LDFLAGS) $(LIBCURL_LIBS) -libcurl_la_CFLAGS = $(AM_CFLAGS) $(libcurl_la_CFLAGS_EXTRA) +libcurl_gnutls_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcurl_gnutls_la_CPPFLAGS_EXTRA) +libcurl_gnutls_la_LDFLAGS = $(AM_LDFLAGS) $(libcurl_gnutls_la_LDFLAGS_EXTRA) $(LDFLAGS) $(LIBCURL_LIBS) +libcurl_gnutls_la_CFLAGS = $(AM_CFLAGS) $(libcurl_gnutls_la_CFLAGS_EXTRA) -libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_STATICLIB -DUNITTESTS -libcurlu_la_LDFLAGS = $(AM_LDFLAGS) -static $(LIBCURL_LIBS) -libcurlu_la_CFLAGS = $(AM_CFLAGS) +libcurlu_gnutls_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_STATICLIB -DUNITTESTS +libcurlu_gnutls_la_LDFLAGS = $(AM_LDFLAGS) -static $(LIBCURL_LIBS) +libcurlu_gnutls_la_CFLAGS = $(AM_CFLAGS) CHECKSRC = $(CS_$(V)) CS_0 = @echo " RUN " $@; diff --git a/lib/libcurl.vers.in b/lib/libcurl.vers.in index ae978a48..bce56334 100644 --- a/lib/libcurl.vers.in +++ b/lib/libcurl.vers.in @@ -6,7 +6,7 @@ HIDDEN _save*; }; -CURL_@CURL_LT_SHLIB_VERSIONED_FLAVOUR@4 +CURL_@CURL_LT_SHLIB_VERSIONED_FLAVOUR@3 { global: curl_*; local: *; diff --git a/src/Makefile.am b/src/Makefile.am index ddeb7007..06d64f75 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -68,9 +68,9 @@ CFLAGS += @CURL_CFLAG_EXTRAS@ LIBS = $(BLANK_AT_MAKETIME) if USE_EXPLICIT_LIB_DEPS -curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@ +curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @LIBCURL_LIBS@ else -curl_LDADD = $(top_builddir)/lib/libcurl.la @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@ +curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@ endif # if unit tests are enabled, build a static library to link them with diff --git a/tests/http/clients/Makefile.am b/tests/http/clients/Makefile.am index 8fdc190b..ddc9be46 100644 --- a/tests/http/clients/Makefile.am +++ b/tests/http/clients/Makefile.am @@ -51,9 +51,9 @@ LIBS = $(BLANK_AT_MAKETIME) # Dependencies if USE_EXPLICIT_LIB_DEPS -LDADD = $(LIBDIR)/libcurl.la @LIBCURL_LIBS@ +LDADD = $(LIBDIR)/libcurl-gnutls.la @LIBCURL_LIBS@ else -LDADD = $(LIBDIR)/libcurl.la +LDADD = $(LIBDIR)/libcurl-gnutls.la endif # This might hold -Werror diff --git a/tests/http/clients/Makefile.in b/tests/http/clients/Makefile.in index 356a2b8f..61b61a76 100644 --- a/tests/http/clients/Makefile.in +++ b/tests/http/clients/Makefile.in @@ -179,9 +179,9 @@ h2_download_SOURCES = h2-download.c h2_download_OBJECTS = h2-download.$(OBJEXT) h2_download_LDADD = $(LDADD) @USE_EXPLICIT_LIB_DEPS_FALSE@h2_download_DEPENDENCIES = \ -@USE_EXPLICIT_LIB_DEPS_FALSE@ $(LIBDIR)/libcurl.la +@USE_EXPLICIT_LIB_DEPS_FALSE@ $(LIBDIR)/libcurl-gnutls.la @USE_EXPLICIT_LIB_DEPS_TRUE@h2_download_DEPENDENCIES = \ -@USE_EXPLICIT_LIB_DEPS_TRUE@ $(LIBDIR)/libcurl.la +@USE_EXPLICIT_LIB_DEPS_TRUE@ $(LIBDIR)/libcurl-gnutls.la AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -190,44 +190,44 @@ h2_pausing_SOURCES = h2-pausing.c h2_pausing_OBJECTS = h2-pausing.$(OBJEXT) h2_pausing_LDADD = $(LDADD) @USE_EXPLICIT_LIB_DEPS_FALSE@h2_pausing_DEPENDENCIES = \ -@USE_EXPLICIT_LIB_DEPS_FALSE@ $(LIBDIR)/libcurl.la +@USE_EXPLICIT_LIB_DEPS_FALSE@ $(LIBDIR)/libcurl-gnutls.la @USE_EXPLICIT_LIB_DEPS_TRUE@h2_pausing_DEPENDENCIES = \ -@USE_EXPLICIT_LIB_DEPS_TRUE@ $(LIBDIR)/libcurl.la +@USE_EXPLICIT_LIB_DEPS_TRUE@ $(LIBDIR)/libcurl-gnutls.la h2_serverpush_SOURCES = h2-serverpush.c h2_serverpush_OBJECTS = h2-serverpush.$(OBJEXT) h2_serverpush_LDADD = $(LDADD) @USE_EXPLICIT_LIB_DEPS_FALSE@h2_serverpush_DEPENDENCIES = \ -@USE_EXPLICIT_LIB_DEPS_FALSE@ $(LIBDIR)/libcurl.la +@USE_EXPLICIT_LIB_DEPS_FALSE@ $(LIBDIR)/libcurl-gnutls.la @USE_EXPLICIT_LIB_DEPS_TRUE@h2_serverpush_DEPENDENCIES = \ -@USE_EXPLICIT_LIB_DEPS_TRUE@ $(LIBDIR)/libcurl.la +@USE_EXPLICIT_LIB_DEPS_TRUE@ $(LIBDIR)/libcurl-gnutls.la h2_upgrade_extreme_SOURCES = h2-upgrade-extreme.c h2_upgrade_extreme_OBJECTS = h2-upgrade-extreme.$(OBJEXT) h2_upgrade_extreme_LDADD = $(LDADD) @USE_EXPLICIT_LIB_DEPS_FALSE@h2_upgrade_extreme_DEPENDENCIES = \ -@USE_EXPLICIT_LIB_DEPS_FALSE@ $(LIBDIR)/libcurl.la +@USE_EXPLICIT_LIB_DEPS_FALSE@ $(LIBDIR)/libcurl-gnutls.la @USE_EXPLICIT_LIB_DEPS_TRUE@h2_upgrade_extreme_DEPENDENCIES = \ -@USE_EXPLICIT_LIB_DEPS_TRUE@ $(LIBDIR)/libcurl.la +@USE_EXPLICIT_LIB_DEPS_TRUE@ $(LIBDIR)/libcurl-gnutls.la tls_session_reuse_SOURCES = tls-session-reuse.c tls_session_reuse_OBJECTS = tls-session-reuse.$(OBJEXT) tls_session_reuse_LDADD = $(LDADD) @USE_EXPLICIT_LIB_DEPS_FALSE@tls_session_reuse_DEPENDENCIES = \ -@USE_EXPLICIT_LIB_DEPS_FALSE@ $(LIBDIR)/libcurl.la +@USE_EXPLICIT_LIB_DEPS_FALSE@ $(LIBDIR)/libcurl-gnutls.la @USE_EXPLICIT_LIB_DEPS_TRUE@tls_session_reuse_DEPENDENCIES = \ -@USE_EXPLICIT_LIB_DEPS_TRUE@ $(LIBDIR)/libcurl.la +@USE_EXPLICIT_LIB_DEPS_TRUE@ $(LIBDIR)/libcurl-gnutls.la ws_data_SOURCES = ws-data.c ws_data_OBJECTS = ws-data.$(OBJEXT) ws_data_LDADD = $(LDADD) @USE_EXPLICIT_LIB_DEPS_FALSE@ws_data_DEPENDENCIES = \ -@USE_EXPLICIT_LIB_DEPS_FALSE@ $(LIBDIR)/libcurl.la +@USE_EXPLICIT_LIB_DEPS_FALSE@ $(LIBDIR)/libcurl-gnutls.la @USE_EXPLICIT_LIB_DEPS_TRUE@ws_data_DEPENDENCIES = \ -@USE_EXPLICIT_LIB_DEPS_TRUE@ $(LIBDIR)/libcurl.la +@USE_EXPLICIT_LIB_DEPS_TRUE@ $(LIBDIR)/libcurl-gnutls.la ws_pingpong_SOURCES = ws-pingpong.c ws_pingpong_OBJECTS = ws-pingpong.$(OBJEXT) ws_pingpong_LDADD = $(LDADD) @USE_EXPLICIT_LIB_DEPS_FALSE@ws_pingpong_DEPENDENCIES = \ -@USE_EXPLICIT_LIB_DEPS_FALSE@ $(LIBDIR)/libcurl.la +@USE_EXPLICIT_LIB_DEPS_FALSE@ $(LIBDIR)/libcurl-gnutls.la @USE_EXPLICIT_LIB_DEPS_TRUE@ws_pingpong_DEPENDENCIES = \ -@USE_EXPLICIT_LIB_DEPS_TRUE@ $(LIBDIR)/libcurl.la +@USE_EXPLICIT_LIB_DEPS_TRUE@ $(LIBDIR)/libcurl-gnutls.la AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -536,10 +536,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/lib \ -I$(top_srcdir)/lib -DCURL_DISABLE_DEPRECATION \ -DCURL_NO_OLDIES $(am__append_1) LIBDIR = $(top_builddir)/lib -@USE_EXPLICIT_LIB_DEPS_FALSE@LDADD = $(LIBDIR)/libcurl.la +@USE_EXPLICIT_LIB_DEPS_FALSE@LDADD = $(LIBDIR)/libcurl-gnutls.la # Dependencies -@USE_EXPLICIT_LIB_DEPS_TRUE@LDADD = $(LIBDIR)/libcurl.la @LIBCURL_LIBS@ +@USE_EXPLICIT_LIB_DEPS_TRUE@LDADD = $(LIBDIR)/libcurl-gnutls.la @LIBCURL_LIBS@ CHECKSRC = $(CS_$(V)) CS_0 = @echo " RUN " $@; CS_1 = diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index 09a13914..6b80e6dd 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -49,11 +49,11 @@ CLEANFILES = lib1521.c LIBS = $(BLANK_AT_MAKETIME) if USE_EXPLICIT_LIB_DEPS -SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@ -TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@ +SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @LIBCURL_LIBS@ +TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @LIBCURL_LIBS@ 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-gnutls.la @CURL_NETWORK_LIBS@ +TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @CURL_NETWORK_AND_TIME_LIBS@ endif # Dependencies (may need to be overridden) -- 2.30.2