From 60b30271bca682d7ffe824fca5360374b5c36a3c Mon Sep 17 00:00:00 2001 From: Michal Domonkos Date: Apr 05 2022 18:33:27 +0000 Subject: Fix minor ABI regression in rpmcli.h Upstream commit: f62b6d27cd741406a52a7e9c5b1d6f581dbd3af8 Related: #2037352 Resolves: #2072175 --- diff --git a/rpm-4.16.1.3-add-path-query-option.patch b/rpm-4.16.1.3-add-path-query-option.patch index 0a44718..324f098 100644 --- a/rpm-4.16.1.3-add-path-query-option.patch +++ b/rpm-4.16.1.3-add-path-query-option.patch @@ -1,4 +1,4 @@ -From ce8af503733b5661efa046cc7f5f68ee0dad75cc Mon Sep 17 00:00:00 2001 +From ba659220886c1a315f50fb91b9af4615b1a8757e Mon Sep 17 00:00:00 2001 From: Michal Domonkos Date: Mon, 16 Aug 2021 18:21:02 +0200 Subject: [PATCH] Add support for RPMDBI_BASENAMES on file queries @@ -14,8 +14,11 @@ Update the man page for --file to reflect it's current behavior and make Resolves: rhbz#1940895 -Combined with d1aebda01033bc8ba0d748b49f6fad9a5c0caa3f and backported -for 4.16.1.3. +Combined with: +d1aebda01033bc8ba0d748b49f6fad9a5c0caa3f +f62b6d27cd741406a52a7e9c5b1d6f581dbd3af8 + +Backported for 4.16.1.3. --- doc/rpm.8 | 9 ++++++-- lib/poptQV.c | 6 +++++- @@ -115,17 +118,17 @@ index fdabe6e52..9a71f0dc5 100644 mi = rpmtsInitIterator(ts, RPMDBI_PROVIDENAME, fn, 0); diff --git a/lib/rpmcli.h b/lib/rpmcli.h -index 4886c2453..8ef992ff2 100644 +index 4886c2453..3961418e7 100644 --- a/lib/rpmcli.h +++ b/lib/rpmcli.h -@@ -81,6 +81,7 @@ rpmcliFini(poptContext optCon); - enum rpmQVSources_e { - RPMQV_PACKAGE = 0, /*!< ... from package name db search. */ - RPMQV_PATH, /*!< ... from file path db search. */ +@@ -101,6 +101,7 @@ enum rpmQVSources_e { + RPMQV_SPECBUILTRPMS, /*!< ... from pkgs which would be built from spec */ + RPMQV_WHATOBSOLETES, /*!< ... from obsoletes db search. */ + RPMQV_WHATCONFLICTS, /*!< ... from conflicts db search. */ + RPMQV_PATH_ALL, /*!< ... from file path db search (all states). */ - RPMQV_ALL, /*!< ... from each installed package. */ - RPMQV_RPM, /*!< ... from reading binary rpm package. */ - RPMQV_GROUP, /*!< ... from group db search. */ + }; + + typedef rpmFlags rpmQVSources; diff --git a/tests/rpmquery.at b/tests/rpmquery.at index 9a4f1cb76..335d5ee0d 100644 --- a/tests/rpmquery.at @@ -190,5 +193,5 @@ index 9a4f1cb76..335d5ee0d 100644 AT_SETUP([integer array query]) AT_KEYWORDS([query]) -- -2.34.1 +2.35.1 diff --git a/rpm.spec b/rpm.spec index bcd8a8d..c864f79 100644 --- a/rpm.spec +++ b/rpm.spec @@ -32,7 +32,7 @@ %global rpmver 4.16.1.3 #global snapver rc1 -%global rel 11 +%global rel 12 %global sover 9 %global srcver %{rpmver}%{?snapver:-%{snapver}} @@ -611,6 +611,9 @@ fi %doc doc/librpm/html/* %changelog +* Tue Apr 05 2022 Michal Domonkos - 4.16.1.3-12 +- Fix minor ABI regression in rpmcli.h (#2037352) + * Mon Feb 14 2022 Michal Domonkos - 4.16.1.3-11 - Fix IMA signature lengths assumed constant, take III (#2018937) - Fix regression reading rpm v3 and other rare packages (#2037186)