Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] connman: build with --enable-iwd
@ 2021-07-11 22:29 jirutka
  2021-07-12  5:33 ` ericonr
                   ` (13 more replies)
  0 siblings, 14 replies; 17+ messages in thread
From: jirutka @ 2021-07-11 22:29 UTC (permalink / raw)
  To: ml

[-- 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"

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: connman: build with --enable-iwd
  2021-07-11 22:29 [PR PATCH] connman: build with --enable-iwd jirutka
@ 2021-07-12  5:33 ` ericonr
  2021-07-12  8:31 ` jirutka
                   ` (12 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: ericonr @ 2021-07-12  5:33 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31916#issuecomment-877985255

Comment:
Does the build with `--enable-iwd` still support the other options?

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: connman: build with --enable-iwd
  2021-07-11 22:29 [PR PATCH] connman: build with --enable-iwd jirutka
  2021-07-12  5:33 ` ericonr
@ 2021-07-12  8:31 ` jirutka
  2021-07-14 13:48 ` [PR PATCH] [Updated] " jirutka
                   ` (11 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: jirutka @ 2021-07-12  8:31 UTC (permalink / raw)
  To: ml

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

New comment by jirutka on void-packages repository

https://github.com/void-linux/void-packages/pull/31916#issuecomment-878083203

Comment:
Yes, it does.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] connman: build with --enable-iwd
  2021-07-11 22:29 [PR PATCH] connman: build with --enable-iwd jirutka
  2021-07-12  5:33 ` ericonr
  2021-07-12  8:31 ` jirutka
@ 2021-07-14 13:48 ` jirutka
  2021-07-14 13:49 ` connman: build with --enable-iwd, add build option "nftables" ericonr
                   ` (10 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: jirutka @ 2021-07-14 13:48 UTC (permalink / raw)
  To: ml

[-- 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)

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: connman: build with --enable-iwd, add build option "nftables"
  2021-07-11 22:29 [PR PATCH] connman: build with --enable-iwd jirutka
                   ` (2 preceding siblings ...)
  2021-07-14 13:48 ` [PR PATCH] [Updated] " jirutka
@ 2021-07-14 13:49 ` ericonr
  2021-07-14 13:52 ` jirutka
                   ` (9 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: ericonr @ 2021-07-14 13:49 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31916#issuecomment-879909496

Comment:
And make it a single commit with both changes too ;)

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: connman: build with --enable-iwd, add build option "nftables"
  2021-07-11 22:29 [PR PATCH] connman: build with --enable-iwd jirutka
                   ` (3 preceding siblings ...)
  2021-07-14 13:49 ` connman: build with --enable-iwd, add build option "nftables" ericonr
@ 2021-07-14 13:52 ` jirutka
  2021-07-14 22:59 ` [PR PATCH] [Updated] " jirutka
                   ` (8 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: jirutka @ 2021-07-14 13:52 UTC (permalink / raw)
  To: ml

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

New comment by jirutka on void-packages repository

https://github.com/void-linux/void-packages/pull/31916#issuecomment-879911906

Comment:
> And make it a single commit with both changes too ;)

They are two independent changes, so they should stay in separate commits. Squashing unrelated changes into mega commits is a horrible antipattern that makes commits hard to comprehend.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] connman: build with --enable-iwd, add build option "nftables"
  2021-07-11 22:29 [PR PATCH] connman: build with --enable-iwd jirutka
                   ` (4 preceding siblings ...)
  2021-07-14 13:52 ` jirutka
@ 2021-07-14 22:59 ` jirutka
  2021-07-15 23:45 ` [PR PATCH] [Updated] connman: build with --enable-iwd, add build option "nftables", split openconnect plugin, remove runtime dependency on wpa_supplicant jirutka
                   ` (7 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: jirutka @ 2021-07-14 22:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 703 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, add build option "nftables"
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: 5543 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/4] 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/4] 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)

From 719e242431844c395ccde8857c8d2eb7a0db5673 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Thu, 15 Jul 2021 00:48:53 +0200
Subject: [PATCH 3/4] connman: split openconnect plugin into subpackage

OpenConnect VPN is not widely used and it adds many dependencies to the
connman package. On my system, removing openconnect orphaned the following
packages: openconnect trousers vpnc-scripts libpcsclite mit-krb5-libs
with total size over 5 MiB.
---
 srcpkgs/connman-openconnect | 1 +
 srcpkgs/connman/template    | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 120000 srcpkgs/connman-openconnect

diff --git a/srcpkgs/connman-openconnect b/srcpkgs/connman-openconnect
new file mode 120000
index 000000000000..b57e8c232da5
--- /dev/null
+++ b/srcpkgs/connman-openconnect
@@ -0,0 +1 @@
+connman
\ No newline at end of file
diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index ac4f46833e6f..b7ff88c19850 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -43,6 +43,14 @@ post_install() {
 	vinstall ${FILESDIR}/connmand.conf 755 usr/share/dbus-1/system.d/
 }
 
+connman-openconnect_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - support for OpenConnect VPN"
+	pkg_install() {
+		vmove usr/lib/connman/plugins-vpn/openconnect.so
+	}
+}
+
 connman-devel_package() {
 	depends="dbus-devel libglib-devel"
 	short_desc+=" - development files"

From 544520b12edd71b2ca53621b3818c216c56ae288 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Thu, 15 Jul 2021 00:53:11 +0200
Subject: [PATCH 4/4] connman: remove runtime dependency on wpa_supplicant

ConnMan can be used with iwd or even without any WiFi program,
because it can be used for Ethernet devices.
---
 srcpkgs/connman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index b7ff88c19850..076df7f1f2c1 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -11,7 +11,7 @@ configure_args="--enable-polkit --enable-client --enable-pie --enable-ethernet
 hostmakedepends="automake iptables libtool pkg-config wpa_supplicant"
 makedepends="gnutls-devel libglib-devel libmnl-devel openconnect-devel
  readline-devel $(vopt_if nftables libnftnl-devel iptables-devel)"
-depends="dbus wpa_supplicant"
+depends="dbus"
 short_desc="Open Source CONNection MANager"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] connman: build with --enable-iwd, add build option "nftables", split openconnect plugin, remove runtime dependency on wpa_supplicant
  2021-07-11 22:29 [PR PATCH] connman: build with --enable-iwd jirutka
                   ` (5 preceding siblings ...)
  2021-07-14 22:59 ` [PR PATCH] [Updated] " jirutka
@ 2021-07-15 23:45 ` jirutka
  2021-07-15 23:47 ` jirutka
                   ` (6 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: jirutka @ 2021-07-15 23:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1265 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, add build option "nftables", split openconnect plugin, remove runtime dependency on wpa_supplicant
1. Build with --enable-iwd

    iwd is a better alternative to wpa_supplicant.

1. 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]

1. Split openconnect plugin into subpackage
    
    OpenConnect VPN is not widely used and it adds many dependencies to the connman package. On my system, removing openconnect orphaned the following packages: openconnect trousers vpnc-scripts libpcsclite mit-krb5-libs with total size over 5 MiB.

1. Remove runtime dependency on wpa_supplicant
    
    ConnMan can be used with iwd or even without any WiFi program, because it can be used for Ethernet devices.

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: 5543 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/4] 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/4] 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)

