| Index: trunk/debs/pdns/debian/patches/10-fix-zoneparser-apostrophe-bug.dpatch |
| — | — | @@ -6,8 +6,8 @@ |
| 7 | 7 | |
| 8 | 8 | @DPATCH@ |
| 9 | 9 | diff -urNad pdns-2.9.21~/pdns/zoneparser-tng.cc pdns-2.9.21/pdns/zoneparser-tng.cc |
| 10 | | -+++ pdns-2.9.21/pdns/zoneparser-tng.cc 2007-06-07 21:10:21.000000000 +0000 |
| | 10 | +--- pdns-2.9.21~/pdns/zoneparser-tng.cc 2007-06-24 15:00:24.000000000 +0000 |
| 11 | 11 | @@ -40,14 +40,16 @@ |
| 12 | 12 | FILE *fp=fopen(fname.c_str(), "r"); |
| 13 | 13 | if(!fp) |
| — | — | @@ -117,8 +117,16 @@ |
| 118 | 118 | } |
| 119 | 119 | } |
| 120 | 120 | if(!haveQTYPE) |
| 121 | | -@@ -364,14 +390,15 @@ |
| | 121 | +@@ -309,6 +335,7 @@ |
| | 122 | + rr.content=d_line.substr(range.first); |
| 122 | 123 | |
| | 124 | + chopComment(rr.content); |
| | 125 | ++ trim(rr.content); |
| | 126 | + |
| | 127 | + if(equals(rr.content, "@")) |
| | 128 | + rr.content=d_zonename; |
| | 129 | +@@ -364,14 +391,15 @@ |
| | 130 | + |
| 123 | 131 | bool ZoneParserTNG::getLine() |
| 124 | 132 | { |
| 125 | 133 | - while(!d_fps.empty()) { |
| — | — | @@ -138,8 +146,8 @@ |
| 139 | 147 | return false; |
| 140 | 148 | } |
| 141 | 149 | diff -urNad pdns-2.9.21~/pdns/zoneparser-tng.hh pdns-2.9.21/pdns/zoneparser-tng.hh |
| 142 | | -+++ pdns-2.9.21/pdns/zoneparser-tng.hh 2007-06-07 21:10:21.000000000 +0000 |
| | 150 | +--- pdns-2.9.21~/pdns/zoneparser-tng.hh 2007-06-24 15:00:24.000000000 +0000 |
| 143 | 151 | @@ -39,7 +39,7 @@ |
| 144 | 152 | bool getLine(); |
| 145 | 153 | bool getTemplateLine(); |
| Index: trunk/debs/pdns/debian/changelog |
| — | — | @@ -1,3 +1,9 @@ |
| | 2 | +pdns (2.9.21-1wm2) feisty; urgency=high |
| | 3 | + |
| | 4 | + * Fix bug in zoneparser-tng.cc where it doesn't trim tabs |
| | 5 | + |
| | 6 | + -- Mark Bergsma <mark@wikimedia.org> Mon, 25 Jun 2007 18:25:32 +0000 |
| | 7 | + |
| 2 | 8 | pdns (2.9.21-1wm1) feisty; urgency=high |
| 3 | 9 | |
| 4 | 10 | * Incorporate zoneparser-tng parser fixes from r1056 |