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

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Thu Sep 20 09:19:06 UTC 2018


    Date: Thursday, September 20, 2018 @ 09:19:06
  Author: bpiotrowski
Revision: 383502

archrelease: copy trunk to testing-any

Added:
  firewalld/repos/testing-any/
  firewalld/repos/testing-any/PKGBUILD
    (from rev 383501, firewalld/trunk/PKGBUILD)
  firewalld/repos/testing-any/firewalld-sysconfigdir.patch
    (from rev 383501, firewalld/trunk/firewalld-sysconfigdir.patch)

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

Copied: firewalld/repos/testing-any/PKGBUILD (from rev 383501, firewalld/trunk/PKGBUILD)
===================================================================
--- testing-any/PKGBUILD	                        (rev 0)
+++ testing-any/PKGBUILD	2018-09-20 09:19:06 UTC (rev 383502)
@@ -0,0 +1,58 @@
+# 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.1
+pkgrel=4
+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
+
+  git cherry-pick -n 5a59a90f449a8bf836e62e2d9ad486301b1aa2bb # FS#59661
+
+  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:

Copied: firewalld/repos/testing-any/firewalld-sysconfigdir.patch (from rev 383501, firewalld/trunk/firewalld-sysconfigdir.patch)
===================================================================
--- testing-any/firewalld-sysconfigdir.patch	                        (rev 0)
+++ testing-any/firewalld-sysconfigdir.patch	2018-09-20 09:19:06 UTC (rev 383502)
@@ -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