net-misc/dhcp: Bump the dhcp package now with upstream ldap

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@2318 6952d904-891a-0410-993b-d76249ca496b

net-misc/dhcp/ChangeLog

@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.154 2009/05/29 23:30:28 vapier Exp $
 
+  24 Aug 2010; Mario Fetka <mario.fetka@gmail.com>
+  files/dhcp-4.0.1.ebuild.patch, +dhcp-4.2.0.ebuild,
+  +files/dhcp-4.2-bpf-nofallback.patch, +files/dhcp-4.2-no_isc_blurb.patch:
+  Bump the dhcp package now with upstream ldap
+
   27 Jun 2010; Mario Fetka <mario.fetka@gmail.com> +dhcp-4.1.1_p1.ebuild:
   Bump ldap patch and dhcp release
 

net-misc/dhcp/Manifest

@@ -30,11 +30,13 @@ AUX dhcp-4.0-linux-ipv6-header.patch 817 RMD160 cd395ba33c6e729862af7a3c869d412e
 AUX dhcp-4.0-no_isc_blurb.patch 2748 RMD160 f29d8705fab63320c18c6319dd5703a51acc1687 SHA1 d8af8f4567e4bdbfac5d8e5455dede87a188ad40 SHA256 603e9a6f28264e35513f40f987d10e4fdce6d5e4f8d48aa46f83b8687d57dff0
 AUX dhcp-4.0-paranoia.patch 4996 RMD160 2f8339e3d8af9164c91cc5a3bab7605ecd728295 SHA1 94db8a07b82b69d0a05645b08ef5d0ec0b99bd19 SHA256 14d328d400cdc1b4d7d6329d9c8e997b2c5e76e8f21330e267a75d6240799058
 AUX dhcp-4.0.1-dhclient-stdin-conf.patch 2965 RMD160 2c3dd3994f0a7f15f3fe51972dd04a2e6055613a SHA1 f4a9d51126ea489f75fcf29053ab432b68e5055d SHA256 0b25bc74ae258656dd1f0e6f4ffd6b4ef8b4ad56956624c0b6070941a180e57c
-AUX dhcp-4.0.1.ebuild.patch 2605 RMD160 10f1e25f75b82aab643be4858bf386df277fe2a0 SHA1 77b0e4fe1880a2eb3a6d72b9a8873df7efaeff7b SHA256 a84b5a2911e27ea4fb56dea23908a90e2698d45889884d975f295a7d3e4819f4
+AUX dhcp-4.0.1.ebuild.patch 2605 RMD160 1f1d6a2f087caee59535f0846ddaf3353641e0f0 SHA1 b2157ee25e9770ab61356afaa6939d0cafb7b109 SHA256 a99a2b9a9d17419626cf7442245c04252ed22c4f78d2202932a01b4abbeac251
 AUX dhcp-4.0.2-no_isc_blurb-1.patch 2926 RMD160 1834092946267c6e04f737406e5ece4441451e5a SHA1 6666ee124a06b24ae2d33b10620b3f8ac22dda1c SHA256 2baeecda2649004cead2eb5fc4c47a7cf49182d71528d4433c2912cc9486c13f
 AUX dhcp-4.1-dhclient-metric.patch 7493 RMD160 59131eb3645b80e666b0741324992f10545213e4 SHA1 ec7fedbc46efe882c172eb07613711cccc0bce73 SHA256 405027d4ed4aa4cf8df8e0972c543885f1a2c077483eac6771a58b84bee2a343
 AUX dhcp-4.1-no_isc_blurb.patch 2711 RMD160 6b6816756fc899a1bb108281faa4765fcf1d09f7 SHA1 5f010721ee2fd39232fc15ef18faccce6d15e3fe SHA256 c9a17ac6695fa29b016f9dc024b648641b3958ffb2c9740671a9f9c5e8b8e52e
 AUX dhcp-4.1.1-no_isc_blurb-1.patch 2871 RMD160 5669a81ac079670ea63d990890cf9d8f021277eb SHA1 7d4ccb64a59940cb9c80bc2d5c8c3bcc282e2c09 SHA256 e827a0b80dee1566edbe75ee8ff896b3efec089f6c518ef8949ada0247aa8957
