View | Details | Raw Unified | Return to bug 229742
Collapse All | Expand All

(-)Makefile (-2 / +1 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	dnsdist
4
PORTNAME=	dnsdist
5
DISTVERSION=	1.3.0
5
DISTVERSION=	1.3.2
6
PORTREVISION=	5
7
CATEGORIES=	dns net
6
CATEGORIES=	dns net
8
MASTER_SITES=	https://downloads.powerdns.com/releases/ \
7
MASTER_SITES=	https://downloads.powerdns.com/releases/ \
9
		LOCAL/cpm
8
		LOCAL/cpm
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1522585108
1
TIMESTAMP = 1531293770
2
SHA256 (dnsdist-1.3.0.tar.bz2) = aa67cd4db8404a13ed4ed1097dd850203dab8a327372f72bb140df11ef7eba08
2
SHA256 (dnsdist-1.3.2.tar.bz2) = 0be7704e5a418a8ed6908fc110ecfb9bc23f270b5af8a5525f1fa934ef0e6bc4
3
SIZE (dnsdist-1.3.0.tar.bz2) = 924183
3
SIZE (dnsdist-1.3.2.tar.bz2) = 918200
(-)files/patch-boost-1.67 (-53 lines)
Lines 1-53 Link Here
1
https://github.com/PowerDNS/pdns/commit/e6a9dde524b5
2
3
--- dns.hh.orig	2018-03-29 15:25:58 UTC
4
+++ dns.hh
5
@@ -235,7 +235,6 @@ inline uint16_t * getFlagsFromDNSHeader(struct dnshead
6
 #define FLAGS_CD_OFFSET (12)
7
 #endif
8
 
9
-#define L theL()
10
 extern time_t s_starttime;
11
 
12
 uint32_t hashQuestion(const char* packet, uint16_t len, uint32_t init);
13
--- dnsdist-carbon.cc.orig	2018-03-29 15:25:58 UTC
14
+++ dnsdist-carbon.cc
15
@@ -27,7 +27,6 @@
16
 #include "sstuff.hh"
17
 
18
 #include "namespaces.hh"
19
-#undef L
20
 #include "dnsdist.hh"
21
 
22
 GlobalStateHolder<vector<CarbonConfig> > g_carbon;
23
--- dnsdist.cc.orig	2018-03-29 15:25:58 UTC
24
+++ dnsdist.cc
25
@@ -2258,7 +2258,7 @@ try
26
     bindAny(cs->local.sin4.sin_family, cs->udpFD);
27
 
28
     //    if (!setSocketTimestamps(cs->udpFD))
29
-    //      L<<Logger::Warning<<"Unable to enable timestamp reporting for socket"<<endl;
30
+    //      g_log<<Logger::Warning<<"Unable to enable timestamp reporting for socket"<<endl;
31
 
32
 
33
     if(IsAnyAddress(cs->local)) {
34
--- remote_logger.cc.orig	2018-03-29 15:25:58 UTC
35
+++ remote_logger.cc
36
@@ -22,7 +22,7 @@ bool RemoteLogger::reconnect()
37
   }
38
   catch(const std::exception& e) {
39
 #ifdef WE_ARE_RECURSOR
40
-    L<<Logger::Warning<<"Error connecting to remote logger "<<d_remote.toStringWithPort()<<": "<<e.what()<<std::endl;
41
+    g_log<<Logger::Warning<<"Error connecting to remote logger "<<d_remote.toStringWithPort()<<": "<<e.what()<<std::endl;
42
 #else
43
     warnlog("Error connecting to remote logger %s: %s", d_remote.toStringWithPort(), e.what());
44
 #endif
45
@@ -63,7 +63,7 @@ void RemoteLogger::worker()
46
     }
47
     catch(const std::runtime_error& e) {
48
 #ifdef WE_ARE_RECURSOR
49
-      L<<Logger::Info<<"Error sending data to remote logger "<<d_remote.toStringWithPort()<<": "<< e.what()<<endl;
50
+      g_log<<Logger::Info<<"Error sending data to remote logger "<<d_remote.toStringWithPort()<<": "<< e.what()<<endl;
51
 #else
52
       vinfolog("Error sending data to remote logger (%s): %s", d_remote.toStringWithPort(), e.what());
53
 #endif

Return to bug 229742