Date: Sunday, March 6, 2022 @ 15:55:09
Author: foutrelis
Revision: 1142601
archrelease: copy trunk to community-staging-any
Added:
firewalld/repos/community-staging-any/
firewalld/repos/community-staging-any/PKGBUILD
(from rev 1142600, firewalld/trunk/PKGBUILD)
firewalld/repos/community-staging-any/firewalld-sysconfigdir.patch
(from rev 1142600, firewalld/trunk/firewalld-sysconfigdir.patch)
------------------------------+
PKGBUILD | 78 +++++++++++++++++++++++++++++++++++++++++
firewalld-sysconfigdir.patch | 44 +++++++++++++++++++++++
2 files changed, 122 insertions(+)
Copied: firewalld/repos/community-staging-any/PKGBUILD (from rev 1142600,
firewalld/trunk/PKGBUILD)
===================================================================
--- community-staging-any/PKGBUILD (rev 0)
+++ community-staging-any/PKGBUILD 2022-03-06 15:55:09 UTC (rev 1142601)
@@ -0,0 +1,78 @@
+# Maintainer: Maxime Gauduin <aluc...@archlinux.org>
+# Contributor: unikum <unikum...@gmail.com>
+# Contributor: speed145a <jonat...@tagchapter.com>
+
+pkgname=firewalld
+pkgver=1.0.3
+pkgrel=3
+pkgdesc='Firewall daemon with D-Bus interface'
+arch=(any)
+url=https://firewalld.org/
+license=(GPL2)
+depends=(
+ dbus-python
+ dconf
+ glib2
+ hicolor-icon-theme
+ nftables
+ python-gobject
+)
+makedepends=(
+ docbook-xsl
+ git
+ intltool
+ podman
+)
+optdepends=(
+ 'bash-completion: bash completion'
+ 'gtk3: firewall-config'
+ 'libnotify: firewall-applet'
+ 'nm-connection-editor: firewalld-applet'
+ 'python-capng: drop daemon capabilities'
+ 'python-pyqt5: firewall-applet'
+)
+backup=(
+ etc/conf.d/firewalld
+ etc/firewalld/firewalld.conf
+)
+_tag=b36cd7384eef067a0154ed535bcb80acffe59786
+source=(
+ git+https://github.com/firewalld/firewalld.git#tag=${_tag}
+ firewalld-sysconfigdir.patch
+)
+sha256sums=(
+ SKIP
+ cf7d655230c43acf10a0f97dffdbcba136729967c8b9a25a930871d54a589834
+)
+
+prepare() {
+ cd firewalld
+ git cherry-pick -n 3337c9a4e63bd42535b6b3e97a91f4b502c063ce
+ patch -Np1 -i ../firewalld-sysconfigdir.patch
+ NOCONFIGURE=true ./autogen.sh
+}
+
+pkgver() {
+ cd firewalld
+ git describe --tags | sed 's/^v//'
+}
+
+build() {
+ cd firewalld
+ ./configure \
+ --prefix=/usr \
+ --localstatedir=/var \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --disable-schemas-compile \
+ --disable-sysconfig
+ make
+}
+
+package() {
+ make DESTDIR="${pkgdir}" -C firewalld install
+ python -m compileall -d /usr/lib "$pkgdir/usr/lib"
+ python -O -m compileall -d /usr/lib "$pkgdir/usr/lib"
+}
+
+# vim: ts=2 sw=2 et:
Copied: firewalld/repos/community-staging-any/firewalld-sysconfigdir.patch
(from rev 1142600, firewalld/trunk/firewalld-sysconfigdir.patch)
===================================================================
--- community-staging-any/firewalld-sysconfigdir.patch
(rev 0)
+++ community-staging-any/firewalld-sysconfigdir.patch 2022-03-06 15:55:09 UTC
(rev 1142601)
@@ -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'