+AUX dhcp-4.2-bpf-nofallback.patch 1553 RMD160 09e3eb3cf2947a60c331becf4f017b10e08436ec SHA1 89a9e09b52b1040df022fced61cbf06aa9b4fbed SHA256 cb667e46ca6700be3c925d5563cc040191208d9aae77402320ff17c018bb7cb0
+AUX dhcp-4.2-no_isc_blurb.patch 2849 RMD160 510b24023741b8d60f3911b37f9c226c2f0d7049 SHA1 e1d07279e668092d3bb27334c2b92b1c128bffdc SHA256 84a85c4e0f414803addd8a2cff4b5b67792e3f50635859a42bf72f5020f5855b
 AUX dhcpd.conf 1092 RMD160 936bb112c7cdf8e669b695599252d1f6626be2f3 SHA1 cbabbcea73a0cbc9692462683b983c96d6f18b0c SHA256 b86d27e0560689057b01a352474582fceb3a398eaf3b17f901378ec56284c4d5
 AUX dhcpd.init 1989 RMD160 7f6b6858020100e47efa5d6a0809b2959e551249 SHA1 2c611adc6425fd095740aa56d09d8aafb4fea58a SHA256 916bfeb81dcb3423fd4239270ac2dce2e6dc105b28a06e03b352f6bf6b30ed1e
 AUX dhcpd.init2 2421 RMD160 baa01ae97b227edba7653cd51735613be2dac652 SHA1 f2068ceb2d79d7992f46b31e6a6e3277a0167dce SHA256 fef93e5a7264780044a977ade27e9cc70de824063791bcd07d3db81c11c16df5
@@ -48,6 +50,7 @@ DIST dhcp-4.0.2.tar.gz 1043137 RMD160 7c80370b433de30f89c8e685a939a89e5390ead7 S
 DIST dhcp-4.1.0.tar.gz 1086815 RMD160 bf96fa9d135a65b4d9b27f8caf4f3744f0636c80 SHA1 46e161892140a3b60cd56e62b442f48f51bc605f SHA256 688741e970410efdb177513550f8cd1ee52032eb109313ab316a852f40310914
 DIST dhcp-4.1.1-P1.tar.gz 1085414 RMD160 d963e87a24e4dd8f98002577446169773a0b8422 SHA1 e9e756df09502f6666cd79bdf0ab3af0f92b41b0 SHA256 2f640350cbb1966ec3090198c3f128d649a3655f747f96ce910a477fe63263da
 DIST dhcp-4.1.1.tar.gz 1084368 RMD160 8b5b7223979c2bf279fe8042ad97680f1d2205fe SHA1 b23a28d481a84248f8170b4c6c1166a86c04b2a6 SHA256 37058685bffbfeb793cfb0867f0b1911f8d238ea69fbaa6cbb165455ab803618
+DIST dhcp-4.2.0.tar.gz 8581458 RMD160 80665da45cecb7c87ff06fd3b7c806b75f8c1344 SHA1 3cd76d9225d9d8405b02f13660762438d4ad3160 SHA256 6260d43423e4c406ba63cd7199502a395e952b13c80a955026c4b82a4e9d4943
 DIST ldap-for-dhcp-3.1.2-2.tar.gz 39752 RMD160 96d2f469b1349485c0202012697222911b81abe8 SHA1 023d12eeb148ad493e252edbfd112d19c9d0cecd SHA256 afd30a30d72a17a4d8ae1a27c247711f03b30b5e270bdcf9f521695b55b28db7
 DIST ldap-for-dhcp-3.1.3-1.tar.gz 41029 RMD160 8b3793f6f6db956fd9c2d6b1ea94e8bd040d188b SHA1 e8053dac00e04fa27ebe90260e78a7d37da21ec7 SHA256 4df0daf50ddc31eb3cfd7c31226ac3d766fb37884f80fc6b96f3c3ee4a94baab
 DIST ldap-for-dhcp-4.0.1-3.tar.gz 39117 RMD160 977ec08ec0213e1a53d0dd5b3b08a234172dbd22 SHA1 8bc692bb2017c1b5ff35d73c10e5a2e4ed44e559 SHA256 161f5cd479ba0789d139ef59d101244fa7c880c3d1c13cbbbbae978004a30a18
