auth: List the 3.4.0+ SQL schema files wherever the older files are.

And clean up godbcbackend's Makefile.am.

diff --git a/builder-support/debian/authoritative/debian-buster/pdns-backend-mysql.docs b/builder-support/debian/authoritative/debian-buster/pdns-backend-mysql.docs
index 2b504466a494f8829b2ab78f4448a9cfe458d553..61b858e9fac13134cfb27b342690c7d254a8a804 100644 (file)
--- a/builder-support/debian/authoritative/debian-buster/pdns-backend-mysql.docs
+++ b/builder-support/debian/authoritative/debian-buster/pdns-backend-mysql.docs
@@ -1,3 +1,6 @@
+modules/gmysqlbackend/3.4.0_to_4.1.0_schema.mysql.sql
+modules/gmysqlbackend/4.1.0_to_4.2.0_schema.mysql.sql
+modules/gmysqlbackend/4.2.0_to_4.3.0_schema.mysql.sql
 modules/gmysqlbackend/dnssec-3.x_to_3.4.0_schema.mysql.sql
 modules/gmysqlbackend/enable-foreign-keys.mysql.sql
 modules/gmysqlbackend/nodnssec-3.x_to_3.4.0_schema.mysql.sql

diff --git a/builder-support/debian/authoritative/debian-buster/pdns-backend-odbc.docs b/builder-support/debian/authoritative/debian-buster/pdns-backend-odbc.docs
index 76cc1e02c8ca76f8d76e30a24b2650cca420dd37..f5df0396078db8ff7835929c5c2e169872abf719 100644 (file)
--- a/builder-support/debian/authoritative/debian-buster/pdns-backend-odbc.docs
+++ b/builder-support/debian/authoritative/debian-buster/pdns-backend-odbc.docs
@@ -1 +1,3 @@
+modules/godbcbackend/4.0.0_to_4.2.0_schema.mssql.sql
+modules/godbcbackend/4.2.0_to_4.3.0_schema.mssql.sql
 modules/godbcbackend/schema.mssql.sql

diff --git a/builder-support/debian/authoritative/debian-buster/pdns-backend-pgsql.docs b/builder-support/debian/authoritative/debian-buster/pdns-backend-pgsql.docs
index 3b420cd6ac044e2d048872ad848471571a8b2ef6..9fdb2fecc504e882167c1ad17f648e43ab8aee0b 100644 (file)
--- a/builder-support/debian/authoritative/debian-buster/pdns-backend-pgsql.docs
+++ b/builder-support/debian/authoritative/debian-buster/pdns-backend-pgsql.docs
@@ -1,3 +1,6 @@
+modules/gpgsqlbackend/3.4.0_to_4.1.0_schema.pgsql.sql
+modules/gpgsqlbackend/4.1.0_to_4.2.0_schema.pgsql.sql
+modules/gpgsqlbackend/4.2.0_to_4.3.0_schema.pgsql.sql
 modules/gpgsqlbackend/dnssec-3.x_to_3.4.0_schema.pgsql.sql
 modules/gpgsqlbackend/nodnssec-3.x_to_3.4.0_schema.pgsql.sql
 modules/gpgsqlbackend/schema.pgsql.sql

diff --git a/builder-support/debian/authoritative/debian-buster/pdns-backend-sqlite3.docs b/builder-support/debian/authoritative/debian-buster/pdns-backend-sqlite3.docs
index 7dbfd921f573843e7e41e7b153900dfcec77e3ea..cc1d83f9de747df172cb303b637a05e9a45e1228 100644 (file)
--- a/builder-support/debian/authoritative/debian-buster/pdns-backend-sqlite3.docs
+++ b/builder-support/debian/authoritative/debian-buster/pdns-backend-sqlite3.docs
@@ -1,3 +1,6 @@
+modules/gsqlite3backend/3.4.0_to_4.0.0_schema.sqlite3.sql
+modules/gsqlite3backend/4.0.0_to_4.2.0_schema.sqlite3.sql
+modules/gsqlite3backend/4.2.0_to_4.3.0_schema.sqlite3.sql
 modules/gsqlite3backend/dnssec-3.x_to_3.4.0_schema.sqlite3.sql
 modules/gsqlite3backend/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql
 modules/gsqlite3backend/schema.sqlite3.sql

diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-backend-mysql.docs b/builder-support/debian/authoritative/debian-jessie/pdns-backend-mysql.docs
index 2b504466a494f8829b2ab78f4448a9cfe458d553..61b858e9fac13134cfb27b342690c7d254a8a804 100644 (file)
--- a/builder-support/debian/authoritative/debian-jessie/pdns-backend-mysql.docs
+++ b/builder-support/debian/authoritative/debian-jessie/pdns-backend-mysql.docs
@@ -1,3 +1,6 @@
+modules/gmysqlbackend/3.4.0_to_4.1.0_schema.mysql.sql
+modules/gmysqlbackend/4.1.0_to_4.2.0_schema.mysql.sql
+modules/gmysqlbackend/4.2.0_to_4.3.0_schema.mysql.sql
 modules/gmysqlbackend/dnssec-3.x_to_3.4.0_schema.mysql.sql
 modules/gmysqlbackend/enable-foreign-keys.mysql.sql
 modules/gmysqlbackend/nodnssec-3.x_to_3.4.0_schema.mysql.sql

diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-backend-odbc.docs b/builder-support/debian/authoritative/debian-jessie/pdns-backend-odbc.docs
index 76cc1e02c8ca76f8d76e30a24b2650cca420dd37..f5df0396078db8ff7835929c5c2e169872abf719 100644 (file)
--- a/builder-support/debian/authoritative/debian-jessie/pdns-backend-odbc.docs
+++ b/builder-support/debian/authoritative/debian-jessie/pdns-backend-odbc.docs
@@ -1 +1,3 @@
+modules/godbcbackend/4.0.0_to_4.2.0_schema.mssql.sql
+modules/godbcbackend/4.2.0_to_4.3.0_schema.mssql.sql
 modules/godbcbackend/schema.mssql.sql

diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-backend-pgsql.docs b/builder-support/debian/authoritative/debian-jessie/pdns-backend-pgsql.docs
index 3b420cd6ac044e2d048872ad848471571a8b2ef6..9fdb2fecc504e882167c1ad17f648e43ab8aee0b 100644 (file)
--- a/builder-support/debian/authoritative/debian-jessie/pdns-backend-pgsql.docs
+++ b/builder-support/debian/authoritative/debian-jessie/pdns-backend-pgsql.docs
@@ -1,3 +1,6 @@
+modules/gpgsqlbackend/3.4.0_to_4.1.0_schema.pgsql.sql
+modules/gpgsqlbackend/4.1.0_to_4.2.0_schema.pgsql.sql
+modules/gpgsqlbackend/4.2.0_to_4.3.0_schema.pgsql.sql
 modules/gpgsqlbackend/dnssec-3.x_to_3.4.0_schema.pgsql.sql
 modules/gpgsqlbackend/nodnssec-3.x_to_3.4.0_schema.pgsql.sql
 modules/gpgsqlbackend/schema.pgsql.sql

diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-backend-sqlite3.docs b/builder-support/debian/authoritative/debian-jessie/pdns-backend-sqlite3.docs
index 7dbfd921f573843e7e41e7b153900dfcec77e3ea..cc1d83f9de747df172cb303b637a05e9a45e1228 100644 (file)
--- a/builder-support/debian/authoritative/debian-jessie/pdns-backend-sqlite3.docs
+++ b/builder-support/debian/authoritative/debian-jessie/pdns-backend-sqlite3.docs
@@ -1,3 +1,6 @@
+modules/gsqlite3backend/3.4.0_to_4.0.0_schema.sqlite3.sql
+modules/gsqlite3backend/4.0.0_to_4.2.0_schema.sqlite3.sql
+modules/gsqlite3backend/4.2.0_to_4.3.0_schema.sqlite3.sql
 modules/gsqlite3backend/dnssec-3.x_to_3.4.0_schema.sqlite3.sql
 modules/gsqlite3backend/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql
 modules/gsqlite3backend/schema.sqlite3.sql

diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-backend-mysql.docs b/builder-support/debian/authoritative/debian-stretch/pdns-backend-mysql.docs
index 2b504466a494f8829b2ab78f4448a9cfe458d553..61b858e9fac13134cfb27b342690c7d254a8a804 100644 (file)
--- a/builder-support/debian/authoritative/debian-stretch/pdns-backend-mysql.docs
+++ b/builder-support/debian/authoritative/debian-stretch/pdns-backend-mysql.docs
@@ -1,3 +1,6 @@
+modules/gmysqlbackend/3.4.0_to_4.1.0_schema.mysql.sql
+modules/gmysqlbackend/4.1.0_to_4.2.0_schema.mysql.sql
+modules/gmysqlbackend/4.2.0_to_4.3.0_schema.mysql.sql
 modules/gmysqlbackend/dnssec-3.x_to_3.4.0_schema.mysql.sql
 modules/gmysqlbackend/enable-foreign-keys.mysql.sql
 modules/gmysqlbackend/nodnssec-3.x_to_3.4.0_schema.mysql.sql

diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-backend-odbc.docs b/builder-support/debian/authoritative/debian-stretch/pdns-backend-odbc.docs
index 76cc1e02c8ca76f8d76e30a24b2650cca420dd37..f5df0396078db8ff7835929c5c2e169872abf719 100644 (file)
--- a/builder-support/debian/authoritative/debian-stretch/pdns-backend-odbc.docs
+++ b/builder-support/debian/authoritative/debian-stretch/pdns-backend-odbc.docs
@@ -1 +1,3 @@
+modules/godbcbackend/4.0.0_to_4.2.0_schema.mssql.sql
+modules/godbcbackend/4.2.0_to_4.3.0_schema.mssql.sql
 modules/godbcbackend/schema.mssql.sql

diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-backend-pgsql.docs b/builder-support/debian/authoritative/debian-stretch/pdns-backend-pgsql.docs
index 3b420cd6ac044e2d048872ad848471571a8b2ef6..9fdb2fecc504e882167c1ad17f648e43ab8aee0b 100644 (file)
--- a/builder-support/debian/authoritative/debian-stretch/pdns-backend-pgsql.docs
+++ b/builder-support/debian/authoritative/debian-stretch/pdns-backend-pgsql.docs
@@ -1,3 +1,6 @@
+modules/gpgsqlbackend/3.4.0_to_4.1.0_schema.pgsql.sql
+modules/gpgsqlbackend/4.1.0_to_4.2.0_schema.pgsql.sql
+modules/gpgsqlbackend/4.2.0_to_4.3.0_schema.pgsql.sql
 modules/gpgsqlbackend/dnssec-3.x_to_3.4.0_schema.pgsql.sql
 modules/gpgsqlbackend/nodnssec-3.x_to_3.4.0_schema.pgsql.sql
 modules/gpgsqlbackend/schema.pgsql.sql

diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-backend-sqlite3.docs b/builder-support/debian/authoritative/debian-stretch/pdns-backend-sqlite3.docs
index 7dbfd921f573843e7e41e7b153900dfcec77e3ea..cc1d83f9de747df172cb303b637a05e9a45e1228 100644 (file)
--- a/builder-support/debian/authoritative/debian-stretch/pdns-backend-sqlite3.docs
+++ b/builder-support/debian/authoritative/debian-stretch/pdns-backend-sqlite3.docs
@@ -1,3 +1,6 @@
+modules/gsqlite3backend/3.4.0_to_4.0.0_schema.sqlite3.sql
+modules/gsqlite3backend/4.0.0_to_4.2.0_schema.sqlite3.sql
+modules/gsqlite3backend/4.2.0_to_4.3.0_schema.sqlite3.sql
 modules/gsqlite3backend/dnssec-3.x_to_3.4.0_schema.sqlite3.sql
 modules/gsqlite3backend/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql
 modules/gsqlite3backend/schema.sqlite3.sql

