[arch-commits] Commit in firewalld/repos (6 files)
Maxime Gauduin
alucryd at nymeria.archlinux.org
Thu Feb 21 10:38:37 UTC 2013
Date: Thursday, February 21, 2013 @ 11:38:37
Author: alucryd
Revision: 84663
archrelease: copy trunk to community-any
Added:
firewalld/repos/community-any/
firewalld/repos/community-any/PKGBUILD
(from rev 84662, firewalld/trunk/PKGBUILD)
firewalld/repos/community-any/default-zone.patch
(from rev 84662, firewalld/trunk/default-zone.patch)
firewalld/repos/community-any/firewalld.install
(from rev 84662, firewalld/trunk/firewalld.install)
firewalld/repos/community-any/paths.patch
(from rev 84662, firewalld/trunk/paths.patch)
firewalld/repos/community-any/python2.patch
(from rev 84662, firewalld/trunk/python2.patch)
--------------------+
PKGBUILD | 48 +++++++++++++++++++++++
default-zone.patch | 11 +++++
firewalld.install | 15 +++++++
paths.patch | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++
python2.patch | 79 ++++++++++++++++++++++++++++++++++++++
5 files changed, 257 insertions(+)
Copied: firewalld/repos/community-any/PKGBUILD (from rev 84662, firewalld/trunk/PKGBUILD)
===================================================================
--- community-any/PKGBUILD (rev 0)
+++ community-any/PKGBUILD 2013-02-21 10:38:37 UTC (rev 84663)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at gmail dot com>
+# Contributor: unikum <unikum dot pm at gmail.com>
+# Contributor: speed145a <jonathan at tagchapter dot com>
+
+pkgname=firewalld
+pkgver=0.2.12
+pkgrel=4
+pkgdesc="Firewall service daemon that provides a dynamic customizable firewall with a D-BUS interface"
+arch=('any')
+url="http://fedorahosted.org/firewalld"
+license=('GPL2')
+depends=('ebtables' 'gtk3' 'hicolor-icon-theme' 'iptables' 'python2-slip')
+makedepends=('desktop-file-utils' 'glib2' 'intltool')
+conflicts=('firewalld-git')
+install=${pkgname}.install
+source=("http://fedorahosted.org/released/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'default-zone.patch' 'paths.patch' 'python2.patch')
+sha256sums=('02da3b1660ba87056615f64714dcdcc13694e953d07fb415b1b23d57d94b3071'
+ '32e12e9b6e70b0ea9e0714d770dedf17b4732c563e41a35616b8106a6141146f'
+ '97b9f97b91cb188e51fbabcdde43de26abc7b17e8ee6de1c6450ca606d291754'
+ 'cb5f73c1c7622c35552d60c6e774d82cf11f4d5794238b50e02799c9f88cb558')
+
+build() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+# Patches
+ patch -Np1 -i "${srcdir}"/default-zone.patch
+ patch -Np1 -i "${srcdir}"/paths.patch
+ patch -Np1 -i "${srcdir}"/python2.patch
+
+# Build
+ PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --disable-schemas-compile
+ make
+}
+
+package() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+# Install
+ make DESTDIR="${pkgdir}" install
+
+# Fix permissions
+ find "${pkgdir}" -type d -exec chmod 755 {} +
+ find "${pkgdir}" -type f -exec chmod 644 {} +
+ chmod -R 755 "${pkgdir}"/usr/{bin,sbin}
+}
+
+# vim: ts=2 sw=2 et:
Copied: firewalld/repos/community-any/default-zone.patch (from rev 84662, firewalld/trunk/default-zone.patch)
===================================================================
--- community-any/default-zone.patch (rev 0)
+++ community-any/default-zone.patch 2013-02-21 10:38:37 UTC (rev 84663)
@@ -0,0 +1,11 @@
+--- a/src/firewall/core/io/firewalld_conf.py
++++ b/src/firewall/core/io/firewalld_conf.py
+@@ -37,7 +37,7 @@ class firewalld_conf:
+ self._deleted = [ ]
+
+ def get(self, key):
+- self._config.get(key.strip())
++ return self._config.get(key.strip())
+
+ def set(self, key, value):
+ _key = key.strip()
Copied: firewalld/repos/community-any/firewalld.install (from rev 84662, firewalld/trunk/firewalld.install)
===================================================================
--- community-any/firewalld.install (rev 0)
+++ community-any/firewalld.install 2013-02-21 10:38:37 UTC (rev 84663)
@@ -0,0 +1,15 @@
+post_install() {
+ gtk-update-icon-cache -ftq usr/share/icons/hicolor
+ update-desktop-database
+ glib-compile-schemas /usr/share/glib-2.0/schemas/
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim: ts=2 sw=2 et:
Copied: firewalld/repos/community-any/paths.patch (from rev 84662, firewalld/trunk/paths.patch)
===================================================================
--- community-any/paths.patch (rev 0)
+++ community-any/paths.patch 2013-02-21 10:38:37 UTC (rev 84663)
@@ -0,0 +1,104 @@
+--- 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.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
+@@ -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
+ 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)"))
+ parser.add_option("--forward-port",
+ action="callback", dest="forward_port",
+@@ -314,7 +314,7 @@ def parseSysconfigArgs(args, options=None, source=None):
+
+ 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:
+ ipv = "ipv4"
+
+ def __init__(self):
+- self._command = "/sbin/ebtables"
++ self._command = "/usr/sbin/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/sbin/iptables",
++ "ipv6": "/usr/sbin/ip6tables",
+ }
+
+ PROC_IPxTABLE_NAMES = {
Copied: firewalld/repos/community-any/python2.patch (from rev 84662, firewalld/trunk/python2.patch)
===================================================================
--- community-any/python2.patch (rev 0)
+++ community-any/python2.patch 2013-02-21 10:38:37 UTC (rev 84663)
@@ -0,0 +1,79 @@
+--- a/fix_python_shebang.sh
++++ b/fix_python_shebang.sh
+@@ -1,3 +1,3 @@
+ #!/bin/bash
+
+-sed -e "s@^#\!/usr/bin/python\$@#\!/usr/bin/python -Es@" -i $@
++sed -e "s@^#\!/usr/bin/python2\$@#\!/usr/bin/python2 -Es@" -i $@
+--- a/src/firewall-applet
++++ b/src/firewall-applet
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2010-2012 Red Hat, Inc.
+--- a/src/firewall-cmd
++++ b/src/firewall-cmd
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2009-2012 Red Hat, Inc.
+--- a/src/firewall-config
++++ b/src/firewall-config
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2011-2012 Red Hat, Inc.
+--- a/src/firewall-offline-cmd
++++ b/src/firewall-offline-cmd
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2009-2012 Red Hat, Inc.
+--- a/src/firewalld
++++ b/src/firewalld
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2010-2012 Red Hat, Inc.
+--- a/src/gtk3_chooserbutton.py
++++ b/src/gtk3_chooserbutton.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python -Es
++#!/usr/bin/python2 -Es
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2008,2012 Red Hat, Inc.
+--- a/src/tests/firewalld_config.py
++++ b/src/tests/firewalld_config.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2010-2012 Red Hat, Inc.
+--- a/src/tests/firewalld_direct.py
++++ b/src/tests/firewalld_direct.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2012 Red Hat, Inc.
+--- a/src/tests/firewalld_test.py
++++ b/src/tests/firewalld_test.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2010-2012 Red Hat, Inc.
More information about the arch-commits
mailing list