3 files changed, 47 insertions, 31 deletions

diff --git a/meta-perl/conf/include/ptest-packagelists-meta-perl.inc b/meta-perl/conf/include/ptest-packagelists-meta-perl.inc
index 612754635b..fc32c709bc 100644
--- a/meta-perl/conf/include/ptest-packagelists-meta-perl.inc
+++ b/meta-perl/conf/include/ptest-packagelists-meta-perl.inc
@@ -26,6 +26,7 @@ PTESTS_FAST_META_PERL = "\
     libmime-types-perl \
     libmozilla-ca-perl \
     libnet-dns-perl \
+    libnet-dns-sec-perl \
     libnet-ldap-perl \
     libnet-ssleay-perl \
     libstrictures-perl \
@@ -48,7 +49,6 @@ PTESTS_PROBLEMS_META_PERL = "\
     libconfig-autoconf-perl \
     libhtml-parser-perl \
     libmodule-build-tiny-perl \
-    libnet-dns-sec-perl \
     libunix-statgrab \
     libxml-libxml-perl \
 "
diff --git a/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb b/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb
deleted file mode 100644
index ee365f9328..0000000000
--- a/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "DNSSEC extensions to Net::DNS"
-HOMEPAGE = "http://www.net-dns.org/"
-SECTION = "libs"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://README;beginline=165;endline=192;md5=6ef523fa09e8c272675839e21de16bde"
-
-SRC_URI = "${CPAN_MIRROR}/authors/id/W/WI/WILLEM/Net-DNS-SEC-${PV}.tar.gz"
-SRC_URI[sha256sum] = "37a47d4def72d7338f3cc7cd807ec19bd9e2ae638ae656fa536cf0314801989e"
-
-DEPENDS += "openssl"
-
-UPSTREAM_CHECK_REGEX = "Net\-DNS\-SEC\-(?P<pver>(\d+\.\d+))(?!_\d+).tar"
-
-S = "${UNPACKDIR}/Net-DNS-SEC-${PV}"
-
-EXTRA_CPANFLAGS = "INC='-I${STAGING_INCDIR}' LIBS='-L${STAGING_LIBDIR} -lssl -L${STAGING_BASELIBDIR} -lcrypto'"
-
-inherit cpan ptest-perl
-
-RDEPENDS:${PN} = " \
-    libnet-dns-perl \
-    libcrypto \
-    perl-module-dynaloader \
-    perl-module-file-find \
-    perl-module-file-spec \
-    perl-module-io-file \
-    perl-module-mime-base64 \
-    perl-module-test-more \
-"
diff --git a/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.26.bb b/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.26.bb
new file mode 100644
index 0000000000..d0e46783d5
--- /dev/null
+++ b/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.26.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "DNSSEC extensions to Net::DNS"
+HOMEPAGE = "http://www.net-dns.org/"
+SECTION = "libs"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2b7e4176275d57d0b036bdccbc01a0e7"
+
+SRC_URI = "${CPAN_MIRROR}/authors/id/N/NL/NLNETLABS/Net-DNS-SEC-${PV}.tar.gz"
+SRC_URI[sha256sum] = "88592c65487fb7b4d05134f2f9c48e649a9cd533a8493c50189b649b4ea711a6"
+
+DEPENDS += "openssl"
+
+UPSTREAM_CHECK_REGEX = "Net\-DNS\-SEC\-(?P<pver>(\d+\.\d+))(?!_\d+).tar"
+
+S = "${UNPACKDIR}/Net-DNS-SEC-${PV}"
+
+EXTRA_CPANFLAGS = "INC='-I${STAGING_INCDIR}' LIBS='-L${STAGING_LIBDIR} -lssl -L${STAGING_BASELIBDIR} -lcrypto'"
+
+inherit cpan ptest-perl
+
+RDEPENDS:${PN} = " \
+    libnet-dns-perl \
+    libcrypto \
+    perl-module-dynaloader \
+    perl-module-file-find \
+    perl-module-file-spec \
+    perl-module-io-file \
+    perl-module-mime-base64 \
+    perl-module-test-more \
+"
+
+do_install_ptest_perl:append(){
+   cp ${D}${PTEST_PATH}/t/TestToolkit.pm ${D}${PTEST_PATH}
+
+   # This test reconciles the perl module's MANIFEST file with the actual files
+   # in the module. This might be useful for package integrity check, but not so
+   # much for runtime testing - and it also requires the whole source tree to
+   # be installed. Rather just remove it.
+   rm ${D}${PTEST_PATH}/t/00-install.t
+}
+
+RDEPENDS:${PN}-ptest += "\
+    libnet-dns-perl \
+    perl-module-extutils-mm-unix \
+    perl-module-file-spec-functions \
+    perl-module-perlio"