OpenMandrivaAssociation · Apr 27, 2022 · Jun 6, 2022 · Jun 22, 2022 · Jul 20, 2022 · Oct 27, 2022
Showing with 61 additions and 10 deletions.

+1 −1 .abf.yml

+15 −9 iwd.spec

+45 −0 main.conf
diff --git a/.abf.yml b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  iwd-1.24.tar.xz: ef23614f28681fab72d2585345441de68298e45a
+  iwd-2.5.tar.xz: 8accad4a4ef3898b6422fe3eb602b0877cf1f5d6
diff --git a/iwd.spec b/iwd.spec
@@ -1,21 +1,24 @@
 %define _disable_rebuild_configure 1
+%global optflags %{optflags} -Oz
 
 Summary:	Wireless daemon for Linux
 Name:		iwd
-Version:	1.24
+Version:	2.5
 Release:	1
 License:	LGPLv2+
 URL:		https://lists.01.org/mailman/listinfo/iwd
 Source0:	https://www.kernel.org/pub/linux/network/wireless/%{name}-%{version}.tar.xz
+Source1:	main.conf
 BuildRequires:	pkgconfig(dbus-1)
-BuildRequires:	readline-devel
+BuildRequires:	pkgconfig(readline)
 BuildRequires:	asciidoc
 BuildRequires:	a2x
 BuildRequires:	python-docutils
 BuildRequires:	pkgconfig(libsystemd)
 BuildRequires:	systemd-rpm-macros
-BuildRequires:	pkgconfig(ell) >= 0.48
+BuildRequires:	pkgconfig(ell) >= 0.57
 Requires:	dbus
+Requires:	wireless-regdb
 %systemd_requires
 
 %description
@@ -26,13 +29,10 @@ hardware.
 %autosetup -p1
 
 %build
-# (tpg) intel guys said VLA are the best and they do not care for LLVM/clang
-export CC=gcc
-export CXX=g++
-
 %configure \
   --with-systemd-unitdir="%{_unitdir}" \
   --with-systemd-modloaddir="%{_modulesloaddir}" \
+  --with-systemd-networkdir=%{_systemd_util_dir}/network \
   --enable-external-ell \
   --enable-sim-hardcoded \
   --enable-ofono \
@@ -45,8 +45,9 @@ export CXX=g++
 %install
 %make_install
 
-# (tpg) do not install it as it break existing user's network configuration
-rm -rf %{buildroot}/lib/systemd/network/80-iwd.link
+mkdir -p %{buildroot}%{_sharedstatedir}/iwd
+mkdir -p %{buildroot}%{_sharedstatedir}/ead
+install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/main.conf
 
 install -d %{buildroot}%{_presetdir}
 cat > %{buildroot}%{_presetdir}/86-iwd.preset << EOF
@@ -89,16 +90,21 @@ fi
 %files
 %doc AUTHORS README TODO ChangeLog
 %license COPYING
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/main.conf
 %{_bindir}/iwctl
 %{_bindir}/iwmon
 %{_bindir}/hwsim
 %{_libexecdir}/iwd
 %{_libexecdir}/ead
 %{_modulesloaddir}/*.conf
+%{_systemd_util_dir}/network/80-iwd.link
 %{_presetdir}/86-iwd.preset
 %{_unitdir}/*.service
 %{_datadir}/dbus-1/system.d/*.conf
 %{_datadir}/dbus-1/system-services/*.service
+%{_sharedstatedir}/iwd
+%{_sharedstatedir}/ead
 %doc %{_mandir}/man1/iwmon.1*
 %doc %{_mandir}/man1/hwsim.1.*
 %doc %{_mandir}/man1/iwctl.1.*

diff --git a/main.conf b/main.conf
@@ -0,0 +1,45 @@
+# For complete description of supported configuration options, refer to
+# 'man 5 iwd.config'.
+
+[General]
+# iwd is capable of performing network configuration on its own, including
+# DHCPv4 based address configuration.  By default this behavior is
+# disabled, and an external service such as NetworkManager, systemd-network
+# or dhcpclient is required.  Uncomment the following line if you want iwd
+# to manage network interface configuration.
+#
+#EnableNetworkConfiguration=true
+#
+# iwd can randomize your WiFi card's MAC address for additional privacy.  By
+# default, this behavior is disabled and the MAC address assigned by the
+# kernel driver is used.  The address will be stable when connecting
+# to a saved network profile, so as to not interfere with any MAC filtering
+# rules that exist on the network.
+# If a randomized MAC address is desired, uncomment the setting line below:
+#
+#AddressRandomization=network
+#
+# Options below control the roaming thresholds on 2.4 & 5G bands.
+# Normally the default values are a good compromise that avoids excessive
+# scanning while maintaining good link quality.
+#
+#RoamThreshold=-70
+#RoamThreshold5G=-76
+#
+[Network]
+# If EnableNetworkConfiguration=true is set, iwd forwards DNS information to
+# the system resolving service.  The currently supported services are:
+# - systemd-resolved ["systemd"]
+# - openresolv / resolvconf ["resolvconf"]
+#
+# If not set, the value "systemd" is used by default.  Uncomment the value
+# below if you are using openresolv:
+#
+NameResolvingService=systemd
+
+#
+# iwd's support for IPv6 is still experimental and is disabled by default.
+# If you want to try it anyway, uncomment the setting below.  Note that
+# configuration via SLAAC is currently not supported (DHCPv6 only).
+#
+#EnableIPv6=true