[arch-commits] Commit in firewalld/repos (3 files)

[Felix Yan]

    Date: Thursday, November 12, 2020 @ 19:34:59
  Author: felixonmars
Revision: 753534

archrelease: copy trunk to community-staging-any

Added:
  firewalld/repos/community-staging-any/
  firewalld/repos/community-staging-any/PKGBUILD
    (from rev 753531, firewalld/trunk/PKGBUILD)
  firewalld/repos/community-staging-any/firewalld-sysconfigdir.patch
    (from rev 753532, firewalld/trunk/firewalld-sysconfigdir.patch)

------------------------------+
 PKGBUILD                     |   86 +++++++++++++++++++++++++++++++++++++++++
 firewalld-sysconfigdir.patch |   44 ++++++++++++++++++++
 2 files changed, 130 insertions(+)

Copied: firewalld/repos/community-staging-any/PKGBUILD (from rev 753531, firewalld/trunk/PKGBUILD)
===================================================================
--- community-staging-any/PKGBUILD	                        (rev 0)
+++ community-staging-any/PKGBUILD	2020-11-12 19:34:59 UTC (rev 753534)
@@ -0,0 +1,86 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: unikum <unikum.pm at gmail.com>
+# Contributor: speed145a <jonathan at tagchapter.com>
+
+pkgname=firewalld
+pkgver=0.9.1
+pkgrel=2
+pkgdesc='Firewall daemon with D-Bus interface'
+arch=(any)
+url=https://firewalld.org/
+license=(GPL2)
+depends=(
+  dconf
+  glib2
+  hicolor-icon-theme
+  nftables
+  python-decorator
+  python-gobject
+  python-slip
+)
+makedepends=(
+  docbook-xsl
+  ebtables
+  git
+  intltool
+  ipset
+  iptables
+)
+optdepends=(
+  'bash-completion: bash completion'
+  'ebtables: old backend'
+  'gtk3: firewall-config'
+  'ipset: old backend'
+  'iptables: old backend'
+  'libnotify: firewall-applet'
+  'nm-connection-editor: firewalld-applet'
+  'python-pyqt5: firewall-applet'
+)
+backup=(
+  etc/conf.d/firewalld
+  etc/firewalld/firewalld.conf
+)
+_tag=dff6df0c9c970f39fda5aac5c856b2b3dc582705
+source=(
+  git+https://github.com/firewalld/firewalld.git#tag=${_tag}
+  firewalld-sysconfigdir.patch
+)
+sha256sums=(
+  SKIP
+  cf7d655230c43acf10a0f97dffdbcba136729967c8b9a25a930871d54a589834
+)
+
+pkgver() {
+  cd firewalld
+
+  git describe --tags | sed 's/^v//'
+}
+
+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() {
+  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 753532, firewalld/trunk/firewalld-sysconfigdir.patch)
===================================================================
--- community-staging-any/firewalld-sysconfigdir.patch	                        (rev 0)
+++ community-staging-any/firewalld-sysconfigdir.patch	2020-11-12 19:34:59 UTC (rev 753534)
@@ -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'