Part of Slepp's ProjectsPastebinTURLImagebinFilebin
Feedback -- English French German Japanese
Create Upload Newest Tools Donate

Advertising

martin
Tuesday, February 27th, 2007 at 2:37:04pm UTC 

  1. diff -u dhcp3-3.0.4/debian/control dhcp3-3.0.4/debian/control
  2. --- dhcp3-3.0.4/debian/control
  3. +++ dhcp3-3.0.4/debian/control
  4. @@ -1,7 +1,8 @@
  5.  Source: dhcp3
  6.  Section: net
  7.  Priority: important
  8. -Maintainer: Eloy A. Paris <[email protected]>
  9. +Maintainer: Ubuntu Core Developers <[email protected]>
  10. +XSBC-Original-Maintainer: Eloy A. Paris <[email protected]>
  11.  Uploaders: Matt Zimmerman <[email protected]>, Andrew Pollock <[email protected]>
  12.  Build-Depends: debhelper (>= 4.1.16), dpkg-dev (>= 1.13.2), groff, dpatch, po-debconf, libcap-dev
  13.  Standards-Version: 3.5.6
  14. diff -u dhcp3-3.0.4/debian/changelog dhcp3-3.0.4/debian/changelog
  15. --- dhcp3-3.0.4/debian/changelog
  16. +++ dhcp3-3.0.4/debian/changelog
  17. @@ -1,3 +1,11 @@
  18. +dhcp3 (3.0.4-12ubuntu3) feisty; urgency=low
  19. +
  20. +  * debian/patches/dynamic-hostname.dpatch: Fix a few forgotten places where
  21. +    the new string type 'h' must be handled as well. (LP: #87816)
  22. +  * debian/control: Set Ubuntu maintainer.
  23. +
  24. + -- Martin Pitt <[email protected]>  Tue, 27 Feb 2007 15:30:13 +0100
  25. +
  26.  dhcp3 (3.0.4-12ubuntu2) feisty; urgency=low
  27.  
  28.    * Add debian/patches/dynamic-hostname.dpatch:
  29. diff -u dhcp3-3.0.4/debian/patches/dynamic-hostname.dpatch dhcp3-3.0.4/debian/patches/dynamic-hostname.dpatch
  30. --- dhcp3-3.0.4/debian/patches/dynamic-hostname.dpatch
  31. +++ dhcp3-3.0.4/debian/patches/dynamic-hostname.dpatch
  32. @@ -7,7 +7,7 @@
  33.  diff -urNad dhcp3-3.0.4~/common/options.c dhcp3-3.0.4/common/options.c
  34.  --- dhcp3-3.0.4~/common/options.c      2006-02-22 23:43:27.000000000 +0100
  35. -+++ dhcp3-3.0.4/common/options.c       2007-02-07 12:33:52.000000000 +0100
  36. ++++ dhcp3-3.0.4/common/options.c       2007-02-27 15:24:15.000000000 +0100
  37.  @@ -1060,6 +1060,7 @@
  38.               switch (*p++) {
  39.                   case 'd':
  40. @@ -16,9 +16,33 @@
  41.                     return 1;
  42.  
  43.                     /* These symbols are arbitrary, not fixed or
  44. [email protected]@ -1189,6 +1190,7 @@
  45. +
  46. +                 case 'd': /* "Domain name" */
  47. +                 case 't': /* "ASCII Text" */
  48. ++                case 'h': /* "ASCII Text with <hostname> magic" */
  49. +                 case 'X': /* "ASCII or Hex Conditional */
  50. +                 case 'x': /* "Hex" */
  51. +                 case 'A': /* Array of all that precedes. */
  52. [email protected]@ -1286,6 +1288,7 @@
  53. +                   break;
  54. +                   case 'd':
  55. +                   case 't':
  56. ++                  case 'h':
  57. +                   fmtbuf [l] = 't';
  58. +                   fmtbuf [l + 1] = 0;
  59. +                   numhunk = -2;
  60. [email protected]@ -1363,6 +1366,7 @@
  61. +             for (j = 0; j < numelem; j++) {
  62. +                   switch (fmtbuf [j]) {
  63. +                         case 't':
  64. ++                        case 'h':
  65. +                         if (emit_quotes)
  66. +                               *op++ = '"';
  67. +                         for (; dp < data + len; dp++) {
  68.  diff -urNad dhcp3-3.0.4~/common/parse.c dhcp3-3.0.4/common/parse.c
  69.  --- dhcp3-3.0.4~/common/parse.c        2006-02-22 23:43:27.000000000 +0100
  70. -+++ dhcp3-3.0.4/common/parse.c 2007-02-07 12:33:52.000000000 +0100
  71. ++++ dhcp3-3.0.4/common/parse.c 2007-02-27 15:14:06.000000000 +0100
  72.  @@ -4300,6 +4300,23 @@
  73.         return 1;
  74.   }
  75. @@ -71,7 +95,7 @@
  76.                           if (token != STRING) {
  77.  diff -urNad dhcp3-3.0.4~/common/tables.c dhcp3-3.0.4/common/tables.c
  78.  --- dhcp3-3.0.4~/common/tables.c       2006-02-22 23:43:27.000000000 +0100
  79. -+++ dhcp3-3.0.4/common/tables.c        2007-02-07 12:34:30.000000000 +0100
  80. ++++ dhcp3-3.0.4/common/tables.c        2007-02-27 15:14:06.000000000 +0100
  81.  @@ -58,6 +58,8 @@
  82.      b - 8-bit signed integer
  83.      B - 8-bit unsigned integer

advertising

Update the Post

Either update this post and resubmit it with changes, or make a new post.

You may also comment on this post.

update paste below
details of the post (optional)

Note: Only the paste content is required, though the following information can be useful to others.

Save name / title?

(space separated, optional)



Please note that information posted here will not expire by default. If you do not want it to expire, please set the expiry time above. If it is set to expire, web search engines will not be allowed to index it prior to it expiring. Items that are not marked to expire will be indexable by search engines. Be careful with your passwords. All illegal activities will be reported and any information will be handed over to the authorities, so be good.

comments powered by Disqus
worth-right
worth-right