From 6c7ea8d76ff077aa0734516127a349a9c8fa7bb1 Mon Sep 17 00:00:00 2001
From: Tomas Hozza <thozza@redhat.com>
Date: Thu, 30 Jul 2020 11:47:17 +0200
Subject: [PATCH] Fix too verbose output even with --no-verbose

Signed-off-by: Tomas Hozza <thozza@redhat.com>
---
 ...20.3-fix-verbosity-with---no-verbose.patch | 52 +++++++++++++++++++
 wget.spec                                     |  8 ++-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 wget-1.20.3-fix-verbosity-with---no-verbose.patch

diff --git a/wget-1.20.3-fix-verbosity-with---no-verbose.patch b/wget-1.20.3-fix-verbosity-with---no-verbose.patch
new file mode 100644
index 0000000..d6ecfac
--- /dev/null
+++ b/wget-1.20.3-fix-verbosity-with---no-verbose.patch
@@ -0,0 +1,52 @@
+From 706e71564cadc7192ac21efbf51b661c967f35b5 Mon Sep 17 00:00:00 2001
+From: Tomas Hozza <thozza@redhat.com>
+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 <thozza@redhat.com>
+---
+ 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.5
+
diff --git a/wget.spec b/wget.spec
index bc24ac4..247f0d4 100644
--- a/wget.spec
+++ b/wget.spec
@@ -1,7 +1,7 @@
 Summary: A utility for retrieving files using the HTTP or FTP protocols
 Name: wget
 Version: 1.20.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv3+
 Url: http://www.gnu.org/software/wget/
 Source: ftp://ftp.gnu.org/gnu/wget/wget-%{version}.tar.gz
@@ -10,7 +10,10 @@ Patch1: wget-1.17-path.patch
 Patch2: wget-1.20.3-remove-unneeded-debug-lines.patch
 # http://git.savannah.gnu.org/cgit/wget.git/commit/?id=04b7369490344d014b05dee5d48ca78cd04733ce
 Patch3: wget-1.20.3-Fix-multiple-definition-of-with-gcc-10.patch
+# http://git.savannah.gnu.org/cgit/wget.git/commit/?id=1656a1628c1d6ab81b0126c3c4540b2becd0558d
 Patch4: wget-1.20.3-bz1475861-ftp-verifcerterr-hadling.patch
+# http://git.savannah.gnu.org/cgit/wget.git/commit/?id=706e71564cadc7192ac21efbf51b661c967f35b5
+Patch5: wget-1.20.3-fix-verbosity-with---no-verbose.patch
 
 Provides: webclient
 Provides: bundled(gnulib) 
@@ -69,6 +72,9 @@ make check
 %{_infodir}/*
 
 %changelog
+* Thu Jul 30 2020 Tomas Hozza <thozza@redhat.com> - 1.20.3-8
+- Fix too verbose output even with --no-verbose
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild