Config release 6.27

DynaLoader.pm broken on 5.8 was probably fixed by P5P in
commit 816b255b3713d16e7c9ee4c3736d7096b851b609
"Wrap the $VERSION initialization of DynaLoader in a BEGIN block"
Perl #40651, which is between 5.9.4 and 5.9.5, also the bug is not
reproducable on Windows 5.8.9 since DynaLoader.o used to be hackishly
compiled by win32/Makefile or win32/makefile.mk directly, rather than from
an EUMM makefile, and -DXS_VERSION macro was never passed to the CC when
compiling DynaLoader.o on Windows, so there was no version check in
boot_DynaLoader() C func on Win32 back then. Nowadays DynaLoader on Win32
is compiled with a standard EUMM makefile and -DXS_VERSION is passed on cmd
line to the CC.

Author: bulk88

.travis.yml

@@ -51,6 +51,7 @@ before_install:
   - eval $(curl https://travis-perl.github.io/init) --auto
 
 install:
+  - cpan-install --deps
   - export COVERAGE=0 AUTOMATED_TESTING=1
 
 script: "perl Makefile.PL && make && make test"

Changes

@@ -1,4 +1,7 @@
 Revision history for XSConfig
+6.27    Wed, Jul 11, 2018  4:17:07 PM
+        -Fixed CPAN RT#125756, DynaLoader.pm broken on 5.8 with XSConfig
+
 6.26    Sun, Jul 01, 2018  4:01:17 PM
         -version bump because most CPAN Testers builders dont test alpha
          versions

Config.pm

@@ -10,7 +10,7 @@ use strict;
 use warnings;
 our (%Config, $VERSION);
 
-$VERSION = '6.26';
+$VERSION = '6.27';
 
 # Skip @Config::EXPORT because it only contains %Config, which we special
 # case below as it's not a function. @Config::EXPORT won't change in the
@@ -59,6 +59,9 @@ sub import {
 sub DESTROY { }
 
 if (defined &DynaLoader::boot_DynaLoader) {
+    #next 2 lines are special matched in Makefile.PL, update that if changed
+    delete local $DynaLoader::{'VERSION'} if $] lt '5.009005';
+    delete local $DynaLoader::{'XS_VERSION'} if $] lt '5.009005';
     require XSLoader;
     XSLoader::load(__PACKAGE__, $VERSION);
     tie %Config, 'Config';

Config_mini.pl.PL

@@ -3,7 +3,7 @@
 #usage: perl Config_mini.pl.PL [ignored]
 
 use strict ;
-my $VERSION = '6.26';
+my $VERSION = '6.27';
 use ExtUtils::Command;
 
 my $mini = searchdirs('Config_mini.pl', \@INC);

Config_pm.PL

@@ -0,0 +1,26 @@
+#!/usr/bin/perl -*- coding: no-conversion -*-
+
+my $path = $ARGV[0];
+die "arg 1 is empty" unless $path;
+if($] ge '5.009005') {
+    open my $fh, '<', $path or die "Can't open $path: $!";
+    my $data;
+    {
+        binmode($fh);
+        local $/ = undef;
+        $data = <$fh>;
+    }
+    close $fh or "Can't close $path: $!";
+    my $match = q|    #next 2 lines are special matched in Makefile.PL, update that if changed
+    delete local $DynaLoader::{'VERSION'} if $] lt '5.009005';
+    delete local $DynaLoader::{'XS_VERSION'} if $] lt '5.009005';
+|;
+    my $pos = index($data, $match);
+    die 'can\'t match in Config_pm.PL' if $pos == -1;
+    substr($data, $pos,length($match),'');
+    open $fh, '>', $path or die "Can't open $path: $!";
+    syswrite($fh, $data) or die "Can't write $path: $!";
+    print "patched $path\n";
+} else {
+    print "did not patch $path\n";
+}

Config_xs.PL

@@ -19,7 +19,7 @@
 #    lib/Config_git.pl
 #
 
-$VERSION = '6.26';
+$VERSION = '6.27';
 my $in_core;
 
 BEGIN {

MANIFEST

@@ -1,6 +1,7 @@
 Changes
 Config.pm
 Config_mini.pl.PL
+Config_pm.PL
 Config_xs.in
 Config_xs.out
 Config_xs.PL
@@ -13,6 +14,7 @@ MANIFEST			This list of files
 README
 regen/regen_lib.pl
 t/Config.t
+t/DynaLoader.t
 t/XSConfig.t
 typemap
 xsc_test.pl

Makefile.PL

@@ -6,12 +6,15 @@ push(@ExtUtils::MakeMaker::Overridable, qw(pm_to_blib));
 my $in_core = ! -d "regen";
 our $uninst;
 my $version = MM->parse_version('Config.pm');
+my $pre_6_5503 = eval($ExtUtils::MakeMaker::VERSION) < 6.5503;
 
 WriteMakefile(
     'ABSTRACT'		=> 'Fast XS drop-in replacement for Config.pm with perfect hashing',
     'AUTHOR'		=> ($ExtUtils::MakeMaker::VERSION >= '6.58'
                                 ? ['Daniel Dragan <[email protected]>', 'Reini Urban <[email protected]>']
                                 : 'Daniel Dragan <[email protected]>, Reini Urban <[email protected]>'),
+    ($pre_6_5503 ? 'PREREQ_PM' : 'BUILD_REQUIRES')
+        => {'MIME::Base64' => 0, 'IO::Compress::Bzip2' => 0},
     'DISTNAME'		=> 'XSConfig',
     'LICENSE'		=> 'perl',
     'NAME'		=> 'Config',
@@ -159,6 +162,7 @@ sub pm_to_blib {
     chomp($blib); #old EUMMs dont have a newline at the end, new ones do
     return $blib.'
 	$(NOECHO) $(CHMOD) $(PERM_RW) $(INST_ARCHLIBDIR)/Config.pm
+	$(NOECHO) $(PERLRUN) Config_pm.PL $(INST_ARCHLIBDIR)/Config.pm
 	$(NOECHO) $(EQUALIZE_TIMESTAMP) Config_pm_mtime $(INST_ARCHLIBDIR)/Config.pm';
 }
 

XSConfig.pod

@@ -4,7 +4,7 @@ XSConfig - Fast XS drop-in replacement for Config.pm with perfect hashing.
 
 =head1 VERSION
 
-Version 6.26
+Version 6.27
 
 =head1 SYNOPSIS
 

t/DynaLoader.t

@@ -0,0 +1,24 @@
+#!/usr/bin/perl
+eval "use DynaLoader;";
+if($@) {
+    warn $@;
+    print <<'END';
+1..1
+not ok 1 - RT #125756 Old DynaLoader works
+END
+} else {
+    print <<'END';
+1..1
+ok 1 - RT #125756 Old DynaLoader works
+END
+}
+
+#C:\perl587\srcnew>perl -MDynaLoader -e"exit 0"
+#DynaLoader object version 1.05 does not match $DynaLoader::VERSION  at C:/perl58
+#7/srcnew/lib/XSLoader.pm line 16.
+#Compilation failed in require at C:/perl587/srcnew/lib/Config.pm line 62.
+#Compilation failed in require at C:/perl587/srcnew/lib/DynaLoader.pm line 25.
+#BEGIN failed--compilation aborted at C:/perl587/srcnew/lib/DynaLoader.pm line 25
+#.
+#Compilation failed in require.
+#BEGIN failed--compilation aborted.