[arch-commits] Commit in firewalld/trunk (PKGBUILD)

[Maxime Gauduin]

    Date: Wednesday, April 14, 2021 @ 09:58:52
  Author: alucryd
Revision: 918373

firewalld 0.9.3-2: reproducibility rebuild

Modified:
  firewalld/trunk/PKGBUILD

----------+
 PKGBUILD |   24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-14 09:57:43 UTC (rev 918372)
+++ PKGBUILD	2021-04-14 09:58:52 UTC (rev 918373)
@@ -4,7 +4,7 @@
 
 pkgname=firewalld
 pkgver=0.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Firewall daemon with D-Bus interface'
 arch=(any)
 url=https://firewalld.org/
@@ -20,18 +20,12 @@
 )
 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'
@@ -50,23 +44,20 @@
   cf7d655230c43acf10a0f97dffdbcba136729967c8b9a25a930871d54a589834
 )
 
-pkgver() {
-  cd firewalld
-
-  git describe --tags | sed 's/^v//'
-}
-
 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 \
@@ -79,6 +70,7 @@
 
 package() {
   make DESTDIR="${pkgdir}" -C firewalld install
+  export PYTHONHASHSEED=0
   python -m compileall -d /usr/lib "$pkgdir/usr/lib"
   python -O -m compileall -d /usr/lib "$pkgdir/usr/lib"
 }