head 1.5; access; symbols OPENPKG_E1_MP_HEAD:1.3 OPENPKG_E1_MP:1.3 OPENPKG_E1_MP_2_STABLE:1.3.2.2 OPENPKG_E1_FP:1.3.2.2 OPENPKG_2_STABLE_MP:1.3 OPENPKG_2_STABLE_20061018:1.3.2.2 OPENPKG_2_STABLE:1.3.0.2 OPENPKG_CW_FP:1.2; locks; strict; comment @# @; 1.5 date 2007.05.17.15.44.33; author rse; state Exp; branches; next 1.4; commitid vT3d0NU1P1aXsiis; 1.4 date 2007.02.16.08.12.36; author rse; state Exp; branches; next 1.3; commitid 6B3yUopM980hRG6s; 1.3 date 2005.11.14.11.49.27; author tho; state Exp; branches 1.3.2.1; next 1.2; commitid 9Zx98TA90hKoOI9r; 1.2 date 2005.01.12.15.32.11; author ms; state Exp; branches; next 1.1; 1.1 date 2003.10.09.19.37.50; author ms; state Exp; branches; next ; 1.3.2.1 date 2005.11.14.11.49.27; author rse; state dead; branches; next 1.3.2.2; commitid iZxwRSmmWscPXUQr; 1.3.2.2 date 2006.10.16.14.55.06; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.5 log @upgrading package: powerdns 2.9.20 -> 2.9.21 @ text @Index: configure --- configure.orig 2006-03-15 19:29:56 +0100 +++ configure 2007-02-16 09:06:21 +0100 @@@@ -21663,7 +21663,7 @@@@ -modules="gmysql geo" +modules="geo" # Check whether --with-modules or --without-modules was given. if test "${with_modules+set}" = set; then Index: pdns/backends/bind/bindbackend2.cc --- pdns/backends/bind/bindbackend2.cc.orig 2006-03-15 19:29:38 +0100 +++ pdns/backends/bind/bindbackend2.cc 2007-02-16 09:06:21 +0100 @@@@ -41,8 +41,21 @@@@ #include "misc.hh" #include "dynlistener.hh" #include "lock.hh" + +#undef L +#define L ::bind2Log() + using namespace std; + +// use own logger across corresponding classes +// to properly identify log text from Bind2Backend +Logger &bind2Log(void) +{ + static Logger lbind2("bind2be"); + return lbind2; +} + /** new scheme of things: we have zone-id map a zone-id has a vector of DNSResourceRecords Index: pdns/backends/gsql/gsqlbackend.cc --- pdns/backends/gsql/gsqlbackend.cc.orig 2006-03-15 19:29:38 +0100 +++ pdns/backends/gsql/gsqlbackend.cc 2007-02-16 09:06:21 +0100 @@@@ -19,6 +19,18 @@@@ #include +#undef L +#define L ::gsqlLog() + + +// use own logger across corresponding classes +// to properly identify log text from GSQLBackend +Logger &gsqlLog(void) +{ + static Logger lgsql("gsql"); + return lgsql; +} + void GSQLBackend::setNotified(uint32_t domain_id, uint32_t serial) { char output[1024]; Index: pdns/randombackend.cc --- pdns/randombackend.cc.orig 2006-03-15 19:29:38 +0100 +++ pdns/randombackend.cc 2007-02-16 09:06:21 +0100 @@@@ -24,6 +24,18 @@@@ #include "ahuexception.hh" #include "logger.hh" +#undef L +#define L ::randLog() + + +// use own logger across corresponding classes +// to properly identify log text from RandomBackend +Logger &randLog(void) +{ + static Logger lrand("randbe"); + return lrand; +} + /* FIRST PART */ class RandomBackend : public DNSBackend { @ 1.4 log @Add optional support for SQLite. Contributed by: Olivier Kaloudoff @ text @a12 25 Index: pdns/backends/bind/bindbackend.cc --- pdns/backends/bind/bindbackend.cc.orig 2006-03-15 19:29:38 +0100 +++ pdns/backends/bind/bindbackend.cc 2007-02-16 09:06:21 +0100 @@@@ -39,9 +39,21 @@@@ #include "misc.hh" #include "dynlistener.hh" #include "lock.hh" + +#undef L +#define L ::bindLog() + using namespace std; +// use own logger across corresponding classes +// to properly identify log text from BindBackend +Logger &bindLog(void) +{ + static Logger lbind("bindbe"); + return lbind; +} + cmap_t BindBackend::d_qnames; map* > > BindBackend::d_zone_id_map; set BindBackend::s_contents; @ 1.3 log @blind update, as boost isn't building at the moment @ text @d1 16 a16 4 diff -Naur pdns/backends/bind/bindbackend.cc.orig pdns/backends/bind/bindbackend.cc --- pdns/backends/bind/bindbackend.cc.orig 2003-08-22 15:33:31.000000000 +0200 +++ pdns/backends/bind/bindbackend.cc 2003-10-09 18:24:43.000000000 +0200 @@@@ -40,9 +40,21 @@@@ d38 4 a41 4 diff -Naur pdns/backends/bind/bindbackend2.cc.orig pdns/backends/bind/bindbackend2.cc --- pdns/backends/bind/bindbackend2.cc.orig 2003-08-22 15:33:31.000000000 +0200 +++ pdns/backends/bind/bindbackend2.cc 2003-10-09 18:24:11.000000000 +0200 @@@@ -42,8 +42,21 @@@@ d62 4 a65 4 a zone-id has a vector of DNSResourceRecords */ diff -Naur pdns/backends/gsql/gsqlbackend.cc.orig pdns/backends/gsql/gsqlbackend.cc --- pdns/backends/gsql/gsqlbackend.cc.orig 2003-08-22 15:33:31.000000000 +0200 +++ pdns/backends/gsql/gsqlbackend.cc 2003-10-09 18:25:07.000000000 +0200 d85 3 a87 3 diff -Naur pdns/randombackend.cc.orig pdns/randombackend.cc --- pdns/randombackend.cc.orig 2003-08-22 14:57:14.000000000 +0200 +++ pdns/randombackend.cc 2003-10-09 18:25:23.000000000 +0200 @ 1.3.2.1 log @file powerdns.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:55:06 +0000 @ text @d1 94 @ 1.3.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 94 diff -Naur pdns/backends/bind/bindbackend.cc.orig pdns/backends/bind/bindbackend.cc --- pdns/backends/bind/bindbackend.cc.orig 2003-08-22 15:33:31.000000000 +0200 +++ pdns/backends/bind/bindbackend.cc 2003-10-09 18:24:43.000000000 +0200 @@@@ -40,9 +40,21 @@@@ #include "misc.hh" #include "dynlistener.hh" #include "lock.hh" + +#undef L +#define L ::bindLog() + using namespace std; +// use own logger across corresponding classes +// to properly identify log text from BindBackend +Logger &bindLog(void) +{ + static Logger lbind("bindbe"); + return lbind; +} + cmap_t BindBackend::d_qnames; map* > > BindBackend::d_zone_id_map; set BindBackend::s_contents; diff -Naur pdns/backends/bind/bindbackend2.cc.orig pdns/backends/bind/bindbackend2.cc --- pdns/backends/bind/bindbackend2.cc.orig 2003-08-22 15:33:31.000000000 +0200 +++ pdns/backends/bind/bindbackend2.cc 2003-10-09 18:24:11.000000000 +0200 @@@@ -42,8 +42,21 @@@@ #include "misc.hh" #include "dynlistener.hh" #include "lock.hh" + +#undef L +#define L ::bind2Log() + using namespace std; + +// use own logger across corresponding classes +// to properly identify log text from Bind2Backend +Logger &bind2Log(void) +{ + static Logger lbind2("bind2be"); + return lbind2; +} + /** new scheme of things: we have zone-id map a zone-id has a vector of DNSResourceRecords */ diff -Naur pdns/backends/gsql/gsqlbackend.cc.orig pdns/backends/gsql/gsqlbackend.cc --- pdns/backends/gsql/gsqlbackend.cc.orig 2003-08-22 15:33:31.000000000 +0200 +++ pdns/backends/gsql/gsqlbackend.cc 2003-10-09 18:25:07.000000000 +0200 @@@@ -19,6 +19,18 @@@@ #include +#undef L +#define L ::gsqlLog() + + +// use own logger across corresponding classes +// to properly identify log text from GSQLBackend +Logger &gsqlLog(void) +{ + static Logger lgsql("gsql"); + return lgsql; +} + void GSQLBackend::setNotified(uint32_t domain_id, uint32_t serial) { char output[1024]; diff -Naur pdns/randombackend.cc.orig pdns/randombackend.cc --- pdns/randombackend.cc.orig 2003-08-22 14:57:14.000000000 +0200 +++ pdns/randombackend.cc 2003-10-09 18:25:23.000000000 +0200 @@@@ -24,6 +24,18 @@@@ #include "ahuexception.hh" #include "logger.hh" +#undef L +#define L ::randLog() + + +// use own logger across corresponding classes +// to properly identify log text from RandomBackend +Logger &randLog(void) +{ + static Logger lrand("randbe"); + return lrand; +} + /* FIRST PART */ class RandomBackend : public DNSBackend { @ 1.2 log @upgrading package: powerdns 2.9.16 -> 2.9.17 @ text @d70 1 a70 1 void GSQLBackend::setNotified(u_int32_t domain_id, u_int32_t serial) @ 1.1 log @Completely repair package and implement features in ticket #202 @ text @d1 3 a3 3 diff -Naur pdns-2.9.11.orig/pdns/backends/bind/bindbackend.cc pdns-2.9.11/pdns/backends/bind/bindbackend.cc --- pdns-2.9.11.orig/pdns/backends/bind/bindbackend.cc 2003-08-22 15:33:31.000000000 +0200 +++ pdns-2.9.11/pdns/backends/bind/bindbackend.cc 2003-10-09 18:24:43.000000000 +0200 d26 4 a29 4 diff -Naur pdns-2.9.11.orig/pdns/backends/bind/bindbackend2.cc pdns-2.9.11/pdns/backends/bind/bindbackend2.cc --- pdns-2.9.11.orig/pdns/backends/bind/bindbackend2.cc 2003-08-22 15:33:31.000000000 +0200 +++ pdns-2.9.11/pdns/backends/bind/bindbackend2.cc 2003-10-09 18:24:11.000000000 +0200 @@@@ -40,8 +40,21 @@@@ d51 4 a54 4 diff -Naur pdns-2.9.11.orig/pdns/backends/gsql/gsqlbackend.cc pdns-2.9.11/pdns/backends/gsql/gsqlbackend.cc --- pdns-2.9.11.orig/pdns/backends/gsql/gsqlbackend.cc 2003-08-22 15:33:31.000000000 +0200 +++ pdns-2.9.11/pdns/backends/gsql/gsqlbackend.cc 2003-10-09 18:25:07.000000000 +0200 @@@@ -17,6 +17,18 @@@@ d73 3 a75 3 diff -Naur pdns-2.9.11.orig/pdns/randombackend.cc pdns-2.9.11/pdns/randombackend.cc --- pdns-2.9.11.orig/pdns/randombackend.cc 2003-08-22 14:57:14.000000000 +0200 +++ pdns-2.9.11/pdns/randombackend.cc 2003-10-09 18:25:23.000000000 +0200 @