* [ptxdist] [PATCH] openvpn: enable iproute2
@ 2020-06-04 6:32 Ladislav Michl
2020-06-05 8:41 ` Michael Olbrich
0 siblings, 1 reply; 4+ messages in thread
From: Ladislav Michl @ 2020-06-04 6:32 UTC (permalink / raw)
To: ptxdist
Use (rt)netlink interface provided by 'ip' tool by default.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
rules/openvpn.in | 13 +++++++------
rules/openvpn.make | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/rules/openvpn.in b/rules/openvpn.in
index 6958e2940..afa124e10 100644
--- a/rules/openvpn.in
+++ b/rules/openvpn.in
@@ -9,11 +9,10 @@ menuconfig OPENVPN
select IPTABLES if OPENVPN_INSTALL_SAMPLE_CONFIGS && RUNTIME
select IPTABLES_INSTALL_TOOLS if OPENVPN_INSTALL_SAMPLE_CONFIGS && RUNTIME
select BRIDGE_UTILS if OPENVPN_INSTALL_SAMPLE_SCRIPTS && RUNTIME
- select IPROUTE2 if !BUSYBOX_IP && RUNTIME
- select IPROUTE2_IP if !BUSYBOX_IP && RUNTIME
- select BUSYBOX_IFCONFIG if RUNTIME
- select BUSYBOX_NETSTAT if RUNTIME
- select BUSYBOX_ROUTE if RUNTIME
+ select BUSYBOX_FEATURE_IP_LINK if BUSYBOX_IP && RUNTIME
+ select BUSYBOX_FEATURE_IP_ROUTE if BUSYBOX_IP && RUNTIME
+ select IPROUTE2 if !BUSYBOX && RUNTIME
+ select IPROUTE2_IP if !BUSYBOX && RUNTIME
help
virtual private network daemon
@@ -22,7 +21,6 @@ menuconfig OPENVPN
remote sites, make secure point-to-point connections,
enhance wireless security, etc.
-
OpenVPN uses all of the encryption, authentication, and
certification features provided by the OpenSSL library (any
cipher, key size, or HMAC digest).
@@ -35,6 +33,9 @@ menuconfig OPENVPN
if OPENVPN
+comment "openvpn requires 'ip'!"
+ depends on !BUSYBOX_IP && !IPROUTE2_IP
+
config OPENVPN_SMALL
bool
prompt "Enable smaller executable size"
diff --git a/rules/openvpn.make b/rules/openvpn.make
index dc05384df..46cca64ca 100644
--- a/rules/openvpn.make
+++ b/rules/openvpn.make
@@ -67,7 +67,7 @@ OPENVPN_CONF_OPT := \
--enable-port-share \
--disable-debug \
--$(call ptx/endis, PTXCONF_OPENVPN_SMALL)-small \
- --disable-iproute2 \
+ --enable-iproute2 \
--enable-def-auth \
--enable-pf \
--disable-plugin-auth-pam \
--
2.27.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [PATCH] openvpn: enable iproute2
2020-06-04 6:32 [ptxdist] [PATCH] openvpn: enable iproute2 Ladislav Michl
@ 2020-06-05 8:41 ` Michael Olbrich
2020-06-05 9:27 ` Ladislav Michl
0 siblings, 1 reply; 4+ messages in thread
From: Michael Olbrich @ 2020-06-05 8:41 UTC (permalink / raw)
To: ptxdist
On Thu, Jun 04, 2020 at 08:32:40AM +0200, Ladislav Michl wrote:
> Use (rt)netlink interface provided by 'ip' tool by default.
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
> rules/openvpn.in | 13 +++++++------
> rules/openvpn.make | 2 +-
> 2 files changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/rules/openvpn.in b/rules/openvpn.in
> index 6958e2940..afa124e10 100644
> --- a/rules/openvpn.in
> +++ b/rules/openvpn.in
> @@ -9,11 +9,10 @@ menuconfig OPENVPN
> select IPTABLES if OPENVPN_INSTALL_SAMPLE_CONFIGS && RUNTIME
> select IPTABLES_INSTALL_TOOLS if OPENVPN_INSTALL_SAMPLE_CONFIGS && RUNTIME
> select BRIDGE_UTILS if OPENVPN_INSTALL_SAMPLE_SCRIPTS && RUNTIME
> - select IPROUTE2 if !BUSYBOX_IP && RUNTIME
> - select IPROUTE2_IP if !BUSYBOX_IP && RUNTIME
> - select BUSYBOX_IFCONFIG if RUNTIME
> - select BUSYBOX_NETSTAT if RUNTIME
> - select BUSYBOX_ROUTE if RUNTIME
> + select BUSYBOX_FEATURE_IP_LINK if BUSYBOX_IP && RUNTIME
> + select BUSYBOX_FEATURE_IP_ROUTE if BUSYBOX_IP && RUNTIME
> + select IPROUTE2 if !BUSYBOX && RUNTIME
> + select IPROUTE2_IP if !BUSYBOX && RUNTIME
Why not just leave the !BUSYBOX_IP here? Then the comment below is not
needed because either IPROUTE2_IP or IPROUTE2_IP will be selected.
Michael
> help
> virtual private network daemon
>
> @@ -22,7 +21,6 @@ menuconfig OPENVPN
> remote sites, make secure point-to-point connections,
> enhance wireless security, etc.
>
> -
> OpenVPN uses all of the encryption, authentication, and
> certification features provided by the OpenSSL library (any
> cipher, key size, or HMAC digest).
> @@ -35,6 +33,9 @@ menuconfig OPENVPN
>
> if OPENVPN
>
> +comment "openvpn requires 'ip'!"
> + depends on !BUSYBOX_IP && !IPROUTE2_IP
> +
> config OPENVPN_SMALL
> bool
> prompt "Enable smaller executable size"
> diff --git a/rules/openvpn.make b/rules/openvpn.make
> index dc05384df..46cca64ca 100644
> --- a/rules/openvpn.make
> +++ b/rules/openvpn.make
> @@ -67,7 +67,7 @@ OPENVPN_CONF_OPT := \
> --enable-port-share \
> --disable-debug \
> --$(call ptx/endis, PTXCONF_OPENVPN_SMALL)-small \
> - --disable-iproute2 \
> + --enable-iproute2 \
> --enable-def-auth \
> --enable-pf \
> --disable-plugin-auth-pam \
> --
> 2.27.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [PATCH] openvpn: enable iproute2
2020-06-05 8:41 ` Michael Olbrich
@ 2020-06-05 9:27 ` Ladislav Michl
2020-06-05 9:53 ` Michael Olbrich
0 siblings, 1 reply; 4+ messages in thread
From: Ladislav Michl @ 2020-06-05 9:27 UTC (permalink / raw)
To: ptxdist
On Fri, Jun 05, 2020 at 10:41:37AM +0200, Michael Olbrich wrote:
> On Thu, Jun 04, 2020 at 08:32:40AM +0200, Ladislav Michl wrote:
> > Use (rt)netlink interface provided by 'ip' tool by default.
> >
> > Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> > ---
> > rules/openvpn.in | 13 +++++++------
> > rules/openvpn.make | 2 +-
> > 2 files changed, 8 insertions(+), 7 deletions(-)
> >
> > diff --git a/rules/openvpn.in b/rules/openvpn.in
> > index 6958e2940..afa124e10 100644
> > --- a/rules/openvpn.in
> > +++ b/rules/openvpn.in
> > @@ -9,11 +9,10 @@ menuconfig OPENVPN
> > select IPTABLES if OPENVPN_INSTALL_SAMPLE_CONFIGS && RUNTIME
> > select IPTABLES_INSTALL_TOOLS if OPENVPN_INSTALL_SAMPLE_CONFIGS && RUNTIME
> > select BRIDGE_UTILS if OPENVPN_INSTALL_SAMPLE_SCRIPTS && RUNTIME
> > - select IPROUTE2 if !BUSYBOX_IP && RUNTIME
> > - select IPROUTE2_IP if !BUSYBOX_IP && RUNTIME
> > - select BUSYBOX_IFCONFIG if RUNTIME
> > - select BUSYBOX_NETSTAT if RUNTIME
> > - select BUSYBOX_ROUTE if RUNTIME
> > + select BUSYBOX_FEATURE_IP_LINK if BUSYBOX_IP && RUNTIME
> > + select BUSYBOX_FEATURE_IP_ROUTE if BUSYBOX_IP && RUNTIME
> > + select IPROUTE2 if !BUSYBOX && RUNTIME
> > + select IPROUTE2_IP if !BUSYBOX && RUNTIME
>
> Why not just leave the !BUSYBOX_IP here? Then the comment below is not
> needed because either IPROUTE2_IP or IPROUTE2_IP will be selected.
We need to select A or B, but there is no simple way of doing this.
When BUSYBOX is not used, then IPROUTE2_IP is the only option, but
with BUSYBOX selected, that leads to IPROUTE2_IP being silently selected.
This way user is warned about pulling another package and can act
accordingly.
Note that we cannot select BUSYBOX_IP anyway (circular dependency),
so this is at least consistent :-)
However, I do not have strong opinion here, so let me send v2.
ladis
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [PATCH] openvpn: enable iproute2
2020-06-05 9:27 ` Ladislav Michl
@ 2020-06-05 9:53 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2020-06-05 9:53 UTC (permalink / raw)
To: ptxdist
On Fri, Jun 05, 2020 at 11:27:57AM +0200, Ladislav Michl wrote:
> On Fri, Jun 05, 2020 at 10:41:37AM +0200, Michael Olbrich wrote:
> > On Thu, Jun 04, 2020 at 08:32:40AM +0200, Ladislav Michl wrote:
> > > Use (rt)netlink interface provided by 'ip' tool by default.
> > >
> > > Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> > > ---
> > > rules/openvpn.in | 13 +++++++------
> > > rules/openvpn.make | 2 +-
> > > 2 files changed, 8 insertions(+), 7 deletions(-)
> > >
> > > diff --git a/rules/openvpn.in b/rules/openvpn.in
> > > index 6958e2940..afa124e10 100644
> > > --- a/rules/openvpn.in
> > > +++ b/rules/openvpn.in
> > > @@ -9,11 +9,10 @@ menuconfig OPENVPN
> > > select IPTABLES if OPENVPN_INSTALL_SAMPLE_CONFIGS && RUNTIME
> > > select IPTABLES_INSTALL_TOOLS if OPENVPN_INSTALL_SAMPLE_CONFIGS && RUNTIME
> > > select BRIDGE_UTILS if OPENVPN_INSTALL_SAMPLE_SCRIPTS && RUNTIME
> > > - select IPROUTE2 if !BUSYBOX_IP && RUNTIME
> > > - select IPROUTE2_IP if !BUSYBOX_IP && RUNTIME
> > > - select BUSYBOX_IFCONFIG if RUNTIME
> > > - select BUSYBOX_NETSTAT if RUNTIME
> > > - select BUSYBOX_ROUTE if RUNTIME
> > > + select BUSYBOX_FEATURE_IP_LINK if BUSYBOX_IP && RUNTIME
> > > + select BUSYBOX_FEATURE_IP_ROUTE if BUSYBOX_IP && RUNTIME
> > > + select IPROUTE2 if !BUSYBOX && RUNTIME
> > > + select IPROUTE2_IP if !BUSYBOX && RUNTIME
> >
> > Why not just leave the !BUSYBOX_IP here? Then the comment below is not
> > needed because either IPROUTE2_IP or IPROUTE2_IP will be selected.
>
> We need to select A or B, but there is no simple way of doing this.
> When BUSYBOX is not used, then IPROUTE2_IP is the only option, but
> with BUSYBOX selected, that leads to IPROUTE2_IP being silently selected.
> This way user is warned about pulling another package and can act
> accordingly.
That's ok, we silently select packages all the time :-).
> Note that we cannot select BUSYBOX_IP anyway (circular dependency),
> so this is at least consistent :-)
Yes I know. This stuff is always messy.
> However, I do not have strong opinion here, so let me send v2.
Thanks.
Michael
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-05 9:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-04 6:32 [ptxdist] [PATCH] openvpn: enable iproute2 Ladislav Michl
2020-06-05 8:41 ` Michael Olbrich
2020-06-05 9:27 ` Ladislav Michl
2020-06-05 9:53 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox