[arch-commits] Commit in firewalld/repos/community-any (6 files)
Maxime Gauduin
alucryd at nymeria.archlinux.org
Wed Jun 19 15:08:03 UTC 2013
Date: Wednesday, June 19, 2013 @ 17:08:02
Author: alucryd
Revision: 92937
archrelease: copy trunk to community-any
Added:
firewalld/repos/community-any/PKGBUILD
(from rev 92936, firewalld/trunk/PKGBUILD)
firewalld/repos/community-any/firewalld-paths.patch
(from rev 92936, firewalld/trunk/firewalld-paths.patch)
firewalld/repos/community-any/firewalld.install
(from rev 92936, firewalld/trunk/firewalld.install)
Deleted:
firewalld/repos/community-any/PKGBUILD
firewalld/repos/community-any/firewalld-paths.patch
firewalld/repos/community-any/firewalld.install
-----------------------+
PKGBUILD | 92 +++++++++++------------
firewalld-paths.patch | 186 ++++++++++++++++++++++++------------------------
firewalld.install | 28 +++----
3 files changed, 153 insertions(+), 153 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-06-19 15:07:51 UTC (rev 92936)
+++ PKGBUILD 2013-06-19 15:08:02 UTC (rev 92937)
@@ -1,46 +0,0 @@
-# $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.3.2
-pkgrel=2
-pkgdesc="A firewall daemon with D-BUS interface providing a dynamic firewall"
-arch=('any')
-url="http://fedorahosted.org/firewalld"
-license=('GPL2')
-depends=('ebtables' 'gtk3' 'iptables' 'libnotify' 'networkmanager' 'python2-slip')
-makedepends=('intltool')
-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=('a9dce34dca673dedbdfc9ed2dd011340e473699a2d5a935e7563a85a56cb443d'
- '77238eb2dee6c8c3be84631b25095dff60b6abaa060abe5c026c5c8851a68610')
-
-prepare() {
- cd "${srcdir}"/${pkgname}-${pkgver}
-
- patch -Np1 -i "${srcdir}"/firewalld-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() {
- cd "${srcdir}"/${pkgname}-${pkgver}
-
- export PYTHON=python2
- ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --disable-schemas-compile
- make
-}
-
-package() {
- cd "${srcdir}"/${pkgname}-${pkgver}
-
- make DESTDIR="${pkgdir}" install
-}
-
-# vim: ts=2 sw=2 et:
Copied: firewalld/repos/community-any/PKGBUILD (from rev 92936, firewalld/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-06-19 15:08:02 UTC (rev 92937)
@@ -0,0 +1,46 @@
+# $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.3.3
+pkgrel=1
+pkgdesc="A firewall daemon with D-BUS interface providing a dynamic firewall"
+arch=('any')
+url="http://fedorahosted.org/firewalld"
+license=('GPL2')
+depends=('ebtables' 'gtk3' 'iptables' 'libnotify' 'networkmanager' 'python2-slip')
+makedepends=('intltool')
+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=('3fc9aa4fe177f07167048e50308cfda3875df03a454bab2110f81219fe98362d'
+ '77238eb2dee6c8c3be84631b25095dff60b6abaa060abe5c026c5c8851a68610')
+
+prepare() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ patch -Np1 -i "${srcdir}"/firewalld-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() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ export PYTHON=python2
+ ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --disable-schemas-compile
+ make
+}
+
+package() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
Deleted: firewalld-paths.patch
===================================================================
--- firewalld-paths.patch 2013-06-19 15:07:51 UTC (rev 92936)
+++ firewalld-paths.patch 2013-06-19 15:08:02 UTC (rev 92937)
@@ -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
-+++ 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/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 92936, firewalld/trunk/firewalld-paths.patch)
===================================================================
--- firewalld-paths.patch (rev 0)
+++ firewalld-paths.patch 2013-06-19 15:08:02 UTC (rev 92937)
@@ -0,0 +1,93 @@
+--- 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
++++ 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/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 = {
Deleted: firewalld.install
===================================================================
--- firewalld.install 2013-06-19 15:07:51 UTC (rev 92936)
+++ firewalld.install 2013-06-19 15:08:02 UTC (rev 92937)
@@ -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 92936, firewalld/trunk/firewalld.install)
===================================================================
--- firewalld.install (rev 0)
+++ firewalld.install 2013-06-19 15:08:02 UTC (rev 92937)
@@ -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