Attachment #166672 for bug #206986

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




# $FreeBSD$

PORTNAME=	powerdns
PORTVERSION=	3.4.8
CATEGORIES=	dns ipv6
MASTER_SITES=	http://downloads.powerdns.com/releases/
DISTNAME=	pdns-${PORTVERSION}

OPTIONS_GROUP_DNSSEC=		BOTAN110
OPTIONS_GROUP_EXPERIMENTAL=	LUA MYDNS TINYDNS
OPTIONS_GROUP_REMOTEOPT=	ZEROMQ
ZEROMQ_IMPLIES=			REMOTE

PGSQL_DESC=		PostgreSQL backend
MYSQL_DESC=		MySQL backend
OPENDBX_DESC=		OpenDBX backend
OPENLDAP_DESC=		OpenLDAP backend
SQLITE3_DESC=		SQLite 3 backend
GEO_DESC=		Geo backend
GEOIP_DESC=		GeoIP backend
DNSSEC_DESC=		Extra DNSSEC options
BOTAN110_DESC=		Faster signing + ECDSA & GOST algorithms
POLARSSL_DESC=		Use embedded PolarSSL
LMDB_DESC=		LMDB backend
LUA_DESC=		Lua backend
MYDNS_DESC=		MyDNS backend
REMOTE_DESC=		Remote backend
TINYDNS_DESC=		TinyDNS backend
TOOLS_DESC=		Build extra tools
REMOTEOPT_DESC=		Remote backend connectors
ZEROMQ_DESC=		Enable ZeroMQ connector

OPTIONS_DEFAULT=	PGSQL DNSSEC BOTAN110 POLARSSL
OPTIONS_SUB=		yes

BOTAN110_CONFIGURE_ON=	--enable-botan1.10
BOTAN110_LIB_DEPENDS=	libbotan-1.10.so:${PORTSDIR}/security/botan110

GEO_VARS=		MODULES+=geo
# has a bug. The options are being enabled even using --disable-

GEOIP_LIB_DEPENDS=	libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp \
			libGeoIP.so:${PORTSDIR}/net/GeoIP
GEOIP_VARS=		MODULES+=geoip

LMDB_LIB_DEPENDS=	liblmdb.so:${PORTSDIR}/databases/lmdb
LMDB_VARS=		MODULES+=lmdb
PGSQL_USES=		pgsql

LUA_VARS=		MODULES+=lua

MYDNS_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
MYDNS_USE=		MYSQL=YES
MYDNS_VARS=		MODULES+=mydns

MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
MYSQL_CONFIGURE_OFF=	--without-mysql
MYSQL_USE=		MYSQL=YES
MYSQL_VARS=		MODULES+=gmysql

OPENDBX_LIB_DEPENDS=	libopendbx.so:${PORTSDIR}/databases/opendbx
OPENDBX_VARS=		MODULES+=opendbx

OPENLDAP_CXXFLAGS=	-DLDAP_DEPRECATED=1
OPENLDAP_USE=		OPENLDAP=YES
OPENLDAP_VARS=		MODULES+=ldap

PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
PGSQL_CONFIGURE_OFF=	--without-pgsql
PGSQL_USES=		pgsql
PGSQL_VARS=		MODULES+=gpgsql

POLARSSL_CONFIGURE_ARGS=	--without-system-polarssl
POLARSSL_LIB_DEPENDS_OFF=	libmbedtls.so:${PORTSDIR}/security/polarssl13

REMOTE_VARS=		MODULES+=remote
BOTAN110_LIB_DEPENDS=	libbotan-1.10.so:${PORTSDIR}/security/botan110

SQLITE3_USE=		SQLITE=3
SQLITE3_VARS=		MODULES+=gqlite3

TINYDNS_CONFIGURE_ON=	CDB_LIBS="-L${LOCALBASE}/lib -lcdb" CDB_CFLAGS="-I${LOCALBASE}/include"
TINYDNS_LIB_DEPENDS=	libcdb.so:${PORTSDIR}/databases/tinycdb
TINYDNS_VARS=		MODULES+=tinydns

ZEROMQ_CONFIGURE_ARGS=	--enable-remotebackend-zeromq
ZEROMQ_LIB_DEPENDS=	libzmq.so:${PORTSDIR}/net/libzmq4

