Run of fresh-snapshots for libcrypt-ssleay-perl

Merge these changes:

git pull https://janitor.debian.net/git/libcrypt-ssleay-perl fresh-snapshots/main
git pull https://janitor.debian.net/git/libcrypt-ssleay-perl fresh-snapshots/pristine-tar
git pull https://janitor.debian.net/git/libcrypt-ssleay-perl fresh-snapshots/upstream

Summary

Merged new upstream version: 0.7304+git20220319.1.ba9a3d7+ds (was: 0.73.06).

Diff

Branch: main

diff --git a/Changes b/Changes
index e8b6ea2..7479e11 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,11 @@
 Revision history for Crypt-SSLeay
 =================================
 
+0.73_07 2017-04-18 18:27:00 UTC
+-   James Keenan noticed I forgot to push '.' to @INC. Thanks.
+-   Version tests fail because of variation in format of returned
+    strings. Drop tests that depend on the contents of those strings.
+
 0.73_06 2017-04-03 16:16:00 UTC
 
 -   Update Travis CI configuration
diff --git a/META.json b/META.json
index 13c4f0d..d723228 100644
--- a/META.json
+++ b/META.json
@@ -7,7 +7,7 @@
       "Gisle Aas"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010",
+   "generated_by" : "ExtUtils::MakeMaker version 7.62, CPAN::Meta::Converter version 2.150010",
    "keywords" : [
       "lwp",
       "lwp-useragent",
@@ -19,7 +19,7 @@
    ],
    "meta-spec" : {
       "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
-      "version" : "2"
+      "version" : 2
    },
    "name" : "Crypt-SSLeay",
    "no_index" : {
@@ -63,11 +63,11 @@
          "url" : "https://github.com/nanis/Crypt-SSLeay"
       }
    },
-   "version" : "0.73_06",
+   "version" : "0.73_07",
    "x_build" : {
       "recommends" : {
          "Devel::CheckLib" : "0.99"
       }
    },
-   "x_serialization_backend" : "JSON::PP version 2.27400"
+   "x_serialization_backend" : "JSON::PP version 4.06"
 }
diff --git a/META.yml b/META.yml
index 2fa8bf8..c0bd4d8 100644
--- a/META.yml
+++ b/META.yml
@@ -14,7 +14,7 @@ configure_requires:
   ExtUtils::CBuilder: '0.280205'
   Getopt::Long: '0'
 dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010'
+generated_by: 'ExtUtils::MakeMaker version 7.62, CPAN::Meta::Converter version 2.150010'
 keywords:
   - lwp
   - lwp-useragent
@@ -37,7 +37,7 @@ requires:
   perl: '5.006'
 resources:
   repository: https://github.com/nanis/Crypt-SSLeay
-version: 0.73_06
+version: 0.73_07
 x_build:
   recommends:
     Devel::CheckLib: '0.99'
diff --git a/Makefile.PL b/Makefile.PL
index 3485578..aec3a82 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -8,8 +8,14 @@ use ExtUtils::MakeMaker;
 use File::Spec::Functions qw( catfile rel2abs );
 use Getopt::Long qw( GetOptionsFromArray );
 
