From: Kees Monshouwer Date: Wed, 11 May 2016 15:34:34 +0000 (+0200) Subject: remove mbedtls/polarssl leftovers X-Git-Tag: auth-4.0.0-beta1~26^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3852%2Fhead;p=thirdparty%2Fpdns.git remove mbedtls/polarssl leftovers --- diff --git a/build-scripts/debian-authoritative/control.in b/build-scripts/debian-authoritative/control.in index d1c0272a36..80e5e39466 100644 --- 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 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 c86169a9ee..7fe68784c3 100644 --- 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 10e543a1da..a9b59b8f00 100644 --- a/build-scripts/debian-recursor/copyright +++ b/build-scripts/debian-recursor/copyright @@ -33,10 +33,6 @@ Copyright: 2002 - 2004 Wichert Akkermann 2014 Christian Hofstaedtler 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 c71cb4c40b..4cffac0b33 100644 --- 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)