TOOLS_CONFIGURE_ENABLE=	tools
			libGeoIP.so:${PORTSDIR}/net/GeoIP

PGSQL_DESC=		PostgreSQL backend
MYSQL_DESC=		MySQL backend
OPENDBX_DESC=		OpenDBX backend
OPENLDAP_DESC=		OpenLDAP backend
SQLITE3_DESC=		SQLite 3 backend
GEO_DESC=		Geo backend
GEOIP_DESC=		GeoIP backend
DNSSEC_DESC=		Extra DNSSEC options
BOTAN110_DESC=		Faster signing + ECDSA & GOST algorithms
POLARSSL_DESC=		Use embedded PolarSSL
LMDB_DESC=		LMDB backend
LUA_DESC=		Lua backend
MYDNS_DESC=		MyDNS backend
REMOTE_DESC=		Remote backend
TINYDNS_DESC=		TinyDNS backend
TOOLS_DESC=		Build extra tools
REMOTEOPT_DESC=		Remote backend connectors
ZEROMQ_DESC=		Enable ZeroMQ connector (Implies REMOTE enabled)

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MGEO}
MODULES+=	geo
.endif

.if ${PORT_OPTIONS:MGEOIP}
MODULES+=	geoip
.endif

.if ${PORT_OPTIONS:MPGSQL}
MODULES+=	gpgsql
.endif

.if ${PORT_OPTIONS:MMYSQL}
MODULES+=	gmysql
.endif

.if ${PORT_OPTIONS:MOPENLDAP}
MODULES+=	ldap
.endif

.if ${PORT_OPTIONS:MSQLITE3}
MODULES+=	gsqlite3
.endif

.if ${PORT_OPTIONS:MLMDB}
MODULES+=	lmdb
.endif

.if ${PORT_OPTIONS:MLUA}
MODULES+=	lua
.endif

.if ${PORT_OPTIONS:MMYDNS}
MODULES+=	mydns
.endif

.if ${PORT_OPTIONS:MREMOTE}
MODULES+=	remote
.	if ${PORT_OPTIONS:MZEROMQ}
CONFIGURE_ARGS+=	--enable-remotebackend-zeromq
LIB_DEPENDS+=		libzmq.so:${PORTSDIR}/net/libzmq4
.	endif
.endif

.if ${PORT_OPTIONS:MTINYDNS}
MODULES+=	tinydns
.endif

.if ${PORT_OPTIONS:MOPENDBX}
MODULES+=	opendbx
.endif

.if ${PORT_OPTIONS:MPOLARSSL}
CONFIGURE_ARGS+=	--without-system-polarssl
.else
LIB_DEPENDS+=		libmbedtls.so.9:${PORTSDIR}/security/polarssl13
.endif

post-install:
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
.for i in pdns.conf

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (pdns-3.4.7.tar.bz2) = e17eca86c5e702b54b62b1edebc4741d8e0db748050a7214c778302039f28c4b	1	SHA256 (pdns-3.4.8.tar.bz2) = 4f818fd09bff89625b4317cc7c05445f6e7bd9ea8d21e7eefeaaca07b8b0cd9f
2	SIZE (pdns-3.4.7.tar.bz2) = 1345379	2	SIZE (pdns-3.4.8.tar.bz2) = 1345728




--- modules/luabackend/lua_functions.cc.orig	2014-09-23 06:27:34 UTC
+++ modules/luabackend/lua_functions.cc
@@ -238,6 +238,7 @@
   return ret;
 }
 
+#if !(defined( __i386__) && defined(__FreeBSD__))
 bool LUABackend::getValueFromTable(lua_State *lua, const std::string& key, time_t& value) {
   lua_pushstring(lua, key.c_str()); 
   lua_gettable(lua, -2);  
@@ -253,6 +254,7 @@
   
   return ret;
 }
