Update dependencies

3 files changed, 30 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 96ebf5d2771c..9f14c8f317bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,28 @@
 pkgbase = firewalld-git
 	pkgdesc = Firewall daemon with D-Bus interface (from git)
-	pkgver = r3296.f3bd1297
+	pkgver = r3403.f3e5384a
 	pkgrel = 1
 	epoch = 1
 	url = https://firewalld.org/
 	arch = any
 	license = GPL2
+	makedepends = desktop-file-utils
 	makedepends = docbook-xsl
 	makedepends = git
+	makedepends = glib2
 	makedepends = intltool
-	makedepends = ipset
+	makedepends = libxslt
+	makedepends = podman
 	depends = dbus-python
-	depends = dconf
-	depends = glib2
 	depends = hicolor-icon-theme
 	depends = nftables
 	depends = python-gobject
-	optdepends = bash-completion: bash completion
-	optdepends = gtk3: firewall-config
+	optdepends = iptables-nft: ebtables and iptables support
 	optdepends = ipset: ipset support
-	optdepends = libnotify: firewall-applet
-	optdepends = nm-connection-editor: firewalld-applet
-	optdepends = python-pyqt5: firewall-applet
+	optdepends = libnotify: firewall panel applet support
+	optdepends = nm-connection-editor: firewall panel applet support
+	optdepends = python-capng: drop daemon capabilities
+	optdepends = python-pyqt5: firewall panel applet support
 	provides = firewalld
 	conflicts = firewalld
 	backup = etc/conf.d/firewalld
@@ -29,6 +30,6 @@ pkgbase = firewalld-git
 	source = git+https://github.com/firewalld/firewalld.git
 	source = firewalld-sysconfigdir.patch
 	sha256sums = SKIP
-	sha256sums = cf7d655230c43acf10a0f97dffdbcba136729967c8b9a25a930871d54a589834
+	sha256sums = 37860bd444e67741cf4a7817eccc9bdbbf56e68cc9448bb54f44a44050b72045
 
 pkgname = firewalld-git
diff --git a/PKGBUILD b/PKGBUILD
index 8ccfc4151adb..c57dd162d5cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: speed145a <jonathan@tagchapter.com>
 
 pkgname=firewalld-git
-pkgver=r3337.012a87a3
+pkgver=r3403.f3e5384a
 pkgrel=1
 epoch=1
 pkgdesc="Firewall daemon with D-Bus interface (from git)"
@@ -14,25 +14,26 @@ url="https://firewalld.org/"
 license=(GPL2)
 depends=(
   dbus-python
-  dconf
-  glib2
   hicolor-icon-theme
   nftables
   python-gobject
 )
 makedepends=(
+  desktop-file-utils
   docbook-xsl
   git
+  glib2
   intltool
-  ipset
+  libxslt
+  podman
 )
 optdepends=(
-  'bash-completion: bash completion'
-  'gtk3: firewall-config'
+  'iptables-nft: ebtables and iptables support'
   'ipset: ipset support'
-  'libnotify: firewall-applet'
-  'nm-connection-editor: firewalld-applet'
-  'python-pyqt5: firewall-applet'
+  'libnotify: firewall panel applet support'
+  'nm-connection-editor: firewall panel applet support'
+  'python-capng: drop daemon capabilities'
+  'python-pyqt5: firewall panel applet support'
 )
 provides=('firewalld')
 conflicts=('firewalld')
@@ -45,7 +46,7 @@ source=(
   firewalld-sysconfigdir.patch
 )
 sha256sums=('SKIP'
-            'cf7d655230c43acf10a0f97dffdbcba136729967c8b9a25a930871d54a589834')
+            '37860bd444e67741cf4a7817eccc9bdbbf56e68cc9448bb54f44a44050b72045')
 
 pkgver() {
   cd firewalld
diff --git a/firewalld-sysconfigdir.patch b/firewalld-sysconfigdir.patch
index b7248d14ebf7..8bc4c8110425 100644
--- a/firewalld-sysconfigdir.patch
+++ b/firewalld-sysconfigdir.patch
@@ -1,6 +1,6 @@
 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
+--- firewalld.orig/config/firewalld.service.in	2022-01-28 11:27:57.000000000 -0500
++++ firewalld/config/firewalld.service.in	2022-01-29 16:30:13.362124135 -0500
 @@ -8,7 +8,7 @@ Conflicts=iptables.service ip6tables.ser
  Documentation=man:firewalld(1)
  
@@ -11,9 +11,9 @@ diff -rupN firewalld.orig/config/firewalld.service.in firewalld/config/firewalld
  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
+--- firewalld.orig/config/Makefile.am	2022-01-28 11:27:57.000000000 -0500
++++ firewalld/config/Makefile.am	2022-01-29 16:30:13.362124135 -0500
+@@ -377,12 +377,12 @@ firewalld.logrotate: firewalld.logrotate
  	$(edit) $< >$@
  
  install-sysconfig:
@@ -31,9 +31,9 @@ diff -rupN firewalld.orig/config/Makefile.am firewalld/config/Makefile.am
  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.orig/src/firewall/config/__init__.py.in	2022-01-28 11:27:57.000000000 -0500
++++ firewalld/src/firewall/config/__init__.py.in	2022-01-29 16:30:13.362124135 -0500
+@@ -97,7 +97,7 @@ FIREWALLD_PIDFILE = "/var/run/firewalld.
  
  FIREWALLD_TEMPDIR = '/run/firewalld'