Version bump to 4.0.1, stdin config support for dhclient has been rediffed due to upstream changes. Still masked, deleting old ebuild.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

4 files changed, 135 insertions, 12 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index b40ecf69bc77..7d49aaf73169 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/dhcp
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.152 2008/10/26 03:45:20 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.153 2009/03/30 13:13:28 chainsaw Exp $
+
+*dhcp-4.0.1 (30 Mar 2009)
+
+  30 Mar 2009; <chainsaw@gentoo.org>
+  +files/dhcp-4.0.1-dhclient-stdin-conf.patch, -dhcp-4.0.0.ebuild,
+  +dhcp-4.0.1.ebuild:
+  Version bump to 4.0.1, stdin config support for dhclient has been rediffed
+  due to upstream changes. Still masked, deleting old ebuild.
 
   26 Oct 2008; Mike Frysinger <vapier@gentoo.org> dhcp-4.0.0.ebuild:
   Pull in app-vim/dhcpd-syntax with USE=vim-syntax #240192 by Dan Wallis.
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 43797b67a632..5b1d643d47f6 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -28,6 +28,7 @@ AUX dhcp-4.0-dhclient-stdin-conf.patch 3009 RMD160 749a3768dd709b54ad0ce6fc53828
 AUX dhcp-4.0-linux-ipv6-header.patch 817 RMD160 cd395ba33c6e729862af7a3c869d412e91ad5b41 SHA1 1e268892009a58caa8b6030be192a25583a96dd5 SHA256 dbb6f22c99dcf31fd91f89061398dea194476d37a1e328736adaff6fe2f00c6d
 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 dhcpd.conf 1092 RMD160 936bb112c7cdf8e669b695599252d1f6626be2f3 SHA1 cbabbcea73a0cbc9692462683b983c96d6f18b0c SHA256 b86d27e0560689057b01a352474582fceb3a398eaf3b17f901378ec56284c4d5
 AUX dhcpd.init 1989 RMD160 7f6b6858020100e47efa5d6a0809b2959e551249 SHA1 2c611adc6425fd095740aa56d09d8aafb4fea58a SHA256 916bfeb81dcb3423fd4239270ac2dce2e6dc105b28a06e03b352f6bf6b30ed1e
 AUX dhcrelay.conf 421 RMD160 456edbc9bcc8d3a44db5bb6dbf0c3003c3e7419c SHA1 78ecdb000382893fb49d0052ced063955b0ad9cf SHA256 409b895ed489e75c1a08f72961b45d641b93fd9357f528abc78b1fd036b7f730
@@ -36,18 +37,18 @@ DIST dhcp-3.0.3.tar.gz 870240 RMD160 bcbd1f8b49f17809a3473103a7b5e096c45855d7 SH
 DIST dhcp-3.0.6.tar.gz 891513 RMD160 6b7dbad413f83f9bce4ed92a8abc60394a06c6ad SHA1 204e509580d57d0cfff23529274612ca8c710efb SHA256 9f77b0ebf975d71578e2d305a2e07b900a9462b7efaac41826facfb4d4f00f4d
 DIST dhcp-3.1.0.tar.gz 797100 RMD160 59ef8b695b66d3cb61437e25a179d9f17639017d SHA1 f33d017f055648e6571aa26cf314d37857491a2e SHA256 26d02217f53e40ab7c7140cf58d99b55a64979c8501481b28da9c432f0f92243
 DIST dhcp-3.1.1.tar.gz 798228 RMD160 08ed15d26ca64928e1d3b07c631cbbfa9a3dc8cb SHA1 3f7e013cb62aed0f3af45bdd97424d8b63e9c280 SHA256 129024c7545e3e8d37e75cd5d534b50c53955592c4935189a57916e216355f6d
-DIST dhcp-4.0.0.tar.gz 1043725 RMD160 86963598124617bc7d1059262c75176db431f26d SHA1 acb4ab7634ba002893b15baba1443ef4d6c92201 SHA256 8efee52b567e934d0e80fb33f17dc0cc9f43892dc2e177a242eddebd64e23c68
+DIST dhcp-4.0.1.tar.gz 1050570 RMD160 a9764a76d105778362fe4b58e77783331ee3448a SHA1 7d813740ab4a64e474f1c01b1395617987532ed1 SHA256 965d09a7759250eff7d6d06d37425ea085c14edb5b405f8357ef5ec72ded28ef
 EBUILD dhcp-3.0.3-r9.ebuild 7186 RMD160 e59315a08a6b382915ec7ded0a4c7cfa38c9a5de SHA1 6c11653e84a8f3e81913f3916dabb6d6a38aedb5 SHA256 eee8b146f259da6645b0f901038e63f6c9d4dec8ffd1627c997ad8fde76338b0
 EBUILD dhcp-3.0.6.ebuild 7532 RMD160 8b67dd9acc7d1f392a6fd7d1d3a1e9ce8c00460b SHA1 c0b406cc528a97db2409324688e3a7ab93862677 SHA256 e550750c928525b090ff08087df2a9f63764805d663aee72b8991244a417e509
 EBUILD dhcp-3.1.0.ebuild 7431 RMD160 bd267b1ae0ee8568ae5b8fce5267a41258fb5d48 SHA1 b77e78900b054ee2fd06f1059fff84cc1db3499c SHA256 a2a75e7c2e1b60c84a49f66d59360571534c1ea5245e6a8a14d8c039c1115bfb
 EBUILD dhcp-3.1.1.ebuild 7431 RMD160 34ec0d733c3d424877748970a92c9f38fbd18730 SHA1 39a0cb8773100a2b436007a6196d65bb4519b29a SHA256 d040e4ee5f081bd585d17fb62136ab3d4aaa95b0044672eafe3364ae26b2fe32