+#endif
 
 bool LUABackend::getValueFromTable(lua_State *lua, const std::string& key, uint32_t& value) {
   lua_pushstring(lua, key.c_str()); 




--- modules/luabackend/luabackend.hh.orig	2014-09-23 06:27:34 UTC
+++ modules/luabackend/luabackend.hh
@@ -155,7 +155,9 @@
 //  FUNCTIONS TO THIS BACKEND
     bool getValueFromTable(lua_State *lua, const std::string& key, string& value);
     bool getValueFromTable(lua_State *lua, uint32_t key, string& value);
+#if !(defined(__i386__) && defined(__FreeBSD__))
     bool getValueFromTable(lua_State *lua, const std::string& key, time_t& value);
+#endif
     bool getValueFromTable(lua_State *lua, const std::string& key, uint32_t& value);
     bool getValueFromTable(lua_State *lua, const std::string& key, uint16_t& value);
     bool getValueFromTable(lua_State *lua, const std::string& key, int& value);

Return to bug 206986

Lines 1-7 Link Here

(-)Makefile (-95 / +55 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= powerdns	3	PORTNAME= powerdns
4	PORTVERSION= 3.4.7	4	PORTVERSION= 3.4.8
5	CATEGORIES= dns ipv6	5	CATEGORIES= dns ipv6
6	MASTER_SITES= http://downloads.powerdns.com/releases/	6	MASTER_SITES= http://downloads.powerdns.com/releases/
7	DISTNAME= pdns-${PORTVERSION}	7	DISTNAME= pdns-${PORTVERSION}
Lines 43-166 Link Here
43	OPTIONS_GROUP_DNSSEC= BOTAN110	43	OPTIONS_GROUP_DNSSEC= BOTAN110
44	OPTIONS_GROUP_EXPERIMENTAL= LUA MYDNS TINYDNS	44	OPTIONS_GROUP_EXPERIMENTAL= LUA MYDNS TINYDNS
45	OPTIONS_GROUP_REMOTEOPT= ZEROMQ	45	OPTIONS_GROUP_REMOTEOPT= ZEROMQ
		46	ZEROMQ_IMPLIES= REMOTE
46		47
47	PGSQL_DESC= PostgreSQL backend
48	MYSQL_DESC= MySQL backend
49	OPENDBX_DESC= OpenDBX backend
50	OPENLDAP_DESC= OpenLDAP backend
51	SQLITE3_DESC= SQLite 3 backend
52	GEO_DESC= Geo backend
53	GEOIP_DESC= GeoIP backend
54	DNSSEC_DESC= Extra DNSSEC options
55	BOTAN110_DESC= Faster signing + ECDSA & GOST algorithms
56	POLARSSL_DESC= Use embedded PolarSSL
57	LMDB_DESC= LMDB backend
58	LUA_DESC= Lua backend
59	MYDNS_DESC= MyDNS backend
60	REMOTE_DESC= Remote backend
61	TINYDNS_DESC= TinyDNS backend
62	TOOLS_DESC= Build extra tools
63	REMOTEOPT_DESC= Remote backend connectors
64	ZEROMQ_DESC= Enable ZeroMQ connector
65
66	OPTIONS_DEFAULT= PGSQL DNSSEC BOTAN110 POLARSSL	48	OPTIONS_DEFAULT= PGSQL DNSSEC BOTAN110 POLARSSL
		49	OPTIONS_SUB= yes
67		50
68	OPTIONS_SUB= yes	51	BOTAN110_CONFIGURE_ON= --enable-botan1.10
		52	BOTAN110_LIB_DEPENDS= libbotan-1.10.so:${PORTSDIR}/security/botan110
69		53
70	# Don't use CONFIGURE_ENABLE, the configure script	54	GEO_VARS= MODULES+=geo
71	# has a bug. The options are being enabled even using --disable-
72		55
73	TOOLS_CONFIGURE_ON= --enable-tools	56	GEOIP_LIB_DEPENDS= libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp \
		57	libGeoIP.so:${PORTSDIR}/net/GeoIP
		58	GEOIP_VARS= MODULES+=geoip
74		59
75	PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE}	60	LMDB_LIB_DEPENDS= liblmdb.so:${PORTSDIR}/databases/lmdb
76	PGSQL_CONFIGURE_OFF= --without-pgsql	61	LMDB_VARS= MODULES+=lmdb
77	PGSQL_USES= pgsql
78		62
		63	LUA_VARS= MODULES+=lua
		64
		65	MYDNS_CONFIGURE_ON= --with-mysql=${LOCALBASE}
		66	MYDNS_USE= MYSQL=YES
		67	MYDNS_VARS= MODULES+=mydns
		68
79	MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE}	69	MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE}
80	MYSQL_CONFIGURE_OFF= --without-mysql	70	MYSQL_CONFIGURE_OFF= --without-mysql
81	MYSQL_USE= MYSQL=YES	71	MYSQL_USE= MYSQL=YES
		72	MYSQL_VARS= MODULES+=gmysql
