[PR PATCH] connman: build with --enable-iwd

[PR PATCH] connman: build with --enable-iwd

[vutunganh]

[-- Attachment #1: Type: text/plain, Size: 1461 bytes --]

There is a new pull request by vutunganh against master on the void-packages repository

https://github.com/vutunganh/void-packages connman-enable-iwd
https://github.com/void-linux/void-packages/pull/35243

connman: build with --enable-iwd
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

This is one of the changes made in https://github.com/void-linux/void-packages/pull/31916. It was requested there that separate changes should be made in separate PRs, so that is what I'm doing, at least for the changes I need.

A patch file from https://github.com/void-linux/void-packages/pull/35243.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-connman-enable-iwd-35243.patch --]
[-- Type: text/x-diff, Size: 1155 bytes --]

From 8b05b5e32da990a16c06b3ce310a1be825431f41 Mon Sep 17 00:00:00 2001
From: Tung Anh Vu <vu.tunganh96@gmail.com>
Date: Wed, 26 Jan 2022 10:51:38 +0100
Subject: [PATCH] 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"

Re: connman: build with --enable-iwd

[Vistaus]

[-- Attachment #1: Type: text/plain, Size: 179 bytes --]

New comment by Vistaus on void-packages repository

https://github.com/void-linux/void-packages/pull/35243#issuecomment-1023397476

Comment:
That's already proposed in PR #31916.

Re: [PR PATCH] [Updated] connman: build with --enable-iwd

[vutunganh]

[-- Attachment #1: Type: text/plain, Size: 1466 bytes --]

There is an updated pull request by vutunganh against master on the void-packages repository

https://github.com/vutunganh/void-packages connman-enable-iwd
https://github.com/void-linux/void-packages/pull/35243

connman: build with --enable-iwd
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

This is one of the changes made in https://github.com/void-linux/void-packages/pull/31916. It was requested there that separate changes should be made in separate PRs, so that is what I'm doing, at least for the changes I need.

A patch file from https://github.com/void-linux/void-packages/pull/35243.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-connman-enable-iwd-35243.patch --]
[-- Type: text/x-diff, Size: 1155 bytes --]

From 45b374f2b1c1205d949aae45fdb21dc471a21681 Mon Sep 17 00:00:00 2001
From: Tung Anh Vu <vu.tunganh96@gmail.com>
Date: Wed, 26 Jan 2022 10:51:38 +0100
Subject: [PATCH] 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"

Re: [PR PATCH] [Updated] connman: build with --enable-iwd

[vutunganh]

[-- Attachment #1: Type: text/plain, Size: 1466 bytes --]

There is an updated pull request by vutunganh against master on the void-packages repository

https://github.com/vutunganh/void-packages connman-enable-iwd
https://github.com/void-linux/void-packages/pull/35243

connman: build with --enable-iwd
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

This is one of the changes made in https://github.com/void-linux/void-packages/pull/31916. It was requested there that separate changes should be made in separate PRs, so that is what I'm doing, at least for the changes I need.

A patch file from https://github.com/void-linux/void-packages/pull/35243.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-connman-enable-iwd-35243.patch --]
[-- Type: text/x-diff, Size: 1155 bytes --]

From b5218a8b8a6c665a6da03bbf5eb741aebc615cbc Mon Sep 17 00:00:00 2001
From: Tung Anh Vu <vu.tunganh96@gmail.com>
Date: Wed, 26 Jan 2022 10:51:38 +0100
Subject: [PATCH] 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"

Re: [PR PATCH] [Updated] connman: build with --enable-iwd

[vutunganh]

[-- Attachment #1: Type: text/plain, Size: 1466 bytes --]

There is an updated pull request by vutunganh against master on the void-packages repository

https://github.com/vutunganh/void-packages connman-enable-iwd
https://github.com/void-linux/void-packages/pull/35243

connman: build with --enable-iwd
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

This is one of the changes made in https://github.com/void-linux/void-packages/pull/31916. It was requested there that separate changes should be made in separate PRs, so that is what I'm doing, at least for the changes I need.

A patch file from https://github.com/void-linux/void-packages/pull/35243.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-connman-enable-iwd-35243.patch --]
[-- Type: text/x-diff, Size: 1063 bytes --]

From 954c5d2641f3dad194be254529bee88737d835c3 Mon Sep 17 00:00:00 2001
From: Tung Anh Vu <vu.tunganh96@gmail.com>
Date: Wed, 26 Jan 2022 10:51:38 +0100
Subject: [PATCH] connman: build with --enable-iwd

---
 srcpkgs/connman/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index 191814ed79ba..2fc9cf03a376 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -6,7 +6,8 @@ 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"

Re: [PR PATCH] [Closed]: connman: build with --enable-iwd

[vutunganh]

[-- Attachment #1: Type: text/plain, Size: 1295 bytes --]

There's a closed pull request on the void-packages repository

connman: build with --enable-iwd
https://github.com/void-linux/void-packages/pull/35243

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

This is one of the changes made in https://github.com/void-linux/void-packages/pull/31916. It was requested there that separate changes should be made in separate PRs, so that is what I'm doing, at least for the changes I need.

Re: connman: build with --enable-iwd

[Idesmi]

[-- Attachment #1: Type: text/plain, Size: 259 bytes --]

New comment by Idesmi on void-packages repository

https://github.com/void-linux/void-packages/pull/35243#issuecomment-1098402456

Comment:
> That's already proposed in PR 31916.

That PR isn't going to be merged as it is, maybe a new one should be opened.

[PR PATCH] connman: build with --enable-iwd

[jirutka]

[-- Attachment #1: Type: text/plain, Size: 669 bytes --]

There is a new pull request by jirutka against master on the void-packages repository

https://github.com/jirutka/void-packages connman-iwd
https://github.com/void-linux/void-packages/pull/31916

connman: build with --enable-iwd
iwd is a better alternative to wpa_supplicant.

<!-- Mark items with [x] where applicable -->

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR


A patch file from https://github.com/void-linux/void-packages/pull/31916.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-connman-iwd-31916.patch --]
[-- Type: text/x-diff, Size: 1151 bytes --]

From 8bae57f9ab3fb6f7178b34e415463f59194505ed Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Mon, 12 Jul 2021 00:28:17 +0200
Subject: [PATCH] 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"

Re: [PR PATCH] [Updated] connman: build with --enable-iwd

[jirutka]

[-- Attachment #1: Type: text/plain, Size: 674 bytes --]

There is an updated pull request by jirutka against master on the void-packages repository

https://github.com/jirutka/void-packages connman-iwd
https://github.com/void-linux/void-packages/pull/31916

connman: build with --enable-iwd
iwd is a better alternative to wpa_supplicant.

<!-- Mark items with [x] where applicable -->

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR


A patch file from https://github.com/void-linux/void-packages/pull/31916.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-connman-iwd-31916.patch --]
[-- Type: text/x-diff, Size: 3050 bytes --]

From 8bae57f9ab3fb6f7178b34e415463f59194505ed Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
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 <jakub@jirutka.cz>
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 <orphan@voidlinux.org>"
@@ -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)