Merge pull request #667 from matsduf/merge-develop-into-master

Merge develop into master (zonemaster-backend)

.travis.yml

@@ -1,21 +1,29 @@
-services: 
-  - mysql
-  - postgresql
-
-env:
-    - TARGET=MySQL ZONEMASTER_RECORD=0 ZONEMASTER_BACKEND_CONFIG_FILE=./share/travis_mysql_backend_config.ini
-    - TARGET=PostgreSQL ZONEMASTER_RECORD=0 ZONEMASTER_BACKEND_CONFIG_FILE=./share/travis_postgresql_backend_config.ini
-    - TARGET=SQLite ZONEMASTER_RECORD=0 ZONEMASTER_BACKEND_CONFIG_FILE=./share/travis_sqlite_backend_config.ini
-
 language: perl
 
-perl:
-    - "5.30"
-    - "5.28"
-    - "5.26"
-    - "5.24"
-    - "5.22"
-      # Perl 5.16 is temporarily excluded because Travis fails
+jobs:
+  include:
+  # Cover MySQL and PostgreSQL with the latest supported Perl version
+  - perl: "5.32"
+    env: TARGET=MySQL ZONEMASTER_RECORD=0 ZONEMASTER_BACKEND_CONFIG_FILE=./share/travis_mysql_backend_config.ini
+    services: mysql
+  - perl: "5.32"
+    env: TARGET=PostgreSQL ZONEMASTER_RECORD=0 ZONEMASTER_BACKEND_CONFIG_FILE=./share/travis_postgresql_backend_config.ini
+    services: postgresql
+  # Cover all Perl versions with SQLite
+  - perl: "5.32"
+    env: TARGET=SQLite ZONEMASTER_RECORD=0 ZONEMASTER_BACKEND_CONFIG_FILE=./share/travis_sqlite_backend_config.ini
+  - perl: "5.30"
+    env: TARGET=SQLite ZONEMASTER_RECORD=0 ZONEMASTER_BACKEND_CONFIG_FILE=./share/travis_sqlite_backend_config.ini
+  - perl: "5.28"
+    env: TARGET=SQLite ZONEMASTER_RECORD=0 ZONEMASTER_BACKEND_CONFIG_FILE=./share/travis_sqlite_backend_config.ini
+  - perl: "5.26"
+    env: TARGET=SQLite ZONEMASTER_RECORD=0 ZONEMASTER_BACKEND_CONFIG_FILE=./share/travis_sqlite_backend_config.ini
+  - perl: "5.24"
+    env: TARGET=SQLite ZONEMASTER_RECORD=0 ZONEMASTER_BACKEND_CONFIG_FILE=./share/travis_sqlite_backend_config.ini
+  - perl: "5.22"
+    env: TARGET=SQLite ZONEMASTER_RECORD=0 ZONEMASTER_BACKEND_CONFIG_FILE=./share/travis_sqlite_backend_config.ini
+  - perl: "5.16"
+    env: TARGET=SQLite ZONEMASTER_RECORD=0 ZONEMASTER_BACKEND_CONFIG_FILE=./share/travis_sqlite_backend_config.ini
 
 addons:
   apt:
@@ -67,6 +75,7 @@ addons:
     - librole-tiny-perl
     - librouter-simple-perl
     - libstring-shellquote-perl
+    - libtry-tiny-perl
     - starman
 
 before_install:

Changes

@@ -1,5 +1,39 @@
 Release history for Zonemaster component Zonemaster-Backend
 
