[arch-commits] Commit in firewalld/repos/community-testing-any (4 files)
Maxime Gauduin
alucryd at archlinux.org
Tue Jul 31 20:39:23 UTC 2018
Date: Tuesday, July 31, 2018 @ 20:39:22
Author: alucryd
Revision: 366140
archrelease: copy trunk to community-testing-any
Added:
firewalld/repos/community-testing-any/PKGBUILD
(from rev 366139, firewalld/trunk/PKGBUILD)
firewalld/repos/community-testing-any/firewalld-sysconfigdir.patch
(from rev 366139, firewalld/trunk/firewalld-sysconfigdir.patch)
Deleted:
firewalld/repos/community-testing-any/PKGBUILD
firewalld/repos/community-testing-any/firewalld-arch.patch
------------------------------+
PKGBUILD | 112 ++++++++++++++++++++---------------------
firewalld-arch.patch | 89 --------------------------------
firewalld-sysconfigdir.patch | 44 ++++++++++++++++
3 files changed, 101 insertions(+), 144 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-07-31 20:39:16 UTC (rev 366139)
+++ PKGBUILD 2018-07-31 20:39:22 UTC (rev 366140)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: unikum <unikum.pm at gmail.com>
-# Contributor: speed145a <jonathan at tagchapter.com>
-
-pkgname=firewalld
-pkgver=0.5.1
-pkgrel=2
-pkgdesc='Firewall daemon with D-Bus interface'
-arch=('any')
-url='https://github.com/t-woerner/firewalld'
-license=('GPL2')
-depends=('dbus-glib' 'dconf' 'ebtables' 'hicolor-icon-theme' 'ipset' 'iptables'
- 'python-slip')
-makedepends=('docbook-xsl' 'intltool')
-optdepends=('bash-completion: bash completion'
- 'gtk3: firewall-config'
- 'libnm-glib: firewall-config and firewall-applet'
- 'libnotify: firewall-applet'
- 'python-pyqt5: firewall-applet')
-backup=('etc/conf.d/firewalld'
- 'etc/firewalld/firewalld.conf')
-source=("firewalld-${pkgver}.tar.gz::https://github.com/t-woerner/firewalld/archive/v${pkgver}.tar.gz"
- 'firewalld-arch.patch')
-sha256sums=('57d0639bed3a845899ea16f52fbd68b2e62fdca75cea50be60d651e4255be00e'
- '14a05a2f5eccbb6c30e775877706a90fd4ad524cdd13ea76f3a23b09b9d4212e')
-
-prepare() {
- cd firewalld-${pkgver}
-
- patch -Np1 -i ../firewalld-arch.patch
-
- ./autogen.sh
-}
-
-build() {
- cd firewalld-${pkgver}
-
- ./configure \
- --prefix='/usr' \
- --localstatedir='/var' \
- --sbindir='/usr/bin' \
- --sysconfdir='/etc' \
- --disable-schemas-compile \
- --disable-sysconfig
- make
-}
-
-package() {
- cd firewalld-${pkgver}
-
- make DESTDIR="${pkgdir}" install
-}
-
-# vim: ts=2 sw=2 et:
Copied: firewalld/repos/community-testing-any/PKGBUILD (from rev 366139, firewalld/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-07-31 20:39:22 UTC (rev 366140)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: unikum <unikum.pm at gmail.com>
+# Contributor: speed145a <jonathan at tagchapter.com>
+
+pkgname=firewalld
+pkgver=0.6.0
+pkgrel=1
+pkgdesc='Firewall daemon with D-Bus interface'
+arch=('any')
+url='https://github.com/t-woerner/firewalld'
+license=('GPL2')
+depends=(
+ 'dconf' 'ebtables' 'glib2' 'hicolor-icon-theme' 'ipset' 'iptables' 'nftables'
+ 'python-decorator' 'python-gobject' 'python-slip'
+)
+makedepends=('docbook-xsl' 'git' 'intltool')
+optdepends=('bash-completion: bash completion'
+ 'gtk3: firewall-config'
+ 'libnm-glib: firewall-config and firewall-applet'
+ 'libnotify: firewall-applet'
+ 'python-pyqt5: firewall-applet')
+backup=('etc/conf.d/firewalld'
+ 'etc/firewalld/firewalld.conf')
+source=("git+https://github.com/firewalld/firewalld.git#tag=v${pkgver}"
+ 'firewalld-sysconfigdir.patch')
+sha256sums=('SKIP'
+ 'cf7d655230c43acf10a0f97dffdbcba136729967c8b9a25a930871d54a589834')
+
+prepare() {
+ cd firewalld
+
+ patch -Np1 -i ../firewalld-sysconfigdir.patch
+
+ NOCONFIGURE='true' ./autogen.sh
+}
+
+build() {
+ cd firewalld
+
+ ./configure \
+ --prefix='/usr' \
+ --localstatedir='/var' \
+ --sbindir='/usr/bin' \
+ --sysconfdir='/etc' \
+ --disable-schemas-compile \
+ --disable-sysconfig
+ make
+}
+
+package() {
+ cd firewalld
+
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
Deleted: firewalld-arch.patch
===================================================================
--- firewalld-arch.patch 2018-07-31 20:39:16 UTC (rev 366139)
+++ firewalld-arch.patch 2018-07-31 20:39:22 UTC (rev 366140)
@@ -1,89 +0,0 @@
-diff -rupN firewalld-0.5.0.orig/config/firewalld.service.in firewalld-0.5.0/config/firewalld.service.in
---- firewalld-0.5.0.orig/config/firewalld.service.in 2018-01-25 22:14:21.796600916 +0100
-+++ firewalld-0.5.0/config/firewalld.service.in 2018-01-25 22:15:29.448820083 +0100
-@@ -8,7 +8,7 @@ Conflicts=iptables.service ip6tables.ser
- Documentation=man:firewalld(1)
-
- [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.5.0.orig/config/Makefile.am firewalld-0.5.0/config/Makefile.am
---- firewalld-0.5.0.orig/config/Makefile.am 2018-01-25 22:14:21.796600916 +0100
-+++ firewalld-0.5.0/config/Makefile.am 2018-01-25 22:17:25.497003199 +0100
-@@ -308,12 +308,12 @@ firewalld-sysctls.conf: firewalld-sysctl
- $(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-rpmmacros:
- $(MKDIR_P) $(DESTDIR)$(prefix)/lib/rpm/macros.d
-diff -rupN firewalld-0.5.0.orig/configure.ac firewalld-0.5.0/configure.ac
---- firewalld-0.5.0.orig/configure.ac 2018-01-25 22:14:21.796600916 +0100
-+++ firewalld-0.5.0/configure.ac 2018-01-25 22:18:20.346179951 +0100
-@@ -71,7 +71,7 @@ AC_SUBST(BASHCOMPLETIONDIR)
-
- AC_ARG_WITH([ifcfgdir],
- AS_HELP_STRING([--with-ifcfgdir=DIR], [The ifcfg configuration directory]),
-- [IFCFGDIR=$withval], [IFCFGDIR="/etc/sysconfig/network-scripts"])
-+ [IFCFGDIR=$withval], [IFCFGDIR="/etc/conf.d/network-scripts"])
- AC_SUBST(IFCFGDIR)
-
- # Extend PATH to include /sbin etc in case we are building as non-root
-diff -rupN firewalld-0.5.0.orig/doc/xml/firewall-offline-cmd.xml firewalld-0.5.0/doc/xml/firewall-offline-cmd.xml
---- firewalld-0.5.0.orig/doc/xml/firewall-offline-cmd.xml 2018-01-25 22:14:21.799934194 +0100
-+++ firewalld-0.5.0/doc/xml/firewall-offline-cmd.xml 2018-01-25 22:18:43.412506403 +0100
-@@ -68,7 +68,7 @@
- <refsect1 id="options">
- <title>Options</title>
- <para>
-- If no options are given, configuration from <command>/etc/sysconfig/system-config-firewall</command> will be migrated.
-+ If no options are given, configuration from <command>/etc/conf.d/system-config-firewall</command> will be migrated.
- </para>
-
- <para>
-diff -rupN firewalld-0.5.0.orig/src/firewall/config/__init__.py.in firewalld-0.5.0/src/firewall/config/__init__.py.in
---- firewalld-0.5.0.orig/src/firewall/config/__init__.py.in 2018-01-25 22:14:21.803267471 +0100
-+++ firewalld-0.5.0/src/firewall/config/__init__.py.in 2018-01-25 22:19:44.971614279 +0100
-@@ -96,7 +96,7 @@ FIREWALLD_PIDFILE = "/var/run/firewalld.
-
- FIREWALLD_TEMPDIR = '/run/firewalld'
-
--SYSCONFIGDIR = '/etc/sysconfig'
-+SYSCONFIGDIR = '/etc/conf.d'
- IFCFGDIR = "@IFCFGDIR@"
-
- SYSCTL_CONFIG = '/etc/sysctl.conf'
-diff -rupN firewalld-0.5.0.orig/src/tests/legacy/firewall-offline-cmd_test.sh firewalld-0.5.0/src/tests/legacy/firewall-offline-cmd_test.sh
---- firewalld-0.5.0.orig/src/tests/legacy/firewall-offline-cmd_test.sh 2018-01-25 22:14:21.806600748 +0100
-+++ firewalld-0.5.0/src/tests/legacy/firewall-offline-cmd_test.sh 2018-01-25 22:19:19.201985041 +0100
-@@ -218,7 +218,7 @@ fw_port2="port=333:proto=udp:toport=444"
- lokkit_opts="--enabled --addmodule=abc --addmodule=efg --removemodule=xyz
- --trust=${trusted_iface1} --trust=${trusted_iface2}
- --masq=tun+ --masq=tap+ --port=7:tcp --port=666:udp
-- --custom-rules=ipv4:mangle:/etc/sysconfig/ebtables-config
-+ --custom-rules=ipv4:mangle:/etc/conf.d/ebtables-config
- --service=${service1} --service=${service2} --remove-service=${service3}
- --block-icmp=${icmp1} --block-icmp=${icmp2}
- --forward-port=if=ippp+:${fw_port1}
-@@ -236,7 +236,7 @@ cat << EOF > ./system-config-firewall
- --masq=tap+
- --port=7:tcp
- --port=666:udp
----custom-rules=ipv4:mangle:/etc/sysconfig/ebtables-config
-+--custom-rules=ipv4:mangle:/etc/conf.d/ebtables-config
- --service=${service1}
- --service=${service2}
- --remove-service=${service3}
Copied: firewalld/repos/community-testing-any/firewalld-sysconfigdir.patch (from rev 366139, firewalld/trunk/firewalld-sysconfigdir.patch)
===================================================================
--- firewalld-sysconfigdir.patch (rev 0)
+++ firewalld-sysconfigdir.patch 2018-07-31 20:39:22 UTC (rev 366140)
@@ -0,0 +1,44 @@
+diff -rupN firewalld.orig/config/firewalld.service.in firewalld/config/firewalld.service.in
+--- firewalld.orig/config/firewalld.service.in 2018-07-31 22:22:40.786777349 +0200
++++ firewalld/config/firewalld.service.in 2018-07-31 22:26:40.550121870 +0200
+@@ -8,7 +8,7 @@ Conflicts=iptables.service ip6tables.ser
+ Documentation=man:firewalld(1)
+
+ [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.orig/config/Makefile.am firewalld/config/Makefile.am
+--- firewalld.orig/config/Makefile.am 2018-07-31 22:22:40.786777349 +0200
++++ firewalld/config/Makefile.am 2018-07-31 22:26:21.666787661 +0200
+@@ -329,12 +329,12 @@ firewalld-sysctls.conf: firewalld-sysctl
+ $(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-rpmmacros:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/lib/rpm/macros.d
+diff -rupN firewalld.orig/src/firewall/config/__init__.py.in firewalld/src/firewall/config/__init__.py.in
+--- firewalld.orig/src/firewall/config/__init__.py.in 2018-07-31 22:22:40.800110683 +0200
++++ firewalld/src/firewall/config/__init__.py.in 2018-07-31 22:24:54.403450272 +0200
+@@ -96,7 +96,7 @@ FIREWALLD_PIDFILE = "/var/run/firewalld.
+
+ FIREWALLD_TEMPDIR = '/run/firewalld'
+
+-SYSCONFIGDIR = '/etc/sysconfig'
++SYSCONFIGDIR = '/etc/conf.d'
+ IFCFGDIR = "@IFCFGDIR@"
+
+ SYSCTL_CONFIG = '/etc/sysctl.conf'
More information about the arch-commits
mailing list