Index: branches/2015Q2/dns/powerdns/Makefile =================================================================== --- branches/2015Q2/dns/powerdns/Makefile (revision 385126) +++ branches/2015Q2/dns/powerdns/Makefile (revision 385127) @@ -1,172 +1,172 @@ # $FreeBSD$ PORTNAME= powerdns -PORTVERSION= 3.4.3 +PORTVERSION= 3.4.4 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ DISTNAME= pdns-${PORTVERSION} MAINTAINER= tremere@cainites.net COMMENT= Advanced DNS server with multiple backends including SQL LICENSE= GPLv2 LIB_DEPENDS= libboost_serialization.so:${PORTSDIR}/devel/boost-libs CONFLICTS= powerdns-devel-[2-3].[0-9]* USES= gmake libtool lua pkgconfig tar:bzip2 USE_LDCONFIG= YES USE_SUBMAKE= YES GNU_CONFIGURE= YES INSTALL_TARGET= install-strip CXXFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" \ LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" CONFIGURE_ARGS= --disable-static \ --with-modules="" \ --with-dynmodules="pipe bind ${MODULES}" \ --docdir="${PREFIX}/share/doc/powerdns" \ --sysconfdir="${PREFIX}/etc/pdns" \ --with-boost="${LOCALBASE}" SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ CURDIR2="${.CURDIR}" \ MKDIR="${MKDIR}" \ DISTNAME="${DISTNAME}" \ POWERDNS_OPTIONS="${POWERDNS_OPTIONS}" SUB_FILES= pkg-message USE_RC_SUBR= pdns OPTIONS_DEFINE= GEO GEOIP LMDB MYSQL OPENDBX OPENLDAP PGSQL POLARSSL REMOTE SQLITE3 TOOLS OPTIONS_GROUP= DNSSEC EXPERIMENTAL REMOTEOPT OPTIONS_GROUP_DNSSEC= BOTAN110 OPTIONS_GROUP_EXPERIMENTAL= LUA MYDNS TINYDNS OPTIONS_GROUP_REMOTEOPT= ZEROMQ 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 # Don't use CONFIGURE_ENABLE, the configure script # has a bug. The options are being enabled even using --disable- TOOLS_CONFIGURE_ON= --enable-tools PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE} PGSQL_CONFIGURE_OFF= --without-pgsql PGSQL_USES= pgsql MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} MYSQL_CONFIGURE_OFF= --without-mysql MYSQL_USE= MYSQL=YES MYDNS_CONFIGURE_ON= --with-mysql=${LOCALBASE} MYDNS_USE= MYSQL=YES OPENLDAP_CXXFLAGS= -DLDAP_DEPRECATED=1 OPENLDAP_USE= OPENLDAP=YES SQLITE3_USE= SQLITE=3 OPENDBX_LIB_DEPENDS= libopendbx.so:${PORTSDIR}/databases/opendbx BOTAN110_CONFIGURE_ON= --enable-botan1.10 BOTAN110_LIB_DEPENDS= libbotan-1.10.so:${PORTSDIR}/security/botan110 TINYDNS_LIB_DEPENDS= libcdb.so:${PORTSDIR}/databases/tinycdb TINYDNS_CONFIGURE_ON= CDB_LIBS="-L${LOCALBASE}/lib -lcdb" CDB_CFLAGS="-I${LOCALBASE}/include" LMDB_LIB_DEPENDS= liblmdb.so:${PORTSDIR}/databases/lmdb GEOIP_LIB_DEPENDS= libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp \ libGeoIP.so:${PORTSDIR}/net/GeoIP .include .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+= libpolarssl.so:${PORTSDIR}/security/polarssl .endif post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for i in pdns.conf ${INSTALL_DATA} ${FILESDIR}/$i ${STAGEDIR}${EXAMPLESDIR}/ .endfor .include Index: branches/2015Q2/dns/powerdns/distinfo =================================================================== --- branches/2015Q2/dns/powerdns/distinfo (revision 385126) +++ branches/2015Q2/dns/powerdns/distinfo (revision 385127) @@ -1,2 +1,2 @@ -SHA256 (pdns-3.4.3.tar.bz2) = 5cd9a087757066427cd0c348f546cb84b4be4bd5e06c7ce969ec2bc21dbb8ce6 -SIZE (pdns-3.4.3.tar.bz2) = 1332686 +SHA256 (pdns-3.4.4.tar.bz2) = ec49f5a0b55b69ba057bf9ce28ab81e5258fc60c8d4954d9100fe3bb3efd09c8 +SIZE (pdns-3.4.4.tar.bz2) = 1336624 Index: branches/2015Q2/dns/powerdns-recursor/Makefile =================================================================== --- branches/2015Q2/dns/powerdns-recursor/Makefile (revision 385126) +++ branches/2015Q2/dns/powerdns-recursor/Makefile (revision 385127) @@ -1,71 +1,74 @@ # Created by: sten@blinkenlights.nl # $FreeBSD$ -PORTNAME= powerdns-recursor -PORTVERSION= 3.7.1 +PORTNAME= recursor +PORTVERSION= 3.7.2 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ -DISTNAME= pdns-recursor-${PORTVERSION} +PKGNAMEPREFIX= powerdns- +DISTNAME= pdns-${PORTNAME}-${PORTVERSION} MAINTAINER= tremere@cainites.net COMMENT= Advanced DNS recursor LICENSE= GPLv2 BUILD_DEPENDS= bjam:${PORTSDIR}/devel/boost-jam \ ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs -USES= gmake tar:bzip2 +USES= cpe gmake tar:bzip2 GNU_CONFIGURE= YES + +CPE_VENDOR= powerdns OPTIONS_DEFINE= SETUID LUA STATIC OPTIONS_DEFAULT= SETUID SETUID_DESC= Run as pdns_recursor user STATIC_DESC= Build static binaries CXXFLAGS+= -I${PREFIX}/include LDFLAGS+= -L${PREFIX}/lib SUB_FILES= pkg-message .include .if ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64 .endif USE_RC_SUBR+= pdns-recursor .if ${PORT_OPTIONS:MSETUID} EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-setuid USERS= pdns_recursor GROUPS= pdns .endif .if ${PORT_OPTIONS:MLUA} USES+= lua MAKE_ENV+=LUA=1 MAKE_ENV+="LUA_CPPFLAGS_CONFIG=-I${LUA_INCDIR}" MAKE_ENV+="LUA_LIBS_CONFIG=-L${LUA_LIBDIR} -llua-${LUA_VER}" .endif .if ${PORT_OPTIONS:MSTATIC} MAKE_ENV+=STATIC=full .endif .if exists(/usr/include/ucontext.h) UCONTEXT!= ${AWK} '/setcontext/ { print "YES" }' \ /usr/include/ucontext.h .if ${UCONTEXT} == "" BROKEN= requires setcontext() .endif .endif post-patch: @${REINPLACE_CMD} -e 's;SBINDIR=/usr/sbin/;SBINDIR=${PREFIX}/sbin/;' \ -e 's;BINDIR=/usr/bin/;BINDIR=${PREFIX}/bin/;' \ -e 's;SYSCONFDIR=/etc/powerdns/;SYSCONFDIR=${PREFIX}/etc/pdns/;' \ -e 's;/usr/share;${MANPREFIX};' \ ${WRKSRC}/Makefile.in .include Index: branches/2015Q2/dns/powerdns-recursor/distinfo =================================================================== --- branches/2015Q2/dns/powerdns-recursor/distinfo (revision 385126) +++ branches/2015Q2/dns/powerdns-recursor/distinfo (revision 385127) @@ -1,2 +1,2 @@ -SHA256 (pdns-recursor-3.7.1.tar.bz2) = e6b0d255a0d8cd023ebd63c50f453a305c649d04873859b4119745d64b8bd36d -SIZE (pdns-recursor-3.7.1.tar.bz2) = 245155 +SHA256 (pdns-recursor-3.7.2.tar.bz2) = 1366bc1bed7c96fbd3926cf7a9e6d365c53b8a99182642debe1b2863dd015a7e +SIZE (pdns-recursor-3.7.2.tar.bz2) = 244582 Index: branches/2015Q2/dns/powerdns-recursor/files/patch-sendmsg_fix =================================================================== --- branches/2015Q2/dns/powerdns-recursor/files/patch-sendmsg_fix (revision 385126) +++ branches/2015Q2/dns/powerdns-recursor/files/patch-sendmsg_fix (nonexistent) @@ -1,23 +0,0 @@ -diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc -index fdee0f1..23fca87 100644 ---- pdns_recursor.cc -+++ pdns_recursor.cc -@@ -688,6 +688,8 @@ void startDoResolve(void *p) - fillMSGHdr(&msgh, &iov, cbuf, 0, (char*)&*packet.begin(), packet.size(), &dc->d_remote); - if(dc->d_local.sin4.sin_family) - addCMsgSrcAddr(&msgh, cbuf, &dc->d_local); -+ else -+ msgh.msg_control=NULL; - sendmsg(dc->d_socket, &msgh, 0); - if(!SyncRes::s_nopacketcache && !variableAnswer ) { - t_packetCache->insertResponsePacket(string((const char*)&*packet.begin(), packet.size()), -@@ -961,6 +963,9 @@ string* doProcessUDPQuestion(const std::string& question, const ComboAddress& fr - if(destaddr.sin4.sin_family) { - addCMsgSrcAddr(&msgh, cbuf, &destaddr); - } -+ else { -+ msgh.msg_control=NULL; -+ } - sendmsg(fd, &msgh, 0); - - if(response.length() >= sizeof(struct dnsheader)) { Property changes on: branches/2015Q2/dns/powerdns-recursor/files/patch-sendmsg_fix ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q2 =================================================================== --- branches/2015Q2 (revision 385126) +++ branches/2015Q2 (revision 385127) Property changes on: branches/2015Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r385121,385123