diff --git a/.gitignore b/.gitignore index f41a3b2..bd631cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -librepo-1.18.0.tar.gz +SOURCES/librepo-1.18.0.tar.gz diff --git a/.librepo.metadata b/.librepo.metadata new file mode 100644 index 0000000..dd6d26e --- /dev/null +++ b/.librepo.metadata @@ -0,0 +1 @@ +93b90217a5baf96ba1232cced6189ba0df5798f5 SOURCES/librepo-1.18.0.tar.gz diff --git a/0001-Use-rpm-sequoia-on-RHEL-10.patch b/SOURCES/0001-Use-rpm-sequoia-on-RHEL-10.patch similarity index 100% rename from 0001-Use-rpm-sequoia-on-RHEL-10.patch rename to SOURCES/0001-Use-rpm-sequoia-on-RHEL-10.patch diff --git a/0002-Fix-a-memory-leak-in-select_next_target.patch b/SOURCES/0002-Fix-a-memory-leak-in-select_next_target.patch similarity index 100% rename from 0002-Fix-a-memory-leak-in-select_next_target.patch rename to SOURCES/0002-Fix-a-memory-leak-in-select_next_target.patch diff --git a/SOURCES/0003-Propagate-return-value-from-prepare_repo_download_ta.patch b/SOURCES/0003-Propagate-return-value-from-prepare_repo_download_ta.patch new file mode 100644 index 0000000..fcdd178 --- /dev/null +++ b/SOURCES/0003-Propagate-return-value-from-prepare_repo_download_ta.patch @@ -0,0 +1,31 @@ +From 089eac540f395db8303e42bc9716a14851b1132c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= +Date: Mon, 9 Jun 2025 09:25:39 +0200 +Subject: [PATCH] Propagate return value from `prepare_repo_download_targets` + +It also ensures that when return value is false there is some error set. +--- + librepo/yum.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/librepo/yum.c b/librepo/yum.c +index 56bca3e..482d4d9 100644 +--- a/librepo/yum.c ++++ b/librepo/yum.c +@@ -961,7 +961,12 @@ lr_yum_download_repo(LrHandle *handle, + + assert(!err || *err == NULL); + +- prepare_repo_download_targets(handle, repo, repomd, NULL, &targets, &cbdata_list, err); ++ ret = prepare_repo_download_targets(handle, repo, repomd, NULL, &targets, &cbdata_list, err); ++ if (!ret) { ++ assert(!err || *err != NULL); ++ return ret; ++ } ++ assert(!err || *err == NULL); + + if (!targets) + return TRUE; +-- +2.49.0 + diff --git a/0003-Fix-input-termination-for-pgpParsePkts.patch b/SOURCES/0004-Fix-input-termination-for-pgpParsePkts.patch similarity index 100% rename from 0003-Fix-input-termination-for-pgpParsePkts.patch rename to SOURCES/0004-Fix-input-termination-for-pgpParsePkts.patch diff --git a/0004-Test-importing-keys-with-prefix-and-suffix.patch b/SOURCES/0005-Test-importing-keys-with-prefix-and-suffix.patch similarity index 100% rename from 0004-Test-importing-keys-with-prefix-and-suffix.patch rename to SOURCES/0005-Test-importing-keys-with-prefix-and-suffix.patch diff --git a/librepo.spec b/SPECS/librepo.spec similarity index 96% rename from librepo.spec rename to SPECS/librepo.spec index 1b03979..375fa3b 100644 --- a/librepo.spec +++ b/SPECS/librepo.spec @@ -29,7 +29,7 @@ Name: librepo Version: 1.18.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Repodata downloading library License: LGPL-2.1-or-later @@ -37,9 +37,10 @@ URL: https://github.com/rpm-software-management/librepo Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Patch1: 0001-Use-rpm-sequoia-on-RHEL-10.patch Patch2: 0002-Fix-a-memory-leak-in-select_next_target.patch +Patch3: 0003-Propagate-return-value-from-prepare_repo_download_ta.patch # https://github.com/rpm-software-management/librepo/pull/325 -Patch3: 0003-Fix-input-termination-for-pgpParsePkts.patch -Patch4: 0004-Test-importing-keys-with-prefix-and-suffix.patch +Patch4: 0004-Fix-input-termination-for-pgpParsePkts.patch +Patch5: 0005-Test-importing-keys-with-prefix-and-suffix.patch BuildRequires: cmake BuildRequires: gcc @@ -132,11 +133,15 @@ Python 3 bindings for the librepo library. %{python3_sitearch}/%{name}/ %changelog -* Thu Jul 03 2025 Ales Matej - 1.18.0-5 -- Test for: Fix input termination for pgpParsePkts (RHEL-101176) +* Thu Jul 03 2025 Ales Matej - 1.18.0-6 +- Test for: Fix input termination for pgpParsePkts (RHEL-61730) -* Tue Jun 24 2025 Romain Geissler - 1.18.0-4 -- Fix input termination for pgpParsePkts (RHEL-101176) +* Tue Jun 24 2025 Romain Geissler - 1.18.0-5 +- Fix input termination for pgpParsePkts + Resolves: RHEL-82533 + +* Tue Jun 24 2025 Ales Matej - 1.18.0-4 +- Propagate return value from prepare_repo_download_targets (RHEL-85338) * Tue Oct 29 2024 Troy Dawson - 1.18.0-3 - Bump release for October 2024 mass rebuild: diff --git a/sources b/sources deleted file mode 100644 index 4ecab35..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (librepo-1.18.0.tar.gz) = 6630b4751163ff6a34c32b94f6d0ecdc34926ade6aa92342c99eef9a514edd25405e051c58f6630615dd9cd04ef5c0404ebc4805708356477b97d351baa19a73