From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 14 Aug 2019 13:57:39 +0000 (+0200)
Subject: Move lmdb-safe files to ext/lmdb-safe/
X-Git-Tag: dnsdist-1.4.0-rc2~9^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae27ae09bfd3b015878579937eaec87f5d3ac7ae;p=pdns

Move lmdb-safe files to ext/lmdb-safe/
---

diff --git a/ext/lmdb-safe/.gitignore b/ext/lmdb-safe/.gitignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/ext/lmdb-safe/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/ext/lmdb-safe/LICENSE b/ext/lmdb-safe/LICENSE
new file mode 100644
index 000000000..47216d4a4
--- /dev/null
+++ b/ext/lmdb-safe/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 bert hubert
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/ext/lmdb-safe/Makefile.am b/ext/lmdb-safe/Makefile.am
new file mode 100644
index 000000000..452f220d8
--- /dev/null
+++ b/ext/lmdb-safe/Makefile.am
@@ -0,0 +1,8 @@
+EXTRA_DIST = \
+        LICENSE
+
+noinst_LTLIBRARIES = liblmdb-safe.la
+
+liblmdb-safe_la_SOURCES = \
+        lmdb-safe.cc lmdb-safe.hh \
+        lmdb-typed.cc lmdb-typed.hh
diff --git a/pdns/lmdb-safe.cc b/ext/lmdb-safe/lmdb-safe.cc
similarity index 100%
rename from pdns/lmdb-safe.cc
rename to ext/lmdb-safe/lmdb-safe.cc
diff --git a/pdns/lmdb-safe.hh b/ext/lmdb-safe/lmdb-safe.hh
similarity index 100%
rename from pdns/lmdb-safe.hh
rename to ext/lmdb-safe/lmdb-safe.hh
diff --git a/modules/lmdbbackend/lmdb-typed.cc b/ext/lmdb-safe/lmdb-typed.cc
similarity index 100%
rename from modules/lmdbbackend/lmdb-typed.cc
rename to ext/lmdb-safe/lmdb-typed.cc
diff --git a/modules/lmdbbackend/lmdb-typed.hh b/ext/lmdb-safe/lmdb-typed.hh
similarity index 99%
rename from modules/lmdbbackend/lmdb-typed.hh
rename to ext/lmdb-safe/lmdb-typed.hh
index d9d6f17fb..e6da3dd7d 100644
--- a/modules/lmdbbackend/lmdb-typed.hh
+++ b/ext/lmdb-safe/lmdb-typed.hh
@@ -1,6 +1,6 @@
 #pragma once
 #include <iostream>
-#include "pdns/lmdb-safe.hh"
+#include "lmdb-safe.hh"
 #include <boost/archive/binary_oarchive.hpp>
 #include <boost/archive/binary_iarchive.hpp>
 #include <boost/serialization/vector.hpp>
diff --git a/modules/lmdbbackend/Makefile.am b/modules/lmdbbackend/Makefile.am
index 0ad0eb2cf..b234c2a63 100644
--- a/modules/lmdbbackend/Makefile.am
+++ b/modules/lmdbbackend/Makefile.am
@@ -4,7 +4,8 @@ pkglib_LTLIBRARIES = liblmdbbackend.la
 
 EXTRA_DIST = OBJECTFILES OBJECTLIBS
 
-liblmdbbackend_la_SOURCES = lmdbbackend.cc lmdbbackend.hh lmdb-typed.hh lmdb-typed.cc \
-	../../pdns/lmdb-safe.hh ../../pdns/lmdb-safe.cc
+liblmdbbackend_la_SOURCES = lmdbbackend.cc lmdbbackend.hh \
+	../../ext/lmdb-safe/lmdb-typed.hh ../../ext/lmdb-safe/lmdb-typed.cc \
+	../../ext/lmdb-safe/lmdb-safe.hh ../../ext/lmdb-safe/lmdb-safe.cc
 liblmdbbackend_la_LDFLAGS = -module -avoid-version
 liblmdbbackend_la_LIBADD = $(LMDB_LIBS) $(BOOST_SERIALIZATION_LIBS)
diff --git a/modules/lmdbbackend/OBJECTFILES b/modules/lmdbbackend/OBJECTFILES
index cb9c8d7b9..892bbe5bf 100644
--- a/modules/lmdbbackend/OBJECTFILES
+++ b/modules/lmdbbackend/OBJECTFILES
@@ -1 +1 @@
-lmdbbackend.lo lmdb-typed.lo ../../pdns/lmdb-safe.lo
+lmdbbackend.lo ../../ext/lmdb-safe/lmdb-typed.lo ../../ext/lmdb-safe/lmdb-safe.lo
diff --git a/modules/lmdbbackend/lmdbbackend.hh b/modules/lmdbbackend/lmdbbackend.hh
index fa51d0d83..19604b6ef 100644
--- a/modules/lmdbbackend/lmdbbackend.hh
+++ b/modules/lmdbbackend/lmdbbackend.hh
@@ -1,6 +1,6 @@
 #pragma once
 #include "pdns/dnsbackend.hh"
