From 23c9427bdf88de8ba2eef918ea8b9d2fa672e167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 27 Oct 2020 15:20:41 -0300
Subject: [PATCH] iwd: add patch to fix dhcp lease in some cases.

---
 srcpkgs/iwd/patches/dhcp-fix.patch | 32 ++++++++++++++++++++++++++++++
 srcpkgs/iwd/template               |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/iwd/patches/dhcp-fix.patch

diff --git a/srcpkgs/iwd/patches/dhcp-fix.patch b/srcpkgs/iwd/patches/dhcp-fix.patch
new file mode 100644
index 00000000000..e3213323c30
--- /dev/null
+++ b/srcpkgs/iwd/patches/dhcp-fix.patch
@@ -0,0 +1,32 @@
+From 974ceb60c946b8b0183875131464335f91e9d6de Mon Sep 17 00:00:00 2001
+From: Denis Kenzior <denkenz@gmail.com>
+Date: Tue, 29 Sep 2020 16:09:31 -0500
+Subject: dhcp: Allow DOMAIN_NAME options with trailing NULL
+
+---
+ ell/dhcp-lease.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/ell/dhcp-lease.c b/ell/dhcp-lease.c
+index e93c618..ac90c6a 100644
+--- ell/dhcp-lease.c
++++ ell/dhcp-lease.c
+@@ -111,6 +111,15 @@ struct l_dhcp_lease *_dhcp_lease_parse_options(struct dhcp_message_iter *iter)
+ 			if (memchr(v, 0, l - 1))
+ 				goto error;
+ 
++			/*
++			 * RFC2132 doesn't say whether ending NULLs are present
++			 * or not.  However, section 2 recommends that trailing
++			 * NULLs should not be used but must not be treated
++			 * as an error
++			 */
++			if (l_get_u8(v + l - 1) == 0)
++				l -= 1;
++
+ 			if (!l_utf8_validate(v, l, NULL))
+ 				goto error;
+ 
+-- 
+cgit 1.2.3-1.el7
+
diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index a3cc274154a..13cf01a762a 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,7 +1,7 @@
 # Template file for 'iwd'
 pkgname=iwd
 version=1.9
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-systemd-service --enable-pie
  --enable-external-ell --enable-dbus-policy --enable-wired"