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

[Maxime Gauduin]

    Date: Wednesday, January 31, 2018 @ 21:56:48
  Author: alucryd
Revision: 288452

upgpkg: firewalld 0.5.1-1

Modified:
  firewalld/trunk/PKGBUILD
Deleted:
  firewalld/trunk/firewalld-fs57255.patch

-------------------------+
 PKGBUILD                |   13 +++++--------
 firewalld-fs57255.patch |   24 ------------------------
 2 files changed, 5 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-31 21:12:02 UTC (rev 288451)
+++ PKGBUILD	2018-01-31 21:56:48 UTC (rev 288452)
@@ -4,8 +4,8 @@
 # Contributor: speed145a <jonathan at tagchapter.com>
 
 pkgname=firewalld
-pkgver=0.5.0
-pkgrel=2
+pkgver=0.5.1
+pkgrel=1
 pkgdesc='Firewall daemon with D-Bus interface'
 arch=('any')
 url='https://github.com/t-woerner/firewalld'
@@ -21,17 +21,14 @@
 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-fs57255.patch')
-sha256sums=('ecd3adb714fe2ead77253d505cf430c6c640f2c088f2a779c0459f399629ab38'
-            '14a05a2f5eccbb6c30e775877706a90fd4ad524cdd13ea76f3a23b09b9d4212e'
-            '7e6a3bd91f96f0bfa60ec463999d1e0411c10036d6f056f5a2237e4959b7bc2c')
+        'firewalld-arch.patch')
+sha256sums=('57d0639bed3a845899ea16f52fbd68b2e62fdca75cea50be60d651e4255be00e'
+            '14a05a2f5eccbb6c30e775877706a90fd4ad524cdd13ea76f3a23b09b9d4212e')
 
 prepare() {
   cd firewalld-${pkgver}
 
   patch -Np1 -i ../firewalld-arch.patch
-  patch -Np1 -i ../firewalld-fs57255.patch
 
   ./autogen.sh
 }

Deleted: firewalld-fs57255.patch
===================================================================
--- firewalld-fs57255.patch	2018-01-31 21:12:02 UTC (rev 288451)
+++ firewalld-fs57255.patch	2018-01-31 21:56:48 UTC (rev 288452)
@@ -1,24 +0,0 @@
-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)
-