From dad52f9cd8333f491537290a3eb8694115d28164 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 31 Jan 2020 12:16:50 +0100 Subject: New upstream version 1.22.6 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 956338ed..7bfb6169 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.22.6-1) UNRELEASED; urgency=medium + + * New upstream version 1.22.6 + + -- Michael Biebl Fri, 31 Jan 2020 12:16:46 +0100 + network-manager (1.22.4-1) unstable; urgency=medium * New upstream version 1.22.4 -- cgit 1.3.0-6-gf8a5 From effff4f66c5100350fd08a6fdd37d9340135a15b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 31 Jan 2020 12:17:12 +0100 Subject: Bump Standards-Version to 4.5.0 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 04e73f43..75fddbbe 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,7 @@ Build-Depends: debhelper-compat (= 12), valac (>= 0.17.1.24), dbus , python3-dbus -Standards-Version: 4.4.1 +Standards-Version: 4.5.0 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 -- cgit 1.3.0-6-gf8a5 From 791273440c1d23e73cb8139a6868ebb9c1f5ed58 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 31 Jan 2020 12:22:20 +0100 Subject: Rebase patches --- ...Force-online-state-with-unmanaged-devices.patch | 10 +++---- ...ger-context-in-n_dhcp4_client_probe_trans.patch | 31 ---------------------- debian/patches/series | 1 - 3 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 debian/patches/n-dhcp4-fix-integer-context-in-n_dhcp4_client_probe_trans.patch (limited to 'debian') diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 40c5217a..1eb08e28 100644 --- a/debian/patches/Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch @@ -12,7 +12,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286 1 file changed, 115 insertions(+) diff --git a/src/nm-manager.c b/src/nm-manager.c -index 3696c78..abd71c4 100644 +index 6d3a5dd..f804918 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -50,6 +50,8 @@ @@ -73,7 +73,7 @@ index 3696c78..abd71c4 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6536,6 +6566,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -6550,6 +6580,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index 3696c78..abd71c4 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6709,6 +6795,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6723,6 +6809,9 @@ nm_manager_start (NMManager *self, GError **error) nm_clear_g_source (&priv->devices_inited_id); priv->devices_inited_id = g_idle_add_full (G_PRIORITY_LOW + 10, devices_inited_cb, self, NULL); @@ -146,7 +146,7 @@ index 3696c78..abd71c4 100644 return TRUE; } -@@ -7557,6 +7646,22 @@ nm_manager_init (NMManager *self) +@@ -7571,6 +7660,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index 3696c78..abd71c4 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7839,6 +7944,16 @@ dispose (GObject *object) +@@ -7853,6 +7958,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } diff --git a/debian/patches/n-dhcp4-fix-integer-context-in-n_dhcp4_client_probe_trans.patch b/debian/patches/n-dhcp4-fix-integer-context-in-n_dhcp4_client_probe_trans.patch deleted file mode 100644 index 6f5360c2..00000000 --- a/debian/patches/n-dhcp4-fix-integer-context-in-n_dhcp4_client_probe_trans.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Thomas Haller -Date: Tue, 14 Jan 2020 16:20:56 +0100 -Subject: n-dhcp4: fix integer context in - n_dhcp4_client_probe_transition_nak() on 32 bit - -Fixes: 218782a9a3c3 ('n-dhcp4: restart the transaction after a NAK') - -https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/339 -(cherry picked from commit de818bf610ba0fed2b275a19fe3e6f9cbfa1862b) -(cherry picked from commit 4665bb9fc52c626d92f5ca383509c389706f4781) ---- - shared/n-dhcp4/src/n-dhcp4-c-probe.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/shared/n-dhcp4/src/n-dhcp4-c-probe.c b/shared/n-dhcp4/src/n-dhcp4-c-probe.c -index 5bed15b..f4962d6 100644 ---- a/shared/n-dhcp4/src/n-dhcp4-c-probe.c -+++ b/shared/n-dhcp4/src/n-dhcp4-c-probe.c -@@ -1005,9 +1005,9 @@ static int n_dhcp4_client_probe_transition_nak(NDhcp4ClientProbe *probe) { - - probe->state = N_DHCP4_CLIENT_PROBE_STATE_INIT; - probe->ns_deferred = n_dhcp4_gettime(CLOCK_BOOTTIME) + probe->ns_nak_restart_delay; -- probe->ns_nak_restart_delay = C_CLAMP(probe->ns_nak_restart_delay * 2, -- UINT64_C(1000000000 * 2), -- UINT64_C(1000000000 * 300)); -+ probe->ns_nak_restart_delay = C_CLAMP(probe->ns_nak_restart_delay * 2u, -+ UINT64_C(2) * UINT64_C(1000000000), -+ UINT64_C(300) * UINT64_C(1000000000)); - break; - case N_DHCP4_CLIENT_PROBE_STATE_SELECTING: - case N_DHCP4_CLIENT_PROBE_STATE_INIT_REBOOT: diff --git a/debian/patches/series b/debian/patches/series index 34431f90..9a20acf2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ Force-online-state-with-unmanaged-devices.patch Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch -n-dhcp4-fix-integer-context-in-n_dhcp4_client_probe_trans.patch -- cgit 1.3.0-6-gf8a5 From bc4ff7bc667094c9450d8a34abe552886c4b1f73 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 31 Jan 2020 18:15:15 +0100 Subject: Release version 1.22.6-1 to unstable --- debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7bfb6169..c063e903 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -network-manager (1.22.6-1) UNRELEASED; urgency=medium +network-manager (1.22.6-1) unstable; urgency=medium * New upstream version 1.22.6 + * Bump Standards-Version to 4.5.0 + * Rebase patches - -- Michael Biebl Fri, 31 Jan 2020 12:16:46 +0100 + -- Michael Biebl Fri, 31 Jan 2020 18:14:59 +0100 network-manager (1.22.4-1) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5 From b20d506cba68685aa76387e609f2bf3a4af62c02 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 19 Feb 2020 23:32:48 +0100 Subject: New upstream version 1.22.8 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c063e903..7cb3663c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.22.8-1) UNRELEASED; urgency=medium + + * New upstream version 1.22.8 + + -- Michael Biebl Wed, 19 Feb 2020 23:32:46 +0100 + network-manager (1.22.6-1) unstable; urgency=medium * New upstream version 1.22.6 -- cgit 1.3.0-6-gf8a5 From 6a85ae0ebf20c44334d1bc7fde0fa2c432c91e78 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 19 Feb 2020 23:52:35 +0100 Subject: Update symbols file for libnm0 --- debian/libnm0.symbols | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index 9cd0d45e..f51b2a6b 100644 --- a/debian/libnm0.symbols +++ b/debian/libnm0.symbols @@ -15,6 +15,7 @@ libnm.so.0 libnm0 #MINVER# libnm_1_20_6@libnm_1_20_6 1.20.6 libnm_1_22_0@libnm_1_22_0 1.22.0 libnm_1_22_2@libnm_1_22_2 1.22.2 + libnm_1_22_8@libnm_1_22_8 1.22.8 libnm_1_2_0@libnm_1_2_0 1.1.90 libnm_1_2_4@libnm_1_2_4 1.2.4 libnm_1_4_0@libnm_1_4_0 1.4.0 @@ -895,6 +896,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_ip6_config_get_addr_gen_mode@libnm_1_2_0 1.1.90 nm_setting_ip6_config_get_dhcp_duid@libnm_1_12_0 1.11.90 nm_setting_ip6_config_get_ip6_privacy@libnm_1_0_0 1.0.0 + nm_setting_ip6_config_get_ra_timeout@libnm_1_22_8 1.22.8 nm_setting_ip6_config_get_token@libnm_1_4_0 1.4.0 nm_setting_ip6_config_get_type@libnm_1_0_0 1.0.0 nm_setting_ip6_config_new@libnm_1_0_0 1.0.0 -- cgit 1.3.0-6-gf8a5 From 34f577aa5f2c79286420599513e9b16102651d0f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 20 Feb 2020 00:28:24 +0100 Subject: Release version 1.22.8-1 to unstable --- debian/changelog | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7cb3663c..3bbab937 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -network-manager (1.22.8-1) UNRELEASED; urgency=medium +network-manager (1.22.8-1) unstable; urgency=medium * New upstream version 1.22.8 + * Update symbols file for libnm0 - -- Michael Biebl Wed, 19 Feb 2020 23:32:46 +0100 + -- Michael Biebl Thu, 20 Feb 2020 00:27:58 +0100 network-manager (1.22.6-1) unstable; urgency=medium @@ -46,7 +47,7 @@ network-manager (1.22.0-1) unstable; urgency=medium * New upstream version 1.22.0 * Rebase patches * Explicitly disable (experimental) nm-cloud-setup tool - * Update symbols file for linm0 + * Update symbols file for libnm0 -- Michael Biebl Wed, 18 Dec 2019 19:05:33 +0100 -- cgit 1.3.0-6-gf8a5 From 3cbb3d6ecfef1076fc757632ee8327935250afee Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 20 Feb 2020 00:52:07 +0100 Subject: Mark network-manager-dev as Architecture: all and M-A: foreign --- debian/control | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 75fddbbe..e489ff51 100644 --- a/debian/control +++ b/debian/control @@ -85,12 +85,9 @@ Description: network management framework (daemon and userspace tools) Package: network-manager-dev Section: devel -Architecture: linux-any -Multi-Arch: same +Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends} -Conflicts: libnm-glib-dev, - libnm-glib-vpn-dev, - libnm-util-dev, Description: network management framework (development files) This package provides documentation of the NetworkManager D-Bus API, the configuration formats and command line utilities. -- cgit 1.3.0-6-gf8a5