martin

diff -u dhcp3-3.0.4/debian/control dhcp3-3.0.4/debian/control--- dhcp3-3.0.4/debian/control+++ dhcp3-3.0.4/debian/control@@ -1,7 +1,8 @@ Source: dhcp3 Section: net Priority: important-Maintainer: Eloy A. Paris <peloy@debian.org>+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>+XSBC-Original-Maintainer: Eloy A. Paris <peloy@debian.org> Uploaders: Matt Zimmerman <mdz@debian.org>, Andrew Pollock <apollock@debian.org> Build-Depends: debhelper (>= 4.1.16), dpkg-dev (>= 1.13.2), groff, dpatch, po-debconf, libcap-dev Standards-Version: 3.5.6diff -u dhcp3-3.0.4/debian/changelog dhcp3-3.0.4/debian/changelog--- dhcp3-3.0.4/debian/changelog+++ dhcp3-3.0.4/debian/changelog@@ -1,3 +1,11 @@+dhcp3 (3.0.4-12ubuntu3) feisty; urgency=low++  * debian/patches/dynamic-hostname.dpatch: Fix a few forgotten places where+    the new string type 'h' must be handled as well. (LP: #87816)+  * debian/control: Set Ubuntu maintainer.++ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 27 Feb 2007 15:30:13 +0100+ dhcp3 (3.0.4-12ubuntu2) feisty; urgency=low    * Add debian/patches/dynamic-hostname.dpatch:diff -u dhcp3-3.0.4/debian/patches/dynamic-hostname.dpatch dhcp3-3.0.4/debian/patches/dynamic-hostname.dpatch--- dhcp3-3.0.4/debian/patches/dynamic-hostname.dpatch+++ dhcp3-3.0.4/debian/patches/dynamic-hostname.dpatch@@ -7,7 +7,7 @@ @DPATCH@ diff -urNad dhcp3-3.0.4~/common/options.c dhcp3-3.0.4/common/options.c --- dhcp3-3.0.4~/common/options.c	2006-02-22 23:43:27.000000000 +0100-+++ dhcp3-3.0.4/common/options.c	2007-02-07 12:33:52.000000000 +0100++++ dhcp3-3.0.4/common/options.c	2007-02-27 15:24:15.000000000 +0100 @@ -1060,6 +1060,7 @@  		switch (*p++) {  		    case 'd':@@ -16,9 +16,33 @@  			return 1;    			/* These symbols are arbitrary, not fixed or+@@ -1189,6 +1190,7 @@+ + 		    case 'd': /* "Domain name" */+ 		    case 't': /* "ASCII Text" */++		    case 'h': /* "ASCII Text with <hostname> magic" */+ 		    case 'X': /* "ASCII or Hex Conditional */+ 		    case 'x': /* "Hex" */+ 		    case 'A': /* Array of all that precedes. */+@@ -1286,6 +1288,7 @@+ 			break;+ 		      case 'd':+ 		      case 't':++		      case 'h':+ 			fmtbuf [l] = 't';+ 			fmtbuf [l + 1] = 0;+ 			numhunk = -2;+@@ -1363,6 +1366,7 @@+ 		for (j = 0; j < numelem; j++) {+ 			switch (fmtbuf [j]) {+ 			      case 't':++			      case 'h':+ 				if (emit_quotes)+ 					*op++ = '"';+ 				for (; dp < data + len; dp++) { diff -urNad dhcp3-3.0.4~/common/parse.c dhcp3-3.0.4/common/parse.c --- dhcp3-3.0.4~/common/parse.c	2006-02-22 23:43:27.000000000 +0100-+++ dhcp3-3.0.4/common/parse.c	2007-02-07 12:33:52.000000000 +0100++++ dhcp3-3.0.4/common/parse.c	2007-02-27 15:14:06.000000000 +0100 @@ -4300,6 +4300,23 @@  	return 1;  }@@ -71,7 +95,7 @@  				if (token != STRING) { diff -urNad dhcp3-3.0.4~/common/tables.c dhcp3-3.0.4/common/tables.c --- dhcp3-3.0.4~/common/tables.c	2006-02-22 23:43:27.000000000 +0100-+++ dhcp3-3.0.4/common/tables.c	2007-02-07 12:34:30.000000000 +0100++++ dhcp3-3.0.4/common/tables.c	2007-02-27 15:14:06.000000000 +0100 @@ -58,6 +58,8 @@     b - 8-bit signed integer     B - 8-bit unsigned integer