From 719e242431844c395ccde8857c8d2eb7a0db5673 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Thu, 15 Jul 2021 00:48:53 +0200
Subject: [PATCH 3/4] connman: split openconnect plugin into subpackage

OpenConnect VPN is not widely used and it adds many dependencies to the
connman package. On my system, removing openconnect orphaned the following
packages: openconnect trousers vpnc-scripts libpcsclite mit-krb5-libs
with total size over 5 MiB.
---
 srcpkgs/connman-openconnect | 1 +
 srcpkgs/connman/template    | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 120000 srcpkgs/connman-openconnect

diff --git a/srcpkgs/connman-openconnect b/srcpkgs/connman-openconnect
new file mode 120000
index 000000000000..b57e8c232da5
--- /dev/null
+++ b/srcpkgs/connman-openconnect
@@ -0,0 +1 @@
+connman
\ No newline at end of file
diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index ac4f46833e6f..b7ff88c19850 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -43,6 +43,14 @@ post_install() {
 	vinstall ${FILESDIR}/connmand.conf 755 usr/share/dbus-1/system.d/
 }
 
+connman-openconnect_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - support for OpenConnect VPN"
+	pkg_install() {
+		vmove usr/lib/connman/plugins-vpn/openconnect.so
+	}
+}
+
 connman-devel_package() {
 	depends="dbus-devel libglib-devel"
 	short_desc+=" - development files"

From 544520b12edd71b2ca53621b3818c216c56ae288 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Thu, 15 Jul 2021 00:53:11 +0200
Subject: [PATCH 4/4] connman: remove runtime dependency on wpa_supplicant

ConnMan can be used with iwd or even without any WiFi program,
because it can be used for Ethernet devices.
---
 srcpkgs/connman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index b7ff88c19850..076df7f1f2c1 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -11,7 +11,7 @@ configure_args="--enable-polkit --enable-client --enable-pie --enable-ethernet
 hostmakedepends="automake iptables libtool pkg-config wpa_supplicant"
 makedepends="gnutls-devel libglib-devel libmnl-devel openconnect-devel
  readline-devel $(vopt_if nftables libnftnl-devel iptables-devel)"
-depends="dbus wpa_supplicant"
+depends="dbus"
 short_desc="Open Source CONNection MANager"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] connman: build with --enable-iwd, add build option "nftables", split openconnect plugin, remove runtime dependency on wpa_supplicant
  2021-07-11 22:29 [PR PATCH] connman: build with --enable-iwd jirutka
                   ` (6 preceding siblings ...)
  2021-07-15 23:45 ` [PR PATCH] [Updated] connman: build with --enable-iwd, add build option "nftables", split openconnect plugin, remove runtime dependency on wpa_supplicant jirutka
