up to 0.15

- temporary patch to add file missing in dist

diff --git a/iwd.spec b/iwd.spec
index 6ce3da4009202f01e425e7d0139dff00b4cf3c6d..3cd48d3633b397c1666dcffa221356a861062551 100644 (file)
--- a/iwd.spec
+++ b/iwd.spec
@@ -1,25 +1,26 @@
 Summary:       iwd - wireless daemon for Linux
 Summary(pl.UTF-8):     iwd - demon sieci bezprzewodowej dla Linuksa
 Name:          iwd
-Version:       0.14
+Version:       0.15
 Release:       1
 License:       LGPL v2.1+
 Group:         Networking/Daemons
 Source0:       https://www.kernel.org/pub/linux/network/wireless/%{name}-%{version}.tar.xz
-# Source0-md5: 0f776b000a03fe1e8ec04fa16445754e
+# Source0-md5: b6dd248c8fdd756b9261fbf3d5081fcf
+Patch0:                pkcs8.conf.patch
 URL:           https://git.kernel.org/pub/scm/network/wireless/iwd.git
 BuildRequires: asciidoc
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
 BuildRequires: dbus-devel
-BuildRequires: ell-devel >= 0.16
+BuildRequires: ell-devel >= 0.18
 BuildRequires: libtool >= 2:2.2
 BuildRequires: pkgconfig
 BuildRequires: readline-devel
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 Requires(post,preun,postun):   systemd-units >= 38
-Requires:      ell >= 0.16
+Requires:      ell >= 0.18
 Requires:      systemd-units >= 38
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -31,6 +32,7 @@ Demon sieci bezprzewodowej dla Linuksa.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -79,3 +81,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/system.d/iwd-dbus.conf
 %{_datadir}/dbus-1/system-services/net.connman.iwd.service
 %{_mandir}/man1/iwmon.1*
+/usr/lib/modules-load.d/pkcs8.conf

diff --git a/pkcs8.conf.patch b/pkcs8.conf.patch
new file mode 100644 (file)
index 0000000..20e3b08
--- /dev/null
+++ b/pkcs8.conf.patch
@@ -0,0 +1,26 @@
+From 39ee15dbc3d7a03572cb7adc7dafd4860a0a3b47 Mon Sep 17 00:00:00 2001
+From: Marcel Holtmann <marcel@holtmann.org>
+Date: Wed, 23 Jan 2019 18:20:58 +0100
+Subject: build: Provide modules-load.d for loading pkcs8_key_parser module
+
+---
+ src/pkcs8.conf | 5 +++++
+ 1 file changed, 5 insertions(+)
+ create mode 100644 src/pkcs8.conf
+
+(limited to 'src/pkcs8.conf')
+
+diff --git a/src/pkcs8.conf b/src/pkcs8.conf
+new file mode 100644
+index 0000000..eae958e
+--- /dev/null
++++ b/src/pkcs8.conf
+@@ -0,0 +1,5 @@
++# When distributions use CONFIG_PKCS8_PRIVATE_KEY_PARSER=m kernel option,
++# using keyctl(2) will fail for loading PKCS#8 private keys since there is
++# no automatic module loading for key type parsers.  This entry ensures
++# that the kernel module pkcs8_key_parser.ko is loaded at boot time.
++pkcs8_key_parser
+-- 
+cgit 1.2-0.3.lf.el7
+