diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -81,5 +81,6 @@ libcurl-gnutls.so.4:curl_url_dup libcurl-gnutls.so.4:curl_url_get libcurl-gnutls.so.4:curl_url_set +libcurl-gnutls.so.4:curl_url_strerror libcurl-gnutls.so.4:curl_version libcurl-gnutls.so.4:curl_version_info diff --git a/abi_symbols32 b/abi_symbols32 --- a/abi_symbols32 +++ b/abi_symbols32 @@ -81,5 +81,6 @@ libcurl-gnutls.so.4:curl_url_dup libcurl-gnutls.so.4:curl_url_get libcurl-gnutls.so.4:curl_url_set +libcurl-gnutls.so.4:curl_url_strerror libcurl-gnutls.so.4:curl_version libcurl-gnutls.so.4:curl_version_info diff --git a/abi_used_symbols b/abi_used_symbols --- a/abi_used_symbols +++ b/abi_used_symbols @@ -75,7 +75,6 @@ libc.so.6:strcpy libc.so.6:strcspn libc.so.6:strdup -libc.so.6:strerror libc.so.6:strftime libc.so.6:strlen libc.so.6:strncmp diff --git a/abi_used_symbols32 b/abi_used_symbols32 --- a/abi_used_symbols32 +++ b/abi_used_symbols32 @@ -75,7 +75,6 @@ libc.so.6:strcpy libc.so.6:strcspn libc.so.6:strdup -libc.so.6:strerror libc.so.6:strftime libc.so.6:strlen libc.so.6:strncmp diff --git a/files/0001-Use-gnutls.patch b/files/0001-Use-gnutls.patch deleted file mode 100644 --- a/files/0001-Use-gnutls.patch +++ /dev/null @@ -1,148 +0,0 @@ -From 95a1ee83728445f3ce325d82bdbfe49c60cc6be5 Mon Sep 17 00:00:00 2001 -From: Pierre-Yves -Date: Wed, 6 Feb 2019 18:01:35 +0100 -Subject: [PATCH] Use gnutls - -Signed-off-by: Pierre-Yves ---- - docs/examples/Makefile.am | 4 ++-- - lib/Makefile.am | 32 ++++++++++++++++---------------- - src/Makefile.am | 4 ++-- - tests/libtest/Makefile.am | 8 ++++---- - 4 files changed, 24 insertions(+), 24 deletions(-) - -diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am -index e3845e0..90db468 100644 ---- a/docs/examples/Makefile.am -+++ b/docs/examples/Makefile.am -@@ -48,9 +48,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 f2034a2..abaa036 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -31,7 +31,7 @@ EXTRA_DIST = Makefile.m32 config-win32.h \ - config-tpf.h mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST) \ - firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl - --lib_LTLIBRARIES = libcurl.la -+lib_LTLIBRARIES = libcurl-gnutls.la - - if BUILD_UNITTESTS - noinst_LTLIBRARIES = libcurlu.la -@@ -83,43 +83,43 @@ AM_CPPFLAGS += -DBUILDING_LIBCURL - AM_LDFLAGS = - AM_CFLAGS = - --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 - 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) -@@ -128,7 +128,7 @@ libcurlu_la_CFLAGS = $(AM_CFLAGS) - # Makefile.inc provides the CSOURCES and HHEADERS defines - include Makefile.inc - --libcurl_la_SOURCES = $(CSOURCES) $(HHEADERS) -+libcurl_gnutls_la_SOURCES = $(CSOURCES) $(HHEADERS) - libcurlu_la_SOURCES = $(CSOURCES) $(HHEADERS) - - checksrc: -diff --git a/src/Makefile.am b/src/Makefile.am -index 2b4c231..95388c7 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -61,9 +61,9 @@ CFLAGS += @CURL_CFLAG_EXTRAS@ - LIBS = $(BLANK_AT_MAKETIME) - - if USE_EXPLICIT_LIB_DEPS --curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@ -+curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@ - else --curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@ -+curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@ - endif - - curl_LDFLAGS = @LIBMETALINK_LDFLAGS@ -diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am -index 56c84a7..27c24f6 100644 ---- a/tests/libtest/Makefile.am -+++ b/tests/libtest/Makefile.am -@@ -57,11 +57,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@ @NSS_LIBS@ --TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_AND_TIME_LIBS@ @NSS_LIBS@ -+SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @CURL_NETWORK_LIBS@ @NSS_LIBS@ -+TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @CURL_NETWORK_AND_TIME_LIBS@ @NSS_LIBS@ - endif - - # Dependencies (may need to be overridden) --- -2.20.1 - diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,42 +1,44 @@ name : curl-gnutls -version : 7.76.1 -release : 40 +version : 7.82.0 +release : 41 source : - - https://github.com/curl/curl/releases/download/curl-7_76_1/curl-7.76.1.tar.xz : 64bb5288c39f0840c07d077e30d9052e1cbb9fa6c2dc52523824cc859e679145 + - https://github.com/curl/curl/releases/download/curl-7_82_0/curl-7.82.0.tar.xz : 0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c homepage : https://curl.haxx.se license : MIT component : binary.compat emul32 : yes -summary : curl-gnutls (GnuTLS version of curl) +summary : GnuTLS version of curl description: | This package provides binary compatibility only and enables the running of content expecting a GnuTLS version of curl. It is forbidden to build against it. builddeps : - pkgconfig32(nettle) - - pkgconfig32(p11-kit-1) - pkgconfig32(gnutls) - pkgconfig32(zlib) - - libunistring-32bit-devel - - libtool-32bit - - gmp-32bit-devel + - patchelf setup : | - %patch -N -p1 < $pkgfiles/0001-Use-gnutls.patch - %reconfigure %configure --disable-static \ --enable-threaded-resolver \ --disable-libcurl-option \ --with-gnutls \ - --with-ca-path=/etc/ssl/certs \ - --without-openssl \ - --without-ssl + --with-ca-path=/etc/ssl/certs build : | %make install : | %make_install - # Only ship libraries + # Only ship libraries. for i in /usr/bin /usr/share %libdir%/pkgconfig /usr/include; do rm -rfv "$installdir/$i" done - # Forbid linking too + # Forbid linking too. Keep only versioned sonames. rm $installdir/%libdir%/*.so - # Skip any potential .la files - rm -f $installdir/%libdir%/*.la || : + rm $installdir/%libdir%/*.la + # Don't collide with OpenSSL-based curl. + pushd $installdir/%libdir% + for name in libcurl*; do + gnuname=$(echo $name | sed 's|libcurl|libcurl-gnutls|') + if [ -L $name ]; then + patchelf --set-soname $gnuname $name + fi + mv $name $gnuname + done + popd diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -3,19 +3,19 @@ curl-gnutls https://curl.haxx.se - F. von Gellhorn - flinux@vongellhorn.ch + Fabio Forni + livingsilver94.solus@redaril.me MIT binary.compat - curl-gnutls (GnuTLS version of curl) + GnuTLS version of curl This package provides binary compatibility only and enables the running of content expecting a GnuTLS version of curl. It is forbidden to build against it. https://getsol.us/sources/README.Solus curl-gnutls - curl-gnutls (GnuTLS version of curl) + GnuTLS version of curl This package provides binary compatibility only and enables the running of content expecting a GnuTLS version of curl. It is forbidden to build against it. binary.compat @@ -31,7 +31,7 @@ emul32 - curl-gnutls + curl-gnutls /usr/lib32/libcurl-gnutls.so.4 @@ -39,12 +39,12 @@ - - 2021-06-20 - 7.76.1 + + 2022-03-19 + 7.82.0 Packaging update - F. von Gellhorn - flinux@vongellhorn.ch + Fabio Forni + livingsilver94.solus@redaril.me \ No newline at end of file