Merge branch 'rawhide' into private-kdudka-libcurl-nss

Merge branch 'master' into private-kdudka-libcurl-nss
disable test 308, which does not work well with NSS
2022-06-23 13:14:46 +02:00 · 2019-08-30 15:01:22 +02:00 · 2019-03-06 13:10:10 +01:00 · 2019-03-06 12:34:56 +01:00 · 2018-06-27 12:34:42 +02:00 · 2018-05-09 16:42:02 +02:00
1 changed files with 13 additions and 9 deletions
--- a/curl.spec
+++ b/curl.spec
@ -28,10 +28,11 @@ BuildRequires: libpsl-devel
 BuildRequires: libssh-devel
 BuildRequires: libtool
 BuildRequires: make
+BuildRequires: nss-devel
 BuildRequires: openldap-devel
 BuildRequires: openssh-clients
 BuildRequires: openssh-server
-BuildRequires: openssl-devel
+BuildRequires: openssl
 BuildRequires: perl-interpreter
 BuildRequires: pkgconfig
 BuildRequires: python-unversioned-command
@ -106,11 +107,6 @@ Requires: libcurl%{?_isa} >= %{version}-%{release}
 # to ensure that we have the necessary symbols available (#525002, #642796)
 %global libssh_version %(pkg-config --modversion libssh 2>/dev/null || echo 0)

-# require at least the version of openssl-libs that we were built against,
-# to ensure that we have the necessary symbols available (#1462184, #1462211)
-# (we need to translate 3.0.0-alpha16 -> 3.0.0-0.alpha16 and 3.0.0-beta1 -> 3.0.0-0.beta1 though)
-%global openssl_version %({ pkg-config --modversion openssl 2>/dev/null || echo 0;} | sed 's|-|-0.|')
-
 %description
 curl is a command line tool for transferring data with URL syntax, supporting
 FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS, FILE, IMAP,
@ -123,10 +119,13 @@ resume, proxy tunneling and a busload of other useful tricks.
 Summary: A library for getting files from web servers
 Requires: libpsl%{?_isa} >= %{libpsl_version}
 Requires: libssh%{?_isa} >= %{libssh_version}
-Requires: openssl-libs%{?_isa} >= 1:%{openssl_version}
 Provides: libcurl-full = %{version}-%{release}
 Provides: libcurl-full%{?_isa} = %{version}-%{release}

+# libnsspem.so is no longer included in the nss package (#1347336)
+BuildRequires: nss-pem
+Requires: nss-pem%{?_isa}
+
 %description -n libcurl
 libcurl is a free and easy-to-use client-side URL transfer library, supporting
 FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS, FILE, IMAP,
@ -166,7 +165,6 @@ be installed.

 %package -n libcurl-minimal
 Summary: Conservatively configured build of libcurl for minimal installations
-Requires: openssl-libs%{?_isa} >= 1:%{openssl_version}
 Provides: libcurl = %{version}-%{release}
 Provides: libcurl%{?_isa} = %{version}-%{release}
 Conflicts: libcurl%{?_isa}
@ -174,6 +172,9 @@ RemovePathPostfixes: .minimal
 # needed for RemovePathPostfixes to work with shared libraries
 %undefine __brp_ldconfig

+# libnsspem.so is no longer included in the nss package (#1347336)
+Requires: nss-pem%{?_isa}
+
 %description -n libcurl-minimal
 This is a replacement of the 'libcurl' package for minimal installations.  It
 comes with a limited set of features compared to the 'libcurl' package.  On the
@ -247,7 +248,7 @@ export common_configure_opts="          \
    --with-gssapi                       \
    --with-libidn2                      \
    --with-nghttp2                      \
-    --with-ssl --with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt"
+    --without-ssl --with-nss-deprecated --without-ca-bundle"

 %global _configure ../configure

@ -411,6 +412,9 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
 %{_libdir}/libcurl.so.4.[0-9].[0-9].minimal

 %changelog