-#include "lmdb-typed.hh"
+#include "ext/lmdb-safe/lmdb-typed.hh"
 
 template<class T, typename std::enable_if<std::is_same<T, DNSName>::value,T>::type* = nullptr>
 std::string keyConv(const T& t)
diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index 7ea3678d0..1cbe7598a 100644
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -277,8 +277,8 @@ endif
 if HAVE_LMDB
 dnsdist_LDADD += $(LMDB_LDFLAGS) $(LMDB_LIBS)
 testrunner_LDADD += $(LMDB_LDFLAGS) $(LMDB_LIBS)
-dnsdist_SOURCES += lmdb-safe.cc lmdb-safe.hh
-testrunner_SOURCES += lmdb-safe.cc lmdb-safe.hh
+dnsdist_SOURCES += ext/lmdb-safe/lmdb-safe.cc ext/lmdb-safe/lmdb-safe.hh
+testrunner_SOURCES += ext/lmdb-safe/lmdb-safe.cc ext/lmdb-safe/lmdb-safe.hh
 endif
 
 if HAVE_DNS_OVER_TLS
diff --git a/pdns/dnsdistdist/dnsdist-kvs.hh b/pdns/dnsdistdist/dnsdist-kvs.hh
index c9cd7fc2a..14f0dad1d 100644
--- a/pdns/dnsdistdist/dnsdist-kvs.hh
+++ b/pdns/dnsdistdist/dnsdist-kvs.hh
@@ -153,7 +153,7 @@ public:
 
 #ifdef HAVE_LMDB
 
-#include "lmdb-safe.hh"
+#include "ext/lmdb-safe/lmdb-safe.hh"
 
 class LMDBKVStore: public KeyValueStore
 {
diff --git a/pdns/dnsdistdist/ext/lmdb-safe/LICENSE b/pdns/dnsdistdist/ext/lmdb-safe/LICENSE
new file mode 120000
index 000000000..4853cdd57
--- /dev/null
+++ b/pdns/dnsdistdist/ext/lmdb-safe/LICENSE
@@ -0,0 +1 @@
+../../../../ext/lmdb-safe/LICENSE
\ No newline at end of file
diff --git a/pdns/dnsdistdist/ext/lmdb-safe/Makefile.am b/pdns/dnsdistdist/ext/lmdb-safe/Makefile.am
new file mode 120000
index 000000000..4a6648983
--- /dev/null
+++ b/pdns/dnsdistdist/ext/lmdb-safe/Makefile.am
@@ -0,0 +1 @@
+../../../../ext/lmdb-safe/Makefile.am
\ No newline at end of file
diff --git a/pdns/dnsdistdist/ext/lmdb-safe/lmdb-safe.cc b/pdns/dnsdistdist/ext/lmdb-safe/lmdb-safe.cc
new file mode 120000
index 000000000..e37c98c3c
--- /dev/null
+++ b/pdns/dnsdistdist/ext/lmdb-safe/lmdb-safe.cc
@@ -0,0 +1 @@
+../../../../ext/lmdb-safe/lmdb-safe.cc
\ No newline at end of file
diff --git a/pdns/dnsdistdist/ext/lmdb-safe/lmdb-safe.hh b/pdns/dnsdistdist/ext/lmdb-safe/lmdb-safe.hh
new file mode 120000
index 000000000..b805748ae
--- /dev/null
+++ b/pdns/dnsdistdist/ext/lmdb-safe/lmdb-safe.hh
@@ -0,0 +1 @@
+../../../../ext/lmdb-safe/lmdb-safe.hh
\ No newline at end of file
diff --git a/pdns/dnsdistdist/lmdb-safe.cc b/pdns/dnsdistdist/lmdb-safe.cc
deleted file mode 120000
index bdc1219c1..000000000
--- a/pdns/dnsdistdist/lmdb-safe.cc
+++ /dev/null
@@ -1 +0,0 @@
-../lmdb-safe.cc
\ No newline at end of file
diff --git a/pdns/dnsdistdist/lmdb-safe.hh b/pdns/dnsdistdist/lmdb-safe.hh
deleted file mode 120000
index 4e3d388f5..000000000
--- a/pdns/dnsdistdist/lmdb-safe.hh
+++ /dev/null
@@ -1 +0,0 @@
-../lmdb-safe.hh
\ No newline at end of file