Package: isc-dhcp Version: 4.1.1-P1-11 Severity: minor Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu ubuntu-patch natty
While merging the new isc-dhcp packaging into Ubuntu, I noticed that you applied a patch in version 4.1.0-1 to fix groff warnings. Unfortunately, the patch is incorrect: it changes ' to \' throughout, which does happen to avoid the warning caused by ' being a control character at the start of an input line, but also emits an acute accent rather than a quotation mark. The correct fix (speaking with my Debian groff maintainer hat on) would be to put a zero-width space (spelled \&) before ' at the start of input lines, which fixes the warning without changing the meaning of the character. Patch follows. === modified file 'debian/patches/fix_groff_warnings.dpatch' --- debian/patches/fix_groff_warnings.dpatch 2009-09-02 22:34:25 +0000 +++ debian/patches/fix_groff_warnings.dpatch 2010-11-01 17:02:14 +0000 @@ -6,14 +6,14 @@ @DPATCH@ diff -urNad isc-dhcp~/common/dhcp-options.5 isc-dhcp/common/dhcp-options.5 ---- isc-dhcp~/common/dhcp-options.5 2009-06-23 22:15:20.000000000 -0700 -+++ isc-dhcp/common/dhcp-options.5 2009-08-30 22:16:30.000000000 -0700 +--- isc-dhcp~/common/dhcp-options.5 2010-11-01 16:52:08.000000000 +0000 ++++ isc-dhcp/common/dhcp-options.5 2010-11-01 17:00:52.000000000 +0000 @@ -1230,7 +1230,7 @@ .PP Specifies the domain name that the client wishes to use. This can be a fully-qualified domain name, or a single label. If there is no trailing -'.' character in the name, it is not fully-qualified, and the server will -+\'.\' character in the name, it is not fully-qualified, and the server will ++\&'.' character in the name, it is not fully-qualified, and the server will generally update that name in some locally-defined domain. .RE .PP @@ -22,31 +22,31 @@ diff -urNad isc-dhcp~/common/dhcp-option .PP The \fBpreference\fR option informs a DHCPv6 client which server is -'preferred' for use on a given subnet. This preference is only -+\'preferred\' for use on a given subnet. This preference is only ++\&'preferred' for use on a given subnet. This preference is only applied during the initial stages of configuration - once a client is bound to an IA, it will remain bound to that IA until it is no longer valid or has expired. This value may be configured on the diff -urNad isc-dhcp~/omapip/omapi.3 isc-dhcp/omapip/omapi.3 ---- isc-dhcp~/omapip/omapi.3 2009-06-23 22:15:20.000000000 -0700 -+++ isc-dhcp/omapip/omapi.3 2009-08-30 22:16:13.000000000 -0700 +--- isc-dhcp~/omapip/omapi.3 2010-11-01 16:52:08.000000000 +0000 ++++ isc-dhcp/omapip/omapi.3 2010-11-01 17:01:03.000000000 +0000 @@ -37,7 +37,7 @@ used by the ISC DHCP server and this outline addresses the parts of OMAPI appropriate to the clients of DHCP server. It does this by also describing the use of a thin API layered on top of OMAPI called -'dhcpctl' -+\'dhcpctl\' ++\&'dhcpctl' .PP OMAPI uses TCP/IP as the transport for server communication, and security can be imposed by having the client and server diff -urNad isc-dhcp~/server/dhcpd.conf.5 isc-dhcp/server/dhcpd.conf.5 ---- isc-dhcp~/server/dhcpd.conf.5 2009-06-23 22:15:20.000000000 -0700 -+++ isc-dhcp/server/dhcpd.conf.5 2009-08-30 22:16:13.000000000 -0700 +--- isc-dhcp~/server/dhcpd.conf.5 2010-11-01 16:52:08.000000000 +0000 ++++ isc-dhcp/server/dhcpd.conf.5 2010-11-01 17:01:22.000000000 +0000 @@ -820,7 +820,7 @@ normally). This process is referred to as 'MAC Address Affinity', but this is somewhat misnamed: it applies equally to DHCP Client Identifier options. Note also that affinity is applied to leases when they enter the state -'free' from 'expired' or 'released'. In this case also, leases will not -+\'free\' from \'expired\' or \'released\'. In this case also, leases will not ++\&'free' from 'expired' or 'released'. In this case also, leases will not be moved from free to backup if the secondary already has more than its share. .PP Thanks, -- Colin Watson [cjwat...@ubuntu.com] -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
