Add 'ddns-update-style ad-hoc;' to the example dhcpd.conf file, #170311 thanks to Whit Blauvelt.

Package-Manager: portage-2.1.3_rc8

5 files changed, 42 insertions, 15 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 4e37ac7618c3..6212fa078a68 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.128 2007/07/05 19:46:49 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.129 2007/07/19 09:38:27 uberlord Exp $
+
+  19 Jul 2007; Roy Marples <uberlord@gentoo.org>
+  +files/dhcp-3.0-ddns-example.patch, dhcp-3.0.3-r9.ebuild,
+  dhcp-3.0.6.ebuild:
+  Add 'ddns-update-style ad-hoc;' to the example dhcpd.conf file, #170311
+  thanks to Whit Blauvelt.
 
 *dhcp-3.0.6 (05 Jul 2007)
 
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 8636cc6c6af9..9092679c9a0f 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,3 +1,7 @@
+AUX dhcp-3.0-ddns-example.patch 401 RMD160 0188ae91fb58fc6f8c0d1b5bcbed58582dfed099 SHA1 c9e0f4c9ccbf1ff89076ff1bec37fb6d1276b7f0 SHA256 cf136ce92ea8f3337b9ded9c6f4f019db9782a68c63a3e8b712d26a04c2c9584
+MD5 7e7e2dd0c327d198d954748433e83417 files/dhcp-3.0-ddns-example.patch 401
+RMD160 0188ae91fb58fc6f8c0d1b5bcbed58582dfed099 files/dhcp-3.0-ddns-example.patch 401
+SHA256 cf136ce92ea8f3337b9ded9c6f4f019db9782a68c63a3e8b712d26a04c2c9584 files/dhcp-3.0-ddns-example.patch 401
 AUX dhcp-3.0-fix-perms.patch 485 RMD160 3857270dffed5feee95609aeb37d0c9ef8844945 SHA1 1217265a8a7f1416b781e9f79e8dfb8304268e6c SHA256 a805a60b36e148886887aebb797e80f642386b3e55ef4a0b5132f96a2877e018
 MD5 d909d81a4d4ea39ddfc9898d33488c73 files/dhcp-3.0-fix-perms.patch 485
 RMD160 3857270dffed5feee95609aeb37d0c9ef8844945 files/dhcp-3.0-fix-perms.patch 485
@@ -95,10 +99,10 @@ DIST dhcp-3.0.5.tar.gz 876591 RMD160 b968e7520fd936bd6f888f77734f3db7df23a636 SH
 DIST dhcp-3.0.6.tar.gz 891513 RMD160 6b7dbad413f83f9bce4ed92a8abc60394a06c6ad SHA1 204e509580d57d0cfff23529274612ca8c710efb SHA256 9f77b0ebf975d71578e2d305a2e07b900a9462b7efaac41826facfb4d4f00f4d
 DIST dhcp-3.1.0a2.tar.gz 776040 RMD160 21419b31dc75fce67d86222277282ffa2a9c9007 SHA1 cc8eca9477f7d60f74c77ff0c556212835aa6b8f SHA256 81e4e068df774f473c36999236fab16d742e3c74ae162dfb990db7b134e87a85
 DIST dhcp-3.1.0a3.tar.gz 776225 RMD160 29f4259fbe6c8f5e619001513827c97a2ab7d628 SHA1 b731552005b2385d87756208f3e03297b40f80d0 SHA256 06d0ffe09cc1c32b7b27719d372414937818665349cdbe9c13652c1ae63677f2
