From fa84235961346511ce9518ab0e6efac20189e405 Mon Sep 17 00:00:00 2001
From: Mikhail Novosyolov <mikhailnov@dumalogiya.ru>
Date: Mon, 8 Oct 2018 10:28:44 +0300
Subject: [PATCH] Fixes

---
 .abf.yml                 | 11 ++---------
 Arch-0002-iproute2.patch |  2 +-
 dhcp.spec                |  4 ++++
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index fa6f3f9..4180479 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,11 +1,4 @@
-removed_sources:
-  dhcp-4.2.5-P1.tar.gz: 120b6e476b2ac0d35e1dc8dee53752c42449b925
-  dhcp-4.2.5-P1.tar.gz.sha512.asc: d43248ba82d8a2f393f2f6c283ea06fb2df38d18
-  dhcp-4.2.5.tar.gz: d029505509aee83ea28972d5d1c95dc4b5db99f1
-  dhcp-4.2.5.tar.gz.sha512.asc: ac49b30ef17acb36cc5603faa5d780e423aa0e06
-  dhcp-4.3.0.tar.gz: deed72a4636461042b74de68c2825dc52623e1d1
-  dhcp-4.3.0.tar.gz.sha512.asc: e05375f86430f0d92a371fe8f619aa73e65de19a
 sources:
-  dhcp-4.3.2.tar.gz: c7fcc4fa2bd135700b410f47eca238dd67419654
-  dhcp-4.3.2.tar.gz.sha512.asc: dd76a14f1424e216dfaf186b75566a867de311d4
+  dhcp-4.4.1.tar.gz: 7be2c4911107f613c2d4b0a943261603c6b8507a
+  dhcp-4.4.1.tar.gz.sha512.asc: 1e5af5476f181d2045e4b30171e3f423aa260fbe
   dhcp-dynamic-dns-examples.tar.bz2: d33980aad3e0380fc89f8346ab37786d39157696
diff --git a/Arch-0002-iproute2.patch b/Arch-0002-iproute2.patch
index 74a4be6..ca6b4a8 100644
--- a/Arch-0002-iproute2.patch
+++ b/Arch-0002-iproute2.patch
@@ -9,7 +9,7 @@ index 5fb16121..c4cef632 100755
          for i in $(seq 0 ${interface_up_wait_time})
          do
 -            ifconfig ${interface} | grep RUNNING >/dev/null 2>&1
-+            ${ip} link show dev ${interface} | grep -q LOWER_UP 2>&1
++            /sbin/ip link show dev ${interface} | grep -q LOWER_UP 2>&1
              if [ $? -eq 0 ]; then
                  break;
              fi
diff --git a/dhcp.spec b/dhcp.spec
index c56a98e..ce39fa8 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -30,6 +30,7 @@ Source19:	dhcrelay.tmpfiles
 Source20:	isc-dhcpd.conf
 Source21:	isc-dhcp-client.conf
 Source22:	dhclient@.service
+Source100:	ROSA-NEWS
 
 # mageia patches
 Patch100:	dhcp-4.2.2-ifup.patch
@@ -43,6 +44,7 @@ Patch7:		dhcp-4.2.0-default-requested-options.patch
 Patch15:	dhcp-4.2.2-missing-ipv6-not-fatal.patch
 Patch17:	dhcp-4.2.0-add_timeout_when_NULL.patch
 Patch18:	dhcp-4.3.0-64_bit_lease_parse.patch
+Patch19:	Arch-0002-iproute2.patch
 BuildRequires:	bind-devel
 BuildRequires:	groff-base
 BuildRequires:	groff-for-man
@@ -177,6 +179,8 @@ Requires(pre):	openldap-config
 # Ensure 64-bit platforms parse lease file dates & times correctly
 %patch18 -p1 -b .64-bit_lease_parse
 
+%patch19 -p1
+
 install -m0644 %{SOURCE10} doc
 
 %build