From 11c51cf947ce7eac281912cbfc4264fb32f175aa Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Thu, 29 Mar 2018 19:09:40 -0500
Subject: [PATCH] The following changes were made:

  * DEPENDS moved from Makefile to Makefile.dhclient and Makefile.dhcpd
  * Modified 01_client-script.patch to use /bin/sh in dhclient-script
---
 Makefile                           |  3 +--
 Makefile.dhclient                  |  1 +
 Makefile.dhcpd                     |  1 +
 SRC/patches/01_client-script.patch | 17 +++++------------
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 6b89fbe..4ce1025 100644
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,10 @@
 SHELL = /bin/bash
 
 export SRCPKG = dhcp
-export DEPENDS = glibc
 export ARCH = x86_64
 export URL = https://www.isc.org/
 BRIEF = Source package for dhcpd and dhclient
-SNAPVER = 5
+SNAPVER = 6
 
 PWD := $(shell pwd)
 ROOT := $(PWD)/ROOT
diff --git a/Makefile.dhclient b/Makefile.dhclient
index b8f1d1c..bce6984 100644
--- a/Makefile.dhclient
+++ b/Makefile.dhclient
@@ -8,6 +8,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+DEPENDS = dash,glibc
 REPO = core
 BRIEF = DHCP Client
 DESC = The Internet Systems Consortium DHCP Client, dhclient, \
diff --git a/Makefile.dhcpd b/Makefile.dhcpd
index de5b6ed..c017515 100644
--- a/Makefile.dhcpd
+++ b/Makefile.dhcpd
@@ -8,6 +8,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+DEPENDS = glibc
 REPO = server
 BRIEF = DHCP server
 DESC = The Internet Systems Consortium DHCP Server, dhcpd, implements the \
diff --git a/SRC/patches/01_client-script.patch b/SRC/patches/01_client-script.patch
index 42a586f..819c293 100644
--- a/SRC/patches/01_client-script.patch
+++ b/SRC/patches/01_client-script.patch
@@ -1,16 +1,9 @@
-Submitted By:            Armin K. <krejzi at email dot com>
-Date:                    2012-08-14
-Initial Package Version: 4.2.4-P1
-Upstream Status:         Rejected by upstream.
-Origin:                  Based on Debian's dhclient-script, but modified for BLFS
-Description:             This patch replaces original linux script for dhcp client with
-                         better one which is based on Debian's dhclient-script, but modified
-                         to be used on LFS/BLFS. It also removes net-tools dependency.
-
---- a/client/scripts/linux	2014-07-09 20:26:40.000000000 +0200
-+++ b/client/scripts/linux	2014-08-12 01:21:02.858998828 +0200
+diff -Naur a/client/scripts/linux b/client/scripts/linux
+--- a/client/scripts/linux	2016-09-27 14:16:50.000000000 -0500
++++ b/client/scripts/linux	2018-03-29 18:30:41.975046889 -0500
 @@ -1,316 +1,346 @@
- #!/bin/bash
+-#!/bin/bash
++#!/bin/sh
 +
  # dhclient-script for Linux. Dan Halbert, March, 1997.
  # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.