@ 2021-07-15 23:47 ` jirutka
  2021-07-16 21:01 ` jirutka
                   ` (5 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: jirutka @ 2021-07-15 23:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1548 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, add build option "nftables", split openconnect plugin, remove runtime dependency on wpa_supplicant
1. Build with --enable-iwd

    iwd is a better alternative to wpa_supplicant.

1. 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]

1. Split openconnect plugin into subpackage
    
    OpenConnect VPN is not widely used and it adds many dependencies to the connman package. On my system, removing openconnect orphaned the following packages: openconnect trousers vpnc-scripts libpcsclite mit-krb5-libs with total size over 5 MiB.

1. Remove runtime dependency on wpa_supplicant
    
    ConnMan can be used with iwd or even without any WiFi program, because it can be used for Ethernet devices.

1. Split openvpn and wireguard to subpackages
    
    The main motivation to split openvpn into a subpackage is to correctly declare its dependency on "openvpn" package. Wireguard doesn't seem to depend on any other package, that's just for consistency with other VPN plugins.

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: 7705 bytes --]

From 25575d025c54aa596d3813ae92c4fdf63ae81822 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/5] 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 cce2a9321dfd9f0e85568542a7ff9cb6b409c4da 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/5] 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)

From 074159108ac06563f1adb91d903f378c7c797719 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Thu, 15 Jul 2021 00:48:53 +0200
Subject: [PATCH 3/5] connman: split openconnect plugin into subpackage

OpenConnect VPN is not widely used and it adds many dependencies to the
connman package. On my system, removing openconnect orphaned the following
packages: openconnect trousers vpnc-scripts libpcsclite mit-krb5-libs
with total size over 5 MiB.
---
 srcpkgs/connman-openconnect | 1 +
 srcpkgs/connman/template    | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 120000 srcpkgs/connman-openconnect

diff --git a/srcpkgs/connman-openconnect b/srcpkgs/connman-openconnect
new file mode 120000
index 000000000000..b57e8c232da5
--- /dev/null
+++ b/srcpkgs/connman-openconnect
@@ -0,0 +1 @@
+connman
\ No newline at end of file
diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index ac4f46833e6f..b7ff88c19850 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -43,6 +43,14 @@ post_install() {
 	vinstall ${FILESDIR}/connmand.conf 755 usr/share/dbus-1/system.d/
 }
 
+connman-openconnect_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - support for OpenConnect VPN"
+	pkg_install() {
+		vmove usr/lib/connman/plugins-vpn/openconnect.so
+	}
+}
+
 connman-devel_package() {
 	depends="dbus-devel libglib-devel"
 	short_desc+=" - development files"

From ac5b61b72594b20dd01c79876e80499d86a169d4 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Thu, 15 Jul 2021 00:53:11 +0200
Subject: [PATCH 4/5] connman: remove runtime dependency on wpa_supplicant

ConnMan can be used with iwd or even without any WiFi program,
because it can be used for Ethernet devices.
---
 srcpkgs/connman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index b7ff88c19850..076df7f1f2c1 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -11,7 +11,7 @@ configure_args="--enable-polkit --enable-client --enable-pie --enable-ethernet
 hostmakedepends="automake iptables libtool pkg-config wpa_supplicant"
 makedepends="gnutls-devel libglib-devel libmnl-devel openconnect-devel
  readline-devel $(vopt_if nftables libnftnl-devel iptables-devel)"
-depends="dbus wpa_supplicant"
+depends="dbus"
 short_desc="Open Source CONNection MANager"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From cb7a94f4a5c67d3efc7530df8c9bdfe24669cdd8 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Fri, 16 Jul 2021 01:37:58 +0200
Subject: [PATCH 5/5] connman: split openvpn and wireguard to subpackages

The main motivation to split openvpn into a subpackage is to correctly
declare its dependency on "openvpn" package. Wireguard doesn't seem to
depend on any other package, that's just for consistency with other VPN
plugins.
---
 srcpkgs/connman-openvpn   |  1 +
 srcpkgs/connman-wireguard |  1 +
 srcpkgs/connman/template  | 19 ++++++++++++++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/connman-openvpn
 create mode 120000 srcpkgs/connman-wireguard

diff --git a/srcpkgs/connman-openvpn b/srcpkgs/connman-openvpn
new file mode 120000
index 000000000000..b57e8c232da5
--- /dev/null
+++ b/srcpkgs/connman-openvpn
@@ -0,0 +1 @@
+connman
\ No newline at end of file
diff --git a/srcpkgs/connman-wireguard b/srcpkgs/connman-wireguard
new file mode 120000
index 000000000000..b57e8c232da5
--- /dev/null
+++ b/srcpkgs/connman-wireguard
@@ -0,0 +1 @@
+connman
\ No newline at end of file
diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index 076df7f1f2c1..3136b8ca68a6 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -45,12 +45,29 @@ post_install() {
 
 connman-openconnect_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - support for OpenConnect VPN"
+	short_desc="OpenConnect VPN plugin for ConnMan"
 	pkg_install() {
 		vmove usr/lib/connman/plugins-vpn/openconnect.so
 	}
 }
 
+connman-openvpn_package() {
+	depends="${sourcepkg}>=${version}_${revision} openvpn"
+	short_desc="OpenVPN plugin for ConnMan"
+	pkg_install() {
+		vmove usr/lib/connman/plugins-vpn/openvpn.so
+		vmove usr/lib/connman/scripts/openvpn-script
+	}
+}
+
+connman-wireguard_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc="WireGuard VPN plugin for ConnMan"
+	pkg_install() {
+		vmove usr/lib/connman/plugins-vpn/wireguard.so
+	}
+}
+
 connman-devel_package() {
 	depends="dbus-devel libglib-devel"
 	short_desc+=" - development files"

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] connman: build with --enable-iwd, add build option "nftables", split openconnect plugin, remove runtime dependency on wpa_supplicant
  2021-07-11 22:29 [PR PATCH] connman: build with --enable-iwd jirutka
                   ` (7 preceding siblings ...)
  2021-07-15 23:47 ` jirutka
@ 2021-07-16 21:01 ` jirutka
  2021-07-17  3:11 ` ericonr
                   ` (4 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: jirutka @ 2021-07-16 21:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1548 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, add build option "nftables", split openconnect plugin, remove runtime dependency on wpa_supplicant
1. Build with --enable-iwd

    iwd is a better alternative to wpa_supplicant.

1. 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]

