[arch-commits] Commit in firewalld/trunk (PKGBUILD firewalld-fs57255.patch)

[Maxime Gauduin]

    Date: Monday, January 29, 2018 @ 21:33:05
  Author: alucryd
Revision: 287892

FS#57255: firewalld 0.5.0-2

Added:
  firewalld/trunk/firewalld-fs57255.patch
Modified:
  firewalld/trunk/PKGBUILD	(contents, properties)

-------------------------+
 PKGBUILD                |    9 ++++++---
 firewalld-fs57255.patch |   24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-29 20:32:22 UTC (rev 287891)
+++ PKGBUILD	2018-01-29 21:33:05 UTC (rev 287892)
@@ -5,7 +5,7 @@
 
 pkgname=firewalld
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Firewall daemon with D-Bus interface'
 arch=('any')
 url='https://github.com/t-woerner/firewalld'
@@ -21,14 +21,17 @@
 backup=('etc/conf.d/firewalld'
         'etc/firewalld/firewalld.conf')
 source=("firewalld-${pkgver}.tar.gz::https://github.com/t-woerner/firewalld/archive/v${pkgver}.tar.gz"
-        'firewalld-arch.patch')
+        'firewalld-arch.patch'
+        'firewalld-fs57255.patch')
 sha256sums=('ecd3adb714fe2ead77253d505cf430c6c640f2c088f2a779c0459f399629ab38'
-            '14a05a2f5eccbb6c30e775877706a90fd4ad524cdd13ea76f3a23b09b9d4212e')
+            '14a05a2f5eccbb6c30e775877706a90fd4ad524cdd13ea76f3a23b09b9d4212e'
+            '7e6a3bd91f96f0bfa60ec463999d1e0411c10036d6f056f5a2237e4959b7bc2c')
 
 prepare() {
   cd firewalld-${pkgver}
 
   patch -Np1 -i ../firewalld-arch.patch
+  patch -Np1 -i ../firewalld-fs57255.patch
 
   ./autogen.sh
 }


Property changes on: firewalld/trunk/PKGBUILD
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Added: firewalld-fs57255.patch
===================================================================
--- firewalld-fs57255.patch	                        (rev 0)
+++ firewalld-fs57255.patch	2018-01-29 21:33:05 UTC (rev 287892)
@@ -0,0 +1,24 @@
+From a0b6e82be7911d28da3a8879535575c32e7818e5 Mon Sep 17 00:00:00 2001
+From: Eric Garver <e at erig.me>
+Date: Mon, 29 Jan 2018 15:39:11 -0500
+Subject: [PATCH] ebtables: fix missing default value to set_rule()
+
+Fixes: #287
+Fixes: e384a49a709a ("fw: Push rule replace logic into backend")
+---
+ src/firewall/core/ebtables.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/firewall/core/ebtables.py b/src/firewall/core/ebtables.py
+index 6f42c656..ea085849 100644
+--- a/src/firewall/core/ebtables.py
++++ b/src/firewall/core/ebtables.py
+@@ -191,7 +191,7 @@ def set_rules(self, rules, flush=False, log_denied="off"):
+                                                      " ".join(args), ret))
+         return ret
+ 
+-    def set_rule(self, rule, log_denied):
++    def set_rule(self, rule, log_denied="off"):
+         self._rule_validate(rule)
+         return self.__run(rule)
+