remove mbedtls/polarssl leftovers

diff --git a/build-scripts/debian-authoritative/control.in b/build-scripts/debian-authoritative/control.in
index d1c0272a367f539409206b2b9c1dc9c39eae77bc..80e5e39466fbdf86d7fb0d06877f16ad139167ac 100644 (file)
--- a/build-scripts/debian-authoritative/control.in
+++ b/build-scripts/debian-authoritative/control.in
@@ -4,7 +4,7 @@ Priority: extra
 Standards-Version: 3.9.6
 Maintainer: PowerDNS Autobuilder <powerdns.support@powerdns.com>
 Origin: PowerDNS
-Build-Depends: debhelper (>= 9~), dh-autoreconf, dh-systemd, po-debconf, libtool, flex, bison, libmysqlclient-dev, libpq-dev, libssl-dev, libpolarssl-dev, libgdbm-dev, libldap2-dev, libsqlite3-dev, dpkg-dev (>= 1.17.0~), libboost-dev, libboost-serialization-dev, libboost-program-options-dev, libboost-test-dev, autotools-dev, automake, autoconf, liblua5.2-dev, pkg-config, ragel, libgmp-dev, libbotan1.10-dev, libcurl4-openssl-dev, libzmq-dev, libyaml-cpp-dev (>= 0.5), libgeoip-dev, libopendbx1-dev, libcdb-dev, unixodbc-dev (>= 2.3.1) @LIBSYSTEMDDEV@
+Build-Depends: debhelper (>= 9~), dh-autoreconf, dh-systemd, po-debconf, libtool, flex, bison, libmysqlclient-dev, libpq-dev, libssl-dev, libgdbm-dev, libldap2-dev, libsqlite3-dev, dpkg-dev (>= 1.17.0~), libboost-dev, libboost-serialization-dev, libboost-program-options-dev, libboost-test-dev, autotools-dev, automake, autoconf, liblua5.2-dev, pkg-config, ragel, libgmp-dev, libbotan1.10-dev, libcurl4-openssl-dev, libzmq-dev, libyaml-cpp-dev (>= 0.5), libgeoip-dev, libopendbx1-dev, libcdb-dev, unixodbc-dev (>= 2.3.1) @LIBSYSTEMDDEV@
 Homepage: http://www.powerdns.com/
 
 Package: pdns-server

diff --git a/build-scripts/debian-authoritative/copyright b/build-scripts/debian-authoritative/copyright
index c86169a9ee5de9c5939ac7350c5679dd2117198c..7fe68784c3b0c26fbd5cb0a192399df9742fc305 100644 (file)
--- a/build-scripts/debian-authoritative/copyright
+++ b/build-scripts/debian-authoritative/copyright
@@ -84,10 +84,6 @@ Files: pdns/ext/yahttp*
 Copyright: 2014 Aki Tuomi
 License: Expat
 
-Files: pdns/ext/mbedtls/*
-Copyright (C) 2006-2014, ARM Limited
-License: GPL-2+
-
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal

diff --git a/build-scripts/debian-recursor/copyright b/build-scripts/debian-recursor/copyright
index 10e543a1daa28509a23f9eedf741b5c812bc8d79..a9b59b8f003592defa000c64c2a10245acaf049a 100644 (file)
--- a/build-scripts/debian-recursor/copyright
+++ b/build-scripts/debian-recursor/copyright
@@ -33,10 +33,6 @@ Copyright: 2002 - 2004 Wichert Akkermann <wichert@wiggy.net>
  2014 Christian Hofstaedtler <zeha@debian.org>
 License: GPL-2
 
-Files: pdns/ext/mbedtls/*
-Copyright (C) 2006-2014, ARM Limited
-License: GPL-2+
-
 Files: pdns/ext/yahttp*
 Copyright: 2014 Aki Tuomi
 License: LGPL-2.1+

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index c71cb4c40bfe97d32b1fddd4ec6b46f9606a5442..4cffac0b3390f95a7176dbb77ee8a8c010b2de93 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -805,7 +805,6 @@ comfun_LDFLAGS = \
        $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
 
 comfun_LDADD = \
-       $(MBEDTLS_LIBS) \
        $(OPENSSL_LIBS) \
        $(BOOST_PROGRAM_OPTIONS_LIBS)