Date: Thursday, April 2, 2020 @ 21:29:23 Author: alucryd Revision: 610349
archrelease: copy trunk to community-any Added: firewalld/repos/community-any/PKGBUILD (from rev 610348, firewalld/trunk/PKGBUILD) firewalld/repos/community-any/firewalld-sysconfigdir.patch (from rev 610348, firewalld/trunk/firewalld-sysconfigdir.patch) Deleted: firewalld/repos/community-any/PKGBUILD firewalld/repos/community-any/firewalld-sysconfigdir.patch ------------------------------+ PKGBUILD | 170 ++++++++++++++++++++--------------------- firewalld-sysconfigdir.patch | 88 ++++++++++----------- 2 files changed, 129 insertions(+), 129 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-04-02 21:29:17 UTC (rev 610348) +++ PKGBUILD 2020-04-02 21:29:23 UTC (rev 610349) @@ -1,85 +0,0 @@ -# Maintainer: Maxime Gauduin <aluc...@archlinux.org> -# Contributor: unikum <unikum...@gmail.com> -# Contributor: speed145a <jonat...@tagchapter.com> - -pkgname=firewalld -pkgver=0.8.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 -) -source=( - git+https://github.com/firewalld/firewalld.git#tag=4748180c9f3f344f9e8b478a2e9a0820c757aa3c - 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-any/PKGBUILD (from rev 610348, firewalld/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-04-02 21:29:23 UTC (rev 610349) @@ -0,0 +1,85 @@ +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: unikum <unikum...@gmail.com> +# Contributor: speed145a <jonat...@tagchapter.com> + +pkgname=firewalld +pkgver=0.8.2 +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 +) +source=( + git+https://github.com/firewalld/firewalld.git#tag=aedc749a0d8f8a39f3a0571f94dac5cb6ea1c0e5 + 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: Deleted: firewalld-sysconfigdir.patch =================================================================== --- firewalld-sysconfigdir.patch 2020-04-02 21:29:17 UTC (rev 610348) +++ firewalld-sysconfigdir.patch 2020-04-02 21:29:23 UTC (rev 610349) @@ -1,44 +0,0 @@ -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' Copied: firewalld/repos/community-any/firewalld-sysconfigdir.patch (from rev 610348, firewalld/trunk/firewalld-sysconfigdir.patch) =================================================================== --- firewalld-sysconfigdir.patch (rev 0) +++ firewalld-sysconfigdir.patch 2020-04-02 21:29:23 UTC (rev 610349) @@ -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'