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

[Maxime Gauduin]

    Date: Wednesday, October 21, 2015 @ 14:19:54
  Author: alucryd
Revision: 144558

FS#46429: firewalld 0.3.14.2-3

Added:
  firewalld/trunk/firewalld-fs46429.patch
Modified:
  firewalld/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |    9 ++++--
 firewalld-fs46429.patch |   62 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-21 12:16:16 UTC (rev 144557)
+++ PKGBUILD	2015-10-21 12:19:54 UTC (rev 144558)
@@ -5,7 +5,7 @@
 
 pkgname=firewalld
 pkgver=0.3.14.2
-pkgrel=2
+pkgrel=3
 pkgdesc='A dynamic firewall daemon with a D-BUS interface'
 arch=('any')
 url='http://fedorahosted.org/firewalld'
@@ -20,14 +20,17 @@
         'etc/firewalld/firewalld.conf')
 install='firewalld.install'
 source=("https://fedorahosted.org/released/firewalld/firewalld-${pkgver}.tar.bz2"
-        'firewalld-paths.patch')
+        'firewalld-paths.patch'
+        'firewalld-fs46429.patch')
 sha256sums=('4b6c3e1deab41b6002b8dc25639e466085941c98a6c14a56bef4f621a5651567'
-            '41591c5358c5ad8d43b29d72f42c331fcfc25e3d38c0ba5b3c818fc757ceef2f')
+            '41591c5358c5ad8d43b29d72f42c331fcfc25e3d38c0ba5b3c818fc757ceef2f'
+            'be0a7fa459f0f99e1fb1ded9fb1f61866f2718c55d9eb7bd3b163134ada03136')
 
 prepare() {
   cd firewalld-${pkgver}
 
   patch -Np1 -i ../firewalld-paths.patch
+  patch -Np1 -i ../firewalld-fs46429.patch
 }
 
 build() {

Added: firewalld-fs46429.patch
===================================================================
--- firewalld-fs46429.patch	                        (rev 0)
+++ firewalld-fs46429.patch	2015-10-21 12:19:54 UTC (rev 144558)
@@ -0,0 +1,62 @@
+From 3a1f22c95bb5723456533de5aa821143682b8e3d Mon Sep 17 00:00:00 2001
+From: Thomas Woerner <twoerner at redhat.com>
+Date: Thu, 18 Jun 2015 16:55:40 +0200
+Subject: [PATCH] firewalld: Fixed 'pid_file' referenced before assignment
+ (RHBZ#1233232)
+
+---
+ src/firewalld | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/firewalld b/src/firewalld
+index 2db71a8..bd81316 100755
+--- a/src/firewalld
++++ b/src/firewalld
+@@ -82,6 +82,7 @@ def setup_logging(args):
+             log.addDebugLogging("*", log.stdout)
+ 
+ def startup(args):
++    pid_file = "/var/run/firewalld.pid"
+     try:
+         if not args.nofork:
+             # do the UNIX double-fork magic, see Stevens' "Advanced
+@@ -119,7 +120,6 @@ def startup(args):
+ 
+         if not args.nopid:
+             # write the pid file
+-            pid_file = "/var/run/firewalld.pid"
+             with open(pid_file, "w") as f:
+                 f.write(str(os.getpid()))
+ 
+@@ -128,27 +128,27 @@ def startup(args):
+         server.run_server(args.debug_gc)
+ 
+         # Clean up on exit
+-        if os.path.exists(pid_file) and not args.nopid:
++        if not args.nopid and os.path.exists(pid_file):
+             os.remove(pid_file)
+ 
+     except OSError as e:
+         log.fatal(_("Fork #1 failed: %d (%s)") % (e.errno, e.strerror))
+         log.error(traceback.format_exc())
+-        if os.path.exists(pid_file) and not args.nopid:
++        if not args.nopid and os.path.exists(pid_file):
+             os.remove(pid_file)
+         sys.exit(1)
+ 
+     except dbus.exceptions.DBusException as e:
+         log.fatal(str(e))
+         log.error(traceback.format_exc())
+-        if os.path.exists(pid_file) and not args.nopid:
++        if not args.nopid and os.path.exists(pid_file):
+             os.remove(pid_file)
+         sys.exit(1)
+ 
+     except IOError as e:
+         log.fatal(str(e))
+         log.error(traceback.format_exc())
+-        if os.path.exists(pid_file) and not args.nopid:
++        if not args.nopid and os.path.exists(pid_file):
+             os.remove(pid_file)
+         sys.exit(1)
+