main/dhcp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: main:v4.3.5-3
Branches Tags
main:0.0alpha1 main:master
main:v4.3.5-7 main:v4.3.5-6 main:v4.3.5-5 main:v4.3.5-4 main:v4.3.5-3
..
compare: main:v4.3.5-7
Branches Tags
main:0.0alpha1 main:master
main:v4.3.5-7 main:v4.3.5-6 main:v4.3.5-5 main:v4.3.5-4 main:v4.3.5-3

4 Commits
v4.3.5-3 ... v4.3.5-7

Author SHA1 Message Date
Jay Larson
c049d7785b Moved to slp format 2020-08-23 16:51:45 -05:00
Jay Larson
11c51cf947 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
 2018-03-29 19:09:40 -05:00
Jay Larson
3028162f5f The following changes were made: 
* Added SHELL (/bin/bash) to Makefile
  * Added BRIEF to Makefile
  * Added REPO to Makefile.dhclient and Makefile.dhcpd
 2018-01-22 21:24:21 -06:00
Jay Larson
89bf02db0c The following change was made to Makefile: 
* Added SRCPKG
 2017-02-20 14:29:03 -06:00
5 changed files with 22 additions and 22 deletions
Expand all files Collapse all files

19
Makefile
View File

@@ -8,10 +8,13 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
export DEPENDS = glibc
SHELL = /bin/bash
export SRCPKG = dhcp
export ARCH = x86_64
export URL = https://www.isc.org/
SNAPVER = 3
BRIEF = Source package for dhcpd and dhclient
SLVER = 7
PWD := $(shell pwd)
ROOT := $(PWD)/ROOT
@@ -20,7 +23,7 @@ TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//')
PATCHDIR := $(PWD)/SRC/patches
export VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'| \
sed 's/^-//')-$(SNAPVER)
sed 's/^-//')-$(SLVER)
DHCLIENT := $(PWD)/dhclient
export DHCLIENTROOT := $(DHCLIENT)/ROOT
@@ -28,20 +31,20 @@ DHCPD := $(PWD)/dhcpd
export DHCPDROOT := $(DHCPD)/ROOT
$(DHCPDROOT): $(DHCLIENTROOT)
@install -v -d $(DHCPD)/SNAP && \
@install -v -d $(DHCPD)/SL && \
install -v -d $(DHCPDROOT)
@cd $(SRCDIR) && make -C server install DESTDIR=$(DHCPDROOT)
@cd $(DHCPD) && make -f ../Makefile.dhcpd && \
mv *.snap ../
mv *.slp ../
$(DHCLIENTROOT): $(SRCDIR)/client/dhclient
@install -v -d $(DHCLIENT)/SNAP && \
@install -v -d $(DHCLIENT)/SL && \
install -v -d $(DHCLIENTROOT)
@cd $(SRCDIR) && make -C client install DESTDIR=$(DHCLIENTROOT)
@install -v -m 755 $(SRCDIR)/client/scripts/linux \
$(DHCLIENTROOT)/sbin/dhclient-script
@cd $(DHCLIENT) && make -f ../Makefile.dhclient && \
mv *.snap ../
mv *.slp ../
$(SRCDIR)/configure: $(ARCHIVE)
@if [ '$(TYPE)' == 'application/x-bzip2' ]; then \
@@ -83,7 +86,7 @@ clean:
@rm -rvf $(ROOT) \
$(DHCLIENT) \
$(DHCPD) \
$(SNAPINFO) \
$(SLINFO) \
$(MANIFEST) \
$(FILES) \
$(SRCDIR)

4
Makefile.dhclient
View File

@@ -8,9 +8,11 @@
# 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, \
provides a means for configuring one or more network interfaces using \
the Dynamic Host Configuration Protocol
include /usr/share/snap/Makefile.snaplinux
include /usr/share/sl/Makefile.snaplinux

4
Makefile.dhcpd
View File

@@ -8,9 +8,11 @@
# 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 \
Dynamic Host Configuration Protocol (DHCP) and the Internet Bootstrap \
Protocol (BOOTP)
include /usr/share/snap/Makefile.snaplinux
include /usr/share/sl/Makefile.snaplinux

0
SNAP/README → SL/README
View File

17
SRC/patches/01_client-script.patch
View File

@@ -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.