Skip to content

Commit 2d3bb03

Browse files
authored
Merge pull request #8776 from mnordhoff/4.3-schema
auth: Add more SQL schema files to packages and tarballs
2 parents feab722 + 9527e8a commit 2d3bb03

21 files changed

+79
-21
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
pdns/bind-dnssec.4.2.0_to_4.3.0_schema.sqlite3.sql
2+
pdns/bind-dnssec.schema.sqlite3.sql
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
modules/gmysqlbackend/3.4.0_to_4.1.0_schema.mysql.sql
2+
modules/gmysqlbackend/4.1.0_to_4.2.0_schema.mysql.sql
3+
modules/gmysqlbackend/4.2.0_to_4.3.0_schema.mysql.sql
14
modules/gmysqlbackend/dnssec-3.x_to_3.4.0_schema.mysql.sql
5+
modules/gmysqlbackend/enable-foreign-keys.mysql.sql
26
modules/gmysqlbackend/nodnssec-3.x_to_3.4.0_schema.mysql.sql
37
modules/gmysqlbackend/schema.mysql.sql
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
modules/godbcbackend/4.0.0_to_4.2.0_schema.mssql.sql
2+
modules/godbcbackend/4.2.0_to_4.3.0_schema.mssql.sql
13
modules/godbcbackend/schema.mssql.sql
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
modules/gpgsqlbackend/3.4.0_to_4.1.0_schema.pgsql.sql
2+
modules/gpgsqlbackend/4.1.0_to_4.2.0_schema.pgsql.sql
3+
modules/gpgsqlbackend/4.2.0_to_4.3.0_schema.pgsql.sql
14
modules/gpgsqlbackend/dnssec-3.x_to_3.4.0_schema.pgsql.sql
25
modules/gpgsqlbackend/nodnssec-3.x_to_3.4.0_schema.pgsql.sql
36
modules/gpgsqlbackend/schema.pgsql.sql
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
modules/gsqlite3backend/3.4.0_to_4.0.0_schema.sqlite3.sql
2+
modules/gsqlite3backend/4.0.0_to_4.2.0_schema.sqlite3.sql
3+
modules/gsqlite3backend/4.2.0_to_4.3.0_schema.sqlite3.sql
14
modules/gsqlite3backend/dnssec-3.x_to_3.4.0_schema.sqlite3.sql
25
modules/gsqlite3backend/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql
36
modules/gsqlite3backend/schema.sqlite3.sql
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
pdns/bind-dnssec.4.2.0_to_4.3.0_schema.sqlite3.sql
2+
pdns/bind-dnssec.schema.sqlite3.sql
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
modules/gmysqlbackend/3.4.0_to_4.1.0_schema.mysql.sql
2+
modules/gmysqlbackend/4.1.0_to_4.2.0_schema.mysql.sql
3+
modules/gmysqlbackend/4.2.0_to_4.3.0_schema.mysql.sql
14
modules/gmysqlbackend/dnssec-3.x_to_3.4.0_schema.mysql.sql
5+
modules/gmysqlbackend/enable-foreign-keys.mysql.sql
26
modules/gmysqlbackend/nodnssec-3.x_to_3.4.0_schema.mysql.sql
37
modules/gmysqlbackend/schema.mysql.sql
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
modules/godbcbackend/4.0.0_to_4.2.0_schema.mssql.sql
2+
modules/godbcbackend/4.2.0_to_4.3.0_schema.mssql.sql
13
modules/godbcbackend/schema.mssql.sql
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
modules/gpgsqlbackend/3.4.0_to_4.1.0_schema.pgsql.sql
2+
modules/gpgsqlbackend/4.1.0_to_4.2.0_schema.pgsql.sql
3+
modules/gpgsqlbackend/4.2.0_to_4.3.0_schema.pgsql.sql
14
modules/gpgsqlbackend/dnssec-3.x_to_3.4.0_schema.pgsql.sql
25
modules/gpgsqlbackend/nodnssec-3.x_to_3.4.0_schema.pgsql.sql
36
modules/gpgsqlbackend/schema.pgsql.sql
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
modules/gsqlite3backend/3.4.0_to_4.0.0_schema.sqlite3.sql
2+
modules/gsqlite3backend/4.0.0_to_4.2.0_schema.sqlite3.sql
3+
modules/gsqlite3backend/4.2.0_to_4.3.0_schema.sqlite3.sql
14
modules/gsqlite3backend/dnssec-3.x_to_3.4.0_schema.sqlite3.sql
25
modules/gsqlite3backend/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql
36
modules/gsqlite3backend/schema.sqlite3.sql
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
pdns/bind-dnssec.4.2.0_to_4.3.0_schema.sqlite3.sql
2+
pdns/bind-dnssec.schema.sqlite3.sql
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
modules/gmysqlbackend/3.4.0_to_4.1.0_schema.mysql.sql
2+
modules/gmysqlbackend/4.1.0_to_4.2.0_schema.mysql.sql
3+
modules/gmysqlbackend/4.2.0_to_4.3.0_schema.mysql.sql
14
modules/gmysqlbackend/dnssec-3.x_to_3.4.0_schema.mysql.sql
5+
modules/gmysqlbackend/enable-foreign-keys.mysql.sql
26
modules/gmysqlbackend/nodnssec-3.x_to_3.4.0_schema.mysql.sql
37
modules/gmysqlbackend/schema.mysql.sql
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
modules/godbcbackend/4.0.0_to_4.2.0_schema.mssql.sql
2+
modules/godbcbackend/4.2.0_to_4.3.0_schema.mssql.sql
13
modules/godbcbackend/schema.mssql.sql
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
modules/gpgsqlbackend/3.4.0_to_4.1.0_schema.pgsql.sql
2+
modules/gpgsqlbackend/4.1.0_to_4.2.0_schema.pgsql.sql
3+
modules/gpgsqlbackend/4.2.0_to_4.3.0_schema.pgsql.sql
14
modules/gpgsqlbackend/dnssec-3.x_to_3.4.0_schema.pgsql.sql
25
modules/gpgsqlbackend/nodnssec-3.x_to_3.4.0_schema.pgsql.sql
36
modules/gpgsqlbackend/schema.pgsql.sql
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
modules/gsqlite3backend/3.4.0_to_4.0.0_schema.sqlite3.sql
2+
modules/gsqlite3backend/4.0.0_to_4.2.0_schema.sqlite3.sql
3+
modules/gsqlite3backend/4.2.0_to_4.3.0_schema.sqlite3.sql
14
modules/gsqlite3backend/dnssec-3.x_to_3.4.0_schema.sqlite3.sql
25
modules/gsqlite3backend/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql
36
modules/gsqlite3backend/schema.sqlite3.sql

