From b0f4dfc1177d9de4d531c3aa2e21b89fbf2d5e2a Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Thu, 23 Jan 2025 21:00:43 +0800 Subject: [PATCH] try fixing tests with metalink --- ...expected_files.py-Ignore-common.conf.patch | 30 +++++++++++++++++++ wget.spec | 29 ++++++++++-------- wget.yaml | 6 ++-- 3 files changed, 49 insertions(+), 16 deletions(-) create mode 100644 backport-testenv-conf-expected_files.py-Ignore-common.conf.patch diff --git a/backport-testenv-conf-expected_files.py-Ignore-common.conf.patch b/backport-testenv-conf-expected_files.py-Ignore-common.conf.patch new file mode 100644 index 0000000..9082e9a --- /dev/null +++ b/backport-testenv-conf-expected_files.py-Ignore-common.conf.patch @@ -0,0 +1,30 @@ +From 6ca59f4d609cf8f1ae91a47dedde1b8f3a0d46b9 Mon Sep 17 00:00:00 2001 +From: Jan Palus +Date: Fri, 12 May 2023 01:44:13 +0200 +Subject: * testenv/conf/expected_files.py: Ignore common.conf + +Copyright-paperwork-exempt: Yes +--- + testenv/conf/expected_files.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/testenv/conf/expected_files.py b/testenv/conf/expected_files.py +index 65adb707..72146726 100644 +--- a/testenv/conf/expected_files.py ++++ b/testenv/conf/expected_files.py +@@ -24,10 +24,10 @@ class ExpectedFiles: + snapshot = {} + for parent, dirs, files in os.walk('.'): + for name in files: +- # pubring.gpg, pubring.kbx, dirmngr.conf, gpg.conf will be created by libgpgme ++ # pubring.gpg, pubring.kbx, common.conf, 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.gpg', 'pubring.kbx', 'dirmngr.conf', 'gpg.conf' ]: ++ if name in [ 'pubring.gpg', 'pubring.kbx', 'common.conf', 'dirmngr.conf', 'gpg.conf' ]: + continue + + f = {'content': ''} +-- +cgit v1.2.3-70-g09d2 + diff --git a/wget.spec b/wget.spec index 964a998..2902a48 100644 --- a/wget.spec +++ b/wget.spec @@ -1,15 +1,16 @@ Name: wget Version: 1.21.4 -Release: 3 +Release: 4 Summary: A package for retrieving files using HTTP, HTTPS, FTP and FTPS the most widely-used Internet protocols. License: GPL-3.0-or-later AND LGPL-2.1-or-later -Url: http://www.gnu.org/software/wget/ +Url: https://www.gnu.org/software/wget/ Source: https://ftp.gnu.org/gnu/wget/wget-%{version}.tar.gz Patch0: backport-wget-1.17-path.patch Patch1: backport-CVE-2024-38428.patch Patch2: backport-CVE-2024-10524.patch -Patch3: backport-src-url.c-maybe_prepend_scheme-Print-message-only-in.patch +Patch3: backport-src-url.c-maybe_prepend_scheme-Print-message-only-in.patch +Patch4: backport-testenv-conf-expected_files.py-Ignore-common.conf.patch Provides: webclient bundled(gnulib) BuildRequires: make perl-HTTP-Daemon python3 libuuid-devel perl-podlators libpsl-devel libmetalink-devel @@ -22,12 +23,7 @@ FTP and FTPS the most widely-used Internet protocols. It is a non-interactive commandline tool, so it may easily be called from scripts, cron jobs, terminals without X-Windows support, etc. -%package help -Summary: help package for %{name} - -%description help -This is the help package for %{name}. It includes some doc -files and man, info files. +%package_help %prep %autosetup -p1 @@ -44,10 +40,11 @@ files and man, info files. rm -f %{buildroot}%{_infodir}/dir %check -make check +make check || testenv/test-suite.log %files -f %{name}.lang -f %{name}-gnulib.lang -%doc AUTHORS COPYING +%license COPYING +%doc AUTHORS %config(noreplace) %{_sysconfdir}/wgetrc %{_bindir}/wget @@ -57,13 +54,19 @@ make check %{_infodir}/* %changelog -* Thu Nov 21 2024 Han Jinpeng -1.21.4-3 +* Thu Jan 23 2025 Funda Wang - 1.21.4-4 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: try fixing tests with metalink + +* Thu Nov 21 2024 Han Jinpeng - 1.21.4-3 - Type:CVE - ID:CVE-2024-10524 - SUG:NA - DESC: fix CVE-2024-10524 and also fix Print message issue -* Sun Jun 16 2024 xuchenchen -1.21.4-2 +* Sun Jun 16 2024 xuchenchen - 1.21.4-2 - Type:CVES - ID:NA - SUG:NA diff --git a/wget.yaml b/wget.yaml index c40d00a..af01632 100644 --- a/wget.yaml +++ b/wget.yaml @@ -1,4 +1,4 @@ -version_control: github -src_repo: mirror/wget +version_control: git +src_repo: https://git.savannah.gnu.org/git/wget.git tag_prefix: ^v -seperator: . +separator: . -- Gitee