[arch-commits] Commit in firewalld/repos/community-any (7 files)

Maxime Gauduin alucryd at nymeria.archlinux.org
Tue Jun 10 10:23:22 UTC 2014


    Date: Tuesday, June 10, 2014 @ 12:23:21
  Author: alucryd
Revision: 112959

archrelease: copy trunk to community-any

Added:
  firewalld/repos/community-any/PKGBUILD
    (from rev 112958, firewalld/trunk/PKGBUILD)
  firewalld/repos/community-any/firewalld-paths.patch
    (from rev 112958, firewalld/trunk/firewalld-paths.patch)
  firewalld/repos/community-any/firewalld-syntax.patch
    (from rev 112958, firewalld/trunk/firewalld-syntax.patch)
  firewalld/repos/community-any/firewalld.install
    (from rev 112958, firewalld/trunk/firewalld.install)
Deleted:
  firewalld/repos/community-any/PKGBUILD
  firewalld/repos/community-any/firewalld-paths.patch
  firewalld/repos/community-any/firewalld.install

------------------------+
 PKGBUILD               |   87 ++++++++++---------
 firewalld-paths.patch  |  210 ++++++++++++++++++++++++++---------------------
 firewalld-syntax.patch |   23 +++++
 firewalld.install      |   28 +++---
 4 files changed, 199 insertions(+), 149 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-10 10:23:05 UTC (rev 112958)
+++ PKGBUILD	2014-06-10 10:23:21 UTC (rev 112959)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at gmail.com>
-# Contributor: unikum <unikum.pm at gmail.com>
-# Contributor: speed145a <jonathan at tagchapter.com>
-
-pkgname=firewalld
-pkgver=0.3.9.3
-pkgrel=2
-pkgdesc='A firewall daemon with D-BUS interface providing a dynamic firewall'
-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"
-        'firewalld-paths.patch')
-sha256sums=('2076665137ad93d574bb5c9688fc83b4971cf70e36bdf0fd20f885dd42553002'
-            'e2f96a3fbd8e8b9168d49c9f39e76a69fff169e69f302d0c12e458ed698cabc6')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-
-  patch -Np1 -i ../firewalld-paths.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 112958, firewalld/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-06-10 10:23:21 UTC (rev 112959)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at gmail.com>
+# Contributor: unikum <unikum.pm at gmail.com>
+# Contributor: speed145a <jonathan at tagchapter.com>
+
+pkgname=firewalld
+pkgver=0.3.10
+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=('0f5e051655fc06690f5ab72b1b38cb57b4368e49bd5ad98a27e2f88c79e82f2b'
+            '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:

Deleted: firewalld-paths.patch
===================================================================
--- firewalld-paths.patch	2014-06-10 10:23:05 UTC (rev 112958)
+++ firewalld-paths.patch	2014-06-10 10:23:21 UTC (rev 112959)
@@ -1,93 +0,0 @@
---- a/config/Makefile.am
-+++ b/config/Makefile.am
-@@ -57,12 +57,12 @@ UNINSTALL_TARGETS += uninstall-init
- endif
- 
- 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
---- a/config/Makefile.in
-+++ b/config/Makefile.in
-@@ -566,12 +566,12 @@ uninstall-am: uninstall-desktopDATA uninstall-dist_dbus_policyDATA \
- all: $(desktop_DATA) $(polkit1_action_DATA) $(gsettings_SCHEMAS)
- 
- 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
---- 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=@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.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",
-                       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
---- a/src/firewall/core/ebtables.py
-+++ b/src/firewall/core/ebtables.py
-@@ -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
---- a/src/firewall/core/ipXtables.py
-+++ b/src/firewall/core/ipXtables.py
-@@ -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 = {

Copied: firewalld/repos/community-any/firewalld-paths.patch (from rev 112958, firewalld/trunk/firewalld-paths.patch)
===================================================================
--- firewalld-paths.patch	                        (rev 0)
+++ firewalld-paths.patch	2014-06-10 10:23:21 UTC (rev 112959)
@@ -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)

Copied: firewalld/repos/community-any/firewalld-syntax.patch (from rev 112958, firewalld/trunk/firewalld-syntax.patch)
===================================================================
--- firewalld-syntax.patch	                        (rev 0)
+++ firewalld-syntax.patch	2014-06-10 10:23:21 UTC (rev 112959)
@@ -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-06-10 10:23:05 UTC (rev 112958)
+++ firewalld.install	2014-06-10 10:23:21 UTC (rev 112959)
@@ -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 112958, firewalld/trunk/firewalld.install)
===================================================================
--- firewalld.install	                        (rev 0)
+++ firewalld.install	2014-06-10 10:23:21 UTC (rev 112959)
@@ -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:




More information about the arch-commits mailing list