@@ -62,5 +65,6 @@ EBUILD dhcp-4.0.2.ebuild 7071 RMD160 e458c6fafeeede68f7897181b2152489844fe843 SH
 EBUILD dhcp-4.1.0.ebuild 7488 RMD160 951457f2b70458c38d82c5013e8e6287ab0353fb SHA1 d96c3ebd090b6def031e79d8902b2c87e303167a SHA256 ec25fa7569f92d9dac230e85702427d37d51981d50033667ce36ccfe7be0620a
 EBUILD dhcp-4.1.1.ebuild 7028 RMD160 e749ceb20ce4ec53319a5c0b2eb51fbd1a9f6da0 SHA1 f24922e252a1a9dad9972cbabd6aaf88308f4797 SHA256 d4ca9c44e344189290decb3da8375a834b496730f06d59545af19f95bd102e03
 EBUILD dhcp-4.1.1_p1.ebuild 6969 RMD160 231066d0ebb33ea454f0874566234080073d5f72 SHA1 b90be96d283dbd983ea67efabbe545380a03fb7a SHA256 f115cdfdf85996d94cab0b30343a474f8a74fc3c31607798e246e42dc249cce6
-MISC ChangeLog 29973 RMD160 53f97d8a10247533e9a3c6ddada13e44eb0595d4 SHA1 4a5d92cbccd3e3a2cae769f8bba5169a53c02082 SHA256 7a5a3b928b4c2875c8b791e3a570f18f7615636d84a440db7dd8a06c6327a242
+EBUILD dhcp-4.2.0.ebuild 6446 RMD160 ef04d42aae30a41e75b020cce55c29ba7f9308b6 SHA1 d8fda6cb3428cec028d1d1b1f879cbbf97440d88 SHA256 d49b721691f80d55616404d2f47b069a5af04b86664d39a16dda983a03f273e9
+MISC ChangeLog 30201 RMD160 7f1365209e08397def98e601ed38a5237d2005b6 SHA1 529d0b8b9455238a9059fc5f4ed67688760b283e SHA256 0a864564363ded3b16af377ca6c76bd88cb6b0ae4af8d4c3317d3bcae537aacd
 MISC metadata.xml 358 RMD160 97ecd4b6ee0a24352a71a66d5ad4fd82481156b4 SHA1 d80da2cf7c6892cdad6b681fda29e46472d68871 SHA256 8665f24cdfcc09576b595f8bd257333ff5f9ea7ee0ca2925ba6fb74d90e12415

net-misc/dhcp/dhcp-4.2.0.ebuild

