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

[Maxime Gauduin]

    Date: Wednesday, June 24, 2015 @ 09:26:39
  Author: alucryd
Revision: 135811

FS#45423: firewalld 0.3.14.2-1

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

------------------------+
 PKGBUILD               |   24 ++++++++++++------------
 firewalld-syntax.patch |   23 -----------------------
 2 files changed, 12 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-24 06:49:53 UTC (rev 135810)
+++ PKGBUILD	2015-06-24 07:26:39 UTC (rev 135811)
@@ -4,30 +4,30 @@
 # Contributor: speed145a <jonathan at tagchapter.com>
 
 pkgname=firewalld
-pkgver=0.3.13
-pkgrel=2
+pkgver=0.3.14.2
+pkgrel=1
 pkgdesc='A dynamic firewall daemon with a D-BUS interface'
 arch=('any')
 url='http://fedorahosted.org/firewalld'
 license=('GPL2')
-depends=('dbus-glib' 'ebtables' 'gtk3' 'iptables' 'libnotify' 'python-slip')
+depends=('dbus-glib' 'ebtables' 'iptables' 'python-slip')
 makedepends=('intltool' 'docbook-xsl')
-optdepends=('networkmanager: firewall-config and firewall-applet')
+optdepends=('gtk3: firewall-config'
+            'libnm-glib: firewall-config and firewall-applet'
+            'libnotify: firewall-applet'
+            'python-pyqt4: firewall-applet')
 backup=('etc/conf.d/firewalld'
         'etc/firewalld/firewalld.conf')
 install='firewalld.install'
-source=("http://fedorahosted.org/released/firewalld/firewalld-${pkgver}.tar.bz2"
-        "firewalld-paths.patch"
-        "firewalld-syntax.patch")
-sha256sums=('bca88cbce4290b6959b3c0eea560e7f19c7cf2f563caca585b7db5cd2fca8ac9'
-            '41591c5358c5ad8d43b29d72f42c331fcfc25e3d38c0ba5b3c818fc757ceef2f'
-            '42f0e4dbf574ac7b87df77117816dbc4a2ac17f709a22990eeeb973950cc6322')
+source=("https://fedorahosted.org/released/firewalld/firewalld-${pkgver}.tar.bz2"
+        'firewalld-paths.patch')
+sha256sums=('4b6c3e1deab41b6002b8dc25639e466085941c98a6c14a56bef4f621a5651567'
+            '41591c5358c5ad8d43b29d72f42c331fcfc25e3d38c0ba5b3c818fc757ceef2f')
 
 prepare() {
   cd firewalld-${pkgver}
 
   patch -Np1 -i ../firewalld-paths.patch
-  patch -Np1 -i ../firewalld-syntax.patch
 }
 
 build() {
@@ -46,7 +46,7 @@
   cd firewalld-${pkgver}
 
   make DESTDIR="${pkgdir}" install
-  chmod 755 "${pkgdir}"/usr/bin/firewall-applet
+  #chmod 755 "${pkgdir}"/usr/bin/firewall-applet
 }
 
 # vim: ts=2 sw=2 et:

Deleted: firewalld-syntax.patch
===================================================================
--- firewalld-syntax.patch	2015-06-24 06:49:53 UTC (rev 135810)
+++ firewalld-syntax.patch	2015-06-24 07:26:39 UTC (rev 135811)
@@ -1,23 +0,0 @@
-diff -rupN firewalld-0.3.10.orig/src/firewall/core/io/direct.py firewalld-0.3.10/src/firewall/core/io/direct.py
---- firewalld-0.3.10.orig/src/firewall/core/io/direct.py	2014-06-10 11:22:07.824457932 +0200
-+++ firewalld-0.3.10/src/firewall/core/io/direct.py	2014-06-10 11:23:07.942732365 +0200
-@@ -295,8 +295,8 @@ class Direct(IO_Object):
-             if len(self.passthroughs[ipv]) == 0:
-                 del self.passthroughs[ipv]
-         else:
--            raise ValueError, "Passthrough '%s' for ipv '%s'" % \
--                ("',".join(args), ipv) + "not in list"
-+            raise ValueError("Passthrough '%s' for ipv '%s'" % \
-+                ("',".join(args), ipv) + "not in list")
- 
-     def query_passthrough(self, ipv, args):
-         return (ipv in self.passthroughs and args in self.passthroughs[ipv])
-@@ -305,7 +305,7 @@ class Direct(IO_Object):
-         if ipv in self.passthroughs:
-             return self.passthroughs[ipv]
-         else:
--            raise ValueError, "No passthroughs for ipv '%s'" % (ipv)
-+            raise ValueError("No passthroughs for ipv '%s'" % (ipv))
- 
-     def get_all_passthroughs(self):
-         return self.passthroughs