about summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog38
-rw-r--r--debian/control4
-rw-r--r--debian/libnm0.symbols6
-rw-r--r--debian/patches/Force-online-state-with-unmanaged-devices.patch18
-rwxr-xr-xdebian/rules10
5 files changed, 58 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog
index 67832a20..fc3f49b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,41 @@
+network-manager (1.40.0-1) unstable; urgency=medium
+
+  * New upstream version 1.40.0
+  * Rebase patches
+  * Bump pre-release symbols from 1.39.x to version 1.40.0
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 26 Aug 2022 21:08:04 +0200
+
+network-manager (1.39.90-2) experimental; urgency=medium
+
+  * Release version 1.39.90-1 to experimental
+  * Explicitly disable LTO via dpkg-buildflags.
+    NetworkManager requires additional build flags like -flto-partition=none
+    to build properly with LTO enabled. (Closes: #1015556)
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 25 Aug 2022 12:48:00 +0200
+
+network-manager (1.39.90-1) experimental; urgency=medium
+
+  * New upstream version 1.39.90 (1.40 rc1)
+  * Rebase patches
+  * Drop obsolete --with-dnssec-trigger configure option.
+    The unbound DNS plugin was marked deprecated for a while and has been
+    removed now in this release.
+  * Simplify dh_autoreconf override by calling upstream provided autogen.sh.
+    This ensures the correct sequence of commands is run. In this specific
+    case we were still using intltoolize when upstream dropped its usage in
+    favour of gettext a while ago.
+  * Replace intltool Build-Depends with gettext
+  * Add Build-Depends on policykit-1.
+    The file /usr/share/gettext/its/polkit.its is required when generating
+    the translations.
+  * Add Build-Depends on python3-pexpect.
+    Required by the test suite.
+  * Update symbols file for libnm0
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 17 Aug 2022 11:35:39 +0200
+
 network-manager (1.38.4-1~bpo11+1) bullseye-backports; urgency=medium
 
   * Rebuild for bullseye-backports
diff --git a/debian/control b/debian/control
index 8a92a63e..a9e19cc3 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 13),
                dh-sequence-gir,
                automake (>= 1.12),
                pkg-config,
-               intltool,
+               gettext (>= 0.19.8),
                libglib2.0-dev (>= 2.40),
                ppp-dev,
                libselinux1-dev,
@@ -34,8 +34,10 @@ Build-Depends: debhelper-compat (= 13),
                libjansson-dev (>= 2.7),
                libbluetooth-dev (>= 5),
                valac,
+               policykit-1,
                dbus <!nocheck>,
                python3-dbus <!nocheck>,
+               python3-pexpect <!nocheck>,
                iproute2 <!nocheck>,
 Standards-Version: 4.6.1
 Rules-Requires-Root: no
diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols
index f90d3ac2..4d2d79f0 100644
--- a/debian/libnm0.symbols
+++ b/debian/libnm0.symbols
@@ -30,6 +30,7 @@ libnm.so.0 libnm0 #MINVER#
  libnm_1_34_0@libnm_1_34_0 1.34.0
  libnm_1_36_0@libnm_1_36_0 1.36.0
  libnm_1_38_0@libnm_1_38_0 1.38.0
+ libnm_1_40_0@libnm_1_40_0 1.40.0
  libnm_1_4_0@libnm_1_4_0 1.4.0
  libnm_1_6_0@libnm_1_6_0 1.6.0
  libnm_1_8_0@libnm_1_8_0 1.8.0
@@ -191,6 +192,7 @@ libnm.so.0 libnm0 #MINVER#
  nm_client_wwan_get_enabled@libnm_1_0_0 1.0.0
  nm_client_wwan_hardware_get_enabled@libnm_1_0_0 1.0.0
  nm_client_wwan_set_enabled@libnm_1_0_0 1.0.0
+ nm_conn_wireguard_import@libnm_1_40_0 1.40.0
  nm_connection_add_setting@libnm_1_0_0 1.0.0
  nm_connection_clear_secrets@libnm_1_0_0 1.0.0
  nm_connection_clear_secrets_with_flags@libnm_1_0_0 1.0.0
@@ -629,6 +631,7 @@ libnm.so.0 libnm0 #MINVER#
  nm_manager_reload_flags_get_type@libnm_1_22_0 1.22.0
  nm_metered_get_type@libnm_1_0_6 1.0.6
  nm_metered_get_type@libnm_1_2_0 1.2.0
+ nm_mptcp_flags_get_type@libnm_1_40_0 1.40.0
  nm_object_get_client@libnm_1_24_0 1.24.0
  nm_object_get_path@libnm_1_0_0 1.0.0
  nm_object_get_type@libnm_1_0_0 1.0.0
@@ -884,6 +887,7 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_connection_get_timestamp@libnm_1_0_0 1.0.0
  nm_setting_connection_get_type@libnm_1_0_0 1.0.0
  nm_setting_connection_get_uuid@libnm_1_0_0 1.0.0
+ nm_setting_connection_get_wait_activation_delay@libnm_1_40_0 1.40.0
  nm_setting_connection_get_wait_device_timeout@libnm_1_20_0 1.20.0
  nm_setting_connection_get_zone@libnm_1_0_0 1.0.0
  nm_setting_connection_is_slave_type@libnm_1_0_0 1.0.0