+* Thu Jun 23 2022 Kamil Dudka <kdudka@redhat.com> - 7.83.1-1.1
+- switch the TLS backend back to NSS (#1445153)
+
 * Wed May 11 2022 Kamil Dudka <kdudka@redhat.com> - 7.83.1-1
 - new upstream release, which fixes the following vulnerabilities
    CVE-2022-27782 - fix too eager reuse of TLS and SSH connections
Author	SHA1	Message	Date
Kamil Dudka	2b62541dd4	Merge branch 'rawhide' into private-kdudka-libcurl-nss	2022-06-23 13:14:46 +02:00
Kamil Dudka	5cb54f9fae	Merge branch 'master' into private-kdudka-libcurl-nss	2019-08-30 15:01:22 +02:00
Kamil Dudka	fc0f22f372	disable test 308, which does not work well with NSS	2019-03-06 13:10:10 +01:00
Kamil Dudka	fe8b4e20c5	Merge branch 'master' into private-kdudka-libcurl-nss	2019-03-06 12:34:56 +01:00
Kamil Dudka	e30c7b58d7	sync with master	2018-06-27 12:34:42 +02:00
Kamil Dudka	88ca5c2221	Merge branch 'master' into private-kdudka-libcurl-nss	2018-05-09 16:42:02 +02:00
Kamil Dudka	c1d44e0d4f	Merge branch 'master' into private-kdudka-libcurl-nss	2018-02-01 14:06:36 +01:00
Kamil Dudka	e4fbb99ee7	Merge branch 'master' into private-kdudka-libcurl-nss	2018-02-01 13:51:26 +01:00
Kamil Dudka	50bd86bb95	Merge branch 'master' into private-kdudka-libcurl-nss ... and revert the libssh2 -> libssh change, too	2018-01-30 16:51:15 +01:00
Kamil Dudka	bec46647ae	Merge branch 'master' into private-kdudka-libcurl-nss	2018-01-21 10:37:26 +01:00
Kamil Dudka	f6dc98fccb	Merge branch 'master' into private-kdudka-libcurl-nss	2017-10-10 10:13:39 +02:00
Kamil Dudka	ca1a62d2d0	Merge branch 'master' into private-kdudka-libcurl-nss	2017-08-29 18:09:02 +02:00
Kamil Dudka	055aeffd0b	test1451: disable valgrind I was not able to find a bug in smb.c, neither prove that it is a false positive of valgrind. Not that I spent too much time digging it though. ==23721== Syscall param socketcall.sendto(msg) points to uninitialised byte(s) ==23721== at 0x62F3A4D: send (send.c:26) ==23721== by 0x4E5292C: Curl_send_plain (sendf.c:371) ==23721== by 0x4E52202: Curl_write (sendf.c:328) ==23721== by 0x4E95446: smb_send (smb.c:376) ==23721== by 0x4E95446: smb_send_message (smb.c:423) ==23721== by 0x4E95F3A: smb_send_setup (smb.c:479) ==23721== by 0x4E9610B: smb_connection_state (smb.c:690) ==23721== by 0x4E74AED: multi_runsingle (multi.c:1622) ==23721== by 0x4E75CD0: curl_multi_perform (multi.c:2160) ==23721== by 0x4E6BEAC: easy_transfer (easy.c:708) ==23721== by 0x4E6BEAC: easy_perform (easy.c:794) ==23721== by 0x4E6BEAC: curl_easy_perform (easy.c:813) ==23721== by 0x11CF7F: operate_do (tool_operate.c:1563) ==23721== by 0x11D809: operate (tool_operate.c:2064) ==23721== by 0x111099: main (tool_main.c:252) ==23721== Address 0xa28fb21 is 2,993 bytes inside a block of size 20,840 alloc'd ==23721== at 0x4C2FA50: calloc (vg_replace_malloc.c:711) ==23721== by 0x4E59FCE: Curl_open (url.c:647) ==23721== by 0x4E6BC43: curl_easy_init (easy.c:359) ==23721== by 0x111061: main_init (tool_main.c:153) ==23721== by 0x111061: main (tool_main.c:249)	2017-08-18 16:07:18 +02:00
Kamil Dudka	2d06d1337d	Merge branch 'master' into private-kdudka-libcurl-nss	2017-08-18 14:49:37 +02:00
Kamil Dudka	94f262cd05	Related: #1445153 - switch the TLS backend back to NSS	2017-06-29 11:28:39 +02:00