- up to 1.19.5; fixes CVE-2018-0494

diff --git a/wget-tests.patch b/wget-tests.patch
deleted file mode 100644 (file)
index 174d4ea..0000000
--- a/wget-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- wget-1.19.4/testenv/conf/expected_files.py.org     2018-01-30 09:36:46.359579482 +0100
-+++ wget-1.19.4/testenv/conf/expected_files.py 2018-01-30 09:37:01.350209794 +0100
-@@ -24,9 +24,9 @@ class ExpectedFiles:
-         snapshot = {}
-         for parent, dirs, files in os.walk('.'):
-             for name in files:
--                # pubring.kbx, dirmngr.conf, gpg.conf will be created by libgpgme if $HOME doesn't contain the .gnupg directory.
-+                # pubring.gpg, pubring.kbx, dirmngr.conf, gpg.conf will be created by libgpgme if $HOME doesn't contain the .gnupg directory.
-                 # setting $HOME to CWD (in base_test.py) breaks two Metalink tests, so we skip this file here.
--                if name in [ 'pubring.kbx', 'dirmngr.conf', 'gpg.conf' ]:
-+                if name in [ 'pubring.gpg', 'pubring.kbx', 'dirmngr.conf', 'gpg.conf' ]:
-                     continue
- 
-                 f = {'content': ''}

diff --git a/wget.spec b/wget.spec
index 0b9506a6b8ab9c57c96739e853ed61c70630850d..c24c42535479dbf0b8b4eb6dee46830fe14e7fb4 100644 (file)
--- a/wget.spec
+++ b/wget.spec
@@ -17,12 +17,12 @@ Summary(ru.UTF-8):  Утилита для получения файлов по п
 Summary(uk.UTF-8):     Утиліта для отримання файлів по протоколам HTTP та FTP
 Summary(zh_CN.UTF-8):  [通讯]功能强大的下载程序,支持断点续传
 Name:          wget
-Version:       1.19.4
+Version:       1.19.5
 Release:       1
 License:       GPL v3+ with OpenSSL exception
 Group:         Networking/Utilities
 Source0:       http://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.lz
-# Source0-md5: 50d3c7b607ef4addccc21eae7ba35430
+# Source0-md5: 4ee511011a15f4207bea8b2993c343ee
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: d8b2b56ec7461606c22edbafaf8a418f
 Patch0:                %{name}-info.patch
@@ -30,7 +30,6 @@ Patch1:               %{name}-wgetrc_path.patch
 Patch2:                %{name}-home_etc.patch
 Patch3:                %{name}-ssl-certs.patch
 Patch4:                user.xdg.origin.url.patch
-Patch5:                %{name}-tests.patch
 URL:           http://www.gnu.org/software/wget/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.9
@@ -138,7 +137,6 @@ Proxy серверів, настроюваність.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %{__rm} doc/wget.info doc/sample.wgetrc.munged_for_texi_inclusion po/stamp-po