diff --git a/SOURCES/wget-1.19.5-ca-cert-too-verbose.patch b/SOURCES/wget-1.19.5-ca-cert-too-verbose.patch new file mode 100644 index 0000000..8794fc1 --- /dev/null +++ b/SOURCES/wget-1.19.5-ca-cert-too-verbose.patch @@ -0,0 +1,52 @@ +From 706e71564cadc7192ac21efbf51b661c967f35b5 Mon Sep 17 00:00:00 2001 +From: Tomas Hozza +Date: Tue, 24 Mar 2020 13:18:40 +0100 +Subject: [PATCH] Don't print message about loading crl or ca-cert files with --no-verbose + +* src/gnutls.c (ssl_init): Use LOG_VERBOSE verbosity for informative + message related to loading CRL or CA certificate file. + +Before change [1], wget didn't produce any output related to loading CA +certificates when --no-verbose option has been used. When --no-verbose +option is used, only error messages and basic information should get +printed. Information about loading CRL or CA certificate is probably not +a basic information. Any error when loading the CRL or CA certificate +will be still printed with --no-verbose. + +Some users rely on wget not printing such information and they consider +it a regression. + +Reported as https://bugzilla.redhat.com/show_bug.cgi?id=1807267 + +[1] http://git.savannah.gnu.org/cgit/wget.git/commit/?id=e4a8fe84e2b813b65d91aec29298eecabe4850a5 + +Signed-off-by: Tomas Hozza +--- + src/gnutls.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gnutls.c b/src/gnutls.c +index e95ecea..7ab1f08 100644 +--- a/src/gnutls.c ++++ b/src/gnutls.c +@@ -172,7 +172,7 @@ ssl_init (void) + else + { + ncerts += rc; +- logprintf (LOG_NOTQUIET, _ ("Loaded CA certificate '%s'\n"), opt.ca_cert); ++ logprintf (LOG_VERBOSE, _ ("Loaded CA certificate '%s'\n"), opt.ca_cert); + } + } + +@@ -186,7 +186,7 @@ ssl_init (void) + return false; + } + +- logprintf (LOG_NOTQUIET, _ ("Loaded CRL file '%s'\n"), opt.crl_file); ++ logprintf (LOG_VERBOSE, _ ("Loaded CRL file '%s'\n"), opt.crl_file); + } + + DEBUGP (("Certificates loaded: %d\n", ncerts)); +-- +libgit2 0.28.2 + diff --git a/SPECS/wget.spec b/SPECS/wget.spec index 10200c1..45c44e0 100644 --- a/SPECS/wget.spec +++ b/SPECS/wget.spec @@ -1,7 +1,7 @@ Summary: A utility for retrieving files using the HTTP or FTP protocols Name: wget Version: 1.19.5 -Release: 8%{?dist}.1 +Release: 10%{?dist} License: GPLv3+ Group: Applications/Internet Url: http://www.gnu.org/software/wget/ @@ -20,6 +20,8 @@ Patch8: wget-1.19.5-CVE-2019-5953.patch # http://git.savannah.gnu.org/cgit/wget.git/commit/?id=fd85ac9cc623847e9d94d9f9241ab34e2c146cbf Patch9: wget-1.19.5-no_proxy-dot-prefix.patch Patch10: wget-1.19.5-no_proxy-tests.patch +# http://git.savannah.gnu.org/cgit/wget.git/commit/?id=706e71564cadc7192ac21efbf51b661c967f35b5 +Patch11: wget-1.19.5-ca-cert-too-verbose.patch Provides: webclient Provides: bundled(gnulib) @@ -55,6 +57,7 @@ grep "PACKAGE_STRING='wget .* (Red Hat modified)'" configure || exit 1 %patch8 -p1 -b .CVE-2019-5953 %patch9 -p1 -b .no_proxy-dot-prefix %patch10 -p1 -b .no_proxy-test +%patch11 -p1 -b .too_verbose %build %configure \ @@ -101,8 +104,11 @@ rm -rf $RPM_BUILD_ROOT %{_infodir}/* %changelog -* Thu Nov 21 2019 Tomáš Hozza - 1.19.5-8.1 -- Fix issue with dot-prefixed domain names in no_proxy ENV (#1772821) +* Tue Mar 31 2020 Tomas Hozza - 1.19.5-10 +- Fix wget being too verbose when using --no-verbose and --ca-certificate (#1807267) + +* Thu Nov 21 2019 Tomáš Hozza - 1.19.5-9 +- Fix issue with dot-prefixed domain names in no_proxy ENV (#1763702) * Sun Apr 07 2019 Tomas Hozza - 1.19.5-8 - Fix CVE-2019-5953 (#1696736)