82		73
83	MYDNS_CONFIGURE_ON= --with-mysql=${LOCALBASE}	74	OPENDBX_LIB_DEPENDS= libopendbx.so:${PORTSDIR}/databases/opendbx
84	MYDNS_USE= MYSQL=YES	75	OPENDBX_VARS= MODULES+=opendbx
85		76
86	OPENLDAP_CXXFLAGS= -DLDAP_DEPRECATED=1	77	OPENLDAP_CXXFLAGS= -DLDAP_DEPRECATED=1
87	OPENLDAP_USE= OPENLDAP=YES	78	OPENLDAP_USE= OPENLDAP=YES
		79	OPENLDAP_VARS= MODULES+=ldap
88		80
89	SQLITE3_USE= SQLITE=3	81	PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE}
		82	PGSQL_CONFIGURE_OFF= --without-pgsql
		83	PGSQL_USES= pgsql
		84	PGSQL_VARS= MODULES+=gpgsql
90		85
91	OPENDBX_LIB_DEPENDS= libopendbx.so:${PORTSDIR}/databases/opendbx	86	POLARSSL_CONFIGURE_ARGS= --without-system-polarssl
		87	POLARSSL_LIB_DEPENDS_OFF= libmbedtls.so:${PORTSDIR}/security/polarssl13
92		88
93	BOTAN110_CONFIGURE_ON= --enable-botan1.10	89	REMOTE_VARS= MODULES+=remote
94	BOTAN110_LIB_DEPENDS= libbotan-1.10.so:${PORTSDIR}/security/botan110
95		90
		91	SQLITE3_USE= SQLITE=3
		92	SQLITE3_VARS= MODULES+=gqlite3
		93
		94	TINYDNS_CONFIGURE_ON= CDB_LIBS="-L${LOCALBASE}/lib -lcdb" CDB_CFLAGS="-I${LOCALBASE}/include"
96	TINYDNS_LIB_DEPENDS= libcdb.so:${PORTSDIR}/databases/tinycdb	95	TINYDNS_LIB_DEPENDS= libcdb.so:${PORTSDIR}/databases/tinycdb
97	TINYDNS_CONFIGURE_ON= CDB_LIBS="-L${LOCALBASE}/lib -lcdb" CDB_CFLAGS="-I${LOCALBASE}/include"	96	TINYDNS_VARS= MODULES+=tinydns
98		97
99	LMDB_LIB_DEPENDS= liblmdb.so:${PORTSDIR}/databases/lmdb	98	ZEROMQ_CONFIGURE_ARGS= --enable-remotebackend-zeromq
		99	ZEROMQ_LIB_DEPENDS= libzmq.so:${PORTSDIR}/net/libzmq4
100		100
101	GEOIP_LIB_DEPENDS= libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp \	101	TOOLS_CONFIGURE_ENABLE= tools
102	libGeoIP.so:${PORTSDIR}/net/GeoIP
103		102
		103	PGSQL_DESC= PostgreSQL backend
		104	MYSQL_DESC= MySQL backend
		105	OPENDBX_DESC= OpenDBX backend
		106	OPENLDAP_DESC= OpenLDAP backend
		107	SQLITE3_DESC= SQLite 3 backend
		108	GEO_DESC= Geo backend
		109	GEOIP_DESC= GeoIP backend
		110	DNSSEC_DESC= Extra DNSSEC options
		111	BOTAN110_DESC= Faster signing + ECDSA & GOST algorithms
		112	POLARSSL_DESC= Use embedded PolarSSL
		113	LMDB_DESC= LMDB backend
		114	LUA_DESC= Lua backend
		115	MYDNS_DESC= MyDNS backend
		116	REMOTE_DESC= Remote backend
		117	TINYDNS_DESC= TinyDNS backend
		118	TOOLS_DESC= Build extra tools
		119	REMOTEOPT_DESC= Remote backend connectors
		120	ZEROMQ_DESC= Enable ZeroMQ connector (Implies REMOTE enabled)
		121