@@ -973,10 +977,12 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_ip4_config_get_dhcp_vendor_class_identifier@libnm_1_26_4 1.28.0
  nm_setting_ip4_config_get_type@libnm_1_0_0 1.0.0
  nm_setting_ip4_config_new@libnm_1_0_0 1.0.0
+ nm_setting_ip4_link_local_get_type@libnm_1_40_0 1.40.0
  nm_setting_ip6_config_addr_gen_mode_get_type@libnm_1_2_0 1.2.0
  nm_setting_ip6_config_get_addr_gen_mode@libnm_1_2_0 1.2.0
  nm_setting_ip6_config_get_dhcp_duid@libnm_1_12_0 1.12.0
  nm_setting_ip6_config_get_ip6_privacy@libnm_1_0_0 1.0.0
+ nm_setting_ip6_config_get_mtu@libnm_1_40_0 1.40.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
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index e6b80752..ddbfcc9d 100644
--- a/debian/patches/Force-online-state-with-unmanaged-devices.patch
+++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch
@@ -12,10 +12,10 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286
  1 file changed, 115 insertions(+)
 
 diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
-index 5215369..462b887 100644
+index 822df7a..0992373 100644
 --- a/src/core/nm-manager.c
 +++ b/src/core/nm-manager.c
-@@ -51,6 +51,8 @@
+@@ -52,6 +52,8 @@
  
  #define DEVICE_STATE_PRUNE_RATELIMIT_MAX 100u
  
@@ -24,7 +24,7 @@ index 5215369..462b887 100644
  /*****************************************************************************/
  
  typedef struct {
-@@ -191,6 +193,10 @@ typedef struct {
+@@ -195,6 +197,10 @@ typedef struct {
      GFileMonitor *fw_monitor;
      guint         fw_changed_id;
  
@@ -35,7 +35,7 @@ index 5215369..462b887 100644
      guint timestamp_update_id;
  
      guint devices_inited_id;
-@@ -1491,6 +1497,27 @@ find_best_device_state(NMManager *manager)
+@@ -1502,6 +1508,27 @@ find_best_device_state(NMManager *manager)
      return best_state;
  }
  
@@ -63,7 +63,7 @@ index 5215369..462b887 100644
  static void
  nm_manager_update_metered(NMManager *self)
  {
-@@ -1537,6 +1564,9 @@ nm_manager_update_state(NMManager *self)
+@@ -1548,6 +1575,9 @@ nm_manager_update_state(NMManager *self)
      else
          new_state = find_best_device_state(self);
  
@@ -73,7 +73,7 @@ index 5215369..462b887 100644
      if (new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
          new_state = NM_STATE_CONNECTED_GLOBAL;
      }
-@@ -6872,6 +6902,62 @@ impl_manager_get_logging(NMDBusObject                      *obj,
+@@ -6941,6 +6971,62 @@ impl_manager_get_logging(NMDBusObject                      *obj,
          g_variant_new("(ss)", nm_logging_level_to_string(), nm_logging_domains_to_string()));
  }
  
@@ -136,7 +136,7 @@ index 5215369..462b887 100644
  typedef struct {
      NMManager             *self;
      GDBusMethodInvocation *context;
-@@ -7182,6 +7268,9 @@ nm_manager_start(NMManager *self, GError **error)
+@@ -7237,6 +7323,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 5215369..462b887 100644
      return TRUE;
  }
  
-@@ -8035,6 +8124,22 @@ nm_manager_init(NMManager *self)
+@@ -8112,6 +8201,22 @@ nm_manager_init(NMManager *self)
          _LOGW(LOGD_CORE, "failed to monitor kernel firmware directory '%s'.", KERNEL_FIRMWARE_DIR);
      }
  
@@ -169,7 +169,7 @@ index 5215369..462b887 100644
      priv->metered       = NM_METERED_UNKNOWN;
      priv->sleep_devices = g_hash_table_new(nm_direct_hash, NULL);
  }
-@@ -8317,6 +8422,16 @@ dispose(GObject *object)
+@@ -8399,6 +8504,16 @@ dispose(GObject *object)
          g_clear_object(&priv->fw_monitor);
      }
  
diff --git a/debian/rules b/debian/rules
index bcb76768..18fb355f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/dpkg/architecture.mk
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=-lto
 
 export PYTHON=/usr/bin/python3
 
@@ -11,13 +11,8 @@ PPPD_PLUGIN_DIR := $(shell dh_ppp --plugin-dir)
 %:
 	dh $@ --with ppp
 
-autoreconf:
-	gtkdocize --copy
-	autopoint --force
-	AUTOPOINT='intltoolize --automake --copy' autoreconf --verbose --force --install
-
 override_dh_autoreconf:
-	dh_autoreconf debian/rules -- autoreconf
+	NOCONFIGURE=true dh_autoreconf ./autogen.sh
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
@@ -30,7 +25,6 @@ override_dh_auto_configure:
 		--with-resolvconf=/sbin/resolvconf \
 		--with-dhclient=/sbin/dhclient \
 		--with-dnsmasq=/usr/sbin/dnsmasq \
-		--with-dnssec-trigger=/usr/lib/dnssec-trigger/dnssec-trigger-script \
 		--with-polkit-agent-helper-1=/usr/lib/policykit-1/polkit-agent-helper-1 \
 		--with-systemdsystemunitdir=/lib/systemd/system \
 		--with-udev-dir=/lib/udev \
generated by cgit-pink 1.3.0-6-gf8a5 (git 2.35.1) at 2026-08-27 15:20:29 +0000