-EBUILD dhcp-4.0.0.ebuild 6744 RMD160 7656566269ea6327702edd50b3f08a0ee9787110 SHA1 f194474f5a3925feaffe90ad893ee58957aa3625 SHA256 42fa252272ac04cfc59f2b88c913c410b20b41235d2baa7bcc6037cfeea38eea
-MISC ChangeLog 25675 RMD160 18eb6aeb032de8868c61bd9006399932ef5f12b8 SHA1 d3dd54a2fb7f183990d0b0a2fc566aa6c0bcc980 SHA256 9c2df92707db000fcc417f715cc5b6f2cb162d76dca6f156e402dab34718c1f3
+EBUILD dhcp-4.0.1.ebuild 6748 RMD160 65a827140787fd302acb9970930d14576a0b5ba6 SHA1 27fcb9e7a64f1d5f7b4a96f6d2c8f3aa5f0b1679 SHA256 43d87d271aeaaf23095e601359d49eb9253c91b07376d7720b5d03e1530ffe6c
+MISC ChangeLog 25970 RMD160 fd6129b7579503e72102d23353501b4afc740943 SHA1 f977257e64e5ba5e390e696fd806b474ab50154f SHA256 0dd9d391f509743b752bc5d19ce647a13f3a1845bac221de29c76999aa28d72d
 MISC metadata.xml 358 RMD160 97ecd4b6ee0a24352a71a66d5ad4fd82481156b4 SHA1 d80da2cf7c6892cdad6b681fda29e46472d68871 SHA256 8665f24cdfcc09576b595f8bd257333ff5f9ea7ee0ca2925ba6fb74d90e12415
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkkQ69AACgkQ67wieSYcaxePsQCbBIL2uIcF7xJxPy/RxnxLDB1+
-ezoAoNz3IHNMtLjyc7wTT33FC/aep8xB
-=YGnN
+iEYEARECAAYFAknQxOkACgkQp5vW4rUFj5rrggCfcfKSl8aUw/jlRNYRCQ+6TPZ3
+2j4An30RKL2L5myj/Dy7DaSxHhkYSaZ7
+=Mh1a
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dhcp/dhcp-4.0.0.ebuild b/net-misc/dhcp/dhcp-4.0.1.ebuild
index 3107fe3da2e8..8b20567f7ad8 100644
--- a/net-misc/dhcp/dhcp-4.0.0.ebuild
+++ b/net-misc/dhcp/dhcp-4.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.0.0.ebuild,v 1.2 2008/10/26 03:45:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.0.1.ebuild,v 1.1 2009/03/30 13:13:28 chainsaw Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -50,7 +50,7 @@ src_unpack() {
 	# Quiet the isc blurb
 	epatch "${FILESDIR}/${PN}"-4.0-no_isc_blurb.patch
 	# Enable dhclient to get extra configuration from stdin
-	epatch "${FILESDIR}/${PN}"-4.0-dhclient-stdin-conf.patch
+	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}"-3.0.5-bpf-nofallback.patch
diff --git a/net-misc/dhcp/files/dhcp-4.0.1-dhclient-stdin-conf.patch b/net-misc/dhcp/files/dhcp-4.0.1-dhclient-stdin-conf.patch
new file mode 100644
index 000000000000..ddbe4a39d5a4
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.0.1-dhclient-stdin-conf.patch
@@ -0,0 +1,114 @@
+diff -uNr dhcp-4.0.1.ORIG/client/clparse.c dhcp-4.0.1/client/clparse.c
+--- dhcp-4.0.1.ORIG/client/clparse.c	2009-03-30 13:54:47.000000000 +0100
++++ dhcp-4.0.1/client/clparse.c	2009-03-30 13:58:02.000000000 +0100
+@@ -174,6 +174,10 @@
+ #endif
+ 	}
+ 
++       /* Read any extra configuration from stdin */
++	read_client_conf_stdin ((struct interface_info *)0,
++				&top_level_config);
++
+ 	/* Set up state and config structures for clients that don't
+ 	   have per-interface configuration statements. */
+ 	config = (struct client_config *)0;
+@@ -203,23 +207,13 @@
+ 	return status;
+ }
+ 
+-int read_client_conf_file (const char *name, struct interface_info *ip,
++int read_client_conf_actual (struct parse *cfile, struct interface_info *ip,
+ 			   struct client_config *client)
+ {
+-	int file;
+-	struct parse *cfile;
+ 	const char *val;
+ 	int token;
+ 	isc_result_t status;
+ 	
+-	if ((file = open (name, O_RDONLY)) < 0)
+-		return uerr2isc (errno);
+-
+-	cfile = NULL;
+-	status = new_parse(&cfile, file, NULL, 0, path_dhclient_conf, 0);
+-	if (status != ISC_R_SUCCESS || cfile == NULL)
+-		return status;
+-
+ 	do {
+ 		token = peek_token (&val, (unsigned *)0, cfile);
+ 		if (token == END_OF_FILE)
+@@ -230,10 +224,74 @@
+ 	status = (cfile -> warnings_occurred
+ 		  ? ISC_R_BADPARSE
+ 		  : ISC_R_SUCCESS);
++	return status;
++}
++
++int read_client_conf_file (const char *name, struct interface_info *ip,
++			   struct client_config *client)
++{
++	int file;
++	struct parse *cfile;
++	isc_result_t status;
++	
++	if ((file = open (name, O_RDONLY)) < 0)
++		return uerr2isc (errno);
++
++	cfile = (struct parse *)0;
++	new_parse (&cfile, file, (char *)0, 0, path_dhclient_conf, 0);
++	status = read_client_conf_actual(cfile, ip, client);
+ 	end_parse (&cfile);
+ 	return status;
+ }
+ 
++int read_client_conf_stdin (struct interface_info *ip,
++			    struct client_config *client)
++{
++	int file;
++	char *buffer = NULL, *p;
++	unsigned buflen, len = 0;
++	struct parse *cfile;
++	size_t bytes;
++	isc_result_t status;
++
++	file = fileno(stdin);
++	if (isatty (file))
++		return ISC_R_NOTFOUND;
++	if (fcntl (file, F_SETFL, O_NONBLOCK) < 0)
++		log_fatal ("could not set stdin to non blocking!");
++
++	buflen = BUFSIZ;
++	buffer = malloc (BUFSIZ + 1);
++	p = buffer;
++	do {
++		bytes = read (file, p, BUFSIZ);
++		if (bytes == 0)
++			break;
++		if (bytes == -1)
++			log_fatal ("failed to read stdin!");
++		if (bytes >= BUFSIZ) {
++			buflen += BUFSIZ;
++			len += BUFSIZ;
++			buffer = realloc (buffer, buflen + 1);
++			if (!buffer)
++				log_fatal ("not enough buffer to read stdin!");
++			p = buffer + len;
++		} else {
++			len += bytes;
++			break;
++		}
++	} while(1);
++	buffer[len] = '\0';
++
++	cfile = (struct parse *)0;
++	status = new_parse (&cfile, -1, buffer, len, "stdin", 0);
++	if (status == ISC_R_SUCCESS) {
++		status = read_client_conf_actual (cfile, ip, client);
++		end_parse (&cfile);
++	}
++	free(buffer);
++	return status;
++}
+ 
+ /* lease-file :== client-lease-statements END_OF_FILE
+    client-lease-statements :== <nil>