@@ -0,0 +1,215 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.1.0.ebuild,v 1.2 2010/01/15 19:00:22 ulm Exp $
+
+inherit eutils flag-o-matic autotools
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="ISC Dynamic Host Configuration Protocol"
+HOMEPAGE="http://www.isc.org/products/DHCP"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
+
+LICENSE="as-is BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="doc ipv6 selinux kernel_linux vim-syntax ldap ssl"
+
+DEPEND="selinux? ( sec-policy/selinux-dhcp )
+	kernel_linux? ( sys-apps/net-tools )
+	vim-syntax? ( app-vim/dhcpd-syntax )
+	ldap? ( net-nds/openldap
+		ssl? ( dev-libs/openssl ) )"
+
+
+PROVIDE="virtual/dhcpc"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Gentoo patches - these will probably never be accepted upstream
+	# Fix some permission issues
+	epatch "${FILESDIR}/${PN}"-3.0-fix-perms.patch
+	# Enable dhclient to equery NTP servers
+	epatch "${FILESDIR}/${PN}"-4.0-dhclient-ntp.patch
+	# resolvconf support in dhclient-script
+	epatch "${FILESDIR}/${PN}"-4.0-dhclient-resolvconf.patch
+	# Stop downing the interface on Linux as that breaks link daemons
+	# such as wpa_supplicant and netplug
+	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-no-down.patch
+	# Quiet the isc blurb
+	epatch "${FILESDIR}/${PN}"-4.2-no_isc_blurb.patch
+	# Enable dhclient to get extra configuration from stdin
+	epatch "${FILESDIR}/${PN}"-4.0.1-dhclient-stdin-conf.patch
+	# Disable fallback interfaces when using BPF
+	# This allows more than one dhclient instance on the BSD's
+	epatch "${FILESDIR}/${PN}"-4.2-bpf-nofallback.patch
+
+	# NetworkManager support patches
+	# If they fail to apply to future versions they will be dropped
+	# Add dbus support to dhclient
+	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-dbus.patch
+
+	# Brand the version with Gentoo
+	# include revision if >0
+	local newver="Gentoo"
+	[[ ${PR} != "r0" ]] && newver="${newver}-${PR}"
+
+	sed -i "/AC_INIT/s/\(\[[0-9]\+\.[0-9]\+\.[0-9]\+\)/\1-${newver}/" \
+		configure.ac || die
+
+	# Change the hook script locations of the scripts
+	sed -i -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
+		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
+		client/scripts/* || die
+
+	# No need for the linux script to force bash, #158540.
+	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
+	# Quiet the freebsd logger a little
+	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
+
+	# Remove these options from the sample config
+	sed -i -e "/\(script\|host-name\|domain-name\) / d" \
+		client/dhclient.conf || die
+
+	# Only install different man pages if we don't have en
+	if [[ " ${LINGUAS} " != *" en "* ]]; then
+		# Install Japanese man pages
+		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
+			einfo "Installing Japanese documention"
+			cp doc/ja_JP.eucJP/dhclient* client
+			cp doc/ja_JP.eucJP/dhcp* common
+		fi
+	fi
+
+	# Now remove the non-english docs so there are no errors later
+	[[ -d doc/ja_JP.eucJP ]] && rm -rf doc/ja_JP.eucJP
+
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		--enable-paranoia \
+		--sysconfdir /etc/dhcp \
+		--with-cli-pid-file=/var/run/dhcp/dhclient.pid \
+		--with-cli-lease-file=/var/lib/dhcp/dhclient.leases \
+		--with-srv-pid-file=/var/run/dhcp/dhcpd.pid \
+		--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
+		--with-relay-pid-file=/var/run/dhcp/dhcrelay.pid \
+		$(use_enable ipv6 dhcpv6) \
+		$(use_with ldap) \
+		$(use_with ssl ldapcrypto) \
+		|| die
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	for installdir in includes tests common minires dst omapip client dhcpctl relay server; do
+		cd "${S}/${installdir}"
+		if [ "${installdir}" == client ]; then
+			make install DESTDIR="${D}" exec_prefix="" || die
+		else
+			make install DESTDIR="${D}" exec_prefix="/usr" || die
+		fi
+	done
+
+	cd "${S}"
+
+	exeinto /sbin
+	if use kernel_linux; then
+		newexe "${S}"/client/scripts/linux dhclient-script
+	else
+		newexe "${S}"/client/scripts/freebsd dhclient-script
+	fi
+
+	if use doc; then
+		dodoc README RELNOTES doc/*
+		use ldap && dodoc "contrib/ldap"/*.ldap
+	fi
+	insinto /etc/dhcp
+	newins client/dhclient.conf dhclient.conf.sample
+	keepdir /var/{lib,run}/dhcp
+	keepdir /var/lib/dhclient
+
+	# Install our server files
+	insinto /etc/dhcp
+	newins server/dhcpd.conf dhcpd.conf.sample
+	newinitd "${FILESDIR}"/dhcpd.init2 dhcpd
+	newinitd "${FILESDIR}"/dhcrelay.init dhcrelay
+	newconfd "${FILESDIR}"/dhcpd.conf dhcpd
+	newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+
+	# install ldap files
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "contrib/ldap"/dhcp.*
+		dosbin "contrib/ldap"/dhcpd-conf-to-ldap
+	fi
+
+
+	# We never want portage to own this file
+	rm -f "${D}"/var/lib/dhcp/dhcpd.leases
+}
+
+pkg_preinst() {
+	enewgroup dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+}
+
+pkg_postinst() {
+	chown -R dhcp:dhcp "${ROOT}"/var/{lib,run}/dhcp
+
+	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
+		ewarn
+		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+		ewarn "and dhcp should be removed from the default runlevel"
+		ewarn
+	fi
+
+	einfo "You can edit /etc/conf.d/dhcpd to customize dhcp settings."
+	einfo
+	einfo "If you would like to run dhcpd in a chroot, simply configure the"
+	einfo "DHCPD_CHROOT directory in /etc/conf.d/dhcpd and then run:"
+	einfo "  emerge --config =${PF}"
+}
+
+pkg_config() {
+	local CHROOT="$(
+		sed -n -e 's/^[[:blank:]]\?DHCPD_CHROOT="*\([^#"]\+\)"*/\1/p' \
+		"${ROOT}"/etc/conf.d/dhcpd
+	)"
+
+	if [[ -z ${CHROOT} ]]; then
+		eerror "CHROOT not defined in /etc/conf.d/dhcpd"
+		return 1
+	fi
+
+	CHROOT="${ROOT}/${CHROOT}"
+
+	if [[ -d ${CHROOT} ]] ; then
+		ewarn "${CHROOT} already exists - aborting"
+		return 0
+	fi
+
+	ebegin "Setting up the chroot directory"
+	mkdir -m 0755 -p "${CHROOT}/"{dev,etc,var/lib,var/run/dhcp}
+	cp /etc/{localtime,resolv.conf} "${CHROOT}"/etc
+	cp -R /etc/dhcp "${CHROOT}"/etc
+	cp -R /var/lib/dhcp "${CHROOT}"/var/lib
+	ln -s ../../var/lib/dhcp "${CHROOT}"/etc/dhcp/lib
+	chown -R dhcp:dhcp "${CHROOT}"/var/{lib,run}/dhcp
+	eend 0
+
+	local logger="$(best_version virtual/logger)"
+	einfo "To enable logging from the dhcpd server, configure your"
+	einfo "logger (${logger}) to listen on ${CHROOT}/dev/log"
+}