1. Split openconnect plugin into subpackage
    
    OpenConnect VPN is not widely used and it adds many dependencies to the connman package. On my system, removing openconnect orphaned the following packages: openconnect trousers vpnc-scripts libpcsclite mit-krb5-libs with total size over 5 MiB.

1. Remove runtime dependency on wpa_supplicant
    
    ConnMan can be used with iwd or even without any WiFi program, because it can be used for Ethernet devices.

1. Split openvpn and wireguard to subpackages
    
    The main motivation to split openvpn into a subpackage is to correctly declare its dependency on "openvpn" package. Wireguard doesn't seem to depend on any other package, that's just for consistency with other VPN plugins.

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: 9080 bytes --]

From 25575d025c54aa596d3813ae92c4fdf63ae81822 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/6] 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 cce2a9321dfd9f0e85568542a7ff9cb6b409c4da 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/6] 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)

From 074159108ac06563f1adb91d903f378c7c797719 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Thu, 15 Jul 2021 00:48:53 +0200
Subject: [PATCH 3/6] connman: split openconnect plugin into subpackage

OpenConnect VPN is not widely used and it adds many dependencies to the
connman package. On my system, removing openconnect orphaned the following
packages: openconnect trousers vpnc-scripts libpcsclite mit-krb5-libs
with total size over 5 MiB.
---
 srcpkgs/connman-openconnect | 1 +
 srcpkgs/connman/template    | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 120000 srcpkgs/connman-openconnect

