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

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as f5e1c759c9a16ae2c47cd1d333ad76fcd607ed9f.

Michael

[sent from post-receive hook]

On Thu, 07 Dec 2023 12:09:57 +0100, Lars Pedersen <lapeddk@gmail.com> 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>
> 
> Flag NETWORKMANAGER_POLKIT as BROKEN because of following error:
> 
> 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
> 
> Signed-off-by: Lars Pedersen <lapeddk@gmail.com>
> Message-Id: <20231201141552.184101-1-lapeddk@gmail.com>
> [mol: remove obsolete patch]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/NetworkManager-1.30.4/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch b/patches/NetworkManager-1.30.4/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch
> deleted file mode 100644
> index ebc2816dff0b..000000000000
> --- a/patches/NetworkManager-1.30.4/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -From: Robert Schwebel <r.schwebel@pengutronix.de>
> -Date: Sat, 25 Jul 2020 18:14:35 +0200
> -Subject: [PATCH] clients/cli: build generate_docs_nm_settings_nmcli only if
> - docs are enabled
> -
> -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ----
> - clients/cli/meson.build | 5 +++++
> - 1 file changed, 5 insertions(+)
> -
> -diff --git a/clients/cli/meson.build b/clients/cli/meson.build
> -index f8e6a8236d4e..af57eedabfb9 100644
> ---- a/clients/cli/meson.build
> -+++ b/clients/cli/meson.build
> -@@ -37,6 +37,9 @@ executable(
> - 
> - endif
> - 
> -+enable_docs = get_option('docs')
> -+if enable_docs
> -+
> - generate_docs_nm_settings_nmcli = executable(
> -   'generate-docs-nm-settings-nmcli',
> -   files(
> -@@ -54,6 +57,8 @@ generate_docs_nm_settings_nmcli = executable(
> -   link_depends: linker_script_binary,
> - )
> - 
> -+endif
> -+
> - if enable_docs
> -   generate_docs_nm_settings_nmcli_xml = custom_target(
> -     'generate-docs-nm-settings-nmcli.xml',
> diff --git a/patches/NetworkManager-1.30.4/series b/patches/NetworkManager-1.30.4/series
> deleted file mode 100644
> index 24a953ec874d..000000000000
> --- a/patches/NetworkManager-1.30.4/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch
> -# c940234bc49ce84559747d716a7955c5  - git-ptx-patches magic
> diff --git a/rules/networkmanager.in b/rules/networkmanager.in
> index e9af267292aa..e0049274bec0 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
> @@ -103,6 +104,7 @@ config NETWORKMANAGER_EXAMPLES
>  
>  config NETWORKMANAGER_POLKIT
>  	bool
> +	depends on BROKEN
>  	prompt "polkit support"
>  
>  config NETWORKMANAGER_MORE_LOGGING
> diff --git a/rules/networkmanager.make b/rules/networkmanager.make
> index 9b47fadad176..af310bd130bf 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 \