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

[Maxime Gauduin]

    Date: Sunday, August 11, 2013 @ 18:09:37
  Author: alucryd
Revision: 95404

upgpkg: firewalld 0.3.4-1

Modified:
  firewalld/trunk/PKGBUILD
  firewalld/trunk/firewalld-paths.patch

-----------------------+
 PKGBUILD              |    8 ++++----
 firewalld-paths.patch |   32 ++++++++++++++++----------------
 2 files changed, 20 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-11 12:41:46 UTC (rev 95403)
+++ PKGBUILD	2013-08-11 16:09:37 UTC (rev 95404)
@@ -4,21 +4,21 @@
 # Contributor: speed145a <jonathan at tagchapter dot com>
 
 pkgname=firewalld
-pkgver=0.3.3
+pkgver=0.3.4
 pkgrel=1
 pkgdesc="A firewall daemon with D-BUS interface providing a dynamic firewall"
 arch=('any')
 url="http://fedorahosted.org/firewalld"
 license=('GPL2')
 depends=('ebtables' 'gtk3' 'iptables' 'libnotify' 'networkmanager' 'python2-slip')
-makedepends=('intltool')
+makedepends=('intltool' 'docbook-xsl')
 backup=('etc/conf.d/firewalld'
         'etc/firewalld/firewalld.conf')
 install=${pkgname}.install
 source=("http://fedorahosted.org/released/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'firewalld-paths.patch')
-sha256sums=('3fc9aa4fe177f07167048e50308cfda3875df03a454bab2110f81219fe98362d'
-            '77238eb2dee6c8c3be84631b25095dff60b6abaa060abe5c026c5c8851a68610')
+sha256sums=('c5d58c23534f841a50bd3d03077ab37f6fcd62dc94d77233764e732b3a2962f1'
+            'e2f96a3fbd8e8b9168d49c9f39e76a69fff169e69f302d0c12e458ed698cabc6')
 
 prepare() {
   cd "${srcdir}"/${pkgname}-${pkgver}

Modified: firewalld-paths.patch
===================================================================
--- firewalld-paths.patch	2013-08-11 12:41:46 UTC (rev 95403)
+++ firewalld-paths.patch	2013-08-11 16:09:37 UTC (rev 95404)
@@ -47,26 +47,26 @@
  ExecStart=@sbindir@/firewalld --nofork --nopid $FIREWALLD_ARGS
  ExecReload=/bin/kill -HUP $MAINPID
  # supress to log debug and error output also to /var/log/messages
---- a/src/firewall-offline-cmd
-+++ b/src/firewall-offline-cmd
-@@ -179,7 +179,7 @@ def _addStandardOptions(parser):
-                              "the firewall, after the "
-                              "default rules. Default protocol type: ipv4, "
-                              "default table: filter. "
--                             "(Example: ipv4:filter:/etc/sysconfig/"
-+                             "(Example: ipv4:filter:/etc/conf.d/"
-                              "ipv4_filter_addon)"))
+--- a/src/firewall-offline-cmd.orig   2013-08-11 17:59:31.155087815 +0200
++++ b/src/firewall-offline-cmd        2013-08-11 18:00:19.502502558 +0200
+@@ -184,7 +184,7 @@ def _addStandardOptions(parser):
+                       action="callback", dest="custom_rules", type="rulesfile",
+                       metavar=_("[<type>:][<table>:]<filename>"),
+                       callback=_append_unique,
+-                      help=_("Ignored option. Was used to add custom rules to the firewall (Example: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"))
++                      help=_("Ignored option. Was used to add custom rules to the firewall (Example: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"))
      parser.add_option("--forward-port",
                        action="callback", dest="forward_port",
-@@ -314,7 +314,7 @@ def parseSysconfigArgs(args, options=None, source=None):
- 
+                       type="forward_port",
+@@ -314,7 +314,7 @@ def parseSysconfigArgs(args, options=Non
+     return _parse_args(parser, args, options)
+
+ # system-config-firewall: fw_sysconfig
+-CONFIG = '/etc/sysconfig/system-config-firewall'
++CONFIG = '/etc/conf.d/system-config-firewall'
+
  def read_sysconfig_args():
      filename = None
--    CONFIG = '/etc/sysconfig/system-config-firewall'
-+    CONFIG = '/etc/conf.d/system-config-firewall'
-     if os.path.exists(CONFIG) and os.path.isfile(CONFIG):
-         filename = CONFIG
-     try:
 --- a/src/firewall/core/ebtables.py
 +++ b/src/firewall/core/ebtables.py
 @@ -37,7 +37,7 @@ class ebtables: