Merge ~levihackerman-102/ubuntu/+source/iwd:merge-lp2130712-resolute into ubuntu/+source/iwd:debian/sid

[Anshul Singh]

[Anshul Singh (levihackerman-102)]

Here's the ppa build:

https://launchpad.net/~levihackerman-102/+archive/ubuntu/merges/+build/31464269

[Matthieu Baerts (matttbe)]

Thank you for the update!

The diff is the same as for the 3.9 version [1] (except for the changelog as expected), so that looks good to me.

(Note: I don't have the permissions to merge and upload a new version)

[1] https://code.launchpad.net/~matttbe/ubuntu/+source/iwd/+git/iwd/+merge/492105

review: Approve

[Nick Rosbrook (enr0n)]

Looks good, except that you forgot to add a bug number reference in the changelog. I.e., I see you have LP: #2130712 for tracking, but it is not mentioned here.

I will make the fix myself and upload, but please remember in the future.

review: Approve

[Nick Rosbrook (enr0n)]

Please also manually mark this merged, as the automation will not work now due to my fix up.

diff --git a/debian/changelog b/debian/changelog
index 99061d3..220c9dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+iwd (3.10-1ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/rules: build with --enable-wired to avoid functional compared to
+      wpa (Closes: #956457)
+    - debian/control: recommend network-manager-iwd, remove wpasupplicant
+      conflict to keep the same behaviour as before on Ubuntu and not remove
+      '*-desktop' packages (Closes: #1094603)
+
+ -- Anshul Singh <[e-mail]>  Wed, 05 Nov 2025 10:41:35 +0000
+
 iwd (3.10-1) unstable; urgency=medium
 
   [ upstream ]
@@ -11,6 +22,17 @@ iwd (3.10-1) unstable; urgency=medium
 
  -- Jonas Smedegaard <[e-mail]>  Thu, 25 Sep 2025 21:05:14 +0200
 
+iwd (3.9-2ubuntu1) questing; urgency=medium
+
+  * Merge with Debian unstable (LP: #2110205). Remaining changes:
+    - debian/rules: build with --enable-wired to avoid functional compared to
+      wpa (Closes: #956457)
+    - debian/control: recommend network-manager-iwd, remove wpasupplicant
+      conflict to keep the same behaviour as before on Ubuntu and not remove
+      '*-desktop' packages (Closes: #1094603)
+
+ -- Matthieu Baerts (matttbe) <[e-mail]>  Sun, 07 Sep 2025 18:17:28 +0200
+
 iwd (3.9-2) unstable; urgency=medium
 
   * no-changes source-only upload to enable testing migration
@@ -80,6 +102,24 @@ iwd (3.5-1) unstable; urgency=medium
 
  -- Jonas Smedegaard <[e-mail]>  Mon, 31 Mar 2025 08:49:56 +0200
 
+iwd (3.4-1ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes (LP: #2088442):
+    - debian/rules:
+      - build with --enable-wired to avoid functional compared to wpa, but
+        moved to a dedicated package, see below
+  * Drop Changes:
+    - The newer versions can be built with LTO (Closes: #1015432)
+    - iwd.conf file is now included in network-manager-iwd (Closes: #1094498)
+  * New Changes:
+    - debian/control: ead is now in a dedicated package, as requested by the
+      Debian maintainers (Closes: #956457)
+    - debian/control: recommend network-manager-iwd, remove wpasupplicant
+      conflict to keep the same behaviour as before on Ubuntu and not remove
+      '*-desktop' packages (Closes: #1094603)
+
+ -- Matthieu Baerts (matttbe) <[e-mail]>  Sat, 15 Feb 2025 16:48:45 +0100
+
 iwd (3.4-1) unstable; urgency=medium
 
   [ upstream ]
@@ -240,6 +280,30 @@ iwd (2.15-1) unstable; urgency=medium
 
  -- Jonas Smedegaard <[e-mail]>  Wed, 28 Feb 2024 07:58:48 +0100
 
+iwd (2.14-1ubuntu3) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- William Grant <[e-mail]>  Mon, 01 Apr 2024 16:57:46 +1100
+
+iwd (2.14-1ubuntu2) noble; urgency=medium
+
+  * No-change rebuild for readline time64 change.
+
+ -- Matthias Klose <[e-mail]>  Thu, 14 Mar 2024 02:56:26 +0100
+
+iwd (2.14-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/iwd.conf, debian/rules:
+      - provide a network-manager configuration to make iwd the default
+        backend when installed
+    - debian/rules:
+      - build with --enable-wired to avoid functional compared to wpa
+      - disable lto, it's leading to a build issue
+
+ -- Sudip Mukherjee <[e-mail]>  Tue, 20 Feb 2024 21:47:10 +0000
+
 iwd (2.14-1) unstable; urgency=medium
 
   [ upstream ]
@@ -250,6 +314,18 @@ iwd (2.14-1) unstable; urgency=medium
 
  -- Jonas Smedegaard <[e-mail]>  Sun, 11 Feb 2024 19:05:31 +0100
 
+iwd (2.13-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes: (LP: #2049515)
+    - debian/iwd.conf, debian/rules:
+      - provide a network-manager configuration to make iwd the default
+        backend when installed
+    - debian/rules:
+      - build with --enable-wired to avoid functional compared to wpa
+      - disable lto, it's leading to a build issue
+
+ -- Sudip Mukherjee <[e-mail]>  Tue, 16 Jan 2024 18:45:49 +0000
+
 iwd (2.13-1) unstable; urgency=medium
 
   [ upstream ]
@@ -287,6 +363,18 @@ iwd (2.10-1) unstable; urgency=medium
 
  -- Jonas Smedegaard <[e-mail]>  Thu, 30 Nov 2023 12:08:59 +0100
 
+iwd (2.8-1ubuntu1) mantic; urgency=medium
+
+  * Resynchronize on Debian, remaining changes
+    + debian/iwd.conf, debian/rules:
+      - provide a network-manager configuration to make iwd the default
+        backend when installed
+    + debian/rules: 
+      - build with --enable-wired to avoid functional compared to wpa
+      - disable lto, it's leading to a build issue
+
+ -- Sebastien Bacher <[e-mail]>  Wed, 13 Sep 2023 19:53:17 +0200
+
 iwd (2.8-1) unstable; urgency=medium
 
   * add patch 2001 to use system group sudo instead of wheel;
diff --git a/debian/control b/debian/control
index 5b9a253..a2bfdf4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: iwd
 Section: net
 Priority: optional
-Maintainer: Jonas Smedegaard <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Jonas Smedegaard <[e-mail]>
 Homepage: https://iwd.wiki.kernel.org/
 Build-Depends:
  debhelper-compat (= 13),
@@ -16,6 +17,27 @@ Vcs-Git: https://salsa.debian.org/debian/iwd.git
 Vcs-Browser: https://salsa.debian.org/debian/iwd
 Rules-Requires-Root: no
 
+Package: ead
+Architecture: linux-any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ dbus | dbus-system-bus,
+Replaces:
+ iwd (<< 3.4-1ubuntu1),
+Breaks:
+ iwd (<< 3.4-1ubuntu1),
+Description: Ethernet authentication daemon for Linux
+ Ethernet authentication daemon (ead) is a minimalistic Ethernet
+ authentication daemon that uses modern Linux interfaces like
+ cfg80211 and nl80211 (netlink).
+ The daemon provides a D-Bus API.
+ .
+ Note that the package defaults  to relying on dbus activation to start.
+ If you want to use ead standalone without any manager, then you'll
+ need to manually enable the system service.
+
 Package: iwd
 Architecture: linux-any
 Depends:
@@ -24,7 +46,7 @@ Depends:
 Recommends:
  dbus | dbus-system-bus,
  wireless-regdb,
-Suggests:
+ ead,
  network-manager-iwd,
 Breaks:
  orphan-sysvinit-scripts (<< 0.11),
@@ -51,16 +73,16 @@ Architecture: all
 Depends:
  iwd,
  ${misc:Depends},
-Conflicts:
- wpasupplicant,
 Enhances:
  network-manager,
+Replaces:
+ iwd (<< 3.4-1ubuntu1),
+Breaks:
+ iwd (<< 3.4-1ubuntu1),
 Description: wireless daemon for Linux - NetworkManager integration
  iNet Wireless Daemon (iwd) is a minimalistic wireless daemon
  that uses modern Linux interfaces
  like cfg80211 and nl80211 (netlink).
  The daemon provides a D-Bus API.
  .
- This package enables use of iwd with NetworkManager,
- and avoids concurrent installation
- of conflicting wpasupplicant service.
+ This package enables use of iwd with NetworkManager.
diff --git a/debian/ead.install b/debian/ead.install
new file mode 100644
index 0000000..7db2526
--- /dev/null
+++ b/debian/ead.install
@@ -0,0 +1,5 @@
+usr/lib/systemd/system/ead.service
+usr/libexec/ead
+usr/share/dbus-1/system-services/net.connman.ead.service
+usr/share/dbus-1/system.d/ead-dbus.conf
+usr/share/man/man*/ead.*
diff --git a/debian/rules b/debian/rules
index f5a58ec..1590ec8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ TESTS = $(basename $(wildcard unit/*.c))
 TESTS_FLAKY = unit/test-wsc unit/test-eap-sim
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-external-ell
+	dh_auto_configure -- --enable-external-ell --enable-wired
 
 override_dh_auto_test:
 	make -j2 check VERBOSE=1 TESTS='$(filter-out $(TESTS_FLAKY),$(TESTS))'