about summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog40
-rw-r--r--debian/control3
-rw-r--r--debian/gbp.conf2
-rw-r--r--debian/libnm0.symbols57
-rw-r--r--debian/network-manager.install2
-rw-r--r--debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch4
-rw-r--r--debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch2
-rw-r--r--debian/patches/Fix-iscsiadm-path.patch26
-rw-r--r--debian/patches/Force-online-state-with-unmanaged-devices.patch14
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules2
11 files changed, 112 insertions, 41 deletions
diff --git a/debian/changelog b/debian/changelog
index bb298b46..7b084125 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,43 @@
+network-manager (1.14.2-1) experimental; urgency=medium
+
+  * New upstream version 1.14.2
+  * Rebase patches
+  * Disable obsolete ibft settings plugin.
+    It has been replaced by an iBFT reader which parses /sys/firmware/ibft
+    directly instead of iscsiadm output.
+  * Drop debian/patches/Fix-iscsiadm-path.patch.
+    No longer needed.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 21 Oct 2018 02:56:25 +0200
+
+network-manager (1.14.0-2) experimental; urgency=medium
+
+  * Tighten inter-package dependencies.
+    Make sure network-manager and libnm0 are always upgraded in lockstep.
+    (Closes: #818165)
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 08 Oct 2018 16:55:10 +0200
+
+network-manager (1.14.0-1) experimental; urgency=medium
+
+  * New upstream version 1.14.0
+  * Rebase patches
+  * Update symbols file for libnm0.
+    The nm_connection_get_setting_{6lowpan,sriov,wpan} API had been
+    introduced during the 1.14 development cycle but as it was duplicating
+    existing functionality it was removed again.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 15 Sep 2018 10:57:07 +0200
+
+network-manager (1.13.90-1) experimental; urgency=medium
+
+  * New upstream version 1.13.90 (1.14 rc1)
+  * Refresh patches
+  * Update symbols file for libnm0
+  * Bump Standards-Version to 4.2.1
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 08 Sep 2018 18:23:20 +0200
+
 network-manager (1.12.4-1) unstable; urgency=medium
 
   * New upstream version 1.12.4
diff --git a/debian/control b/debian/control
index 0827195f..45d1f3de 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Build-Depends: debhelper (>= 10.3),
                valac (>= 0.17.1.24),
                dbus <!nocheck>,
                python-dbus <!nocheck>
-Standards-Version: 4.1.5
+Standards-Version: 4.2.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
@@ -51,6 +51,7 @@ Architecture: linux-any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         libnm0 (= ${binary:Version}),
          lsb-base,
          wpasupplicant,
          dbus,
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 478d845c..ffa7b970 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
 pristine-tar = True
 patch-numbers = False
-debian-branch = master
+debian-branch = experimental
diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols
index 3e7c9ed1..73491d69 100644
--- a/debian/libnm0.symbols
+++ b/debian/libnm0.symbols
@@ -6,6 +6,7 @@ libnm.so.0 libnm0 #MINVER#
  libnm_1_10_2@libnm_1_10_2 1.10.2
  libnm_1_12_0@libnm_1_12_0 1.11.3
  libnm_1_12_2@libnm_1_12_2 1.12.2
+ libnm_1_14_0@libnm_1_14_0 1.13.90
  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
@@ -192,6 +193,7 @@ libnm.so.0 libnm0 #MINVER#
  nm_connection_get_virtual_device_description@libnm_1_0_0 1.0.0
  nm_connection_is_type@libnm_1_0_0 1.0.0
  nm_connection_is_virtual@libnm_1_0_0 1.0.0
+ nm_connection_multi_connect_get_type@libnm_1_14_0 1.13.90
  nm_connection_need_secrets@libnm_1_0_0 1.0.0
  nm_connection_normalize@libnm_1_0_0 1.0.0
  nm_connection_remove_setting@libnm_1_0_0 1.0.0
@@ -206,6 +208,7 @@ libnm.so.0 libnm0 #MINVER#
  nm_connectivity_state_get_type@libnm_1_0_0 1.0.0
  nm_crypto_error_get_type@libnm_1_0_0 1.0.0
  nm_crypto_error_quark@libnm_1_0_0 1.0.0
+ nm_device_6lowpan_get_type@libnm_1_14_0 1.13.90
  nm_device_adsl_get_carrier@libnm_1_0_0 1.0.0
  nm_device_adsl_get_type@libnm_1_0_0 1.0.0
  nm_device_bond_get_carrier@libnm_1_0_0 1.0.0
@@ -401,6 +404,11 @@ libnm.so.0 libnm0 #MINVER#
  nm_device_wimax_get_rssi@libnm_1_0_0 1.0.0
  nm_device_wimax_get_tx_power@libnm_1_0_0 1.0.0
  nm_device_wimax_get_type@libnm_1_0_0 1.0.0
+ nm_device_wireguard_get_fwmark@libnm_1_14_0 1.13.90
+ nm_device_wireguard_get_listen_port@libnm_1_14_0 1.13.90
+ nm_device_wireguard_get_public_key@libnm_1_14_0 1.13.90
+ nm_device_wireguard_get_type@libnm_1_14_0 1.13.90
+ nm_device_wpan_get_type@libnm_1_14_0 1.13.90
  nm_dhcp_config_get_family@libnm_1_0_0 1.0.0
  nm_dhcp_config_get_one_option@libnm_1_0_0 1.0.0
  nm_dhcp_config_get_options@libnm_1_0_0 1.0.0
@@ -512,6 +520,7 @@ libnm.so.0 libnm0 #MINVER#
  nm_secret_agent_old_unregister@libnm_1_0_0 1.0.0
  nm_secret_agent_old_unregister_async@libnm_1_0_0 1.0.0
  nm_secret_agent_old_unregister_finish@libnm_1_0_0 1.0.0
+ nm_setting_6lowpan_get_type@libnm_1_14_0 1.13.90
  nm_setting_802_1x_add_altsubject_match@libnm_1_0_0 1.0.0
  nm_setting_802_1x_add_eap_method@libnm_1_0_0 1.0.0
  nm_setting_802_1x_add_phase2_altsubject_match@libnm_1_0_0 1.0.0
@@ -666,10 +675,12 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_connection_get_id@libnm_1_0_0 1.0.0
  nm_setting_connection_get_interface_name@libnm_1_0_0 1.0.0
  nm_setting_connection_get_lldp@libnm_1_2_0 1.1.90
+ nm_setting_connection_get_llmnr@libnm_1_14_0 1.13.90
  nm_setting_connection_get_master@libnm_1_0_0 1.0.0
  nm_setting_connection_get_mdns@libnm_1_12_0 1.11.3
  nm_setting_connection_get_metered@libnm_1_0_6 1.0.6
  nm_setting_connection_get_metered@libnm_1_2_0 1.1.90
+ nm_setting_connection_get_multi_connect@libnm_1_14_0 1.13.90
  nm_setting_connection_get_num_permissions@libnm_1_0_0 1.0.0
  nm_setting_connection_get_num_secondaries@libnm_1_0_0 1.0.0
  nm_setting_connection_get_permission@libnm_1_0_0 1.0.0
@@ -683,6 +694,7 @@ libnm.so.0 libnm0 #MINVER#
  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
  nm_setting_connection_lldp_get_type@libnm_1_2_0 1.1.90
+ nm_setting_connection_llmnr_get_type@libnm_1_14_0 1.13.90
  nm_setting_connection_mdns_get_type@libnm_1_12_0 1.11.3
  nm_setting_connection_new@libnm_1_0_0 1.0.0
  nm_setting_connection_permissions_user_allowed@libnm_1_0_0 1.0.0
@@ -720,6 +732,11 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_dummy_new@libnm_1_8_0 1.8.0
  nm_setting_duplicate@libnm_1_0_0 1.0.0
  nm_setting_enumerate_values@libnm_1_0_0 1.0.0
+ nm_setting_ethtool_clear_features@libnm_1_14_0 1.13.90
+ nm_setting_ethtool_get_feature@libnm_1_14_0 1.13.90
+ nm_setting_ethtool_get_type@libnm_1_14_0 1.13.90
+ nm_setting_ethtool_new@libnm_1_14_0 1.13.90
+ nm_setting_ethtool_set_feature@libnm_1_14_0 1.13.90
  nm_setting_generic_get_type@libnm_1_0_0 1.0.0
  nm_setting_generic_new@libnm_1_0_0 1.0.0
  nm_setting_get_dbus_property_type@libnm_1_0_0 1.0.0
@@ -842,6 +859,14 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_macvlan_get_type@libnm_1_2_0 1.1.90
  nm_setting_macvlan_mode_get_type@libnm_1_2_0 1.1.90
  nm_setting_macvlan_new@libnm_1_2_0 1.1.90
+ nm_setting_match_add_interface_name@libnm_1_14_0 1.13.90
+ nm_setting_match_clear_interface_names@libnm_1_14_0 1.13.90
+ nm_setting_match_get_interface_name@libnm_1_14_0 1.13.90
+ nm_setting_match_get_interface_names@libnm_1_14_0 1.13.90
+ nm_setting_match_get_num_interface_names@libnm_1_14_0 1.13.90
+ nm_setting_match_get_type@libnm_1_14_0 1.13.90
+ nm_setting_match_remove_interface_name@libnm_1_14_0 1.13.90
+ nm_setting_match_remove_interface_name_by_value@libnm_1_14_0 1.13.90
  nm_setting_olpc_mesh_get_channel@libnm_1_0_0 1.0.0
  nm_setting_olpc_mesh_get_dhcp_anycast_address@libnm_1_0_0 1.0.0
  nm_setting_olpc_mesh_get_ssid@libnm_1_0_0 1.0.0
@@ -911,6 +936,16 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_serial_new@libnm_1_0_0 1.0.0
  nm_setting_serial_parity_get_type@libnm_1_0_0 1.0.0
  nm_setting_set_secret_flags@libnm_1_0_0 1.0.0
+ nm_setting_sriov_add_vf@libnm_1_14_0 1.13.90
+ nm_setting_sriov_clear_vfs@libnm_1_14_0 1.13.90
+ nm_setting_sriov_get_autoprobe_drivers@libnm_1_14_0 1.13.90
+ nm_setting_sriov_get_num_vfs@libnm_1_14_0 1.13.90
+ nm_setting_sriov_get_total_vfs@libnm_1_14_0 1.13.90
+ nm_setting_sriov_get_type@libnm_1_14_0 1.13.90
+ nm_setting_sriov_get_vf@libnm_1_14_0 1.13.90
+ nm_setting_sriov_new@libnm_1_14_0 1.13.90
+ nm_setting_sriov_remove_vf@libnm_1_14_0 1.13.90
+ nm_setting_sriov_remove_vf_by_index@libnm_1_14_0 1.13.90
  nm_setting_tc_config_add_qdisc@libnm_1_10_2 1.10.2
  nm_setting_tc_config_add_tfilter@libnm_1_10_2 1.10.2
  nm_setting_tc_config_clear_qdiscs@libnm_1_10_2 1.10.2
@@ -1136,6 +1171,7 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_wireless_security_set_wep_key@libnm_1_0_0 1.0.0
  nm_setting_wireless_security_wps_method_get_type@libnm_1_10_0 1.9.90
  nm_setting_wireless_wake_on_wlan_get_type@libnm_1_12_0 1.11.90
+ nm_setting_wpan_get_type@libnm_1_14_0 1.13.90
  nm_settings_connection_flags_get_type@libnm_1_12_0 1.11.3
  nm_settings_error_get_type@libnm_1_0_0 1.0.0
  nm_settings_error_quark@libnm_1_0_0 1.0.0
@@ -1144,6 +1180,24 @@ libnm.so.0 libnm0 #MINVER#
  nm_simple_connection_new@libnm_1_0_0 1.0.0
  nm_simple_connection_new_clone@libnm_1_0_0 1.0.0
  nm_simple_connection_new_from_dbus@libnm_1_0_0 1.0.0
+ nm_sriov_vf_add_vlan@libnm_1_14_0 1.13.90
+ nm_sriov_vf_dup@libnm_1_14_0 1.13.90
+ nm_sriov_vf_equal@libnm_1_14_0 1.13.90
+ nm_sriov_vf_get_attribute@libnm_1_14_0 1.13.90
+ nm_sriov_vf_get_attribute_names@libnm_1_14_0 1.13.90
+ nm_sriov_vf_get_index@libnm_1_14_0 1.13.90
+ nm_sriov_vf_get_type@libnm_1_14_0 1.13.90
+ nm_sriov_vf_get_vlan_ids@libnm_1_14_0 1.13.90
+ nm_sriov_vf_get_vlan_protocol@libnm_1_14_0 1.13.90
+ nm_sriov_vf_get_vlan_qos@libnm_1_14_0 1.13.90
+ nm_sriov_vf_new@libnm_1_14_0 1.13.90
+ nm_sriov_vf_ref@libnm_1_14_0 1.13.90
+ nm_sriov_vf_remove_vlan@libnm_1_14_0 1.13.90
+ nm_sriov_vf_set_attribute@libnm_1_14_0 1.13.90
+ nm_sriov_vf_set_vlan_protocol@libnm_1_14_0 1.13.90
+ nm_sriov_vf_set_vlan_qos@libnm_1_14_0 1.13.90
+ nm_sriov_vf_unref@libnm_1_14_0 1.13.90
+ nm_sriov_vf_vlan_protocol_get_type@libnm_1_14_0 1.13.90
  nm_state_get_type@libnm_1_0_0 1.0.0
  nm_tc_action_dup@libnm_1_10_2 1.10.2
  nm_tc_action_equal@libnm_1_10_2 1.10.2
@@ -1193,6 +1247,7 @@ libnm.so.0 libnm0 #MINVER#
  nm_team_link_watcher_new_nsna_ping@libnm_1_10_2 1.10.2
  nm_team_link_watcher_ref@libnm_1_10_2 1.10.2
  nm_team_link_watcher_unref@libnm_1_10_2 1.10.2
+ nm_ternary_get_type@libnm_1_14_0 1.13.90
  nm_utils_ap_mode_security_valid@libnm_1_0_0 1.0.0
  nm_utils_bin2hexstr@libnm_1_0_0 1.0.0
  nm_utils_bond_mode_int_to_string@libnm_1_2_0 1.1.90
@@ -1245,6 +1300,8 @@ libnm.so.0 libnm0 #MINVER#
  nm_utils_same_ssid@libnm_1_0_0 1.0.0
  nm_utils_security_type_get_type@libnm_1_0_0 1.0.0
  nm_utils_security_valid@libnm_1_0_0 1.0.0
+ nm_utils_sriov_vf_from_str@libnm_1_14_0 1.13.90
+ nm_utils_sriov_vf_to_str@libnm_1_14_0 1.13.90
  nm_utils_ssid_to_utf8@libnm_1_0_0 1.0.0
  nm_utils_tc_action_from_str@libnm_1_10_2 1.10.2
  nm_utils_tc_action_to_str@libnm_1_10_2 1.10.2
diff --git a/debian/network-manager.install b/debian/network-manager.install
index 6edafaa0..bb751b47 100644
--- a/debian/network-manager.install
+++ b/debian/network-manager.install
@@ -5,8 +5,8 @@ usr/bin/nmtui*
 usr/lib/NetworkManager/nm-dhcp-helper
 usr/lib/NetworkManager/nm-iface-helper
 usr/lib/NetworkManager/nm-dispatcher
+usr/lib/NetworkManager/nm-initrd-generator
 usr/lib/*/NetworkManager/*/libnm-settings-plugin-ifupdown.so
-usr/lib/*/NetworkManager/*/libnm-settings-plugin-ibft.so
 usr/lib/*/NetworkManager/*/libnm-device-plugin-*.so
 usr/lib/*/NetworkManager/*/libnm-ppp-plugin.so
 usr/lib/*/NetworkManager/*/libnm-wwan.so
diff --git a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
index b8a4c486..636865a4 100644
--- a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
+++ b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
@@ -10,10 +10,10 @@ to be autostarted by a client request.
  2 files changed, 6 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 0b8becd..1803e1a 100644
+index 1e100f6..204f1a0 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -3895,11 +3895,6 @@ endif
+@@ -4110,11 +4110,6 @@ endif
  data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in
  	$(AM_V_GEN) $(data_edit) $< >$@
  
diff --git a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
index e2516d62..5ab7a01d 100644
--- a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
+++ b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
@@ -16,7 +16,7 @@ Closes: #742933
  1 file changed, 5 insertions(+)
 
 diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c
-index a7e3a7c..9931f12 100644
+index 54d7577..a4bb43f 100644
 --- a/src/nm-sleep-monitor.c
 +++ b/src/nm-sleep-monitor.c
 @@ -25,6 +25,7 @@
diff --git a/debian/patches/Fix-iscsiadm-path.patch b/debian/patches/Fix-iscsiadm-path.patch
deleted file mode 100644
index 7af98133..00000000
--- a/debian/patches/Fix-iscsiadm-path.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Michael Biebl <biebl@debian.org>
-Date: Wed, 6 May 2015 18:17:51 +0200
-Subject: Fix iscsiadm path
-
-The open-scsi package in Debian installs the iscisadm binary as
-/usr/bin/iscsiadm.
-
-This patch can be dropped post-stretch as open-iscsi now also ships the
-binary as /sbin/iscsiadm (and /usr/bin/iscsiadm is a compat symlink).
----
- src/settings/plugins/ibft/nms-ibft-plugin.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/settings/plugins/ibft/nms-ibft-plugin.c b/src/settings/plugins/ibft/nms-ibft-plugin.c
-index 77ce208..f84276d 100644
---- a/src/settings/plugins/ibft/nms-ibft-plugin.c
-+++ b/src/settings/plugins/ibft/nms-ibft-plugin.c
-@@ -74,7 +74,7 @@ read_connections (NMSIbftPlugin *self)
- 	GError *error = NULL;
- 	NMSIbftConnection *connection;
- 
--	if (!nms_ibft_reader_load_blocks ("/sbin/iscsiadm", &blocks, &error)) {
-+	if (!nms_ibft_reader_load_blocks ("/usr/bin/iscsiadm", &blocks, &error)) {
- 		nm_log_dbg (LOGD_SETTINGS, "ibft: failed to read iscsiadm records: %s", error->message);
- 		g_error_free (error);
- 		return;
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index 022154c6..ae96f968 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 ad90616..d5f0f95 100644
+index 7598995..1439c47 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -62,6 +62,8 @@
@@ -35,7 +35,7 @@ index ad90616..d5f0f95 100644
  	guint timestamp_update_id;
  
  	guint devices_inited_id;
-@@ -1387,6 +1393,27 @@ find_best_device_state (NMManager *manager)
+@@ -1417,6 +1423,27 @@ find_best_device_state (NMManager *manager)
  	return best_state;
  }
  
@@ -63,7 +63,7 @@ index ad90616..d5f0f95 100644
  static void
  nm_manager_update_metered (NMManager *self)
  {
-@@ -1425,6 +1452,9 @@ nm_manager_update_state (NMManager *self)
+@@ -1455,6 +1482,9 @@ nm_manager_update_state (NMManager *self)
  	else
  		new_state = find_best_device_state (self);
  
@@ -73,7 +73,7 @@ index ad90616..d5f0f95 100644
  	if (   new_state >= NM_STATE_CONNECTED_LOCAL
  	    && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
  		new_state = NM_STATE_CONNECTED_GLOBAL;
-@@ -5884,6 +5914,62 @@ impl_manager_check_connectivity (NMDBusObject *obj,
+@@ -6209,6 +6239,62 @@ impl_manager_check_connectivity (NMDBusObject *obj,
  	nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE);
  }
  
@@ -136,7 +136,7 @@ index ad90616..d5f0f95 100644
  static void
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
-@@ -6034,6 +6120,9 @@ nm_manager_start (NMManager *self, GError **error)
+@@ -6377,6 +6463,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 ad90616..d5f0f95 100644
  	return TRUE;
  }
  
-@@ -6897,6 +6986,22 @@ nm_manager_init (NMManager *self)
+@@ -7231,6 +7320,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -169,7 +169,7 @@ index ad90616..d5f0f95 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -7172,6 +7277,16 @@ dispose (GObject *object)
+@@ -7506,6 +7611,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}
  
diff --git a/debian/patches/series b/debian/patches/series
index 0adf0cf1..6da89bb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 Force-online-state-with-unmanaged-devices.patch
 Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
 Don-t-make-NetworkManager-D-Bus-activatable.patch
-Fix-iscsiadm-path.patch
diff --git a/debian/rules b/debian/rules
index 4387a89c..28e8eca5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,7 +43,6 @@ override_dh_auto_configure:
 		--enable-polkit-agent \
 		--enable-ppp \
 		--enable-ifupdown \
-		--enable-config-plugin-ibft \
 		--enable-introspection \
 		--enable-gtk-doc \
 		--enable-concheck \
@@ -51,6 +50,7 @@ override_dh_auto_configure:
 		--enable-json-validation \
 		--enable-bluez5-dun \
 		--enable-vala \
+		--disable-config-plugin-ibft \
 		--disable-more-warnings \
 		--disable-modify-system \
 		--disable-ovs
generated by cgit-pink 1.3.0-6-gf8a5 (git 2.35.1) at 2026-09-09 21:52:58 +0000