Attachment #188457 for bug #224027

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




# $FreeBSD$

PORTNAME=	recursor
DISTVERSION=	4.0.7
PORTREVISION=	5
CATEGORIES=	dns ipv6
MASTER_SITES=	http://downloads.powerdns.com/releases/
PKGNAMEPREFIX=	powerdns-
DISTNAME=	pdns-${PORTNAME}-${DISTVERSION}

MAINTAINER=	tremere@cainites.net
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_armv7=		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 \
		libprotobuf.so:devel/protobuf

USES=		compiler:c++11-lib cpe gmake localbase:ldflags pkgconfig ssl tar:bzip2
GNU_CONFIGURE=	YES
CXXFLAGS+=	-D_GLIBCXX_USE_C99
CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/pdns \
		--with-protobuf

CPE_VENDOR=	powerdns


LUAJIT_CONFIGURE_WITH=	luajit
LUAJIT_LIB_DEPENDS=	libluajit-5.1.so.2:lang/luajit

OPTALGO_CONFIGURE_ON=	--enable-botan \
			--enable-libsodium
OPTALGO_LIB_DEPENDS=	libbotan-2.so:security/botan2 \
			libsodium.so:security/libsodium

SETUID_VARS=	USERS=pdns_recursor GROUPS=pdns

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1499338924	1	TIMESTAMP = 1512117295
2	SHA256 (pdns-recursor-4.0.6.tar.bz2) = f2182ac644268bb08b865a71351f11d75c5015ac0608a1469eb4c1cd5494d60d	2	SHA256 (pdns-recursor-4.0.7.tar.bz2) = 966d1654c32c72bd0cc9b301ae5b723a34e36f3c02e62c73a7643260122f94e7
3	SIZE (pdns-recursor-4.0.6.tar.bz2) = 1105423	3	SIZE (pdns-recursor-4.0.7.tar.bz2) = 1107546




https://github.com/PowerDNS/pdns/pull/5498/commits/0f8f34997afc2c3609b2f3df72ca808940d2a778#diff-a69f1deeeb9a0d7ebabc200a4c24c9f9L184
--- botan110signers.cc.orig	2017-07-04 15:43:07 UTC
+++ botan110signers.cc
@@ -181,8 +181,9 @@ std::string GOSTDNSCryptoKeyEngine::getP
 
 std::string GOSTDNSCryptoKeyEngine::getPublicKeyString() const
 {
-  const BigInt&x =d_key->public_point().get_affine_x();
-  const BigInt&y =d_key->public_point().get_affine_y();
+  std::shared_ptr<GOST_3410_PublicKey> pk = d_pubkey ? d_pubkey : d_key;
+  const BigInt&x =pk->public_point().get_affine_x();
+  const BigInt&y =pk->public_point().get_affine_y();
   
   size_t part_size = std::max(x.bytes(), y.bytes());
  

Return to bug 224027

Lines 2-13 Link Here

(-)Makefile (-10 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= recursor	4	PORTNAME= recursor
5	PORTVERSION= 4.0.6	5	DISTVERSION= 4.0.7
6	PORTREVISION= 5
7	CATEGORIES= dns ipv6	6	CATEGORIES= dns ipv6
8	MASTER_SITES= http://downloads.powerdns.com/releases/	7	MASTER_SITES= http://downloads.powerdns.com/releases/
9	PKGNAMEPREFIX= powerdns-	8	PKGNAMEPREFIX= powerdns-
10	DISTNAME= pdns-${PORTNAME}-${PORTVERSION}	9	DISTNAME= pdns-${PORTNAME}-${DISTVERSION}
11		10
12	MAINTAINER= tremere@cainites.net	11	MAINTAINER= tremere@cainites.net
13	COMMENT= Advanced DNS recursor	12	COMMENT= Advanced DNS recursor
Lines 14-31 Link Here
14		13
15	LICENSE= GPLv2	14	LICENSE= GPLv2
16		15
17	BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
18	LIB_DEPENDS= libboost_context.so:devel/boost-libs
19
20	BROKEN_armv6= fails to compile: use of overloaded operator << is ambiguous	16	BROKEN_armv6= fails to compile: use of overloaded operator << is ambiguous
21	BROKEN_armv7= fails to compile: use of overloaded operator << is ambiguous	17	BROKEN_armv7= fails to compile: use of overloaded operator << is ambiguous
22	BROKEN_sparc64= fails to compile: json11.cpp: undefined reference to std::__throw_out_of_range_fmt	18	BROKEN_sparc64= fails to compile: json11.cpp: undefined reference to std::__throw_out_of_range_fmt
23	BROKEN_powerpc64= fails to compile: dnslabeltext.cc: undefined reference to std::__cxx11::basic_string	19	BROKEN_powerpc64= fails to compile: dnslabeltext.cc: undefined reference to std::__cxx11::basic_string
24		20
25	USES= compiler:c++11-lib cpe gmake localbase pkgconfig ssl tar:bzip2	21	BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
		22	LIB_DEPENDS= libboost_context.so:devel/boost-libs \
		23	libprotobuf.so:devel/protobuf
		24
		25	USES= compiler:c++11-lib cpe gmake localbase:ldflags pkgconfig ssl tar:bzip2
26	GNU_CONFIGURE= YES	26	GNU_CONFIGURE= YES
27	CXXFLAGS+= -D_GLIBCXX_USE_C99	27	CXXFLAGS+= -D_GLIBCXX_USE_C99
28	CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/pdns	28	CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/pdns \
		29	--with-protobuf
29		30
30	CPE_VENDOR= powerdns	31	CPE_VENDOR= powerdns
31		32
Lines 46-54 Link Here
46	LUAJIT_CONFIGURE_WITH= luajit	47	LUAJIT_CONFIGURE_WITH= luajit
47	LUAJIT_LIB_DEPENDS= libluajit-5.1.so.2:lang/luajit	48	LUAJIT_LIB_DEPENDS= libluajit-5.1.so.2:lang/luajit
48		49
49	OPTALGO_CONFIGURE_ON= --enable-botan1.10 \	50	OPTALGO_CONFIGURE_ON= --enable-botan \
50	--enable-libsodium	51	--enable-libsodium
51	OPTALGO_LIB_DEPENDS= libbotan-1.10.so:security/botan110 \	52	OPTALGO_LIB_DEPENDS= libbotan-2.so:security/botan2 \
52	libsodium.so:security/libsodium	53	libsodium.so:security/libsodium
53		54
54	SETUID_VARS= USERS=pdns_recursor GROUPS=pdns	55	SETUID_VARS= USERS=pdns_recursor GROUPS=pdns

Lines 1-15 Link Here

(-)files/patch-botan110signers.cc (-15 lines)
1	https://github.com/PowerDNS/pdns/pull/5498/commits/0f8f34997afc2c3609b2f3df72ca808940d2a778#diff-a69f1deeeb9a0d7ebabc200a4c24c9f9L184
2	--- botan110signers.cc.orig 2017-07-04 15:43:07 UTC
3	+++ botan110signers.cc
4	@@ -181,8 +181,9 @@ std::string GOSTDNSCryptoKeyEngine::getP
5
6	std::string GOSTDNSCryptoKeyEngine::getPublicKeyString() const
7	{
8	- const BigInt&x =d_key->public_point().get_affine_x();
9	- const BigInt&y =d_key->public_point().get_affine_y();
10	+ std::shared_ptr<GOST_3410_PublicKey> pk = d_pubkey ? d_pubkey : d_key;
11	+ const BigInt&x =pk->public_point().get_affine_x();
12	+ const BigInt&y =pk->public_point().get_affine_y();
13
14	size_t part_size = std::max(x.bytes(), y.bytes());
15