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

Merge develop into master (Zonemaster-LDNS)

.github/pull_request_template.md

@@ -0,0 +1,15 @@
+## Purpose
+
+This PR...
+
+## Context
+
+(e.g. Fixes #9999, Follow-up to #9999, etc.)
+
+## Changes
+
+...
+
+## How to test this PR
+
+...

.gitignore

@@ -1,7 +1,7 @@
 Makefile.old
 MYMETA.*
 META.yml
-Makefile
+/Makefile
 *.bs
 *.o
 blib
@@ -11,3 +11,6 @@ inc
 ppport.h
 MANIFEST.bak
 Net-LDNS-*.tar.gz
+
+# Emacs backup files
+*~

CONTRIBUTING.md

@@ -0,0 +1,30 @@
+# Contributing to Zonemaster::LDNS
+
+Contribution to this repository is welcome. Contribution can be either an issue
+report or a code or a documentation update. Also see the information in the
+[main README][Zonemaster/Zonemaster README] in the main Zonemaster respository.
+
+## Issue
+
+First search for a similar issue in the [issues list]. If a relevant issue is
+found, add your information as a comment. If no relevant issue is found, create
+[a new issue][create issue]. Give as many details as you have and describe, if
+possible, how the issue can be reproduced.
+
+## Pull request
+
+If you would like to contribute an update, first please look for issues and open
+[pull requests] that are about the same thing. If nothing relevant is found or
+you have a different solution, create [a new pull request][create pull request].
+Creating a pull request assumes that you have your proposal in a fork repository.
+
+When you create a pull request, please always start with the `develop` branch
+and create the pull request against the same branch.
+
+
+[issues list]:                        https://github.com/zonemaster/zonemaster-ldns/issues
+[create issue]:                       https://github.com/zonemaster/zonemaster-ldns/issues/new
+[pull requests]:                      https://github.com/zonemaster/zonemaster-ldns/pulls
+[create pull request]:                https://github.com/zonemaster/zonemaster-ldns/compare
+[Zonemaster/Zonemaster README]:       https://github.com/zonemaster/zonemaster#readme
+

Changes

@@ -1,5 +1,10 @@
 Release history for Zonemaster component Zonemaster-LDNS
 
+2.2.0 2021-05-28
+
+ [Features]
+ - Adds (minimal) support for CDNSKEY records (#113)
+
 
 2.1.0 2020-04-30
 

MANIFEST

@@ -1,5 +1,6 @@
 Changes
 CONTRIBUTORS.txt
+CONTRIBUTING.md
 inc/Module/Install.pm
 inc/Module/Install/Base.pm
 inc/Module/Install/Can.pm
@@ -95,6 +96,7 @@ lib/Zonemaster/LDNS/RR/AFSDB.pm
 lib/Zonemaster/LDNS/RR/APL.pm
 lib/Zonemaster/LDNS/RR/ATMA.pm
 lib/Zonemaster/LDNS/RR/CAA.pm
+lib/Zonemaster/LDNS/RR/CDNSKEY.pm
 lib/Zonemaster/LDNS/RR/CDS.pm
 lib/Zonemaster/LDNS/RR/CERT.pm
 lib/Zonemaster/LDNS/RR/CNAME.pm

MANIFEST.SKIP

@@ -7,6 +7,9 @@
 # Avoid the dist tarball
 ^Zonemaster-LDNS-.*\.tar\.gz$
 
+# Avoid Github control files
+^\.github/
+
 # Avoid autotools input files
 \.m4$
 \.ac$

lib/Zonemaster/LDNS.pm

@@ -2,7 +2,7 @@ package Zonemaster::LDNS;
 
 use 5.014;
 
-our $VERSION = '2.1.0';
+our $VERSION = '2.2.0';
 
 use parent 'Exporter';
 our @EXPORT_OK = qw[to_idn has_idn ldns_version load_zonefile];

lib/Zonemaster/LDNS/RR.pm

@@ -10,6 +10,7 @@ use Zonemaster::LDNS::RR::AFSDB;
 use Zonemaster::LDNS::RR::APL;
 use Zonemaster::LDNS::RR::ATMA;
 use Zonemaster::LDNS::RR::CAA;
+use Zonemaster::LDNS::RR::CDNSKEY;
 use Zonemaster::LDNS::RR::CDS;
 use Zonemaster::LDNS::RR::CERT;
 use Zonemaster::LDNS::RR::CNAME;

lib/Zonemaster/LDNS/RR/CDNSKEY.pm

@@ -0,0 +1,22 @@
+package Zonemaster::LDNS::RR::CDNSKEY;
+
+use strict;
+use warnings;
+
+use parent 'Zonemaster::LDNS::RR';
+
+1;
+
+=head1 NAME
+
+Zonemaster::LDNS::RR::CDNSKEY - Type CDNSKEY record
+
+=head1 DESCRIPTION
+
+A subclass of L<Zonemaster::LDNS::RR>, so it has all the methods of that class available in addition to the ones documented here.
+
+=head1 METHODS
+
+No RDATA methods implemented yet.
+
+=cut

t/netldns.t

@@ -56,7 +56,8 @@ SKIP: {
     ok( !$@ );
 
     my @answer = $p2->answer;
-    is( scalar( @answer ), 3, 'expected number of NS records in answer' );
+    cmp_ok( scalar( @answer ), '<=', 6, 'at most 6 NS records in answer (iis.se)' );
+    cmp_ok( scalar( @answer ), '>=', 2, 'at least 2 NS records in answer (iis.se)' );
     my %known_ns = map { $_ => 1 } qw[ns.nic.se. i.ns.se. ns3.nic.se.];
     foreach my $rr ( @answer ) {
         isa_ok( $rr, 'Zonemaster::LDNS::RR::NS' );