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 <[email protected]>
---
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 via email to