From 8bae57f9ab3fb6f7178b34e415463f59194505ed Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Mon, 12 Jul 2021 00:28:17 +0200 Subject: [PATCH 1/2] connman: build with --enable-iwd --- srcpkgs/connman/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template index f133b12d2967..e8cc6cb97afe 100644 --- a/srcpkgs/connman/template +++ b/srcpkgs/connman/template @@ -1,12 +1,13 @@ # Template file for 'connman' pkgname=connman version=1.40 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-polkit --enable-client --enable-pie --enable-ethernet --enable-wifi --enable-bluetooth --enable-loopback --enable-nmcompat --enable-openvpn --with-openvpn=/usr/bin/openvpn --enable-openconnect - --disable-tools --disable-wispr --with-openconnect=/usr/bin/openconnect" + --disable-tools --disable-wispr --with-openconnect=/usr/bin/openconnect + --enable-iwd" hostmakedepends="automake iptables libtool pkg-config wpa_supplicant" makedepends="gnutls-devel iptables-devel libglib-devel libmnl-devel openconnect-devel readline-devel" From c17ed120a552f2e2d6e46234c6b9e7e3627d38d9 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Wed, 14 Jul 2021 15:26:52 +0200 Subject: [PATCH 2/2] connman: add build option "nftables" Allow to build with support for nftables instead of iptables. From ./configure --help: --with-firewall=TYPE specify which firewall type is used iptables or nftables [default=iptables] --- srcpkgs/connman/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template index e8cc6cb97afe..ac4f46833e6f 100644 --- a/srcpkgs/connman/template +++ b/srcpkgs/connman/template @@ -7,10 +7,10 @@ configure_args="--enable-polkit --enable-client --enable-pie --enable-ethernet --enable-wifi --enable-bluetooth --enable-loopback --enable-nmcompat --enable-openvpn --with-openvpn=/usr/bin/openvpn --enable-openconnect --disable-tools --disable-wispr --with-openconnect=/usr/bin/openconnect - --enable-iwd" + --enable-iwd --with-firewall=$(vopt_if nftables nftables iptables)" hostmakedepends="automake iptables libtool pkg-config wpa_supplicant" -makedepends="gnutls-devel iptables-devel libglib-devel libmnl-devel - openconnect-devel readline-devel" +makedepends="gnutls-devel libglib-devel libmnl-devel openconnect-devel + readline-devel $(vopt_if nftables libnftnl-devel iptables-devel)" depends="dbus wpa_supplicant" short_desc="Open Source CONNection MANager" maintainer="Orphaned " @@ -21,6 +21,10 @@ distfiles="${KERNEL_SITE}/network/${pkgname}/${pkgname}-${version}.tar.xz" checksum=1a57ae7ce234aa3a1744aac3be5c2121d98dce999440ef8ab9cc4edfd5edcb12 lib32disabled=yes +# Package build options +build_options="nftables" +desc_option_nftables="Build with nftables instead of iptables" + pre_configure() { case "$XBPS_TARGET_MACHINE" in *-musl)