Skip to content

Commit

Permalink
Merge pull request #279 from matsduf/merge-develop-into-master
Browse files Browse the repository at this point in the history
Merge develop into master (CLI)
  • Loading branch information
matsduf authored Jul 8, 2022
2 parents 4391018 + 48da73f commit 9f1a24d
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 11 deletions.
8 changes: 8 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
Release history for Zonemaster component Zonemaster-CLI

v4.0.1 2022-07-08 (public fix version)

[Fixes]
- Adds missing installation instructions for CentOS Linux 7
(#275)
- Updates translation to Danish (#271)


v4.0.0 2022-06-09 (public release version)

[Breaking changes]
Expand Down
2 changes: 1 addition & 1 deletion Makefile.PL
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ requires(
'Locale::TextDomain' => 1.23,
'MooseX::Getopt' => 0,
'Text::Reflow' => 0,
'Zonemaster::Engine' => 4.005,
'Zonemaster::Engine' => 4.005001,
'Zonemaster::LDNS' => 2.002002,
);

Expand Down
23 changes: 23 additions & 0 deletions docs/Installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* [Installation on Rocky Linux](#Installation-on-Rocky-Linux)
* [Installation on Debian and Ubuntu](#Installation-on-Debian-and-Ubuntu)
* [Installation on FreeBSD](#Installation-on-FreeBSD)
* [Installation on CentOS Linux 7](#Installation-on-CentOS-Linux-7)
* [Post-installation sanity check](#Post-installation-sanity-check)
* [Using zonemaster-cli](#Using-zonemaster-cli)
* [What to do next?](#What-to-do-next)
Expand Down Expand Up @@ -157,6 +158,28 @@ Using pre-built packages is the preferred method for Debian and Ubuntu.
cpanm Zonemaster::CLI
```

### Installation on CentOS Linux 7

> **Please note!** CentOS 7 will only be supported until the release of
> v2023.1, which is planned to happen during the spring of 2023.

1) Install binary dependencies:

```sh
sudo yum install perl-JSON-XS perl-MooseX-Getopt
```

2) Install dependencies from CPAN:

```sh
sudo cpanm Text::Reflow Locale::TextDomain
```

3) Install Zonemaster::CLI

```sh
sudo cpanm Zonemaster::CLI
```

## Post-installation sanity check

Expand Down
2 changes: 1 addition & 1 deletion lib/Zonemaster/CLI.pm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use 5.014002;
use strict;
use warnings;

use version; our $VERSION = version->declare( "v4.0.0" );
use version; our $VERSION = version->declare( "v4.0.1" );

use Locale::TextDomain 'Zonemaster-CLI';
use Moose;
Expand Down
31 changes: 22 additions & 9 deletions share/da.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-12-07 14:55+0000\n"
"PO-Revision-Date: 2021-12-07 14:55+0000\n"
"POT-Creation-Date: 2022-06-08 14:12+0000\n"
"PO-Revision-Date: 2022-06-08 14:01+0000\n"
"Last-Translator: haarbo@dk-hostmaster.dk\n"
"Language-Team: Zonemaster Team\n"
"Language: da\n"
Expand Down Expand Up @@ -136,8 +136,9 @@ msgstr "Udskriv den effektive profil benyttet i JSON-format, og afslut."
msgid ""
"Source IP address used to send queries. Setting an IP address not correctly "
"configured on a local network interface causes cryptic error messages."
msgstr "IP-adresse brugt til at sende forespørgsler fra. En ikke korrekt "
"konfiguret IP-adresse på et lokalt interface medfører kryptiske fejlbeskeder."
msgstr ""
"IP-adresse brugt til at sende forespørgsler fra. En ikke korrekt konfiguret "
"IP-adresse på et lokalt interface medfører kryptiske fejlbeskeder."

#, perl-format
msgid ""
Expand All @@ -147,6 +148,7 @@ msgid ""
msgstr ""
"Advarsel: Kunne ikke sætte locale kategori LC_MESSAGES til %s (er det "
"installeret på dette system?).\n"
"\n"

#, perl-format
msgid ""
Expand All @@ -156,6 +158,7 @@ msgid ""
msgstr ""
"Advarsel: Kunne ikke sætte locale kategori LC_CTYPE til %s (er det "
"installeret på dette system?).\n"
"\n"

#, perl-brace-format
msgid "Loading profile from {path}."
Expand All @@ -174,6 +177,9 @@ msgstr ""
msgid "Must give the name of a domain to test.\n"
msgstr "Domænenavn, der skal testes, skal angives.\n"

msgid "The domain name contains consecutive dots.\n"
msgstr "Domænenavnet indeholder flere dots (.) efter hinanden.\n"

msgid "Seconds "
msgstr "Sekunder "

Expand Down Expand Up @@ -220,12 +226,20 @@ msgstr ""
msgid "%8s\t%5d entries.\n"
msgstr "%8s\t%5d beskeder.\n"

msgid "--ns must be a name or a name/ip pair."
msgstr "--ns skal være et navn eller et navn/IP-adresse par."

#, perl-brace-format
msgid "The name of the nameserver '{nsname}' contains consecutive dots."
msgstr ""
"Navnet på navneserveren '{nsname}' indeholder flere dots (.) efter hinanden."

msgid ""
"Warning: Zonemaster::LDNS not compiled with libidn2, cannot handle non-ASCII "
"names correctly."
"Warning: Zonemaster::LDNS not compiled with IDN support, cannot handle non-"
"ASCII names correctly."
msgstr ""
"Advarser: Zonemaster::LDNS er ikke kompileret med libidn2, kan derfor ikke "
"benytte ikke-ASCII navne."
"Advarsel: Zonemaster::LDNS er ikke kompileret med IDN-support, og kan derfor "
"ikke håndtere ikke-ASCII navne korrekt."

msgid "DEBUG"
msgstr "FEJLSØG"
Expand All @@ -244,4 +258,3 @@ msgstr "FEJL"

msgid "CRITICAL"
msgstr "KRITISK"

0 comments on commit 9f1a24d

Please sign in to comment.