builder-support/specs/pdns.spec

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,10 @@ fi
298298
%endif
299299

300300
%files
301-
%doc COPYING README
301+
%doc COPYING
302+
%doc README
303+
%doc pdns/bind-dnssec.4.2.0_to_4.3.0_schema.sqlite3.sql
304+
%doc pdns/bind-dnssec.schema.sqlite3.sql
302305
%{_bindir}/pdns_control
303306
%{_bindir}/pdnsutil
304307
%{_bindir}/zone2sql
@@ -367,12 +370,19 @@ fi
367370
%doc modules/gmysqlbackend/schema.mysql.sql
368371
%doc modules/gmysqlbackend/dnssec-3.x_to_3.4.0_schema.mysql.sql
369372
%doc modules/gmysqlbackend/nodnssec-3.x_to_3.4.0_schema.mysql.sql
373+
%doc modules/gmysqlbackend/3.4.0_to_4.1.0_schema.mysql.sql
374+
%doc modules/gmysqlbackend/4.1.0_to_4.2.0_schema.mysql.sql
375+
%doc modules/gmysqlbackend/4.2.0_to_4.3.0_schema.mysql.sql
376+
%doc modules/gmysqlbackend/enable-foreign-keys.mysql.sql
370377
%{_libdir}/%{name}/libgmysqlbackend.so
371378

372379
%files backend-postgresql
373380
%doc modules/gpgsqlbackend/schema.pgsql.sql
374381
%doc modules/gpgsqlbackend/dnssec-3.x_to_3.4.0_schema.pgsql.sql
375382
%doc modules/gpgsqlbackend/nodnssec-3.x_to_3.4.0_schema.pgsql.sql
383+
%doc modules/gpgsqlbackend/3.4.0_to_4.1.0_schema.pgsql.sql
384+
%doc modules/gpgsqlbackend/4.1.0_to_4.2.0_schema.pgsql.sql
385+
%doc modules/gpgsqlbackend/4.2.0_to_4.3.0_schema.pgsql.sql
376386
%{_libdir}/%{name}/libgpgsqlbackend.so
377387

378388
%files backend-pipe
@@ -394,11 +404,16 @@ fi
394404
%doc modules/gsqlite3backend/schema.sqlite3.sql
395405
%doc modules/gsqlite3backend/dnssec-3.x_to_3.4.0_schema.sqlite3.sql
396406
%doc modules/gsqlite3backend/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql
407+
%doc modules/gsqlite3backend/3.4.0_to_4.0.0_schema.sqlite3.sql
408+
%doc modules/gsqlite3backend/4.0.0_to_4.2.0_schema.sqlite3.sql
409+
%doc modules/gsqlite3backend/4.2.0_to_4.3.0_schema.sqlite3.sql
397410
%{_libdir}/%{name}/libgsqlite3backend.so
398411

399412
%if 0%{?rhel} >= 7
400413
%files backend-odbc
401414
%doc modules/godbcbackend/schema.mssql.sql
415+
%doc modules/godbcbackend/4.0.0_to_4.2.0_schema.mssql.sql
416+
%doc modules/godbcbackend/4.2.0_to_4.3.0_schema.mssql.sql
402417
%{_libdir}/%{name}/libgodbcbackend.so
403418

