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

[Maxime Gauduin]

    Date: Sunday, March 31, 2013 @ 22:56:54
  Author: alucryd
Revision: 87451

upgpkg: firewalld 0.3.1-1

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

-------------+
 PKGBUILD    |   16 +++++++---------
 paths.patch |   17 +++--------------
 2 files changed, 10 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-31 20:44:06 UTC (rev 87450)
+++ PKGBUILD	2013-03-31 20:56:54 UTC (rev 87451)
@@ -4,9 +4,9 @@
 # Contributor: speed145a <jonathan at tagchapter dot com>
 
 pkgname=firewalld
-pkgver=0.2.12
-pkgrel=6
-pkgdesc="Firewall service daemon that provides a dynamic customizable firewall with a D-BUS interface"
+pkgver=0.3.1
+pkgrel=1
+pkgdesc="A firewall daemon with D-BUS interface providing a dynamic firewall"
 arch=('any')
 url="http://fedorahosted.org/firewalld"
 license=('GPL2')
@@ -14,23 +14,21 @@
 makedepends=('intltool')
 backup=('etc/conf.d/firewalld' 'etc/firewalld/firewalld.conf')
 install=${pkgname}.install
-source=("http://fedorahosted.org/released/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'default-zone.patch' 'paths.patch')
-sha256sums=('02da3b1660ba87056615f64714dcdcc13694e953d07fb415b1b23d57d94b3071'
-            '32e12e9b6e70b0ea9e0714d770dedf17b4732c563e41a35616b8106a6141146f'
-            '97b9f97b91cb188e51fbabcdde43de26abc7b17e8ee6de1c6450ca606d291754')
+source=("http://fedorahosted.org/released/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'paths.patch')
+sha256sums=('069791fbc12bc1751ffb62bcf5a8ed45640d45e3edcdb9a2af3f4ed4b6fdc6d0'
+            'ee826f06ec8d8fc964d63005850dbc8da9058a3d49b5ccd5df21c7dd52b3de7f')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
 
 # Patches
-  patch -Np1 -i "${srcdir}"/default-zone.patch
   patch -Np1 -i "${srcdir}"/paths.patch
   sed -i 's|^#!.*python$|#!/usr/bin/python2|
           s|^#!.*python -Es$|#!/usr/bin/python2|' $(grep -rl '^#!.*python')
   sed -i 's|python|python2|g' fix_python_shebang.sh
 
 # Build
-  PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --disable-schemas-compile
+  PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile
   make
 }
 

Modified: paths.patch
===================================================================
--- paths.patch	2013-03-31 20:44:06 UTC (rev 87450)
+++ paths.patch	2013-03-31 20:56:54 UTC (rev 87451)
@@ -36,26 +36,15 @@
  
  install-init: install-sysconfig
  	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d
---- a/config/firewalld.init
-+++ b/config/firewalld.init
-@@ -29,7 +29,7 @@ exec="/usr/sbin/firewalld"
- prog="firewalld"
- #config="/etc/firewalld/firewalld.conf"
- 
--[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-+[ -e /etc/conf.d/$prog ] && . /etc/conf.d/$prog
- 
- lockfile=/var/lock/subsys/$prog
- 
---- a/config/firewalld.service
-+++ b/config/firewalld.service
+--- a/config/firewalld.service.in
++++ b/config/firewalld.service.in
 @@ -8,7 +8,7 @@ Before=NetworkManager.service
  Conflicts=iptables.service ip6tables.service ebtables.service
  
  [Service]
 -EnvironmentFile=-/etc/sysconfig/firewalld
 +EnvironmentFile=-/etc/conf.d/firewalld
- ExecStart=/usr/sbin/firewalld --nofork $FIREWALLD_ARGS
+ 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