Re: [ptxdist] [PATCH] networkmanager: Version bump 1.30.4 to 1.44.2

[Lars Pedersen <lapeddk@gmail.com>]

On Tue, 28 Nov 2023 at 09:31, Michael Olbrich <m.olbrich@pengutronix.de> wrote:
>
> On Tue, Nov 21, 2023 at 08:29:17AM +0100, Lars Pedersen wrote:
> > dnssec_trigger and iptables configure options has been removed
> >
> > select PPP_MS_CHAP if NETWORKMANAGER_PPP is enabled to fix compile error:
> >   ../NetworkManager-1.44.2/src/core/ppp/nm-pppd-compat.c:50:10: fatal
> >   error: pppd/chap_ms.h: No such file or directory
> >      50 | #include <pppd/chap_ms.h>
> >
> > Signed-off-by: Lars Pedersen <lapeddk@gmail.com>
> > ---
> > Version 1.30.4 was getting pretty old and with this patch it will match
> > the one in Fedora 39. Surprisingly no major changes in configure
> > options.
> >
> > Note: Updating ppp to version 2.5.0 seemed pretty straight forward, but I
> > ran into issue https://github.com/ppp-project/ppp/issues/419. I'll try
> > to send a ppp patch when 2.5.1 is released.
>
> Hmmm, building fails with:
>
> FAILED: data/org.freedesktop.NetworkManager.policy
> .../sysroot-host/usr/bin/meson --internal msgfmthelper --msgfmt=.../sysroot-host/usr/bin/msgfmt data/org.freedesktop.NetworkManager.policy.in data/org.freedesktop.NetworkManager.policy xml .../build-target/NetworkManager-1.44.2/po
> .../sysroot-host/usr/bin/msgfmt: cannot locate ITS rules for data/org.freedesktop.NetworkManager.policy.in
>
> We're not selecting HOST_GETTEXT, so I'm guessing, msgfmt is found anyways
> even though it should not be used. But I've not looked any closer.
>
> Michael

Hmm. We can't get the same error in our setup (ptxdist 2023.06.0).

grep NETWORKMANAGER ptxconfig
PTXCONF_NETWORKMANAGER=y
PTXCONF_NETWORKMANAGER_NM_ONLINE=y
# PTXCONF_NETWORKMANAGER_NMTUI is not set
PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT=y
# PTXCONF_NETWORKMANAGER_WIRELESS is not set
PTXCONF_NETWORKMANAGER_NMCLI=y
PTXCONF_NETWORKMANAGER_WWAN=y
PTXCONF_NETWORKMANAGER_PPP=y
# PTXCONF_NETWORKMANAGER_CONCHECK is not set
# PTXCONF_NETWORKMANAGER_EXAMPLES is not set
# PTXCONF_NETWORKMANAGER_POLKIT is not set
# PTXCONF_NETWORKMANAGER_MORE_LOGGING is not set
# PTXCONF_NETWORKMANAGER_INTROSPECTION is not set
# PTXCONF_NETWORKMANAGER_FORTISSLVPN is not set
# PTXCONF_NETWORKMANAGER_OPENVPN is not set

And we have tried enabling and disabling the following:

# PTXCONF_HOST_GETTEXT
# PTXCONF_GETTEXT
# PTXCONF_POLKIT

What kind of networkmanager configuration are you testing?

/Lars Pedersen

>
> >  rules/networkmanager.in   | 1 +
> >  rules/networkmanager.make | 6 ++----
> >  2 files changed, 3 insertions(+), 4 deletions(-)
> >
> > diff --git a/rules/networkmanager.in b/rules/networkmanager.in
> > index e9af26729..8c5e8ad2e 100644
> > --- a/rules/networkmanager.in
> > +++ b/rules/networkmanager.in
> > @@ -24,6 +24,7 @@ menuconfig NETWORKMANAGER
> >       select POLKIT                           if NETWORKMANAGER_POLKIT
> >       select PPP                              if NETWORKMANAGER_PPP
> >       select PPP_PLUGINS                      if NETWORKMANAGER_PPP
> > +     select PPP_MS_CHAP                      if NETWORKMANAGER_PPP
> >       select READLINE                         if NETWORKMANAGER_NMCLI
> >       select SYSTEMD                          if NETWORKMANAGER_SYSTEMD_UNIT
> >       select UDEV
> > diff --git a/rules/networkmanager.make b/rules/networkmanager.make
> > index 9b47fadad..af310bd13 100644
> > --- a/rules/networkmanager.make
> > +++ b/rules/networkmanager.make
> > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
> >  #
> >  # Paths and names
> >  #
> > -NETWORKMANAGER_VERSION       := 1.30.4
> > -NETWORKMANAGER_MD5   := 8ce53a38356864832f7f10ad46fcde27
> > +NETWORKMANAGER_VERSION       := 1.44.2
> > +NETWORKMANAGER_MD5   := bd6c9cb0ecd0fb7f516cde7bf4dee3fb
> >  NETWORKMANAGER               := NetworkManager-$(NETWORKMANAGER_VERSION)
> >  NETWORKMANAGER_SUFFIX        := tar.xz
> >  NETWORKMANAGER_URL   := $(call ptx/mirror, GNOME, NetworkManager/$(basename $(NETWORKMANAGER_VERSION))/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX))
> > @@ -47,7 +47,6 @@ NETWORKMANAGER_CONF_OPT = \
> >       -Ddhcpcanon=false \
> >       -Ddhcpcd=false \
> >       -Ddnsmasq=/usr/sbin/dnsmasq \
> > -     -Ddnssec_trigger=/bin/true \
> >       -Ddocs=false \
> >       -Debpf=false \
> >       -Dfirewalld_zone=false \
> > @@ -55,7 +54,6 @@ NETWORKMANAGER_CONF_OPT = \
> >       -Difcfg_rh=false \
> >       -Difupdown=true \
> >       -Dintrospection=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_INTROSPECTION) \
> > -     -Diptables=/usr/sbin/iptables \
> >       -Diwd=false \
> >       -Dkernel_firmware_dir=/lib/firmware \
> >       -Dld_gc=true \
> > --
> > 2.41.0
> >
> >
> >
>
> --
> 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 |