404419
%files backend-geoip

modules/gmysqlbackend/Makefile.am

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@ pkglib_LTLIBRARIES = libgmysqlbackend.la
44

55
EXTRA_DIST = \
66
OBJECTFILES \
7-
OBJECTLIBS \
8-
dnssec-3.x_to_3.4.0_schema.mysql.sql \
9-
nodnssec-3.x_to_3.4.0_schema.mysql.sql \
10-
schema.mysql.sql
7+
OBJECTLIBS
118

129
dist_doc_DATA = \
1310
dnssec-3.x_to_3.4.0_schema.mysql.sql \
11+
enable-foreign-keys.mysql.sql \
1412
nodnssec-3.x_to_3.4.0_schema.mysql.sql \
1513
3.4.0_to_4.1.0_schema.mysql.sql \
1614
4.1.0_to_4.2.0_schema.mysql.sql \
15+
4.2.0_to_4.3.0_schema.mysql.sql \
1716
schema.mysql.sql
1817

1918
libgmysqlbackend_la_SOURCES = \

modules/godbcbackend/Makefile.am

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
AM_CPPFLAGS += $(UNIXODBC_CFLAGS)
22
pkglib_LTLIBRARIES = libgodbcbackend.la
33

4-
EXTRA_DIST=OBJECTFILES OBJECTLIBS
4+
EXTRA_DIST = \
5+
OBJECTFILES \
6+
OBJECTLIBS
57

6-
dist_doc_DATA=schema.mssql.sql \
7-
4.0.0_to_4.2.0_schema.mssql.sql
8+
dist_doc_DATA = \
9+
schema.mssql.sql \
10+
4.0.0_to_4.2.0_schema.mssql.sql \
11+
4.2.0_to_4.3.0_schema.mssql.sql
812

9-
libgodbcbackend_la_SOURCES=godbcbackend.cc godbcbackend.hh \
10-
sodbc.hh sodbc.cc
13+
libgodbcbackend_la_SOURCES = \
14+
godbcbackend.cc godbcbackend.hh \
15+
sodbc.cc sodbc.hh
1116

12-
libgodbcbackend_la_LDFLAGS=-module -avoid-version
13-
libgodbcbackend_la_LIBADD=$(UNIXODBC_LIBS)
17+
libgodbcbackend_la_LDFLAGS = -module -avoid-version
18+
libgodbcbackend_la_LIBADD = $(UNIXODBC_LIBS)

modules/gpgsqlbackend/Makefile.am

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@ pkglib_LTLIBRARIES = libgpgsqlbackend.la
33

44
EXTRA_DIST = \
55
OBJECTFILES \
6-
OBJECTLIBS \
7-
dnssec-3.x_to_3.4.0_schema.pgsql.sql \
8-
nodnssec-3.x_to_3.4.0_schema.pgsql.sql \
9-
schema.pgsql.sql
6+
OBJECTLIBS
107

118
dist_doc_DATA = \
129
schema.pgsql.sql \
1310
nodnssec-3.x_to_3.4.0_schema.pgsql.sql \
1411
dnssec-3.x_to_3.4.0_schema.pgsql.sql \
1512
3.4.0_to_4.1.0_schema.pgsql.sql \
16-
4.1.0_to_4.2.0_schema.pgsql.sql
13+
4.1.0_to_4.2.0_schema.pgsql.sql \
14+
4.2.0_to_4.3.0_schema.pgsql.sql
1715

1816
libgpgsqlbackend_la_SOURCES = \
1917
gpgsqlbackend.cc gpgsqlbackend.hh \

modules/gsqlite3backend/Makefile.am

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@ pkglib_LTLIBRARIES = libgsqlite3backend.la
22

33
EXTRA_DIST = \
44
OBJECTFILES \
5-
OBJECTLIBS \
6-
dnssec-3.x_to_3.4.0_schema.sqlite3.sql \
7-
nodnssec-3.x_to_3.4.0_schema.sqlite3.sql \
8-
schema.sqlite3.sql
5+
OBJECTLIBS
96

107
dist_doc_DATA = \
118
dnssec-3.x_to_3.4.0_schema.sqlite3.sql \
129
nodnssec-3.x_to_3.4.0_schema.sqlite3.sql \
1310
3.4.0_to_4.0.0_schema.sqlite3.sql \
1411
4.0.0_to_4.2.0_schema.sqlite3.sql \
12+
4.2.0_to_4.3.0_schema.sqlite3.sql \
1513
schema.sqlite3.sql
1614

1715
libgsqlite3backend_la_SOURCES = gsqlite3backend.cc gsqlite3backend.hh

pdns/Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ EXTRA_DIST = \
4747
effective_tld_names.dat \
4848
mtasker.cc \
4949
inflighter.cc \
50+
bind-dnssec.4.2.0_to_4.3.0_schema.sqlite3.sql \
5051
bind-dnssec.schema.sqlite3.sql \
5152
bindparser.h \
5253
named.conf.parsertest \

0 commit comments

Comments
 (0)