Merge tag 'debian/1.38.4-1' into debian/bullseye-backports

network-manager Debian release 1.38.4-1

6 files changed, 28 insertions, 103 deletions

diff --git a/debian/changelog b/debian/changelog
index 66a96f43..90a08e70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+network-manager (1.38.4-1) unstable; urgency=medium
+
+  * New upstream version 1.38.4
+    - core: avoid stale entries in the DNS manager for non-virtual devices
+      (Closes: #1006724)
+  * Clean up build dependencies
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 13 Aug 2022 15:51:32 +0200
+
+network-manager (1.38.2-1) unstable; urgency=medium
+
+  * New upstream version 1.38.2
+  * Rebase patches
+  * Bump Standards-Version to 4.6.1
+  * Use dh-sequence-gir instead of gir addon
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 18 Jun 2022 22:26:35 +0200
+
 network-manager (1.38.0-2~bpo11+1) bullseye-backports; urgency=medium
 
   * Rebuild for bullseye-backports
diff --git a/debian/control b/debian/control
index f0785bfe..8a92a63e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,20 +6,21 @@ Uploaders: Michael Biebl <biebl@debian.org>,
  Sjoerd Simons <sjoerd@debian.org>,
  Aron Xu <aron@debian.org>
 Build-Depends: debhelper-compat (= 13),
+               dh-sequence-gir,
                automake (>= 1.12),
                pkg-config,
                intltool,
-               libglib2.0-dev (>= 2.32),
-               ppp-dev (>= 2.4.7-1+1),
+               libglib2.0-dev (>= 2.40),
+               ppp-dev,
                libselinux1-dev,
                libaudit-dev,
                libgnutls28-dev (>= 2.12),
                uuid-dev,
-               systemd (>= 185),
+               systemd,
                libsystemd-dev (>= 209),
                libudev-dev (>= 175),
-               libgirepository1.0-dev (>= 0.10.7-1~),
-               gobject-introspection (>= 0.9.12-4~),
+               libgirepository1.0-dev,
+               gobject-introspection,
                python3-gi,
                libpsl-dev (>= 0.1),
                libcurl4-gnutls-dev (>= 7.24.0),
@@ -30,13 +31,13 @@ Build-Depends: debhelper-compat (= 13),
                libreadline-dev,
                libnewt-dev (>= 0.52.15),
                libteam-dev (>= 1.9),
-               libjansson-dev,
+               libjansson-dev (>= 2.7),
                libbluetooth-dev (>= 5),
-               valac (>= 0.17.1.24),
+               valac,
                dbus <!nocheck>,
                python3-dbus <!nocheck>,
                iproute2 <!nocheck>,
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/utopia-team/network-manager.git
 Vcs-Browser: https://salsa.debian.org/utopia-team/network-manager
diff --git a/debian/patches/c-rbtree-fix-alignment-assertion-on-m64k.patch b/debian/patches/c-rbtree-fix-alignment-assertion-on-m64k.patch
deleted file mode 100644
index c00cd520..00000000
--- a/debian/patches/c-rbtree-fix-alignment-assertion-on-m64k.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: David Rheinsberg <david.rheinsberg@gmail.com>
-Date: Wed, 18 May 2022 11:31:45 +0200
-Subject: c-rbtree: fix alignment assertion on m64k
-
-We want to assert that our alignment-guarantees do not exceed the
-guarantees of the system-linker or system-allocator on the target
-platform. Hence, we check against max_align_t. This is a lower bound,
-but not the exact check we actually want. And as it turns out, on m64k
-it is too low. Add a static check against 4-byte alignment for m64k as
-a workaround.
-
-Reported-by: Michael Biebl
-Signed-off-by: David Rheinsberg <david.rheinsberg@gmail.com>
-
-https://github.com/c-util/c-rbtree/issues/9
-https://github.com/c-util/c-rbtree/commit/eb778d39694a0f3389f2438bbc45fb21685a047d
-(cherry picked from commit 78831d127fa169b26783ccaa6b534edfbb0adad4)
-(cherry picked from commit a83c884fb6e13aad783d547691620d43bed4db84)
----
- src/c-rbtree/src/c-rbtree.c | 21 +++++++++++++++++----
- 1 file changed, 17 insertions(+), 4 deletions(-)
-
-diff --git a/src/c-rbtree/src/c-rbtree.c b/src/c-rbtree/src/c-rbtree.c
-index 2f0e608..28de4d9 100644
---- a/src/c-rbtree/src/c-rbtree.c
-+++ b/src/c-rbtree/src/c-rbtree.c
-@@ -35,12 +35,25 @@
-  * CRBNode is 4-byte aligned, so the lower 2 bits are actually unused. We also
-  * sometimes store a pointer to the root-node, so make sure this one is also 4
-  * byte aligned.
-- * Note that there are actually some architectures where `max_align_t` is 4, so
-- * we do not have much wiggle-room to extend this flag-set.
-+ *
-+ * Additionally, we want to avoid an alignment that is bigger than the
-+ * alignment guaranteed by the system allocator or supported by the system
-+ * linker. As there is no standard way to check this, we simply verify against
-+ * `alignof(max_align_t)`, as this alignment must be supported by the
-+ * toolchain.
-+ *
-+ * m64k is special here, as it only has a 2-byte max-alignment, but still
-+ * guarantees a >=4-byte alignment on allocations. So hard-code the maximum for
-+ * it.
-  */
--static_assert(alignof(CRBNode) <= alignof(max_align_t), "Invalid RBNode alignment");
-+#ifdef __m68k__
-+#  define C_RBTREE_MAX_ALIGN (C_MAX(4, alignof(max_align_t)))
-+#else
-+#  define C_RBTREE_MAX_ALIGN (alignof(max_align_t))
-+#endif
-+static_assert(alignof(CRBNode) <= C_RBTREE_MAX_ALIGN, "Invalid RBNode alignment");
- static_assert(alignof(CRBNode) >= 4, "Invalid CRBNode alignment");
--static_assert(alignof(CRBTree) <= alignof(max_align_t), "Invalid RBTree alignment");
-+static_assert(alignof(CRBTree) <= C_RBTREE_MAX_ALIGN, "Invalid RBTree alignment");
- static_assert(alignof(CRBTree) >= 4, "Invalid CRBTree alignment");
- 
- /**
diff --git a/debian/patches/device-don-t-require-a-hardware-address-for-DHCPv6.patch b/debian/patches/device-don-t-require-a-hardware-address-for-DHCPv6.patch
deleted file mode 100644
index 09d48282..00000000
--- a/debian/patches/device-don-t-require-a-hardware-address-for-DHCPv6.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Mon, 16 May 2022 17:53:51 +0200
-Subject: device: don't require a hardware address for DHCPv6
-
-DHCPv4 requires a hardware address, while DHCPv6 does not.
-
-Anyway, the DHCP manager already checks that an address is available
-when needed, so drop the check here.
-
-Fixes: 58287cbcc0c8 ('core: rework IP configuration in NetworkManager using layer 3 configuration')
-
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1228
-(cherry picked from commit 9bc7278da369d9dd69cc7687a5d050dfea793faa)
-(cherry picked from commit 1dbcc1c4412de43c6c5def417eef221b84535d7a)
----
- src/core/devices/nm-device.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
-index 70b52b1..9e2c1f9 100644
---- a/src/core/devices/nm-device.c
-+++ b/src/core/devices/nm-device.c
-@@ -10117,13 +10117,6 @@ _dev_ipdhcpx_start(NMDevice *self, int addr_family)
- 
-     hwaddr = nmp_link_address_get_as_bytes(&pllink->l_address);
- 
--    if (!IS_IPv4) {
--        if (!hwaddr) {
--            fail_reason = "interface has no MAC address to start DHCPv6";
--            goto out_fail;
--        }
--    }
--
-     request_broadcast = FALSE;
-     if (pllink) {
-         str = nmp_object_link_udev_device_get_property_value(NMP_OBJECT_UP_CAST(pllink),
diff --git a/debian/patches/series b/debian/patches/series
index cf412f3b..a2d7e06d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 Force-online-state-with-unmanaged-devices.patch
-c-rbtree-fix-alignment-assertion-on-m64k.patch
-device-don-t-require-a-hardware-address-for-DHCPv6.patch
diff --git a/debian/rules b/debian/rules
index 1f896f0a..bcb76768 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ export PYTHON=/usr/bin/python3
 PPPD_PLUGIN_DIR := $(shell dh_ppp --plugin-dir)
 
 %:
-	dh $@ --with gir,ppp
+	dh $@ --with ppp
 
 autoreconf:
 	gtkdocize --copy