Compare commits
No commits in common. 'c9' and 'i9c-beta' have entirely different histories.
@ -0,0 +1,38 @@
|
||||
From 3c5641a9c7c416e387a54eaf7dad7c33db52b0ec Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Mracek <jmracek@redhat.com>
|
||||
Date: Wed, 6 Mar 2024 07:46:34 +0100
|
||||
Subject: [PATCH] Replace assert by map_grow
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream commit: ef8ac7fcedea1ec87dd3149ce1abdf8daeee25b9
|
||||
|
||||
It will make code prepared for situation when number of solvables
|
||||
is increased after query is created and applied.
|
||||
|
||||
The issue can be easilly triggered by adding remote RPMs therefore
|
||||
the patch fixes a standard situation
|
||||
|
||||
Resolves: https://issues.redhat.com/browse/RHEL-27657
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
libdnf/sack/query.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libdnf/sack/query.cpp b/libdnf/sack/query.cpp
|
||||
index 79377703..6eecfa50 100644
|
||||
--- a/libdnf/sack/query.cpp
|
||||
+++ b/libdnf/sack/query.cpp
|
||||
@@ -2313,7 +2313,7 @@ Query::Impl::apply()
|
||||
if (!result)
|
||||
initResult();
|
||||
map_init(&m, pool->nsolvables);
|
||||
- assert(m.size == result->getMap()->size);
|
||||
+ map_grow(result->getMap(), pool->nsolvables);
|
||||
for (auto f : filters) {
|
||||
map_empty(&m);
|
||||
switch (f.getKeyname()) {
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
From c91ed331cc9ea6512a7aaad918db1be9bc6d4f69 Mon Sep 17 00:00:00 2001
|
||||
From: Marek Blaha <mblaha@redhat.com>
|
||||
Date: Tue, 26 Mar 2024 14:09:47 +0100
|
||||
Subject: [PATCH] subject-py: Fix memory leak
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream commit: fd284bda6f7430b2e939f95c6836c972e22a2eb4
|
||||
|
||||
Posible memory leak was detected in get_best_solution() method.
|
||||
|
||||
Resolves: https://issues.redhat.com/browse/RHEL-26226
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
python/hawkey/subject-py.cpp | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/python/hawkey/subject-py.cpp b/python/hawkey/subject-py.cpp
|
||||
index a88d572a..3e1919e7 100644
|
||||
--- a/python/hawkey/subject-py.cpp
|
||||
+++ b/python/hawkey/subject-py.cpp
|
||||
@@ -361,8 +361,10 @@ get_best_solution(_SubjectObject *self, PyObject *args, PyObject *kwds)
|
||||
HyNevra nevra{nullptr};
|
||||
|
||||
UniquePtrPyObject q(get_solution(self, args, kwds, &nevra));
|
||||
- if (!q)
|
||||
+ if (!q) {
|
||||
+ delete nevra;
|
||||
return NULL;
|
||||
+ }
|
||||
PyObject *ret_dict = PyDict_New();
|
||||
PyDict_SetItem(ret_dict, PyString_FromString("query"), q.get());
|
||||
if (nevra) {
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@ -0,0 +1,40 @@
|
||||
From 74150bafa1ffb8527e8eef7507da50562bcb9983 Mon Sep 17 00:00:00 2001
|
||||
From: Nicola Sella <nsella@redhat.com>
|
||||
Date: Tue, 26 Mar 2024 14:35:43 +0100
|
||||
Subject: [PATCH] Add virtual destructor to TransactionItem
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream commit: e4e90777f789fc45e002b4c0385c0565a76be946
|
||||
Resolves: https://issues.redhat.com/browse/RHEL-26240
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
libdnf/transaction/TransactionItem.hpp | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/libdnf/transaction/TransactionItem.hpp b/libdnf/transaction/TransactionItem.hpp
|
||||
index 72684f73..5addad45 100644
|
||||
--- a/libdnf/transaction/TransactionItem.hpp
|
||||
+++ b/libdnf/transaction/TransactionItem.hpp
|
||||
@@ -43,6 +43,8 @@ namespace libdnf {
|
||||
|
||||
class TransactionItemBase {
|
||||
public:
|
||||
+ virtual ~TransactionItemBase() = default;
|
||||
+
|
||||
ItemPtr getItem() const noexcept { return item; }
|
||||
void setItem(ItemPtr value) { item = value; }
|
||||
|
||||
@@ -101,6 +103,7 @@ public:
|
||||
explicit TransactionItem(Transaction *trans);
|
||||
|
||||
TransactionItem(SQLite3Ptr conn, int64_t transID);
|
||||
+ virtual ~TransactionItem() = default;
|
||||
|
||||
int64_t getId() const noexcept { return id; }
|
||||
void setId(int64_t value) { id = value; }
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@ -0,0 +1,180 @@
|
||||
From 318b018f031ddb0e36ae771fb5421446d674eec9 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Kolarik <jkolarik@redhat.com>
|
||||
Date: Mon, 26 Feb 2024 09:58:33 +0000
|
||||
Subject: [PATCH 1/2] MergedTransaction: Calculate RPM difference between two
|
||||
same versions as no-op
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream commit: 54823d82a1369c25ba1a68c18ea2a67c41f4fbe7
|
||||
|
||||
If a package of a particular version is installed and would still be installed after a list of transactions, it's more user friendly to treat the whole situation as "do nothing".
|
||||
|
||||
Resolves: https://issues.redhat.com/browse/RHEL-17494
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
libdnf/transaction/MergedTransaction.cpp | 38 ++++++++++++-------
|
||||
libdnf/transaction/MergedTransaction.hpp | 6 +--
|
||||
.../transaction/MergedTransactionTest.cpp | 7 +---
|
||||
3 files changed, 28 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/libdnf/transaction/MergedTransaction.cpp b/libdnf/transaction/MergedTransaction.cpp
|
||||
index a8d878cb..8f26882f 100644
|
||||
--- a/libdnf/transaction/MergedTransaction.cpp
|
||||
+++ b/libdnf/transaction/MergedTransaction.cpp
|
||||
@@ -192,7 +192,7 @@ static bool transaction_item_sort_function(const std::shared_ptr<TransactionItem
|
||||
* Actions are merged using following rules:
|
||||
* (old action) -> (new action) = (merged action)
|
||||
*
|
||||
- * Erase/Obsolete -> Install/Obsoleting = Reinstall/Downgrade/Upgrade
|
||||
+ * Erase/Obsolete -> Install/Obsoleting = Downgrade/Upgrade
|
||||
*
|
||||
* Reinstall/Reason change -> (new action) = (new action)
|
||||
*
|
||||
@@ -210,6 +210,9 @@ static bool transaction_item_sort_function(const std::shared_ptr<TransactionItem
|
||||
*
|
||||
* With complete transaction pair we need to get a new Upgrade/Downgrade package and
|
||||
* compare versions with original package from pair.
|
||||
+ *
|
||||
+ * Additionally, if a package is installed both before and after the list of transactions
|
||||
+ * with the same version, no action will be taken.
|
||||
*/
|
||||
std::vector< TransactionItemBasePtr >
|
||||
MergedTransaction::getItems()
|
||||
@@ -261,13 +264,16 @@ getItemIdentifier(ItemPtr item)
|
||||
|
||||
/**
|
||||
* Resolve the difference between RPMs in the first and second transaction item
|
||||
- * and create a ItemPair of Upgrade, Downgrade or reinstall.
|
||||
+ * and create a ItemPair of Upgrade, Downgrade or drop the item from the merged
|
||||
+ * transaction set in case of both packages are of the same version.
|
||||
* Method is called when original package is being removed and than installed again.
|
||||
+ * \param itemPairMap merged transaction set
|
||||
* \param previousItemPair original item pair
|
||||
* \param mTransItem new transaction item
|
||||
*/
|
||||
void
|
||||
-MergedTransaction::resolveRPMDifference(ItemPair &previousItemPair,
|
||||
+MergedTransaction::resolveRPMDifference(ItemPairMap &itemPairMap,
|
||||
+ ItemPair &previousItemPair,
|
||||
TransactionItemBasePtr mTransItem)
|
||||
{
|
||||
auto firstItem = previousItemPair.first->getItem();
|
||||
@@ -277,11 +283,10 @@ MergedTransaction::resolveRPMDifference(ItemPair &previousItemPair,
|
||||
auto secondRPM = std::dynamic_pointer_cast< RPMItem >(secondItem);
|
||||
|
||||
if (firstRPM->getVersion() == secondRPM->getVersion() &&
|
||||
- firstRPM->getEpoch() == secondRPM->getEpoch()) {
|
||||
- // reinstall
|
||||
- mTransItem->setAction(TransactionItemAction::REINSTALL);
|
||||
- previousItemPair.first = mTransItem;
|
||||
- previousItemPair.second = nullptr;
|
||||
+ firstRPM->getEpoch() == secondRPM->getEpoch() &&
|
||||
+ firstRPM->getRelease() == secondRPM->getRelease()) {
|
||||
+ // Drop the item from merged transaction
|
||||
+ itemPairMap.erase(getItemIdentifier(firstItem));
|
||||
return;
|
||||
} else if ((*firstRPM) < (*secondRPM)) {
|
||||
// Upgrade to secondRPM
|
||||
@@ -296,7 +301,9 @@ MergedTransaction::resolveRPMDifference(ItemPair &previousItemPair,
|
||||
}
|
||||
|
||||
void
|
||||
-MergedTransaction::resolveErase(ItemPair &previousItemPair, TransactionItemBasePtr mTransItem)
|
||||
+MergedTransaction::resolveErase(ItemPairMap &itemPairMap,
|
||||
+ ItemPair &previousItemPair,
|
||||
+ TransactionItemBasePtr mTransItem)
|
||||
{
|
||||
/*
|
||||
* The original item has been removed - it has to be installed now unless the rpmdb
|
||||
@@ -306,7 +313,7 @@ MergedTransaction::resolveErase(ItemPair &previousItemPair, TransactionItemBaseP
|
||||
if (mTransItem->getAction() == TransactionItemAction::INSTALL) {
|
||||
if (mTransItem->getItem()->getItemType() == ItemType::RPM) {
|
||||
// resolve the difference between RPM packages
|
||||
- resolveRPMDifference(previousItemPair, mTransItem);
|
||||
+ resolveRPMDifference(itemPairMap, previousItemPair, mTransItem);
|
||||
} else {
|
||||
// difference between comps can't be resolved
|
||||
mTransItem->setAction(TransactionItemAction::REINSTALL);
|
||||
@@ -323,11 +330,14 @@ MergedTransaction::resolveErase(ItemPair &previousItemPair, TransactionItemBaseP
|
||||
* transaction - new package is used to complete the pair. Items are stored in pairs (Upgrade,
|
||||
* Upgrade) or (Downgraded, Downgrade). With complete transaction pair we need to get the new
|
||||
* Upgrade/Downgrade item and compare its version with the original item from the pair.
|
||||
+ * \param itemPairMap merged transaction set
|
||||
* \param previousItemPair original item pair
|
||||
* \param mTransItem new transaction item
|
||||
*/
|
||||
void
|
||||
-MergedTransaction::resolveAltered(ItemPair &previousItemPair, TransactionItemBasePtr mTransItem)
|
||||
+MergedTransaction::resolveAltered(ItemPairMap &itemPairMap,
|
||||
+ ItemPair &previousItemPair,
|
||||
+ TransactionItemBasePtr mTransItem)
|
||||
{
|
||||
auto newState = mTransItem->getAction();
|
||||
auto firstState = previousItemPair.first->getAction();
|
||||
@@ -369,7 +379,7 @@ MergedTransaction::resolveAltered(ItemPair &previousItemPair, TransactionItemBas
|
||||
} else {
|
||||
if (mTransItem->getItem()->getItemType() == ItemType::RPM) {
|
||||
// resolve the difference between RPM packages
|
||||
- resolveRPMDifference(previousItemPair, mTransItem);
|
||||
+ resolveRPMDifference(itemPairMap, previousItemPair, mTransItem);
|
||||
} else {
|
||||
// difference between comps can't be resolved
|
||||
previousItemPair.second->setAction(TransactionItemAction::REINSTALL);
|
||||
@@ -405,7 +415,7 @@ MergedTransaction::mergeItem(ItemPairMap &itemPairMap, TransactionItemBasePtr mT
|
||||
switch (firstState) {
|
||||
case TransactionItemAction::REMOVE:
|
||||
case TransactionItemAction::OBSOLETED:
|
||||
- resolveErase(previousItemPair, mTransItem);
|
||||
+ resolveErase(itemPairMap, previousItemPair, mTransItem);
|
||||
break;
|
||||
case TransactionItemAction::INSTALL:
|
||||
// the original package has been installed -> it may be either Removed, or altered
|
||||
@@ -432,7 +442,7 @@ MergedTransaction::mergeItem(ItemPairMap &itemPairMap, TransactionItemBasePtr mT
|
||||
case TransactionItemAction::UPGRADE:
|
||||
case TransactionItemAction::UPGRADED:
|
||||
case TransactionItemAction::OBSOLETE:
|
||||
- resolveAltered(previousItemPair, mTransItem);
|
||||
+ resolveAltered(itemPairMap, previousItemPair, mTransItem);
|
||||
break;
|
||||
case TransactionItemAction::REINSTALLED:
|
||||
break;
|
||||
diff --git a/libdnf/transaction/MergedTransaction.hpp b/libdnf/transaction/MergedTransaction.hpp
|
||||
index dbb8af11..f85b133a 100644
|
||||
--- a/libdnf/transaction/MergedTransaction.hpp
|
||||
+++ b/libdnf/transaction/MergedTransaction.hpp
|
||||
@@ -76,9 +76,9 @@ protected:
|
||||
typedef std::map< std::string, ItemPair > ItemPairMap;
|
||||
|
||||
void mergeItem(ItemPairMap &itemPairMap, TransactionItemBasePtr transItem);
|
||||
- void resolveRPMDifference(ItemPair &previousItemPair, TransactionItemBasePtr mTransItem);
|
||||
- void resolveErase(ItemPair &previousItemPair, TransactionItemBasePtr mTransItem);
|
||||
- void resolveAltered(ItemPair &previousItemPair, TransactionItemBasePtr mTransItem);
|
||||
+ void resolveRPMDifference(ItemPairMap &itemPairMap, ItemPair &previousItemPair, TransactionItemBasePtr mTransItem);
|
||||
+ void resolveErase(ItemPairMap &itemPairMap, ItemPair &previousItemPair, TransactionItemBasePtr mTransItem);
|
||||
+ void resolveAltered(ItemPairMap &itemPairMap, ItemPair &previousItemPair, TransactionItemBasePtr mTransItem);
|
||||
};
|
||||
|
||||
} // namespace libdnf
|
||||
diff --git a/tests/libdnf/transaction/MergedTransactionTest.cpp b/tests/libdnf/transaction/MergedTransactionTest.cpp
|
||||
index 52507700..35fb4250 100644
|
||||
--- a/tests/libdnf/transaction/MergedTransactionTest.cpp
|
||||
+++ b/tests/libdnf/transaction/MergedTransactionTest.cpp
|
||||
@@ -822,12 +822,7 @@ MergedTransactionTest::test_downgrade_upgrade_remove()
|
||||
// test merging trans1, trans2
|
||||
merged.merge(trans2);
|
||||
auto items2 = merged.getItems();
|
||||
- CPPUNIT_ASSERT_EQUAL(1, (int)items2.size());
|
||||
- auto item2 = items2.at(0);
|
||||
- CPPUNIT_ASSERT_EQUAL(std::string("tour-4.8-1.noarch"), item2->getItem()->toStr());
|
||||
- CPPUNIT_ASSERT_EQUAL(std::string("repo1"), item2->getRepoid());
|
||||
- CPPUNIT_ASSERT_EQUAL(TransactionItemAction::REINSTALL, item2->getAction());
|
||||
- CPPUNIT_ASSERT_EQUAL(TransactionItemReason::USER, item2->getReason());
|
||||
+ CPPUNIT_ASSERT_EQUAL(0, (int)items2.size());
|
||||
|
||||
// test merging trans1, trans2, trans3
|
||||
merged.merge(trans3);
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@ -0,0 +1,94 @@
|
||||
From 020aab89fd015d8303b0e8f3f84e126dcdd4d4f4 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Kolarik <jkolarik@redhat.com>
|
||||
Date: Tue, 23 Apr 2024 14:11:19 +0000
|
||||
Subject: [PATCH 2/2] MergedTransaction: Fix invalid memory access when
|
||||
dropping items
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream commit: 90d2ffad964a91a7a798b81e15c16eb1e840f257
|
||||
|
||||
When an item is dropped from the merged transaction, the `ItemPair` reference becomes invalid and should no longer be used.
|
||||
|
||||
Resolves: https://issues.redhat.com/browse/RHEL-17494
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
libdnf/transaction/MergedTransaction.cpp | 18 +++++++++++-------
|
||||
libdnf/transaction/MergedTransaction.hpp | 2 +-
|
||||
2 files changed, 12 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/libdnf/transaction/MergedTransaction.cpp b/libdnf/transaction/MergedTransaction.cpp
|
||||
index 8f26882f..75d2c1e7 100644
|
||||
--- a/libdnf/transaction/MergedTransaction.cpp
|
||||
+++ b/libdnf/transaction/MergedTransaction.cpp
|
||||
@@ -264,14 +264,15 @@ getItemIdentifier(ItemPtr item)
|
||||
|
||||
/**
|
||||
* Resolve the difference between RPMs in the first and second transaction item
|
||||
- * and create a ItemPair of Upgrade, Downgrade or drop the item from the merged
|
||||
- * transaction set in case of both packages are of the same version.
|
||||
- * Method is called when original package is being removed and than installed again.
|
||||
+ * and create a ItemPair of Upgrade, Downgrade or remove the item from the merged
|
||||
+ * transaction set in case of both packages are the same.
|
||||
+ * Method is called when original package is being removed and then installed again.
|
||||
* \param itemPairMap merged transaction set
|
||||
* \param previousItemPair original item pair
|
||||
* \param mTransItem new transaction item
|
||||
+ * \return true if the original and new transaction item differ
|
||||
*/
|
||||
-void
|
||||
+bool
|
||||
MergedTransaction::resolveRPMDifference(ItemPairMap &itemPairMap,
|
||||
ItemPair &previousItemPair,
|
||||
TransactionItemBasePtr mTransItem)
|
||||
@@ -287,7 +288,7 @@ MergedTransaction::resolveRPMDifference(ItemPairMap &itemPairMap,
|
||||
firstRPM->getRelease() == secondRPM->getRelease()) {
|
||||
// Drop the item from merged transaction
|
||||
itemPairMap.erase(getItemIdentifier(firstItem));
|
||||
- return;
|
||||
+ return false;
|
||||
} else if ((*firstRPM) < (*secondRPM)) {
|
||||
// Upgrade to secondRPM
|
||||
previousItemPair.first->setAction(TransactionItemAction::UPGRADED);
|
||||
@@ -298,6 +299,7 @@ MergedTransaction::resolveRPMDifference(ItemPairMap &itemPairMap,
|
||||
mTransItem->setAction(TransactionItemAction::DOWNGRADE);
|
||||
}
|
||||
previousItemPair.second = mTransItem;
|
||||
+ return true;
|
||||
}
|
||||
|
||||
void
|
||||
@@ -308,12 +310,14 @@ MergedTransaction::resolveErase(ItemPairMap &itemPairMap,
|
||||
/*
|
||||
* The original item has been removed - it has to be installed now unless the rpmdb
|
||||
* has changed. Resolve the difference between packages and mark it as Upgrade,
|
||||
- * Reinstall or Downgrade
|
||||
+ * Downgrade or remove it from the transaction
|
||||
*/
|
||||
if (mTransItem->getAction() == TransactionItemAction::INSTALL) {
|
||||
if (mTransItem->getItem()->getItemType() == ItemType::RPM) {
|
||||
// resolve the difference between RPM packages
|
||||
- resolveRPMDifference(itemPairMap, previousItemPair, mTransItem);
|
||||
+ if (!resolveRPMDifference(itemPairMap, previousItemPair, mTransItem)) {
|
||||
+ return;
|
||||
+ }
|
||||
} else {
|
||||
// difference between comps can't be resolved
|
||||
mTransItem->setAction(TransactionItemAction::REINSTALL);
|
||||
diff --git a/libdnf/transaction/MergedTransaction.hpp b/libdnf/transaction/MergedTransaction.hpp
|
||||
index f85b133a..50212159 100644
|
||||
--- a/libdnf/transaction/MergedTransaction.hpp
|
||||
+++ b/libdnf/transaction/MergedTransaction.hpp
|
||||
@@ -76,7 +76,7 @@ protected:
|
||||
typedef std::map< std::string, ItemPair > ItemPairMap;
|
||||
|
||||
void mergeItem(ItemPairMap &itemPairMap, TransactionItemBasePtr transItem);
|
||||
- void resolveRPMDifference(ItemPairMap &itemPairMap, ItemPair &previousItemPair, TransactionItemBasePtr mTransItem);
|
||||
+ bool resolveRPMDifference(ItemPairMap &itemPairMap, ItemPair &previousItemPair, TransactionItemBasePtr mTransItem);
|
||||
void resolveErase(ItemPairMap &itemPairMap, ItemPair &previousItemPair, TransactionItemBasePtr mTransItem);
|
||||
void resolveAltered(ItemPairMap &itemPairMap, ItemPair &previousItemPair, TransactionItemBasePtr mTransItem);
|
||||
};
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@ -0,0 +1,232 @@
|
||||
From bb652b9b1a6a1746413ae43e6bbe1e9ec2aa1a90 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Mon, 8 Apr 2024 07:32:31 +0200
|
||||
Subject: [PATCH 1/2] context: use `rpmtsAddReinstallElement()` when doing a
|
||||
reinstall
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream commit: 85432dfd048912083897ab687488087038a9ac96
|
||||
|
||||
`rpmtsAddInstallElement()` doesn't work for all reinstall cases, such as
|
||||
when a package `Provides` and `Conflicts` with the same capability.
|
||||
|
||||
Fixes: https://github.com/rpm-software-management/microdnf/issues/137
|
||||
Resolves: https://issues.redhat.com/browse/RHEL-1454
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
libdnf/dnf-rpmts-private.hpp | 6 ++
|
||||
libdnf/dnf-rpmts.cpp | 108 +++++++++++++++++++++++------------
|
||||
libdnf/dnf-transaction.cpp | 8 ++-
|
||||
3 files changed, 85 insertions(+), 37 deletions(-)
|
||||
|
||||
diff --git a/libdnf/dnf-rpmts-private.hpp b/libdnf/dnf-rpmts-private.hpp
|
||||
index 94ad6b45..7a8f70fb 100644
|
||||
--- a/libdnf/dnf-rpmts-private.hpp
|
||||
+++ b/libdnf/dnf-rpmts-private.hpp
|
||||
@@ -31,4 +31,10 @@ gboolean dnf_rpmts_add_install_filename2(rpmts ts,
|
||||
DnfPackage *pkg,
|
||||
GError **error);
|
||||
|
||||
+gboolean dnf_rpmts_add_reinstall_filename(rpmts ts,
|
||||
+ const gchar *filename,
|
||||
+ gboolean allow_untrusted,
|
||||
+ GError **error);
|
||||
+
|
||||
+
|
||||
#endif /* __DNF_RPMTS_PRIVATE_HPP */
|
||||
diff --git a/libdnf/dnf-rpmts.cpp b/libdnf/dnf-rpmts.cpp
|
||||
index ec3d3706..9c0152fc 100644
|
||||
--- a/libdnf/dnf-rpmts.cpp
|
||||
+++ b/libdnf/dnf-rpmts.cpp
|
||||
@@ -88,94 +88,132 @@ test_fail_safe(Header * hdr, DnfPackage * pkg, GError **error)
|
||||
return ret;
|
||||
}
|
||||
|
||||
-gboolean
|
||||
-dnf_rpmts_add_install_filename2(rpmts ts,
|
||||
- const gchar *filename,
|
||||
- gboolean allow_untrusted,
|
||||
- gboolean is_update,
|
||||
- DnfPackage * pkg,
|
||||
- GError **error) try
|
||||
-{
|
||||
- gboolean ret = TRUE;
|
||||
- gint res;
|
||||
- Header hdr;
|
||||
- FD_t fd;
|
||||
-
|
||||
- /* open this */
|
||||
- fd = Fopen(filename, "r.ufdio");
|
||||
- res = rpmReadPackageFile(ts, fd, filename, &hdr);
|
||||
-
|
||||
+static gboolean
|
||||
+result_is_accepted(gint result, gboolean allow_untrusted, const gchar *filename, GError **error) {
|
||||
/* be less strict when we're allowing untrusted transactions */
|
||||
if (allow_untrusted) {
|
||||
- switch(res) {
|
||||
+ switch(result) {
|
||||
case RPMRC_NOKEY:
|
||||
case RPMRC_NOTFOUND:
|
||||
case RPMRC_NOTTRUSTED:
|
||||
case RPMRC_OK:
|
||||
- break;
|
||||
+ return TRUE;
|
||||
case RPMRC_FAIL:
|
||||
- ret = FALSE;
|
||||
g_set_error(error,
|
||||
DNF_ERROR,
|
||||
DNF_ERROR_INTERNAL_ERROR,
|
||||
_("signature does not verify for %s"),
|
||||
filename);
|
||||
- goto out;
|
||||
+ return FALSE;
|
||||
default:
|
||||
- ret = FALSE;
|
||||
g_set_error(error,
|
||||
DNF_ERROR,
|
||||
DNF_ERROR_INTERNAL_ERROR,
|
||||
_("failed to open(generic error): %s"),
|
||||
filename);
|
||||
- goto out;
|
||||
+ return FALSE;
|
||||
}
|
||||
} else {
|
||||
- switch(res) {
|
||||
+ switch(result) {
|
||||
case RPMRC_OK:
|
||||
- break;
|
||||
+ return TRUE;
|
||||
case RPMRC_NOTTRUSTED:
|
||||
- ret = FALSE;
|
||||
g_set_error(error,
|
||||
DNF_ERROR,
|
||||
DNF_ERROR_INTERNAL_ERROR,
|
||||
_("failed to verify key for %s"),
|
||||
filename);
|
||||
- goto out;
|
||||
+ return FALSE;
|
||||
case RPMRC_NOKEY:
|
||||
- ret = FALSE;
|
||||
g_set_error(error,
|
||||
DNF_ERROR,
|
||||
DNF_ERROR_INTERNAL_ERROR,
|
||||
_("public key unavailable for %s"),
|
||||
filename);
|
||||
- goto out;
|
||||
+ return FALSE;
|
||||
case RPMRC_NOTFOUND:
|
||||
- ret = FALSE;
|
||||
g_set_error(error,
|
||||
DNF_ERROR,
|
||||
DNF_ERROR_INTERNAL_ERROR,
|
||||
_("signature not found for %s"),
|
||||
filename);
|
||||
- goto out;
|
||||
+ return FALSE;
|
||||
case RPMRC_FAIL:
|
||||
- ret = FALSE;
|
||||
g_set_error(error,
|
||||
DNF_ERROR,
|
||||
DNF_ERROR_INTERNAL_ERROR,
|
||||
_("signature does not verify for %s"),
|
||||
filename);
|
||||
- goto out;
|
||||
+ return FALSE;
|
||||
default:
|
||||
- ret = FALSE;
|
||||
g_set_error(error,
|
||||
DNF_ERROR,
|
||||
DNF_ERROR_INTERNAL_ERROR,
|
||||
_("failed to open(generic error): %s"),
|
||||
filename);
|
||||
- goto out;
|
||||
+ return FALSE;
|
||||
}
|
||||
}
|
||||
+}
|
||||
+
|
||||
+gboolean
|
||||
+dnf_rpmts_add_reinstall_filename(rpmts ts,
|
||||
+ const gchar *filename,
|
||||
+ gboolean allow_untrusted,
|
||||
+ GError **error) try
|
||||
+{
|
||||
+ gboolean ret = TRUE;
|
||||
+ gint res;
|
||||
+ Header hdr;
|
||||
+ FD_t fd;
|
||||
+
|
||||
+ /* open this */
|
||||
+ fd = Fopen(filename, "r.ufdio");
|
||||
+ res = rpmReadPackageFile(ts, fd, filename, &hdr);
|
||||
+
|
||||
+ if (!result_is_accepted(res, allow_untrusted, filename, error)) {
|
||||
+ ret = FALSE;
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ /* add to the transaction */
|
||||
+ res = rpmtsAddReinstallElement(ts, hdr, (fnpyKey) filename);
|
||||
+ if (res != 0) {
|
||||
+ ret = FALSE;
|
||||
+ g_set_error(error,
|
||||
+ DNF_ERROR,
|
||||
+ DNF_ERROR_INTERNAL_ERROR,
|
||||
+ _("failed to add reinstall element: %1$s [%2$i]"),
|
||||
+ filename, res);
|
||||
+ goto out;
|
||||
+ }
|
||||
+out:
|
||||
+ Fclose(fd);
|
||||
+ headerFree(hdr);
|
||||
+ return ret;
|
||||
+} CATCH_TO_GERROR(FALSE)
|
||||
+
|
||||
+gboolean
|
||||
+dnf_rpmts_add_install_filename2(rpmts ts,
|
||||
+ const gchar *filename,
|
||||
+ gboolean allow_untrusted,
|
||||
+ gboolean is_update,
|
||||
+ DnfPackage * pkg,
|
||||
+ GError **error) try
|
||||
+{
|
||||
+ gboolean ret = TRUE;
|
||||
+ gint res;
|
||||
+ Header hdr;
|
||||
+ FD_t fd;
|
||||
+
|
||||
+ /* open this */
|
||||
+ fd = Fopen(filename, "r.ufdio");
|
||||
+ res = rpmReadPackageFile(ts, fd, filename, &hdr);
|
||||
+
|
||||
+ if (!result_is_accepted(res, allow_untrusted, filename, error)) {
|
||||
+ ret = FALSE;
|
||||
+ goto out;
|
||||
+ }
|
||||
if (pkg) {
|
||||
if (!test_fail_safe(&hdr, pkg, error)) {
|
||||
ret = FALSE;
|
||||
diff --git a/libdnf/dnf-transaction.cpp b/libdnf/dnf-transaction.cpp
|
||||
index d93c5ec6..d57e463d 100644
|
||||
--- a/libdnf/dnf-transaction.cpp
|
||||
+++ b/libdnf/dnf-transaction.cpp
|
||||
@@ -1221,8 +1221,12 @@ dnf_transaction_commit(DnfTransaction *transaction, HyGoal goal, DnfState *state
|
||||
filename = dnf_package_get_filename(pkg);
|
||||
allow_untrusted = (priv->flags & DNF_TRANSACTION_FLAG_ONLY_TRUSTED) == 0;
|
||||
is_update = action == DNF_STATE_ACTION_UPDATE || action == DNF_STATE_ACTION_DOWNGRADE;
|
||||
- ret = dnf_rpmts_add_install_filename2(
|
||||
- priv->ts, filename, allow_untrusted, is_update, pkg, error);
|
||||
+ if (action == DNF_STATE_ACTION_REINSTALL) {
|
||||
+ ret = dnf_rpmts_add_reinstall_filename(priv->ts, filename, allow_untrusted, error);
|
||||
+ } else {
|
||||
+ ret = dnf_rpmts_add_install_filename2(
|
||||
+ priv->ts, filename, allow_untrusted, is_update, pkg, error);
|
||||
+ }
|
||||
if (!ret)
|
||||
goto out;
|
||||
|
||||
--
|
||||
2.45.0
|
||||
|
||||
@ -0,0 +1,81 @@
|
||||
From 7a3d4ed40276d2667cf48f83672ef1f142a8f0a7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Fri, 3 May 2024 08:55:47 +0200
|
||||
Subject: [PATCH 2/2] Since we use rpmtsAddReinstallElement rpm also uninstalls
|
||||
the package
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream commit: bc371683ab69d51127952b037bde209a56e44105
|
||||
|
||||
It calls callbacks for `RPMCALLBACK_INST_START` and
|
||||
`RPMCALLBACK_INST_PROGRESS` just like before when the reinstall was done
|
||||
through regural install (rpmtsAddInstallElement) but in addition it also
|
||||
calls `RPMCALLBACK_UNINST_START` and `RPMCALLBACK_UNINST_PROGRESS`. To
|
||||
ensure they find the `DnfPackage` add it to `remove_helper` array.
|
||||
|
||||
Unfortunaly this means that the reinstall action is reported twice to
|
||||
the clients (one install and one uninstall). We could try to hide one of
|
||||
the them but I think a better solution is to report what is actually
|
||||
happening and report one install and one uninstall.
|
||||
|
||||
This is for the context part of libdnf (microdnf, packagekit, ...)
|
||||
|
||||
Fixes: https://github.com/rpm-software-management/libdnf/issues/1653
|
||||
Resolves: https://issues.redhat.com/browse/RHEL-1454
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
libdnf/dnf-transaction.cpp | 15 ++++++++++++---
|
||||
1 file changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/libdnf/dnf-transaction.cpp b/libdnf/dnf-transaction.cpp
|
||||
index d57e463d..8e17ba2d 100644
|
||||
--- a/libdnf/dnf-transaction.cpp
|
||||
+++ b/libdnf/dnf-transaction.cpp
|
||||
@@ -602,7 +602,7 @@ dnf_transaction_ts_progress_cb(const void *arg,
|
||||
|
||||
/* map to correct action code */
|
||||
action = dnf_package_get_action(pkg);
|
||||
- if (action == DNF_STATE_ACTION_UNKNOWN)
|
||||
+ if (action == DNF_STATE_ACTION_UNKNOWN || action == DNF_STATE_ACTION_REINSTALL)
|
||||
action = DNF_STATE_ACTION_INSTALL;
|
||||
|
||||
/* set the pkgid if not already set */
|
||||
@@ -641,7 +641,7 @@ dnf_transaction_ts_progress_cb(const void *arg,
|
||||
|
||||
/* map to correct action code */
|
||||
action = dnf_package_get_action(pkg);
|
||||
- if (action == DNF_STATE_ACTION_UNKNOWN)
|
||||
+ if (action == DNF_STATE_ACTION_UNKNOWN || action == DNF_STATE_ACTION_REINSTALL)
|
||||
action = DNF_STATE_ACTION_REMOVE;
|
||||
|
||||
/* remove start */
|
||||
@@ -716,7 +716,7 @@ dnf_transaction_ts_progress_cb(const void *arg,
|
||||
|
||||
/* map to correct action code */
|
||||
action = dnf_package_get_action(pkg);
|
||||
- if (action == DNF_STATE_ACTION_UNKNOWN)
|
||||
+ if (action == DNF_STATE_ACTION_UNKNOWN || action == DNF_STATE_ACTION_REINSTALL)
|
||||
action = DNF_STATE_ACTION_REMOVE;
|
||||
|
||||
dnf_state_set_package_progress(
|
||||
@@ -1338,6 +1338,15 @@ dnf_transaction_commit(DnfTransaction *transaction, HyGoal goal, DnfState *state
|
||||
g_ptr_array_unref(pkglist);
|
||||
}
|
||||
|
||||
+ /* add reinstalled packages to a helper array which is used to
|
||||
+ * map removed packages auto-added by rpm to actual DnfPackage's */
|
||||
+ pkglist = dnf_goal_get_packages(goal, DNF_PACKAGE_INFO_REINSTALL, -1);
|
||||
+ for (i = 0; i < pkglist->len; i++) {
|
||||
+ pkg_tmp = static_cast< DnfPackage * >(g_ptr_array_index(pkglist, i));
|
||||
+ g_ptr_array_add(priv->remove_helper, g_object_ref(pkg_tmp));
|
||||
+ }
|
||||
+ g_ptr_array_unref(pkglist);
|
||||
+
|
||||
/* this section done */
|
||||
ret = dnf_state_done(state, error);
|
||||
if (!ret)
|
||||
--
|
||||
2.45.0
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From a0a32b4c2e2a03ff6ffcb6b7285905ec50892798 Mon Sep 17 00:00:00 2001
|
||||
From d264065ec0d574b70bf376d5ee3777d7cc03030f Mon Sep 17 00:00:00 2001
|
||||
From: Colin Walters <walters@verbum.org>
|
||||
Date: Tue, 4 Jun 2024 06:57:19 -0400
|
||||
Subject: [PATCH] repo: Don't try to perform labeling if SELinux is disabled
|
||||
Loading…
Reference in new issue