commit 9f69fa6a0df7541314064c5f3f996b83ffd4cbc6 Author: Jay Larson Date: Tue Nov 8 13:32:37 2016 -0600 First check in diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..54bf6b0 --- /dev/null +++ b/Makefile @@ -0,0 +1,91 @@ +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation here: +# (http://www.gnu.org/licenses/gpl-2.0.html) +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +export DEPENDS = +export ARCH = x86_64 +export URL = https://www.isc.org/ +DESC = +SNAPVER = sr1 + +PWD := $(shell pwd) +ROOT := $(PWD)/ROOT +ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) +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) + +DHCLIENT := $(PWD)/dhclient +export DHCLIENTROOT := $(DHCLIENT)/ROOT +DHCPD := $(PWD)/dhcpd +export DHCPDROOT := $(DHCPD)/ROOT + +$(DHCPDROOT): $(DHCLIENTROOT) + @install -v -d $(DHCPD)/SNAP && \ + install -v -d $(DHCPDROOT) + @cd $(SRCDIR) && make -C server install DESTDIR=$(DHCPDROOT) + @cd $(DHCPD) && make -f ../Makefile.dhcpd && \ + mv *.snap ../ + +$(DHCLIENTROOT): $(SRCDIR)/client/dhclient + @install -v -d $(DHCLIENT)/SNAP && \ + 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 ../ + +$(SRCDIR)/configure: $(ARCHIVE) + @if [ '$(TYPE)' == 'application/x-bzip2' ]; then \ + tar -jxf $(ARCHIVE); \ + elif [ '$(TYPE)' == 'application/x-gzip' ]; then \ + tar -zxf $(ARCHIVE); \ + elif [ '$(TYPE)' == 'application/x-tar' ]; then \ + tar -xf $(ARCHIVE); \ + elif [ '$(TYPE)' == 'application/x-xz' ]; then \ + tar -xf $(ARCHIVE); \ + else \ + echo 'Unable to determine archive type'; \ + exit 1; \ + fi + @touch $(SRCDIR)/configure + +$(SRCDIR)/config.log: $(SRCDIR)/configure + @cd $(SRCDIR) && \ + for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \ + patch --verbose -Np1 -i $$patch; \ + done + @cd $(SRCDIR); \ + ./configure \ + --prefix=/usr \ + --sbindir=/sbin \ + --sysconfdir=/etc/dhcp \ + --build=x86_64-snap-linux-gnu \ + --host=x86_64-snap-linux-gnu \ + --target=x86_64-snap-linux-gnu + +$(SRCDIR)/client/dhclient: $(SRCDIR)/config.log + @cd $(SRCDIR) && make + +test: $(ROOT) + @cd $(SRCDIR); \ + make check + +clean: + @rm -rvf $(ROOT) \ + $(DHCLIENT) \ + $(DHCPD) \ + $(SNAPINFO) \ + $(MANIFEST) \ + $(FILES) \ + $(SRCDIR) + diff --git a/Makefile.dhclient b/Makefile.dhclient new file mode 100644 index 0000000..6d7161c --- /dev/null +++ b/Makefile.dhclient @@ -0,0 +1,15 @@ +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation here: +# (http://www.gnu.org/licenses/gpl-2.0.html) +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +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 diff --git a/Makefile.dhcpd b/Makefile.dhcpd new file mode 100644 index 0000000..40a2bd9 --- /dev/null +++ b/Makefile.dhcpd @@ -0,0 +1,15 @@ +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation here: +# (http://www.gnu.org/licenses/gpl-2.0.html) +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +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 diff --git a/SNAP/README b/SNAP/README new file mode 100644 index 0000000..19a3ff1 --- /dev/null +++ b/SNAP/README @@ -0,0 +1,3 @@ +This is the directory where the manifest, snapinfo, and files.tar.gz +files will be created. It is also where the usher file should be +placed if it is required by the package. diff --git a/SRC/dhcp-4.3.5.tar.gz b/SRC/dhcp-4.3.5.tar.gz new file mode 100644 index 0000000..9f658a3 Binary files /dev/null and b/SRC/dhcp-4.3.5.tar.gz differ diff --git a/SRC/dhcp-4.3.5.tar.gz.asc b/SRC/dhcp-4.3.5.tar.gz.asc new file mode 100644 index 0000000..fa3a83e --- /dev/null +++ b/SRC/dhcp-4.3.5.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iQEcBAABAgAGBQJX8jrBAAoJEG+m68mRGkwCczcH/1lMdlvf2RX+IfNraDTXWmY1 ++MGk51H7aIJDRDFhiLA1f1ht1hIXJB0gnaOdJxLcqQGUiHPQfVZidDz2XxAjr7S2 +VvV6mfHxO1+oPsaFzCEItDqHk/LJcBDgKWC2cvabNfi5Nyq8rR+Zjn0i509DYFBR +cJYzau7Smse8ZVpUrsdLOtKgNznVPioowqCooiOlzZfYNfKOdwk4z6U8vglLhRL4 +xpfbg373Z78dExeNPqJ97c/tUg2YCnuZGvLfwvI+2Bzrp63TbAnJYB3CnyCj+fS2 +iSH7WACNSqRQoEWxE+vi9kTY0GGVFaonPZSRMT1DKFhBge4TdMCm2STIIOJiPFw= +=xG2q +-----END PGP SIGNATURE----- diff --git a/SRC/isc2017.key b/SRC/isc2017.key new file mode 100644 index 0000000..650f020 --- /dev/null +++ b/SRC/isc2017.key @@ -0,0 +1,31 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.11 (GNU/Linux) + +mQENBFR9szQBCADAwiKoEyFh32NHLc+c1vGgZ2lDKvXd7MoZZAOM2NUJkaDqt+Xy +537ycGmZRqukpGUsa0fDeqjOq+l4paX3QnW1DEs8ypnWi5Zme4lYHysmNeG33ihe +SMeGRbnZi+9VTho3NGv3iM9gtRMDXTB5wi7OCu0XNypUtR2afP9F9EgRs4nJ5iMz +o5c1y0wH4y+lJ33NCHZDj8ditl64yMbuVlZOD3UxoQqw/8E6T4rHly64g9s6Ld7o +YybSN/hKIXFZRqrTebEd2LwZqGhPQIgYDUdumwvtw6jfrosbMOx0tan3esnxlptl +fbkmOsoi8pPJqlo2VtLBx9XN53ZFMqc/Pj3tABEBAAG0TUludGVybmV0IFN5c3Rl +bXMgQ29uc29ydGl1bSwgSW5jLiAoU2lnbmluZyBrZXksIDIwMTUtMjAxNikgPGNv +ZGVzaWduQGlzYy5vcmc+iQE9BBMBAgAoBQJUfbM0AhsDBQkEEtKABgsJCAcDAgYV +CAIJCgsEFgIDAQIeAQIXgAAKCRBvpuvJkRpMAhD3B/ip18kQSE4//Yt8VMF6kciD +bcCQAOwy45/1frZaX9wS5ri/pdHxB0vw4SwrpJgJEkLGG0sEzRwS87QeFCtGDhIw +J/+5JX6in0cJ+hr2G7DJUpVgKp3Y8lEZ3ch+gAZ3k45uzzoOTT4tm6uXWlkOnlPJ +jUb1s9bVzL9zUsJ7XaV5x4aR3Bw53/izJEIaxWHj1CEjAzRC7wPQpo/EK+fWzFBf +enSCBJEvW1vkomtb1jMdj+uhod1LzFdXHdQjDCSKn/Glpn/YcZ9/LkiUSwNLTpL4 +CxDbEis4QWNDndAR/u9REC1zDW/xQEC3UxsB06Zm9NaWjAHy8s0rOihgoetaroa5 +AQ0EVH2zNAEIAK3gbs1saWWHWGxsPuhOf+x18g0/+N7f4fZE7TTetPNhdOgY0LGx +ul9VHRoZgvPbnm+BZmZhYGMr/oWlTEuF+sa/Dr8SKqVDjYIj0qOzimMLYgaKYV8S +Q8LhUFtUQjm5V5J/FQ97NzO2fPgEIo7JbIVrhsPEms+1gl9yanKW/+HUovl7KUyN +RovfaJdpO4uyuY9CGz875DqE39EhflBWN96bpCUmp9O/VQs4eJTp6pkv2EkMVcEa +dtFXAVFlSFe/OUd83gbVXM9NCRfY98ZJaB2OnI1/lU8OomdHOt+z6h7bdtC/w42q +sjBmu+y2Fth4WXzPd7WbfvVdlMjbBHZLn8EAEQEAAYkBJQQYAQIADwUCVH2zNAIb +DAUJBBLSgAAKCRBvpuvJkRpMAhEXB/0Xq9NqR7vgSZTed7esSMWqOLWZloKdjxys +3BA9h3EXCkF6gMdE4b6OkIUH0V2aFCYJXZmyFol0tq50aETD62aCgCOVtxlkx5VH +tTLl/T1Venf9TDISiEmDBI+3DDqjA3YOH86Fql7Jq+EMZx4e2L50PWWyRR3Lzjp6 +TFe9Xh4rqQJoI0OBtLyX13Nfe/Ar4Z85DX6O1sv/CM0aWkfGbdMAeeHrDVRKaraH +ULyyX4kfu+mZj8AthxMpVDyaHil9WCX1uwGo+6rkiuAMvURbn05h5C92t2QUQJE1 +rvBKpzLEBW8qQq5foo+8yHHWpzue4i4r2uEJ3+FLUsjtlU+3F+Pq +=dem0 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/SRC/patches/01_client-script.patch b/SRC/patches/01_client-script.patch new file mode 100644 index 0000000..42a586f --- /dev/null +++ b/SRC/patches/01_client-script.patch @@ -0,0 +1,645 @@ +Submitted By: Armin K. +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 +@@ -1,316 +1,346 @@ + #!/bin/bash ++ + # dhclient-script for Linux. Dan Halbert, March, 1997. + # Updated for Linux 2.[12] by Brian J. Murrell, January 1999. +-# No guarantees about this. I'm a novice at the details of Linux +-# networking. +- +-# Notes: +- +-# 0. This script is based on the netbsd script supplied with dhcp-970306. +- +-# 1. ifconfig down apparently deletes all relevant routes and flushes +-# the arp cache, so this doesn't need to be done explicitly. +- +-# 2. The alias address handling here has not been tested AT ALL. +-# I'm just going by the doc of modern Linux ip aliasing, which uses +-# notations like eth0:0, eth0:1, for each alias. ++# Modified for Debian. Matt Zimmerman and Eloy Paris, December 2003 ++# Modified to remove useless tests for antiquated kernel versions that ++# this doesn't even work with anyway, and introduces a dependency on /usr ++# being mounted, which causes cosmetic errors on hosts that NFS mount /usr ++# Andrew Pollock, February 2005 ++# Modified to work on point-to-point links. Andrew Pollock, June 2005 ++# Modified to support passing the parameters called with to the hooks. Andrew Pollock, November 2005 ++# Modified to use the script with Linux From Scratch by Armin K., May 2012 + +-# 3. I have to calculate the network address, and calculate the broadcast +-# address if it is not supplied. This might be much more easily done +-# by the dhclient C code, and passed on. +- +-# 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious +-# of the $1 in its args. +- +-# 'ip' just looks too weird. /sbin/ip looks less weird. +-ip=/sbin/ip ++# The alias handling in here probably still sucks. -mdz + ++# update /etc/resolv.conf based on received values + make_resolv_conf() { +- if [ x"$new_domain_name_servers" != x ]; then +- cat /dev/null > /etc/resolv.conf.dhclient +- chmod 644 /etc/resolv.conf.dhclient +- if [ x"$new_domain_search" != x ]; then +- echo search $new_domain_search >> /etc/resolv.conf.dhclient +- elif [ x"$new_domain_name" != x ]; then +- # Note that the DHCP 'Domain Name Option' is really just a domain +- # name, and that this practice of using the domain name option as +- # a search path is both nonstandard and deprecated. +- echo search $new_domain_name >> /etc/resolv.conf.dhclient +- fi +- for nameserver in $new_domain_name_servers; do +- echo nameserver $nameserver >>/etc/resolv.conf.dhclient +- done +- +- mv /etc/resolv.conf.dhclient /etc/resolv.conf +- elif [ "x${new_dhcp6_name_servers}" != x ] ; then +- cat /dev/null > /etc/resolv.conf.dhclient6 +- chmod 644 /etc/resolv.conf.dhclient6 ++ local new_resolv_conf + +- if [ "x${new_dhcp6_domain_search}" != x ] ; then +- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6 ++ # DHCPv4 ++ if [ -n "$new_domain_search" ] || [ -n "$new_domain_name" ] || ++ [ -n "$new_domain_name_servers" ]; then ++ new_resolv_conf=/etc/resolv.conf.dhclient-new ++ rm -f $new_resolv_conf ++ ++ if [ -n "$new_domain_name" ]; then ++ echo domain ${new_domain_name%% *} >>$new_resolv_conf ++ fi ++ ++ if [ -n "$new_domain_search" ]; then ++ if [ -n "$new_domain_name" ]; then ++ domain_in_search_list="" ++ for domain in $new_domain_search; do ++ if [ "$domain" = "${new_domain_name}" ] || ++ [ "$domain" = "${new_domain_name}." ]; then ++ domain_in_search_list="Yes" ++ fi ++ done ++ if [ -z "$domain_in_search_list" ]; then ++ new_domain_search="$new_domain_name $new_domain_search" ++ fi ++ fi ++ echo "search ${new_domain_search}" >> $new_resolv_conf ++ elif [ -n "$new_domain_name" ]; then ++ echo "search ${new_domain_name}" >> $new_resolv_conf ++ fi ++ ++ if [ -n "$new_domain_name_servers" ]; then ++ for nameserver in $new_domain_name_servers; do ++ echo nameserver $nameserver >>$new_resolv_conf ++ done ++ else # keep 'old' nameservers ++ sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p /etc/resolv.conf >>$new_resolv_conf ++ fi ++ ++ chown --reference=/etc/resolv.conf $new_resolv_conf ++ chmod --reference=/etc/resolv.conf $new_resolv_conf ++ mv -f $new_resolv_conf /etc/resolv.conf ++ # DHCPv6 ++ elif [ -n "$new_dhcp6_domain_search" ] || [ -n "$new_dhcp6_name_servers" ]; then ++ new_resolv_conf=/etc/resolv.conf.dhclient-new ++ rm -f $new_resolv_conf ++ ++ if [ -n "$new_dhcp6_domain_search" ]; then ++ echo "search ${new_dhcp6_domain_search}" >> $new_resolv_conf ++ fi ++ ++ if [ -n "$new_dhcp6_name_servers" ]; then ++ for nameserver in $new_dhcp6_name_servers; do ++ # append %interface to link-local-address nameservers ++ if [ "${nameserver##fe80::}" != "$nameserver" ] || ++ [ "${nameserver##FE80::}" != "$nameserver" ]; then ++ nameserver="${nameserver}%${interface}" ++ fi ++ echo nameserver $nameserver >>$new_resolv_conf ++ done ++ else # keep 'old' nameservers ++ sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p /etc/resolv.conf >>$new_resolv_conf ++ fi ++ ++ chown --reference=/etc/resolv.conf $new_resolv_conf ++ chmod --reference=/etc/resolv.conf $new_resolv_conf ++ mv -f $new_resolv_conf /etc/resolv.conf + fi +- shopt -s nocasematch +- for nameserver in ${new_dhcp6_name_servers} ; do +- # If the nameserver has a link-local address +- # add a (interface name) to it. +- if [[ "$nameserver" =~ ^fe80:: ]] +- then +- zone_id="%$interface" +- else +- zone_id= +- fi +- echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6 +- done +- shopt -u nocasematch ++} + +- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf +- fi ++# set host name ++set_hostname() { ++ local current_hostname ++ ++ if [ -n "$new_host_name" ]; then ++ current_hostname=$(hostname) ++ ++ # current host name is empty, '(none)' or 'localhost' or differs from new one from DHCP ++ if [ -z "$current_hostname" ] || ++ [ "$current_hostname" = '(none)' ] || ++ [ "$current_hostname" = 'localhost' ] || ++ [ "$current_hostname" = "$old_host_name" ]; then ++ if [ "$new_host_name" != "$old_host_name" ]; then ++ hostname "$new_host_name" ++ fi ++ fi ++ fi + } + +-# Must be used on exit. Invokes the local dhcp client exit hooks, if any. ++# Must be used on exit. Invokes the local dhcp client exit hooks, if any. + exit_with_hooks() { + exit_status=$1 +- if [ -f /etc/dhclient-exit-hooks ]; then +- . /etc/dhclient-exit-hooks ++ if [ -f /etc/dhcp/dhclient-exit-hooks ]; then ++ . /etc/dhcp/dhclient-exit-hooks + fi +-# probably should do something with exit status of the local script + exit $exit_status + } + ++# The 576 MTU is only used for X.25 and dialup connections ++# where the admin wants low latency. Such a low MTU can cause ++# problems with UDP traffic, among other things. As such, ++# disallow MTUs from 576 and below by default, so that broken ++# MTUs are ignored, but higher stuff is allowed (1492, 1500, etc). ++if [ -z "$new_interface_mtu" ] || [ "$new_interface_mtu" -le 576 ]; then ++ new_interface_mtu='' ++fi ++ ++# The action starts here ++ + # Invoke the local dhcp client enter hooks, if they exist. +-if [ -f /etc/dhclient-enter-hooks ]; then ++if [ -f /etc/dhcp/dhclient-enter-hooks ]; then + exit_status=0 +- . /etc/dhclient-enter-hooks +- # allow the local script to abort processing of this state +- # local script must set exit_status variable to nonzero. ++ . /etc/dhcp/dhclient-enter-hooks + if [ $exit_status -ne 0 ]; then + exit $exit_status + fi + fi + +-### +-### DHCPv4 Handlers +-### +- +-if [ x$new_broadcast_address != x ]; then +- new_broadcast_arg="broadcast $new_broadcast_address" +-fi +-if [ x$old_broadcast_address != x ]; then +- old_broadcast_arg="broadcast $old_broadcast_address" +-fi +-if [ x$new_subnet_mask != x ]; then +- new_subnet_arg="netmask $new_subnet_mask" +-fi +-if [ x$old_subnet_mask != x ]; then +- old_subnet_arg="netmask $old_subnet_mask" +-fi +-if [ x$alias_subnet_mask != x ]; then +- alias_subnet_arg="netmask $alias_subnet_mask" +-fi +-if [ x$new_interface_mtu != x ]; then +- mtu_arg="mtu $new_interface_mtu" +-fi +-if [ x$IF_METRIC != x ]; then +- metric_arg="metric $IF_METRIC" +-fi +- +-if [ x$reason = xMEDIUM ]; then +- # Linux doesn't do mediums (ok, ok, media). +- exit_with_hooks 0 +-fi +- +-if [ x$reason = xPREINIT ]; then +- if [ x$alias_ip_address != x ]; then +- # Bring down alias interface. Its routes will disappear too. +- ifconfig $interface:0- inet 0 +- fi +- ifconfig $interface 0 up +- +- # We need to give the kernel some time to get the interface up. +- sleep 1 +- +- exit_with_hooks 0 +-fi +- +-if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then +- exit_with_hooks 0 +-fi +- +-if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \ +- [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then +- current_hostname=`hostname` +- if [ x$current_hostname = x ] || \ +- [ x$current_hostname = "x(none)" ] || \ +- [ x$current_hostname = xlocalhost ] || \ +- [ x$current_hostname = x$old_host_name ]; then +- if [ x$new_host_name != x$old_host_name ]; then +- hostname "$new_host_name" +- fi +- fi +- +- if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ +- [ x$alias_ip_address != x$old_ip_address ]; then +- # Possible new alias. Remove old alias. +- ifconfig $interface:0- inet 0 +- fi +- if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then +- # IP address changed. Bringing down the interface will delete all routes, +- # and clear the ARP cache. +- ifconfig $interface inet 0 down +- +- fi +- if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \ +- [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then +- +- ifconfig $interface inet $new_ip_address $new_subnet_arg \ +- $new_broadcast_arg $mtu_arg +- # Add a network route to the computed network address. +- for router in $new_routers; do +- if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then +- route add -host $router dev $interface +- fi +- route add default gw $router $metric_arg dev $interface +- done +- else +- # we haven't changed the address, have we changed other options +- # that we wish to update? +- if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then +- # if we've changed routers delete the old and add the new. +- for router in $old_routers; do +- route del default gw $router +- done +- for router in $new_routers; do +- if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then +- route add -host $router dev $interface +- fi +- route add default gw $router $metric_arg dev $interface +- done +- fi +- fi +- if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ]; +- then +- ifconfig $interface:0- inet 0 +- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg +- route add -host $alias_ip_address $interface:0 +- fi +- make_resolv_conf +- exit_with_hooks 0 +-fi +- +-if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \ +- || [ x$reason = xSTOP ]; then +- if [ x$alias_ip_address != x ]; then +- # Turn off alias interface. +- ifconfig $interface:0- inet 0 +- fi +- if [ x$old_ip_address != x ]; then +- # Shut down interface, which will delete routes and clear arp cache. +- ifconfig $interface inet 0 down +- fi +- if [ x$alias_ip_address != x ]; then +- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg +- route add -host $alias_ip_address $interface:0 +- fi +- exit_with_hooks 0 +-fi +- +-if [ x$reason = xTIMEOUT ]; then +- if [ x$alias_ip_address != x ]; then +- ifconfig $interface:0- inet 0 +- fi +- ifconfig $interface inet $new_ip_address $new_subnet_arg \ +- $new_broadcast_arg $mtu_arg +- set $new_routers +- if ping -q -c 1 $1; then +- if [ x$new_ip_address != x$alias_ip_address ] && \ +- [ x$alias_ip_address != x ]; then +- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg +- route add -host $alias_ip_address dev $interface:0 +- fi +- for router in $new_routers; do +- if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then +- route add -host $router dev $interface +- fi +- route add default gw $router $metric_arg dev $interface +- done +- make_resolv_conf +- exit_with_hooks 0 +- fi +- ifconfig $interface inet 0 down +- exit_with_hooks 1 +-fi +- +-### +-### DHCPv6 Handlers +-### +- +-if [ x$reason = xPREINIT6 ] ; then +- # Ensure interface is up. +- ${ip} link set ${interface} up +- +- # Remove any stale addresses from aborted clients. +- ${ip} -f inet6 addr flush dev ${interface} scope global permanent +- +- exit_with_hooks 0 +-fi +- +-if [ x${old_ip6_prefix} != x ] || [ x${new_ip6_prefix} != x ] ; then +- echo Prefix ${reason} old=${old_ip6_prefix} new=${new_ip6_prefix} ++# Execute the operation ++case "$reason" in + +- exit_with_hooks 0 +-fi +- +-if [ x$reason = xBOUND6 ] ; then +- if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then +- exit_with_hooks 2; +- fi ++ ### DHCPv4 Handlers + +- ${ip} -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \ +- dev ${interface} scope global ++ MEDIUM|ARPCHECK|ARPSEND) ++ # Do nothing ++ ;; ++ PREINIT) ++ # The DHCP client is requesting that an interface be ++ # configured as required in order to send packets prior to ++ # receiving an actual address. - dhclient-script(8) ++ ++ # ensure interface is up ++ ip link set dev ${interface} up ++ ++ if [ -n "$alias_ip_address" ]; then ++ # flush alias IP from interface ++ ip -4 addr flush dev ${interface} label ${interface}:0 ++ fi ++ ++ ;; ++ ++ BOUND|RENEW|REBIND|REBOOT) ++ set_hostname ++ ++ if [ -n "$old_ip_address" ] && [ -n "$alias_ip_address" ] && ++ [ "$alias_ip_address" != "$old_ip_address" ]; then ++ # alias IP may have changed => flush it ++ ip -4 addr flush dev ${interface} label ${interface}:0 ++ fi ++ ++ if [ -n "$old_ip_address" ] && ++ [ "$old_ip_address" != "$new_ip_address" ]; then ++ # leased IP has changed => flush it ++ ip -4 addr flush dev ${interface} label ${interface} ++ fi ++ ++ if [ -z "$old_ip_address" ] || ++ [ "$old_ip_address" != "$new_ip_address" ] || ++ [ "$reason" = "BOUND" ] || [ "$reason" = "REBOOT" ]; then ++ # new IP has been leased or leased IP changed => set it ++ ip -4 addr add ${new_ip_address}${new_subnet_mask:+/$new_subnet_mask} \ ++ ${new_broadcast_address:+broadcast $new_broadcast_address} \ ++ dev ${interface} label ${interface} ++ ++ if [ -n "$new_interface_mtu" ]; then ++ # set MTU ++ ip link set dev ${interface} mtu ${new_interface_mtu} ++ fi ++ ++ # set if_metric if IF_METRIC is set or there's more than one router ++ if_metric="$IF_METRIC" ++ if [ "${new_routers%% *}" != "${new_routers}" ]; then ++ if_metric=${if_metric:-1} ++ fi ++ ++ for router in $new_routers; do ++ if [ "$new_subnet_mask" = "255.255.255.255" ]; then ++ # point-to-point connection => set explicit route ++ ip -4 route add ${router} dev $interface >/dev/null 2>&1 ++ fi ++ ++ # set default route ++ ip -4 route add default via ${router} dev ${interface} \ ++ ${if_metric:+metric $if_metric} >/dev/null 2>&1 ++ ++ if [ -n "$if_metric" ]; then ++ if_metric=$((if_metric+1)) ++ fi ++ done ++ fi ++ ++ if [ -n "$alias_ip_address" ] && ++ [ "$new_ip_address" != "$alias_ip_address" ]; then ++ # separate alias IP given, which may have changed ++ # => flush it, set it & add host route to it ++ ip -4 addr flush dev ${interface} label ${interface}:0 ++ ip -4 addr add ${alias_ip_address}${alias_subnet_mask:+/$alias_subnet_mask} \ ++ dev ${interface} label ${interface}:0 ++ ip -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1 ++ fi ++ ++ # update /etc/resolv.conf ++ make_resolv_conf ++ ++ ;; ++ ++ EXPIRE|FAIL|RELEASE|STOP) ++ if [ -n "$alias_ip_address" ]; then ++ # flush alias IP ++ ip -4 addr flush dev ${interface} label ${interface}:0 ++ fi ++ ++ if [ -n "$old_ip_address" ]; then ++ # flush leased IP ++ ip -4 addr flush dev ${interface} label ${interface} ++ fi ++ ++ if [ -n "$alias_ip_address" ]; then ++ # alias IP given => set it & add host route to it ++ ip -4 addr add ${alias_ip_address}${alias_network_arg} \ ++ dev ${interface} label ${interface}:0 ++ ip -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1 ++ fi ++ ++ ;; ++ ++ TIMEOUT) ++ if [ -n "$alias_ip_address" ]; then ++ # flush alias IP ++ ip -4 addr flush dev ${interface} label ${interface}:0 ++ fi ++ ++ # set IP from recorded lease ++ ip -4 addr add ${new_ip_address}${new_subnet_mask:+/$new_subnet_mask} \ ++ ${new_broadcast_address:+broadcast $new_broadcast_address} \ ++ dev ${interface} label ${interface} ++ ++ if [ -n "$new_interface_mtu" ]; then ++ # set MTU ++ ip link set dev ${interface} mtu ${new_interface_mtu} ++ fi ++ ++ # if there is no router recorded in the lease or the 1st router answers pings ++ if [ -z "$new_routers" ] || ping -q -c 1 "${new_routers%% *}"; then ++ if [ -n "$alias_ip_address" ] && ++ [ "$new_ip_address" != "$alias_ip_address" ]; then ++ # separate alias IP given => set up the alias IP & add host route to it ++ ip -4 addr add ${alias_ip_address}${alias_subnet_mask:+/$alias_subnet_mask} \ ++ dev ${interface} label ${interface}:0 ++ ip -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1 ++ fi ++ ++ # set if_metric if IF_METRIC is set or there's more than one router ++ if_metric="$IF_METRIC" ++ if [ "${new_routers%% *}" != "${new_routers}" ]; then ++ if_metric=${if_metric:-1} ++ fi ++ ++ # set default route ++ for router in $new_routers; do ++ ip -4 route add default via ${router} dev ${interface} \ ++ ${if_metric:+metric $if_metric} >/dev/null 2>&1 ++ ++ if [ -n "$if_metric" ]; then ++ if_metric=$((if_metric+1)) ++ fi ++ done ++ ++ # update /etc/resolv.conf ++ make_resolv_conf ++ else ++ # flush all IPs from interface ++ ip -4 addr flush dev ${interface} ++ exit_with_hooks 1 ++ fi ++ ++ ;; ++ ++ ### DHCPv6 Handlers ++ # TODO handle prefix change: ?based on ${old_ip6_prefix} and ${new_ip6_prefix}? ++ ++ PREINIT6) ++ # ensure interface is up ++ ip link set ${interface} up ++ ++ # flush any stale global permanent IPs from interface ++ ip -6 addr flush dev ${interface} scope global permanent ++ ++ ;; ++ ++ BOUND6|RENEW6|REBIND6) ++ if [ "${new_ip6_address}" ] && [ "${new_ip6_prefixlen}" ]; then ++ # set leased IP ++ ip -6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \ ++ dev ${interface} scope global ++ fi ++ ++ # update /etc/resolv.conf ++ if [ "${reason}" = BOUND6 ] || ++ [ "${new_dhcp6_name_servers}" != "${old_dhcp6_name_servers}" ] || ++ [ "${new_dhcp6_domain_search}" != "${old_dhcp6_domain_search}" ]; then ++ make_resolv_conf ++ fi ++ ++ ;; ++ ++ DEPREF6) ++ if [ -z "${cur_ip6_prefixlen}" ]; then ++ exit_with_hooks 1 ++ fi ++ ++ # set preferred lifetime of leased IP to 0 ++ ip -6 addr change ${cur_ip6_address}/${cur_ip6_prefixlen} \ ++ dev ${interface} scope global preferred_lft 0 ++ ++ ;; ++ ++ EXPIRE6|RELEASE6|STOP6) ++ if [ -z "${old_ip6_address}" ] || [ -z "${old_ip6_prefixlen}" ]; then ++ exit_with_hooks 1 ++ fi ++ ++ # delete leased IP ++ ip -6 addr del ${old_ip6_address}/${old_ip6_prefixlen} \ ++ dev ${interface} + +- # Check for nameserver options. +- make_resolv_conf +- +- exit_with_hooks 0 +-fi +- +-if [ x$reason = xRENEW6 ] || [ x$reason = xREBIND6 ] ; then +- if [ x${new_ip6_address} != x ] && [ x${new_ip6_prefixlen} != x ] ; then +- ${ip} -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \ +- dev ${interface} scope global +- fi +- +- # Make sure nothing has moved around on us. +- +- # Nameservers/domains/etc. +- if [ "x${new_dhcp6_name_servers}" != "x${old_dhcp6_name_servers}" ] || +- [ "x${new_dhcp6_domain_search}" != "x${old_dhcp6_domain_search}" ] ; then +- make_resolv_conf +- fi +- +- exit_with_hooks 0 +-fi +- +-if [ x$reason = xDEPREF6 ] ; then +- if [ x${new_ip6_prefixlen} = x ] ; then +- exit_with_hooks 2; +- fi +- +- ${ip} -f inet6 addr change ${new_ip6_address}/${new_ip6_prefixlen} \ +- dev ${interface} scope global preferred_lft 0 +- +- exit_with_hooks 0 +-fi +- +-if [ x$reason = xEXPIRE6 -o x$reason = xRELEASE6 -o x$reason = xSTOP6 ] ; then +- if [ x${old_ip6_address} = x ] || [ x${old_ip6_prefixlen} = x ] ; then +- exit_with_hooks 2; +- fi +- +- ${ip} -f inet6 addr del ${old_ip6_address}/${old_ip6_prefixlen} \ +- dev ${interface} +- +- exit_with_hooks 0 +-fi ++ ;; ++esac + + exit_with_hooks 0 diff --git a/SRC/patches/02_quieter.patch b/SRC/patches/02_quieter.patch new file mode 100644 index 0000000..da0de06 --- /dev/null +++ b/SRC/patches/02_quieter.patch @@ -0,0 +1,27 @@ +diff -Naur a/client/dhclient.c b/client/dhclient.c +--- a/client/dhclient.c 2016-09-27 14:16:50.000000000 -0500 ++++ b/client/dhclient.c 2016-11-08 13:24:08.964000000 -0600 +@@ -540,7 +540,10 @@ + + if (e != 0 && e != EOF && oldpid) { + if (kill(oldpid, SIGTERM) == 0) { +- log_info("Killed old client process"); ++ if (!quiet) { ++ log_info("Killed old client" ++ " process"); ++ } + (void) unlink(path_dhclient_pid); + /* + * wait for the old process to +@@ -551,7 +554,10 @@ + */ + sleep(1); + } else if (errno == ESRCH) { +- log_info("Removed stale PID file"); ++ if (!quiet) { ++ log_info("Removed stale PID" ++ " file"); ++ } + (void) unlink(path_dhclient_pid); + } + } diff --git a/SRC/patches/README b/SRC/patches/README new file mode 100644 index 0000000..253cdcd --- /dev/null +++ b/SRC/patches/README @@ -0,0 +1,2 @@ +Place any patch files here and preface each with a number indicating +the order of execution. Patch files are expected to use a .patch extension.