net-misc/dhcp/files/dhcp-4.0.1.ebuild.patch

@@ -1,5 +1,5 @@
 --- /usr/portage/net-misc/dhcp/dhcp-4.0.1.ebuild	2009-03-30 15:13:28.000000000 +0200
-+++ dhcp-4.0.1.ebuild	2009-07-08 19:11:15.121631116 +0200
++++ dhcp-4.2.0.ebuild	2009-07-08 19:11:15.121631116 +0200
 @@ -4,22 +4,30 @@
  
  inherit eutils flag-o-matic autotools

net-misc/dhcp/files/dhcp-4.2-bpf-nofallback.patch

@@ -0,0 +1,45 @@
+diff -uNr dhcp-4.2.0.orig//common/bpf.c dhcp-4.2.0/common/bpf.c
+--- dhcp-4.2.0.orig//common/bpf.c	2010-08-24 21:05:43.000000000 +0200
++++ dhcp-4.2.0/common/bpf.c	2010-08-24 21:08:59.000000000 +0200
+@@ -358,9 +358,9 @@
+ 	struct iovec iov [3];
+ 	int result;
+ 
+-	if (!strcmp (interface -> name, "fallback"))
++/*	if (!strcmp (interface -> name, "fallback"))
+ 		return send_fallback (interface, packet, raw,
+-				      len, from, to, hto);
++				      len, from, to, hto); */
+ 
+ 	if (hto == NULL && interface->anycast_mac_addr.hlen)
+ 		hto = &interface->anycast_mac_addr;
+@@ -537,7 +537,7 @@
+ 
+ void maybe_setup_fallback ()
+ {
+-	isc_result_t status;
++/*	isc_result_t status;
+ 	struct interface_info *fbi = (struct interface_info *)0;
+ 	if (setup_fallback (&fbi, MDL)) {
+ 		if_register_fallback (fbi);
+@@ -548,7 +548,7 @@
+ 			log_fatal ("Can't register I/O handle for %s: %s",
+ 				   fbi -> name, isc_result_totext (status));
+ 		interface_dereference (&fbi, MDL);
+-	}
++	} */
+ }
+ 
+ void
+diff -uNr dhcp-4.2.0.orig//includes/osdep.h dhcp-4.2.0/includes/osdep.h
+--- dhcp-4.2.0.orig//includes/osdep.h	2010-08-24 21:05:43.000000000 +0200
++++ dhcp-4.2.0/includes/osdep.h	2010-08-24 21:06:07.000000000 +0200
+@@ -157,7 +157,7 @@
+    Currently, all low-level packet interfaces use BSD sockets as a
+    fallback. */
+ 
+-#if defined (USE_BPF_SEND) || defined (USE_NIT_SEND) || \
++#if defined (USE_NIT_SEND) || \
+     defined (USE_DLPI_SEND) || defined (USE_UPF_SEND) || \
+     defined (USE_LPF_SEND) || \
+     (defined (USE_SOCKET_SEND) && defined (HAVE_SO_BINDTODEVICE))

net-misc/dhcp/files/dhcp-4.2-no_isc_blurb.patch