104	.include <bsd.port.options.mk>	122	.include <bsd.port.options.mk>
105		123
106	.if ${PORT_OPTIONS:MGEO}
107	MODULES+= geo
108	.endif
109
110	.if ${PORT_OPTIONS:MGEOIP}
111	MODULES+= geoip
112	.endif
113
114	.if ${PORT_OPTIONS:MPGSQL}
115	MODULES+= gpgsql
116	.endif
117
118	.if ${PORT_OPTIONS:MMYSQL}
119	MODULES+= gmysql
120	.endif
121
122	.if ${PORT_OPTIONS:MOPENLDAP}
123	MODULES+= ldap
124	.endif
125
126	.if ${PORT_OPTIONS:MSQLITE3}
127	MODULES+= gsqlite3
128	.endif
129
130	.if ${PORT_OPTIONS:MLMDB}
131	MODULES+= lmdb
132	.endif
133
134	.if ${PORT_OPTIONS:MLUA}
135	MODULES+= lua
136	.endif
137
138	.if ${PORT_OPTIONS:MMYDNS}
139	MODULES+= mydns
140	.endif
141
142	.if ${PORT_OPTIONS:MREMOTE}
143	MODULES+= remote
144	. if ${PORT_OPTIONS:MZEROMQ}
145	CONFIGURE_ARGS+= --enable-remotebackend-zeromq
146	LIB_DEPENDS+= libzmq.so:${PORTSDIR}/net/libzmq4
147	. endif
148	.endif
149
150	.if ${PORT_OPTIONS:MTINYDNS}
151	MODULES+= tinydns
152	.endif
153
154	.if ${PORT_OPTIONS:MOPENDBX}
155	MODULES+= opendbx
156	.endif
157
158	.if ${PORT_OPTIONS:MPOLARSSL}
159	CONFIGURE_ARGS+= --without-system-polarssl
160	.else
161	LIB_DEPENDS+= libmbedtls.so.9:${PORTSDIR}/security/polarssl13
162	.endif
163
164	post-install:	124	post-install:
165	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	125	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
166	.for i in pdns.conf	126	.for i in pdns.conf

Lines 1-18 Link Here

(-)files/patch-modules__luabackend__lua_functions.cc (-18 lines)
1	--- modules/luabackend/lua_functions.cc.orig 2014-09-23 06:27:34 UTC
2	+++ modules/luabackend/lua_functions.cc
3	@@ -238,6 +238,7 @@
4	return ret;
5	}
6
7	+#if !(defined( __i386__) && defined(__FreeBSD__))
8	bool LUABackend::getValueFromTable(lua_State *lua, const std::string& key, time_t& value) {
9	lua_pushstring(lua, key.c_str());
10	lua_gettable(lua, -2);
11	@@ -253,6 +254,7 @@
12
13	return ret;
14	}
15	+#endif
16
17	bool LUABackend::getValueFromTable(lua_State *lua, const std::string& key, uint32_t& value) {
18	lua_pushstring(lua, key.c_str());

Lines 1-12 Link Here

(-)files/patch-modules__luabackend__luabackend.hh (-12 lines)
1	--- modules/luabackend/luabackend.hh.orig 2014-09-23 06:27:34 UTC
2	+++ modules/luabackend/luabackend.hh
3	@@ -155,7 +155,9 @@
4	// FUNCTIONS TO THIS BACKEND
5	bool getValueFromTable(lua_State *lua, const std::string& key, string& value);
6	bool getValueFromTable(lua_State *lua, uint32_t key, string& value);
7	+#if !(defined(__i386__) && defined(__FreeBSD__))
8	bool getValueFromTable(lua_State *lua, const std::string& key, time_t& value);
9	+#endif
10	bool getValueFromTable(lua_State *lua, const std::string& key, uint32_t& value);
11	bool getValueFromTable(lua_State *lua, const std::string& key, uint16_t& value);
12	bool getValueFromTable(lua_State *lua, const std::string& key, int& value);