diff --git a/builder-support/specs/pdns.spec b/builder-support/specs/pdns.spec
index 786d57d4edabbef3c0388116c1c0f2d518749d71..ceae213ffde0c19e2a2f80c0596b342992d92eb3 100644 (file)
--- a/builder-support/specs/pdns.spec
+++ b/builder-support/specs/pdns.spec
@@ -367,6 +367,9 @@ fi
 %doc modules/gmysqlbackend/schema.mysql.sql
 %doc modules/gmysqlbackend/dnssec-3.x_to_3.4.0_schema.mysql.sql
 %doc modules/gmysqlbackend/nodnssec-3.x_to_3.4.0_schema.mysql.sql
+%doc modules/gmysqlbackend/3.4.0_to_4.1.0_schema.mysql.sql
+%doc modules/gmysqlbackend/4.1.0_to_4.2.0_schema.mysql.sql
+%doc modules/gmysqlbackend/4.2.0_to_4.3.0_schema.mysql.sql
 %doc modules/gmysqlbackend/enable-foreign-keys.mysql.sql
 %{_libdir}/%{name}/libgmysqlbackend.so
 
@@ -374,6 +377,9 @@ fi
 %doc modules/gpgsqlbackend/schema.pgsql.sql
 %doc modules/gpgsqlbackend/dnssec-3.x_to_3.4.0_schema.pgsql.sql
 %doc modules/gpgsqlbackend/nodnssec-3.x_to_3.4.0_schema.pgsql.sql
+%doc modules/gpgsqlbackend/3.4.0_to_4.1.0_schema.pgsql.sql
+%doc modules/gpgsqlbackend/4.1.0_to_4.2.0_schema.pgsql.sql
+%doc modules/gpgsqlbackend/4.2.0_to_4.3.0_schema.pgsql.sql
 %{_libdir}/%{name}/libgpgsqlbackend.so
 
 %files backend-pipe
@@ -395,11 +401,16 @@ fi
 %doc modules/gsqlite3backend/schema.sqlite3.sql
 %doc modules/gsqlite3backend/dnssec-3.x_to_3.4.0_schema.sqlite3.sql
 %doc modules/gsqlite3backend/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql
+%doc modules/gsqlite3backend/3.4.0_to_4.0.0_schema.sqlite3.sql
+%doc modules/gsqlite3backend/4.0.0_to_4.2.0_schema.sqlite3.sql
+%doc modules/gsqlite3backend/4.2.0_to_4.3.0_schema.sqlite3.sql
 %{_libdir}/%{name}/libgsqlite3backend.so
 
 %if 0%{?rhel} >= 7
 %files backend-odbc
 %doc modules/godbcbackend/schema.mssql.sql
+%doc modules/godbcbackend/4.0.0_to_4.2.0_schema.mssql.sql
+%doc modules/godbcbackend/4.2.0_to_4.3.0_schema.mssql.sql
 %{_libdir}/%{name}/libgodbcbackend.so
 
 %files backend-geoip

diff --git a/modules/gmysqlbackend/Makefile.am b/modules/gmysqlbackend/Makefile.am
index 1bd99a1f8fb253f230ed84be788148338e9f1876..1845a453d4ddf20c807ea70d1cd84ba3e948f40c 100644 (file)
--- a/modules/gmysqlbackend/Makefile.am
+++ b/modules/gmysqlbackend/Makefile.am
@@ -8,6 +8,9 @@ EXTRA_DIST = \
        dnssec-3.x_to_3.4.0_schema.mysql.sql \
        enable-foreign-keys.mysql.sql \
        nodnssec-3.x_to_3.4.0_schema.mysql.sql \