+v6.0.1 2020-11-09 (public release version)
+ [Fixes]
+ - Fixed a version specification error in Makefile.PL.
+
+
+v6.0.0 2020-11-06 (public release version)
+
+ [Breaking changes]
+ - Updated language tag format in the RPCAPI (#629)
+   - Restricted language tag.
+   - Language tag is set in backend.ini.
+   - New languages can be added without code change.
+   - RPCAPI can report supported language tags.
+
+ [Features]
+ - New tools for command line test (#662, #658, #652, #632,
+   #628, #626, #536, #534)
+ - Improved log handling in RPCAPI (#653, #656, #650, #840)
+ - Improved log handling in testagent (#644, #612)
+
+ [Fixes]
+ - Updated installation instructions (#665, #663, #660, #658,
+   #633, #638, #449, #620)
+ - Corrected MANIFEST (#657)
+ - Improved error handling handling RPCAPI daemon (#545, #213)
+ - Garbage collection testing documentation (#567, #578)
+ - Corrected API documentation (#647, #648)
+ - Updates and corrections in Translator (#655, #649, #631)
+ - Add Norwegian in documentation and configuration (#643)
+ - Clean-up (#642, #598, #597, #639, #638, #641, #193)
+ - Fix warning in test agent (#635, #630, #625, #607)
+ - Fix warning in RPCAPI (#636, #624, #634)
+
+
 v5.0.2 2020-05-22
 
  [Fixes]

MANIFEST

@@ -8,10 +8,10 @@ CodeSnippets/sample_api_call__validate_syntax.pl
 CodeSnippets/sample_api_call__version_info.pl
 docs/API.md
 docs/Architecture.md
+docs/Configuration.md
 docs/files-description.md
 docs/GettingStarted.md
 docs/Installation.md
-docs/Configuration.md
 docs/TypographicConventions.md
 docs/upgrade_db_zonemaster_backend_ver_1.0.3.md
 docs/upgrade_db_zonemaster_backend_ver_1.1.0.md
@@ -46,14 +46,12 @@ README.md
 script/add-test.pl
 script/create_db_mysql.pl
 script/create_db_postgresql_9.3.pl
-script/crontab_job_runner/execute_tests.pl
-script/crontab_job_runner/execute_zonemaster_P10.pl
-script/crontab_job_runner/execute_zonemaster_P5.pl
 script/zonemaster_backend_rpcapi.psgi
 script/zonemaster_backend_testagent
 share/backend_config.ini
 share/cleanup-mysql.sql
 share/cleanup-postgres.sql
+share/freebsd-pwd.conf
 share/initial-mysql.sql
 share/initial-postgres.sql
 share/patch_db_README.txt
@@ -71,11 +69,11 @@ share/zm-rpcapi.lsb
 share/zm-testagent.lsb
 share/zm_rpcapi-bsd
 share/zm_testagent-bsd
+share/zmb
+share/zmtest
 share/zonemaster_backend_testagent.conf
 t/test01.data
 t/test01.t
 t/test_DB_backend.pl
 t/test_runner.pl
 t/test_validate_syntax.t
-
-

MANIFEST.SKIP

@@ -6,6 +6,10 @@ maint
 ^.*\.swp$
 ^MANIFEST\.SKIP$
 
+# Avoid experimental tools
+script/zmb
+script/zmtest
+
 #!start included /usr/share/perl/5.20/ExtUtils/MANIFEST.SKIP
 # Avoid version control files.
 \bRCS\b

Makefile.PL

@@ -5,6 +5,9 @@ all_from 'lib/Zonemaster/Backend.pm';
 repository 'https://github.com/zonemaster/zonemaster-backend';
 bugtracker 'https://github.com/zonemaster/zonemaster-backend/issues';
 
+# "2.1.0" could be declared as "2.001" but not as "2.1"
+# (see Zonemaster::LDNS below)
+
 requires
   'Class::Method::Modifiers'    => 1.09,
   'Config::IniFiles'            => 0,
@@ -13,25 +16,22 @@ requires
   'File::ShareDir'              => 0,
   'File::Slurp'                 => 0,
   'HTML::Entities'              => 0,
-  'IO::CaptureOutput'           => 0,
   'JSON::PP'                    => 0,
   'JSON::RPC'                   => 1.01,
   'JSON::Validator'             => 3.12,
   'Log::Any'                    => 0,
   'Log::Any::Adapter::Dispatch' => 0,
   'Log::Dispatch'               => 0,
   'Moose'                       => 2.04,
-  'Net::IP::XS'                 => 0.14,
   'Parallel::ForkManager'       => 1.12,
   'Plack::Builder'              => 0,
-  'Plack::Middleware::Debug'    => 0.14,
   'Role::Tiny'                  => 1.001003,
   'Router::Simple::Declare'     => 0,
   'Starman'                     => 0,
   'String::ShellQuote'          => 0,
-  'Try::Tiny'                   => 0.30,
-  'Zonemaster::Engine'          => 3.0,
-  'Zonemaster::LDNS'            => 2.0,
+  'Try::Tiny'                   => 0.24,
+  'Zonemaster::Engine'          => 4.0,
+  'Zonemaster::LDNS'            => 2.001,
   ;
 
 test_requires 'DBD::SQLite';