Move pdns/ext to ext/

Part of #2407

diff --git a/Makefile.am b/Makefile.am
index efc2ea7687362780dbccf2a679733eb1f006a8fb..1a1b7aae1e10446aae3053009a514819d1173934 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = modules codedocs docs
+SUBDIRS = ext modules codedocs docs
 
 if WITH_PDNS_SERVER
   SUBDIRS += pdns

diff --git a/configure.ac b/configure.ac
index 743c5b52d48f254a81e646ff4b281bac3dbf49e2..fae08413e14e3dae25f92620187065ed7c3afe35 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -330,8 +330,8 @@ AC_SUBST([AM_CPPFLAGS],
   ["AS_ESCAPE([-I$(top_builddir) -I$(top_srcdir)]) $THREADFLAGS $BOOST_CPPFLAGS"]
 )
 
-AC_SUBST([YAHTTP_CFLAGS], ['-I$(top_srcdir)/pdns/ext/yahttp'])
-AC_SUBST([YAHTTP_LIBS], ['-L$(top_builddir)/pdns/ext/yahttp/yahttp -lyahttp'])
+AC_SUBST([YAHTTP_CFLAGS], ['-I$(top_srcdir)/ext/yahttp'])
+AC_SUBST([YAHTTP_LIBS], ['-L$(top_builddir)/ext/yahttp/yahttp -lyahttp'])
 
 CXXFLAGS="$SANITIZER_FLAGS $CXXFLAGS"
 
@@ -349,13 +349,13 @@ AC_CONFIG_FILES([
   codedocs/Makefile
   docs/Makefile
   pdns/pdns.init
-  pdns/ext/Makefile
-  pdns/ext/ed25519/Makefile
-  pdns/ext/yahttp/Makefile
-  pdns/ext/yahttp/yahttp/Makefile
-  pdns/ext/polarssl/Makefile
-  pdns/ext/polarssl/library/Makefile
-  pdns/ext/rapidjson/Makefile
+  ext/Makefile
+  ext/ed25519/Makefile
+  ext/yahttp/Makefile
+  ext/yahttp/yahttp/Makefile
+  ext/polarssl/Makefile
+  ext/polarssl/library/Makefile
+  ext/rapidjson/Makefile
   modules/bindbackend/Makefile
   modules/geobackend/Makefile
   modules/geoipbackend/Makefile

diff --git a/pdns/ext/.gitignore b/ext/.gitignore
similarity index 100%
rename from pdns/ext/.gitignore
rename to ext/.gitignore

diff --git a/pdns/ext/Makefile.am b/ext/Makefile.am
similarity index 100%
rename from pdns/ext/Makefile.am
rename to ext/Makefile.am

diff --git a/pdns/ext/ed25519/.gitignore b/ext/ed25519/.gitignore
similarity index 100%
rename from pdns/ext/ed25519/.gitignore
rename to ext/ed25519/.gitignore

diff --git a/pdns/ext/ed25519/Makefile-ed25519 b/ext/ed25519/Makefile-ed25519
similarity index 100%
rename from pdns/ext/ed25519/Makefile-ed25519
rename to ext/ed25519/Makefile-ed25519

diff --git a/pdns/ext/ed25519/Makefile.am b/ext/ed25519/Makefile.am
similarity index 100%
rename from pdns/ext/ed25519/Makefile.am
rename to ext/ed25519/Makefile.am

diff --git a/pdns/ext/ed25519/README b/ext/ed25519/README
similarity index 100%
rename from pdns/ext/ed25519/README
rename to ext/ed25519/README

diff --git a/pdns/ext/ed25519/api.h b/ext/ed25519/api.h
similarity index 100%
rename from pdns/ext/ed25519/api.h
rename to ext/ed25519/api.h

diff --git a/pdns/ext/ed25519/base.h b/ext/ed25519/base.h
similarity index 100%
rename from pdns/ext/ed25519/base.h
rename to ext/ed25519/base.h

diff --git a/pdns/ext/ed25519/base.py b/ext/ed25519/base.py
similarity index 100%
rename from pdns/ext/ed25519/base.py
rename to ext/ed25519/base.py

diff --git a/pdns/ext/ed25519/base2.h b/ext/ed25519/base2.h
similarity index 100%
rename from pdns/ext/ed25519/base2.h
rename to ext/ed25519/base2.h

diff --git a/pdns/ext/ed25519/base2.py b/ext/ed25519/base2.py
similarity index 100%
rename from pdns/ext/ed25519/base2.py
rename to ext/ed25519/base2.py

diff --git a/pdns/ext/ed25519/crypto_hash_sha512.h b/ext/ed25519/crypto_hash_sha512.h
similarity index 100%
rename from pdns/ext/ed25519/crypto_hash_sha512.h
rename to ext/ed25519/crypto_hash_sha512.h

diff --git a/pdns/ext/ed25519/crypto_int32.h b/ext/ed25519/crypto_int32.h
similarity index 100%
rename from pdns/ext/ed25519/crypto_int32.h
rename to ext/ed25519/crypto_int32.h

diff --git a/pdns/ext/ed25519/crypto_int64.h b/ext/ed25519/crypto_int64.h
similarity index 100%
rename from pdns/ext/ed25519/crypto_int64.h
rename to ext/ed25519/crypto_int64.h

diff --git a/pdns/ext/ed25519/crypto_sign.h b/ext/ed25519/crypto_sign.h
similarity index 100%
rename from pdns/ext/ed25519/crypto_sign.h
rename to ext/ed25519/crypto_sign.h

diff --git a/pdns/ext/ed25519/crypto_uint32.h b/ext/ed25519/crypto_uint32.h
similarity index 100%
rename from pdns/ext/ed25519/crypto_uint32.h
rename to ext/ed25519/crypto_uint32.h

diff --git a/pdns/ext/ed25519/crypto_uint64.h b/ext/ed25519/crypto_uint64.h
similarity index 100%
rename from pdns/ext/ed25519/crypto_uint64.h
rename to ext/ed25519/crypto_uint64.h

diff --git a/pdns/ext/ed25519/crypto_verify_32.h b/ext/ed25519/crypto_verify_32.h
similarity index 100%
rename from pdns/ext/ed25519/crypto_verify_32.h
rename to ext/ed25519/crypto_verify_32.h

diff --git a/pdns/ext/ed25519/d.h b/ext/ed25519/d.h
similarity index 100%
rename from pdns/ext/ed25519/d.h
rename to ext/ed25519/d.h

diff --git a/pdns/ext/ed25519/d.py b/ext/ed25519/d.py
similarity index 100%
rename from pdns/ext/ed25519/d.py
rename to ext/ed25519/d.py

diff --git a/pdns/ext/ed25519/d2.h b/ext/ed25519/d2.h
similarity index 100%
rename from pdns/ext/ed25519/d2.h
rename to ext/ed25519/d2.h

diff --git a/pdns/ext/ed25519/d2.py b/ext/ed25519/d2.py
similarity index 100%
rename from pdns/ext/ed25519/d2.py
rename to ext/ed25519/d2.py

diff --git a/pdns/ext/ed25519/fe.h b/ext/ed25519/fe.h
similarity index 100%
rename from pdns/ext/ed25519/fe.h
rename to ext/ed25519/fe.h

diff --git a/pdns/ext/ed25519/fe_0.c b/ext/ed25519/fe_0.c
similarity index 100%
rename from pdns/ext/ed25519/fe_0.c
rename to ext/ed25519/fe_0.c

diff --git a/pdns/ext/ed25519/fe_1.c b/ext/ed25519/fe_1.c
similarity index 100%
rename from pdns/ext/ed25519/fe_1.c
rename to ext/ed25519/fe_1.c

diff --git a/pdns/ext/ed25519/fe_add.c b/ext/ed25519/fe_add.c
similarity index 100%
rename from pdns/ext/ed25519/fe_add.c
rename to ext/ed25519/fe_add.c

diff --git a/pdns/ext/ed25519/fe_cmov.c b/ext/ed25519/fe_cmov.c
similarity index 100%
rename from pdns/ext/ed25519/fe_cmov.c
rename to ext/ed25519/fe_cmov.c

diff --git a/pdns/ext/ed25519/fe_copy.c b/ext/ed25519/fe_copy.c
similarity index 100%
rename from pdns/ext/ed25519/fe_copy.c
rename to ext/ed25519/fe_copy.c

diff --git a/pdns/ext/ed25519/fe_frombytes.c b/ext/ed25519/fe_frombytes.c
similarity index 100%
rename from pdns/ext/ed25519/fe_frombytes.c
rename to ext/ed25519/fe_frombytes.c

diff --git a/pdns/ext/ed25519/fe_invert.c b/ext/ed25519/fe_invert.c
similarity index 100%
rename from pdns/ext/ed25519/fe_invert.c
rename to ext/ed25519/fe_invert.c

diff --git a/pdns/ext/ed25519/fe_isnegative.c b/ext/ed25519/fe_isnegative.c
similarity index 100%
rename from pdns/ext/ed25519/fe_isnegative.c
rename to ext/ed25519/fe_isnegative.c

diff --git a/pdns/ext/ed25519/fe_isnonzero.c b/ext/ed25519/fe_isnonzero.c
similarity index 100%
rename from pdns/ext/ed25519/fe_isnonzero.c
rename to ext/ed25519/fe_isnonzero.c

diff --git a/pdns/ext/ed25519/fe_mul.c b/ext/ed25519/fe_mul.c
similarity index 100%
rename from pdns/ext/ed25519/fe_mul.c
rename to ext/ed25519/fe_mul.c

diff --git a/pdns/ext/ed25519/fe_neg.c b/ext/ed25519/fe_neg.c
similarity index 100%
rename from pdns/ext/ed25519/fe_neg.c
rename to ext/ed25519/fe_neg.c

diff --git a/pdns/ext/ed25519/fe_pow22523.c b/ext/ed25519/fe_pow22523.c
similarity index 100%
rename from pdns/ext/ed25519/fe_pow22523.c
rename to ext/ed25519/fe_pow22523.c

diff --git a/pdns/ext/ed25519/fe_sq.c b/ext/ed25519/fe_sq.c
similarity index 100%
rename from pdns/ext/ed25519/fe_sq.c
rename to ext/ed25519/fe_sq.c

diff --git a/pdns/ext/ed25519/fe_sq2.c b/ext/ed25519/fe_sq2.c
similarity index 100%
rename from pdns/ext/ed25519/fe_sq2.c
rename to ext/ed25519/fe_sq2.c

diff --git a/pdns/ext/ed25519/fe_sub.c b/ext/ed25519/fe_sub.c
similarity index 100%
rename from pdns/ext/ed25519/fe_sub.c
rename to ext/ed25519/fe_sub.c

diff --git a/pdns/ext/ed25519/fe_tobytes.c b/ext/ed25519/fe_tobytes.c
similarity index 100%
rename from pdns/ext/ed25519/fe_tobytes.c
rename to ext/ed25519/fe_tobytes.c

diff --git a/pdns/ext/ed25519/ge.h b/ext/ed25519/ge.h
similarity index 100%
rename from pdns/ext/ed25519/ge.h
rename to ext/ed25519/ge.h

diff --git a/pdns/ext/ed25519/ge_add.c b/ext/ed25519/ge_add.c
similarity index 100%
rename from pdns/ext/ed25519/ge_add.c
rename to ext/ed25519/ge_add.c

diff --git a/pdns/ext/ed25519/ge_add.h b/ext/ed25519/ge_add.h
similarity index 100%
rename from pdns/ext/ed25519/ge_add.h
rename to ext/ed25519/ge_add.h

diff --git a/pdns/ext/ed25519/ge_add.q b/ext/ed25519/ge_add.q
similarity index 100%
rename from pdns/ext/ed25519/ge_add.q
rename to ext/ed25519/ge_add.q

diff --git a/pdns/ext/ed25519/ge_double_scalarmult.c b/ext/ed25519/ge_double_scalarmult.c
similarity index 100%
rename from pdns/ext/ed25519/ge_double_scalarmult.c
rename to ext/ed25519/ge_double_scalarmult.c

diff --git a/pdns/ext/ed25519/ge_frombytes.c b/ext/ed25519/ge_frombytes.c
similarity index 100%
rename from pdns/ext/ed25519/ge_frombytes.c
rename to ext/ed25519/ge_frombytes.c

diff --git a/pdns/ext/ed25519/ge_madd.c b/ext/ed25519/ge_madd.c
similarity index 100%
rename from pdns/ext/ed25519/ge_madd.c
rename to ext/ed25519/ge_madd.c

diff --git a/pdns/ext/ed25519/ge_madd.h b/ext/ed25519/ge_madd.h
similarity index 100%
rename from pdns/ext/ed25519/ge_madd.h
rename to ext/ed25519/ge_madd.h

diff --git a/pdns/ext/ed25519/ge_madd.q b/ext/ed25519/ge_madd.q
similarity index 100%
rename from pdns/ext/ed25519/ge_madd.q
rename to ext/ed25519/ge_madd.q

diff --git a/pdns/ext/ed25519/ge_msub.c b/ext/ed25519/ge_msub.c
similarity index 100%
rename from pdns/ext/ed25519/ge_msub.c
rename to ext/ed25519/ge_msub.c

diff --git a/pdns/ext/ed25519/ge_msub.h b/ext/ed25519/ge_msub.h
similarity index 100%
rename from pdns/ext/ed25519/ge_msub.h
rename to ext/ed25519/ge_msub.h

diff --git a/pdns/ext/ed25519/ge_msub.q b/ext/ed25519/ge_msub.q
similarity index 100%
rename from pdns/ext/ed25519/ge_msub.q
rename to ext/ed25519/ge_msub.q

diff --git a/pdns/ext/ed25519/ge_p1p1_to_p2.c b/ext/ed25519/ge_p1p1_to_p2.c
similarity index 100%
rename from pdns/ext/ed25519/ge_p1p1_to_p2.c
rename to ext/ed25519/ge_p1p1_to_p2.c

diff --git a/pdns/ext/ed25519/ge_p1p1_to_p3.c b/ext/ed25519/ge_p1p1_to_p3.c
similarity index 100%
rename from pdns/ext/ed25519/ge_p1p1_to_p3.c
rename to ext/ed25519/ge_p1p1_to_p3.c

diff --git a/pdns/ext/ed25519/ge_p2_0.c b/ext/ed25519/ge_p2_0.c
similarity index 100%
rename from pdns/ext/ed25519/ge_p2_0.c
rename to ext/ed25519/ge_p2_0.c

diff --git a/pdns/ext/ed25519/ge_p2_dbl.c b/ext/ed25519/ge_p2_dbl.c
similarity index 100%
rename from pdns/ext/ed25519/ge_p2_dbl.c
rename to ext/ed25519/ge_p2_dbl.c

diff --git a/pdns/ext/ed25519/ge_p2_dbl.h b/ext/ed25519/ge_p2_dbl.h
similarity index 100%
rename from pdns/ext/ed25519/ge_p2_dbl.h
rename to ext/ed25519/ge_p2_dbl.h

diff --git a/pdns/ext/ed25519/ge_p2_dbl.q b/ext/ed25519/ge_p2_dbl.q
similarity index 100%
rename from pdns/ext/ed25519/ge_p2_dbl.q
rename to ext/ed25519/ge_p2_dbl.q

diff --git a/pdns/ext/ed25519/ge_p3_0.c b/ext/ed25519/ge_p3_0.c
similarity index 100%
rename from pdns/ext/ed25519/ge_p3_0.c
rename to ext/ed25519/ge_p3_0.c

diff --git a/pdns/ext/ed25519/ge_p3_dbl.c b/ext/ed25519/ge_p3_dbl.c
similarity index 100%
rename from pdns/ext/ed25519/ge_p3_dbl.c
rename to ext/ed25519/ge_p3_dbl.c

diff --git a/pdns/ext/ed25519/ge_p3_to_cached.c b/ext/ed25519/ge_p3_to_cached.c
similarity index 100%
rename from pdns/ext/ed25519/ge_p3_to_cached.c
rename to ext/ed25519/ge_p3_to_cached.c

diff --git a/pdns/ext/ed25519/ge_p3_to_p2.c b/ext/ed25519/ge_p3_to_p2.c
similarity index 100%
rename from pdns/ext/ed25519/ge_p3_to_p2.c
rename to ext/ed25519/ge_p3_to_p2.c

diff --git a/pdns/ext/ed25519/ge_p3_tobytes.c b/ext/ed25519/ge_p3_tobytes.c
similarity index 100%
rename from pdns/ext/ed25519/ge_p3_tobytes.c
rename to ext/ed25519/ge_p3_tobytes.c

diff --git a/pdns/ext/ed25519/ge_precomp_0.c b/ext/ed25519/ge_precomp_0.c
similarity index 100%
rename from pdns/ext/ed25519/ge_precomp_0.c
rename to ext/ed25519/ge_precomp_0.c

diff --git a/pdns/ext/ed25519/ge_scalarmult_base.c b/ext/ed25519/ge_scalarmult_base.c
similarity index 100%
rename from pdns/ext/ed25519/ge_scalarmult_base.c
rename to ext/ed25519/ge_scalarmult_base.c

diff --git a/pdns/ext/ed25519/ge_sub.c b/ext/ed25519/ge_sub.c
similarity index 100%
rename from pdns/ext/ed25519/ge_sub.c
rename to ext/ed25519/ge_sub.c

diff --git a/pdns/ext/ed25519/ge_sub.h b/ext/ed25519/ge_sub.h
similarity index 100%
rename from pdns/ext/ed25519/ge_sub.h
rename to ext/ed25519/ge_sub.h

diff --git a/pdns/ext/ed25519/ge_sub.q b/ext/ed25519/ge_sub.q
similarity index 100%
rename from pdns/ext/ed25519/ge_sub.q
rename to ext/ed25519/ge_sub.q

diff --git a/pdns/ext/ed25519/ge_tobytes.c b/ext/ed25519/ge_tobytes.c
similarity index 100%
rename from pdns/ext/ed25519/ge_tobytes.c
rename to ext/ed25519/ge_tobytes.c

diff --git a/pdns/ext/ed25519/keypair.c b/ext/ed25519/keypair.c
similarity index 100%
rename from pdns/ext/ed25519/keypair.c
rename to ext/ed25519/keypair.c

diff --git a/pdns/ext/ed25519/open.c b/ext/ed25519/open.c
similarity index 100%
rename from pdns/ext/ed25519/open.c
rename to ext/ed25519/open.c

diff --git a/pdns/ext/ed25519/pow22523.h b/ext/ed25519/pow22523.h
similarity index 100%
rename from pdns/ext/ed25519/pow22523.h
rename to ext/ed25519/pow22523.h

diff --git a/pdns/ext/ed25519/pow22523.q b/ext/ed25519/pow22523.q
similarity index 100%
rename from pdns/ext/ed25519/pow22523.q
rename to ext/ed25519/pow22523.q

diff --git a/pdns/ext/ed25519/pow225521.h b/ext/ed25519/pow225521.h
similarity index 100%
rename from pdns/ext/ed25519/pow225521.h
rename to ext/ed25519/pow225521.h

diff --git a/pdns/ext/ed25519/pow225521.q b/ext/ed25519/pow225521.q
similarity index 100%
rename from pdns/ext/ed25519/pow225521.q
rename to ext/ed25519/pow225521.q

diff --git a/pdns/ext/ed25519/publickey.c b/ext/ed25519/publickey.c
similarity index 100%
rename from pdns/ext/ed25519/publickey.c
rename to ext/ed25519/publickey.c

diff --git a/pdns/ext/ed25519/q2h.sh b/ext/ed25519/q2h.sh
similarity index 100%
rename from pdns/ext/ed25519/q2h.sh
rename to ext/ed25519/q2h.sh

diff --git a/pdns/ext/ed25519/sc.h b/ext/ed25519/sc.h
similarity index 100%
rename from pdns/ext/ed25519/sc.h
rename to ext/ed25519/sc.h

diff --git a/pdns/ext/ed25519/sc_muladd.c b/ext/ed25519/sc_muladd.c
similarity index 100%
rename from pdns/ext/ed25519/sc_muladd.c
rename to ext/ed25519/sc_muladd.c

diff --git a/pdns/ext/ed25519/sc_reduce.c b/ext/ed25519/sc_reduce.c
similarity index 100%
rename from pdns/ext/ed25519/sc_reduce.c
rename to ext/ed25519/sc_reduce.c

diff --git a/pdns/ext/ed25519/sha512-blocks.c b/ext/ed25519/sha512-blocks.c
similarity index 100%
rename from pdns/ext/ed25519/sha512-blocks.c
rename to ext/ed25519/sha512-blocks.c

diff --git a/pdns/ext/ed25519/sha512-hash.c b/ext/ed25519/sha512-hash.c
similarity index 100%
rename from pdns/ext/ed25519/sha512-hash.c
rename to ext/ed25519/sha512-hash.c

diff --git a/pdns/ext/ed25519/sha512.h b/ext/ed25519/sha512.h
similarity index 100%
rename from pdns/ext/ed25519/sha512.h
rename to ext/ed25519/sha512.h

diff --git a/pdns/ext/ed25519/sign.c b/ext/ed25519/sign.c
similarity index 100%
rename from pdns/ext/ed25519/sign.c
rename to ext/ed25519/sign.c

diff --git a/pdns/ext/ed25519/sqrtm1.h b/ext/ed25519/sqrtm1.h
similarity index 100%
rename from pdns/ext/ed25519/sqrtm1.h
rename to ext/ed25519/sqrtm1.h

diff --git a/pdns/ext/ed25519/sqrtm1.py b/ext/ed25519/sqrtm1.py
similarity index 100%
rename from pdns/ext/ed25519/sqrtm1.py
rename to ext/ed25519/sqrtm1.py

diff --git a/pdns/ext/ed25519/verify.c b/ext/ed25519/verify.c
similarity index 100%
rename from pdns/ext/ed25519/verify.c
rename to ext/ed25519/verify.c

diff --git a/pdns/ext/incbin/incbin.h b/ext/incbin/incbin.h
similarity index 100%
rename from pdns/ext/incbin/incbin.h
rename to ext/incbin/incbin.h

diff --git a/pdns/ext/json11/LICENSE.txt b/ext/json11/LICENSE.txt
similarity index 100%
rename from pdns/ext/json11/LICENSE.txt
rename to ext/json11/LICENSE.txt

diff --git a/pdns/ext/json11/json11.cpp b/ext/json11/json11.cpp
similarity index 100%
rename from pdns/ext/json11/json11.cpp
rename to ext/json11/json11.cpp

diff --git a/pdns/ext/json11/json11.hpp b/ext/json11/json11.hpp
similarity index 100%
rename from pdns/ext/json11/json11.hpp
rename to ext/json11/json11.hpp

diff --git a/pdns/ext/luawrapper/include/LuaContext.hpp b/ext/luawrapper/include/LuaContext.hpp
similarity index 100%
rename from pdns/ext/luawrapper/include/LuaContext.hpp
rename to ext/luawrapper/include/LuaContext.hpp

diff --git a/pdns/ext/polarssl/.gitignore b/ext/polarssl/.gitignore
similarity index 100%
rename from pdns/ext/polarssl/.gitignore
rename to ext/polarssl/.gitignore

diff --git a/pdns/ext/polarssl/CMakeLists.txt b/ext/polarssl/CMakeLists.txt
similarity index 100%
rename from pdns/ext/polarssl/CMakeLists.txt
rename to ext/polarssl/CMakeLists.txt

diff --git a/pdns/ext/polarssl/ChangeLog b/ext/polarssl/ChangeLog
similarity index 100%
rename from pdns/ext/polarssl/ChangeLog
rename to ext/polarssl/ChangeLog

diff --git a/pdns/ext/polarssl/DartConfiguration.tcl b/ext/polarssl/DartConfiguration.tcl
similarity index 100%
rename from pdns/ext/polarssl/DartConfiguration.tcl
rename to ext/polarssl/DartConfiguration.tcl

diff --git a/pdns/ext/polarssl/LICENSE b/ext/polarssl/LICENSE
similarity index 100%
rename from pdns/ext/polarssl/LICENSE
rename to ext/polarssl/LICENSE

diff --git a/pdns/ext/polarssl/Makefile.am b/ext/polarssl/Makefile.am
similarity index 100%
rename from pdns/ext/polarssl/Makefile.am
rename to ext/polarssl/Makefile.am

diff --git a/pdns/ext/polarssl/README.rst b/ext/polarssl/README.rst
similarity index 100%
rename from pdns/ext/polarssl/README.rst
rename to ext/polarssl/README.rst

diff --git a/pdns/ext/polarssl/include/.gitignore b/ext/polarssl/include/.gitignore
similarity index 100%
rename from pdns/ext/polarssl/include/.gitignore
rename to ext/polarssl/include/.gitignore

diff --git a/pdns/ext/polarssl/include/CMakeLists.txt b/ext/polarssl/include/CMakeLists.txt
similarity index 100%
rename from pdns/ext/polarssl/include/CMakeLists.txt
rename to ext/polarssl/include/CMakeLists.txt

diff --git a/pdns/ext/polarssl/include/polarssl/aes.h b/ext/polarssl/include/polarssl/aes.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/aes.h
rename to ext/polarssl/include/polarssl/aes.h

diff --git a/pdns/ext/polarssl/include/polarssl/aesni.h b/ext/polarssl/include/polarssl/aesni.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/aesni.h
rename to ext/polarssl/include/polarssl/aesni.h

diff --git a/pdns/ext/polarssl/include/polarssl/arc4.h b/ext/polarssl/include/polarssl/arc4.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/arc4.h
rename to ext/polarssl/include/polarssl/arc4.h

diff --git a/pdns/ext/polarssl/include/polarssl/asn1.h b/ext/polarssl/include/polarssl/asn1.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/asn1.h
rename to ext/polarssl/include/polarssl/asn1.h

diff --git a/pdns/ext/polarssl/include/polarssl/asn1write.h b/ext/polarssl/include/polarssl/asn1write.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/asn1write.h
rename to ext/polarssl/include/polarssl/asn1write.h

diff --git a/pdns/ext/polarssl/include/polarssl/base64.h b/ext/polarssl/include/polarssl/base64.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/base64.h
rename to ext/polarssl/include/polarssl/base64.h

diff --git a/pdns/ext/polarssl/include/polarssl/bignum.h b/ext/polarssl/include/polarssl/bignum.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/bignum.h
rename to ext/polarssl/include/polarssl/bignum.h

diff --git a/pdns/ext/polarssl/include/polarssl/blowfish.h b/ext/polarssl/include/polarssl/blowfish.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/blowfish.h
rename to ext/polarssl/include/polarssl/blowfish.h

diff --git a/pdns/ext/polarssl/include/polarssl/bn_mul.h b/ext/polarssl/include/polarssl/bn_mul.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/bn_mul.h
rename to ext/polarssl/include/polarssl/bn_mul.h

diff --git a/pdns/ext/polarssl/include/polarssl/camellia.h b/ext/polarssl/include/polarssl/camellia.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/camellia.h
rename to ext/polarssl/include/polarssl/camellia.h

diff --git a/pdns/ext/polarssl/include/polarssl/ccm.h b/ext/polarssl/include/polarssl/ccm.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/ccm.h
rename to ext/polarssl/include/polarssl/ccm.h

diff --git a/pdns/ext/polarssl/include/polarssl/certs.h b/ext/polarssl/include/polarssl/certs.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/certs.h
rename to ext/polarssl/include/polarssl/certs.h

diff --git a/pdns/ext/polarssl/include/polarssl/check_config.h b/ext/polarssl/include/polarssl/check_config.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/check_config.h
rename to ext/polarssl/include/polarssl/check_config.h

diff --git a/pdns/ext/polarssl/include/polarssl/cipher.h b/ext/polarssl/include/polarssl/cipher.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/cipher.h
rename to ext/polarssl/include/polarssl/cipher.h

diff --git a/pdns/ext/polarssl/include/polarssl/cipher_wrap.h b/ext/polarssl/include/polarssl/cipher_wrap.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/cipher_wrap.h
rename to ext/polarssl/include/polarssl/cipher_wrap.h

diff --git a/pdns/ext/polarssl/include/polarssl/compat-1.2.h b/ext/polarssl/include/polarssl/compat-1.2.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/compat-1.2.h
rename to ext/polarssl/include/polarssl/compat-1.2.h

diff --git a/pdns/ext/polarssl/include/polarssl/config.h b/ext/polarssl/include/polarssl/config.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/config.h
rename to ext/polarssl/include/polarssl/config.h

diff --git a/pdns/ext/polarssl/include/polarssl/ctr_drbg.h b/ext/polarssl/include/polarssl/ctr_drbg.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/ctr_drbg.h
rename to ext/polarssl/include/polarssl/ctr_drbg.h

diff --git a/pdns/ext/polarssl/include/polarssl/debug.h b/ext/polarssl/include/polarssl/debug.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/debug.h
rename to ext/polarssl/include/polarssl/debug.h

diff --git a/pdns/ext/polarssl/include/polarssl/des.h b/ext/polarssl/include/polarssl/des.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/des.h
rename to ext/polarssl/include/polarssl/des.h

diff --git a/pdns/ext/polarssl/include/polarssl/dhm.h b/ext/polarssl/include/polarssl/dhm.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/dhm.h
rename to ext/polarssl/include/polarssl/dhm.h

diff --git a/pdns/ext/polarssl/include/polarssl/ecdh.h b/ext/polarssl/include/polarssl/ecdh.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/ecdh.h
rename to ext/polarssl/include/polarssl/ecdh.h

diff --git a/pdns/ext/polarssl/include/polarssl/ecdsa.h b/ext/polarssl/include/polarssl/ecdsa.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/ecdsa.h
rename to ext/polarssl/include/polarssl/ecdsa.h

diff --git a/pdns/ext/polarssl/include/polarssl/ecp.h b/ext/polarssl/include/polarssl/ecp.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/ecp.h
rename to ext/polarssl/include/polarssl/ecp.h

diff --git a/pdns/ext/polarssl/include/polarssl/entropy.h b/ext/polarssl/include/polarssl/entropy.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/entropy.h
rename to ext/polarssl/include/polarssl/entropy.h

diff --git a/pdns/ext/polarssl/include/polarssl/entropy_poll.h b/ext/polarssl/include/polarssl/entropy_poll.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/entropy_poll.h
rename to ext/polarssl/include/polarssl/entropy_poll.h

diff --git a/pdns/ext/polarssl/include/polarssl/error.h b/ext/polarssl/include/polarssl/error.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/error.h
rename to ext/polarssl/include/polarssl/error.h

diff --git a/pdns/ext/polarssl/include/polarssl/gcm.h b/ext/polarssl/include/polarssl/gcm.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/gcm.h
rename to ext/polarssl/include/polarssl/gcm.h

diff --git a/pdns/ext/polarssl/include/polarssl/havege.h b/ext/polarssl/include/polarssl/havege.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/havege.h
rename to ext/polarssl/include/polarssl/havege.h

diff --git a/pdns/ext/polarssl/include/polarssl/hmac_drbg.h b/ext/polarssl/include/polarssl/hmac_drbg.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/hmac_drbg.h
rename to ext/polarssl/include/polarssl/hmac_drbg.h

diff --git a/pdns/ext/polarssl/include/polarssl/md.h b/ext/polarssl/include/polarssl/md.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/md.h
rename to ext/polarssl/include/polarssl/md.h

diff --git a/pdns/ext/polarssl/include/polarssl/md2.h b/ext/polarssl/include/polarssl/md2.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/md2.h
rename to ext/polarssl/include/polarssl/md2.h

diff --git a/pdns/ext/polarssl/include/polarssl/md4.h b/ext/polarssl/include/polarssl/md4.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/md4.h
rename to ext/polarssl/include/polarssl/md4.h

diff --git a/pdns/ext/polarssl/include/polarssl/md5.h b/ext/polarssl/include/polarssl/md5.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/md5.h
rename to ext/polarssl/include/polarssl/md5.h

diff --git a/pdns/ext/polarssl/include/polarssl/md_wrap.h b/ext/polarssl/include/polarssl/md_wrap.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/md_wrap.h
rename to ext/polarssl/include/polarssl/md_wrap.h

diff --git a/pdns/ext/polarssl/include/polarssl/memory.h b/ext/polarssl/include/polarssl/memory.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/memory.h
rename to ext/polarssl/include/polarssl/memory.h

diff --git a/pdns/ext/polarssl/include/polarssl/memory_buffer_alloc.h b/ext/polarssl/include/polarssl/memory_buffer_alloc.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/memory_buffer_alloc.h
rename to ext/polarssl/include/polarssl/memory_buffer_alloc.h

diff --git a/pdns/ext/polarssl/include/polarssl/net.h b/ext/polarssl/include/polarssl/net.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/net.h
rename to ext/polarssl/include/polarssl/net.h

diff --git a/pdns/ext/polarssl/include/polarssl/oid.h b/ext/polarssl/include/polarssl/oid.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/oid.h
rename to ext/polarssl/include/polarssl/oid.h

diff --git a/pdns/ext/polarssl/include/polarssl/openssl.h b/ext/polarssl/include/polarssl/openssl.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/openssl.h
rename to ext/polarssl/include/polarssl/openssl.h

diff --git a/pdns/ext/polarssl/include/polarssl/padlock.h b/ext/polarssl/include/polarssl/padlock.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/padlock.h
rename to ext/polarssl/include/polarssl/padlock.h

diff --git a/pdns/ext/polarssl/include/polarssl/pbkdf2.h b/ext/polarssl/include/polarssl/pbkdf2.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/pbkdf2.h
rename to ext/polarssl/include/polarssl/pbkdf2.h

diff --git a/pdns/ext/polarssl/include/polarssl/pem.h b/ext/polarssl/include/polarssl/pem.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/pem.h
rename to ext/polarssl/include/polarssl/pem.h

diff --git a/pdns/ext/polarssl/include/polarssl/pk.h b/ext/polarssl/include/polarssl/pk.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/pk.h
rename to ext/polarssl/include/polarssl/pk.h

diff --git a/pdns/ext/polarssl/include/polarssl/pk_wrap.h b/ext/polarssl/include/polarssl/pk_wrap.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/pk_wrap.h
rename to ext/polarssl/include/polarssl/pk_wrap.h

diff --git a/pdns/ext/polarssl/include/polarssl/pkcs11.h b/ext/polarssl/include/polarssl/pkcs11.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/pkcs11.h
rename to ext/polarssl/include/polarssl/pkcs11.h

diff --git a/pdns/ext/polarssl/include/polarssl/pkcs12.h b/ext/polarssl/include/polarssl/pkcs12.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/pkcs12.h
rename to ext/polarssl/include/polarssl/pkcs12.h

diff --git a/pdns/ext/polarssl/include/polarssl/pkcs5.h b/ext/polarssl/include/polarssl/pkcs5.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/pkcs5.h
rename to ext/polarssl/include/polarssl/pkcs5.h

diff --git a/pdns/ext/polarssl/include/polarssl/platform.h b/ext/polarssl/include/polarssl/platform.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/platform.h
rename to ext/polarssl/include/polarssl/platform.h

diff --git a/pdns/ext/polarssl/include/polarssl/ripemd160.h b/ext/polarssl/include/polarssl/ripemd160.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/ripemd160.h
rename to ext/polarssl/include/polarssl/ripemd160.h

diff --git a/pdns/ext/polarssl/include/polarssl/rsa.h b/ext/polarssl/include/polarssl/rsa.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/rsa.h
rename to ext/polarssl/include/polarssl/rsa.h

diff --git a/pdns/ext/polarssl/include/polarssl/sha1.h b/ext/polarssl/include/polarssl/sha1.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/sha1.h
rename to ext/polarssl/include/polarssl/sha1.h

diff --git a/pdns/ext/polarssl/include/polarssl/sha256.h b/ext/polarssl/include/polarssl/sha256.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/sha256.h
rename to ext/polarssl/include/polarssl/sha256.h

diff --git a/pdns/ext/polarssl/include/polarssl/sha512.h b/ext/polarssl/include/polarssl/sha512.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/sha512.h
rename to ext/polarssl/include/polarssl/sha512.h

diff --git a/pdns/ext/polarssl/include/polarssl/ssl.h b/ext/polarssl/include/polarssl/ssl.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/ssl.h
rename to ext/polarssl/include/polarssl/ssl.h

diff --git a/pdns/ext/polarssl/include/polarssl/ssl_cache.h b/ext/polarssl/include/polarssl/ssl_cache.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/ssl_cache.h
rename to ext/polarssl/include/polarssl/ssl_cache.h

diff --git a/pdns/ext/polarssl/include/polarssl/ssl_ciphersuites.h b/ext/polarssl/include/polarssl/ssl_ciphersuites.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/ssl_ciphersuites.h
rename to ext/polarssl/include/polarssl/ssl_ciphersuites.h

diff --git a/pdns/ext/polarssl/include/polarssl/threading.h b/ext/polarssl/include/polarssl/threading.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/threading.h
rename to ext/polarssl/include/polarssl/threading.h

diff --git a/pdns/ext/polarssl/include/polarssl/timing.h b/ext/polarssl/include/polarssl/timing.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/timing.h
rename to ext/polarssl/include/polarssl/timing.h

diff --git a/pdns/ext/polarssl/include/polarssl/version.h b/ext/polarssl/include/polarssl/version.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/version.h
rename to ext/polarssl/include/polarssl/version.h

diff --git a/pdns/ext/polarssl/include/polarssl/x509.h b/ext/polarssl/include/polarssl/x509.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/x509.h
rename to ext/polarssl/include/polarssl/x509.h

diff --git a/pdns/ext/polarssl/include/polarssl/x509_crl.h b/ext/polarssl/include/polarssl/x509_crl.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/x509_crl.h
rename to ext/polarssl/include/polarssl/x509_crl.h

diff --git a/pdns/ext/polarssl/include/polarssl/x509_crt.h b/ext/polarssl/include/polarssl/x509_crt.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/x509_crt.h
rename to ext/polarssl/include/polarssl/x509_crt.h

diff --git a/pdns/ext/polarssl/include/polarssl/x509_csr.h b/ext/polarssl/include/polarssl/x509_csr.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/x509_csr.h
rename to ext/polarssl/include/polarssl/x509_csr.h

diff --git a/pdns/ext/polarssl/include/polarssl/xtea.h b/ext/polarssl/include/polarssl/xtea.h
similarity index 100%
rename from pdns/ext/polarssl/include/polarssl/xtea.h
rename to ext/polarssl/include/polarssl/xtea.h

diff --git a/pdns/ext/polarssl/library/.gitignore b/ext/polarssl/library/.gitignore
similarity index 100%
rename from pdns/ext/polarssl/library/.gitignore
rename to ext/polarssl/library/.gitignore

diff --git a/pdns/ext/polarssl/library/CMakeLists.txt b/ext/polarssl/library/CMakeLists.txt
similarity index 100%
rename from pdns/ext/polarssl/library/CMakeLists.txt
rename to ext/polarssl/library/CMakeLists.txt

diff --git a/pdns/ext/polarssl/library/Makefile.am b/ext/polarssl/library/Makefile.am
similarity index 100%
rename from pdns/ext/polarssl/library/Makefile.am
rename to ext/polarssl/library/Makefile.am

diff --git a/pdns/ext/polarssl/library/aes.c b/ext/polarssl/library/aes.c
similarity index 100%
rename from pdns/ext/polarssl/library/aes.c
rename to ext/polarssl/library/aes.c

diff --git a/pdns/ext/polarssl/library/aesni.c b/ext/polarssl/library/aesni.c
similarity index 100%
rename from pdns/ext/polarssl/library/aesni.c
rename to ext/polarssl/library/aesni.c

diff --git a/pdns/ext/polarssl/library/arc4.c b/ext/polarssl/library/arc4.c
similarity index 100%
rename from pdns/ext/polarssl/library/arc4.c
rename to ext/polarssl/library/arc4.c

diff --git a/pdns/ext/polarssl/library/asn1parse.c b/ext/polarssl/library/asn1parse.c
similarity index 100%
rename from pdns/ext/polarssl/library/asn1parse.c
rename to ext/polarssl/library/asn1parse.c

diff --git a/pdns/ext/polarssl/library/asn1write.c b/ext/polarssl/library/asn1write.c
similarity index 100%
rename from pdns/ext/polarssl/library/asn1write.c
rename to ext/polarssl/library/asn1write.c

diff --git a/pdns/ext/polarssl/library/base64.c b/ext/polarssl/library/base64.c
similarity index 100%
rename from pdns/ext/polarssl/library/base64.c
rename to ext/polarssl/library/base64.c

diff --git a/pdns/ext/polarssl/library/bignum.c b/ext/polarssl/library/bignum.c
similarity index 100%
rename from pdns/ext/polarssl/library/bignum.c
rename to ext/polarssl/library/bignum.c

diff --git a/pdns/ext/polarssl/library/blowfish.c b/ext/polarssl/library/blowfish.c
similarity index 100%
rename from pdns/ext/polarssl/library/blowfish.c
rename to ext/polarssl/library/blowfish.c

diff --git a/pdns/ext/polarssl/library/camellia.c b/ext/polarssl/library/camellia.c
similarity index 100%
rename from pdns/ext/polarssl/library/camellia.c
rename to ext/polarssl/library/camellia.c

diff --git a/pdns/ext/polarssl/library/ccm.c b/ext/polarssl/library/ccm.c
similarity index 100%
rename from pdns/ext/polarssl/library/ccm.c
rename to ext/polarssl/library/ccm.c

diff --git a/pdns/ext/polarssl/library/certs.c b/ext/polarssl/library/certs.c
similarity index 100%
rename from pdns/ext/polarssl/library/certs.c
rename to ext/polarssl/library/certs.c

diff --git a/pdns/ext/polarssl/library/cipher.c b/ext/polarssl/library/cipher.c
similarity index 100%
rename from pdns/ext/polarssl/library/cipher.c
rename to ext/polarssl/library/cipher.c

diff --git a/pdns/ext/polarssl/library/cipher_wrap.c b/ext/polarssl/library/cipher_wrap.c
similarity index 100%
rename from pdns/ext/polarssl/library/cipher_wrap.c
rename to ext/polarssl/library/cipher_wrap.c

diff --git a/pdns/ext/polarssl/library/ctr_drbg.c b/ext/polarssl/library/ctr_drbg.c
similarity index 100%
rename from pdns/ext/polarssl/library/ctr_drbg.c
rename to ext/polarssl/library/ctr_drbg.c

diff --git a/pdns/ext/polarssl/library/debug.c b/ext/polarssl/library/debug.c
similarity index 100%
rename from pdns/ext/polarssl/library/debug.c
rename to ext/polarssl/library/debug.c

diff --git a/pdns/ext/polarssl/library/des.c b/ext/polarssl/library/des.c
similarity index 100%
rename from pdns/ext/polarssl/library/des.c
rename to ext/polarssl/library/des.c

diff --git a/pdns/ext/polarssl/library/dhm.c b/ext/polarssl/library/dhm.c
similarity index 100%
rename from pdns/ext/polarssl/library/dhm.c
rename to ext/polarssl/library/dhm.c

diff --git a/pdns/ext/polarssl/library/ecdh.c b/ext/polarssl/library/ecdh.c
similarity index 100%
rename from pdns/ext/polarssl/library/ecdh.c
rename to ext/polarssl/library/ecdh.c

diff --git a/pdns/ext/polarssl/library/ecdsa.c b/ext/polarssl/library/ecdsa.c
similarity index 100%
rename from pdns/ext/polarssl/library/ecdsa.c
rename to ext/polarssl/library/ecdsa.c

diff --git a/pdns/ext/polarssl/library/ecp.c b/ext/polarssl/library/ecp.c
similarity index 100%
rename from pdns/ext/polarssl/library/ecp.c
rename to ext/polarssl/library/ecp.c

diff --git a/pdns/ext/polarssl/library/ecp_curves.c b/ext/polarssl/library/ecp_curves.c
similarity index 100%
rename from pdns/ext/polarssl/library/ecp_curves.c
rename to ext/polarssl/library/ecp_curves.c

diff --git a/pdns/ext/polarssl/library/entropy.c b/ext/polarssl/library/entropy.c
similarity index 100%
rename from pdns/ext/polarssl/library/entropy.c
rename to ext/polarssl/library/entropy.c

diff --git a/pdns/ext/polarssl/library/entropy_poll.c b/ext/polarssl/library/entropy_poll.c
similarity index 100%
rename from pdns/ext/polarssl/library/entropy_poll.c
rename to ext/polarssl/library/entropy_poll.c

diff --git a/pdns/ext/polarssl/library/error.c b/ext/polarssl/library/error.c
similarity index 100%
rename from pdns/ext/polarssl/library/error.c
rename to ext/polarssl/library/error.c

diff --git a/pdns/ext/polarssl/library/gcm.c b/ext/polarssl/library/gcm.c
similarity index 100%
rename from pdns/ext/polarssl/library/gcm.c
rename to ext/polarssl/library/gcm.c

diff --git a/pdns/ext/polarssl/library/havege.c b/ext/polarssl/library/havege.c
similarity index 100%
rename from pdns/ext/polarssl/library/havege.c
rename to ext/polarssl/library/havege.c

diff --git a/pdns/ext/polarssl/library/hmac_drbg.c b/ext/polarssl/library/hmac_drbg.c
similarity index 100%
rename from pdns/ext/polarssl/library/hmac_drbg.c
rename to ext/polarssl/library/hmac_drbg.c

diff --git a/pdns/ext/polarssl/library/md.c b/ext/polarssl/library/md.c
similarity index 100%
rename from pdns/ext/polarssl/library/md.c
rename to ext/polarssl/library/md.c

diff --git a/pdns/ext/polarssl/library/md2.c b/ext/polarssl/library/md2.c
similarity index 100%
rename from pdns/ext/polarssl/library/md2.c
rename to ext/polarssl/library/md2.c

diff --git a/pdns/ext/polarssl/library/md4.c b/ext/polarssl/library/md4.c
similarity index 100%
rename from pdns/ext/polarssl/library/md4.c
rename to ext/polarssl/library/md4.c

diff --git a/pdns/ext/polarssl/library/md5.c b/ext/polarssl/library/md5.c
similarity index 100%
rename from pdns/ext/polarssl/library/md5.c
rename to ext/polarssl/library/md5.c

diff --git a/pdns/ext/polarssl/library/md_wrap.c b/ext/polarssl/library/md_wrap.c
similarity index 100%
rename from pdns/ext/polarssl/library/md_wrap.c
rename to ext/polarssl/library/md_wrap.c

diff --git a/pdns/ext/polarssl/library/memory_buffer_alloc.c b/ext/polarssl/library/memory_buffer_alloc.c
similarity index 100%
rename from pdns/ext/polarssl/library/memory_buffer_alloc.c
rename to ext/polarssl/library/memory_buffer_alloc.c

diff --git a/pdns/ext/polarssl/library/net.c b/ext/polarssl/library/net.c
similarity index 100%
rename from pdns/ext/polarssl/library/net.c
rename to ext/polarssl/library/net.c

diff --git a/pdns/ext/polarssl/library/oid.c b/ext/polarssl/library/oid.c
similarity index 100%
rename from pdns/ext/polarssl/library/oid.c
rename to ext/polarssl/library/oid.c

diff --git a/pdns/ext/polarssl/library/padlock.c b/ext/polarssl/library/padlock.c
similarity index 100%
rename from pdns/ext/polarssl/library/padlock.c
rename to ext/polarssl/library/padlock.c

diff --git a/pdns/ext/polarssl/library/pbkdf2.c b/ext/polarssl/library/pbkdf2.c
similarity index 100%
rename from pdns/ext/polarssl/library/pbkdf2.c
rename to ext/polarssl/library/pbkdf2.c

diff --git a/pdns/ext/polarssl/library/pem.c b/ext/polarssl/library/pem.c
similarity index 100%
rename from pdns/ext/polarssl/library/pem.c
rename to ext/polarssl/library/pem.c

diff --git a/pdns/ext/polarssl/library/pk.c b/ext/polarssl/library/pk.c
similarity index 100%
rename from pdns/ext/polarssl/library/pk.c
rename to ext/polarssl/library/pk.c

diff --git a/pdns/ext/polarssl/library/pk_wrap.c b/ext/polarssl/library/pk_wrap.c
similarity index 100%
rename from pdns/ext/polarssl/library/pk_wrap.c
rename to ext/polarssl/library/pk_wrap.c

diff --git a/pdns/ext/polarssl/library/pkcs11.c b/ext/polarssl/library/pkcs11.c
similarity index 100%
rename from pdns/ext/polarssl/library/pkcs11.c
rename to ext/polarssl/library/pkcs11.c

diff --git a/pdns/ext/polarssl/library/pkcs12.c b/ext/polarssl/library/pkcs12.c
similarity index 100%
rename from pdns/ext/polarssl/library/pkcs12.c
rename to ext/polarssl/library/pkcs12.c

diff --git a/pdns/ext/polarssl/library/pkcs5.c b/ext/polarssl/library/pkcs5.c
similarity index 100%
rename from pdns/ext/polarssl/library/pkcs5.c
rename to ext/polarssl/library/pkcs5.c

diff --git a/pdns/ext/polarssl/library/pkparse.c b/ext/polarssl/library/pkparse.c
similarity index 100%
rename from pdns/ext/polarssl/library/pkparse.c
rename to ext/polarssl/library/pkparse.c

diff --git a/pdns/ext/polarssl/library/pkwrite.c b/ext/polarssl/library/pkwrite.c
similarity index 100%
rename from pdns/ext/polarssl/library/pkwrite.c
rename to ext/polarssl/library/pkwrite.c

diff --git a/pdns/ext/polarssl/library/platform.c b/ext/polarssl/library/platform.c
similarity index 100%
rename from pdns/ext/polarssl/library/platform.c
rename to ext/polarssl/library/platform.c

diff --git a/pdns/ext/polarssl/library/ripemd160.c b/ext/polarssl/library/ripemd160.c
similarity index 100%
rename from pdns/ext/polarssl/library/ripemd160.c
rename to ext/polarssl/library/ripemd160.c

diff --git a/pdns/ext/polarssl/library/rsa.c b/ext/polarssl/library/rsa.c
similarity index 100%
rename from pdns/ext/polarssl/library/rsa.c
rename to ext/polarssl/library/rsa.c

diff --git a/pdns/ext/polarssl/library/sha1.c b/ext/polarssl/library/sha1.c
similarity index 100%
rename from pdns/ext/polarssl/library/sha1.c
rename to ext/polarssl/library/sha1.c

diff --git a/pdns/ext/polarssl/library/sha256.c b/ext/polarssl/library/sha256.c
similarity index 100%
rename from pdns/ext/polarssl/library/sha256.c
rename to ext/polarssl/library/sha256.c

diff --git a/pdns/ext/polarssl/library/sha512.c b/ext/polarssl/library/sha512.c
similarity index 100%
rename from pdns/ext/polarssl/library/sha512.c
rename to ext/polarssl/library/sha512.c

diff --git a/pdns/ext/polarssl/library/ssl_cache.c b/ext/polarssl/library/ssl_cache.c
similarity index 100%
rename from pdns/ext/polarssl/library/ssl_cache.c
rename to ext/polarssl/library/ssl_cache.c

diff --git a/pdns/ext/polarssl/library/ssl_ciphersuites.c b/ext/polarssl/library/ssl_ciphersuites.c
similarity index 100%
rename from pdns/ext/polarssl/library/ssl_ciphersuites.c
rename to ext/polarssl/library/ssl_ciphersuites.c

diff --git a/pdns/ext/polarssl/library/ssl_cli.c b/ext/polarssl/library/ssl_cli.c
similarity index 100%
rename from pdns/ext/polarssl/library/ssl_cli.c
rename to ext/polarssl/library/ssl_cli.c

diff --git a/pdns/ext/polarssl/library/ssl_srv.c b/ext/polarssl/library/ssl_srv.c
similarity index 100%
rename from pdns/ext/polarssl/library/ssl_srv.c
rename to ext/polarssl/library/ssl_srv.c

diff --git a/pdns/ext/polarssl/library/ssl_tls.c b/ext/polarssl/library/ssl_tls.c
similarity index 100%
rename from pdns/ext/polarssl/library/ssl_tls.c
rename to ext/polarssl/library/ssl_tls.c

diff --git a/pdns/ext/polarssl/library/threading.c b/ext/polarssl/library/threading.c
similarity index 100%
rename from pdns/ext/polarssl/library/threading.c
rename to ext/polarssl/library/threading.c

diff --git a/pdns/ext/polarssl/library/timing.c b/ext/polarssl/library/timing.c
similarity index 100%
rename from pdns/ext/polarssl/library/timing.c
rename to ext/polarssl/library/timing.c

diff --git a/pdns/ext/polarssl/library/version.c b/ext/polarssl/library/version.c
similarity index 100%
rename from pdns/ext/polarssl/library/version.c
rename to ext/polarssl/library/version.c

diff --git a/pdns/ext/polarssl/library/version_features.c b/ext/polarssl/library/version_features.c
similarity index 100%
rename from pdns/ext/polarssl/library/version_features.c
rename to ext/polarssl/library/version_features.c

diff --git a/pdns/ext/polarssl/library/x509.c b/ext/polarssl/library/x509.c
similarity index 100%
rename from pdns/ext/polarssl/library/x509.c
rename to ext/polarssl/library/x509.c

diff --git a/pdns/ext/polarssl/library/x509_create.c b/ext/polarssl/library/x509_create.c
similarity index 100%
rename from pdns/ext/polarssl/library/x509_create.c
rename to ext/polarssl/library/x509_create.c

diff --git a/pdns/ext/polarssl/library/x509_crl.c b/ext/polarssl/library/x509_crl.c
similarity index 100%
rename from pdns/ext/polarssl/library/x509_crl.c
rename to ext/polarssl/library/x509_crl.c

diff --git a/pdns/ext/polarssl/library/x509_crt.c b/ext/polarssl/library/x509_crt.c
similarity index 100%
rename from pdns/ext/polarssl/library/x509_crt.c
rename to ext/polarssl/library/x509_crt.c

diff --git a/pdns/ext/polarssl/library/x509_csr.c b/ext/polarssl/library/x509_csr.c
similarity index 100%
rename from pdns/ext/polarssl/library/x509_csr.c
rename to ext/polarssl/library/x509_csr.c

diff --git a/pdns/ext/polarssl/library/x509write_crt.c b/ext/polarssl/library/x509write_crt.c
similarity index 100%
rename from pdns/ext/polarssl/library/x509write_crt.c
rename to ext/polarssl/library/x509write_crt.c

diff --git a/pdns/ext/polarssl/library/x509write_csr.c b/ext/polarssl/library/x509write_csr.c
similarity index 100%
rename from pdns/ext/polarssl/library/x509write_csr.c
rename to ext/polarssl/library/x509write_csr.c

diff --git a/pdns/ext/polarssl/library/xtea.c b/ext/polarssl/library/xtea.c
similarity index 100%
rename from pdns/ext/polarssl/library/xtea.c
rename to ext/polarssl/library/xtea.c

diff --git a/pdns/ext/rapidjson/.gitignore b/ext/rapidjson/.gitignore
similarity index 100%
rename from pdns/ext/rapidjson/.gitignore
rename to ext/rapidjson/.gitignore

diff --git a/pdns/ext/rapidjson/Makefile.am b/ext/rapidjson/Makefile.am
similarity index 100%
rename from pdns/ext/rapidjson/Makefile.am
rename to ext/rapidjson/Makefile.am

diff --git a/pdns/ext/rapidjson/include/rapidjson/document.h b/ext/rapidjson/include/rapidjson/document.h
similarity index 100%
rename from pdns/ext/rapidjson/include/rapidjson/document.h
rename to ext/rapidjson/include/rapidjson/document.h

diff --git a/pdns/ext/rapidjson/include/rapidjson/filestream.h b/ext/rapidjson/include/rapidjson/filestream.h
similarity index 100%
rename from pdns/ext/rapidjson/include/rapidjson/filestream.h
rename to ext/rapidjson/include/rapidjson/filestream.h

diff --git a/pdns/ext/rapidjson/include/rapidjson/internal/pow10.h b/ext/rapidjson/include/rapidjson/internal/pow10.h
similarity index 100%
rename from pdns/ext/rapidjson/include/rapidjson/internal/pow10.h
rename to ext/rapidjson/include/rapidjson/internal/pow10.h

diff --git a/pdns/ext/rapidjson/include/rapidjson/internal/stack.h b/ext/rapidjson/include/rapidjson/internal/stack.h
similarity index 100%
rename from pdns/ext/rapidjson/include/rapidjson/internal/stack.h
rename to ext/rapidjson/include/rapidjson/internal/stack.h

diff --git a/pdns/ext/rapidjson/include/rapidjson/internal/strfunc.h b/ext/rapidjson/include/rapidjson/internal/strfunc.h
similarity index 100%
rename from pdns/ext/rapidjson/include/rapidjson/internal/strfunc.h
rename to ext/rapidjson/include/rapidjson/internal/strfunc.h

diff --git a/pdns/ext/rapidjson/include/rapidjson/prettywriter.h b/ext/rapidjson/include/rapidjson/prettywriter.h
similarity index 100%
rename from pdns/ext/rapidjson/include/rapidjson/prettywriter.h
rename to ext/rapidjson/include/rapidjson/prettywriter.h

diff --git a/pdns/ext/rapidjson/include/rapidjson/rapidjson.h b/ext/rapidjson/include/rapidjson/rapidjson.h
similarity index 100%
rename from pdns/ext/rapidjson/include/rapidjson/rapidjson.h
rename to ext/rapidjson/include/rapidjson/rapidjson.h

diff --git a/pdns/ext/rapidjson/include/rapidjson/reader.h b/ext/rapidjson/include/rapidjson/reader.h
similarity index 100%
rename from pdns/ext/rapidjson/include/rapidjson/reader.h
rename to ext/rapidjson/include/rapidjson/reader.h

diff --git a/pdns/ext/rapidjson/include/rapidjson/stringbuffer.h b/ext/rapidjson/include/rapidjson/stringbuffer.h
similarity index 100%
rename from pdns/ext/rapidjson/include/rapidjson/stringbuffer.h
rename to ext/rapidjson/include/rapidjson/stringbuffer.h

diff --git a/pdns/ext/rapidjson/include/rapidjson/writer.h b/ext/rapidjson/include/rapidjson/writer.h
similarity index 100%
rename from pdns/ext/rapidjson/include/rapidjson/writer.h
rename to ext/rapidjson/include/rapidjson/writer.h

diff --git a/pdns/ext/rapidjson/license.txt b/ext/rapidjson/license.txt
similarity index 100%
rename from pdns/ext/rapidjson/license.txt
rename to ext/rapidjson/license.txt

diff --git a/pdns/ext/rapidjson/version b/ext/rapidjson/version
similarity index 100%
rename from pdns/ext/rapidjson/version
rename to ext/rapidjson/version

diff --git a/pdns/ext/yahttp/.gitignore b/ext/yahttp/.gitignore
similarity index 100%
rename from pdns/ext/yahttp/.gitignore
rename to ext/yahttp/.gitignore

diff --git a/pdns/ext/yahttp/LICENSE b/ext/yahttp/LICENSE
similarity index 100%
rename from pdns/ext/yahttp/LICENSE
rename to ext/yahttp/LICENSE

diff --git a/pdns/ext/yahttp/Makefile.am b/ext/yahttp/Makefile.am
similarity index 100%
rename from pdns/ext/yahttp/Makefile.am
rename to ext/yahttp/Makefile.am

diff --git a/pdns/ext/yahttp/README.md b/ext/yahttp/README.md
similarity index 100%
rename from pdns/ext/yahttp/README.md
rename to ext/yahttp/README.md

diff --git a/pdns/ext/yahttp/yahttp/Makefile.am b/ext/yahttp/yahttp/Makefile.am
similarity index 100%
rename from pdns/ext/yahttp/yahttp/Makefile.am
rename to ext/yahttp/yahttp/Makefile.am

diff --git a/pdns/ext/yahttp/yahttp/cookie.hpp b/ext/yahttp/yahttp/cookie.hpp
similarity index 100%
rename from pdns/ext/yahttp/yahttp/cookie.hpp
rename to ext/yahttp/yahttp/cookie.hpp

diff --git a/pdns/ext/yahttp/yahttp/exception.hpp b/ext/yahttp/yahttp/exception.hpp
similarity index 100%
rename from pdns/ext/yahttp/yahttp/exception.hpp
rename to ext/yahttp/yahttp/exception.hpp

diff --git a/pdns/ext/yahttp/yahttp/reqresp.cpp b/ext/yahttp/yahttp/reqresp.cpp
similarity index 100%
rename from pdns/ext/yahttp/yahttp/reqresp.cpp
rename to ext/yahttp/yahttp/reqresp.cpp

diff --git a/pdns/ext/yahttp/yahttp/reqresp.hpp b/ext/yahttp/yahttp/reqresp.hpp
similarity index 100%
rename from pdns/ext/yahttp/yahttp/reqresp.hpp
rename to ext/yahttp/yahttp/reqresp.hpp

diff --git a/pdns/ext/yahttp/yahttp/router.cpp b/ext/yahttp/yahttp/router.cpp
similarity index 100%
rename from pdns/ext/yahttp/yahttp/router.cpp
rename to ext/yahttp/yahttp/router.cpp

diff --git a/pdns/ext/yahttp/yahttp/router.hpp b/ext/yahttp/yahttp/router.hpp
similarity index 100%
rename from pdns/ext/yahttp/yahttp/router.hpp
rename to ext/yahttp/yahttp/router.hpp

diff --git a/pdns/ext/yahttp/yahttp/url.hpp b/ext/yahttp/yahttp/url.hpp
similarity index 100%
rename from pdns/ext/yahttp/yahttp/url.hpp
rename to ext/yahttp/yahttp/url.hpp

diff --git a/pdns/ext/yahttp/yahttp/utility.hpp b/ext/yahttp/yahttp/utility.hpp
similarity index 100%
rename from pdns/ext/yahttp/yahttp/utility.hpp
rename to ext/yahttp/yahttp/utility.hpp

diff --git a/pdns/ext/yahttp/yahttp/yahttp-config.h b/ext/yahttp/yahttp/yahttp-config.h
similarity index 100%
rename from pdns/ext/yahttp/yahttp/yahttp-config.h
rename to ext/yahttp/yahttp/yahttp-config.h

diff --git a/pdns/ext/yahttp/yahttp/yahttp.hpp b/ext/yahttp/yahttp/yahttp.hpp
similarity index 100%
rename from pdns/ext/yahttp/yahttp/yahttp.hpp
rename to ext/yahttp/yahttp/yahttp.hpp

diff --git a/m4/pdns_enable_ed25519.m4 b/m4/pdns_enable_ed25519.m4
index 686f939a6e729a8f9927d3eb7f24f7362267c7e9..522dc5b449e4d2e59a974499099cb671df2d7160 100644 (file)
--- a/m4/pdns_enable_ed25519.m4
+++ b/m4/pdns_enable_ed25519.m4
@@ -11,7 +11,7 @@ AC_DEFUN([PDNS_ENABLE_ED25519], [
   AM_CONDITIONAL([ED25519], [test "x$enable_ed25519" != "xno"])
   AM_COND_IF([ED25519], [
     ED25519_SUBDIR=ed25519
-    ED25519_LIBS="-L\$(top_builddir)/pdns/ext/$ED25519_SUBDIR/ -led25519"
+    ED25519_LIBS="-L\$(top_builddir)/ext/$ED25519_SUBDIR/ -led25519"
   ],[
     ED25519_SUBDIR=
     ED25519_LIBS=

diff --git a/m4/pdns_with_system_polarssl.m4 b/m4/pdns_with_system_polarssl.m4
index 030aa410b382c77a4c106478b23ade581490389d..959e7b60f960172df0ce4f6e791e62cc55132b9c 100644 (file)
--- a/m4/pdns_with_system_polarssl.m4
+++ b/m4/pdns_with_system_polarssl.m4
@@ -6,8 +6,8 @@ AC_DEFUN([PDNS_WITH_SYSTEM_POLARSSL],[
   )
 
   POLARSSL_SUBDIR=polarssl
-  POLARSSL_CFLAGS=-I\$\(top_srcdir\)/pdns/ext/$POLARSSL_SUBDIR/include/
-  POLARSSL_LIBS="-L\$(top_builddir)/pdns/ext/$POLARSSL_SUBDIR/library/ -lpolarssl"
+  POLARSSL_CFLAGS=-I\$\(top_srcdir\)/ext/$POLARSSL_SUBDIR/include/
+  POLARSSL_LIBS="-L\$(top_builddir)/ext/$POLARSSL_SUBDIR/library/ -lpolarssl"
 
   AS_IF([test "x$with_system_polarssl" = "xyes"],[
     OLD_LIBS=$LIBS

diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am
index 93b26635aeb31660fe2e12f834d739f1cef0efd0..e161957ac1565eaad7e01a75c683035ef892bcd8 100644 (file)
--- a/modules/remotebackend/Makefile.am
+++ b/modules/remotebackend/Makefile.am
@@ -1,13 +1,11 @@
 AM_CPPFLAGS += \
-       -I$(top_srcdir)/pdns/ext/rapidjson/include \
+       -I$(top_srcdir)/ext/rapidjson/include \
        $(YAHTTP_CFLAGS) \
        $(POLARSSL_CFLAGS) \
        $(LIBZMQ_CFLAGS)
 
 AM_LDFLAGS = $(THREADFLAGS)
 
-SUBDIRS = ../../pdns/ext/yahttp
-
 EXTRA_DIST = \
        OBJECTFILES \
        OBJECTLIBS \

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 966f6d1d0e66f83261ee6aaf3dd1c7442fddde98..d6226fb4f3291af689e74deb6a40a217ebfe7075 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1,5 +1,5 @@
 AM_CPPFLAGS += \
-       -I$(top_srcdir)/pdns/ext/rapidjson/include \
+       -I$(top_srcdir)/ext/rapidjson/include \
        $(YAHTTP_CFLAGS) \
        $(POLARSSL_CFLAGS)
 
@@ -46,8 +46,6 @@ EXTRA_DIST = \
        named.conf.parsertest \
        pdns.conf-dist
 
-SUBDIRS = ext
-
 BUILT_SOURCES = \
        bind-dnssec.schema.sqlite3.sql.h \
        version_generated.h \
@@ -581,7 +579,7 @@ dnsdist_SOURCES = \
        sholder.hh \
        sodcrypto.cc sodcrypto.hh \
        sstuff.hh \
-       ext/json11/json11.cpp
+       $(top_srcdir)/ext/json11/json11.cpp
 
 dnsdist_LDFLAGS = \
        $(AM_LDFLAGS) 

diff --git a/pdns/dist-recursor b/pdns/dist-recursor
index 7e37498eacf55ca1e5ca68d48c08188f98cd3882..e342dad903dc7c9e21d921494de111a1ad055c5d 100755 (executable)
--- a/pdns/dist-recursor
+++ b/pdns/dist-recursor
@@ -59,13 +59,13 @@ cat >>$DIRNAME/config.h <<EOF
 #define HAVE_BOOST 1
 EOF
 mkdir -p $DIRNAME/ext/rapidjson/include/rapidjson/internal
-cp -a ext/rapidjson/include/rapidjson/*.h $DIRNAME/ext/rapidjson/include/rapidjson/
-cp -a ext/rapidjson/include/rapidjson/internal/*.h $DIRNAME/ext/rapidjson/include/rapidjson/internal
+cp -a ../ext/rapidjson/include/rapidjson/*.h $DIRNAME/ext/rapidjson/include/rapidjson/
+cp -a ../ext/rapidjson/include/rapidjson/internal/*.h $DIRNAME/ext/rapidjson/include/rapidjson/internal
 mkdir -p $DIRNAME/ext/polarssl/include/polarssl
-cp -a ext/polarssl/include/polarssl/config.h ext/polarssl/include/polarssl/check_config.h ext/polarssl/include/polarssl/aes.h ext/polarssl/include/polarssl/base64.h ext/polarssl/include/polarssl/platform.h ext/polarssl/include/polarssl/version.h $DIRNAME/ext/polarssl/include/polarssl
+cp -a ../ext/polarssl/include/polarssl/config.h ../ext/polarssl/include/polarssl/check_config.h ../ext/polarssl/include/polarssl/aes.h ../ext/polarssl/include/polarssl/base64.h ../ext/polarssl/include/polarssl/platform.h ../ext/polarssl/include/polarssl/version.h $DIRNAME/ext/polarssl/include/polarssl
 mkdir -p $DIRNAME/ext/polarssl/library
-cp -a ext/polarssl/library/aes.c ext/polarssl/library/base64.c $DIRNAME/ext/polarssl/library
-cp -a ext/yahttp/ $DIRNAME/ext/yahttp
+cp -a ../ext/polarssl/library/aes.c ../ext/polarssl/library/base64.c $DIRNAME/ext/polarssl/library
+cp -a ../ext/yahttp/ $DIRNAME/ext/yahttp
 echo '#include "../../../config.h"' > $DIRNAME/ext/yahttp/yahttp/yahttp-config.h
 mkdir $DIRNAME/rrd
 cp tools/rrd/{create,update,makegraphs,index.html} $DIRNAME/rrd