Date: Thursday, October 23, 2014 @ 11:35:25 Author: alucryd Revision: 121271
archrelease: copy trunk to community-any Added: firewalld/repos/community-any/PKGBUILD (from rev 121270, firewalld/trunk/PKGBUILD) firewalld/repos/community-any/firewalld-paths.patch (from rev 121270, firewalld/trunk/firewalld-paths.patch) firewalld/repos/community-any/firewalld-syntax.patch (from rev 121270, firewalld/trunk/firewalld-syntax.patch) firewalld/repos/community-any/firewalld.install (from rev 121270, firewalld/trunk/firewalld.install) Deleted: firewalld/repos/community-any/PKGBUILD firewalld/repos/community-any/firewalld-paths.patch firewalld/repos/community-any/firewalld-syntax.patch firewalld/repos/community-any/firewalld.install ------------------------+ PKGBUILD | 95 ++++++++++--------- firewalld-paths.patch | 234 +++++++++++++++++++++++------------------------ firewalld-syntax.patch | 46 ++++----- firewalld.install | 28 ++--- 4 files changed, 204 insertions(+), 199 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2014-10-23 09:35:13 UTC (rev 121270) +++ PKGBUILD 2014-10-23 09:35:25 UTC (rev 121271) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer: Maxime Gauduin <aluc...@gmail.com> -# Contributor: unikum <unikum...@gmail.com> -# Contributor: speed145a <jonat...@tagchapter.com> - -pkgname=firewalld -pkgver=0.3.11 -pkgrel=1 -pkgdesc='A dynamic firewall daemon with a D-BUS interface' -arch=('any') -url="http://fedorahosted.org/${pkgname}" -license=('GPL2') -depends=('ebtables' 'gtk3' 'iptables' 'libnotify' 'networkmanager' 'python-slip') -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" - "${pkgname}-paths.patch" - "${pkgname}-syntax.patch") -sha256sums=('02aeea580954d62abe7ad9ec053c2d943c7575d3f30e48e518a24d420b8a994f' - '41591c5358c5ad8d43b29d72f42c331fcfc25e3d38c0ba5b3c818fc757ceef2f' - '42f0e4dbf574ac7b87df77117816dbc4a2ac17f709a22990eeeb973950cc6322') - -prepare() { - cd ${pkgname}-${pkgver} - - patch -Np1 -i ../${pkgname}-paths.patch - patch -Np1 -i ../${pkgname}-syntax.patch -} - -build() { - cd ${pkgname}-${pkgver} - - ./configure --prefix='/usr' --sbindir='/usr/bin' --sysconfdir='/etc' --disable-schemas-compile - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR="${pkgdir}" install -} - -# vim: ts=2 sw=2 et: Copied: firewalld/repos/community-any/PKGBUILD (from rev 121270, firewalld/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2014-10-23 09:35:25 UTC (rev 121271) @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer: Maxime Gauduin <aluc...@archlinux.org.com> +# Contributor: unikum <unikum...@gmail.com> +# Contributor: speed145a <jonat...@tagchapter.com> + +pkgname=firewalld +pkgver=0.3.12 +pkgrel=1 +pkgdesc='A dynamic firewall daemon with a D-BUS interface' +arch=('any') +url='http://fedorahosted.org/firewalld' +license=('GPL2') +depends=('ebtables' 'gtk3' 'iptables' 'libnotify' 'networkmanager' + 'python-slip') +makedepends=('intltool' 'docbook-xsl') +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=('7909e29ef276f4c87e52a0c26d3184ad7dd1cf6bff04a4ab875662bc519bf48c' + '41591c5358c5ad8d43b29d72f42c331fcfc25e3d38c0ba5b3c818fc757ceef2f' + '42f0e4dbf574ac7b87df77117816dbc4a2ac17f709a22990eeeb973950cc6322') + +prepare() { + cd firewalld-${pkgver} + + patch -Np1 -i ../firewalld-paths.patch + patch -Np1 -i ../firewalld-syntax.patch +} + +build() { + cd firewalld-${pkgver} + + ./configure --prefix='/usr'\ + --localstatedir='/var' \ + --sbindir='/usr/bin' \ + --sysconfdir='/etc' \ + --disable-schemas-compile + make +} + +package() { + cd firewalld-${pkgver} + + make DESTDIR="${pkgdir}" install +} + +# vim: ts=2 sw=2 et: Deleted: firewalld-paths.patch =================================================================== --- firewalld-paths.patch 2014-10-23 09:35:13 UTC (rev 121270) +++ firewalld-paths.patch 2014-10-23 09:35:25 UTC (rev 121271) @@ -1,117 +0,0 @@ -diff -rupN firewalld-0.3.10.orig/config/firewalld.service.in firewalld-0.3.10/config/firewalld.service.in ---- firewalld-0.3.10.orig/config/firewalld.service.in 2014-06-10 11:07:27.864758482 +0200 -+++ firewalld-0.3.10/config/firewalld.service.in 2014-06-10 11:07:39.582420959 +0200 -@@ -6,7 +6,7 @@ Before=NetworkManager.service - Conflicts=iptables.service ip6tables.service ebtables.service - - [Service] --EnvironmentFile=-/etc/sysconfig/firewalld -+EnvironmentFile=-/etc/conf.d/firewalld - ExecStart=@sbindir@/firewalld --nofork --nopid $FIREWALLD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - # supress to log debug and error output also to /var/log/messages -diff -rupN firewalld-0.3.10.orig/config/Makefile.am firewalld-0.3.10/config/Makefile.am ---- firewalld-0.3.10.orig/config/Makefile.am 2014-06-10 11:07:27.851758856 +0200 -+++ firewalld-0.3.10/config/Makefile.am 2014-06-10 11:07:39.580421016 +0200 -@@ -164,12 +164,12 @@ firewalld.service: firewalld.service.in - $(edit) $< >$@ - - install-sysconfig: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig -- $(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/firewalld -+ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/conf.d -+ $(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/conf.d/firewalld - - uninstall-sysconfig: -- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld -- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : -+ rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld -+ rmdir $(DESTDIR)$(sysconfdir)/conf.d || : - - install-init: install-sysconfig - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d -diff -rupN firewalld-0.3.10.orig/config/Makefile.in firewalld-0.3.10/config/Makefile.in ---- firewalld-0.3.10.orig/config/Makefile.in 2014-06-10 11:07:27.782760844 +0200 -+++ firewalld-0.3.10/config/Makefile.in 2014-06-10 11:07:39.581420988 +0200 -@@ -761,12 +761,12 @@ firewalld.service: firewalld.service.in - $(edit) $< >$@ - - install-sysconfig: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig -- $(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/firewalld -+ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/conf.d -+ $(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/conf.d/firewalld - - uninstall-sysconfig: -- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld -- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : -+ rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld -+ rmdir $(DESTDIR)$(sysconfdir)/conf.d || : - - install-init: install-sysconfig - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d -diff -rupN firewalld-0.3.10.orig/src/firewall/core/ebtables.py firewalld-0.3.10/src/firewall/core/ebtables.py ---- firewalld-0.3.10.orig/src/firewall/core/ebtables.py 2014-06-10 11:07:27.340773575 +0200 -+++ firewalld-0.3.10/src/firewall/core/ebtables.py 2014-06-10 11:07:39.585420873 +0200 -@@ -37,7 +37,7 @@ class ebtables: - ipv = "ipv4" - - def __init__(self): -- self._command = "/sbin/ebtables" -+ self._command = "/usr/bin/ebtables" - - def __run(self, args): - # convert to string list -diff -rupN firewalld-0.3.10.orig/src/firewall/core/ipXtables.py firewalld-0.3.10/src/firewall/core/ipXtables.py ---- firewalld-0.3.10.orig/src/firewall/core/ipXtables.py 2014-06-10 11:07:27.340773575 +0200 -+++ firewalld-0.3.10/src/firewall/core/ipXtables.py 2014-06-10 11:07:39.586420844 +0200 -@@ -25,8 +25,8 @@ from firewall.core.prog import runProg - from firewall.core.logger import log - - COMMAND = { -- "ipv4": "/sbin/iptables", -- "ipv6": "/sbin/ip6tables", -+ "ipv4": "/usr/bin/iptables", -+ "ipv6": "/usr/bin/ip6tables", - } - - PROC_IPxTABLE_NAMES = { -diff -rupN firewalld-0.3.10.orig/src/firewall-offline-cmd firewalld-0.3.10/src/firewall-offline-cmd ---- firewalld-0.3.10.orig/src/firewall-offline-cmd 2014-06-10 11:07:27.339773604 +0200 -+++ firewalld-0.3.10/src/firewall-offline-cmd 2014-06-10 11:09:17.747594086 +0200 -@@ -44,7 +44,7 @@ def __usage(): - print (""" - Usage: firewall-offline-cmd [OPTIONS...] - --If no options are given, configuration from '/etc/sysconfig/system-config-firewall' will be migrated. -+If no options are given, configuration from '/etc/conf.d/system-config-firewall' will be migrated. - - General Options - -h, --help Prints a short help text and exists -@@ -70,7 +70,7 @@ Lokkit Compatibility Options - --custom-rules=[<type>:][<table>:]<filename> - Ignored option. Was used to add custom rules to the - firewall (Example: -- ipv4:filter:/etc/sysconfig/ipv4_filter_addon) -+ ipv4:filter:/etc/conf.d/ipv4_filter_addon) - --forward-port=if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:toaddr=<destination address>] - Forward the port with protocol for the interface to - either another local destination port (no destination -@@ -376,7 +376,7 @@ def __pk_symlink(product='server'): - __fail('no such file '+_PK_DIR+_PK_NAME+product+'.policy') - - # system-config-firewall: fw_sysconfig --CONFIG = '/etc/sysconfig/system-config-firewall' -+CONFIG = '/etc/conf.d/system-config-firewall' - def read_sysconfig_args(): - filename = None - if os.path.exists(CONFIG) and os.path.isfile(CONFIG): -@@ -562,7 +562,7 @@ if len(sys.argv) > 1: - args.append(joinArgs(aux_args[i+1:])) # add <args> as one arg - a = parser.parse_args(args) - else: -- # migrate configuration from /etc/sysconfig/system-config-firewall -+ # migrate configuration from /etc/conf.d/system-config-firewall - args = read_sysconfig_args() - if args: - a = parser.parse_args(args) Copied: firewalld/repos/community-any/firewalld-paths.patch (from rev 121270, firewalld/trunk/firewalld-paths.patch) =================================================================== --- firewalld-paths.patch (rev 0) +++ firewalld-paths.patch 2014-10-23 09:35:25 UTC (rev 121271) @@ -0,0 +1,117 @@ +diff -rupN firewalld-0.3.10.orig/config/firewalld.service.in firewalld-0.3.10/config/firewalld.service.in +--- firewalld-0.3.10.orig/config/firewalld.service.in 2014-06-10 11:07:27.864758482 +0200 ++++ firewalld-0.3.10/config/firewalld.service.in 2014-06-10 11:07:39.582420959 +0200 +@@ -6,7 +6,7 @@ Before=NetworkManager.service + Conflicts=iptables.service ip6tables.service ebtables.service + + [Service] +-EnvironmentFile=-/etc/sysconfig/firewalld ++EnvironmentFile=-/etc/conf.d/firewalld + ExecStart=@sbindir@/firewalld --nofork --nopid $FIREWALLD_ARGS + ExecReload=/bin/kill -HUP $MAINPID + # supress to log debug and error output also to /var/log/messages +diff -rupN firewalld-0.3.10.orig/config/Makefile.am firewalld-0.3.10/config/Makefile.am +--- firewalld-0.3.10.orig/config/Makefile.am 2014-06-10 11:07:27.851758856 +0200 ++++ firewalld-0.3.10/config/Makefile.am 2014-06-10 11:07:39.580421016 +0200 +@@ -164,12 +164,12 @@ firewalld.service: firewalld.service.in + $(edit) $< >$@ + + install-sysconfig: +- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig +- $(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/firewalld ++ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/conf.d ++ $(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/conf.d/firewalld + + uninstall-sysconfig: +- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld +- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : ++ rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld ++ rmdir $(DESTDIR)$(sysconfdir)/conf.d || : + + install-init: install-sysconfig + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d +diff -rupN firewalld-0.3.10.orig/config/Makefile.in firewalld-0.3.10/config/Makefile.in +--- firewalld-0.3.10.orig/config/Makefile.in 2014-06-10 11:07:27.782760844 +0200 ++++ firewalld-0.3.10/config/Makefile.in 2014-06-10 11:07:39.581420988 +0200 +@@ -761,12 +761,12 @@ firewalld.service: firewalld.service.in + $(edit) $< >$@ + + install-sysconfig: +- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig +- $(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/firewalld ++ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/conf.d ++ $(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/conf.d/firewalld + + uninstall-sysconfig: +- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld +- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : ++ rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld ++ rmdir $(DESTDIR)$(sysconfdir)/conf.d || : + + install-init: install-sysconfig + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d +diff -rupN firewalld-0.3.10.orig/src/firewall/core/ebtables.py firewalld-0.3.10/src/firewall/core/ebtables.py +--- firewalld-0.3.10.orig/src/firewall/core/ebtables.py 2014-06-10 11:07:27.340773575 +0200 ++++ firewalld-0.3.10/src/firewall/core/ebtables.py 2014-06-10 11:07:39.585420873 +0200 +@@ -37,7 +37,7 @@ class ebtables: + ipv = "ipv4" + + def __init__(self): +- self._command = "/sbin/ebtables" ++ self._command = "/usr/bin/ebtables" + + def __run(self, args): + # convert to string list +diff -rupN firewalld-0.3.10.orig/src/firewall/core/ipXtables.py firewalld-0.3.10/src/firewall/core/ipXtables.py +--- firewalld-0.3.10.orig/src/firewall/core/ipXtables.py 2014-06-10 11:07:27.340773575 +0200 ++++ firewalld-0.3.10/src/firewall/core/ipXtables.py 2014-06-10 11:07:39.586420844 +0200 +@@ -25,8 +25,8 @@ from firewall.core.prog import runProg + from firewall.core.logger import log + + COMMAND = { +- "ipv4": "/sbin/iptables", +- "ipv6": "/sbin/ip6tables", ++ "ipv4": "/usr/bin/iptables", ++ "ipv6": "/usr/bin/ip6tables", + } + + PROC_IPxTABLE_NAMES = { +diff -rupN firewalld-0.3.10.orig/src/firewall-offline-cmd firewalld-0.3.10/src/firewall-offline-cmd +--- firewalld-0.3.10.orig/src/firewall-offline-cmd 2014-06-10 11:07:27.339773604 +0200 ++++ firewalld-0.3.10/src/firewall-offline-cmd 2014-06-10 11:09:17.747594086 +0200 +@@ -44,7 +44,7 @@ def __usage(): + print (""" + Usage: firewall-offline-cmd [OPTIONS...] + +-If no options are given, configuration from '/etc/sysconfig/system-config-firewall' will be migrated. ++If no options are given, configuration from '/etc/conf.d/system-config-firewall' will be migrated. + + General Options + -h, --help Prints a short help text and exists +@@ -70,7 +70,7 @@ Lokkit Compatibility Options + --custom-rules=[<type>:][<table>:]<filename> + Ignored option. Was used to add custom rules to the + firewall (Example: +- ipv4:filter:/etc/sysconfig/ipv4_filter_addon) ++ ipv4:filter:/etc/conf.d/ipv4_filter_addon) + --forward-port=if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:toaddr=<destination address>] + Forward the port with protocol for the interface to + either another local destination port (no destination +@@ -376,7 +376,7 @@ def __pk_symlink(product='server'): + __fail('no such file '+_PK_DIR+_PK_NAME+product+'.policy') + + # system-config-firewall: fw_sysconfig +-CONFIG = '/etc/sysconfig/system-config-firewall' ++CONFIG = '/etc/conf.d/system-config-firewall' + def read_sysconfig_args(): + filename = None + if os.path.exists(CONFIG) and os.path.isfile(CONFIG): +@@ -562,7 +562,7 @@ if len(sys.argv) > 1: + args.append(joinArgs(aux_args[i+1:])) # add <args> as one arg + a = parser.parse_args(args) + else: +- # migrate configuration from /etc/sysconfig/system-config-firewall ++ # migrate configuration from /etc/conf.d/system-config-firewall + args = read_sysconfig_args() + if args: + a = parser.parse_args(args) Deleted: firewalld-syntax.patch =================================================================== --- firewalld-syntax.patch 2014-10-23 09:35:13 UTC (rev 121270) +++ firewalld-syntax.patch 2014-10-23 09:35:25 UTC (rev 121271) @@ -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 Copied: firewalld/repos/community-any/firewalld-syntax.patch (from rev 121270, firewalld/trunk/firewalld-syntax.patch) =================================================================== --- firewalld-syntax.patch (rev 0) +++ firewalld-syntax.patch 2014-10-23 09:35:25 UTC (rev 121271) @@ -0,0 +1,23 @@ +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 Deleted: firewalld.install =================================================================== --- firewalld.install 2014-10-23 09:35:13 UTC (rev 121270) +++ firewalld.install 2014-10-23 09:35:25 UTC (rev 121271) @@ -1,14 +0,0 @@ -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -ftq usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim: ts=2 sw=2 et: Copied: firewalld/repos/community-any/firewalld.install (from rev 121270, firewalld/trunk/firewalld.install) =================================================================== --- firewalld.install (rev 0) +++ firewalld.install 2014-10-23 09:35:25 UTC (rev 121271) @@ -0,0 +1,14 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -ftq usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim: ts=2 sw=2 et: