Rename polarssl-1.3.2 to polarssl

Makes upgrading in the future much easier
since we don't hardcode the version number everywhere.

diff --git a/configure.ac b/configure.ac
index e2814b5b48c467a8cfdc3379aa2f9762155b42da..3ad7d84c243beb71c64c1ff0f5d5f6da569e209e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -365,8 +365,8 @@ AC_CONFIG_FILES([
   pdns/ext/Makefile
   pdns/ext/yahttp/Makefile
   pdns/ext/yahttp/yahttp/Makefile
-  pdns/ext/polarssl-1.3.2/Makefile
-  pdns/ext/polarssl-1.3.2/library/Makefile
+  pdns/ext/polarssl/Makefile
+  pdns/ext/polarssl/library/Makefile
   pdns/ext/rapidjson/Makefile
   modules/bindbackend/Makefile
   modules/db2backend/Makefile

diff --git a/m4/pdns_with_system_polarssl.m4 b/m4/pdns_with_system_polarssl.m4
index ab981503ee21933d605d20a5c07d0b89f6b617c3..846ac7c2f5166c58a6974d05712e8c1da063305b 100644 (file)
--- a/m4/pdns_with_system_polarssl.m4
+++ b/m4/pdns_with_system_polarssl.m4
@@ -27,7 +27,7 @@ AC_DEFUN([PDNS_WITH_SYSTEM_POLARSSL],[
     [have_system_polarssl=no]
   )
 
-  POLARSSL_SUBDIR=polarssl-1.3.2
+  POLARSSL_SUBDIR=polarssl
   POLARSSL_CFLAGS=-I\$\(top_srcdir\)/pdns/ext/$POLARSSL_SUBDIR/include/
   POLARSSL_LIBS="-L\$(top_builddir)/pdns/ext/$POLARSSL_SUBDIR/library/ -lpolarssl"
 

diff --git a/pdns/Makefile-recursor b/pdns/Makefile-recursor
index 722788aec7d965457b55e47d5dd47d45dd901a76..f02b5dd669f26e64f96d12e2d4eb56237b14e55c 100644 (file)
--- a/pdns/Makefile-recursor
+++ b/pdns/Makefile-recursor
@@ -4,8 +4,8 @@ BINDIR=/usr/bin/
 SYSCONFDIR=/etc/powerdns/
 LOCALSTATEDIR=/var/run/
 OPTFLAGS?=-O3
-CXXFLAGS:= $(CXXFLAGS) -Iext/rapidjson/include -I$(CURDIR)/ext/polarssl-1.3.2/include -Wall $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -pthread -Iext/yahttp
-CFLAGS:=$(CFLAGS) -Wall $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -I$(CURDIR)/ext/polarssl-1.3.2/include -pthread
+CXXFLAGS:= $(CXXFLAGS) -Iext/rapidjson/include -I$(CURDIR)/ext/polarssl/include -Wall $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -pthread -Iext/yahttp
+CFLAGS:=$(CFLAGS) -Wall $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -I$(CURDIR)/ext/polarssl/include -pthread
 LDFLAGS:=$(LDFLAGS) $(ARCHFLAGS) -pthread
 STRIP_BINARIES?=1
 
@@ -20,7 +20,7 @@ PDNS_RECURSOR_OBJECTS=syncres.o  misc.o unix_utility.o qtype.o logger.o  \
 arguments.o lwres.o pdns_recursor.o recursor_cache.o dnsparser.o \
 dnswriter.o dnsrecords.o rcpgenerator.o base64.o zoneparser-tng.o \
 rec_channel.o rec_channel_rec.o selectmplexer.o sillyrecords.o \
-dns_random.o ext/polarssl-1.3.2/library/aes.o ext/polarssl-1.3.2/library/padlock.o dnslabeltext.o \
+dns_random.o ext/polarssl/library/aes.o ext/polarssl/library/padlock.o dnslabeltext.o \
 lua-pdns.o lua-recursor.o randomhelper.o recpacketcache.o dns.o \
 reczones.o base32.o nsecrecords.o json.o ws-recursor.o ws-api.o \
 version.o responsestats.o webserver.o ext/yahttp/yahttp/reqresp.o ext/yahttp/yahttp/router.o \
@@ -121,7 +121,7 @@ clean: binclean
        -rm -f dep *~ *.gcda *.gcno optional/*.gcda optional/*.gcno
 
 binclean:
-       -rm -f *.o pdns_hw pdns_recursor rec_control optional/*.o build-stamp ext/polarssl-1.3.2/library/*.o ext/yahttp/yahttp/*.o version_generated.h
+       -rm -f *.o pdns_hw pdns_recursor rec_control optional/*.o build-stamp ext/library/*.o ext/yahttp/yahttp/*.o version_generated.h
 
 dep:
        $(CXX) $(CXXFLAGS) -MM -MG *.cc *.hh > $@

diff --git a/pdns/dist-recursor b/pdns/dist-recursor
index a17ac9e9c962e359853a00be29e9177dde178e16..e3b81d91557313a91c6bf9a0bc59193189a8729e 100755 (executable)
--- a/pdns/dist-recursor
+++ b/pdns/dist-recursor
@@ -59,10 +59,10 @@ 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
-mkdir -p $DIRNAME/ext/polarssl-1.3.2/include/polarssl
-cp -a ext/polarssl-1.3.2/include/polarssl/config.h ext/polarssl-1.3.2/include/polarssl/aes.h ext/polarssl-1.3.2/include/polarssl/padlock.h $DIRNAME/ext/polarssl-1.3.2/include/polarssl
-mkdir -p $DIRNAME/ext/polarssl-1.3.2/library
-cp -a ext/polarssl-1.3.2/library/aes.c ext/polarssl-1.3.2/library/padlock.c $DIRNAME/ext/polarssl-1.3.2/library
+mkdir -p $DIRNAME/ext/polarssl/include/polarssl
+cp -a ext/polarssl/include/polarssl/config.h ext/polarssl/include/polarssl/aes.h ext/polarssl/include/polarssl/padlock.h $DIRNAME/ext/polarssl/include/polarssl
+mkdir -p $DIRNAME/ext/polarssl/library
+cp -a ext/polarssl/library/aes.c ext/polarssl/library/padlock.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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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