diff --git a/srcpkgs/connman-openconnect b/srcpkgs/connman-openconnect
new file mode 120000
index 000000000000..b57e8c232da5
--- /dev/null
+++ b/srcpkgs/connman-openconnect
@@ -0,0 +1 @@
+connman
\ No newline at end of file
diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index ac4f46833e6f..b7ff88c19850 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -43,6 +43,14 @@ post_install() {
 	vinstall ${FILESDIR}/connmand.conf 755 usr/share/dbus-1/system.d/
 }
 
+connman-openconnect_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - support for OpenConnect VPN"
+	pkg_install() {
+		vmove usr/lib/connman/plugins-vpn/openconnect.so
+	}
+}
+
 connman-devel_package() {
 	depends="dbus-devel libglib-devel"
 	short_desc+=" - development files"

From ac5b61b72594b20dd01c79876e80499d86a169d4 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Thu, 15 Jul 2021 00:53:11 +0200
Subject: [PATCH 4/6] connman: remove runtime dependency on wpa_supplicant

ConnMan can be used with iwd or even without any WiFi program,
because it can be used for Ethernet devices.
---
 srcpkgs/connman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index b7ff88c19850..076df7f1f2c1 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -11,7 +11,7 @@ configure_args="--enable-polkit --enable-client --enable-pie --enable-ethernet
 hostmakedepends="automake iptables libtool pkg-config wpa_supplicant"
 makedepends="gnutls-devel libglib-devel libmnl-devel openconnect-devel
  readline-devel $(vopt_if nftables libnftnl-devel iptables-devel)"
-depends="dbus wpa_supplicant"
+depends="dbus"
 short_desc="Open Source CONNection MANager"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From cb7a94f4a5c67d3efc7530df8c9bdfe24669cdd8 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Fri, 16 Jul 2021 01:37:58 +0200
Subject: [PATCH 5/6] connman: split openvpn and wireguard to subpackages

The main motivation to split openvpn into a subpackage is to correctly
declare its dependency on "openvpn" package. Wireguard doesn't seem to
depend on any other package, that's just for consistency with other VPN
plugins.
---
 srcpkgs/connman-openvpn   |  1 +
 srcpkgs/connman-wireguard |  1 +
 srcpkgs/connman/template  | 19 ++++++++++++++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/connman-openvpn
 create mode 120000 srcpkgs/connman-wireguard

diff --git a/srcpkgs/connman-openvpn b/srcpkgs/connman-openvpn
new file mode 120000
index 000000000000..b57e8c232da5
--- /dev/null
+++ b/srcpkgs/connman-openvpn
@@ -0,0 +1 @@
+connman
\ No newline at end of file
diff --git a/srcpkgs/connman-wireguard b/srcpkgs/connman-wireguard
new file mode 120000
index 000000000000..b57e8c232da5
--- /dev/null
+++ b/srcpkgs/connman-wireguard
@@ -0,0 +1 @@
+connman
\ No newline at end of file
diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index 076df7f1f2c1..3136b8ca68a6 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -45,12 +45,29 @@ post_install() {
 
 connman-openconnect_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - support for OpenConnect VPN"
+	short_desc="OpenConnect VPN plugin for ConnMan"
 	pkg_install() {
 		vmove usr/lib/connman/plugins-vpn/openconnect.so
 	}
 }
 
+connman-openvpn_package() {
+	depends="${sourcepkg}>=${version}_${revision} openvpn"
+	short_desc="OpenVPN plugin for ConnMan"
+	pkg_install() {
+		vmove usr/lib/connman/plugins-vpn/openvpn.so
+		vmove usr/lib/connman/scripts/openvpn-script
+	}
+}
+
+connman-wireguard_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc="WireGuard VPN plugin for ConnMan"
+	pkg_install() {
+		vmove usr/lib/connman/plugins-vpn/wireguard.so
+	}
+}
+
 connman-devel_package() {
 	depends="dbus-devel libglib-devel"
 	short_desc+=" - development files"

From fdd5a86973b6ec99d58b3b905dcd44845566b857 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Fri, 16 Jul 2021 22:58:00 +0200
Subject: [PATCH 6/6] connman: install main.conf and remove redundant vbin

connmanctl is installed by Makefile
---
 srcpkgs/connman/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index 3136b8ca68a6..66b6634f8329 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -8,6 +8,7 @@ configure_args="--enable-polkit --enable-client --enable-pie --enable-ethernet
  --enable-openvpn --with-openvpn=/usr/bin/openvpn --enable-openconnect
  --disable-tools --disable-wispr --with-openconnect=/usr/bin/openconnect
  --enable-iwd --with-firewall=$(vopt_if nftables nftables iptables)"
+conf_files="/etc/connman/*"
 hostmakedepends="automake iptables libtool pkg-config wpa_supplicant"
 makedepends="gnutls-devel libglib-devel libmnl-devel openconnect-devel
  readline-devel $(vopt_if nftables libnftnl-devel iptables-devel)"
@@ -36,11 +37,11 @@ pre_configure() {
 	esac
 	autoreconf -fi
 }
+
 post_install() {
-	# Install the client connmanctl.
-	vbin client/connmanctl
 	vsv connmand
 	vinstall ${FILESDIR}/connmand.conf 755 usr/share/dbus-1/system.d/
+	vinstall src/main.conf 644 etc/connman
 }
 
 connman-openconnect_package() {

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: connman: build with --enable-iwd, add build option "nftables", split openconnect plugin, remove runtime dependency on wpa_supplicant
  2021-07-11 22:29 [PR PATCH] connman: build with --enable-iwd jirutka
                   ` (8 preceding siblings ...)
  2021-07-16 21:01 ` jirutka
@ 2021-07-17  3:11 ` ericonr
  2021-07-17  3:25 ` ahesford
                   ` (3 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: ericonr @ 2021-07-17  3:11 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31916#issuecomment-881807379

Comment:
I'm not sure we want such a granular separation... Have you considered the case where an update removes features from users' systems?

> They are two independent changes, so they should stay in separate commits. Squashing unrelated changes into mega commits is a horrible antipattern that makes commits hard to comprehend.

But the repo tries to follow a convention of atomic commits per package; splitting the changes that apply to a single revision change can be confusing too for those who are used to the convention. I think 6 commits for the present changes is too much, in any case.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: connman: build with --enable-iwd, add build option "nftables", split openconnect plugin, remove runtime dependency on wpa_supplicant
  2021-07-11 22:29 [PR PATCH] connman: build with --enable-iwd jirutka
                   ` (9 preceding siblings ...)
  2021-07-17  3:11 ` ericonr
@ 2021-07-17  3:25 ` ahesford
  2021-07-17  3:32 ` abenson
                   ` (2 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: ahesford @ 2021-07-17  3:25 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/31916#issuecomment-881809066

Comment:
> > And make it a single commit with both changes too ;)
> 
> They are two independent changes, so they should stay in separate commits. Squashing unrelated changes into mega commits is a horrible antipattern that makes commits hard to comprehend.

Save the "anti-pattern" critiques for the classroom. Our policy is not designed to maximize comprehension; it is designed to maximize atomicity and reversibility. If you break something, we need to be able to easily restore the prior state of the package while you figure out what went wrong, not wade through a web of commits to bisect the breakage.

If there is a lot to explain about the changes, use comments or the commit message.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: connman: build with --enable-iwd, add build option "nftables", split openconnect plugin, remove runtime dependency on wpa_supplicant
  2021-07-11 22:29 [PR PATCH] connman: build with --enable-iwd jirutka
                   ` (10 preceding siblings ...)
  2021-07-17  3:25 ` ahesford
@ 2021-07-17  3:32 ` abenson
  2022-05-25  2:15 ` github-actions
  2022-06-09  2:11 ` [PR PATCH] [Closed]: " github-actions
  13 siblings, 0 replies; 17+ messages in thread
From: abenson @ 2021-07-17  3:32 UTC (permalink / raw)
  To: ml

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/31916#issuecomment-881809858

Comment:
> They are two independent changes, so they should stay in separate commits.

If they're unrelated changes, they should be in separate PRs.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: connman: build with --enable-iwd, add build option "nftables", split openconnect plugin, remove runtime dependency on wpa_supplicant
  2021-07-11 22:29 [PR PATCH] connman: build with --enable-iwd jirutka
                   ` (11 preceding siblings ...)
  2021-07-17  3:32 ` abenson
@ 2022-05-25  2:15 ` github-actions
  2022-06-09  2:11 ` [PR PATCH] [Closed]: " github-actions
  13 siblings, 0 replies; 17+ messages in thread
From: github-actions @ 2022-05-25  2:15 UTC (permalink / raw)
  To: ml

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/31916#issuecomment-1136640187

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Closed]: connman: build with --enable-iwd, add build option "nftables", split openconnect plugin, remove runtime dependency on wpa_supplicant
  2021-07-11 22:29 [PR PATCH] connman: build with --enable-iwd jirutka
                   ` (12 preceding siblings ...)
  2022-05-25  2:15 ` github-actions
@ 2022-06-09  2:11 ` github-actions
  13 siblings, 0 replies; 17+ messages in thread
From: github-actions @ 2022-06-09  2:11 UTC (permalink / raw)
  To: ml

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

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

connman: build with --enable-iwd, add build option "nftables", split openconnect plugin, remove runtime dependency on wpa_supplicant
https://github.com/void-linux/void-packages/pull/31916

Description:
1. Build with --enable-iwd

    iwd is a better alternative to wpa_supplicant.

1. 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]

1. Split openconnect plugin into subpackage
    
    OpenConnect VPN is not widely used and it adds many dependencies to the connman package. On my system, removing openconnect orphaned the following packages: openconnect trousers vpnc-scripts libpcsclite mit-krb5-libs with total size over 5 MiB.

1. Remove runtime dependency on wpa_supplicant
    
    ConnMan can be used with iwd or even without any WiFi program, because it can be used for Ethernet devices.

1. Split openvpn and wireguard to subpackages
    
    The main motivation to split openvpn into a subpackage is to correctly declare its dependency on "openvpn" package. Wireguard doesn't seem to depend on any other package, that's just for consistency with other VPN plugins.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: connman: build with --enable-iwd
  2022-01-26 10:16 [PR PATCH] connman: build with --enable-iwd vutunganh
  2022-01-27 16:18 ` Vistaus
@ 2022-04-13 19:25 ` Idesmi
  1 sibling, 0 replies; 17+ messages in thread
From: Idesmi @ 2022-04-13 19:25 UTC (permalink / raw)
  To: ml

[-- 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.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: connman: build with --enable-iwd
  2022-01-26 10:16 [PR PATCH] connman: build with --enable-iwd vutunganh
@ 2022-01-27 16:18 ` Vistaus
  2022-04-13 19:25 ` Idesmi
  1 sibling, 0 replies; 17+ messages in thread
From: Vistaus @ 2022-01-27 16:18 UTC (permalink / raw)
  To: ml

[-- 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.

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2022-06-09  2:11 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-11 22:29 [PR PATCH] connman: build with --enable-iwd jirutka
2021-07-12  5:33 ` ericonr
2021-07-12  8:31 ` jirutka
2021-07-14 13:48 ` [PR PATCH] [Updated] " jirutka
2021-07-14 13:49 ` connman: build with --enable-iwd, add build option "nftables" ericonr
2021-07-14 13:52 ` jirutka
2021-07-14 22:59 ` [PR PATCH] [Updated] " jirutka
2021-07-15 23:45 ` [PR PATCH] [Updated] connman: build with --enable-iwd, add build option "nftables", split openconnect plugin, remove runtime dependency on wpa_supplicant jirutka
2021-07-15 23:47 ` jirutka
2021-07-16 21:01 ` jirutka
2021-07-17  3:11 ` ericonr
2021-07-17  3:25 ` ahesford
2021-07-17  3:32 ` abenson
2022-05-25  2:15 ` github-actions
2022-06-09  2:11 ` [PR PATCH] [Closed]: " github-actions
2022-01-26 10:16 [PR PATCH] connman: build with --enable-iwd vutunganh
2022-01-27 16:18 ` Vistaus
2022-04-13 19:25 ` Idesmi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).