From c16dcdb087453e1f83def2f989cbdebcb6bb7f7997243a9e8b63e830c659a680 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Wed, 10 Dec 2014 14:54:02 +0000
Subject: [PATCH] Accepting request 264583 from home:Ledest:bashisms

fix bashisms in dhcprelay script

OBS-URL: https://build.opensuse.org/request/show/264583
OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=145
---
 ...cp-4.2.x-handle-ifa_addr-NULL.909189.patch | 28 -------------------
 dhcp.changes                                  |  8 ------
 dhcp.spec                                     |  3 --
 3 files changed, 39 deletions(-)
 delete mode 100644 0027-dhcp-4.2.x-handle-ifa_addr-NULL.909189.patch

diff --git a/0027-dhcp-4.2.x-handle-ifa_addr-NULL.909189.patch b/0027-dhcp-4.2.x-handle-ifa_addr-NULL.909189.patch
deleted file mode 100644
index 4988906..0000000
--- a/0027-dhcp-4.2.x-handle-ifa_addr-NULL.909189.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 17e0eabe7700d02b48ed8b0a923427caad3b7b4b Mon Sep 17 00:00:00 2001
-From: Jiri Slaby <jslaby@suse.cz>
-Date: Wed, 10 Dec 2014 13:48:03 +0100
-Subject: [PATCH] dhcp-4.2.x-handle-ifa_addr-NULL.909189
-
-References: bsc#909189,bnc#870535
-
-Fix to not crash in interface discovery when the interface
-address is NULL. Bug has been introduced by the infiniband
-support patch (bsc#870535).
-
-diff --git a/common/lpf.c b/common/lpf.c
-index 9dc6053..892ccce 100644
---- a/common/lpf.c
-+++ b/common/lpf.c
-@@ -605,6 +605,9 @@ get_hw_addr(struct interface_info *info)
- 
- 	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
- 
-+		if (!ifa->ifa_addr)
-+			continue;
-+
- 		if (ifa->ifa_addr->sa_family != AF_PACKET)
- 			continue;
- 
--- 
-2.2.0
-
diff --git a/dhcp.changes b/dhcp.changes
index aee3ce2..12772d9 100644
--- a/dhcp.changes
+++ b/dhcp.changes
@@ -1,11 +1,3 @@
--------------------------------------------------------------------
-Wed Dec 10 12:52:03 UTC 2014 - mt@suse.de
-
-- Applied fix by Jiri Slaby to not crash in interface discovery
-  when the interface address is NULL, which has been introduced
-  by the infiniband support patch (bsc#909189,bsc#870535).
-  [+ 0027-dhcp-4.2.x-handle-ifa_addr-NULL.909189.patch]
-
 -------------------------------------------------------------------
 Tue Dec 09 19:25:00 UTC 2014 - Led <ledest@gmail.com>
 
diff --git a/dhcp.spec b/dhcp.spec
index 49ca0ef..ced2b89 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -132,8 +132,6 @@ Patch24:        0024-dhcp-4.2.x-dhcpv6-decline-on-DAD-failure.872609.patch
 Patch25:        0025-dhcp-4.2.x-dhcpv6-retransmission-until-MRD.872609.patch
 # PATCH-FIX-SLE dhcp-4.2.x-disable-unused-ddns-port-in-server bnc#891655
 Patch26:        0026-dhcp-4.2.x-disable-unused-ddns-port-in-server.891655.patch
-# PATCH-FIX-SLE dhcp-4.2.x-handle-ifa_addr-NULL bsc#909189
-Patch27:        0027-dhcp-4.2.x-handle-ifa_addr-NULL.909189.patch
 ##
 PreReq:         /bin/touch /sbin/chkconfig sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -275,7 +273,6 @@ Authors:
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
-%patch27 -p1
 ##
 find . -type f -name \*.cat\* -exec rm -f {} \;
 dos2unix contrib/ms2isc/*