[git.ipfire.org] IPFire 3.x development tree branch, master, updated. ff9f3da8eafb7934d94aca50900166a2b2b2d866
by gitï¼ ipfire.org 08 Oct '12
by gitï¼ ipfire.org 08 Oct '12
08 Oct '12
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via ff9f3da8eafb7934d94aca50900166a2b2b2d866 (commit)
from 954a213a2b7d9e36a253fd932423511c08224ece (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ff9f3da8eafb7934d94aca50900166a2b2b2d866
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 8 13:04:03 2012 +0000
nano: Disable the line wrapping.
-----------------------------------------------------------------------
Summary of changes:
nano/nano.nm | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/nano/nano.nm b/nano/nano.nm
index 8a69aad..86dd413 100644
--- a/nano/nano.nm
+++ b/nano/nano.nm
@@ -5,7 +5,7 @@
name = nano
version = 2.3.0
-release = 2
+release = 3
groups = Application/Editors
url = http://www.nano-editor.org/
@@ -25,19 +25,26 @@ build
end
configure_options += \
- --sysconfdir=/etc/nano \
--enable-color \
--enable-multibuffer \
--enable-nanorc
install_cmds
+ # Disable line wrapping.
+ sed -i doc/nanorc.sample \
+ -e "s/# set nowrap/set nowrap/"
+
install -v -m644 -D doc/nanorc.sample \
- %{BUILDROOT}/etc/nano/nanorc.sample
+ %{BUILDROOT}%{sysconfdir}/nanorc
end
end
packages
package %{name}
+ configfiles
+ %{sysconfdir}/nanorc
+ end
+ end
package %{name}-debuginfo
template DEBUGINFO
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 954a213a2b7d9e36a253fd932423511c08224ece
by gitï¼ ipfire.org 07 Oct '12
by gitï¼ ipfire.org 07 Oct '12
07 Oct '12
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 954a213a2b7d9e36a253fd932423511c08224ece (commit)
from 44ee7247a3f98e46b2c9517c468df40130f5ed9f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 954a213a2b7d9e36a253fd932423511c08224ece
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 7 11:59:54 2012 +0000
network: Add dependency to dhclient package.
-----------------------------------------------------------------------
Summary of changes:
network/network.nm | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Difference in files:
diff --git a/network/network.nm b/network/network.nm
index 83781fd..03816d7 100644
--- a/network/network.nm
+++ b/network/network.nm
@@ -6,7 +6,7 @@
name = network
epoch = 1
version = 005
-release = 1.2
+release = 1.3
arch = noarch
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -37,6 +37,7 @@ packages
requires
aiccu
bash >= 4.0
+ dhclient >= 4.2.4-2
dhcp >= 4.2.4-1
ebtables
hostapd
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 44ee7247a3f98e46b2c9517c468df40130f5ed9f
by gitï¼ ipfire.org 07 Oct '12
by gitï¼ ipfire.org 07 Oct '12
07 Oct '12
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 44ee7247a3f98e46b2c9517c468df40130f5ed9f (commit)
via 0bb94940130d251ffae655ffb81b5e5a3b31299e (commit)
from 1fc643684a25cac48de05722b47d76874b51fbe2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 44ee7247a3f98e46b2c9517c468df40130f5ed9f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 7 07:21:41 2012 +0000
hostapd: Make new-style systemd unit file.
commit 0bb94940130d251ffae655ffb81b5e5a3b31299e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 7 07:16:02 2012 +0000
dhcp: Fix duplicate file dhclient-script file.
This script had to be installed by the network package.
-----------------------------------------------------------------------
Summary of changes:
dhcp/dhclient-script | 590 --------------------------------------
dhcp/dhcp.nm | 13 +-
hostapd/hostapd.nm | 2 +-
hostapd/systemd/hostapd@.service | 5 +-
4 files changed, 8 insertions(+), 602 deletions(-)
delete mode 100644 dhcp/dhclient-script
Difference in files:
diff --git a/dhcp/dhclient-script b/dhcp/dhclient-script
deleted file mode 100644
index 6991938..0000000
--- a/dhcp/dhclient-script
+++ /dev/null
@@ -1,590 +0,0 @@
-#!/bin/bash
-#
-# dhclient-script: Network interface configuration script run by
-# dhclient based on DHCP client communication
-#
-# Copyright (C) 2008 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# Author(s): David Cantrell <dcantrell(a)redhat.com>
-#
-# ----------
-# This script is a rewrite/reworking on dhclient-script originally
-# included as part of dhcp-970306:
-# dhclient-script for Linux. Dan Halbert, March, 1997.
-# Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
-# Modified by David Cantrell <dcantrell(a)redhat.com> for Fedora and RHEL
-# ----------
-#
-
-PATH=/bin:/usr/bin:/sbin
-SAVEDIR=/var/lib/dhclient
-
-LOGFACILITY="local7"
-LOGLEVEL="notice"
-
-logmessage() {
- msg="${1}"
- logger -p ${LOGFACILITY}.${LOGLEVEL} -t "NET" "dhclient: ${msg}"
-}
-
-save_previous() {
- origfile="${1}"
- savefile="${SAVEDIR}/${origfile##*/}.predhclient.${interface}"
-
- if [ ! -d ${SAVEDIR} ]; then
- mkdir -p ${SAVEDIR}
- fi
-
- if [ -e ${origfile} ]; then
- mv ${origfile} ${savefile}
- else
- echo > ${savefile}
- fi
-}
-
-make_resolv_conf() {
- [ "${PEERDNS}" = "no" ] && return
-
- if [ "${reason}" = "RENEW" ] &&
- [ "${new_domain_name}" = "${old_domain_name}" ] &&
- [ "${new_domain_name_servers}" = "${old_domain_name_servers}" ]; then
- return
- fi
-
- if [ -n "${new_domain_name}" ] ||
- [ -n "${new_domain_name_servers}" ] ||
- [ -n "${new_domain_search}" ]; then
- save_previous /etc/resolv.conf
- rscf="$(mktemp /tmp/XXXXXX)"
- echo "; generated by /sbin/dhclient-script" > ${rscf}
-
- if [ -n "${SEARCH}" ]; then
- echo "search ${SEARCH}" >> $rscf
- else
- if [ -n "${new_domain_search}" ]; then
- echo "search ${new_domain_search//\\032/ }" >> ${rscf}
- elif [ -n "${new_domain_name}" ]; then
- echo "search ${new_domain_name//\\032/ }" >> ${rscf}
- fi
- fi
-
- if [ -n "${RES_OPTIONS}" ]; then
- echo "options ${RES_OPTIONS}" >> ${rscf}
- fi
-
- for nameserver in ${new_domain_name_servers} ; do
- echo "nameserver ${nameserver}" >> ${rscf}
- done
-
- change_resolv_conf ${rscf}
- rm -f ${rscf}
- fi
-}
-
-exit_with_hooks() {
- exit_status="${1}"
-
- if [ -x /etc/dhclient-exit-hooks ]; then
- . /etc/dhclient-exit-hooks
- fi
-
- exit ${exit_status}
-}
-
-quad2num() {
- if [ $# -eq 4 ]; then
- let n="${1} << 24 | ${2} << 16 | ${3} << 8 | ${4}"
- echo "${n}"
- return 0
- else
- echo "0"
- return 1
- fi
-}
-
-ip2num() {
- IFS="." quad2num ${1}
-}
-
-num2ip() {
- let n="${1}"
- let o1="(n >> 24) & 0xff"
- let o2="(n >> 16) & 0xff"
- let o3="(n >> 8) & 0xff"
- let o4="n & 0xff"
- echo "${o1}.${o2}.${o3}.${o4}"
-}
-
-mask() {
- ip="${1}"
- m="${2}"
- let ip="$(IFS="." ip2num ${ip})"
- let m="$(IFS="." ip2num ${m})"
- let n="ip & m"
- num2ip ${n}
-}
-
-class_bits() {
- let ip=$(IFS='.' ip2num $1)
- let bits=32
- let mask='255'
- for ((i=0; i <= 3; i++, 'mask<<=8')); do
- let v='ip&mask'
- if [ "$v" -eq 0 ] ; then
- let bits-=8
- else
- break
- fi
- done
- echo $bits
-}
-
-is_router_reachable() {
- # handle DHCP servers that give us a router not on our subnet
- router="${1}"
- routersubnet="$(mask ${router} ${new_subnet_mask})"
- mysubnet="$(mask ${new_ip_address} ${new_subnet_mask})"
- unreachable=0
-
- if [ ! "${routersubnet}" = "${mysubnet}" ]; then
- unreachable=1
- if arping -f -q -I ${interface} -w2 ${router}; then
- ip route add ${router}/32 dev ${interface}
- if [ $? -eq 0 ]; then
- unreachable=0
- else
- logmessage "failed to create host router for unreachable router ${router} not on subnet ${mysubnet}"
- fi
- else
- unreachable=1
- logmessage "DHCP router ${router} is unreachable on DHCP subnet ${mysubnet} router subnet ${routersubnet}"
- fi
- fi
-
- return ${unreachable}
-}
-
-add_default_gateway() {
- router="${1}"
- metric=""
-
- if [ $# -gt 1 ] && [ ${2} -gt 0 ]; then
- metric="metric ${2}"
- fi
-
- if is_router_reachable ${router} ; then
- ip route replace default via ${router} dev ${interface} ${metric}
- if [ $? -ne 0 ]; then
- logmessage "failed to create default route: ${router} dev ${interface} ${metric}"
- return 1
- else
- return 0
- fi
- fi
-
- return 1
-}
-
-dhconfig() {
- if [ -n "${old_ip_address}" ] && [ -n "${alias_ip_address}" ] &&
- [ ! "${alias_ip_address}" = "${old_ip_address}" ]; then
- # possible new alias, remove old alias first
- ip -family inet addr del ${old_ip_address} dev ${interface}:0
- fi
-
- if [ -n "${old_ip_address}" ] &&
- [ ! "${old_ip_address}" = "${new_ip_address}" ]; then
- # IP address changed. Bringing down the interface will delete all
- # routes, and clear the ARP cache.
- ip -family inet addr flush dev ${interface} >/dev/null 2>&1
- ip -family inet link set dev ${interface} down
- fi
-
- if [ "${reason}" = "BOUND" ] || [ "${reason}" = "REBOOT" ] ||
- [ ! "${old_ip_address}" = "${new_ip_address}" ] ||
- [ ! "${old_subnet_mask}" = "${new_subnet_mask}" ] ||
- [ ! "${old_network_number}" = "${new_network_number}" ] ||
- [ ! "${old_broadcast_address}" = "${new_broadcast_address}" ] ||
- [ ! "${old_routers}" = "${new_routers}" ] ||
- [ ! "${old_interface_mtu}" = "${new_interface_mtu}" ]; then
- ip -family inet addr add ${new_ip_address}/${new_prefix} broadcast ${new_broadcast_address} dev ${interface}
-
- if [ -n "${new_interface_mtu}" ]; then
- ip link set ${interface} mtu ${new_interface_mtu}
- fi
-
- if [ -x /etc/dhclient-${interface}-up-hooks ]; then
- . /etc/dhclient-${interface}-up-hooks
- elif [ -x /etc/dhclient-up-hooks ]; then
- . /etc/dhclient-up-hooks
- fi
-
- if [[ (( -z "${GATEWAYDEV}" ) ||
- ( "${GATEWAYDEV}" = "${interface}" )) &&
- (( -z "$GATEWAY" ) ||
- (( -n "$DHCLIENT_IGNORE_GATEWAY" ) &&
- ( "$DHCLIENT_IGNORE_GATEWAY" = [Yy]* ))) ]]; then
- metric="${METRIC:-}"
- let i="${METRIC:-0}"
- default_routers=()
-
- for router in ${new_routers} ; do
- added_router=-
-
- for r in ${default_routers[@]} ; do
- if [ "${r}" = "${router}" ]; then
- added_router=1
- fi
- done
-
- if [ -z "${router}" ] ||
- [ "${added_router}" = "1" ] ||
- [ $(IFS=. ip2num ${router}) -le 0 ] ||
- [[ ( "${router}" = "${new_broadcast_address}" ) &&
- ( "${new_subnet_mask}" != "255.255.255.255" ) ]]; then
- continue
- fi
-
- default_routers=(${default_routers[@]} ${router})
- add_default_gateway ${router} ${metric}
- let i=i+1
- metric=${i}
- done
- elif [[ (( -z "${GATEWAYDEV}" ) ||
- ( "${GATEWAYDEV}" = "${interface}" )) &&
- ( -n "${GATEWAY}" ) ]]; then
- routersubnet=$(mask ${GATEWAY} ${new_subnet_mask})
- mysubnet=$(mask ${new_ip_address} ${new_subnet_mask})
-
- if [ "${routersubnet}" = "${mysubnet}" ]; then
- ip route replace default via ${GATEWAY} dev ${interface}
- fi
- fi
-
- # static routes
- if [ -n "${new_static_routes}" ]; then
- IFS=', |' static_routes=(${new_static_routes})
- route_targets=()
-
- for((i=0; i<${#static_routes[@]}; i+=2)); do
- target=${static_routes[$i]}
- gateway=${static_routes[$i+1]}
- metric=''
-
- for t in ${route_targets[@]}; do
- if [ ${t} = ${target} ]; then
- if [ -z "${metric}" ]; then
- metric=1
- else
- ((metric=metric+1))
- fi
- fi
- done
-
- if [ -n "${metric}" ]; then
- metric="metric ${metric}"
- fi
-
- if is_router_reachable ${gateway}; then
- ip route replace ${target}/$(class_bits ${target}) via ${gateway} dev ${interface} ${metric}
-
- if [ $? -ne 0 ]; then
- logmessage "failed to create static route: ${target}/$(class_bits ${target}) via ${gateway} dev ${interface} ${metric}"
- else
- route_targets=(${route_targets[@]} ${target})
- fi
- fi
- done
- fi
- fi
-
- if [ ! "${new_ip_address}" = "${alias_ip_address}" ] &&
- [ -n "${alias_ip_address}" ]; then
- ip -family inet addr flush dev ${interface}:0 >/dev/null 2>&1
- ip -family inet addr add ${alias_ip_address}/${alias_prefix} dev ${interface}:0
- ip route replace ${alias_ip_address}/32 dev ${interface}:0
- fi
-
- make_resolv_conf
-
- if [ -n "${new_host_name}" ] && need_hostname; then
- hostname ${new_host_name}
- fi
-
- if [ ! "${PEERNIS}" = "no" ]; then
- if [ -n "${new_nis_domain}" ]; then
- domainname "${new_nis_domain}"
- save_previous /etc/yp.conf
- let contents=0
- echo '# generated by /sbin/dhclient-script' > /etc/yp.conf
-
- if [ -n "${new_nis_servers}" ]; then
- for i in ${new_nis_servers} ; do
- echo "domain ${new_nis_domain} server ${i}" >> /etc/yp.conf
- let contents=contents+1
- done
- else
- echo "domain ${new_nis_domain} broadcast" >> /etc/yp.conf
- let contents=contents+1
- fi
-
- if [ ${contents} -gt 0 ]; then
- if [ -x /etc/rc.d/init.d/ypbind ] &&
- [ -r /var/run/ypbind.pid ]; then
- service ypbind restart >/dev/null 2>&1
- fi
- fi
- elif [ -n "${new_nis_servers}" ]; then
- save_previous /etc/yp.conf
- echo '# generated by /sbin/dhclient-script' > /etc/yp.conf
- let contents=0
-
- for i in ${new_nis_servers} ; do
- echo "ypserver ${i}" >> /etc/yp.conf
- let contents=contents+1
- done
-
- if [ $contents -gt 0 ]; then
- if [ -x /etc/rc.d/init.d/ypbind ] &&
- [ -r /var/run/ypbind.pid ]; then
- service ypbind restart >/dev/null 2>&1
- fi
- fi
- fi
- fi
-
- if [ -n "${DHCP_TIME_OFFSET_SETS_TIMEZONE}" ] &&
- [[ "${DHCP_TIME_OFFSET_SETS_TIMEZONE}" = [yY1]* ]]; then
- if [ -n "${new_time_offset}" ]; then
- # DHCP option "time-offset" is requested by default and should be
- # handled. The geographical zone abbreviation cannot be determined
- # from the GMT offset, but the $ZONEINFO/Etc/GMT$offset file can be
- # used - note: this disables DST.
- ((z=new_time_offset/3600))
- ((hoursWest=$(printf '%+d' $z)))
-
- if (( $hoursWest < 0 )); then
- # tzdata treats negative 'hours west' as positive 'gmtoff'!
- ((hoursWest*=-1))
- fi
-
- tzfile=/usr/share/zoneinfo/Etc/GMT$(printf '%+d' ${hoursWest})
- if [ -e ${tzfile} ]; then
- save_previous /etc/localtime
- cp -fp ${tzfile} /etc/localtime
- touch /etc/localtime
- fi
- fi
- fi
-
- if [ ! "${PEERNTP}" = "no" ] &&
- [ -n "${new_ntp_servers}" ] && [ -e /etc/ntp.conf ]; then
- save_previous /etc/ntp.conf
- egrep -v '^server .* # added by /sbin/dhclient-script$'< ${SAVEDIR}/ntp.conf.predhclient.${interface} > /etc/ntp.conf
-
- for s in ${new_ntp_servers} ; do
- echo "server ${s} # added by /sbin/dhclient-script" >> /etc/ntp.conf
- done
-
- diff -q /etc/ntp.conf ${SAVEDIR}/ntp.conf.predhclient.${interface} >/dev/null 2>&1
- if [ $? -eq 1 ]; then
- service ntpd condrestart >/dev/null 2>&1
- fi
- fi
-}
-
-get_prefix() {
- ip="${1}"
- nm="${2}"
-
- if [ -n "${ip}" -a -n "${nm}" ]; then
- ipcalc -s -p ${ip} ${nm} | cut -d '=' -f 2
- fi
-}
-
-
-#
-# ### MAIN
-#
-
-if [ -x /etc/dhclient-enter-hooks ]; then
- exit_status=0
-
- # dhclient-enter-hooks can abort dhclient-script by setting
- # the exit_status variable to a non-zero value
- . /etc/dhclient-enter-hooks
- if [ ${exit_status} -ne 0 ]; then
- exit ${exit_status}
- fi
-fi
-
-if [ ! -r /etc/sysconfig/network-scripts/network-functions ]; then
- echo "Missing /etc/sysconfig/network-scripts/network-functions, exiting." >&2
- exit 1
-fi
-
-if [ ! -r /etc/rc.d/init.d/functions ]; then
- echo "Missing /etc/rc.d/init.d/functions, exiting." >&2
- exit 1
-fi
-
-. /etc/sysconfig/network-scripts/network-functions
-. /etc/rc.d/init.d/functions
-
-if [ -f /etc/sysconfig/network ]; then
- . /etc/sysconfig/network
-fi
-
-if [ -f /etc/sysconfig/networking/network ]; then
- . /etc/sysconfig/networking/network
-fi
-
-CONFIG="/etc/sysconfig/network-scripts/ifcfg-${interface}"
-need_config ${CONFIG}
-source_config >/dev/null 2>&1
-
-new_prefix="$(get_prefix ${new_ip_address} ${new_subnet_mask})"
-old_prefix="$(get_prefix ${old_ip_address} ${new_subnet_mask})"
-alias_prefix="$(get_prefix ${alias_ip_address} ${alias_subnet_mask})"
-
-case "${reason}" in
- MEDIUM)
- # Linux doesn't handle mediums (media)
- exit_with_hooks 0
- ;;
-
- PREINIT)
- if [ -n "${alias_ip_address}" ]; then
- # Bring down alias interface, its routes will disappear too.
- ip -family inet link set ${interface}:0 down
- fi
-
- if [ "${keep_old_ip}" = "yes" ]; then
- ip -family inet link set ${interface} up
- else
- ip -family inet addr flush dev ${interface} >/dev/null 2>&1
- ip -family inet link set ${interface} up
- fi
-
- if [ -n "${DHCLIENT_DELAY}" ] && [ ${DHCLIENT_DELAY} -gt 0 ]; then
- sleep ${DHCLIENT_DELAY}
- fi
-
- exit_with_hooks 0
- ;;
-
- ARPCHECK|ARPSEND)
- if [ -z "${new_ip_address}" ] || [ -z "${interface}" ] ||
- arping -q -f -c 2 -w 3 -D -I ${interface} ${new_ip_address}; then
- exit_with_hooks 0
- else
- exit_with_hooks 1
- fi
- ;;
-
- BOUND|RENEW|REBIND|REBOOT)
- dhconfig
- exit_with_hooks 0
- ;;
-
- EXPIRE|FAIL|RELEASE|STOP)
- # only restore config files if there are no other dhclient processes
- # running (#306381)
- any_other_clients="$(ps -eo pid,ppid,comm | grep dhclient | grep -v ${PPID})"
- if [ -n "${any_other_clients}" ]; then
- if [ -f ${SAVEDIR}/resolv.conf.predhclient.${interface} ]; then
- change_resolv_conf ${SAVEDIR}/resolv.conf.predhclient.${interface}
- rm -f ${SAVEDIR}/resolv.conf.predhclient.${interface}
- fi
-
- if [ -n "${DHCP_TIME_OFFSET_SETS_TIMEZONE}" ] &&
- [[ "${DHCP_TIME_OFFSET_SETS_TIMEZONE}" = [yY1]* ]]; then
- if [ -e ${SAVEDIR}/localtime.predhclient.${interface} ]; then
- rm -f /etc/localtime
- mv ${SAVEDIR}/localtime.predhclient.${interface} /etc/localtime
- touch /etc/localtime
- fi
- fi
-
- if [ -f ${SAVEDIR}/ntp.conf.predhclient.${interface} ]; then
- rm -f /etc/ntp.conf
- mv -f ${SAVEDIR}/ntp.conf.predhclient.${interface} /etc/ntp.conf
- service ntpd condrestart >/dev/null 2>&1
- fi
-
- if [ -f ${SAVEDIR}/yp.conf.predhclient.${interface} ]; then
- rm -f /etc/yp.conf
- mv -f ${SAVEDIR}/yp.conf.predhclient.${interface} /etc/yp.conf
- if [ -x /etc/rc.d/init.d/ypbind ] && [ -r /var/run/ypbind.pid ]; then
- service ypbind restart >/dev/null 2>&1
- fi
- fi
- fi
-
- if [ -x /etc/dhclient-${interface}-down-hooks ]; then
- . /etc/dhclient-${interface}-down-hooks
- elif [ -x /etc/dhclient-down-hooks ]; then
- . /etc/dhclient-down-hooks
- fi
-
- if [ -n "${alias_ip_address}" ]; then
- # Turn off alias interface
- ip -family inet link set ${interface}:0 down
- fi
-
- if [ -n "${old_ip_address}" ]; then
- # Shut down interface, which will delete routes and clear arp cache.
- ip -family inet addr flush dev ${interface} >/dev/null 2>&1
- ip -family inet link set ${interface} down
- fi
-
- if [ -n "${alias_ip_address}" ]; then
- ip -family inet addr add ${alias_ip_address}/${alias_prefix} dev ${interface}:0
- ip -family inet route replace ${alias_ip_address}/32 ${interface}:0
- fi
-
- exit_with_hooks 0
- ;;
-
- TIMEOUT)
- if [ -n "${new_routers}" ]; then
- if [ -n "${alias_ip_address}" ]; then
- ip -family inet addr flush dev ${interface}:0 >/dev/null 2>&1
- fi
-
- ip -family inet addr add ${new_ip_address}/${new_prefix} broadcast ${new_broadcast_address} dev ${interface}
- set ${new_routers}
-
- if ping -q -c 1 -w 10 -I ${interface} ${1}; then
- dhconfig
- exit_with_hooks 0
- fi
-
- ip -family inet addr flush dev ${interface} >/dev/null 2>&1
- ip -family inet link set ${interface} down
- exit_with_hooks 1
- else
- exit_with_hooks 1
- fi
- ;;
-
- *)
- logmessage "unhandled state: ${reason}"
- exit_with_hooks 1
- ;;
-esac
-
-exit_with_hooks 0
diff --git a/dhcp/dhcp.nm b/dhcp/dhcp.nm
index f97734b..407873b 100644
--- a/dhcp/dhcp.nm
+++ b/dhcp/dhcp.nm
@@ -5,7 +5,7 @@
name = dhcp
version = 4.2.4
-release = 1
+release = 2
groups = Networking/Daemons
url = http://isc.org/products/DHCP/
@@ -113,14 +113,6 @@ build
install_cmds
rm -vf %{BUILDROOT}%{sysconfdir}/dhcp/dhclient.conf
- # Move the client to /sbin, create dirs
- # and remove the default config.
- mkdir -pv %{BUILDROOT}/sbin
- mv -v %{BUILDROOT}/usr/sbin/dhclient %{BUILDROOT}/sbin/dhclient
-
- install -v -m 755 %{DIR_SOURCE}/dhclient-script \
- %{BUILDROOT}/sbin/dhclient-script
-
# Create runtime folders.
mkdir -pv %{BUILDROOT}/var/lib/dhclient
mkdir -pv %{BUILDROOT}/var/lib/dhcpd
@@ -190,11 +182,12 @@ packages
requires
dhcp-common = %{thisver}
dhcp-libs = %{thisver}
+ %{sbindir}/dhclient-script
end
files
%{unitdir}/dhclient*.service
- /sbin
+ %{sbindir}/dhclient
/usr/share/man/man5/dhclient*
/usr/share/man/man8/dhclient*
/var/lib/dhclient
diff --git a/hostapd/hostapd.nm b/hostapd/hostapd.nm
index 359add5..5e7351b 100644
--- a/hostapd/hostapd.nm
+++ b/hostapd/hostapd.nm
@@ -5,7 +5,7 @@
name = hostapd
version = 1.0
-release = 1
+release = 2
groups = Networking/Tools
url = http://hostap.epitest.fi/hostapd/
diff --git a/hostapd/systemd/hostapd@.service b/hostapd/systemd/hostapd@.service
index 0fbfab5..b0c0a12 100644
--- a/hostapd/systemd/hostapd@.service
+++ b/hostapd/systemd/hostapd@.service
@@ -2,6 +2,9 @@
Description=hostap daemon on %I
[Service]
-ExecStart=/usr/sbin/hostapd -P /run/network/hostapd/%I/pid /run/network/hostapd/%I/config
+ExecStartPre=/usr/lib/network/helpers/hostapd-config-helper create %I
+ExecStart=/usr/sbin/hostapd -P /run/hostapd/%I.pid /run/network/ports/%I/hostapd.conf
+ExecStopPost=/usr/lib/network/helpers/hostapd-config-helper remove %I
+Restart=on-failure
UtmpIdentifier=%I
KillMode=process
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1fc643684a25cac48de05722b47d76874b51fbe2
by gitï¼ ipfire.org 06 Oct '12
by gitï¼ ipfire.org 06 Oct '12
06 Oct '12
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 1fc643684a25cac48de05722b47d76874b51fbe2 (commit)
from 4fec525d81f9fbb94d12990823a1d063c1e96681 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1fc643684a25cac48de05722b47d76874b51fbe2
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Sat Oct 6 19:10:16 2012 +0200
libstatgrab: New package.
-----------------------------------------------------------------------
Summary of changes:
libstatgrab/libstatgrab.nm | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
create mode 100644 libstatgrab/libstatgrab.nm
Difference in files:
diff --git a/libstatgrab/libstatgrab.nm b/libstatgrab/libstatgrab.nm
new file mode 100644
index 0000000..5116b5d
--- /dev/null
+++ b/libstatgrab/libstatgrab.nm
@@ -0,0 +1,41 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = libstatgrab
+version = 0.17
+release = 1
+
+groups = System/Libraries
+url = http://www.i-scream.org/libstatgrab/
+license = GNUv2
+summary = Provides access to statistics about the system.
+
+description
+ libstatgrab is a library that provides statistics about the system on
+ which it's run. It's written in C and presents a selection of useful
+ interfaces which can be used to access key system statistics.
+ The current list of statistics includes CPU usage, memory utilisation,
+ disk usage, process counts, network traffic, disk I/O, and more.
+end
+
+source_dl = ftp://ftp.uk.i-scream.org/pub/i-scream/libstatgrab/
+
+build
+ requires
+ ncurses-devel
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-devel
+ template DEVEL
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4fec525d81f9fbb94d12990823a1d063c1e96681
by gitï¼ ipfire.org 03 Oct '12
by gitï¼ ipfire.org 03 Oct '12
03 Oct '12
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 4fec525d81f9fbb94d12990823a1d063c1e96681 (commit)
via 1f6a2693b495f2d20ebf13dc7c95d68f9ee141b6 (commit)
via e035b2dfaf87bcfe34b63a8b79a645b5d3038fdd (commit)
via e40e92128e48e0e56c18561ffd5a77e5f7b7d800 (commit)
from 405f79679ce3fe8ef7a9279f27f26d50056f15f0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4fec525d81f9fbb94d12990823a1d063c1e96681
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 3 20:53:03 2012 +0200
pakfire: Import latest patches from upstream.
commit 1f6a2693b495f2d20ebf13dc7c95d68f9ee141b6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 3 20:39:16 2012 +0200
python-tornado: Build for Python 3.
commit e035b2dfaf87bcfe34b63a8b79a645b5d3038fdd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 3 20:38:53 2012 +0200
python-setuptools: Build for Python 3.
commit e40e92128e48e0e56c18561ffd5a77e5f7b7d800
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 3 20:29:42 2012 +0200
network: Reapply dependencies.
-----------------------------------------------------------------------
Summary of changes:
network/network.nm | 6 +-
pakfire/pakfire.nm | 2 +-
...-QA-Remove-obsoleted-python-hardlink-tool.patch | 39 +++++++++++++++++
...ompile-Make-script-more-robust-for-errors.patch | 45 +++++++++++++++++++
python-setuptools/python-setuptools.nm | 46 ++++++++++++++++---
python-tornado/python-tornado.nm | 39 ++++++++++++++--
6 files changed, 160 insertions(+), 17 deletions(-)
create mode 100644 pakfire/patches/0007-QA-Remove-obsoleted-python-hardlink-tool.patch
create mode 100644 pakfire/patches/0008-py-compile-Make-script-more-robust-for-errors.patch
Difference in files:
diff --git a/network/network.nm b/network/network.nm
index 23f01cf..83781fd 100644
--- a/network/network.nm
+++ b/network/network.nm
@@ -6,7 +6,7 @@
name = network
epoch = 1
version = 005
-release = 1.1
+release = 1.2
arch = noarch
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -37,7 +37,7 @@ packages
requires
aiccu
bash >= 4.0
- #dhcp >= 4.2.4-1
+ dhcp >= 4.2.4-1
ebtables
hostapd
initscripts >= 1:2.99-18
@@ -52,7 +52,7 @@ packages
sqlite
systemd-units
tunctl
- #wpa_supplicant >= 1.0-2
+ wpa_supplicant >= 1.0-2
/usr/bin/ipcalc
/usr/bin/logger
end
diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index d862b32..501e9cc 100644
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -5,7 +5,7 @@
name = pakfire
version = 0.9.23
-release = 3
+release = 4
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = System/Packaging
diff --git a/pakfire/patches/0007-QA-Remove-obsoleted-python-hardlink-tool.patch b/pakfire/patches/0007-QA-Remove-obsoleted-python-hardlink-tool.patch
new file mode 100644
index 0000000..869118d
--- /dev/null
+++ b/pakfire/patches/0007-QA-Remove-obsoleted-python-hardlink-tool.patch
@@ -0,0 +1,39 @@
+From 99c47627b24f5a16897aa85ed83eb3919ea6ea85 Mon Sep 17 00:00:00 2001
+From: Michael Tremer <michael.tremer(a)ipfire.org>
+Date: Wed, 3 Oct 2012 01:02:06 +0200
+Subject: [PATCH 7/8] QA: Remove obsoleted python hardlink tool.
+
+---
+ tools/quality-agent.d/090-python-hardlinks | 20 --------------------
+ 1 file changed, 20 deletions(-)
+ delete mode 100755 tools/quality-agent.d/090-python-hardlinks
+
+diff --git a/tools/quality-agent.d/090-python-hardlinks b/tools/quality-agent.d/090-python-hardlinks
+deleted file mode 100755
+index e2abf76..0000000
+--- a/tools/quality-agent.d/090-python-hardlinks
++++ /dev/null
+@@ -1,20 +0,0 @@
+-#!/bin/bash
+-
+-. $(dirname ${0})/qa-include
+-
+-DESC="Python byte-code files could be hardlinked if the optimized one is equal"
+-DESC="${DESC} to the other one."
+-
+-function check() {
+- for py in $(find ${BUILDROOT} -type f -name "*.py"); do
+- if [ -e "${py}c" ] && [ -e "${py}o" ]; then
+- if cmp -s "${py}c" "${py}o"; then
+- log DEBUG " ${py}c -> ${py}o"
+- ln -f "${py}c" "${py}o"
+- fi
+- fi
+- done
+-}
+-
+-run
+-
+--
+1.7.11.4
+
diff --git a/pakfire/patches/0008-py-compile-Make-script-more-robust-for-errors.patch b/pakfire/patches/0008-py-compile-Make-script-more-robust-for-errors.patch
new file mode 100644
index 0000000..59c3922
--- /dev/null
+++ b/pakfire/patches/0008-py-compile-Make-script-more-robust-for-errors.patch
@@ -0,0 +1,45 @@
+From 61918bfab20eaba61bb8ce7e8397a28806d029d2 Mon Sep 17 00:00:00 2001
+From: Michael Tremer <michael.tremer(a)ipfire.org>
+Date: Wed, 3 Oct 2012 14:56:41 +0200
+Subject: [PATCH 8/8] py-compile: Make script more robust for errors.
+
+---
+ tools/py-compile | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/tools/py-compile b/tools/py-compile
+index 5ccd8f9..2749042 100755
+--- a/tools/py-compile
++++ b/tools/py-compile
+@@ -33,14 +33,18 @@ tempfile=$(mktemp)
+ trap "rm -f ${tempfile}" EXIT
+
+ cat > ${tempfile} <<EOF
++import os
+ import py_compile
+ import sys
+
+ for file in sys.argv[1:]:
++ if not os.path.exists(file):
++ continue
++
+ py_compile.compile(file, doraise=0)
+ EOF
+
+-filelist=$(find ${paths} -type f -a -name "*.py")
++filelist=$(find ${paths} -type f -a -name "*.py" 2>/dev/null)
+
+ # Compile with optimization.
+ ${python_interpreter} -O ${tempfile} ${filelist}
+@@ -49,7 +53,7 @@ ${python_interpreter} -O ${tempfile} ${filelist}
+ ${python_interpreter} ${tempfile} ${filelist}
+
+ # Hardlink identical files.
+-for pyc in $(find ${paths} -type f -a -name "*.pyc"); do
++for pyc in $(find ${paths} -type f -a -name "*.pyc" 2>/dev/null); do
+ pyo="${pyc/.pyc/.pyo}"
+
+ if cmp -s "${pyc}" "${pyo}"; then
+--
+1.7.11.4
+
diff --git a/python-setuptools/python-setuptools.nm b/python-setuptools/python-setuptools.nm
index e4d8fe8..01cca94 100644
--- a/python-setuptools/python-setuptools.nm
+++ b/python-setuptools/python-setuptools.nm
@@ -5,7 +5,7 @@
name = python-setuptools
version = 0.6.28
-release = 1
+release = 2
arch = noarch
thisapp = distribute-%{version}
@@ -25,32 +25,62 @@ source_dl = http://pypi.python.org/packages/source/d/distribute/
build
requires
+ pakfire-builder >= 0.9.23-2
python-devel
+ python3-devel
end
+ DIR_APP3 = %{DIR_APP}-python3
+
prepare_cmds
+ cp -av %{DIR_APP} %{DIR_APP3}
+
+ pushd %{DIR_APP3}
+ for file in setuptools/command/easy_install.py distribute_setup.py ; do
+ sed -i '1s|^#!python|#!%{python3}|' $file
+ done
+ popd
+
# Scripts seem to have a wrong hashbang
for file in setuptools/command/easy_install.py distribute_setup.py ; do
- sed -i '1s|^#!python|#!/usr/bin/python|' $file
+ sed -i '1s|^#!python|#!%{python}|' $file
done
# Fix file permissions.
- chmod -R 644 %{DIR_APP}/distribute.egg-info
+ chmod -R 644 {%{DIR_APP},%{DIR_APP3}}/distribute.egg-info
end
build
- CFLAGS="%{CFLAGS}" python setup.py build
+ pushd %{DIR_APP3}
+ CFLAGS="%{CFLAGS}" %{python3} setup.py build
+ popd
+
+ CFLAGS="%{CFLAGS}" %{python} setup.py build
end
install
- python setup.py install --skip-build --root=%{BUILDROOT}
+ pushd %{DIR_APP3}
+ %{python3} setup.py install --skip-build --root=%{BUILDROOT}
- # XXX %{PYTHON_EXTRACT_EGG} /usr/lib/python*/site-packages/%{name}*.egg
- rm -vf %{BUILDROOT}/usr/lib/python*/site-packages/setuptools/*.exe
- rm -rvf %{BUILDROOT}/usr/lib/python*/site-packages/setuptools/tests
+ rm -rvf %{BUILDROOT}%{python3_sitelib}/setuptools/tests
+ chmod +x %{BUILDROOT}%{python3_sitelib}/setuptools/command/easy_install.py
+ popd
+
+ %{python} setup.py install --skip-build --root=%{BUILDROOT}
+
+ rm -rvf %{BUILDROOT}%{python_sitelib}/setuptools/tests
+ chmod +x %{BUILDROOT}%{python_sitelib}/setuptools/command/easy_install.py
+
+ find %{BUILDROOT}{%{python_sitelib},%{python3_sitelib}} -name "*.exe" | xargs rm -vf
end
end
packages
package %{name}
+
+ package python3-setuptools
+ template PYTHON3
+
+ files += %{bindir}/easy_install-3*
+ end
end
diff --git a/python-tornado/python-tornado.nm b/python-tornado/python-tornado.nm
index 1242655..78fcbba 100644
--- a/python-tornado/python-tornado.nm
+++ b/python-tornado/python-tornado.nm
@@ -4,7 +4,7 @@
###############################################################################
name = python-tornado
-version = 0.2
+version = 2.4
release = 1
arch = noarch
thisapp = tornado-%{version}
@@ -12,7 +12,7 @@ thisapp = tornado-%{version}
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = Development/Libraries
url = http://www.tornadoweb.org/
-license = Apache2.0
+license = ASL 2.0
summary = A python based non-blocking web server.
description
@@ -21,22 +21,51 @@ description
and reasonably fast.
end
-source_dl =
+source_dl = http://github.com/downloads/facebook/tornado/
build
requires
+ pakfire-builder >= 0.9.23-2
python-devel
+ python3-devel
+ python3-setuptools
+ python3-tools
+ end
+
+ DIR_APP3 = %{DIR_APP}-python3
+
+ prepare_cmds
+ find tornado -name "*py" | xargs sed -e '/^#!\//, 1d' -i
+
+ cp -a %{DIR_APP} %{DIR_APP3}
+ 2to3 --write --nobackups %{DIR_APP3}
end
build
- python setup.py build
+ pushd %{DIR_APP3}
+ %{python3} setup.py build
+ popd
+
+ %{python} setup.py build
end
install
- python setup.py install --skip-build --root=%{BUILDROOT}
+ pushd %{DIR_APP3}
+ %{python3} setup.py install --skip-build --root=%{BUILDROOT}
+ popd
+
+ %{python} setup.py install --skip-build --root=%{BUILDROOT}
end
end
packages
package %{name}
+ requires
+ python-pycurl
+ end
+ end
+
+ package python3-tornado
+ template PYTHON3
+ end
end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 405f79679ce3fe8ef7a9279f27f26d50056f15f0
by gitï¼ ipfire.org 03 Oct '12
by gitï¼ ipfire.org 03 Oct '12
03 Oct '12
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 405f79679ce3fe8ef7a9279f27f26d50056f15f0 (commit)
from cf8d9c33032cbf9269cb4101229a4171defc77d1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 405f79679ce3fe8ef7a9279f27f26d50056f15f0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 3 20:19:18 2012 +0200
network: Remove some dependencies to get the build through.
-----------------------------------------------------------------------
Summary of changes:
network/network.nm | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
Difference in files:
diff --git a/network/network.nm b/network/network.nm
index 0510263..23f01cf 100644
--- a/network/network.nm
+++ b/network/network.nm
@@ -6,7 +6,7 @@
name = network
epoch = 1
version = 005
-release = 1
+release = 1.1
arch = noarch
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -37,9 +37,10 @@ packages
requires
aiccu
bash >= 4.0
- dhcp >= 4.2.4-1
+ #dhcp >= 4.2.4-1
ebtables
hostapd
+ initscripts >= 1:2.99-18
iproute2
iw
man
@@ -51,8 +52,8 @@ packages
sqlite
systemd-units
tunctl
- wpa_supplicant >= 1.0-2
- /usr/bin/ipcalc >= 2.99-18
+ #wpa_supplicant >= 1.0-2
+ /usr/bin/ipcalc
/usr/bin/logger
end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. cf8d9c33032cbf9269cb4101229a4171defc77d1
by gitï¼ ipfire.org 03 Oct '12
by gitï¼ ipfire.org 03 Oct '12
03 Oct '12
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via cf8d9c33032cbf9269cb4101229a4171defc77d1 (commit)
via e8744052f2b8bee4d7581ad3b501a977187dc22f (commit)
via 7748d56fa7bf229f351ff63210d97e9e900f1237 (commit)
via 6205da65c5aad2269a62ce3b81f55dd0b6c4dfcc (commit)
via e1b23d7a13d9a516e75079a3c17ca626965491bc (commit)
via 444c11848eb724d4aa47edf0e39af1c16320243a (commit)
via b781eae54d011280936fea367d0be6f6e2bd8c2a (commit)
from c08a5fb64f9b6359f63dbc35168e89e31e0aa7d0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cf8d9c33032cbf9269cb4101229a4171defc77d1
Merge: e874405 c08a5fb
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 3 17:53:29 2012 +0000
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit e8744052f2b8bee4d7581ad3b501a977187dc22f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 3 17:48:12 2012 +0000
network: Update to 005.
commit 7748d56fa7bf229f351ff63210d97e9e900f1237
Merge: 6205da6 444c118
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 3 17:40:43 2012 +0000
Merge branch 'dhcp'
commit 6205da65c5aad2269a62ce3b81f55dd0b6c4dfcc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 3 17:40:04 2012 +0000
wpa_supplicant: Add systemd unit file.
commit e1b23d7a13d9a516e75079a3c17ca626965491bc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 3 17:26:39 2012 +0000
initscripts: Enhance ipcalc with IPv6 implode/explode.
commit 444c11848eb724d4aa47edf0e39af1c16320243a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Sep 15 09:12:10 2012 +0000
dhcp: Update to 4.2.4.
Fixes configuration files, defined in the systemd unit files.
commit b781eae54d011280936fea367d0be6f6e2bd8c2a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Sep 9 16:09:55 2012 +0000
dhcp: Fix some configuration paths.
Enable automatic generation of configuration files
for the server daemons.
-----------------------------------------------------------------------
Summary of changes:
dhcp/dhcp.nm | 71 ++--
dhcp/patches/dhcp-4.2.0-CLOEXEC.patch | 422 -------------------
dhcp/patches/dhcp-4.2.0-inherit-leases.patch | 34 --
dhcp/patches/dhcp-4.2.0-noprefixavail.patch | 140 -------
dhcp/patches/dhcp-4.2.0-paths.patch | 45 --
dhcp/patches/dhcp-4.2.1-P1-CVE-2011-0997.patch | 16 -
.../patches/dhcp-4.2.1-invalid-dhclient-conf.patch | 12 -
dhcp/patches/dhcp-4.2.2-CLOEXEC.patch | 60 ---
dhcp/patches/dhcp-4.2.2-capability.patch | 73 ----
dhcp/patches/dhcp-4.2.2-gpxe-cid.patch | 53 +---
dhcp/patches/dhcp-4.2.2-sharedlib.patch | 57 +--
dhcp/patches/dhcp-4.2.3-P2-log_perror.patch | 11 +
...2-rfc5970-dhcpv6-options-for-network-boot.patch | 89 ++++
.../dhcp-4.2.3-dhclient-decline-onetry.patch | 27 ++
dhcp/patches/dhcp-4.2.3-paranoia.patch | 49 +++
...e.patch => dhcp-4.2.4-64_bit_lease_parse.patch} | 36 +-
....4-P1-dhclient6-leases_semicolon_expected.patch | 41 ++
dhcp/patches/dhcp-4.2.4-P1-interval.patch | 25 ++
dhcp/patches/dhcp-4.2.4-P1-remove-dst.patch | 46 ++
.../{dhcp-4.2.0-PPP.patch => dhcp-4.2.4-PPP.patch} | 64 ++--
...lticast.patch => dhcp-4.2.4-UseMulticast.patch} | 38 ++-
dhcp/patches/dhcp-4.2.4-failOverPeer.patch | 12 +
dhcp/patches/dhcp-4.2.4-getifaddrs.patch | 431 ++++++++++++++++++++
...ved-xid.patch => dhcp-4.2.4-improved-xid.patch} | 40 +-
...-4.2.2-lpf-ib.patch => dhcp-4.2.4-lpf-ib.patch} | 175 +++++----
....2.2-options.patch => dhcp-4.2.4-options.patch} | 76 ++--
dhcp/patches/dhcp-4.2.4-paths.patch | 26 ++
...cp-4.2.4-rfc3442-classless-static-routes.patch} | 92 ++--
dhcp/patches/dhcp-4.2.4-send_release.patch | 23 +
...-systemtap.patch => dhcp-4.2.4-systemtap.patch} | 182 ++++-----
...-bootp.patch => dhcp-4.2.4-unicast-bootp.patch} | 32 +-
dhcp/systemd/dhcpd.service | 5 +-
dhcp/systemd/dhcpd6.service | 5 +-
initscripts/initscripts.nm | 2 +-
...Enhance-to-implode-explode-IPv6-addresses.patch | 93 +++++
.../0001-ipcalc-Implement-prefix-for-IPv6.patch | 84 ++++
network/network.nm | 10 +-
wpa_supplicant/systemd/wpa_supplicant@.service | 11 +
wpa_supplicant/wpa_supplicant.nm | 4 +-
39 files changed, 1412 insertions(+), 1300 deletions(-)
delete mode 100644 dhcp/patches/dhcp-4.2.0-CLOEXEC.patch
delete mode 100644 dhcp/patches/dhcp-4.2.0-inherit-leases.patch
delete mode 100644 dhcp/patches/dhcp-4.2.0-noprefixavail.patch
delete mode 100644 dhcp/patches/dhcp-4.2.0-paths.patch
delete mode 100644 dhcp/patches/dhcp-4.2.1-P1-CVE-2011-0997.patch
delete mode 100644 dhcp/patches/dhcp-4.2.1-invalid-dhclient-conf.patch
create mode 100644 dhcp/patches/dhcp-4.2.3-P2-log_perror.patch
create mode 100644 dhcp/patches/dhcp-4.2.3-P2-rfc5970-dhcpv6-options-for-network-boot.patch
create mode 100644 dhcp/patches/dhcp-4.2.3-dhclient-decline-onetry.patch
create mode 100644 dhcp/patches/dhcp-4.2.3-paranoia.patch
rename dhcp/patches/{dhcp-4.2.1-64_bit_lease_parse.patch => dhcp-4.2.4-64_bit_lease_parse.patch} (64%)
create mode 100644 dhcp/patches/dhcp-4.2.4-P1-dhclient6-leases_semicolon_expected.patch
create mode 100644 dhcp/patches/dhcp-4.2.4-P1-interval.patch
create mode 100644 dhcp/patches/dhcp-4.2.4-P1-remove-dst.patch
rename dhcp/patches/{dhcp-4.2.0-PPP.patch => dhcp-4.2.4-PPP.patch} (65%)
rename dhcp/patches/{dhcp-4.2.0-UseMulticast.patch => dhcp-4.2.4-UseMulticast.patch} (85%)
create mode 100644 dhcp/patches/dhcp-4.2.4-failOverPeer.patch
create mode 100644 dhcp/patches/dhcp-4.2.4-getifaddrs.patch
rename dhcp/patches/{dhcp-4.2.2-improved-xid.patch => dhcp-4.2.4-improved-xid.patch} (78%)
rename dhcp/patches/{dhcp-4.2.2-lpf-ib.patch => dhcp-4.2.4-lpf-ib.patch} (79%)
rename dhcp/patches/{dhcp-4.2.2-options.patch => dhcp-4.2.4-options.patch} (82%)
create mode 100644 dhcp/patches/dhcp-4.2.4-paths.patch
rename dhcp/patches/{dhcp-4.2.2-rfc3442-classless-static-routes.patch => dhcp-4.2.4-rfc3442-classless-static-routes.patch} (81%)
create mode 100644 dhcp/patches/dhcp-4.2.4-send_release.patch
rename dhcp/patches/{dhcp-4.2.2-systemtap.patch => dhcp-4.2.4-systemtap.patch} (76%)
rename dhcp/patches/{dhcp-4.2.0-unicast-bootp.patch => dhcp-4.2.4-unicast-bootp.patch} (72%)
create mode 100644 initscripts/patches/0001-ipcalc-Enhance-to-implode-explode-IPv6-addresses.patch
create mode 100644 initscripts/patches/0001-ipcalc-Implement-prefix-for-IPv6.patch
create mode 100644 wpa_supplicant/systemd/wpa_supplicant@.service
Difference in files:
diff --git a/dhcp/dhcp.nm b/dhcp/dhcp.nm
index c2db7d2..f97734b 100644
--- a/dhcp/dhcp.nm
+++ b/dhcp/dhcp.nm
@@ -4,8 +4,8 @@
###############################################################################
name = dhcp
-version = 4.2.2
-release = 4
+version = 4.2.4
+release = 1
groups = Networking/Daemons
url = http://isc.org/products/DHCP/
@@ -20,41 +20,49 @@ description
easier to administer a large network.
end
-source_dl = ftp://ftp.isc.org/isc/dhcp/
+source_dl = ftp://ftp.isc.org/isc/dhcp/%{version}/
# Apply patches in a special order.
patches = \
dhcp-4.2.2-remove-bind.patch \
+ dhcp-4.2.4-P1-remove-dst.patch \
dhcp-4.2.0-errwarn-message.patch \
- dhcp-4.2.2-options.patch \
+ dhcp-4.2.4-options.patch \
dhcp-4.2.0-release-by-ifup.patch \
dhcp-4.2.0-dhclient-decline-backoff.patch \
- dhcp-4.2.0-unicast-bootp.patch \
+ dhcp-4.2.4-unicast-bootp.patch \
dhcp-4.2.2-dhclient-usage.patch \
dhcp-4.2.0-default-requested-options.patch \
dhcp-4.2.2-xen-checksum.patch \
dhcp-4.2.1-manpages.patch \
- dhcp-4.2.0-paths.patch \
+ dhcp-4.2.4-paths.patch \
dhcp-4.2.2-CLOEXEC.patch \
- dhcp-4.2.0-inherit-leases.patch \
dhcp-4.2.0-garbage-chars.patch \
dhcp-4.2.0-missing-ipv6-not-fatal.patch \
dhcp-4.2.0-add_timeout_when_NULL.patch \
- dhcp-4.2.1-64_bit_lease_parse.patch \
+ dhcp-4.2.4-64_bit_lease_parse.patch \
dhcp-4.2.2-capability.patch \
dhcp-4.2.0-logpid.patch \
- dhcp-4.2.0-UseMulticast.patch \
+ dhcp-4.2.4-UseMulticast.patch \
dhcp-4.2.1-sendDecline.patch \
dhcp-4.2.1-retransmission.patch \
- dhcp-4.2.2-rfc3442-classless-static-routes.patch \
+ dhcp-4.2.4-rfc3442-classless-static-routes.patch \
dhcp-4.2.0-honor-expired.patch \
- dhcp-4.2.0-noprefixavail.patch \
dhcp-4.2.2-sharedlib.patch \
- dhcp-4.2.0-PPP.patch \
- dhcp-4.2.2-lpf-ib.patch \
- dhcp-4.2.2-improved-xid.patch \
+ dhcp-4.2.4-PPP.patch \
+ dhcp-4.2.3-paranoia.patch \
+ dhcp-4.2.4-lpf-ib.patch \
+ dhcp-4.2.4-improved-xid.patch \
dhcp-4.2.2-gpxe-cid.patch \
- dhcp-4.2.2-systemtap.patch
+ dhcp-4.2.4-systemtap.patch \
+ dhcp-4.2.3-dhclient-decline-onetry.patch \
+ dhcp-4.2.3-P2-log_perror.patch \
+ dhcp-4.2.4-getifaddrs.patch \
+ dhcp-4.2.4-send_release.patch \
+ dhcp-4.2.3-P2-rfc5970-dhcpv6-options-for-network-boot.patch \
+ dhcp-4.2.4-failOverPeer.patch \
+ dhcp-4.2.4-P1-dhclient6-leases_semicolon_expected.patch \
+ dhcp-4.2.4-P1-interval.patch
build
requires
@@ -69,15 +77,12 @@ build
systemd-units
end
- CFLAGS += \
- -fno-strict-aliasing \
- -D_GNU_SOURCE \
- -Wl,--as-needed
+ CFLAGS += -fno-strict-aliasing
configure_options += \
- --sysconfdir=/etc \
+ --sysconfdir=%{sysconfdir}/dhcp \
--with-srv-lease-file=/var/lib/dhcpd/dhcpd.leases \
- --with-srv6-lease-file=/var/lib/dhcpd/dhcp6.leases \
+ --with-srv6-lease-file=/var/lib/dhcpd/dhcpd6.leases \
--with-cli-lease-file=/var/lib/dhclient/dhclient.leases \
--with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases \
--with-srv-pid-file=/run/dhcpd.pid \
@@ -97,13 +102,16 @@ build
# Remove bundled BIND source
rm -rvf %{DIR_APP}/bind/bind.tar.gz
+ # Remove dst.
+ rm -rvf dst includes/isc-dhcp
+
# Regenerate build environment
- libtoolize --copy --force
+ #libtoolize --copy --force
autoreconf --verbose --force --install
end
install_cmds
- rm -vf %{BUILDROOT}/etc/dhclient.conf
+ rm -vf %{BUILDROOT}%{sysconfdir}/dhcp/dhclient.conf
# Move the client to /sbin, create dirs
# and remove the default config.
@@ -127,19 +135,23 @@ end
packages
package %{name}
-
requires
- dhcp-common
+ dhcp-common = %{thisver}
+ dhcp-libs = %{thisver}
+ /usr/lib/network/helpers/dhcpd-config-helper
end
prerequires += shadow-utils
+ configfiles
+ %{sysconfdir}/dhcp
+ end
+
script prein
getent group dhcpd >/dev/null || groupadd -r dhcpd
getent passwd dhcpd >/dev/null || \
useradd -r -g dhcpd -d /var/lib/dhcpd -s /sbin/nologin \
-c "User for the DHCP server" dhcpd
- exit 0
end
# Just search for new unit files that were just installed.
@@ -176,7 +188,8 @@ packages
description = %{summary}
requires
- dhcp-common
+ dhcp-common = %{thisver}
+ dhcp-libs = %{thisver}
end
files
@@ -205,6 +218,10 @@ packages
summary = Common files used by the dhcp client and server.
description = %{summary}
+ requires
+ dhcp-libs = %{thisver}
+ end
+
files
/usr/bin/
/usr/share/man/man1/omshell.1*
diff --git a/dhcp/patches/dhcp-4.2.0-CLOEXEC.patch b/dhcp/patches/dhcp-4.2.0-CLOEXEC.patch
deleted file mode 100644
index 2483f55..0000000
--- a/dhcp/patches/dhcp-4.2.0-CLOEXEC.patch
+++ /dev/null
@@ -1,422 +0,0 @@
-diff -up dhcp-4.2.0/client/clparse.c.cloexec dhcp-4.2.0/client/clparse.c
---- dhcp-4.2.0/client/clparse.c.cloexec 2010-07-21 13:55:42.000000000 +0200
-+++ dhcp-4.2.0/client/clparse.c 2010-07-21 14:31:13.000000000 +0200
-@@ -211,7 +211,7 @@ int read_client_conf_file (const char *n
- int token;
- isc_result_t status;
-
-- if ((file = open (name, O_RDONLY)) < 0)
-+ if ((file = open (name, O_RDONLY | O_CLOEXEC)) < 0)
- return uerr2isc (errno);
-
- cfile = NULL;
-@@ -248,7 +248,7 @@ void read_client_leases ()
-
- /* Open the lease file. If we can't open it, just return -
- we can safely trust the server to remember our state. */
-- if ((file = open (path_dhclient_db, O_RDONLY)) < 0)
-+ if ((file = open (path_dhclient_db, O_RDONLY | O_CLOEXEC)) < 0)
- return;
-
- cfile = NULL;
-diff -up dhcp-4.2.0/client/dhclient.c.cloexec dhcp-4.2.0/client/dhclient.c
---- dhcp-4.2.0/client/dhclient.c.cloexec 2010-07-21 13:55:42.000000000 +0200
-+++ dhcp-4.2.0/client/dhclient.c 2010-07-21 14:33:44.000000000 +0200
-@@ -137,11 +137,11 @@ main(int argc, char **argv) {
- /* Make sure that file descriptors 0 (stdin), 1, (stdout), and
- 2 (stderr) are open. To do this, we assume that when we
- open a file the lowest available file descriptor is used. */
-- fd = open("/dev/null", O_RDWR);
-+ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
- if (fd == 0)
-- fd = open("/dev/null", O_RDWR);
-+ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
- if (fd == 1)
-- fd = open("/dev/null", O_RDWR);
-+ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
- if (fd == 2)
- log_perror = 0; /* No sense logging to /dev/null. */
- else if (fd != -1)
-@@ -488,7 +488,7 @@ main(int argc, char **argv) {
- int e;
-
- oldpid = 0;
-- if ((pidfd = fopen(path_dhclient_pid, "r")) != NULL) {
-+ if ((pidfd = fopen(path_dhclient_pid, "re")) != NULL) {
- e = fscanf(pidfd, "%ld\n", &temp);
- oldpid = (pid_t)temp;
-
-@@ -530,7 +530,7 @@ main(int argc, char **argv) {
- strncpy(new_path_dhclient_pid, path_dhclient_pid, pfx);
- sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name);
-
-- if ((pidfd = fopen(new_path_dhclient_pid, "r")) != NULL) {
-+ if ((pidfd = fopen(new_path_dhclient_pid, "re")) != NULL) {
- e = fscanf(pidfd, "%ld\n", &temp);
- oldpid = (pid_t)temp;
-
-@@ -555,7 +555,7 @@ main(int argc, char **argv) {
- int dhc_running = 0;
- char procfn[256] = "";
-
-- if ((pidfp = fopen(path_dhclient_pid, "r")) != NULL) {
-+ if ((pidfp = fopen(path_dhclient_pid, "re")) != NULL) {
- if ((fscanf(pidfp, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) {
- snprintf(procfn,256,"/proc/%u",dhcpid);
- dhc_running = (access(procfn, F_OK) == 0);
-@@ -2931,7 +2931,7 @@ void rewrite_client_leases ()
-
- if (leaseFile != NULL)
- fclose (leaseFile);
-- leaseFile = fopen (path_dhclient_db, "w");
-+ leaseFile = fopen (path_dhclient_db, "we");
- if (leaseFile == NULL) {
- log_error ("can't create %s: %m", path_dhclient_db);
- return;
-@@ -3035,7 +3035,7 @@ write_duid(struct data_string *duid)
- return DHCP_R_INVALIDARG;
-
- if (leaseFile == NULL) { /* XXX? */
-- leaseFile = fopen(path_dhclient_db, "w");
-+ leaseFile = fopen(path_dhclient_db, "we");
- if (leaseFile == NULL) {
- log_error("can't create %s: %m", path_dhclient_db);
- return ISC_R_IOERROR;
-@@ -3215,7 +3215,7 @@ int write_client_lease (client, lease, r
- return 1;
-
- if (leaseFile == NULL) { /* XXX */
-- leaseFile = fopen (path_dhclient_db, "w");
-+ leaseFile = fopen (path_dhclient_db, "we");
- if (leaseFile == NULL) {
- log_error ("can't create %s: %m", path_dhclient_db);
- return 0;
-@@ -3668,9 +3668,9 @@ void go_daemon ()
- close(2);
-
- /* Reopen them on /dev/null. */
-- open("/dev/null", O_RDWR);
-- open("/dev/null", O_RDWR);
-- open("/dev/null", O_RDWR);
-+ open("/dev/null", O_RDWR | O_CLOEXEC);
-+ open("/dev/null", O_RDWR | O_CLOEXEC);
-+ open("/dev/null", O_RDWR | O_CLOEXEC);
-
- write_client_pid_file ();
-
-@@ -3682,14 +3682,14 @@ void write_client_pid_file ()
- FILE *pf;
- int pfdesc;
-
-- pfdesc = open (path_dhclient_pid, O_CREAT | O_TRUNC | O_WRONLY, 0644);
-+ pfdesc = open (path_dhclient_pid, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, 0644);
-
- if (pfdesc < 0) {
- log_error ("Can't create %s: %m", path_dhclient_pid);
- return;
- }
-
-- pf = fdopen (pfdesc, "w");
-+ pf = fdopen (pfdesc, "we");
- if (!pf)
- log_error ("Can't fdopen %s: %m", path_dhclient_pid);
- else {
-diff -up dhcp-4.2.0/common/bpf.c.cloexec dhcp-4.2.0/common/bpf.c
---- dhcp-4.2.0/common/bpf.c.cloexec 2009-11-20 02:48:59.000000000 +0100
-+++ dhcp-4.2.0/common/bpf.c 2010-07-21 14:31:13.000000000 +0200
-@@ -94,7 +94,7 @@ int if_register_bpf (info)
- for (b = 0; 1; b++) {
- /* %Audit% 31 bytes max. %2004.06.17,Safe% */
- sprintf(filename, BPF_FORMAT, b);
-- sock = open (filename, O_RDWR, 0);
-+ sock = open (filename, O_RDWR | O_CLOEXEC, 0);
- if (sock < 0) {
- if (errno == EBUSY) {
- continue;
-diff -up dhcp-4.2.0/common/discover.c.cloexec dhcp-4.2.0/common/discover.c
---- dhcp-4.2.0/common/discover.c.cloexec 2009-10-28 05:12:29.000000000 +0100
-+++ dhcp-4.2.0/common/discover.c 2010-07-21 14:31:13.000000000 +0200
-@@ -409,7 +409,7 @@ begin_iface_scan(struct iface_conf_list
- int len;
- int i;
-
-- ifaces->fp = fopen("/proc/net/dev", "r");
-+ ifaces->fp = fopen("/proc/net/dev", "re");
- if (ifaces->fp == NULL) {
- log_error("Error opening '/proc/net/dev' to list interfaces");
- return 0;
-@@ -444,7 +444,7 @@ begin_iface_scan(struct iface_conf_list
-
- #ifdef DHCPv6
- if (local_family == AF_INET6) {
-- ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
-+ ifaces->fp6 = fopen("/proc/net/if_inet6", "re");
- if (ifaces->fp6 == NULL) {
- log_error("Error opening '/proc/net/if_inet6' to "
- "list IPv6 interfaces; %m");
-diff -up dhcp-4.2.0/common/dlpi.c.cloexec dhcp-4.2.0/common/dlpi.c
---- dhcp-4.2.0/common/dlpi.c.cloexec 2009-11-20 02:49:00.000000000 +0100
-+++ dhcp-4.2.0/common/dlpi.c 2010-07-21 14:31:13.000000000 +0200
-@@ -807,7 +807,7 @@ dlpiopen(const char *ifname) {
- }
- *dp = '\0';
-
-- return open (devname, O_RDWR, 0);
-+ return open (devname, O_RDWR | O_CLOEXEC, 0);
- }
-
- /*
-diff -up dhcp-4.2.0/common/nit.c.cloexec dhcp-4.2.0/common/nit.c
---- dhcp-4.2.0/common/nit.c.cloexec 2009-11-20 02:49:01.000000000 +0100
-+++ dhcp-4.2.0/common/nit.c 2010-07-21 14:31:13.000000000 +0200
-@@ -81,7 +81,7 @@ int if_register_nit (info)
- struct strioctl sio;
-
- /* Open a NIT device */
-- sock = open ("/dev/nit", O_RDWR);
-+ sock = open ("/dev/nit", O_RDWR | O_CLOEXEC);
- if (sock < 0)
- log_fatal ("Can't open NIT device for %s: %m", info -> name);
-
-diff -up dhcp-4.2.0/common/resolv.c.cloexec dhcp-4.2.0/common/resolv.c
---- dhcp-4.2.0/common/resolv.c.cloexec 2009-11-20 02:49:01.000000000 +0100
-+++ dhcp-4.2.0/common/resolv.c 2010-07-21 14:31:13.000000000 +0200
-@@ -49,7 +49,7 @@ void read_resolv_conf (parse_time)
- struct domain_search_list *dp, *dl, *nd;
- isc_result_t status;
-
-- if ((file = open (path_resolv_conf, O_RDONLY)) < 0) {
-+ if ((file = open (path_resolv_conf, O_RDONLY | O_CLOEXEC)) < 0) {
- log_error ("Can't open %s: %m", path_resolv_conf);
- return;
- }
-diff -up dhcp-4.2.0/common/upf.c.cloexec dhcp-4.2.0/common/upf.c
---- dhcp-4.2.0/common/upf.c.cloexec 2009-11-20 02:49:01.000000000 +0100
-+++ dhcp-4.2.0/common/upf.c 2010-07-21 14:31:13.000000000 +0200
-@@ -77,7 +77,7 @@ int if_register_upf (info)
- /* %Audit% Cannot exceed 36 bytes. %2004.06.17,Safe% */
- sprintf(filename, "/dev/pf/pfilt%d", b);
-
-- sock = open (filename, O_RDWR, 0);
-+ sock = open (filename, O_RDWR | O_CLOEXEC, 0);
- if (sock < 0) {
- if (errno == EBUSY) {
- continue;
-diff -up dhcp-4.2.0/dst/dst_api.c.cloexec dhcp-4.2.0/dst/dst_api.c
---- dhcp-4.2.0/dst/dst_api.c.cloexec 2009-10-29 01:46:48.000000000 +0100
-+++ dhcp-4.2.0/dst/dst_api.c 2010-07-21 14:31:13.000000000 +0200
-@@ -437,7 +437,7 @@ dst_s_write_private_key(const DST_KEY *k
- PRIVATE_KEY, PATH_MAX);
-
- /* Do not overwrite an existing file */
-- if ((fp = dst_s_fopen(file, "w", 0600)) != NULL) {
-+ if ((fp = dst_s_fopen(file, "we", 0600)) != NULL) {
- int nn;
- if ((nn = fwrite(encoded_block, 1, len, fp)) != len) {
- EREPORT(("dst_write_private_key(): Write failure on %s %d != %d errno=%d\n",
-@@ -494,7 +494,7 @@ dst_s_read_public_key(const char *in_nam
- * flags, proto, alg stored as decimal (or hex numbers FIXME).
- * (FIXME: handle parentheses for line continuation.)
- */
-- if ((fp = dst_s_fopen(name, "r", 0)) == NULL) {
-+ if ((fp = dst_s_fopen(name, "re", 0)) == NULL) {
- EREPORT(("dst_read_public_key(): Public Key not found %s\n",
- name));
- return (NULL);
-@@ -620,7 +620,7 @@ dst_s_write_public_key(const DST_KEY *ke
- return (0);
- }
- /* create public key file */
-- if ((fp = dst_s_fopen(filename, "w+", 0644)) == NULL) {
-+ if ((fp = dst_s_fopen(filename, "w+e", 0644)) == NULL) {
- EREPORT(("DST_write_public_key: open of file:%s failed (errno=%d)\n",
- filename, errno));
- return (0);
-@@ -854,7 +854,7 @@ dst_s_read_private_key_file(char *name,
- return (0);
- }
- /* first check if we can find the key file */
-- if ((fp = dst_s_fopen(filename, "r", 0)) == NULL) {
-+ if ((fp = dst_s_fopen(filename, "re", 0)) == NULL) {
- EREPORT(("dst_s_read_private_key_file: Could not open file %s in directory %s\n",
- filename, dst_path[0] ? dst_path :
- (char *) getcwd(NULL, PATH_MAX - 1)));
-diff -up dhcp-4.2.0/dst/prandom.c.cloexec dhcp-4.2.0/dst/prandom.c
---- dhcp-4.2.0/dst/prandom.c.cloexec 2009-11-20 02:49:01.000000000 +0100
-+++ dhcp-4.2.0/dst/prandom.c 2010-07-21 14:31:13.000000000 +0200
-@@ -269,7 +269,7 @@ get_dev_random(u_char *output, unsigned
-
- s = stat("/dev/random", &st);
- if (s == 0 && S_ISCHR(st.st_mode)) {
-- if ((fd = open("/dev/random", O_RDONLY | O_NONBLOCK)) != -1) {
-+ if ((fd = open("/dev/random", O_RDONLY | O_NONBLOCK | O_CLOEXEC)) != -1) {
- if ((n = read(fd, output, size)) < 0)
- n = 0;
- close(fd);
-@@ -480,7 +480,7 @@ digest_file(dst_work *work)
- work->file_digest = dst_free_key(work->file_digest);
- return (0);
- }
-- if ((fp = fopen(name, "r")) == NULL)
-+ if ((fp = fopen(name, "re")) == NULL)
- return (0);
- for (no = 0; (i = fread(buf, sizeof(*buf), sizeof(buf), fp)) > 0;
- no += i)
-diff -up dhcp-4.2.0/omapip/trace.c.cloexec dhcp-4.2.0/omapip/trace.c
---- dhcp-4.2.0/omapip/trace.c.cloexec 2010-06-01 19:29:59.000000000 +0200
-+++ dhcp-4.2.0/omapip/trace.c 2010-07-21 14:36:48.000000000 +0200
-@@ -141,10 +141,10 @@ isc_result_t trace_begin (const char *fi
- return DHCP_R_INVALIDARG;
- }
-
-- traceoutfile = open (filename, O_CREAT | O_WRONLY | O_EXCL, 0600);
-+ traceoutfile = open (filename, O_CREAT | O_WRONLY | O_EXCL | O_CLOEXEC, 0600);
- if (traceoutfile < 0 && errno == EEXIST) {
- log_error ("WARNING: Overwriting trace file \"%s\"", filename);
-- traceoutfile = open (filename, O_WRONLY | O_EXCL | O_TRUNC,
-+ traceoutfile = open (filename, O_WRONLY | O_EXCL | O_TRUNC | O_CLOEXEC,
- 0600);
- }
-
-@@ -431,7 +431,7 @@ void trace_file_replay (const char *file
- isc_result_t result;
- int len;
-
-- traceinfile = fopen (filename, "r");
-+ traceinfile = fopen (filename, "re");
- if (!traceinfile) {
- log_error("Can't open tracefile %s: %m", filename);
- return;
-diff -up dhcp-4.2.0/relay/dhcrelay.c.cloexec dhcp-4.2.0/relay/dhcrelay.c
---- dhcp-4.2.0/relay/dhcrelay.c.cloexec 2010-02-17 21:33:55.000000000 +0100
-+++ dhcp-4.2.0/relay/dhcrelay.c 2010-07-21 14:31:39.000000000 +0200
-@@ -177,11 +177,11 @@ main(int argc, char **argv) {
- /* Make sure that file descriptors 0(stdin), 1,(stdout), and
- 2(stderr) are open. To do this, we assume that when we
- open a file the lowest available file descriptor is used. */
-- fd = open("/dev/null", O_RDWR);
-+ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
- if (fd == 0)
-- fd = open("/dev/null", O_RDWR);
-+ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
- if (fd == 1)
-- fd = open("/dev/null", O_RDWR);
-+ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
- if (fd == 2)
- log_perror = 0; /* No sense logging to /dev/null. */
- else if (fd != -1)
-@@ -520,12 +520,12 @@ main(int argc, char **argv) {
- exit(0);
-
- pfdesc = open(path_dhcrelay_pid,
-- O_CREAT | O_TRUNC | O_WRONLY, 0644);
-+ O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, 0644);
-
- if (pfdesc < 0) {
- log_error("Can't create %s: %m", path_dhcrelay_pid);
- } else {
-- pf = fdopen(pfdesc, "w");
-+ pf = fdopen(pfdesc, "we");
- if (!pf)
- log_error("Can't fdopen %s: %m",
- path_dhcrelay_pid);
-diff -up dhcp-4.2.0/server/confpars.c.cloexec dhcp-4.2.0/server/confpars.c
---- dhcp-4.2.0/server/confpars.c.cloexec 2010-03-24 22:49:47.000000000 +0100
-+++ dhcp-4.2.0/server/confpars.c 2010-07-21 14:31:39.000000000 +0200
-@@ -116,7 +116,7 @@ isc_result_t read_conf_file (const char
- }
- #endif
-
-- if ((file = open (filename, O_RDONLY)) < 0) {
-+ if ((file = open (filename, O_RDONLY | O_CLOEXEC)) < 0) {
- if (leasep) {
- log_error ("Can't open lease database %s: %m --",
- path_dhcpd_db);
-diff -up dhcp-4.2.0/server/db.c.cloexec dhcp-4.2.0/server/db.c
---- dhcp-4.2.0/server/db.c.cloexec 2010-02-17 21:33:55.000000000 +0100
-+++ dhcp-4.2.0/server/db.c 2010-07-21 14:31:39.000000000 +0200
-@@ -1035,7 +1035,7 @@ void db_startup (testp)
- }
- #endif
- if (!testp) {
-- db_file = fopen (path_dhcpd_db, "a");
-+ db_file = fopen (path_dhcpd_db, "ae");
- if (!db_file)
- log_fatal ("Can't open %s for append.", path_dhcpd_db);
- expire_all_pools ();
-@@ -1083,12 +1083,12 @@ int new_lease_file ()
- path_dhcpd_db, (int)t) >= sizeof newfname)
- log_fatal("new_lease_file: lease file path too long");
-
-- db_fd = open (newfname, O_WRONLY | O_TRUNC | O_CREAT, 0664);
-+ db_fd = open (newfname, O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, 0664);
- if (db_fd < 0) {
- log_error ("Can't create new lease file: %m");
- return 0;
- }
-- if ((new_db_file = fdopen(db_fd, "w")) == NULL) {
-+ if ((new_db_file = fdopen(db_fd, "we")) == NULL) {
- log_error("Can't fdopen new lease file: %m");
- close(db_fd);
- goto fdfail;
-diff -up dhcp-4.2.0/server/dhcpd.c.cloexec dhcp-4.2.0/server/dhcpd.c
---- dhcp-4.2.0/server/dhcpd.c.cloexec 2010-06-01 19:29:59.000000000 +0200
-+++ dhcp-4.2.0/server/dhcpd.c 2010-07-21 14:31:39.000000000 +0200
-@@ -268,11 +268,11 @@ main(int argc, char **argv) {
- /* Make sure that file descriptors 0 (stdin), 1, (stdout), and
- 2 (stderr) are open. To do this, we assume that when we
- open a file the lowest available file descriptor is used. */
-- fd = open("/dev/null", O_RDWR);
-+ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
- if (fd == 0)
-- fd = open("/dev/null", O_RDWR);
-+ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
- if (fd == 1)
-- fd = open("/dev/null", O_RDWR);
-+ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
- if (fd == 2)
- log_perror = 0; /* No sense logging to /dev/null. */
- else if (fd != -1)
-@@ -780,7 +780,7 @@ main(int argc, char **argv) {
- #endif /* PARANOIA */
-
- /* Read previous pid file. */
-- if ((i = open (path_dhcpd_pid, O_RDONLY)) >= 0) {
-+ if ((i = open (path_dhcpd_pid, O_RDONLY | O_CLOEXEC)) >= 0) {
- status = read(i, pbuf, (sizeof pbuf) - 1);
- close (i);
- if (status > 0) {
-@@ -798,7 +798,7 @@ main(int argc, char **argv) {
- }
-
- /* Write new pid file. */
-- if ((i = open(path_dhcpd_pid, O_WRONLY|O_CREAT|O_TRUNC, 0644)) >= 0) {
-+ if ((i = open(path_dhcpd_pid, O_WRONLY|O_CREAT|O_TRUNC|O_CLOEXEC, 0644)) >= 0) {
- sprintf(pbuf, "%d\n", (int) getpid());
- IGNORE_RET (write(i, pbuf, strlen(pbuf)));
- close(i);
-@@ -824,9 +824,9 @@ main(int argc, char **argv) {
- close(2);
-
- /* Reopen them on /dev/null. */
-- open("/dev/null", O_RDWR);
-- open("/dev/null", O_RDWR);
-- open("/dev/null", O_RDWR);
-+ open("/dev/null", O_RDWR | O_CLOEXEC);
-+ open("/dev/null", O_RDWR | O_CLOEXEC);
-+ open("/dev/null", O_RDWR | O_CLOEXEC);
- log_perror = 0; /* No sense logging to /dev/null. */
-
- IGNORE_RET (chdir("/"));
-diff -up dhcp-4.2.0/server/ldap.c.cloexec dhcp-4.2.0/server/ldap.c
---- dhcp-4.2.0/server/ldap.c.cloexec 2010-03-25 16:26:58.000000000 +0100
-+++ dhcp-4.2.0/server/ldap.c 2010-07-21 14:31:39.000000000 +0200
-@@ -685,7 +685,7 @@ ldap_start (void)
-
- if (ldap_debug_file != NULL && ldap_debug_fd == -1)
- {
-- if ((ldap_debug_fd = open (ldap_debug_file, O_CREAT | O_TRUNC | O_WRONLY,
-+ if ((ldap_debug_fd = open (ldap_debug_file, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC,
- S_IRUSR | S_IWUSR)) < 0)
- log_error ("Error opening debug LDAP log file %s: %s", ldap_debug_file,
- strerror (errno));
diff --git a/dhcp/patches/dhcp-4.2.0-PPP.patch b/dhcp/patches/dhcp-4.2.0-PPP.patch
deleted file mode 100644
index bef2be7..0000000
--- a/dhcp/patches/dhcp-4.2.0-PPP.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff -up dhcp-4.2.0-P1/client/dhc6.c.PPP dhcp-4.2.0-P1/client/dhc6.c
---- dhcp-4.2.0-P1/client/dhc6.c.PPP 2010-11-05 10:47:37.000000000 +0100
-+++ dhcp-4.2.0-P1/client/dhc6.c 2010-11-09 15:54:12.000000000 +0100
-@@ -129,7 +129,7 @@ extern int stateless;
- * is not how it is intended. Upcoming rearchitecting the client should
- * address this "one daemon model."
- */
--void
-+isc_result_t
- form_duid(struct data_string *duid, const char *file, int line)
- {
- struct interface_info *ip;
-@@ -141,6 +141,15 @@ form_duid(struct data_string *duid, cons
- if (ip == NULL)
- log_fatal("Impossible condition at %s:%d.", MDL);
-
-+ while (ip && ip->hw_address.hbuf[0] == HTYPE_RESERVED) {
-+ /* Try the other interfaces */
-+ log_debug("Cannot form default DUID from interface %s.", ip->name);
-+ ip = ip->next;
-+ }
-+ if (ip == NULL) {
-+ return ISC_R_UNEXPECTED;
-+ }
-+
- if ((ip->hw_address.hlen == 0) ||
- (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf)))
- log_fatal("Impossible hardware address length at %s:%d.", MDL);
-@@ -176,6 +185,8 @@ form_duid(struct data_string *duid, cons
- memcpy(duid->buffer->data + 4, ip->hw_address.hbuf + 1,
- ip->hw_address.hlen - 1);
- }
-+
-+ return ISC_R_SUCCESS;
- }
-
- /*
-@@ -5289,7 +5300,8 @@ make_client6_options(struct client_state
- */
- if ((oc = lookup_option(&dhcpv6_universe, *op,
- D6O_CLIENTID)) == NULL) {
-- if (!option_cache(&oc, &default_duid, NULL, clientid_option,
-+ if (default_duid.len == 0 ||
-+ !option_cache(&oc, &default_duid, NULL, clientid_option,
- MDL))
- log_fatal("Failure assembling a DUID.");
-
-diff -up dhcp-4.2.0-P1/client/dhclient.c.PPP dhcp-4.2.0-P1/client/dhclient.c
---- dhcp-4.2.0-P1/client/dhclient.c.PPP 2010-11-05 10:47:37.000000000 +0100
-+++ dhcp-4.2.0-P1/client/dhclient.c 2010-11-09 15:37:26.000000000 +0100
-@@ -911,8 +911,8 @@ main(int argc, char **argv) {
- if (default_duid.buffer != NULL)
- data_string_forget(&default_duid, MDL);
-
-- form_duid(&default_duid, MDL);
-- write_duid(&default_duid);
-+ if (form_duid(&default_duid, MDL) == ISC_R_SUCCESS)
-+ write_duid(&default_duid);
- }
-
- for (ip = interfaces ; ip != NULL ; ip = ip->next) {
-diff -up dhcp-4.2.0-P1/common/bpf.c.PPP dhcp-4.2.0-P1/common/bpf.c
---- dhcp-4.2.0-P1/common/bpf.c.PPP 2010-11-05 10:47:37.000000000 +0100
-+++ dhcp-4.2.0-P1/common/bpf.c 2010-11-09 15:42:42.000000000 +0100
-@@ -599,6 +599,22 @@ get_hw_addr(const char *name, struct har
- memcpy(&hw->hbuf[1], LLADDR(sa), sa->sdl_alen);
- break;
- #endif /* IFT_FDDI */
-+#if defined(IFT_PPP)
-+ case IFT_PPP:
-+ if (local_family != AF_INET6)
-+ log_fatal("Unsupported device type %d for \"%s\"",
-+ sa->sdl_type, name);
-+ hw->hlen = 0;
-+ hw->hbuf[0] = HTYPE_RESERVED;
-+ /* 0xdeadbeef should never occur on the wire,
-+ * and is a signature that something went wrong.
-+ */
-+ hw->hbuf[1] = 0xde;
-+ hw->hbuf[2] = 0xad;
-+ hw->hbuf[3] = 0xbe;
-+ hw->hbuf[4] = 0xef;
-+ break;
-+#endif
- default:
- log_fatal("Unsupported device type %d for \"%s\"",
- sa->sdl_type, name);
-diff -up dhcp-4.2.0-P1/common/lpf.c.PPP dhcp-4.2.0-P1/common/lpf.c
---- dhcp-4.2.0-P1/common/lpf.c.PPP 2010-11-05 10:47:37.000000000 +0100
-+++ dhcp-4.2.0-P1/common/lpf.c 2010-11-09 15:45:40.000000000 +0100
-@@ -502,6 +502,22 @@ get_hw_addr(const char *name, struct har
- hw->hbuf[0] = HTYPE_FDDI;
- memcpy(&hw->hbuf[1], sa->sa_data, 16);
- break;
-+#if defined(ARPHRD_PPP)
-+ case ARPHRD_PPP:
-+ if (local_family != AF_INET6)
-+ log_fatal("Unsupported device type %d for \"%s\"",
-+ sa->sa_family, name);
-+ hw->hlen = 0;
-+ hw->hbuf[0] = HTYPE_RESERVED;
-+ /* 0xdeadbeef should never occur on the wire,
-+ * and is a signature that something went wrong.
-+ */
-+ hw->hbuf[1] = 0xde;
-+ hw->hbuf[2] = 0xad;
-+ hw->hbuf[3] = 0xbe;
-+ hw->hbuf[4] = 0xef;
-+ break;
-+#endif
- default:
- log_fatal("Unsupported device type %ld for \"%s\"",
- (long int)sa->sa_family, name);
-diff -up dhcp-4.2.0-P1/includes/dhcpd.h.PPP dhcp-4.2.0-P1/includes/dhcpd.h
---- dhcp-4.2.0-P1/includes/dhcpd.h.PPP 2010-11-05 10:47:37.000000000 +0100
-+++ dhcp-4.2.0-P1/includes/dhcpd.h 2010-11-09 15:46:58.000000000 +0100
-@@ -2733,7 +2733,7 @@ void dhcpv4_client_assignments(void);
- void dhcpv6_client_assignments(void);
-
- /* dhc6.c */
--void form_duid(struct data_string *duid, const char *file, int line);
-+isc_result_t form_duid(struct data_string *duid, const char *file, int line);
- void dhc6_lease_destroy(struct dhc6_lease **src, const char *file, int line);
- void start_init6(struct client_state *client);
- void start_info_request6(struct client_state *client);
-diff -up dhcp-4.2.0-P1/includes/dhcp.h.PPP dhcp-4.2.0-P1/includes/dhcp.h
---- dhcp-4.2.0-P1/includes/dhcp.h.PPP 2010-11-05 10:47:37.000000000 +0100
-+++ dhcp-4.2.0-P1/includes/dhcp.h 2010-11-09 15:48:53.000000000 +0100
-@@ -80,6 +80,8 @@ struct dhcp_packet {
- #define HTYPE_IEEE802 6 /* IEEE 802.2 Token Ring... */
- #define HTYPE_FDDI 8 /* FDDI... */
-
-+#define HTYPE_RESERVED 0 /* RFC 5494 */
-+
- /* Magic cookie validating dhcp options field (and bootp vendor
- extensions field). */
- #define DHCP_OPTIONS_COOKIE "\143\202\123\143"
-diff -up dhcp-4.2.0-P1/server/dhcpv6.c.PPP dhcp-4.2.0-P1/server/dhcpv6.c
---- dhcp-4.2.0-P1/server/dhcpv6.c.PPP 2010-11-05 10:47:37.000000000 +0100
-+++ dhcp-4.2.0-P1/server/dhcpv6.c 2010-11-09 15:50:17.000000000 +0100
-@@ -300,6 +300,9 @@ generate_new_server_duid(void) {
- if (p->hw_address.hlen > 0) {
- break;
- }
-+ if (p->next == NULL && p->hw_address.hbuf[0] == HTYPE_RESERVED) {
-+ log_error("Can not generate DUID from interfaces which do not have hardware addresses, please configure server-duid!");
-+ }
- }
- if (p == NULL) {
- return ISC_R_UNEXPECTED;
diff --git a/dhcp/patches/dhcp-4.2.0-UseMulticast.patch b/dhcp/patches/dhcp-4.2.0-UseMulticast.patch
deleted file mode 100644
index 319344a..0000000
--- a/dhcp/patches/dhcp-4.2.0-UseMulticast.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-diff -up dhcp-4.2.0/server/dhcpv6.c.UseMulticast dhcp-4.2.0/server/dhcpv6.c
---- dhcp-4.2.0/server/dhcpv6.c.UseMulticast 2010-06-01 19:30:00.000000000 +0200
-+++ dhcp-4.2.0/server/dhcpv6.c 2010-07-21 16:17:30.000000000 +0200
-@@ -346,6 +346,48 @@ generate_new_server_duid(void) {
- }
-
- /*
-+ * Is the D6O_UNICAST option defined in dhcpd.conf ?
-+ */
-+static isc_boolean_t unicast_option_defined;
-+
-+/*
-+ * Did we already search dhcpd.conf for D6O_UNICAST option ?
-+ * We need to store it here to not parse dhcpd.conf repeatedly.
-+ */
-+static isc_boolean_t unicast_option_parsed = ISC_FALSE;
-+
-+
-+/*
-+ * Is the D6O_UNICAST option defined in dhcpd.conf ?
-+ */
-+isc_boolean_t
-+is_unicast_option_defined(void) {
-+ struct option_state *opt_state;
-+ struct option_cache *oc;
-+
-+ /*
-+ * If we are looking for the unicast option for the first time
-+ */
-+ if (unicast_option_parsed == ISC_FALSE) {
-+ unicast_option_parsed = ISC_TRUE;
-+ opt_state = NULL;
-+ if (!option_state_allocate(&opt_state, MDL)) {
-+ log_fatal("No memory for option state.");
-+ }
-+
-+ execute_statements_in_scope(NULL, NULL, NULL, NULL, NULL,
-+ opt_state, &global_scope, root_group, NULL);
-+
-+ oc = lookup_option(&dhcpv6_universe, opt_state, D6O_UNICAST);
-+ unicast_option_defined = (oc != NULL);
-+
-+ option_state_dereference(&opt_state, MDL);
-+ }
-+
-+ return (unicast_option_defined);
-+}
-+
-+/*
- * Get the client identifier from the packet.
- */
- isc_result_t
-@@ -1405,6 +1447,56 @@ lease_to_client(struct data_string *repl
- reply.shared->group);
- }
-
-+ /* reject unicast message, unless we set unicast option */
-+ if ((packet->unicast == ISC_TRUE) && !is_unicast_option_defined())
-+ /*
-+ * RFC3315 section 18.2.1 (Request):
-+ *
-+ * When the server receives a Request message via unicast from a client
-+ * to which the server has not sent a unicast option, the server
-+ * discards the Request message and responds with a Reply message
-+ * containing a Status Code option with the value UseMulticast, a Server
-+ * Identifier option containing the server's DUID, the Client Identifier
-+ * option from the client message, and no other options.
-+ *
-+ * Section 18.2.3 (Renew):
-+ *
-+ * When the server receives a Renew message via unicast from a client to
-+ * which the server has not sent a unicast option, the server discards
-+ * the Renew message and responds with a Reply message containing a
-+ * Status Code option with the value UseMulticast, a Server Identifier
-+ * option containing the server's DUID, the Client Identifier option
-+ * from the client message, and no other options.
-+ */
-+ {
-+ /* Set the UseMulticast status code. */
-+ if (!set_status_code(STATUS_UseMulticast,
-+ "Unicast not allowed by server.",
-+ reply.opt_state)) {
-+ log_error("lease_to_client: Unable to set "
-+ "UseMulticast status code.");
-+ goto exit;
-+ }
-+
-+ /* Rewind the cursor to the start. */
-+ reply.cursor = REPLY_OPTIONS_INDEX;
-+
-+ /*
-+ * Produce an reply that includes only:
-+ *
-+ * Status code.
-+ * Server DUID.
-+ * Client DUID.
-+ */
-+ reply.cursor += store_options6((char *)reply.buf.data +
-+ reply.cursor,
-+ sizeof(reply.buf) -
-+ reply.cursor,
-+ reply.opt_state, reply.packet,
-+ required_opts_NAA,
-+ NULL);
-+ } else if (no_resources_avail && (reply.ia_count != 0) &&
-+ (reply.packet->dhcpv6_msg_type == DHCPV6_SOLICIT))
- /*
- * RFC3315 section 17.2.2 (Solicit):
- *
-@@ -1429,8 +1521,6 @@ lease_to_client(struct data_string *repl
- * the server.
- * Sends a Renew/Rebind if the IA is not in the Reply message.
- */
-- if (no_resources_avail && (reply.ia_count != 0) &&
-- (reply.packet->dhcpv6_msg_type == DHCPV6_SOLICIT))
- {
- /* Set the NoAddrsAvail status code. */
- if (!set_status_code(STATUS_NoAddrsAvail,
-@@ -4128,7 +4218,6 @@ dhcpv6_solicit(struct data_string *reply
- * Very similar to Solicit handling, except the server DUID is required.
- */
-
--/* TODO: reject unicast messages, unless we set unicast option */
- static void
- dhcpv6_request(struct data_string *reply_ret, struct packet *packet) {
- struct data_string client_id;
-@@ -4443,7 +4532,6 @@ exit:
- * except for the error code of when addresses don't match.
- */
-
--/* TODO: reject unicast messages, unless we set unicast option */
- static void
- dhcpv6_renew(struct data_string *reply, struct packet *packet) {
- struct data_string client_id;
-@@ -4688,18 +4776,60 @@ iterate_over_ia_na(struct data_string *r
- goto exit;
- }
-
-- snprintf(status_msg, sizeof(status_msg), "%s received.", packet_type);
-- if (!set_status_code(STATUS_Success, status_msg, opt_state)) {
-- goto exit;
-- }
-+ /* reject unicast message, unless we set unicast option */
-+ if ((packet->unicast == ISC_TRUE) && !is_unicast_option_defined()) {
-+ /*
-+ * RFC3315 section 18.2.6 (Release):
-+ *
-+ * When the server receives a Release message via unicast from a client
-+ * to which the server has not sent a unicast option, the server
-+ * discards the Release message and responds with a Reply message
-+ * containing a Status Code option with value UseMulticast, a Server
-+ * Identifier option containing the server's DUID, the Client Identifier
-+ * option from the client message, and no other options.
-+ *
-+ * Section 18.2.7 (Decline):
-+ *
-+ * When the server receives a Decline message via unicast from a client
-+ * to which the server has not sent a unicast option, the server
-+ * discards the Decline message and responds with a Reply message
-+ * containing a Status Code option with the value UseMulticast, a Server
-+ * Identifier option containing the server's DUID, the Client Identifier
-+ * option from the client message, and no other options.
-+ */
-+ snprintf(status_msg, sizeof(status_msg),
-+ "%s received unicast.", packet_type);
-+ if (!set_status_code(STATUS_UseMulticast, status_msg, opt_state)) {
-+ goto exit;
-+ }
-
-- /*
-- * Add our options that are not associated with any IA_NA or IA_TA.
-- */
-- reply_ofs += store_options6(reply_data+reply_ofs,
-- sizeof(reply_data)-reply_ofs,
-+ /*
-+ * Produce an reply that includes only:
-+ *
-+ * Status code.
-+ * Server DUID.
-+ * Client DUID.
-+ */
-+ reply_ofs += store_options6(reply_data+reply_ofs,
-+ sizeof(reply_data)-reply_ofs,
- opt_state, packet,
-- required_opts, NULL);
-+ required_opts_NAA, NULL);
-+
-+ goto return_reply;
-+ } else {
-+ snprintf(status_msg, sizeof(status_msg), "%s received.", packet_type);
-+ if (!set_status_code(STATUS_Success, status_msg, opt_state)) {
-+ goto exit;
-+ }
-+
-+ /*
-+ * Add our options that are not associated with any IA_NA or IA_TA.
-+ */
-+ reply_ofs += store_options6(reply_data+reply_ofs,
-+ sizeof(reply_data)-reply_ofs,
-+ opt_state, packet,
-+ required_opts, NULL);
-+ }
-
- /*
- * Loop through the IA_NA reported by the client, and deal with
-@@ -4838,6 +4968,7 @@ iterate_over_ia_na(struct data_string *r
- /*
- * Return our reply to the caller.
- */
-+return_reply:
- reply_ret->len = reply_ofs;
- reply_ret->buffer = NULL;
- if (!buffer_allocate(&reply_ret->buffer, reply_ofs, MDL)) {
-@@ -4883,7 +5014,6 @@ exit:
- * we still need to be aware of this possibility.
- */
-
--/* TODO: reject unicast messages, unless we set unicast option */
- /* TODO: IA_TA */
- static void
- dhcpv6_decline(struct data_string *reply, struct packet *packet) {
-@@ -5355,7 +5485,6 @@ exit:
- * Release means a client is done with the leases.
- */
-
--/* TODO: reject unicast messages, unless we set unicast option */
- static void
- dhcpv6_release(struct data_string *reply, struct packet *packet) {
- struct data_string client_id;
diff --git a/dhcp/patches/dhcp-4.2.0-inherit-leases.patch b/dhcp/patches/dhcp-4.2.0-inherit-leases.patch
deleted file mode 100644
index 052f642..0000000
--- a/dhcp/patches/dhcp-4.2.0-inherit-leases.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -up dhcp-4.2.0/client/dhclient.c.inherit dhcp-4.2.0/client/dhclient.c
---- dhcp-4.2.0/client/dhclient.c.inherit 2010-07-21 14:33:44.000000000 +0200
-+++ dhcp-4.2.0/client/dhclient.c 2010-07-21 14:40:05.000000000 +0200
-@@ -2322,6 +2322,7 @@ void send_request (cpp)
- {
- struct client_state *client = cpp;
-
-+ int i;
- int result;
- int interval;
- struct sockaddr_in destination;
-@@ -2381,6 +2382,22 @@ void send_request (cpp)
- /* Now do a preinit on the interface so that we can
- discover a new address. */
- script_init (client, "PREINIT", (struct string_list *)0);
-+
-+ /* Has an active lease */
-+ if (client -> interface -> addresses != NULL) {
-+ for (i = 0; i < client -> interface -> address_count; i++) {
-+ if (client -> active &&
-+ client -> active -> is_bootp &&
-+ client -> active -> expiry > cur_time &&
-+ client -> interface -> addresses[i].s_addr != 0 &&
-+ client -> active -> address.len == 4 &&
-+ memcpy (client -> active -> address.iabuf, &(client -> interface -> addresses[i]), 4) == 0) {
-+ client_envadd (client, "", "keep_old_ip", "%s", "yes");
-+ break;
-+ }
-+ }
-+ }
-+
- if (client -> alias)
- script_write_params (client, "alias_",
- client -> alias);
diff --git a/dhcp/patches/dhcp-4.2.0-noprefixavail.patch b/dhcp/patches/dhcp-4.2.0-noprefixavail.patch
deleted file mode 100644
index 729a172..0000000
--- a/dhcp/patches/dhcp-4.2.0-noprefixavail.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-diff -up dhcp-4.2.0/server/dhcpv6.c.noprefixavail dhcp-4.2.0/server/dhcpv6.c
---- dhcp-4.2.0/server/dhcpv6.c.noprefixavail 2010-10-07 13:48:45.000000000 +0200
-+++ dhcp-4.2.0/server/dhcpv6.c 2010-10-13 11:00:25.000000000 +0200
-@@ -1134,7 +1134,7 @@ try_client_v6_prefix(struct iasubopt **p
- return DHCP_R_INVALIDARG;
- }
- tmp_plen = (int) requested_pref->data[0];
-- if ((tmp_plen < 3) || (tmp_plen > 128)) {
-+ if ((tmp_plen < 3) || (tmp_plen > 128) ||((int)tmp_plen != pool->units)) {
- return ISC_R_FAILURE;
- }
- memcpy(&tmp_pref, requested_pref->data + 1, sizeof(tmp_pref));
-@@ -1147,9 +1147,8 @@ try_client_v6_prefix(struct iasubopt **p
- return ISC_R_FAILURE;
- }
-
-- if (((int)tmp_plen != pool->units) ||
-- !ipv6_in_pool(&tmp_pref, pool)) {
-- return ISC_R_FAILURE;
-+ if (!ipv6_in_pool(&tmp_pref, pool)) {
-+ return ISC_R_ADDRNOTAVAIL;
- }
-
- if (prefix6_exists(pool, &tmp_pref, tmp_plen)) {
-@@ -1409,13 +1408,6 @@ lease_to_client(struct data_string *repl
- if ((status != ISC_R_SUCCESS) &&
- (status != ISC_R_NORESOURCES))
- goto exit;
--
-- /*
-- * If any prefix cannot be given to any IA_PD, then
-- * set the NoPrefixAvail status code.
-- */
-- if (reply.client_resources == 0)
-- no_resources_avail = ISC_TRUE;
- }
-
- /*
-@@ -1549,36 +1541,6 @@ lease_to_client(struct data_string *repl
- reply.opt_state, reply.packet,
- required_opts_NAA,
- NULL);
-- } else if (no_resources_avail && (reply.ia_count == 0) &&
-- (reply.packet->dhcpv6_msg_type == DHCPV6_SOLICIT))
-- {
-- /* Set the NoPrefixAvail status code. */
-- if (!set_status_code(STATUS_NoPrefixAvail,
-- "No prefixes available for this "
-- "interface.", reply.opt_state)) {
-- log_error("lease_to_client: Unable to set "
-- "NoPrefixAvail status code.");
-- goto exit;
-- }
--
-- /* Rewind the cursor to the start. */
-- reply.cursor = REPLY_OPTIONS_INDEX;
--
-- /*
-- * Produce an advertise that includes only:
-- *
-- * Status code.
-- * Server DUID.
-- * Client DUID.
-- */
-- reply.buf.reply.msg_type = DHCPV6_ADVERTISE;
-- reply.cursor += store_options6((char *)reply.buf.data +
-- reply.cursor,
-- sizeof(reply.buf) -
-- reply.cursor,
-- reply.opt_state, reply.packet,
-- required_opts_NAA,
-- NULL);
- } else {
- /*
- * Having stored the client's IA's, store any options that
-@@ -2793,16 +2755,18 @@ find_client_temporaries(struct reply_sta
- */
- static isc_result_t
- reply_process_try_addr(struct reply_state *reply, struct iaddr *addr) {
-- isc_result_t status = ISC_R_NORESOURCES;
-+ isc_result_t status = ISC_R_ADDRNOTAVAIL;
- struct ipv6_pool *pool;
- int i;
- struct data_string data_addr;
-
- if ((reply == NULL) || (reply->shared == NULL) ||
-- (reply->shared->ipv6_pools == NULL) || (addr == NULL) ||
-- (reply->lease != NULL))
-+ (addr == NULL) || (reply->lease != NULL))
- return DHCP_R_INVALIDARG;
-
-+ if (reply->shared->ipv6_pools == NULL)
-+ return ISC_R_ADDRNOTAVAIL;
-+
- memset(&data_addr, 0, sizeof(data_addr));
- data_addr.len = addr->len;
- data_addr.data = addr->iabuf;
-@@ -3314,7 +3278,9 @@ reply_process_ia_pd(struct reply_state *
- if (status == ISC_R_CANCELED)
- break;
-
-- if ((status != ISC_R_SUCCESS) && (status != ISC_R_ADDRINUSE))
-+ if ((status != ISC_R_SUCCESS) &&
-+ (status != ISC_R_ADDRINUSE) &&
-+ (status != ISC_R_ADDRNOTAVAIL))
- goto cleanup;
- }
-
-@@ -3594,7 +3560,8 @@ reply_process_prefix(struct reply_state
-
- /* Either error out or skip this prefix. */
- if ((status != ISC_R_SUCCESS) &&
-- (status != ISC_R_ADDRINUSE))
-+ (status != ISC_R_ADDRINUSE) &&
-+ (status != ISC_R_ADDRNOTAVAIL))
- goto cleanup;
-
- if (reply->lease == NULL) {
-@@ -3773,16 +3740,18 @@ prefix_is_owned(struct reply_state *repl
- static isc_result_t
- reply_process_try_prefix(struct reply_state *reply,
- struct iaddrcidrnet *pref) {
-- isc_result_t status = ISC_R_NORESOURCES;
-+ isc_result_t status = ISC_R_ADDRNOTAVAIL;
- struct ipv6_pool *pool;
- int i;
- struct data_string data_pref;
-
- if ((reply == NULL) || (reply->shared == NULL) ||
-- (reply->shared->ipv6_pools == NULL) || (pref == NULL) ||
-- (reply->lease != NULL))
-+ (pref == NULL) || (reply->lease != NULL))
- return DHCP_R_INVALIDARG;
-
-+ if (reply->shared->ipv6_pools == NULL)
-+ return ISC_R_ADDRNOTAVAIL;
-+
- memset(&data_pref, 0, sizeof(data_pref));
- data_pref.len = 17;
- if (!buffer_allocate(&data_pref.buffer, data_pref.len, MDL)) {
diff --git a/dhcp/patches/dhcp-4.2.0-paths.patch b/dhcp/patches/dhcp-4.2.0-paths.patch
deleted file mode 100644
index 54c7aba..0000000
--- a/dhcp/patches/dhcp-4.2.0-paths.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -up dhcp-4.2.0/includes/dhcpd.h.paths dhcp-4.2.0/includes/dhcpd.h
---- dhcp-4.2.0/includes/dhcpd.h.paths 2010-07-21 13:55:42.000000000 +0200
-+++ dhcp-4.2.0/includes/dhcpd.h 2010-07-21 14:29:57.000000000 +0200
-@@ -1390,15 +1390,15 @@ typedef unsigned char option_mask [16];
- #else /* !DEBUG */
-
- #ifndef _PATH_DHCPD_CONF
--#define _PATH_DHCPD_CONF "/etc/dhcpd.conf"
-+#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
- #endif /* DEBUG */
-
- #ifndef _PATH_DHCPD_DB
--#define _PATH_DHCPD_DB LOCALSTATEDIR"/db/dhcpd.leases"
-+#define _PATH_DHCPD_DB LOCALSTATEDIR"/dhcpd/dhcpd.leases"
- #endif
-
- #ifndef _PATH_DHCPD6_DB
--#define _PATH_DHCPD6_DB LOCALSTATEDIR"/db/dhcpd6.leases"
-+#define _PATH_DHCPD6_DB LOCALSTATEDIR"/dhcpd/dhcpd6.leases"
- #endif
-
- #ifndef _PATH_DHCPD_PID
-@@ -1412,7 +1412,7 @@ typedef unsigned char option_mask [16];
- #endif /* DEBUG */
-
- #ifndef _PATH_DHCLIENT_CONF
--#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf"
-+#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
- #endif
-
- #ifndef _PATH_DHCLIENT_SCRIPT
-@@ -1428,11 +1428,11 @@ typedef unsigned char option_mask [16];
- #endif
-
- #ifndef _PATH_DHCLIENT_DB
--#define _PATH_DHCLIENT_DB LOCALSTATEDIR"/db/dhclient.leases"
-+#define _PATH_DHCLIENT_DB LOCALSTATEDIR"/dhclient/dhclient.leases"
- #endif
-
- #ifndef _PATH_DHCLIENT6_DB
--#define _PATH_DHCLIENT6_DB LOCALSTATEDIR"/db/dhclient6.leases"
-+#define _PATH_DHCLIENT6_DB LOCALSTATEDIR"/dhclient/dhclient6.leases"
- #endif
-
- #ifndef _PATH_RESOLV_CONF
diff --git a/dhcp/patches/dhcp-4.2.0-unicast-bootp.patch b/dhcp/patches/dhcp-4.2.0-unicast-bootp.patch
deleted file mode 100644
index 78bc078..0000000
--- a/dhcp/patches/dhcp-4.2.0-unicast-bootp.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -up dhcp-4.2.0/server/bootp.c.unicast dhcp-4.2.0/server/bootp.c
---- dhcp-4.2.0/server/bootp.c.unicast 2009-11-20 02:49:03.000000000 +0100
-+++ dhcp-4.2.0/server/bootp.c 2010-07-21 13:40:25.000000000 +0200
-@@ -58,6 +58,7 @@ void bootp (packet)
- char msgbuf [1024];
- int ignorep;
- int peer_has_leases = 0;
-+ int norelay = 0;
-
- if (packet -> raw -> op != BOOTREQUEST)
- return;
-@@ -73,7 +74,7 @@ void bootp (packet)
- ? inet_ntoa (packet -> raw -> giaddr)
- : packet -> interface -> name);
-
-- if (!locate_network (packet)) {
-+ if ((norelay = locate_network (packet)) == 0) {
- log_info ("%s: network unknown", msgbuf);
- return;
- }
-@@ -390,6 +391,13 @@ void bootp (packet)
- from, &to, &hto);
- goto out;
- }
-+ } else if (norelay == 2) {
-+ to.sin_addr = raw.ciaddr;
-+ to.sin_port = remote_port;
-+ if (fallback_interface) {
-+ result = send_packet (fallback_interface, (struct packet *)0, &raw, outgoing.packet_length, from, &to, &hto);
-+ goto out;
-+ }
-
- /* If it comes from a client that already knows its address
- and is not requesting a broadcast response, and we can
-diff -up dhcp-4.2.0/server/dhcp.c.unicast dhcp-4.2.0/server/dhcp.c
---- dhcp-4.2.0/server/dhcp.c.unicast 2010-06-01 19:29:59.000000000 +0200
-+++ dhcp-4.2.0/server/dhcp.c 2010-07-21 13:40:25.000000000 +0200
-@@ -4185,6 +4185,7 @@ int locate_network (packet)
- struct data_string data;
- struct subnet *subnet = (struct subnet *)0;
- struct option_cache *oc;
-+ int norelay = 0;
-
- /* See if there's a Relay Agent Link Selection Option, or a
- * Subnet Selection Option. The Link-Select and Subnet-Select
-@@ -4200,12 +4201,24 @@ int locate_network (packet)
- from the interface, if there is one. If not, fail. */
- if (!oc && !packet -> raw -> giaddr.s_addr) {
- if (packet -> interface -> shared_network) {
-- shared_network_reference
-- (&packet -> shared_network,
-- packet -> interface -> shared_network, MDL);
-- return 1;
-+ struct in_addr any_addr;
-+ any_addr.s_addr = INADDR_ANY;
-+
-+ if (!packet -> packet_type && memcmp(&packet -> raw -> ciaddr, &any_addr, 4)) {
-+ struct iaddr cip;
-+ memcpy(cip.iabuf, &packet -> raw -> ciaddr, 4);
-+ cip.len = 4;
-+ if (!find_grouped_subnet(&subnet, packet->interface->shared_network, cip, MDL))
-+ norelay = 2;
-+ }
-+
-+ if (!norelay) {
-+ shared_network_reference(&packet -> shared_network, packet -> interface -> shared_network, MDL);
-+ return 1;
-+ }
-+ } else {
-+ return 0;
- }
-- return 0;
- }
-
- /* If there's an option indicating link connection, and it's valid,
-@@ -4228,7 +4241,10 @@ int locate_network (packet)
- data_string_forget (&data, MDL);
- } else {
- ia.len = 4;
-- memcpy (ia.iabuf, &packet -> raw -> giaddr, 4);
-+ if (norelay)
-+ memcpy (ia.iabuf, &packet->raw->ciaddr, 4);
-+ else
-+ memcpy (ia.iabuf, &packet->raw->giaddr, 4);
- }
-
- /* If we know the subnet on which the IP address lives, use it. */
-@@ -4236,7 +4252,10 @@ int locate_network (packet)
- shared_network_reference (&packet -> shared_network,
- subnet -> shared_network, MDL);
- subnet_dereference (&subnet, MDL);
-- return 1;
-+ if (norelay)
-+ return norelay;
-+ else
-+ return 1;
- }
-
- /* Otherwise, fail. */
diff --git a/dhcp/patches/dhcp-4.2.1-64_bit_lease_parse.patch b/dhcp/patches/dhcp-4.2.1-64_bit_lease_parse.patch
deleted file mode 100644
index a540bc1..0000000
--- a/dhcp/patches/dhcp-4.2.1-64_bit_lease_parse.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -up dhcp-4.2.1b1/common/dispatch.c.64-bit_lease_parse dhcp-4.2.1b1/common/dispatch.c
-diff -up dhcp-4.2.1b1/common/parse.c.64-bit_lease_parse dhcp-4.2.1b1/common/parse.c
---- dhcp-4.2.1b1/common/parse.c.64-bit_lease_parse 2010-12-30 00:01:42.000000000 +0100
-+++ dhcp-4.2.1b1/common/parse.c 2011-01-28 08:01:10.000000000 +0100
-@@ -909,8 +909,8 @@ TIME
- parse_date_core(cfile)
- struct parse *cfile;
- {
-- int guess;
-- int tzoff, wday, year, mon, mday, hour, min, sec;
-+ TIME guess;
-+ long int tzoff, wday, year, mon, mday, hour, min, sec;
- const char *val;
- enum dhcp_token token;
- static int months[11] = { 31, 59, 90, 120, 151, 181,
-@@ -936,7 +936,7 @@ parse_date_core(cfile)
- }
-
- token = next_token(&val, NULL, cfile); /* consume number */
-- guess = atoi(val);
-+ guess = atol(val);
-
- return((TIME)guess);
- }
-@@ -948,7 +948,7 @@ parse_date_core(cfile)
- return((TIME)0);
- }
- token = next_token(&val, NULL, cfile); /* consume day of week */
-- wday = atoi(val);
-+ wday = atol(val);
-
- /* Year... */
- token = peek_token(&val, NULL, cfile);
-@@ -964,7 +964,7 @@ parse_date_core(cfile)
- somebody invents a time machine, I think we can safely disregard
- it. This actually works around a stupid Y2K bug that was present
- in a very early beta release of dhcpd. */
-- year = atoi(val);
-+ year = atol(val);
- if (year > 1900)
- year -= 1900;
-
-@@ -988,7 +988,7 @@ parse_date_core(cfile)
- return((TIME)0);
- }
- token = next_token(&val, NULL, cfile); /* consume month */
-- mon = atoi(val) - 1;
-+ mon = atol(val) - 1;
-
- /* Slash separating month from day... */
- token = peek_token(&val, NULL, cfile);
-@@ -1010,7 +1010,7 @@ parse_date_core(cfile)
- return((TIME)0);
- }
- token = next_token(&val, NULL, cfile); /* consume day of month */
-- mday = atoi(val);
-+ mday = atol(val);
-
- /* Hour... */
- token = peek_token(&val, NULL, cfile);
-@@ -1021,7 +1021,7 @@ parse_date_core(cfile)
- return((TIME)0);
- }
- token = next_token(&val, NULL, cfile); /* consume hour */
-- hour = atoi(val);
-+ hour = atol(val);
-
- /* Colon separating hour from minute... */
- token = peek_token(&val, NULL, cfile);
-@@ -1043,7 +1043,7 @@ parse_date_core(cfile)
- return((TIME)0);
- }
- token = next_token(&val, NULL, cfile); /* consume minute */
-- min = atoi(val);
-+ min = atol(val);
-
- /* Colon separating minute from second... */
- token = peek_token(&val, NULL, cfile);
-@@ -1065,13 +1065,13 @@ parse_date_core(cfile)
- return((TIME)0);
- }
- token = next_token(&val, NULL, cfile); /* consume second */
-- sec = atoi(val);
-+ sec = atol(val);
-
- tzoff = 0;
- token = peek_token(&val, NULL, cfile);
- if (token == NUMBER) {
- token = next_token(&val, NULL, cfile); /* consume tzoff */
-- tzoff = atoi(val);
-+ tzoff = atol(val);
- } else if (token != SEMI) {
- token = next_token(&val, NULL, cfile);
- parse_warn(cfile,
diff --git a/dhcp/patches/dhcp-4.2.1-P1-CVE-2011-0997.patch b/dhcp/patches/dhcp-4.2.1-P1-CVE-2011-0997.patch
deleted file mode 100644
index 1a0243c..0000000
--- a/dhcp/patches/dhcp-4.2.1-P1-CVE-2011-0997.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up dhcp-4.2.1-P1/client/dhclient.c.CVE-2011-0997 dhcp-4.2.1-P1/client/dhclient.c
---- dhcp-4.2.1-P1/client/dhclient.c.CVE-2011-0997 2011-04-06 20:21:43.000000000 +0200
-+++ dhcp-4.2.1-P1/client/dhclient.c 2011-04-06 20:22:31.000000000 +0200
-@@ -4545,11 +4545,11 @@ static int check_option_values(struct un
- if ((universe == NULL) || (universe == &dhcp_universe)) {
- switch(opt) {
- case DHO_HOST_NAME:
-- case DHO_DOMAIN_NAME:
- case DHO_NIS_DOMAIN:
- case DHO_NETBIOS_SCOPE:
- return check_domain_name(ptr, len, 0);
- break;
-+ case DHO_DOMAIN_NAME: /* accept a list for compatibiliy */
- case DHO_DOMAIN_SEARCH:
- return check_domain_name_list(ptr, len, 0);
- break;
diff --git a/dhcp/patches/dhcp-4.2.1-invalid-dhclient-conf.patch b/dhcp/patches/dhcp-4.2.1-invalid-dhclient-conf.patch
deleted file mode 100644
index eeeea84..0000000
--- a/dhcp/patches/dhcp-4.2.1-invalid-dhclient-conf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up dhcp-4.2.1b1/client/dhclient.conf.supersede dhcp-4.2.1b1/client/dhclient.conf
---- dhcp-4.2.1b1/client/dhclient.conf.supersede 2010-09-15 01:03:56.000000000 +0200
-+++ dhcp-4.2.1b1/client/dhclient.conf 2011-01-27 18:38:28.000000000 +0100
-@@ -4,7 +4,7 @@ send dhcp-lease-time 3600;
- supersede domain-search "fugue.com", "home.vix.com";
- prepend domain-name-servers 127.0.0.1;
- request subnet-mask, broadcast-address, time-offset, routers,
-- domain-name, domain-name-servers, host-name;
-+ domain-search, domain-name-servers, host-name;
- require subnet-mask, domain-name-servers;
- timeout 60;
- retry 60;
diff --git a/dhcp/patches/dhcp-4.2.2-CLOEXEC.patch b/dhcp/patches/dhcp-4.2.2-CLOEXEC.patch
index b07e2ff..1198f77 100644
--- a/dhcp/patches/dhcp-4.2.2-CLOEXEC.patch
+++ b/dhcp/patches/dhcp-4.2.2-CLOEXEC.patch
@@ -202,66 +202,6 @@ diff -up dhcp-4.2.2b1/common/upf.c.cloexec dhcp-4.2.2b1/common/upf.c
if (sock < 0) {
if (errno == EBUSY) {
continue;
-diff -up dhcp-4.2.2b1/dst/dst_api.c.cloexec dhcp-4.2.2b1/dst/dst_api.c
---- dhcp-4.2.2b1/dst/dst_api.c.cloexec 2009-10-29 01:46:48.000000000 +0100
-+++ dhcp-4.2.2b1/dst/dst_api.c 2011-07-01 14:13:31.035887670 +0200
-@@ -437,7 +437,7 @@ dst_s_write_private_key(const DST_KEY *k
- PRIVATE_KEY, PATH_MAX);
-
- /* Do not overwrite an existing file */
-- if ((fp = dst_s_fopen(file, "w", 0600)) != NULL) {
-+ if ((fp = dst_s_fopen(file, "we", 0600)) != NULL) {
- int nn;
- if ((nn = fwrite(encoded_block, 1, len, fp)) != len) {
- EREPORT(("dst_write_private_key(): Write failure on %s %d != %d errno=%d\n",
-@@ -494,7 +494,7 @@ dst_s_read_public_key(const char *in_nam
- * flags, proto, alg stored as decimal (or hex numbers FIXME).
- * (FIXME: handle parentheses for line continuation.)
- */
-- if ((fp = dst_s_fopen(name, "r", 0)) == NULL) {
-+ if ((fp = dst_s_fopen(name, "re", 0)) == NULL) {
- EREPORT(("dst_read_public_key(): Public Key not found %s\n",
- name));
- return (NULL);
-@@ -620,7 +620,7 @@ dst_s_write_public_key(const DST_KEY *ke
- return (0);
- }
- /* create public key file */
-- if ((fp = dst_s_fopen(filename, "w+", 0644)) == NULL) {
-+ if ((fp = dst_s_fopen(filename, "w+e", 0644)) == NULL) {
- EREPORT(("DST_write_public_key: open of file:%s failed (errno=%d)\n",
- filename, errno));
- return (0);
-@@ -854,7 +854,7 @@ dst_s_read_private_key_file(char *name,
- return (0);
- }
- /* first check if we can find the key file */
-- if ((fp = dst_s_fopen(filename, "r", 0)) == NULL) {
-+ if ((fp = dst_s_fopen(filename, "re", 0)) == NULL) {
- EREPORT(("dst_s_read_private_key_file: Could not open file %s in directory %s\n",
- filename, dst_path[0] ? dst_path :
- (char *) getcwd(NULL, PATH_MAX - 1)));
-diff -up dhcp-4.2.2b1/dst/prandom.c.cloexec dhcp-4.2.2b1/dst/prandom.c
---- dhcp-4.2.2b1/dst/prandom.c.cloexec 2009-11-20 02:49:01.000000000 +0100
-+++ dhcp-4.2.2b1/dst/prandom.c 2011-07-01 14:13:31.035887670 +0200
-@@ -269,7 +269,7 @@ get_dev_random(u_char *output, unsigned
-
- s = stat("/dev/random", &st);
- if (s == 0 && S_ISCHR(st.st_mode)) {
-- if ((fd = open("/dev/random", O_RDONLY | O_NONBLOCK)) != -1) {
-+ if ((fd = open("/dev/random", O_RDONLY | O_NONBLOCK | O_CLOEXEC)) != -1) {
- if ((n = read(fd, output, size)) < 0)
- n = 0;
- close(fd);
-@@ -480,7 +480,7 @@ digest_file(dst_work *work)
- work->file_digest = dst_free_key(work->file_digest);
- return (0);
- }
-- if ((fp = fopen(name, "r")) == NULL)
-+ if ((fp = fopen(name, "re")) == NULL)
- return (0);
- for (no = 0; (i = fread(buf, sizeof(*buf), sizeof(buf), fp)) > 0;
- no += i)
diff -up dhcp-4.2.2b1/omapip/trace.c.cloexec dhcp-4.2.2b1/omapip/trace.c
--- dhcp-4.2.2b1/omapip/trace.c.cloexec 2010-05-27 02:34:57.000000000 +0200
+++ dhcp-4.2.2b1/omapip/trace.c 2011-07-01 14:13:31.036887669 +0200
diff --git a/dhcp/patches/dhcp-4.2.2-capability.patch b/dhcp/patches/dhcp-4.2.2-capability.patch
index 79af036..db2fb38 100644
--- a/dhcp/patches/dhcp-4.2.2-capability.patch
+++ b/dhcp/patches/dhcp-4.2.2-capability.patch
@@ -248,76 +248,3 @@ diff -up dhcp-4.2.2b1/relay/Makefile.am.capability dhcp-4.2.2b1/relay/Makefile.a
man_MANS = dhcrelay.8
EXTRA_DIST = $(man_MANS)
-diff -up dhcp-4.2.2b1/server/dhcpd.c.capability dhcp-4.2.2b1/server/dhcpd.c
---- dhcp-4.2.2b1/server/dhcpd.c.capability 2011-07-01 15:09:06.636784192 +0200
-+++ dhcp-4.2.2b1/server/dhcpd.c 2011-07-01 15:09:06.670783841 +0200
-@@ -58,6 +58,11 @@ static const char url [] =
- # undef group
- #endif /* PARANOIA */
-
-+#ifdef HAVE_LIBCAP_NG
-+# include <cap-ng.h>
-+ int keep_capabilities = 0;
-+#endif
-+
- static void usage(void);
-
- struct iaddr server_identifier;
-@@ -403,6 +408,10 @@ main(int argc, char **argv) {
- traceinfile = argv [i];
- trace_replay_init ();
- #endif /* TRACING */
-+ } else if (!strcmp(argv[i], "-nc")) {
-+#ifdef HAVE_LIBCAP_NG
-+ keep_capabilities = 1;
-+#endif
- } else if (argv [i][0] == '-') {
- usage ();
- } else {
-@@ -459,6 +468,17 @@ main(int argc, char **argv) {
- }
- #endif /* DHCPv6 */
-
-+#ifdef HAVE_LIBCAP_NG
-+ /* Drop capabilities */
-+ if (!keep_capabilities) {
-+ capng_clear(CAPNG_SELECT_BOTH);
-+ capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED,
-+ CAP_NET_RAW, CAP_NET_BIND_SERVICE, CAP_SYS_CHROOT, CAP_SETUID, CAP_SETGID, -1);
-+ capng_apply(CAPNG_SELECT_BOTH);
-+ log_info ("Dropped all unnecessary capabilities.");
-+ }
-+#endif
-+
- /*
- * convert relative path names to absolute, for files that need
- * to be reopened after chdir() has been called
-@@ -859,6 +879,15 @@ main(int argc, char **argv) {
- omapi_set_int_value ((omapi_object_t *)dhcp_control_object,
- (omapi_object_t *)0, "state", server_running);
-
-+#ifdef HAVE_LIBCAP_NG
-+ /* Drop all capabilities */
-+ if (!keep_capabilities) {
-+ capng_clear(CAPNG_SELECT_BOTH);
-+ capng_apply(CAPNG_SELECT_BOTH);
-+ log_info ("Dropped all capabilities.");
-+ }
-+#endif
-+
- /* Receive packets and dispatch them... */
- dispatch ();
-
-diff -up dhcp-4.2.2b1/server/Makefile.am.capability dhcp-4.2.2b1/server/Makefile.am
---- dhcp-4.2.2b1/server/Makefile.am.capability 2011-07-01 15:09:06.546785121 +0200
-+++ dhcp-4.2.2b1/server/Makefile.am 2011-07-01 15:09:06.671783830 +0200
-@@ -8,7 +8,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
-
- dhcpd_CFLAGS = $(LDAP_CFLAGS)
- dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
-- ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export
-+ ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export \
-+ $(CAPNG_LDADD)
-
- man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
- EXTRA_DIST = $(man_MANS)
diff --git a/dhcp/patches/dhcp-4.2.2-gpxe-cid.patch b/dhcp/patches/dhcp-4.2.2-gpxe-cid.patch
index c0be4c2..fd73b2c 100644
--- a/dhcp/patches/dhcp-4.2.2-gpxe-cid.patch
+++ b/dhcp/patches/dhcp-4.2.2-gpxe-cid.patch
@@ -73,60 +73,11 @@ diff -up dhcp-4.2.2/client/dhclient.c.gpxe-cid dhcp-4.2.2/client/dhclient.c
diff -up dhcp-4.2.2/common/lpf.c.gpxe-cid dhcp-4.2.2/common/lpf.c
--- dhcp-4.2.2/common/lpf.c.gpxe-cid 2011-09-16 18:23:20.183453996 +0200
+++ dhcp-4.2.2/common/lpf.c 2011-09-16 18:25:28.235804421 +0200
-@@ -591,6 +591,37 @@ void maybe_setup_fallback ()
- }
- }
-
-+static unsigned char * get_ib_hw_addr(char * name)
-+{
-+ struct ifaddrs *ifaddrs;
-+ struct ifaddrs *ifa;
-+ struct sockaddr_ll *sll = NULL;
-+ static unsigned char hw_addr[8];
-+
-+ if (getifaddrs(&ifaddrs) == -1)
-+ return NULL;
-+
-+ for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
-+ if (ifa->ifa_addr == NULL)
-+ continue;
-+ if (ifa->ifa_addr->sa_family != AF_PACKET)
-+ continue;
-+ if (ifa->ifa_flags & IFF_LOOPBACK)
-+ continue;
-+ if (strcmp(ifa->ifa_name, name) == 0) {
-+ sll = (struct sockaddr_ll *)(void *)ifa->ifa_addr;
-+ break;
-+ }
-+ }
-+ if (sll == NULL) {
-+ freeifaddrs(ifaddrs);
-+ return NULL;
-+ }
-+ memcpy(hw_addr, &sll->sll_addr[sll->sll_halen - 8], 8);
-+ freeifaddrs(ifaddrs);
-+ return (unsigned char *)&hw_addr;
-+}
-+
- void
- get_hw_addr(struct interface_info *info)
- {
-@@ -599,6 +630,7 @@ get_hw_addr(struct interface_info *info)
- struct ifaddrs *ifaddrs;
- struct ifaddrs *ifa;
- struct sockaddr_ll *sll = NULL;
-+ unsigned char *hw_addr;
-
- if (getifaddrs(&ifaddrs) == -1)
- log_fatal("Failed to get interfaces");
-@@ -660,6 +692,10 @@ get_hw_addr(struct interface_info *info)
+@@ -698,6 +698,7 @@ get_hw_addr(struct interface_info *info)
hw->hlen = 1;
hw->hbuf[0] = HTYPE_INFINIBAND;
-+ hw_addr = get_ib_hw_addr(name);
-+ if (!hw_addr)
-+ log_fatal("Failed getting %s hw addr", name);
-+ memcpy (&hw->hbuf [1], hw_addr, 8);
++ memcpy(&hw->hbuf[1], &sll->sll_addr[sll->sll_halen - 8], 8);
break;
#if defined(ARPHRD_PPP)
case ARPHRD_PPP:
diff --git a/dhcp/patches/dhcp-4.2.2-improved-xid.patch b/dhcp/patches/dhcp-4.2.2-improved-xid.patch
deleted file mode 100644
index f49fc78..0000000
--- a/dhcp/patches/dhcp-4.2.2-improved-xid.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -up dhcp-4.2.2/client/dhclient.c.improved-xid dhcp-4.2.2/client/dhclient.c
---- dhcp-4.2.2/client/dhclient.c.improved-xid 2011-09-16 18:18:00.649730661 +0200
-+++ dhcp-4.2.2/client/dhclient.c 2011-09-16 18:22:36.815035513 +0200
-@@ -898,6 +898,26 @@ main(int argc, char **argv) {
- }
- }
-
-+ /* We create a backup seed before rediscovering interfaces in order to
-+ have a seed built using all of the available interfaces
-+ It's interesting if required interfaces doesn't let us defined
-+ a really unique seed due to a lack of valid HW addr later
-+ (this is the case with DHCP over IB)
-+ We only use the last device as using a sum could broke the
-+ uniqueness of the seed among multiple nodes
-+ */
-+ unsigned backup_seed = 0;
-+ for (ip = interfaces; ip; ip = ip -> next) {
-+ int junk;
-+ if ( ip -> hw_address.hlen <= sizeof seed )
-+ continue;
-+ memcpy (&junk,
-+ &ip -> hw_address.hbuf [ip -> hw_address.hlen -
-+ sizeof seed], sizeof seed);
-+ backup_seed = junk;
-+ }
-+
-+
- /* At this point, all the interfaces that the script thinks
- are relevant should be running, so now we once again call
- discover_interfaces(), and this time ask it to actually set
-@@ -912,14 +932,36 @@ main(int argc, char **argv) {
- Not much entropy, but we're booting, so we're not likely to
- find anything better. */
- seed = 0;
-+ int seed_flag = 0;
- for (ip = interfaces; ip; ip = ip->next) {
- int junk;
-+ if ( ip -> hw_address.hlen <= sizeof seed )
-+ continue;
- memcpy(&junk,
- &ip->hw_address.hbuf[ip->hw_address.hlen -
- sizeof seed], sizeof seed);
- seed += junk;
-+ seed_flag = 1;
- }
-- srandom(seed + cur_time + (unsigned)getpid());
-+ if ( seed_flag == 0 ) {
-+ if ( backup_seed != 0 ) {
-+ seed = backup_seed;
-+ log_info ("xid: rand init seed (0x%x) built using all"
-+ " available interfaces",seed);
-+ }
-+ else {
-+ seed = cur_time^((unsigned) gethostid()) ;
-+ log_info ("xid: warning: no netdev with useable HWADDR found"
-+ " for seed's uniqueness enforcement");
-+ log_info ("xid: rand init seed (0x%x) built using gethostid",
-+ seed);
-+ }
-+ /* we only use seed and no current time as a broadcast reply */
-+ /* will certainly be used by the hwaddrless interface */
-+ srandom(seed);
-+ }
-+ else
-+ srandom(seed + cur_time + (unsigned)getpid());
-
- /* Setup specific Infiniband options */
- for (ip = interfaces; ip; ip = ip->next) {
-@@ -1457,7 +1499,7 @@ void dhcpack (packet)
- return;
- }
-
-- log_info ("DHCPACK from %s", piaddr (packet -> client_addr));
-+ log_info ("DHCPACK from %s (xid=0x%x)", piaddr (packet -> client_addr), client -> xid);
-
- lease = packet_to_lease (packet, client);
- if (!lease) {
-@@ -2174,7 +2216,7 @@ void dhcpnak (packet)
- return;
- }
-
-- log_info ("DHCPNAK from %s", piaddr (packet -> client_addr));
-+ log_info ("DHCPNAK from %s (xid=0x%x)", piaddr (packet -> client_addr), client -> xid);
-
- if (!client -> active) {
- #if defined (DEBUG)
-@@ -2300,10 +2342,10 @@ void send_discover (cpp)
- client -> packet.secs = htons (65535);
- client -> secs = client -> packet.secs;
-
-- log_info ("DHCPDISCOVER on %s to %s port %d interval %ld",
-+ log_info ("DHCPDISCOVER on %s to %s port %d interval %ld (xid=0x%x)",
- client -> name ? client -> name : client -> interface -> name,
- inet_ntoa (sockaddr_broadcast.sin_addr),
-- ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval));
-+ ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval), client -> xid);
-
- /* Send out a packet. */
- result = send_packet (client -> interface, (struct packet *)0,
-@@ -2584,10 +2626,10 @@ void send_request (cpp)
- client -> packet.secs = htons (65535);
- }
-
-- log_info ("DHCPREQUEST on %s to %s port %d",
-+ log_info ("DHCPREQUEST on %s to %s port %d (xid=0x%x)",
- client -> name ? client -> name : client -> interface -> name,
- inet_ntoa (destination.sin_addr),
-- ntohs (destination.sin_port));
-+ ntohs (destination.sin_port), client -> xid);
-
- if (destination.sin_addr.s_addr != INADDR_BROADCAST &&
- fallback_interface)
-@@ -2618,10 +2660,10 @@ void send_decline (cpp)
-
- int result;
-
-- log_info ("DHCPDECLINE on %s to %s port %d",
-+ log_info ("DHCPDECLINE on %s to %s port %d (xid=0x%x)",
- client -> name ? client -> name : client -> interface -> name,
- inet_ntoa (sockaddr_broadcast.sin_addr),
-- ntohs (sockaddr_broadcast.sin_port));
-+ ntohs (sockaddr_broadcast.sin_port), client -> xid);
-
- /* Send out a packet. */
- result = send_packet (client -> interface, (struct packet *)0,
-@@ -2661,10 +2703,10 @@ void send_release (cpp)
- return;
- }
-
-- log_info ("DHCPRELEASE on %s to %s port %d",
-+ log_info ("DHCPRELEASE on %s to %s port %d (xid=0x%x)",
- client -> name ? client -> name : client -> interface -> name,
- inet_ntoa (destination.sin_addr),
-- ntohs (destination.sin_port));
-+ ntohs (destination.sin_port), client -> xid);
-
- if (fallback_interface)
- result = send_packet (fallback_interface,
diff --git a/dhcp/patches/dhcp-4.2.2-lpf-ib.patch b/dhcp/patches/dhcp-4.2.2-lpf-ib.patch
deleted file mode 100644
index 4034028..0000000
--- a/dhcp/patches/dhcp-4.2.2-lpf-ib.patch
+++ /dev/null
@@ -1,538 +0,0 @@
-diff -up dhcp-4.2.2/client/dhclient.c.lpf-ib dhcp-4.2.2/client/dhclient.c
---- dhcp-4.2.2/client/dhclient.c.lpf-ib 2011-09-19 11:24:08.693775799 +0200
-+++ dhcp-4.2.2/client/dhclient.c 2011-09-19 11:24:08.703775541 +0200
-@@ -113,6 +113,8 @@ static int check_domain_name_list(const
- static int check_option_values(struct universe *universe, unsigned int opt,
- const char *ptr, size_t len);
-
-+static void setup_ib_interface(struct interface_info *ip);
-+
- int
- main(int argc, char **argv) {
- int fd;
-@@ -919,6 +921,14 @@ main(int argc, char **argv) {
- }
- srandom(seed + cur_time + (unsigned)getpid());
-
-+ /* Setup specific Infiniband options */
-+ for (ip = interfaces; ip; ip = ip->next) {
-+ if (ip->client &&
-+ (ip->hw_address.hbuf[0] == HTYPE_INFINIBAND)) {
-+ setup_ib_interface(ip);
-+ }
-+ }
-+
- /* Start a configuration state machine for each interface. */
- #ifdef DHCPv6
- if (local_family == AF_INET6) {
-@@ -1195,6 +1205,29 @@ int find_subnet (struct subnet **sp,
- return 0;
- }
-
-+static void setup_ib_interface(struct interface_info *ip)
-+{
-+ struct group *g;
-+
-+ /* Set the broadcast flag */
-+ ip->client->config->bootp_broadcast_always = 1;
-+
-+ /*
-+ * Find out if a dhcp-client-identifier option was specified either
-+ * in the config file or on the command line
-+ */
-+ for (g = ip->client->config->on_transmission; g != NULL; g = g->next) {
-+ if ((g->statements != NULL) &&
-+ (strcmp(g->statements->data.option->option->name,
-+ "dhcp-client-identifier") == 0)) {
-+ return;
-+ }
-+ }
-+
-+ /* No client ID specified */
-+ log_fatal("dhcp-client-identifier must be specified for InfiniBand");
-+}
-+
- /* Individual States:
- *
- * Each routine is called from the dhclient_state_machine() in one of
-diff -up dhcp-4.2.2/common/bpf.c.lpf-ib dhcp-4.2.2/common/bpf.c
---- dhcp-4.2.2/common/bpf.c.lpf-ib 2011-09-19 11:24:08.694775773 +0200
-+++ dhcp-4.2.2/common/bpf.c 2011-09-19 11:24:08.704775516 +0200
-@@ -198,11 +198,44 @@ struct bpf_insn dhcp_bpf_filter [] = {
- BPF_STMT(BPF_RET+BPF_K, 0),
- };
-
-+/* Packet filter program for DHCP over Infiniband.
-+ *
-+ * XXX
-+ * Changes to the filter program may require changes to the constant offsets
-+ * used in lpf_gen_filter_setup to patch the port in the BPF program!
-+ * XXX
-+ */
-+struct bpf_insn dhcp_ib_bpf_filter [] = {
-+ /* Packet filter for Infiniband */
-+ /* Make sure it's a UDP packet... */
-+ BPF_STMT(BPF_LD + BPF_B + BPF_ABS, 9),
-+ BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, IPPROTO_UDP, 0, 6),
-+
-+ /* Make sure this isn't a fragment... */
-+ BPF_STMT(BPF_LD + BPF_H + BPF_ABS, 6),
-+ BPF_JUMP(BPF_JMP + BPF_JSET + BPF_K, 0x1fff, 4, 0),
-+
-+ /* Get the IP header length... */
-+ BPF_STMT(BPF_LDX + BPF_B + BPF_MSH, 0),
-+
-+ /* Make sure it's to the right port... */
-+ BPF_STMT(BPF_LD + BPF_H + BPF_IND, 2),
-+ BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 67, 0, 1),
-+
-+ /* If we passed all the tests, ask for the whole packet. */
-+ BPF_STMT(BPF_RET + BPF_K, (u_int)-1),
-+
-+ /* Otherwise, drop it. */
-+ BPF_STMT(BPF_RET + BPF_K, 0),
-+};
-+
- #if defined (DEC_FDDI)
- struct bpf_insn *bpf_fddi_filter;
- #endif
-
- int dhcp_bpf_filter_len = sizeof dhcp_bpf_filter / sizeof (struct bpf_insn);
-+int dhcp_ib_bpf_filter_len = sizeof dhcp_ib_bpf_filter / sizeof (struct bpf_insn);
-+
- #if defined (HAVE_TR_SUPPORT)
- struct bpf_insn dhcp_bpf_tr_filter [] = {
- /* accept all token ring packets due to variable length header */
-diff -up dhcp-4.2.2/common/lpf.c.lpf-ib dhcp-4.2.2/common/lpf.c
---- dhcp-4.2.2/common/lpf.c.lpf-ib 2011-09-19 11:24:08.694775773 +0200
-+++ dhcp-4.2.2/common/lpf.c 2011-09-19 11:26:15.107109935 +0200
-@@ -42,6 +42,7 @@
- #include "includes/netinet/udp.h"
- #include "includes/netinet/if_ether.h"
- #include <net/if.h>
-+#include <ifaddrs.h>
-
- #ifndef PACKET_AUXDATA
- #define PACKET_AUXDATA 8
-@@ -59,6 +60,15 @@ struct tpacket_auxdata
- /* Reinitializes the specified interface after an address change. This
- is not required for packet-filter APIs. */
-
-+/* Default broadcast address for IPoIB */
-+static unsigned char default_ib_bcast_addr[20] = {
-+ 0x00, 0xff, 0xff, 0xff,
-+ 0xff, 0x12, 0x40, 0x1b,
-+ 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00,
-+ 0xff, 0xff, 0xff, 0xff
-+};
-+
- #ifdef USE_LPF_SEND
- void if_reinitialize_send (info)
- struct interface_info *info;
-@@ -86,10 +96,21 @@ int if_register_lpf (info)
- struct sockaddr common;
- } sa;
- struct ifreq ifr;
-+ int type;
-+ int protocol;
-
- /* Make an LPF socket. */
-- if ((sock = socket(PF_PACKET, SOCK_RAW,
-- htons((short)ETH_P_ALL))) < 0) {
-+ get_hw_addr(info);
-+
-+ if (info->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
-+ type = SOCK_DGRAM;
-+ protocol = ETHERTYPE_IP;
-+ } else {
-+ type = SOCK_RAW;
-+ protocol = ETH_P_ALL;
-+ }
-+
-+ if ((sock = socket(PF_PACKET, type, htons((short)protocol))) < 0) {
- if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
- errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
- errno == EAFNOSUPPORT || errno == EINVAL) {
-@@ -112,6 +133,7 @@ int if_register_lpf (info)
- /* Bind to the interface name */
- memset (&sa, 0, sizeof sa);
- sa.ll.sll_family = AF_PACKET;
-+ sa.ll.sll_protocol = htons(protocol);
- sa.ll.sll_ifindex = ifr.ifr_ifindex;
- if (bind (sock, &sa.common, sizeof sa)) {
- if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
-@@ -127,8 +149,6 @@ int if_register_lpf (info)
- log_fatal ("Bind socket to interface: %m");
- }
-
-- get_hw_addr(info->name, &info->hw_address);
--
- return sock;
- }
- #endif /* USE_LPF_SEND || USE_LPF_RECEIVE */
-@@ -183,6 +203,8 @@ void if_deregister_send (info)
- in bpf includes... */
- extern struct sock_filter dhcp_bpf_filter [];
- extern int dhcp_bpf_filter_len;
-+extern struct sock_filter dhcp_ib_bpf_filter [];
-+extern int dhcp_ib_bpf_filter_len;
-
- #if defined (HAVE_TR_SUPPORT)
- extern struct sock_filter dhcp_bpf_tr_filter [];
-@@ -200,11 +222,13 @@ void if_register_receive (info)
- /* Open a LPF device and hang it on this interface... */
- info -> rfdesc = if_register_lpf (info);
-
-- val = 1;
-- if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val,
-- sizeof val) < 0) {
-- if (errno != ENOPROTOOPT)
-- log_fatal ("Failed to set auxiliary packet data: %m");
-+ if (info->hw_address.hbuf[0] != HTYPE_INFINIBAND) {
-+ val = 1;
-+ if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA,
-+ &val, sizeof val) < 0) {
-+ if (errno != ENOPROTOOPT)
-+ log_fatal ("Failed to set auxiliary packet data: %m");
-+ }
- }
-
- #if defined (HAVE_TR_SUPPORT)
-@@ -250,15 +274,28 @@ static void lpf_gen_filter_setup (info)
-
- memset(&p, 0, sizeof(p));
-
-- /* Set up the bpf filter program structure. This is defined in
-- bpf.c */
-- p.len = dhcp_bpf_filter_len;
-- p.filter = dhcp_bpf_filter;
--
-- /* Patch the server port into the LPF program...
-- XXX changes to filter program may require changes
-- to the insn number(s) used below! XXX */
-- dhcp_bpf_filter [8].k = ntohs ((short)local_port);
-+ if (info->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
-+ /* Set up the bpf filter program structure. */
-+ p.len = dhcp_ib_bpf_filter_len;
-+ p.filter = dhcp_ib_bpf_filter;
-+
-+ /* Patch the server port into the LPF program...
-+ XXX
-+ changes to filter program may require changes
-+ to the insn number(s) used below!
-+ XXX */
-+ dhcp_ib_bpf_filter[6].k = ntohs ((short)local_port);
-+ } else {
-+ /* Set up the bpf filter program structure.
-+ This is defined in bpf.c */
-+ p.len = dhcp_bpf_filter_len;
-+ p.filter = dhcp_bpf_filter;
-+
-+ /* Patch the server port into the LPF program...
-+ XXX changes to filter program may require changes
-+ to the insn number(s) used below! XXX */
-+ dhcp_bpf_filter [8].k = ntohs ((short)local_port);
-+ }
-
- if (setsockopt (info -> rfdesc, SOL_SOCKET, SO_ATTACH_FILTER, &p,
- sizeof p) < 0) {
-@@ -315,6 +352,54 @@ static void lpf_tr_filter_setup (info)
- #endif /* USE_LPF_RECEIVE */
-
- #ifdef USE_LPF_SEND
-+ssize_t send_packet_ib(interface, packet, raw, len, from, to, hto)
-+ struct interface_info *interface;
-+ struct packet *packet;
-+ struct dhcp_packet *raw;
-+ size_t len;
-+ struct in_addr from;
-+ struct sockaddr_in *to;
-+ struct hardware *hto;
-+{
-+ unsigned ibufp = 0;
-+ double ih [1536 / sizeof (double)];
-+ unsigned char *buf = (unsigned char *)ih;
-+ ssize_t result;
-+
-+ union sockunion {
-+ struct sockaddr sa;
-+ struct sockaddr_ll sll;
-+ struct sockaddr_storage ss;
-+ } su;
-+
-+ assemble_udp_ip_header (interface, buf, &ibufp, from.s_addr,
-+ to->sin_addr.s_addr, to->sin_port,
-+ (unsigned char *)raw, len);
-+ memcpy (buf + ibufp, raw, len);
-+
-+ memset(&su, 0, sizeof(su));
-+ su.sll.sll_family = AF_PACKET;
-+ su.sll.sll_protocol = htons(ETHERTYPE_IP);
-+
-+ if (!(su.sll.sll_ifindex = if_nametoindex(interface->name))) {
-+ errno = ENOENT;
-+ log_error ("send_packet_ib: %m - failed to get if index");
-+ return -1;
-+ }
-+
-+ su.sll.sll_hatype = htons(HTYPE_INFINIBAND);
-+ su.sll.sll_halen = sizeof(interface->bcast_addr);
-+ memcpy(&su.sll.sll_addr, interface->bcast_addr, 20);
-+
-+ result = sendto(interface->wfdesc, buf, ibufp + len, 0,
-+ &su.sa, sizeof(su));
-+
-+ if (result < 0)
-+ log_error ("send_packet_ib: %m");
-+
-+ return result;
-+}
-+
- ssize_t send_packet (interface, packet, raw, len, from, to, hto)
- struct interface_info *interface;
- struct packet *packet;
-@@ -335,6 +420,11 @@ ssize_t send_packet (interface, packet,
- return send_fallback (interface, packet, raw,
- len, from, to, hto);
-
-+ if (interface->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
-+ return send_packet_ib(interface, packet, raw, len, from,
-+ to, hto);
-+ }
-+
- if (hto == NULL && interface->anycast_mac_addr.hlen)
- hto = &interface->anycast_mac_addr;
-
-@@ -356,6 +446,42 @@ ssize_t send_packet (interface, packet,
- #endif /* USE_LPF_SEND */
-
- #ifdef USE_LPF_RECEIVE
-+ssize_t receive_packet_ib (interface, buf, len, from, hfrom)
-+ struct interface_info *interface;
-+ unsigned char *buf;
-+ size_t len;
-+ struct sockaddr_in *from;
-+ struct hardware *hfrom;
-+{
-+ int length = 0;
-+ int offset = 0;
-+ unsigned char ibuf [1536];
-+ unsigned bufix = 0;
-+ unsigned paylen;
-+
-+ length = read(interface->rfdesc, ibuf, sizeof(ibuf));
-+
-+ if (length <= 0)
-+ return length;
-+
-+ offset = decode_udp_ip_header(interface, ibuf, bufix, from,
-+ (unsigned)length, &paylen, 0);
-+
-+ if (offset < 0)
-+ return 0;
-+
-+ bufix += offset;
-+ length -= offset;
-+
-+ if (length < paylen)
-+ log_fatal("Internal inconsistency at %s:%d.", MDL);
-+
-+ /* Copy out the data in the packet... */
-+ memcpy(buf, &ibuf[bufix], paylen);
-+
-+ return (ssize_t)paylen;
-+}
-+
- ssize_t receive_packet (interface, buf, len, from, hfrom)
- struct interface_info *interface;
- unsigned char *buf;
-@@ -382,6 +508,10 @@ ssize_t receive_packet (interface, buf,
- };
- struct cmsghdr *cmsg;
-
-+ if (interface->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
-+ return receive_packet_ib(interface, buf, len, from, hfrom);
-+ }
-+
- length = recvmsg (interface -> rfdesc, &msg, 0);
- if (length <= 0)
- return length;
-@@ -462,33 +592,44 @@ void maybe_setup_fallback ()
- }
-
- void
--get_hw_addr(const char *name, struct hardware *hw) {
-- int sock;
-- struct ifreq tmp;
-- struct sockaddr *sa;
-+get_hw_addr(struct interface_info *info)
-+{
-+ struct hardware *hw = &info->hw_address;
-+ char *name = info->name;
-+ struct ifaddrs *ifaddrs;
-+ struct ifaddrs *ifa;
-+ struct sockaddr_ll *sll = NULL;
-
-- if (strlen(name) >= sizeof(tmp.ifr_name)) {
-- log_fatal("Device name too long: \"%s\"", name);
-- }
-+ if (getifaddrs(&ifaddrs) == -1)
-+ log_fatal("Failed to get interfaces");
-
-- sock = socket(AF_INET, SOCK_DGRAM, 0);
-- if (sock < 0) {
-- log_fatal("Can't create socket for \"%s\": %m", name);
-+ for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
-+
-+ if (ifa->ifa_addr == NULL)
-+ continue;
-+
-+ if (ifa->ifa_addr->sa_family != AF_PACKET)
-+ continue;
-+
-+ if (ifa->ifa_flags & IFF_LOOPBACK)
-+ continue;
-+
-+ if (strcmp(ifa->ifa_name, name) == 0) {
-+ sll = (struct sockaddr_ll *)(void *)ifa->ifa_addr;
-+ break;
-+ }
- }
-
-- memset(&tmp, 0, sizeof(tmp));
-- strcpy(tmp.ifr_name, name);
-- if (ioctl(sock, SIOCGIFHWADDR, &tmp) < 0) {
-- log_fatal("Error getting hardware address for \"%s\": %m",
-- name);
-+ if (sll == NULL) {
-+ freeifaddrs(ifaddrs);
-+ log_fatal("Failed to get HW address for %s\n", name);
- }
-
-- sa = &tmp.ifr_hwaddr;
-- switch (sa->sa_family) {
-+ switch (sll->sll_hatype) {
- case ARPHRD_ETHER:
- hw->hlen = 7;
- hw->hbuf[0] = HTYPE_ETHER;
-- memcpy(&hw->hbuf[1], sa->sa_data, 6);
-+ memcpy(&hw->hbuf[1], sll->sll_addr, 6);
- break;
- case ARPHRD_IEEE802:
- #ifdef ARPHRD_IEEE802_TR
-@@ -496,18 +637,35 @@ get_hw_addr(const char *name, struct har
- #endif /* ARPHRD_IEEE802_TR */
- hw->hlen = 7;
- hw->hbuf[0] = HTYPE_IEEE802;
-- memcpy(&hw->hbuf[1], sa->sa_data, 6);
-+ memcpy(&hw->hbuf[1], sll->sll_addr, 6);
- break;
- case ARPHRD_FDDI:
- hw->hlen = 17;
- hw->hbuf[0] = HTYPE_FDDI;
-- memcpy(&hw->hbuf[1], sa->sa_data, 16);
-+ memcpy(&hw->hbuf[1], sll->sll_addr, 16);
-+ break;
-+ case ARPHRD_INFINIBAND:
-+ /* For Infiniband, save the broadcast address and store
-+ * the port GUID into the hardware address.
-+ */
-+ if (ifa->ifa_flags & IFF_BROADCAST) {
-+ struct sockaddr_ll *bll;
-+
-+ bll = (struct sockaddr_ll *)ifa->ifa_broadaddr;
-+ memcpy(&info->bcast_addr, bll->sll_addr, 20);
-+ } else {
-+ memcpy(&info->bcast_addr, default_ib_bcast_addr,
-+ 20);
-+ }
-+
-+ hw->hlen = 1;
-+ hw->hbuf[0] = HTYPE_INFINIBAND;
- break;
- #if defined(ARPHRD_PPP)
- case ARPHRD_PPP:
- if (local_family != AF_INET6)
-- log_fatal("Unsupported device type %d for \"%s\"",
-- sa->sa_family, name);
-+ log_fatal("Unsupported device type %ld for \"%s\"",
-+ (long int)sll->sll_family, name);
- hw->hlen = 0;
- hw->hbuf[0] = HTYPE_RESERVED;
- /* 0xdeadbeef should never occur on the wire,
-@@ -520,10 +678,11 @@ get_hw_addr(const char *name, struct har
- break;
- #endif
- default:
-+ freeifaddrs(ifaddrs);
- log_fatal("Unsupported device type %ld for \"%s\"",
-- (long int)sa->sa_family, name);
-+ (long int)sll->sll_family, name);
- }
-
-- close(sock);
-+ freeifaddrs(ifaddrs);
- }
- #endif
-diff -up dhcp-4.2.2/common/socket.c.lpf-ib dhcp-4.2.2/common/socket.c
---- dhcp-4.2.2/common/socket.c.lpf-ib 2011-06-27 18:18:20.000000000 +0200
-+++ dhcp-4.2.2/common/socket.c 2011-09-19 11:24:08.705775490 +0200
-@@ -324,7 +324,7 @@ void if_register_send (info)
- info->wfdesc = if_register_socket(info, AF_INET, 0);
- /* If this is a normal IPv4 address, get the hardware address. */
- if (strcmp(info->name, "fallback") != 0)
-- get_hw_addr(info->name, &info->hw_address);
-+ get_hw_addr(info);
- #if defined (USE_SOCKET_FALLBACK)
- /* Fallback only registers for send, but may need to receive as
- well. */
-@@ -387,7 +387,7 @@ void if_register_receive (info)
- #endif /* IP_PKTINFO... */
- /* If this is a normal IPv4 address, get the hardware address. */
- if (strcmp(info->name, "fallback") != 0)
-- get_hw_addr(info->name, &info->hw_address);
-+ get_hw_addr(info);
-
- if (!quiet_interface_discovery)
- log_info ("Listening on Socket/%s%s%s",
-@@ -497,7 +497,7 @@ if_register6(struct interface_info *info
- if (req_multi)
- if_register_multicast(info);
-
-- get_hw_addr(info->name, &info->hw_address);
-+ get_hw_addr(info);
-
- if (!quiet_interface_discovery) {
- if (info->shared_network != NULL) {
-diff -up dhcp-4.2.2/includes/dhcpd.h.lpf-ib dhcp-4.2.2/includes/dhcpd.h
---- dhcp-4.2.2/includes/dhcpd.h.lpf-ib 2011-09-19 11:24:08.696775721 +0200
-+++ dhcp-4.2.2/includes/dhcpd.h 2011-09-19 11:24:08.707775438 +0200
-@@ -1243,6 +1243,7 @@ struct interface_info {
- struct shared_network *shared_network;
- /* Networks connected to this interface. */
- struct hardware hw_address; /* Its physical address. */
-+ u_int8_t bcast_addr[20]; /* Infiniband broadcast address */
- struct in_addr *addresses; /* Addresses associated with this
- * interface.
- */
-@@ -2356,7 +2357,7 @@ void print_dns_status (int, struct dhcp_
- #endif
- const char *print_time(TIME);
-
--void get_hw_addr(const char *name, struct hardware *hw);
-+void get_hw_addr(struct interface_info *info);
-
- /* socket.c */
- #if defined (USE_SOCKET_SEND) || defined (USE_SOCKET_RECEIVE) \
-diff -up dhcp-4.2.2/includes/dhcp.h.lpf-ib dhcp-4.2.2/includes/dhcp.h
---- dhcp-4.2.2/includes/dhcp.h.lpf-ib 2011-09-19 11:24:08.696775721 +0200
-+++ dhcp-4.2.2/includes/dhcp.h 2011-09-19 11:24:08.707775438 +0200
-@@ -79,6 +79,7 @@ struct dhcp_packet {
- #define HTYPE_ETHER 1 /* Ethernet 10Mbps */
- #define HTYPE_IEEE802 6 /* IEEE 802.2 Token Ring... */
- #define HTYPE_FDDI 8 /* FDDI... */
-+#define HTYPE_INFINIBAND 32 /* Infiniband IPoIB */
-
- #define HTYPE_RESERVED 0 /* RFC 5494 */
-
diff --git a/dhcp/patches/dhcp-4.2.2-options.patch b/dhcp/patches/dhcp-4.2.2-options.patch
deleted file mode 100644
index 32e2add..0000000
--- a/dhcp/patches/dhcp-4.2.2-options.patch
+++ /dev/null
@@ -1,401 +0,0 @@
-diff -up dhcp-4.2.2b1/client/clparse.c.options dhcp-4.2.2b1/client/clparse.c
---- dhcp-4.2.2b1/client/clparse.c.options 2011-04-21 16:08:14.000000000 +0200
-+++ dhcp-4.2.2b1/client/clparse.c 2011-07-01 13:51:52.935755570 +0200
-@@ -146,6 +146,7 @@ isc_result_t read_client_conf ()
- /* Requested lease time, used by DHCPv6 (DHCPv4 uses the option cache)
- */
- top_level_config.requested_lease = 7200;
-+ top_level_config.bootp_broadcast_always = 0;
-
- group_allocate (&top_level_config.on_receipt, MDL);
- if (!top_level_config.on_receipt)
-@@ -313,7 +314,8 @@ void read_client_leases ()
- interface-declaration |
- LEASE client-lease-statement |
- ALIAS client-lease-statement |
-- KEY key-definition */
-+ KEY key-definition |
-+ BOOTP_BROADCAST_ALWAYS */
-
- void parse_client_statement (cfile, ip, config)
- struct parse *cfile;
-@@ -732,6 +734,12 @@ void parse_client_statement (cfile, ip,
- parse_reject_statement (cfile, config);
- return;
-
-+ case BOOTP_BROADCAST_ALWAYS:
-+ token = next_token(&val, (unsigned*)0, cfile);
-+ config -> bootp_broadcast_always = 1;
-+ parse_semi (cfile);
-+ return;
-+
- default:
- lose = 0;
- stmt = (struct executable_statement *)0;
-diff -up dhcp-4.2.2b1/client/dhclient.c.options dhcp-4.2.2b1/client/dhclient.c
---- dhcp-4.2.2b1/client/dhclient.c.options 2011-05-11 16:20:59.000000000 +0200
-+++ dhcp-4.2.2b1/client/dhclient.c 2011-07-01 13:51:52.936755545 +0200
-@@ -39,6 +39,12 @@
- #include <limits.h>
- #include <dns/result.h>
-
-+/*
-+ * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
-+ * that when building ISC code.
-+ */
-+extern int asprintf(char **strp, const char *fmt, ...);
-+
- TIME default_lease_time = 43200; /* 12 hours... */
- TIME max_lease_time = 86400; /* 24 hours... */
-
-@@ -87,6 +93,9 @@ int wanted_ia_na = -1; /* the absolute
- int wanted_ia_ta = 0;
- int wanted_ia_pd = 0;
- char *mockup_relay = NULL;
-+int bootp_broadcast_always = 0;
-+
-+extern u_int32_t default_requested_options[];
-
- void run_stateless(int exit_mode);
-
-@@ -123,6 +132,15 @@ main(int argc, char **argv) {
- int local_family_set = 0;
- #endif /* DHCPv6 */
- char *s;
-+ char *dhcp_client_identifier_arg = NULL;
-+ char *dhcp_host_name_arg = NULL;
-+ char *dhcp_fqdn_arg = NULL;
-+ char *dhcp_vendor_class_identifier_arg = NULL;
-+ char *dhclient_request_options = NULL;
-+
-+ int timeout_arg = 0;
-+ char *arg_conf = NULL;
-+ int arg_conf_len = 0;
-
- /* Initialize client globals. */
- memset(&default_duid, 0, sizeof(default_duid));
-@@ -310,6 +328,88 @@ main(int argc, char **argv) {
- } else if (!strcmp(argv[i], "--version")) {
- log_info("isc-dhclient-%s", PACKAGE_VERSION);
- exit(0);
-+ } else if (!strcmp(argv[i], "-I")) {
-+ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
-+ usage();
-+ exit(1);
-+ }
-+
-+ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
-+ log_error("-I option dhcp-client-identifier string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
-+ exit(1);
-+ }
-+
-+ dhcp_client_identifier_arg = argv[i];
-+ } else if (!strcmp(argv[i], "-B")) {
-+ bootp_broadcast_always = 1;
-+ } else if (!strcmp(argv[i], "-H")) {
-+ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
-+ usage();
-+ exit(1);
-+ }
-+
-+ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
-+ log_error("-H option host-name string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
-+ exit(1);
-+ }
-+
-+ if (dhcp_host_name_arg != NULL) {
-+ log_error("The -H <host-name> and -F <fqdn> arguments are mutually exclusive");
-+ exit(1);
-+ }
-+
-+ dhcp_host_name_arg = argv[i];
-+ } else if (!strcmp(argv[i], "-F")) {
-+ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
-+ usage();
-+ exit(1);
-+ }
-+
-+ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
-+ log_error("-F option fqdn.fqdn string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
-+ exit(1);
-+ }
-+
-+ if (dhcp_fqdn_arg != NULL) {
-+ log_error("Only one -F <fqdn> argument can be specified");
-+ exit(1);
-+ }
-+
-+ if (dhcp_host_name_arg != NULL) {
-+ log_error("The -F <fqdn> and -H <host-name> arguments are mutually exclusive");
-+ exit(1);
-+ }
-+
-+ dhcp_fqdn_arg = argv[i];
-+ } else if (!strcmp(argv[i], "-timeout")) {
-+ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
-+ usage();
-+ exit(1);
-+ }
-+
-+ if ((timeout_arg = atoi(argv[i])) <= 0) {
-+ log_error("-T timeout option must be > 0 - bad value: %s",argv[i]);
-+ exit(1);
-+ }
-+ } else if (!strcmp(argv[i], "-V")) {
-+ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
-+ usage();
-+ exit(1);
-+ }
-+
-+ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
-+ log_error("-V option vendor-class-identifier string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
-+ exit(1);
-+ }
-+
-+ dhcp_vendor_class_identifier_arg = argv[i];
-+ } else if (!strcmp(argv[i], "-R")) {
-+ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
-+ usage();
-+ exit(1);
-+ }
-+
-+ dhclient_request_options = argv[i];
- } else if (argv[i][0] == '-') {
- usage();
- } else if (interfaces_requested < 0) {
-@@ -484,6 +584,166 @@ main(int argc, char **argv) {
- /* Parse the dhclient.conf file. */
- read_client_conf();
-
-+ /* Parse any extra command line configuration arguments: */
-+ if ((dhcp_client_identifier_arg != NULL) && (*dhcp_client_identifier_arg != '\0')) {
-+ arg_conf_len = asprintf(&arg_conf, "send dhcp-client-identifier \"%s\";", dhcp_client_identifier_arg);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to send -I option dhcp-client-identifier");
-+ }
-+
-+ if ((dhcp_host_name_arg != NULL) && (*dhcp_host_name_arg != '\0')) {
-+ if (arg_conf == 0) {
-+ arg_conf_len = asprintf(&arg_conf, "send host-name \"%s\";", dhcp_host_name_arg);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to send -H option host-name");
-+ } else {
-+ char *last_arg_conf = arg_conf;
-+ arg_conf = NULL;
-+ arg_conf_len = asprintf(&arg_conf, "%s\nsend host-name \"%s\";", last_arg_conf, dhcp_host_name_arg);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to send -H option host-name");
-+
-+ free(last_arg_conf);
-+ }
-+ }
-+
-+ if ((dhcp_fqdn_arg != NULL) && (*dhcp_fqdn_arg != '\0')) {
-+ if (arg_conf == 0) {
-+ arg_conf_len = asprintf(&arg_conf, "send fqdn.fqdn \"%s\";", dhcp_fqdn_arg);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to send -F option fqdn.fqdn");
-+ } else {
-+ char *last_arg_conf = arg_conf;
-+ arg_conf = NULL;
-+ arg_conf_len = asprintf(&arg_conf, "%s\nsend fqdn.fqdn \"%s\";", last_arg_conf, dhcp_fqdn_arg);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to send -F option fqdn.fqdn");
-+
-+ free(last_arg_conf);
-+ }
-+ }
-+
-+ if (timeout_arg) {
-+ if (arg_conf == 0) {
-+ arg_conf_len = asprintf(&arg_conf, "timeout %d;", timeout_arg);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to process -timeout timeout argument");
-+ } else {
-+ char *last_arg_conf = arg_conf;
-+ arg_conf = NULL;
-+ arg_conf_len = asprintf(&arg_conf, "%s\ntimeout %d;", last_arg_conf, timeout_arg);
-+
-+ if ((arg_conf == 0) || (arg_conf_len == 0))
-+ log_fatal("Unable to process -timeout timeout argument");
-+
-+ free(last_arg_conf);
-+ }
-+ }
-+
-+ if ((dhcp_vendor_class_identifier_arg != NULL) && (*dhcp_vendor_class_identifier_arg != '\0')) {
-+ if (arg_conf == 0) {
-+ arg_conf_len = asprintf(&arg_conf, "send vendor-class-identifier \"%s\";", dhcp_vendor_class_identifier_arg);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to send -V option vendor-class-identifier");
-+ } else {
-+ char *last_arg_conf = arg_conf;
-+ arg_conf = NULL;
-+ arg_conf_len = asprintf(&arg_conf, "%s\nsend vendor-class-identifier \"%s\";", last_arg_conf, dhcp_vendor_class_identifier_arg);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to send -V option vendor-class-identifier");
-+
-+ free(last_arg_conf);
-+ }
-+ }
-+
-+ if (dhclient_request_options != NULL) {
-+ if (arg_conf == 0) {
-+ arg_conf_len = asprintf(&arg_conf, "request %s;", dhclient_request_options);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to parse -R <request options list> argument");
-+ } else {
-+ char *last_arg_conf = arg_conf;
-+ arg_conf = NULL;
-+ arg_conf_len = asprintf(&arg_conf, "%s\nrequest %s;", last_arg_conf, dhclient_request_options);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to parse -R <request options list> argument");
-+
-+ free(last_arg_conf);
-+ }
-+ }
-+
-+ if (arg_conf) {
-+ if (arg_conf_len == 0)
-+ if ((arg_conf_len = strlen(arg_conf)) == 0)
-+ /* huh ? cannot happen ! */
-+ log_fatal("Unable to process -I/-H/-F/-timeout/-V/-R configuration arguments");
-+
-+ /* parse the extra dhclient.conf configuration arguments
-+ * into top level config: */
-+ struct parse *cfile = (struct parse *)0;
-+ const char *val = NULL;
-+ int token;
-+
-+ status = new_parse(&cfile, -1, arg_conf, arg_conf_len, "extra dhclient -I/-H/-F/-timeout/-V/-R configuration arguments", 0);
-+
-+ if ((status != ISC_R_SUCCESS) || (cfile -> warnings_occurred))
-+ log_fatal("Cannot parse -I/-H/-F/-timeout/-V/-R configuration arguments !");
-+ /* more detailed parse failures will be logged */
-+
-+ do {
-+ token = peek_token(&val, (unsigned *)0, cfile);
-+ if (token == END_OF_FILE)
-+ break;
-+
-+ parse_client_statement(cfile, (struct interface_info *)0, &top_level_config);
-+ } while (1);
-+
-+ if (cfile -> warnings_occurred)
-+ log_fatal("Cannot parse -I/-H/-F/-timeout/-V/-R configuration arguments !");
-+ end_parse(&cfile);
-+
-+ if (timeout_arg) {
-+ /* we just set the toplevel timeout, but per-client
-+ * timeouts may still be at defaults. Also, it makes no
-+ * sense having the reboot_timeout or backoff_cutoff
-+ * greater than the timeout:
-+ */
-+ if ((top_level_config.backoff_cutoff == 15) && (top_level_config.backoff_cutoff > (timeout_arg / 2)))
-+ top_level_config.backoff_cutoff = (((unsigned long)(timeout_arg / 2)) == 0) ? timeout_arg : (unsigned long)(timeout_arg / 2);
-+
-+ for (ip=interfaces; ip; ip = ip->next) {
-+ if (ip->client->config->timeout == 60)
-+ ip->client->config->timeout = timeout_arg;
-+
-+ if ((ip->client->config->reboot_timeout == 10) && (ip->client->config->reboot_timeout > ip->client->config->timeout))
-+ ip->client->config->reboot_timeout = ip->client->config->timeout;
-+ if ((ip->client->config->backoff_cutoff == 15) && (ip->client->config->backoff_cutoff > top_level_config.backoff_cutoff))
-+ ip->client->config->backoff_cutoff = top_level_config.backoff_cutoff;
-+ }
-+ }
-+
-+ if ((dhclient_request_options != 0) && (top_level_config.requested_options != default_requested_options)) {
-+ for (ip=interfaces; ip; ip = ip->next) {
-+ if (ip->client->config->requested_options == default_requested_options)
-+ ip->client->config->requested_options = top_level_config.requested_options;
-+ }
-+ }
-+
-+ free(arg_conf);
-+ arg_conf = NULL;
-+ arg_conf_len = 0;
-+ }
-+
- /* Parse the lease database. */
- read_client_leases();
-
-@@ -2397,7 +2657,8 @@ void make_discover (client, lease)
- client -> packet.xid = random ();
- client -> packet.secs = 0; /* filled in by send_discover. */
-
-- if (can_receive_unicast_unconfigured (client -> interface))
-+ if ((!(bootp_broadcast_always || client->config->bootp_broadcast_always))
-+ && can_receive_unicast_unconfigured(client->interface))
- client -> packet.flags = 0;
- else
- client -> packet.flags = htons (BOOTP_BROADCAST);
-@@ -2481,7 +2742,9 @@ void make_request (client, lease)
- } else {
- memset (&client -> packet.ciaddr, 0,
- sizeof client -> packet.ciaddr);
-- if (can_receive_unicast_unconfigured (client -> interface))
-+ if ((!(bootp_broadcast_always ||
-+ client ->config->bootp_broadcast_always)) &&
-+ can_receive_unicast_unconfigured (client -> interface))
- client -> packet.flags = 0;
- else
- client -> packet.flags = htons (BOOTP_BROADCAST);
-@@ -2543,7 +2806,8 @@ void make_decline (client, lease)
- client -> packet.hops = 0;
- client -> packet.xid = client -> xid;
- client -> packet.secs = 0; /* Filled in by send_request. */
-- if (can_receive_unicast_unconfigured (client -> interface))
-+ if ((!(bootp_broadcast_always || client->config-> bootp_broadcast_always))
-+ && can_receive_unicast_unconfigured (client->interface))
- client -> packet.flags = 0;
- else
- client -> packet.flags = htons (BOOTP_BROADCAST);
-diff -up dhcp-4.2.2b1/common/conflex.c.options dhcp-4.2.2b1/common/conflex.c
---- dhcp-4.2.2b1/common/conflex.c.options 2011-05-11 16:20:59.000000000 +0200
-+++ dhcp-4.2.2b1/common/conflex.c 2011-07-01 13:51:52.938755494 +0200
-@@ -808,6 +808,8 @@ intern(char *atom, enum dhcp_token dfv)
- return BALANCE;
- if (!strcasecmp (atom + 1, "ound"))
- return BOUND;
-+ if (!strcasecmp (atom + 1, "ootp-broadcast-always"))
-+ return BOOTP_BROADCAST_ALWAYS;
- break;
- case 'c':
- if (!strcasecmp(atom + 1, "ase"))
-diff -up dhcp-4.2.2b1/includes/dhcpd.h.options dhcp-4.2.2b1/includes/dhcpd.h
---- dhcp-4.2.2b1/includes/dhcpd.h.options 2011-05-20 16:21:11.000000000 +0200
-+++ dhcp-4.2.2b1/includes/dhcpd.h 2011-07-01 13:51:52.940755442 +0200
-@@ -1147,6 +1147,9 @@ struct client_config {
- int do_forward_update; /* If nonzero, and if we have the
- information we need, update the
- A record for the address we get. */
-+
-+ int bootp_broadcast_always; /* If nonzero, always set the BOOTP_BROADCAST
-+ flag in requests */
- };
-
- /* Per-interface state used in the dhcp client... */
-diff -up dhcp-4.2.2b1/includes/dhctoken.h.options dhcp-4.2.2b1/includes/dhctoken.h
---- dhcp-4.2.2b1/includes/dhctoken.h.options 2011-05-12 14:02:47.000000000 +0200
-+++ dhcp-4.2.2b1/includes/dhctoken.h 2011-07-01 13:53:43.316861637 +0200
-@@ -361,7 +361,8 @@ enum dhcp_token {
- GETHOSTNAME = 662,
- REWIND = 663,
- INITIAL_DELAY = 664,
-- GETHOSTBYNAME = 665
-+ GETHOSTBYNAME = 665,
-+ BOOTP_BROADCAST_ALWAYS = 666
- };
-
- #define is_identifier(x) ((x) >= FIRST_TOKEN && \
diff --git a/dhcp/patches/dhcp-4.2.2-rfc3442-classless-static-routes.patch b/dhcp/patches/dhcp-4.2.2-rfc3442-classless-static-routes.patch
deleted file mode 100644
index 0a0bfcb..0000000
--- a/dhcp/patches/dhcp-4.2.2-rfc3442-classless-static-routes.patch
+++ /dev/null
@@ -1,405 +0,0 @@
-diff -up dhcp-4.2.2b1/client/clparse.c.rfc3442 dhcp-4.2.2b1/client/clparse.c
---- dhcp-4.2.2b1/client/clparse.c.rfc3442 2011-07-01 14:22:38.031534508 +0200
-+++ dhcp-4.2.2b1/client/clparse.c 2011-07-01 14:22:38.128532940 +0200
-@@ -37,7 +37,7 @@
-
- struct client_config top_level_config;
-
--#define NUM_DEFAULT_REQUESTED_OPTS 14
-+#define NUM_DEFAULT_REQUESTED_OPTS 15
- struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1];
-
- static void parse_client_default_duid(struct parse *cfile);
-@@ -82,7 +82,11 @@ isc_result_t read_client_conf ()
- dhcp_universe.code_hash, &code, 0, MDL);
-
- /* 4 */
-- code = DHO_ROUTERS;
-+ /* The Classless Static Routes option code MUST appear in the parameter
-+ * request list prior to both the Router option code and the Static
-+ * Routes option code, if present. (RFC3442)
-+ */
-+ code = DHO_CLASSLESS_STATIC_ROUTES;
- option_code_hash_lookup(&default_requested_options[3],
- dhcp_universe.code_hash, &code, 0, MDL);
-
-@@ -136,6 +140,11 @@ isc_result_t read_client_conf ()
- option_code_hash_lookup(&default_requested_options[13],
- dhcp_universe.code_hash, &code, 0, MDL);
-
-+ /* 15 */
-+ code = DHO_ROUTERS;
-+ option_code_hash_lookup(&default_requested_options[14],
-+ dhcp_universe.code_hash, &code, 0, MDL);
-+
- for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
- if (default_requested_options[code] == NULL)
- log_fatal("Unable to find option definition for "
-diff -up dhcp-4.2.2b1/common/dhcp-options.5.rfc3442 dhcp-4.2.2b1/common/dhcp-options.5
---- dhcp-4.2.2b1/common/dhcp-options.5.rfc3442 2011-07-01 14:22:38.020534686 +0200
-+++ dhcp-4.2.2b1/common/dhcp-options.5 2011-07-01 14:22:38.129532924 +0200
-@@ -115,6 +115,26 @@ hexadecimal, separated by colons. For
- or
- option dhcp-client-identifier 43:4c:49:45:54:2d:46:4f:4f;
- .fi
-+.PP
-+The
-+.B destination-descriptor
-+describe the IP subnet number and subnet mask
-+of a particular destination using a compact encoding. This encoding
-+consists of one octet describing the width of the subnet mask,
-+followed by all the significant octets of the subnet number.
-+The following table contains some examples of how various subnet
-+number/mask combinations can be encoded:
-+.nf
-+.sp 1
-+Subnet number Subnet mask Destination descriptor
-+0 0 0
-+10.0.0.0 255.0.0.0 8.10
-+10.0.0.0 255.255.255.0 24.10.0.0
-+10.17.0.0 255.255.0.0 16.10.17
-+10.27.129.0 255.255.255.0 24.10.27.129
-+10.229.0.128 255.255.255.128 25.10.229.0.128
-+10.198.122.47 255.255.255.255 32.10.198.122.47
-+.fi
- .SH SETTING OPTION VALUES USING EXPRESSIONS
- Sometimes it's helpful to be able to set the value of a DHCP option
- based on some value that the client has sent. To do this, you can
-@@ -931,6 +951,29 @@ dhclient-script will create routes:
- .RE
- .PP
- .nf
-+.B option \fBclassless-static-routes\fR \fIdestination-descriptor ip-address\fR
-+ [\fB,\fR \fIdestination-descriptor ip-address\fR...]\fB;\fR
-+.fi
-+.RS 0.25i
-+.PP
-+This option (see RFC3442) specifies a list of classless static routes
-+that the client should install in its routing cache.
-+.PP
-+This option can contain one or more static routes, each of which
-+consists of a destination descriptor and the IP address of the router
-+that should be used to reach that destination.
-+.PP
-+Many clients may not implement the Classless Static Routes option.
-+DHCP server administrators should therefore configure their DHCP
-+servers to send both a Router option and a Classless Static Routes
-+option, and should specify the default router(s) both in the Router
-+option and in the Classless Static Routes option.
-+.PP
-+If the DHCP server returns both a Classless Static Routes option and
-+a Router option, the DHCP client ignores the Router option.
-+.RE
-+.PP
-+.nf
- .B option \fBstreettalk-directory-assistance-server\fR \fIip-address\fR
- [\fB,\fR \fIip-address\fR...]\fB;\fR
- .fi
-diff -up dhcp-4.2.2b1/common/inet.c.rfc3442 dhcp-4.2.2b1/common/inet.c
---- dhcp-4.2.2b1/common/inet.c.rfc3442 2011-05-11 02:47:22.000000000 +0200
-+++ dhcp-4.2.2b1/common/inet.c 2011-07-01 14:22:38.130532908 +0200
-@@ -528,6 +528,60 @@ free_iaddrcidrnetlist(struct iaddrcidrne
- return ISC_R_SUCCESS;
- }
-
-+static const char *
-+inet_ntopdd(const unsigned char *src, unsigned srclen, char *dst, size_t size)
-+{
-+ char tmp[sizeof("32.255.255.255.255")];
-+ int len;
-+
-+ switch (srclen) {
-+ case 2:
-+ len = sprintf (tmp, "%u.%u", src[0], src[1]);
-+ break;
-+ case 3:
-+ len = sprintf (tmp, "%u.%u.%u", src[0], src[1], src[2]);
-+ break;
-+ case 4:
-+ len = sprintf (tmp, "%u.%u.%u.%u", src[0], src[1], src[2], src[3]);
-+ break;
-+ case 5:
-+ len = sprintf (tmp, "%u.%u.%u.%u.%u", src[0], src[1], src[2], src[3], src[4]);
-+ break;
-+ default:
-+ return NULL;
-+ }
-+ if (len < 0)
-+ return NULL;
-+
-+ if (len > size) {
-+ errno = ENOSPC;
-+ return NULL;
-+ }
-+
-+ return strcpy (dst, tmp);
-+}
-+
-+/* pdestdesc() turns an iaddr structure into a printable dest. descriptor */
-+const char *
-+pdestdesc(const struct iaddr addr) {
-+ static char pbuf[sizeof("255.255.255.255.255")];
-+
-+ if (addr.len == 0) {
-+ return "<null destination descriptor>";
-+ }
-+ if (addr.len == 1) {
-+ return "0";
-+ }
-+ if ((addr.len >= 2) && (addr.len <= 5)) {
-+ return inet_ntopdd(addr.iabuf, addr.len, pbuf, sizeof(pbuf));
-+ }
-+
-+ log_fatal("pdestdesc():%s:%d: Invalid destination descriptor length %d.",
-+ MDL, addr.len);
-+ /* quell compiler warnings */
-+ return NULL;
-+}
-+
- /* piaddr() turns an iaddr structure into a printable address. */
- /* XXX: should use a const pointer rather than passing the structure */
- const char *
-diff -up dhcp-4.2.2b1/common/options.c.rfc3442 dhcp-4.2.2b1/common/options.c
---- dhcp-4.2.2b1/common/options.c.rfc3442 2011-03-24 22:57:13.000000000 +0100
-+++ dhcp-4.2.2b1/common/options.c 2011-07-01 14:22:38.132532876 +0200
-@@ -706,7 +706,11 @@ cons_options(struct packet *inpacket, st
- * packet.
- */
- priority_list[priority_len++] = DHO_SUBNET_MASK;
-- priority_list[priority_len++] = DHO_ROUTERS;
-+ if (lookup_option(&dhcp_universe, cfg_options,
-+ DHO_CLASSLESS_STATIC_ROUTES))
-+ priority_list[priority_len++] = DHO_CLASSLESS_STATIC_ROUTES;
-+ else
-+ priority_list[priority_len++] = DHO_ROUTERS;
- priority_list[priority_len++] = DHO_DOMAIN_NAME_SERVERS;
- priority_list[priority_len++] = DHO_HOST_NAME;
- priority_list[priority_len++] = DHO_FQDN;
-@@ -1683,6 +1687,7 @@ const char *pretty_print_option (option,
- const unsigned char *dp = data;
- char comma;
- unsigned long tval;
-+ unsigned int octets = 0;
-
- if (emit_commas)
- comma = ',';
-@@ -1691,6 +1696,7 @@ const char *pretty_print_option (option,
-
- memset (enumbuf, 0, sizeof enumbuf);
-
-+ if (option->format[0] != 'R') { /* see explanation lower */
- /* Figure out the size of the data. */
- for (l = i = 0; option -> format [i]; i++, l++) {
- if (l >= sizeof(fmtbuf) - 1)
-@@ -1840,6 +1846,33 @@ const char *pretty_print_option (option,
- if (numhunk < 0)
- numhunk = 1;
-
-+ } else { /* option->format[i] == 'R') */
-+ /* R (destination descriptor) has variable length.
-+ * We can find it only in classless static route option,
-+ * so we are for sure parsing classless static route option now.
-+ * We go through whole the option to check whether there are no
-+ * missing/extra bytes.
-+ * I didn't find out how to improve the existing code and that's the
-+ * reason for this separate 'else' where I do my own checkings.
-+ * I know it's little bit unsystematic, but it works.
-+ */
-+ numhunk = 0;
-+ numelem = 2; /* RI */
-+ fmtbuf[0]='R'; fmtbuf[1]='I'; fmtbuf[2]=0;
-+ for (i =0; i < len; i = i + octets + 5) {
-+ if (data[i] > 32) { /* subnet mask width */
-+ log_error ("wrong subnet mask width in destination descriptor");
-+ break;
-+ }
-+ numhunk++;
-+ octets = ((data[i]+7) / 8);
-+ }
-+ if (i != len) {
-+ log_error ("classless static routes option has wrong size or "
-+ "there's some garbage in format");
-+ }
-+ }
-+
- /* Cycle through the array (or hunk) printing the data. */
- for (i = 0; i < numhunk; i++) {
- for (j = 0; j < numelem; j++) {
-@@ -1978,6 +2011,20 @@ const char *pretty_print_option (option,
- strcpy(op, piaddr(iaddr));
- dp += 4;
- break;
-+
-+ case 'R':
-+ if (dp[0] <= 32)
-+ iaddr.len = (((dp[0]+7)/8)+1);
-+ else {
-+ log_error ("wrong subnet mask width in destination descriptor");
-+ return "<error>";
-+ }
-+
-+ memcpy(iaddr.iabuf, dp, iaddr.len);
-+ strcpy(op, pdestdesc(iaddr));
-+ dp += iaddr.len;
-+ break;
-+
- case '6':
- iaddr.len = 16;
- memcpy(iaddr.iabuf, dp, 16);
-diff -up dhcp-4.2.2b1/common/parse.c.rfc3442 dhcp-4.2.2b1/common/parse.c
---- dhcp-4.2.2b1/common/parse.c.rfc3442 2011-07-01 14:22:38.097533441 +0200
-+++ dhcp-4.2.2b1/common/parse.c 2011-07-01 14:22:38.135532828 +0200
-@@ -341,6 +341,39 @@ int parse_ip_addr (cfile, addr)
- }
-
- /*
-+ * destination-descriptor :== NUMBER DOT NUMBER |
-+ * NUMBER DOT NUMBER DOT NUMBER |
-+ * NUMBER DOT NUMBER DOT NUMBER DOT NUMBER |
-+ * NUMBER DOT NUMBER DOT NUMBER DOT NUMBER DOT NUMBER
-+ */
-+
-+int parse_destination_descriptor (cfile, addr)
-+ struct parse *cfile;
-+ struct iaddr *addr;
-+{
-+ unsigned int mask_width, dest_dest_len;
-+ addr -> len = 0;
-+ if (parse_numeric_aggregate (cfile, addr -> iabuf,
-+ &addr -> len, DOT, 10, 8)) {
-+ mask_width = (unsigned int)addr->iabuf[0];
-+ dest_dest_len = (((mask_width+7)/8)+1);
-+ if (mask_width > 32) {
-+ parse_warn (cfile,
-+ "subnet mask width (%u) greater than 32.", mask_width);
-+ }
-+ else if (dest_dest_len != addr->len) {
-+ parse_warn (cfile,
-+ "destination descriptor with subnet mask width %u "
-+ "should have %u octets, but has %u octets.",
-+ mask_width, dest_dest_len, addr->len);
-+ }
-+
-+ return 1;
-+ }
-+ return 0;
-+}
-+
-+/*
- * Return true if every character in the string is hexadecimal.
- */
- static int
-@@ -700,8 +733,10 @@ unsigned char *parse_numeric_aggregate (
- if (count) {
- token = peek_token (&val, (unsigned *)0, cfile);
- if (token != separator) {
-- if (!*max)
-+ if (!*max) {
-+ *max = count;
- break;
-+ }
- if (token != RBRACE && token != LBRACE)
- token = next_token (&val,
- (unsigned *)0,
-@@ -1624,6 +1659,9 @@ int parse_option_code_definition (cfile,
- case IP_ADDRESS:
- type = 'I';
- break;
-+ case DESTINATION_DESCRIPTOR:
-+ type = 'R';
-+ break;
- case IP6_ADDRESS:
- type = '6';
- break;
-@@ -5288,6 +5326,15 @@ int parse_option_token (rv, cfile, fmt,
- }
- break;
-
-+ case 'R': /* destination descriptor */
-+ if (!parse_destination_descriptor (cfile, &addr)) {
-+ return 0;
-+ }
-+ if (!make_const_data (&t, addr.iabuf, addr.len, 0, 1, MDL)) {
-+ return 0;
-+ }
-+ break;
-+
- case '6': /* IPv6 address. */
- if (!parse_ip6_addr(cfile, &addr)) {
- return 0;
-@@ -5548,6 +5595,13 @@ int parse_option_decl (oc, cfile)
- goto exit;
- len = ip_addr.len;
- dp = ip_addr.iabuf;
-+ goto alloc;
-+
-+ case 'R': /* destination descriptor */
-+ if (!parse_destination_descriptor (cfile, &ip_addr))
-+ goto exit;
-+ len = ip_addr.len;
-+ dp = ip_addr.iabuf;
-
- alloc:
- if (hunkix + len > sizeof hunkbuf) {
-diff -up dhcp-4.2.2b1/common/tables.c.rfc3442 dhcp-4.2.2b1/common/tables.c
---- dhcp-4.2.2b1/common/tables.c.rfc3442 2011-07-01 14:22:38.087533601 +0200
-+++ dhcp-4.2.2b1/common/tables.c 2011-07-01 14:22:38.137532796 +0200
-@@ -51,6 +51,7 @@ HASH_FUNCTIONS (option_code, const unsig
- Format codes:
-
- I - IPv4 address
-+ R - destination descriptor (RFC3442)
- 6 - IPv6 address
- l - 32-bit signed integer
- L - 32-bit unsigned integer
-@@ -208,6 +209,7 @@ static struct option dhcp_options[] = {
- { "default-url", "t", &dhcp_universe, 114, 1 },
- { "subnet-selection", "I", &dhcp_universe, 118, 1 },
- { "domain-search", "D", &dhcp_universe, 119, 1 },
-+ { "classless-static-routes", "RIA", &dhcp_universe, 121, 1 },
- { "vivco", "Evendor-class.", &dhcp_universe, 124, 1 },
- { "vivso", "Evendor.", &dhcp_universe, 125, 1 },
- #if 0
-diff -up dhcp-4.2.2b1/includes/dhcpd.h.rfc3442 dhcp-4.2.2b1/includes/dhcpd.h
---- dhcp-4.2.2b1/includes/dhcpd.h.rfc3442 2011-07-01 14:22:38.000000000 +0200
-+++ dhcp-4.2.2b1/includes/dhcpd.h 2011-07-01 14:24:19.999810333 +0200
-@@ -2662,6 +2662,7 @@ isc_result_t range2cidr(struct iaddrcidr
- const struct iaddr *lo, const struct iaddr *hi);
- isc_result_t free_iaddrcidrnetlist(struct iaddrcidrnetlist **result);
- const char *piaddr (struct iaddr);
-+const char *pdestdesc (struct iaddr);
- char *piaddrmask(struct iaddr *, struct iaddr *);
- char *piaddrcidr(const struct iaddr *, unsigned int);
- u_int16_t validate_port(char *);
-@@ -2869,6 +2870,7 @@ void parse_client_lease_declaration (str
- int parse_option_decl (struct option_cache **, struct parse *);
- void parse_string_list (struct parse *, struct string_list **, int);
- int parse_ip_addr (struct parse *, struct iaddr *);
-+int parse_destination_descriptor (struct parse *, struct iaddr *);
- int parse_ip_addr_with_subnet(struct parse *, struct iaddrmatch *);
- void parse_reject_statement (struct parse *, struct client_config *);
-
-diff -up dhcp-4.2.2b1/includes/dhcp.h.rfc3442 dhcp-4.2.2b1/includes/dhcp.h
---- dhcp-4.2.2b1/includes/dhcp.h.rfc3442 2009-11-20 02:49:01.000000000 +0100
-+++ dhcp-4.2.2b1/includes/dhcp.h 2011-07-01 14:22:38.145532665 +0200
-@@ -158,6 +158,7 @@ struct dhcp_packet {
- #define DHO_ASSOCIATED_IP 92
- #define DHO_SUBNET_SELECTION 118 /* RFC3011! */
- #define DHO_DOMAIN_SEARCH 119 /* RFC3397 */
-+#define DHO_CLASSLESS_STATIC_ROUTES 121 /* RFC3442 */
- #define DHO_VIVCO_SUBOPTIONS 124
- #define DHO_VIVSO_SUBOPTIONS 125
-
-diff -up dhcp-4.2.2b1/includes/dhctoken.h.rfc3442 dhcp-4.2.2b1/includes/dhctoken.h
---- dhcp-4.2.2b1/includes/dhctoken.h.rfc3442 2011-07-01 14:22:37.000000000 +0200
-+++ dhcp-4.2.2b1/includes/dhctoken.h 2011-07-01 14:25:12.541867623 +0200
-@@ -362,7 +362,8 @@ enum dhcp_token {
- REWIND = 663,
- INITIAL_DELAY = 664,
- GETHOSTBYNAME = 665,
-- BOOTP_BROADCAST_ALWAYS = 666
-+ BOOTP_BROADCAST_ALWAYS = 666,
-+ DESTINATION_DESCRIPTOR = 667
- };
-
- #define is_identifier(x) ((x) >= FIRST_TOKEN && \
diff --git a/dhcp/patches/dhcp-4.2.2-sharedlib.patch b/dhcp/patches/dhcp-4.2.2-sharedlib.patch
index 74fe9f1..b504de7 100644
--- a/dhcp/patches/dhcp-4.2.2-sharedlib.patch
+++ b/dhcp/patches/dhcp-4.2.2-sharedlib.patch
@@ -1,7 +1,7 @@
diff -up dhcp-4.2.2/client/Makefile.am.sharedlib dhcp-4.2.2/client/Makefile.am
---- dhcp-4.2.2/client/Makefile.am.sharedlib 2011-09-09 16:35:56.000000000 +0200
-+++ dhcp-4.2.2/client/Makefile.am 2011-09-09 16:36:29.849007951 +0200
-@@ -4,7 +4,7 @@ dhclient_SOURCES = clparse.c dhclient.c
+--- dhcp-4.2.2/client/Makefile.am.sharedlib 2011-10-09 20:07:40.000000000 +0200
++++ dhcp-4.2.2/client/Makefile.am 2011-10-09 20:07:40.000000000 +0200
+@@ -4,7 +4,7 @@ dhclient_SOURCES = clparse.c dhclient.c
scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
scripts/netbsd scripts/nextstep scripts/openbsd \
scripts/solaris scripts/openwrt
@@ -11,8 +11,8 @@ diff -up dhcp-4.2.2/client/Makefile.am.sharedlib dhcp-4.2.2/client/Makefile.am
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
EXTRA_DIST = $(man_MANS)
diff -up dhcp-4.2.2/configure.ac.sharedlib dhcp-4.2.2/configure.ac
---- dhcp-4.2.2/configure.ac.sharedlib 2011-09-09 16:35:56.097000001 +0200
-+++ dhcp-4.2.2/configure.ac 2011-09-09 16:35:56.383000000 +0200
+--- dhcp-4.2.2/configure.ac.sharedlib 2011-10-09 20:07:40.000000000 +0200
++++ dhcp-4.2.2/configure.ac 2011-10-09 20:07:40.000000000 +0200
@@ -30,7 +30,8 @@ fi
# Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
AC_USE_SYSTEM_EXTENSIONS
@@ -24,8 +24,8 @@ diff -up dhcp-4.2.2/configure.ac.sharedlib dhcp-4.2.2/configure.ac
# we sometimes need to know byte order for building packets
diff -up dhcp-4.2.2/dhcpctl/Makefile.am.sharedlib dhcp-4.2.2/dhcpctl/Makefile.am
---- dhcp-4.2.2/dhcpctl/Makefile.am.sharedlib 2011-09-09 16:35:55.459000001 +0200
-+++ dhcp-4.2.2/dhcpctl/Makefile.am 2011-09-09 16:35:56.384000000 +0200
+--- dhcp-4.2.2/dhcpctl/Makefile.am.sharedlib 2011-10-09 20:07:39.000000000 +0200
++++ dhcp-4.2.2/dhcpctl/Makefile.am 2011-10-09 20:07:40.000000000 +0200
@@ -1,15 +1,15 @@
bin_PROGRAMS = omshell
-lib_LIBRARIES = libdhcpctl.a
@@ -46,34 +46,9 @@ diff -up dhcp-4.2.2/dhcpctl/Makefile.am.sharedlib dhcp-4.2.2/dhcpctl/Makefile.am
-cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
+cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
$(BIND9_LIBDIR) -ldns-export -lisc-export
-diff -up dhcp-4.2.2/dst/base64.c.sharedlib dhcp-4.2.2/dst/base64.c
---- dhcp-4.2.2/dst/base64.c.sharedlib 2009-11-20 02:49:01.000000000 +0100
-+++ dhcp-4.2.2/dst/base64.c 2011-09-09 16:35:56.385000000 +0200
-@@ -64,6 +64,7 @@ static const char rcsid[] = "$Id: base64
-
- #include <sys/socket.h>
-
-+#include "dst_internal.h"
- #include "cdefs.h"
- #include "osdep.h"
- #include "arpa/nameser.h"
-diff -up dhcp-4.2.2/dst/Makefile.am.sharedlib dhcp-4.2.2/dst/Makefile.am
---- dhcp-4.2.2/dst/Makefile.am.sharedlib 2007-05-29 18:32:10.000000000 +0200
-+++ dhcp-4.2.2/dst/Makefile.am 2011-09-09 16:35:56.386000000 +0200
-@@ -1,8 +1,8 @@
- AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5
-
--lib_LIBRARIES = libdst.a
-+lib_LTLIBRARIES = libdst.la
-
--libdst_a_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \
-+libdst_la_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \
- base64.c prandom.c
-
- EXTRA_DIST = dst_internal.h md5.h md5_locl.h
diff -up dhcp-4.2.2/omapip/Makefile.am.sharedlib dhcp-4.2.2/omapip/Makefile.am
---- dhcp-4.2.2/omapip/Makefile.am.sharedlib 2011-09-09 16:35:55.000000000 +0200
-+++ dhcp-4.2.2/omapip/Makefile.am 2011-09-09 16:37:36.734000324 +0200
+--- dhcp-4.2.2/omapip/Makefile.am.sharedlib 2011-10-09 20:07:39.000000000 +0200
++++ dhcp-4.2.2/omapip/Makefile.am 2011-10-09 20:07:40.000000000 +0200
@@ -1,7 +1,7 @@
-lib_LIBRARIES = libomapi.a
+lib_LTLIBRARIES = libomapi.la
@@ -92,8 +67,8 @@ diff -up dhcp-4.2.2/omapip/Makefile.am.sharedlib dhcp-4.2.2/omapip/Makefile.am
+svtest_LDADD = libomapi.la $(BIND9_LIBDIR) -ldns-export -lisc-export
diff -up dhcp-4.2.2/relay/Makefile.am.sharedlib dhcp-4.2.2/relay/Makefile.am
---- dhcp-4.2.2/relay/Makefile.am.sharedlib 2011-09-09 16:35:56.000000000 +0200
-+++ dhcp-4.2.2/relay/Makefile.am 2011-09-09 16:37:57.058019749 +0200
+--- dhcp-4.2.2/relay/Makefile.am.sharedlib 2011-10-09 20:07:40.000000000 +0200
++++ dhcp-4.2.2/relay/Makefile.am 2011-10-09 20:07:40.000000000 +0200
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
sbin_PROGRAMS = dhcrelay
@@ -104,16 +79,16 @@ diff -up dhcp-4.2.2/relay/Makefile.am.sharedlib dhcp-4.2.2/relay/Makefile.am
man_MANS = dhcrelay.8
EXTRA_DIST = $(man_MANS)
diff -up dhcp-4.2.2/server/Makefile.am.sharedlib dhcp-4.2.2/server/Makefile.am
---- dhcp-4.2.2/server/Makefile.am.sharedlib 2011-09-09 16:35:56.000000000 +0200
-+++ dhcp-4.2.2/server/Makefile.am 2011-09-09 16:38:56.291004599 +0200
+--- dhcp-4.2.2/server/Makefile.am.sharedlib 2011-10-09 20:07:39.000000000 +0200
++++ dhcp-4.2.2/server/Makefile.am 2011-10-09 20:08:26.000000000 +0200
@@ -7,8 +7,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
dhcpv6.c mdb6.c ldap.c ldap_casa.c
dhcpd_CFLAGS = $(LDAP_CFLAGS)
-dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
-- ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export \
+- ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export
+dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
-+ ../dhcpctl/libdhcpctl.la $(BIND9_LIBDIR) -ldns-export -lisc-export \
- $(CAPNG_LDADD)
++ ../dhcpctl/libdhcpctl.la $(BIND9_LIBDIR) -ldns-export -lisc-export
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
+ EXTRA_DIST = $(man_MANS)
diff --git a/dhcp/patches/dhcp-4.2.2-systemtap.patch b/dhcp/patches/dhcp-4.2.2-systemtap.patch
deleted file mode 100644
index c067348..0000000
--- a/dhcp/patches/dhcp-4.2.2-systemtap.patch
+++ /dev/null
@@ -1,810 +0,0 @@
-diff -up dhcp-4.2.2/configure.ac.systemtap dhcp-4.2.2/configure.ac
---- dhcp-4.2.2/configure.ac.systemtap 2011-09-21 15:13:35.515434854 +0200
-+++ dhcp-4.2.2/configure.ac 2011-09-21 15:13:35.574434049 +0200
-@@ -485,6 +485,35 @@ else
- AC_MSG_RESULT(no)
- fi
-
-+AC_MSG_CHECKING([whether to include systemtap tracing support])
-+AC_ARG_ENABLE([systemtap],
-+ [AS_HELP_STRING([--enable-systemtap],
-+ [Enable inclusion of systemtap trace support])],
-+ [ENABLE_SYSTEMTAP="${enableval}"], [ENABLE_SYSTEMTAP='no'])
-+AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$ENABLE_SYSTEMTAP = xyes])
-+AC_MSG_RESULT(${ENABLE_SYSTEMTAP})
-+
-+if test "x${ENABLE_SYSTEMTAP}" = xyes; then
-+ # Additional configuration for --enable-systemtap is HERE
-+ AC_CHECK_PROGS(DTRACE, dtrace)
-+ if test -z "$DTRACE"; then
-+ AC_MSG_ERROR([dtrace not found])
-+ fi
-+ AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'],
-+ [SDT_H_FOUND='no';
-+ AC_MSG_ERROR([systemtap support needs sys/sdt.h header])])
-+ AC_DEFINE([HAVE_SYSTEMTAP], [1], [Define to 1 if using SystemTap probes.])
-+ AC_ARG_WITH([tapset-install-dir],
-+ [AS_HELP_STRING([--with-tapset-install-dir],
-+ [The absolute path where the tapset dir will be installed])],
-+ [if test "x${withval}" = x; then
-+ ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"
-+ else
-+ ABS_TAPSET_DIR="${withval}"
-+ fi], [ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"])
-+ AC_SUBST(ABS_TAPSET_DIR)
-+fi
-+
- # Solaris needs some libraries for functions
- AC_SEARCH_LIBS(socket, [socket])
- AC_SEARCH_LIBS(inet_ntoa, [nsl])
-@@ -631,6 +660,7 @@ AC_OUTPUT([
- relay/Makefile
- server/Makefile
- tests/Makefile
-+ tapset/Makefile
- ])
-
- sh util/bindvar.sh
-diff -up dhcp-4.2.2/Makefile.am.systemtap dhcp-4.2.2/Makefile.am
---- dhcp-4.2.2/Makefile.am.systemtap 2011-09-21 15:13:35.339437258 +0200
-+++ dhcp-4.2.2/Makefile.am 2011-09-21 15:13:35.574434049 +0200
-@@ -29,5 +29,8 @@ endif
-
- SUBDIRS += includes tests common dst omapip client dhcpctl relay server
-
-+SUBDIRS += tapset
-+#DIST_SUBDIRS = $(SUBDIRS)
-+
- nobase_include_HEADERS = dhcpctl/dhcpctl.h
-
-diff -up dhcp-4.2.2/server/dhcp.c.systemtap dhcp-4.2.2/server/dhcp.c
---- dhcp-4.2.2/server/dhcp.c.systemtap 2011-09-21 15:13:35.362436945 +0200
-+++ dhcp-4.2.2/server/dhcp.c 2011-09-21 15:13:35.576434021 +0200
-@@ -36,7 +36,7 @@
- #include <errno.h>
- #include <limits.h>
- #include <sys/time.h>
--
-+#include "trace.h"
- static void commit_leases_ackout(void *foo);
- static void maybe_return_agent_options(struct packet *packet,
- struct option_state *options);
-@@ -275,6 +275,8 @@ void dhcpdiscover (packet, ms_nulltp)
- dhcp_failover_state_t *peer;
- #endif
-
-+ TRACE(DHCPD_DISCOVER_START());
-+
- find_lease (&lease, packet, packet -> shared_network,
- 0, &peer_has_leases, (struct lease *)0, MDL);
-
-@@ -399,6 +401,8 @@ void dhcpdiscover (packet, ms_nulltp)
- out:
- if (lease)
- lease_dereference (&lease, MDL);
-+
-+ TRACE(DHCPD_DISCOVER_DONE());
- }
-
- void dhcprequest (packet, ms_nulltp, ip_lease)
-@@ -422,6 +426,8 @@ void dhcprequest (packet, ms_nulltp, ip_
- int have_server_identifier = 0;
- int have_requested_addr = 0;
-
-+ TRACE(DHCPD_REQUEST_START());
-+
- oc = lookup_option (&dhcp_universe, packet -> options,
- DHO_DHCP_REQUESTED_ADDRESS);
- memset (&data, 0, sizeof data);
-@@ -679,6 +685,9 @@ void dhcprequest (packet, ms_nulltp, ip_
- log_info ("%s: unknown lease %s.", msgbuf, piaddr (cip));
-
- out:
-+
-+ TRACE(DHCPD_REQUEST_DONE());
-+
- if (subnet)
- subnet_dereference (&subnet, MDL);
- if (lease)
-@@ -697,6 +706,7 @@ void dhcprelease (packet, ms_nulltp)
- const char *s;
- char msgbuf [1024], cstr[16]; /* XXX */
-
-+ TRACE(DHCPD_RELEASE_START());
-
- /* DHCPRELEASE must not specify address in requested-address
- option, but old protocol specs weren't explicit about this,
-@@ -821,6 +831,8 @@ void dhcprelease (packet, ms_nulltp)
- #endif
- if (lease)
- lease_dereference (&lease, MDL);
-+
-+ TRACE(DHCPD_RELEASE_DONE());
- }
-
- void dhcpdecline (packet, ms_nulltp)
-@@ -838,6 +850,8 @@ void dhcpdecline (packet, ms_nulltp)
- struct option_cache *oc;
- struct data_string data;
-
-+ TRACE(DHCPD_DECLINE_START());
-+
- /* DHCPDECLINE must specify address. */
- if (!(oc = lookup_option (&dhcp_universe, packet -> options,
- DHO_DHCP_REQUESTED_ADDRESS)))
-@@ -949,6 +963,8 @@ void dhcpdecline (packet, ms_nulltp)
- option_state_dereference (&options, MDL);
- if (lease)
- lease_dereference (&lease, MDL);
-+
-+ TRACE(DHCPD_DECLINE_DONE());
- }
-
- void dhcpinform (packet, ms_nulltp)
-@@ -970,6 +986,8 @@ void dhcpinform (packet, ms_nulltp)
- struct in_addr from;
- isc_boolean_t zeroed_ciaddr;
-
-+ TRACE(DHCPD_INFORM_START());
-+
- /* The client should set ciaddr to its IP address, but apparently
- it's common for clients not to do this, so we'll use their IP
- source address if they didn't set ciaddr. */
-@@ -1320,6 +1338,8 @@ void dhcpinform (packet, ms_nulltp)
- from, &to, (struct hardware *)0);
- if (subnet)
- subnet_dereference (&subnet, MDL);
-+
-+ TRACE(DHCPD_INFORM_DONE());
- }
-
- void nak_lease (packet, cip)
-@@ -1336,6 +1356,8 @@ void nak_lease (packet, cip)
- struct option_state *options = (struct option_state *)0;
- struct option_cache *oc = (struct option_cache *)0;
-
-+ TRACE(DHCPD_NAK_LEASE_START());
-+
- option_state_allocate (&options, MDL);
- memset (&outgoing, 0, sizeof outgoing);
- memset (&raw, 0, sizeof raw);
-@@ -1474,6 +1496,8 @@ void nak_lease (packet, cip)
- errno = 0;
- result = send_packet(packet->interface, packet, &raw,
- outgoing.packet_length, from, &to, NULL);
-+
-+ TRACE(DHCPD_NAK_LEASE_DONE());
- }
-
- void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
-@@ -1515,6 +1539,8 @@ void ack_lease (packet, lease, offer, wh
- if (lease -> state)
- return;
-
-+ TRACE(DHCPD_ACK_LEASE_START());
-+
- /* Save original cltt for comparison later. */
- lease_cltt = lease->cltt;
-
-@@ -2877,6 +2903,8 @@ void ack_lease (packet, lease, offer, wh
- #endif
- dhcp_reply(lease);
- }
-+
-+ TRACE(DHCPD_ACK_LEASE_DONE());
- }
-
- /*
-@@ -3029,6 +3057,8 @@ void dhcp_reply (lease)
- if (!state)
- log_fatal ("dhcp_reply was supplied lease with no state!");
-
-+ TRACE(DHCPD_REPLY_START());
-+
- /* Compose a response for the client... */
- memset (&raw, 0, sizeof raw);
- memset (&d1, 0, sizeof d1);
-@@ -3236,6 +3266,8 @@ void dhcp_reply (lease)
-
- free_lease_state (state, MDL);
- lease -> state = (struct lease_state *)0;
-+
-+ TRACE(DHCPD_REPLY_DONE());
- }
-
- int find_lease (struct lease **lp,
-@@ -3258,6 +3290,8 @@ int find_lease (struct lease **lp,
- struct data_string client_identifier;
- struct hardware h;
-
-+ TRACE(DHCPD_FIND_LEASE_START());
-+
- #if defined(FAILOVER_PROTOCOL)
- /* Quick check to see if the peer has leases. */
- if (peer_has_leases) {
-@@ -3985,6 +4019,9 @@ int find_lease (struct lease **lp,
- #if defined (DEBUG_FIND_LEASE)
- log_info ("Not returning a lease.");
- #endif
-+
-+ TRACE(DHCPD_FIND_LEASE_DONE());
-+
- return 0;
- }
-
-diff -up dhcp-4.2.2/server/dhcpd.c.systemtap dhcp-4.2.2/server/dhcpd.c
---- dhcp-4.2.2/server/dhcpd.c.systemtap 2011-09-21 15:13:35.471435455 +0200
-+++ dhcp-4.2.2/server/dhcpd.c 2011-09-21 15:14:47.686449112 +0200
-@@ -63,6 +63,8 @@ static const char url [] =
- int keep_capabilities = 0;
- #endif
-
-+#include "trace.h"
-+
- static void usage(void);
-
- struct iaddr server_identifier;
-@@ -887,7 +889,7 @@ main(int argc, char **argv) {
- log_info ("Dropped all capabilities.");
- }
- #endif
--
-+ TRACE(DHCPD_MAIN());
- /* Receive packets and dispatch them... */
- dispatch ();
-
-diff -up dhcp-4.2.2/server/dhcpv6.c.systemtap dhcp-4.2.2/server/dhcpv6.c
---- dhcp-4.2.2/server/dhcpv6.c.systemtap 2011-09-21 15:13:35.528434676 +0200
-+++ dhcp-4.2.2/server/dhcpv6.c 2011-09-21 15:13:35.579433979 +0200
-@@ -15,6 +15,7 @@
- */
-
- #include "dhcpd.h"
-+#include "trace.h"
-
- #ifdef DHCPv6
-
-@@ -4171,6 +4172,8 @@ static void
- dhcpv6_solicit(struct data_string *reply_ret, struct packet *packet) {
- struct data_string client_id;
-
-+ TRACE(DHCPD_6_SOLICIT_START());
-+
- /*
- * Validate our input.
- */
-@@ -4184,6 +4187,8 @@ dhcpv6_solicit(struct data_string *reply
- * Clean up.
- */
- data_string_forget(&client_id, MDL);
-+
-+ TRACE(DHCPD_6_SOLICIT_DONE());
- }
-
- /*
-@@ -4197,6 +4202,8 @@ dhcpv6_request(struct data_string *reply
- struct data_string client_id;
- struct data_string server_id;
-
-+ TRACE(DHCPD_6_REQUEST_START());
-+
- /*
- * Validate our input.
- */
-@@ -4214,6 +4221,8 @@ dhcpv6_request(struct data_string *reply
- */
- data_string_forget(&client_id, MDL);
- data_string_forget(&server_id, MDL);
-+
-+ TRACE(DHCPD_6_REQUEST_DONE());
- }
-
- /* Find a DHCPv6 packet's shared network from hints in the packet.
-@@ -4326,6 +4335,8 @@ dhcpv6_confirm(struct data_string *reply
- struct dhcpv6_packet *reply = (struct dhcpv6_packet *)reply_data;
- int reply_ofs = (int)(offsetof(struct dhcpv6_packet, options));
-
-+ TRACE(DHCPD_6_CONFIRM_START());
-+
- /*
- * Basic client message validation.
- */
-@@ -4512,6 +4523,8 @@ exit:
- option_state_dereference(&cli_enc_opt_state, MDL);
- if (opt_state != NULL)
- option_state_dereference(&opt_state, MDL);
-+
-+ TRACE(DHCPD_6_CONFIRM_DONE());
- }
-
- /*
-@@ -4526,6 +4539,8 @@ dhcpv6_renew(struct data_string *reply,
- struct data_string client_id;
- struct data_string server_id;
-
-+ TRACE(DHCPD_6_RENEW_START());
-+
- /*
- * Validate the request.
- */
-@@ -4543,6 +4558,8 @@ dhcpv6_renew(struct data_string *reply,
- */
- data_string_forget(&server_id, MDL);
- data_string_forget(&client_id, MDL);
-+
-+ TRACE(DHCPD_6_RENEW_DONE());
- }
-
- /*
-@@ -4556,6 +4573,8 @@ static void
- dhcpv6_rebind(struct data_string *reply, struct packet *packet) {
- struct data_string client_id;
-
-+ TRACE(DHCPD_6_REBIND_START());
-+
- if (!valid_client_msg(packet, &client_id)) {
- return;
- }
-@@ -4563,6 +4582,8 @@ dhcpv6_rebind(struct data_string *reply,
- lease_to_client(reply, packet, &client_id, NULL);
-
- data_string_forget(&client_id, MDL);
-+
-+ TRACE(DHCPD_6_REBIND_DONE());
- }
-
- static void
-@@ -5009,6 +5030,8 @@ dhcpv6_decline(struct data_string *reply
- struct data_string client_id;
- struct data_string server_id;
-
-+ TRACE(DHCPD_6_DECLINE_START());
-+
- /*
- * Validate our input.
- */
-@@ -5029,6 +5052,8 @@ dhcpv6_decline(struct data_string *reply
-
- data_string_forget(&server_id, MDL);
- data_string_forget(&client_id, MDL);
-+
-+ TRACE(DHCPD_6_DECLINE_DONE());
- }
-
- static void
-@@ -5479,6 +5504,8 @@ dhcpv6_release(struct data_string *reply
- struct data_string client_id;
- struct data_string server_id;
-
-+ TRACE(DHCPD_6_RELEASE_START());
-+
- /*
- * Validate our input.
- */
-@@ -5500,6 +5527,8 @@ dhcpv6_release(struct data_string *reply
-
- data_string_forget(&server_id, MDL);
- data_string_forget(&client_id, MDL);
-+
-+ TRACE(DHCPD_6_RELEASE_DONE());
- }
-
- /*
-@@ -5512,6 +5541,8 @@ dhcpv6_information_request(struct data_s
- struct data_string client_id;
- struct data_string server_id;
-
-+ TRACE(DHCPD_6_INFORMATION_REQUEST_START());
-+
- /*
- * Validate our input.
- */
-@@ -5543,6 +5574,8 @@ dhcpv6_information_request(struct data_s
- data_string_forget(&client_id, MDL);
- }
- data_string_forget(&server_id, MDL);
-+
-+ TRACE(DHCPD_6_INFORMATION_REQUEST_DONE());
- }
-
- /*
-@@ -5571,6 +5604,8 @@ dhcpv6_relay_forw(struct data_string *re
- struct dhcpv6_relay_packet *reply;
- int reply_ofs;
-
-+ TRACE(DHCPD_6_RELAY_FORW_START());
-+
- /*
- * Initialize variables for early exit.
- */
-@@ -5828,6 +5863,8 @@ exit:
- if (enc_packet != NULL) {
- packet_dereference(&enc_packet, MDL);
- }
-+
-+ TRACE(DHCPD_6_RELAY_FORW_DONE());
- }
-
- static void
-diff -up dhcp-4.2.2/server/failover.c.systemtap dhcp-4.2.2/server/failover.c
---- dhcp-4.2.2/server/failover.c.systemtap 2011-05-11 16:21:00.000000000 +0200
-+++ dhcp-4.2.2/server/failover.c 2011-09-21 15:13:35.584433913 +0200
-@@ -35,6 +35,8 @@
- #include "dhcpd.h"
- #include <omapip/omapip_p.h>
-
-+#include "trace.h"
-+
- #if defined (FAILOVER_PROTOCOL)
- dhcp_failover_state_t *failover_states;
- static isc_result_t do_a_failover_option (omapi_object_t *,
-@@ -1711,6 +1713,8 @@ isc_result_t dhcp_failover_set_state (dh
- struct lease *l;
- struct timeval tv;
-
-+ TRACE(DHCPD_FAILOVER_SET_STATE_START(state->me.state, new_state));
-+
- /* If we're in certain states where we're sending updates, and the peer
- * state changes, we need to re-schedule any pending updates just to
- * be on the safe side. This results in retransmission.
-@@ -1938,6 +1942,8 @@ isc_result_t dhcp_failover_set_state (dh
- break;
- }
-
-+ TRACE(DHCPD_FAILOVER_SET_STATE_DONE());
-+
- return ISC_R_SUCCESS;
- }
-
-@@ -2420,6 +2426,8 @@ dhcp_failover_pool_dobalance(dhcp_failov
- if (state -> me.state != normal)
- return 0;
-
-+ TRACE(DHCPD_FAILOVER_POOL_DOBALANCE_START());
-+
- state->last_balance = cur_time;
-
- for (s = shared_networks ; s ; s = s->next) {
-@@ -2580,6 +2588,8 @@ dhcp_failover_pool_dobalance(dhcp_failov
- if (leases_queued)
- commit_leases();
-
-+ TRACE(DHCPD_FAILOVER_POOL_DOBALANCE_DONE());
-+
- return leases_queued;
- }
-
-diff -up dhcp-4.2.2/server/Makefile.am.systemtap dhcp-4.2.2/server/Makefile.am
---- dhcp-4.2.2/server/Makefile.am.systemtap 2011-09-21 15:13:35.517434828 +0200
-+++ dhcp-4.2.2/server/Makefile.am 2011-09-21 15:13:35.585433900 +0200
-@@ -4,7 +4,7 @@ dist_sysconf_DATA = dhcpd.conf
- sbin_PROGRAMS = dhcpd
- dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
- omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c \
-- dhcpv6.c mdb6.c ldap.c ldap_casa.c
-+ dhcpv6.c mdb6.c ldap.c ldap_casa.c probes.d trace.h
-
- dhcpd_CFLAGS = $(LDAP_CFLAGS)
- dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
-@@ -14,3 +14,13 @@ dhcpd_LDADD = ../common/libdhcp.a ../oma
- man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
- EXTRA_DIST = $(man_MANS)
-
-+if ENABLE_SYSTEMTAP
-+BUILT_SOURCES = probes.h
-+probes.h: probes.d
-+ $(DTRACE) -C -h -s $< -o $@
-+
-+probes.o: probes.d
-+ $(DTRACE) -C -G -s $< -o $@
-+
-+dhcpd_LDADD += probes.o
-+endif
-diff -up dhcp-4.2.2/server/probes.d.systemtap dhcp-4.2.2/server/probes.d
---- dhcp-4.2.2/server/probes.d.systemtap 2011-09-21 15:13:35.585433900 +0200
-+++ dhcp-4.2.2/server/probes.d 2011-09-21 15:13:35.585433900 +0200
-@@ -0,0 +1,43 @@
-+provider dhcpd {
-+ probe main();
-+ probe discover_start()
-+ probe discover_done()
-+ probe request_start()
-+ probe request_done()
-+ probe release_start()
-+ probe release_done()
-+ probe decline_start()
-+ probe decline_done()
-+ probe inform_start()
-+ probe inform_done()
-+ probe nak_lease_start()
-+ probe nak_lease_done()
-+ probe ack_lease_start()
-+ probe ack_lease_done()
-+ probe reply_start()
-+ probe reply_done()
-+ probe find_lease_start()
-+ probe find_lease_done()
-+ probe 6_solicit_start()
-+ probe 6_solicit_done()
-+ probe 6_request_start()
-+ probe 6_request_done()
-+ probe 6_confirm_start()
-+ probe 6_confirm_done()
-+ probe 6_renew_start()
-+ probe 6_renew_done()
-+ probe 6_rebind_start()
-+ probe 6_rebind_done()
-+ probe 6_decline_start()
-+ probe 6_decline_done()
-+ probe 6_release_start()
-+ probe 6_release_done()
-+ probe 6_information_request_start()
-+ probe 6_information_request_done()
-+ probe 6_relay_forw_start()
-+ probe 6_relay_forw_done()
-+ probe failover_pool_dobalance_start()
-+ probe failover_pool_dobalance_done()
-+ probe failover_set_state_start(int, int) /* state, new_state */
-+ probe failover_set_state_done()
-+};
-diff -up dhcp-4.2.2/server/trace.h.systemtap dhcp-4.2.2/server/trace.h
---- dhcp-4.2.2/server/trace.h.systemtap 2011-09-21 15:13:35.585433900 +0200
-+++ dhcp-4.2.2/server/trace.h 2011-09-21 15:13:35.585433900 +0200
-@@ -0,0 +1,11 @@
-+// trace.h
-+
-+#include "config.h"
-+#ifdef HAVE_SYSTEMTAP
-+// include the generated probes header and put markers in code
-+#include "probes.h"
-+#define TRACE(probe) probe
-+#else
-+// Wrap the probe to allow it to be removed when no systemtap available
-+#define TRACE(probe)
-+#endif
-diff -up dhcp-4.2.2/tapset/dhcpd.stp.systemtap dhcp-4.2.2/tapset/dhcpd.stp
---- dhcp-4.2.2/tapset/dhcpd.stp.systemtap 2011-09-21 15:13:35.586433886 +0200
-+++ dhcp-4.2.2/tapset/dhcpd.stp 2011-09-21 15:13:35.586433886 +0200
-@@ -0,0 +1,212 @@
-+/* dhcpd tapset
-+ Copyright (C) 2011, Red Hat Inc.
-+ */
-+
-+probe dhcpd_main = process("dhcpd").mark("main")
-+{
-+ probestr = sprintf("%s(locals: %s)", $$name, $$locals);
-+
-+}
-+
-+probe dhcpd_discover_start = process("dhcpd").mark("discover_start")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_discover_done = process("dhcpd").mark("discover_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_request_start = process("dhcpd").mark("request_start")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_request_done = process("dhcpd").mark("request_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_release_start = process("dhcpd").mark("release_start")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_release_done = process("dhcpd").mark("release_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_decline_start = process("dhcpd").mark("decline_start")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_decline_done = process("dhcpd").mark("decline_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_inform_start = process("dhcpd").mark("inform_start")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_inform_done = process("dhcpd").mark("inform_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_nak_lease_start = process("dhcpd").mark("nak_lease_start")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_nak_lease_done = process("dhcpd").mark("nak_lease_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_ack_lease_start = process("dhcpd").mark("ack_lease_start")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_ack_lease_done = process("dhcpd").mark("ack_lease_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_reply_start = process("dhcpd").mark("reply_start")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_reply_done = process("dhcpd").mark("reply_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_find_lease_start = process("dhcpd").mark("find_lease_start")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_find_lease_done = process("dhcpd").mark("find_lease_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_6_solicit_start = process("dhcpd").mark("6_solicit_start")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_6_solicit_done = process("dhcpd").mark("6_solicit_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_6_request_start = process("dhcpd").mark("6_request_start")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_6_request_done = process("dhcpd").mark("6_request_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_6_confirm_start = process("dhcpd").mark("6_confirm_start")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_6_confirm_done = process("dhcpd").mark("6_confirm_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_6_renew_start = process("dhcpd").mark("6_renew_start")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_6_renew_done = process("dhcpd").mark("6_renew_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_6_rebind_start = process("dhcpd").mark("6_rebind_start")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_6_rebind_done = process("dhcpd").mark("6_rebind_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_6_decline_start = process("dhcpd").mark("6_decline_start")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_6_decline_done = process("dhcpd").mark("6_decline_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_6_release_start = process("dhcpd").mark("6_release_start")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_6_release_done = process("dhcpd").mark("6_release_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_6_information_request_start = process("dhcpd").mark("6_information_request_start")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_6_information_request_done = process("dhcpd").mark("6_information_request_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_6_relay_forw_start = process("dhcpd").mark("6_relay_forw_start")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_6_relay_forw_done = process("dhcpd").mark("6_relay_forw_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_failover_pool_dobalance_start = process("dhcpd").mark("failover_pool_dobalance_start")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+probe dhcpd_failover_pool_dobalance_done = process("dhcpd").mark("failover_pool_dobalance_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-+
-+
-+probe dhcpd_failover_set_state_start = process("dhcpd").mark("failover_set_state_start")
-+{
-+ state = $arg1;
-+ new_state = $arg2;
-+ probestr = sprintf("%s(state=%d, new_state=%d)", $$name, state, new_state);
-+}
-+
-+probe dhcpd_failover_set_state_done = process("dhcpd").mark("failover_set_state_done")
-+{
-+ probestr = sprintf("%s", $$name);
-+}
-diff -up dhcp-4.2.2/tapset/Makefile.am.systemtap dhcp-4.2.2/tapset/Makefile.am
---- dhcp-4.2.2/tapset/Makefile.am.systemtap 2011-09-21 15:13:35.586433886 +0200
-+++ dhcp-4.2.2/tapset/Makefile.am 2011-09-21 15:13:35.586433886 +0200
-@@ -0,0 +1,26 @@
-+# Makefile.am for dhcp/tapset
-+# Jiri Popelka
-+
-+.PHONY: clean-local install-data-hook uninstall-local
-+
-+#
-+EXTRA_DIST = dhcpd.stp
-+TAPSET_FILES = $(EXTRA_DIST)
-+TAPSET_INSTALL_DIR = $(DESTDIR)@ABS_TAPSET_DIR@
-+
-+if ENABLE_SYSTEMTAP
-+all-local: $(TAPSET_FILES)
-+
-+clean-local:
-+
-+install-data-hook:
-+ $(MKDIR_P) $(TAPSET_INSTALL_DIR)
-+ $(INSTALL_DATA) $(TAPSET_FILES) $(TAPSET_INSTALL_DIR)
-+
-+uninstall-local:
-+ @list='$(TAPSET_FILES)'; for p in $$list; do \
-+ echo " rm -f '$(TAPSET_INSTALL_DIR)/$$p'"; \
-+ rm -f "$(TAPSET_INSTALL_DIR)/$$p"; \
-+ done
-+endif
-+
diff --git a/dhcp/patches/dhcp-4.2.3-P2-log_perror.patch b/dhcp/patches/dhcp-4.2.3-P2-log_perror.patch
new file mode 100644
index 0000000..124c8c5
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.3-P2-log_perror.patch
@@ -0,0 +1,11 @@
+diff -up dhcp-4.2.3-P2/server/dhcpd.c.log_perror dhcp-4.2.3-P2/server/dhcpd.c
+--- dhcp-4.2.3-P2/server/dhcpd.c.log_perror 2012-02-22 14:24:57.000000000 +0100
++++ dhcp-4.2.3-P2/server/dhcpd.c 2012-02-22 14:29:09.964576687 +0100
+@@ -315,6 +315,7 @@ main(int argc, char **argv) {
+ #ifndef DEBUG
+ daemon = 0;
+ #endif
++ log_perror = 0;
+ } else if (!strcmp (argv [i], "-d")) {
+ #ifndef DEBUG
+ daemon = 0;
diff --git a/dhcp/patches/dhcp-4.2.3-P2-rfc5970-dhcpv6-options-for-network-boot.patch b/dhcp/patches/dhcp-4.2.3-P2-rfc5970-dhcpv6-options-for-network-boot.patch
new file mode 100644
index 0000000..3bcb5da
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.3-P2-rfc5970-dhcpv6-options-for-network-boot.patch
@@ -0,0 +1,89 @@
+diff -up dhcp-4.2.3-P2/common/dhcp-options.5.rfc5970 dhcp-4.2.3-P2/common/dhcp-options.5
+--- dhcp-4.2.3-P2/common/dhcp-options.5.rfc5970 2012-03-21 19:39:47.572002389 +0100
++++ dhcp-4.2.3-P2/common/dhcp-options.5 2012-03-21 19:39:47.670001164 +0100
+@@ -1770,7 +1770,48 @@ The \fBlq-relay-data\fR option is used i
+ The \fBlq-client-link\fR option is used internally by for lease query.
+ .RE
+ .PP
++
++.B option
++.B dhcp6.bootfile-url
++.I string
++.B ;
++.RS 0.25i
++.PP
++The server sends this option to inform the client about a URL to a
++boot file. Used primarily for UEFI network booting, it contains an RFC3986
++compliant URI which the client may use to boot an operating system. This option
++is defined in RFC5970
++.RE
++.PP
++
++.B option
++.B dhcp6.arch-type
++.I arch-id \fR[\fB,\fR arch-id\fR...]
++.B ;
++.RS 0.25i
++.PP
++A client will send this option to a server so that the server may make decisions
++on what options and addresses to offer the requesting client. The option
++consists of a list of 16 bit unsigned values that represent the architecture of
++the requesting client. These values corespond to the values available to the
++dhcpv4 option architecture-type, as defined in RFC4578, section 2.1.
++This option is defined in RFC5970
+ .RE
++.PP
++
++.B option
++.B dhcp6.net-id
++.I uint8 uint8 uint8
++.B ;
++.RS 0.25i
++.PP
++A client will send this option to a server to inform it about the clients level
++of UNDI support. The option consists of 3 octets (a type, major and minor
++value). Specific meanings of these values are doumented in section 2.2 of
++RFC4578.
++This option is defined in RFC5970
++.RE
++.PP
+ .SH DEFINING NEW OPTIONS
+ The Internet Systems Consortium DHCP client and server provide the
+ capability to define new options. Each DHCP option has a name, a
+diff -up dhcp-4.2.3-P2/common/tables.c.rfc5970 dhcp-4.2.3-P2/common/tables.c
+--- dhcp-4.2.3-P2/common/tables.c.rfc5970 2012-03-21 19:39:47.577002328 +0100
++++ dhcp-4.2.3-P2/common/tables.c 2012-03-21 19:39:47.670001164 +0100
+@@ -461,6 +461,18 @@ static struct option dhcpv6_options[] =
+ { "lq-relay-data", "6X", &dhcpv6_universe, 47, 1 },
+ { "lq-client-link", "6A", &dhcpv6_universe, 48, 1 },
+
++ /* RFC5970 OPTIONS */
++
++ { "bootfile-url", "t", &dhcpv6_universe, 59, 1},
++#if 0
++ /* Can't implement this until arrays of strings with length "StA"
++ * are implemented
++ */
++ { "bootfile-param", "StA", &dhcpv6_universe, 60, 1},
++#endif
++ { "arch-type", "Sa", &dhcpv6_universe, 61, 1},
++ { "net-id", "BBB", &dhcpv6_universe, 62, 1},
++
+ { NULL, NULL, NULL, 0, 0 }
+ };
+
+diff -up dhcp-4.2.3-P2/includes/dhcp6.h.rfc5970 dhcp-4.2.3-P2/includes/dhcp6.h
+--- dhcp-4.2.3-P2/includes/dhcp6.h.rfc5970 2010-02-17 21:33:55.000000000 +0100
++++ dhcp-4.2.3-P2/includes/dhcp6.h 2012-03-21 19:39:47.671001151 +0100
+@@ -75,6 +75,11 @@
+ #define D6O_CLT_TIME 46 /* RFC5007 */
+ #define D6O_LQ_RELAY_DATA 47 /* RFC5007 */
+ #define D6O_LQ_CLIENT_LINK 48 /* RFC5007 */
++/* 49-58 Not yet assigned */
++#define D60_BOOT_URL 59 /* RFC5970 */
++#define D60_BOOT_PARAMS 60 /* RFC5970 */
++#define D60_CLIENT_ARCH 61 /* RFC5970 */
++#define D60_CLIENT_NII 62 /* RFC5970 */
+
+ /*
+ * Status Codes, from RFC 3315 section 24.4, and RFC 3633, 5007.
diff --git a/dhcp/patches/dhcp-4.2.3-dhclient-decline-onetry.patch b/dhcp/patches/dhcp-4.2.3-dhclient-decline-onetry.patch
new file mode 100644
index 0000000..af3314d
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.3-dhclient-decline-onetry.patch
@@ -0,0 +1,27 @@
+diff -up dhcp-4.2.3/client/dhclient.c.decline-onetry dhcp-4.2.3/client/dhclient.c
+--- dhcp-4.2.3/client/dhclient.c.decline-onetry 2011-11-24 14:21:50.000000000 +0100
++++ dhcp-4.2.3/client/dhclient.c 2011-11-24 14:23:44.472893215 +0100
+@@ -1704,11 +1704,18 @@ void bind_lease (client)
+ if (script_go (client)) {
+ make_decline (client, client -> new);
+ send_decline (client);
+- destroy_client_lease (client -> new);
+- client -> new = (struct client_lease *)0;
+- client -> state = S_DECLINED;
+- state_init (client);
+- return;
++ if (onetry) {
++ if (!quiet)
++ log_info ("Unable to obtain a lease on first try.%s",
++ " Exiting.");
++ exit (2);
++ } else {
++ destroy_client_lease (client -> new);
++ client -> new = (struct client_lease *)0;
++ client -> state = S_DECLINED;
++ state_init (client);
++ return;
++ }
+ }
+
+ /* Write out the new lease if it has been long enough. */
diff --git a/dhcp/patches/dhcp-4.2.3-paranoia.patch b/dhcp/patches/dhcp-4.2.3-paranoia.patch
new file mode 100644
index 0000000..e6c1576
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.3-paranoia.patch
@@ -0,0 +1,49 @@
+diff -up dhcp-4.2.3-P1/server/dhcpd.c.paranoia dhcp-4.2.3-P1/server/dhcpd.c
+--- dhcp-4.2.3-P1/server/dhcpd.c.paranoia 2011-12-20 18:02:26.000000000 +0100
++++ dhcp-4.2.3-P1/server/dhcpd.c 2011-12-20 18:03:43.840037108 +0100
+@@ -771,22 +771,6 @@ main(int argc, char **argv) {
+ exit (0);
+ }
+
+-#if defined (PARANOIA)
+- /* change uid to the specified one */
+-
+- if (set_gid) {
+- if (setgroups (0, (void *)0))
+- log_fatal ("setgroups: %m");
+- if (setgid (set_gid))
+- log_fatal ("setgid(%d): %m", (int) set_gid);
+- }
+-
+- if (set_uid) {
+- if (setuid (set_uid))
+- log_fatal ("setuid(%d): %m", (int) set_uid);
+- }
+-#endif /* PARANOIA */
+-
+ /*
+ * Deal with pid files. If the user told us
+ * not to write a file we don't read one either
+@@ -823,6 +807,22 @@ main(int argc, char **argv) {
+ }
+ }
+
++#if defined (PARANOIA)
++ /* change uid to the specified one */
++
++ if (set_gid) {
++ if (setgroups (0, (void *)0))
++ log_fatal ("setgroups: %m");
++ if (setgid (set_gid))
++ log_fatal ("setgid(%d): %m", (int) set_gid);
++ }
++
++ if (set_uid) {
++ if (setuid (set_uid))
++ log_fatal ("setuid(%d): %m", (int) set_uid);
++ }
++#endif /* PARANOIA */
++
+ /* If we were requested to log to stdout on the command line,
+ keep doing so; otherwise, stop. */
+ if (log_perror == -1)
diff --git a/dhcp/patches/dhcp-4.2.4-64_bit_lease_parse.patch b/dhcp/patches/dhcp-4.2.4-64_bit_lease_parse.patch
new file mode 100644
index 0000000..c1b978b
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.4-64_bit_lease_parse.patch
@@ -0,0 +1,84 @@
+diff -up dhcp-4.2.4b1/common/parse.c.64-bit_lease_parse dhcp-4.2.4b1/common/parse.c
+--- dhcp-4.2.4b1/common/parse.c.64-bit_lease_parse 2012-03-09 12:28:10.000000000 +0100
++++ dhcp-4.2.4b1/common/parse.c 2012-04-16 17:30:55.867045149 +0200
+@@ -906,8 +906,8 @@ TIME
+ parse_date_core(cfile)
+ struct parse *cfile;
+ {
+- int guess;
+- int tzoff, year, mon, mday, hour, min, sec;
++ TIME guess;
++ long int tzoff, year, mon, mday, hour, min, sec;
+ const char *val;
+ enum dhcp_token token;
+ static int months[11] = { 31, 59, 90, 120, 151, 181,
+@@ -933,7 +933,7 @@ parse_date_core(cfile)
+ }
+
+ token = next_token(&val, NULL, cfile); /* consume number */
+- guess = atoi(val);
++ guess = atol(val);
+
+ return((TIME)guess);
+ }
+@@ -961,7 +961,7 @@ parse_date_core(cfile)
+ somebody invents a time machine, I think we can safely disregard
+ it. This actually works around a stupid Y2K bug that was present
+ in a very early beta release of dhcpd. */
+- year = atoi(val);
++ year = atol(val);
+ if (year > 1900)
+ year -= 1900;
+
+@@ -985,7 +985,7 @@ parse_date_core(cfile)
+ return((TIME)0);
+ }
+ token = next_token(&val, NULL, cfile); /* consume month */
+- mon = atoi(val) - 1;
++ mon = atol(val) - 1;
+
+ /* Slash separating month from day... */
+ token = peek_token(&val, NULL, cfile);
+@@ -1007,7 +1007,7 @@ parse_date_core(cfile)
+ return((TIME)0);
+ }
+ token = next_token(&val, NULL, cfile); /* consume day of month */
+- mday = atoi(val);
++ mday = atol(val);
+
+ /* Hour... */
+ token = peek_token(&val, NULL, cfile);
+@@ -1018,7 +1018,7 @@ parse_date_core(cfile)
+ return((TIME)0);
+ }
+ token = next_token(&val, NULL, cfile); /* consume hour */
+- hour = atoi(val);
++ hour = atol(val);
+
+ /* Colon separating hour from minute... */
+ token = peek_token(&val, NULL, cfile);
+@@ -1040,7 +1040,7 @@ parse_date_core(cfile)
+ return((TIME)0);
+ }
+ token = next_token(&val, NULL, cfile); /* consume minute */
+- min = atoi(val);
++ min = atol(val);
+
+ /* Colon separating minute from second... */
+ token = peek_token(&val, NULL, cfile);
+@@ -1062,13 +1062,13 @@ parse_date_core(cfile)
+ return((TIME)0);
+ }
+ token = next_token(&val, NULL, cfile); /* consume second */
+- sec = atoi(val);
++ sec = atol(val);
+
+ tzoff = 0;
+ token = peek_token(&val, NULL, cfile);
+ if (token == NUMBER) {
+ token = next_token(&val, NULL, cfile); /* consume tzoff */
+- tzoff = atoi(val);
++ tzoff = atol(val);
+ } else if (token != SEMI) {
+ token = next_token(&val, NULL, cfile);
+ parse_warn(cfile,
diff --git a/dhcp/patches/dhcp-4.2.4-P1-dhclient6-leases_semicolon_expected.patch b/dhcp/patches/dhcp-4.2.4-P1-dhclient6-leases_semicolon_expected.patch
new file mode 100644
index 0000000..c18380d
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.4-P1-dhclient6-leases_semicolon_expected.patch
@@ -0,0 +1,41 @@
+diff -up dhcp-4.2.4-P1/client/dhclient.c.dhclient6-leases_semicolon dhcp-4.2.4-P1/client/dhclient.c
+--- dhcp-4.2.4-P1/client/dhclient.c.dhclient6-leases_semicolon 2012-07-25 15:20:22.187164614 +0200
++++ dhcp-4.2.4-P1/client/dhclient.c 2012-07-25 15:20:26.648152028 +0200
+@@ -3236,10 +3236,21 @@ void write_lease_option (struct option_c
+ }
+ if (evaluate_option_cache (&ds, packet, lease, client_state,
+ in_options, cfg_options, scope, oc, MDL)) {
+- fprintf(leaseFile, "%soption %s%s%s %s;\n", preamble,
+- name, dot, oc->option->name,
+- pretty_print_option(oc->option, ds.data, ds.len,
+- 1, 1));
++ /* The option name */
++ fprintf(leaseFile, "%soption %s%s%s", preamble,
++ name, dot, oc->option->name);
++
++ /* The option value if there is one */
++ if ((oc->option->format == NULL) ||
++ (oc->option->format[0] != 'Z')) {
++ fprintf(leaseFile, " %s",
++ pretty_print_option(oc->option, ds.data,
++ ds.len, 1, 1));
++ }
++
++ /* The closing semi-colon and newline */
++ fprintf(leaseFile, ";\n");
++
+ data_string_forget (&ds, MDL);
+ }
+ }
+diff -up dhcp-4.2.4-P1/common/parse.c.dhclient6-leases_semicolon dhcp-4.2.4-P1/common/parse.c
+--- dhcp-4.2.4-P1/common/parse.c.dhclient6-leases_semicolon 2012-07-25 15:10:39.683557386 +0200
++++ dhcp-4.2.4-P1/common/parse.c 2012-07-25 15:16:50.826762985 +0200
+@@ -5772,7 +5772,7 @@ int parse_option_decl (oc, cfile)
+ goto alloc;
+
+ case 'Z': /* Zero-length option */
+- token = next_token(&val, (unsigned *)0, cfile);
++ token = peek_token(&val, (unsigned *)0, cfile);
+ if (token != SEMI) {
+ parse_warn(cfile,
+ "semicolon expected.");
diff --git a/dhcp/patches/dhcp-4.2.4-P1-interval.patch b/dhcp/patches/dhcp-4.2.4-P1-interval.patch
new file mode 100644
index 0000000..e8e89c1
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.4-P1-interval.patch
@@ -0,0 +1,25 @@
+diff -up dhcp-4.2.4/common/dispatch.c.foo dhcp-4.2.4/common/dispatch.c
+--- dhcp-4.2.4/common/dispatch.c.foo 2012-07-26 21:31:43.875349675 -0500
++++ dhcp-4.2.4/common/dispatch.c 2012-07-26 21:39:14.961710319 -0500
+@@ -324,7 +324,20 @@ void add_timeout (when, where, what, ref
+ q->next = timeouts;
+ timeouts = q;
+
+- isc_interval_set(&interval, sec & DHCP_SEC_MAX, usec * 1000);
++ /* isc_time_nowplusinterval() is not safe with 64-bit time_t and will
++ * return an error for sufficiently large intervals. We have to limit
++ * the interval to INT_MAX or less to ensure the interval doesn't
++ * overflow 32 bits, since the returned isc_time_t fields are
++ * 32-bit unsigned ints.
++ *
++ * HACK: The 9 is a magic number of seconds, since some time may have
++ * gone by since the last call to gettimeofday() and the one in
++ * isc_time_nowplusinterval().
++ */
++ if (sec > TIME_MAX)
++ sec = TIME_MAX - 9;
++
++ isc_interval_set(&interval, sec, usec * 1000);
+ status = isc_time_nowplusinterval(&expires, &interval);
+ if (status != ISC_R_SUCCESS) {
+ /*
diff --git a/dhcp/patches/dhcp-4.2.4-P1-remove-dst.patch b/dhcp/patches/dhcp-4.2.4-P1-remove-dst.patch
new file mode 100644
index 0000000..6b8dbb0
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.4-P1-remove-dst.patch
@@ -0,0 +1,46 @@
+diff -up dhcp-4.2.4-P1/configure.ac.remove-dst dhcp-4.2.4-P1/configure.ac
+--- dhcp-4.2.4-P1/configure.ac.remove-dst 2012-08-17 15:24:29.066454140 +0200
++++ dhcp-4.2.4-P1/configure.ac 2012-08-17 15:24:29.071454073 +0200
+@@ -608,7 +608,6 @@ AC_OUTPUT([
+ common/Makefile
+ common/tests/Makefile
+ dhcpctl/Makefile
+- dst/Makefile
+ includes/Makefile
+ omapip/Makefile
+ relay/Makefile
+diff -up dhcp-4.2.4-P1/includes/Makefile.am.remove-dst dhcp-4.2.4-P1/includes/Makefile.am
+--- dhcp-4.2.4-P1/includes/Makefile.am.remove-dst 2012-07-13 08:17:54.000000000 +0200
++++ dhcp-4.2.4-P1/includes/Makefile.am 2012-08-17 15:25:08.253922458 +0200
+@@ -1,7 +1,6 @@
+ nobase_include_HEADERS = omapip/alloc.h omapip/buffer.h omapip/convert.h \
+ omapip/hash.h omapip/isclib.h omapip/omapip.h \
+- omapip/omapip_p.h omapip/result.h omapip/trace.h \
+- isc-dhcp/dst.h
++ omapip/omapip_p.h omapip/result.h omapip/trace.h
+
+ EXTRA_DIST = cdefs.h ctrace.h dhcp.h dhcp6.h dhcpd.h dhctoken.h failover.h \
+ heap.h inet.h minires.h osdep.h site.h statement.h tree.h \
+diff -up dhcp-4.2.4-P1/Makefile.am.remove-dst dhcp-4.2.4-P1/Makefile.am
+--- dhcp-4.2.4-P1/Makefile.am.remove-dst 2012-08-17 15:24:29.067454126 +0200
++++ dhcp-4.2.4-P1/Makefile.am 2012-08-17 15:24:29.071454073 +0200
+@@ -27,7 +27,7 @@ else
+ SUBDIRS =
+ endif
+
+-SUBDIRS += includes tests common dst omapip client dhcpctl relay server
++SUBDIRS += includes tests common omapip client dhcpctl relay server
+
+ nobase_include_HEADERS = dhcpctl/dhcpctl.h
+
+diff -up dhcp-4.2.4-P1/server/ddns.c.remove-dst dhcp-4.2.4-P1/server/ddns.c
+--- dhcp-4.2.4-P1/server/ddns.c.remove-dst 2012-07-13 08:18:05.000000000 +0200
++++ dhcp-4.2.4-P1/server/ddns.c 2012-08-17 15:24:29.072454060 +0200
+@@ -34,7 +34,6 @@
+ */
+
+ #include "dhcpd.h"
+-#include "dst/md5.h"
+ #include <dns/result.h>
+
+ #ifdef NSUPDATE
diff --git a/dhcp/patches/dhcp-4.2.4-PPP.patch b/dhcp/patches/dhcp-4.2.4-PPP.patch
new file mode 100644
index 0000000..edb11bf
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.4-PPP.patch
@@ -0,0 +1,150 @@
+diff -up dhcp-4.2.4b1/client/dhc6.c.PPP dhcp-4.2.4b1/client/dhc6.c
+--- dhcp-4.2.4b1/client/dhc6.c.PPP 2012-04-16 17:37:23.243618764 +0200
++++ dhcp-4.2.4b1/client/dhc6.c 2012-04-16 17:37:23.252618638 +0200
+@@ -133,7 +133,7 @@ extern int stateless;
+ * is not how it is intended. Upcoming rearchitecting the client should
+ * address this "one daemon model."
+ */
+-void
++isc_result_t
+ form_duid(struct data_string *duid, const char *file, int line)
+ {
+ struct interface_info *ip;
+@@ -145,6 +145,15 @@ form_duid(struct data_string *duid, cons
+ if (ip == NULL)
+ log_fatal("Impossible condition at %s:%d.", MDL);
+
++ while (ip && ip->hw_address.hbuf[0] == HTYPE_RESERVED) {
++ /* Try the other interfaces */
++ log_debug("Cannot form default DUID from interface %s.", ip->name);
++ ip = ip->next;
++ }
++ if (ip == NULL) {
++ return ISC_R_UNEXPECTED;
++ }
++
+ if ((ip->hw_address.hlen == 0) ||
+ (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf)))
+ log_fatal("Impossible hardware address length at %s:%d.", MDL);
+@@ -180,6 +189,8 @@ form_duid(struct data_string *duid, cons
+ memcpy(duid->buffer->data + 4, ip->hw_address.hbuf + 1,
+ ip->hw_address.hlen - 1);
+ }
++
++ return ISC_R_SUCCESS;
+ }
+
+ /*
+@@ -5130,7 +5141,8 @@ make_client6_options(struct client_state
+ */
+ if ((oc = lookup_option(&dhcpv6_universe, *op,
+ D6O_CLIENTID)) == NULL) {
+- if (!option_cache(&oc, &default_duid, NULL, clientid_option,
++ if (default_duid.len == 0 ||
++ !option_cache(&oc, &default_duid, NULL, clientid_option,
+ MDL))
+ log_fatal("Failure assembling a DUID.");
+
+diff -up dhcp-4.2.4b1/client/dhclient.c.PPP dhcp-4.2.4b1/client/dhclient.c
+--- dhcp-4.2.4b1/client/dhclient.c.PPP 2012-04-16 17:37:23.214619170 +0200
++++ dhcp-4.2.4b1/client/dhclient.c 2012-04-16 17:37:23.254618610 +0200
+@@ -919,8 +919,8 @@ main(int argc, char **argv) {
+ if (default_duid.buffer != NULL)
+ data_string_forget(&default_duid, MDL);
+
+- form_duid(&default_duid, MDL);
+- write_duid(&default_duid);
++ if (form_duid(&default_duid, MDL) == ISC_R_SUCCESS)
++ write_duid(&default_duid);
+ }
+
+ for (ip = interfaces ; ip != NULL ; ip = ip->next) {
+diff -up dhcp-4.2.4b1/common/bpf.c.PPP dhcp-4.2.4b1/common/bpf.c
+--- dhcp-4.2.4b1/common/bpf.c.PPP 2012-04-16 17:37:23.175619716 +0200
++++ dhcp-4.2.4b1/common/bpf.c 2012-04-16 17:37:23.255618596 +0200
+@@ -599,6 +599,22 @@ get_hw_addr(const char *name, struct har
+ memcpy(&hw->hbuf[1], LLADDR(sa), sa->sdl_alen);
+ break;
+ #endif /* IFT_FDDI */
++#if defined(IFT_PPP)
++ case IFT_PPP:
++ if (local_family != AF_INET6)
++ log_fatal("Unsupported device type %d for \"%s\"",
++ sa->sdl_type, name);
++ hw->hlen = 0;
++ hw->hbuf[0] = HTYPE_RESERVED;
++ /* 0xdeadbeef should never occur on the wire,
++ * and is a signature that something went wrong.
++ */
++ hw->hbuf[1] = 0xde;
++ hw->hbuf[2] = 0xad;
++ hw->hbuf[3] = 0xbe;
++ hw->hbuf[4] = 0xef;
++ break;
++#endif
+ default:
+ log_fatal("Unsupported device type %d for \"%s\"",
+ sa->sdl_type, name);
+diff -up dhcp-4.2.4b1/common/lpf.c.PPP dhcp-4.2.4b1/common/lpf.c
+--- dhcp-4.2.4b1/common/lpf.c.PPP 2012-04-16 17:37:23.155619996 +0200
++++ dhcp-4.2.4b1/common/lpf.c 2012-04-16 17:37:23.256618582 +0200
+@@ -503,6 +503,22 @@ get_hw_addr(const char *name, struct har
+ hw->hbuf[0] = HTYPE_FDDI;
+ memcpy(&hw->hbuf[1], sa->sa_data, 16);
+ break;
++#if defined(ARPHRD_PPP)
++ case ARPHRD_PPP:
++ if (local_family != AF_INET6)
++ log_fatal("Unsupported device type %d for \"%s\"",
++ sa->sa_family, name);
++ hw->hlen = 0;
++ hw->hbuf[0] = HTYPE_RESERVED;
++ /* 0xdeadbeef should never occur on the wire,
++ * and is a signature that something went wrong.
++ */
++ hw->hbuf[1] = 0xde;
++ hw->hbuf[2] = 0xad;
++ hw->hbuf[3] = 0xbe;
++ hw->hbuf[4] = 0xef;
++ break;
++#endif
+ default:
+ log_fatal("Unsupported device type %ld for \"%s\"",
+ (long int)sa->sa_family, name);
+diff -up dhcp-4.2.4b1/includes/dhcpd.h.PPP dhcp-4.2.4b1/includes/dhcpd.h
+--- dhcp-4.2.4b1/includes/dhcpd.h.PPP 2012-04-16 17:37:23.239618820 +0200
++++ dhcp-4.2.4b1/includes/dhcpd.h 2012-04-16 17:37:23.257618568 +0200
+@@ -2760,7 +2760,7 @@ void dhcpv4_client_assignments(void);
+ void dhcpv6_client_assignments(void);
+
+ /* dhc6.c */
+-void form_duid(struct data_string *duid, const char *file, int line);
++isc_result_t form_duid(struct data_string *duid, const char *file, int line);
+ void dhc6_lease_destroy(struct dhc6_lease **src, const char *file, int line);
+ void start_init6(struct client_state *client);
+ void start_info_request6(struct client_state *client);
+diff -up dhcp-4.2.4b1/includes/dhcp.h.PPP dhcp-4.2.4b1/includes/dhcp.h
+--- dhcp-4.2.4b1/includes/dhcp.h.PPP 2012-04-16 17:37:23.000000000 +0200
++++ dhcp-4.2.4b1/includes/dhcp.h 2012-04-16 17:38:34.675618138 +0200
+@@ -85,6 +85,8 @@ struct dhcp_packet {
+ * is no standard for this so we
+ * just steal a type */
+
++#define HTYPE_RESERVED 0 /* RFC 5494 */
++
+ /* Magic cookie validating dhcp options field (and bootp vendor
+ extensions field). */
+ #define DHCP_OPTIONS_COOKIE "\143\202\123\143"
+diff -up dhcp-4.2.4b1/server/dhcpv6.c.PPP dhcp-4.2.4b1/server/dhcpv6.c
+--- dhcp-4.2.4b1/server/dhcpv6.c.PPP 2012-04-16 17:37:23.218619114 +0200
++++ dhcp-4.2.4b1/server/dhcpv6.c 2012-04-16 17:37:23.260618526 +0200
+@@ -300,6 +300,9 @@ generate_new_server_duid(void) {
+ if (p->hw_address.hlen > 0) {
+ break;
+ }
++ if (p->next == NULL && p->hw_address.hbuf[0] == HTYPE_RESERVED) {
++ log_error("Can not generate DUID from interfaces which do not have hardware addresses, please configure server-duid!");
++ }
+ }
+ if (p == NULL) {
+ return ISC_R_UNEXPECTED;
diff --git a/dhcp/patches/dhcp-4.2.4-UseMulticast.patch b/dhcp/patches/dhcp-4.2.4-UseMulticast.patch
new file mode 100644
index 0000000..d0c5dfe
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.4-UseMulticast.patch
@@ -0,0 +1,239 @@
+diff -up dhcp-4.2.4b1/server/dhcpv6.c.UseMulticast dhcp-4.2.4b1/server/dhcpv6.c
+--- dhcp-4.2.4b1/server/dhcpv6.c.UseMulticast 2012-04-11 00:14:04.000000000 +0200
++++ dhcp-4.2.4b1/server/dhcpv6.c 2012-04-16 19:21:43.575923732 +0200
+@@ -346,6 +346,48 @@ generate_new_server_duid(void) {
+ }
+
+ /*
++ * Is the D6O_UNICAST option defined in dhcpd.conf ?
++ */
++static isc_boolean_t unicast_option_defined;
++
++/*
++ * Did we already search dhcpd.conf for D6O_UNICAST option ?
++ * We need to store it here to not parse dhcpd.conf repeatedly.
++ */
++static isc_boolean_t unicast_option_parsed = ISC_FALSE;
++
++
++/*
++ * Is the D6O_UNICAST option defined in dhcpd.conf ?
++ */
++isc_boolean_t
++is_unicast_option_defined(void) {
++ struct option_state *opt_state;
++ struct option_cache *oc;
++
++ /*
++ * If we are looking for the unicast option for the first time
++ */
++ if (unicast_option_parsed == ISC_FALSE) {
++ unicast_option_parsed = ISC_TRUE;
++ opt_state = NULL;
++ if (!option_state_allocate(&opt_state, MDL)) {
++ log_fatal("No memory for option state.");
++ }
++
++ execute_statements_in_scope(NULL, NULL, NULL, NULL, NULL,
++ opt_state, &global_scope, root_group, NULL);
++
++ oc = lookup_option(&dhcpv6_universe, opt_state, D6O_UNICAST);
++ unicast_option_defined = (oc != NULL);
++
++ option_state_dereference(&opt_state, MDL);
++ }
++
++ return (unicast_option_defined);
++}
++
++/*
+ * Get the client identifier from the packet.
+ */
+ isc_result_t
+@@ -1404,6 +1446,56 @@ lease_to_client(struct data_string *repl
+ reply.shared->group);
+ }
+
++ /* reject unicast message, unless we set unicast option */
++ if ((packet->unicast == ISC_TRUE) && !is_unicast_option_defined())
++ /*
++ * RFC3315 section 18.2.1 (Request):
++ *
++ * When the server receives a Request message via unicast from a client
++ * to which the server has not sent a unicast option, the server
++ * discards the Request message and responds with a Reply message
++ * containing a Status Code option with the value UseMulticast, a Server
++ * Identifier option containing the server's DUID, the Client Identifier
++ * option from the client message, and no other options.
++ *
++ * Section 18.2.3 (Renew):
++ *
++ * When the server receives a Renew message via unicast from a client to
++ * which the server has not sent a unicast option, the server discards
++ * the Renew message and responds with a Reply message containing a
++ * Status Code option with the value UseMulticast, a Server Identifier
++ * option containing the server's DUID, the Client Identifier option
++ * from the client message, and no other options.
++ */
++ {
++ /* Set the UseMulticast status code. */
++ if (!set_status_code(STATUS_UseMulticast,
++ "Unicast not allowed by server.",
++ reply.opt_state)) {
++ log_error("lease_to_client: Unable to set "
++ "UseMulticast status code.");
++ goto exit;
++ }
++
++ /* Rewind the cursor to the start. */
++ reply.cursor = REPLY_OPTIONS_INDEX;
++
++ /*
++ * Produce an reply that includes only:
++ *
++ * Status code.
++ * Server DUID.
++ * Client DUID.
++ */
++ reply.cursor += store_options6((char *)reply.buf.data +
++ reply.cursor,
++ sizeof(reply.buf) -
++ reply.cursor,
++ reply.opt_state, reply.packet,
++ required_opts_NAA,
++ NULL);
++ }
++
+ /*
+ * RFC3315 section 17.2.2 (Solicit):
+ *
+@@ -1429,8 +1521,8 @@ lease_to_client(struct data_string *repl
+ * Sends a Renew/Rebind if the IA is not in the Reply message.
+ */
+ #if defined (RFC3315_PRE_ERRATA_2010_08)
+- if (no_resources_avail && (reply.ia_count != 0) &&
+- (reply.packet->dhcpv6_msg_type == DHCPV6_SOLICIT))
++ else if (no_resources_avail && (reply.ia_count != 0) &&
++ (reply.packet->dhcpv6_msg_type == DHCPV6_SOLICIT))
+ {
+ /* Set the NoAddrsAvail status code. */
+ if (!set_status_code(STATUS_NoAddrsAvail,
+@@ -1477,6 +1569,7 @@ lease_to_client(struct data_string *repl
+ * Having stored the client's IA's, store any options that
+ * will fit in the remaining space.
+ */
++ else
+ reply.cursor += store_options6((char *)reply.buf.data + reply.cursor,
+ sizeof(reply.buf) - reply.cursor,
+ reply.opt_state, reply.packet,
+@@ -4126,7 +4219,6 @@ dhcpv6_solicit(struct data_string *reply
+ * Very similar to Solicit handling, except the server DUID is required.
+ */
+
+-/* TODO: reject unicast messages, unless we set unicast option */
+ static void
+ dhcpv6_request(struct data_string *reply_ret, struct packet *packet) {
+ struct data_string client_id;
+@@ -4456,7 +4548,6 @@ exit:
+ * except for the error code of when addresses don't match.
+ */
+
+-/* TODO: reject unicast messages, unless we set unicast option */
+ static void
+ dhcpv6_renew(struct data_string *reply, struct packet *packet) {
+ struct data_string client_id;
+@@ -4700,18 +4791,60 @@ iterate_over_ia_na(struct data_string *r
+ goto exit;
+ }
+
+- snprintf(status_msg, sizeof(status_msg), "%s received.", packet_type);
+- if (!set_status_code(STATUS_Success, status_msg, opt_state)) {
+- goto exit;
+- }
++ /* reject unicast message, unless we set unicast option */
++ if ((packet->unicast == ISC_TRUE) && !is_unicast_option_defined()) {
++ /*
++ * RFC3315 section 18.2.6 (Release):
++ *
++ * When the server receives a Release message via unicast from a client
++ * to which the server has not sent a unicast option, the server
++ * discards the Release message and responds with a Reply message
++ * containing a Status Code option with value UseMulticast, a Server
++ * Identifier option containing the server's DUID, the Client Identifier
++ * option from the client message, and no other options.
++ *
++ * Section 18.2.7 (Decline):
++ *
++ * When the server receives a Decline message via unicast from a client
++ * to which the server has not sent a unicast option, the server
++ * discards the Decline message and responds with a Reply message
++ * containing a Status Code option with the value UseMulticast, a Server
++ * Identifier option containing the server's DUID, the Client Identifier
++ * option from the client message, and no other options.
++ */
++ snprintf(status_msg, sizeof(status_msg),
++ "%s received unicast.", packet_type);
++ if (!set_status_code(STATUS_UseMulticast, status_msg, opt_state)) {
++ goto exit;
++ }
+
+- /*
+- * Add our options that are not associated with any IA_NA or IA_TA.
+- */
+- reply_ofs += store_options6(reply_data+reply_ofs,
+- sizeof(reply_data)-reply_ofs,
++ /*
++ * Produce an reply that includes only:
++ *
++ * Status code.
++ * Server DUID.
++ * Client DUID.
++ */
++ reply_ofs += store_options6(reply_data+reply_ofs,
++ sizeof(reply_data)-reply_ofs,
+ opt_state, packet,
+- required_opts, NULL);
++ required_opts_NAA, NULL);
++
++ goto return_reply;
++ } else {
++ snprintf(status_msg, sizeof(status_msg), "%s received.", packet_type);
++ if (!set_status_code(STATUS_Success, status_msg, opt_state)) {
++ goto exit;
++ }
++
++ /*
++ * Add our options that are not associated with any IA_NA or IA_TA.
++ */
++ reply_ofs += store_options6(reply_data+reply_ofs,
++ sizeof(reply_data)-reply_ofs,
++ opt_state, packet,
++ required_opts, NULL);
++ }
+
+ /*
+ * Loop through the IA_NA reported by the client, and deal with
+@@ -4849,6 +4982,7 @@ iterate_over_ia_na(struct data_string *r
+ /*
+ * Return our reply to the caller.
+ */
++return_reply:
+ reply_ret->len = reply_ofs;
+ reply_ret->buffer = NULL;
+ if (!buffer_allocate(&reply_ret->buffer, reply_ofs, MDL)) {
+@@ -4894,7 +5028,6 @@ exit:
+ * we still need to be aware of this possibility.
+ */
+
+-/* TODO: reject unicast messages, unless we set unicast option */
+ /* TODO: IA_TA */
+ static void
+ dhcpv6_decline(struct data_string *reply, struct packet *packet) {
+@@ -5364,7 +5497,6 @@ exit:
+ * Release means a client is done with the leases.
+ */
+
+-/* TODO: reject unicast messages, unless we set unicast option */
+ static void
+ dhcpv6_release(struct data_string *reply, struct packet *packet) {
+ struct data_string client_id;
diff --git a/dhcp/patches/dhcp-4.2.4-failOverPeer.patch b/dhcp/patches/dhcp-4.2.4-failOverPeer.patch
new file mode 100644
index 0000000..1b0da7e
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.4-failOverPeer.patch
@@ -0,0 +1,12 @@
+diff -up dhcp-4.2.4/server/ldap.c.failOverPeer dhcp-4.2.4/server/ldap.c
+--- dhcp-4.2.4/server/ldap.c.failOverPeer 2012-07-23 12:53:26.815262322 +0200
++++ dhcp-4.2.4/server/ldap.c 2012-07-23 12:54:31.002119299 +0200
+@@ -893,7 +893,7 @@ ldap_start (void)
+ static void
+ parse_external_dns (LDAPMessage * ent)
+ {
+- char *search[] = {"dhcpOptionsDN", "dhcpSharedNetworkDN", "dhcpSubnetDN",
++ char *search[] = {"dhcpFailOverPeerDN", "dhcpOptionsDN", "dhcpSharedNetworkDN", "dhcpSubnetDN",
+ "dhcpGroupDN", "dhcpHostDN", "dhcpClassesDN",
+ "dhcpPoolDN", NULL};
+ LDAPMessage * newres, * newent;
diff --git a/dhcp/patches/dhcp-4.2.4-getifaddrs.patch b/dhcp/patches/dhcp-4.2.4-getifaddrs.patch
new file mode 100644
index 0000000..fe22da0
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.4-getifaddrs.patch
@@ -0,0 +1,431 @@
+diff -up dhcp-4.2.4rc2/common/discover.c.getifaddrs dhcp-4.2.4rc2/common/discover.c
+--- dhcp-4.2.4rc2/common/discover.c.getifaddrs 2012-05-25 18:05:29.592024035 +0200
++++ dhcp-4.2.4rc2/common/discover.c 2012-05-25 18:12:05.254266023 +0200
+@@ -379,394 +379,13 @@ end_iface_scan(struct iface_conf_list *i
+ ifaces->sock = -1;
+ }
+
+-#elif __linux /* !HAVE_SIOCGLIFCONF */
+-/*
+- * Linux support
+- * -------------
+- *
+- * In Linux, we use the /proc pseudo-filesystem to get information
+- * about interfaces, along with selected ioctl() calls.
+- *
+- * Linux low level access is documented in the netdevice man page.
+- */
+-
+-/*
+- * Structure holding state about the scan.
+- */
+-struct iface_conf_list {
+- int sock; /* file descriptor used to get information */
+- FILE *fp; /* input from /proc/net/dev */
+-#ifdef DHCPv6
+- FILE *fp6; /* input from /proc/net/if_inet6 */
+-#endif
+-};
+-
+-/*
+- * Structure used to return information about a specific interface.
+- */
+-struct iface_info {
+- char name[IFNAMSIZ]; /* name of the interface, e.g. "eth0" */
+- struct sockaddr_storage addr; /* address information */
+- isc_uint64_t flags; /* interface flags, e.g. IFF_LOOPBACK */
+-};
+-
+-/*
+- * Start a scan of interfaces.
+- *
+- * The iface_conf_list structure maintains state for this process.
+- */
+-int
+-begin_iface_scan(struct iface_conf_list *ifaces) {
+- char buf[256];
+- int len;
+- int i;
+-
+- ifaces->fp = fopen("/proc/net/dev", "re");
+- if (ifaces->fp == NULL) {
+- log_error("Error opening '/proc/net/dev' to list interfaces");
+- return 0;
+- }
+-
+- /*
+- * The first 2 lines are header information, so read and ignore them.
+- */
+- for (i=0; i<2; i++) {
+- if (fgets(buf, sizeof(buf), ifaces->fp) == NULL) {
+- log_error("Error reading headers from '/proc/net/dev'");
+- fclose(ifaces->fp);
+- ifaces->fp = NULL;
+- return 0;
+- }
+- len = strlen(buf);
+- if ((len <= 0) || (buf[len-1] != '\n')) {
+- log_error("Bad header line in '/proc/net/dev'");
+- fclose(ifaces->fp);
+- ifaces->fp = NULL;
+- return 0;
+- }
+- }
+-
+- ifaces->sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+- if (ifaces->sock < 0) {
+- log_error("Error creating socket to list interfaces; %m");
+- fclose(ifaces->fp);
+- ifaces->fp = NULL;
+- return 0;
+- }
+-
+-#ifdef DHCPv6
+- if ((local_family == AF_INET6) && !access("/proc/net/if_inet6", R_OK)) {
+- ifaces->fp6 = fopen("/proc/net/if_inet6", "re");
+- if (ifaces->fp6 == NULL) {
+- log_error("Error opening '/proc/net/if_inet6' to "
+- "list IPv6 interfaces; %m");
+- close(ifaces->sock);
+- ifaces->sock = -1;
+- fclose(ifaces->fp);
+- ifaces->fp = NULL;
+- return 0;
+- }
+- } else {
+- ifaces->fp6 = NULL;
+- }
+-#endif
+-
+- return 1;
+-}
+-
+-/*
+- * Read our IPv4 interfaces from /proc/net/dev.
+- *
+- * The file looks something like this:
+- *
+- * Inter-| Receive ...
+- * face |bytes packets errs drop fifo frame ...
+- * lo: 1580562 4207 0 0 0 0 ...
+- * eth0: 0 0 0 0 0 0 ...
+- * eth1:1801552440 37895 0 14 0 ...
+- *
+- * We only care about the interface name, which is at the start of
+- * each line.
+- *
+- * We use an ioctl() to get the address and flags for each interface.
+- */
+-static int
+-next_iface4(struct iface_info *info, int *err, struct iface_conf_list *ifaces) {
+- char buf[256];
+- int len;
+- char *p;
+- char *name;
+- struct ifreq tmp;
+-
+- /*
+- * Loop exits when we find an interface that has an address, or
+- * when we run out of interfaces.
+- */
+- for (;;) {
+- do {
+- /*
+- * Read the next line in the file.
+- */
+- if (fgets(buf, sizeof(buf), ifaces->fp) == NULL) {
+- if (ferror(ifaces->fp)) {
+- *err = 1;
+- log_error("Error reading interface "
+- "information");
+- } else {
+- *err = 0;
+- }
+- return 0;
+- }
+-
+- /*
+- * Make sure the line is a nice,
+- * newline-terminated line.
+- */
+- len = strlen(buf);
+- if ((len <= 0) || (buf[len-1] != '\n')) {
+- log_error("Bad line reading interface "
+- "information");
+- *err = 1;
+- return 0;
+- }
+-
+- /*
+- * Figure out our name.
+- */
+- p = strrchr(buf, ':');
+- if (p == NULL) {
+- log_error("Bad line reading interface "
+- "information (no colon)");
+- *err = 1;
+- return 0;
+- }
+- *p = '\0';
+- name = buf;
+- while (isspace(*name)) {
+- name++;
+- }
+-
+- /*
+- * Copy our name into our interface structure.
+- */
+- len = p - name;
+- if (len >= sizeof(info->name)) {
+- *err = 1;
+- log_error("Interface name '%s' too long", name);
+- return 0;
+- }
+- strcpy(info->name, name);
+-
+-#ifdef ALIAS_NAMED_PERMUTED
+- /* interface aliases look like "eth0:1" or "wlan1:3" */
+- s = strchr(info->name, ':');
+- if (s != NULL) {
+- *s = '\0';
+- }
+-#endif
+-
+-#ifdef SKIP_DUMMY_INTERFACES
+- } while (strncmp(info->name, "dummy", 5) == 0);
+-#else
+- } while (0);
+-#endif
+-
+- memset(&tmp, 0, sizeof(tmp));
+- strcpy(tmp.ifr_name, name);
+- if (ioctl(ifaces->sock, SIOCGIFADDR, &tmp) < 0) {
+- if (errno == EADDRNOTAVAIL) {
+- continue;
+- }
+- log_error("Error getting interface address "
+- "for '%s'; %m", name);
+- *err = 1;
+- return 0;
+- }
+- memcpy(&info->addr, &tmp.ifr_addr, sizeof(tmp.ifr_addr));
+-
+- memset(&tmp, 0, sizeof(tmp));
+- strcpy(tmp.ifr_name, name);
+- if (ioctl(ifaces->sock, SIOCGIFFLAGS, &tmp) < 0) {
+- log_error("Error getting interface flags for '%s'; %m",
+- name);
+- *err = 1;
+- return 0;
+- }
+- info->flags = tmp.ifr_flags;
+-
+- *err = 0;
+- return 1;
+- }
+-}
+-
+-#ifdef DHCPv6
+-/*
+- * Read our IPv6 interfaces from /proc/net/if_inet6.
+- *
+- * The file looks something like this:
+- *
+- * fe80000000000000025056fffec00008 05 40 20 80 vmnet8
+- * 00000000000000000000000000000001 01 80 10 80 lo
+- * fe80000000000000025056fffec00001 06 40 20 80 vmnet1
+- * 200108881936000202166ffffe497d9b 03 40 00 00 eth1
+- * fe8000000000000002166ffffe497d9b 03 40 20 80 eth1
+- *
+- * We get IPv6 address from the start, the interface name from the end,
+- * and ioctl() to get flags.
+- */
+-static int
+-next_iface6(struct iface_info *info, int *err, struct iface_conf_list *ifaces) {
+- char buf[256];
+- int len;
+- char *p;
+- char *name;
+- int i;
+- struct sockaddr_in6 addr;
+- struct ifreq tmp;
+-
+- do {
+- /*
+- * Read the next line in the file.
+- */
+- if (fgets(buf, sizeof(buf), ifaces->fp6) == NULL) {
+- if (ferror(ifaces->fp6)) {
+- *err = 1;
+- log_error("Error reading IPv6 "
+- "interface information");
+- } else {
+- *err = 0;
+- }
+- return 0;
+- }
+-
+- /*
+- * Make sure the line is a nice, newline-terminated line.
+- */
+- len = strlen(buf);
+- if ((len <= 0) || (buf[len-1] != '\n')) {
+- log_error("Bad line reading IPv6 "
+- "interface information");
+- *err = 1;
+- return 0;
+- }
+-
+- /*
+- * Figure out our name.
+- */
+- buf[--len] = '\0';
+- p = strrchr(buf, ' ');
+- if (p == NULL) {
+- log_error("Bad line reading IPv6 interface "
+- "information (no space)");
+- *err = 1;
+- return 0;
+- }
+- name = p+1;
+-
+- /*
+- * Copy our name into our interface structure.
+- */
+- len = strlen(name);
+- if (len >= sizeof(info->name)) {
+- *err = 1;
+- log_error("IPv6 interface name '%s' too long", name);
+- return 0;
+- }
+- strcpy(info->name, name);
+-
+-#ifdef SKIP_DUMMY_INTERFACES
+- } while (strncmp(info->name, "dummy", 5) == 0);
+-#else
+- } while (0);
+-#endif
+-
+- /*
+- * Double-check we start with the IPv6 address.
+- */
+- for (i=0; i<32; i++) {
+- if (!isxdigit(buf[i]) || isupper(buf[i])) {
+- *err = 1;
+- log_error("Bad line reading IPv6 interface address "
+- "for '%s'", name);
+- return 0;
+- }
+- }
+-
+- /*
+- * Load our socket structure.
+- */
+- memset(&addr, 0, sizeof(addr));
+- addr.sin6_family = AF_INET6;
+- for (i=0; i<16; i++) {
+- unsigned char byte;
+- static const char hex[] = "0123456789abcdef";
+- byte = ((index(hex, buf[i * 2]) - hex) << 4) |
+- (index(hex, buf[i * 2 + 1]) - hex);
+- addr.sin6_addr.s6_addr[i] = byte;
+- }
+- memcpy(&info->addr, &addr, sizeof(addr));
+-
+- /*
+- * Get our flags.
+- */
+- memset(&tmp, 0, sizeof(tmp));
+- strcpy(tmp.ifr_name, name);
+- if (ioctl(ifaces->sock, SIOCGIFFLAGS, &tmp) < 0) {
+- log_error("Error getting interface flags for '%s'; %m", name);
+- *err = 1;
+- return 0;
+- }
+- info->flags = tmp.ifr_flags;
+-
+- *err = 0;
+- return 1;
+-}
+-#endif /* DHCPv6 */
+-
+-/*
+- * Retrieve the next interface.
+- *
+- * Returns information in the info structure.
+- * Sets err to 1 if there is an error, otherwise 0.
+- */
+-int
+-next_iface(struct iface_info *info, int *err, struct iface_conf_list *ifaces) {
+- if (next_iface4(info, err, ifaces)) {
+- return 1;
+- }
+-#ifdef DHCPv6
+- if (!(*err) && ifaces->fp6) {
+- if (local_family == AF_INET6)
+- return next_iface6(info, err, ifaces);
+- }
+-#endif
+- return 0;
+-}
+-
+-/*
+- * End scan of interfaces.
+- */
+-void
+-end_iface_scan(struct iface_conf_list *ifaces) {
+- fclose(ifaces->fp);
+- ifaces->fp = NULL;
+- close(ifaces->sock);
+- ifaces->sock = -1;
+-#ifdef DHCPv6
+- if (local_family == AF_INET6) {
+- if (ifaces->fp6)
+- fclose(ifaces->fp6);
+- ifaces->fp6 = NULL;
+- }
+-#endif
+-}
+ #else
+
+ /*
+ * BSD support
+ * -----------
+ *
+- * FreeBSD, NetBSD, OpenBSD, and OS X all have the getifaddrs()
++ * FreeBSD, NetBSD, OpenBSD, OS X and Linux all have the getifaddrs()
+ * function.
+ *
+ * The getifaddrs() man page describes the use.
+@@ -814,6 +433,8 @@ begin_iface_scan(struct iface_conf_list
+ */
+ int
+ next_iface(struct iface_info *info, int *err, struct iface_conf_list *ifaces) {
++ size_t sa_len = 0;
++
+ if (ifaces->next == NULL) {
+ *err = 0;
+ return 0;
+@@ -825,8 +446,20 @@ next_iface(struct iface_info *info, int
+ return 0;
+ }
+ strcpy(info->name, ifaces->next->ifa_name);
+- memcpy(&info->addr, ifaces->next->ifa_addr,
+- ifaces->next->ifa_addr->sa_len);
++
++ memset(&info->addr, 0 , sizeof(info->addr));
++
++ if (ifaces->next->ifa_addr != NULL) {
++#ifdef HAVE_SA_LEN
++ sa_len = ifaces->next->ifa_addr->sa_len;
++#else
++ if (ifaces->next->ifa_addr->sa_family == AF_INET)
++ sa_len = sizeof(struct sockaddr_in);
++ else if (ifaces->next->ifa_addr->sa_family == AF_INET6)
++ sa_len = sizeof(struct sockaddr_in6);
++#endif
++ memcpy(&info->addr, ifaces->next->ifa_addr, sa_len);
++ }
+ info->flags = ifaces->next->ifa_flags;
+ ifaces->next = ifaces->next->ifa_next;
+ *err = 0;
diff --git a/dhcp/patches/dhcp-4.2.4-improved-xid.patch b/dhcp/patches/dhcp-4.2.4-improved-xid.patch
new file mode 100644
index 0000000..f353fb0
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.4-improved-xid.patch
@@ -0,0 +1,138 @@
+diff -up dhcp-4.2.4b1/client/dhclient.c.improved-xid dhcp-4.2.4b1/client/dhclient.c
+--- dhcp-4.2.4b1/client/dhclient.c.improved-xid 2012-04-16 17:42:37.444217424 +0200
++++ dhcp-4.2.4b1/client/dhclient.c 2012-04-16 17:45:32.105770755 +0200
+@@ -888,6 +888,26 @@ main(int argc, char **argv) {
+ }
+ }
+
++ /* We create a backup seed before rediscovering interfaces in order to
++ have a seed built using all of the available interfaces
++ It's interesting if required interfaces doesn't let us defined
++ a really unique seed due to a lack of valid HW addr later
++ (this is the case with DHCP over IB)
++ We only use the last device as using a sum could broke the
++ uniqueness of the seed among multiple nodes
++ */
++ unsigned backup_seed = 0;
++ for (ip = interfaces; ip; ip = ip -> next) {
++ int junk;
++ if ( ip -> hw_address.hlen <= sizeof seed )
++ continue;
++ memcpy (&junk,
++ &ip -> hw_address.hbuf [ip -> hw_address.hlen -
++ sizeof seed], sizeof seed);
++ backup_seed = junk;
++ }
++
++
+ /* At this point, all the interfaces that the script thinks
+ are relevant should be running, so now we once again call
+ discover_interfaces(), and this time ask it to actually set
+@@ -902,14 +922,36 @@ main(int argc, char **argv) {
+ Not much entropy, but we're booting, so we're not likely to
+ find anything better. */
+ seed = 0;
++ int seed_flag = 0;
+ for (ip = interfaces; ip; ip = ip->next) {
+ int junk;
++ if ( ip -> hw_address.hlen <= sizeof seed )
++ continue;
+ memcpy(&junk,
+ &ip->hw_address.hbuf[ip->hw_address.hlen -
+ sizeof seed], sizeof seed);
+ seed += junk;
++ seed_flag = 1;
+ }
+- srandom(seed + cur_time + (unsigned)getpid());
++ if ( seed_flag == 0 ) {
++ if ( backup_seed != 0 ) {
++ seed = backup_seed;
++ log_info ("xid: rand init seed (0x%x) built using all"
++ " available interfaces",seed);
++ }
++ else {
++ seed = cur_time^((unsigned) gethostid()) ;
++ log_info ("xid: warning: no netdev with useable HWADDR found"
++ " for seed's uniqueness enforcement");
++ log_info ("xid: rand init seed (0x%x) built using gethostid",
++ seed);
++ }
++ /* we only use seed and no current time as a broadcast reply */
++ /* will certainly be used by the hwaddrless interface */
++ srandom(seed);
++ }
++ else
++ srandom(seed + cur_time + (unsigned)getpid());
+
+ /* Setup specific Infiniband options */
+ for (ip = interfaces; ip; ip = ip->next) {
+@@ -1447,7 +1489,7 @@ void dhcpack (packet)
+ return;
+ }
+
+- log_info ("DHCPACK from %s", piaddr (packet -> client_addr));
++ log_info ("DHCPACK from %s (xid=0x%x)", piaddr (packet -> client_addr), client -> xid);
+
+ lease = packet_to_lease (packet, client);
+ if (!lease) {
+@@ -2164,7 +2206,7 @@ void dhcpnak (packet)
+ return;
+ }
+
+- log_info ("DHCPNAK from %s", piaddr (packet -> client_addr));
++ log_info ("DHCPNAK from %s (xid=0x%x)", piaddr (packet -> client_addr), client -> xid);
+
+ if (!client -> active) {
+ #if defined (DEBUG)
+@@ -2290,10 +2332,10 @@ void send_discover (cpp)
+ client -> packet.secs = htons (65535);
+ client -> secs = client -> packet.secs;
+
+- log_info ("DHCPDISCOVER on %s to %s port %d interval %ld",
++ log_info ("DHCPDISCOVER on %s to %s port %d interval %ld (xid=0x%x)",
+ client -> name ? client -> name : client -> interface -> name,
+ inet_ntoa (sockaddr_broadcast.sin_addr),
+- ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval));
++ ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval), client -> xid);
+
+ /* Send out a packet. */
+ result = send_packet(client->interface, NULL, &client->packet,
+@@ -2577,10 +2619,10 @@ void send_request (cpp)
+ client -> packet.secs = htons (65535);
+ }
+
+- log_info ("DHCPREQUEST on %s to %s port %d",
++ log_info ("DHCPREQUEST on %s to %s port %d (xid=0x%x)",
+ client -> name ? client -> name : client -> interface -> name,
+ inet_ntoa (destination.sin_addr),
+- ntohs (destination.sin_port));
++ ntohs (destination.sin_port), client -> xid);
+
+ if (destination.sin_addr.s_addr != INADDR_BROADCAST &&
+ fallback_interface) {
+@@ -2620,10 +2662,10 @@ void send_decline (cpp)
+
+ int result;
+
+- log_info ("DHCPDECLINE on %s to %s port %d",
++ log_info ("DHCPDECLINE on %s to %s port %d (xid=0x%x)",
+ client->name ? client->name : client->interface->name,
+ inet_ntoa(sockaddr_broadcast.sin_addr),
+- ntohs(sockaddr_broadcast.sin_port));
++ ntohs(sockaddr_broadcast.sin_port), client -> xid);
+
+ /* Send out a packet. */
+ result = send_packet(client->interface, NULL, &client->packet,
+@@ -2666,10 +2708,10 @@ void send_release (cpp)
+ return;
+ }
+
+- log_info ("DHCPRELEASE on %s to %s port %d",
++ log_info ("DHCPRELEASE on %s to %s port %d (xid=0x%x)",
+ client -> name ? client -> name : client -> interface -> name,
+ inet_ntoa (destination.sin_addr),
+- ntohs (destination.sin_port));
++ ntohs (destination.sin_port), client -> xid);
+
+ if (fallback_interface) {
+ result = send_packet(fallback_interface, NULL, &client->packet,
diff --git a/dhcp/patches/dhcp-4.2.4-lpf-ib.patch b/dhcp/patches/dhcp-4.2.4-lpf-ib.patch
new file mode 100644
index 0000000..abf7af9
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.4-lpf-ib.patch
@@ -0,0 +1,549 @@
+diff -up dhcp-4.2.4/client/dhclient.c.lpf-ib dhcp-4.2.4/client/dhclient.c
+--- dhcp-4.2.4/client/dhclient.c.lpf-ib 2012-07-18 21:08:48.100835005 +0200
++++ dhcp-4.2.4/client/dhclient.c 2012-07-18 21:08:48.111834856 +0200
+@@ -113,6 +113,8 @@ static int check_domain_name_list(const
+ static int check_option_values(struct universe *universe, unsigned int opt,
+ const char *ptr, size_t len);
+
++static void setup_ib_interface(struct interface_info *ip);
++
+ int
+ main(int argc, char **argv) {
+ int fd;
+@@ -909,6 +911,14 @@ main(int argc, char **argv) {
+ }
+ srandom(seed + cur_time + (unsigned)getpid());
+
++ /* Setup specific Infiniband options */
++ for (ip = interfaces; ip; ip = ip->next) {
++ if (ip->client &&
++ (ip->hw_address.hbuf[0] == HTYPE_INFINIBAND)) {
++ setup_ib_interface(ip);
++ }
++ }
++
+ /* Start a configuration state machine for each interface. */
+ #ifdef DHCPv6
+ if (local_family == AF_INET6) {
+@@ -1185,6 +1195,29 @@ int find_subnet (struct subnet **sp,
+ return 0;
+ }
+
++static void setup_ib_interface(struct interface_info *ip)
++{
++ struct group *g;
++
++ /* Set the broadcast flag */
++ ip->client->config->bootp_broadcast_always = 1;
++
++ /*
++ * Find out if a dhcp-client-identifier option was specified either
++ * in the config file or on the command line
++ */
++ for (g = ip->client->config->on_transmission; g != NULL; g = g->next) {
++ if ((g->statements != NULL) &&
++ (strcmp(g->statements->data.option->option->name,
++ "dhcp-client-identifier") == 0)) {
++ return;
++ }
++ }
++
++ /* No client ID specified */
++ log_fatal("dhcp-client-identifier must be specified for InfiniBand");
++}
++
+ /* Individual States:
+ *
+ * Each routine is called from the dhclient_state_machine() in one of
+diff -up dhcp-4.2.4/common/bpf.c.lpf-ib dhcp-4.2.4/common/bpf.c
+--- dhcp-4.2.4/common/bpf.c.lpf-ib 2012-07-18 21:08:48.101834991 +0200
++++ dhcp-4.2.4/common/bpf.c 2012-07-18 21:08:48.111834856 +0200
+@@ -198,11 +198,44 @@ struct bpf_insn dhcp_bpf_filter [] = {
+ BPF_STMT(BPF_RET+BPF_K, 0),
+ };
+
++/* Packet filter program for DHCP over Infiniband.
++ *
++ * XXX
++ * Changes to the filter program may require changes to the constant offsets
++ * used in lpf_gen_filter_setup to patch the port in the BPF program!
++ * XXX
++ */
++struct bpf_insn dhcp_ib_bpf_filter [] = {
++ /* Packet filter for Infiniband */
++ /* Make sure it's a UDP packet... */
++ BPF_STMT(BPF_LD + BPF_B + BPF_ABS, 9),
++ BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, IPPROTO_UDP, 0, 6),
++
++ /* Make sure this isn't a fragment... */
++ BPF_STMT(BPF_LD + BPF_H + BPF_ABS, 6),
++ BPF_JUMP(BPF_JMP + BPF_JSET + BPF_K, 0x1fff, 4, 0),
++
++ /* Get the IP header length... */
++ BPF_STMT(BPF_LDX + BPF_B + BPF_MSH, 0),
++
++ /* Make sure it's to the right port... */
++ BPF_STMT(BPF_LD + BPF_H + BPF_IND, 2),
++ BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 67, 0, 1),
++
++ /* If we passed all the tests, ask for the whole packet. */
++ BPF_STMT(BPF_RET + BPF_K, (u_int)-1),
++
++ /* Otherwise, drop it. */
++ BPF_STMT(BPF_RET + BPF_K, 0),
++};
++
+ #if defined (DEC_FDDI)
+ struct bpf_insn *bpf_fddi_filter;
+ #endif
+
+ int dhcp_bpf_filter_len = sizeof dhcp_bpf_filter / sizeof (struct bpf_insn);
++int dhcp_ib_bpf_filter_len = sizeof dhcp_ib_bpf_filter / sizeof (struct bpf_insn);
++
+ #if defined (HAVE_TR_SUPPORT)
+ struct bpf_insn dhcp_bpf_tr_filter [] = {
+ /* accept all token ring packets due to variable length header */
+diff -up dhcp-4.2.4/common/lpf.c.lpf-ib dhcp-4.2.4/common/lpf.c
+--- dhcp-4.2.4/common/lpf.c.lpf-ib 2012-07-18 21:08:48.101834991 +0200
++++ dhcp-4.2.4/common/lpf.c 2012-07-18 21:10:47.367210799 +0200
+@@ -42,6 +42,7 @@
+ #include "includes/netinet/udp.h"
+ #include "includes/netinet/if_ether.h"
+ #include <net/if.h>
++#include <ifaddrs.h>
+
+ #ifndef PACKET_AUXDATA
+ #define PACKET_AUXDATA 8
+@@ -59,6 +60,15 @@ struct tpacket_auxdata
+ /* Reinitializes the specified interface after an address change. This
+ is not required for packet-filter APIs. */
+
++/* Default broadcast address for IPoIB */
++static unsigned char default_ib_bcast_addr[20] = {
++ 0x00, 0xff, 0xff, 0xff,
++ 0xff, 0x12, 0x40, 0x1b,
++ 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00,
++ 0xff, 0xff, 0xff, 0xff
++};
++
+ #ifdef USE_LPF_SEND
+ void if_reinitialize_send (info)
+ struct interface_info *info;
+@@ -86,10 +96,21 @@ int if_register_lpf (info)
+ struct sockaddr common;
+ } sa;
+ struct ifreq ifr;
++ int type;
++ int protocol;
+
+ /* Make an LPF socket. */
+- if ((sock = socket(PF_PACKET, SOCK_RAW,
+- htons((short)ETH_P_ALL))) < 0) {
++ get_hw_addr(info);
++
++ if (info->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
++ type = SOCK_DGRAM;
++ protocol = ETHERTYPE_IP;
++ } else {
++ type = SOCK_RAW;
++ protocol = ETH_P_ALL;
++ }
++
++ if ((sock = socket(PF_PACKET, type, htons((short)protocol))) < 0) {
+ if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+ errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
+ errno == EAFNOSUPPORT || errno == EINVAL) {
+@@ -112,6 +133,7 @@ int if_register_lpf (info)
+ /* Bind to the interface name */
+ memset (&sa, 0, sizeof sa);
+ sa.ll.sll_family = AF_PACKET;
++ sa.ll.sll_protocol = htons(protocol);
+ sa.ll.sll_ifindex = ifr.ifr_ifindex;
+ if (bind (sock, &sa.common, sizeof sa)) {
+ if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+@@ -127,8 +149,6 @@ int if_register_lpf (info)
+ log_fatal ("Bind socket to interface: %m");
+ }
+
+- get_hw_addr(info->name, &info->hw_address);
+-
+ return sock;
+ }
+ #endif /* USE_LPF_SEND || USE_LPF_RECEIVE */
+@@ -183,6 +203,8 @@ void if_deregister_send (info)
+ in bpf includes... */
+ extern struct sock_filter dhcp_bpf_filter [];
+ extern int dhcp_bpf_filter_len;
++extern struct sock_filter dhcp_ib_bpf_filter [];
++extern int dhcp_ib_bpf_filter_len;
+
+ #if defined (HAVE_TR_SUPPORT)
+ extern struct sock_filter dhcp_bpf_tr_filter [];
+@@ -200,11 +222,13 @@ void if_register_receive (info)
+ /* Open a LPF device and hang it on this interface... */
+ info -> rfdesc = if_register_lpf (info);
+
+- val = 1;
+- if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val,
+- sizeof val) < 0) {
+- if (errno != ENOPROTOOPT)
+- log_fatal ("Failed to set auxiliary packet data: %m");
++ if (info->hw_address.hbuf[0] != HTYPE_INFINIBAND) {
++ val = 1;
++ if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA,
++ &val, sizeof val) < 0) {
++ if (errno != ENOPROTOOPT)
++ log_fatal ("Failed to set auxiliary packet data: %m");
++ }
+ }
+
+ #if defined (HAVE_TR_SUPPORT)
+@@ -250,15 +274,28 @@ static void lpf_gen_filter_setup (info)
+
+ memset(&p, 0, sizeof(p));
+
+- /* Set up the bpf filter program structure. This is defined in
+- bpf.c */
+- p.len = dhcp_bpf_filter_len;
+- p.filter = dhcp_bpf_filter;
+-
+- /* Patch the server port into the LPF program...
+- XXX changes to filter program may require changes
+- to the insn number(s) used below! XXX */
+- dhcp_bpf_filter [8].k = ntohs ((short)local_port);
++ if (info->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
++ /* Set up the bpf filter program structure. */
++ p.len = dhcp_ib_bpf_filter_len;
++ p.filter = dhcp_ib_bpf_filter;
++
++ /* Patch the server port into the LPF program...
++ XXX
++ changes to filter program may require changes
++ to the insn number(s) used below!
++ XXX */
++ dhcp_ib_bpf_filter[6].k = ntohs ((short)local_port);
++ } else {
++ /* Set up the bpf filter program structure.
++ This is defined in bpf.c */
++ p.len = dhcp_bpf_filter_len;
++ p.filter = dhcp_bpf_filter;
++
++ /* Patch the server port into the LPF program...
++ XXX changes to filter program may require changes
++ to the insn number(s) used below! XXX */
++ dhcp_bpf_filter [8].k = ntohs ((short)local_port);
++ }
+
+ if (setsockopt (info -> rfdesc, SOL_SOCKET, SO_ATTACH_FILTER, &p,
+ sizeof p) < 0) {
+@@ -315,6 +352,54 @@ static void lpf_tr_filter_setup (info)
+ #endif /* USE_LPF_RECEIVE */
+
+ #ifdef USE_LPF_SEND
++ssize_t send_packet_ib(interface, packet, raw, len, from, to, hto)
++ struct interface_info *interface;
++ struct packet *packet;
++ struct dhcp_packet *raw;
++ size_t len;
++ struct in_addr from;
++ struct sockaddr_in *to;
++ struct hardware *hto;
++{
++ unsigned ibufp = 0;
++ double ih [1536 / sizeof (double)];
++ unsigned char *buf = (unsigned char *)ih;
++ ssize_t result;
++
++ union sockunion {
++ struct sockaddr sa;
++ struct sockaddr_ll sll;
++ struct sockaddr_storage ss;
++ } su;
++
++ assemble_udp_ip_header (interface, buf, &ibufp, from.s_addr,
++ to->sin_addr.s_addr, to->sin_port,
++ (unsigned char *)raw, len);
++ memcpy (buf + ibufp, raw, len);
++
++ memset(&su, 0, sizeof(su));
++ su.sll.sll_family = AF_PACKET;
++ su.sll.sll_protocol = htons(ETHERTYPE_IP);
++
++ if (!(su.sll.sll_ifindex = if_nametoindex(interface->name))) {
++ errno = ENOENT;
++ log_error ("send_packet_ib: %m - failed to get if index");
++ return -1;
++ }
++
++ su.sll.sll_hatype = htons(HTYPE_INFINIBAND);
++ su.sll.sll_halen = sizeof(interface->bcast_addr);
++ memcpy(&su.sll.sll_addr, interface->bcast_addr, 20);
++
++ result = sendto(interface->wfdesc, buf, ibufp + len, 0,
++ &su.sa, sizeof(su));
++
++ if (result < 0)
++ log_error ("send_packet_ib: %m");
++
++ return result;
++}
++
+ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
+ struct interface_info *interface;
+ struct packet *packet;
+@@ -335,6 +420,11 @@ ssize_t send_packet (interface, packet,
+ return send_fallback (interface, packet, raw,
+ len, from, to, hto);
+
++ if (interface->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
++ return send_packet_ib(interface, packet, raw, len, from,
++ to, hto);
++ }
++
+ if (hto == NULL && interface->anycast_mac_addr.hlen)
+ hto = &interface->anycast_mac_addr;
+
+@@ -356,6 +446,42 @@ ssize_t send_packet (interface, packet,
+ #endif /* USE_LPF_SEND */
+
+ #ifdef USE_LPF_RECEIVE
++ssize_t receive_packet_ib (interface, buf, len, from, hfrom)
++ struct interface_info *interface;
++ unsigned char *buf;
++ size_t len;
++ struct sockaddr_in *from;
++ struct hardware *hfrom;
++{
++ int length = 0;
++ int offset = 0;
++ unsigned char ibuf [1536];
++ unsigned bufix = 0;
++ unsigned paylen;
++
++ length = read(interface->rfdesc, ibuf, sizeof(ibuf));
++
++ if (length <= 0)
++ return length;
++
++ offset = decode_udp_ip_header(interface, ibuf, bufix, from,
++ (unsigned)length, &paylen, 0);
++
++ if (offset < 0)
++ return 0;
++
++ bufix += offset;
++ length -= offset;
++
++ if (length < paylen)
++ log_fatal("Internal inconsistency at %s:%d.", MDL);
++
++ /* Copy out the data in the packet... */
++ memcpy(buf, &ibuf[bufix], paylen);
++
++ return (ssize_t)paylen;
++}
++
+ ssize_t receive_packet (interface, buf, len, from, hfrom)
+ struct interface_info *interface;
+ unsigned char *buf;
+@@ -382,6 +508,10 @@ ssize_t receive_packet (interface, buf,
+ };
+ struct cmsghdr *cmsg;
+
++ if (interface->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
++ return receive_packet_ib(interface, buf, len, from, hfrom);
++ }
++
+ length = recvmsg (interface -> rfdesc, &msg, 0);
+ if (length <= 0)
+ return length;
+@@ -461,11 +591,32 @@ void maybe_setup_fallback ()
+ }
+ }
+
+-void
+-get_hw_addr(const char *name, struct hardware *hw) {
++struct sockaddr_ll *
++get_ll (struct ifaddrs *ifaddrs, struct ifaddrs **ifa, char *name)
++{
++ for (*ifa = ifaddrs; *ifa != NULL; *ifa = (*ifa)->ifa_next) {
++ if ((*ifa)->ifa_addr == NULL)
++ continue;
++
++ if ((*ifa)->ifa_addr->sa_family != AF_PACKET)
++ continue;
++
++ if ((*ifa)->ifa_flags & IFF_LOOPBACK)
++ continue;
++
++ if (strcmp((*ifa)->ifa_name, name) == 0)
++ return (struct sockaddr_ll *)(void *)(*ifa)->ifa_addr;
++ }
++ return NULL;
++}
++
++struct sockaddr_ll *
++ioctl_get_ll(char *name)
++{
+ int sock;
+ struct ifreq tmp;
+- struct sockaddr *sa;
++ struct sockaddr *sa = NULL;
++ struct sockaddr_ll *sll = NULL;
+
+ if (strlen(name) >= sizeof(tmp.ifr_name)) {
+ log_fatal("Device name too long: \"%s\"", name);
+@@ -479,16 +630,44 @@ get_hw_addr(const char *name, struct har
+ memset(&tmp, 0, sizeof(tmp));
+ strcpy(tmp.ifr_name, name);
+ if (ioctl(sock, SIOCGIFHWADDR, &tmp) < 0) {
+- log_fatal("Error getting hardware address for \"%s\": %m",
++ log_fatal("Error getting hardware address for \"%s\": %m",
+ name);
+ }
+
+ sa = &tmp.ifr_hwaddr;
+- switch (sa->sa_family) {
++ sll = dmalloc (sizeof (struct sockaddr_ll), MDL);
++ if (!sll)
++ log_fatal("Unable to allocate memory for link layer address");
++ memcpy(&sll->sll_hatype, &sa->sa_family, sizeof (sll->sll_hatype));
++ memcpy(sll->sll_addr, sa->sa_data, sizeof (sll->sll_addr));
++ return sll;
++}
++
++void
++get_hw_addr(struct interface_info *info)
++{
++ struct hardware *hw = &info->hw_address;
++ char *name = info->name;
++ struct ifaddrs *ifaddrs = NULL;
++ struct ifaddrs *ifa = NULL;
++ struct sockaddr_ll *sll = NULL;
++
++ if (getifaddrs(&ifaddrs) == -1)
++ log_fatal("Failed to get interfaces");
++
++ if ((sll = get_ll(ifaddrs, &ifa, name)) == NULL) {
++ /*
++ * We were unable to get link-layer address for name.
++ * Fall back to ioctl(SIOCGIFHWADDR).
++ */
++ sll = ioctl_get_ll(name);
++ }
++
++ switch (sll->sll_hatype) {
+ case ARPHRD_ETHER:
+ hw->hlen = 7;
+ hw->hbuf[0] = HTYPE_ETHER;
+- memcpy(&hw->hbuf[1], sa->sa_data, 6);
++ memcpy(&hw->hbuf[1], sll->sll_addr, 6);
+ break;
+ case ARPHRD_IEEE802:
+ #ifdef ARPHRD_IEEE802_TR
+@@ -496,18 +675,35 @@ get_hw_addr(const char *name, struct har
+ #endif /* ARPHRD_IEEE802_TR */
+ hw->hlen = 7;
+ hw->hbuf[0] = HTYPE_IEEE802;
+- memcpy(&hw->hbuf[1], sa->sa_data, 6);
++ memcpy(&hw->hbuf[1], sll->sll_addr, 6);
+ break;
+ case ARPHRD_FDDI:
+ hw->hlen = 17;
+ hw->hbuf[0] = HTYPE_FDDI;
+- memcpy(&hw->hbuf[1], sa->sa_data, 16);
++ memcpy(&hw->hbuf[1], sll->sll_addr, 16);
++ break;
++ case ARPHRD_INFINIBAND:
++ /* For Infiniband, save the broadcast address and store
++ * the port GUID into the hardware address.
++ */
++ if (ifa->ifa_flags & IFF_BROADCAST) {
++ struct sockaddr_ll *bll;
++
++ bll = (struct sockaddr_ll *)ifa->ifa_broadaddr;
++ memcpy(&info->bcast_addr, bll->sll_addr, 20);
++ } else {
++ memcpy(&info->bcast_addr, default_ib_bcast_addr,
++ 20);
++ }
++
++ hw->hlen = 1;
++ hw->hbuf[0] = HTYPE_INFINIBAND;
+ break;
+ #if defined(ARPHRD_PPP)
+ case ARPHRD_PPP:
+ if (local_family != AF_INET6)
+- log_fatal("Unsupported device type %d for \"%s\"",
+- sa->sa_family, name);
++ log_fatal("local_family != AF_INET6 for \"%s\"",
++ name);
+ hw->hlen = 0;
+ hw->hbuf[0] = HTYPE_RESERVED;
+ /* 0xdeadbeef should never occur on the wire,
+@@ -520,10 +716,11 @@ get_hw_addr(const char *name, struct har
+ break;
+ #endif
+ default:
+- log_fatal("Unsupported device type %ld for \"%s\"",
+- (long int)sa->sa_family, name);
++ freeifaddrs(ifaddrs);
++ log_fatal("Unsupported device type %h for \"%s\"",
++ sll->sll_hatype, name);
+ }
+
+- close(sock);
++ freeifaddrs(ifaddrs);
+ }
+ #endif
+diff -up dhcp-4.2.4/common/socket.c.lpf-ib dhcp-4.2.4/common/socket.c
+--- dhcp-4.2.4/common/socket.c.lpf-ib 2012-03-09 12:28:11.000000000 +0100
++++ dhcp-4.2.4/common/socket.c 2012-07-18 21:08:48.112834843 +0200
+@@ -325,7 +325,7 @@ void if_register_send (info)
+ info->wfdesc = if_register_socket(info, AF_INET, 0);
+ /* If this is a normal IPv4 address, get the hardware address. */
+ if (strcmp(info->name, "fallback") != 0)
+- get_hw_addr(info->name, &info->hw_address);
++ get_hw_addr(info);
+ #if defined (USE_SOCKET_FALLBACK)
+ /* Fallback only registers for send, but may need to receive as
+ well. */
+@@ -388,7 +388,7 @@ void if_register_receive (info)
+ #endif /* IP_PKTINFO... */
+ /* If this is a normal IPv4 address, get the hardware address. */
+ if (strcmp(info->name, "fallback") != 0)
+- get_hw_addr(info->name, &info->hw_address);
++ get_hw_addr(info);
+
+ if (!quiet_interface_discovery)
+ log_info ("Listening on Socket/%s%s%s",
+@@ -498,7 +498,7 @@ if_register6(struct interface_info *info
+ if (req_multi)
+ if_register_multicast(info);
+
+- get_hw_addr(info->name, &info->hw_address);
++ get_hw_addr(info);
+
+ if (!quiet_interface_discovery) {
+ if (info->shared_network != NULL) {
+diff -up dhcp-4.2.4/includes/dhcpd.h.lpf-ib dhcp-4.2.4/includes/dhcpd.h
+--- dhcp-4.2.4/includes/dhcpd.h.lpf-ib 2012-07-18 21:08:48.102834978 +0200
++++ dhcp-4.2.4/includes/dhcpd.h 2012-07-18 21:08:48.114834815 +0200
+@@ -1243,6 +1243,7 @@ struct interface_info {
+ struct shared_network *shared_network;
+ /* Networks connected to this interface. */
+ struct hardware hw_address; /* Its physical address. */
++ u_int8_t bcast_addr[20]; /* Infiniband broadcast address */
+ struct in_addr *addresses; /* Addresses associated with this
+ * interface.
+ */
+@@ -2360,7 +2361,7 @@ void print_dns_status (int, struct dhcp_
+ #endif
+ const char *print_time(TIME);
+
+-void get_hw_addr(const char *name, struct hardware *hw);
++void get_hw_addr(struct interface_info *info);
+
+ /* socket.c */
+ #if defined (USE_SOCKET_SEND) || defined (USE_SOCKET_RECEIVE) \
diff --git a/dhcp/patches/dhcp-4.2.4-options.patch b/dhcp/patches/dhcp-4.2.4-options.patch
new file mode 100644
index 0000000..b0080e1
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.4-options.patch
@@ -0,0 +1,391 @@
+diff -up dhcp-4.2.4b1/client/clparse.c.options dhcp-4.2.4b1/client/clparse.c
+--- dhcp-4.2.4b1/client/clparse.c.options 2012-03-09 12:28:10.000000000 +0100
++++ dhcp-4.2.4b1/client/clparse.c 2012-04-16 17:24:58.794047046 +0200
+@@ -154,6 +154,7 @@ isc_result_t read_client_conf ()
+ /* Requested lease time, used by DHCPv6 (DHCPv4 uses the option cache)
+ */
+ top_level_config.requested_lease = 7200;
++ top_level_config.bootp_broadcast_always = 0;
+
+ group_allocate (&top_level_config.on_receipt, MDL);
+ if (!top_level_config.on_receipt)
+@@ -320,7 +321,8 @@ void read_client_leases ()
+ interface-declaration |
+ LEASE client-lease-statement |
+ ALIAS client-lease-statement |
+- KEY key-definition */
++ KEY key-definition |
++ BOOTP_BROADCAST_ALWAYS */
+
+ void parse_client_statement (cfile, ip, config)
+ struct parse *cfile;
+@@ -739,6 +741,12 @@ void parse_client_statement (cfile, ip,
+ parse_reject_statement (cfile, config);
+ return;
+
++ case BOOTP_BROADCAST_ALWAYS:
++ token = next_token(&val, (unsigned*)0, cfile);
++ config -> bootp_broadcast_always = 1;
++ parse_semi (cfile);
++ return;
++
+ default:
+ lose = 0;
+ stmt = (struct executable_statement *)0;
+diff -up dhcp-4.2.4b1/client/dhclient.c.options dhcp-4.2.4b1/client/dhclient.c
+--- dhcp-4.2.4b1/client/dhclient.c.options 2012-04-11 22:43:24.000000000 +0200
++++ dhcp-4.2.4b1/client/dhclient.c 2012-04-16 17:24:58.795047032 +0200
+@@ -39,6 +39,12 @@
+ #include <limits.h>
+ #include <dns/result.h>
+
++/*
++ * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
++ * that when building ISC code.
++ */
++extern int asprintf(char **strp, const char *fmt, ...);
++
+ TIME default_lease_time = 43200; /* 12 hours... */
+ TIME max_lease_time = 86400; /* 24 hours... */
+
+@@ -87,6 +93,9 @@ int wanted_ia_na = -1; /* the absolute
+ int wanted_ia_ta = 0;
+ int wanted_ia_pd = 0;
+ char *mockup_relay = NULL;
++int bootp_broadcast_always = 0;
++
++extern u_int32_t default_requested_options[];
+
+ void run_stateless(int exit_mode);
+
+@@ -123,6 +132,15 @@ main(int argc, char **argv) {
+ int local_family_set = 0;
+ #endif /* DHCPv6 */
+ char *s;
++ char *dhcp_client_identifier_arg = NULL;
++ char *dhcp_host_name_arg = NULL;
++ char *dhcp_fqdn_arg = NULL;
++ char *dhcp_vendor_class_identifier_arg = NULL;
++ char *dhclient_request_options = NULL;
++
++ int timeout_arg = 0;
++ char *arg_conf = NULL;
++ int arg_conf_len = 0;
+
+ /* Initialize client globals. */
+ memset(&default_duid, 0, sizeof(default_duid));
+@@ -310,6 +328,88 @@ main(int argc, char **argv) {
+ } else if (!strcmp(argv[i], "--version")) {
+ log_info("isc-dhclient-%s", PACKAGE_VERSION);
+ exit(0);
++ } else if (!strcmp(argv[i], "-I")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
++ log_error("-I option dhcp-client-identifier string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
++ exit(1);
++ }
++
++ dhcp_client_identifier_arg = argv[i];
++ } else if (!strcmp(argv[i], "-B")) {
++ bootp_broadcast_always = 1;
++ } else if (!strcmp(argv[i], "-H")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
++ log_error("-H option host-name string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
++ exit(1);
++ }
++
++ if (dhcp_host_name_arg != NULL) {
++ log_error("The -H <host-name> and -F <fqdn> arguments are mutually exclusive");
++ exit(1);
++ }
++
++ dhcp_host_name_arg = argv[i];
++ } else if (!strcmp(argv[i], "-F")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
++ log_error("-F option fqdn.fqdn string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
++ exit(1);
++ }
++
++ if (dhcp_fqdn_arg != NULL) {
++ log_error("Only one -F <fqdn> argument can be specified");
++ exit(1);
++ }
++
++ if (dhcp_host_name_arg != NULL) {
++ log_error("The -F <fqdn> and -H <host-name> arguments are mutually exclusive");
++ exit(1);
++ }
++
++ dhcp_fqdn_arg = argv[i];
++ } else if (!strcmp(argv[i], "-timeout")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if ((timeout_arg = atoi(argv[i])) <= 0) {
++ log_error("timeout option must be > 0 - bad value: %s",argv[i]);
++ exit(1);
++ }
++ } else if (!strcmp(argv[i], "-V")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
++ log_error("-V option vendor-class-identifier string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
++ exit(1);
++ }
++
++ dhcp_vendor_class_identifier_arg = argv[i];
++ } else if (!strcmp(argv[i], "-R")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ dhclient_request_options = argv[i];
+ } else if (argv[i][0] == '-') {
+ usage();
+ } else if (interfaces_requested < 0) {
+@@ -484,6 +584,156 @@ main(int argc, char **argv) {
+ /* Parse the dhclient.conf file. */
+ read_client_conf();
+
++ /* Parse any extra command line configuration arguments: */
++ if ((dhcp_client_identifier_arg != NULL) && (*dhcp_client_identifier_arg != '\0')) {
++ arg_conf_len = asprintf(&arg_conf, "send dhcp-client-identifier \"%s\";", dhcp_client_identifier_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -I option dhcp-client-identifier");
++ }
++
++ if ((dhcp_host_name_arg != NULL) && (*dhcp_host_name_arg != '\0')) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "send host-name \"%s\";", dhcp_host_name_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -H option host-name");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\nsend host-name \"%s\";", last_arg_conf, dhcp_host_name_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -H option host-name");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if ((dhcp_fqdn_arg != NULL) && (*dhcp_fqdn_arg != '\0')) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "send fqdn.fqdn \"%s\";", dhcp_fqdn_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -F option fqdn.fqdn");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\nsend fqdn.fqdn \"%s\";", last_arg_conf, dhcp_fqdn_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -F option fqdn.fqdn");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if (timeout_arg) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "timeout %d;", timeout_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to process -timeout timeout argument");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\ntimeout %d;", last_arg_conf, timeout_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len == 0))
++ log_fatal("Unable to process -timeout timeout argument");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if ((dhcp_vendor_class_identifier_arg != NULL) && (*dhcp_vendor_class_identifier_arg != '\0')) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "send vendor-class-identifier \"%s\";", dhcp_vendor_class_identifier_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -V option vendor-class-identifier");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\nsend vendor-class-identifier \"%s\";", last_arg_conf, dhcp_vendor_class_identifier_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -V option vendor-class-identifier");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if (dhclient_request_options != NULL) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "request %s;", dhclient_request_options);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to parse -R <request options list> argument");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\nrequest %s;", last_arg_conf, dhclient_request_options);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to parse -R <request options list> argument");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if (arg_conf) {
++ if (arg_conf_len == 0)
++ if ((arg_conf_len = strlen(arg_conf)) == 0)
++ /* huh ? cannot happen ! */
++ log_fatal("Unable to process -I/-H/-F/-timeout/-V/-R configuration arguments");
++
++ /* parse the extra dhclient.conf configuration arguments
++ * into top level config: */
++ struct parse *cfile = (struct parse *)0;
++ const char *val = NULL;
++ int token;
++
++ status = new_parse(&cfile, -1, arg_conf, arg_conf_len, "extra dhclient -I/-H/-F/-timeout/-V/-R configuration arguments", 0);
++
++ if ((status != ISC_R_SUCCESS) || (cfile -> warnings_occurred))
++ log_fatal("Cannot parse -I/-H/-F/-timeout/-V/-R configuration arguments !");
++ /* more detailed parse failures will be logged */
++
++ do {
++ token = peek_token(&val, (unsigned *)0, cfile);
++ if (token == END_OF_FILE)
++ break;
++
++ parse_client_statement(cfile, (struct interface_info *)0, &top_level_config);
++ } while (1);
++
++ if (cfile -> warnings_occurred)
++ log_fatal("Cannot parse -I/-H/-F/-timeout/-V/-R configuration arguments !");
++ end_parse(&cfile);
++
++ if (timeout_arg) {
++ /* we just set the toplevel timeout, but per-client
++ * timeouts may still be at defaults.
++ */
++ for (ip=interfaces; ip; ip = ip->next) {
++ if (ip->client->config->timeout == 60)
++ ip->client->config->timeout = timeout_arg;
++ }
++ }
++
++ if ((dhclient_request_options != 0) && (top_level_config.requested_options != default_requested_options)) {
++ for (ip=interfaces; ip; ip = ip->next) {
++ if (ip->client->config->requested_options == default_requested_options)
++ ip->client->config->requested_options = top_level_config.requested_options;
++ }
++ }
++
++ free(arg_conf);
++ arg_conf = NULL;
++ arg_conf_len = 0;
++ }
++
+ /* Parse the lease database. */
+ read_client_leases();
+
+@@ -2421,7 +2671,8 @@ void make_discover (client, lease)
+ client -> packet.xid = random ();
+ client -> packet.secs = 0; /* filled in by send_discover. */
+
+- if (can_receive_unicast_unconfigured (client -> interface))
++ if ((!(bootp_broadcast_always || client->config->bootp_broadcast_always))
++ && can_receive_unicast_unconfigured(client->interface))
+ client -> packet.flags = 0;
+ else
+ client -> packet.flags = htons (BOOTP_BROADCAST);
+@@ -2505,7 +2756,9 @@ void make_request (client, lease)
+ } else {
+ memset (&client -> packet.ciaddr, 0,
+ sizeof client -> packet.ciaddr);
+- if (can_receive_unicast_unconfigured (client -> interface))
++ if ((!(bootp_broadcast_always ||
++ client ->config->bootp_broadcast_always)) &&
++ can_receive_unicast_unconfigured (client -> interface))
+ client -> packet.flags = 0;
+ else
+ client -> packet.flags = htons (BOOTP_BROADCAST);
+@@ -2567,7 +2820,8 @@ void make_decline (client, lease)
+ client -> packet.hops = 0;
+ client -> packet.xid = client -> xid;
+ client -> packet.secs = 0; /* Filled in by send_request. */
+- if (can_receive_unicast_unconfigured (client -> interface))
++ if ((!(bootp_broadcast_always || client->config-> bootp_broadcast_always))
++ && can_receive_unicast_unconfigured (client->interface))
+ client -> packet.flags = 0;
+ else
+ client -> packet.flags = htons (BOOTP_BROADCAST);
+diff -up dhcp-4.2.4b1/common/conflex.c.options dhcp-4.2.4b1/common/conflex.c
+--- dhcp-4.2.4b1/common/conflex.c.options 2012-02-16 22:09:14.000000000 +0100
++++ dhcp-4.2.4b1/common/conflex.c 2012-04-16 17:24:58.796047018 +0200
+@@ -808,6 +808,8 @@ intern(char *atom, enum dhcp_token dfv)
+ return BALANCE;
+ if (!strcasecmp (atom + 1, "ound"))
+ return BOUND;
++ if (!strcasecmp (atom + 1, "ootp-broadcast-always"))
++ return BOOTP_BROADCAST_ALWAYS;
+ break;
+ case 'c':
+ if (!strcasecmp(atom + 1, "ase"))
+diff -up dhcp-4.2.4b1/includes/dhcpd.h.options dhcp-4.2.4b1/includes/dhcpd.h
+--- dhcp-4.2.4b1/includes/dhcpd.h.options 2012-04-10 02:55:06.000000000 +0200
++++ dhcp-4.2.4b1/includes/dhcpd.h 2012-04-16 17:24:58.797047004 +0200
+@@ -1147,6 +1147,9 @@ struct client_config {
+ int do_forward_update; /* If nonzero, and if we have the
+ information we need, update the
+ A record for the address we get. */
++
++ int bootp_broadcast_always; /* If nonzero, always set the BOOTP_BROADCAST
++ flag in requests */
+ };
+
+ /* Per-interface state used in the dhcp client... */
+diff -up dhcp-4.2.4b1/includes/dhctoken.h.options dhcp-4.2.4b1/includes/dhctoken.h
+--- dhcp-4.2.4b1/includes/dhctoken.h.options 2012-02-16 22:09:15.000000000 +0100
++++ dhcp-4.2.4b1/includes/dhctoken.h 2012-04-16 17:25:53.819276248 +0200
+@@ -364,7 +364,8 @@ enum dhcp_token {
+ GETHOSTBYNAME = 665,
+ PRIMARY6 = 666,
+ SECONDARY6 = 667,
+- TOKEN_INFINIBAND = 668
++ TOKEN_INFINIBAND = 668,
++ BOOTP_BROADCAST_ALWAYS = 669
+ };
+
+ #define is_identifier(x) ((x) >= FIRST_TOKEN && \
diff --git a/dhcp/patches/dhcp-4.2.4-paths.patch b/dhcp/patches/dhcp-4.2.4-paths.patch
new file mode 100644
index 0000000..a737571
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.4-paths.patch
@@ -0,0 +1,26 @@
+diff -up dhcp-4.2.4b1/includes/dhcpd.h.paths dhcp-4.2.4b1/includes/dhcpd.h
+--- dhcp-4.2.4b1/includes/dhcpd.h.paths 2012-04-18 11:12:34.000000000 +0200
++++ dhcp-4.2.4b1/includes/dhcpd.h 2012-04-18 11:14:38.541272405 +0200
+@@ -1420,7 +1420,7 @@ typedef unsigned char option_mask [16];
+ #else /* !DEBUG */
+
+ #ifndef _PATH_DHCPD_CONF
+-#define _PATH_DHCPD_CONF "/etc/dhcpd.conf"
++#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
+ #endif /* DEBUG */
+
+ #ifndef _PATH_DHCPD_DB
+@@ -1442,11 +1442,11 @@ typedef unsigned char option_mask [16];
+ #endif /* DEBUG */
+
+ #ifndef _PATH_DHCLIENT_CONF
+-#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf"
++#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
+ #endif
+
+ #ifndef _PATH_DHCLIENT_SCRIPT
+-#define _PATH_DHCLIENT_SCRIPT "/sbin/dhclient-script"
++#define _PATH_DHCLIENT_SCRIPT "/usr/sbin/dhclient-script"
+ #endif
+
+ #ifndef _PATH_DHCLIENT_PID
diff --git a/dhcp/patches/dhcp-4.2.4-rfc3442-classless-static-routes.patch b/dhcp/patches/dhcp-4.2.4-rfc3442-classless-static-routes.patch
new file mode 100644
index 0000000..a2fe219
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.4-rfc3442-classless-static-routes.patch
@@ -0,0 +1,405 @@
+diff -up dhcp-4.2.4b1/client/clparse.c.rfc3442 dhcp-4.2.4b1/client/clparse.c
+--- dhcp-4.2.4b1/client/clparse.c.rfc3442 2012-04-16 17:34:27.546079944 +0200
++++ dhcp-4.2.4b1/client/clparse.c 2012-04-16 17:34:27.605079118 +0200
+@@ -37,7 +37,7 @@
+
+ struct client_config top_level_config;
+
+-#define NUM_DEFAULT_REQUESTED_OPTS 14
++#define NUM_DEFAULT_REQUESTED_OPTS 15
+ struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1];
+
+ static void parse_client_default_duid(struct parse *cfile);
+@@ -90,7 +90,11 @@ isc_result_t read_client_conf ()
+ dhcp_universe.code_hash, &code, 0, MDL);
+
+ /* 4 */
+- code = DHO_ROUTERS;
++ /* The Classless Static Routes option code MUST appear in the parameter
++ * request list prior to both the Router option code and the Static
++ * Routes option code, if present. (RFC3442)
++ */
++ code = DHO_CLASSLESS_STATIC_ROUTES;
+ option_code_hash_lookup(&default_requested_options[3],
+ dhcp_universe.code_hash, &code, 0, MDL);
+
+@@ -144,6 +148,11 @@ isc_result_t read_client_conf ()
+ option_code_hash_lookup(&default_requested_options[13],
+ dhcp_universe.code_hash, &code, 0, MDL);
+
++ /* 15 */
++ code = DHO_ROUTERS;
++ option_code_hash_lookup(&default_requested_options[14],
++ dhcp_universe.code_hash, &code, 0, MDL);
++
+ for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
+ if (default_requested_options[code] == NULL)
+ log_fatal("Unable to find option definition for "
+diff -up dhcp-4.2.4b1/common/dhcp-options.5.rfc3442 dhcp-4.2.4b1/common/dhcp-options.5
+--- dhcp-4.2.4b1/common/dhcp-options.5.rfc3442 2012-04-16 17:34:27.537080070 +0200
++++ dhcp-4.2.4b1/common/dhcp-options.5 2012-04-16 17:34:27.606079104 +0200
+@@ -115,6 +115,26 @@ hexadecimal, separated by colons. For
+ or
+ option dhcp-client-identifier 43:4c:49:45:54:2d:46:4f:4f;
+ .fi
++.PP
++The
++.B destination-descriptor
++describe the IP subnet number and subnet mask
++of a particular destination using a compact encoding. This encoding
++consists of one octet describing the width of the subnet mask,
++followed by all the significant octets of the subnet number.
++The following table contains some examples of how various subnet
++number/mask combinations can be encoded:
++.nf
++.sp 1
++Subnet number Subnet mask Destination descriptor
++0 0 0
++10.0.0.0 255.0.0.0 8.10
++10.0.0.0 255.255.255.0 24.10.0.0
++10.17.0.0 255.255.0.0 16.10.17
++10.27.129.0 255.255.255.0 24.10.27.129
++10.229.0.128 255.255.255.128 25.10.229.0.128
++10.198.122.47 255.255.255.255 32.10.198.122.47
++.fi
+ .SH SETTING OPTION VALUES USING EXPRESSIONS
+ Sometimes it's helpful to be able to set the value of a DHCP option
+ based on some value that the client has sent. To do this, you can
+@@ -931,6 +951,29 @@ dhclient-script will create routes:
+ .RE
+ .PP
+ .nf
++.B option \fBclassless-static-routes\fR \fIdestination-descriptor ip-address\fR
++ [\fB,\fR \fIdestination-descriptor ip-address\fR...]\fB;\fR
++.fi
++.RS 0.25i
++.PP
++This option (see RFC3442) specifies a list of classless static routes
++that the client should install in its routing cache.
++.PP
++This option can contain one or more static routes, each of which
++consists of a destination descriptor and the IP address of the router
++that should be used to reach that destination.
++.PP
++Many clients may not implement the Classless Static Routes option.
++DHCP server administrators should therefore configure their DHCP
++servers to send both a Router option and a Classless Static Routes
++option, and should specify the default router(s) both in the Router
++option and in the Classless Static Routes option.
++.PP
++If the DHCP server returns both a Classless Static Routes option and
++a Router option, the DHCP client ignores the Router option.
++.RE
++.PP
++.nf
+ .B option \fBstreettalk-directory-assistance-server\fR \fIip-address\fR
+ [\fB,\fR \fIip-address\fR...]\fB;\fR
+ .fi
+diff -up dhcp-4.2.4b1/common/inet.c.rfc3442 dhcp-4.2.4b1/common/inet.c
+--- dhcp-4.2.4b1/common/inet.c.rfc3442 2011-05-11 02:47:22.000000000 +0200
++++ dhcp-4.2.4b1/common/inet.c 2012-04-16 17:34:27.607079090 +0200
+@@ -528,6 +528,60 @@ free_iaddrcidrnetlist(struct iaddrcidrne
+ return ISC_R_SUCCESS;
+ }
+
++static const char *
++inet_ntopdd(const unsigned char *src, unsigned srclen, char *dst, size_t size)
++{
++ char tmp[sizeof("32.255.255.255.255")];
++ int len;
++
++ switch (srclen) {
++ case 2:
++ len = sprintf (tmp, "%u.%u", src[0], src[1]);
++ break;
++ case 3:
++ len = sprintf (tmp, "%u.%u.%u", src[0], src[1], src[2]);
++ break;
++ case 4:
++ len = sprintf (tmp, "%u.%u.%u.%u", src[0], src[1], src[2], src[3]);
++ break;
++ case 5:
++ len = sprintf (tmp, "%u.%u.%u.%u.%u", src[0], src[1], src[2], src[3], src[4]);
++ break;
++ default:
++ return NULL;
++ }
++ if (len < 0)
++ return NULL;
++
++ if (len > size) {
++ errno = ENOSPC;
++ return NULL;
++ }
++
++ return strcpy (dst, tmp);
++}
++
++/* pdestdesc() turns an iaddr structure into a printable dest. descriptor */
++const char *
++pdestdesc(const struct iaddr addr) {
++ static char pbuf[sizeof("255.255.255.255.255")];
++
++ if (addr.len == 0) {
++ return "<null destination descriptor>";
++ }
++ if (addr.len == 1) {
++ return "0";
++ }
++ if ((addr.len >= 2) && (addr.len <= 5)) {
++ return inet_ntopdd(addr.iabuf, addr.len, pbuf, sizeof(pbuf));
++ }
++
++ log_fatal("pdestdesc():%s:%d: Invalid destination descriptor length %d.",
++ MDL, addr.len);
++ /* quell compiler warnings */
++ return NULL;
++}
++
+ /* piaddr() turns an iaddr structure into a printable address. */
+ /* XXX: should use a const pointer rather than passing the structure */
+ const char *
+diff -up dhcp-4.2.4b1/common/options.c.rfc3442 dhcp-4.2.4b1/common/options.c
+--- dhcp-4.2.4b1/common/options.c.rfc3442 2012-03-20 01:31:53.000000000 +0100
++++ dhcp-4.2.4b1/common/options.c 2012-04-16 17:34:27.608079076 +0200
+@@ -706,7 +706,11 @@ cons_options(struct packet *inpacket, st
+ * packet.
+ */
+ priority_list[priority_len++] = DHO_SUBNET_MASK;
+- priority_list[priority_len++] = DHO_ROUTERS;
++ if (lookup_option(&dhcp_universe, cfg_options,
++ DHO_CLASSLESS_STATIC_ROUTES))
++ priority_list[priority_len++] = DHO_CLASSLESS_STATIC_ROUTES;
++ else
++ priority_list[priority_len++] = DHO_ROUTERS;
+ priority_list[priority_len++] = DHO_DOMAIN_NAME_SERVERS;
+ priority_list[priority_len++] = DHO_HOST_NAME;
+ priority_list[priority_len++] = DHO_FQDN;
+@@ -1683,6 +1687,7 @@ const char *pretty_print_option (option,
+ const unsigned char *dp = data;
+ char comma;
+ unsigned long tval;
++ unsigned int octets = 0;
+
+ if (emit_commas)
+ comma = ',';
+@@ -1691,6 +1696,7 @@ const char *pretty_print_option (option,
+
+ memset (enumbuf, 0, sizeof enumbuf);
+
++ if (option->format[0] != 'R') { /* see explanation lower */
+ /* Figure out the size of the data. */
+ for (l = i = 0; option -> format [i]; i++, l++) {
+ if (l >= sizeof(fmtbuf) - 1)
+@@ -1840,6 +1846,33 @@ const char *pretty_print_option (option,
+ if (numhunk < 0)
+ numhunk = 1;
+
++ } else { /* option->format[i] == 'R') */
++ /* R (destination descriptor) has variable length.
++ * We can find it only in classless static route option,
++ * so we are for sure parsing classless static route option now.
++ * We go through whole the option to check whether there are no
++ * missing/extra bytes.
++ * I didn't find out how to improve the existing code and that's the
++ * reason for this separate 'else' where I do my own checkings.
++ * I know it's little bit unsystematic, but it works.
++ */
++ numhunk = 0;
++ numelem = 2; /* RI */
++ fmtbuf[0]='R'; fmtbuf[1]='I'; fmtbuf[2]=0;
++ for (i =0; i < len; i = i + octets + 5) {
++ if (data[i] > 32) { /* subnet mask width */
++ log_error ("wrong subnet mask width in destination descriptor");
++ break;
++ }
++ numhunk++;
++ octets = ((data[i]+7) / 8);
++ }
++ if (i != len) {
++ log_error ("classless static routes option has wrong size or "
++ "there's some garbage in format");
++ }
++ }
++
+ /* Cycle through the array (or hunk) printing the data. */
+ for (i = 0; i < numhunk; i++) {
+ for (j = 0; j < numelem; j++) {
+@@ -1978,6 +2011,20 @@ const char *pretty_print_option (option,
+ strcpy(op, piaddr(iaddr));
+ dp += 4;
+ break;
++
++ case 'R':
++ if (dp[0] <= 32)
++ iaddr.len = (((dp[0]+7)/8)+1);
++ else {
++ log_error ("wrong subnet mask width in destination descriptor");
++ return "<error>";
++ }
++
++ memcpy(iaddr.iabuf, dp, iaddr.len);
++ strcpy(op, pdestdesc(iaddr));
++ dp += iaddr.len;
++ break;
++
+ case '6':
+ iaddr.len = 16;
+ memcpy(iaddr.iabuf, dp, 16);
+diff -up dhcp-4.2.4b1/common/parse.c.rfc3442 dhcp-4.2.4b1/common/parse.c
+--- dhcp-4.2.4b1/common/parse.c.rfc3442 2012-04-16 17:34:27.577079510 +0200
++++ dhcp-4.2.4b1/common/parse.c 2012-04-16 17:34:27.610079048 +0200
+@@ -341,6 +341,39 @@ int parse_ip_addr (cfile, addr)
+ }
+
+ /*
++ * destination-descriptor :== NUMBER DOT NUMBER |
++ * NUMBER DOT NUMBER DOT NUMBER |
++ * NUMBER DOT NUMBER DOT NUMBER DOT NUMBER |
++ * NUMBER DOT NUMBER DOT NUMBER DOT NUMBER DOT NUMBER
++ */
++
++int parse_destination_descriptor (cfile, addr)
++ struct parse *cfile;
++ struct iaddr *addr;
++{
++ unsigned int mask_width, dest_dest_len;
++ addr -> len = 0;
++ if (parse_numeric_aggregate (cfile, addr -> iabuf,
++ &addr -> len, DOT, 10, 8)) {
++ mask_width = (unsigned int)addr->iabuf[0];
++ dest_dest_len = (((mask_width+7)/8)+1);
++ if (mask_width > 32) {
++ parse_warn (cfile,
++ "subnet mask width (%u) greater than 32.", mask_width);
++ }
++ else if (dest_dest_len != addr->len) {
++ parse_warn (cfile,
++ "destination descriptor with subnet mask width %u "
++ "should have %u octets, but has %u octets.",
++ mask_width, dest_dest_len, addr->len);
++ }
++
++ return 1;
++ }
++ return 0;
++}
++
++/*
+ * Return true if every character in the string is hexadecimal.
+ */
+ static int
+@@ -704,8 +737,10 @@ unsigned char *parse_numeric_aggregate (
+ if (count) {
+ token = peek_token (&val, (unsigned *)0, cfile);
+ if (token != separator) {
+- if (!*max)
++ if (!*max) {
++ *max = count;
+ break;
++ }
+ if (token != RBRACE && token != LBRACE)
+ token = next_token (&val,
+ (unsigned *)0,
+@@ -1628,6 +1663,9 @@ int parse_option_code_definition (cfile,
+ case IP_ADDRESS:
+ type = 'I';
+ break;
++ case DESTINATION_DESCRIPTOR:
++ type = 'R';
++ break;
+ case IP6_ADDRESS:
+ type = '6';
+ break;
+@@ -5375,6 +5413,15 @@ int parse_option_token (rv, cfile, fmt,
+ }
+ break;
+
++ case 'R': /* destination descriptor */
++ if (!parse_destination_descriptor (cfile, &addr)) {
++ return 0;
++ }
++ if (!make_const_data (&t, addr.iabuf, addr.len, 0, 1, MDL)) {
++ return 0;
++ }
++ break;
++
+ case '6': /* IPv6 address. */
+ if (!parse_ip6_addr(cfile, &addr)) {
+ return 0;
+@@ -5635,6 +5682,13 @@ int parse_option_decl (oc, cfile)
+ goto exit;
+ len = ip_addr.len;
+ dp = ip_addr.iabuf;
++ goto alloc;
++
++ case 'R': /* destination descriptor */
++ if (!parse_destination_descriptor (cfile, &ip_addr))
++ goto exit;
++ len = ip_addr.len;
++ dp = ip_addr.iabuf;
+
+ alloc:
+ if (hunkix + len > sizeof hunkbuf) {
+diff -up dhcp-4.2.4b1/common/tables.c.rfc3442 dhcp-4.2.4b1/common/tables.c
+--- dhcp-4.2.4b1/common/tables.c.rfc3442 2012-04-16 17:34:27.566079664 +0200
++++ dhcp-4.2.4b1/common/tables.c 2012-04-16 17:34:27.611079034 +0200
+@@ -52,6 +52,7 @@ HASH_FUNCTIONS (option_code, const unsig
+ Format codes:
+
+ I - IPv4 address
++ R - destination descriptor (RFC3442)
+ 6 - IPv6 address
+ l - 32-bit signed integer
+ L - 32-bit unsigned integer
+@@ -209,6 +210,7 @@ static struct option dhcp_options[] = {
+ { "default-url", "t", &dhcp_universe, 114, 1 },
+ { "subnet-selection", "I", &dhcp_universe, 118, 1 },
+ { "domain-search", "D", &dhcp_universe, 119, 1 },
++ { "classless-static-routes", "RIA", &dhcp_universe, 121, 1 },
+ { "vivco", "Evendor-class.", &dhcp_universe, 124, 1 },
+ { "vivso", "Evendor.", &dhcp_universe, 125, 1 },
+ #if 0
+diff -up dhcp-4.2.4b1/includes/dhcpd.h.rfc3442 dhcp-4.2.4b1/includes/dhcpd.h
+--- dhcp-4.2.4b1/includes/dhcpd.h.rfc3442 2012-04-16 17:34:27.543079986 +0200
++++ dhcp-4.2.4b1/includes/dhcpd.h 2012-04-16 17:34:27.613079006 +0200
+@@ -2666,6 +2666,7 @@ isc_result_t range2cidr(struct iaddrcidr
+ const struct iaddr *lo, const struct iaddr *hi);
+ isc_result_t free_iaddrcidrnetlist(struct iaddrcidrnetlist **result);
+ const char *piaddr (struct iaddr);
++const char *pdestdesc (struct iaddr);
+ char *piaddrmask(struct iaddr *, struct iaddr *);
+ char *piaddrcidr(const struct iaddr *, unsigned int);
+ u_int16_t validate_port(char *);
+@@ -2873,6 +2874,7 @@ void parse_client_lease_declaration (str
+ int parse_option_decl (struct option_cache **, struct parse *);
+ void parse_string_list (struct parse *, struct string_list **, int);
+ int parse_ip_addr (struct parse *, struct iaddr *);
++int parse_destination_descriptor (struct parse *, struct iaddr *);
+ int parse_ip_addr_with_subnet(struct parse *, struct iaddrmatch *);
+ void parse_reject_statement (struct parse *, struct client_config *);
+
+diff -up dhcp-4.2.4b1/includes/dhcp.h.rfc3442 dhcp-4.2.4b1/includes/dhcp.h
+--- dhcp-4.2.4b1/includes/dhcp.h.rfc3442 2012-02-16 22:09:14.000000000 +0100
++++ dhcp-4.2.4b1/includes/dhcp.h 2012-04-16 17:34:27.613079006 +0200
+@@ -163,6 +163,7 @@ struct dhcp_packet {
+ #define DHO_ASSOCIATED_IP 92
+ #define DHO_SUBNET_SELECTION 118 /* RFC3011! */
+ #define DHO_DOMAIN_SEARCH 119 /* RFC3397 */
++#define DHO_CLASSLESS_STATIC_ROUTES 121 /* RFC3442 */
+ #define DHO_VIVCO_SUBOPTIONS 124
+ #define DHO_VIVSO_SUBOPTIONS 125
+
+diff -up dhcp-4.2.4b1/includes/dhctoken.h.rfc3442 dhcp-4.2.4b1/includes/dhctoken.h
+--- dhcp-4.2.4b1/includes/dhctoken.h.rfc3442 2012-04-16 17:34:27.000000000 +0200
++++ dhcp-4.2.4b1/includes/dhctoken.h 2012-04-16 17:35:15.028414805 +0200
+@@ -365,7 +365,8 @@ enum dhcp_token {
+ PRIMARY6 = 666,
+ SECONDARY6 = 667,
+ TOKEN_INFINIBAND = 668,
+- BOOTP_BROADCAST_ALWAYS = 669
++ BOOTP_BROADCAST_ALWAYS = 669,
++ DESTINATION_DESCRIPTOR = 670
+ };
+
+ #define is_identifier(x) ((x) >= FIRST_TOKEN && \
diff --git a/dhcp/patches/dhcp-4.2.4-send_release.patch b/dhcp/patches/dhcp-4.2.4-send_release.patch
new file mode 100644
index 0000000..3e0a618
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.4-send_release.patch
@@ -0,0 +1,23 @@
+diff -up dhcp-4.2.4b1/client/dhclient.c.send_release dhcp-4.2.4b1/client/dhclient.c
+--- dhcp-4.2.4b1/client/dhclient.c.send_release 2012-04-16 17:48:52.000000000 +0200
++++ dhcp-4.2.4b1/client/dhclient.c 2012-04-16 17:50:44.357396720 +0200
+@@ -2764,8 +2764,8 @@ void send_release (cpp)
+ inet_ntoa (destination.sin_addr),
+ ntohs (destination.sin_port), client -> xid);
+
+- if (fallback_interface) {
+- result = send_packet(fallback_interface, NULL, &client->packet,
++ if (client -> interface) {
++ result = send_packet(client -> interface, NULL, &client->packet,
+ client->packet_length, from, &destination,
+ NULL);
+ if (result < 0) {
+@@ -2776,7 +2776,7 @@ void send_release (cpp)
+ }
+ } else {
+ /* Send out a packet. */
+- result = send_packet(client->interface, NULL, &client->packet,
++ result = send_packet(fallback_interface, NULL, &client->packet,
+ client->packet_length, from, &destination,
+ NULL);
+ if (result < 0) {
diff --git a/dhcp/patches/dhcp-4.2.4-systemtap.patch b/dhcp/patches/dhcp-4.2.4-systemtap.patch
new file mode 100644
index 0000000..6f036a7
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.4-systemtap.patch
@@ -0,0 +1,808 @@
+diff -up dhcp-4.2.4b1/configure.ac.systemtap dhcp-4.2.4b1/configure.ac
+--- dhcp-4.2.4b1/configure.ac.systemtap 2012-04-16 17:46:10.913227143 +0200
++++ dhcp-4.2.4b1/configure.ac 2012-04-16 17:46:10.947226667 +0200
+@@ -504,6 +504,35 @@ else
+ AC_MSG_RESULT(no)
+ fi
+
++AC_MSG_CHECKING([whether to include systemtap tracing support])
++AC_ARG_ENABLE([systemtap],
++ [AS_HELP_STRING([--enable-systemtap],
++ [Enable inclusion of systemtap trace support])],
++ [ENABLE_SYSTEMTAP="${enableval}"], [ENABLE_SYSTEMTAP='no'])
++AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$ENABLE_SYSTEMTAP = xyes])
++AC_MSG_RESULT(${ENABLE_SYSTEMTAP})
++
++if test "x${ENABLE_SYSTEMTAP}" = xyes; then
++ # Additional configuration for --enable-systemtap is HERE
++ AC_CHECK_PROGS(DTRACE, dtrace)
++ if test -z "$DTRACE"; then
++ AC_MSG_ERROR([dtrace not found])
++ fi
++ AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'],
++ [SDT_H_FOUND='no';
++ AC_MSG_ERROR([systemtap support needs sys/sdt.h header])])
++ AC_DEFINE([HAVE_SYSTEMTAP], [1], [Define to 1 if using SystemTap probes.])
++ AC_ARG_WITH([tapset-install-dir],
++ [AS_HELP_STRING([--with-tapset-install-dir],
++ [The absolute path where the tapset dir will be installed])],
++ [if test "x${withval}" = x; then
++ ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"
++ else
++ ABS_TAPSET_DIR="${withval}"
++ fi], [ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"])
++ AC_SUBST(ABS_TAPSET_DIR)
++fi
++
+ # Solaris needs some libraries for functions
+ AC_SEARCH_LIBS(socket, [socket])
+ AC_SEARCH_LIBS(inet_ntoa, [nsl])
+@@ -650,6 +679,7 @@ AC_OUTPUT([
+ relay/Makefile
+ server/Makefile
+ tests/Makefile
++ tapset/Makefile
+ ])
+
+ sh util/bindvar.sh
+diff -up dhcp-4.2.4b1/Makefile.am.systemtap dhcp-4.2.4b1/Makefile.am
+--- dhcp-4.2.4b1/Makefile.am.systemtap 2012-04-16 17:46:10.791228851 +0200
++++ dhcp-4.2.4b1/Makefile.am 2012-04-16 17:46:10.947226667 +0200
+@@ -29,5 +29,8 @@ endif
+
+ SUBDIRS += includes tests common omapip client dhcpctl relay server
+
++SUBDIRS += tapset
++#DIST_SUBDIRS = $(SUBDIRS)
++
+ nobase_include_HEADERS = dhcpctl/dhcpctl.h
+
+diff -up dhcp-4.2.4b1/server/dhcp.c.systemtap dhcp-4.2.4b1/server/dhcp.c
+--- dhcp-4.2.4b1/server/dhcp.c.systemtap 2012-04-16 17:46:10.816228501 +0200
++++ dhcp-4.2.4b1/server/dhcp.c 2012-04-16 17:48:11.528537555 +0200
+@@ -36,7 +36,7 @@
+ #include <errno.h>
+ #include <limits.h>
+ #include <sys/time.h>
+-
++#include "trace.h"
+ static void commit_leases_ackout(void *foo);
+ static void maybe_return_agent_options(struct packet *packet,
+ struct option_state *options);
+@@ -275,6 +275,8 @@ void dhcpdiscover (packet, ms_nulltp)
+ dhcp_failover_state_t *peer;
+ #endif
+
++ TRACE(DHCPD_DISCOVER_START());
++
+ find_lease (&lease, packet, packet -> shared_network,
+ 0, &peer_has_leases, (struct lease *)0, MDL);
+
+@@ -399,6 +401,8 @@ void dhcpdiscover (packet, ms_nulltp)
+ out:
+ if (lease)
+ lease_dereference (&lease, MDL);
++
++ TRACE(DHCPD_DISCOVER_DONE());
+ }
+
+ void dhcprequest (packet, ms_nulltp, ip_lease)
+@@ -421,6 +425,8 @@ void dhcprequest (packet, ms_nulltp, ip_
+ #endif
+ int have_requested_addr = 0;
+
++ TRACE(DHCPD_REQUEST_START());
++
+ oc = lookup_option (&dhcp_universe, packet -> options,
+ DHO_DHCP_REQUESTED_ADDRESS);
+ memset (&data, 0, sizeof data);
+@@ -677,6 +683,9 @@ void dhcprequest (packet, ms_nulltp, ip_
+ log_info ("%s: unknown lease %s.", msgbuf, piaddr (cip));
+
+ out:
++
++ TRACE(DHCPD_REQUEST_DONE());
++
+ if (subnet)
+ subnet_dereference (&subnet, MDL);
+ if (lease)
+@@ -695,6 +704,7 @@ void dhcprelease (packet, ms_nulltp)
+ const char *s;
+ char msgbuf [1024], cstr[16]; /* XXX */
+
++ TRACE(DHCPD_RELEASE_START());
+
+ /* DHCPRELEASE must not specify address in requested-address
+ option, but old protocol specs weren't explicit about this,
+@@ -819,6 +829,8 @@ void dhcprelease (packet, ms_nulltp)
+ #endif
+ if (lease)
+ lease_dereference (&lease, MDL);
++
++ TRACE(DHCPD_RELEASE_DONE());
+ }
+
+ void dhcpdecline (packet, ms_nulltp)
+@@ -836,6 +848,8 @@ void dhcpdecline (packet, ms_nulltp)
+ struct option_cache *oc;
+ struct data_string data;
+
++ TRACE(DHCPD_DECLINE_START());
++
+ /* DHCPDECLINE must specify address. */
+ if (!(oc = lookup_option (&dhcp_universe, packet -> options,
+ DHO_DHCP_REQUESTED_ADDRESS)))
+@@ -947,6 +961,8 @@ void dhcpdecline (packet, ms_nulltp)
+ option_state_dereference (&options, MDL);
+ if (lease)
+ lease_dereference (&lease, MDL);
++
++ TRACE(DHCPD_DECLINE_DONE());
+ }
+
+ void dhcpinform (packet, ms_nulltp)
+@@ -970,6 +986,8 @@ void dhcpinform (packet, ms_nulltp)
+ struct interface_info *interface;
+ int result;
+
++ TRACE(DHCPD_INFORM_START());
++
+ /* The client should set ciaddr to its IP address, but apparently
+ it's common for clients not to do this, so we'll use their IP
+ source address if they didn't set ciaddr. */
+@@ -1327,6 +1345,8 @@ void dhcpinform (packet, ms_nulltp)
+
+ if (subnet)
+ subnet_dereference (&subnet, MDL);
++
++ TRACE(DHCPD_INFORM_DONE());
+ }
+
+ void nak_lease (packet, cip)
+@@ -1343,6 +1363,8 @@ void nak_lease (packet, cip)
+ struct option_state *options = (struct option_state *)0;
+ struct option_cache *oc = (struct option_cache *)0;
+
++ TRACE(DHCPD_NAK_LEASE_START());
++
+ option_state_allocate (&options, MDL);
+ memset (&outgoing, 0, sizeof outgoing);
+ memset (&raw, 0, sizeof raw);
+@@ -1494,6 +1516,7 @@ void nak_lease (packet, cip)
+ packet->interface->name);
+ }
+
++ TRACE(DHCPD_NAK_LEASE_DONE());
+ }
+
+ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
+@@ -1535,6 +1558,8 @@ void ack_lease (packet, lease, offer, wh
+ if (lease -> state)
+ return;
+
++ TRACE(DHCPD_ACK_LEASE_START());
++
+ /* Save original cltt for comparison later. */
+ lease_cltt = lease->cltt;
+
+@@ -2897,6 +2922,8 @@ void ack_lease (packet, lease, offer, wh
+ #endif
+ dhcp_reply(lease);
+ }
++
++ TRACE(DHCPD_ACK_LEASE_DONE());
+ }
+
+ /*
+@@ -3049,6 +3076,8 @@ void dhcp_reply (lease)
+ if (!state)
+ log_fatal ("dhcp_reply was supplied lease with no state!");
+
++ TRACE(DHCPD_REPLY_START());
++
+ /* Compose a response for the client... */
+ memset (&raw, 0, sizeof raw);
+ memset (&d1, 0, sizeof d1);
+@@ -3270,6 +3299,8 @@ void dhcp_reply (lease)
+
+ free_lease_state (state, MDL);
+ lease -> state = (struct lease_state *)0;
++
++ TRACE(DHCPD_REPLY_DONE());
+ }
+
+ int find_lease (struct lease **lp,
+@@ -3292,6 +3323,8 @@ int find_lease (struct lease **lp,
+ struct data_string client_identifier;
+ struct hardware h;
+
++ TRACE(DHCPD_FIND_LEASE_START());
++
+ #if defined(FAILOVER_PROTOCOL)
+ /* Quick check to see if the peer has leases. */
+ if (peer_has_leases) {
+@@ -4019,6 +4052,9 @@ int find_lease (struct lease **lp,
+ #if defined (DEBUG_FIND_LEASE)
+ log_info ("Not returning a lease.");
+ #endif
++
++ TRACE(DHCPD_FIND_LEASE_DONE());
++
+ return 0;
+ }
+
+diff -up dhcp-4.2.4b1/server/dhcpd.c.systemtap dhcp-4.2.4b1/server/dhcpd.c
+--- dhcp-4.2.4b1/server/dhcpd.c.systemtap 2012-04-16 17:46:10.928226933 +0200
++++ dhcp-4.2.4b1/server/dhcpd.c 2012-04-16 17:46:10.951226611 +0200
+@@ -58,6 +58,8 @@ static const char url [] =
+ # undef group
+ #endif /* PARANOIA */
+
++#include "trace.h"
++
+ static void usage(void);
+
+ struct iaddr server_identifier;
+@@ -859,6 +861,7 @@ main(int argc, char **argv) {
+ omapi_set_int_value ((omapi_object_t *)dhcp_control_object,
+ (omapi_object_t *)0, "state", server_running);
+
++ TRACE(DHCPD_MAIN());
+ /* Receive packets and dispatch them... */
+ dispatch ();
+
+diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
+--- dhcp-4.2.4b1/server/dhcpv6.c.systemtap 2012-04-16 17:46:10.925226975 +0200
++++ dhcp-4.2.4b1/server/dhcpv6.c 2012-04-16 17:46:10.953226583 +0200
+@@ -15,6 +15,7 @@
+ */
+
+ #include "dhcpd.h"
++#include "trace.h"
+
+ #ifdef DHCPv6
+
+@@ -4198,6 +4199,8 @@ static void
+ dhcpv6_solicit(struct data_string *reply_ret, struct packet *packet) {
+ struct data_string client_id;
+
++ TRACE(DHCPD_6_SOLICIT_START());
++
+ /*
+ * Validate our input.
+ */
+@@ -4211,6 +4214,8 @@ dhcpv6_solicit(struct data_string *reply
+ * Clean up.
+ */
+ data_string_forget(&client_id, MDL);
++
++ TRACE(DHCPD_6_SOLICIT_DONE());
+ }
+
+ /*
+@@ -4224,6 +4229,8 @@ dhcpv6_request(struct data_string *reply
+ struct data_string client_id;
+ struct data_string server_id;
+
++ TRACE(DHCPD_6_REQUEST_START());
++
+ /*
+ * Validate our input.
+ */
+@@ -4241,6 +4248,8 @@ dhcpv6_request(struct data_string *reply
+ */
+ data_string_forget(&client_id, MDL);
+ data_string_forget(&server_id, MDL);
++
++ TRACE(DHCPD_6_REQUEST_DONE());
+ }
+
+ /* Find a DHCPv6 packet's shared network from hints in the packet.
+@@ -4353,6 +4362,8 @@ dhcpv6_confirm(struct data_string *reply
+ struct dhcpv6_packet *reply = (struct dhcpv6_packet *)reply_data;
+ int reply_ofs = (int)(offsetof(struct dhcpv6_packet, options));
+
++ TRACE(DHCPD_6_CONFIRM_START());
++
+ /*
+ * Basic client message validation.
+ */
+@@ -4539,6 +4550,8 @@ exit:
+ option_state_dereference(&cli_enc_opt_state, MDL);
+ if (opt_state != NULL)
+ option_state_dereference(&opt_state, MDL);
++
++ TRACE(DHCPD_6_CONFIRM_DONE());
+ }
+
+ /*
+@@ -4553,6 +4566,8 @@ dhcpv6_renew(struct data_string *reply,
+ struct data_string client_id;
+ struct data_string server_id;
+
++ TRACE(DHCPD_6_RENEW_START());
++
+ /*
+ * Validate the request.
+ */
+@@ -4570,6 +4585,8 @@ dhcpv6_renew(struct data_string *reply,
+ */
+ data_string_forget(&server_id, MDL);
+ data_string_forget(&client_id, MDL);
++
++ TRACE(DHCPD_6_RENEW_DONE());
+ }
+
+ /*
+@@ -4583,6 +4600,8 @@ static void
+ dhcpv6_rebind(struct data_string *reply, struct packet *packet) {
+ struct data_string client_id;
+
++ TRACE(DHCPD_6_REBIND_START());
++
+ if (!valid_client_msg(packet, &client_id)) {
+ return;
+ }
+@@ -4590,6 +4609,8 @@ dhcpv6_rebind(struct data_string *reply,
+ lease_to_client(reply, packet, &client_id, NULL);
+
+ data_string_forget(&client_id, MDL);
++
++ TRACE(DHCPD_6_REBIND_DONE());
+ }
+
+ static void
+@@ -5034,6 +5055,8 @@ dhcpv6_decline(struct data_string *reply
+ struct data_string client_id;
+ struct data_string server_id;
+
++ TRACE(DHCPD_6_DECLINE_START());
++
+ /*
+ * Validate our input.
+ */
+@@ -5054,6 +5077,8 @@ dhcpv6_decline(struct data_string *reply
+
+ data_string_forget(&server_id, MDL);
+ data_string_forget(&client_id, MDL);
++
++ TRACE(DHCPD_6_DECLINE_DONE());
+ }
+
+ static void
+@@ -5502,6 +5527,8 @@ dhcpv6_release(struct data_string *reply
+ struct data_string client_id;
+ struct data_string server_id;
+
++ TRACE(DHCPD_6_RELEASE_START());
++
+ /*
+ * Validate our input.
+ */
+@@ -5523,6 +5550,8 @@ dhcpv6_release(struct data_string *reply
+
+ data_string_forget(&server_id, MDL);
+ data_string_forget(&client_id, MDL);
++
++ TRACE(DHCPD_6_RELEASE_DONE());
+ }
+
+ /*
+@@ -5535,6 +5564,8 @@ dhcpv6_information_request(struct data_s
+ struct data_string client_id;
+ struct data_string server_id;
+
++ TRACE(DHCPD_6_INFORMATION_REQUEST_START());
++
+ /*
+ * Validate our input.
+ */
+@@ -5566,6 +5597,8 @@ dhcpv6_information_request(struct data_s
+ data_string_forget(&client_id, MDL);
+ }
+ data_string_forget(&server_id, MDL);
++
++ TRACE(DHCPD_6_INFORMATION_REQUEST_DONE());
+ }
+
+ /*
+@@ -5594,6 +5627,8 @@ dhcpv6_relay_forw(struct data_string *re
+ struct dhcpv6_relay_packet *reply;
+ int reply_ofs;
+
++ TRACE(DHCPD_6_RELAY_FORW_START());
++
+ /*
+ * Initialize variables for early exit.
+ */
+@@ -5853,6 +5888,8 @@ exit:
+ if (enc_packet != NULL) {
+ packet_dereference(&enc_packet, MDL);
+ }
++
++ TRACE(DHCPD_6_RELAY_FORW_DONE());
+ }
+
+ static void
+diff -up dhcp-4.2.4b1/server/failover.c.systemtap dhcp-4.2.4b1/server/failover.c
+--- dhcp-4.2.4b1/server/failover.c.systemtap 2012-03-19 23:29:49.000000000 +0100
++++ dhcp-4.2.4b1/server/failover.c 2012-04-16 17:46:10.955226555 +0200
+@@ -36,6 +36,8 @@
+ #include "dhcpd.h"
+ #include <omapip/omapip_p.h>
+
++#include "trace.h"
++
+ #if defined (FAILOVER_PROTOCOL)
+ dhcp_failover_state_t *failover_states;
+ static isc_result_t do_a_failover_option (omapi_object_t *,
+@@ -1712,6 +1714,8 @@ isc_result_t dhcp_failover_set_state (dh
+ struct lease *l;
+ struct timeval tv;
+
++ TRACE(DHCPD_FAILOVER_SET_STATE_START(state->me.state, new_state));
++
+ /* If we're in certain states where we're sending updates, and the peer
+ * state changes, we need to re-schedule any pending updates just to
+ * be on the safe side. This results in retransmission.
+@@ -1939,6 +1943,8 @@ isc_result_t dhcp_failover_set_state (dh
+ break;
+ }
+
++ TRACE(DHCPD_FAILOVER_SET_STATE_DONE());
++
+ return ISC_R_SUCCESS;
+ }
+
+@@ -2422,6 +2428,8 @@ dhcp_failover_pool_dobalance(dhcp_failov
+ if (state -> me.state != normal)
+ return 0;
+
++ TRACE(DHCPD_FAILOVER_POOL_DOBALANCE_START());
++
+ state->last_balance = cur_time;
+
+ for (s = shared_networks ; s ; s = s->next) {
+@@ -2582,6 +2590,8 @@ dhcp_failover_pool_dobalance(dhcp_failov
+ if (leases_queued)
+ commit_leases();
+
++ TRACE(DHCPD_FAILOVER_POOL_DOBALANCE_DONE());
++
+ return leases_queued;
+ }
+
+diff -up dhcp-4.2.4b1/server/Makefile.am.systemtap dhcp-4.2.4b1/server/Makefile.am
+--- dhcp-4.2.4b1/server/Makefile.am.systemtap 2012-04-16 17:46:10.914227129 +0200
++++ dhcp-4.2.4b1/server/Makefile.am 2012-04-16 17:46:10.956226541 +0200
+@@ -4,7 +4,7 @@ dist_sysconf_DATA = dhcpd.conf
+ sbin_PROGRAMS = dhcpd
+ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
+ omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c \
+- dhcpv6.c mdb6.c ldap.c ldap_casa.c
++ dhcpv6.c mdb6.c ldap.c ldap_casa.c probes.d trace.h
+
+ dhcpd_CFLAGS = $(LDAP_CFLAGS)
+ dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
+@@ -13,3 +13,13 @@ dhcpd_LDADD = ../common/libdhcp.a ../oma
+ man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
+ EXTRA_DIST = $(man_MANS)
+
++if ENABLE_SYSTEMTAP
++BUILT_SOURCES = probes.h
++probes.h: probes.d
++ $(DTRACE) -C -h -s $< -o $@
++
++probes.o: probes.d
++ $(DTRACE) -C -G -s $< -o $@
++
++dhcpd_LDADD += probes.o
++endif
+diff -up dhcp-4.2.4b1/server/probes.d.systemtap dhcp-4.2.4b1/server/probes.d
+--- dhcp-4.2.4b1/server/probes.d.systemtap 2012-04-16 17:46:10.956226541 +0200
++++ dhcp-4.2.4b1/server/probes.d 2012-04-16 17:46:10.956226541 +0200
+@@ -0,0 +1,43 @@
++provider dhcpd {
++ probe main();
++ probe discover_start()
++ probe discover_done()
++ probe request_start()
++ probe request_done()
++ probe release_start()
++ probe release_done()
++ probe decline_start()
++ probe decline_done()
++ probe inform_start()
++ probe inform_done()
++ probe nak_lease_start()
++ probe nak_lease_done()
++ probe ack_lease_start()
++ probe ack_lease_done()
++ probe reply_start()
++ probe reply_done()
++ probe find_lease_start()
++ probe find_lease_done()
++ probe 6_solicit_start()
++ probe 6_solicit_done()
++ probe 6_request_start()
++ probe 6_request_done()
++ probe 6_confirm_start()
++ probe 6_confirm_done()
++ probe 6_renew_start()
++ probe 6_renew_done()
++ probe 6_rebind_start()
++ probe 6_rebind_done()
++ probe 6_decline_start()
++ probe 6_decline_done()
++ probe 6_release_start()
++ probe 6_release_done()
++ probe 6_information_request_start()
++ probe 6_information_request_done()
++ probe 6_relay_forw_start()
++ probe 6_relay_forw_done()
++ probe failover_pool_dobalance_start()
++ probe failover_pool_dobalance_done()
++ probe failover_set_state_start(int, int) /* state, new_state */
++ probe failover_set_state_done()
++};
+diff -up dhcp-4.2.4b1/server/trace.h.systemtap dhcp-4.2.4b1/server/trace.h
+--- dhcp-4.2.4b1/server/trace.h.systemtap 2012-04-16 17:46:10.956226541 +0200
++++ dhcp-4.2.4b1/server/trace.h 2012-04-16 17:46:10.956226541 +0200
+@@ -0,0 +1,11 @@
++// trace.h
++
++#include "config.h"
++#ifdef HAVE_SYSTEMTAP
++// include the generated probes header and put markers in code
++#include "probes.h"
++#define TRACE(probe) probe
++#else
++// Wrap the probe to allow it to be removed when no systemtap available
++#define TRACE(probe)
++#endif
+diff -up dhcp-4.2.4b1/tapset/dhcpd.stp.systemtap dhcp-4.2.4b1/tapset/dhcpd.stp
+--- dhcp-4.2.4b1/tapset/dhcpd.stp.systemtap 2012-04-16 17:46:10.957226527 +0200
++++ dhcp-4.2.4b1/tapset/dhcpd.stp 2012-04-16 17:46:10.957226527 +0200
+@@ -0,0 +1,212 @@
++/* dhcpd tapset
++ Copyright (C) 2011, Red Hat Inc.
++ */
++
++probe dhcpd_main = process("dhcpd").mark("main")
++{
++ probestr = sprintf("%s(locals: %s)", $$name, $$locals);
++
++}
++
++probe dhcpd_discover_start = process("dhcpd").mark("discover_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_discover_done = process("dhcpd").mark("discover_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_request_start = process("dhcpd").mark("request_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_request_done = process("dhcpd").mark("request_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_release_start = process("dhcpd").mark("release_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_release_done = process("dhcpd").mark("release_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_decline_start = process("dhcpd").mark("decline_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_decline_done = process("dhcpd").mark("decline_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_inform_start = process("dhcpd").mark("inform_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_inform_done = process("dhcpd").mark("inform_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_nak_lease_start = process("dhcpd").mark("nak_lease_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_nak_lease_done = process("dhcpd").mark("nak_lease_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_ack_lease_start = process("dhcpd").mark("ack_lease_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_ack_lease_done = process("dhcpd").mark("ack_lease_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_reply_start = process("dhcpd").mark("reply_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_reply_done = process("dhcpd").mark("reply_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_find_lease_start = process("dhcpd").mark("find_lease_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_find_lease_done = process("dhcpd").mark("find_lease_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_solicit_start = process("dhcpd").mark("6_solicit_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_solicit_done = process("dhcpd").mark("6_solicit_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_request_start = process("dhcpd").mark("6_request_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_request_done = process("dhcpd").mark("6_request_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_confirm_start = process("dhcpd").mark("6_confirm_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_confirm_done = process("dhcpd").mark("6_confirm_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_renew_start = process("dhcpd").mark("6_renew_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_renew_done = process("dhcpd").mark("6_renew_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_rebind_start = process("dhcpd").mark("6_rebind_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_rebind_done = process("dhcpd").mark("6_rebind_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_decline_start = process("dhcpd").mark("6_decline_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_decline_done = process("dhcpd").mark("6_decline_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_release_start = process("dhcpd").mark("6_release_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_release_done = process("dhcpd").mark("6_release_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_information_request_start = process("dhcpd").mark("6_information_request_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_information_request_done = process("dhcpd").mark("6_information_request_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_relay_forw_start = process("dhcpd").mark("6_relay_forw_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_relay_forw_done = process("dhcpd").mark("6_relay_forw_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_failover_pool_dobalance_start = process("dhcpd").mark("failover_pool_dobalance_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_failover_pool_dobalance_done = process("dhcpd").mark("failover_pool_dobalance_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++
++probe dhcpd_failover_set_state_start = process("dhcpd").mark("failover_set_state_start")
++{
++ state = $arg1;
++ new_state = $arg2;
++ probestr = sprintf("%s(state=%d, new_state=%d)", $$name, state, new_state);
++}
++
++probe dhcpd_failover_set_state_done = process("dhcpd").mark("failover_set_state_done")
++{
++ probestr = sprintf("%s", $$name);
++}
+diff -up dhcp-4.2.4b1/tapset/Makefile.am.systemtap dhcp-4.2.4b1/tapset/Makefile.am
+--- dhcp-4.2.4b1/tapset/Makefile.am.systemtap 2012-04-16 17:46:10.957226527 +0200
++++ dhcp-4.2.4b1/tapset/Makefile.am 2012-04-16 17:46:10.957226527 +0200
+@@ -0,0 +1,26 @@
++# Makefile.am for dhcp/tapset
++# Jiri Popelka
++
++.PHONY: clean-local install-data-hook uninstall-local
++
++#
++EXTRA_DIST = dhcpd.stp
++TAPSET_FILES = $(EXTRA_DIST)
++TAPSET_INSTALL_DIR = $(DESTDIR)@ABS_TAPSET_DIR@
++
++if ENABLE_SYSTEMTAP
++all-local: $(TAPSET_FILES)
++
++clean-local:
++
++install-data-hook:
++ $(MKDIR_P) $(TAPSET_INSTALL_DIR)
++ $(INSTALL_DATA) $(TAPSET_FILES) $(TAPSET_INSTALL_DIR)
++
++uninstall-local:
++ @list='$(TAPSET_FILES)'; for p in $$list; do \
++ echo " rm -f '$(TAPSET_INSTALL_DIR)/$$p'"; \
++ rm -f "$(TAPSET_INSTALL_DIR)/$$p"; \
++ done
++endif
++
diff --git a/dhcp/patches/dhcp-4.2.4-unicast-bootp.patch b/dhcp/patches/dhcp-4.2.4-unicast-bootp.patch
new file mode 100644
index 0000000..69ab4c8
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.4-unicast-bootp.patch
@@ -0,0 +1,101 @@
+diff -up dhcp-4.2.4b1/server/bootp.c.unicast dhcp-4.2.4b1/server/bootp.c
+--- dhcp-4.2.4b1/server/bootp.c.unicast 2012-04-10 23:27:06.000000000 +0200
++++ dhcp-4.2.4b1/server/bootp.c 2012-04-16 17:28:42.095919022 +0200
+@@ -59,6 +59,7 @@ void bootp (packet)
+ char msgbuf [1024];
+ int ignorep;
+ int peer_has_leases = 0;
++ int norelay = 0;
+
+ if (packet -> raw -> op != BOOTREQUEST)
+ return;
+@@ -74,7 +75,7 @@ void bootp (packet)
+ ? inet_ntoa (packet -> raw -> giaddr)
+ : packet -> interface -> name);
+
+- if (!locate_network (packet)) {
++ if ((norelay = locate_network (packet)) == 0) {
+ log_info ("%s: network unknown", msgbuf);
+ return;
+ }
+@@ -399,6 +400,15 @@ void bootp (packet)
+
+ goto out;
+ }
++ } else if (norelay == 2) {
++ to.sin_addr = raw.ciaddr;
++ to.sin_port = remote_port;
++ if (fallback_interface) {
++ result = send_packet (fallback_interface, NULL, &raw,
++ outgoing.packet_length, from,
++ &to, &hto);
++ goto out;
++ }
+
+ /* If it comes from a client that already knows its address
+ and is not requesting a broadcast response, and we can
+diff -up dhcp-4.2.4b1/server/dhcp.c.unicast dhcp-4.2.4b1/server/dhcp.c
+--- dhcp-4.2.4b1/server/dhcp.c.unicast 2012-03-09 12:28:12.000000000 +0100
++++ dhcp-4.2.4b1/server/dhcp.c 2012-04-16 17:26:55.067418285 +0200
+@@ -4299,6 +4299,7 @@ int locate_network (packet)
+ struct data_string data;
+ struct subnet *subnet = (struct subnet *)0;
+ struct option_cache *oc;
++ int norelay = 0;
+
+ /* See if there's a Relay Agent Link Selection Option, or a
+ * Subnet Selection Option. The Link-Select and Subnet-Select
+@@ -4314,12 +4315,24 @@ int locate_network (packet)
+ from the interface, if there is one. If not, fail. */
+ if (!oc && !packet -> raw -> giaddr.s_addr) {
+ if (packet -> interface -> shared_network) {
+- shared_network_reference
+- (&packet -> shared_network,
+- packet -> interface -> shared_network, MDL);
+- return 1;
++ struct in_addr any_addr;
++ any_addr.s_addr = INADDR_ANY;
++
++ if (!packet -> packet_type && memcmp(&packet -> raw -> ciaddr, &any_addr, 4)) {
++ struct iaddr cip;
++ memcpy(cip.iabuf, &packet -> raw -> ciaddr, 4);
++ cip.len = 4;
++ if (!find_grouped_subnet(&subnet, packet->interface->shared_network, cip, MDL))
++ norelay = 2;
++ }
++
++ if (!norelay) {
++ shared_network_reference(&packet -> shared_network, packet -> interface -> shared_network, MDL);
++ return 1;
++ }
++ } else {
++ return 0;
+ }
+- return 0;
+ }
+
+ /* If there's an option indicating link connection, and it's valid,
+@@ -4342,7 +4355,10 @@ int locate_network (packet)
+ data_string_forget (&data, MDL);
+ } else {
+ ia.len = 4;
+- memcpy (ia.iabuf, &packet -> raw -> giaddr, 4);
++ if (norelay)
++ memcpy (ia.iabuf, &packet->raw->ciaddr, 4);
++ else
++ memcpy (ia.iabuf, &packet->raw->giaddr, 4);
+ }
+
+ /* If we know the subnet on which the IP address lives, use it. */
+@@ -4350,7 +4366,10 @@ int locate_network (packet)
+ shared_network_reference (&packet -> shared_network,
+ subnet -> shared_network, MDL);
+ subnet_dereference (&subnet, MDL);
+- return 1;
++ if (norelay)
++ return norelay;
++ else
++ return 1;
+ }
+
+ /* Otherwise, fail. */
diff --git a/dhcp/systemd/dhcpd.service b/dhcp/systemd/dhcpd.service
index 51f1a56..d2fdd03 100644
--- a/dhcp/systemd/dhcpd.service
+++ b/dhcp/systemd/dhcpd.service
@@ -1,9 +1,10 @@
[Unit]
Description=DHCPv4 Server Daemon
-After=syslog.target network.target
+After=network.target
[Service]
-ExecStart=/usr/sbin/dhcpd -d -user dhcpd -group dhcpd --no-pid
+ExecStartPre=/usr/lib/network/helpers/dhcpd-config-helper create ipv4
+ExecStart=/usr/sbin/dhcpd -d -cf /etc/dhcp/dhcpd.conf -user dhcpd -group dhcpd --no-pid
[Install]
WantedBy=multi-user.target
diff --git a/dhcp/systemd/dhcpd6.service b/dhcp/systemd/dhcpd6.service
index 0931264..54e4c27 100644
--- a/dhcp/systemd/dhcpd6.service
+++ b/dhcp/systemd/dhcpd6.service
@@ -1,9 +1,10 @@
[Unit]
Description=DHCPv6 Server Daemon
-After=syslog.target network.target
+After=network.target
[Service]
-ExecStart=/usr/sbin/dhcpd -d -6 -user dhcpd -group dhcpd --no-pid
+ExecStartPre=/usr/lib/network/helpers/dhcpd-config-helper create ipv6
+ExecStart=/usr/sbin/dhcpd -d -6 -cf /etc/dhcp/dhcpd6.conf -user dhcpd -group dhcpd --no-pid
[Install]
WantedBy=multi-user.target
diff --git a/initscripts/initscripts.nm b/initscripts/initscripts.nm
index b171219..0941a42 100644
--- a/initscripts/initscripts.nm
+++ b/initscripts/initscripts.nm
@@ -6,7 +6,7 @@
name = initscripts
epoch = 1
version = 2.99
-release = 17
+release = 18
groups = System/Boot
url =
diff --git a/initscripts/patches/0001-ipcalc-Enhance-to-implode-explode-IPv6-addresses.patch b/initscripts/patches/0001-ipcalc-Enhance-to-implode-explode-IPv6-addresses.patch
new file mode 100644
index 0000000..abba71f
--- /dev/null
+++ b/initscripts/patches/0001-ipcalc-Enhance-to-implode-explode-IPv6-addresses.patch
@@ -0,0 +1,93 @@
+From 5baf67156ccb7fed775d8bd00298a6ccaed03214 Mon Sep 17 00:00:00 2001
+From: Michael Tremer <michael.tremer(a)ipfire.org>
+Date: Sun, 9 Sep 2012 21:34:19 +0000
+Subject: [PATCH] ipcalc: Enhance to implode/explode IPv6 addresses.
+
+These functionalities are handy to work with IPv6 addresses
+in shell scripts.
+
+implode:
+Removes all leading zeroes from the IP address:
+ ::0:0:0:1 -> ::1
+
+explode:
+Adds all leading zeroes:
+ ::1 -> 0000:0000:0000:0000:0000:0000:0000:0001
+---
+ src/ipcalc.1 | 10 ++++++++++
+ src/ipcalc.c | 25 +++++++++++++++++++++++++
+ 2 files changed, 35 insertions(+), 0 deletions(-)
+
+diff --git a/src/ipcalc.1 b/src/ipcalc.1
+index 30e0b20..654e2ba 100644
+--- a/src/ipcalc.1
++++ b/src/ipcalc.1
+@@ -51,6 +51,16 @@ Show the prefix for the given mask/IP address.
+ Display the network address for the given IP address and netmask.
+
+ .TP
++\fB\-i\fR, \fB\-\-implode\fR
++Implodes the given IPv6 address. Returns the shortest possible representation
++of the given IPv6 address.
++
++.TP
++\fB\-e\fR, \fB\-\-explode\fR
++Explodes the given IPv6 address. Adds all leading zeroes and replaces
++:: with zeroes, too.
++
++.TP
+ \fB\-s\fR, \fB\-\-silent\fR
+ Don't ever display error messages.
+
+diff --git a/src/ipcalc.c b/src/ipcalc.c
+index 7316f05..c3f4604 100644
+--- a/src/ipcalc.c
++++ b/src/ipcalc.c
+@@ -218,6 +218,7 @@ int main(int argc, const char **argv) {
+ int showHostname = 0, showNetmask = 0;
+ int beSilent = 0;
+ int doCheck = 0, familyIPv4 = 0, familyIPv6 = 0;
++ int implodeIP6Address = 0, explodeIP6Address = 0;
+ int rc;
+ poptContext optCon;
+ char *ipStr, *prefixStr, *netmaskStr, *chptr;
+@@ -246,6 +247,10 @@ int main(int argc, const char **argv) {
+ "Display network prefix", },
+ { "silent", 's', 0, &beSilent, 0,
+ "Don't ever display error messages" },
++ { "implode", 'i', 0, &implodeIP6Address, 0,
++ "Implode given IPv6 address", },
++ { "explode", 'e', 0, &explodeIP6Address, 0,
++ "Explode given IPv6 address", },
+ POPT_AUTOHELP
+ { NULL, '\0', 0, 0, 0, NULL, NULL }
+ };
+@@ -472,5 +477,25 @@ int main(int argc, const char **argv) {
+ printf("HOSTNAME=%s\n", hostName);
+ }
+
++ if (implodeIP6Address) {
++ if (inet_ntop(AF_INET6, &ip6, namebuf, INET6_ADDRSTRLEN) == NULL) {
++ perror("inet_ntop error");
++ abort();
++ }
++
++ printf("ADDRESS6_IMPL=%s\n", namebuf);
++ }
++
++ if (explodeIP6Address) {
++ sprintf(namebuf, "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",
++ (int)ip6.s6_addr[0], (int)ip6.s6_addr[1], (int)ip6.s6_addr[2], (int)ip6.s6_addr[3],
++ (int)ip6.s6_addr[4], (int)ip6.s6_addr[5], (int)ip6.s6_addr[6], (int)ip6.s6_addr[7],
++ (int)ip6.s6_addr[8], (int)ip6.s6_addr[9], (int)ip6.s6_addr[10], (int)ip6.s6_addr[11],
++ (int)ip6.s6_addr[12], (int)ip6.s6_addr[13], (int)ip6.s6_addr[14], (int)ip6.s6_addr[15]
++ );
++
++ printf("ADDRESS6_EXPL=%s\n", namebuf);
++ }
++
+ return 0;
+ }
+--
+1.7.8.2
+
diff --git a/initscripts/patches/0001-ipcalc-Implement-prefix-for-IPv6.patch b/initscripts/patches/0001-ipcalc-Implement-prefix-for-IPv6.patch
new file mode 100644
index 0000000..8fbde3e
--- /dev/null
+++ b/initscripts/patches/0001-ipcalc-Implement-prefix-for-IPv6.patch
@@ -0,0 +1,84 @@
+From 027b87bd2fcfd1aa6fe48a363d51e40ff972f03d Mon Sep 17 00:00:00 2001
+From: Michael Tremer <michael.tremer(a)ipfire.org>
+Date: Sat, 15 Sep 2012 10:50:32 +0000
+Subject: [PATCH] ipcalc: Implement --prefix for IPv6.
+
+The -p option will now return the prefix of the given IPv6 address.
+
+[root@os src]# ./ipcalc -p 2001:db8:abc:123::1/64
+PREFIX6=2001:db8:abc:123::
+[root@os src]# ./ipcalc -p 2001:db8:abc:123::2/48
+PREFIX6=2001:db8:abc::
+---
+ src/ipcalc.c | 31 ++++++++++++++++++++++++++++---
+ 1 files changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/src/ipcalc.c b/src/ipcalc.c
+index c3f4604..039f4c7 100644
+--- a/src/ipcalc.c
++++ b/src/ipcalc.c
+@@ -204,6 +204,21 @@ char *get_hostname(int family, void *addr)
+ return hostinfo->h_name;
+ }
+
++void ipv6_prefix(struct in6_addr *dst, struct in6_addr *addr, unsigned int prefix) {
++ uint8_t i;
++
++ /* Make a copy to work with, because we don't want to alter the input. */
++ memcpy(dst, addr, sizeof(struct in6_addr));
++
++ for (i = 0; i < (128 - prefix) / 8; i++) {
++ dst->s6_addr[15-i] = 0;
++ }
++
++ if ((128 - prefix) % 8) {
++ dst->s6_addr[15-i] &= ~((1 << ((128 - prefix) % 8)) - 1);
++ }
++}
++
+ /*!
+ \fn main(int argc, const char **argv)
+ \brief wrapper program for ipcalc functions.
+@@ -225,7 +240,7 @@ int main(int argc, const char **argv) {
+ char *hostName = NULL;
+ char namebuf[INET6_ADDRSTRLEN+1];
+ struct in_addr ip, netmask, network, broadcast;
+- struct in6_addr ip6;
++ struct in6_addr ip6, prefix6;
+ int prefix = -1;
+ char errBuf[250];
+ struct poptOption optionsTable[] = {
+@@ -394,7 +409,7 @@ int main(int argc, const char **argv) {
+ }
+
+ if (familyIPv6 &&
+- (showBroadcast || showNetmask || showNetwork || showPrefix)) {
++ (showBroadcast || showNetmask || showNetwork)) {
+ if (!beSilent) {
+ fprintf(stderr, "ipcalc: unable to show setting for IPv6\n");
+ }
+@@ -429,10 +444,20 @@ int main(int argc, const char **argv) {
+ printf("NETMASK=%s\n", namebuf);
+ }
+
+- if (showPrefix) {
++ if (showPrefix && familyIPv4) {
+ if (prefix == -1)
+ prefix = mask2prefix(ip);
+ printf("PREFIX=%d\n", prefix);
++
++ } else if (showPrefix && familyIPv6) {
++ ipv6_prefix(&prefix6, &ip6, prefix);
++
++ if (inet_ntop(AF_INET6, &prefix6, namebuf, INET6_ADDRSTRLEN) == NULL) {
++ perror("inet_ntop error");
++ abort();
++ }
++
++ printf("PREFIX6=%s\n", namebuf);
+ }
+
+ if (showBroadcast) {
+--
+1.7.8.2
+
diff --git a/network/network.nm b/network/network.nm
index d082a2c..0510263 100644
--- a/network/network.nm
+++ b/network/network.nm
@@ -5,7 +5,7 @@
name = network
epoch = 1
-version = 004
+version = 005
release = 1
arch = noarch
@@ -37,8 +37,7 @@ packages
requires
aiccu
bash >= 4.0
- bridge-utils
- dhcp
+ dhcp >= 4.2.4-1
ebtables
hostapd
iproute2
@@ -52,9 +51,8 @@ packages
sqlite
systemd-units
tunctl
- vlan
- wpa_supplicant
- /usr/bin/ipcalc
+ wpa_supplicant >= 1.0-2
+ /usr/bin/ipcalc >= 2.99-18
/usr/bin/logger
end
diff --git a/wpa_supplicant/systemd/wpa_supplicant@.service b/wpa_supplicant/systemd/wpa_supplicant@.service
new file mode 100644
index 0000000..b3bd340
--- /dev/null
+++ b/wpa_supplicant/systemd/wpa_supplicant@.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=wpa_supplicant for %I.
+
+[Service]
+ExecStartPre=/usr/lib/network/helpers/wpa_supplicant-config-helper create %I
+ExecStart=/usr/lib/network/helpers/wpa_supplicant %I
+ExecStopPost=/usr/lib/network/helpers/wpa_supplicant-config-helper remove %I
+PIDFile=/run/wpa_supplicant-%I.pid
+Restart=on-failure
+UtmpIdentifier=%I
+KillMode=process
diff --git a/wpa_supplicant/wpa_supplicant.nm b/wpa_supplicant/wpa_supplicant.nm
index 92fac58..41f2ad6 100644
--- a/wpa_supplicant/wpa_supplicant.nm
+++ b/wpa_supplicant/wpa_supplicant.nm
@@ -5,7 +5,7 @@
name = wpa_supplicant
version = 1.0
-release = 1
+release = 2
groups = Sytem/Base
url = http://hostap.epitest.fi/releases/
@@ -53,6 +53,8 @@ end
packages
package %{name}
+ requires += network >= 1:005
+ end
package %{name}-debuginfo
template DEBUGINFO
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. c08a5fb64f9b6359f63dbc35168e89e31e0aa7d0
by gitï¼ ipfire.org 03 Oct '12
by gitï¼ ipfire.org 03 Oct '12
03 Oct '12
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via c08a5fb64f9b6359f63dbc35168e89e31e0aa7d0 (commit)
via a012d85175067ac6a1add0a02035299a90d0e7f7 (commit)
from 7af86c9c032331d30f1cf8112e14f68729947fc8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c08a5fb64f9b6359f63dbc35168e89e31e0aa7d0
Author: Kim Barthel <kbarthel(a)ipfire.org>
Date: Wed Oct 3 15:38:09 2012 +0200
Flex: Updated to the latest stable release 2.5.37
Fixes Bug #10227
commit a012d85175067ac6a1add0a02035299a90d0e7f7
Author: Kim Barthel <kbarthel(a)ipfire.org>
Date: Wed Oct 3 15:13:28 2012 +0200
less: updated to the latest stable version 451
Add ESC-F command to keep reading data until a pattern is found.
Use exit code of LESSOPEN script if LESSOPEN starts with "||".
When up/down arrow is used on the command line immediately after typing text, the next command starting with that text is found.
Add support for GNU regex.
Add configure option --with-regex=none and fix compile errors when compiling with no regex library.
Fix bugs handling SGR sequences in Win32.
Fix possible crashes caused by malformed LESSOPEN or LESSCLOSE variables.
Fix bug highlighting text which is discontiguous in the file due to backspace processing.
Fix bug in displaying status column when scrolling backwards with -J and -S in effect.
Fixes bug #10226
-----------------------------------------------------------------------
Summary of changes:
flex/flex.nm | 2 +-
flex/patches/flex-2.5.35-gcc44-1.patch | 24 --------
flex/patches/flex-2.5.36-bison-2.6.1.patch | 88 ++++++++++++++++++++++++++++
less/less.nm | 6 +-
4 files changed, 92 insertions(+), 28 deletions(-)
delete mode 100644 flex/patches/flex-2.5.35-gcc44-1.patch
create mode 100644 flex/patches/flex-2.5.36-bison-2.6.1.patch
Difference in files:
diff --git a/flex/flex.nm b/flex/flex.nm
index fa2578a..eaef5a2 100644
--- a/flex/flex.nm
+++ b/flex/flex.nm
@@ -4,7 +4,7 @@
###############################################################################
name = flex
-version = 2.5.36
+version = 2.5.37
release = 1
groups = Development/Tools
diff --git a/flex/patches/flex-2.5.35-gcc44-1.patch b/flex/patches/flex-2.5.35-gcc44-1.patch
deleted file mode 100644
index 8f0e80f..0000000
--- a/flex/patches/flex-2.5.35-gcc44-1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Submitted by: Matt Burgess (matthew at linuxfromscratch dot org)
-Date: 2009-05-03
-Initial Package Version: 2.5.35
-Origin: Matt Burgess
-Upstream Status: Submitted (attached to sourceforge bug 2178663)
-Description: Fixes an error caused by header cleanups in GCC 4.4.0 that is
- evident from the test suite and would affect any C++ lexers
- generated by Flex. Without this patch, Flex will generate lexers
- containing references to the 'EOF' symbol without including the
- necessary C++ header file, leading to:
-
- error: 'EOF' was not declared in this scope
-
-diff -Naur flex-2.5.35.orig/skel.c flex-2.5.35/skel.c
---- flex-2.5.35.orig/skel.c 2008-02-26 21:34:19.000000000 +0000
-+++ flex-2.5.35/skel.c 2009-05-03 15:18:14.000000000 +0000
-@@ -284,6 +284,7 @@
- "/* begin standard C++ headers. */",
- "#include <iostream> ",
- "#include <errno.h>",
-+ "#include <cstdio>",
- "#include <cstdlib>",
- "#include <cstring>",
- "/* end standard C++ headers. */",
diff --git a/flex/patches/flex-2.5.36-bison-2.6.1.patch b/flex/patches/flex-2.5.36-bison-2.6.1.patch
new file mode 100644
index 0000000..e7cdff6
--- /dev/null
+++ b/flex/patches/flex-2.5.36-bison-2.6.1.patch
@@ -0,0 +1,88 @@
+diff -up flex-2.5.36/tests/test-bison-yylloc/main.c~ flex-2.5.36/tests/test-bison-yylloc/main.c
+--- flex-2.5.36/tests/test-bison-yylloc/main.c~ 2002-06-25 21:37:06.000000000 +0200
++++ flex-2.5.36/tests/test-bison-yylloc/main.c 2012-07-31 18:53:22.007394045 +0200
+@@ -21,8 +21,6 @@
+ #include "parser.h"
+ #include "scanner.h"
+
+-extern int testparse(yyscan_t);
+-
+ int main ( int argc, char** argv )
+ {
+ yyscan_t scanner;
+diff -up flex-2.5.36/tests/test-bison-yylloc/parser.y~ flex-2.5.36/tests/test-bison-yylloc/parser.y
+--- flex-2.5.36/tests/test-bison-yylloc/parser.y~ 2002-07-25 02:43:47.000000000 +0200
++++ flex-2.5.36/tests/test-bison-yylloc/parser.y 2012-08-01 01:06:53.093155586 +0200
+@@ -21,6 +21,8 @@
+ * PURPOSE.
+ */
+
++%parse-param { void* scanner }
++
+ /*
+ How to compile:
+ bison --defines --output-file="parser.c" --name-prefix="test" parser.y
+@@ -32,10 +34,8 @@
+ #include "config.h"
+
+ #define YYERROR_VERBOSE 1
+-#define YYPARSE_PARAM scanner
+ #define YYLEX_PARAM scanner
+
+-int yyerror(char* msg);
+ extern int testget_lineno(void*);
+
+
+@@ -89,7 +89,7 @@ line:
+
+ %%
+
+-int yyerror(char* msg) {
++int yyerror(void* scanner, char* msg) {
+ fprintf(stderr,"%s\n",msg);
+ return 0;
+ }
+diff -up flex-2.5.36/tests/test-bison-yylval/main.c~ flex-2.5.36/tests/test-bison-yylval/main.c
+--- flex-2.5.36/tests/test-bison-yylval/main.c~ 2002-06-25 21:37:06.000000000 +0200
++++ flex-2.5.36/tests/test-bison-yylval/main.c 2012-08-01 01:10:02.015510280 +0200
+@@ -24,8 +24,6 @@
+ #include "parser.h"
+ #include "scanner.h"
+
+-extern int testparse(yyscan_t);
+-
+ int main ( int argc, char** argv )
+ {
+ yyscan_t scanner;
+diff -up flex-2.5.36/tests/test-bison-yylval/parser.y~ flex-2.5.36/tests/test-bison-yylval/parser.y
+--- flex-2.5.36/tests/test-bison-yylval/parser.y~ 2002-06-25 21:37:06.000000000 +0200
++++ flex-2.5.36/tests/test-bison-yylval/parser.y 2012-08-01 01:13:11.239867147 +0200
+@@ -25,6 +25,7 @@
+ How to compile:
+ bison --defines --output-file="parser.c" --name-prefix="test" parser.y
+ */
++%parse-param { void* scanner }
+ %{
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -32,11 +33,8 @@
+ #include "config.h"
+
+ #define YYERROR_VERBOSE 1
+-#define YYPARSE_PARAM scanner
+ #define YYLEX_PARAM scanner
+
+-int yyerror(char* msg);
+-
+
+ /* A dummy function. A check against seg-faults in yylval->str. */
+ int process_text(char* s) {
+@@ -76,7 +74,7 @@ starttag: LT TAGNAME GT { process_
+ endtag: LTSLASH TAGNAME GT { process_text($2);free($2);} ;
+ %%
+
+-int yyerror(char* msg) {
++int yyerror(void* scanner, char* msg) {
+ fprintf(stderr,"%s\n",msg);
+ return 0;
+ }
diff --git a/less/less.nm b/less/less.nm
index a6ffab1..2e5d127 100644
--- a/less/less.nm
+++ b/less/less.nm
@@ -4,8 +4,8 @@
###############################################################################
name = less
-version = 444
-release = 2
+version = 451
+release = 1
groups = Applications/Text
url = http://www.greenwoodsoftware.com/less/
@@ -20,7 +20,7 @@ description
example, vi).
end
-source_dl =
+source_dl = http://www.greenwoodsoftware.com/less/
build
requires
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 79117dc15f51f12163f061e222bb02d77fa9b06d
by gitï¼ ipfire.org 03 Oct '12
by gitï¼ ipfire.org 03 Oct '12
03 Oct '12
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, thirteen has been updated
via 79117dc15f51f12163f061e222bb02d77fa9b06d (commit)
via cdd31b0871663337611424302ee6f0dcc109a81d (commit)
via d22a2dc4c49dfb68e7f171d8bd8395500292835e (commit)
via 3905a9b7544a09b07af86e2ad2e5af75ecdefa6d (commit)
via 689383f9c9505636c471f98dc0ad45d2c15bebfd (commit)
via 9b4bd0e29e8f8f743884a327b0a90d2124a7ff97 (commit)
via 5122dafe9d1816b3d06135fc14a008f6115d0035 (commit)
via 5fc15be081a86a83356cd1ba97f22361468b5e5f (commit)
via 619f637be745adc17928e8ec03972f92a1d58a03 (commit)
via 6325b06b17d6033afa42b4139192c48974e63a75 (commit)
from 7778e4da40e18c786333bdc28aba1752af3c87b8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 79117dc15f51f12163f061e222bb02d77fa9b06d
Merge: 7778e4d cdd31b0
Author: Arne Fitzenreiter <Arne_F(a)ipfire.org>
Date: Wed Oct 3 16:50:36 2012 +0200
Merge remote-tracking branch 'origin/next' into thirteen
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/{61 => 63}/filelists/GeoIP | 0
config/rootfiles/core/63/filelists/inetutils | 1 +
lfs/GeoIP | 4 ++--
make.sh | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
copy config/rootfiles/core/{61 => 63}/filelists/GeoIP (100%)
create mode 120000 config/rootfiles/core/63/filelists/inetutils
Difference in files:
diff --git a/config/rootfiles/core/63/filelists/GeoIP b/config/rootfiles/core/63/filelists/GeoIP
new file mode 100644
index 0000000..0258236
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/GeoIP
@@ -0,0 +1 @@
+usr/local/share/GeoIP/GeoIP.dat
diff --git a/config/rootfiles/core/63/filelists/inetutils b/config/rootfiles/core/63/filelists/inetutils
new file mode 120000
index 0000000..bcd329b
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/inetutils
@@ -0,0 +1 @@
+../../../common/inetutils
\ No newline at end of file
diff --git a/lfs/GeoIP b/lfs/GeoIP
index 41a82e9..3dd7e6f 100644
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -25,7 +25,7 @@
include Config
VER = 1.17
-DATVER = 05092012
+DATVER = 02102012
THISAPP = Geo-IP-PurePerl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
$(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
-GeoIP.dat-$(DATVER).gz_MD5 = c053f11cb8383fb8f4826591b0cbae3d
+GeoIP.dat-$(DATVER).gz_MD5 = 371c7ea4a8c8b963594ec3031e798696
install : $(TARGET)
diff --git a/make.sh b/make.sh
index 299ee6d..b0f8b31 100755
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.13" # Version number
CORE="63" # Core Level (Filename)
-PAKFIRE_CORE="62" # Core Level (PAKFIRE)
+PAKFIRE_CORE="63" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, master, updated. cdd31b0871663337611424302ee6f0dcc109a81d
by gitï¼ ipfire.org 03 Oct '12
by gitï¼ ipfire.org 03 Oct '12
03 Oct '12
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via cdd31b0871663337611424302ee6f0dcc109a81d (commit)
via d22a2dc4c49dfb68e7f171d8bd8395500292835e (commit)
via 3905a9b7544a09b07af86e2ad2e5af75ecdefa6d (commit)
via 689383f9c9505636c471f98dc0ad45d2c15bebfd (commit)
via 102d54873b6089cf6ff40d55dcd8e620f426c4a3 (commit)
via 5bf93aaf1ed38f0a89353a7728c2ddfd13c27c14 (commit)
via 656ab283146cd4355165561c4d9e414bd17bce3d (commit)
via b96220a4274284723db83a2b73dbda1ff4adfd37 (commit)
via c7d6609dc0196d9cc87b2013c0bee039574b0bea (commit)
via 789e6f5c8ebf3eacebf40d56f0b972df851e9d40 (commit)
via 1cded5eefd1516f5e35f16086b4fde737907e20f (commit)
via 00f9fa160d2089ddb5ed09ec7dcec35af94f76bc (commit)
via e851b1c35c1a7962a9087b7e0c78fb1410c42037 (commit)
via e5d406ab9edb68599069389ee39f333d77fc68fe (commit)
via 6de056b1de4b8dc507a54dc8200c94d4dff0841c (commit)
via 082b492eccbded95ad3ae1021bbe96c3c5671805 (commit)
via 78ab9b049f6697ff168cfbde1074b7a440b21b36 (commit)
via 1de5c9454bc7daaa238bdff88126e1ffb95ef285 (commit)
via 3d8f85ec45d6a4b405415081cfe840f5ed599e50 (commit)
via 180557381b64d0d84d207a3963e2b0aee9921f80 (commit)
via 0a22737a9414654f70e479aee4144737dfeaf2d9 (commit)
via 26c8b40955b104d7d747d4a965f7ab4178dcae3b (commit)
via ee8e0346a167c4c1c78a1fef217196db838df8dd (commit)
via c7fa84917f1ab16ab01c33a09ca2d76cf53f22d7 (commit)
via 0e1a4446254ee0c6c3573670adb0bcc08591ed8d (commit)
via 9b4bd0e29e8f8f743884a327b0a90d2124a7ff97 (commit)
via eaaa6652ccfca472e413cd768ff170fa88637471 (commit)
via b52f6eb2bd8a4ab57ca1d6b30ac064c87330adff (commit)
via 19b630e4ca96bd287d2504c2f527c50c142ed451 (commit)
via 5122dafe9d1816b3d06135fc14a008f6115d0035 (commit)
via 5fc15be081a86a83356cd1ba97f22361468b5e5f (commit)
via 619f637be745adc17928e8ec03972f92a1d58a03 (commit)
via 6325b06b17d6033afa42b4139192c48974e63a75 (commit)
from 83aefc12ddcc59470f151f833df0474ed1617108 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cdd31b0871663337611424302ee6f0dcc109a81d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Oct 3 16:38:32 2012 +0200
core63: add inetutils to updater.
commit d22a2dc4c49dfb68e7f171d8bd8395500292835e
Merge: 9b4bd0e 3905a9b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Oct 3 16:32:02 2012 +0200
Merge branch 'next' into core63
commit 3905a9b7544a09b07af86e2ad2e5af75ecdefa6d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Oct 3 16:29:43 2012 +0200
finished core63.
commit 689383f9c9505636c471f98dc0ad45d2c15bebfd
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Oct 3 16:28:50 2012 +0200
GeoIP: update datebase to 02102012.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/apache2 | 12 +-
config/rootfiles/common/dhcp | 50 +-
config/rootfiles/common/inetutils | 2 -
config/rootfiles/core/{55 => 63}/exclude | 1 +
config/rootfiles/core/{54 => 63}/filelists/GeoIP | 0
config/rootfiles/core/{52 => 63}/filelists/apache2 | 0
.../{oldcore/51 => core/63}/filelists/dhcp | 0
config/rootfiles/core/{58 => 63}/filelists/files | 4 +-
.../rootfiles/core/{54 => 63}/filelists/fireinfo | 0
config/rootfiles/core/63/filelists/inetutils | 1 +
config/rootfiles/core/{52 => 63}/meta | 0
config/rootfiles/core/{62 => 63}/update.sh | 7 +-
config/rootfiles/{core => oldcore}/52/exclude | 0
.../{core/53 => oldcore/52}/filelists/apache2 | 0
.../{core => oldcore}/52/filelists/ethtool | 0
.../rootfiles/{core => oldcore}/52/filelists/files | 0
.../rootfiles/{core => oldcore}/52/filelists/squid | 0
config/rootfiles/{core/53 => oldcore/52}/meta | 0
config/rootfiles/{core => oldcore}/52/update.sh | 0
config/rootfiles/{core => oldcore}/53/exclude | 0
.../{core/57 => oldcore/53}/filelists/apache2 | 0
.../rootfiles/{core => oldcore}/53/filelists/files | 0
.../rootfiles/{core => oldcore}/53/filelists/gmp | 0
.../53/filelists/i586/compat-wireless | 0
.../{core => oldcore}/53/filelists/i586/gcc | 0
.../{core => oldcore}/53/filelists/i586/glibc | 0
.../{core => oldcore}/53/filelists/i586/kvm-kmod | 0
.../{core => oldcore}/53/filelists/openvpn | 0
.../{core => oldcore}/53/filelists/strongswan | 0
.../{core => oldcore}/53/filelists/usb_modeswitch | 0
.../53/filelists/usb_modeswitch_data | 0
config/rootfiles/{core/54 => oldcore/53}/meta | 0
config/rootfiles/{core => oldcore}/53/update.sh | 0
config/rootfiles/{core => oldcore}/54/exclude | 0
.../{core/58 => oldcore/54}/filelists/GeoIP | 0
.../54/filelists/armv5tel/intelnet-modules | 0
.../rootfiles/{core => oldcore}/54/filelists/daq | 0
.../{core => oldcore}/54/filelists/dracut | 0
.../rootfiles/{core => oldcore}/54/filelists/files | 0
.../{core/58 => oldcore/54}/filelists/fireinfo | 0
.../{core => oldcore}/54/filelists/fw_ath9k_htc | 0
.../54/filelists/i586/intelnet-modules | 0
.../{core => oldcore}/54/filelists/smartmontools | 0
.../rootfiles/{core => oldcore}/54/filelists/snort | 0
.../rootfiles/{core => oldcore}/54/filelists/squid | 0
.../{core => oldcore}/54/filelists/strongswan | 0
.../{core => oldcore}/54/filelists/tzdata | 0
config/rootfiles/{core/55 => oldcore/54}/meta | 0
config/rootfiles/{core => oldcore}/54/update.sh | 0
config/rootfiles/{core => oldcore}/55/exclude | 0
.../rootfiles/{core => oldcore}/55/filelists/files | 0
.../{core => oldcore}/55/filelists/openssh | 0
.../{core => oldcore}/55/filelists/openssl | 0
config/rootfiles/{core/56 => oldcore/55}/meta | 0
config/rootfiles/{core => oldcore}/55/update.sh | 0
config/rootfiles/{core => oldcore}/56/exclude | 0
.../{core => oldcore}/56/filelists/Crypt-PasswdMD5 | 0
.../rootfiles/{core => oldcore}/56/filelists/files | 0
.../{core => oldcore}/56/filelists/openssh | 0
.../{core => oldcore}/56/filelists/openssl | 0
.../{core => oldcore}/56/filelists/usb_modeswitch | 0
.../56/filelists/usb_modeswitch_data | 0
config/rootfiles/{core/57 => oldcore/56}/meta | 0
config/rootfiles/{core => oldcore}/56/update.sh | 0
config/rootfiles/{core => oldcore}/57/exclude | 0
.../{core/52 => oldcore/57}/filelists/apache2 | 0
.../rootfiles/{core => oldcore}/57/filelists/files | 0
.../rootfiles/{core => oldcore}/57/filelists/php | 0
.../rootfiles/{core => oldcore}/57/filelists/squid | 0
.../{core => oldcore}/57/filelists/strongswan | 0
.../rootfiles/{core => oldcore}/57/filelists/vim | 0
config/rootfiles/{core/58 => oldcore/57}/meta | 0
config/rootfiles/{core => oldcore}/57/update.sh | 0
config/rootfiles/{core => oldcore}/58/exclude | 0
.../{core/59 => oldcore/58}/filelists/GeoIP | 0
.../{core => oldcore}/58/filelists/Net-Telnet | 0
.../58/filelists/armv5tel/cryptodev | 0
.../rootfiles/{core => oldcore}/58/filelists/files | 0
.../{core/54 => oldcore/58}/filelists/fireinfo | 0
.../{core => oldcore}/58/filelists/hwdata | 0
.../{core => oldcore}/58/filelists/i586/cryptodev | 0
.../{core => oldcore}/58/filelists/libpng | 0
.../{core => oldcore}/58/filelists/openssh | 0
.../{core => oldcore}/58/filelists/openssl | 0
.../{core => oldcore}/58/filelists/openvpn | 0
.../{core => oldcore}/58/filelists/strongswan | 0
.../{core => oldcore}/58/filelists/usb_modeswitch | 0
config/rootfiles/{core/59 => oldcore/58}/meta | 0
config/rootfiles/{core => oldcore}/58/update.sh | 0
config/rootfiles/{core => oldcore}/59/exclude | 0
.../{core/54 => oldcore/59}/filelists/GeoIP | 0
.../{core => oldcore}/59/filelists/Net-Telnet | 0
.../rootfiles/{core => oldcore}/59/filelists/files | 0
.../{core => oldcore}/59/filelists/openssh | 0
.../{core => oldcore}/59/filelists/openssl | 0
.../rootfiles/{core => oldcore}/59/filelists/php | 0
.../{core => oldcore}/59/filelists/python | 0
.../{core => oldcore}/59/filelists/strongswan | 0
config/rootfiles/{core/52 => oldcore/59}/meta | 0
config/rootfiles/{core => oldcore}/59/update.sh | 0
config/rootfiles/packages/clamav | 6 +-
config/rootfiles/packages/telnet | 4 +
html/cgi-bin/index.cgi | 17 +-
html/cgi-bin/ovpnmain.cgi | 21 +-
lfs/GeoIP | 4 +-
lfs/apache2 | 11 +-
lfs/clamav | 6 +-
lfs/dhcp | 59 +-
lfs/fireinfo | 4 +-
lfs/fping | 6 +-
lfs/inetutils | 2 +-
lfs/minidlna | 4 +-
lfs/samba | 6 +-
lfs/{iftop => telnet} | 34 +-
make.sh | 7 +-
src/initscripts/init.d/network-vlans | 15 +-
src/patches/dhcp-4.2.0-PPP.patch | 150 ++
src/patches/dhcp-4.2.0-UseMulticast.patch | 229 +++
src/patches/dhcp-4.2.0-add_timeout_when_NULL.patch | 14 +
.../dhcp-4.2.0-default-requested-options.patch | 44 +
.../dhcp-4.2.0-dhclient-decline-backoff.patch | 63 +
src/patches/dhcp-4.2.0-errwarn-message.patch | 30 +
src/patches/dhcp-4.2.0-garbage-chars.patch | 12 +
src/patches/dhcp-4.2.0-honor-expired.patch | 49 +
src/patches/dhcp-4.2.0-inherit-leases.patch | 34 +
src/patches/dhcp-4.2.0-logpid.patch | 12 +
.../dhcp-4.2.0-missing-ipv6-not-fatal.patch | 40 +
src/patches/dhcp-4.2.0-noprefixavail.patch | 140 ++
src/patches/dhcp-4.2.0-paths.patch | 45 +
src/patches/dhcp-4.2.0-release-by-ifup.patch | 85 +
src/patches/dhcp-4.2.0-unicast-bootp.patch | 99 ++
src/patches/dhcp-4.2.1-64_bit_lease_parse.patch | 94 ++
src/patches/dhcp-4.2.1-invalid-dhclient-conf.patch | 12 +
src/patches/dhcp-4.2.1-manpages.patch | 264 +++
src/patches/dhcp-4.2.1-retransmission.patch | 48 +
src/patches/dhcp-4.2.1-sendDecline.patch | 231 +++
src/patches/dhcp-4.2.2-CLOEXEC.patch | 423 +++++
src/patches/dhcp-4.2.2-capability.patch | 323 ++++
src/patches/dhcp-4.2.2-dhclient-usage.patch | 14 +
src/patches/dhcp-4.2.2-gpxe-cid.patch | 132 ++
src/patches/dhcp-4.2.2-improved-xid.patch | 138 ++
src/patches/dhcp-4.2.2-lpf-ib.patch | 538 ++++++
src/patches/dhcp-4.2.2-options.patch | 401 +++++
src/patches/dhcp-4.2.2-remove-bind.patch | 149 ++
...hcp-4.2.2-rfc3442-classless-static-routes.patch | 405 +++++
src/patches/dhcp-4.2.2-sharedlib.patch | 119 ++
src/patches/dhcp-4.2.2-xen-checksum.patch | 249 +++
src/patches/netkit-telnet-0.17-ipv6.diff | 265 +++
src/patches/netkit-telnet-0.17-nodns.patch | 43 +
src/patches/netkit-telnet-0.17-reallynodns.patch | 88 +
src/patches/telnet-0.17-8bit.patch | 33 +
src/patches/telnet-0.17-CAN-2005-468_469.patch | 179 ++
src/patches/telnet-0.17-argv.patch | 12 +
src/patches/telnet-0.17-cleanup_race.patch | 11 +
src/patches/telnet-0.17-conf.patch | 23 +
src/patches/telnet-0.17-env.patch | 84 +
src/patches/telnet-0.17-errno_test_sys_bsd.patch | 24 +
src/patches/telnet-0.17-issue.patch | 81 +
src/patches/telnet-0.17-pek.patch0 | 37 +
src/patches/telnet-0.17-sa-01-49.patch | 208 +++
src/patches/telnet-client-cvs.patch0 | 1721 ++++++++++++++++++++
src/patches/telnet-gethostbyname.patch | 48 +
162 files changed, 7626 insertions(+), 100 deletions(-)
copy config/rootfiles/core/{55 => 63}/exclude (90%)
copy config/rootfiles/core/{54 => 63}/filelists/GeoIP (100%)
copy config/rootfiles/core/{52 => 63}/filelists/apache2 (100%)
copy config/rootfiles/{oldcore/51 => core/63}/filelists/dhcp (100%)
copy config/rootfiles/core/{58 => 63}/filelists/files (62%)
copy config/rootfiles/core/{54 => 63}/filelists/fireinfo (100%)
create mode 120000 config/rootfiles/core/63/filelists/inetutils
copy config/rootfiles/core/{52 => 63}/meta (100%)
copy config/rootfiles/core/{62 => 63}/update.sh (95%)
rename config/rootfiles/{core => oldcore}/52/exclude (100%)
rename config/rootfiles/{core/53 => oldcore/52}/filelists/apache2 (100%)
rename config/rootfiles/{core => oldcore}/52/filelists/ethtool (100%)
rename config/rootfiles/{core => oldcore}/52/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/52/filelists/squid (100%)
rename config/rootfiles/{core/53 => oldcore/52}/meta (100%)
rename config/rootfiles/{core => oldcore}/52/update.sh (100%)
rename config/rootfiles/{core => oldcore}/53/exclude (100%)
rename config/rootfiles/{core/57 => oldcore/53}/filelists/apache2 (100%)
rename config/rootfiles/{core => oldcore}/53/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/53/filelists/gmp (100%)
rename config/rootfiles/{core => oldcore}/53/filelists/i586/compat-wireless (100%)
rename config/rootfiles/{core => oldcore}/53/filelists/i586/gcc (100%)
rename config/rootfiles/{core => oldcore}/53/filelists/i586/glibc (100%)
rename config/rootfiles/{core => oldcore}/53/filelists/i586/kvm-kmod (100%)
rename config/rootfiles/{core => oldcore}/53/filelists/openvpn (100%)
rename config/rootfiles/{core => oldcore}/53/filelists/strongswan (100%)
rename config/rootfiles/{core => oldcore}/53/filelists/usb_modeswitch (100%)
rename config/rootfiles/{core => oldcore}/53/filelists/usb_modeswitch_data (100%)
rename config/rootfiles/{core/54 => oldcore/53}/meta (100%)
rename config/rootfiles/{core => oldcore}/53/update.sh (100%)
rename config/rootfiles/{core => oldcore}/54/exclude (100%)
rename config/rootfiles/{core/58 => oldcore/54}/filelists/GeoIP (100%)
rename config/rootfiles/{core => oldcore}/54/filelists/armv5tel/intelnet-modules (100%)
rename config/rootfiles/{core => oldcore}/54/filelists/daq (100%)
rename config/rootfiles/{core => oldcore}/54/filelists/dracut (100%)
rename config/rootfiles/{core => oldcore}/54/filelists/files (100%)
rename config/rootfiles/{core/58 => oldcore/54}/filelists/fireinfo (100%)
rename config/rootfiles/{core => oldcore}/54/filelists/fw_ath9k_htc (100%)
rename config/rootfiles/{core => oldcore}/54/filelists/i586/intelnet-modules (100%)
rename config/rootfiles/{core => oldcore}/54/filelists/smartmontools (100%)
rename config/rootfiles/{core => oldcore}/54/filelists/snort (100%)
rename config/rootfiles/{core => oldcore}/54/filelists/squid (100%)
rename config/rootfiles/{core => oldcore}/54/filelists/strongswan (100%)
rename config/rootfiles/{core => oldcore}/54/filelists/tzdata (100%)
rename config/rootfiles/{core/55 => oldcore/54}/meta (100%)
rename config/rootfiles/{core => oldcore}/54/update.sh (100%)
rename config/rootfiles/{core => oldcore}/55/exclude (100%)
rename config/rootfiles/{core => oldcore}/55/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/55/filelists/openssh (100%)
rename config/rootfiles/{core => oldcore}/55/filelists/openssl (100%)
rename config/rootfiles/{core/56 => oldcore/55}/meta (100%)
rename config/rootfiles/{core => oldcore}/55/update.sh (100%)
rename config/rootfiles/{core => oldcore}/56/exclude (100%)
rename config/rootfiles/{core => oldcore}/56/filelists/Crypt-PasswdMD5 (100%)
rename config/rootfiles/{core => oldcore}/56/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/56/filelists/openssh (100%)
rename config/rootfiles/{core => oldcore}/56/filelists/openssl (100%)
rename config/rootfiles/{core => oldcore}/56/filelists/usb_modeswitch (100%)
rename config/rootfiles/{core => oldcore}/56/filelists/usb_modeswitch_data (100%)
rename config/rootfiles/{core/57 => oldcore/56}/meta (100%)
rename config/rootfiles/{core => oldcore}/56/update.sh (100%)
rename config/rootfiles/{core => oldcore}/57/exclude (100%)
rename config/rootfiles/{core/52 => oldcore/57}/filelists/apache2 (100%)
rename config/rootfiles/{core => oldcore}/57/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/57/filelists/php (100%)
rename config/rootfiles/{core => oldcore}/57/filelists/squid (100%)
rename config/rootfiles/{core => oldcore}/57/filelists/strongswan (100%)
rename config/rootfiles/{core => oldcore}/57/filelists/vim (100%)
rename config/rootfiles/{core/58 => oldcore/57}/meta (100%)
rename config/rootfiles/{core => oldcore}/57/update.sh (100%)
rename config/rootfiles/{core => oldcore}/58/exclude (100%)
rename config/rootfiles/{core/59 => oldcore/58}/filelists/GeoIP (100%)
rename config/rootfiles/{core => oldcore}/58/filelists/Net-Telnet (100%)
rename config/rootfiles/{core => oldcore}/58/filelists/armv5tel/cryptodev (100%)
rename config/rootfiles/{core => oldcore}/58/filelists/files (100%)
rename config/rootfiles/{core/54 => oldcore/58}/filelists/fireinfo (100%)
rename config/rootfiles/{core => oldcore}/58/filelists/hwdata (100%)
rename config/rootfiles/{core => oldcore}/58/filelists/i586/cryptodev (100%)
rename config/rootfiles/{core => oldcore}/58/filelists/libpng (100%)
rename config/rootfiles/{core => oldcore}/58/filelists/openssh (100%)
rename config/rootfiles/{core => oldcore}/58/filelists/openssl (100%)
rename config/rootfiles/{core => oldcore}/58/filelists/openvpn (100%)
rename config/rootfiles/{core => oldcore}/58/filelists/strongswan (100%)
rename config/rootfiles/{core => oldcore}/58/filelists/usb_modeswitch (100%)
rename config/rootfiles/{core/59 => oldcore/58}/meta (100%)
rename config/rootfiles/{core => oldcore}/58/update.sh (100%)
rename config/rootfiles/{core => oldcore}/59/exclude (100%)
rename config/rootfiles/{core/54 => oldcore/59}/filelists/GeoIP (100%)
rename config/rootfiles/{core => oldcore}/59/filelists/Net-Telnet (100%)
rename config/rootfiles/{core => oldcore}/59/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/59/filelists/openssh (100%)
rename config/rootfiles/{core => oldcore}/59/filelists/openssl (100%)
rename config/rootfiles/{core => oldcore}/59/filelists/php (100%)
rename config/rootfiles/{core => oldcore}/59/filelists/python (100%)
rename config/rootfiles/{core => oldcore}/59/filelists/strongswan (100%)
rename config/rootfiles/{core/52 => oldcore/59}/meta (100%)
rename config/rootfiles/{core => oldcore}/59/update.sh (100%)
create mode 100644 config/rootfiles/packages/telnet
copy lfs/{iftop => telnet} (63%)
create mode 100644 src/patches/dhcp-4.2.0-PPP.patch
create mode 100644 src/patches/dhcp-4.2.0-UseMulticast.patch
create mode 100644 src/patches/dhcp-4.2.0-add_timeout_when_NULL.patch
create mode 100644 src/patches/dhcp-4.2.0-default-requested-options.patch
create mode 100644 src/patches/dhcp-4.2.0-dhclient-decline-backoff.patch
create mode 100644 src/patches/dhcp-4.2.0-errwarn-message.patch
create mode 100644 src/patches/dhcp-4.2.0-garbage-chars.patch
create mode 100644 src/patches/dhcp-4.2.0-honor-expired.patch
create mode 100644 src/patches/dhcp-4.2.0-inherit-leases.patch
create mode 100644 src/patches/dhcp-4.2.0-logpid.patch
create mode 100644 src/patches/dhcp-4.2.0-missing-ipv6-not-fatal.patch
create mode 100644 src/patches/dhcp-4.2.0-noprefixavail.patch
create mode 100644 src/patches/dhcp-4.2.0-paths.patch
create mode 100644 src/patches/dhcp-4.2.0-release-by-ifup.patch
create mode 100644 src/patches/dhcp-4.2.0-unicast-bootp.patch
create mode 100644 src/patches/dhcp-4.2.1-64_bit_lease_parse.patch
create mode 100644 src/patches/dhcp-4.2.1-invalid-dhclient-conf.patch
create mode 100644 src/patches/dhcp-4.2.1-manpages.patch
create mode 100644 src/patches/dhcp-4.2.1-retransmission.patch
create mode 100644 src/patches/dhcp-4.2.1-sendDecline.patch
create mode 100644 src/patches/dhcp-4.2.2-CLOEXEC.patch
create mode 100644 src/patches/dhcp-4.2.2-capability.patch
create mode 100644 src/patches/dhcp-4.2.2-dhclient-usage.patch
create mode 100644 src/patches/dhcp-4.2.2-gpxe-cid.patch
create mode 100644 src/patches/dhcp-4.2.2-improved-xid.patch
create mode 100644 src/patches/dhcp-4.2.2-lpf-ib.patch
create mode 100644 src/patches/dhcp-4.2.2-options.patch
create mode 100644 src/patches/dhcp-4.2.2-remove-bind.patch
create mode 100644 src/patches/dhcp-4.2.2-rfc3442-classless-static-routes.patch
create mode 100644 src/patches/dhcp-4.2.2-sharedlib.patch
create mode 100644 src/patches/dhcp-4.2.2-xen-checksum.patch
create mode 100644 src/patches/netkit-telnet-0.17-ipv6.diff
create mode 100644 src/patches/netkit-telnet-0.17-nodns.patch
create mode 100644 src/patches/netkit-telnet-0.17-reallynodns.patch
create mode 100644 src/patches/telnet-0.17-8bit.patch
create mode 100644 src/patches/telnet-0.17-CAN-2005-468_469.patch
create mode 100644 src/patches/telnet-0.17-argv.patch
create mode 100644 src/patches/telnet-0.17-cleanup_race.patch
create mode 100644 src/patches/telnet-0.17-conf.patch
create mode 100644 src/patches/telnet-0.17-env.patch
create mode 100644 src/patches/telnet-0.17-errno_test_sys_bsd.patch
create mode 100644 src/patches/telnet-0.17-issue.patch
create mode 100644 src/patches/telnet-0.17-pek.patch0
create mode 100644 src/patches/telnet-0.17-sa-01-49.patch
create mode 100644 src/patches/telnet-client-cvs.patch0
create mode 100644 src/patches/telnet-gethostbyname.patch
Difference in files:
diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 01e9bbe..802ddcb 100644
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -439,6 +439,7 @@ etc/httpd/conf/mime.types
#srv/web/ipfire/manual/images/mod_rewrite_fig2.gif
#srv/web/ipfire/manual/images/mod_rewrite_fig2.png
#srv/web/ipfire/manual/images/pixel.gif
+#srv/web/ipfire/manual/images/rewrite_backreferences.png
#srv/web/ipfire/manual/images/rewrite_rule_flow.png
#srv/web/ipfire/manual/images/right.gif
#srv/web/ipfire/manual/images/ssl_intro_fig1.gif
@@ -1051,6 +1052,7 @@ etc/httpd/conf/mime.types
#srv/web/ipfire/manual/style/css/manual-zip-100pc.css
#srv/web/ipfire/manual/style/css/manual-zip.css
#srv/web/ipfire/manual/style/css/manual.css
+#srv/web/ipfire/manual/style/css/prettify.css
#srv/web/ipfire/manual/style/faq.dtd
#srv/web/ipfire/manual/style/lang
#srv/web/ipfire/manual/style/lang.dtd
@@ -1058,6 +1060,8 @@ etc/httpd/conf/mime.types
#srv/web/ipfire/manual/style/latex/atbeginend.sty
#srv/web/ipfire/manual/style/manualpage.dtd
#srv/web/ipfire/manual/style/modulesynopsis.dtd
+#srv/web/ipfire/manual/style/scripts
+#srv/web/ipfire/manual/style/scripts/prettify.js
#srv/web/ipfire/manual/style/sitemap.dtd
#srv/web/ipfire/manual/style/version.ent
#srv/web/ipfire/manual/style/xsl
@@ -1326,7 +1330,7 @@ usr/lib/apr-util-1/apr_dbd_sqlite3.so
#usr/lib/libapr-1.la
usr/lib/libapr-1.so
usr/lib/libapr-1.so.0
-usr/lib/libapr-1.so.0.4.5
+usr/lib/libapr-1.so.0.4.6
#usr/lib/libaprutil-1.a
#usr/lib/libaprutil-1.la
usr/lib/libaprutil-1.so
@@ -1349,17 +1353,17 @@ usr/sbin/httpd
#usr/sbin/httxt2dbm
#usr/sbin/logresolve
#usr/sbin/rotatelogs
-#usr/share/man/man1/ab.1
-#usr/share/man/man1/apxs.1
#usr/share/man/man1/dbmmanage.1
#usr/share/man/man1/htdbm.1
#usr/share/man/man1/htdigest.1
#usr/share/man/man1/htpasswd.1
#usr/share/man/man1/httxt2dbm.1
-#usr/share/man/man1/logresolve.1
+#usr/share/man/man8/ab.8
#usr/share/man/man8/apachectl.8
+#usr/share/man/man8/apxs.8
#usr/share/man/man8/htcacheclean.8
#usr/share/man/man8/httpd.8
+#usr/share/man/man8/logresolve.8
#usr/share/man/man8/rotatelogs.8
#usr/share/man/man8/suexec.8
var/log/httpd
diff --git a/config/rootfiles/common/dhcp b/config/rootfiles/common/dhcp
index a165ca8..381309c 100644
--- a/config/rootfiles/common/dhcp
+++ b/config/rootfiles/common/dhcp
@@ -1,38 +1,40 @@
-etc/dhcpd.conf
-#sbin/dhclient
-#sbin/dhclient-script
+#etc/dhcp
+#etc/dhcp/dhclient.conf
+etc/dhcp/dhcpd.conf
#usr/bin/omshell
-#usr/include/dhcpctl.h
+#usr/include/dhcpctl
+#usr/include/dhcpctl/dhcpctl.h
#usr/include/isc-dhcp
-#usr/include/isc-dhcp/boolean.h
#usr/include/isc-dhcp/dst.h
-#usr/include/isc-dhcp/int.h
-#usr/include/isc-dhcp/lang.h
-#usr/include/isc-dhcp/list.h
-#usr/include/isc-dhcp/result.h
-#usr/include/isc-dhcp/types.h
#usr/include/omapip
#usr/include/omapip/alloc.h
#usr/include/omapip/buffer.h
+#usr/include/omapip/convert.h
+#usr/include/omapip/hash.h
+#usr/include/omapip/isclib.h
#usr/include/omapip/omapip.h
+#usr/include/omapip/omapip_p.h
+#usr/include/omapip/result.h
+#usr/include/omapip/trace.h
#usr/lib/libdhcpctl.a
+#usr/lib/libdst.a
#usr/lib/libomapi.a
-#usr/man/man1/omshell.1
-#usr/man/man3/dhcpctl.3
-#usr/man/man3/omapi.3
-#usr/man/man3/omshell.3
-#usr/man/man5/dhclient.conf.5
-#usr/man/man5/dhclient.leases.5
-#usr/man/man5/dhcp-eval.5
-#usr/man/man5/dhcp-options.5
-#usr/man/man5/dhcpd.conf.5
-#usr/man/man5/dhcpd.leases.5
-#usr/man/man8/dhclient-script.8
-#usr/man/man8/dhclient.8
-#usr/man/man8/dhcpd.8
-#usr/man/man8/dhcrelay.8
+#usr/sbin/dhclient
usr/sbin/dhcpd
#usr/sbin/dhcrelay
+#usr/share/man/man1/omshell.1
+#usr/share/man/man3/dhcpctl.3
+#usr/share/man/man3/omapi.3
+#usr/share/man/man5/dhclient.conf.5
+#usr/share/man/man5/dhclient.leases.5
+#usr/share/man/man5/dhcp-eval.5
+#usr/share/man/man5/dhcp-options.5
+#usr/share/man/man5/dhcpd.conf.5
+#usr/share/man/man5/dhcpd.leases.5
+#usr/share/man/man8/dhclient-script.8
+#usr/share/man/man8/dhclient.8
+#usr/share/man/man8/dhcpd.8
+#usr/share/man/man8/dhcrelay.8
#var/state
#var/state/dhcp
var/state/dhcp/dhcpd.leases
diff --git a/config/rootfiles/common/inetutils b/config/rootfiles/common/inetutils
index 426e375..3cea63c 100644
--- a/config/rootfiles/common/inetutils
+++ b/config/rootfiles/common/inetutils
@@ -4,7 +4,6 @@ bin/ping
#usr/bin/rlogin
#usr/bin/rsh
#usr/bin/talk
-#usr/bin/telnet
#usr/bin/tftp
usr/bin/whois
#usr/sbin/ftpd
@@ -13,7 +12,6 @@ usr/bin/whois
#usr/sbin/rlogind
#usr/sbin/rshd
#usr/sbin/talkd
-#usr/sbin/telnetd
#usr/sbin/tftpd
#usr/sbin/uucpd
#usr/share/info/inetutils.info
diff --git a/config/rootfiles/core/52/exclude b/config/rootfiles/core/52/exclude
deleted file mode 100644
index bb0d8c8..0000000
--- a/config/rootfiles/core/52/exclude
+++ /dev/null
@@ -1,2 +0,0 @@
-srv/web/ipfire/html/proxy.pac
-var/updatecache
diff --git a/config/rootfiles/core/52/filelists/apache2 b/config/rootfiles/core/52/filelists/apache2
deleted file mode 120000
index eef95ef..0000000
--- a/config/rootfiles/core/52/filelists/apache2
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/apache2
\ No newline at end of file
diff --git a/config/rootfiles/core/52/filelists/ethtool b/config/rootfiles/core/52/filelists/ethtool
deleted file mode 120000
index 494a53e..0000000
--- a/config/rootfiles/core/52/filelists/ethtool
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/ethtool
\ No newline at end of file
diff --git a/config/rootfiles/core/52/filelists/files b/config/rootfiles/core/52/filelists/files
deleted file mode 100644
index 8076e02..0000000
--- a/config/rootfiles/core/52/filelists/files
+++ /dev/null
@@ -1,8 +0,0 @@
-etc/system-release
-var/ipfire/langs/
-etc/rc.d/init.d/console
-usr/local/sbin/setup
-usr/local/bin/setddns.pl
-srv/web/ipfire/cgi-bin/ddns.cgi
-srv/web/ipfire/cgi-bin/proxy.cgi
-var/ipfire/graphs.pl
diff --git a/config/rootfiles/core/52/filelists/squid b/config/rootfiles/core/52/filelists/squid
deleted file mode 120000
index 2dc8372..0000000
--- a/config/rootfiles/core/52/filelists/squid
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/52/meta b/config/rootfiles/core/52/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/52/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/52/update.sh b/config/rootfiles/core/52/update.sh
deleted file mode 100644
index 412299d..0000000
--- a/config/rootfiles/core/52/update.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire 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. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2011 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-
-#
-# Remove old core updates from pakfire cache to save space...
-core=52
-for (( i=1; i<=$core; i++ ))
-do
- rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
-done
-
-#
-#Stop services
-/etc/init.d/squid stop
-/etc/init.d/apache stop
-
-#
-#Extract files
-extract_files
-
-#
-#Start services
-/etc/init.d/apache start
-/etc/init.d/squid start
-
-#
-#Update Language cache
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-
-#Rebuild module dep's
-#depmod 2.6.32.43-ipfire >/dev/null 2>&1
-#depmod 2.6.32.43-ipfire-pae >/dev/null 2>&1
-#depmod 2.6.32.43-ipfire-xen >/dev/null 2>&1
-
-#
-#Finish
-/etc/init.d/fireinfo start
-sendprofile
-#Don't report the exitcode last command
-exit 0
diff --git a/config/rootfiles/core/53/exclude b/config/rootfiles/core/53/exclude
deleted file mode 100644
index ca3adf5..0000000
--- a/config/rootfiles/core/53/exclude
+++ /dev/null
@@ -1,9 +0,0 @@
-srv/web/ipfire/html/proxy.pac
-etc/udev/rules.d/30-persistent-network.rules
-etc/ipsec.conf
-etc/ipsec.secrets
-etc/ipsec.user.conf
-etc/ipsec.user.secrets
-var/updatecache
-etc/localtime
-var/ipfire/ovpn
diff --git a/config/rootfiles/core/53/filelists/apache2 b/config/rootfiles/core/53/filelists/apache2
deleted file mode 120000
index eef95ef..0000000
--- a/config/rootfiles/core/53/filelists/apache2
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/apache2
\ No newline at end of file
diff --git a/config/rootfiles/core/53/filelists/files b/config/rootfiles/core/53/filelists/files
deleted file mode 100644
index 741254d..0000000
--- a/config/rootfiles/core/53/filelists/files
+++ /dev/null
@@ -1,26 +0,0 @@
-etc/rc.d/init.d/network
-etc/rc.d/init.d/static-routes
-etc/sysctl.conf
-etc/system-release
-etc/issue
-etc/iproute2/rt_tables
-etc/rc.d/init.d/networking/red.up/50-ovpn
-etc/rc.d/init.d/networking/red.down/10-ovpn
-srv/web/ipfire/cgi-bin/extrahd.cgi
-srv/web/ipfire/cgi-bin/index.cgi
-srv/web/ipfire/cgi-bin/outgoinggrp.cgi
-srv/web/ipfire/cgi-bin/ovpnmain.cgi
-srv/web/ipfire/cgi-bin/pakfire.cgi
-srv/web/ipfire/cgi-bin/routing.cgi
-srv/web/ipfire/cgi-bin/vpnmain.cgi
-srv/web/ipfire/cgi-bin/logs.cgi/log.dat
-var/ipfire/langs/
-usr/local/bin/ipsecctrl
-usr/local/bin/openvpnctrl
-usr/local/bin/vpn-watch
-usr/local/bin/rebuildroutes
-usr/local/sbin/setup
-var/ipfire/main/routing
-var/ipfire/menu.d/30-network.menu
-opt/pakfire/etc/pakfire.conf
-usr/local/bin/backupiso
diff --git a/config/rootfiles/core/53/filelists/gmp b/config/rootfiles/core/53/filelists/gmp
deleted file mode 120000
index 8662a89..0000000
--- a/config/rootfiles/core/53/filelists/gmp
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/gmp
\ No newline at end of file
diff --git a/config/rootfiles/core/53/filelists/i586/compat-wireless b/config/rootfiles/core/53/filelists/i586/compat-wireless
deleted file mode 100644
index 5d899bf..0000000
--- a/config/rootfiles/core/53/filelists/i586/compat-wireless
+++ /dev/null
@@ -1,359 +0,0 @@
-lib/modules/2.6.32.45-ipfire-xen/kernel/compat/compat.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/compat/compat_firmware_class.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/ath3k.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bcm203x.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bfusb.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bluecard_cs.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bpa10x.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bt3c_cs.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btmrvl.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btmrvl_sdio.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btsdio.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btuart_cs.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btusb.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/dtl1_cs.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/hci_uart.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/hci_vhci.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/atl1c/atl1c.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/atl1e/atl1e.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/atlx/atl1.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/atlx/atl2.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/b44.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/asix.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/catc.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/cdc_eem.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/cdc_ether.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/cdc_subset.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/dm9601.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/gl620a.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/hso.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/int51x1.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/kaweth.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/mcs7830.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/net1080.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/pegasus.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/plusb.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/rndis_host.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/rtl8150.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/smsc95xx.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/usbnet.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/zaurus.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/adm8211.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/at76c50x-usb.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/b43/b43.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/libipw.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwlegacy/iwl-legacy.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwlegacy/iwl3945.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwlegacy/iwl4965.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_cs.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas/usb8xxx.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/mac80211_hwsim.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/mwl8k.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/p54/p54common.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/p54/p54pci.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/p54/p54usb.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rndis_wlan.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/wl1251/wl1251.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl12xx.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/ssb/ssb.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/staging/ath6kl/ath6kl.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/staging/brcm80211/brcmfmac/brcmfmac.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/staging/brcm80211/brcmsmac/brcmsmac.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/staging/brcm80211/util/brcmutil.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/bluetooth.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/bnep/bnep.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/cmtp/cmtp.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/hidp/hidp.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/rfcomm/rfcomm.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/net/mac80211/mac80211.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/cfg80211.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/lib80211.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/lib80211_crypt_ccmp.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/lib80211_crypt_tkip.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/lib80211_crypt_wep.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/compat/compat.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/compat/compat_firmware_class.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/ath3k.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bcm203x.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bfusb.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bluecard_cs.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bpa10x.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bt3c_cs.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btmrvl.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btmrvl_sdio.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btsdio.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btuart_cs.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btusb.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/dtl1_cs.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/hci_uart.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/hci_vhci.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/atl1c/atl1c.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/atl1e/atl1e.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/atlx/atl1.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/atlx/atl2.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/b44.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/asix.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/catc.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/cdc_eem.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/cdc_ether.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/cdc_subset.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/dm9601.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/gl620a.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/hso.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/int51x1.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/kaweth.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/mcs7830.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/net1080.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/pegasus.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/plusb.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/rndis_host.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/rtl8150.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/smsc95xx.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/usbnet.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/zaurus.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/adm8211.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/at76c50x-usb.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/b43/b43.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/libipw.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwlegacy/iwl-legacy.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwlegacy/iwl3945.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwlegacy/iwl4965.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas_cs.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas/usb8xxx.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/mac80211_hwsim.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/mwl8k.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/p54/p54common.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/p54/p54pci.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/p54/p54usb.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rndis_wlan.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/wl1251/wl1251.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/wl12xx/wl12xx.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/ssb/ssb.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/staging/ath6kl/ath6kl.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/staging/brcm80211/brcmfmac/brcmfmac.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/staging/brcm80211/brcmsmac/brcmsmac.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/staging/brcm80211/util/brcmutil.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/bluetooth.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/bnep/bnep.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/cmtp/cmtp.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/hidp/hidp.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/rfcomm/rfcomm.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/net/mac80211/mac80211.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/cfg80211.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/lib80211.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/lib80211_crypt_ccmp.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/lib80211_crypt_tkip.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/lib80211_crypt_wep.ko
-lib/modules/2.6.32.45-ipfire/kernel/compat/compat.ko
-lib/modules/2.6.32.45-ipfire/kernel/compat/compat_firmware_class.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/ath3k.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bcm203x.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bfusb.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bluecard_cs.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bpa10x.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bt3c_cs.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btmrvl.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btmrvl_sdio.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btsdio.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btuart_cs.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btusb.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/dtl1_cs.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/hci_uart.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/hci_vhci.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/atl1c/atl1c.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/atl1e/atl1e.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/atlx/atl1.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/atlx/atl2.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/b44.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/asix.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/catc.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/cdc_eem.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/cdc_ether.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/cdc_subset.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/dm9601.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/gl620a.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/hso.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/int51x1.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/kaweth.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/mcs7830.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/net1080.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/pegasus.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/plusb.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/rndis_host.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/rtl8150.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/smsc95xx.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/usbnet.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/zaurus.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/adm8211.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/at76c50x-usb.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/b43/b43.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ipw2x00/libipw.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwlegacy/iwl-legacy.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwlegacy/iwl3945.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwlegacy/iwl4965.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas/libertas.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas/libertas_cs.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas/usb8xxx.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/mwl8k.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/p54/p54common.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/p54/p54pci.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/p54/p54usb.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rndis_wlan.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/wl1251/wl1251.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/wl12xx/wl12xx.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/ssb/ssb.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/staging/ath6kl/ath6kl.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/staging/brcm80211/brcmfmac/brcmfmac.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/staging/brcm80211/brcmsmac/brcmsmac.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/staging/brcm80211/util/brcmutil.ko
-lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/bluetooth.ko
-lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/bnep/bnep.ko
-lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/cmtp/cmtp.ko
-lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/hidp/hidp.ko
-lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/rfcomm/rfcomm.ko
-lib/modules/2.6.32.45-ipfire/kernel/net/mac80211/mac80211.ko
-lib/modules/2.6.32.45-ipfire/kernel/net/wireless/cfg80211.ko
-lib/modules/2.6.32.45-ipfire/kernel/net/wireless/lib80211.ko
-lib/modules/2.6.32.45-ipfire/kernel/net/wireless/lib80211_crypt_ccmp.ko
-lib/modules/2.6.32.45-ipfire/kernel/net/wireless/lib80211_crypt_tkip.ko
-lib/modules/2.6.32.45-ipfire/kernel/net/wireless/lib80211_crypt_wep.ko
-etc/udev/rules.d/50-compat_firmware.rules
-lib/udev/compat_firmware.sh
diff --git a/config/rootfiles/core/53/filelists/i586/gcc b/config/rootfiles/core/53/filelists/i586/gcc
deleted file mode 120000
index ba328e3..0000000
--- a/config/rootfiles/core/53/filelists/i586/gcc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/gcc
\ No newline at end of file
diff --git a/config/rootfiles/core/53/filelists/i586/glibc b/config/rootfiles/core/53/filelists/i586/glibc
deleted file mode 120000
index 943021f..0000000
--- a/config/rootfiles/core/53/filelists/i586/glibc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/53/filelists/i586/kvm-kmod b/config/rootfiles/core/53/filelists/i586/kvm-kmod
deleted file mode 100644
index ec75215..0000000
--- a/config/rootfiles/core/53/filelists/i586/kvm-kmod
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm.ko
-lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm-amd.ko
-lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm-intel.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm-amd.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm-intel.ko
diff --git a/config/rootfiles/core/53/filelists/openvpn b/config/rootfiles/core/53/filelists/openvpn
deleted file mode 120000
index 493f3f7..0000000
--- a/config/rootfiles/core/53/filelists/openvpn
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/core/53/filelists/strongswan b/config/rootfiles/core/53/filelists/strongswan
deleted file mode 120000
index 90c727e..0000000
--- a/config/rootfiles/core/53/filelists/strongswan
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/53/filelists/usb_modeswitch b/config/rootfiles/core/53/filelists/usb_modeswitch
deleted file mode 120000
index acbab6f..0000000
--- a/config/rootfiles/core/53/filelists/usb_modeswitch
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/usb_modeswitch
\ No newline at end of file
diff --git a/config/rootfiles/core/53/filelists/usb_modeswitch_data b/config/rootfiles/core/53/filelists/usb_modeswitch_data
deleted file mode 120000
index 4cbce46..0000000
--- a/config/rootfiles/core/53/filelists/usb_modeswitch_data
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/usb_modeswitch_data
\ No newline at end of file
diff --git a/config/rootfiles/core/53/meta b/config/rootfiles/core/53/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/53/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/53/update.sh b/config/rootfiles/core/53/update.sh
deleted file mode 100644
index dae061b..0000000
--- a/config/rootfiles/core/53/update.sh
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire 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. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2011 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-
-#
-# Remove old core updates from pakfire cache to save space...
-core=53
-for (( i=1; i<=$core; i++ ))
-do
- rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
-done
-
-#
-#Stop services
-
-/etc/init.d/ipsec stop
-/etc/init.d/apache stop
-
-#
-# Remove old strongswan libs
-rm -rf /usr/lib/libcharon.so
-rm -rf /usr/lib/libcharon.so.0
-rm -rf /usr/lib/libcharon.so.0.0.0
-rm -rf /usr/lib/libhydra.so
-rm -rf /usr/lib/libhydra.so.0
-rm -rf /usr/lib/libhydra.so.0.0.0
-rm -rf /usr/lib/libstrongswan.so
-rm -rf /usr/lib/libstrongswan.so.0
-rm -rf /usr/lib/libstrongswan.so.0.0.0
-rm -rf /usr/libexec/ipsec/plugins
-
-# Remove old usb_modeswitch_data
-rm -rf /etc/usb_modeswitch.d
-
-#
-#Extract files
-extract_files
-
-#
-#Replace now unsupported EU regdomain by a "DE" comment.
-sed -i -e "s|^options cfg80211 ieee80211_regdom=EU|#options cfg80211 ieee80211_regdom=DE|g" \
- /etc/modprobe.d/cfg80211
-
-#
-#Start services
-
-/etc/init.d/apache start
-if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
- /etc/init.d/ipsec start
-fi
-
-#
-#Update Language cache
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-
-#Rebuild module dep's
-depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
-depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
-depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
-
-#Rebuild initrd's because some compat-wireless modules are inside
-/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
-if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
-/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
-fi
-if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
-/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
-fi
-
-sync
-
-#
-# After pakfire has ended run it again and update the lists and do upgrade
-#
-echo '#!/bin/bash' > /tmp/pak_update
-echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update
-echo ' sleep 1' >> /tmp/pak_update
-echo 'done' >> /tmp/pak_update
-echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update
-echo ' sleep 1' >> /tmp/pak_update
-echo 'done' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
-echo 'sync && sync && sync' >> /tmp/pak_update
-echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-53 " *** Please reboot... *** "' >> /tmp/pak_update
-echo 'touch /var/run/need_reboot ' >> /tmp/pak_update
-
-#
-chmod +x /tmp/pak_update
-/tmp/pak_update &
-echo
-echo Please wait until pakfire has ended...
-echo
-
-#
-#Finish
-/etc/init.d/fireinfo start
-sendprofile
-#Don't report the exitcode last command
-exit 0
diff --git a/config/rootfiles/core/54/exclude b/config/rootfiles/core/54/exclude
deleted file mode 100644
index ca3adf5..0000000
--- a/config/rootfiles/core/54/exclude
+++ /dev/null
@@ -1,9 +0,0 @@
-srv/web/ipfire/html/proxy.pac
-etc/udev/rules.d/30-persistent-network.rules
-etc/ipsec.conf
-etc/ipsec.secrets
-etc/ipsec.user.conf
-etc/ipsec.user.secrets
-var/updatecache
-etc/localtime
-var/ipfire/ovpn
diff --git a/config/rootfiles/core/54/filelists/GeoIP b/config/rootfiles/core/54/filelists/GeoIP
deleted file mode 100644
index 0258236..0000000
--- a/config/rootfiles/core/54/filelists/GeoIP
+++ /dev/null
@@ -1 +0,0 @@
-usr/local/share/GeoIP/GeoIP.dat
diff --git a/config/rootfiles/core/54/filelists/armv5tel/intelnet-modules b/config/rootfiles/core/54/filelists/armv5tel/intelnet-modules
deleted file mode 100644
index 83d1e8b..0000000
--- a/config/rootfiles/core/54/filelists/armv5tel/intelnet-modules
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/e1000/e1000.ko
-lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/e1000e/e1000e.ko
-lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/igb/igb.ko
-lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/e1000/e1000.ko
-lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/e1000e/e1000e.ko
-lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/igb/igb.ko
diff --git a/config/rootfiles/core/54/filelists/daq b/config/rootfiles/core/54/filelists/daq
deleted file mode 120000
index d0e0956..0000000
--- a/config/rootfiles/core/54/filelists/daq
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/daq
\ No newline at end of file
diff --git a/config/rootfiles/core/54/filelists/dracut b/config/rootfiles/core/54/filelists/dracut
deleted file mode 120000
index 1608699..0000000
--- a/config/rootfiles/core/54/filelists/dracut
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/dracut
\ No newline at end of file
diff --git a/config/rootfiles/core/54/filelists/files b/config/rootfiles/core/54/filelists/files
deleted file mode 100644
index 01c4951..0000000
--- a/config/rootfiles/core/54/filelists/files
+++ /dev/null
@@ -1,19 +0,0 @@
-etc/system-release
-etc/issue
-etc/snort/snort.conf
-var/ipfire/langs
-usr/share/hwdata/pci.ids
-usr/share/hwdata/usb.ids
-etc/rc.d/init.d/network
-etc/rc.d/init.d/networking/dhcpcd.exe
-etc/rc.d/init.d/rc
-etc/rc.d/init.d/smartenabler
-etc/rc.d/init.d/snort
-usr/local/bin/hddshutdown
-usr/local/bin/makegraphs
-usr/local/bin/scanhd
-srv/web/ipfire/cgi-bin/credits.cgi
-srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
-srv/web/ipfire/cgi-bin/ids.cgi
-srv/web/ipfire/cgi-bin/media.cgi
-srv/web/ipfire/cgi-bin/vpnmain.cgi
diff --git a/config/rootfiles/core/54/filelists/fireinfo b/config/rootfiles/core/54/filelists/fireinfo
deleted file mode 120000
index c461155..0000000
--- a/config/rootfiles/core/54/filelists/fireinfo
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/fireinfo
\ No newline at end of file
diff --git a/config/rootfiles/core/54/filelists/fw_ath9k_htc b/config/rootfiles/core/54/filelists/fw_ath9k_htc
deleted file mode 120000
index 098408d..0000000
--- a/config/rootfiles/core/54/filelists/fw_ath9k_htc
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/fw_ath9k_htc
\ No newline at end of file
diff --git a/config/rootfiles/core/54/filelists/i586/intelnet-modules b/config/rootfiles/core/54/filelists/i586/intelnet-modules
deleted file mode 100644
index 5e3439d..0000000
--- a/config/rootfiles/core/54/filelists/i586/intelnet-modules
+++ /dev/null
@@ -1,9 +0,0 @@
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/e1000/e1000.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/e1000e/e1000e.ko
-lib/modules/2.6.32.45-ipfire/kernel/drivers/net/igb/igb.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/e1000/e1000.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/e1000e/e1000e.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/igb/igb.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/e1000/e1000.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/e1000e/e1000e.ko
-lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/igb/igb.ko
diff --git a/config/rootfiles/core/54/filelists/smartmontools b/config/rootfiles/core/54/filelists/smartmontools
deleted file mode 120000
index fb66daf..0000000
--- a/config/rootfiles/core/54/filelists/smartmontools
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/smartmontools
\ No newline at end of file
diff --git a/config/rootfiles/core/54/filelists/snort b/config/rootfiles/core/54/filelists/snort
deleted file mode 120000
index 9406ce0..0000000
--- a/config/rootfiles/core/54/filelists/snort
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/snort
\ No newline at end of file
diff --git a/config/rootfiles/core/54/filelists/squid b/config/rootfiles/core/54/filelists/squid
deleted file mode 120000
index 2dc8372..0000000
--- a/config/rootfiles/core/54/filelists/squid
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/54/filelists/strongswan b/config/rootfiles/core/54/filelists/strongswan
deleted file mode 120000
index 90c727e..0000000
--- a/config/rootfiles/core/54/filelists/strongswan
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/54/filelists/tzdata b/config/rootfiles/core/54/filelists/tzdata
deleted file mode 120000
index 5a6e325..0000000
--- a/config/rootfiles/core/54/filelists/tzdata
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/tzdata
\ No newline at end of file
diff --git a/config/rootfiles/core/54/meta b/config/rootfiles/core/54/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/54/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/54/update.sh b/config/rootfiles/core/54/update.sh
deleted file mode 100644
index 61d1011..0000000
--- a/config/rootfiles/core/54/update.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire 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. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2011 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-
-#
-# Remove old core updates from pakfire cache to save space...
-core=54
-for (( i=1; i<=$core; i++ ))
-do
- rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
-done
-
-#
-#Stop services
-
-/etc/init.d/ipsec stop
-/etc/init.d/squid stop
-/etc/init.d/snort stop
-
-#
-# Flush old usb-modeswitch data
-rm -rf /usr/share/usb_modeswitch
-
-#
-# Flush old snort rules
-rm -rf /etc/snort/rules
-
-#
-#Extract files
-extract_files
-
-#
-#Start services
-
-/etc/init.d/squid start
-if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
- /etc/init.d/ipsec start
-fi
-
-#
-#Update Language cache
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-
-#Rebuild module dep's
-depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
-depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
-depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
-
-#Rebuild initrd's because some compat-wireless modules are inside
-/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
-if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
-/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
-fi
-if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
-/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
-fi
-
-sync
-
-#
-#Finish
-/etc/init.d/fireinfo start
-sendprofile
-#Don't report the exitcode last command
-exit 0
diff --git a/config/rootfiles/core/55/exclude b/config/rootfiles/core/55/exclude
deleted file mode 100644
index 7360266..0000000
--- a/config/rootfiles/core/55/exclude
+++ /dev/null
@@ -1,12 +0,0 @@
-srv/web/ipfire/html/proxy.pac
-etc/udev/rules.d/30-persistent-network.rules
-etc/ipsec.conf
-etc/ipsec.secrets
-etc/ipsec.user.conf
-etc/ipsec.user.secrets
-var/updatecache
-etc/localtime
-var/ipfire/ovpn
-etc/ssh/ssh_config
-etc/ssh/sshd_config
-etc/ssl/openssl.cnf
diff --git a/config/rootfiles/core/55/filelists/files b/config/rootfiles/core/55/filelists/files
deleted file mode 100644
index 409e5fe..0000000
--- a/config/rootfiles/core/55/filelists/files
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/system-release
-etc/issue
diff --git a/config/rootfiles/core/55/filelists/openssh b/config/rootfiles/core/55/filelists/openssh
deleted file mode 120000
index d8c77fd..0000000
--- a/config/rootfiles/core/55/filelists/openssh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/55/filelists/openssl b/config/rootfiles/core/55/filelists/openssl
deleted file mode 120000
index e011a92..0000000
--- a/config/rootfiles/core/55/filelists/openssl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/55/meta b/config/rootfiles/core/55/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/55/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/55/update.sh b/config/rootfiles/core/55/update.sh
deleted file mode 100644
index dbdd436..0000000
--- a/config/rootfiles/core/55/update.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire 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. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-
-#
-# Remove old core updates from pakfire cache to save space...
-core=55
-for (( i=1; i<=$core; i++ ))
-do
- rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
-done
-
-#
-#Stop services
-/etc/init.d/sshd stop
-/etc/init.d/apache stop
-
-#
-#Extract files
-extract_files
-
-#
-#Start services
-/etc/init.d/apache start
-/etc/init.d/sshd start
-
-
-#
-#Update Language cache
-#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-
-#Rebuild module dep's
-#depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
-#depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
-#depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
-
-#Rebuild initrd's because some compat-wireless modules are inside
-#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
-#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
-#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
-#fi
-#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
-#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
-#fi
-
-sync
-
-# This update need a reboot...
-touch /var/run/need_reboot
-
-#
-#Finish
-/etc/init.d/fireinfo start
-sendprofile
-#Don't report the exitcode last command
-exit 0
diff --git a/config/rootfiles/core/56/exclude b/config/rootfiles/core/56/exclude
deleted file mode 100644
index 7360266..0000000
--- a/config/rootfiles/core/56/exclude
+++ /dev/null
@@ -1,12 +0,0 @@
-srv/web/ipfire/html/proxy.pac
-etc/udev/rules.d/30-persistent-network.rules
-etc/ipsec.conf
-etc/ipsec.secrets
-etc/ipsec.user.conf
-etc/ipsec.user.secrets
-var/updatecache
-etc/localtime
-var/ipfire/ovpn
-etc/ssh/ssh_config
-etc/ssh/sshd_config
-etc/ssl/openssl.cnf
diff --git a/config/rootfiles/core/56/filelists/Crypt-PasswdMD5 b/config/rootfiles/core/56/filelists/Crypt-PasswdMD5
deleted file mode 120000
index 9a766e1..0000000
--- a/config/rootfiles/core/56/filelists/Crypt-PasswdMD5
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/Crypt-PasswdMD5
\ No newline at end of file
diff --git a/config/rootfiles/core/56/filelists/files b/config/rootfiles/core/56/filelists/files
deleted file mode 100644
index 355107e..0000000
--- a/config/rootfiles/core/56/filelists/files
+++ /dev/null
@@ -1,13 +0,0 @@
-etc/system-release
-etc/issue
-etc/rc.d/init.d/mountfs
-etc/rc.d/init.d/smartenabler
-etc/rc.d/init.d/networking/red.up/10-static-routes
-etc/rc.d/init.d/networking/red.down/10-static-routes
-srv/web/ipfire/cgi-bin/chpasswd.cgi
-srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
-srv/web/ipfire/cgi-bin/media.cgi
-usr/local/bin/hddshutdown
-usr/local/bin/makegraphs
-usr/local/bin/openvpnctrl
-usr/local/bin/readhash
diff --git a/config/rootfiles/core/56/filelists/openssh b/config/rootfiles/core/56/filelists/openssh
deleted file mode 120000
index d8c77fd..0000000
--- a/config/rootfiles/core/56/filelists/openssh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/56/filelists/openssl b/config/rootfiles/core/56/filelists/openssl
deleted file mode 120000
index e011a92..0000000
--- a/config/rootfiles/core/56/filelists/openssl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/56/filelists/usb_modeswitch b/config/rootfiles/core/56/filelists/usb_modeswitch
deleted file mode 120000
index acbab6f..0000000
--- a/config/rootfiles/core/56/filelists/usb_modeswitch
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/usb_modeswitch
\ No newline at end of file
diff --git a/config/rootfiles/core/56/filelists/usb_modeswitch_data b/config/rootfiles/core/56/filelists/usb_modeswitch_data
deleted file mode 120000
index 4cbce46..0000000
--- a/config/rootfiles/core/56/filelists/usb_modeswitch_data
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/usb_modeswitch_data
\ No newline at end of file
diff --git a/config/rootfiles/core/56/meta b/config/rootfiles/core/56/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/56/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/56/update.sh b/config/rootfiles/core/56/update.sh
deleted file mode 100644
index 2655a40..0000000
--- a/config/rootfiles/core/56/update.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire 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. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-
-#
-# Remove old core updates from pakfire cache to save space...
-core=56
-for (( i=1; i<=$core; i++ ))
-do
- rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
-done
-
-#
-#Stop services
-/etc/init.d/sshd stop
-/etc/init.d/apache stop
-
-#
-#Extract files
-extract_files
-
-#
-#Edit baudrate in grub.conf and inittab
-sed -i -e "s|38400|115200|g" /boot/grub/grub.conf
-sed -i -e "s|38400|115200|g" /etc/inittab
-
-#
-#Start services
-/etc/init.d/apache start
-/etc/init.d/sshd start
-
-#
-#Update Language cache
-#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-
-#Rebuild module dep's
-#depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
-#depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
-#depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
-
-#Rebuild initrd's because some compat-wireless modules are inside
-#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
-#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
-#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
-#fi
-#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
-#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
-#fi
-
-sync
-
-# This update need a reboot...
-touch /var/run/need_reboot
-
-#
-#Finish
-/etc/init.d/fireinfo start
-sendprofile
-#Don't report the exitcode last command
-exit 0
diff --git a/config/rootfiles/core/57/exclude b/config/rootfiles/core/57/exclude
deleted file mode 100644
index 7360266..0000000
--- a/config/rootfiles/core/57/exclude
+++ /dev/null
@@ -1,12 +0,0 @@
-srv/web/ipfire/html/proxy.pac
-etc/udev/rules.d/30-persistent-network.rules
-etc/ipsec.conf
-etc/ipsec.secrets
-etc/ipsec.user.conf
-etc/ipsec.user.secrets
-var/updatecache
-etc/localtime
-var/ipfire/ovpn
-etc/ssh/ssh_config
-etc/ssh/sshd_config
-etc/ssl/openssl.cnf
diff --git a/config/rootfiles/core/57/filelists/apache2 b/config/rootfiles/core/57/filelists/apache2
deleted file mode 120000
index eef95ef..0000000
--- a/config/rootfiles/core/57/filelists/apache2
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/apache2
\ No newline at end of file
diff --git a/config/rootfiles/core/57/filelists/files b/config/rootfiles/core/57/filelists/files
deleted file mode 100644
index 2f80b5f..0000000
--- a/config/rootfiles/core/57/filelists/files
+++ /dev/null
@@ -1,5 +0,0 @@
-etc/system-release
-etc/issue
-etc/rc.d/init.d/networking/red.up/10-static-routes
-etc/rc.d/init.d/networking/red.down/10-static-routes
-etc/rc.d/init.d/networking/any
diff --git a/config/rootfiles/core/57/filelists/php b/config/rootfiles/core/57/filelists/php
deleted file mode 120000
index 1ae48d7..0000000
--- a/config/rootfiles/core/57/filelists/php
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/php
\ No newline at end of file
diff --git a/config/rootfiles/core/57/filelists/squid b/config/rootfiles/core/57/filelists/squid
deleted file mode 120000
index 2dc8372..0000000
--- a/config/rootfiles/core/57/filelists/squid
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/57/filelists/strongswan b/config/rootfiles/core/57/filelists/strongswan
deleted file mode 120000
index 90c727e..0000000
--- a/config/rootfiles/core/57/filelists/strongswan
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/57/filelists/vim b/config/rootfiles/core/57/filelists/vim
deleted file mode 120000
index 9861317..0000000
--- a/config/rootfiles/core/57/filelists/vim
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/vim
\ No newline at end of file
diff --git a/config/rootfiles/core/57/meta b/config/rootfiles/core/57/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/57/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/57/update.sh b/config/rootfiles/core/57/update.sh
deleted file mode 100644
index 177bf72..0000000
--- a/config/rootfiles/core/57/update.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire 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. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-
-#
-# Remove old core updates from pakfire cache to save space...
-core=57
-for (( i=1; i<=$core; i++ ))
-do
- rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
-done
-
-#
-#Stop services
-/etc/init.d/squid stop
-/etc/init.d/apache stop
-/etc/init.d/ipsec stop
-
-#
-#Extract files
-extract_files
-
-#
-#Start services
-/etc/init.d/squid start
-/etc/init.d/apache start
-if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
- /etc/init.d/ipsec start
-fi
-
-#
-#Update Language cache
-#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-
-#Rebuild module dep's
-#depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
-#depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
-#depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
-
-#Rebuild initrd's because some compat-wireless modules are inside
-#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
-#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
-#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
-#fi
-#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
-#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
-#fi
-
-sync
-
-# This update need a reboot...
-#touch /var/run/need_reboot
-
-#
-#Finish
-/etc/init.d/fireinfo start
-sendprofile
-#Don't report the exitcode last command
-exit 0
diff --git a/config/rootfiles/core/58/exclude b/config/rootfiles/core/58/exclude
deleted file mode 100644
index 7360266..0000000
--- a/config/rootfiles/core/58/exclude
+++ /dev/null
@@ -1,12 +0,0 @@
-srv/web/ipfire/html/proxy.pac
-etc/udev/rules.d/30-persistent-network.rules
-etc/ipsec.conf
-etc/ipsec.secrets
-etc/ipsec.user.conf
-etc/ipsec.user.secrets
-var/updatecache
-etc/localtime
-var/ipfire/ovpn
-etc/ssh/ssh_config
-etc/ssh/sshd_config
-etc/ssl/openssl.cnf
diff --git a/config/rootfiles/core/58/filelists/GeoIP b/config/rootfiles/core/58/filelists/GeoIP
deleted file mode 100644
index 0258236..0000000
--- a/config/rootfiles/core/58/filelists/GeoIP
+++ /dev/null
@@ -1 +0,0 @@
-usr/local/share/GeoIP/GeoIP.dat
diff --git a/config/rootfiles/core/58/filelists/Net-Telnet b/config/rootfiles/core/58/filelists/Net-Telnet
deleted file mode 120000
index 66ca926..0000000
--- a/config/rootfiles/core/58/filelists/Net-Telnet
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/Net-Telnet
\ No newline at end of file
diff --git a/config/rootfiles/core/58/filelists/armv5tel/cryptodev b/config/rootfiles/core/58/filelists/armv5tel/cryptodev
deleted file mode 100644
index 6870588..0000000
--- a/config/rootfiles/core/58/filelists/armv5tel/cryptodev
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/modules/2.6.32.45-ipfire-versatile/extra/cryptodev.ko
-lib/modules/2.6.32.45-ipfire-kirkwood/extra/cryptodev.ko
diff --git a/config/rootfiles/core/58/filelists/files b/config/rootfiles/core/58/filelists/files
deleted file mode 100644
index 047127e..0000000
--- a/config/rootfiles/core/58/filelists/files
+++ /dev/null
@@ -1,7 +0,0 @@
-etc/system-release
-etc/issue
-etc/vimrc
-srv/web/ipfire/cgi-bin/index.cgi
-srv/web/ipfire/cgi-bin/ovpnmain.cgi
-var/ipfire/general-functions.pl
-var/ipfire/langs
diff --git a/config/rootfiles/core/58/filelists/fireinfo b/config/rootfiles/core/58/filelists/fireinfo
deleted file mode 120000
index c461155..0000000
--- a/config/rootfiles/core/58/filelists/fireinfo
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/fireinfo
\ No newline at end of file
diff --git a/config/rootfiles/core/58/filelists/hwdata b/config/rootfiles/core/58/filelists/hwdata
deleted file mode 100644
index 5a9672f..0000000
--- a/config/rootfiles/core/58/filelists/hwdata
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/hwdata/pci.ids
-usr/share/hwdata/usb.ids
diff --git a/config/rootfiles/core/58/filelists/i586/cryptodev b/config/rootfiles/core/58/filelists/i586/cryptodev
deleted file mode 100644
index da29a79..0000000
--- a/config/rootfiles/core/58/filelists/i586/cryptodev
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/modules/2.6.32.45-ipfire/extra/cryptodev.ko
-lib/modules/2.6.32.45-ipfire-pae/extra/cryptodev.ko
-lib/modules/2.6.32.45-ipfire-xen/extra/cryptodev.ko
diff --git a/config/rootfiles/core/58/filelists/libpng b/config/rootfiles/core/58/filelists/libpng
deleted file mode 120000
index 8ef96e2..0000000
--- a/config/rootfiles/core/58/filelists/libpng
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/libpng
\ No newline at end of file
diff --git a/config/rootfiles/core/58/filelists/openssh b/config/rootfiles/core/58/filelists/openssh
deleted file mode 120000
index d8c77fd..0000000
--- a/config/rootfiles/core/58/filelists/openssh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/58/filelists/openssl b/config/rootfiles/core/58/filelists/openssl
deleted file mode 120000
index e011a92..0000000
--- a/config/rootfiles/core/58/filelists/openssl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/58/filelists/openvpn b/config/rootfiles/core/58/filelists/openvpn
deleted file mode 120000
index 493f3f7..0000000
--- a/config/rootfiles/core/58/filelists/openvpn
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/core/58/filelists/strongswan b/config/rootfiles/core/58/filelists/strongswan
deleted file mode 120000
index 90c727e..0000000
--- a/config/rootfiles/core/58/filelists/strongswan
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/58/filelists/usb_modeswitch b/config/rootfiles/core/58/filelists/usb_modeswitch
deleted file mode 120000
index acbab6f..0000000
--- a/config/rootfiles/core/58/filelists/usb_modeswitch
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/usb_modeswitch
\ No newline at end of file
diff --git a/config/rootfiles/core/58/meta b/config/rootfiles/core/58/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/58/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/58/update.sh b/config/rootfiles/core/58/update.sh
deleted file mode 100644
index ccec4b0..0000000
--- a/config/rootfiles/core/58/update.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire 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. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-
-#
-# Remove old core updates from pakfire cache to save space...
-core=58
-for (( i=1; i<=$core; i++ ))
-do
- rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
-done
-
-#
-#Stop services
-/etc/init.d/ipsec stop
-
-#
-#Extract files
-extract_files
-
-#
-#Start services
-if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
- /etc/init.d/ipsec start
-fi
-
-#
-#Update Language cache
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-
-#Rebuild module dep's
-arch=`uname -m`
-if [ ${arch::3} == "arm" ]; then
- depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1
- depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1
-else
- depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
- depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
- depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
-fi
-
-
-#Rebuild initrd's because some compat-wireless modules are inside
-#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
-#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
-#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
-#fi
-#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
-#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
-#fi
-
-sync
-
-# This update need a reboot...
-touch /var/run/need_reboot
-
-#
-#Finish
-/etc/init.d/fireinfo start
-sendprofile
-#Don't report the exitcode last command
-exit 0
diff --git a/config/rootfiles/core/59/exclude b/config/rootfiles/core/59/exclude
deleted file mode 100644
index 7360266..0000000
--- a/config/rootfiles/core/59/exclude
+++ /dev/null
@@ -1,12 +0,0 @@
-srv/web/ipfire/html/proxy.pac
-etc/udev/rules.d/30-persistent-network.rules
-etc/ipsec.conf
-etc/ipsec.secrets
-etc/ipsec.user.conf
-etc/ipsec.user.secrets
-var/updatecache
-etc/localtime
-var/ipfire/ovpn
-etc/ssh/ssh_config
-etc/ssh/sshd_config
-etc/ssl/openssl.cnf
diff --git a/config/rootfiles/core/59/filelists/GeoIP b/config/rootfiles/core/59/filelists/GeoIP
deleted file mode 100644
index 0258236..0000000
--- a/config/rootfiles/core/59/filelists/GeoIP
+++ /dev/null
@@ -1 +0,0 @@
-usr/local/share/GeoIP/GeoIP.dat
diff --git a/config/rootfiles/core/59/filelists/Net-Telnet b/config/rootfiles/core/59/filelists/Net-Telnet
deleted file mode 120000
index 66ca926..0000000
--- a/config/rootfiles/core/59/filelists/Net-Telnet
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/Net-Telnet
\ No newline at end of file
diff --git a/config/rootfiles/core/59/filelists/files b/config/rootfiles/core/59/filelists/files
deleted file mode 100644
index fef386b..0000000
--- a/config/rootfiles/core/59/filelists/files
+++ /dev/null
@@ -1,7 +0,0 @@
-etc/system-release
-etc/issue
-srv/web/ipfire/cgi-bin/index.cgi
-srv/web/ipfire/cgi-bin/ovpnmain.cgi
-var/ipfire/general-functions.pl
-var/ipfire/langs
-var/ipfire/dhcpc/dhcpcd-hooks/10-mtu
diff --git a/config/rootfiles/core/59/filelists/openssh b/config/rootfiles/core/59/filelists/openssh
deleted file mode 120000
index d8c77fd..0000000
--- a/config/rootfiles/core/59/filelists/openssh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/59/filelists/openssl b/config/rootfiles/core/59/filelists/openssl
deleted file mode 120000
index e011a92..0000000
--- a/config/rootfiles/core/59/filelists/openssl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/59/filelists/php b/config/rootfiles/core/59/filelists/php
deleted file mode 120000
index 1ae48d7..0000000
--- a/config/rootfiles/core/59/filelists/php
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/php
\ No newline at end of file
diff --git a/config/rootfiles/core/59/filelists/python b/config/rootfiles/core/59/filelists/python
deleted file mode 120000
index ffe6e2c..0000000
--- a/config/rootfiles/core/59/filelists/python
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/python
\ No newline at end of file
diff --git a/config/rootfiles/core/59/filelists/strongswan b/config/rootfiles/core/59/filelists/strongswan
deleted file mode 120000
index 90c727e..0000000
--- a/config/rootfiles/core/59/filelists/strongswan
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/59/meta b/config/rootfiles/core/59/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/59/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/59/update.sh b/config/rootfiles/core/59/update.sh
deleted file mode 100644
index 2f1d865..0000000
--- a/config/rootfiles/core/59/update.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire 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. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-
-#
-# Remove old core updates from pakfire cache to save space...
-core=59
-for (( i=1; i<=$core; i++ ))
-do
- rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
-done
-
-#
-#Stop services
-/etc/init.d/ipsec stop
-/etc/init.d/sshd stop
-
-#
-#Extract files
-extract_files
-
-#
-#Start services
-/etc/init.d/sshd start
-if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
- /etc/init.d/ipsec start
-fi
-
-#
-#Update Language cache
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-
-#Rebuild module dep's
-#arch=`uname -m`
-#if [ ${arch::3} == "arm" ]; then
-# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1
-# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1
-#else
-# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
-# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
-# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
-#fi
-
-
-#Rebuild initrd's because some compat-wireless modules are inside
-#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
-#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
-#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
-#fi
-#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
-#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
-#fi
-
-sync
-
-# This update need a reboot...
-#touch /var/run/need_reboot
-
-#
-#Finish
-/etc/init.d/fireinfo start
-sendprofile
-#Don't report the exitcode last command
-exit 0
diff --git a/config/rootfiles/core/63/exclude b/config/rootfiles/core/63/exclude
new file mode 100644
index 0000000..b6a8d1d
--- /dev/null
+++ b/config/rootfiles/core/63/exclude
@@ -0,0 +1,13 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+var/state/dhcp/dhcpd.leases
diff --git a/config/rootfiles/core/63/filelists/GeoIP b/config/rootfiles/core/63/filelists/GeoIP
new file mode 100644
index 0000000..0258236
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/GeoIP
@@ -0,0 +1 @@
+usr/local/share/GeoIP/GeoIP.dat
diff --git a/config/rootfiles/core/63/filelists/apache2 b/config/rootfiles/core/63/filelists/apache2
new file mode 120000
index 0000000..eef95ef
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file
diff --git a/config/rootfiles/core/63/filelists/dhcp b/config/rootfiles/core/63/filelists/dhcp
new file mode 120000
index 0000000..32d8da4
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/dhcp
@@ -0,0 +1 @@
+../../../common/dhcp
\ No newline at end of file
diff --git a/config/rootfiles/core/63/filelists/files b/config/rootfiles/core/63/filelists/files
new file mode 100644
index 0000000..1455a87
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/files
@@ -0,0 +1,5 @@
+etc/system-release
+etc/issue
+etc/rc.d/init.d/network-vlans
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
diff --git a/config/rootfiles/core/63/filelists/fireinfo b/config/rootfiles/core/63/filelists/fireinfo
new file mode 120000
index 0000000..c461155
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/fireinfo
@@ -0,0 +1 @@
+../../../common/fireinfo
\ No newline at end of file
diff --git a/config/rootfiles/core/63/filelists/inetutils b/config/rootfiles/core/63/filelists/inetutils
new file mode 120000
index 0000000..bcd329b
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/inetutils
@@ -0,0 +1 @@
+../../../common/inetutils
\ No newline at end of file
diff --git a/config/rootfiles/core/63/meta b/config/rootfiles/core/63/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/63/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/63/update.sh b/config/rootfiles/core/63/update.sh
new file mode 100644
index 0000000..f0764ae
--- /dev/null
+++ b/config/rootfiles/core/63/update.sh
@@ -0,0 +1,85 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire 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. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=63
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Remove old symlink to DHCP server configuration file.
+rm -f /etc/dhcpd.conf
+
+#
+#Stop services
+/etc/init.d/apache stop
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+/etc/init.d/apache start
+
+#
+#Update Language cache
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#arch=`uname -m`
+#if [ ${arch::3} == "arm" ]; then
+# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1
+# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1
+#else
+# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
+# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
+# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
+#fi
+
+
+#Rebuild initrd's because some compat-wireless modules are inside
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
+#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
+#fi
+#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
+#fi
+
+sync
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/52/exclude b/config/rootfiles/oldcore/52/exclude
new file mode 100644
index 0000000..bb0d8c8
--- /dev/null
+++ b/config/rootfiles/oldcore/52/exclude
@@ -0,0 +1,2 @@
+srv/web/ipfire/html/proxy.pac
+var/updatecache
diff --git a/config/rootfiles/oldcore/52/filelists/apache2 b/config/rootfiles/oldcore/52/filelists/apache2
new file mode 120000
index 0000000..eef95ef
--- /dev/null
+++ b/config/rootfiles/oldcore/52/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/52/filelists/ethtool b/config/rootfiles/oldcore/52/filelists/ethtool
new file mode 120000
index 0000000..494a53e
--- /dev/null
+++ b/config/rootfiles/oldcore/52/filelists/ethtool
@@ -0,0 +1 @@
+../../../common/ethtool
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/52/filelists/files b/config/rootfiles/oldcore/52/filelists/files
new file mode 100644
index 0000000..8076e02
--- /dev/null
+++ b/config/rootfiles/oldcore/52/filelists/files
@@ -0,0 +1,8 @@
+etc/system-release
+var/ipfire/langs/
+etc/rc.d/init.d/console
+usr/local/sbin/setup
+usr/local/bin/setddns.pl
+srv/web/ipfire/cgi-bin/ddns.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
+var/ipfire/graphs.pl
diff --git a/config/rootfiles/oldcore/52/filelists/squid b/config/rootfiles/oldcore/52/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/oldcore/52/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/52/meta b/config/rootfiles/oldcore/52/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/52/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/52/update.sh b/config/rootfiles/oldcore/52/update.sh
new file mode 100644
index 0000000..412299d
--- /dev/null
+++ b/config/rootfiles/oldcore/52/update.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire 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. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2011 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=52
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+/etc/init.d/squid stop
+/etc/init.d/apache stop
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+/etc/init.d/apache start
+/etc/init.d/squid start
+
+#
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#depmod 2.6.32.43-ipfire >/dev/null 2>&1
+#depmod 2.6.32.43-ipfire-pae >/dev/null 2>&1
+#depmod 2.6.32.43-ipfire-xen >/dev/null 2>&1
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/53/exclude b/config/rootfiles/oldcore/53/exclude
new file mode 100644
index 0000000..ca3adf5
--- /dev/null
+++ b/config/rootfiles/oldcore/53/exclude
@@ -0,0 +1,9 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
diff --git a/config/rootfiles/oldcore/53/filelists/apache2 b/config/rootfiles/oldcore/53/filelists/apache2
new file mode 120000
index 0000000..eef95ef
--- /dev/null
+++ b/config/rootfiles/oldcore/53/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/53/filelists/files b/config/rootfiles/oldcore/53/filelists/files
new file mode 100644
index 0000000..741254d
--- /dev/null
+++ b/config/rootfiles/oldcore/53/filelists/files
@@ -0,0 +1,26 @@
+etc/rc.d/init.d/network
+etc/rc.d/init.d/static-routes
+etc/sysctl.conf
+etc/system-release
+etc/issue
+etc/iproute2/rt_tables
+etc/rc.d/init.d/networking/red.up/50-ovpn
+etc/rc.d/init.d/networking/red.down/10-ovpn
+srv/web/ipfire/cgi-bin/extrahd.cgi
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/outgoinggrp.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/pakfire.cgi
+srv/web/ipfire/cgi-bin/routing.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+var/ipfire/langs/
+usr/local/bin/ipsecctrl
+usr/local/bin/openvpnctrl
+usr/local/bin/vpn-watch
+usr/local/bin/rebuildroutes
+usr/local/sbin/setup
+var/ipfire/main/routing
+var/ipfire/menu.d/30-network.menu
+opt/pakfire/etc/pakfire.conf
+usr/local/bin/backupiso
diff --git a/config/rootfiles/oldcore/53/filelists/gmp b/config/rootfiles/oldcore/53/filelists/gmp
new file mode 120000
index 0000000..8662a89
--- /dev/null
+++ b/config/rootfiles/oldcore/53/filelists/gmp
@@ -0,0 +1 @@
+../../../common/gmp
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/53/filelists/i586/compat-wireless b/config/rootfiles/oldcore/53/filelists/i586/compat-wireless
new file mode 100644
index 0000000..5d899bf
--- /dev/null
+++ b/config/rootfiles/oldcore/53/filelists/i586/compat-wireless
@@ -0,0 +1,359 @@
+lib/modules/2.6.32.45-ipfire-xen/kernel/compat/compat.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/compat/compat_firmware_class.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/ath3k.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bcm203x.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bfusb.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bluecard_cs.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bpa10x.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bt3c_cs.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btmrvl.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btmrvl_sdio.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btsdio.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btuart_cs.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btusb.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/dtl1_cs.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/hci_uart.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/hci_vhci.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/atl1c/atl1c.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/atl1e/atl1e.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/atlx/atl1.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/atlx/atl2.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/b44.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/asix.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/catc.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/cdc_eem.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/cdc_ether.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/cdc_subset.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/dm9601.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/gl620a.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/hso.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/int51x1.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/kaweth.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/mcs7830.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/net1080.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/pegasus.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/plusb.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/rndis_host.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/rtl8150.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/smsc95xx.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/usbnet.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/zaurus.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/adm8211.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/at76c50x-usb.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/b43/b43.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/libipw.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwlegacy/iwl-legacy.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwlegacy/iwl3945.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwlegacy/iwl4965.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_cs.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas/usb8xxx.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/mac80211_hwsim.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/mwl8k.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/p54/p54common.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/p54/p54pci.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/p54/p54usb.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rndis_wlan.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/wl1251/wl1251.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl12xx.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/ssb/ssb.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/staging/ath6kl/ath6kl.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/staging/brcm80211/brcmfmac/brcmfmac.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/staging/brcm80211/brcmsmac/brcmsmac.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/staging/brcm80211/util/brcmutil.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/bluetooth.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/bnep/bnep.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/cmtp/cmtp.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/hidp/hidp.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/rfcomm/rfcomm.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/net/mac80211/mac80211.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/cfg80211.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/lib80211.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/lib80211_crypt_ccmp.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/lib80211_crypt_tkip.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/lib80211_crypt_wep.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/compat/compat.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/compat/compat_firmware_class.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/ath3k.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bcm203x.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bfusb.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bluecard_cs.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bpa10x.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bt3c_cs.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btmrvl.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btmrvl_sdio.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btsdio.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btuart_cs.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btusb.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/dtl1_cs.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/hci_uart.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/hci_vhci.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/atl1c/atl1c.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/atl1e/atl1e.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/atlx/atl1.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/atlx/atl2.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/b44.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/asix.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/catc.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/cdc_eem.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/cdc_ether.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/cdc_subset.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/dm9601.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/gl620a.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/hso.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/int51x1.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/kaweth.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/mcs7830.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/net1080.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/pegasus.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/plusb.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/rndis_host.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/rtl8150.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/smsc95xx.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/usbnet.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/zaurus.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/adm8211.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/at76c50x-usb.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/b43/b43.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/libipw.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwlegacy/iwl-legacy.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwlegacy/iwl3945.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwlegacy/iwl4965.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas_cs.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas/usb8xxx.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/mac80211_hwsim.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/mwl8k.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/p54/p54common.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/p54/p54pci.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/p54/p54usb.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rndis_wlan.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/wl1251/wl1251.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/wl12xx/wl12xx.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/ssb/ssb.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/staging/ath6kl/ath6kl.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/staging/brcm80211/brcmfmac/brcmfmac.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/staging/brcm80211/brcmsmac/brcmsmac.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/staging/brcm80211/util/brcmutil.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/bluetooth.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/bnep/bnep.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/cmtp/cmtp.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/hidp/hidp.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/rfcomm/rfcomm.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/net/mac80211/mac80211.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/cfg80211.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/lib80211.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/lib80211_crypt_ccmp.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/lib80211_crypt_tkip.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/lib80211_crypt_wep.ko
+lib/modules/2.6.32.45-ipfire/kernel/compat/compat.ko
+lib/modules/2.6.32.45-ipfire/kernel/compat/compat_firmware_class.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/ath3k.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bcm203x.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bfusb.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bluecard_cs.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bpa10x.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bt3c_cs.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btmrvl.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btmrvl_sdio.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btsdio.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btuart_cs.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btusb.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/dtl1_cs.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/hci_uart.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/hci_vhci.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/atl1c/atl1c.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/atl1e/atl1e.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/atlx/atl1.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/atlx/atl2.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/b44.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/asix.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/catc.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/cdc_eem.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/cdc_ether.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/cdc_subset.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/dm9601.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/gl620a.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/hso.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/int51x1.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/kaweth.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/mcs7830.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/net1080.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/pegasus.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/plusb.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/rndis_host.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/rtl8150.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/smsc95xx.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/usbnet.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/zaurus.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/adm8211.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/at76c50x-usb.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/b43/b43.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ipw2x00/libipw.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwlegacy/iwl-legacy.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwlegacy/iwl3945.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwlegacy/iwl4965.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas/libertas.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas/libertas_cs.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas/usb8xxx.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/mwl8k.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/p54/p54common.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/p54/p54pci.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/p54/p54usb.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rndis_wlan.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/wl1251/wl1251.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/wl12xx/wl12xx.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/ssb/ssb.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/staging/ath6kl/ath6kl.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/staging/brcm80211/brcmfmac/brcmfmac.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/staging/brcm80211/brcmsmac/brcmsmac.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/staging/brcm80211/util/brcmutil.ko
+lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/bluetooth.ko
+lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/bnep/bnep.ko
+lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/cmtp/cmtp.ko
+lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/hidp/hidp.ko
+lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/rfcomm/rfcomm.ko
+lib/modules/2.6.32.45-ipfire/kernel/net/mac80211/mac80211.ko
+lib/modules/2.6.32.45-ipfire/kernel/net/wireless/cfg80211.ko
+lib/modules/2.6.32.45-ipfire/kernel/net/wireless/lib80211.ko
+lib/modules/2.6.32.45-ipfire/kernel/net/wireless/lib80211_crypt_ccmp.ko
+lib/modules/2.6.32.45-ipfire/kernel/net/wireless/lib80211_crypt_tkip.ko
+lib/modules/2.6.32.45-ipfire/kernel/net/wireless/lib80211_crypt_wep.ko
+etc/udev/rules.d/50-compat_firmware.rules
+lib/udev/compat_firmware.sh
diff --git a/config/rootfiles/oldcore/53/filelists/i586/gcc b/config/rootfiles/oldcore/53/filelists/i586/gcc
new file mode 120000
index 0000000..ba328e3
--- /dev/null
+++ b/config/rootfiles/oldcore/53/filelists/i586/gcc
@@ -0,0 +1 @@
+../../../../common/i586/gcc
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/53/filelists/i586/glibc b/config/rootfiles/oldcore/53/filelists/i586/glibc
new file mode 120000
index 0000000..943021f
--- /dev/null
+++ b/config/rootfiles/oldcore/53/filelists/i586/glibc
@@ -0,0 +1 @@
+../../../../common/i586/glibc
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/53/filelists/i586/kvm-kmod b/config/rootfiles/oldcore/53/filelists/i586/kvm-kmod
new file mode 100644
index 0000000..ec75215
--- /dev/null
+++ b/config/rootfiles/oldcore/53/filelists/i586/kvm-kmod
@@ -0,0 +1,6 @@
+lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm.ko
+lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm-amd.ko
+lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm-intel.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm-amd.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm-intel.ko
diff --git a/config/rootfiles/oldcore/53/filelists/openvpn b/config/rootfiles/oldcore/53/filelists/openvpn
new file mode 120000
index 0000000..493f3f7
--- /dev/null
+++ b/config/rootfiles/oldcore/53/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/53/filelists/strongswan b/config/rootfiles/oldcore/53/filelists/strongswan
new file mode 120000
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/oldcore/53/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/53/filelists/usb_modeswitch b/config/rootfiles/oldcore/53/filelists/usb_modeswitch
new file mode 120000
index 0000000..acbab6f
--- /dev/null
+++ b/config/rootfiles/oldcore/53/filelists/usb_modeswitch
@@ -0,0 +1 @@
+../../../common/usb_modeswitch
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/53/filelists/usb_modeswitch_data b/config/rootfiles/oldcore/53/filelists/usb_modeswitch_data
new file mode 120000
index 0000000..4cbce46
--- /dev/null
+++ b/config/rootfiles/oldcore/53/filelists/usb_modeswitch_data
@@ -0,0 +1 @@
+../../../common/usb_modeswitch_data
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/53/meta b/config/rootfiles/oldcore/53/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/53/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/53/update.sh b/config/rootfiles/oldcore/53/update.sh
new file mode 100644
index 0000000..dae061b
--- /dev/null
+++ b/config/rootfiles/oldcore/53/update.sh
@@ -0,0 +1,124 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire 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. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2011 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=53
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+
+/etc/init.d/ipsec stop
+/etc/init.d/apache stop
+
+#
+# Remove old strongswan libs
+rm -rf /usr/lib/libcharon.so
+rm -rf /usr/lib/libcharon.so.0
+rm -rf /usr/lib/libcharon.so.0.0.0
+rm -rf /usr/lib/libhydra.so
+rm -rf /usr/lib/libhydra.so.0
+rm -rf /usr/lib/libhydra.so.0.0.0
+rm -rf /usr/lib/libstrongswan.so
+rm -rf /usr/lib/libstrongswan.so.0
+rm -rf /usr/lib/libstrongswan.so.0.0.0
+rm -rf /usr/libexec/ipsec/plugins
+
+# Remove old usb_modeswitch_data
+rm -rf /etc/usb_modeswitch.d
+
+#
+#Extract files
+extract_files
+
+#
+#Replace now unsupported EU regdomain by a "DE" comment.
+sed -i -e "s|^options cfg80211 ieee80211_regdom=EU|#options cfg80211 ieee80211_regdom=DE|g" \
+ /etc/modprobe.d/cfg80211
+
+#
+#Start services
+
+/etc/init.d/apache start
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+ /etc/init.d/ipsec start
+fi
+
+#
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
+depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
+depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
+
+#Rebuild initrd's because some compat-wireless modules are inside
+/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
+if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
+/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
+fi
+if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
+/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
+fi
+
+sync
+
+#
+# After pakfire has ended run it again and update the lists and do upgrade
+#
+echo '#!/bin/bash' > /tmp/pak_update
+echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update
+echo ' sleep 1' >> /tmp/pak_update
+echo 'done' >> /tmp/pak_update
+echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update
+echo ' sleep 1' >> /tmp/pak_update
+echo 'done' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
+echo 'sync && sync && sync' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-53 " *** Please reboot... *** "' >> /tmp/pak_update
+echo 'touch /var/run/need_reboot ' >> /tmp/pak_update
+
+#
+chmod +x /tmp/pak_update
+/tmp/pak_update &
+echo
+echo Please wait until pakfire has ended...
+echo
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/54/exclude b/config/rootfiles/oldcore/54/exclude
new file mode 100644
index 0000000..ca3adf5
--- /dev/null
+++ b/config/rootfiles/oldcore/54/exclude
@@ -0,0 +1,9 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
diff --git a/config/rootfiles/oldcore/54/filelists/GeoIP b/config/rootfiles/oldcore/54/filelists/GeoIP
new file mode 100644
index 0000000..0258236
--- /dev/null
+++ b/config/rootfiles/oldcore/54/filelists/GeoIP
@@ -0,0 +1 @@
+usr/local/share/GeoIP/GeoIP.dat
diff --git a/config/rootfiles/oldcore/54/filelists/armv5tel/intelnet-modules b/config/rootfiles/oldcore/54/filelists/armv5tel/intelnet-modules
new file mode 100644
index 0000000..83d1e8b
--- /dev/null
+++ b/config/rootfiles/oldcore/54/filelists/armv5tel/intelnet-modules
@@ -0,0 +1,6 @@
+lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/e1000/e1000.ko
+lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/e1000e/e1000e.ko
+lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/igb/igb.ko
+lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/e1000/e1000.ko
+lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/e1000e/e1000e.ko
+lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/igb/igb.ko
diff --git a/config/rootfiles/oldcore/54/filelists/daq b/config/rootfiles/oldcore/54/filelists/daq
new file mode 120000
index 0000000..d0e0956
--- /dev/null
+++ b/config/rootfiles/oldcore/54/filelists/daq
@@ -0,0 +1 @@
+../../../common/daq
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/54/filelists/dracut b/config/rootfiles/oldcore/54/filelists/dracut
new file mode 120000
index 0000000..1608699
--- /dev/null
+++ b/config/rootfiles/oldcore/54/filelists/dracut
@@ -0,0 +1 @@
+../../../common/dracut
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/54/filelists/files b/config/rootfiles/oldcore/54/filelists/files
new file mode 100644
index 0000000..01c4951
--- /dev/null
+++ b/config/rootfiles/oldcore/54/filelists/files
@@ -0,0 +1,19 @@
+etc/system-release
+etc/issue
+etc/snort/snort.conf
+var/ipfire/langs
+usr/share/hwdata/pci.ids
+usr/share/hwdata/usb.ids
+etc/rc.d/init.d/network
+etc/rc.d/init.d/networking/dhcpcd.exe
+etc/rc.d/init.d/rc
+etc/rc.d/init.d/smartenabler
+etc/rc.d/init.d/snort
+usr/local/bin/hddshutdown
+usr/local/bin/makegraphs
+usr/local/bin/scanhd
+srv/web/ipfire/cgi-bin/credits.cgi
+srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
+srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/media.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
diff --git a/config/rootfiles/oldcore/54/filelists/fireinfo b/config/rootfiles/oldcore/54/filelists/fireinfo
new file mode 120000
index 0000000..c461155
--- /dev/null
+++ b/config/rootfiles/oldcore/54/filelists/fireinfo
@@ -0,0 +1 @@
+../../../common/fireinfo
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/54/filelists/fw_ath9k_htc b/config/rootfiles/oldcore/54/filelists/fw_ath9k_htc
new file mode 120000
index 0000000..098408d
--- /dev/null
+++ b/config/rootfiles/oldcore/54/filelists/fw_ath9k_htc
@@ -0,0 +1 @@
+../../../common/fw_ath9k_htc
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/54/filelists/i586/intelnet-modules b/config/rootfiles/oldcore/54/filelists/i586/intelnet-modules
new file mode 100644
index 0000000..5e3439d
--- /dev/null
+++ b/config/rootfiles/oldcore/54/filelists/i586/intelnet-modules
@@ -0,0 +1,9 @@
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/e1000/e1000.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/e1000e/e1000e.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/igb/igb.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/e1000/e1000.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/e1000e/e1000e.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/igb/igb.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/e1000/e1000.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/e1000e/e1000e.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/igb/igb.ko
diff --git a/config/rootfiles/oldcore/54/filelists/smartmontools b/config/rootfiles/oldcore/54/filelists/smartmontools
new file mode 120000
index 0000000..fb66daf
--- /dev/null
+++ b/config/rootfiles/oldcore/54/filelists/smartmontools
@@ -0,0 +1 @@
+../../../common/smartmontools
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/54/filelists/snort b/config/rootfiles/oldcore/54/filelists/snort
new file mode 120000
index 0000000..9406ce0
--- /dev/null
+++ b/config/rootfiles/oldcore/54/filelists/snort
@@ -0,0 +1 @@
+../../../common/snort
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/54/filelists/squid b/config/rootfiles/oldcore/54/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/oldcore/54/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/54/filelists/strongswan b/config/rootfiles/oldcore/54/filelists/strongswan
new file mode 120000
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/oldcore/54/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/54/filelists/tzdata b/config/rootfiles/oldcore/54/filelists/tzdata
new file mode 120000
index 0000000..5a6e325
--- /dev/null
+++ b/config/rootfiles/oldcore/54/filelists/tzdata
@@ -0,0 +1 @@
+../../../common/tzdata
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/54/meta b/config/rootfiles/oldcore/54/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/54/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/54/update.sh b/config/rootfiles/oldcore/54/update.sh
new file mode 100644
index 0000000..61d1011
--- /dev/null
+++ b/config/rootfiles/oldcore/54/update.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire 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. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2011 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=54
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+
+/etc/init.d/ipsec stop
+/etc/init.d/squid stop
+/etc/init.d/snort stop
+
+#
+# Flush old usb-modeswitch data
+rm -rf /usr/share/usb_modeswitch
+
+#
+# Flush old snort rules
+rm -rf /etc/snort/rules
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+
+/etc/init.d/squid start
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+ /etc/init.d/ipsec start
+fi
+
+#
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
+depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
+depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
+
+#Rebuild initrd's because some compat-wireless modules are inside
+/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
+if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
+/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
+fi
+if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
+/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
+fi
+
+sync
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/55/exclude b/config/rootfiles/oldcore/55/exclude
new file mode 100644
index 0000000..7360266
--- /dev/null
+++ b/config/rootfiles/oldcore/55/exclude
@@ -0,0 +1,12 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
diff --git a/config/rootfiles/oldcore/55/filelists/files b/config/rootfiles/oldcore/55/filelists/files
new file mode 100644
index 0000000..409e5fe
--- /dev/null
+++ b/config/rootfiles/oldcore/55/filelists/files
@@ -0,0 +1,2 @@
+etc/system-release
+etc/issue
diff --git a/config/rootfiles/oldcore/55/filelists/openssh b/config/rootfiles/oldcore/55/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/oldcore/55/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/55/filelists/openssl b/config/rootfiles/oldcore/55/filelists/openssl
new file mode 120000
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/oldcore/55/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/55/meta b/config/rootfiles/oldcore/55/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/55/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/55/update.sh b/config/rootfiles/oldcore/55/update.sh
new file mode 100644
index 0000000..dbdd436
--- /dev/null
+++ b/config/rootfiles/oldcore/55/update.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire 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. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=55
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+/etc/init.d/sshd stop
+/etc/init.d/apache stop
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+/etc/init.d/apache start
+/etc/init.d/sshd start
+
+
+#
+#Update Language cache
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
+#depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
+#depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
+
+#Rebuild initrd's because some compat-wireless modules are inside
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
+#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
+#fi
+#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
+#fi
+
+sync
+
+# This update need a reboot...
+touch /var/run/need_reboot
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/56/exclude b/config/rootfiles/oldcore/56/exclude
new file mode 100644
index 0000000..7360266
--- /dev/null
+++ b/config/rootfiles/oldcore/56/exclude
@@ -0,0 +1,12 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
diff --git a/config/rootfiles/oldcore/56/filelists/Crypt-PasswdMD5 b/config/rootfiles/oldcore/56/filelists/Crypt-PasswdMD5
new file mode 120000
index 0000000..9a766e1
--- /dev/null
+++ b/config/rootfiles/oldcore/56/filelists/Crypt-PasswdMD5
@@ -0,0 +1 @@
+../../../common/Crypt-PasswdMD5
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/56/filelists/files b/config/rootfiles/oldcore/56/filelists/files
new file mode 100644
index 0000000..355107e
--- /dev/null
+++ b/config/rootfiles/oldcore/56/filelists/files
@@ -0,0 +1,13 @@
+etc/system-release
+etc/issue
+etc/rc.d/init.d/mountfs
+etc/rc.d/init.d/smartenabler
+etc/rc.d/init.d/networking/red.up/10-static-routes
+etc/rc.d/init.d/networking/red.down/10-static-routes
+srv/web/ipfire/cgi-bin/chpasswd.cgi
+srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
+srv/web/ipfire/cgi-bin/media.cgi
+usr/local/bin/hddshutdown
+usr/local/bin/makegraphs
+usr/local/bin/openvpnctrl
+usr/local/bin/readhash
diff --git a/config/rootfiles/oldcore/56/filelists/openssh b/config/rootfiles/oldcore/56/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/oldcore/56/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/56/filelists/openssl b/config/rootfiles/oldcore/56/filelists/openssl
new file mode 120000
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/oldcore/56/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/56/filelists/usb_modeswitch b/config/rootfiles/oldcore/56/filelists/usb_modeswitch
new file mode 120000
index 0000000..acbab6f
--- /dev/null
+++ b/config/rootfiles/oldcore/56/filelists/usb_modeswitch
@@ -0,0 +1 @@
+../../../common/usb_modeswitch
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/56/filelists/usb_modeswitch_data b/config/rootfiles/oldcore/56/filelists/usb_modeswitch_data
new file mode 120000
index 0000000..4cbce46
--- /dev/null
+++ b/config/rootfiles/oldcore/56/filelists/usb_modeswitch_data
@@ -0,0 +1 @@
+../../../common/usb_modeswitch_data
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/56/meta b/config/rootfiles/oldcore/56/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/56/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/56/update.sh b/config/rootfiles/oldcore/56/update.sh
new file mode 100644
index 0000000..2655a40
--- /dev/null
+++ b/config/rootfiles/oldcore/56/update.sh
@@ -0,0 +1,82 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire 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. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=56
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+/etc/init.d/sshd stop
+/etc/init.d/apache stop
+
+#
+#Extract files
+extract_files
+
+#
+#Edit baudrate in grub.conf and inittab
+sed -i -e "s|38400|115200|g" /boot/grub/grub.conf
+sed -i -e "s|38400|115200|g" /etc/inittab
+
+#
+#Start services
+/etc/init.d/apache start
+/etc/init.d/sshd start
+
+#
+#Update Language cache
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
+#depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
+#depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
+
+#Rebuild initrd's because some compat-wireless modules are inside
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
+#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
+#fi
+#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
+#fi
+
+sync
+
+# This update need a reboot...
+touch /var/run/need_reboot
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/57/exclude b/config/rootfiles/oldcore/57/exclude
new file mode 100644
index 0000000..7360266
--- /dev/null
+++ b/config/rootfiles/oldcore/57/exclude
@@ -0,0 +1,12 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
diff --git a/config/rootfiles/oldcore/57/filelists/apache2 b/config/rootfiles/oldcore/57/filelists/apache2
new file mode 120000
index 0000000..eef95ef
--- /dev/null
+++ b/config/rootfiles/oldcore/57/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/57/filelists/files b/config/rootfiles/oldcore/57/filelists/files
new file mode 100644
index 0000000..2f80b5f
--- /dev/null
+++ b/config/rootfiles/oldcore/57/filelists/files
@@ -0,0 +1,5 @@
+etc/system-release
+etc/issue
+etc/rc.d/init.d/networking/red.up/10-static-routes
+etc/rc.d/init.d/networking/red.down/10-static-routes
+etc/rc.d/init.d/networking/any
diff --git a/config/rootfiles/oldcore/57/filelists/php b/config/rootfiles/oldcore/57/filelists/php
new file mode 120000
index 0000000..1ae48d7
--- /dev/null
+++ b/config/rootfiles/oldcore/57/filelists/php
@@ -0,0 +1 @@
+../../../common/php
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/57/filelists/squid b/config/rootfiles/oldcore/57/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/oldcore/57/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/57/filelists/strongswan b/config/rootfiles/oldcore/57/filelists/strongswan
new file mode 120000
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/oldcore/57/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/57/filelists/vim b/config/rootfiles/oldcore/57/filelists/vim
new file mode 120000
index 0000000..9861317
--- /dev/null
+++ b/config/rootfiles/oldcore/57/filelists/vim
@@ -0,0 +1 @@
+../../../common/vim
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/57/meta b/config/rootfiles/oldcore/57/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/57/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/57/update.sh b/config/rootfiles/oldcore/57/update.sh
new file mode 100644
index 0000000..177bf72
--- /dev/null
+++ b/config/rootfiles/oldcore/57/update.sh
@@ -0,0 +1,81 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire 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. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=57
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+/etc/init.d/squid stop
+/etc/init.d/apache stop
+/etc/init.d/ipsec stop
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+/etc/init.d/squid start
+/etc/init.d/apache start
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+ /etc/init.d/ipsec start
+fi
+
+#
+#Update Language cache
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
+#depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
+#depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
+
+#Rebuild initrd's because some compat-wireless modules are inside
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
+#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
+#fi
+#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
+#fi
+
+sync
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/58/exclude b/config/rootfiles/oldcore/58/exclude
new file mode 100644
index 0000000..7360266
--- /dev/null
+++ b/config/rootfiles/oldcore/58/exclude
@@ -0,0 +1,12 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
diff --git a/config/rootfiles/oldcore/58/filelists/GeoIP b/config/rootfiles/oldcore/58/filelists/GeoIP
new file mode 100644
index 0000000..0258236
--- /dev/null
+++ b/config/rootfiles/oldcore/58/filelists/GeoIP
@@ -0,0 +1 @@
+usr/local/share/GeoIP/GeoIP.dat
diff --git a/config/rootfiles/oldcore/58/filelists/Net-Telnet b/config/rootfiles/oldcore/58/filelists/Net-Telnet
new file mode 120000
index 0000000..66ca926
--- /dev/null
+++ b/config/rootfiles/oldcore/58/filelists/Net-Telnet
@@ -0,0 +1 @@
+../../../common/Net-Telnet
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/58/filelists/armv5tel/cryptodev b/config/rootfiles/oldcore/58/filelists/armv5tel/cryptodev
new file mode 100644
index 0000000..6870588
--- /dev/null
+++ b/config/rootfiles/oldcore/58/filelists/armv5tel/cryptodev
@@ -0,0 +1,2 @@
+lib/modules/2.6.32.45-ipfire-versatile/extra/cryptodev.ko
+lib/modules/2.6.32.45-ipfire-kirkwood/extra/cryptodev.ko
diff --git a/config/rootfiles/oldcore/58/filelists/files b/config/rootfiles/oldcore/58/filelists/files
new file mode 100644
index 0000000..047127e
--- /dev/null
+++ b/config/rootfiles/oldcore/58/filelists/files
@@ -0,0 +1,7 @@
+etc/system-release
+etc/issue
+etc/vimrc
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+var/ipfire/general-functions.pl
+var/ipfire/langs
diff --git a/config/rootfiles/oldcore/58/filelists/fireinfo b/config/rootfiles/oldcore/58/filelists/fireinfo
new file mode 120000
index 0000000..c461155
--- /dev/null
+++ b/config/rootfiles/oldcore/58/filelists/fireinfo
@@ -0,0 +1 @@
+../../../common/fireinfo
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/58/filelists/hwdata b/config/rootfiles/oldcore/58/filelists/hwdata
new file mode 100644
index 0000000..5a9672f
--- /dev/null
+++ b/config/rootfiles/oldcore/58/filelists/hwdata
@@ -0,0 +1,2 @@
+usr/share/hwdata/pci.ids
+usr/share/hwdata/usb.ids
diff --git a/config/rootfiles/oldcore/58/filelists/i586/cryptodev b/config/rootfiles/oldcore/58/filelists/i586/cryptodev
new file mode 100644
index 0000000..da29a79
--- /dev/null
+++ b/config/rootfiles/oldcore/58/filelists/i586/cryptodev
@@ -0,0 +1,3 @@
+lib/modules/2.6.32.45-ipfire/extra/cryptodev.ko
+lib/modules/2.6.32.45-ipfire-pae/extra/cryptodev.ko
+lib/modules/2.6.32.45-ipfire-xen/extra/cryptodev.ko
diff --git a/config/rootfiles/oldcore/58/filelists/libpng b/config/rootfiles/oldcore/58/filelists/libpng
new file mode 120000
index 0000000..8ef96e2
--- /dev/null
+++ b/config/rootfiles/oldcore/58/filelists/libpng
@@ -0,0 +1 @@
+../../../common/libpng
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/58/filelists/openssh b/config/rootfiles/oldcore/58/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/oldcore/58/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/58/filelists/openssl b/config/rootfiles/oldcore/58/filelists/openssl
new file mode 120000
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/oldcore/58/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/58/filelists/openvpn b/config/rootfiles/oldcore/58/filelists/openvpn
new file mode 120000
index 0000000..493f3f7
--- /dev/null
+++ b/config/rootfiles/oldcore/58/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/58/filelists/strongswan b/config/rootfiles/oldcore/58/filelists/strongswan
new file mode 120000
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/oldcore/58/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/58/filelists/usb_modeswitch b/config/rootfiles/oldcore/58/filelists/usb_modeswitch
new file mode 120000
index 0000000..acbab6f
--- /dev/null
+++ b/config/rootfiles/oldcore/58/filelists/usb_modeswitch
@@ -0,0 +1 @@
+../../../common/usb_modeswitch
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/58/meta b/config/rootfiles/oldcore/58/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/58/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/58/update.sh b/config/rootfiles/oldcore/58/update.sh
new file mode 100644
index 0000000..ccec4b0
--- /dev/null
+++ b/config/rootfiles/oldcore/58/update.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire 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. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=58
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+/etc/init.d/ipsec stop
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+ /etc/init.d/ipsec start
+fi
+
+#
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+arch=`uname -m`
+if [ ${arch::3} == "arm" ]; then
+ depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1
+ depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1
+else
+ depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
+ depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
+ depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
+fi
+
+
+#Rebuild initrd's because some compat-wireless modules are inside
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
+#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
+#fi
+#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
+#fi
+
+sync
+
+# This update need a reboot...
+touch /var/run/need_reboot
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/59/exclude b/config/rootfiles/oldcore/59/exclude
new file mode 100644
index 0000000..7360266
--- /dev/null
+++ b/config/rootfiles/oldcore/59/exclude
@@ -0,0 +1,12 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
diff --git a/config/rootfiles/oldcore/59/filelists/GeoIP b/config/rootfiles/oldcore/59/filelists/GeoIP
new file mode 100644
index 0000000..0258236
--- /dev/null
+++ b/config/rootfiles/oldcore/59/filelists/GeoIP
@@ -0,0 +1 @@
+usr/local/share/GeoIP/GeoIP.dat
diff --git a/config/rootfiles/oldcore/59/filelists/Net-Telnet b/config/rootfiles/oldcore/59/filelists/Net-Telnet
new file mode 120000
index 0000000..66ca926
--- /dev/null
+++ b/config/rootfiles/oldcore/59/filelists/Net-Telnet
@@ -0,0 +1 @@
+../../../common/Net-Telnet
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/59/filelists/files b/config/rootfiles/oldcore/59/filelists/files
new file mode 100644
index 0000000..fef386b
--- /dev/null
+++ b/config/rootfiles/oldcore/59/filelists/files
@@ -0,0 +1,7 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+var/ipfire/general-functions.pl
+var/ipfire/langs
+var/ipfire/dhcpc/dhcpcd-hooks/10-mtu
diff --git a/config/rootfiles/oldcore/59/filelists/openssh b/config/rootfiles/oldcore/59/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/oldcore/59/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/59/filelists/openssl b/config/rootfiles/oldcore/59/filelists/openssl
new file mode 120000
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/oldcore/59/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/59/filelists/php b/config/rootfiles/oldcore/59/filelists/php
new file mode 120000
index 0000000..1ae48d7
--- /dev/null
+++ b/config/rootfiles/oldcore/59/filelists/php
@@ -0,0 +1 @@
+../../../common/php
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/59/filelists/python b/config/rootfiles/oldcore/59/filelists/python
new file mode 120000
index 0000000..ffe6e2c
--- /dev/null
+++ b/config/rootfiles/oldcore/59/filelists/python
@@ -0,0 +1 @@
+../../../common/python
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/59/filelists/strongswan b/config/rootfiles/oldcore/59/filelists/strongswan
new file mode 120000
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/oldcore/59/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/59/meta b/config/rootfiles/oldcore/59/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/59/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/59/update.sh b/config/rootfiles/oldcore/59/update.sh
new file mode 100644
index 0000000..2f1d865
--- /dev/null
+++ b/config/rootfiles/oldcore/59/update.sh
@@ -0,0 +1,86 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire 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. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=59
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+/etc/init.d/ipsec stop
+/etc/init.d/sshd stop
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+/etc/init.d/sshd start
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+ /etc/init.d/ipsec start
+fi
+
+#
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#arch=`uname -m`
+#if [ ${arch::3} == "arm" ]; then
+# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1
+# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1
+#else
+# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
+# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
+# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
+#fi
+
+
+#Rebuild initrd's because some compat-wireless modules are inside
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
+#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
+#fi
+#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
+#fi
+
+sync
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index 6987ade..db38453 100644
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -10,15 +10,15 @@ usr/bin/sigtool
#usr/lib/libclamav.la
usr/lib/libclamav.so
usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.14
+usr/lib/libclamav.so.6.1.15
#usr/lib/libclamunrar.la
usr/lib/libclamunrar.so
usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.14
+usr/lib/libclamunrar.so.6.1.15
#usr/lib/libclamunrar_iface.la
usr/lib/libclamunrar_iface.so
usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.14
+usr/lib/libclamunrar_iface.so.6.1.15
#usr/lib/pkgconfig/libclamav.pc
usr/sbin/clamd
usr/share/clamav
diff --git a/config/rootfiles/packages/telnet b/config/rootfiles/packages/telnet
new file mode 100644
index 0000000..75b8d77
--- /dev/null
+++ b/config/rootfiles/packages/telnet
@@ -0,0 +1,4 @@
+usr/bin/telnet
+#usr/man/man1/telnet.1
+#usr/man/man5/issue.net.5
+#usr/sbin/in.telnetd
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 04a87cf..6919c8c 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -241,19 +241,22 @@ END
print <<END;
+
<!-- Table of networks -->
<table border='0' width=80%>
- <tr> <th bgcolor='$color{'color20'}'>$Lang::tr{'network'}
- <th bgcolor='$color{'color20'}'>IP
- <th bgcolor='$color{'color20'}'>$Lang::tr{'status'}
- <tr> <td align='center' bgcolor='$Header::colourred' width='25%'><a href="/cgi-bin/pppsetup.cgi"><font size='2' color='white'><b>$Lang::tr{'internet'}</b></font></a><br>
- <td width='30%' align='center'>$ipaddr
- <td width='45%' align='center'>$connstate
+ <tr> <th bgcolor='$color{'color20'}'>$Lang::tr{'network'}</th>
+ <th bgcolor='$color{'color20'}'>IP</th>
+ <th bgcolor='$color{'color20'}'>$Lang::tr{'status'}</th></tr>
+ <tr> <td align='center' bgcolor='$Header::colourred' width='25%'><a href="/cgi-bin/pppsetup.cgi"><font size='2' color='white'><b>$Lang::tr{'internet'}</b></font></a><br></td>
+ <td width='30%' align='center'>$ipaddr </td>
+ <td width='45%' align='center'>$connstate
END
if ( $netsettings{'RED_TYPE'} ne "STATIC" && $netsettings{'RED_TYPE'} ne "DHCP" ){
print `/usr/local/bin/dialctrl.pl show`;
print <<END;
- <tr><td colspan='2'>
+ </td></tr>
+ <tr><td colspan='2'>
+
<form method='post' action='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'profile'}:
<select name='PROFILE'>
END
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index f91adf1..990fe66 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -356,14 +356,11 @@ sub writeserverconf {
if ($sovpnsettings{CLIENT2CLIENT} eq 'on') {
print CONF "client-to-client\n";
}
- if ($sovpnsettings{'DPROTOCOL'} eq 'udp') {
- if ($sovpnsettings{MSSFIX} eq 'on') {
- print CONF "mssfix\n";
- }
- if ($sovpnsettings{'FRAGMENT'} eq '' || $sovpnsettings{'FRAGMENT'} eq 0) {
- $sovpnsettings{'FRAGMENT'} = '1300';
- }
- print CONF "fragment $sovpnsettings{'FRAGMENT'}\n";
+ if ($sovpnsettings{MSSFIX} eq 'on') {
+ print CONF "mssfix\n";
+ }
+ if ($sovpnsettings{FRAGMENT} ne '' && $sovpnsettings{'DPROTOCOL'} ne 'tcp') {
+ print CONF "fragment $sovpnsettings{'FRAGMENT'}\n";
}
if ($sovpnsettings{KEEPALIVE_1} > 0 && $sovpnsettings{KEEPALIVE_2} > 0) {
print CONF "keepalive $sovpnsettings{'KEEPALIVE_1'} $sovpnsettings{'KEEPALIVE_2'}\n";
@@ -532,7 +529,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) {
}
}
if ($cgiparams{'MSSFIX'} ne 'on') {
- $vpnsettings{'MSSFIX'} = 'off';
+ delete $vpnsettings{'MSSFIX'};
} else {
$vpnsettings{'MSSFIX'} = $cgiparams{'MSSFIX'};
}
@@ -1906,12 +1903,6 @@ ADV_ERROR:
if ($cgiparams{'LOG_VERB'} eq '') {
$cgiparams{'LOG_VERB'} = '3';
}
- if ($cgiparams{'MSSFIX'} eq '') {
- $cgiparams{'MSSFIX'} = 'on';
- }
- if ($cgiparams{'FRAGMENT'} eq '') {
- $cgiparams{'FRAGMENT'} = '1300';
- }
$checked{'CLIENT2CLIENT'}{'off'} = '';
$checked{'CLIENT2CLIENT'}{'on'} = '';
$checked{'CLIENT2CLIENT'}{$cgiparams{'CLIENT2CLIENT'}} = 'CHECKED';
diff --git a/lfs/GeoIP b/lfs/GeoIP
index 41a82e9..3dd7e6f 100644
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -25,7 +25,7 @@
include Config
VER = 1.17
-DATVER = 05092012
+DATVER = 02102012
THISAPP = Geo-IP-PurePerl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
$(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
-GeoIP.dat-$(DATVER).gz_MD5 = c053f11cb8383fb8f4826591b0cbae3d
+GeoIP.dat-$(DATVER).gz_MD5 = 371c7ea4a8c8b963594ec3031e798696
install : $(TARGET)
diff --git a/lfs/apache2 b/lfs/apache2
index bcc9155..c3d9156 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -25,7 +25,7 @@
include Config
-VER = 2.2.22
+VER = 2.2.23
THISAPP = httpd-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -47,7 +47,7 @@ objects = $(DL_FILE) \
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch
-$(DL_FILE)_MD5 = 9fe3093194c8a57f085ff7c3fc43715f
+$(DL_FILE)_MD5 = ca133de0e4b4b15316990a97186b9993
httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
install : $(TARGET)
@@ -133,10 +133,9 @@ else
cd $(DIR_APP) && make install
chown -v root:root /usr/lib/apache/httpd.exp \
/usr/sbin/{apxs,apachectl,dbmmanage,envvars{,-std}} \
- /usr/share/man/man1/{ab,apxs,dbmmanage,ht{dbm,digest,passwd,txt2dbm}}.1 \
- /usr/share/man/man1/logresolve.1 \
- /usr/share/man/man8/{apachectl,htcacheclean,httpd}.8 \
- /usr/share/man/man8/{rotatelogs,suexec}.8
+ /usr/share/man/man1/{dbmmanage,ht{dbm,digest,passwd,txt2dbm}}.1 \
+ /usr/share/man/man8/{ab,apachectl,apxs,htcacheclean,httpd}.8 \
+ /usr/share/man/man8/{logresolve,rotatelogs,suexec}.8
@rm -rf $(DIR_APP)
endif
@$(POSTBUILD)
diff --git a/lfs/clamav b/lfs/clamav
index a717023..a2ed1f0 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
include Config
-VER = 0.97.5
+VER = 0.97.6
THISAPP = clamav-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = clamav
-PAK_VER = 20
+PAK_VER = 21
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4d4b93243a5add0216acc4f24f43a895
+$(DL_FILE)_MD5 = 1dbdd803b37c0d9d222e4316049f46a2
install : $(TARGET)
diff --git a/lfs/dhcp b/lfs/dhcp
index 845813c..816a75d 100644
--- a/lfs/dhcp
+++ b/lfs/dhcp
@@ -24,7 +24,7 @@
include Config
-VER = 3.1-ESV-R3
+VER = 4.2.2
THISAPP = dhcp-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = af3d8db60f62664f1d5538b81e406459
+$(DL_FILE)_MD5 = bb0f0434cd796f76aa7cead391d71f31
install : $(TARGET)
@@ -70,10 +70,59 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-remove-bind.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-errwarn-message.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-options.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-release-by-ifup.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-dhclient-decline-backoff.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-unicast-bootp.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-dhclient-usage.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-default-requested-options.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-xen-checksum.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.1-manpages.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-paths.patch
+ # Has to be enabled after glibc update.
+ #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-CLOEXEC.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-inherit-leases.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-garbage-chars.patch
+ #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-missing-ipv6-not-fatal.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-add_timeout_when_NULL.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.1-64_bit_lease_parse.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-capability.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-logpid.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-UseMulticast.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.1-sendDecline.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.1-retransmission.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-rfc3442-classless-static-routes.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-honor-expired.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-noprefixavail.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-sharedlib.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-PPP.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-lpf-ib.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-improved-xid.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-gpxe-cid.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.1-invalid-dhclient-conf.patch
+
+ # Remove bundled BIND stuff.
+ # (requires newer autoconf)
+ #rm -rfv $(DIR_APP)/bind/bind.tar.gz
+ #cd $(DIR_APP) && autoreconf --verbose --force --install
+
+ cd $(DIR_APP) && \
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc/dhcp \
+ --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
+ --disable-static \
+ --enable-paranoia \
+ --enable-early-chroot \
+ --disable-dhcpv6
cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make LIBDIR=/usr/lib INCDIR=/usr/include install
+ cd $(DIR_APP) && make install
+
+ mkdir -pv /var/state/dhcp
touch /var/state/dhcp/dhcpd.leases
- ln -sf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcpd.conf
+
+ ln -svf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcp/dhcpd.conf
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/fireinfo b/lfs/fireinfo
index f7fbbc4..c2e7238 100644
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -24,7 +24,7 @@
include Config
-VER = 2.1.5
+VER = 2.1.6
THISAPP = fireinfo-v$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 7f5350212b6aff44cb361fcabdf991e0
+$(DL_FILE)_MD5 = ff8eb520af49c0bf00722aac167070cd
install : $(TARGET)
diff --git a/lfs/fping b/lfs/fping
index 3b7b97c..6418686 100644
--- a/lfs/fping
+++ b/lfs/fping
@@ -24,7 +24,7 @@
include Config
-VER = 3.1
+VER = 3.4
THISAPP = fping-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = fping
-PAK_VER = 1
+PAK_VER = 2
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a2bbf3316da8c7b47a1a0ffe959d5d9e
+$(DL_FILE)_MD5 = a4bc97804e630dbf26dfac8f28c78091
install : $(TARGET)
diff --git a/lfs/inetutils b/lfs/inetutils
index 03cf5de..c1d51ce 100644
--- a/lfs/inetutils
+++ b/lfs/inetutils
@@ -75,7 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/sbin \
--sysconfdir=/etc --localstatedir=/var \
--mandir=/usr/share/man --infodir=/usr/share/info \
- --disable-logger --disable-syslogd
+ --disable-logger --disable-syslogd --disable-telnet --disable-telnetd
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
mv -v /usr/bin/ping /bin
diff --git a/lfs/minidlna b/lfs/minidlna
index d93a5c2..e2c1d21 100644
--- a/lfs/minidlna
+++ b/lfs/minidlna
@@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = minidlna
-PAK_VER = 1
+PAK_VER = 2
-DEPS = "ffmpeg flac libexif libid3tag libogg"
+DEPS = "ffmpeg flac libexif libid3tag libogg sqlite"
###############################################################################
# Top-level Rules
diff --git a/lfs/samba b/lfs/samba
index 9c6a3b6..4741754 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
include Config
-VER = 3.5.16
+VER = 3.5.18
THISAPP = samba-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
-PAK_VER = 41
+PAK_VER = 42
DEPS = "cups"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 260cf49b683e86f4cc316c1e6fddbdc5
+$(DL_FILE)_MD5 = 4bdb6d7ef23369d1c7d0199f0ebe012a
install : $(TARGET)
diff --git a/lfs/telnet b/lfs/telnet
new file mode 100644
index 0000000..a43beba
--- /dev/null
+++ b/lfs/telnet
@@ -0,0 +1,106 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# 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. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 0.17
+THISAPP = netkit-telnet-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = telnet
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE) \
+ telnet-client.tar.gz
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+telnet-client.tar.gz = $(DL_FROM)/telnet-client.tar.gz
+
+$(DL_FILE)_MD5 = d6beabaaf53fe6e382c42ce3faa05a36
+telnet-client.tar.gz_MD5 = d74983062470c5a3e7ae14f34c489e00
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd ${DIR_APP} && mv telnet telnet-netkit
+ cd ${DIR_APP} && tar zxf $(DIR_DL)/telnet-client.tar.gz
+ cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/telnet-client-cvs.patch0
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/telnet-0.17-env.patch
+ cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/telnet-0.17-pek.patch0
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/telnet-0.17-issue.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/telnet-0.17-sa-01-49.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/telnet-0.17-8bit.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/telnet-0.17-argv.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/telnet-0.17-conf.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/telnet-0.17-cleanup_race.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/telnet-0.17-CAN-2005-468_469.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/telnet-gethostbyname.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/netkit-telnet-0.17-ipv6.diff
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/netkit-telnet-0.17-nodns.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/telnet-0.17-errno_test_sys_bsd.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/netkit-telnet-0.17-reallynodns.patch
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && make
+ cd $(DIR_APP) && make install
+ rm -f /usr/sbin/telnetd
+ rm -f /usr/man/man8/in.telnetd.8
+ rm -f /usr/man/man8/telnetd.8
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index cf36f63..dec06f8 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.11" # Version number
-CORE="62" # Core Level (Filename)
-PAKFIRE_CORE="62" # Core Level (PAKFIRE)
+CORE="63" # Core Level (Filename)
+PAKFIRE_CORE="63" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
@@ -373,6 +373,7 @@ buildipfire() {
export LOGFILE
ipfiremake configroot
ipfiremake backup
+ ipfiremake bind
ipfiremake dhcp
ipfiremake dhcpcd
ipfiremake libusb
@@ -513,7 +514,6 @@ buildipfire() {
ipfiremake apache2 PASS=C
ipfiremake arping
ipfiremake beep
- ipfiremake bind
ipfiremake dvdrtools
ipfiremake dnsmasq
ipfiremake dosfstools
@@ -771,6 +771,7 @@ buildipfire() {
ipfiremake tcpick
ipfiremake minidlna
ipfiremake fping
+ ipfiremake telnet
echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
echo >> $BASEDIR/build/var/ipfire/firebuild
diff --git a/src/initscripts/init.d/network-vlans b/src/initscripts/init.d/network-vlans
index 88733e6..2fdfe9e 100755
--- a/src/initscripts/init.d/network-vlans
+++ b/src/initscripts/init.d/network-vlans
@@ -26,7 +26,7 @@ CONFIG_FILE="/var/ipfire/ethernet/vlans"
# Skip immediately if no configuration file has been found.
[ -e "${CONFIG_FILE}" ] || exit 0
-eval $(readhash ${CONFIG_FILE})
+eval $(/usr/local/bin/readhash ${CONFIG_FILE})
# This is start or stop.
action=${1}
@@ -52,21 +52,26 @@ for interface in green0 blue0 orange0; do
case "${action}" in
start)
+ # If no parent device has been configured, we assume
+ # that this interface is not set up for VLANs and
+ # silently go on.
+ [ -z "${PARENT_DEV}" ] && continue
+
# Check if the interface does already exists.
# If so, we skip creating it.
if [ -d "/sys/class/net/${interface}" ]; then
- echo "Interface ${interface} already exists."
+ echo "Interface ${interface} already exists." >&2
continue
fi
# Check if the parent interface exists.
- if [ -z "${PARENT_DEV}" ] || [ ! -d "/sys/class/net/${PARENT_DEV}" ]; then
- echo "${interface}: Parent device is not set or does not exist: ${PARENT_DEV}"
+ if [ ! -d "/sys/class/net/${PARENT_DEV}" ]; then
+ echo "${interface}: Parent device is not set or does not exist: ${PARENT_DEV}" >&2
continue
fi
if [ -z "${VLAN_ID}" ]; then
- echo "${interface}: You did not set the VLAN ID."
+ echo "${interface}: You did not set the VLAN ID." >&2
continue
fi
diff --git a/src/patches/dhcp-4.2.0-PPP.patch b/src/patches/dhcp-4.2.0-PPP.patch
new file mode 100644
index 0000000..bef2be7
--- /dev/null
+++ b/src/patches/dhcp-4.2.0-PPP.patch
@@ -0,0 +1,150 @@
+diff -up dhcp-4.2.0-P1/client/dhc6.c.PPP dhcp-4.2.0-P1/client/dhc6.c
+--- dhcp-4.2.0-P1/client/dhc6.c.PPP 2010-11-05 10:47:37.000000000 +0100
++++ dhcp-4.2.0-P1/client/dhc6.c 2010-11-09 15:54:12.000000000 +0100
+@@ -129,7 +129,7 @@ extern int stateless;
+ * is not how it is intended. Upcoming rearchitecting the client should
+ * address this "one daemon model."
+ */
+-void
++isc_result_t
+ form_duid(struct data_string *duid, const char *file, int line)
+ {
+ struct interface_info *ip;
+@@ -141,6 +141,15 @@ form_duid(struct data_string *duid, cons
+ if (ip == NULL)
+ log_fatal("Impossible condition at %s:%d.", MDL);
+
++ while (ip && ip->hw_address.hbuf[0] == HTYPE_RESERVED) {
++ /* Try the other interfaces */
++ log_debug("Cannot form default DUID from interface %s.", ip->name);
++ ip = ip->next;
++ }
++ if (ip == NULL) {
++ return ISC_R_UNEXPECTED;
++ }
++
+ if ((ip->hw_address.hlen == 0) ||
+ (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf)))
+ log_fatal("Impossible hardware address length at %s:%d.", MDL);
+@@ -176,6 +185,8 @@ form_duid(struct data_string *duid, cons
+ memcpy(duid->buffer->data + 4, ip->hw_address.hbuf + 1,
+ ip->hw_address.hlen - 1);
+ }
++
++ return ISC_R_SUCCESS;
+ }
+
+ /*
+@@ -5289,7 +5300,8 @@ make_client6_options(struct client_state
+ */
+ if ((oc = lookup_option(&dhcpv6_universe, *op,
+ D6O_CLIENTID)) == NULL) {
+- if (!option_cache(&oc, &default_duid, NULL, clientid_option,
++ if (default_duid.len == 0 ||
++ !option_cache(&oc, &default_duid, NULL, clientid_option,
+ MDL))
+ log_fatal("Failure assembling a DUID.");
+
+diff -up dhcp-4.2.0-P1/client/dhclient.c.PPP dhcp-4.2.0-P1/client/dhclient.c
+--- dhcp-4.2.0-P1/client/dhclient.c.PPP 2010-11-05 10:47:37.000000000 +0100
++++ dhcp-4.2.0-P1/client/dhclient.c 2010-11-09 15:37:26.000000000 +0100
+@@ -911,8 +911,8 @@ main(int argc, char **argv) {
+ if (default_duid.buffer != NULL)
+ data_string_forget(&default_duid, MDL);
+
+- form_duid(&default_duid, MDL);
+- write_duid(&default_duid);
++ if (form_duid(&default_duid, MDL) == ISC_R_SUCCESS)
++ write_duid(&default_duid);
+ }
+
+ for (ip = interfaces ; ip != NULL ; ip = ip->next) {
+diff -up dhcp-4.2.0-P1/common/bpf.c.PPP dhcp-4.2.0-P1/common/bpf.c
+--- dhcp-4.2.0-P1/common/bpf.c.PPP 2010-11-05 10:47:37.000000000 +0100
++++ dhcp-4.2.0-P1/common/bpf.c 2010-11-09 15:42:42.000000000 +0100
+@@ -599,6 +599,22 @@ get_hw_addr(const char *name, struct har
+ memcpy(&hw->hbuf[1], LLADDR(sa), sa->sdl_alen);
+ break;
+ #endif /* IFT_FDDI */
++#if defined(IFT_PPP)
++ case IFT_PPP:
++ if (local_family != AF_INET6)
++ log_fatal("Unsupported device type %d for \"%s\"",
++ sa->sdl_type, name);
++ hw->hlen = 0;
++ hw->hbuf[0] = HTYPE_RESERVED;
++ /* 0xdeadbeef should never occur on the wire,
++ * and is a signature that something went wrong.
++ */
++ hw->hbuf[1] = 0xde;
++ hw->hbuf[2] = 0xad;
++ hw->hbuf[3] = 0xbe;
++ hw->hbuf[4] = 0xef;
++ break;
++#endif
+ default:
+ log_fatal("Unsupported device type %d for \"%s\"",
+ sa->sdl_type, name);
+diff -up dhcp-4.2.0-P1/common/lpf.c.PPP dhcp-4.2.0-P1/common/lpf.c
+--- dhcp-4.2.0-P1/common/lpf.c.PPP 2010-11-05 10:47:37.000000000 +0100
++++ dhcp-4.2.0-P1/common/lpf.c 2010-11-09 15:45:40.000000000 +0100
+@@ -502,6 +502,22 @@ get_hw_addr(const char *name, struct har
+ hw->hbuf[0] = HTYPE_FDDI;
+ memcpy(&hw->hbuf[1], sa->sa_data, 16);
+ break;
++#if defined(ARPHRD_PPP)
++ case ARPHRD_PPP:
++ if (local_family != AF_INET6)
++ log_fatal("Unsupported device type %d for \"%s\"",
++ sa->sa_family, name);
++ hw->hlen = 0;
++ hw->hbuf[0] = HTYPE_RESERVED;
++ /* 0xdeadbeef should never occur on the wire,
++ * and is a signature that something went wrong.
++ */
++ hw->hbuf[1] = 0xde;
++ hw->hbuf[2] = 0xad;
++ hw->hbuf[3] = 0xbe;
++ hw->hbuf[4] = 0xef;
++ break;
++#endif
+ default:
+ log_fatal("Unsupported device type %ld for \"%s\"",
+ (long int)sa->sa_family, name);
+diff -up dhcp-4.2.0-P1/includes/dhcpd.h.PPP dhcp-4.2.0-P1/includes/dhcpd.h
+--- dhcp-4.2.0-P1/includes/dhcpd.h.PPP 2010-11-05 10:47:37.000000000 +0100
++++ dhcp-4.2.0-P1/includes/dhcpd.h 2010-11-09 15:46:58.000000000 +0100
+@@ -2733,7 +2733,7 @@ void dhcpv4_client_assignments(void);
+ void dhcpv6_client_assignments(void);
+
+ /* dhc6.c */
+-void form_duid(struct data_string *duid, const char *file, int line);
++isc_result_t form_duid(struct data_string *duid, const char *file, int line);
+ void dhc6_lease_destroy(struct dhc6_lease **src, const char *file, int line);
+ void start_init6(struct client_state *client);
+ void start_info_request6(struct client_state *client);
+diff -up dhcp-4.2.0-P1/includes/dhcp.h.PPP dhcp-4.2.0-P1/includes/dhcp.h
+--- dhcp-4.2.0-P1/includes/dhcp.h.PPP 2010-11-05 10:47:37.000000000 +0100
++++ dhcp-4.2.0-P1/includes/dhcp.h 2010-11-09 15:48:53.000000000 +0100
+@@ -80,6 +80,8 @@ struct dhcp_packet {
+ #define HTYPE_IEEE802 6 /* IEEE 802.2 Token Ring... */
+ #define HTYPE_FDDI 8 /* FDDI... */
+
++#define HTYPE_RESERVED 0 /* RFC 5494 */
++
+ /* Magic cookie validating dhcp options field (and bootp vendor
+ extensions field). */
+ #define DHCP_OPTIONS_COOKIE "\143\202\123\143"
+diff -up dhcp-4.2.0-P1/server/dhcpv6.c.PPP dhcp-4.2.0-P1/server/dhcpv6.c
+--- dhcp-4.2.0-P1/server/dhcpv6.c.PPP 2010-11-05 10:47:37.000000000 +0100
++++ dhcp-4.2.0-P1/server/dhcpv6.c 2010-11-09 15:50:17.000000000 +0100
+@@ -300,6 +300,9 @@ generate_new_server_duid(void) {
+ if (p->hw_address.hlen > 0) {
+ break;
+ }
++ if (p->next == NULL && p->hw_address.hbuf[0] == HTYPE_RESERVED) {
++ log_error("Can not generate DUID from interfaces which do not have hardware addresses, please configure server-duid!");
++ }
+ }
+ if (p == NULL) {
+ return ISC_R_UNEXPECTED;
diff --git a/src/patches/dhcp-4.2.0-UseMulticast.patch b/src/patches/dhcp-4.2.0-UseMulticast.patch
new file mode 100644
index 0000000..319344a
--- /dev/null
+++ b/src/patches/dhcp-4.2.0-UseMulticast.patch
@@ -0,0 +1,229 @@
+diff -up dhcp-4.2.0/server/dhcpv6.c.UseMulticast dhcp-4.2.0/server/dhcpv6.c
+--- dhcp-4.2.0/server/dhcpv6.c.UseMulticast 2010-06-01 19:30:00.000000000 +0200
++++ dhcp-4.2.0/server/dhcpv6.c 2010-07-21 16:17:30.000000000 +0200
+@@ -346,6 +346,48 @@ generate_new_server_duid(void) {
+ }
+
+ /*
++ * Is the D6O_UNICAST option defined in dhcpd.conf ?
++ */
++static isc_boolean_t unicast_option_defined;
++
++/*
++ * Did we already search dhcpd.conf for D6O_UNICAST option ?
++ * We need to store it here to not parse dhcpd.conf repeatedly.
++ */
++static isc_boolean_t unicast_option_parsed = ISC_FALSE;
++
++
++/*
++ * Is the D6O_UNICAST option defined in dhcpd.conf ?
++ */
++isc_boolean_t
++is_unicast_option_defined(void) {
++ struct option_state *opt_state;
++ struct option_cache *oc;
++
++ /*
++ * If we are looking for the unicast option for the first time
++ */
++ if (unicast_option_parsed == ISC_FALSE) {
++ unicast_option_parsed = ISC_TRUE;
++ opt_state = NULL;
++ if (!option_state_allocate(&opt_state, MDL)) {
++ log_fatal("No memory for option state.");
++ }
++
++ execute_statements_in_scope(NULL, NULL, NULL, NULL, NULL,
++ opt_state, &global_scope, root_group, NULL);
++
++ oc = lookup_option(&dhcpv6_universe, opt_state, D6O_UNICAST);
++ unicast_option_defined = (oc != NULL);
++
++ option_state_dereference(&opt_state, MDL);
++ }
++
++ return (unicast_option_defined);
++}
++
++/*
+ * Get the client identifier from the packet.
+ */
+ isc_result_t
+@@ -1405,6 +1447,56 @@ lease_to_client(struct data_string *repl
+ reply.shared->group);
+ }
+
++ /* reject unicast message, unless we set unicast option */
++ if ((packet->unicast == ISC_TRUE) && !is_unicast_option_defined())
++ /*
++ * RFC3315 section 18.2.1 (Request):
++ *
++ * When the server receives a Request message via unicast from a client
++ * to which the server has not sent a unicast option, the server
++ * discards the Request message and responds with a Reply message
++ * containing a Status Code option with the value UseMulticast, a Server
++ * Identifier option containing the server's DUID, the Client Identifier
++ * option from the client message, and no other options.
++ *
++ * Section 18.2.3 (Renew):
++ *
++ * When the server receives a Renew message via unicast from a client to
++ * which the server has not sent a unicast option, the server discards
++ * the Renew message and responds with a Reply message containing a
++ * Status Code option with the value UseMulticast, a Server Identifier
++ * option containing the server's DUID, the Client Identifier option
++ * from the client message, and no other options.
++ */
++ {
++ /* Set the UseMulticast status code. */
++ if (!set_status_code(STATUS_UseMulticast,
++ "Unicast not allowed by server.",
++ reply.opt_state)) {
++ log_error("lease_to_client: Unable to set "
++ "UseMulticast status code.");
++ goto exit;
++ }
++
++ /* Rewind the cursor to the start. */
++ reply.cursor = REPLY_OPTIONS_INDEX;
++
++ /*
++ * Produce an reply that includes only:
++ *
++ * Status code.
++ * Server DUID.
++ * Client DUID.
++ */
++ reply.cursor += store_options6((char *)reply.buf.data +
++ reply.cursor,
++ sizeof(reply.buf) -
++ reply.cursor,
++ reply.opt_state, reply.packet,
++ required_opts_NAA,
++ NULL);
++ } else if (no_resources_avail && (reply.ia_count != 0) &&
++ (reply.packet->dhcpv6_msg_type == DHCPV6_SOLICIT))
+ /*
+ * RFC3315 section 17.2.2 (Solicit):
+ *
+@@ -1429,8 +1521,6 @@ lease_to_client(struct data_string *repl
+ * the server.
+ * Sends a Renew/Rebind if the IA is not in the Reply message.
+ */
+- if (no_resources_avail && (reply.ia_count != 0) &&
+- (reply.packet->dhcpv6_msg_type == DHCPV6_SOLICIT))
+ {
+ /* Set the NoAddrsAvail status code. */
+ if (!set_status_code(STATUS_NoAddrsAvail,
+@@ -4128,7 +4218,6 @@ dhcpv6_solicit(struct data_string *reply
+ * Very similar to Solicit handling, except the server DUID is required.
+ */
+
+-/* TODO: reject unicast messages, unless we set unicast option */
+ static void
+ dhcpv6_request(struct data_string *reply_ret, struct packet *packet) {
+ struct data_string client_id;
+@@ -4443,7 +4532,6 @@ exit:
+ * except for the error code of when addresses don't match.
+ */
+
+-/* TODO: reject unicast messages, unless we set unicast option */
+ static void
+ dhcpv6_renew(struct data_string *reply, struct packet *packet) {
+ struct data_string client_id;
+@@ -4688,18 +4776,60 @@ iterate_over_ia_na(struct data_string *r
+ goto exit;
+ }
+
+- snprintf(status_msg, sizeof(status_msg), "%s received.", packet_type);
+- if (!set_status_code(STATUS_Success, status_msg, opt_state)) {
+- goto exit;
+- }
++ /* reject unicast message, unless we set unicast option */
++ if ((packet->unicast == ISC_TRUE) && !is_unicast_option_defined()) {
++ /*
++ * RFC3315 section 18.2.6 (Release):
++ *
++ * When the server receives a Release message via unicast from a client
++ * to which the server has not sent a unicast option, the server
++ * discards the Release message and responds with a Reply message
++ * containing a Status Code option with value UseMulticast, a Server
++ * Identifier option containing the server's DUID, the Client Identifier
++ * option from the client message, and no other options.
++ *
++ * Section 18.2.7 (Decline):
++ *
++ * When the server receives a Decline message via unicast from a client
++ * to which the server has not sent a unicast option, the server
++ * discards the Decline message and responds with a Reply message
++ * containing a Status Code option with the value UseMulticast, a Server
++ * Identifier option containing the server's DUID, the Client Identifier
++ * option from the client message, and no other options.
++ */
++ snprintf(status_msg, sizeof(status_msg),
++ "%s received unicast.", packet_type);
++ if (!set_status_code(STATUS_UseMulticast, status_msg, opt_state)) {
++ goto exit;
++ }
+
+- /*
+- * Add our options that are not associated with any IA_NA or IA_TA.
+- */
+- reply_ofs += store_options6(reply_data+reply_ofs,
+- sizeof(reply_data)-reply_ofs,
++ /*
++ * Produce an reply that includes only:
++ *
++ * Status code.
++ * Server DUID.
++ * Client DUID.
++ */
++ reply_ofs += store_options6(reply_data+reply_ofs,
++ sizeof(reply_data)-reply_ofs,
+ opt_state, packet,
+- required_opts, NULL);
++ required_opts_NAA, NULL);
++
++ goto return_reply;
++ } else {
++ snprintf(status_msg, sizeof(status_msg), "%s received.", packet_type);
++ if (!set_status_code(STATUS_Success, status_msg, opt_state)) {
++ goto exit;
++ }
++
++ /*
++ * Add our options that are not associated with any IA_NA or IA_TA.
++ */
++ reply_ofs += store_options6(reply_data+reply_ofs,
++ sizeof(reply_data)-reply_ofs,
++ opt_state, packet,
++ required_opts, NULL);
++ }
+
+ /*
+ * Loop through the IA_NA reported by the client, and deal with
+@@ -4838,6 +4968,7 @@ iterate_over_ia_na(struct data_string *r
+ /*
+ * Return our reply to the caller.
+ */
++return_reply:
+ reply_ret->len = reply_ofs;
+ reply_ret->buffer = NULL;
+ if (!buffer_allocate(&reply_ret->buffer, reply_ofs, MDL)) {
+@@ -4883,7 +5014,6 @@ exit:
+ * we still need to be aware of this possibility.
+ */
+
+-/* TODO: reject unicast messages, unless we set unicast option */
+ /* TODO: IA_TA */
+ static void
+ dhcpv6_decline(struct data_string *reply, struct packet *packet) {
+@@ -5355,7 +5485,6 @@ exit:
+ * Release means a client is done with the leases.
+ */
+
+-/* TODO: reject unicast messages, unless we set unicast option */
+ static void
+ dhcpv6_release(struct data_string *reply, struct packet *packet) {
+ struct data_string client_id;
diff --git a/src/patches/dhcp-4.2.0-add_timeout_when_NULL.patch b/src/patches/dhcp-4.2.0-add_timeout_when_NULL.patch
new file mode 100644
index 0000000..4784d5a
--- /dev/null
+++ b/src/patches/dhcp-4.2.0-add_timeout_when_NULL.patch
@@ -0,0 +1,14 @@
+diff -up dhcp-4.2.0/common/dispatch.c.dracut dhcp-4.2.0/common/dispatch.c
+--- dhcp-4.2.0/common/dispatch.c.dracut 2010-06-01 19:29:59.000000000 +0200
++++ dhcp-4.2.0/common/dispatch.c 2010-07-21 16:10:09.000000000 +0200
+@@ -189,6 +189,10 @@ void add_timeout (when, where, what, ref
+ isc_interval_t interval;
+ isc_time_t expires;
+
++ if (when == NULL) {
++ return;
++ }
++
+ /* See if this timeout supersedes an existing timeout. */
+ t = (struct timeout *)0;
+ for (q = timeouts; q; q = q->next) {
diff --git a/src/patches/dhcp-4.2.0-default-requested-options.patch b/src/patches/dhcp-4.2.0-default-requested-options.patch
new file mode 100644
index 0000000..fea8a4b
--- /dev/null
+++ b/src/patches/dhcp-4.2.0-default-requested-options.patch
@@ -0,0 +1,44 @@
+diff -up dhcp-4.2.0/client/clparse.c.requested dhcp-4.2.0/client/clparse.c
+--- dhcp-4.2.0/client/clparse.c.requested 2010-07-21 13:29:05.000000000 +0200
++++ dhcp-4.2.0/client/clparse.c 2010-07-21 13:50:29.000000000 +0200
+@@ -37,7 +37,7 @@
+
+ struct client_config top_level_config;
+
+-#define NUM_DEFAULT_REQUESTED_OPTS 9
++#define NUM_DEFAULT_REQUESTED_OPTS 14
+ struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1];
+
+ static void parse_client_default_duid(struct parse *cfile);
+@@ -111,6 +111,31 @@ isc_result_t read_client_conf ()
+ option_code_hash_lookup(&default_requested_options[8],
+ dhcpv6_universe.code_hash, &code, 0, MDL);
+
++ /* 10 */
++ code = DHO_NIS_DOMAIN;
++ option_code_hash_lookup(&default_requested_options[9],
++ dhcp_universe.code_hash, &code, 0, MDL);
++
++ /* 11 */
++ code = DHO_NIS_SERVERS;
++ option_code_hash_lookup(&default_requested_options[10],
++ dhcp_universe.code_hash, &code, 0, MDL);
++
++ /* 12 */
++ code = DHO_NTP_SERVERS;
++ option_code_hash_lookup(&default_requested_options[11],
++ dhcp_universe.code_hash, &code, 0, MDL);
++
++ /* 13 */
++ code = DHO_INTERFACE_MTU;
++ option_code_hash_lookup(&default_requested_options[12],
++ dhcp_universe.code_hash, &code, 0, MDL);
++
++ /* 14 */
++ code = DHO_DOMAIN_SEARCH;
++ option_code_hash_lookup(&default_requested_options[13],
++ dhcp_universe.code_hash, &code, 0, MDL);
++
+ for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
+ if (default_requested_options[code] == NULL)
+ log_fatal("Unable to find option definition for "
diff --git a/src/patches/dhcp-4.2.0-dhclient-decline-backoff.patch b/src/patches/dhcp-4.2.0-dhclient-decline-backoff.patch
new file mode 100644
index 0000000..81bec7b
--- /dev/null
+++ b/src/patches/dhcp-4.2.0-dhclient-decline-backoff.patch
@@ -0,0 +1,63 @@
+diff -up dhcp-4.2.0/client/dhclient.c.backoff dhcp-4.2.0/client/dhclient.c
+--- dhcp-4.2.0/client/dhclient.c.backoff 2010-07-21 13:37:03.000000000 +0200
++++ dhcp-4.2.0/client/dhclient.c 2010-07-21 13:38:31.000000000 +0200
+@@ -1208,6 +1208,8 @@ void state_init (cpp)
+ void *cpp;
+ {
+ struct client_state *client = cpp;
++ enum dhcp_state init_state = client->state;
++ struct timeval tv;
+
+ ASSERT_STATE(state, S_INIT);
+
+@@ -1220,9 +1222,18 @@ void state_init (cpp)
+ client -> first_sending = cur_time;
+ client -> interval = client -> config -> initial_interval;
+
+- /* Add an immediate timeout to cause the first DHCPDISCOVER packet
+- to go out. */
+- send_discover (client);
++ if (init_state != S_DECLINED) {
++ /* Add an immediate timeout to cause the first DHCPDISCOVER packet
++ to go out. */
++ send_discover(client);
++ } else {
++ /* We've received an OFFER and it has been DECLINEd by dhclient-script.
++ * wait for a random time between 1 and backoff_cutoff seconds before
++ * trying again. */
++ tv . tv_sec = cur_time + ((1 + (random() >> 2)) % client->config->backoff_cutoff);
++ tv . tv_usec = 0;
++ add_timeout(&tv, send_discover, client, 0, 0);
++ }
+ }
+
+ /*
+@@ -1501,6 +1512,7 @@ void bind_lease (client)
+ send_decline (client);
+ destroy_client_lease (client -> new);
+ client -> new = (struct client_lease *)0;
++ client -> state = S_DECLINED;
+ state_init (client);
+ return;
+ }
+@@ -3711,6 +3723,7 @@ void client_location_changed ()
+ case S_INIT:
+ case S_REBINDING:
+ case S_STOPPED:
++ case S_DECLINED:
+ break;
+ }
+ client -> state = S_INIT;
+diff -up dhcp-4.2.0/includes/dhcpd.h.backoff dhcp-4.2.0/includes/dhcpd.h
+--- dhcp-4.2.0/includes/dhcpd.h.backoff 2010-07-21 13:29:05.000000000 +0200
++++ dhcp-4.2.0/includes/dhcpd.h 2010-07-21 13:38:31.000000000 +0200
+@@ -1056,7 +1056,8 @@ enum dhcp_state {
+ S_BOUND = 5,
+ S_RENEWING = 6,
+ S_REBINDING = 7,
+- S_STOPPED = 8
++ S_STOPPED = 8,
++ S_DECLINED = 9
+ };
+
+ /* Authentication and BOOTP policy possibilities (not all values work
diff --git a/src/patches/dhcp-4.2.0-errwarn-message.patch b/src/patches/dhcp-4.2.0-errwarn-message.patch
new file mode 100644
index 0000000..a0f70cd
--- /dev/null
+++ b/src/patches/dhcp-4.2.0-errwarn-message.patch
@@ -0,0 +1,30 @@
+diff -up dhcp-4.2.0/omapip/errwarn.c.errwarn dhcp-4.2.0/omapip/errwarn.c
+--- dhcp-4.2.0/omapip/errwarn.c.errwarn 2009-07-23 20:52:21.000000000 +0200
++++ dhcp-4.2.0/omapip/errwarn.c 2010-07-21 13:23:47.000000000 +0200
+@@ -76,20 +76,13 @@ void log_fatal (const char * fmt, ... )
+
+ #if !defined (NOMINUM)
+ log_error ("%s", "");
+- log_error ("If you did not get this software from ftp.isc.org, please");
+- log_error ("get the latest from ftp.isc.org and install that before");
+- log_error ("requesting help.");
++ log_error ("This version of ISC DHCP is based on the release available");
++ log_error ("on ftp.isc.org. Features have been added and other changes");
++ log_error ("have been made to the base software release in order to make");
++ log_error ("it work better with this distribution.");
+ log_error ("%s", "");
+- log_error ("If you did get this software from ftp.isc.org and have not");
+- log_error ("yet read the README, please read it before requesting help.");
+- log_error ("If you intend to request help from the dhcp-server(a)isc.org");
+- log_error ("mailing list, please read the section on the README about");
+- log_error ("submitting bug reports and requests for help.");
+- log_error ("%s", "");
+- log_error ("Please do not under any circumstances send requests for");
+- log_error ("help directly to the authors of this software - please");
+- log_error ("send them to the appropriate mailing list as described in");
+- log_error ("the README file.");
++ log_error ("Please report for this software via the Red Hat Bugzilla site:");
++ log_error (" http://bugzilla.redhat.com");
+ log_error ("%s", "");
+ log_error ("exiting.");
+ #endif
diff --git a/src/patches/dhcp-4.2.0-garbage-chars.patch b/src/patches/dhcp-4.2.0-garbage-chars.patch
new file mode 100644
index 0000000..118ff3f
--- /dev/null
+++ b/src/patches/dhcp-4.2.0-garbage-chars.patch
@@ -0,0 +1,12 @@
+diff -up dhcp-4.2.0/common/tables.c.garbage dhcp-4.2.0/common/tables.c
+--- dhcp-4.2.0/common/tables.c.garbage 2009-11-20 02:49:01.000000000 +0100
++++ dhcp-4.2.0/common/tables.c 2010-07-21 14:40:56.000000000 +0200
+@@ -207,7 +207,7 @@ static struct option dhcp_options[] = {
+ { "netinfo-server-tag", "t", &dhcp_universe, 113, 1 },
+ { "default-url", "t", &dhcp_universe, 114, 1 },
+ { "subnet-selection", "I", &dhcp_universe, 118, 1 },
+- { "domain-search", "Dc", &dhcp_universe, 119, 1 },
++ { "domain-search", "D", &dhcp_universe, 119, 1 },
+ { "vivco", "Evendor-class.", &dhcp_universe, 124, 1 },
+ { "vivso", "Evendor.", &dhcp_universe, 125, 1 },
+ #if 0
diff --git a/src/patches/dhcp-4.2.0-honor-expired.patch b/src/patches/dhcp-4.2.0-honor-expired.patch
new file mode 100644
index 0000000..0ae9128
--- /dev/null
+++ b/src/patches/dhcp-4.2.0-honor-expired.patch
@@ -0,0 +1,49 @@
+diff -up dhcp-4.2.0/client/dhc6.c.honor-expired dhcp-4.2.0/client/dhc6.c
+--- dhcp-4.2.0/client/dhc6.c.honor-expired 2010-10-07 12:55:37.000000000 +0200
++++ dhcp-4.2.0/client/dhc6.c 2010-10-07 12:56:43.000000000 +0200
+@@ -1405,6 +1405,32 @@ start_info_request6(struct client_state
+ go_daemon();
+ }
+
++/* Run through the addresses in lease and return true if there's any unexpired.
++ * Return false otherwise.
++ */
++isc_boolean_t
++unexpired_address_in_lease(struct dhc6_lease *lease)
++{
++ struct dhc6_ia *ia;
++ struct dhc6_addr *addr;
++
++ for (ia = lease->bindings ; ia != NULL ; ia = ia->next) {
++ for (addr = ia->addrs ; addr != NULL ; addr = addr->next) {
++ if (addr->flags & DHC6_ADDR_EXPIRED)
++ continue;
++
++ if (addr->starts + addr->max_life > cur_time) {
++ return ISC_TRUE;
++ }
++ }
++ }
++
++ log_info("PRC: Previous lease is devoid of active addresses."
++ " Re-initializing.");
++
++ return ISC_FALSE;
++}
++
+ /*
+ * start_confirm6() kicks off an "init-reboot" version of the process, at
+ * startup to find out if old bindings are 'fair' and at runtime whenever
+@@ -1417,8 +1446,10 @@ start_confirm6(struct client_state *clie
+
+ /* If there is no active lease, there is nothing to check. */
+ if ((client->active_lease == NULL) ||
+- !active_prefix(client) ||
+- client->active_lease->released) {
++ !active_prefix(client) ||
++ client->active_lease->released ||
++ !unexpired_address_in_lease(client->active_lease)) {
++ dhc6_lease_destroy(&client->active_lease, MDL);
+ start_init6(client);
+ return;
+ }
diff --git a/src/patches/dhcp-4.2.0-inherit-leases.patch b/src/patches/dhcp-4.2.0-inherit-leases.patch
new file mode 100644
index 0000000..052f642
--- /dev/null
+++ b/src/patches/dhcp-4.2.0-inherit-leases.patch
@@ -0,0 +1,34 @@
+diff -up dhcp-4.2.0/client/dhclient.c.inherit dhcp-4.2.0/client/dhclient.c
+--- dhcp-4.2.0/client/dhclient.c.inherit 2010-07-21 14:33:44.000000000 +0200
++++ dhcp-4.2.0/client/dhclient.c 2010-07-21 14:40:05.000000000 +0200
+@@ -2322,6 +2322,7 @@ void send_request (cpp)
+ {
+ struct client_state *client = cpp;
+
++ int i;
+ int result;
+ int interval;
+ struct sockaddr_in destination;
+@@ -2381,6 +2382,22 @@ void send_request (cpp)
+ /* Now do a preinit on the interface so that we can
+ discover a new address. */
+ script_init (client, "PREINIT", (struct string_list *)0);
++
++ /* Has an active lease */
++ if (client -> interface -> addresses != NULL) {
++ for (i = 0; i < client -> interface -> address_count; i++) {
++ if (client -> active &&
++ client -> active -> is_bootp &&
++ client -> active -> expiry > cur_time &&
++ client -> interface -> addresses[i].s_addr != 0 &&
++ client -> active -> address.len == 4 &&
++ memcpy (client -> active -> address.iabuf, &(client -> interface -> addresses[i]), 4) == 0) {
++ client_envadd (client, "", "keep_old_ip", "%s", "yes");
++ break;
++ }
++ }
++ }
++
+ if (client -> alias)
+ script_write_params (client, "alias_",
+ client -> alias);
diff --git a/src/patches/dhcp-4.2.0-logpid.patch b/src/patches/dhcp-4.2.0-logpid.patch
new file mode 100644
index 0000000..c24adb1
--- /dev/null
+++ b/src/patches/dhcp-4.2.0-logpid.patch
@@ -0,0 +1,12 @@
+diff -up dhcp-4.2.0/client/dhclient.c.logpid dhcp-4.2.0/client/dhclient.c
+--- dhcp-4.2.0/client/dhclient.c.logpid 2010-07-21 16:13:52.000000000 +0200
++++ dhcp-4.2.0/client/dhclient.c 2010-07-21 16:16:51.000000000 +0200
+@@ -154,7 +154,7 @@ main(int argc, char **argv) {
+ else if (fd != -1)
+ close(fd);
+
+- openlog("dhclient", LOG_NDELAY, LOG_DAEMON);
++ openlog("dhclient", LOG_NDELAY | LOG_PID, LOG_DAEMON);
+
+ #if !(defined(DEBUG) || defined(__CYGWIN32__))
+ setlogmask(LOG_UPTO(LOG_INFO));
diff --git a/src/patches/dhcp-4.2.0-missing-ipv6-not-fatal.patch b/src/patches/dhcp-4.2.0-missing-ipv6-not-fatal.patch
new file mode 100644
index 0000000..b604115
--- /dev/null
+++ b/src/patches/dhcp-4.2.0-missing-ipv6-not-fatal.patch
@@ -0,0 +1,40 @@
+diff -up dhcp-4.2.0/common/discover.c.noipv6 dhcp-4.2.0/common/discover.c
+--- dhcp-4.2.0/common/discover.c.noipv6 2010-07-21 14:31:13.000000000 +0200
++++ dhcp-4.2.0/common/discover.c 2010-07-21 16:04:57.000000000 +0200
+@@ -443,7 +443,7 @@ begin_iface_scan(struct iface_conf_list
+ }
+
+ #ifdef DHCPv6
+- if (local_family == AF_INET6) {
++ if ((local_family == AF_INET6) && !access("/proc/net/if_inet6", R_OK)) {
+ ifaces->fp6 = fopen("/proc/net/if_inet6", "re");
+ if (ifaces->fp6 == NULL) {
+ log_error("Error opening '/proc/net/if_inet6' to "
+@@ -454,6 +454,8 @@ begin_iface_scan(struct iface_conf_list
+ ifaces->fp = NULL;
+ return 0;
+ }
++ } else {
++ ifaces->fp6 = NULL;
+ }
+ #endif
+
+@@ -721,7 +723,7 @@ next_iface(struct iface_info *info, int
+ return 1;
+ }
+ #ifdef DHCPv6
+- if (!(*err)) {
++ if (!(*err) && ifaces->fp6) {
+ if (local_family == AF_INET6)
+ return next_iface6(info, err, ifaces);
+ }
+@@ -740,7 +742,8 @@ end_iface_scan(struct iface_conf_list *i
+ ifaces->sock = -1;
+ #ifdef DHCPv6
+ if (local_family == AF_INET6) {
+- fclose(ifaces->fp6);
++ if (ifaces->fp6)
++ fclose(ifaces->fp6);
+ ifaces->fp6 = NULL;
+ }
+ #endif
diff --git a/src/patches/dhcp-4.2.0-noprefixavail.patch b/src/patches/dhcp-4.2.0-noprefixavail.patch
new file mode 100644
index 0000000..729a172
--- /dev/null
+++ b/src/patches/dhcp-4.2.0-noprefixavail.patch
@@ -0,0 +1,140 @@
+diff -up dhcp-4.2.0/server/dhcpv6.c.noprefixavail dhcp-4.2.0/server/dhcpv6.c
+--- dhcp-4.2.0/server/dhcpv6.c.noprefixavail 2010-10-07 13:48:45.000000000 +0200
++++ dhcp-4.2.0/server/dhcpv6.c 2010-10-13 11:00:25.000000000 +0200
+@@ -1134,7 +1134,7 @@ try_client_v6_prefix(struct iasubopt **p
+ return DHCP_R_INVALIDARG;
+ }
+ tmp_plen = (int) requested_pref->data[0];
+- if ((tmp_plen < 3) || (tmp_plen > 128)) {
++ if ((tmp_plen < 3) || (tmp_plen > 128) ||((int)tmp_plen != pool->units)) {
+ return ISC_R_FAILURE;
+ }
+ memcpy(&tmp_pref, requested_pref->data + 1, sizeof(tmp_pref));
+@@ -1147,9 +1147,8 @@ try_client_v6_prefix(struct iasubopt **p
+ return ISC_R_FAILURE;
+ }
+
+- if (((int)tmp_plen != pool->units) ||
+- !ipv6_in_pool(&tmp_pref, pool)) {
+- return ISC_R_FAILURE;
++ if (!ipv6_in_pool(&tmp_pref, pool)) {
++ return ISC_R_ADDRNOTAVAIL;
+ }
+
+ if (prefix6_exists(pool, &tmp_pref, tmp_plen)) {
+@@ -1409,13 +1408,6 @@ lease_to_client(struct data_string *repl
+ if ((status != ISC_R_SUCCESS) &&
+ (status != ISC_R_NORESOURCES))
+ goto exit;
+-
+- /*
+- * If any prefix cannot be given to any IA_PD, then
+- * set the NoPrefixAvail status code.
+- */
+- if (reply.client_resources == 0)
+- no_resources_avail = ISC_TRUE;
+ }
+
+ /*
+@@ -1549,36 +1541,6 @@ lease_to_client(struct data_string *repl
+ reply.opt_state, reply.packet,
+ required_opts_NAA,
+ NULL);
+- } else if (no_resources_avail && (reply.ia_count == 0) &&
+- (reply.packet->dhcpv6_msg_type == DHCPV6_SOLICIT))
+- {
+- /* Set the NoPrefixAvail status code. */
+- if (!set_status_code(STATUS_NoPrefixAvail,
+- "No prefixes available for this "
+- "interface.", reply.opt_state)) {
+- log_error("lease_to_client: Unable to set "
+- "NoPrefixAvail status code.");
+- goto exit;
+- }
+-
+- /* Rewind the cursor to the start. */
+- reply.cursor = REPLY_OPTIONS_INDEX;
+-
+- /*
+- * Produce an advertise that includes only:
+- *
+- * Status code.
+- * Server DUID.
+- * Client DUID.
+- */
+- reply.buf.reply.msg_type = DHCPV6_ADVERTISE;
+- reply.cursor += store_options6((char *)reply.buf.data +
+- reply.cursor,
+- sizeof(reply.buf) -
+- reply.cursor,
+- reply.opt_state, reply.packet,
+- required_opts_NAA,
+- NULL);
+ } else {
+ /*
+ * Having stored the client's IA's, store any options that
+@@ -2793,16 +2755,18 @@ find_client_temporaries(struct reply_sta
+ */
+ static isc_result_t
+ reply_process_try_addr(struct reply_state *reply, struct iaddr *addr) {
+- isc_result_t status = ISC_R_NORESOURCES;
++ isc_result_t status = ISC_R_ADDRNOTAVAIL;
+ struct ipv6_pool *pool;
+ int i;
+ struct data_string data_addr;
+
+ if ((reply == NULL) || (reply->shared == NULL) ||
+- (reply->shared->ipv6_pools == NULL) || (addr == NULL) ||
+- (reply->lease != NULL))
++ (addr == NULL) || (reply->lease != NULL))
+ return DHCP_R_INVALIDARG;
+
++ if (reply->shared->ipv6_pools == NULL)
++ return ISC_R_ADDRNOTAVAIL;
++
+ memset(&data_addr, 0, sizeof(data_addr));
+ data_addr.len = addr->len;
+ data_addr.data = addr->iabuf;
+@@ -3314,7 +3278,9 @@ reply_process_ia_pd(struct reply_state *
+ if (status == ISC_R_CANCELED)
+ break;
+
+- if ((status != ISC_R_SUCCESS) && (status != ISC_R_ADDRINUSE))
++ if ((status != ISC_R_SUCCESS) &&
++ (status != ISC_R_ADDRINUSE) &&
++ (status != ISC_R_ADDRNOTAVAIL))
+ goto cleanup;
+ }
+
+@@ -3594,7 +3560,8 @@ reply_process_prefix(struct reply_state
+
+ /* Either error out or skip this prefix. */
+ if ((status != ISC_R_SUCCESS) &&
+- (status != ISC_R_ADDRINUSE))
++ (status != ISC_R_ADDRINUSE) &&
++ (status != ISC_R_ADDRNOTAVAIL))
+ goto cleanup;
+
+ if (reply->lease == NULL) {
+@@ -3773,16 +3740,18 @@ prefix_is_owned(struct reply_state *repl
+ static isc_result_t
+ reply_process_try_prefix(struct reply_state *reply,
+ struct iaddrcidrnet *pref) {
+- isc_result_t status = ISC_R_NORESOURCES;
++ isc_result_t status = ISC_R_ADDRNOTAVAIL;
+ struct ipv6_pool *pool;
+ int i;
+ struct data_string data_pref;
+
+ if ((reply == NULL) || (reply->shared == NULL) ||
+- (reply->shared->ipv6_pools == NULL) || (pref == NULL) ||
+- (reply->lease != NULL))
++ (pref == NULL) || (reply->lease != NULL))
+ return DHCP_R_INVALIDARG;
+
++ if (reply->shared->ipv6_pools == NULL)
++ return ISC_R_ADDRNOTAVAIL;
++
+ memset(&data_pref, 0, sizeof(data_pref));
+ data_pref.len = 17;
+ if (!buffer_allocate(&data_pref.buffer, data_pref.len, MDL)) {
diff --git a/src/patches/dhcp-4.2.0-paths.patch b/src/patches/dhcp-4.2.0-paths.patch
new file mode 100644
index 0000000..54c7aba
--- /dev/null
+++ b/src/patches/dhcp-4.2.0-paths.patch
@@ -0,0 +1,45 @@
+diff -up dhcp-4.2.0/includes/dhcpd.h.paths dhcp-4.2.0/includes/dhcpd.h
+--- dhcp-4.2.0/includes/dhcpd.h.paths 2010-07-21 13:55:42.000000000 +0200
++++ dhcp-4.2.0/includes/dhcpd.h 2010-07-21 14:29:57.000000000 +0200
+@@ -1390,15 +1390,15 @@ typedef unsigned char option_mask [16];
+ #else /* !DEBUG */
+
+ #ifndef _PATH_DHCPD_CONF
+-#define _PATH_DHCPD_CONF "/etc/dhcpd.conf"
++#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
+ #endif /* DEBUG */
+
+ #ifndef _PATH_DHCPD_DB
+-#define _PATH_DHCPD_DB LOCALSTATEDIR"/db/dhcpd.leases"
++#define _PATH_DHCPD_DB LOCALSTATEDIR"/dhcpd/dhcpd.leases"
+ #endif
+
+ #ifndef _PATH_DHCPD6_DB
+-#define _PATH_DHCPD6_DB LOCALSTATEDIR"/db/dhcpd6.leases"
++#define _PATH_DHCPD6_DB LOCALSTATEDIR"/dhcpd/dhcpd6.leases"
+ #endif
+
+ #ifndef _PATH_DHCPD_PID
+@@ -1412,7 +1412,7 @@ typedef unsigned char option_mask [16];
+ #endif /* DEBUG */
+
+ #ifndef _PATH_DHCLIENT_CONF
+-#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf"
++#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
+ #endif
+
+ #ifndef _PATH_DHCLIENT_SCRIPT
+@@ -1428,11 +1428,11 @@ typedef unsigned char option_mask [16];
+ #endif
+
+ #ifndef _PATH_DHCLIENT_DB
+-#define _PATH_DHCLIENT_DB LOCALSTATEDIR"/db/dhclient.leases"
++#define _PATH_DHCLIENT_DB LOCALSTATEDIR"/dhclient/dhclient.leases"
+ #endif
+
+ #ifndef _PATH_DHCLIENT6_DB
+-#define _PATH_DHCLIENT6_DB LOCALSTATEDIR"/db/dhclient6.leases"
++#define _PATH_DHCLIENT6_DB LOCALSTATEDIR"/dhclient/dhclient6.leases"
+ #endif
+
+ #ifndef _PATH_RESOLV_CONF
diff --git a/src/patches/dhcp-4.2.0-release-by-ifup.patch b/src/patches/dhcp-4.2.0-release-by-ifup.patch
new file mode 100644
index 0000000..300c5f3
--- /dev/null
+++ b/src/patches/dhcp-4.2.0-release-by-ifup.patch
@@ -0,0 +1,85 @@
+diff -up dhcp-4.2.0/client/dhclient.c.ifup dhcp-4.2.0/client/dhclient.c
+--- dhcp-4.2.0/client/dhclient.c.ifup 2010-07-21 13:30:10.000000000 +0200
++++ dhcp-4.2.0/client/dhclient.c 2010-07-21 13:37:03.000000000 +0200
+@@ -497,9 +497,81 @@ main(int argc, char **argv) {
+ kill(oldpid, SIGTERM);
+ }
+ fclose(pidfd);
++ } else {
++ /* handle release for interfaces requested with Red Hat
++ * /sbin/ifup - pidfile will be /var/run/dhclient-$interface.pid
++ */
++
++ if ((path_dhclient_pid == NULL) || (*path_dhclient_pid == '\0'))
++ path_dhclient_pid = "/var/run/dhclient.pid";
++
++ char *new_path_dhclient_pid;
++ struct interface_info *ip;
++ int pdp_len = strlen(path_dhclient_pid), pfx, dpfx;
++
++ /* find append point: beginning of any trailing '.pid'
++ * or '-$IF.pid' */
++ for (pfx=pdp_len; (pfx >= 0) && (path_dhclient_pid[pfx] != '.') && (path_dhclient_pid[pfx] != '/'); pfx--);
++ if (pfx == -1)
++ pfx = pdp_len;
++
++ if (path_dhclient_pid[pfx] == '/')
++ pfx += 1;
++
++ for (dpfx=pfx; (dpfx >= 0) && (path_dhclient_pid[dpfx] != '-') && (path_dhclient_pid[dpfx] != '/'); dpfx--);
++ if ((dpfx > -1) && (path_dhclient_pid[dpfx] != '/'))
++ pfx = dpfx;
++
++ for (ip = interfaces; ip; ip = ip->next) {
++ if (interfaces_requested && (ip->flags & (INTERFACE_REQUESTED))) {
++ int n_len = strlen(ip->name);
++
++ new_path_dhclient_pid = (char*) malloc(pfx + n_len + 6);
++ strncpy(new_path_dhclient_pid, path_dhclient_pid, pfx);
++ sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name);
++
++ if ((pidfd = fopen(new_path_dhclient_pid, "r")) != NULL) {
++ e = fscanf(pidfd, "%ld\n", &temp);
++ oldpid = (pid_t)temp;
++
++ if (e != 0 && e != EOF) {
++ if (oldpid) {
++ if (kill(oldpid, SIGTERM) == 0)
++ unlink(path_dhclient_pid);
++ }
++ }
++
++ fclose(pidfd);
++ }
++
++ free(new_path_dhclient_pid);
++ }
++ }
++ }
++ } else {
++ FILE *pidfp = NULL;
++ long temp = 0;
++ pid_t dhcpid = 0;
++ int dhc_running = 0;
++ char procfn[256] = "";
++
++ if ((pidfp = fopen(path_dhclient_pid, "r")) != NULL) {
++ if ((fscanf(pidfp, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) {
++ snprintf(procfn,256,"/proc/%u",dhcpid);
++ dhc_running = (access(procfn, F_OK) == 0);
++ }
++
++ fclose(pidfp);
++ }
++
++ if (dhc_running) {
++ log_fatal("dhclient(%u) is already running - exiting. ", dhcpid);
++ return(1);
+ }
+ }
+
++ write_client_pid_file();
++
+ if (!quiet) {
+ log_info("%s %s", message, PACKAGE_VERSION);
+ log_info(copyright);
diff --git a/src/patches/dhcp-4.2.0-unicast-bootp.patch b/src/patches/dhcp-4.2.0-unicast-bootp.patch
new file mode 100644
index 0000000..78bc078
--- /dev/null
+++ b/src/patches/dhcp-4.2.0-unicast-bootp.patch
@@ -0,0 +1,99 @@
+diff -up dhcp-4.2.0/server/bootp.c.unicast dhcp-4.2.0/server/bootp.c
+--- dhcp-4.2.0/server/bootp.c.unicast 2009-11-20 02:49:03.000000000 +0100
++++ dhcp-4.2.0/server/bootp.c 2010-07-21 13:40:25.000000000 +0200
+@@ -58,6 +58,7 @@ void bootp (packet)
+ char msgbuf [1024];
+ int ignorep;
+ int peer_has_leases = 0;
++ int norelay = 0;
+
+ if (packet -> raw -> op != BOOTREQUEST)
+ return;
+@@ -73,7 +74,7 @@ void bootp (packet)
+ ? inet_ntoa (packet -> raw -> giaddr)
+ : packet -> interface -> name);
+
+- if (!locate_network (packet)) {
++ if ((norelay = locate_network (packet)) == 0) {
+ log_info ("%s: network unknown", msgbuf);
+ return;
+ }
+@@ -390,6 +391,13 @@ void bootp (packet)
+ from, &to, &hto);
+ goto out;
+ }
++ } else if (norelay == 2) {
++ to.sin_addr = raw.ciaddr;
++ to.sin_port = remote_port;
++ if (fallback_interface) {
++ result = send_packet (fallback_interface, (struct packet *)0, &raw, outgoing.packet_length, from, &to, &hto);
++ goto out;
++ }
+
+ /* If it comes from a client that already knows its address
+ and is not requesting a broadcast response, and we can
+diff -up dhcp-4.2.0/server/dhcp.c.unicast dhcp-4.2.0/server/dhcp.c
+--- dhcp-4.2.0/server/dhcp.c.unicast 2010-06-01 19:29:59.000000000 +0200
++++ dhcp-4.2.0/server/dhcp.c 2010-07-21 13:40:25.000000000 +0200
+@@ -4185,6 +4185,7 @@ int locate_network (packet)
+ struct data_string data;
+ struct subnet *subnet = (struct subnet *)0;
+ struct option_cache *oc;
++ int norelay = 0;
+
+ /* See if there's a Relay Agent Link Selection Option, or a
+ * Subnet Selection Option. The Link-Select and Subnet-Select
+@@ -4200,12 +4201,24 @@ int locate_network (packet)
+ from the interface, if there is one. If not, fail. */
+ if (!oc && !packet -> raw -> giaddr.s_addr) {
+ if (packet -> interface -> shared_network) {
+- shared_network_reference
+- (&packet -> shared_network,
+- packet -> interface -> shared_network, MDL);
+- return 1;
++ struct in_addr any_addr;
++ any_addr.s_addr = INADDR_ANY;
++
++ if (!packet -> packet_type && memcmp(&packet -> raw -> ciaddr, &any_addr, 4)) {
++ struct iaddr cip;
++ memcpy(cip.iabuf, &packet -> raw -> ciaddr, 4);
++ cip.len = 4;
++ if (!find_grouped_subnet(&subnet, packet->interface->shared_network, cip, MDL))
++ norelay = 2;
++ }
++
++ if (!norelay) {
++ shared_network_reference(&packet -> shared_network, packet -> interface -> shared_network, MDL);
++ return 1;
++ }
++ } else {
++ return 0;
+ }
+- return 0;
+ }
+
+ /* If there's an option indicating link connection, and it's valid,
+@@ -4228,7 +4241,10 @@ int locate_network (packet)
+ data_string_forget (&data, MDL);
+ } else {
+ ia.len = 4;
+- memcpy (ia.iabuf, &packet -> raw -> giaddr, 4);
++ if (norelay)
++ memcpy (ia.iabuf, &packet->raw->ciaddr, 4);
++ else
++ memcpy (ia.iabuf, &packet->raw->giaddr, 4);
+ }
+
+ /* If we know the subnet on which the IP address lives, use it. */
+@@ -4236,7 +4252,10 @@ int locate_network (packet)
+ shared_network_reference (&packet -> shared_network,
+ subnet -> shared_network, MDL);
+ subnet_dereference (&subnet, MDL);
+- return 1;
++ if (norelay)
++ return norelay;
++ else
++ return 1;
+ }
+
+ /* Otherwise, fail. */
diff --git a/src/patches/dhcp-4.2.1-64_bit_lease_parse.patch b/src/patches/dhcp-4.2.1-64_bit_lease_parse.patch
new file mode 100644
index 0000000..a540bc1
--- /dev/null
+++ b/src/patches/dhcp-4.2.1-64_bit_lease_parse.patch
@@ -0,0 +1,94 @@
+diff -up dhcp-4.2.1b1/common/dispatch.c.64-bit_lease_parse dhcp-4.2.1b1/common/dispatch.c
+diff -up dhcp-4.2.1b1/common/parse.c.64-bit_lease_parse dhcp-4.2.1b1/common/parse.c
+--- dhcp-4.2.1b1/common/parse.c.64-bit_lease_parse 2010-12-30 00:01:42.000000000 +0100
++++ dhcp-4.2.1b1/common/parse.c 2011-01-28 08:01:10.000000000 +0100
+@@ -909,8 +909,8 @@ TIME
+ parse_date_core(cfile)
+ struct parse *cfile;
+ {
+- int guess;
+- int tzoff, wday, year, mon, mday, hour, min, sec;
++ TIME guess;
++ long int tzoff, wday, year, mon, mday, hour, min, sec;
+ const char *val;
+ enum dhcp_token token;
+ static int months[11] = { 31, 59, 90, 120, 151, 181,
+@@ -936,7 +936,7 @@ parse_date_core(cfile)
+ }
+
+ token = next_token(&val, NULL, cfile); /* consume number */
+- guess = atoi(val);
++ guess = atol(val);
+
+ return((TIME)guess);
+ }
+@@ -948,7 +948,7 @@ parse_date_core(cfile)
+ return((TIME)0);
+ }
+ token = next_token(&val, NULL, cfile); /* consume day of week */
+- wday = atoi(val);
++ wday = atol(val);
+
+ /* Year... */
+ token = peek_token(&val, NULL, cfile);
+@@ -964,7 +964,7 @@ parse_date_core(cfile)
+ somebody invents a time machine, I think we can safely disregard
+ it. This actually works around a stupid Y2K bug that was present
+ in a very early beta release of dhcpd. */
+- year = atoi(val);
++ year = atol(val);
+ if (year > 1900)
+ year -= 1900;
+
+@@ -988,7 +988,7 @@ parse_date_core(cfile)
+ return((TIME)0);
+ }
+ token = next_token(&val, NULL, cfile); /* consume month */
+- mon = atoi(val) - 1;
++ mon = atol(val) - 1;
+
+ /* Slash separating month from day... */
+ token = peek_token(&val, NULL, cfile);
+@@ -1010,7 +1010,7 @@ parse_date_core(cfile)
+ return((TIME)0);
+ }
+ token = next_token(&val, NULL, cfile); /* consume day of month */
+- mday = atoi(val);
++ mday = atol(val);
+
+ /* Hour... */
+ token = peek_token(&val, NULL, cfile);
+@@ -1021,7 +1021,7 @@ parse_date_core(cfile)
+ return((TIME)0);
+ }
+ token = next_token(&val, NULL, cfile); /* consume hour */
+- hour = atoi(val);
++ hour = atol(val);
+
+ /* Colon separating hour from minute... */
+ token = peek_token(&val, NULL, cfile);
+@@ -1043,7 +1043,7 @@ parse_date_core(cfile)
+ return((TIME)0);
+ }
+ token = next_token(&val, NULL, cfile); /* consume minute */
+- min = atoi(val);
++ min = atol(val);
+
+ /* Colon separating minute from second... */
+ token = peek_token(&val, NULL, cfile);
+@@ -1065,13 +1065,13 @@ parse_date_core(cfile)
+ return((TIME)0);
+ }
+ token = next_token(&val, NULL, cfile); /* consume second */
+- sec = atoi(val);
++ sec = atol(val);
+
+ tzoff = 0;
+ token = peek_token(&val, NULL, cfile);
+ if (token == NUMBER) {
+ token = next_token(&val, NULL, cfile); /* consume tzoff */
+- tzoff = atoi(val);
++ tzoff = atol(val);
+ } else if (token != SEMI) {
+ token = next_token(&val, NULL, cfile);
+ parse_warn(cfile,
diff --git a/src/patches/dhcp-4.2.1-invalid-dhclient-conf.patch b/src/patches/dhcp-4.2.1-invalid-dhclient-conf.patch
new file mode 100644
index 0000000..eeeea84
--- /dev/null
+++ b/src/patches/dhcp-4.2.1-invalid-dhclient-conf.patch
@@ -0,0 +1,12 @@
+diff -up dhcp-4.2.1b1/client/dhclient.conf.supersede dhcp-4.2.1b1/client/dhclient.conf
+--- dhcp-4.2.1b1/client/dhclient.conf.supersede 2010-09-15 01:03:56.000000000 +0200
++++ dhcp-4.2.1b1/client/dhclient.conf 2011-01-27 18:38:28.000000000 +0100
+@@ -4,7 +4,7 @@ send dhcp-lease-time 3600;
+ supersede domain-search "fugue.com", "home.vix.com";
+ prepend domain-name-servers 127.0.0.1;
+ request subnet-mask, broadcast-address, time-offset, routers,
+- domain-name, domain-name-servers, host-name;
++ domain-search, domain-name-servers, host-name;
+ require subnet-mask, domain-name-servers;
+ timeout 60;
+ retry 60;
diff --git a/src/patches/dhcp-4.2.1-manpages.patch b/src/patches/dhcp-4.2.1-manpages.patch
new file mode 100644
index 0000000..9a42b7f
--- /dev/null
+++ b/src/patches/dhcp-4.2.1-manpages.patch
@@ -0,0 +1,264 @@
+diff -up dhcp-4.2.1b1/client/dhclient.8.man dhcp-4.2.1b1/client/dhclient.8
+--- dhcp-4.2.1b1/client/dhclient.8.man 2010-07-14 22:09:34.000000000 +0200
++++ dhcp-4.2.1b1/client/dhclient.8 2011-01-27 18:19:07.000000000 +0100
+@@ -115,6 +115,33 @@ dhclient - Dynamic Host Configuration Pr
+ .B -w
+ ]
+ [
++.B -B
++]
++[
++.B -I
++.I dhcp-client-identifier
++]
++[
++.B -H
++.I host-name
++]
++[
++.B -F
++.I fqdn.fqdn
++]
++[
++.B -V
++.I vendor-class-identifier
++]
++[
++.B -R
++.I request-option-list
++]
++[
++.B -timeout
++.I timeout
++]
++[
+ .B -v
+ ]
+ [
+@@ -264,6 +291,69 @@ not to exit when it doesn't find any suc
+ program can then be used to notify the client when a network interface
+ has been added or removed, so that the client can attempt to configure an IP
+ address on that interface.
++
++.TP
++.BI \-B
++Set the BOOTP broadcast flag in request packets so servers will always
++broadcast replies.
++
++.TP
++.BI \-I\ <dhcp-client-identifier>
++Specify the dhcp-client-identifier option to send to the DHCP server.
++
++.TP
++.BI \-H\ <host-name>
++Specify the host-name option to send to the DHCP server. The host-name
++string only contains the client's hostname prefix, to which the server will
++append the ddns-domainname or domain-name options, if any, to derive the
++fully qualified domain name of the client. The
++.B -H
++option cannot be used with the
++.B -F
++option.
++
++.TP
++.BI \-F\ <fqdn.fqdn>
++Specify the fqdn.fqdn option to send to the DHCP server. This option cannot
++be used with the
++.B -H
++option. The fqdn.fqdn option must specify the complete domain name of the
++client host, which the server may use for dynamic DNS updates.
++
++.TP
++.BI \-V\ <vendor-class-identifier>
++Specify the vendor-class-identifier option to send to the DHCP server.
++
++.TP
++.BI \-R\ <option>[,<option>...]
++Specify the list of options the client is to request from the server. The
++option list must be a single string consisting of option names separated
++by at least one command and optional space characters. The default option
++list is:
++
++.BR
++ subnet-mask, broadcast-address, time-offset, routers,
++.BR
++ domain-search, domain-name, domain-name-servers, host-name,
++.BR
++ nis-domain, nis-servers, ntp-servers, interface-mtu
++
++.TP
++.B -R
++option does not append options to the default request, it overrides the
++default request list. Keep this in mind if you want to request an
++additional option besides the default request list. You will have to
++specify all option names for the
++.B -R
++parameter.
++
++.TP
++.BI \-timeout\ <timeout>
++Specify the time after which
++.B dhclient
++will decide that no DHCP servers can be contacted when no responses have been
++received.
++
+ .TP
+ .BI \-n
+ Do not configure any interfaces. This is most likely to be useful in
+diff -up dhcp-4.2.1b1/client/dhclient.conf.5.man dhcp-4.2.1b1/client/dhclient.conf.5
+--- dhcp-4.2.1b1/client/dhclient.conf.5.man 2010-09-15 01:03:56.000000000 +0200
++++ dhcp-4.2.1b1/client/dhclient.conf.5 2011-01-27 18:22:56.000000000 +0100
+@@ -186,7 +186,8 @@ responding to the client send the client
+ options. Only the option names should be specified in the request
+ statement - not option parameters. By default, the DHCPv4 client
+ requests the subnet-mask, broadcast-address, time-offset, routers,
+-domain-name, domain-name-servers and host-name options while the DHCPv6
++domain-search, domain-name, domain-name-servers, host-name, nis-domain,
++nis-servers, ntp-servers and interface-mtu options while the DHCPv6
+ client requests the dhcp6 name-servers and domain-search options. Note
+ that if you enter a \'request\' statement, you over-ride these defaults
+ and these options will not be requested.
+@@ -672,6 +673,17 @@ know the DHCP service(s) anycast MAC add
+ client. The \fIlink-type\fR and \fImac-address\fR parameters are configured
+ in a similar manner to the \fBhardware\fR statement.
+ .PP
++ \fBbootp-broadcast-always;\fR
++.PP
++The
++.B bootp-broadcast-always
++statement instructs dhclient to always set the bootp broadcast flag in
++request packets, so that servers will always broadcast replies.
++This is equivalent to supplying the dhclient -B argument, and has
++the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
++This option is provided as an extension to enable dhclient to work
++on IBM s390 Linux guests.
++.PP
+ .SH SAMPLE
+ The following configuration file is used on a laptop running NetBSD
+ 1.3. The laptop has an IP alias of 192.5.5.213, and has one
+@@ -697,7 +709,7 @@ interface "ep0" {
+ supersede domain-search "fugue.com", "rc.vix.com", "home.vix.com";
+ prepend domain-name-servers 127.0.0.1;
+ request subnet-mask, broadcast-address, time-offset, routers,
+- domain-name, domain-name-servers, host-name;
++ domain-search, domain-name, domain-name-servers, host-name;
+ require subnet-mask, domain-name-servers;
+ script "CLIENTBINDIR/dhclient-script";
+ media "media 10baseT/UTP", "media 10base2/BNC";
+diff -up dhcp-4.2.1b1/client/dhclient-script.8.man dhcp-4.2.1b1/client/dhclient-script.8
+--- dhcp-4.2.1b1/client/dhclient-script.8.man 2010-07-06 21:03:11.000000000 +0200
++++ dhcp-4.2.1b1/client/dhclient-script.8 2011-01-27 18:24:44.000000000 +0100
+@@ -47,7 +47,7 @@ customizations are needed, they should b
+ exit hooks provided (see HOOKS for details). These hooks will allow the
+ user to override the default behaviour of the client in creating a
+ .B /etc/resolv.conf
+-file.
++file, and to handle DHCP options not handled by default.
+ .PP
+ No standard client script exists for some operating systems, even though
+ the actual client may work, so a pioneering user may well need to create
+@@ -91,6 +91,26 @@ present. The
+ .B ETCDIR/dhclient-exit-hooks
+ script can modify the valid of exit_status to change the exit status
+ of dhclient-script.
++.PP
++Immediately after dhclient brings an interface UP with a new IP address,
++subnet mask, and routes, in the REBOOT/BOUND states, it will check for the
++existence of an executable
++.B ETCDIR/dhclient-up-hooks
++script, and source it if found. This script can handle DHCP options in
++the environment that are not handled by default. A per-interface.
++.B ETCDIR/dhclient-${IF}-up-hooks
++script will override the generic script and be sourced when interface
++$IF has been brought up.
++.PP
++Immediately before dhclient brings an interface DOWN, removing its IP
++address, subnet mask, and routes, in the STOP/RELEASE states, it will
++check for the existence of an executable
++.B ETCDIR/dhclient-down-hooks
++script, and source it if found. This script can handle DHCP options in
++the environment that are not handled by default. A per-interface
++.B ETCDIR/dhclient-${IF}-down-hooks
++script will override the generic script and be sourced when interface
++$IF is about to be brought down.
+ .SH OPERATION
+ When dhclient needs to invoke the client configuration script, it
+ defines a set of variables in the environment, and then invokes
+diff -up dhcp-4.2.1b1/common/dhcp-options.5.man dhcp-4.2.1b1/common/dhcp-options.5
+--- dhcp-4.2.1b1/common/dhcp-options.5.man 2010-07-13 22:56:56.000000000 +0200
++++ dhcp-4.2.1b1/common/dhcp-options.5 2011-01-27 18:25:57.000000000 +0100
+@@ -913,6 +913,21 @@ classless IP routing - it does not inclu
+ classless IP routing is now the most widely deployed routing standard,
+ this option is virtually useless, and is not implemented by any of the
+ popular DHCP clients, for example the Microsoft DHCP client.
++.PP
++NOTE to Fedora dhclient users:
++.br
++dhclient-script interprets trailing 0 octets of the target as indicating
++the subnet class of the route, so for the following static-routes value:
++.br
++ option static-routes 172.0.0.0 172.16.2.254,
++.br
++ 192.168.0.0 192.168.2.254;
++.br
++dhclient-script will create routes:
++.br
++ 172/8 via 172.16.2.254 dev $interface
++.br
++ 192.168/16 via 192.168.2.254 dev $interface
+ .RE
+ .PP
+ .nf
+diff -up dhcp-4.2.1b1/server/dhcpd.conf.5.man dhcp-4.2.1b1/server/dhcpd.conf.5
+--- dhcp-4.2.1b1/server/dhcpd.conf.5.man 2010-07-06 21:03:12.000000000 +0200
++++ dhcp-4.2.1b1/server/dhcpd.conf.5 2011-01-27 18:29:12.000000000 +0100
+@@ -519,6 +519,9 @@ pool {
+ };
+ .fi
+ .PP
++Dynamic BOOTP leases are not compatible with failover, and, as such,
++you need to disallow BOOTP in pools that you are using failover for.
++.PP
+ The server currently does very little sanity checking, so if you
+ configure it wrong, it will just fail in odd ways. I would recommend
+ therefore that you either do failover or don't do failover, but don't
+@@ -533,9 +536,9 @@ primary server might look like this:
+ failover peer "foo" {
+ primary;
+ address anthrax.rc.vix.com;
+- port 519;
++ port 647;
+ peer address trantor.rc.vix.com;
+- peer port 520;
++ peer port 847;
+ max-response-delay 60;
+ max-unacked-updates 10;
+ mclt 3600;
+@@ -1305,7 +1308,7 @@ the zone containing PTR records - for IS
+ .PP
+ .nf
+ key DHCP_UPDATER {
+- algorithm HMAC-MD5.SIG-ALG.REG.INT;
++ algorithm hmac-md5;
+ secret pRP5FapFoJ95JEL06sv4PQ==;
+ };
+
+@@ -1328,7 +1331,7 @@ dhcpd.conf file:
+ .PP
+ .nf
+ key DHCP_UPDATER {
+- algorithm HMAC-MD5.SIG-ALG.REG.INT;
++ algorithm hmac-md5;
+ secret pRP5FapFoJ95JEL06sv4PQ==;
+ };
+
+@@ -2540,7 +2543,8 @@ statement
+ The \fInext-server\fR statement is used to specify the host address of
+ the server from which the initial boot file (specified in the
+ \fIfilename\fR statement) is to be loaded. \fIServer-name\fR should
+-be a numeric IP address or a domain name.
++be a numeric IP address or a domain name. If no \fInext-server\fR statement
++applies to a given client, the address 0.0.0.0 is used.
+ .RE
+ .PP
+ The
diff --git a/src/patches/dhcp-4.2.1-retransmission.patch b/src/patches/dhcp-4.2.1-retransmission.patch
new file mode 100644
index 0000000..18e447f
--- /dev/null
+++ b/src/patches/dhcp-4.2.1-retransmission.patch
@@ -0,0 +1,48 @@
+diff -up dhcp-4.2.1b1/client/dhc6.c.retransmission dhcp-4.2.1b1/client/dhc6.c
+--- dhcp-4.2.1b1/client/dhc6.c.retransmission 2011-01-28 08:40:56.000000000 +0100
++++ dhcp-4.2.1b1/client/dhc6.c 2011-01-28 08:39:22.000000000 +0100
+@@ -361,7 +361,7 @@ dhc6_retrans_init(struct client_state *c
+ static void
+ dhc6_retrans_advance(struct client_state *client)
+ {
+- struct timeval elapsed;
++ struct timeval elapsed, elapsed_after_RT;
+
+ /* elapsed = cur - start */
+ elapsed.tv_sec = cur_tv.tv_sec - client->start_time.tv_sec;
+@@ -378,6 +378,8 @@ dhc6_retrans_advance(struct client_state
+ elapsed.tv_sec += 1;
+ elapsed.tv_usec -= 1000000;
+ }
++ elapsed_after_RT.tv_sec = elapsed.tv_sec;
++ elapsed_after_RT.tv_usec = elapsed.tv_usec;
+
+ /*
+ * RT for each subsequent message transmission is based on the previous
+@@ -415,13 +417,10 @@ dhc6_retrans_advance(struct client_state
+ elapsed.tv_usec -= 1000000;
+ }
+ if (elapsed.tv_sec >= client->MRD) {
+- /*
+- * wake at RT + cur = start + MRD
+- */
+- client->RT = client->MRD +
+- (client->start_time.tv_sec - cur_tv.tv_sec);
+- client->RT = client->RT * 100 +
+- (client->start_time.tv_usec - cur_tv.tv_usec) / 10000;
++ client->RT = client->MRD - elapsed_after_RT.tv_sec;
++ client->RT = client->RT * 100 - elapsed_after_RT.tv_usec / 10000;
++ if (client->RT < 0)
++ client->RT = 0;
+ }
+ client->txcount++;
+ }
+@@ -1497,7 +1496,7 @@ check_timing6 (struct client_state *clie
+ }
+
+ /* Check if finished (-1 argument). */
+- if ((client->MRD != 0) && (elapsed.tv_sec > client->MRD)) {
++ if ((client->MRD != 0) && (elapsed.tv_sec >= client->MRD)) {
+ log_info("Max retransmission duration exceeded.");
+ return(CHK_TIM_MRD_EXCEEDED);
+ }
diff --git a/src/patches/dhcp-4.2.1-sendDecline.patch b/src/patches/dhcp-4.2.1-sendDecline.patch
new file mode 100644
index 0000000..b2fa4af
--- /dev/null
+++ b/src/patches/dhcp-4.2.1-sendDecline.patch
@@ -0,0 +1,231 @@
+diff -up dhcp-4.2.1-P1/client/dhc6.c.sendDecline dhcp-4.2.1-P1/client/dhc6.c
+--- dhcp-4.2.1-P1/client/dhc6.c.sendDecline 2010-09-10 22:27:11.000000000 +0200
++++ dhcp-4.2.1-P1/client/dhc6.c 2011-06-17 14:19:48.992099868 +0200
+@@ -95,6 +95,8 @@ void do_select6(void *input);
+ void do_refresh6(void *input);
+ static void do_release6(void *input);
+ static void start_bound(struct client_state *client);
++static void start_decline6(struct client_state *client);
++static void do_decline6(void *input);
+ static void start_informed(struct client_state *client);
+ void informed_handler(struct packet *packet, struct client_state *client);
+ void bound_handler(struct packet *packet, struct client_state *client);
+@@ -2075,6 +2077,7 @@ start_release6(struct client_state *clie
+ cancel_timeout(do_select6, client);
+ cancel_timeout(do_refresh6, client);
+ cancel_timeout(do_release6, client);
++ cancel_timeout(do_decline6, client);
+ client->state = S_STOPPED;
+
+ /*
+@@ -2708,6 +2711,7 @@ dhc6_check_reply(struct client_state *cl
+ break;
+
+ case S_STOPPED:
++ case S_DECLINED:
+ action = dhc6_stop_action;
+ break;
+
+@@ -2809,6 +2813,7 @@ dhc6_check_reply(struct client_state *cl
+ break;
+
+ case S_STOPPED:
++ case S_DECLINED:
+ /* Nothing critical to do at this stage. */
+ break;
+
+@@ -3799,17 +3804,23 @@ reply_handler(struct packet *packet, str
+ cancel_timeout(do_select6, client);
+ cancel_timeout(do_refresh6, client);
+ cancel_timeout(do_release6, client);
++ cancel_timeout(do_decline6, client);
+
+ /* If this is in response to a Release/Decline, clean up and return. */
+- if (client->state == S_STOPPED) {
+- if (client->active_lease == NULL)
+- return;
++ if ((client->state == S_STOPPED) ||
++ (client->state == S_DECLINED)) {
++
++ if (client->active_lease != NULL) {
++ dhc6_lease_destroy(&client->active_lease, MDL);
++ client->active_lease = NULL;
++ /* We should never wait for nothing!? */
++ if (stopping_finished())
++ exit(0);
++ }
++
++ if (client->state == S_DECLINED)
++ start_init6(client);
+
+- dhc6_lease_destroy(&client->active_lease, MDL);
+- client->active_lease = NULL;
+- /* We should never wait for nothing!? */
+- if (stopping_finished())
+- exit(0);
+ return;
+ }
+
+@@ -4336,7 +4347,11 @@ start_bound(struct client_state *client)
+ oldia, oldaddr);
+ dhc6_marshall_values("new_", client, lease, ia, addr);
+
+- script_go(client);
++ // when script returns 3, DAD failed
++ if (script_go(client) == 3) {
++ start_decline6(client);
++ return;
++ }
+ }
+
+ /* XXX: maybe we should loop on the old values instead? */
+@@ -4382,6 +4397,149 @@ start_bound(struct client_state *client)
+ dhc6_check_times(client);
+ }
+
++/*
++ * Decline addresses.
++ */
++void
++start_decline6(struct client_state *client)
++{
++ /* Cancel any pending transmissions */
++ cancel_timeout(do_confirm6, client);
++ cancel_timeout(do_select6, client);
++ cancel_timeout(do_refresh6, client);
++ cancel_timeout(do_release6, client);
++ cancel_timeout(do_decline6, client);
++ client->state = S_DECLINED;
++
++ if (client->active_lease == NULL)
++ return;
++
++ /* Set timers per RFC3315 section 18.1.7. */
++ client->IRT = DEC_TIMEOUT * 100;
++ client->MRT = 0;
++ client->MRC = DEC_MAX_RC;
++ client->MRD = 0;
++
++ dhc6_retrans_init(client);
++ client->v6_handler = reply_handler;
++
++ client->refresh_type = DHCPV6_DECLINE;
++ do_decline6(client);
++}
++
++/*
++ * do_decline6() creates a Decline packet and transmits it.
++ */
++static void
++do_decline6(void *input)
++{
++ struct client_state *client;
++ struct data_string ds;
++ int send_ret;
++ struct timeval elapsed, tv;
++
++ client = input;
++
++ if ((client->active_lease == NULL) || !active_prefix(client))
++ return;
++
++ if ((client->MRC != 0) && (client->txcount > client->MRC)) {
++ log_info("Max retransmission count exceeded.");
++ goto decline_done;
++ }
++
++ /*
++ * Start_time starts at the first transmission.
++ */
++ if (client->txcount == 0) {
++ client->start_time.tv_sec = cur_tv.tv_sec;
++ client->start_time.tv_usec = cur_tv.tv_usec;
++ }
++
++ /* elapsed = cur - start */
++ elapsed.tv_sec = cur_tv.tv_sec - client->start_time.tv_sec;
++ elapsed.tv_usec = cur_tv.tv_usec - client->start_time.tv_usec;
++ if (elapsed.tv_usec < 0) {
++ elapsed.tv_sec -= 1;
++ elapsed.tv_usec += 1000000;
++ }
++
++ memset(&ds, 0, sizeof(ds));
++ if (!buffer_allocate(&ds.buffer, 4, MDL)) {
++ log_error("Unable to allocate memory for Decline.");
++ goto decline_done;
++ }
++
++ ds.data = ds.buffer->data;
++ ds.len = 4;
++ ds.buffer->data[0] = DHCPV6_DECLINE;
++ memcpy(ds.buffer->data + 1, client->dhcpv6_transaction_id, 3);
++
++ /* Form an elapsed option. */
++ /* Maximum value is 65535 1/100s coded as 0xffff. */
++ if ((elapsed.tv_sec < 0) || (elapsed.tv_sec > 655) ||
++ ((elapsed.tv_sec == 655) && (elapsed.tv_usec > 350000))) {
++ client->elapsed = 0xffff;
++ } else {
++ client->elapsed = elapsed.tv_sec * 100;
++ client->elapsed += elapsed.tv_usec / 10000;
++ }
++
++ client->elapsed = htons(client->elapsed);
++
++ log_debug("XMT: Forming Decline.");
++ make_client6_options(client, &client->sent_options,
++ client->active_lease, DHCPV6_DECLINE);
++ dhcpv6_universe.encapsulate(&ds, NULL, NULL, client, NULL,
++ client->sent_options, &global_scope,
++ &dhcpv6_universe);
++
++ /* Append IA's (but don't release temporary addresses). */
++ if (wanted_ia_na &&
++ dhc6_add_ia_na(client, &ds, client->active_lease,
++ DHCPV6_DECLINE) != ISC_R_SUCCESS) {
++ data_string_forget(&ds, MDL);
++ goto decline_done;
++ }
++ if (wanted_ia_pd &&
++ dhc6_add_ia_pd(client, &ds, client->active_lease,
++ DHCPV6_DECLINE) != ISC_R_SUCCESS) {
++ data_string_forget(&ds, MDL);
++ goto decline_done;
++ }
++
++ /* Transmit and wait. */
++ log_info("XMT: Decline on %s, interval %ld0ms.",
++ client->name ? client->name : client->interface->name,
++ (long int)client->RT);
++
++ send_ret = send_packet6(client->interface, ds.data, ds.len,
++ &DHCPv6DestAddr);
++ if (send_ret != ds.len) {
++ log_error("dhc6: sendpacket6() sent %d of %d bytes",
++ send_ret, ds.len);
++ }
++
++ data_string_forget(&ds, MDL);
++
++ /* Wait RT */
++ tv.tv_sec = cur_tv.tv_sec + client->RT / 100;
++ tv.tv_usec = cur_tv.tv_usec + (client->RT % 100) * 10000;
++ if (tv.tv_usec >= 1000000) {
++ tv.tv_sec += 1;
++ tv.tv_usec -= 1000000;
++ }
++ add_timeout(&tv, do_decline6, client, NULL, NULL);
++ dhc6_retrans_advance(client);
++ return;
++
++decline_done:
++ dhc6_lease_destroy(&client->active_lease, MDL);
++ client->active_lease = NULL;
++ start_init6(client);
++ return;
++}
++
+ /* While bound, ignore packets. In the future we'll want to answer
+ * Reconfigure-Request messages and the like.
+ */
diff --git a/src/patches/dhcp-4.2.2-CLOEXEC.patch b/src/patches/dhcp-4.2.2-CLOEXEC.patch
new file mode 100644
index 0000000..b07e2ff
--- /dev/null
+++ b/src/patches/dhcp-4.2.2-CLOEXEC.patch
@@ -0,0 +1,423 @@
+diff -up dhcp-4.2.2b1/client/clparse.c.cloexec dhcp-4.2.2b1/client/clparse.c
+--- dhcp-4.2.2b1/client/clparse.c.cloexec 2011-07-01 14:13:30.973887714 +0200
++++ dhcp-4.2.2b1/client/clparse.c 2011-07-01 14:15:15.021580693 +0200
+@@ -246,7 +246,7 @@ int read_client_conf_file (const char *n
+ int token;
+ isc_result_t status;
+
+- if ((file = open (name, O_RDONLY)) < 0)
++ if ((file = open (name, O_RDONLY | O_CLOEXEC)) < 0)
+ return uerr2isc (errno);
+
+ cfile = NULL;
+@@ -283,7 +283,7 @@ void read_client_leases ()
+
+ /* Open the lease file. If we can't open it, just return -
+ we can safely trust the server to remember our state. */
+- if ((file = open (path_dhclient_db, O_RDONLY)) < 0)
++ if ((file = open (path_dhclient_db, O_RDONLY | O_CLOEXEC)) < 0)
+ return;
+
+ cfile = NULL;
+diff -up dhcp-4.2.2b1/client/dhclient.c.cloexec dhcp-4.2.2b1/client/dhclient.c
+--- dhcp-4.2.2b1/client/dhclient.c.cloexec 2011-07-01 14:13:30.970887717 +0200
++++ dhcp-4.2.2b1/client/dhclient.c 2011-07-01 14:16:51.485930388 +0200
+@@ -148,11 +148,11 @@ main(int argc, char **argv) {
+ /* Make sure that file descriptors 0 (stdin), 1, (stdout), and
+ 2 (stderr) are open. To do this, we assume that when we
+ open a file the lowest available file descriptor is used. */
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 0)
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 1)
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 2)
+ log_perror = 0; /* No sense logging to /dev/null. */
+ else if (fd != -1)
+@@ -506,7 +506,7 @@ main(int argc, char **argv) {
+ int e;
+
+ oldpid = 0;
+- if ((pidfd = fopen(path_dhclient_pid, "r")) != NULL) {
++ if ((pidfd = fopen(path_dhclient_pid, "re")) != NULL) {
+ e = fscanf(pidfd, "%ld\n", &temp);
+ oldpid = (pid_t)temp;
+
+@@ -548,7 +548,7 @@ main(int argc, char **argv) {
+ strncpy(new_path_dhclient_pid, path_dhclient_pid, pfx);
+ sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name);
+
+- if ((pidfd = fopen(new_path_dhclient_pid, "r")) != NULL) {
++ if ((pidfd = fopen(new_path_dhclient_pid, "re")) != NULL) {
+ e = fscanf(pidfd, "%ld\n", &temp);
+ oldpid = (pid_t)temp;
+
+@@ -573,7 +573,7 @@ main(int argc, char **argv) {
+ int dhc_running = 0;
+ char procfn[256] = "";
+
+- if ((pidfp = fopen(path_dhclient_pid, "r")) != NULL) {
++ if ((pidfp = fopen(path_dhclient_pid, "re")) != NULL) {
+ if ((fscanf(pidfp, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) {
+ snprintf(procfn,256,"/proc/%u",dhcpid);
+ dhc_running = (access(procfn, F_OK) == 0);
+@@ -2995,7 +2995,7 @@ void rewrite_client_leases ()
+
+ if (leaseFile != NULL)
+ fclose (leaseFile);
+- leaseFile = fopen (path_dhclient_db, "w");
++ leaseFile = fopen (path_dhclient_db, "we");
+ if (leaseFile == NULL) {
+ log_error ("can't create %s: %m", path_dhclient_db);
+ return;
+@@ -3105,7 +3105,7 @@ write_duid(struct data_string *duid)
+ return DHCP_R_INVALIDARG;
+
+ if (leaseFile == NULL) { /* XXX? */
+- leaseFile = fopen(path_dhclient_db, "w");
++ leaseFile = fopen(path_dhclient_db, "we");
+ if (leaseFile == NULL) {
+ log_error("can't create %s: %m", path_dhclient_db);
+ return ISC_R_IOERROR;
+@@ -3285,7 +3285,7 @@ int write_client_lease (client, lease, r
+ return 1;
+
+ if (leaseFile == NULL) { /* XXX */
+- leaseFile = fopen (path_dhclient_db, "w");
++ leaseFile = fopen (path_dhclient_db, "we");
+ if (leaseFile == NULL) {
+ log_error ("can't create %s: %m", path_dhclient_db);
+ return 0;
+@@ -3772,9 +3772,9 @@ void go_daemon ()
+ close(2);
+
+ /* Reopen them on /dev/null. */
+- open("/dev/null", O_RDWR);
+- open("/dev/null", O_RDWR);
+- open("/dev/null", O_RDWR);
++ open("/dev/null", O_RDWR | O_CLOEXEC);
++ open("/dev/null", O_RDWR | O_CLOEXEC);
++ open("/dev/null", O_RDWR | O_CLOEXEC);
+
+ write_client_pid_file ();
+
+@@ -3791,14 +3791,14 @@ void write_client_pid_file ()
+ return;
+ }
+
+- pfdesc = open (path_dhclient_pid, O_CREAT | O_TRUNC | O_WRONLY, 0644);
++ pfdesc = open (path_dhclient_pid, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, 0644);
+
+ if (pfdesc < 0) {
+ log_error ("Can't create %s: %m", path_dhclient_pid);
+ return;
+ }
+
+- pf = fdopen (pfdesc, "w");
++ pf = fdopen (pfdesc, "we");
+ if (!pf) {
+ close(pfdesc);
+ log_error ("Can't fdopen %s: %m", path_dhclient_pid);
+diff -up dhcp-4.2.2b1/common/bpf.c.cloexec dhcp-4.2.2b1/common/bpf.c
+--- dhcp-4.2.2b1/common/bpf.c.cloexec 2011-07-01 14:13:30.976887712 +0200
++++ dhcp-4.2.2b1/common/bpf.c 2011-07-01 14:13:31.030887673 +0200
+@@ -94,7 +94,7 @@ int if_register_bpf (info)
+ for (b = 0; 1; b++) {
+ /* %Audit% 31 bytes max. %2004.06.17,Safe% */
+ sprintf(filename, BPF_FORMAT, b);
+- sock = open (filename, O_RDWR, 0);
++ sock = open (filename, O_RDWR | O_CLOEXEC, 0);
+ if (sock < 0) {
+ if (errno == EBUSY) {
+ continue;
+diff -up dhcp-4.2.2b1/common/discover.c.cloexec dhcp-4.2.2b1/common/discover.c
+--- dhcp-4.2.2b1/common/discover.c.cloexec 2011-06-27 18:18:20.000000000 +0200
++++ dhcp-4.2.2b1/common/discover.c 2011-07-01 14:13:31.031887673 +0200
+@@ -421,7 +421,7 @@ begin_iface_scan(struct iface_conf_list
+ int len;
+ int i;
+
+- ifaces->fp = fopen("/proc/net/dev", "r");
++ ifaces->fp = fopen("/proc/net/dev", "re");
+ if (ifaces->fp == NULL) {
+ log_error("Error opening '/proc/net/dev' to list interfaces");
+ return 0;
+@@ -456,7 +456,7 @@ begin_iface_scan(struct iface_conf_list
+
+ #ifdef DHCPv6
+ if (local_family == AF_INET6) {
+- ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
++ ifaces->fp6 = fopen("/proc/net/if_inet6", "re");
+ if (ifaces->fp6 == NULL) {
+ log_error("Error opening '/proc/net/if_inet6' to "
+ "list IPv6 interfaces; %m");
+diff -up dhcp-4.2.2b1/common/dlpi.c.cloexec dhcp-4.2.2b1/common/dlpi.c
+--- dhcp-4.2.2b1/common/dlpi.c.cloexec 2011-07-01 14:13:30.977887712 +0200
++++ dhcp-4.2.2b1/common/dlpi.c 2011-07-01 14:13:31.032887673 +0200
+@@ -806,7 +806,7 @@ dlpiopen(const char *ifname) {
+ }
+ *dp = '\0';
+
+- return open (devname, O_RDWR, 0);
++ return open (devname, O_RDWR | O_CLOEXEC, 0);
+ }
+
+ /*
+diff -up dhcp-4.2.2b1/common/nit.c.cloexec dhcp-4.2.2b1/common/nit.c
+--- dhcp-4.2.2b1/common/nit.c.cloexec 2011-07-01 14:13:30.978887712 +0200
++++ dhcp-4.2.2b1/common/nit.c 2011-07-01 14:13:31.033887672 +0200
+@@ -81,7 +81,7 @@ int if_register_nit (info)
+ struct strioctl sio;
+
+ /* Open a NIT device */
+- sock = open ("/dev/nit", O_RDWR);
++ sock = open ("/dev/nit", O_RDWR | O_CLOEXEC);
+ if (sock < 0)
+ log_fatal ("Can't open NIT device for %s: %m", info -> name);
+
+diff -up dhcp-4.2.2b1/common/resolv.c.cloexec dhcp-4.2.2b1/common/resolv.c
+--- dhcp-4.2.2b1/common/resolv.c.cloexec 2009-11-20 02:49:01.000000000 +0100
++++ dhcp-4.2.2b1/common/resolv.c 2011-07-01 14:13:31.033887672 +0200
+@@ -49,7 +49,7 @@ void read_resolv_conf (parse_time)
+ struct domain_search_list *dp, *dl, *nd;
+ isc_result_t status;
+
+- if ((file = open (path_resolv_conf, O_RDONLY)) < 0) {
++ if ((file = open (path_resolv_conf, O_RDONLY | O_CLOEXEC)) < 0) {
+ log_error ("Can't open %s: %m", path_resolv_conf);
+ return;
+ }
+diff -up dhcp-4.2.2b1/common/upf.c.cloexec dhcp-4.2.2b1/common/upf.c
+--- dhcp-4.2.2b1/common/upf.c.cloexec 2011-07-01 14:13:30.979887712 +0200
++++ dhcp-4.2.2b1/common/upf.c 2011-07-01 14:13:31.034887671 +0200
+@@ -77,7 +77,7 @@ int if_register_upf (info)
+ /* %Audit% Cannot exceed 36 bytes. %2004.06.17,Safe% */
+ sprintf(filename, "/dev/pf/pfilt%d", b);
+
+- sock = open (filename, O_RDWR, 0);
++ sock = open (filename, O_RDWR | O_CLOEXEC, 0);
+ if (sock < 0) {
+ if (errno == EBUSY) {
+ continue;
+diff -up dhcp-4.2.2b1/dst/dst_api.c.cloexec dhcp-4.2.2b1/dst/dst_api.c
+--- dhcp-4.2.2b1/dst/dst_api.c.cloexec 2009-10-29 01:46:48.000000000 +0100
++++ dhcp-4.2.2b1/dst/dst_api.c 2011-07-01 14:13:31.035887670 +0200
+@@ -437,7 +437,7 @@ dst_s_write_private_key(const DST_KEY *k
+ PRIVATE_KEY, PATH_MAX);
+
+ /* Do not overwrite an existing file */
+- if ((fp = dst_s_fopen(file, "w", 0600)) != NULL) {
++ if ((fp = dst_s_fopen(file, "we", 0600)) != NULL) {
+ int nn;
+ if ((nn = fwrite(encoded_block, 1, len, fp)) != len) {
+ EREPORT(("dst_write_private_key(): Write failure on %s %d != %d errno=%d\n",
+@@ -494,7 +494,7 @@ dst_s_read_public_key(const char *in_nam
+ * flags, proto, alg stored as decimal (or hex numbers FIXME).
+ * (FIXME: handle parentheses for line continuation.)
+ */
+- if ((fp = dst_s_fopen(name, "r", 0)) == NULL) {
++ if ((fp = dst_s_fopen(name, "re", 0)) == NULL) {
+ EREPORT(("dst_read_public_key(): Public Key not found %s\n",
+ name));
+ return (NULL);
+@@ -620,7 +620,7 @@ dst_s_write_public_key(const DST_KEY *ke
+ return (0);
+ }
+ /* create public key file */
+- if ((fp = dst_s_fopen(filename, "w+", 0644)) == NULL) {
++ if ((fp = dst_s_fopen(filename, "w+e", 0644)) == NULL) {
+ EREPORT(("DST_write_public_key: open of file:%s failed (errno=%d)\n",
+ filename, errno));
+ return (0);
+@@ -854,7 +854,7 @@ dst_s_read_private_key_file(char *name,
+ return (0);
+ }
+ /* first check if we can find the key file */
+- if ((fp = dst_s_fopen(filename, "r", 0)) == NULL) {
++ if ((fp = dst_s_fopen(filename, "re", 0)) == NULL) {
+ EREPORT(("dst_s_read_private_key_file: Could not open file %s in directory %s\n",
+ filename, dst_path[0] ? dst_path :
+ (char *) getcwd(NULL, PATH_MAX - 1)));
+diff -up dhcp-4.2.2b1/dst/prandom.c.cloexec dhcp-4.2.2b1/dst/prandom.c
+--- dhcp-4.2.2b1/dst/prandom.c.cloexec 2009-11-20 02:49:01.000000000 +0100
++++ dhcp-4.2.2b1/dst/prandom.c 2011-07-01 14:13:31.035887670 +0200
+@@ -269,7 +269,7 @@ get_dev_random(u_char *output, unsigned
+
+ s = stat("/dev/random", &st);
+ if (s == 0 && S_ISCHR(st.st_mode)) {
+- if ((fd = open("/dev/random", O_RDONLY | O_NONBLOCK)) != -1) {
++ if ((fd = open("/dev/random", O_RDONLY | O_NONBLOCK | O_CLOEXEC)) != -1) {
+ if ((n = read(fd, output, size)) < 0)
+ n = 0;
+ close(fd);
+@@ -480,7 +480,7 @@ digest_file(dst_work *work)
+ work->file_digest = dst_free_key(work->file_digest);
+ return (0);
+ }
+- if ((fp = fopen(name, "r")) == NULL)
++ if ((fp = fopen(name, "re")) == NULL)
+ return (0);
+ for (no = 0; (i = fread(buf, sizeof(*buf), sizeof(buf), fp)) > 0;
+ no += i)
+diff -up dhcp-4.2.2b1/omapip/trace.c.cloexec dhcp-4.2.2b1/omapip/trace.c
+--- dhcp-4.2.2b1/omapip/trace.c.cloexec 2010-05-27 02:34:57.000000000 +0200
++++ dhcp-4.2.2b1/omapip/trace.c 2011-07-01 14:13:31.036887669 +0200
+@@ -141,10 +141,10 @@ isc_result_t trace_begin (const char *fi
+ return DHCP_R_INVALIDARG;
+ }
+
+- traceoutfile = open (filename, O_CREAT | O_WRONLY | O_EXCL, 0600);
++ traceoutfile = open (filename, O_CREAT | O_WRONLY | O_EXCL | O_CLOEXEC, 0600);
+ if (traceoutfile < 0 && errno == EEXIST) {
+ log_error ("WARNING: Overwriting trace file \"%s\"", filename);
+- traceoutfile = open (filename, O_WRONLY | O_EXCL | O_TRUNC,
++ traceoutfile = open (filename, O_WRONLY | O_EXCL | O_TRUNC | O_CLOEXEC,
+ 0600);
+ }
+
+@@ -431,7 +431,7 @@ void trace_file_replay (const char *file
+ isc_result_t result;
+ int len;
+
+- traceinfile = fopen (filename, "r");
++ traceinfile = fopen (filename, "re");
+ if (!traceinfile) {
+ log_error("Can't open tracefile %s: %m", filename);
+ return;
+diff -up dhcp-4.2.2b1/relay/dhcrelay.c.cloexec dhcp-4.2.2b1/relay/dhcrelay.c
+--- dhcp-4.2.2b1/relay/dhcrelay.c.cloexec 2011-05-10 15:07:37.000000000 +0200
++++ dhcp-4.2.2b1/relay/dhcrelay.c 2011-07-01 14:18:07.630209767 +0200
+@@ -183,11 +183,11 @@ main(int argc, char **argv) {
+ /* Make sure that file descriptors 0(stdin), 1,(stdout), and
+ 2(stderr) are open. To do this, we assume that when we
+ open a file the lowest available file descriptor is used. */
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 0)
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 1)
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 2)
+ log_perror = 0; /* No sense logging to /dev/null. */
+ else if (fd != -1)
+@@ -540,13 +540,13 @@ main(int argc, char **argv) {
+
+ if (no_pid_file == ISC_FALSE) {
+ pfdesc = open(path_dhcrelay_pid,
+- O_CREAT | O_TRUNC | O_WRONLY, 0644);
++ O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, 0644);
+
+ if (pfdesc < 0) {
+ log_error("Can't create %s: %m",
+ path_dhcrelay_pid);
+ } else {
+- pf = fdopen(pfdesc, "w");
++ pf = fdopen(pfdesc, "we");
+ if (!pf)
+ log_error("Can't fdopen %s: %m",
+ path_dhcrelay_pid);
+diff -up dhcp-4.2.2b1/server/confpars.c.cloexec dhcp-4.2.2b1/server/confpars.c
+--- dhcp-4.2.2b1/server/confpars.c.cloexec 2010-10-14 00:34:45.000000000 +0200
++++ dhcp-4.2.2b1/server/confpars.c 2011-07-01 14:13:31.039887666 +0200
+@@ -116,7 +116,7 @@ isc_result_t read_conf_file (const char
+ }
+ #endif
+
+- if ((file = open (filename, O_RDONLY)) < 0) {
++ if ((file = open (filename, O_RDONLY | O_CLOEXEC)) < 0) {
+ if (leasep) {
+ log_error ("Can't open lease database %s: %m --",
+ path_dhcpd_db);
+diff -up dhcp-4.2.2b1/server/db.c.cloexec dhcp-4.2.2b1/server/db.c
+--- dhcp-4.2.2b1/server/db.c.cloexec 2010-09-14 00:15:26.000000000 +0200
++++ dhcp-4.2.2b1/server/db.c 2011-07-01 14:13:31.040887665 +0200
+@@ -1035,7 +1035,7 @@ void db_startup (testp)
+ }
+ #endif
+ if (!testp) {
+- db_file = fopen (path_dhcpd_db, "a");
++ db_file = fopen (path_dhcpd_db, "ae");
+ if (!db_file)
+ log_fatal ("Can't open %s for append.", path_dhcpd_db);
+ expire_all_pools ();
+@@ -1083,12 +1083,12 @@ int new_lease_file ()
+ path_dhcpd_db, (int)t) >= sizeof newfname)
+ log_fatal("new_lease_file: lease file path too long");
+
+- db_fd = open (newfname, O_WRONLY | O_TRUNC | O_CREAT, 0664);
++ db_fd = open (newfname, O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, 0664);
+ if (db_fd < 0) {
+ log_error ("Can't create new lease file: %m");
+ return 0;
+ }
+- if ((new_db_file = fdopen(db_fd, "w")) == NULL) {
++ if ((new_db_file = fdopen(db_fd, "we")) == NULL) {
+ log_error("Can't fdopen new lease file: %m");
+ close(db_fd);
+ goto fdfail;
+diff -up dhcp-4.2.2b1/server/dhcpd.c.cloexec dhcp-4.2.2b1/server/dhcpd.c
+--- dhcp-4.2.2b1/server/dhcpd.c.cloexec 2011-04-21 16:08:15.000000000 +0200
++++ dhcp-4.2.2b1/server/dhcpd.c 2011-07-01 14:19:40.354124505 +0200
+@@ -270,11 +270,11 @@ main(int argc, char **argv) {
+ /* Make sure that file descriptors 0 (stdin), 1, (stdout), and
+ 2 (stderr) are open. To do this, we assume that when we
+ open a file the lowest available file descriptor is used. */
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 0)
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 1)
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 2)
+ log_perror = 0; /* No sense logging to /dev/null. */
+ else if (fd != -1)
+@@ -793,7 +793,7 @@ main(int argc, char **argv) {
+ */
+ if (no_pid_file == ISC_FALSE) {
+ /*Read previous pid file. */
+- if ((i = open (path_dhcpd_pid, O_RDONLY)) >= 0) {
++ if ((i = open (path_dhcpd_pid, O_RDONLY | O_CLOEXEC)) >= 0) {
+ status = read(i, pbuf, (sizeof pbuf) - 1);
+ close (i);
+ if (status > 0) {
+@@ -812,7 +812,7 @@ main(int argc, char **argv) {
+ }
+
+ /* Write new pid file. */
+- i = open(path_dhcpd_pid, O_WRONLY|O_CREAT|O_TRUNC, 0644);
++ i = open(path_dhcpd_pid, O_WRONLY|O_CREAT|O_TRUNC|O_CLOEXEC, 0644);
+ if (i >= 0) {
+ sprintf(pbuf, "%d\n", (int) getpid());
+ IGNORE_RET (write(i, pbuf, strlen(pbuf)));
+@@ -840,9 +840,9 @@ main(int argc, char **argv) {
+ close(2);
+
+ /* Reopen them on /dev/null. */
+- open("/dev/null", O_RDWR);
+- open("/dev/null", O_RDWR);
+- open("/dev/null", O_RDWR);
++ open("/dev/null", O_RDWR | O_CLOEXEC);
++ open("/dev/null", O_RDWR | O_CLOEXEC);
++ open("/dev/null", O_RDWR | O_CLOEXEC);
+ log_perror = 0; /* No sense logging to /dev/null. */
+
+ IGNORE_RET (chdir("/"));
+diff -up dhcp-4.2.2b1/server/ldap.c.cloexec dhcp-4.2.2b1/server/ldap.c
+--- dhcp-4.2.2b1/server/ldap.c.cloexec 2010-03-25 16:26:58.000000000 +0100
++++ dhcp-4.2.2b1/server/ldap.c 2011-07-01 14:13:31.043887665 +0200
+@@ -685,7 +685,7 @@ ldap_start (void)
+
+ if (ldap_debug_file != NULL && ldap_debug_fd == -1)
+ {
+- if ((ldap_debug_fd = open (ldap_debug_file, O_CREAT | O_TRUNC | O_WRONLY,
++ if ((ldap_debug_fd = open (ldap_debug_file, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC,
+ S_IRUSR | S_IWUSR)) < 0)
+ log_error ("Error opening debug LDAP log file %s: %s", ldap_debug_file,
+ strerror (errno));
diff --git a/src/patches/dhcp-4.2.2-capability.patch b/src/patches/dhcp-4.2.2-capability.patch
new file mode 100644
index 0000000..79af036
--- /dev/null
+++ b/src/patches/dhcp-4.2.2-capability.patch
@@ -0,0 +1,323 @@
+diff -up dhcp-4.2.2b1/client/dhclient.8.capability dhcp-4.2.2b1/client/dhclient.8
+--- dhcp-4.2.2b1/client/dhclient.8.capability 2011-07-01 15:09:06.603784531 +0200
++++ dhcp-4.2.2b1/client/dhclient.8 2011-07-01 15:09:06.663783913 +0200
+@@ -118,6 +118,9 @@ dhclient - Dynamic Host Configuration Pr
+ .B -w
+ ]
+ [
++.B -nc
++]
++[
+ .B -B
+ ]
+ [
+@@ -296,6 +299,32 @@ has been added or removed, so that the c
+ address on that interface.
+
+ .TP
++.BI \-nc
++Do not drop capabilities.
++
++Normally, if
++.B dhclient
++was compiled with libcap-ng support,
++.B dhclient
++drops most capabilities immediately upon startup. While more secure,
++this greatly restricts the additional actions that hooks in
++.B dhclient-script (8)
++can take. (For example, any daemons that
++.B dhclient-script (8)
++starts or restarts will inherit the restricted capabilities as well,
++which may interfere with their correct operation.) Thus, the
++.BI \-nc
++option can be used to prevent
++.B dhclient
++from dropping capabilities.
++
++The
++.BI \-nc
++option is ignored if
++.B dhclient
++was not compiled with libcap-ng support.
++
++.TP
+ .BI \-B
+ Set the BOOTP broadcast flag in request packets so servers will always
+ broadcast replies.
+diff -up dhcp-4.2.2b1/client/dhclient.c.capability dhcp-4.2.2b1/client/dhclient.c
+--- dhcp-4.2.2b1/client/dhclient.c.capability 2011-07-01 15:09:06.644784107 +0200
++++ dhcp-4.2.2b1/client/dhclient.c 2011-07-01 15:09:06.664783903 +0200
+@@ -39,6 +39,10 @@
+ #include <limits.h>
+ #include <dns/result.h>
+
++#ifdef HAVE_LIBCAP_NG
++#include <cap-ng.h>
++#endif
++
+ /*
+ * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
+ * that when building ISC code.
+@@ -141,6 +145,9 @@ main(int argc, char **argv) {
+ int timeout_arg = 0;
+ char *arg_conf = NULL;
+ int arg_conf_len = 0;
++#ifdef HAVE_LIBCAP_NG
++ int keep_capabilities = 0;
++#endif
+
+ /* Initialize client globals. */
+ memset(&default_duid, 0, sizeof(default_duid));
+@@ -410,6 +417,10 @@ main(int argc, char **argv) {
+ }
+
+ dhclient_request_options = argv[i];
++ } else if (!strcmp(argv[i], "-nc")) {
++#ifdef HAVE_LIBCAP_NG
++ keep_capabilities = 1;
++#endif
+ } else if (argv[i][0] == '-') {
+ usage();
+ } else if (interfaces_requested < 0) {
+@@ -458,6 +469,19 @@ main(int argc, char **argv) {
+ path_dhclient_script = s;
+ }
+
++#ifdef HAVE_LIBCAP_NG
++ /* Drop capabilities */
++ if (!keep_capabilities) {
++ capng_clear(CAPNG_SELECT_CAPS);
++ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED,
++ CAP_DAC_OVERRIDE); // Drop this someday
++ capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED,
++ CAP_NET_ADMIN, CAP_NET_RAW,
++ CAP_NET_BIND_SERVICE, CAP_SYS_ADMIN, -1);
++ capng_apply(CAPNG_SELECT_CAPS);
++ }
++#endif
++
+ /* Set up the initial dhcp option universe. */
+ initialize_common_option_spaces();
+
+diff -up dhcp-4.2.2b1/client/dhclient-script.8.capability dhcp-4.2.2b1/client/dhclient-script.8
+--- dhcp-4.2.2b1/client/dhclient-script.8.capability 2011-07-01 15:09:06.604784521 +0200
++++ dhcp-4.2.2b1/client/dhclient-script.8 2011-07-01 15:09:06.666783883 +0200
+@@ -239,6 +239,16 @@ repeatedly initialized to the values pro
+ the other. Assuming the information provided by both servers is
+ valid, this shouldn't cause any real problems, but it could be
+ confusing.
++.PP
++Normally, if dhclient was compiled with libcap-ng support,
++dhclient drops most capabilities immediately upon startup.
++While more secure, this greatly restricts the additional actions that
++hooks in dhclient-script can take. For example, any daemons that
++dhclient-script starts or restarts will inherit the restricted
++capabilities as well, which may interfere with their correct operation.
++Thus, the
++.BI \-nc
++option can be used to prevent dhclient from dropping capabilities.
+ .SH SEE ALSO
+ dhclient(8), dhcpd(8), dhcrelay(8), dhclient.conf(5) and
+ dhclient.leases(5).
+diff -up dhcp-4.2.2b1/client/Makefile.am.capability dhcp-4.2.2b1/client/Makefile.am
+--- dhcp-4.2.2b1/client/Makefile.am.capability 2011-07-01 15:09:06.526785327 +0200
++++ dhcp-4.2.2b1/client/Makefile.am 2011-07-01 15:09:06.667783873 +0200
+@@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c
+ scripts/netbsd scripts/nextstep scripts/openbsd \
+ scripts/solaris scripts/openwrt
+ dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+- $(BIND9_LIBDIR) -ldns-export -lisc-export
++ $(BIND9_LIBDIR) -ldns-export -lisc-export $(CAPNG_LDADD)
+ man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
+ EXTRA_DIST = $(man_MANS)
+
+diff -up dhcp-4.2.2b1/configure.ac.capability dhcp-4.2.2b1/configure.ac
+--- dhcp-4.2.2b1/configure.ac.capability 2011-07-01 15:09:06.527785317 +0200
++++ dhcp-4.2.2b1/configure.ac 2011-07-01 15:09:06.667783873 +0200
+@@ -449,6 +449,41 @@ AC_TRY_LINK(
+ # Look for optional headers.
+ AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
+
++# look for capabilities library
++AC_ARG_WITH(libcap-ng,
++ [ --with-libcap-ng=[auto/yes/no] Add Libcap-ng support [default=auto]],,
++ with_libcap_ng=auto)
++
++# Check for Libcap-ng API
++#
++# libcap-ng detection
++if test x$with_libcap_ng = xno ; then
++ have_libcap_ng=no;
++else
++ # Start by checking for header file
++ AC_CHECK_HEADER(cap-ng.h, capng_headers=yes, capng_headers=no)
++
++ # See if we have libcap-ng library
++ AC_CHECK_LIB(cap-ng, capng_clear,
++ CAPNG_LDADD=-lcap-ng,)
++
++ # Check results are usable
++ if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then
++ AC_MSG_ERROR(libcap-ng support was requested and the library was not found)
++ fi
++ if test x$CAPNG_LDADD != x -a $capng_headers = no ; then
++ AC_MSG_ERROR(libcap-ng libraries found but headers are missing)
++ fi
++fi
++AC_SUBST(CAPNG_LDADD)
++AC_MSG_CHECKING(whether to use libcap-ng)
++if test x$CAPNG_LDADD != x ; then
++ AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])
++ AC_MSG_RESULT(yes)
++else
++ AC_MSG_RESULT(no)
++fi
++
+ # Solaris needs some libraries for functions
+ AC_SEARCH_LIBS(socket, [socket])
+ AC_SEARCH_LIBS(inet_ntoa, [nsl])
+diff -up dhcp-4.2.2b1/relay/dhcrelay.c.capability dhcp-4.2.2b1/relay/dhcrelay.c
+--- dhcp-4.2.2b1/relay/dhcrelay.c.capability 2011-07-01 15:09:06.626784295 +0200
++++ dhcp-4.2.2b1/relay/dhcrelay.c 2011-07-01 15:12:05.362223794 +0200
+@@ -36,6 +36,11 @@
+ #include <syslog.h>
+ #include <sys/time.h>
+
++#ifdef HAVE_LIBCAP_NG
++# include <cap-ng.h>
++ int keep_capabilities = 0;
++#endif
++
+ TIME default_lease_time = 43200; /* 12 hours... */
+ TIME max_lease_time = 86400; /* 24 hours... */
+ struct tree_cache *global_options[256];
+@@ -356,6 +361,10 @@ main(int argc, char **argv) {
+ sl->next = upstreams;
+ upstreams = sl;
+ #endif
++ } else if (!strcmp(argv[i], "-nc")) {
++#ifdef HAVE_LIBCAP_NG
++ keep_capabilities = 1;
++#endif
+ } else if (!strcmp(argv[i], "-pf")) {
+ if (++i == argc)
+ usage();
+@@ -426,6 +435,17 @@ main(int argc, char **argv) {
+ #endif
+ }
+
++#ifdef HAVE_LIBCAP_NG
++ /* Drop capabilities */
++ if (!keep_capabilities) {
++ capng_clear(CAPNG_SELECT_BOTH);
++ capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED,
++ CAP_NET_RAW, CAP_NET_BIND_SERVICE, -1);
++ capng_apply(CAPNG_SELECT_BOTH);
++ log_info ("Dropped all unnecessary capabilities.");
++ }
++#endif
++
+ if (!quiet) {
+ log_info("%s %s", message, PACKAGE_VERSION);
+ log_info(copyright);
+@@ -573,6 +593,15 @@ main(int argc, char **argv) {
+ dhcpv6_packet_handler = do_packet6;
+ #endif
+
++#ifdef HAVE_LIBCAP_NG
++ /* Drop all capabilities */
++ if (!keep_capabilities) {
++ capng_clear(CAPNG_SELECT_BOTH);
++ capng_apply(CAPNG_SELECT_BOTH);
++ log_info ("Dropped all capabilities.");
++ }
++#endif
++
+ /* Start dispatching packets and timeouts... */
+ dispatch();
+
+diff -up dhcp-4.2.2b1/relay/Makefile.am.capability dhcp-4.2.2b1/relay/Makefile.am
+--- dhcp-4.2.2b1/relay/Makefile.am.capability 2011-07-01 15:09:06.546785121 +0200
++++ dhcp-4.2.2b1/relay/Makefile.am 2011-07-01 15:09:06.670783841 +0200
+@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
+ sbin_PROGRAMS = dhcrelay
+ dhcrelay_SOURCES = dhcrelay.c
+ dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+- $(BIND9_LIBDIR) -ldns-export -lisc-export
++ $(BIND9_LIBDIR) -ldns-export -lisc-export $(CAPNG_LDADD)
+ man_MANS = dhcrelay.8
+ EXTRA_DIST = $(man_MANS)
+
+diff -up dhcp-4.2.2b1/server/dhcpd.c.capability dhcp-4.2.2b1/server/dhcpd.c
+--- dhcp-4.2.2b1/server/dhcpd.c.capability 2011-07-01 15:09:06.636784192 +0200
++++ dhcp-4.2.2b1/server/dhcpd.c 2011-07-01 15:09:06.670783841 +0200
+@@ -58,6 +58,11 @@ static const char url [] =
+ # undef group
+ #endif /* PARANOIA */
+
++#ifdef HAVE_LIBCAP_NG
++# include <cap-ng.h>
++ int keep_capabilities = 0;
++#endif
++
+ static void usage(void);
+
+ struct iaddr server_identifier;
+@@ -403,6 +408,10 @@ main(int argc, char **argv) {
+ traceinfile = argv [i];
+ trace_replay_init ();
+ #endif /* TRACING */
++ } else if (!strcmp(argv[i], "-nc")) {
++#ifdef HAVE_LIBCAP_NG
++ keep_capabilities = 1;
++#endif
+ } else if (argv [i][0] == '-') {
+ usage ();
+ } else {
+@@ -459,6 +468,17 @@ main(int argc, char **argv) {
+ }
+ #endif /* DHCPv6 */
+
++#ifdef HAVE_LIBCAP_NG
++ /* Drop capabilities */
++ if (!keep_capabilities) {
++ capng_clear(CAPNG_SELECT_BOTH);
++ capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED,
++ CAP_NET_RAW, CAP_NET_BIND_SERVICE, CAP_SYS_CHROOT, CAP_SETUID, CAP_SETGID, -1);
++ capng_apply(CAPNG_SELECT_BOTH);
++ log_info ("Dropped all unnecessary capabilities.");
++ }
++#endif
++
+ /*
+ * convert relative path names to absolute, for files that need
+ * to be reopened after chdir() has been called
+@@ -859,6 +879,15 @@ main(int argc, char **argv) {
+ omapi_set_int_value ((omapi_object_t *)dhcp_control_object,
+ (omapi_object_t *)0, "state", server_running);
+
++#ifdef HAVE_LIBCAP_NG
++ /* Drop all capabilities */
++ if (!keep_capabilities) {
++ capng_clear(CAPNG_SELECT_BOTH);
++ capng_apply(CAPNG_SELECT_BOTH);
++ log_info ("Dropped all capabilities.");
++ }
++#endif
++
+ /* Receive packets and dispatch them... */
+ dispatch ();
+
+diff -up dhcp-4.2.2b1/server/Makefile.am.capability dhcp-4.2.2b1/server/Makefile.am
+--- dhcp-4.2.2b1/server/Makefile.am.capability 2011-07-01 15:09:06.546785121 +0200
++++ dhcp-4.2.2b1/server/Makefile.am 2011-07-01 15:09:06.671783830 +0200
+@@ -8,7 +8,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
+
+ dhcpd_CFLAGS = $(LDAP_CFLAGS)
+ dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+- ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export
++ ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export \
++ $(CAPNG_LDADD)
+
+ man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
+ EXTRA_DIST = $(man_MANS)
diff --git a/src/patches/dhcp-4.2.2-dhclient-usage.patch b/src/patches/dhcp-4.2.2-dhclient-usage.patch
new file mode 100644
index 0000000..0d41943
--- /dev/null
+++ b/src/patches/dhcp-4.2.2-dhclient-usage.patch
@@ -0,0 +1,14 @@
+diff -up dhcp-4.2.2b1/client/dhclient.c.usage dhcp-4.2.2b1/client/dhclient.c
+--- dhcp-4.2.2b1/client/dhclient.c.usage 2011-07-01 13:55:16.000000000 +0200
++++ dhcp-4.2.2b1/client/dhclient.c 2011-07-01 13:58:55.243800602 +0200
+@@ -1047,6 +1047,10 @@ static void usage()
+ " [-s server-addr] [-cf config-file] "
+ "[-lf lease-file]\n"
+ " [-pf pid-file] [--no-pid] [-e VAR=val]\n"
++ " [-I <dhcp-client-identifier>] [-B]\n"
++ " [-H <host-name> | -F <fqdn.fqdn>] [-timeout <timeout>]\n"
++ " [-V <vendor-class-identifier>]\n"
++ " [-R <request option list>]\n"
+ " [-sf script-file] [interface]");
+ }
+
diff --git a/src/patches/dhcp-4.2.2-gpxe-cid.patch b/src/patches/dhcp-4.2.2-gpxe-cid.patch
new file mode 100644
index 0000000..c0be4c2
--- /dev/null
+++ b/src/patches/dhcp-4.2.2-gpxe-cid.patch
@@ -0,0 +1,132 @@
+diff -up dhcp-4.2.2/client/dhclient.c.gpxe-cid dhcp-4.2.2/client/dhclient.c
+--- dhcp-4.2.2/client/dhclient.c.gpxe-cid 2011-09-16 18:23:20.190453902 +0200
++++ dhcp-4.2.2/client/dhclient.c 2011-09-16 18:27:15.568463599 +0200
+@@ -58,6 +58,13 @@ const char *path_dhclient_pid = NULL;
+ static char path_dhclient_script_array[] = _PATH_DHCLIENT_SCRIPT;
+ char *path_dhclient_script = path_dhclient_script_array;
+
++/* Default Prefix */
++static unsigned char default_prefix[12] = {
++ 0xff, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x02, 0x00,
++ 0x00, 0x02, 0xc9, 0x00
++};
++
+ /* False (default) => we write and use a pid file */
+ isc_boolean_t no_pid_file = ISC_FALSE;
+
+@@ -1250,6 +1257,12 @@ int find_subnet (struct subnet **sp,
+ static void setup_ib_interface(struct interface_info *ip)
+ {
+ struct group *g;
++ struct hardware *hw = &ip->hw_address;
++ char client_id[64];
++ char *arg_conf = NULL;
++ int arg_conf_len = 0;
++ isc_result_t status;
++ struct parse *cfile = (struct parse *)0;
+
+ /* Set the broadcast flag */
+ ip->client->config->bootp_broadcast_always = 1;
+@@ -1266,8 +1279,39 @@ static void setup_ib_interface(struct in
+ }
+ }
+
+- /* No client ID specified */
+- log_fatal("dhcp-client-identifier must be specified for InfiniBand");
++ /*
++ * No client ID specified, make up one based on a default
++ * "prefix" and the port GUID.
++ *
++ * NOTE: This is compatible with what gpxe does.
++ */
++ sprintf(client_id, "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",
++ default_prefix[0], default_prefix[1], default_prefix[2],
++ default_prefix[3], default_prefix[4], default_prefix[5],
++ default_prefix[6], default_prefix[7], default_prefix[8],
++ default_prefix[9], default_prefix[10], default_prefix[11],
++ hw->hbuf[1], hw->hbuf[2], hw->hbuf[3], hw->hbuf[4],
++ hw->hbuf[5], hw->hbuf[6], hw->hbuf[7], hw->hbuf[8]);
++
++ arg_conf_len = asprintf(&arg_conf,
++ "send dhcp-client-identifier %s;",
++ client_id);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send option dhcp-client-identifier");
++
++ status = new_parse(&cfile, -1, arg_conf, arg_conf_len,
++ "Automatic Infiniband client identifier", 0);
++
++ if ((status != ISC_R_SUCCESS) || (cfile->warnings_occurred))
++ log_fatal("Failed to parse Infiniband client identifier");
++
++ parse_client_statement(cfile, NULL, ip->client->config);
++
++ if (cfile->warnings_occurred)
++ log_fatal("Failed to parse Infiniband client identifier");
++
++ end_parse(&cfile);
+ }
+
+ /* Individual States:
+diff -up dhcp-4.2.2/common/lpf.c.gpxe-cid dhcp-4.2.2/common/lpf.c
+--- dhcp-4.2.2/common/lpf.c.gpxe-cid 2011-09-16 18:23:20.183453996 +0200
++++ dhcp-4.2.2/common/lpf.c 2011-09-16 18:25:28.235804421 +0200
+@@ -591,6 +591,37 @@ void maybe_setup_fallback ()
+ }
+ }
+
++static unsigned char * get_ib_hw_addr(char * name)
++{
++ struct ifaddrs *ifaddrs;
++ struct ifaddrs *ifa;
++ struct sockaddr_ll *sll = NULL;
++ static unsigned char hw_addr[8];
++
++ if (getifaddrs(&ifaddrs) == -1)
++ return NULL;
++
++ for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
++ if (ifa->ifa_addr == NULL)
++ continue;
++ if (ifa->ifa_addr->sa_family != AF_PACKET)
++ continue;
++ if (ifa->ifa_flags & IFF_LOOPBACK)
++ continue;
++ if (strcmp(ifa->ifa_name, name) == 0) {
++ sll = (struct sockaddr_ll *)(void *)ifa->ifa_addr;
++ break;
++ }
++ }
++ if (sll == NULL) {
++ freeifaddrs(ifaddrs);
++ return NULL;
++ }
++ memcpy(hw_addr, &sll->sll_addr[sll->sll_halen - 8], 8);
++ freeifaddrs(ifaddrs);
++ return (unsigned char *)&hw_addr;
++}
++
+ void
+ get_hw_addr(struct interface_info *info)
+ {
+@@ -599,6 +630,7 @@ get_hw_addr(struct interface_info *info)
+ struct ifaddrs *ifaddrs;
+ struct ifaddrs *ifa;
+ struct sockaddr_ll *sll = NULL;
++ unsigned char *hw_addr;
+
+ if (getifaddrs(&ifaddrs) == -1)
+ log_fatal("Failed to get interfaces");
+@@ -660,6 +692,10 @@ get_hw_addr(struct interface_info *info)
+
+ hw->hlen = 1;
+ hw->hbuf[0] = HTYPE_INFINIBAND;
++ hw_addr = get_ib_hw_addr(name);
++ if (!hw_addr)
++ log_fatal("Failed getting %s hw addr", name);
++ memcpy (&hw->hbuf [1], hw_addr, 8);
+ break;
+ #if defined(ARPHRD_PPP)
+ case ARPHRD_PPP:
diff --git a/src/patches/dhcp-4.2.2-improved-xid.patch b/src/patches/dhcp-4.2.2-improved-xid.patch
new file mode 100644
index 0000000..f49fc78
--- /dev/null
+++ b/src/patches/dhcp-4.2.2-improved-xid.patch
@@ -0,0 +1,138 @@
+diff -up dhcp-4.2.2/client/dhclient.c.improved-xid dhcp-4.2.2/client/dhclient.c
+--- dhcp-4.2.2/client/dhclient.c.improved-xid 2011-09-16 18:18:00.649730661 +0200
++++ dhcp-4.2.2/client/dhclient.c 2011-09-16 18:22:36.815035513 +0200
+@@ -898,6 +898,26 @@ main(int argc, char **argv) {
+ }
+ }
+
++ /* We create a backup seed before rediscovering interfaces in order to
++ have a seed built using all of the available interfaces
++ It's interesting if required interfaces doesn't let us defined
++ a really unique seed due to a lack of valid HW addr later
++ (this is the case with DHCP over IB)
++ We only use the last device as using a sum could broke the
++ uniqueness of the seed among multiple nodes
++ */
++ unsigned backup_seed = 0;
++ for (ip = interfaces; ip; ip = ip -> next) {
++ int junk;
++ if ( ip -> hw_address.hlen <= sizeof seed )
++ continue;
++ memcpy (&junk,
++ &ip -> hw_address.hbuf [ip -> hw_address.hlen -
++ sizeof seed], sizeof seed);
++ backup_seed = junk;
++ }
++
++
+ /* At this point, all the interfaces that the script thinks
+ are relevant should be running, so now we once again call
+ discover_interfaces(), and this time ask it to actually set
+@@ -912,14 +932,36 @@ main(int argc, char **argv) {
+ Not much entropy, but we're booting, so we're not likely to
+ find anything better. */
+ seed = 0;
++ int seed_flag = 0;
+ for (ip = interfaces; ip; ip = ip->next) {
+ int junk;
++ if ( ip -> hw_address.hlen <= sizeof seed )
++ continue;
+ memcpy(&junk,
+ &ip->hw_address.hbuf[ip->hw_address.hlen -
+ sizeof seed], sizeof seed);
+ seed += junk;
++ seed_flag = 1;
+ }
+- srandom(seed + cur_time + (unsigned)getpid());
++ if ( seed_flag == 0 ) {
++ if ( backup_seed != 0 ) {
++ seed = backup_seed;
++ log_info ("xid: rand init seed (0x%x) built using all"
++ " available interfaces",seed);
++ }
++ else {
++ seed = cur_time^((unsigned) gethostid()) ;
++ log_info ("xid: warning: no netdev with useable HWADDR found"
++ " for seed's uniqueness enforcement");
++ log_info ("xid: rand init seed (0x%x) built using gethostid",
++ seed);
++ }
++ /* we only use seed and no current time as a broadcast reply */
++ /* will certainly be used by the hwaddrless interface */
++ srandom(seed);
++ }
++ else
++ srandom(seed + cur_time + (unsigned)getpid());
+
+ /* Setup specific Infiniband options */
+ for (ip = interfaces; ip; ip = ip->next) {
+@@ -1457,7 +1499,7 @@ void dhcpack (packet)
+ return;
+ }
+
+- log_info ("DHCPACK from %s", piaddr (packet -> client_addr));
++ log_info ("DHCPACK from %s (xid=0x%x)", piaddr (packet -> client_addr), client -> xid);
+
+ lease = packet_to_lease (packet, client);
+ if (!lease) {
+@@ -2174,7 +2216,7 @@ void dhcpnak (packet)
+ return;
+ }
+
+- log_info ("DHCPNAK from %s", piaddr (packet -> client_addr));
++ log_info ("DHCPNAK from %s (xid=0x%x)", piaddr (packet -> client_addr), client -> xid);
+
+ if (!client -> active) {
+ #if defined (DEBUG)
+@@ -2300,10 +2342,10 @@ void send_discover (cpp)
+ client -> packet.secs = htons (65535);
+ client -> secs = client -> packet.secs;
+
+- log_info ("DHCPDISCOVER on %s to %s port %d interval %ld",
++ log_info ("DHCPDISCOVER on %s to %s port %d interval %ld (xid=0x%x)",
+ client -> name ? client -> name : client -> interface -> name,
+ inet_ntoa (sockaddr_broadcast.sin_addr),
+- ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval));
++ ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval), client -> xid);
+
+ /* Send out a packet. */
+ result = send_packet (client -> interface, (struct packet *)0,
+@@ -2584,10 +2626,10 @@ void send_request (cpp)
+ client -> packet.secs = htons (65535);
+ }
+
+- log_info ("DHCPREQUEST on %s to %s port %d",
++ log_info ("DHCPREQUEST on %s to %s port %d (xid=0x%x)",
+ client -> name ? client -> name : client -> interface -> name,
+ inet_ntoa (destination.sin_addr),
+- ntohs (destination.sin_port));
++ ntohs (destination.sin_port), client -> xid);
+
+ if (destination.sin_addr.s_addr != INADDR_BROADCAST &&
+ fallback_interface)
+@@ -2618,10 +2660,10 @@ void send_decline (cpp)
+
+ int result;
+
+- log_info ("DHCPDECLINE on %s to %s port %d",
++ log_info ("DHCPDECLINE on %s to %s port %d (xid=0x%x)",
+ client -> name ? client -> name : client -> interface -> name,
+ inet_ntoa (sockaddr_broadcast.sin_addr),
+- ntohs (sockaddr_broadcast.sin_port));
++ ntohs (sockaddr_broadcast.sin_port), client -> xid);
+
+ /* Send out a packet. */
+ result = send_packet (client -> interface, (struct packet *)0,
+@@ -2661,10 +2703,10 @@ void send_release (cpp)
+ return;
+ }
+
+- log_info ("DHCPRELEASE on %s to %s port %d",
++ log_info ("DHCPRELEASE on %s to %s port %d (xid=0x%x)",
+ client -> name ? client -> name : client -> interface -> name,
+ inet_ntoa (destination.sin_addr),
+- ntohs (destination.sin_port));
++ ntohs (destination.sin_port), client -> xid);
+
+ if (fallback_interface)
+ result = send_packet (fallback_interface,
diff --git a/src/patches/dhcp-4.2.2-lpf-ib.patch b/src/patches/dhcp-4.2.2-lpf-ib.patch
new file mode 100644
index 0000000..4034028
--- /dev/null
+++ b/src/patches/dhcp-4.2.2-lpf-ib.patch
@@ -0,0 +1,538 @@
+diff -up dhcp-4.2.2/client/dhclient.c.lpf-ib dhcp-4.2.2/client/dhclient.c
+--- dhcp-4.2.2/client/dhclient.c.lpf-ib 2011-09-19 11:24:08.693775799 +0200
++++ dhcp-4.2.2/client/dhclient.c 2011-09-19 11:24:08.703775541 +0200
+@@ -113,6 +113,8 @@ static int check_domain_name_list(const
+ static int check_option_values(struct universe *universe, unsigned int opt,
+ const char *ptr, size_t len);
+
++static void setup_ib_interface(struct interface_info *ip);
++
+ int
+ main(int argc, char **argv) {
+ int fd;
+@@ -919,6 +921,14 @@ main(int argc, char **argv) {
+ }
+ srandom(seed + cur_time + (unsigned)getpid());
+
++ /* Setup specific Infiniband options */
++ for (ip = interfaces; ip; ip = ip->next) {
++ if (ip->client &&
++ (ip->hw_address.hbuf[0] == HTYPE_INFINIBAND)) {
++ setup_ib_interface(ip);
++ }
++ }
++
+ /* Start a configuration state machine for each interface. */
+ #ifdef DHCPv6
+ if (local_family == AF_INET6) {
+@@ -1195,6 +1205,29 @@ int find_subnet (struct subnet **sp,
+ return 0;
+ }
+
++static void setup_ib_interface(struct interface_info *ip)
++{
++ struct group *g;
++
++ /* Set the broadcast flag */
++ ip->client->config->bootp_broadcast_always = 1;
++
++ /*
++ * Find out if a dhcp-client-identifier option was specified either
++ * in the config file or on the command line
++ */
++ for (g = ip->client->config->on_transmission; g != NULL; g = g->next) {
++ if ((g->statements != NULL) &&
++ (strcmp(g->statements->data.option->option->name,
++ "dhcp-client-identifier") == 0)) {
++ return;
++ }
++ }
++
++ /* No client ID specified */
++ log_fatal("dhcp-client-identifier must be specified for InfiniBand");
++}
++
+ /* Individual States:
+ *
+ * Each routine is called from the dhclient_state_machine() in one of
+diff -up dhcp-4.2.2/common/bpf.c.lpf-ib dhcp-4.2.2/common/bpf.c
+--- dhcp-4.2.2/common/bpf.c.lpf-ib 2011-09-19 11:24:08.694775773 +0200
++++ dhcp-4.2.2/common/bpf.c 2011-09-19 11:24:08.704775516 +0200
+@@ -198,11 +198,44 @@ struct bpf_insn dhcp_bpf_filter [] = {
+ BPF_STMT(BPF_RET+BPF_K, 0),
+ };
+
++/* Packet filter program for DHCP over Infiniband.
++ *
++ * XXX
++ * Changes to the filter program may require changes to the constant offsets
++ * used in lpf_gen_filter_setup to patch the port in the BPF program!
++ * XXX
++ */
++struct bpf_insn dhcp_ib_bpf_filter [] = {
++ /* Packet filter for Infiniband */
++ /* Make sure it's a UDP packet... */
++ BPF_STMT(BPF_LD + BPF_B + BPF_ABS, 9),
++ BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, IPPROTO_UDP, 0, 6),
++
++ /* Make sure this isn't a fragment... */
++ BPF_STMT(BPF_LD + BPF_H + BPF_ABS, 6),
++ BPF_JUMP(BPF_JMP + BPF_JSET + BPF_K, 0x1fff, 4, 0),
++
++ /* Get the IP header length... */
++ BPF_STMT(BPF_LDX + BPF_B + BPF_MSH, 0),
++
++ /* Make sure it's to the right port... */
++ BPF_STMT(BPF_LD + BPF_H + BPF_IND, 2),
++ BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 67, 0, 1),
++
++ /* If we passed all the tests, ask for the whole packet. */
++ BPF_STMT(BPF_RET + BPF_K, (u_int)-1),
++
++ /* Otherwise, drop it. */
++ BPF_STMT(BPF_RET + BPF_K, 0),
++};
++
+ #if defined (DEC_FDDI)
+ struct bpf_insn *bpf_fddi_filter;
+ #endif
+
+ int dhcp_bpf_filter_len = sizeof dhcp_bpf_filter / sizeof (struct bpf_insn);
++int dhcp_ib_bpf_filter_len = sizeof dhcp_ib_bpf_filter / sizeof (struct bpf_insn);
++
+ #if defined (HAVE_TR_SUPPORT)
+ struct bpf_insn dhcp_bpf_tr_filter [] = {
+ /* accept all token ring packets due to variable length header */
+diff -up dhcp-4.2.2/common/lpf.c.lpf-ib dhcp-4.2.2/common/lpf.c
+--- dhcp-4.2.2/common/lpf.c.lpf-ib 2011-09-19 11:24:08.694775773 +0200
++++ dhcp-4.2.2/common/lpf.c 2011-09-19 11:26:15.107109935 +0200
+@@ -42,6 +42,7 @@
+ #include "includes/netinet/udp.h"
+ #include "includes/netinet/if_ether.h"
+ #include <net/if.h>
++#include <ifaddrs.h>
+
+ #ifndef PACKET_AUXDATA
+ #define PACKET_AUXDATA 8
+@@ -59,6 +60,15 @@ struct tpacket_auxdata
+ /* Reinitializes the specified interface after an address change. This
+ is not required for packet-filter APIs. */
+
++/* Default broadcast address for IPoIB */
++static unsigned char default_ib_bcast_addr[20] = {
++ 0x00, 0xff, 0xff, 0xff,
++ 0xff, 0x12, 0x40, 0x1b,
++ 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00,
++ 0xff, 0xff, 0xff, 0xff
++};
++
+ #ifdef USE_LPF_SEND
+ void if_reinitialize_send (info)
+ struct interface_info *info;
+@@ -86,10 +96,21 @@ int if_register_lpf (info)
+ struct sockaddr common;
+ } sa;
+ struct ifreq ifr;
++ int type;
++ int protocol;
+
+ /* Make an LPF socket. */
+- if ((sock = socket(PF_PACKET, SOCK_RAW,
+- htons((short)ETH_P_ALL))) < 0) {
++ get_hw_addr(info);
++
++ if (info->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
++ type = SOCK_DGRAM;
++ protocol = ETHERTYPE_IP;
++ } else {
++ type = SOCK_RAW;
++ protocol = ETH_P_ALL;
++ }
++
++ if ((sock = socket(PF_PACKET, type, htons((short)protocol))) < 0) {
+ if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+ errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
+ errno == EAFNOSUPPORT || errno == EINVAL) {
+@@ -112,6 +133,7 @@ int if_register_lpf (info)
+ /* Bind to the interface name */
+ memset (&sa, 0, sizeof sa);
+ sa.ll.sll_family = AF_PACKET;
++ sa.ll.sll_protocol = htons(protocol);
+ sa.ll.sll_ifindex = ifr.ifr_ifindex;
+ if (bind (sock, &sa.common, sizeof sa)) {
+ if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+@@ -127,8 +149,6 @@ int if_register_lpf (info)
+ log_fatal ("Bind socket to interface: %m");
+ }
+
+- get_hw_addr(info->name, &info->hw_address);
+-
+ return sock;
+ }
+ #endif /* USE_LPF_SEND || USE_LPF_RECEIVE */
+@@ -183,6 +203,8 @@ void if_deregister_send (info)
+ in bpf includes... */
+ extern struct sock_filter dhcp_bpf_filter [];
+ extern int dhcp_bpf_filter_len;
++extern struct sock_filter dhcp_ib_bpf_filter [];
++extern int dhcp_ib_bpf_filter_len;
+
+ #if defined (HAVE_TR_SUPPORT)
+ extern struct sock_filter dhcp_bpf_tr_filter [];
+@@ -200,11 +222,13 @@ void if_register_receive (info)
+ /* Open a LPF device and hang it on this interface... */
+ info -> rfdesc = if_register_lpf (info);
+
+- val = 1;
+- if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val,
+- sizeof val) < 0) {
+- if (errno != ENOPROTOOPT)
+- log_fatal ("Failed to set auxiliary packet data: %m");
++ if (info->hw_address.hbuf[0] != HTYPE_INFINIBAND) {
++ val = 1;
++ if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA,
++ &val, sizeof val) < 0) {
++ if (errno != ENOPROTOOPT)
++ log_fatal ("Failed to set auxiliary packet data: %m");
++ }
+ }
+
+ #if defined (HAVE_TR_SUPPORT)
+@@ -250,15 +274,28 @@ static void lpf_gen_filter_setup (info)
+
+ memset(&p, 0, sizeof(p));
+
+- /* Set up the bpf filter program structure. This is defined in
+- bpf.c */
+- p.len = dhcp_bpf_filter_len;
+- p.filter = dhcp_bpf_filter;
+-
+- /* Patch the server port into the LPF program...
+- XXX changes to filter program may require changes
+- to the insn number(s) used below! XXX */
+- dhcp_bpf_filter [8].k = ntohs ((short)local_port);
++ if (info->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
++ /* Set up the bpf filter program structure. */
++ p.len = dhcp_ib_bpf_filter_len;
++ p.filter = dhcp_ib_bpf_filter;
++
++ /* Patch the server port into the LPF program...
++ XXX
++ changes to filter program may require changes
++ to the insn number(s) used below!
++ XXX */
++ dhcp_ib_bpf_filter[6].k = ntohs ((short)local_port);
++ } else {
++ /* Set up the bpf filter program structure.
++ This is defined in bpf.c */
++ p.len = dhcp_bpf_filter_len;
++ p.filter = dhcp_bpf_filter;
++
++ /* Patch the server port into the LPF program...
++ XXX changes to filter program may require changes
++ to the insn number(s) used below! XXX */
++ dhcp_bpf_filter [8].k = ntohs ((short)local_port);
++ }
+
+ if (setsockopt (info -> rfdesc, SOL_SOCKET, SO_ATTACH_FILTER, &p,
+ sizeof p) < 0) {
+@@ -315,6 +352,54 @@ static void lpf_tr_filter_setup (info)
+ #endif /* USE_LPF_RECEIVE */
+
+ #ifdef USE_LPF_SEND
++ssize_t send_packet_ib(interface, packet, raw, len, from, to, hto)
++ struct interface_info *interface;
++ struct packet *packet;
++ struct dhcp_packet *raw;
++ size_t len;
++ struct in_addr from;
++ struct sockaddr_in *to;
++ struct hardware *hto;
++{
++ unsigned ibufp = 0;
++ double ih [1536 / sizeof (double)];
++ unsigned char *buf = (unsigned char *)ih;
++ ssize_t result;
++
++ union sockunion {
++ struct sockaddr sa;
++ struct sockaddr_ll sll;
++ struct sockaddr_storage ss;
++ } su;
++
++ assemble_udp_ip_header (interface, buf, &ibufp, from.s_addr,
++ to->sin_addr.s_addr, to->sin_port,
++ (unsigned char *)raw, len);
++ memcpy (buf + ibufp, raw, len);
++
++ memset(&su, 0, sizeof(su));
++ su.sll.sll_family = AF_PACKET;
++ su.sll.sll_protocol = htons(ETHERTYPE_IP);
++
++ if (!(su.sll.sll_ifindex = if_nametoindex(interface->name))) {
++ errno = ENOENT;
++ log_error ("send_packet_ib: %m - failed to get if index");
++ return -1;
++ }
++
++ su.sll.sll_hatype = htons(HTYPE_INFINIBAND);
++ su.sll.sll_halen = sizeof(interface->bcast_addr);
++ memcpy(&su.sll.sll_addr, interface->bcast_addr, 20);
++
++ result = sendto(interface->wfdesc, buf, ibufp + len, 0,
++ &su.sa, sizeof(su));
++
++ if (result < 0)
++ log_error ("send_packet_ib: %m");
++
++ return result;
++}
++
+ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
+ struct interface_info *interface;
+ struct packet *packet;
+@@ -335,6 +420,11 @@ ssize_t send_packet (interface, packet,
+ return send_fallback (interface, packet, raw,
+ len, from, to, hto);
+
++ if (interface->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
++ return send_packet_ib(interface, packet, raw, len, from,
++ to, hto);
++ }
++
+ if (hto == NULL && interface->anycast_mac_addr.hlen)
+ hto = &interface->anycast_mac_addr;
+
+@@ -356,6 +446,42 @@ ssize_t send_packet (interface, packet,
+ #endif /* USE_LPF_SEND */
+
+ #ifdef USE_LPF_RECEIVE
++ssize_t receive_packet_ib (interface, buf, len, from, hfrom)
++ struct interface_info *interface;
++ unsigned char *buf;
++ size_t len;
++ struct sockaddr_in *from;
++ struct hardware *hfrom;
++{
++ int length = 0;
++ int offset = 0;
++ unsigned char ibuf [1536];
++ unsigned bufix = 0;
++ unsigned paylen;
++
++ length = read(interface->rfdesc, ibuf, sizeof(ibuf));
++
++ if (length <= 0)
++ return length;
++
++ offset = decode_udp_ip_header(interface, ibuf, bufix, from,
++ (unsigned)length, &paylen, 0);
++
++ if (offset < 0)
++ return 0;
++
++ bufix += offset;
++ length -= offset;
++
++ if (length < paylen)
++ log_fatal("Internal inconsistency at %s:%d.", MDL);
++
++ /* Copy out the data in the packet... */
++ memcpy(buf, &ibuf[bufix], paylen);
++
++ return (ssize_t)paylen;
++}
++
+ ssize_t receive_packet (interface, buf, len, from, hfrom)
+ struct interface_info *interface;
+ unsigned char *buf;
+@@ -382,6 +508,10 @@ ssize_t receive_packet (interface, buf,
+ };
+ struct cmsghdr *cmsg;
+
++ if (interface->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
++ return receive_packet_ib(interface, buf, len, from, hfrom);
++ }
++
+ length = recvmsg (interface -> rfdesc, &msg, 0);
+ if (length <= 0)
+ return length;
+@@ -462,33 +592,44 @@ void maybe_setup_fallback ()
+ }
+
+ void
+-get_hw_addr(const char *name, struct hardware *hw) {
+- int sock;
+- struct ifreq tmp;
+- struct sockaddr *sa;
++get_hw_addr(struct interface_info *info)
++{
++ struct hardware *hw = &info->hw_address;
++ char *name = info->name;
++ struct ifaddrs *ifaddrs;
++ struct ifaddrs *ifa;
++ struct sockaddr_ll *sll = NULL;
+
+- if (strlen(name) >= sizeof(tmp.ifr_name)) {
+- log_fatal("Device name too long: \"%s\"", name);
+- }
++ if (getifaddrs(&ifaddrs) == -1)
++ log_fatal("Failed to get interfaces");
+
+- sock = socket(AF_INET, SOCK_DGRAM, 0);
+- if (sock < 0) {
+- log_fatal("Can't create socket for \"%s\": %m", name);
++ for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
++
++ if (ifa->ifa_addr == NULL)
++ continue;
++
++ if (ifa->ifa_addr->sa_family != AF_PACKET)
++ continue;
++
++ if (ifa->ifa_flags & IFF_LOOPBACK)
++ continue;
++
++ if (strcmp(ifa->ifa_name, name) == 0) {
++ sll = (struct sockaddr_ll *)(void *)ifa->ifa_addr;
++ break;
++ }
+ }
+
+- memset(&tmp, 0, sizeof(tmp));
+- strcpy(tmp.ifr_name, name);
+- if (ioctl(sock, SIOCGIFHWADDR, &tmp) < 0) {
+- log_fatal("Error getting hardware address for \"%s\": %m",
+- name);
++ if (sll == NULL) {
++ freeifaddrs(ifaddrs);
++ log_fatal("Failed to get HW address for %s\n", name);
+ }
+
+- sa = &tmp.ifr_hwaddr;
+- switch (sa->sa_family) {
++ switch (sll->sll_hatype) {
+ case ARPHRD_ETHER:
+ hw->hlen = 7;
+ hw->hbuf[0] = HTYPE_ETHER;
+- memcpy(&hw->hbuf[1], sa->sa_data, 6);
++ memcpy(&hw->hbuf[1], sll->sll_addr, 6);
+ break;
+ case ARPHRD_IEEE802:
+ #ifdef ARPHRD_IEEE802_TR
+@@ -496,18 +637,35 @@ get_hw_addr(const char *name, struct har
+ #endif /* ARPHRD_IEEE802_TR */
+ hw->hlen = 7;
+ hw->hbuf[0] = HTYPE_IEEE802;
+- memcpy(&hw->hbuf[1], sa->sa_data, 6);
++ memcpy(&hw->hbuf[1], sll->sll_addr, 6);
+ break;
+ case ARPHRD_FDDI:
+ hw->hlen = 17;
+ hw->hbuf[0] = HTYPE_FDDI;
+- memcpy(&hw->hbuf[1], sa->sa_data, 16);
++ memcpy(&hw->hbuf[1], sll->sll_addr, 16);
++ break;
++ case ARPHRD_INFINIBAND:
++ /* For Infiniband, save the broadcast address and store
++ * the port GUID into the hardware address.
++ */
++ if (ifa->ifa_flags & IFF_BROADCAST) {
++ struct sockaddr_ll *bll;
++
++ bll = (struct sockaddr_ll *)ifa->ifa_broadaddr;
++ memcpy(&info->bcast_addr, bll->sll_addr, 20);
++ } else {
++ memcpy(&info->bcast_addr, default_ib_bcast_addr,
++ 20);
++ }
++
++ hw->hlen = 1;
++ hw->hbuf[0] = HTYPE_INFINIBAND;
+ break;
+ #if defined(ARPHRD_PPP)
+ case ARPHRD_PPP:
+ if (local_family != AF_INET6)
+- log_fatal("Unsupported device type %d for \"%s\"",
+- sa->sa_family, name);
++ log_fatal("Unsupported device type %ld for \"%s\"",
++ (long int)sll->sll_family, name);
+ hw->hlen = 0;
+ hw->hbuf[0] = HTYPE_RESERVED;
+ /* 0xdeadbeef should never occur on the wire,
+@@ -520,10 +678,11 @@ get_hw_addr(const char *name, struct har
+ break;
+ #endif
+ default:
++ freeifaddrs(ifaddrs);
+ log_fatal("Unsupported device type %ld for \"%s\"",
+- (long int)sa->sa_family, name);
++ (long int)sll->sll_family, name);
+ }
+
+- close(sock);
++ freeifaddrs(ifaddrs);
+ }
+ #endif
+diff -up dhcp-4.2.2/common/socket.c.lpf-ib dhcp-4.2.2/common/socket.c
+--- dhcp-4.2.2/common/socket.c.lpf-ib 2011-06-27 18:18:20.000000000 +0200
++++ dhcp-4.2.2/common/socket.c 2011-09-19 11:24:08.705775490 +0200
+@@ -324,7 +324,7 @@ void if_register_send (info)
+ info->wfdesc = if_register_socket(info, AF_INET, 0);
+ /* If this is a normal IPv4 address, get the hardware address. */
+ if (strcmp(info->name, "fallback") != 0)
+- get_hw_addr(info->name, &info->hw_address);
++ get_hw_addr(info);
+ #if defined (USE_SOCKET_FALLBACK)
+ /* Fallback only registers for send, but may need to receive as
+ well. */
+@@ -387,7 +387,7 @@ void if_register_receive (info)
+ #endif /* IP_PKTINFO... */
+ /* If this is a normal IPv4 address, get the hardware address. */
+ if (strcmp(info->name, "fallback") != 0)
+- get_hw_addr(info->name, &info->hw_address);
++ get_hw_addr(info);
+
+ if (!quiet_interface_discovery)
+ log_info ("Listening on Socket/%s%s%s",
+@@ -497,7 +497,7 @@ if_register6(struct interface_info *info
+ if (req_multi)
+ if_register_multicast(info);
+
+- get_hw_addr(info->name, &info->hw_address);
++ get_hw_addr(info);
+
+ if (!quiet_interface_discovery) {
+ if (info->shared_network != NULL) {
+diff -up dhcp-4.2.2/includes/dhcpd.h.lpf-ib dhcp-4.2.2/includes/dhcpd.h
+--- dhcp-4.2.2/includes/dhcpd.h.lpf-ib 2011-09-19 11:24:08.696775721 +0200
++++ dhcp-4.2.2/includes/dhcpd.h 2011-09-19 11:24:08.707775438 +0200
+@@ -1243,6 +1243,7 @@ struct interface_info {
+ struct shared_network *shared_network;
+ /* Networks connected to this interface. */
+ struct hardware hw_address; /* Its physical address. */
++ u_int8_t bcast_addr[20]; /* Infiniband broadcast address */
+ struct in_addr *addresses; /* Addresses associated with this
+ * interface.
+ */
+@@ -2356,7 +2357,7 @@ void print_dns_status (int, struct dhcp_
+ #endif
+ const char *print_time(TIME);
+
+-void get_hw_addr(const char *name, struct hardware *hw);
++void get_hw_addr(struct interface_info *info);
+
+ /* socket.c */
+ #if defined (USE_SOCKET_SEND) || defined (USE_SOCKET_RECEIVE) \
+diff -up dhcp-4.2.2/includes/dhcp.h.lpf-ib dhcp-4.2.2/includes/dhcp.h
+--- dhcp-4.2.2/includes/dhcp.h.lpf-ib 2011-09-19 11:24:08.696775721 +0200
++++ dhcp-4.2.2/includes/dhcp.h 2011-09-19 11:24:08.707775438 +0200
+@@ -79,6 +79,7 @@ struct dhcp_packet {
+ #define HTYPE_ETHER 1 /* Ethernet 10Mbps */
+ #define HTYPE_IEEE802 6 /* IEEE 802.2 Token Ring... */
+ #define HTYPE_FDDI 8 /* FDDI... */
++#define HTYPE_INFINIBAND 32 /* Infiniband IPoIB */
+
+ #define HTYPE_RESERVED 0 /* RFC 5494 */
+
diff --git a/src/patches/dhcp-4.2.2-options.patch b/src/patches/dhcp-4.2.2-options.patch
new file mode 100644
index 0000000..32e2add
--- /dev/null
+++ b/src/patches/dhcp-4.2.2-options.patch
@@ -0,0 +1,401 @@
+diff -up dhcp-4.2.2b1/client/clparse.c.options dhcp-4.2.2b1/client/clparse.c
+--- dhcp-4.2.2b1/client/clparse.c.options 2011-04-21 16:08:14.000000000 +0200
++++ dhcp-4.2.2b1/client/clparse.c 2011-07-01 13:51:52.935755570 +0200
+@@ -146,6 +146,7 @@ isc_result_t read_client_conf ()
+ /* Requested lease time, used by DHCPv6 (DHCPv4 uses the option cache)
+ */
+ top_level_config.requested_lease = 7200;
++ top_level_config.bootp_broadcast_always = 0;
+
+ group_allocate (&top_level_config.on_receipt, MDL);
+ if (!top_level_config.on_receipt)
+@@ -313,7 +314,8 @@ void read_client_leases ()
+ interface-declaration |
+ LEASE client-lease-statement |
+ ALIAS client-lease-statement |
+- KEY key-definition */
++ KEY key-definition |
++ BOOTP_BROADCAST_ALWAYS */
+
+ void parse_client_statement (cfile, ip, config)
+ struct parse *cfile;
+@@ -732,6 +734,12 @@ void parse_client_statement (cfile, ip,
+ parse_reject_statement (cfile, config);
+ return;
+
++ case BOOTP_BROADCAST_ALWAYS:
++ token = next_token(&val, (unsigned*)0, cfile);
++ config -> bootp_broadcast_always = 1;
++ parse_semi (cfile);
++ return;
++
+ default:
+ lose = 0;
+ stmt = (struct executable_statement *)0;
+diff -up dhcp-4.2.2b1/client/dhclient.c.options dhcp-4.2.2b1/client/dhclient.c
+--- dhcp-4.2.2b1/client/dhclient.c.options 2011-05-11 16:20:59.000000000 +0200
++++ dhcp-4.2.2b1/client/dhclient.c 2011-07-01 13:51:52.936755545 +0200
+@@ -39,6 +39,12 @@
+ #include <limits.h>
+ #include <dns/result.h>
+
++/*
++ * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
++ * that when building ISC code.
++ */
++extern int asprintf(char **strp, const char *fmt, ...);
++
+ TIME default_lease_time = 43200; /* 12 hours... */
+ TIME max_lease_time = 86400; /* 24 hours... */
+
+@@ -87,6 +93,9 @@ int wanted_ia_na = -1; /* the absolute
+ int wanted_ia_ta = 0;
+ int wanted_ia_pd = 0;
+ char *mockup_relay = NULL;
++int bootp_broadcast_always = 0;
++
++extern u_int32_t default_requested_options[];
+
+ void run_stateless(int exit_mode);
+
+@@ -123,6 +132,15 @@ main(int argc, char **argv) {
+ int local_family_set = 0;
+ #endif /* DHCPv6 */
+ char *s;
++ char *dhcp_client_identifier_arg = NULL;
++ char *dhcp_host_name_arg = NULL;
++ char *dhcp_fqdn_arg = NULL;
++ char *dhcp_vendor_class_identifier_arg = NULL;
++ char *dhclient_request_options = NULL;
++
++ int timeout_arg = 0;
++ char *arg_conf = NULL;
++ int arg_conf_len = 0;
+
+ /* Initialize client globals. */
+ memset(&default_duid, 0, sizeof(default_duid));
+@@ -310,6 +328,88 @@ main(int argc, char **argv) {
+ } else if (!strcmp(argv[i], "--version")) {
+ log_info("isc-dhclient-%s", PACKAGE_VERSION);
+ exit(0);
++ } else if (!strcmp(argv[i], "-I")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
++ log_error("-I option dhcp-client-identifier string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
++ exit(1);
++ }
++
++ dhcp_client_identifier_arg = argv[i];
++ } else if (!strcmp(argv[i], "-B")) {
++ bootp_broadcast_always = 1;
++ } else if (!strcmp(argv[i], "-H")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
++ log_error("-H option host-name string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
++ exit(1);
++ }
++
++ if (dhcp_host_name_arg != NULL) {
++ log_error("The -H <host-name> and -F <fqdn> arguments are mutually exclusive");
++ exit(1);
++ }
++
++ dhcp_host_name_arg = argv[i];
++ } else if (!strcmp(argv[i], "-F")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
++ log_error("-F option fqdn.fqdn string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
++ exit(1);
++ }
++
++ if (dhcp_fqdn_arg != NULL) {
++ log_error("Only one -F <fqdn> argument can be specified");
++ exit(1);
++ }
++
++ if (dhcp_host_name_arg != NULL) {
++ log_error("The -F <fqdn> and -H <host-name> arguments are mutually exclusive");
++ exit(1);
++ }
++
++ dhcp_fqdn_arg = argv[i];
++ } else if (!strcmp(argv[i], "-timeout")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if ((timeout_arg = atoi(argv[i])) <= 0) {
++ log_error("-T timeout option must be > 0 - bad value: %s",argv[i]);
++ exit(1);
++ }
++ } else if (!strcmp(argv[i], "-V")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
++ log_error("-V option vendor-class-identifier string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
++ exit(1);
++ }
++
++ dhcp_vendor_class_identifier_arg = argv[i];
++ } else if (!strcmp(argv[i], "-R")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ dhclient_request_options = argv[i];
+ } else if (argv[i][0] == '-') {
+ usage();
+ } else if (interfaces_requested < 0) {
+@@ -484,6 +584,166 @@ main(int argc, char **argv) {
+ /* Parse the dhclient.conf file. */
+ read_client_conf();
+
++ /* Parse any extra command line configuration arguments: */
++ if ((dhcp_client_identifier_arg != NULL) && (*dhcp_client_identifier_arg != '\0')) {
++ arg_conf_len = asprintf(&arg_conf, "send dhcp-client-identifier \"%s\";", dhcp_client_identifier_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -I option dhcp-client-identifier");
++ }
++
++ if ((dhcp_host_name_arg != NULL) && (*dhcp_host_name_arg != '\0')) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "send host-name \"%s\";", dhcp_host_name_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -H option host-name");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\nsend host-name \"%s\";", last_arg_conf, dhcp_host_name_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -H option host-name");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if ((dhcp_fqdn_arg != NULL) && (*dhcp_fqdn_arg != '\0')) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "send fqdn.fqdn \"%s\";", dhcp_fqdn_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -F option fqdn.fqdn");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\nsend fqdn.fqdn \"%s\";", last_arg_conf, dhcp_fqdn_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -F option fqdn.fqdn");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if (timeout_arg) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "timeout %d;", timeout_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to process -timeout timeout argument");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\ntimeout %d;", last_arg_conf, timeout_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len == 0))
++ log_fatal("Unable to process -timeout timeout argument");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if ((dhcp_vendor_class_identifier_arg != NULL) && (*dhcp_vendor_class_identifier_arg != '\0')) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "send vendor-class-identifier \"%s\";", dhcp_vendor_class_identifier_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -V option vendor-class-identifier");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\nsend vendor-class-identifier \"%s\";", last_arg_conf, dhcp_vendor_class_identifier_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -V option vendor-class-identifier");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if (dhclient_request_options != NULL) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "request %s;", dhclient_request_options);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to parse -R <request options list> argument");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\nrequest %s;", last_arg_conf, dhclient_request_options);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to parse -R <request options list> argument");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if (arg_conf) {
++ if (arg_conf_len == 0)
++ if ((arg_conf_len = strlen(arg_conf)) == 0)
++ /* huh ? cannot happen ! */
++ log_fatal("Unable to process -I/-H/-F/-timeout/-V/-R configuration arguments");
++
++ /* parse the extra dhclient.conf configuration arguments
++ * into top level config: */
++ struct parse *cfile = (struct parse *)0;
++ const char *val = NULL;
++ int token;
++
++ status = new_parse(&cfile, -1, arg_conf, arg_conf_len, "extra dhclient -I/-H/-F/-timeout/-V/-R configuration arguments", 0);
++
++ if ((status != ISC_R_SUCCESS) || (cfile -> warnings_occurred))
++ log_fatal("Cannot parse -I/-H/-F/-timeout/-V/-R configuration arguments !");
++ /* more detailed parse failures will be logged */
++
++ do {
++ token = peek_token(&val, (unsigned *)0, cfile);
++ if (token == END_OF_FILE)
++ break;
++
++ parse_client_statement(cfile, (struct interface_info *)0, &top_level_config);
++ } while (1);
++
++ if (cfile -> warnings_occurred)
++ log_fatal("Cannot parse -I/-H/-F/-timeout/-V/-R configuration arguments !");
++ end_parse(&cfile);
++
++ if (timeout_arg) {
++ /* we just set the toplevel timeout, but per-client
++ * timeouts may still be at defaults. Also, it makes no
++ * sense having the reboot_timeout or backoff_cutoff
++ * greater than the timeout:
++ */
++ if ((top_level_config.backoff_cutoff == 15) && (top_level_config.backoff_cutoff > (timeout_arg / 2)))
++ top_level_config.backoff_cutoff = (((unsigned long)(timeout_arg / 2)) == 0) ? timeout_arg : (unsigned long)(timeout_arg / 2);
++
++ for (ip=interfaces; ip; ip = ip->next) {
++ if (ip->client->config->timeout == 60)
++ ip->client->config->timeout = timeout_arg;
++
++ if ((ip->client->config->reboot_timeout == 10) && (ip->client->config->reboot_timeout > ip->client->config->timeout))
++ ip->client->config->reboot_timeout = ip->client->config->timeout;
++ if ((ip->client->config->backoff_cutoff == 15) && (ip->client->config->backoff_cutoff > top_level_config.backoff_cutoff))
++ ip->client->config->backoff_cutoff = top_level_config.backoff_cutoff;
++ }
++ }
++
++ if ((dhclient_request_options != 0) && (top_level_config.requested_options != default_requested_options)) {
++ for (ip=interfaces; ip; ip = ip->next) {
++ if (ip->client->config->requested_options == default_requested_options)
++ ip->client->config->requested_options = top_level_config.requested_options;
++ }
++ }
++
++ free(arg_conf);
++ arg_conf = NULL;
++ arg_conf_len = 0;
++ }
++
+ /* Parse the lease database. */
+ read_client_leases();
+
+@@ -2397,7 +2657,8 @@ void make_discover (client, lease)
+ client -> packet.xid = random ();
+ client -> packet.secs = 0; /* filled in by send_discover. */
+
+- if (can_receive_unicast_unconfigured (client -> interface))
++ if ((!(bootp_broadcast_always || client->config->bootp_broadcast_always))
++ && can_receive_unicast_unconfigured(client->interface))
+ client -> packet.flags = 0;
+ else
+ client -> packet.flags = htons (BOOTP_BROADCAST);
+@@ -2481,7 +2742,9 @@ void make_request (client, lease)
+ } else {
+ memset (&client -> packet.ciaddr, 0,
+ sizeof client -> packet.ciaddr);
+- if (can_receive_unicast_unconfigured (client -> interface))
++ if ((!(bootp_broadcast_always ||
++ client ->config->bootp_broadcast_always)) &&
++ can_receive_unicast_unconfigured (client -> interface))
+ client -> packet.flags = 0;
+ else
+ client -> packet.flags = htons (BOOTP_BROADCAST);
+@@ -2543,7 +2806,8 @@ void make_decline (client, lease)
+ client -> packet.hops = 0;
+ client -> packet.xid = client -> xid;
+ client -> packet.secs = 0; /* Filled in by send_request. */
+- if (can_receive_unicast_unconfigured (client -> interface))
++ if ((!(bootp_broadcast_always || client->config-> bootp_broadcast_always))
++ && can_receive_unicast_unconfigured (client->interface))
+ client -> packet.flags = 0;
+ else
+ client -> packet.flags = htons (BOOTP_BROADCAST);
+diff -up dhcp-4.2.2b1/common/conflex.c.options dhcp-4.2.2b1/common/conflex.c
+--- dhcp-4.2.2b1/common/conflex.c.options 2011-05-11 16:20:59.000000000 +0200
++++ dhcp-4.2.2b1/common/conflex.c 2011-07-01 13:51:52.938755494 +0200
+@@ -808,6 +808,8 @@ intern(char *atom, enum dhcp_token dfv)
+ return BALANCE;
+ if (!strcasecmp (atom + 1, "ound"))
+ return BOUND;
++ if (!strcasecmp (atom + 1, "ootp-broadcast-always"))
++ return BOOTP_BROADCAST_ALWAYS;
+ break;
+ case 'c':
+ if (!strcasecmp(atom + 1, "ase"))
+diff -up dhcp-4.2.2b1/includes/dhcpd.h.options dhcp-4.2.2b1/includes/dhcpd.h
+--- dhcp-4.2.2b1/includes/dhcpd.h.options 2011-05-20 16:21:11.000000000 +0200
++++ dhcp-4.2.2b1/includes/dhcpd.h 2011-07-01 13:51:52.940755442 +0200
+@@ -1147,6 +1147,9 @@ struct client_config {
+ int do_forward_update; /* If nonzero, and if we have the
+ information we need, update the
+ A record for the address we get. */
++
++ int bootp_broadcast_always; /* If nonzero, always set the BOOTP_BROADCAST
++ flag in requests */
+ };
+
+ /* Per-interface state used in the dhcp client... */
+diff -up dhcp-4.2.2b1/includes/dhctoken.h.options dhcp-4.2.2b1/includes/dhctoken.h
+--- dhcp-4.2.2b1/includes/dhctoken.h.options 2011-05-12 14:02:47.000000000 +0200
++++ dhcp-4.2.2b1/includes/dhctoken.h 2011-07-01 13:53:43.316861637 +0200
+@@ -361,7 +361,8 @@ enum dhcp_token {
+ GETHOSTNAME = 662,
+ REWIND = 663,
+ INITIAL_DELAY = 664,
+- GETHOSTBYNAME = 665
++ GETHOSTBYNAME = 665,
++ BOOTP_BROADCAST_ALWAYS = 666
+ };
+
+ #define is_identifier(x) ((x) >= FIRST_TOKEN && \
diff --git a/src/patches/dhcp-4.2.2-remove-bind.patch b/src/patches/dhcp-4.2.2-remove-bind.patch
new file mode 100644
index 0000000..6297772
--- /dev/null
+++ b/src/patches/dhcp-4.2.2-remove-bind.patch
@@ -0,0 +1,149 @@
+diff -up dhcp-4.2.2/client/Makefile.am.rh637017 dhcp-4.2.2/client/Makefile.am
+--- dhcp-4.2.2/client/Makefile.am.rh637017 2010-09-15 00:32:36.000000000 +0200
++++ dhcp-4.2.2/client/Makefile.am 2011-08-11 17:28:58.923897561 +0200
+@@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c
+ scripts/netbsd scripts/nextstep scripts/openbsd \
+ scripts/solaris scripts/openwrt
+ dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+- ../bind/lib/libdns.a ../bind/lib/libisc.a
++ $(BIND9_LIBDIR) -ldns-export -lisc-export
+ man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
+ EXTRA_DIST = $(man_MANS)
+
+diff -up dhcp-4.2.2/common/tests/Makefile.am.rh637017 dhcp-4.2.2/common/tests/Makefile.am
+--- dhcp-4.2.2/common/tests/Makefile.am.rh637017 2009-10-28 05:12:30.000000000 +0100
++++ dhcp-4.2.2/common/tests/Makefile.am 2011-08-11 17:33:45.258637236 +0200
+@@ -6,6 +6,5 @@ TESTS = test_alloc
+
+ test_alloc_SOURCES = test_alloc.c
+ test_alloc_LDADD = ../libdhcp.a ../../tests/libt_api.a \
+- ../../omapip/libomapi.a ../../bind/lib/libdns.a \
+- ../../bind/lib/libisc.a
+-
++ ../../omapip/libomapi.a \
++ $(BIND9_LIBDIR) -ldns-export -lisc-export
+diff -up dhcp-4.2.2/configure.ac.rh637017 dhcp-4.2.2/configure.ac
+--- dhcp-4.2.2/configure.ac.rh637017 2011-07-20 02:32:18.000000000 +0200
++++ dhcp-4.2.2/configure.ac 2011-08-11 17:28:58.924897535 +0200
+@@ -512,20 +512,37 @@ AC_CHECK_MEMBER(struct msghdr.msg_contro
+ libbind=
+ AC_ARG_WITH(libbind,
+ AC_HELP_STRING([--with-libbind=PATH],
+- [bind includes and libraries are in PATH
+- (default is ./bind)]),
++ [bind includes are in PATH
++ (default is ./bind/includes)]),
+ use_libbind="$withval", use_libbind="no")
+ case "$use_libbind" in
++yes|no)
++ libbind="\${top_srcdir}/bind/include"
++ ;;
++*)
++ libbind="$use_libbind"
++ ;;
++esac
++
++BIND9_LIBDIR='-L$(top_builddir)/bind/lib'
++AC_ARG_WITH(libbind-libs,
++ AC_HELP_STRING([--with-libbind-libs=PATH],
++ [bind9 export libraries are in PATH]),
++ [libbind_libs="$withval"], [libbind_libs='no'])
++case "$libbind_libs" in
+ yes)
+- libbind="\${top_srcdir}/bind"
++ AC_MSG_ERROR([Specify path to bind9 libraries])
+ ;;
+ no)
+- libbind="\${top_srcdir}/bind"
++ BUNDLED_BIND=yes
+ ;;
+ *)
+- libbind="$use_libbind"
++ BIND9_LIBDIR="-L$libbind_libs"
++ BUNDLED_BIND=no
+ ;;
+ esac
++AM_CONDITIONAL([BUNDLED_BIND], [test "$BUNDLED_BIND" = yes])
++AC_SUBST([BIND9_LIBDIR])
+
+ # OpenLDAP support.
+ AC_ARG_WITH(ldap,
+@@ -562,7 +579,7 @@ fi
+ CFLAGS="$CFLAGS $STD_CWARNINGS"
+
+ # Try to add the bind include directory
+-CFLAGS="$CFLAGS -I$libbind/include"
++CFLAGS="$CFLAGS -I$libbind"
+
+ AC_C_FLEXIBLE_ARRAY_MEMBER
+
+diff -up dhcp-4.2.2/dhcpctl/Makefile.am.rh637017 dhcp-4.2.2/dhcpctl/Makefile.am
+--- dhcp-4.2.2/dhcpctl/Makefile.am.rh637017 2009-10-28 05:12:30.000000000 +0100
++++ dhcp-4.2.2/dhcpctl/Makefile.am 2011-08-11 17:28:58.924897535 +0200
+@@ -6,10 +6,10 @@ EXTRA_DIST = $(man_MANS)
+
+ omshell_SOURCES = omshell.c
+ omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
+- ../bind/lib/libdns.a ../bind/lib/libisc.a
++ $(BIND9_LIBDIR) -ldns-export -lisc-export
+
+ libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
+
+ cltest_SOURCES = cltest.c
+ cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
+- ../bind/lib/libdns.a ../bind/lib/libisc.a
+\ No newline at end of file
++ $(BIND9_LIBDIR) -ldns-export -lisc-export
+diff -up dhcp-4.2.2/Makefile.am.rh637017 dhcp-4.2.2/Makefile.am
+--- dhcp-4.2.2/Makefile.am.rh637017 2010-03-25 00:30:38.000000000 +0100
++++ dhcp-4.2.2/Makefile.am 2011-08-11 17:28:58.925897509 +0200
+@@ -21,7 +21,13 @@ EXTRA_DIST = RELNOTES LICENSE \
+ util/bindvar.sh \
+ bind/Makefile bind/bind.tar.gz bind/version.tmp
+
+-SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server
++if BUNDLED_BIND
++SUBDIRS = bind
++else
++SUBDIRS =
++endif
++
++SUBDIRS += includes tests common dst omapip client dhcpctl relay server
+
+ nobase_include_HEADERS = dhcpctl/dhcpctl.h
+
+diff -up dhcp-4.2.2/omapip/Makefile.am.rh637017 dhcp-4.2.2/omapip/Makefile.am
+--- dhcp-4.2.2/omapip/Makefile.am.rh637017 2010-02-12 01:13:54.000000000 +0100
++++ dhcp-4.2.2/omapip/Makefile.am 2011-08-11 17:28:58.939897149 +0200
+@@ -10,5 +10,5 @@ man_MANS = omapi.3
+ EXTRA_DIST = $(man_MANS)
+
+ svtest_SOURCES = test.c
+-svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a
++svtest_LDADD = libomapi.a $(BIND9_LIBDIR) -ldns-export -lisc-export
+
+diff -up dhcp-4.2.2/relay/Makefile.am.rh637017 dhcp-4.2.2/relay/Makefile.am
+--- dhcp-4.2.2/relay/Makefile.am.rh637017 2009-10-28 05:12:30.000000000 +0100
++++ dhcp-4.2.2/relay/Makefile.am 2011-08-11 17:28:58.940897123 +0200
+@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
+ sbin_PROGRAMS = dhcrelay
+ dhcrelay_SOURCES = dhcrelay.c
+ dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+- ../bind/lib/libdns.a ../bind/lib/libisc.a
++ $(BIND9_LIBDIR) -ldns-export -lisc-export
+ man_MANS = dhcrelay.8
+ EXTRA_DIST = $(man_MANS)
+
+diff -up dhcp-4.2.2/server/Makefile.am.rh637017 dhcp-4.2.2/server/Makefile.am
+--- dhcp-4.2.2/server/Makefile.am.rh637017 2010-03-24 22:49:47.000000000 +0100
++++ dhcp-4.2.2/server/Makefile.am 2011-08-11 17:28:58.944897021 +0200
+@@ -8,8 +8,7 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
+
+ dhcpd_CFLAGS = $(LDAP_CFLAGS)
+ dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+- ../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \
+- ../bind/lib/libisc.a
++ ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export
+
+ man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
+ EXTRA_DIST = $(man_MANS)
diff --git a/src/patches/dhcp-4.2.2-rfc3442-classless-static-routes.patch b/src/patches/dhcp-4.2.2-rfc3442-classless-static-routes.patch
new file mode 100644
index 0000000..0a0bfcb
--- /dev/null
+++ b/src/patches/dhcp-4.2.2-rfc3442-classless-static-routes.patch
@@ -0,0 +1,405 @@
+diff -up dhcp-4.2.2b1/client/clparse.c.rfc3442 dhcp-4.2.2b1/client/clparse.c
+--- dhcp-4.2.2b1/client/clparse.c.rfc3442 2011-07-01 14:22:38.031534508 +0200
++++ dhcp-4.2.2b1/client/clparse.c 2011-07-01 14:22:38.128532940 +0200
+@@ -37,7 +37,7 @@
+
+ struct client_config top_level_config;
+
+-#define NUM_DEFAULT_REQUESTED_OPTS 14
++#define NUM_DEFAULT_REQUESTED_OPTS 15
+ struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1];
+
+ static void parse_client_default_duid(struct parse *cfile);
+@@ -82,7 +82,11 @@ isc_result_t read_client_conf ()
+ dhcp_universe.code_hash, &code, 0, MDL);
+
+ /* 4 */
+- code = DHO_ROUTERS;
++ /* The Classless Static Routes option code MUST appear in the parameter
++ * request list prior to both the Router option code and the Static
++ * Routes option code, if present. (RFC3442)
++ */
++ code = DHO_CLASSLESS_STATIC_ROUTES;
+ option_code_hash_lookup(&default_requested_options[3],
+ dhcp_universe.code_hash, &code, 0, MDL);
+
+@@ -136,6 +140,11 @@ isc_result_t read_client_conf ()
+ option_code_hash_lookup(&default_requested_options[13],
+ dhcp_universe.code_hash, &code, 0, MDL);
+
++ /* 15 */
++ code = DHO_ROUTERS;
++ option_code_hash_lookup(&default_requested_options[14],
++ dhcp_universe.code_hash, &code, 0, MDL);
++
+ for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
+ if (default_requested_options[code] == NULL)
+ log_fatal("Unable to find option definition for "
+diff -up dhcp-4.2.2b1/common/dhcp-options.5.rfc3442 dhcp-4.2.2b1/common/dhcp-options.5
+--- dhcp-4.2.2b1/common/dhcp-options.5.rfc3442 2011-07-01 14:22:38.020534686 +0200
++++ dhcp-4.2.2b1/common/dhcp-options.5 2011-07-01 14:22:38.129532924 +0200
+@@ -115,6 +115,26 @@ hexadecimal, separated by colons. For
+ or
+ option dhcp-client-identifier 43:4c:49:45:54:2d:46:4f:4f;
+ .fi
++.PP
++The
++.B destination-descriptor
++describe the IP subnet number and subnet mask
++of a particular destination using a compact encoding. This encoding
++consists of one octet describing the width of the subnet mask,
++followed by all the significant octets of the subnet number.
++The following table contains some examples of how various subnet
++number/mask combinations can be encoded:
++.nf
++.sp 1
++Subnet number Subnet mask Destination descriptor
++0 0 0
++10.0.0.0 255.0.0.0 8.10
++10.0.0.0 255.255.255.0 24.10.0.0
++10.17.0.0 255.255.0.0 16.10.17
++10.27.129.0 255.255.255.0 24.10.27.129
++10.229.0.128 255.255.255.128 25.10.229.0.128
++10.198.122.47 255.255.255.255 32.10.198.122.47
++.fi
+ .SH SETTING OPTION VALUES USING EXPRESSIONS
+ Sometimes it's helpful to be able to set the value of a DHCP option
+ based on some value that the client has sent. To do this, you can
+@@ -931,6 +951,29 @@ dhclient-script will create routes:
+ .RE
+ .PP
+ .nf
++.B option \fBclassless-static-routes\fR \fIdestination-descriptor ip-address\fR
++ [\fB,\fR \fIdestination-descriptor ip-address\fR...]\fB;\fR
++.fi
++.RS 0.25i
++.PP
++This option (see RFC3442) specifies a list of classless static routes
++that the client should install in its routing cache.
++.PP
++This option can contain one or more static routes, each of which
++consists of a destination descriptor and the IP address of the router
++that should be used to reach that destination.
++.PP
++Many clients may not implement the Classless Static Routes option.
++DHCP server administrators should therefore configure their DHCP
++servers to send both a Router option and a Classless Static Routes
++option, and should specify the default router(s) both in the Router
++option and in the Classless Static Routes option.
++.PP
++If the DHCP server returns both a Classless Static Routes option and
++a Router option, the DHCP client ignores the Router option.
++.RE
++.PP
++.nf
+ .B option \fBstreettalk-directory-assistance-server\fR \fIip-address\fR
+ [\fB,\fR \fIip-address\fR...]\fB;\fR
+ .fi
+diff -up dhcp-4.2.2b1/common/inet.c.rfc3442 dhcp-4.2.2b1/common/inet.c
+--- dhcp-4.2.2b1/common/inet.c.rfc3442 2011-05-11 02:47:22.000000000 +0200
++++ dhcp-4.2.2b1/common/inet.c 2011-07-01 14:22:38.130532908 +0200
+@@ -528,6 +528,60 @@ free_iaddrcidrnetlist(struct iaddrcidrne
+ return ISC_R_SUCCESS;
+ }
+
++static const char *
++inet_ntopdd(const unsigned char *src, unsigned srclen, char *dst, size_t size)
++{
++ char tmp[sizeof("32.255.255.255.255")];
++ int len;
++
++ switch (srclen) {
++ case 2:
++ len = sprintf (tmp, "%u.%u", src[0], src[1]);
++ break;
++ case 3:
++ len = sprintf (tmp, "%u.%u.%u", src[0], src[1], src[2]);
++ break;
++ case 4:
++ len = sprintf (tmp, "%u.%u.%u.%u", src[0], src[1], src[2], src[3]);
++ break;
++ case 5:
++ len = sprintf (tmp, "%u.%u.%u.%u.%u", src[0], src[1], src[2], src[3], src[4]);
++ break;
++ default:
++ return NULL;
++ }
++ if (len < 0)
++ return NULL;
++
++ if (len > size) {
++ errno = ENOSPC;
++ return NULL;
++ }
++
++ return strcpy (dst, tmp);
++}
++
++/* pdestdesc() turns an iaddr structure into a printable dest. descriptor */
++const char *
++pdestdesc(const struct iaddr addr) {
++ static char pbuf[sizeof("255.255.255.255.255")];
++
++ if (addr.len == 0) {
++ return "<null destination descriptor>";
++ }
++ if (addr.len == 1) {
++ return "0";
++ }
++ if ((addr.len >= 2) && (addr.len <= 5)) {
++ return inet_ntopdd(addr.iabuf, addr.len, pbuf, sizeof(pbuf));
++ }
++
++ log_fatal("pdestdesc():%s:%d: Invalid destination descriptor length %d.",
++ MDL, addr.len);
++ /* quell compiler warnings */
++ return NULL;
++}
++
+ /* piaddr() turns an iaddr structure into a printable address. */
+ /* XXX: should use a const pointer rather than passing the structure */
+ const char *
+diff -up dhcp-4.2.2b1/common/options.c.rfc3442 dhcp-4.2.2b1/common/options.c
+--- dhcp-4.2.2b1/common/options.c.rfc3442 2011-03-24 22:57:13.000000000 +0100
++++ dhcp-4.2.2b1/common/options.c 2011-07-01 14:22:38.132532876 +0200
+@@ -706,7 +706,11 @@ cons_options(struct packet *inpacket, st
+ * packet.
+ */
+ priority_list[priority_len++] = DHO_SUBNET_MASK;
+- priority_list[priority_len++] = DHO_ROUTERS;
++ if (lookup_option(&dhcp_universe, cfg_options,
++ DHO_CLASSLESS_STATIC_ROUTES))
++ priority_list[priority_len++] = DHO_CLASSLESS_STATIC_ROUTES;
++ else
++ priority_list[priority_len++] = DHO_ROUTERS;
+ priority_list[priority_len++] = DHO_DOMAIN_NAME_SERVERS;
+ priority_list[priority_len++] = DHO_HOST_NAME;
+ priority_list[priority_len++] = DHO_FQDN;
+@@ -1683,6 +1687,7 @@ const char *pretty_print_option (option,
+ const unsigned char *dp = data;
+ char comma;
+ unsigned long tval;
++ unsigned int octets = 0;
+
+ if (emit_commas)
+ comma = ',';
+@@ -1691,6 +1696,7 @@ const char *pretty_print_option (option,
+
+ memset (enumbuf, 0, sizeof enumbuf);
+
++ if (option->format[0] != 'R') { /* see explanation lower */
+ /* Figure out the size of the data. */
+ for (l = i = 0; option -> format [i]; i++, l++) {
+ if (l >= sizeof(fmtbuf) - 1)
+@@ -1840,6 +1846,33 @@ const char *pretty_print_option (option,
+ if (numhunk < 0)
+ numhunk = 1;
+
++ } else { /* option->format[i] == 'R') */
++ /* R (destination descriptor) has variable length.
++ * We can find it only in classless static route option,
++ * so we are for sure parsing classless static route option now.
++ * We go through whole the option to check whether there are no
++ * missing/extra bytes.
++ * I didn't find out how to improve the existing code and that's the
++ * reason for this separate 'else' where I do my own checkings.
++ * I know it's little bit unsystematic, but it works.
++ */
++ numhunk = 0;
++ numelem = 2; /* RI */
++ fmtbuf[0]='R'; fmtbuf[1]='I'; fmtbuf[2]=0;
++ for (i =0; i < len; i = i + octets + 5) {
++ if (data[i] > 32) { /* subnet mask width */
++ log_error ("wrong subnet mask width in destination descriptor");
++ break;
++ }
++ numhunk++;
++ octets = ((data[i]+7) / 8);
++ }
++ if (i != len) {
++ log_error ("classless static routes option has wrong size or "
++ "there's some garbage in format");
++ }
++ }
++
+ /* Cycle through the array (or hunk) printing the data. */
+ for (i = 0; i < numhunk; i++) {
+ for (j = 0; j < numelem; j++) {
+@@ -1978,6 +2011,20 @@ const char *pretty_print_option (option,
+ strcpy(op, piaddr(iaddr));
+ dp += 4;
+ break;
++
++ case 'R':
++ if (dp[0] <= 32)
++ iaddr.len = (((dp[0]+7)/8)+1);
++ else {
++ log_error ("wrong subnet mask width in destination descriptor");
++ return "<error>";
++ }
++
++ memcpy(iaddr.iabuf, dp, iaddr.len);
++ strcpy(op, pdestdesc(iaddr));
++ dp += iaddr.len;
++ break;
++
+ case '6':
+ iaddr.len = 16;
+ memcpy(iaddr.iabuf, dp, 16);
+diff -up dhcp-4.2.2b1/common/parse.c.rfc3442 dhcp-4.2.2b1/common/parse.c
+--- dhcp-4.2.2b1/common/parse.c.rfc3442 2011-07-01 14:22:38.097533441 +0200
++++ dhcp-4.2.2b1/common/parse.c 2011-07-01 14:22:38.135532828 +0200
+@@ -341,6 +341,39 @@ int parse_ip_addr (cfile, addr)
+ }
+
+ /*
++ * destination-descriptor :== NUMBER DOT NUMBER |
++ * NUMBER DOT NUMBER DOT NUMBER |
++ * NUMBER DOT NUMBER DOT NUMBER DOT NUMBER |
++ * NUMBER DOT NUMBER DOT NUMBER DOT NUMBER DOT NUMBER
++ */
++
++int parse_destination_descriptor (cfile, addr)
++ struct parse *cfile;
++ struct iaddr *addr;
++{
++ unsigned int mask_width, dest_dest_len;
++ addr -> len = 0;
++ if (parse_numeric_aggregate (cfile, addr -> iabuf,
++ &addr -> len, DOT, 10, 8)) {
++ mask_width = (unsigned int)addr->iabuf[0];
++ dest_dest_len = (((mask_width+7)/8)+1);
++ if (mask_width > 32) {
++ parse_warn (cfile,
++ "subnet mask width (%u) greater than 32.", mask_width);
++ }
++ else if (dest_dest_len != addr->len) {
++ parse_warn (cfile,
++ "destination descriptor with subnet mask width %u "
++ "should have %u octets, but has %u octets.",
++ mask_width, dest_dest_len, addr->len);
++ }
++
++ return 1;
++ }
++ return 0;
++}
++
++/*
+ * Return true if every character in the string is hexadecimal.
+ */
+ static int
+@@ -700,8 +733,10 @@ unsigned char *parse_numeric_aggregate (
+ if (count) {
+ token = peek_token (&val, (unsigned *)0, cfile);
+ if (token != separator) {
+- if (!*max)
++ if (!*max) {
++ *max = count;
+ break;
++ }
+ if (token != RBRACE && token != LBRACE)
+ token = next_token (&val,
+ (unsigned *)0,
+@@ -1624,6 +1659,9 @@ int parse_option_code_definition (cfile,
+ case IP_ADDRESS:
+ type = 'I';
+ break;
++ case DESTINATION_DESCRIPTOR:
++ type = 'R';
++ break;
+ case IP6_ADDRESS:
+ type = '6';
+ break;
+@@ -5288,6 +5326,15 @@ int parse_option_token (rv, cfile, fmt,
+ }
+ break;
+
++ case 'R': /* destination descriptor */
++ if (!parse_destination_descriptor (cfile, &addr)) {
++ return 0;
++ }
++ if (!make_const_data (&t, addr.iabuf, addr.len, 0, 1, MDL)) {
++ return 0;
++ }
++ break;
++
+ case '6': /* IPv6 address. */
+ if (!parse_ip6_addr(cfile, &addr)) {
+ return 0;
+@@ -5548,6 +5595,13 @@ int parse_option_decl (oc, cfile)
+ goto exit;
+ len = ip_addr.len;
+ dp = ip_addr.iabuf;
++ goto alloc;
++
++ case 'R': /* destination descriptor */
++ if (!parse_destination_descriptor (cfile, &ip_addr))
++ goto exit;
++ len = ip_addr.len;
++ dp = ip_addr.iabuf;
+
+ alloc:
+ if (hunkix + len > sizeof hunkbuf) {
+diff -up dhcp-4.2.2b1/common/tables.c.rfc3442 dhcp-4.2.2b1/common/tables.c
+--- dhcp-4.2.2b1/common/tables.c.rfc3442 2011-07-01 14:22:38.087533601 +0200
++++ dhcp-4.2.2b1/common/tables.c 2011-07-01 14:22:38.137532796 +0200
+@@ -51,6 +51,7 @@ HASH_FUNCTIONS (option_code, const unsig
+ Format codes:
+
+ I - IPv4 address
++ R - destination descriptor (RFC3442)
+ 6 - IPv6 address
+ l - 32-bit signed integer
+ L - 32-bit unsigned integer
+@@ -208,6 +209,7 @@ static struct option dhcp_options[] = {
+ { "default-url", "t", &dhcp_universe, 114, 1 },
+ { "subnet-selection", "I", &dhcp_universe, 118, 1 },
+ { "domain-search", "D", &dhcp_universe, 119, 1 },
++ { "classless-static-routes", "RIA", &dhcp_universe, 121, 1 },
+ { "vivco", "Evendor-class.", &dhcp_universe, 124, 1 },
+ { "vivso", "Evendor.", &dhcp_universe, 125, 1 },
+ #if 0
+diff -up dhcp-4.2.2b1/includes/dhcpd.h.rfc3442 dhcp-4.2.2b1/includes/dhcpd.h
+--- dhcp-4.2.2b1/includes/dhcpd.h.rfc3442 2011-07-01 14:22:38.000000000 +0200
++++ dhcp-4.2.2b1/includes/dhcpd.h 2011-07-01 14:24:19.999810333 +0200
+@@ -2662,6 +2662,7 @@ isc_result_t range2cidr(struct iaddrcidr
+ const struct iaddr *lo, const struct iaddr *hi);
+ isc_result_t free_iaddrcidrnetlist(struct iaddrcidrnetlist **result);
+ const char *piaddr (struct iaddr);
++const char *pdestdesc (struct iaddr);
+ char *piaddrmask(struct iaddr *, struct iaddr *);
+ char *piaddrcidr(const struct iaddr *, unsigned int);
+ u_int16_t validate_port(char *);
+@@ -2869,6 +2870,7 @@ void parse_client_lease_declaration (str
+ int parse_option_decl (struct option_cache **, struct parse *);
+ void parse_string_list (struct parse *, struct string_list **, int);
+ int parse_ip_addr (struct parse *, struct iaddr *);
++int parse_destination_descriptor (struct parse *, struct iaddr *);
+ int parse_ip_addr_with_subnet(struct parse *, struct iaddrmatch *);
+ void parse_reject_statement (struct parse *, struct client_config *);
+
+diff -up dhcp-4.2.2b1/includes/dhcp.h.rfc3442 dhcp-4.2.2b1/includes/dhcp.h
+--- dhcp-4.2.2b1/includes/dhcp.h.rfc3442 2009-11-20 02:49:01.000000000 +0100
++++ dhcp-4.2.2b1/includes/dhcp.h 2011-07-01 14:22:38.145532665 +0200
+@@ -158,6 +158,7 @@ struct dhcp_packet {
+ #define DHO_ASSOCIATED_IP 92
+ #define DHO_SUBNET_SELECTION 118 /* RFC3011! */
+ #define DHO_DOMAIN_SEARCH 119 /* RFC3397 */
++#define DHO_CLASSLESS_STATIC_ROUTES 121 /* RFC3442 */
+ #define DHO_VIVCO_SUBOPTIONS 124
+ #define DHO_VIVSO_SUBOPTIONS 125
+
+diff -up dhcp-4.2.2b1/includes/dhctoken.h.rfc3442 dhcp-4.2.2b1/includes/dhctoken.h
+--- dhcp-4.2.2b1/includes/dhctoken.h.rfc3442 2011-07-01 14:22:37.000000000 +0200
++++ dhcp-4.2.2b1/includes/dhctoken.h 2011-07-01 14:25:12.541867623 +0200
+@@ -362,7 +362,8 @@ enum dhcp_token {
+ REWIND = 663,
+ INITIAL_DELAY = 664,
+ GETHOSTBYNAME = 665,
+- BOOTP_BROADCAST_ALWAYS = 666
++ BOOTP_BROADCAST_ALWAYS = 666,
++ DESTINATION_DESCRIPTOR = 667
+ };
+
+ #define is_identifier(x) ((x) >= FIRST_TOKEN && \
diff --git a/src/patches/dhcp-4.2.2-sharedlib.patch b/src/patches/dhcp-4.2.2-sharedlib.patch
new file mode 100644
index 0000000..74fe9f1
--- /dev/null
+++ b/src/patches/dhcp-4.2.2-sharedlib.patch
@@ -0,0 +1,119 @@
+diff -up dhcp-4.2.2/client/Makefile.am.sharedlib dhcp-4.2.2/client/Makefile.am
+--- dhcp-4.2.2/client/Makefile.am.sharedlib 2011-09-09 16:35:56.000000000 +0200
++++ dhcp-4.2.2/client/Makefile.am 2011-09-09 16:36:29.849007951 +0200
+@@ -4,7 +4,7 @@ dhclient_SOURCES = clparse.c dhclient.c
+ scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
+ scripts/netbsd scripts/nextstep scripts/openbsd \
+ scripts/solaris scripts/openwrt
+-dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
++dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
+ $(BIND9_LIBDIR) -ldns-export -lisc-export $(CAPNG_LDADD)
+ man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
+ EXTRA_DIST = $(man_MANS)
+diff -up dhcp-4.2.2/configure.ac.sharedlib dhcp-4.2.2/configure.ac
+--- dhcp-4.2.2/configure.ac.sharedlib 2011-09-09 16:35:56.097000001 +0200
++++ dhcp-4.2.2/configure.ac 2011-09-09 16:35:56.383000000 +0200
+@@ -30,7 +30,8 @@ fi
+ # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
+ AC_USE_SYSTEM_EXTENSIONS
+
+-AC_PROG_RANLIB
++# Use libtool to simplify building of shared libraries
++AC_PROG_LIBTOOL
+ AC_CONFIG_HEADERS([includes/config.h])
+
+ # we sometimes need to know byte order for building packets
+diff -up dhcp-4.2.2/dhcpctl/Makefile.am.sharedlib dhcp-4.2.2/dhcpctl/Makefile.am
+--- dhcp-4.2.2/dhcpctl/Makefile.am.sharedlib 2011-09-09 16:35:55.459000001 +0200
++++ dhcp-4.2.2/dhcpctl/Makefile.am 2011-09-09 16:35:56.384000000 +0200
+@@ -1,15 +1,15 @@
+ bin_PROGRAMS = omshell
+-lib_LIBRARIES = libdhcpctl.a
++lib_LTLIBRARIES = libdhcpctl.la
+ noinst_PROGRAMS = cltest
+ man_MANS = omshell.1 dhcpctl.3
+ EXTRA_DIST = $(man_MANS)
+
+ omshell_SOURCES = omshell.c
+-omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
++omshell_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
+ $(BIND9_LIBDIR) -ldns-export -lisc-export
+
+-libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
++libdhcpctl_la_SOURCES = dhcpctl.c callback.c remote.c
+
+ cltest_SOURCES = cltest.c
+-cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
++cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
+ $(BIND9_LIBDIR) -ldns-export -lisc-export
+diff -up dhcp-4.2.2/dst/base64.c.sharedlib dhcp-4.2.2/dst/base64.c
+--- dhcp-4.2.2/dst/base64.c.sharedlib 2009-11-20 02:49:01.000000000 +0100
++++ dhcp-4.2.2/dst/base64.c 2011-09-09 16:35:56.385000000 +0200
+@@ -64,6 +64,7 @@ static const char rcsid[] = "$Id: base64
+
+ #include <sys/socket.h>
+
++#include "dst_internal.h"
+ #include "cdefs.h"
+ #include "osdep.h"
+ #include "arpa/nameser.h"
+diff -up dhcp-4.2.2/dst/Makefile.am.sharedlib dhcp-4.2.2/dst/Makefile.am
+--- dhcp-4.2.2/dst/Makefile.am.sharedlib 2007-05-29 18:32:10.000000000 +0200
++++ dhcp-4.2.2/dst/Makefile.am 2011-09-09 16:35:56.386000000 +0200
+@@ -1,8 +1,8 @@
+ AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5
+
+-lib_LIBRARIES = libdst.a
++lib_LTLIBRARIES = libdst.la
+
+-libdst_a_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \
++libdst_la_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \
+ base64.c prandom.c
+
+ EXTRA_DIST = dst_internal.h md5.h md5_locl.h
+diff -up dhcp-4.2.2/omapip/Makefile.am.sharedlib dhcp-4.2.2/omapip/Makefile.am
+--- dhcp-4.2.2/omapip/Makefile.am.sharedlib 2011-09-09 16:35:55.000000000 +0200
++++ dhcp-4.2.2/omapip/Makefile.am 2011-09-09 16:37:36.734000324 +0200
+@@ -1,7 +1,7 @@
+-lib_LIBRARIES = libomapi.a
++lib_LTLIBRARIES = libomapi.la
+ noinst_PROGRAMS = svtest
+
+-libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
++libomapi_la_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
+ errwarn.c listener.c dispatch.c generic.c support.c \
+ handle.c message.c convert.c hash.c auth.c inet_addr.c \
+ array.c trace.c toisc.c iscprint.c isclib.c
+@@ -10,5 +10,5 @@ man_MANS = omapi.3
+ EXTRA_DIST = $(man_MANS)
+
+ svtest_SOURCES = test.c
+-svtest_LDADD = libomapi.a $(BIND9_LIBDIR) -ldns-export -lisc-export
++svtest_LDADD = libomapi.la $(BIND9_LIBDIR) -ldns-export -lisc-export
+
+diff -up dhcp-4.2.2/relay/Makefile.am.sharedlib dhcp-4.2.2/relay/Makefile.am
+--- dhcp-4.2.2/relay/Makefile.am.sharedlib 2011-09-09 16:35:56.000000000 +0200
++++ dhcp-4.2.2/relay/Makefile.am 2011-09-09 16:37:57.058019749 +0200
+@@ -2,7 +2,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
+
+ sbin_PROGRAMS = dhcrelay
+ dhcrelay_SOURCES = dhcrelay.c
+-dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
++dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
+ $(BIND9_LIBDIR) -ldns-export -lisc-export $(CAPNG_LDADD)
+ man_MANS = dhcrelay.8
+ EXTRA_DIST = $(man_MANS)
+diff -up dhcp-4.2.2/server/Makefile.am.sharedlib dhcp-4.2.2/server/Makefile.am
+--- dhcp-4.2.2/server/Makefile.am.sharedlib 2011-09-09 16:35:56.000000000 +0200
++++ dhcp-4.2.2/server/Makefile.am 2011-09-09 16:38:56.291004599 +0200
+@@ -7,8 +7,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
+ dhcpv6.c mdb6.c ldap.c ldap_casa.c
+
+ dhcpd_CFLAGS = $(LDAP_CFLAGS)
+-dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+- ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export \
++dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
++ ../dhcpctl/libdhcpctl.la $(BIND9_LIBDIR) -ldns-export -lisc-export \
+ $(CAPNG_LDADD)
+
+ man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
diff --git a/src/patches/dhcp-4.2.2-xen-checksum.patch b/src/patches/dhcp-4.2.2-xen-checksum.patch
new file mode 100644
index 0000000..038d346
--- /dev/null
+++ b/src/patches/dhcp-4.2.2-xen-checksum.patch
@@ -0,0 +1,249 @@
+diff -up dhcp-4.2.2b1/common/bpf.c.xen dhcp-4.2.2b1/common/bpf.c
+--- dhcp-4.2.2b1/common/bpf.c.xen 2009-11-20 02:48:59.000000000 +0100
++++ dhcp-4.2.2b1/common/bpf.c 2011-07-01 14:00:16.936959001 +0200
+@@ -485,7 +485,7 @@ ssize_t receive_packet (interface, buf,
+ offset = decode_udp_ip_header (interface,
+ interface -> rbuf,
+ interface -> rbuf_offset,
+- from, hdr.bh_caplen, &paylen);
++ from, hdr.bh_caplen, &paylen, 0);
+
+ /* If the IP or UDP checksum was bad, skip the packet... */
+ if (offset < 0) {
+diff -up dhcp-4.2.2b1/common/dlpi.c.xen dhcp-4.2.2b1/common/dlpi.c
+--- dhcp-4.2.2b1/common/dlpi.c.xen 2011-05-11 16:20:59.000000000 +0200
++++ dhcp-4.2.2b1/common/dlpi.c 2011-07-01 14:00:16.937958997 +0200
+@@ -693,7 +693,7 @@ ssize_t receive_packet (interface, buf,
+ length -= offset;
+ #endif
+ offset = decode_udp_ip_header (interface, dbuf, bufix,
+- from, length, &paylen);
++ from, length, &paylen, 0);
+
+ /*
+ * If the IP or UDP checksum was bad, skip the packet...
+diff -up dhcp-4.2.2b1/common/lpf.c.xen dhcp-4.2.2b1/common/lpf.c
+--- dhcp-4.2.2b1/common/lpf.c.xen 2011-05-10 16:38:58.000000000 +0200
++++ dhcp-4.2.2b1/common/lpf.c 2011-07-01 14:11:24.725748028 +0200
+@@ -29,19 +29,33 @@
+ #include "dhcpd.h"
+ #if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE)
+ #include <sys/ioctl.h>
++#include <sys/socket.h>
+ #include <sys/uio.h>
+ #include <errno.h>
+
+ #include <asm/types.h>
+ #include <linux/filter.h>
+ #include <linux/if_ether.h>
++#include <linux/if_packet.h>
+ #include <netinet/in_systm.h>
+-#include <net/if_packet.h>
+ #include "includes/netinet/ip.h"
+ #include "includes/netinet/udp.h"
+ #include "includes/netinet/if_ether.h"
+ #include <net/if.h>
+
++#ifndef PACKET_AUXDATA
++#define PACKET_AUXDATA 8
++
++struct tpacket_auxdata
++{
++ __u32 tp_status;
++ __u32 tp_len;
++ __u32 tp_snaplen;
++ __u16 tp_mac;
++ __u16 tp_net;
++};
++#endif
++
+ /* Reinitializes the specified interface after an address change. This
+ is not required for packet-filter APIs. */
+
+@@ -67,10 +81,14 @@ int if_register_lpf (info)
+ struct interface_info *info;
+ {
+ int sock;
+- struct sockaddr sa;
++ union {
++ struct sockaddr_ll ll;
++ struct sockaddr common;
++ } sa;
++ struct ifreq ifr;
+
+ /* Make an LPF socket. */
+- if ((sock = socket(PF_PACKET, SOCK_PACKET,
++ if ((sock = socket(PF_PACKET, SOCK_RAW,
+ htons((short)ETH_P_ALL))) < 0) {
+ if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+ errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
+@@ -85,11 +103,17 @@ int if_register_lpf (info)
+ log_fatal ("Open a socket for LPF: %m");
+ }
+
++ memset (&ifr, 0, sizeof ifr);
++ strncpy (ifr.ifr_name, (const char *)info -> ifp, sizeof ifr.ifr_name);
++ ifr.ifr_name[IFNAMSIZ-1] = '\0';
++ if (ioctl (sock, SIOCGIFINDEX, &ifr))
++ log_fatal ("Failed to get interface index: %m");
++
+ /* Bind to the interface name */
+ memset (&sa, 0, sizeof sa);
+- sa.sa_family = AF_PACKET;
+- strncpy (sa.sa_data, (const char *)info -> ifp, sizeof sa.sa_data);
+- if (bind (sock, &sa, sizeof sa)) {
++ sa.ll.sll_family = AF_PACKET;
++ sa.ll.sll_ifindex = ifr.ifr_ifindex;
++ if (bind (sock, &sa.common, sizeof sa)) {
+ if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+ errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
+ errno == EAFNOSUPPORT || errno == EINVAL) {
+@@ -171,9 +195,18 @@ static void lpf_gen_filter_setup (struct
+ void if_register_receive (info)
+ struct interface_info *info;
+ {
++ int val;
++
+ /* Open a LPF device and hang it on this interface... */
+ info -> rfdesc = if_register_lpf (info);
+
++ val = 1;
++ if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val,
++ sizeof val) < 0) {
++ if (errno != ENOPROTOOPT)
++ log_fatal ("Failed to set auxiliary packet data: %m");
++ }
++
+ #if defined (HAVE_TR_SUPPORT)
+ if (info -> hw_address.hbuf [0] == HTYPE_IEEE802)
+ lpf_tr_filter_setup (info);
+@@ -295,7 +328,6 @@ ssize_t send_packet (interface, packet,
+ double hh [16];
+ double ih [1536 / sizeof (double)];
+ unsigned char *buf = (unsigned char *)ih;
+- struct sockaddr_pkt sa;
+ int result;
+ int fudge;
+
+@@ -316,17 +348,7 @@ ssize_t send_packet (interface, packet,
+ (unsigned char *)raw, len);
+ memcpy (buf + ibufp, raw, len);
+
+- /* For some reason, SOCK_PACKET sockets can't be connected,
+- so we have to do a sentdo every time. */
+- memset (&sa, 0, sizeof sa);
+- sa.spkt_family = AF_PACKET;
+- strncpy ((char *)sa.spkt_device,
+- (const char *)interface -> ifp, sizeof sa.spkt_device);
+- sa.spkt_protocol = htons(ETH_P_IP);
+-
+- result = sendto (interface -> wfdesc,
+- buf + fudge, ibufp + len - fudge, 0,
+- (const struct sockaddr *)&sa, sizeof sa);
++ result = write (interface -> wfdesc, buf + fudge, ibufp + len - fudge);
+ if (result < 0)
+ log_error ("send_packet: %m");
+ return result;
+@@ -343,14 +365,35 @@ ssize_t receive_packet (interface, buf,
+ {
+ int length = 0;
+ int offset = 0;
++ int nocsum = 0;
+ unsigned char ibuf [1536];
+ unsigned bufix = 0;
+ unsigned paylen;
++ unsigned char cmsgbuf[CMSG_LEN(sizeof(struct tpacket_auxdata))];
++ struct iovec iov = {
++ .iov_base = ibuf,
++ .iov_len = sizeof ibuf,
++ };
++ struct msghdr msg = {
++ .msg_iov = &iov,
++ .msg_iovlen = 1,
++ .msg_control = cmsgbuf,
++ .msg_controllen = sizeof(cmsgbuf),
++ };
++ struct cmsghdr *cmsg;
+
+- length = read (interface -> rfdesc, ibuf, sizeof ibuf);
++ length = recvmsg (interface -> rfdesc, &msg, 0);
+ if (length <= 0)
+ return length;
+
++ for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
++ if (cmsg->cmsg_level == SOL_PACKET &&
++ cmsg->cmsg_type == PACKET_AUXDATA) {
++ struct tpacket_auxdata *aux = (void *)CMSG_DATA(cmsg);
++ nocsum = aux->tp_status & TP_STATUS_CSUMNOTREADY;
++ }
++ }
++
+ bufix = 0;
+ /* Decode the physical header... */
+ offset = decode_hw_header (interface, ibuf, bufix, hfrom);
+@@ -367,7 +410,7 @@ ssize_t receive_packet (interface, buf,
+
+ /* Decode the IP and UDP headers... */
+ offset = decode_udp_ip_header (interface, ibuf, bufix, from,
+- (unsigned)length, &paylen);
++ (unsigned)length, &paylen, nocsum);
+
+ /* If the IP or UDP checksum was bad, skip the packet... */
+ if (offset < 0)
+diff -up dhcp-4.2.2b1/common/nit.c.xen dhcp-4.2.2b1/common/nit.c
+--- dhcp-4.2.2b1/common/nit.c.xen 2009-11-20 02:49:01.000000000 +0100
++++ dhcp-4.2.2b1/common/nit.c 2011-07-01 14:00:16.939958989 +0200
+@@ -369,7 +369,7 @@ ssize_t receive_packet (interface, buf,
+
+ /* Decode the IP and UDP headers... */
+ offset = decode_udp_ip_header (interface, ibuf, bufix,
+- from, length, &paylen);
++ from, length, &paylen, 0);
+
+ /* If the IP or UDP checksum was bad, skip the packet... */
+ if (offset < 0)
+diff -up dhcp-4.2.2b1/common/packet.c.xen dhcp-4.2.2b1/common/packet.c
+--- dhcp-4.2.2b1/common/packet.c.xen 2009-07-23 20:52:20.000000000 +0200
++++ dhcp-4.2.2b1/common/packet.c 2011-07-01 14:00:16.939958989 +0200
+@@ -211,7 +211,7 @@ ssize_t
+ decode_udp_ip_header(struct interface_info *interface,
+ unsigned char *buf, unsigned bufix,
+ struct sockaddr_in *from, unsigned buflen,
+- unsigned *rbuflen)
++ unsigned *rbuflen, int nocsum)
+ {
+ unsigned char *data;
+ struct ip ip;
+@@ -322,7 +322,7 @@ decode_udp_ip_header(struct interface_in
+ 8, IPPROTO_UDP + ulen))));
+
+ udp_packets_seen++;
+- if (usum && usum != sum) {
++ if (!nocsum && usum && usum != sum) {
+ udp_packets_bad_checksum++;
+ if (udp_packets_seen > 4 &&
+ (udp_packets_seen / udp_packets_bad_checksum) < 2) {
+diff -up dhcp-4.2.2b1/common/upf.c.xen dhcp-4.2.2b1/common/upf.c
+--- dhcp-4.2.2b1/common/upf.c.xen 2009-11-20 02:49:01.000000000 +0100
++++ dhcp-4.2.2b1/common/upf.c 2011-07-01 14:00:16.940958986 +0200
+@@ -320,7 +320,7 @@ ssize_t receive_packet (interface, buf,
+
+ /* Decode the IP and UDP headers... */
+ offset = decode_udp_ip_header (interface, ibuf, bufix,
+- from, length, &paylen);
++ from, length, &paylen, 0);
+
+ /* If the IP or UDP checksum was bad, skip the packet... */
+ if (offset < 0)
+diff -up dhcp-4.2.2b1/includes/dhcpd.h.xen dhcp-4.2.2b1/includes/dhcpd.h
+--- dhcp-4.2.2b1/includes/dhcpd.h.xen 2011-07-01 14:00:16.000000000 +0200
++++ dhcp-4.2.2b1/includes/dhcpd.h 2011-07-01 14:12:18.069642470 +0200
+@@ -2796,7 +2796,7 @@ ssize_t decode_hw_header (struct interfa
+ unsigned, struct hardware *);
+ ssize_t decode_udp_ip_header (struct interface_info *, unsigned char *,
+ unsigned, struct sockaddr_in *,
+- unsigned, unsigned *);
++ unsigned, unsigned *, int);
+
+ /* ethernet.c */
+ void assemble_ethernet_header (struct interface_info *, unsigned char *,
diff --git a/src/patches/netkit-telnet-0.17-ipv6.diff b/src/patches/netkit-telnet-0.17-ipv6.diff
new file mode 100644
index 0000000..e3719f1
--- /dev/null
+++ b/src/patches/netkit-telnet-0.17-ipv6.diff
@@ -0,0 +1,265 @@
+diff -uNr netkit-telnet-0.17/telnetd/telnetd.c netkit-telnet-0.17.ipv6/telnetd/telnetd.c
+--- netkit-telnet-0.17/telnetd/telnetd.c 2006-07-13 08:37:18.000000000 +0200
++++ netkit-telnet-0.17.ipv6/telnetd/telnetd.c 2006-07-14 08:36:11.000000000 +0200
+@@ -49,6 +49,7 @@
+ /* #include <netinet/ip.h> */ /* Don't think this is used at all here */
+ #include <arpa/inet.h>
+ #include <assert.h>
++#include <sys/poll.h>
+ #include "telnetd.h"
+ #include "pathnames.h"
+ #include "setproctitle.h"
+@@ -68,7 +69,7 @@
+ #define HAS_IPPROTO_IP
+ #endif
+
+-static void doit(struct sockaddr_in *who);
++static void doit(struct sockaddr *who, socklen_t wholen);
+ static int terminaltypeok(const char *s);
+
+ /*
+@@ -90,7 +91,7 @@
+ int
+ main(int argc, char *argv[], char *env[])
+ {
+- struct sockaddr_in from;
++ struct sockaddr from;
+ int on = 1;
+ socklen_t fromlen;
+ register int ch;
+@@ -248,64 +249,89 @@
+ argc -= optind;
+ argv += optind;
+
+- if (debug) {
+- int s, ns;
+- socklen_t foo;
+- struct servent *sp;
+- struct sockaddr_in sn;
++ int s = 0;
+
+- memset(&sn, 0, sizeof(sn));
+- sn.sin_family = AF_INET;
++ if (debug) {
++ struct addrinfo *ai;
++ unsigned int nfds = 0;
++ struct pollfd fds[2];
+
+ if (argc > 1) {
+- usage();
+- /* NOTREACHED */
+- } else if (argc == 1) {
+- if ((sp = getservbyname(*argv, "tcp"))!=NULL) {
+- sn.sin_port = sp->s_port;
+- }
+- else {
+- int pt = atoi(*argv);
+- if (pt <= 0) {
+- fprintf(stderr, "telnetd: %s: bad port number\n",
+- *argv);
+- usage();
+- /* NOTREACHED */
+- }
+- sn.sin_port = htons(pt);
+- }
++ usage();
++ /* NOTREACHED */
+ } else {
+- sp = getservbyname("telnet", "tcp");
+- if (sp == 0) {
+- fprintf(stderr, "telnetd: tcp/telnet: unknown service\n");
+- exit(1);
+- }
+- sn.sin_port = sp->s_port;
+- }
++ struct addrinfo hints;
++
++ memset (&hints, '\0', sizeof (hints));
++ hints.ai_socktype = SOCK_STREAM;
++ hints.ai_flags = AI_ADDRCONFIG | AI_PASSIVE;
++ hints.ai_protocol = IPPROTO_TCP;
++
++ if (argc == 0) {
++ if (getaddrinfo(NULL, "telnet", &hints, &ai) != 0) {
++ fprintf(stderr, "telnetd: %s: bad port number\n", *argv);
++ usage();
++ /* NOTREACHED */
++ }
++ } else {
++ if (getaddrinfo(NULL, *argv, &hints, &ai) != 0) {
++ fprintf(stderr, "telnetd: %s: bad port number\n", *argv);
++ usage();
++ /* NOTREACHED */
++ }
++ }
++ }
+
+- s = socket(AF_INET, SOCK_STREAM, 0);
+- if (s < 0) {
++ struct addrinfo *runp;
++ int b = 0;
++ for (runp = ai; ((runp != NULL) && (nfds < sizeof (fds) / sizeof (fds[0]))); runp = runp->ai_next) {
++ fds[nfds].fd = socket(runp->ai_family, runp->ai_socktype, runp->ai_protocol);
++ if (fds[nfds].fd < 0) {
+ perror("telnetd: socket");;
+- exit(1);
++ exit(1);
++ }
++ fds[nfds].events = POLLIN;
++ (void) setsockopt(fds[nfds].fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
++
++ if (bind(fds[nfds].fd, runp->ai_addr, runp->ai_addrlen) != 0) {
++ // Unable to bind to given port. One of the reason can be
++ // that we can't bind to both IPv4 and IPv6
++ break;
++ } else {
++ b++;
++ }
++
++ if (listen(fds[nfds].fd, 1) < 0) {
++ perror("listen");
++ exit(1);
++ }
++ nfds++;
+ }
+- (void) setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+- if (bind(s, (struct sockaddr *)&sn, sizeof(sn)) < 0) {
+- perror("bind");
+- exit(1);
+- }
+- if (listen(s, 1) < 0) {
+- perror("listen");
+- exit(1);
++ freeaddrinfo(ai);
++
++ if (b == 0) {
++ perror("bind");
++ exit(1);
+ }
+- foo = sizeof(sn);
+- ns = accept(s, (struct sockaddr *)&sn, &foo);
+- if (ns < 0) {
+- perror("accept");
+- exit(1);
++
++ int n = poll (fds, nfds, -1);
++ if (n > 0) {
++ unsigned int i;
++ for (i = 0; i < nfds; i++) {
++ if (fds[i].revents & POLLIN) {
++ struct sockaddr_storage rem;
++ socklen_t remlen = sizeof(rem);
++ int fd = accept(fds[i].fd, (struct sockaddr *) &rem, &remlen);
++
++ if (fd < 0) {
++ perror("accept");
++ exit(1);
++ }
++
++ s = fd;
++ }
++ }
+ }
+- (void) dup2(ns, 0);
+- (void) close(ns);
+- (void) close(s);
+ } else if (argc > 0) {
+ usage();
+ /* NOT REACHED */
+@@ -313,13 +339,13 @@
+
+ openlog("telnetd", LOG_PID | LOG_ODELAY, LOG_DAEMON);
+ fromlen = sizeof (from);
+- if (getpeername(0, (struct sockaddr *)&from, &fromlen) < 0) {
++ if (getpeername(s, &from, &fromlen) < 0) {
+ fprintf(stderr, "%s: ", progname);
+ perror("getpeername");
+ _exit(1);
+ }
+ if (keepalive &&
+- setsockopt(0, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0) {
++ setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0) {
+ syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m");
+ }
+
+@@ -333,13 +359,13 @@
+ if (tos < 0)
+ tos = 020; /* Low Delay bit */
+ if (tos
+- && (setsockopt(0, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0)
++ && (setsockopt(s, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0)
+ && (errno != ENOPROTOOPT) )
+ syslog(LOG_WARNING, "setsockopt (IP_TOS): %m");
+ }
+ #endif /* defined(HAS_IPPROTO_IP) && defined(IP_TOS) */
+- net = 0;
+- doit(&from);
++ net = s;
++ doit(&from, fromlen);
+ /* NOTREACHED */
+ return 0;
+ } /* end of main */
+@@ -608,10 +634,9 @@
+ * Get a pty, scan input lines.
+ */
+ static void
+-doit(struct sockaddr_in *who)
++doit(struct sockaddr *who, socklen_t wholen)
+ {
+ const char *host;
+- struct hostent *hp;
+ int level;
+ char user_name[256];
+
+@@ -623,12 +648,18 @@
+ fatal(net, "All network ports in use");
+
+ /* get name of connected client */
+- hp = gethostbyaddr((char *)&who->sin_addr, sizeof (struct in_addr),
+- who->sin_family);
+- if (hp)
+- host = hp->h_name;
+- else
+- host = inet_ntoa(who->sin_addr);
++ int error = -1;
++ char namebuf[255];
++
++ error = getnameinfo(who, wholen, namebuf, sizeof(namebuf), NULL, 0, 0);
++
++ if (error) {
++ perror("getnameinfo: localhost");
++ perror(gai_strerror(error));
++ exit(1);
++ }
++
++ host = namebuf;
+
+ /*
+ * We must make a copy because Kerberos is probably going
+@@ -649,13 +680,21 @@
+
+ /* Get local host name */
+ {
+- struct hostent *h;
++ struct addrinfo hints;
++ struct addrinfo *res;
++ int e;
++
++ memset(&hints, '\0', sizeof(hints));
++ hints.ai_socktype = SOCK_STREAM;
++ hints.ai_flags = AI_ADDRCONFIG;
++
+ gethostname(host_name, sizeof(host_name));
+- h = gethostbyname(host_name);
+- if (h) {
+- strncpy(host_name, h->h_name, sizeof(host_name));
+- host_name[sizeof(host_name)-1] = 0;
++ if ((e = getaddrinfo(host_name, NULL, &hints, &res)) != 0) {
++ perror("getaddrinfo: localhost");
++ perror(gai_strerror(e));
++ exit(1);
+ }
++ freeaddrinfo(res);
+ }
+
+ #if defined(AUTHENTICATE) || defined(ENCRYPT)
diff --git a/src/patches/netkit-telnet-0.17-nodns.patch b/src/patches/netkit-telnet-0.17-nodns.patch
new file mode 100644
index 0000000..1dba79b
--- /dev/null
+++ b/src/patches/netkit-telnet-0.17-nodns.patch
@@ -0,0 +1,43 @@
+--- netkit-telnet-0.17.orig/telnetd/telnetd.c 2007-03-13 16:31:20.000000000 +0000
++++ netkit-telnet-0.17.orig/telnetd/telnetd.c 2007-03-13 16:31:26.000000000 +0000
+@@ -653,6 +653,11 @@ doit(struct sockaddr *who, socklen_t who
+
+ error = getnameinfo(who, wholen, namebuf, sizeof(namebuf), NULL, 0, 0);
+
++ /* if we can't get a hostname now, settle for an address */
++ if(error == EAI_AGAIN)
++ error = getnameinfo(who, wholen, namebuf, sizeof(namebuf),
++ NULL, 0, NI_NUMERICHOST);
++
+ if (error) {
+ perror("getnameinfo: localhost");
+ perror(gai_strerror(error));
+@@ -681,7 +686,7 @@ doit(struct sockaddr *who, socklen_t who
+ /* Get local host name */
+ {
+ struct addrinfo hints;
+- struct addrinfo *res;
++ struct addrinfo *res = 0;
+ int e;
+
+ memset(&hints, '\0', sizeof(hints));
+@@ -690,11 +695,14 @@ doit(struct sockaddr *who, socklen_t who
+
+ gethostname(host_name, sizeof(host_name));
+ if ((e = getaddrinfo(host_name, NULL, &hints, &res)) != 0) {
+- perror("getaddrinfo: localhost");
+- perror(gai_strerror(e));
+- exit(1);
++ if(e != EAI_AGAIN) {
++ fprintf(stderr, "getaddrinfo: localhost %s\n",
++ gai_strerror(e));
++ exit(1);
++ }
+ }
+- freeaddrinfo(res);
++ if(res)
++ freeaddrinfo(res);
+ }
+
+ #if defined(AUTHENTICATE) || defined(ENCRYPT)
+
diff --git a/src/patches/netkit-telnet-0.17-reallynodns.patch b/src/patches/netkit-telnet-0.17-reallynodns.patch
new file mode 100644
index 0000000..32f7af5
--- /dev/null
+++ b/src/patches/netkit-telnet-0.17-reallynodns.patch
@@ -0,0 +1,88 @@
+--- netkit-telnet-0.17.orig/telnetd/telnetd.c.reallynodns 2009-03-12 14:32:29.000000000 -0700
++++ netkit-telnet-0.17.orig/telnetd/telnetd.c 2009-03-12 14:51:59.000000000 -0700
+@@ -85,6 +85,7 @@
+ int keepalive = 1;
+ char *loginprg = _PATH_LOGIN;
+ char *progname;
++int lookupself = 1;
+
+ extern void usage(void);
+
+@@ -111,7 +112,7 @@
+
+ progname = *argv;
+
+- while ((ch = getopt(argc, argv, "d:a:e:lhnr:I:D:B:sS:a:X:L:")) != EOF) {
++ while ((ch = getopt(argc, argv, "d:a:e:lhnr:I:D:B:sS:a:X:L:N")) != EOF) {
+ switch(ch) {
+
+ #ifdef AUTHENTICATE
+@@ -210,6 +211,10 @@
+ keepalive = 0;
+ break;
+
++ case 'N':
++ lookupself = 0;
++ break;
++
+ #ifdef SecurID
+ case 's':
+ /* SecurID required */
+@@ -393,6 +398,7 @@
+ #endif
+ fprintf(stderr, " [-L login_program]");
+ fprintf(stderr, " [-n]");
++ fprintf(stderr, " [-N]");
+ #ifdef SecurID
+ fprintf(stderr, " [-s]");
+ #endif
+@@ -691,15 +697,20 @@
+
+ memset(&hints, '\0', sizeof(hints));
+ hints.ai_socktype = SOCK_STREAM;
+- hints.ai_flags = AI_ADDRCONFIG;
++ hints.ai_flags = AI_CANONNAME;
+
+ gethostname(host_name, sizeof(host_name));
+- if ((e = getaddrinfo(host_name, NULL, &hints, &res)) != 0) {
+- if(e != EAI_AGAIN) {
+- fprintf(stderr, "getaddrinfo: localhost %s\n",
+- gai_strerror(e));
+- exit(1);
+- }
++ /*
++ * Optionally canonicalize the local host name, in case
++ * gethostname() returns foo, we want foo.example.com
++ */
++ if (lookupself &&
++ (e = getaddrinfo(host_name, NULL, &hints, &res)) == 0) {
++ if (res->ai_canonname) {
++ strncpy(host_name, res->ai_canonname,
++ sizeof(host_name)-1);
++ host_name[sizeof(host_name)-1] = 0;
++ }
+ }
+ if(res)
+ freeaddrinfo(res);
+--- netkit-telnet-0.17.orig/telnetd/telnetd.8.reallynodns 2009-03-12 14:54:54.000000000 -0700
++++ netkit-telnet-0.17.orig/telnetd/telnetd.8 2009-03-12 14:56:58.000000000 -0700
+@@ -42,7 +42,7 @@
+ protocol server
+ .Sh SYNOPSIS
+ .Nm /usr/sbin/in.telnetd
+-.Op Fl hns
++.Op Fl hnNs
+ .Op Fl a Ar authmode
+ .Op Fl D Ar debugmode
+ .Op Fl L Ar loginprg
+@@ -175,6 +175,10 @@
+ if the client is still there, so that idle connections
+ from machines that have crashed or can no longer
+ be reached may be cleaned up.
++.It Fl N
++Do not use DNS to canonicalize the local hostname;
++.Fn gethostname 2
++returns a fully qualified name.
+ .It Fl s
+ This option is only enabled if
+ .Nm telnetd
diff --git a/src/patches/telnet-0.17-8bit.patch b/src/patches/telnet-0.17-8bit.patch
new file mode 100644
index 0000000..89818b5
--- /dev/null
+++ b/src/patches/telnet-0.17-8bit.patch
@@ -0,0 +1,33 @@
+diff -ru netkit-telnet-0.17.orig/telnet/main.c netkit-telnet-0.17/telnet/main.c
+--- netkit-telnet-0.17.orig/telnet/main.c 2003-05-15 20:07:40.000000000 +0200
++++ netkit-telnet-0.17/telnet/main.c 2003-05-16 00:18:28.000000000 +0200
+@@ -143,7 +143,7 @@
+ while ((ch = getopt(argc, argv, "78DEKLS:X:ab:cde:fFk:l:n:rt:x")) != -1) {
+ switch(ch) {
+ case '8':
+- eight = 3; /* binary output and input */
++ binary = 3; /* send TELNET BINARY option for output and input */
+ break;
+ case '7':
+ eight = 0;
+@@ -165,7 +165,7 @@
+ #endif
+ break;
+ case 'L':
+- eight |= 2; /* binary output only */
++ binary = 2; /* send TELNET BINARY option for output only */
+ break;
+ case 'S':
+ {
+diff -ru netkit-telnet-0.17.orig/telnet/telnet.1 netkit-telnet-0.17/telnet/telnet.1
+--- netkit-telnet-0.17.orig/telnet/telnet.1 2003-05-15 20:07:40.000000000 +0200
++++ netkit-telnet-0.17/telnet/telnet.1 2003-05-15 23:38:37.000000000 +0200
+@@ -76,6 +76,8 @@
+ .Pp
+ The options are as follows:
+ .Bl -tag -width Ds
++.It Fl 7
++Strip 8th bit on input and output. Telnet is 8-bit clean by default but doesn't send the TELNET BINARY option unless forced.
+ .It Fl 8
+ Specifies an 8-bit data path.
+ This causes an attempt to negotiate the
diff --git a/src/patches/telnet-0.17-CAN-2005-468_469.patch b/src/patches/telnet-0.17-CAN-2005-468_469.patch
new file mode 100644
index 0000000..57e1372
--- /dev/null
+++ b/src/patches/telnet-0.17-CAN-2005-468_469.patch
@@ -0,0 +1,179 @@
+--- netkit-telnet-0.17/telnet/telnet.c.CAN-2005-468_469 2005-03-17 13:48:58.000000000 +0100
++++ netkit-telnet-0.17/telnet/telnet.c 2005-03-17 14:02:27.000000000 +0100
+@@ -1310,22 +1310,66 @@
+ }
+
+
+-unsigned char slc_reply[128];
++#define SLC_REPLY_SIZE 128
++unsigned char *slc_reply;
+ unsigned char *slc_replyp;
++unsigned char *slc_replyend;
+
+ void
+ slc_start_reply(void)
+ {
++ slc_reply = (unsigned char *)malloc(SLC_REPLY_SIZE);
++ if (slc_reply == NULL) {
++/*@*/ printf("slc_start_reply: malloc()/realloc() failed!!!\n");
++ slc_reply = slc_replyp = slc_replyend = NULL;
++ return;
++ }
++
+ slc_replyp = slc_reply;
++ slc_replyend = slc_reply + SLC_REPLY_SIZE;
+ *slc_replyp++ = IAC;
+ *slc_replyp++ = SB;
+ *slc_replyp++ = TELOPT_LINEMODE;
+ *slc_replyp++ = LM_SLC;
+ }
+
++static int
++slc_assure_buffer(int want_len);
++
++ static int
++slc_assure_buffer(int want_len)
++{
++ if ((slc_replyp + want_len) >= slc_replyend) {
++ int len;
++ int old_len = slc_replyp - slc_reply;
++ unsigned char *p;
++
++ len = old_len
++ + (want_len / SLC_REPLY_SIZE + 1) * SLC_REPLY_SIZE;
++ p = (unsigned char *)realloc(slc_reply, len);
++ if (p == NULL)
++ free(slc_reply);
++ slc_reply = p;
++ if (slc_reply == NULL) {
++/*@*/ printf("slc_add_reply: realloc() failed!!!\n");
++ slc_reply = slc_replyp = slc_replyend = NULL;
++ return 1;
++ }
++ slc_replyp = slc_reply + old_len;
++ slc_replyend = slc_reply + len;
++ }
++ return 0;
++}
++
+ void
+ slc_add_reply(unsigned char func, unsigned char flags, cc_t value)
+ {
++ if (slc_assure_buffer(6))
++ return;
++
++ if (slc_replyp == NULL)
++ return;
++
+ if ((*slc_replyp++ = func) == IAC)
+ *slc_replyp++ = IAC;
+ if ((*slc_replyp++ = flags) == IAC)
+@@ -1339,6 +1383,12 @@
+ {
+ int len;
+
++ if (slc_assure_buffer(2))
++ return;
++
++ if (slc_replyp == NULL)
++ return;
++
+ *slc_replyp++ = IAC;
+ *slc_replyp++ = SE;
+ len = slc_replyp - slc_reply;
+@@ -1456,7 +1506,7 @@
+ }
+ }
+
+-#define OPT_REPLY_SIZE 256
++#define OPT_REPLY_SIZE 1024
+ unsigned char *opt_reply;
+ unsigned char *opt_replyp;
+ unsigned char *opt_replyend;
+@@ -1490,10 +1540,38 @@
+ env_opt_start_info(void)
+ {
+ env_opt_start();
+- if (opt_replyp)
++ if (opt_replyp && (opt_replyp > opt_reply))
+ opt_replyp[-1] = TELQUAL_INFO;
+ }
+
++static int
++env_opt_assure_buffer(int want_len);
++
++ static int
++env_opt_assure_buffer(int want_len)
++{
++ if ((opt_replyp + want_len) >= opt_replyend) {
++ int len;
++ unsigned char *p;
++ int old_len = opt_replyp - opt_reply;
++
++ len = old_len
++ + (want_len / OPT_REPLY_SIZE + 1) * OPT_REPLY_SIZE;
++ p = (unsigned char *)realloc(opt_reply, len);
++ if (p == NULL)
++ free(opt_reply);
++ opt_reply = p;
++ if (opt_reply == NULL) {
++/*@*/ printf("env_opt_add: realloc() failed!!!\n");
++ opt_reply = opt_replyp = opt_replyend = NULL;
++ return 1;
++ }
++ opt_replyp = opt_reply + old_len;
++ opt_replyend = opt_reply + len;
++ }
++ return 0;
++}
++
+ void
+ env_opt_add(unsigned char *ep)
+ {
+@@ -1515,25 +1593,12 @@
+ return;
+ }
+ vp = env_getvalue(ep, 1);
+- if (opt_replyp + (vp ? strlen((char *)vp) : 0) +
+- strlen((char *)ep) + 6 > opt_replyend)
+- {
+- int len;
+- unsigned char *p;
+- opt_replyend += OPT_REPLY_SIZE;
+- len = opt_replyend - opt_reply;
+- p = (unsigned char *)realloc(opt_reply, len);
+- if (p == NULL)
+- free(opt_reply);
+- opt_reply = p;
+- if (opt_reply == NULL) {
+-/*@*/ printf("env_opt_add: realloc() failed!!!\n");
+- opt_reply = opt_replyp = opt_replyend = NULL;
+- return;
+- }
+- opt_replyp = opt_reply + len - (opt_replyend - opt_replyp);
+- opt_replyend = opt_reply + len;
+- }
++
++ /* use the double length in case it gots escaped */
++ if (env_opt_assure_buffer((vp ? strlen((char *)vp)*2 : 0) +
++ strlen((char *)ep)*2 + 6))
++ return;
++
+ if (opt_welldefined((char *)ep))
+ #ifdef OLD_ENVIRON
+ if (telopt_environ == TELOPT_OLD_ENVIRON)
+@@ -1588,8 +1653,14 @@
+ {
+ int len;
+
++ if (opt_reply == NULL) /*XXX*/
++ return; /*XXX*/
++
++
+ len = opt_replyp - opt_reply + 2;
+ if (emptyok || len > 6) {
++ if (env_opt_assure_buffer(2))
++ return;
+ *opt_replyp++ = IAC;
+ *opt_replyp++ = SE;
+ if (NETROOM() > len) {
diff --git a/src/patches/telnet-0.17-argv.patch b/src/patches/telnet-0.17-argv.patch
new file mode 100644
index 0000000..6f71bed
--- /dev/null
+++ b/src/patches/telnet-0.17-argv.patch
@@ -0,0 +1,12 @@
+diff -ur netkit-telnet-0.17/telnetd/setproctitle.c netkit-telnet-0.17.new/telnetd/setproctitle.c
+--- netkit-telnet-0.17/telnetd/setproctitle.c 1999-12-11 00:06:39.000000000 +0100
++++ netkit-telnet-0.17.new/telnetd/setproctitle.c 2004-06-28 16:48:51.153514392 +0200
+@@ -139,7 +139,7 @@
+ (void) strcpy(Argv[0], buf);
+ p = &Argv[0][i];
+ while (p < LastArgv)
+- *p++ = ' ';
++ *p++ = '\0';
+ Argv[1] = NULL;
+ }
+
diff --git a/src/patches/telnet-0.17-cleanup_race.patch b/src/patches/telnet-0.17-cleanup_race.patch
new file mode 100644
index 0000000..bc3c0f5
--- /dev/null
+++ b/src/patches/telnet-0.17-cleanup_race.patch
@@ -0,0 +1,11 @@
+--- netkit-telnet-0.17/telnetd/telnetd.c.cleanup_race 2005-01-11 18:39:49.578123000 -0500
++++ netkit-telnet-0.17/telnetd/telnetd.c 2005-01-11 18:42:45.909616000 -0500
+@@ -1081,6 +1081,8 @@
+ if (FD_ISSET(p, &obits) && (pfrontp - pbackp) > 0)
+ ptyflush();
+ }
++ /* to avoid a race for wtmp lock */
++ signal(SIGCHLD, SIG_IGN);
+ cleanup(0);
+ } /* end of telnet */
+
diff --git a/src/patches/telnet-0.17-conf.patch b/src/patches/telnet-0.17-conf.patch
new file mode 100644
index 0000000..512f104
--- /dev/null
+++ b/src/patches/telnet-0.17-conf.patch
@@ -0,0 +1,23 @@
+--- netkit-telnet-0.17/configure.confverb 2000-07-29 20:00:29.000000000 +0200
++++ netkit-telnet-0.17/configure 2004-07-05 10:50:36.492963840 +0200
+@@ -263,14 +263,19 @@
+ cat <<EOF >__conftest.cc
+ #include <unistd.h>
+ #include <signal.h>
+-int count=0;
++volatile int count=0;
+ void handle(int foo) { count++; }
+ int main() {
++ sigset_t sset;
+ int pid=getpid();
++ sigemptyset(&sset);
++ sigaddset(&sset, SIGINT);
++ sigprocmask(SIG_UNBLOCK, &sset, NULL);
+ signal(SIGINT, handle);
+ kill(pid,SIGINT);
+ kill(pid,SIGINT);
+ kill(pid,SIGINT);
++ sleep(1);
+ if (count!=3) return 1;
+ return 0;
+ }
diff --git a/src/patches/telnet-0.17-env.patch b/src/patches/telnet-0.17-env.patch
new file mode 100644
index 0000000..88e7c01
--- /dev/null
+++ b/src/patches/telnet-0.17-env.patch
@@ -0,0 +1,84 @@
+--- netkit-telnet-0.17-pre-20000204/telnet/commands.c.env Thu Apr 8 19:30:20 1999
++++ netkit-telnet-0.17-pre-20000204/telnet/commands.c Tue May 16 17:19:47 2000
+@@ -1815,11 +1815,11 @@
+ }
+
+ unsigned char *
+-env_getvalue(unsigned char *var)
++env_getvalue(unsigned char *var, int exported_only)
+ {
+- struct env_lst *ep;
++ struct env_lst *ep = env_find(var);
+
+- if ((ep = env_find(var)))
++ if (ep && (!exported_only || ep->export))
+ return(ep->value);
+ return(NULL);
+ }
+--- netkit-telnet-0.17-pre-20000204/telnet/telnet.c.env Tue May 16 17:19:47 2000
++++ netkit-telnet-0.17-pre-20000204/telnet/telnet.c Tue May 16 17:19:47 2000
+@@ -438,7 +438,7 @@
+ #endif
+
+ case TELOPT_XDISPLOC: /* X Display location */
+- if (env_getvalue((unsigned char *)"DISPLAY"))
++ if (env_getvalue((unsigned char *)"DISPLAY", 0))
+ new_state_ok = 1;
+ break;
+
+@@ -693,7 +693,7 @@
+ resettermname = 0;
+ if (tnamep && tnamep != unknown)
+ free(tnamep);
+- if ((tname = (char *)env_getvalue((unsigned char *)"TERM")) &&
++ if ((tname = (char *)env_getvalue((unsigned char *)"TERM", 0)) &&
+ (setupterm(tname, 1, &errret) == 0)) {
+ tnamep = mklist(ttytype, tname);
+ } else {
+@@ -870,7 +870,7 @@
+ unsigned char temp[50], *dp;
+ int len;
+
+- if ((dp = env_getvalue((unsigned char *)"DISPLAY")) == NULL) {
++ if ((dp = env_getvalue((unsigned char *)"DISPLAY", 0)) == NULL) {
+ /*
+ * Something happened, we no longer have a DISPLAY
+ * variable. So, turn off the option.
+@@ -1527,7 +1527,7 @@
+ env_opt_add(ep);
+ return;
+ }
+- vp = env_getvalue(ep);
++ vp = env_getvalue(ep, 1);
+ if (opt_replyp + (vp ? strlen((char *)vp) : 0) +
+ strlen((char *)ep) + 6 > opt_replyend)
+ {
+@@ -2170,7 +2170,7 @@
+ send_will(TELOPT_LINEMODE, 1);
+ send_will(TELOPT_NEW_ENVIRON, 1);
+ send_do(TELOPT_STATUS, 1);
+- if (env_getvalue((unsigned char *)"DISPLAY"))
++ if (env_getvalue((unsigned char *)"DISPLAY", 0))
+ send_will(TELOPT_XDISPLOC, 1);
+ if (binary)
+ tel_enter_binary(binary);
+--- netkit-telnet-0.17-pre-20000204/telnet/externs.h.env Mon Feb 8 15:56:11 1999
++++ netkit-telnet-0.17-pre-20000204/telnet/externs.h Tue May 16 17:19:47 2000
+@@ -203,7 +203,7 @@
+ void env_send (unsigned char *);
+ void env_list (void);
+ unsigned char * env_default(int init, int welldefined);
+-unsigned char * env_getvalue(unsigned char *var);
++unsigned char * env_getvalue(unsigned char *var, int exported_only);
+
+ void set_escape_char(char *s);
+ unsigned long sourceroute(char *arg, char **cpp, int *lenp);
+@@ -335,7 +335,7 @@
+ void env_opt_end (int);
+
+ unsigned char *env_default (int, int);
+-unsigned char *env_getvalue (unsigned char *);
++unsigned char *env_getvalue (unsigned char *, int);
+
+ int get_status (void);
+ int dosynch (void);
diff --git a/src/patches/telnet-0.17-errno_test_sys_bsd.patch b/src/patches/telnet-0.17-errno_test_sys_bsd.patch
new file mode 100644
index 0000000..9a4fcba
--- /dev/null
+++ b/src/patches/telnet-0.17-errno_test_sys_bsd.patch
@@ -0,0 +1,24 @@
+diff -up netkit-telnet-0.17/telnet/sys_bsd.c.errnosysbsd netkit-telnet-0.17/telnet/sys_bsd.c
+--- netkit-telnet-0.17/telnet/sys_bsd.c.errnosysbsd 2007-09-20 10:57:58.000000000 +0200
++++ netkit-telnet-0.17/telnet/sys_bsd.c 2007-09-20 11:10:08.000000000 +0200
+@@ -375,6 +375,7 @@ TerminalNewMode(int f)
+ int onoff;
+ int old;
+ cc_t esc;
++ int err;
+
+ globalmode = f&~MODE_FORCE;
+ if (prevmode == f)
+@@ -407,6 +408,12 @@ TerminalNewMode(int f)
+ tcsetattr(tin, TCSADRAIN, &tmp_tc);
+ #endif /* USE_TERMIO */
+ old = ttyflush(SYNCHing|flushout);
++ if (old < 0) {
++ err = errno;
++ if (! ((err == EINTR) || (err == EAGAIN) || (err == ENOSPC))) {
++ break;
++ }
++ }
+ } while (old < 0 || old > 1);
+ }
+
diff --git a/src/patches/telnet-0.17-issue.patch b/src/patches/telnet-0.17-issue.patch
new file mode 100644
index 0000000..c00df43
--- /dev/null
+++ b/src/patches/telnet-0.17-issue.patch
@@ -0,0 +1,81 @@
+--- netkit-telnet-0.17/telnetd/utility.c.issue Sun Dec 12 09:59:45 1999
++++ netkit-telnet-0.17/telnetd/utility.c Wed Jul 18 11:14:11 2001
+@@ -460,13 +460,13 @@
+ putlocation = where;
+
+ while (*cp) {
+- if (*cp != '%') {
++ if (*cp != '%' && *cp != '\\') {
+ putchr(*cp++);
+ continue;
+ }
+ switch (*++cp) {
+
+- case 't':
++ case 'l':
+ slash = strrchr(line, '/');
+ if (slash == NULL)
+ putstr(line);
+@@ -474,21 +474,28 @@
+ putstr(slash+1);
+ break;
+
++ case 'n':
+ case 'h':
+ putstr(editedhost);
+ break;
+
++ case 't':
+ case 'd':
+ (void)time(&t);
+ (void)strftime(db, sizeof(db), fmtstr, localtime(&t));
+ putstr(db);
+ break;
+
++ case '\\':
++ putchr('\\');
++ break;
++
+ case '%':
+ putchr('%');
+ break;
+
+ case 'D':
++ case 'o':
+ {
+ char buff[128];
+
+@@ -515,7 +522,7 @@
+ c = fgetc(fp);
+ } while (c != EOF && c != '\n');
+ continue;
+- } else if (c == '%') {
++ } else if (c == '%' || c == '\\') {
+ buff[0] = c;
+ c = fgetc(fp);
+ if (c == EOF) break;
+--- netkit-telnet-0.17/telnetd/issue.net.5.issue Sun Jul 30 19:57:09 2000
++++ netkit-telnet-0.17/telnetd/issue.net.5 Wed Jul 18 11:03:09 2001
+@@ -15,16 +15,17 @@
+ .Pa /etc/issue.net
+ is a text file which contains a message or system identification to be
+ printed before the login prompt of a telnet session. It may contain
+-various `%-char' sequences. The following sequences are supported by
++various `%-char' (or, alternatively, '\\-char') sequences. The following
++sequences are supported by
+ .Ic telnetd :
+ .Bl -tag -offset indent -compact -width "abcde"
+-.It %t
++.It %l
+ - show the current tty
+-.It %h
++.It %h, %n
+ - show the system node name (FQDN)
+-.It %D
++.It %D, %o
+ - show the name of the NIS domain
+-.It %d
++.It %d, %t
+ - show the current time and date
+ .It %s
+ - show the name of the operating system
diff --git a/src/patches/telnet-0.17-pek.patch0 b/src/patches/telnet-0.17-pek.patch0
new file mode 100644
index 0000000..0f4c400
--- /dev/null
+++ b/src/patches/telnet-0.17-pek.patch0
@@ -0,0 +1,37 @@
+diff -u telnet/commands.c telnet.new/commands.c
+--- telnet/commands.c Sat Sep 1 12:55:18 2001
++++ telnet.new/commands.c Sat Sep 1 12:54:36 2001
+@@ -2354,6 +2354,7 @@
+ hints.ai_flags = AI_CANONNAME;
+ if (portp == NULL) {
+ portp = "telnet";
++ telnetport = 1;
+ } else if (*portp == '-') {
+ portp++;
+ telnetport = 1;
+@@ -2397,7 +2398,6 @@
+ if (error) {
+ warn("%s: %s", aliasp, gai_strerror(error));
+ close(net);
+- freeaddrinfo(ares);
+ continue;
+ }
+ if (bind(net, ares->ai_addr, ares->ai_addrlen) < 0) {
+@@ -2414,7 +2414,7 @@
+ perror("setsockopt (IP_OPTIONS)");
+ #endif
+ #if defined(IPPROTO_IP) && defined(IP_TOS)
+- {
++ if (res->ai_family == AF_INET) {
+ # if defined(HAS_GETTOS)
+ struct tosent *tp;
+ if (tos < 0 && (tp = gettosbyname("telnet", "tcp")))
+@@ -2438,7 +2438,7 @@
+ char hbuf[NI_MAXHOST];
+
+ if (getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf),
+- NULL, 0, NI_NUMERICHOST) != 0) {
++ NULL, 0, niflags) != 0) {
+ strcpy(hbuf, "(invalid)");
+ }
+ fprintf(stderr, "telnet: connect to address %s: %s\n", hbuf,
diff --git a/src/patches/telnet-0.17-sa-01-49.patch b/src/patches/telnet-0.17-sa-01-49.patch
new file mode 100644
index 0000000..64ed23c
--- /dev/null
+++ b/src/patches/telnet-0.17-sa-01-49.patch
@@ -0,0 +1,208 @@
+diff -up netkit-telnet-0.17/telnetd/ext.h.sa-01-49 netkit-telnet-0.17/telnetd/ext.h
+--- netkit-telnet-0.17/telnetd/ext.h.sa-01-49 1999-12-12 15:59:44.000000000 +0100
++++ netkit-telnet-0.17/telnetd/ext.h 2011-01-20 22:39:54.000000000 +0100
+@@ -86,7 +86,10 @@ extern char *neturg; /* one past last b
+ extern int pcc, ncc;
+
+ /* printf into netobuf */
+-void netoprintf(const char *fmt, ...) __attribute((format (printf, 1, 2)));
++/* void netoprintf(const char *fmt, ...) __attribute((format (printf, 1, 2))); */
++#define netoprintf output_data
++int output_data(const char *, ...) __attribute((format (printf, 1, 2)));
++void output_datalen(const char *, int);
+
+ extern int pty, net;
+ extern char *line;
+@@ -182,7 +185,10 @@ void tty_setsofttab(int);
+ void tty_tspeed(int);
+ void willoption(int);
+ void wontoption(int);
++
++#if 0
+ void writenet(unsigned char *, int);
++#endif
+
+ #if defined(ENCRYPT)
+ extern void (*encrypt_output)(unsigned char *, int);
+diff -up netkit-telnet-0.17/telnetd/slc.c.sa-01-49 netkit-telnet-0.17/telnetd/slc.c
+--- netkit-telnet-0.17/telnetd/slc.c.sa-01-49 1999-12-12 15:59:44.000000000 +0100
++++ netkit-telnet-0.17/telnetd/slc.c 2011-01-20 22:39:54.000000000 +0100
+@@ -183,7 +183,7 @@ int end_slc(unsigned char **bufp) {
+ else {
+ snprintf(slcbuf+slcoff, sizeof(slcbuf)-slcoff, "%c%c", IAC, SE);
+ slcoff += 2;
+- writenet(slcbuf, slcoff);
++ output_datalen(slcbuf, slcoff);
+ netflush(); /* force it out immediately */
+ }
+ }
+diff -up netkit-telnet-0.17/telnetd/state.c.sa-01-49 netkit-telnet-0.17/telnetd/state.c
+--- netkit-telnet-0.17/telnetd/state.c.sa-01-49 1999-12-12 20:41:44.000000000 +0100
++++ netkit-telnet-0.17/telnetd/state.c 2011-01-20 22:43:34.000000000 +0100
+@@ -37,6 +37,7 @@
+ char state_rcsid[] =
+ "$Id: state.c,v 1.12 1999/12/12 19:41:44 dholland Exp $";
+
++#include <stdarg.h>
+ #include "telnetd.h"
+
+ int not42 = 1;
+@@ -1365,7 +1366,7 @@ void send_status(void) {
+ ADD(IAC);
+ ADD(SE);
+
+- writenet(statusbuf, ncp - statusbuf);
++ output_datalen(statusbuf, ncp - statusbuf);
+ netflush(); /* Send it on its way */
+
+ DIAG(TD_OPTIONS, {printsub('>', statusbuf, ncp - statusbuf); netflush();});
+diff -up netkit-telnet-0.17/telnetd/termstat.c.sa-01-49 netkit-telnet-0.17/telnetd/termstat.c
+--- netkit-telnet-0.17/telnetd/termstat.c.sa-01-49 1999-12-12 15:59:45.000000000 +0100
++++ netkit-telnet-0.17/telnetd/termstat.c 2011-01-20 22:39:54.000000000 +0100
+@@ -128,7 +128,6 @@ static int _terminit = 0;
+ void
+ localstat()
+ {
+- void netflush();
+ int need_will_echo = 0;
+
+ /*
+diff -up netkit-telnet-0.17/telnetd/utility.c.sa-01-49 netkit-telnet-0.17/telnetd/utility.c
+--- netkit-telnet-0.17/telnetd/utility.c.sa-01-49 2011-01-20 22:39:54.000000000 +0100
++++ netkit-telnet-0.17/telnetd/utility.c 2011-01-20 22:48:02.000000000 +0100
+@@ -38,8 +38,10 @@ char util_rcsid[] =
+ "$Id: utility.c,v 1.11 1999/12/12 14:59:45 dholland Exp $";
+
+ #define PRINTOPTIONS
++#define _GNU_SOURCE
+
+ #include <stdarg.h>
++#include <stdio.h>
+ #include <sys/utsname.h>
+
+ #ifdef AUTHENTICATE
+@@ -52,6 +54,53 @@ char util_rcsid[] =
+ * utility functions performing io related tasks
+ */
+
++/*
++ * This function appends data to nfrontp and advances nfrontp.
++ * Returns the number of characters written altogether (the
++ * buffer may have been flushed in the process).
++ */
++
++int
++output_data(const char *format, ...)
++{
++ va_list args;
++ int len;
++ char *buf;
++
++ va_start(args, format);
++ if ((len = vasprintf(&buf, format, args)) == -1)
++ return -1;
++ output_datalen(buf, len);
++ va_end(args);
++ free(buf);
++ return (len);
++}
++
++void
++output_datalen(const char *buf, int len)
++{
++ int remaining, copied;
++
++ remaining = BUFSIZ - (nfrontp - netobuf);
++ while (len > 0) {
++ /* Free up enough space if the room is too low*/
++ if ((len > BUFSIZ ? BUFSIZ : len) > remaining) {
++ netflush();
++ remaining = BUFSIZ - (nfrontp - netobuf);
++ }
++
++ /* Copy out as much as will fit */
++ copied = remaining > len ? len : remaining;
++ memmove(nfrontp, buf, copied);
++ nfrontp += copied;
++ len -= copied;
++ remaining -= copied;
++ buf += copied;
++ }
++ return;
++}
++
++/**
+ void
+ netoprintf(const char *fmt, ...)
+ {
+@@ -67,7 +116,7 @@ netoprintf(const char *fmt, ...)
+ va_end(ap);
+
+ if (len<0 || len==maxsize) {
+- /* didn't fit */
++ / * did not fit * /
+ netflush();
+ }
+ else {
+@@ -76,6 +125,7 @@ netoprintf(const char *fmt, ...)
+ }
+ nfrontp += len;
+ }
++*/
+
+ /*
+ * ttloop
+@@ -273,10 +323,15 @@ netflush(void)
+ int n;
+
+ if ((n = nfrontp - nbackp) > 0) {
++
++#if 0
++ /* XXX This causes output_data() to recurse and die */
+ DIAG(TD_REPORT,
+ { netoprintf("td: netflush %d chars\r\n", n);
+ n = nfrontp - nbackp; /* update count */
+ });
++#endif
++
+ #if defined(ENCRYPT)
+ if (encrypt_output) {
+ char *s = nclearto ? nclearto : nbackp;
+@@ -310,11 +365,14 @@ netflush(void)
+ }
+ }
+ }
+- if (n < 0) {
+- if (errno == EWOULDBLOCK || errno == EINTR)
+- return;
+- cleanup(0);
+- }
++
++ if (n == -1) {
++ if (errno == EWOULDBLOCK || errno == EINTR)
++ return;
++ cleanup(0);
++ /* NOTREACHED */
++ }
++
+ nbackp += n;
+ #if defined(ENCRYPT)
+ if (nbackp > nclearto)
+@@ -332,7 +390,7 @@ netflush(void)
+ return;
+ } /* end of netflush */
+
+-
++#if 0
+ /*
+ * writenet
+ *
+@@ -355,7 +413,7 @@ void writenet(register unsigned char *pt
+ nfrontp += len;
+
+ } /* end of writenet */
+-
++#endif
+
+ /*
+ * miscellaneous functions doing a variety of little jobs follow ...
diff --git a/src/patches/telnet-client-cvs.patch0 b/src/patches/telnet-client-cvs.patch0
new file mode 100644
index 0000000..5fc57a7
--- /dev/null
+++ b/src/patches/telnet-client-cvs.patch0
@@ -0,0 +1,1721 @@
+diff -uNr telnet/Makefile telnet.obsd-cvs/Makefile
+--- telnet/Makefile Mon Jul 27 18:25:13 1998
++++ telnet.obsd-cvs/Makefile Sat Mar 10 10:54:26 2001
+@@ -36,22 +36,20 @@
+
+ PROG= telnet
+
+-CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DSKEY -Dunix
+-CFLAGS+=-DENV_HACK -D_USE_OLD_CURSES_
++CFLAGS+=-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY -Dunix
+ CFLAGS+=-I${.CURDIR}/../../lib
+-LDADD+= -locurses -ltelnet
+-DPADD= ${LIBOLDCURSES} ${LIBTELNET}
++LDADD+= -lcurses -ltelnet
++DPADD= ${LIBCURSES} ${LIBTELNET
+
+ SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \
+ terminal.c tn3270.c utilities.c
+
+ .include <bsd.own.mk> # for KERBEROS
+
+-.if (${KERBEROS} == "yes")
++.if (${KERBEROS:L} == "yes")
+ CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB4
+ LDADD+= -lkrb -ldes
+ DPADD+= ${LIBDES} ${LIBKRB}
+ .endif
+
+ .include <bsd.prog.mk>
+-
+diff -uNr telnet/commands.c telnet.obsd-cvs/commands.c
+--- telnet/commands.c Fri Apr 9 02:30:20 1999
++++ telnet.obsd-cvs/commands.c Sat Mar 10 10:51:22 2001
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: commands.c,v 1.20 1999/01/04 07:55:05 art Exp $ */
++/* $OpenBSD: commands.c,v 1.34 2000/11/08 21:49:44 aaron Exp $ */
+ /* $NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $ */
+
+ /*
+@@ -69,7 +69,7 @@
+ int status;
+
+ if(argc != 3) {
+- printf("%s sequence challenge\n", argv[0]);
++ printf("usage: %s sequence challenge\n", argv[0]);
+ return 0;
+ }
+
+@@ -2175,17 +2175,19 @@
+ int gotmachine = 0;
+ int l1 = strlen(m1);
+ int l2 = strlen(m2);
+- char m1save[64];
++ char m1save[MAXHOSTNAMELEN];
+
+ if (skiprc)
+ return;
+
+- strcpy(m1save, m1);
++ strncpy(m1save, m1, sizeof(m1save));
+ m1 = m1save;
+
+ if (rcname[0] == 0) {
+ char *home = getenv("HOME");
+
++ if (home == NULL || *home == '\0')
++ return;
+ snprintf (rcname, sizeof(rcname), "%s/.telnetrc",
+ home ? home : "");
+ }
+@@ -2248,15 +2250,9 @@
+ int
+ tn(int argc, char *argv[])
+ {
+- struct hostent *host = 0, *alias = 0;
+-#if defined(AF_INET6)
+- struct sockaddr_in6 sin6;
+-#endif
++ struct addrinfo hints, *res, *res0;
++ int error;
+ struct sockaddr_in sin;
+- struct sockaddr_in ladr;
+- struct sockaddr *sa;
+- int sa_size;
+- struct servent *sp = 0;
+ unsigned long temp;
+ #if !defined(__linux__)
+ extern char *inet_ntoa();
+@@ -2266,15 +2262,18 @@
+ int srlen;
+ #endif
+ char *cmd, *hostp = 0, *portp = 0, *user = 0, *aliasp = 0;
+- int family, port = 0;
+-
++ int retry;
++#ifdef NI_WITHSCOPEID
++ const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
++#else
++ const int niflags = NI_NUMERICHOST;
++#endif
++
+ /* clear the socket address prior to use */
+ memset((char *)&sin, 0, sizeof(sin));
+
+ if (connected) {
+ printf("?Already connected to %s\r\n", hostname);
+- seteuid(getuid());
+- setuid(getuid());
+ return 0;
+ }
+ if (argc < 2) {
+@@ -2324,8 +2323,6 @@
+ }
+ usage:
+ printf("usage: %s [-l user] [-a] host-name [port]\r\n", cmd);
+- seteuid(getuid());
+- setuid(getuid());
+ return 0;
+ }
+ if (hostp == 0)
+@@ -2340,185 +2337,80 @@
+ temp = sourceroute(hostp, &srp, &srlen);
+ if (temp == 0) {
+ herror(srp);
+- seteuid(getuid());
+- setuid(getuid());
+ return 0;
+ } else if (temp == -1) {
+ printf("Bad source route option: %s\r\n", hostp);
+- seteuid(getuid());
+- setuid(getuid());
+ return 0;
+ } else {
+ abort();
+ }
+- } else {
+-#endif
+- memset (&sin, 0, sizeof(sin));
+-#if defined(HAVE_INET_PTON) && defined(AF_INET6)
+- memset (&sin6, 0, sizeof(sin6));
+-
+- if(inet_pton(AF_INET6, hostp, &sin6.sin6_addr)) {
+- sin6.sin6_family = family = AF_INET6;
+- sa = (struct sockaddr *)&sin6;
+- sa_size = sizeof(sin6);
+- strcpy(_hostname, hostp);
+- hostname =_hostname;
+- } else
+-#endif
+- if(inet_aton(hostp, &sin.sin_addr)){
+- sin.sin_family = family = AF_INET;
+- sa = (struct sockaddr *)&sin;
+- sa_size = sizeof(sin);
+- strcpy(_hostname, hostp);
+- hostname = _hostname;
+- } else {
+-#ifdef HAVE_GETHOSTBYNAME2
+- host = gethostbyname2(hostp, AF_INET6);
+- if(host == NULL)
+- host = gethostbyname2(hostp, AF_INET);
+-#else
+- host = gethostbyname(hostp);
+-#endif
+- if (host) {
+- strncpy(_hostname, host->h_name, sizeof(_hostname));
+- family = host->h_addrtype;
+-
+- switch(family) {
+- case AF_INET:
+- memset(&sin, 0, sizeof(sin));
+- sa_size = sizeof(sin);
+- sa = (struct sockaddr *)&sin;
+- sin.sin_family = family;
+-
+- memcpy(&sin.sin_addr, *host->h_addr_list, sizeof(struct in_addr));
+- break;
+-#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
+- case AF_INET6:
+- memset(&sin6, 0, sizeof(sin6));
+- sa_size = sizeof(sin6);
+- sa = (struct sockaddr *)&sin6;
+- sin6.sin6_family = family;
+- memcpy(&sin6.sin6_addr, *host->h_addr_list, sizeof(struct in6_addr));
+- break;
+-#endif
+- default:
+- fprintf(stderr, "Bad address family: %d\n", family);
+- return 0;
+- }
+-
+- _hostname[sizeof(_hostname)-1] = '\0';
+- hostname = _hostname;
+- } else {
+- herror(hostp);
+- seteuid(getuid());
+- setuid(getuid());
+- return 0;
+- }
+- }
+-#if defined(IP_OPTIONS) && defined(IPPROTO_IP)
+- }
++ } else
+ #endif
+- if (portp) {
+- if (*portp == '-') {
+- portp++;
+- telnetport = 1;
+- } else
+- telnetport = 0;
+- port = atoi(portp);
+- if (port == 0) {
+- sp = getservbyname(portp, "tcp");
+- if (sp)
+- port = sp->s_port;
+- else {
+- printf("%s: bad port number\r\n", portp);
+- seteuid(getuid());
+- setuid(getuid());
+- return 0;
+- }
+- } else {
+- port = htons(port);
+- }
+- } else {
+- if (sp == 0) {
+- sp = getservbyname("telnet", "tcp");
+- if (sp == 0) {
+- fprintf(stderr, "telnet: tcp/telnet: unknown service\r\n");
+- seteuid(getuid());
+- setuid(getuid());
+- return 0;
+- }
+- port = sp->s_port;
++ {
++ hostname = hostp;
++ memset(&hints, 0, sizeof(hints));
++ hints.ai_family = PF_UNSPEC;
++ hints.ai_socktype = SOCK_STREAM;
++ hints.ai_flags = AI_CANONNAME;
++ if (portp == NULL) {
++ portp = "telnet";
++ } else if (*portp == '-') {
++ portp++;
++ telnetport = 1;
++ }
++ h_errno = 0;
++ error = getaddrinfo(hostp, portp, &hints, &res0);
++ if (error) {
++ if (error == EAI_SERVICE)
++ warnx("%s: bad port", portp);
++ else
++ warnx("%s: %s", hostp, gai_strerror(error));
++ if (h_errno)
++ herror(hostp);
++ return 0;
+ }
+- telnetport = 1;
+ }
+- switch(family) {
+- case AF_INET:
+- sin.sin_port = port;
+- printf("Trying %s...\r\n", inet_ntoa(sin.sin_addr));
+- break;
+-#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
+- case AF_INET6: {
+-#ifndef INET6_ADDRSTRLEN
+-#define INET6_ADDRSTRLEN 46
+-#endif
+
+- char buf[INET6_ADDRSTRLEN];
+-
+- sin6.sin6_port = port;
+-#ifdef HAVE_INET_NTOP
+- printf("Trying %s...\r\n", inet_ntop(AF_INET6,
+- &sin6.sin6_addr,
+- buf,
+- sizeof(buf)));
+-#endif
+- break;
+- }
+-#endif
+- default:
+- abort();
+- }
+-
+- do {
+- net = socket(family, SOCK_STREAM, 0);
+- seteuid(getuid());
+- setuid(getuid());
+- if (net < 0) {
+- perror("telnet: socket");
+- return 0;
++ net = -1;
++ retry = 0;
++ for (res = res0; res; res = res->ai_next) {
++ if (1 /* retry */) {
++ char hbuf[NI_MAXHOST];
++
++ if (getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf),
++ NULL, 0, niflags) != 0) {
++ strcpy(hbuf, "(invalid)");
++ }
++ printf("Trying %s...\r\n", hbuf);
+ }
++ net = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
++ if (net < 0)
++ continue;
++
+ if (aliasp) {
+- memset ((caddr_t)&ladr, 0, sizeof (ladr));
+- temp = inet_addr(aliasp);
+- if (temp != INADDR_NONE) {
+- ladr.sin_addr.s_addr = temp;
+- ladr.sin_family = AF_INET;
+- alias = gethostbyaddr((char *)&temp, sizeof(temp), AF_INET);
+- } else {
+- alias = gethostbyname(aliasp);
+- if (alias) {
+- ladr.sin_family = alias->h_addrtype;
+-#if defined(h_addr) /* In 4.3, this is a #define */
+- memmove((caddr_t)&ladr.sin_addr,
+- alias->h_addr_list[0], alias->h_length);
+-#else /* defined(h_addr) */
+- memmove((caddr_t)&ladr.sin_addr, alias->h_addr,
+- alias->h_length);
+-#endif /* defined(h_addr) */
+- } else {
+- herror(aliasp);
+- return 0;
+- }
++ struct addrinfo ahints, *ares;
++ memset(&ahints, 0, sizeof(ahints));
++ ahints.ai_family = PF_UNSPEC;
++ ahints.ai_socktype = SOCK_STREAM;
++ ahints.ai_flags = AI_PASSIVE;
++ error = getaddrinfo(aliasp, "0", &ahints, &ares);
++ if (error) {
++ warn("%s: %s", aliasp, gai_strerror(error));
++ close(net);
++ freeaddrinfo(ares);
++ continue;
+ }
+- ladr.sin_port = htons(0);
+-
+- if (bind (net, (struct sockaddr *)&ladr, sizeof(ladr)) < 0) {
+- perror(aliasp);;
++ if (bind(net, ares->ai_addr, ares->ai_addrlen) < 0) {
++ perror(aliasp);
+ (void) close(net); /* dump descriptor */
+- return 0;
++ freeaddrinfo(ares);
++ continue;
+ }
++ freeaddrinfo(ares);
+ }
+ #if defined(IP_OPTIONS) && defined(IPPROTO_IP)
+- if (srp && setsockopt(net, IPPROTO_IP, IP_OPTIONS, (char *)srp, srlen) < 0)
++ if (srp && res->ai_family == AF_INET
++ && setsockopt(net, IPPROTO_IP, IP_OPTIONS, (char *)srp, srlen) < 0)
+ perror("setsockopt (IP_OPTIONS)");
+ #endif
+ #if defined(IPPROTO_IP) && defined(IP_TOS)
+@@ -2542,65 +2434,32 @@
+ perror("setsockopt (SO_DEBUG)");
+ }
+
+- if (connect(net, sa, sa_size) < 0) {
+- int retry = 0;
+-
+- if (host && host->h_addr_list[1]) {
+- int oerrno = errno;
+- retry = 1;
+-
+- switch(family) {
+- case AF_INET :
+- fprintf(stderr, "telnet: connect to address %s: ",
+- inet_ntoa(sin.sin_addr));
+- ++host->h_addr_list;
+- memcpy(&sin.sin_addr, *host->h_addr_list, sizeof(struct in_addr));
+- break;
+-#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
+- case AF_INET6: {
+- char buf[INET6_ADDRSTRLEN];
+-
+- fprintf(stderr, "telnet: connect to address %s: ",
+- inet_ntop(AF_INET6, &sin6.sin6_addr, buf,
+- sizeof(buf)));
+- ++host->h_addr_list;
+- memcpy(&sin6.sin6_addr, *host->h_addr_list, sizeof(struct in6_addr));
+- break;
+- }
+-#endif
+- default:
+- abort();
+- }
+-
+- errno = oerrno;
+- perror(NULL);
+-
+- switch(family) {
+- case AF_INET :
+- printf("Trying %s...\r\n", inet_ntoa(sin.sin_addr));
+- break;
+-#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
+- case AF_INET6: {
+- printf("Trying %s...\r\n", inet_ntop(AF_INET6,
+- &sin6.sin6_addr,
+- buf,
+- sizeof(buf)));
+- break;
+- }
+-#endif
+- }
+-
+- (void) NetClose(net);
+- continue;
++ if (connect(net, res->ai_addr, res->ai_addrlen) < 0) {
++ char hbuf[NI_MAXHOST];
++
++ if (getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf),
++ NULL, 0, NI_NUMERICHOST) != 0) {
++ strcpy(hbuf, "(invalid)");
+ }
+- perror("telnet: Unable to connect to remote host");
+- return 0;
++ fprintf(stderr, "telnet: connect to address %s: %s\n", hbuf,
++ strerror(errno));
++
++ close(net);
++ net = -1;
++ retry++;
++ continue;
+ }
++
+ connected++;
+ #if defined(AUTHENTICATION) || defined(ENCRYPTION)
+ auth_encrypt_connect(connected);
+ #endif /* defined(AUTHENTICATION) */
+- } while (connected == 0);
++ break;
++ }
++ freeaddrinfo(res0);
++ if (net < 0) {
++ return 0;
++ }
+ cmdrc(hostp, hostname);
+ if (autologin && user == NULL) {
+ struct passwd *pw;
+@@ -2652,6 +2511,9 @@
+ encrypthelp[] = "turn on (off) encryption ('encrypt ?' for more)",
+ #endif
+ zhelp[] = "suspend telnet",
++#ifdef SKEY
++ skeyhelp[] = "compute response to s/key challenge",
++#endif
+ shellhelp[] = "invoke a subshell",
+ envhelp[] = "change environment variables ('environ ?' for more)",
+ modestring[] = "try to enter line or character mode ('mode ?' for more)";
+@@ -2690,7 +2552,7 @@
+ { "environ", envhelp, env_cmd, 0 },
+ { "?", helphelp, help, 0 },
+ #if defined(SKEY)
+- { "skey", NULL, skey_calc, 0 },
++ { "skey", skeyhelp, skey_calc, 0 },
+ #endif
+ { 0, 0, 0, 0 }
+ };
+diff -uNr telnet/externs.h telnet.obsd-cvs/externs.h
+--- telnet/externs.h Mon Feb 8 22:56:11 1999
++++ telnet.obsd-cvs/externs.h Sat Mar 10 10:54:35 2001
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: externs.h,v 1.4 1998/03/12 17:31:32 deraadt Exp $ */
++/* $OpenBSD: externs.h,v 1.5 1998/03/12 2001/01/22 11:03:38 fgsch Exp $ */
+ /* $KTH: externs.h,v 1.16 1997/11/29 02:28:35 joda Exp $ */
+
+ /*
+@@ -447,7 +447,7 @@
+ *Ibackp, /* Oldest byte of 3270 data */
+ Ibuf[], /* 3270 buffer */
+ *Ifrontp, /* Where next 3270 byte goes */
+- tline[],
++ tline[200],
+ *transcom; /* Transparent command */
+
+ extern int
+diff -uNr telnet/main.c telnet.obsd-cvs/main.c
+--- telnet/main.c Wed Apr 7 23:23:35 1999
++++ telnet.obsd-cvs/main.c Sat Mar 10 09:59:35 2001
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: main.c,v 1.7 1998/05/15 03:16:38 art Exp $ */
++/* $OpenBSD: main.c,v 1.10 2001/01/21 22:46:37 aaron Exp $ */
+ /* $NetBSD: main.c,v 1.5 1996/02/28 21:04:05 thorpej Exp $ */
+
+ /*
+@@ -81,10 +81,10 @@
+ prompt,
+ #ifdef AUTHENTICATION
+ "[-8] [-E] [-K] [-L] [-S tos] [-X atype] [-a] [-c] [-d] [-e char]",
+- "\n\t[-k realm] [-l user] [-f/-F] [-n tracefile] [-b hostalias ]",
++ "\n\t[-k realm] [-l user] [-f/-F] [-n tracefile] [-b hostalias ] ",
+ #else
+ "[-8] [-E] [-L] [-S tos] [-a] [-c] [-d] [-e char] [-l user]",
+- "\n\t[-n tracefile] [-b hostalias ]",
++ "\n\t[-n tracefile] [-b hostalias ] ",
+ #endif
+ #if defined(TN3270) && defined(unix)
+ # ifdef AUTHENTICATION
+@@ -95,13 +95,11 @@
+ #else
+ "[-r] ",
+ #endif
++ "\n\r "
+ #ifdef ENCRYPTION
+- "[-x] [host-name [port]]"
+-#else
+-
+- "[host-name [port]]"
++ "[-x] "
+ #endif
+- );
++ "[host-name [port]]");
+ exit(1);
+ }
+
+@@ -276,8 +274,8 @@
+ break;
+ case 't':
+ #if defined(TN3270) && defined(unix)
++ (void)strncpy(tline, optarg, sizeof(tline));
+ transcom = tline;
+- (void)strcpy(transcom, optarg);
+ #else
+ fprintf(stderr,
+ "%s: Warning: -t ignored, no TN3270 support.\n",
+diff -uNr telnet/sys_bsd.c telnet.obsd-cvs/sys_bsd.c
+--- telnet/sys_bsd.c Wed Apr 7 21:38:31 1999
++++ telnet.obsd-cvs/sys_bsd.c Sat Mar 10 10:55:18 2001
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: sys_bsd.c,v 1.6 1998/12/28 11:13:51 deraadt Exp $ */
++/* $OpenBSD: sys_bsd.c,v 1.8 2000/10/10 15:41:10 millert Exp $ */
+ /* $NetBSD: sys_bsd.c,v 1.11 1996/02/28 21:04:10 thorpej Exp $ */
+
+ /*
+@@ -35,6 +35,7 @@
+ */
+
+ #include "telnet_locl.h"
++#include <err.h>
+
+ /*
+ * The following routines try to encapsulate what is system dependent
+@@ -198,9 +199,10 @@
+ TerminalFlushOutput(void)
+ {
+ #ifdef TIOCFLUSH
+- (void) ioctl(fileno(stdout), TIOCFLUSH, (char *) 0);
++ int com = FWRITE;
++ (void) ioctl(fileno(stdout), TIOCFLUSH, (int *) &com);
+ #else
+- (void) ioctl(fileno(stdout), TCFLSH, (char *) 0);
++ (void) ioctl(fileno(stdout), TCFLSH, (int *) 0);
+ #endif
+ }
+
+diff -uNr telnet/telnet.c telnet.obsd-cvs/telnet.c
+--- telnet/telnet.c Wed Apr 7 23:22:14 1999
++++ telnet.obsd-cvs/telnet.c Sat Mar 10 11:02:34 2001
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: telnet.c,v 1.6 1998/07/27 15:29:29 millert Exp $ */
++/* $OpenBSD: telnet.c,v 1.11 2000/11/10 15:33:13 provos millert Exp $ */
+ /* $NetBSD: telnet.c,v 1.7 1996/02/28 21:04:15 thorpej Exp $ */
+
+ /*
+@@ -35,6 +35,8 @@
+ */
+
+ #include "telnet_locl.h"
++#include <curses.h>
++#include <term.h>
+
+ #define strip(x) (eight ? (x) : ((x) & 0x7f))
+
+@@ -523,10 +525,9 @@
+ }
+
+ /*
+- * Given a buffer returned by tgetent(), this routine will turn
+- * the pipe seperated list of names in the buffer into an array
+- * of pointers to null terminated names. We toss out any bad,
+- * duplicate, or verbose names (names with spaces).
++ * This routine will turn a pipe seperated list of names in the buffer
++ * into an array of pointers to NUL terminated names. We toss out any
++ * bad, duplicate, or verbose names (names with spaces).
+ */
+
+ int is_unique P((char *, char **, char **));
+@@ -554,7 +555,7 @@
+ /*
+ * Count up the number of names.
+ */
+- for (n = 1, cp = buf; *cp && *cp != ':'; cp++) {
++ for (n = 1, cp = buf; *cp; cp++) {
+ if (*cp == '|')
+ n++;
+ }
+@@ -659,25 +660,6 @@
+ return (1);
+ }
+
+-static char termbuf[1024];
+-
+-int telnet_setupterm P((char *tname, int fd, int *errp)); /* XXX move elsewhere */
+- /*ARGSUSED*/
+- int
+-telnet_setupterm(char *tname, int fd, int *errp)
+-{
+- (void)fd;
+- if (tgetent(termbuf, tname) == 1) {
+- termbuf[1023] = '\0';
+- if (errp)
+- *errp = 1;
+- return(0);
+- }
+- if (errp)
+- *errp = 0;
+- return(-1);
+-}
+-
+ int resettermname = 1;
+
+ char *gettermname P((void)); /* XXX move elsewhere */
+@@ -687,15 +669,15 @@
+ char *tname;
+ static char **tnamep = 0;
+ static char **next;
+- int err;
++ int errret;
+
+ if (resettermname) {
+ resettermname = 0;
+ if (tnamep && tnamep != unknown)
+ free(tnamep);
+ if ((tname = (char *)env_getvalue((unsigned char *)"TERM")) &&
+- (telnet_setupterm(tname, 1, &err) == 0)) {
+- tnamep = mklist(termbuf, tname);
++ (setupterm(tname, 1, &errret) == 0)) {
++ tnamep = mklist(ttytype, tname);
+ } else {
+ if (tname && ((int)strlen(tname) <= 40)) {
+ unknown[0] = tname;
+@@ -1482,10 +1464,15 @@
+ void
+ env_opt_start(void)
+ {
+- if (opt_reply)
+- opt_reply = (unsigned char *)realloc(opt_reply, OPT_REPLY_SIZE);
+- else
+- opt_reply = (unsigned char *)malloc(OPT_REPLY_SIZE);
++ unsigned char *p;
++
++ if (opt_reply) {
++ p = (unsigned char *)realloc(opt_reply, OPT_REPLY_SIZE);
++ if (p == NULL)
++ free(opt_reply);
++ } else
++ p = (unsigned char *)malloc(OPT_REPLY_SIZE);
++ opt_reply = p;
+ if (opt_reply == NULL) {
+ /*@*/ printf("env_opt_start: malloc()/realloc() failed!!!\n");
+ opt_reply = opt_replyp = opt_replyend = NULL;
+@@ -1532,9 +1519,13 @@
+ strlen((char *)ep) + 6 > opt_replyend)
+ {
+ int len;
++ unsigned char *p;
+ opt_replyend += OPT_REPLY_SIZE;
+ len = opt_replyend - opt_reply;
+- opt_reply = (unsigned char *)realloc(opt_reply, len);
++ p = (unsigned char *)realloc(opt_reply, len);
++ if (p == NULL)
++ free(opt_reply);
++ opt_reply = p;
+ if (opt_reply == NULL) {
+ /*@*/ printf("env_opt_add: realloc() failed!!!\n");
+ opt_reply = opt_replyp = opt_replyend = NULL;
+@@ -1945,7 +1936,7 @@
+ command(0, "z\n", 2);
+ continue;
+ }
+- if (sc == escape) {
++ if (sc == escape && escape != _POSIX_VDISABLE) {
+ command(0, (char *)tbp, tcc);
+ bol = 1;
+ count += tcc;
+@@ -1962,7 +1953,7 @@
+ }
+ if ((sc == '\n') || (sc == '\r'))
+ bol = 1;
+- } else if (sc == escape) {
++ } else if (sc == escape && escape != _POSIX_VDISABLE) {
+ /*
+ * Double escape is a pass through of a single escape character.
+ */
+diff -uNr telnet/telnet_locl.h telnet.obsd-cvs/telnet_locl.h
+--- telnet/telnet_locl.h Thu Mar 12 06:57:44 1998
++++ telnet.obsd-cvs/telnet_locl.h Sat Mar 10 11:12:37 2001
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: telnet_locl.h,v 1.1 1998/03/12 04:57:44 art Exp $ */
++/* $OpenBSD: telnet_locl.h,v 1.2 1999/12/11 09:08:09 itojun Exp $ */
+ /* $KTH: telnet_locl.h,v 1.13 1997/11/03 21:37:55 assar Exp $ */
+
+ /*
+@@ -86,7 +86,5 @@
+ #include "defines.h"
+ #include "types.h"
+
+-#undef AF_INET6 /* XXX - it has not been tested and it doesn't exist yet */
+-
+ /* prototypes */
+
+diff -uNr libtelnet/kerberos.c libtelnet.obsd-cvs/kerberos.c
+--- libtelnet/kerberos.c Mon Feb 8 23:38:17 1999
++++ libtelnet.obsd-cvs/kerberos.c Sat Mar 10 11:11:03 2001
+@@ -320,11 +320,10 @@
+ char ts[MAXPATHLEN];
+ struct passwd *pw = getpwnam(UserNameRequested);
+
+- if(pw){
++ if (pw) {
+ snprintf(ts, sizeof(ts),
+- "%s%u",
+- TKT_ROOT,
+- (unsigned)pw->pw_uid);
++ "%s%u", TKT_ROOT, (unsigned)pw->pw_uid);
++ /* XXX allocation failure? */
+ setenv("KRBTKFILE", ts, 1);
+ }
+ Data(ap, KRB_ACCEPT, NULL, 0);
+@@ -609,16 +608,26 @@
+ {
+ unsigned char *p = buf;
+
+- p += krb_put_nir(cred->service, cred->instance, cred->realm, p);
++ memcpy (p, cred->service, ANAME_SZ);
++ p += ANAME_SZ;
++ memcpy (p, cred->instance, INST_SZ);
++ p += INST_SZ;
++ memcpy (p, cred->realm, REALM_SZ);
++ p += REALM_SZ;
+ memcpy(p, cred->session, 8);
+ p += 8;
+ *p++ = cred->lifetime;
+ *p++ = cred->kvno;
+- p += krb_put_int(cred->ticket_st.length, p, 4);
++ p += krb_put_int(cred->ticket_st.length, p, 4, 4);
+ memcpy(p, cred->ticket_st.dat, cred->ticket_st.length);
+ p += cred->ticket_st.length;
+- p += krb_put_int(cred->issue_date, p, 4);
+- p += krb_put_nir(cred->pname, cred->pinst, NULL, p);
++ p += krb_put_int(cred->issue_date, p, 4, 4);
++ strncpy (cred->pname, p, ANAME_SZ);
++ cred->pname[ANAME_SZ - 1] = '\0';
++ p += ANAME_SZ;
++ strncpy (cred->pinst, p, INST_SZ);
++ cred->pinst[INST_SZ - 1] = '\0';
++ p += INST_SZ;
+ return p - buf;
+ }
+
+@@ -627,7 +636,16 @@
+ {
+ unsigned char *p = buf;
+
+- p += krb_get_nir(p, cred->service, cred->instance, cred->realm);
++ strncpy (cred->service, p, ANAME_SZ);
++ cred->service[ANAME_SZ - 1] = '\0';
++ p += ANAME_SZ;
++ strncpy (cred->instance, p, INST_SZ);
++ cred->instance[INST_SZ - 1] = '\0';
++ p += INST_SZ;
++ strncpy (cred->realm, p, REALM_SZ);
++ cred->realm[REALM_SZ - 1] = '\0';
++ p += REALM_SZ;
++
+ memcpy(cred->session, p, 8);
+ p += 8;
+ cred->lifetime = *p++;
+@@ -636,7 +654,10 @@
+ memcpy(cred->ticket_st.dat, p, cred->ticket_st.length);
+ cred->ticket_st.mbz = 0;
+ p += krb_get_int(p, (u_int32_t *)&cred->issue_date, 4, 0);
+- p += krb_get_nir(p, cred->pname, cred->pinst, NULL);
++ p += krb_get_nir(p,
++ cred->pname, sizeof(cred->pname),
++ cred->pinst, sizeof(cred->pinst),
++ NULL, 0);
+ return 0;
+ }
+
+--- telnet/telnet.1 Thu Nov 12 01:01:46 1998
++++ telnet.obsd-cvs/telnet.1 Thu Nov 9 19:52:41 2000
+@@ -1,4 +1,4 @@
+-.\" $OpenBSD: telnet.1,v 1.14 1998/11/11 23:01:46 aaron Exp $
++.\" $OpenBSD: telnet.1,v 1.27 2000/11/09 17:52:41 aaron Exp $
+ .\" $NetBSD: telnet.1,v 1.5 1996/02/28 21:04:12 thorpej Exp $
+ .\"
+ .\" Copyright (c) 1983, 1990, 1993
+@@ -36,45 +36,34 @@
+ .\"
+ .Dd February 3, 1994
+ .Dt TELNET 1
+-.Os BSD 4.2
++.Os
+ .Sh NAME
+ .Nm telnet
+-.Nd user interface to the
++.Nd user interface to the
+ .Tn TELNET
+ protocol
+ .Sh SYNOPSIS
+ .Nm telnet
+-.Op Fl 8
+-.Op Fl E
+-.Op Fl F
+-.Op Fl K
+-.Op Fl L
+-.Op Fl S Ar tos
++.Op Fl 8EFKLacdfrx
+ .Op Fl X Ar authtype
+-.Op Fl a
+ .Op Fl b Ar hostalias
+-.Op Fl c
+-.Op Fl d
+ .Op Fl e Ar escapechar
+-.Op Fl f
+ .Op Fl k Ar realm
+ .Op Fl l Ar user
+ .Op Fl n Ar tracefile
+-.Op Fl r
+-.Op Fl x
+ .Oo
+ .Ar host
+ .Op Ar port
+ .Oc
+ .Sh DESCRIPTION
+ The
+-.Nm telnet
++.Nm
+ command
+-is used to communicate with another host using the
++is used to communicate with another host using the
+ .Tn TELNET
+ protocol.
+ If
+-.Nm telnet
++.Nm
+ is invoked without the
+ .Ar host
+ argument, it enters command mode,
+@@ -85,11 +74,11 @@
+ .Ic open
+ command with those arguments.
+ .Pp
+-Options:
+-.Bl -tag -width indent
++The options are as follows:
++.Bl -tag -width Ds
+ .It Fl 8
+-Specifies an 8-bit data path. This causes an attempt to
+-negotiate the
++Specifies an 8-bit data path.
++This causes an attempt to negotiate the
+ .Dv TELNET BINARY
+ option on both input and output.
+ .It Fl E
+@@ -103,18 +92,9 @@
+ .It Fl K
+ Specifies no automatic login to the remote system.
+ .It Fl L
+-Specifies an 8-bit data path on output. This causes the
+-BINARY option to be negotiated on output.
+-.It Fl S Ar tos
+-Sets the IP type-of-service (TOS) option for the telnet
+-connection to the value
+-.Ar tos ,
+-which can be a numeric TOS value
+-or, on systems that support it, a symbolic
+-TOS name found in the
+-.Pa /etc/iptos
+-file.
+-.It Fl X Ar atype
++Specifies an 8-bit data path on output.
++This causes the BINARY option to be negotiated on output.
++.It Fl X Ar atype
+ Disables the
+ .Ar atype
+ type of authentication.
+@@ -144,7 +124,8 @@
+ .It Fl c
+ Disables the reading of the user's
+ .Pa \&.telnetrc
+-file. (See the
++file.
++(See the
+ .Ic toggle skiprc
+ command on this man page.)
+ .It Fl d
+@@ -152,7 +133,7 @@
+ .Ic debug
+ toggle to
+ .Dv TRUE .
+-.It Fl e Ar escapechar
++.It Fl e Ar escapechar
+ Sets the initial
+ .Nm
+ escape character to
+@@ -169,14 +150,14 @@
+ If Kerberos authentication is being used, the
+ .Fl k
+ option requests that
+-.Nm telnet
++.Nm
+ obtain tickets for the remote host in
+ realm
+ .Ar realm
+ instead of the remote host's realm, as determined
+ by
+ .Xr krb_realmofhost 3 .
+-.It Fl l Ar user
++.It Fl l Ar user
+ When connecting to the remote system, if the remote system
+ understands the
+ .Ev ENVIRON
+@@ -189,7 +170,7 @@
+ This option may also be used with the
+ .Ic open
+ command.
+-.It Fl n Ar tracefile
++.It Fl n Ar tracefile
+ Opens
+ .Ar tracefile
+ for recording trace information.
+@@ -210,35 +191,38 @@
+ Indicates the official name, an alias, or the Internet address
+ of a remote host.
+ .It Ar port
+-Indicates a port number (address of an application). If a number is
+-not specified, the default
+-.Nm telnet
++Indicates a port number (address of an application).
++If a number is not specified, the default
++.Nm
+ port is used.
+ .El
+ .Pp
+-When in rlogin mode, a line of the form ~. disconnects from the
++When in rlogin mode, a line of the form ~.
++disconnects from the
+ remote host; ~ is the telnet escape character.
+ Similarly, the line ~^Z suspends the telnet session.
+ The line ~^] escapes to the normal telnet escape prompt.
+ .Pp
+ Once a connection has been opened,
+-.Nm telnet
++.Nm
+ will attempt to enable the
+ .Dv TELNET LINEMODE
+ option.
+ If this fails,
+-.Nm telnet
++.Nm
+ will revert to one of two input modes:
+ either ``character at a time''
+ or ``old line by line''
+ depending on what the remote system supports.
+ .Pp
+-When
++When
+ .Dv LINEMODE
+ is enabled, character processing is done on the
+-local system, under the control of the remote system. When input
++local system, under the control of the remote system.
++When input
+ editing or character echoing is to be disabled, the remote system
+-will relay that information. The remote system will also relay
++will relay that information.
++The remote system will also relay
+ changes to any special characters that happen on the remote
+ system, so that they can take effect on the local system.
+ .Pp
+@@ -252,7 +236,7 @@
+ (this would mostly be used to enter passwords
+ without the password being echoed).
+ .Pp
+-If the
++If the
+ .Dv LINEMODE
+ option is enabled, or if the
+ .Ic localchars
+@@ -267,7 +251,7 @@
+ characters are trapped locally, and sent as
+ .Tn TELNET
+ protocol sequences to the remote side.
+-If
++If
+ .Dv LINEMODE
+ has ever been enabled, then the user's
+ .Ic susp
+@@ -278,9 +262,9 @@
+ protocol sequences,
+ and
+ .Ic quit
+-is sent as a
++is sent as a
+ .Dv TELNET ABORT
+-instead of
++instead of
+ .Dv BREAK .
+ There are options (see
+ .Ic toggle
+@@ -296,17 +280,26 @@
+ (in the case of
+ .Ic quit
+ and
+-.Ic intr ) .
++.Ic intr ) .
+ .Pp
+ While connected to a remote host,
+-.Nm telnet
++.Nm
+ command mode may be entered by typing the
+-.Nm telnet
++.Nm
+ ``escape character'' (initially ``^]'').
+ When in command mode, the normal terminal editing conventions are available.
++Note that the escape character will return to the command mode of the initial
++invocation of
++.Nm
++that has the controlling terminal.
++Use the
++.Cm send escape
++command to switch to command mode in subsequent
++.Nm
++processes on remote hosts.
+ .Pp
+ The following
+-.Nm telnet
++.Nm
+ commands are available.
+ Only enough of each command to uniquely identify it need be typed
+ (this is also true for arguments to the
+@@ -320,26 +313,28 @@
+ .Ic display
+ commands).
+ .Bl -tag -width "mode type"
+-.It Ic auth Ar argument Op Ar ...
++.It Ic auth Ar argument Op Ar ...
+ The
+ .Ic auth
+ command manipulates the information sent through the
+ .Dv TELNET AUTHENTICATE
+-option. Valid arguments for the
+-auth command are as follows:
++option.
++Valid arguments for the
++.Ic auth
++command are as follows:
+ .Bl -tag -width "disable type"
+ .It Ic disable Ar type
+ Disables the specified
+ .Ar type
+-of authentication. To
+-obtain a list of available types, use the
++of authentication.
++To obtain a list of available types, use the
+ .Ic auth disable \&?
+ command.
+ .It Ic enable Ar type
+ Enables the specified
+ .Ar type
+-of authentication. To
+-obtain a list of available types, use the
++of authentication.
++To obtain a list of available types, use the
+ .Ic auth enable \&?
+ command.
+ .It Ic status
+@@ -350,7 +345,7 @@
+ Close a
+ .Tn TELNET
+ session and return to command mode.
+-.It Ic display Ar argument Op Ar ...
++.It Ic display Ar argument Op Ar ...
+ Displays all, or some, of the
+ .Ic set
+ and
+@@ -368,26 +363,27 @@
+ .It Ic disable Ar type Ic [input|output]
+ Disables the specified
+ .Ar type
+-of encryption. If you
+-omit
++of encryption.
++If you omit
+ .Ic input
+ and
+ .Ic output ,
+ both input and output
+-are disabled. To obtain a list of available
+-types, use the
++are disabled.
++To obtain a list of available types, use the
+ .Ic encrypt disable \&?
+ command.
+ .It Ic enable Ar type Ic [input|output]
+ Enables the specified
+ .Ar type
+-of encryption. If you
+-omit
++of encryption.
++If you omit
+ .Ic input
+ and
+ .Ic output ,
+ both input and output are
+-enabled. To obtain a list of available types, use the
++enabled.
++To obtain a list of available types, use the
+ .Ic encrypt enable \&?
+ command.
+ .It Ic input
+@@ -407,18 +403,20 @@
+ .Ic encrypt stop output
+ command.
+ .It Ic start Ic [input|output]
+-Attempts to start encryption. If you omit
++Attempts to start encryption.
++If you omit
+ .Ic input
+ and
+-.Ic output,
+-both input and output are enabled. To
+-obtain a list of available types, use the
++.Ic output ,
++both input and output are enabled.
++To obtain a list of available types, use the
+ .Ic encrypt enable \&?
+ command.
+ .It Ic status
+ Lists the current status of encryption.
+ .It Ic stop Ic [input|output]
+-Stops encryption. If you omit
++Stops encryption.
++If you omit
+ .Ic input
+ and
+ .Ic output ,
+@@ -431,7 +429,7 @@
+ .Ic encrypt stop
+ commands.
+ .El
+-.It Ic environ Ar arguments Op Ar ...
++.It Ic environ Ar arguments Op Ar ...
+ The
+ .Ic environ
+ command is used to manipulate the
+@@ -456,7 +454,7 @@
+ .Ic environ
+ command are:
+ .Bl -tag -width Fl
+-.It Ic define Ar variable value
++.It Ic define Ar variable value
+ Define the variable
+ .Ar variable
+ to have a value of
+@@ -466,15 +464,15 @@
+ .Ar value
+ may be enclosed in single or double quotes so
+ that tabs and spaces may be included.
+-.It Ic undefine Ar variable
++.It Ic undefine Ar variable
+ Remove
+ .Ar variable
+ from the list of environment variables.
+-.It Ic export Ar variable
++.It Ic export Ar variable
+ Mark the variable
+ .Ar variable
+ to be exported to the remote side.
+-.It Ic unexport Ar variable
++.It Ic unexport Ar variable
+ Mark the variable
+ .Ar variable
+ to not be exported unless
+@@ -508,7 +506,7 @@
+ suspending a user's session for later reattachment,
+ the logout argument indicates that you
+ should terminate the session immediately.
+-.It Ic mode Ar type
++.It Ic mode Ar type
+ .Ar type
+ is one of several options, depending on the state of the
+ .Tn TELNET
+@@ -529,40 +527,40 @@
+ option, or, if the remote side does not understand the
+ .Dv LINEMODE
+ option, then attempt to enter ``old-line-by-line'' mode.
+-.It Ic isig Pq Ic \-isig
+-Attempt to enable (disable) the
++.It Ic isig Pq Ic \-isig
++Attempt to enable (disable) the
+ .Dv TRAPSIG
+-mode of the
++mode of the
+ .Dv LINEMODE
+ option.
+-This requires that the
++This requires that the
+ .Dv LINEMODE
+ option be enabled.
+-.It Ic edit Pq Ic \-edit
+-Attempt to enable (disable) the
++.It Ic edit Pq Ic \-edit
++Attempt to enable (disable) the
+ .Dv EDIT
+-mode of the
++mode of the
+ .Dv LINEMODE
+ option.
+-This requires that the
++This requires that the
+ .Dv LINEMODE
+ option be enabled.
+-.It Ic softtabs Pq Ic \-softtabs
+-Attempt to enable (disable) the
++.It Ic softtabs Pq Ic \-softtabs
++Attempt to enable (disable) the
+ .Dv SOFT_TAB
+-mode of the
++mode of the
+ .Dv LINEMODE
+ option.
+-This requires that the
++This requires that the
+ .Dv LINEMODE
+ option be enabled.
+-.It Ic litecho Pq Ic \-litecho
+-Attempt to enable (disable) the
++.It Ic litecho Pq Ic \-litecho
++Attempt to enable (disable) the
+ .Dv LIT_ECHO
+-mode of the
++mode of the
+ .Dv LINEMODE
+ option.
+-This requires that the
++This requires that the
+ .Dv LINEMODE
+ option be enabled.
+ .It Ic \&?
+@@ -579,7 +577,7 @@
+ Open a connection to the named host.
+ If no port number
+ is specified,
+-.Nm telnet
++.Nm
+ will attempt to contact a
+ .Tn TELNET
+ server at the default port.
+@@ -594,24 +592,29 @@
+ .Ev ENVIRON
+ option.
+ When connecting to a non-standard port,
+-.Nm telnet
++.Nm
+ omits any automatic initiation of
+ .Tn TELNET
+-options. When the port number is preceded by a minus sign,
++options.
++When the port number is preceded by a minus sign,
+ the initial option negotiation is done.
+ After establishing a connection, the file
+ .Pa \&.telnetrc
+ in the
+-user's home directory is opened. Lines beginning with a ``#'' are
+-comment lines. Blank lines are ignored. Lines that begin
+-without white space are the start of a machine entry. The
+-first thing on the line is the name of the machine that is
+-being connected to. The rest of the line, and successive
+-lines that begin with white space are assumed to be
+-.Nm telnet
++user's home directory is opened.
++Lines beginning with a ``#'' are
++comment lines.
++Blank lines are ignored.
++Lines that begin
++without whitespace are the start of a machine entry.
++The first thing on the line is the name of the machine that is
++being connected to.
++The rest of the line, and successive
++lines that begin with whitespace are assumed to be
++.Nm
+ commands and are processed as if they had been typed
+ in manually to the
+-.Nm telnet
++.Nm
+ command prompt.
+ .It Ic quit
+ Close any open
+@@ -619,7 +622,7 @@
+ session and exit
+ .Nm telnet .
+ An end-of-file (in command mode) will also close a session and exit.
+-.It Ic send Ar arguments
++.It Ic send Ar arguments
+ Sends one or more special character sequences to the remote host.
+ The following are the arguments which may be specified
+ (more than one argument may be specified at a time):
+@@ -673,7 +676,7 @@
+ sequence.
+ .It Ic escape
+ Sends the current
+-.Nm telnet
++.Nm
+ escape character (initially ``^]'').
+ .It Ic ga
+ Sends the
+@@ -788,12 +791,12 @@
+ .Ic send
+ command.
+ .El
+-.It Ic set Ar argument value
+-.It Ic unset Ar argument value
++.It Ic set Ar argument value
++.It Ic unset Ar argument value
+ The
+ .Ic set
+ command will set any one of a number of
+-.Nm telnet
++.Nm
+ variables to a specific value or to
+ .Dv TRUE .
+ The special value
+@@ -811,7 +814,8 @@
+ .Ic display
+ command.
+ The variables which may be set or unset, but not toggled, are
+-listed here. In addition, any of the variables for the
++listed here.
++In addition, any of the variables for the
+ .Ic toggle
+ command may be explicitly set or unset using
+ the
+@@ -832,7 +836,8 @@
+ sequence (see
+ .Ic send ayt
+ preceding) is sent to the
+-remote host. The initial value for the "Are You There"
++remote host.
++The initial value for the "Are You There"
+ character is the terminal's status character.
+ .It Ic echo
+ This is the value (initially ``^E'') which, when in
+@@ -841,7 +846,7 @@
+ echoing of entered characters (for entering, say, a password).
+ .It Ic eof
+ If
+-.Nm telnet
++.Nm
+ is operating in
+ .Dv LINEMODE
+ or ``old line by line'' mode, entering this character
+@@ -854,7 +859,7 @@
+ character.
+ .It Ic erase
+ If
+-.Nm telnet
++.Nm
+ is in
+ .Ic localchars
+ mode (see
+@@ -862,7 +867,7 @@
+ .Ic localchars
+ below),
+ and if
+-.Nm telnet
++.Nm
+ is operating in ``character at a time'' mode, then when this
+ character is typed, a
+ .Dv TELNET EC
+@@ -879,14 +884,14 @@
+ character.
+ .It Ic escape
+ This is the
+-.Nm telnet
++.Nm
+ escape character (initially ``^['') which causes entry
+ into
+-.Nm telnet
++.Nm
+ command mode (when connected to a remote system).
+ .It Ic flushoutput
+ If
+-.Nm telnet
++.Nm
+ is in
+ .Ic localchars
+ mode (see
+@@ -916,12 +921,13 @@
+ .Dv LINEMODE ,
+ these are the
+ characters that, when typed, cause partial lines to be
+-forwarded to the remote system. The initial value for
++forwarded to the remote system.
++The initial value for
+ the forwarding characters are taken from the terminal's
+ eol and eol2 characters.
+ .It Ic interrupt
+ If
+-.Nm telnet
++.Nm
+ is in
+ .Ic localchars
+ mode (see
+@@ -945,7 +951,7 @@
+ character.
+ .It Ic kill
+ If
+-.Nm telnet
++.Nm
+ is in
+ .Ic localchars
+ mode (see
+@@ -953,7 +959,7 @@
+ .Ic localchars
+ below),
+ and if
+-.Nm telnet
++.Nm
+ is operating in ``character at a time'' mode, then when this
+ character is typed, a
+ .Dv TELNET EL
+@@ -970,7 +976,7 @@
+ character.
+ .It Ic lnext
+ If
+-.Nm telnet
++.Nm
+ is operating in
+ .Dv LINEMODE
+ or ``old line by line'' mode, then this character is taken to
+@@ -985,7 +991,7 @@
+ character.
+ .It Ic quit
+ If
+-.Nm telnet
++.Nm
+ is in
+ .Ic localchars
+ mode (see
+@@ -1009,7 +1015,7 @@
+ character.
+ .It Ic reprint
+ If
+-.Nm telnet
++.Nm
+ is operating in
+ .Dv LINEMODE
+ or old line by line'' mode, then this character is taken to
+@@ -1031,8 +1037,9 @@
+ This character, at the beginning of a line, followed by
+ a "." closes the connection; when followed by a ^Z it
+ suspends the
+-.Nm telnet
+-command. The initial state is to
++.Nm
++command.
++The initial state is to
+ disable the
+ .Ic rlogin
+ escape character.
+@@ -1066,7 +1073,7 @@
+ character.
+ .It Ic susp
+ If
+-.Nm telnet
++.Nm
+ is in
+ .Ic localchars
+ mode, or
+@@ -1093,12 +1100,13 @@
+ .Ic option
+ tracing being
+ .Dv TRUE ,
+-will be written. If it is set to
++will be written.
++If it is set to
+ .Dq Fl ,
+ then tracing information will be written to standard output (the default).
+ .It Ic worderase
+ If
+-.Nm telnet
++.Nm
+ is operating in
+ .Dv LINEMODE
+ or ``old line by line'' mode, then this character is taken to
+@@ -1117,25 +1125,32 @@
+ .Pq Ic unset
+ commands.
+ .El
+-.It Ic slc Ar state
++.It Ic skey Ar sequence challenge
++The
++.Ic skey
++command computes a response to the S/Key challenge.
++See
++.Xr skey 1
++for more information on the S/Key system.
++.It Ic slc Ar state
+ The
+ .Ic slc
+ command (Set Local Characters) is used to set
+ or change the state of the special
+-characters when the
++characters when the
+ .Dv TELNET LINEMODE
+ option has
+-been enabled. Special characters are characters that get
+-mapped to
++been enabled.
++Special characters are characters that get mapped to
+ .Tn TELNET
+ commands sequences (like
+ .Ic ip
+ or
+-.Ic quit )
++.Ic quit )
+ or line editing characters (like
+ .Ic erase
+ and
+-.Ic kill ) .
++.Ic kill ) .
+ By default, the local special characters are exported.
+ .Bl -tag -width Fl
+ .It Ic check
+@@ -1144,15 +1159,15 @@
+ character settings, and if there are any discrepancies with
+ the local side, the local side will switch to the remote value.
+ .It Ic export
+-Switch to the local defaults for the special characters. The
+-local default characters are those of the local terminal at
++Switch to the local defaults for the special characters.
++The local default characters are those of the local terminal at
+ the time when
+-.Nm telnet
++.Nm
+ was started.
+ .It Ic import
+ Switch to the remote defaults for the special characters.
+ The remote default characters are those of the remote system
+-at the time when the
++at the time when the
+ .Tn TELNET
+ connection was established.
+ .It Ic \&?
+@@ -1165,13 +1180,13 @@
+ .Nm telnet .
+ This includes the peer one is connected to, as well
+ as the current mode.
+-.It Ic toggle Ar arguments Op Ar ...
++.It Ic toggle Ar arguments Op Ar ...
+ Toggle (between
+ .Dv TRUE
+ and
+ .Dv FALSE )
+ various flags that control how
+-.Nm telnet
++.Nm
+ responds to events.
+ These flags may be set explicitly to
+ .Dv TRUE
+@@ -1206,7 +1221,7 @@
+ sequences; see
+ .Ic set
+ above for details),
+-.Nm telnet
++.Nm
+ refuses to display any data on the user's terminal
+ until the remote system acknowledges (via a
+ .Dv TELNET TIMING MARK
+@@ -1220,13 +1235,14 @@
+ done an "stty noflsh", otherwise
+ .Dv FALSE
+ (see
+-.Xr stty 1 ) .
++.Xr stty 1 ) .
+ .It Ic autodecrypt
+ When the
+ .Dv TELNET ENCRYPT
+ option is negotiated, by
+ default the actual encryption (decryption) of the data
+-stream does not start automatically. The
++stream does not start automatically.
++The
+ .Ic autoencrypt
+ .Pq Ic autodecrypt
+ command states that encryption of the
+@@ -1238,7 +1254,8 @@
+ .Dv TELNET AUTHENTICATION
+ option
+ .Tn TELNET
+-attempts to use it to perform automatic authentication. If the
++attempts to use it to perform automatic authentication.
++If the
+ .Dv AUTHENTICATION
+ option is not supported, the user's login
+ name are propagated through the
+@@ -1314,7 +1331,7 @@
+ The initial value for this toggle is
+ .Dv FALSE .
+ .It Ic debug
+-Toggles socket level debugging (useful only to the super-user).
++Toggles socket level debugging (useful only to the superuser).
+ The initial value for this toggle is
+ .Dv FALSE .
+ .It Ic encdebug
+@@ -1340,7 +1357,7 @@
+ .Ic brk ,
+ .Ic ec ,
+ and
+-.Ic el ;
++.Ic el ;
+ see
+ .Ic send
+ above).
+@@ -1379,7 +1396,7 @@
+ .Dv FALSE .
+ .It Ic options
+ Toggles the display of some internal
+-.Nm telnet
++.Nm
+ protocol processing (having to do with
+ .Tn TELNET
+ options).
+@@ -1404,8 +1421,8 @@
+ skips the reading of the
+ .Pa \&.telnetrc
+ file in the user's home
+-directory when connections are opened. The initial
+-value for this toggle is
++directory when connections are opened.
++The initial value for this toggle is
+ .Dv FALSE .
+ .It Ic termdata
+ Toggles the display of all terminal data (in hexadecimal format).
+@@ -1416,9 +1433,10 @@
+ .Ic verbose_encrypt
+ toggle is
+ .Dv TRUE ,
+-.Nm telnet
++.Nm
+ prints out a message each time encryption is enabled or
+-disabled. The initial value for this toggle is
++disabled.
++The initial value for this toggle is
+ .Dv FALSE .
+ .It Ic \&?
+ Displays the legal
+@@ -1430,22 +1448,24 @@
+ .Nm telnet .
+ This command only works when the user is using the
+ .Xr csh 1 .
+-.It Ic \&! Op Ar command
++.It Ic \&! Op Ar command
+ Execute a single command in a subshell on the local
+-system. If
++system.
++If
+ .Ar command
+ is omitted, then an interactive
+ subshell is invoked.
+-.It Ic \&? Op Ar command
+-Get help. With no arguments,
+-.Nm telnet
++.It Ic \&? Op Ar command
++Get help.
++With no arguments,
++.Nm
+ prints a help summary.
+ If a command is specified,
+-.Nm telnet
++.Nm
+ will print the help information for just that command.
+ .El
+ .Sh ENVIRONMENT
+-.Nm telnet
++.Nm
+ uses at least the
+ .Ev HOME ,
+ .Ev SHELL ,
+@@ -1464,16 +1484,18 @@
+ .El
+ .Sh HISTORY
+ The
+-.Nm telnet
++.Nm
+ command appeared in
+ .Bx 4.2 .
+ .Sh NOTES
+ On some remote systems, echo has to be turned off manually when in
+ ``old line by line'' mode.
+ .Pp
+-In ``old line by line'' mode or
++In ``old line by line'' mode or
+ .Dv LINEMODE
+ the terminal's
+ .Ic eof
+ character is only recognized (and sent to the remote system)
+ when it is the first character on a line.
++.Pp
++Source routing is not supported yet for IPv6.
diff --git a/src/patches/telnet-gethostbyname.patch b/src/patches/telnet-gethostbyname.patch
new file mode 100644
index 0000000..e1c1976
--- /dev/null
+++ b/src/patches/telnet-gethostbyname.patch
@@ -0,0 +1,48 @@
+--- netkit-telnet-0.17/telnet/commands.c.old 2006-04-30 10:24:49.000000000 -0700
++++ netkit-telnet-0.17/telnet/commands.c 2006-04-30 10:37:10.000000000 -0700
+@@ -1669,9 +1669,15 @@
+
+ /* If this is not the full name, try to get it via DNS */
+ if (strchr(hbuf, '.') == 0) {
+- struct hostent *he = gethostbyname(hbuf);
+- if (he != 0)
+- strncpy(hbuf, he->h_name, sizeof hbuf-1);
++ struct addrinfo hints;
++ struct addrinfo *res;
++ memset (&hints, '\0', sizeof (hints));
++ hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG | AI_CANONNAME;
++ if (getaddrinfo (hbuf, NULL, &hints, &res) == 0) {
++ if (res->ai_canonname != NULL)
++ strncpy(hbuf, res->ai_canonname, sizeof hbuf-1);
++ freeaddrinfo (res);
++ }
+ hbuf[sizeof hbuf-1] = '\0';
+ }
+
+@@ -2832,17 +2838,15 @@
+ if (!c)
+ cp2 = 0;
+
+- if ((tmp = inet_addr(cp)) != -1) {
+- sin_addr.s_addr = tmp;
+- } else if ((host = gethostbyname(cp))) {
+-#if defined(h_addr)
+- memmove((caddr_t)&sin_addr,
+- host->h_addr_list[0],
+- sizeof(sin_addr));
+-#else
+- memmove((caddr_t)&sin_addr, host->h_addr,
+- sizeof(sin_addr));
+-#endif
++ struct addrinfo hints;
++ memset (&hints, '\0', sizeof (hints));
++ // XXX The code here seems to allow only IPv4 addresses.
++ hints.ai_family = AF_INET;
++ hints.ai_flags = AI_ADDRCONFIG;
++ struct addrinfo *aires;
++ if (getaddrinfo (cp, NULL, &hints, &aires) == 0) {
++ sin_addr = ((struct sockaddr_in *) aires->ai_addr)->sin_addr;
++ freeaddrinfo (aires);
+ } else {
+ *cpp = cp;
+ return(0);
hooks/post-receive
--
IPFire 2.x development tree
1
0