+       3.4.0_to_4.1.0_schema.mysql.sql \
+       4.1.0_to_4.2.0_schema.mysql.sql \
+       4.2.0_to_4.3.0_schema.mysql.sql \
        schema.mysql.sql
 
 dist_doc_DATA = \

diff --git a/modules/godbcbackend/Makefile.am b/modules/godbcbackend/Makefile.am
index b540972b5fd8e179af3ef0a8ac93c5bd28e65d41..e070cb1053f8565ef42f83cb82f767b6151c75e4 100644 (file)
--- a/modules/godbcbackend/Makefile.am
+++ b/modules/godbcbackend/Makefile.am
@@ -1,14 +1,21 @@
 AM_CPPFLAGS += $(UNIXODBC_CFLAGS)
 pkglib_LTLIBRARIES = libgodbcbackend.la
 
-EXTRA_DIST=OBJECTFILES OBJECTLIBS
+EXTRA_DIST = \
+       OBJECTFILES \
+       OBJECTLIBS \
+       schema.mssql.sql \
+       4.0.0_to_4.2.0_schema.mssql.sql \
+       4.2.0_to_4.3.0_schema.mssql.sql
 
-dist_doc_DATA=schema.mssql.sql \
+dist_doc_DATA = \
+       schema.mssql.sql \
        4.0.0_to_4.2.0_schema.mssql.sql \
        4.2.0_to_4.3.0_schema.mssql.sql
 
-libgodbcbackend_la_SOURCES=godbcbackend.cc godbcbackend.hh \
-                sodbc.hh sodbc.cc
+libgodbcbackend_la_SOURCES = \
+       godbcbackend.cc godbcbackend.hh \
+       sodbc.cc sodbc.hh
 
-libgodbcbackend_la_LDFLAGS=-module -avoid-version
-libgodbcbackend_la_LIBADD=$(UNIXODBC_LIBS)
+libgodbcbackend_la_LDFLAGS = -module -avoid-version
+libgodbcbackend_la_LIBADD = $(UNIXODBC_LIBS)

diff --git a/modules/gpgsqlbackend/Makefile.am b/modules/gpgsqlbackend/Makefile.am
index 405a57bed8ab776481ce70bd0ccfc0043580e439..73054771024573f1278d6971e63859e978fbebcb 100644 (file)
--- a/modules/gpgsqlbackend/Makefile.am
+++ b/modules/gpgsqlbackend/Makefile.am
@@ -4,6 +4,9 @@ pkglib_LTLIBRARIES = libgpgsqlbackend.la
 EXTRA_DIST = \
        OBJECTFILES \
        OBJECTLIBS \
+       3.4.0_to_4.1.0_schema.pgsql.sql \
+       4.1.0_to_4.2.0_schema.pgsql.sql \
+       4.2.0_to_4.3.0_schema.pgsql.sql \
        dnssec-3.x_to_3.4.0_schema.pgsql.sql \
        nodnssec-3.x_to_3.4.0_schema.pgsql.sql \
        schema.pgsql.sql

diff --git a/modules/gsqlite3backend/Makefile.am b/modules/gsqlite3backend/Makefile.am
index 68244271ecd9ebf31d9b8c72ec47ead0d4d5c4b5..317dc9e7b888284dded39417bd9c07b715ca4b99 100644 (file)
--- a/modules/gsqlite3backend/Makefile.am
+++ b/modules/gsqlite3backend/Makefile.am
@@ -5,6 +5,9 @@ EXTRA_DIST = \
        OBJECTLIBS \
        dnssec-3.x_to_3.4.0_schema.sqlite3.sql \
        nodnssec-3.x_to_3.4.0_schema.sqlite3.sql \
+       3.4.0_to_4.0.0_schema.sqlite3.sql \
+       4.0.0_to_4.2.0_schema.sqlite3.sql \
+       4.2.0_to_4.3.0_schema.sqlite3.sql \
        schema.sqlite3.sql
 
 dist_doc_DATA = \