-EBUILD dhcp-3.0.3-r9.ebuild 7075 RMD160 be9e27a21a28bcc4d9e1b76ac258977659233c23 SHA1 f09f820dca2bd7495c921d88998abd797c9d8978 SHA256 1be774481ac09e2c36e4827c837408bfe947066ec763187fb7a9f8e276914db5
-MD5 ec66c01b6d65c265d3cc26956af59b00 dhcp-3.0.3-r9.ebuild 7075
-RMD160 be9e27a21a28bcc4d9e1b76ac258977659233c23 dhcp-3.0.3-r9.ebuild 7075
-SHA256 1be774481ac09e2c36e4827c837408bfe947066ec763187fb7a9f8e276914db5 dhcp-3.0.3-r9.ebuild 7075
+EBUILD dhcp-3.0.3-r9.ebuild 7186 RMD160 e59315a08a6b382915ec7ded0a4c7cfa38c9a5de SHA1 6c11653e84a8f3e81913f3916dabb6d6a38aedb5 SHA256 eee8b146f259da6645b0f901038e63f6c9d4dec8ffd1627c997ad8fde76338b0
+MD5 165433f5c0a15eb7d8ac9044b0f1a871 dhcp-3.0.3-r9.ebuild 7186
+RMD160 e59315a08a6b382915ec7ded0a4c7cfa38c9a5de dhcp-3.0.3-r9.ebuild 7186
+SHA256 eee8b146f259da6645b0f901038e63f6c9d4dec8ffd1627c997ad8fde76338b0 dhcp-3.0.3-r9.ebuild 7186
 EBUILD dhcp-3.0.5-r1.ebuild 7435 RMD160 ab81f6a4b5b4758668a9b82c153dc69ff95bbe2e SHA1 621e9324f2780805d2a4ff5a72d3e626a6dfc771 SHA256 e23a09dd3eb5c4bd9086332d5cb31746d8490ae6c5ff1d9faf5364c441f5ce18
 MD5 82014eeddb8233449f25d6c1c7ea406c dhcp-3.0.5-r1.ebuild 7435
 RMD160 ab81f6a4b5b4758668a9b82c153dc69ff95bbe2e dhcp-3.0.5-r1.ebuild 7435
@@ -107,10 +111,10 @@ EBUILD dhcp-3.0.5.ebuild 7432 RMD160 49b02a4111486e48b838cfa2e066c5aac03cbb9c SH
 MD5 add4a35d4904ef7db2013501b43a8958 dhcp-3.0.5.ebuild 7432
 RMD160 49b02a4111486e48b838cfa2e066c5aac03cbb9c dhcp-3.0.5.ebuild 7432
 SHA256 fc679b95bbad5aa0071feeed22ccd424fd74863e908e33095db64521cbcbed52 dhcp-3.0.5.ebuild 7432
-EBUILD dhcp-3.0.6.ebuild 7432 RMD160 25dfd987f69e7944cd989ef068c03468cbaf0215 SHA1 4a8a4d3fd72cd163f03c37b493c535183a8e9ffd SHA256 141316b6da1615fc374eaab954a66d6076ddff4dc9f5e6368e673591e37b6e63
-MD5 966876247230188b900907df75229f08 dhcp-3.0.6.ebuild 7432
-RMD160 25dfd987f69e7944cd989ef068c03468cbaf0215 dhcp-3.0.6.ebuild 7432
-SHA256 141316b6da1615fc374eaab954a66d6076ddff4dc9f5e6368e673591e37b6e63 dhcp-3.0.6.ebuild 7432
+EBUILD dhcp-3.0.6.ebuild 7544 RMD160 59124a2739ab895d5e32635ce57fe4496642b3d4 SHA1 2afb4d9eb11b9ffa2f749cff1551509625c913b2 SHA256 43e66b9d5563e21e8797cca36de45912afc208f6536dee5d5018c9e33c0b3a89
+MD5 f7edb976eabd2ed3b60420ed4210d821 dhcp-3.0.6.ebuild 7544
+RMD160 59124a2739ab895d5e32635ce57fe4496642b3d4 dhcp-3.0.6.ebuild 7544
+SHA256 43e66b9d5563e21e8797cca36de45912afc208f6536dee5d5018c9e33c0b3a89 dhcp-3.0.6.ebuild 7544
 EBUILD dhcp-3.1.0_alpha2.ebuild 7470 RMD160 db0f05f5c26bf6160bd0d68bdceee8460aeb1766 SHA1 d1eb0d1518a3c5da10d3c5da1b29f788004cd0f0 SHA256 503e84c58f60ce737528b205074e0ee5713d1d2d72bc028cbc9a66db3d2ef999
 MD5 1de7a90d12475125e754b46006f575b2 dhcp-3.1.0_alpha2.ebuild 7470
 RMD160 db0f05f5c26bf6160bd0d68bdceee8460aeb1766 dhcp-3.1.0_alpha2.ebuild 7470
@@ -119,10 +123,10 @@ EBUILD dhcp-3.1.0_alpha3.ebuild 7470 RMD160 2dbd200561617977c3a4834b8fdf76575dcf
 MD5 0f7965d4331e77b1811b4b5677b003c0 dhcp-3.1.0_alpha3.ebuild 7470
 RMD160 2dbd200561617977c3a4834b8fdf76575dcf6f7f dhcp-3.1.0_alpha3.ebuild 7470
 SHA256 148da65354609598ec0223e81558919aa1f09e650ec34234d00d623162724810 dhcp-3.1.0_alpha3.ebuild 7470
