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

Maxime Gauduin alucryd at nymeria.archlinux.org
Sun May 12 07:23:45 EDT 2013


    Date: Sunday, May 12, 2013 @ 13:23:44
  Author: alucryd
Revision: 90439

upgpkg: firewalld 0.3.2-2

Added:
  firewalld/trunk/firewalld-paths.patch
Modified:
  firewalld/trunk/PKGBUILD
Deleted:
  firewalld/trunk/paths.patch

-----------------------+
 PKGBUILD              |   18 +++++----
 firewalld-paths.patch |   93 ++++++++++++++++++++++++++++++++++++++++++++++++
 paths.patch           |   93 ------------------------------------------------
 3 files changed, 103 insertions(+), 101 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-12 11:14:41 UTC (rev 90438)
+++ PKGBUILD	2013-05-12 11:23:44 UTC (rev 90439)
@@ -5,23 +5,25 @@
 
 pkgname=firewalld
 pkgver=0.3.2
-pkgrel=1
+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' 'hicolor-icon-theme' 'iptables' 'libnotify' 'networkmanager' 'python2-slip')
+depends=('ebtables' 'gtk3' 'iptables' 'libnotify' 'networkmanager' 'python2-slip')
 makedepends=('intltool')
-backup=('etc/conf.d/firewalld' 'etc/firewalld/firewalld.conf')
+backup=('etc/conf.d/firewalld'
+        'etc/firewalld/firewalld.conf')
 install=${pkgname}.install
-source=("http://fedorahosted.org/released/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'paths.patch')
-sha256sums=('aa52ea143d6df474f81f599f148d9db4c8f54fd78c5878ab3ae9b461584bd68e'
-            'ee826f06ec8d8fc964d63005850dbc8da9058a3d49b5ccd5df21c7dd52b3de7f')
+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}"/paths.patch
+  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
@@ -31,7 +33,7 @@
   cd "${srcdir}"/${pkgname}-${pkgver}
 
   export  PYTHON=python2
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile
+  ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --disable-schemas-compile
   make
 }
 

Added: firewalld-paths.patch
===================================================================
--- firewalld-paths.patch	                        (rev 0)
+++ firewalld-paths.patch	2013-05-12 11:23:44 UTC (rev 90439)
@@ -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 = {


Property changes on: firewalld/trunk/firewalld-paths.patch
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Deleted: paths.patch
===================================================================
--- paths.patch	2013-05-12 11:14:41 UTC (rev 90438)
+++ paths.patch	2013-05-12 11:23:44 UTC (rev 90439)
@@ -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/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 = {



More information about the arch-commits mailing list