-unless( require( catfile qw(inc IO Interactive Tiny.pm) ) ) {
-    die 'Your distribution is incomplete: Failed to load bundled IO::Interactive::Tiny';
+BEGIN {
+  # Must use a bundled version
+  # "./" prefix required to subvert @INC traversal
+  # "catfile" not useful here as it eats "." and may produces wrong \
+  #  under windows ( require always takes / )
+  local $@;
+  eval { require "./inc/IO/Interactive/Tiny.pm" } or
+    die "Your distribution is incomplete: Failed to load bundled IO::Interactive::Tiny\n$@";
 }
 
 run(\@ARGV, [qw{ssl crypto ssl32 ssleay32 eay32 libeay32 z}]);
@@ -276,6 +282,17 @@ sub filter_libs {
     my $opt = shift;
     my $libs = shift;
 
+    if (eval { require ExtUtils::PkgConfig } &&
+            ExtUtils::PkgConfig->exists('openssl')) {
+        my @libs = map { s/^-l//; $_ }
+            split(' ', ExtUtils::PkgConfig->libs_only_l('openssl'));
+        $opt->{libpath} = ExtUtils::PkgConfig->libs_only_L('openssl') // '';
+        $opt->{libpath} =~ s/^-L//;
+        $opt->{incpath} = ExtUtils::PkgConfig->cflags_only_I('openssl') // '';
+        $opt->{incpath} =~ s/-I//;
+        return \@libs;
+    }
+
     return $libs unless eval {
         require Devel::CheckLib;
         1;
diff --git a/SSLeay.pm b/SSLeay.pm
index b422e4f..47b1c75 100644
--- a/SSLeay.pm
+++ b/SSLeay.pm
@@ -2,7 +2,7 @@ package Crypt::SSLeay;
 
 use strict;
 use vars qw( @ISA $VERSION $XS_VERSION );
-$XS_VERSION = $VERSION = '0.73_06';
+$XS_VERSION = $VERSION = '0.73_07';
 $VERSION = eval $VERSION;
 
 use Bytes::Random::Secure;
diff --git a/debian/changelog b/debian/changelog
index dac0966..6bad70f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libcrypt-ssleay-perl (0.7304+git20220319.1.ba9a3d7+ds-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sat, 30 Jul 2022 17:20:26 -0000
+
 libcrypt-ssleay-perl (0.73.06-2) unstable; urgency=medium
 
   [ gregor herrmann ]
diff --git a/lib/Net/SSL.pm b/lib/Net/SSL.pm
old mode 100644
new mode 100755
diff --git a/t/03-version.t b/t/03-version.t
old mode 100755
new mode 100644
index d02a0c0..9288c2b
--- a/t/03-version.t
+++ b/t/03-version.t
@@ -17,33 +17,18 @@ use Crypt::SSLeay::Version qw(
     my $built_on = openssl_built_on();
     ok(defined $built_on, 'openssl_built_on returns a defined value');
     note $built_on;
-    like(
-        $built_on,
-        qr/\Abuilt on:/,
-        'openssl_built_on return value looks valid',
-    );
 }
 
 {
     my $cflags = openssl_cflags();
     ok(defined $cflags, 'openssl_cflags returns a defined value');
     note $cflags;
-    like(
-        $cflags,
-        qr/\Acompiler:/,
-        'openssl_cflags return value looks valid',
-    );
 }
 
 {
     my $dir = openssl_dir();
     ok(defined $dir, 'openssl_dir returns a defined value');
     note $dir;
-    like(
-        $dir,
-        qr/\AOPENSSLDIR:/,
-        'openssl_dir return value looks valid',
-    );
 }
 
 {
@@ -56,11 +41,6 @@ use Crypt::SSLeay::Version qw(
     my $version = openssl_version();
     ok(defined $version, 'openssl_version returns a defined value');
     note $version;
-    like(
-        $version,
-        qr/\AOpenSSL/,
-        'openssl_version return value looks valid',
-    );
 }
 
 {
diff --git a/t/manifest.t b/t/manifest.t
old mode 100755
new mode 100644

Branch: pristine-tar

diff --git a/libcrypt-ssleay-perl_0.7304+git20220319.1.ba9a3d7+ds.orig.tar.gz.delta b/libcrypt-ssleay-perl_0.7304+git20220319.1.ba9a3d7+ds.orig.tar.gz.delta
new file mode 100644
index 0000000..19ca262
Binary files /dev/null and b/libcrypt-ssleay-perl_0.7304+git20220319.1.ba9a3d7+ds.orig.tar.gz.delta differ
diff --git a/libcrypt-ssleay-perl_0.7304+git20220319.1.ba9a3d7+ds.orig.tar.gz.id b/libcrypt-ssleay-perl_0.7304+git20220319.1.ba9a3d7+ds.orig.tar.gz.id
new file mode 100644
index 0000000..633e580
--- /dev/null
+++ b/libcrypt-ssleay-perl_0.7304+git20220319.1.ba9a3d7+ds.orig.tar.gz.id
@@ -0,0 +1 @@
+e256dd403b731337460b9326cc73ff96f58fd2fe

Branch: upstream

Tag: upstream/0.7304+git20220319.1.ba9a3d7+ds
diff --git a/Changes b/Changes
index e8b6ea2..7479e11 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,11 @@
 Revision history for Crypt-SSLeay
 =================================
 
+0.73_07 2017-04-18 18:27:00 UTC
+-   James Keenan noticed I forgot to push '.' to @INC. Thanks.
+-   Version tests fail because of variation in format of returned
+    strings. Drop tests that depend on the contents of those strings.
+
 0.73_06 2017-04-03 16:16:00 UTC
 
 -   Update Travis CI configuration
diff --git a/META.json b/META.json
index 13c4f0d..d723228 100644
--- a/META.json
+++ b/META.json
@@ -7,7 +7,7 @@
       "Gisle Aas"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010",
+   "generated_by" : "ExtUtils::MakeMaker version 7.62, CPAN::Meta::Converter version 2.150010",
    "keywords" : [
       "lwp",
       "lwp-useragent",
@@ -19,7 +19,7 @@
    ],
    "meta-spec" : {
       "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
-      "version" : "2"
+      "version" : 2
    },
    "name" : "Crypt-SSLeay",
    "no_index" : {
@@ -63,11 +63,11 @@
          "url" : "https://github.com/nanis/Crypt-SSLeay"
       }
    },
-   "version" : "0.73_06",
+   "version" : "0.73_07",
    "x_build" : {
       "recommends" : {
          "Devel::CheckLib" : "0.99"
       }
    },
-   "x_serialization_backend" : "JSON::PP version 2.27400"
+   "x_serialization_backend" : "JSON::PP version 4.06"
 }
diff --git a/META.yml b/META.yml
index 2fa8bf8..c0bd4d8 100644
--- a/META.yml
+++ b/META.yml
@@ -14,7 +14,7 @@ configure_requires:
   ExtUtils::CBuilder: '0.280205'
   Getopt::Long: '0'
 dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010'
+generated_by: 'ExtUtils::MakeMaker version 7.62, CPAN::Meta::Converter version 2.150010'
 keywords:
   - lwp
   - lwp-useragent
@@ -37,7 +37,7 @@ requires:
   perl: '5.006'
 resources:
   repository: https://github.com/nanis/Crypt-SSLeay
-version: 0.73_06
+version: 0.73_07
 x_build:
   recommends:
     Devel::CheckLib: '0.99'
diff --git a/Makefile.PL b/Makefile.PL
index 3485578..aec3a82 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -8,8 +8,14 @@ use ExtUtils::MakeMaker;
 use File::Spec::Functions qw( catfile rel2abs );
 use Getopt::Long qw( GetOptionsFromArray );
 
-unless( require( catfile qw(inc IO Interactive Tiny.pm) ) ) {
-    die 'Your distribution is incomplete: Failed to load bundled IO::Interactive::Tiny';
+BEGIN {
+  # Must use a bundled version
+  # "./" prefix required to subvert @INC traversal
+  # "catfile" not useful here as it eats "." and may produces wrong \
+  #  under windows ( require always takes / )
+  local $@;
+  eval { require "./inc/IO/Interactive/Tiny.pm" } or
+    die "Your distribution is incomplete: Failed to load bundled IO::Interactive::Tiny\n$@";
 }
 
 run(\@ARGV, [qw{ssl crypto ssl32 ssleay32 eay32 libeay32 z}]);
@@ -276,6 +282,17 @@ sub filter_libs {
     my $opt = shift;
     my $libs = shift;
 
+    if (eval { require ExtUtils::PkgConfig } &&
+            ExtUtils::PkgConfig->exists('openssl')) {
+        my @libs = map { s/^-l//; $_ }
+            split(' ', ExtUtils::PkgConfig->libs_only_l('openssl'));
+        $opt->{libpath} = ExtUtils::PkgConfig->libs_only_L('openssl') // '';
+        $opt->{libpath} =~ s/^-L//;
+        $opt->{incpath} = ExtUtils::PkgConfig->cflags_only_I('openssl') // '';
+        $opt->{incpath} =~ s/-I//;
+        return \@libs;
+    }
+
     return $libs unless eval {
         require Devel::CheckLib;
         1;
diff --git a/SSLeay.pm b/SSLeay.pm
index b422e4f..47b1c75 100644
--- a/SSLeay.pm
+++ b/SSLeay.pm
@@ -2,7 +2,7 @@ package Crypt::SSLeay;
 
 use strict;
 use vars qw( @ISA $VERSION $XS_VERSION );
-$XS_VERSION = $VERSION = '0.73_06';
+$XS_VERSION = $VERSION = '0.73_07';
 $VERSION = eval $VERSION;
 
 use Bytes::Random::Secure;
diff --git a/lib/Net/SSL.pm b/lib/Net/SSL.pm
old mode 100644
new mode 100755
diff --git a/t/03-version.t b/t/03-version.t
old mode 100755
new mode 100644
index d02a0c0..9288c2b
--- a/t/03-version.t
+++ b/t/03-version.t
@@ -17,33 +17,18 @@ use Crypt::SSLeay::Version qw(
     my $built_on = openssl_built_on();
     ok(defined $built_on, 'openssl_built_on returns a defined value');
     note $built_on;
-    like(
-        $built_on,
-        qr/\Abuilt on:/,
-        'openssl_built_on return value looks valid',
-    );
 }
 
 {
     my $cflags = openssl_cflags();
     ok(defined $cflags, 'openssl_cflags returns a defined value');
     note $cflags;
-    like(
-        $cflags,
-        qr/\Acompiler:/,
-        'openssl_cflags return value looks valid',
-    );
 }
 
 {
     my $dir = openssl_dir();
     ok(defined $dir, 'openssl_dir returns a defined value');
     note $dir;
-    like(
-        $dir,
-        qr/\AOPENSSLDIR:/,
-        'openssl_dir return value looks valid',
-    );
 }
 
 {
@@ -56,11 +41,6 @@ use Crypt::SSLeay::Version qw(
     my $version = openssl_version();
     ok(defined $version, 'openssl_version returns a defined value');
     note $version;
-    like(
-        $version,
-        qr/\AOpenSSL/,
-        'openssl_version return value looks valid',
-    );
 }
 
 {
diff --git a/t/manifest.t b/t/manifest.t
old mode 100755
new mode 100644

Publish Blockers

  • ☑ run was successful
  • ☑ package has not been removed from the archive
  • ☒ command changed from DEB_UPDATE_CHANGELOG=update deb-new-upstream --snapshot --refresh-patches to DEB_UPDATE_CHANGELOG=auto deb-new-upstream --snapshot --refresh-patches
  • ☒ not yet reviewed, but review needed
  • ☑ 0 publish attempts so far.not currently attempting to back off
  • ☑ proposals not currently being rate-limited for maintainer pkg-perl-maintainers@lists.alioth.debian.org
  • ☑ change set 704021db-4049-43b5-8482-8a3c7cbff2e7 is ready

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-snapshots libcrypt-ssleay-perl-dbgsymapt install -t fresh-snapshots libcrypt-ssleay-perl

Lintian Result

Full worker log Full build log