mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Lars Pedersen <lapeddk@gmail.com>
To: ptxdist@pengutronix.de
Cc: Lars Pedersen <lapeddk@gmail.com>
Subject: [ptxdist] [PATCH v2] networkmanager: Version bump 1.30.4 to 1.44.2
Date: Fri,  1 Dec 2023 15:15:52 +0100	[thread overview]
Message-ID: <20231201141552.184101-1-lapeddk@gmail.com> (raw)

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>
---
v1 -> v2:
 Flag NETWORKMANAGER_POLKIT as BROKEN

 rules/networkmanager.in   | 2 ++
 rules/networkmanager.make | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index e9af26729..e0049274b 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 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.43.0




             reply	other threads:[~2023-12-01 14:16 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-01 14:15 Lars Pedersen [this message]
2023-12-07 11:09 ` [ptxdist] [APPLIED] " Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231201141552.184101-1-lapeddk@gmail.com \
    --to=lapeddk@gmail.com \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox