[arch-commits] Commit in dhcp/trunk (0002-iproute2.patch PKGBUILD)

[Christian Hesse]

    Date: Friday, November 24, 2017 @ 15:16:12
  Author: eworm
Revision: 310812

upgpkg: dhcp 4.3.6-4

do not use deprecated ifconfig, but ip from iproute2 (FS#56422)

Added:
  dhcp/trunk/0002-iproute2.patch
Modified:
  dhcp/trunk/PKGBUILD

---------------------+
 0002-iproute2.patch |   13 +++++++++++++
 PKGBUILD            |   11 ++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

Added: 0002-iproute2.patch
===================================================================
--- 0002-iproute2.patch	                        (rev 0)
+++ 0002-iproute2.patch	2017-11-24 15:16:12 UTC (rev 310812)
@@ -0,0 +1,13 @@
+diff --git a/client/scripts/linux b/client/scripts/linux
+index 5fb16121..c4cef632 100755
+--- a/client/scripts/linux
++++ b/client/scripts/linux
+@@ -362,7 +362,7 @@ case "$reason" in
+         interface_up_wait_time=5
+         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
+             if [ $? -eq 0 ]; then
+                 break;
+             fi

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-24 15:14:58 UTC (rev 310811)
+++ PKGBUILD	2017-11-24 15:16:12 UTC (rev 310812)
@@ -7,7 +7,7 @@
 
 # separate patch levels with a period to maintain proper versioning.
 pkgver=4.3.6
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
@@ -18,7 +18,8 @@
         dhcpd4.service
         dhcpd6.service
         dhclient at .service
-        0001-dhcp-honor-expired.patch)
+        0001-dhcp-honor-expired.patch
+        0002-iproute2.patch)
 sha256sums=('a41eaf6364f1377fe065d35671d9cf82bbbc8f21207819b2b9f33f652aec6f1b'
             'SKIP'
             'b16083e6bb572ffacaa7cd97e7fde5fcfa1b6dbeb166f162e2ec6e8ec4b928d6'
@@ -25,7 +26,8 @@
             '537b52307e2196775d79b7e7087fa7499189e26bc9a1737c9b75acd45a720920'
             '9a2a9bdf25871dfe875ed39d92a4d97852f9ad6c38fa74bd16cbc18e85986d3f'
             '259d004987b4759e0c9e1a8807a5baa3df74f1e0c57b058a9e1bc92ea41fcb6a'
-            '97088096c5d880ecd889f4875ba89cf8eaf564bec772038e8976c22bd4896b18')
+            '97088096c5d880ecd889f4875ba89cf8eaf564bec772038e8976c22bd4896b18'
+            '837a64189b949afae951655546967cc8f17f2f2cf370faabff00575364f0fcf7')
 
 prepare() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -33,6 +35,9 @@
   # Sourced from Fedora - required for NM
   # https://bugzilla.gnome.org/show_bug.cgi?id=748268
   patch -Np1 -i ../0001-dhcp-honor-expired.patch
+
+  # no ifconfig, use ip from iproute2
+  patch -Np1 -i ../0002-iproute2.patch
 }
 
 build() {