1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00

* Updated to 4.0.5

Changelog:	https://doc.powerdns.com/md/changelog/#powerdns-recursor-405

PR:		220289
Submitted by:	Ralf van der Enden <tremere@cainites.net> (maintainer)
Reviewed by:	matthew (mentor), matt
Approved by:	matthew (mentor)
Differential Revision:	https://reviews.freebsd.org/D11472
This commit is contained in:
Richard Gallamore 2017-07-04 17:47:13 +00:00
parent 090d2c758d
commit 9879f67894
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=445029
4 changed files with 64 additions and 57 deletions

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= recursor
PORTVERSION= 4.0.4
PORTREVISION= 3
PORTVERSION= 4.0.5
CATEGORIES= dns ipv6
MASTER_SITES= http://downloads.powerdns.com/releases/
PKGNAMEPREFIX= powerdns-
@ -14,19 +13,22 @@ COMMENT= Advanced DNS recursor
LICENSE= GPLv2
BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
LIB_DEPENDS= libboost_context.so:devel/boost-libs
BROKEN_armv6= fails to compile: use of overloaded operator << is ambiguous
BROKEN_sparc64= fails to compile: json11.cpp: undefined reference to std::__throw_out_of_range_fmt
BROKEN_powerpc64= fails to compile: dnslabeltext.cc: undefined reference to std::__cxx11::basic_string
BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
LIB_DEPENDS= libboost_context.so:devel/boost-libs
USES= compiler:c++11-lib cpe gmake localbase pkgconfig ssl tar:bzip2
GNU_CONFIGURE= YES
CXXFLAGS+= -D_GLIBCXX_USE_C99
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/pdns
CPE_VENDOR= powerdns
USE_RC_SUBR= pdns-recursor
OPTIONS_DEFINE= SETUID
OPTIONS_DEFAULT= LUA SETUID
OPTIONS_RADIO= LUA_RG
@ -35,25 +37,15 @@ LUAJIT_DESC= Enable LuaJIT
LUA_RG_DESC= Lua Engine
SETUID_DESC= Run as pdns_recursor user
CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/pdns
SUB_FILES= pkg-message
LUA_CONFIGURE_WITH= lua
LUA_USES= lua
LUAJIT_CONFIGURE_WITH= luajit
LUAJIT_LIB_DEPENDS= libluajit-5.1.so.2:lang/luajit
SETUID_VARS= USERS=pdns_recursor GROUPS=pdns
SETUID_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-setuid
USE_RC_SUBR+= pdns-recursor
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MSETUID}
USERS= pdns_recursor
GROUPS= pdns
.endif
SUB_FILES= pkg-message
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1484621032
SHA256 (pdns-recursor-4.0.4.tar.bz2) = 2338778f49ccd03401e65f6f4b39047890e691c8ff6d810ecee45321fb4f1e4d
SIZE (pdns-recursor-4.0.4.tar.bz2) = 1050596
TIMESTAMP = 1497513533
SHA256 (pdns-recursor-4.0.5.tar.bz2) = ba43ce4280b3a06afebe58c5d63680f51dd525c63d1de7f3b229b380e6b1b7af
SIZE (pdns-recursor-4.0.5.tar.bz2) = 1066145

View File

@ -0,0 +1,52 @@
--- configure.orig 2017-06-13 09:59:12 UTC
+++ configure
@@ -15885,17 +15885,14 @@ fi
case "$host" in
mips* | powerpc* )
- as_CACHEVAR=`$as_echo "ax_cv_check_ldflags_cannot continue" "$LINENO" 5
- _-latomic" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -latomic" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -latomic" >&5
$as_echo_n "checking whether the linker accepts -latomic... " >&6; }
-if eval \${$as_CACHEVAR+:} false; then :
+if ${ax_cv_check_ldflags___latomic+:} false; then :
$as_echo_n "(cached) " >&6
else
ax_check_save_flags=$LDFLAGS
- LDFLAGS="$LDFLAGS cannot continue" "$LINENO" 5
- -latomic"
+ LDFLAGS="$LDFLAGS -latomic"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -15908,21 +15905,21 @@ main ()
}
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
- eval "$as_CACHEVAR=yes"
+ ax_cv_check_ldflags___latomic=yes
else
- eval "$as_CACHEVAR=no"
+ ax_cv_check_ldflags___latomic=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$ax_check_save_flags
fi
-eval ac_res=\$$as_CACHEVAR
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___latomic" >&5
+$as_echo "$ax_cv_check_ldflags___latomic" >&6; }
+if test "x$ax_cv_check_ldflags___latomic" = xyes; then :
:
else
- as_fn_error $? "Unable to link against libatomic
+ as_fn_error $? "Unable to link against libatomic, cannot continue" "$LINENO" 5
+
fi
LDFLAGS="-latomic $LDFLAGS"

View File

@ -1,37 +0,0 @@
--- ext/json11/json11.cpp.orig 2017-01-18 18:06:37 UTC
+++ ext/json11/json11.cpp
@@ -37,11 +37,21 @@ using std::make_shared;
using std::initializer_list;
using std::move;
+/* Helper for representing null - just a do-nothing struct, plus comparison
+ * operators so the helpers in JsonValue work. We can't use nullptr_t because
+ * it may not be orderable.
+*/
+
+struct NullStruct {
+ bool operator==(NullStruct) const { return true; }
+ bool operator<(NullStruct) const { return false; }
+};
+
/* * * * * * * * * * * * * * * * * * * *
* Serialization
*/
-static void dump(std::nullptr_t, string &out) {
+static void dump(NullStruct, string &out) {
out += "null";
}
@@ -204,9 +214,9 @@ public:
explicit JsonObject(Json::object &&value) : Value(move(value)) {}
};
-class JsonNull final : public Value<Json::NUL, std::nullptr_t> {
+class JsonNull final : public Value<Json::NUL, NullStruct> {
public:
- JsonNull() : Value(nullptr) {}
+ JsonNull() : Value({}) {}
};
/* * * * * * * * * * * * * * * * * * * *