@@ -0,0 +1,103 @@
+Submitted By: Your Name (your at email dot address)
+Date: 2010-08-24
+Initial Package Version: 4.1
+Origin: Gentoo patch
+Upstream Status: unknown
+Description: remove isc blurb
+ 
+diff -Naur dhcp-4.2.0.orig/client/dhclient.c dhcp-4.2.0/client/dhclient.c
+--- dhcp-4.2.0.orig/client/dhclient.c	2010-08-24 19:00:10.000000000 +0000
++++ dhcp-4.2.0/client/dhclient.c	2010-08-24 19:00:35.000000000 +0000
+@@ -89,6 +89,8 @@
+ 
+ static isc_result_t write_duid(struct data_string *duid);
+ 
++extern int log_isc_blurb;
++
+ int
+ main(int argc, char **argv) {
+ 	int fd;
+@@ -408,6 +410,7 @@
+ 		log_info("%s", "");
+ 	} else {
+ 		log_perror = 0;
++		log_isc_blurb = 0;
+ 		quiet_interface_discovery = 1;
+ 	}
+ 
+diff -Naur dhcp-4.2.0.orig/omapip/errwarn.c dhcp-4.2.0/omapip/errwarn.c
+--- dhcp-4.2.0.orig/omapip/errwarn.c	2010-08-24 19:00:10.000000000 +0000
++++ dhcp-4.2.0/omapip/errwarn.c	2010-08-24 19:00:35.000000000 +0000
+@@ -43,6 +43,8 @@
+ int log_perror = 1;
+ #endif
+ int log_priority;
++int log_isc_blurb=1;
++
+ void (*log_cleanup) (void);
+ 
+ #define CVT_BUF_MAX 1023
+@@ -74,7 +76,9 @@
+ 	  IGNORE_RET (write (STDERR_FILENO, "\n", 1));
+   }
+ 
+-#if !defined (NOMINUM)
++#if !defined(NOMINUM)
++  if ( log_isc_blurb )
++  {
+   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");
+@@ -92,7 +96,12 @@
+   log_error ("the README file.");
+   log_error ("%s", "");
+   log_error ("exiting.");
++  }else
++  {
++      log_error ("exiting.");
++  }
+ #endif
++
+   if (log_cleanup)
+ 	  (*log_cleanup) ();
+   exit (1);
+diff -Naur dhcp-4.2.0.orig/relay/dhcrelay.c dhcp-4.2.0/relay/dhcrelay.c
+--- dhcp-4.2.0.orig/relay/dhcrelay.c	2010-08-24 19:00:10.000000000 +0000
++++ dhcp-4.2.0/relay/dhcrelay.c	2010-08-24 19:01:47.000000000 +0000
+@@ -133,6 +133,7 @@
+ "Internet Systems Consortium DHCP Relay Agent";
+ static const char url[] =
+ "For info, please visit https://www.isc.org/software/dhcp/";
++extern int log_isc_blurb;
+ 
+ #ifdef DHCPv6
+ #define DHCRELAY_USAGE \
+@@ -228,6 +229,7 @@
+ 		} else if (!strcmp(argv[i], "-q")) {
+ 			quiet = 1;
+ 			quiet_interface_discovery = 1;
++			log_isc_blurb = 0;
+ 		} else if (!strcmp(argv[i], "-p")) {
+ 			if (++i == argc)
+ 				usage();
+diff -Naur dhcp-4.2.0.orig/server/dhcpd.c dhcp-4.2.0/server/dhcpd.c
+--- dhcp-4.2.0.orig/server/dhcpd.c	2010-08-24 19:00:10.000000000 +0000
++++ dhcp-4.2.0/server/dhcpd.c	2010-08-24 19:00:35.000000000 +0000
+@@ -63,6 +63,9 @@
+ struct iaddr server_identifier;
+ int server_identifier_matched;
+ 
++
++extern int log_isc_blurb;
++
+ #if defined (NSUPDATE)
+ 
+ /* This stuff is always executed to figure the default values for certain
+@@ -367,6 +370,7 @@
+ 			lftest = 1;
+ 			log_perror = -1;
+ 		} else if (!strcmp (argv [i], "-q")) {
++			log_isc_blurb = 0;
+ 			quiet = 1;
+ 			quiet_interface_discovery = 1;
+ #ifdef DHCPv6