remove unused patches
This commit is contained in:
parent
43ab8cdd33
commit
34a91ae356
@ -1,35 +0,0 @@
|
|||||||
From 5494006021e83f27195dc902c3c9fd024e71dc3b Mon Sep 17 00:00:00 2001
|
|
||||||
From: MeggyCal <MeggyCal@users.noreply.github.com>
|
|
||||||
Date: Thu, 20 Sep 2018 15:37:17 +0200
|
|
||||||
Subject: [PATCH] Fix translating labels (#392)
|
|
||||||
|
|
||||||
Fix for #344 was incomplete, the "flags" were not translating and the reported bug was still active.
|
|
||||||
|
|
||||||
Fixes: #344
|
|
||||||
(cherry picked from commit e657200927a9f0f41fbed95640cd47e2a5836c6f)
|
|
||||||
---
|
|
||||||
src/firewall-config.glade | 8 ++++----
|
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/firewall-config.glade b/src/firewall-config.glade
|
|
||||||
index 22bed58aafaf..75c229b408fd 100644
|
|
||||||
--- a/src/firewall-config.glade
|
|
||||||
+++ b/src/firewall-config.glade
|
|
||||||
@@ -10135,10 +10135,10 @@
|
|
||||||
<property name="halign">start</property>
|
|
||||||
<property name="valign">start</property>
|
|
||||||
<items>
|
|
||||||
- <item>accept</item>
|
|
||||||
- <item>reject</item>
|
|
||||||
- <item>drop</item>
|
|
||||||
- <item>mark</item>
|
|
||||||
+ <item translatable="yes">accept</item>
|
|
||||||
+ <item translatable="yes">reject</item>
|
|
||||||
+ <item translatable="yes">drop</item>
|
|
||||||
+ <item translatable="yes">mark</item>
|
|
||||||
</items>
|
|
||||||
<signal name="changed" handler="on_richRuleDialog_changed" swapped="no"/>
|
|
||||||
</object>
|
|
||||||
--
|
|
||||||
2.18.0
|
|
||||||
|
|
@ -1,48 +0,0 @@
|
|||||||
From 2e53fab83ac844c1d2fb2781116ad47b8900ab85 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Eric Garver <e@erig.me>
|
|
||||||
Date: Fri, 21 Sep 2018 11:02:18 -0400
|
|
||||||
Subject: [PATCH 1/2] fw_transaction: On clear zone transaction, must clear fw
|
|
||||||
and other zones
|
|
||||||
|
|
||||||
Just like FirewallZoneTransaction.execute() that was spawned from a
|
|
||||||
FirewallTransaction must call FirewallTransaction.exectue() we should
|
|
||||||
also make sure the same is done for clear(). Otherwise we can end up
|
|
||||||
with a partially cleared transaction. This gets really hairy if the
|
|
||||||
FirewallTransaction contains many instances of FirewallZoneTransaction
|
|
||||||
which is common during startup with non-default configuration.
|
|
||||||
|
|
||||||
Fixes: #374
|
|
||||||
---
|
|
||||||
src/firewall/core/fw_transaction.py | 16 +++++++++++++---
|
|
||||||
1 file changed, 13 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/firewall/core/fw_transaction.py b/src/firewall/core/fw_transaction.py
|
|
||||||
index f169e4a923dd..ad204c1991cf 100644
|
|
||||||
--- a/src/firewall/core/fw_transaction.py
|
|
||||||
+++ b/src/firewall/core/fw_transaction.py
|
|
||||||
@@ -231,9 +231,19 @@ class FirewallZoneTransaction(SimpleFirewallTransaction):
|
|
||||||
self.modules = [ ] # [ module,.. ]
|
|
||||||
|
|
||||||
def clear(self):
|
|
||||||
- super(FirewallZoneTransaction, self).clear()
|
|
||||||
- del self.chains[:]
|
|
||||||
- del self.modules[:]
|
|
||||||
+ # calling clear on a zone_transaction that was spawned from a
|
|
||||||
+ # FirewallTransaction needs to clear the fw_transaction and all the
|
|
||||||
+ # other zones otherwise we end up with a partially cleared transaction.
|
|
||||||
+ if self.fw_transaction:
|
|
||||||
+ super(FirewallTransaction, self.fw_transaction).clear()
|
|
||||||
+ for zone in self.fw_transaction.zone_transactions.keys():
|
|
||||||
+ super(FirewallZoneTransaction, self.fw_transaction.zone_transactions[zone]).clear()
|
|
||||||
+ del self.fw_transaction.zone_transactions[zone].chains[:]
|
|
||||||
+ del self.fw_transaction.zone_transactions[zone].modules[:]
|
|
||||||
+ else:
|
|
||||||
+ super(FirewallZoneTransaction, self).clear()
|
|
||||||
+ del self.chains[:]
|
|
||||||
+ del self.modules[:]
|
|
||||||
|
|
||||||
def prepare(self, enable, rules=None, modules=None):
|
|
||||||
log.debug4("%s.prepare(%s, %s)" % (type(self), enable, "..."))
|
|
||||||
--
|
|
||||||
2.18.0
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user