-MISC ChangeLog 21952 RMD160 6c8817ac8bd83724469e2b9ce55c321738a6c11c SHA1 a42c6842b2221fc4edfe73b5c538bb922bf9953f SHA256 c6c9fe2e310b9268a7612fe65c12218c3bbd7ac1de2ab16369d4a1fbeb4fe668
-MD5 779e2281fba740d6205f618f49c5b1b2 ChangeLog 21952
-RMD160 6c8817ac8bd83724469e2b9ce55c321738a6c11c ChangeLog 21952
-SHA256 c6c9fe2e310b9268a7612fe65c12218c3bbd7ac1de2ab16369d4a1fbeb4fe668 ChangeLog 21952
+MISC ChangeLog 22184 RMD160 03e80e09dccc7f27b155565c55c5fa3981c51e1e SHA1 d1e33fb2ac6632aca02e081211b7569430fb4b5d SHA256 5ea761b4899c6c20bd11007d84245aa3bfab1e5f9f3ec6495326efd397fc2ac8
+MD5 9e00110436cfffd9e34d949d505f91e3 ChangeLog 22184
+RMD160 03e80e09dccc7f27b155565c55c5fa3981c51e1e ChangeLog 22184
+SHA256 5ea761b4899c6c20bd11007d84245aa3bfab1e5f9f3ec6495326efd397fc2ac8 ChangeLog 22184
 MISC metadata.xml 441 RMD160 489c700355a49fda7d249a7b3f72066add57e779 SHA1 f2013226d45685a4bd06c3f7723df78e134486d4 SHA256 16dccfd59e8db49b0c9b9bb34f99188f9773a2ef00757d4fb429fea4293ac44e
 MD5 3ccab43e194be4b8df2632546cbd028e metadata.xml 441
 RMD160 489c700355a49fda7d249a7b3f72066add57e779 metadata.xml 441
diff --git a/net-misc/dhcp/dhcp-3.0.3-r9.ebuild b/net-misc/dhcp/dhcp-3.0.3-r9.ebuild
index 41385f3d054e..e1d81f32dcbc 100644
--- a/net-misc/dhcp/dhcp-3.0.3-r9.ebuild
+++ b/net-misc/dhcp/dhcp-3.0.3-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.3-r9.ebuild,v 1.14 2007/06/26 02:30:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.3-r9.ebuild,v 1.15 2007/07/19 09:38:27 uberlord Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -57,6 +57,8 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}"-3.0.3-libdst.patch
 	# Fix building on Gentoo/FreeBSD
 	epatch "${FILESDIR}/${PN}"-3.0.2-gmake.patch
+	# Set ddns-update-style none in the example config, #170311
+	epatch "${FILESDIR}/${PN}"-3.0-ddns-example.patch
 
 	# NetworkManager support patches
 	# If they fail to apply to future versions they will be dropped
diff --git a/net-misc/dhcp/dhcp-3.0.6.ebuild b/net-misc/dhcp/dhcp-3.0.6.ebuild
index 28da6c3e1cc6..ad911a878080 100644
--- a/net-misc/dhcp/dhcp-3.0.6.ebuild
+++ b/net-misc/dhcp/dhcp-3.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.6.ebuild,v 1.1 2007/07/05 19:46:49 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.6.ebuild,v 1.2 2007/07/19 09:38:27 uberlord Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -58,6 +58,8 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}"-3.0.3-libdst.patch
 	# Fix building on Gentoo/FreeBSD
 	epatch "${FILESDIR}/${PN}"-3.0.2-gmake.patch
+	# Set ddns-update-style none in the example config, #170311
+	epatch "${FILESDIR}/${PN}"-3.0-ddns-example.patch
 
 	# NetworkManager support patches
 	# If they fail to apply to future versions they will be dropped
diff --git a/net-misc/dhcp/files/dhcp-3.0-ddns-example.patch b/net-misc/dhcp/files/dhcp-3.0-ddns-example.patch
new file mode 100644
index 000000000000..8e69ddbe22f1
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0-ddns-example.patch
@@ -0,0 +1,13 @@
+diff -ur a/server/dhcpd.conf b/server/dhcpd.conf
+--- a/server/dhcpd.conf	2001-01-25 08:33:11 +0000
++++ b/server/dhcpd.conf	2007-07-19 10:29:43 +0100
+@@ -21,6 +21,9 @@
+ # No service will be given on this subnet, but declaring it helps the 
+ # DHCP server to understand the network topology.
+ 
++# Disable dynamic DNS updates.
++ddns-update-style none;
++
+ subnet 10.152.187.0 netmask 255.255.255.0 {
+ }
+