diff -Nru libconfig-file-perl-1.50/Build.PL libconfig-file-perl-1.51/Build.PL --- libconfig-file-perl-1.50/Build.PL 2009-01-20 19:54:04.000000000 +0000 +++ libconfig-file-perl-1.51/Build.PL 2018-11-15 14:31:35.000000000 +0000 @@ -1,15 +1,17 @@ use Module::Build; my $build = Module::Build->new( - module_name => 'Config::File', - dist_abstract => 'Parse a simple configuration file', - dist_author => 'Gunnar Wolf ', - license => 'gpl', - requires => {}, - recommends => {}, - build_requires => {Test::Pod => 0, - Test::Pod::Coverage => 0, - Module::Build => 0}, + module_name => 'Config::File', + dist_abstract => 'Parse a simple configuration file', + dist_author => 'Gunnar Wolf ', + license => 'gpl', + requires => {}, + recommends => {}, + build_requires => { + Test::Pod => 0, + Test::Pod::Coverage => 0, + Module::Build => 0 + }, create_makefile_pl => 'passthrough' - ); +); $build->create_build_script; diff -Nru libconfig-file-perl-1.50/CHANGES libconfig-file-perl-1.51/CHANGES --- libconfig-file-perl-1.50/CHANGES 2009-01-20 19:54:04.000000000 +0000 +++ libconfig-file-perl-1.51/CHANGES 2018-11-15 14:31:35.000000000 +0000 @@ -1,4 +1,9 @@ UNRELEASED +1.51 (15-Nov-2018): + - Fix old bugs from CPAN RT + - perltidy + - Update maintainer and copyright + 1.50 (20-Jan-2009): - Added Test::Pod::Coverage as a build dependency, as some CPANTS test hosts have died during the tests diff -Nru libconfig-file-perl-1.50/debian/changelog libconfig-file-perl-1.51/debian/changelog --- libconfig-file-perl-1.50/debian/changelog 2015-05-30 14:18:50.000000000 +0000 +++ libconfig-file-perl-1.51/debian/changelog 2018-12-22 17:07:29.000000000 +0000 @@ -1,3 +1,30 @@ +libconfig-file-perl (1.51-1) unstable; urgency=medium + + [ Salvatore Bonaccorso ] + * debian/control: Use HTTPS transport protocol for Vcs-Git URI + + [ gregor herrmann ] + * debian/copyright: change Copyright-Format 1.0 URL to HTTPS. + + [ Salvatore Bonaccorso ] + * Update Vcs-* headers for switch to salsa.debian.org + + [ gregor herrmann ] + * debian/*: update URLs from {search,www}.cpan.org to MetaCPAN. + + [ Laurent Baillet ] + * fix lintian file-contains-trailing-whitespace warning + + [ gregor herrmann ] + * New upstream release. + * Update debian/copyright. + New copyright holder, new Upstream-Contact, bump years of + packaging copyright. + * Declare compliance with Debian Policy 4.2.1. + * Bump debhelper compatibility level to 10. + + -- gregor herrmann Sat, 22 Dec 2018 18:07:29 +0100 + libconfig-file-perl (1.50-3) unstable; urgency=low [ Nathan Handler ] @@ -72,11 +99,11 @@ (source stanza). * debian/control: Added: ${misc:Depends} to Depends: field. * standards-version -> 3.8.0 (no changes) - + [ Gunnar Wolf ] * New upstream release * Switched the build system used to Module::Build - + -- Gunnar Wolf Thu, 11 Dec 2008 22:00:24 -0600 libconfig-file-perl (1.42-1) unstable; urgency=low diff -Nru libconfig-file-perl-1.50/debian/compat libconfig-file-perl-1.51/debian/compat --- libconfig-file-perl-1.50/debian/compat 2015-05-30 13:38:05.000000000 +0000 +++ libconfig-file-perl-1.51/debian/compat 2018-12-22 17:07:29.000000000 +0000 @@ -1 +1 @@ -8 +10 diff -Nru libconfig-file-perl-1.50/debian/control libconfig-file-perl-1.51/debian/control --- libconfig-file-perl-1.50/debian/control 2015-05-30 14:14:29.000000000 +0000 +++ libconfig-file-perl-1.51/debian/control 2018-12-22 17:07:29.000000000 +0000 @@ -4,17 +4,17 @@ Damyan Ivanov , Axel Beckert Section: perl +Testsuite: autopkgtest-pkg-perl Priority: optional -Build-Depends: debhelper (>= 8), +Build-Depends: debhelper (>= 10), libmodule-build-perl, perl Build-Depends-Indep: libtest-pod-coverage-perl, libtest-pod-perl -Standards-Version: 3.9.6 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libconfig-file-perl.git -Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libconfig-file-perl.git +Standards-Version: 4.2.1 +Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/libconfig-file-perl +Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/libconfig-file-perl.git Homepage: https://metacpan.org/release/Config-File -Testsuite: autopkgtest-pkg-perl Package: libconfig-file-perl Architecture: all diff -Nru libconfig-file-perl-1.50/debian/copyright libconfig-file-perl-1.51/debian/copyright --- libconfig-file-perl-1.50/debian/copyright 2015-05-30 14:06:11.000000000 +0000 +++ libconfig-file-perl-1.51/debian/copyright 2018-12-22 17:07:29.000000000 +0000 @@ -1,11 +1,13 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Config-File -Source: http://search.cpan.org/dist/Config-File/ +Upstream-Contact: Johan Wassberg +Source: https://metacpan.org/release/Config-File Files: * Copyright: Copyright (c) 2002 Sébastien J. Gross Copyright (c) 2003-2009 Gunnar Wolf + Copyright (c) 2018 Stockholm University License: GPL-2+ Files: debian/* @@ -13,7 +15,7 @@ Copyright 2002, Sébastien J. Gross Copyright 2003-2006, 2008, 2009 Gunnar Wolf Copyright 2007, 2009 Damyan Ivanov - Copyright 2008 gregor herrmann + Copyright 2008-2018 gregor herrmann License: GPL-2+ Comment: The packaging is licensed under the same terms as the software itself. diff -Nru libconfig-file-perl-1.50/lib/Config/File.pm libconfig-file-perl-1.51/lib/Config/File.pm --- libconfig-file-perl-1.50/lib/Config/File.pm 2009-01-20 19:54:04.000000000 +0000 +++ libconfig-file-perl-1.51/lib/Config/File.pm 2018-11-15 14:31:35.000000000 +0000 @@ -6,21 +6,20 @@ use IO::File; use vars qw($VERSION @ISA @EXPORT_OK); -@ISA = qw/Exporter/; +@ISA = qw/Exporter/; @EXPORT_OK = qw/read_config_file/; -$VERSION='1.50'; - +$VERSION = '1.51'; sub read_config_file($) { - my ($conf, $file, $fh, $line_num); + my ( $conf, $file, $fh, $line_num ); $file = shift; - $fh = IO::File->new($file, 'r') or - croak "Can't read configuration in $file: $!\n"; + $fh = IO::File->new( $file, 'r' ) + or croak "Can't read configuration in $file: $!\n"; - while (++$line_num and my $line = $fh->getline) { - my ($orig_line, $conf_ele, $conf_data); + while ( ++$line_num and my $line = $fh->getline ) { + my ( $orig_line, $conf_ele, $conf_data ); chomp $line; - $orig_line = $line; + $orig_line = $line; next if $line =~ m/^\s*#/; $line =~ s/(?{$1}) ? $conf->{$1} : "\$$1" }gsex; - - unless ($line =~ m/\s*([^\s=]+)\s*=\s*(.*?)\s*$/) { - warn "Line format invalid at line $line_num: '$orig_line'"; - next; - } - - ($conf_ele, $conf_data) = ($1, $2); - unless ($conf_ele =~ /^[\]\[A-Za-z0-9_-]+$/) { - warn "Invalid characters in key $conf_ele at line $line_num" . - " - Ignoring"; + unless ( $line =~ m/\s*([^\s=]+)\s*=\s*(.*?)\s*$/ ) { + warn "Line format invalid at line $line_num: '$orig_line'"; + next; + } + + ( $conf_ele, $conf_data ) = ( $1, $2 ); + unless ( $conf_ele =~ /^[\]\[A-Za-z0-9_-]+$/ ) { + warn "Invalid characters in key $conf_ele at line $line_num" + . " - Ignoring"; next; } - $conf_ele = '$conf->{' . join("}->{", split /[][]+/, $conf_ele) . "}"; + $conf_ele = + '$conf->{"' . join( '"}->{"', split /[][]+/, $conf_ele ) . '"}'; $conf_data =~ s!([\\\'])!\\$1!g; eval "$conf_ele = '$conf_data'"; } $fh->close; - return $conf; + return $conf // {}; } 1; diff -Nru libconfig-file-perl-1.50/Makefile.PL libconfig-file-perl-1.51/Makefile.PL --- libconfig-file-perl-1.50/Makefile.PL 2009-01-20 19:54:04.000000000 +0000 +++ libconfig-file-perl-1.51/Makefile.PL 2018-11-15 14:31:35.000000000 +0000 @@ -1,31 +1,32 @@ -# Note: this file was auto-generated by Module::Build::Compat version 0.2808_01 - - unless (eval "use Module::Build::Compat 0.02; 1" ) { - print "This module requires Module::Build to install itself.\n"; - - require ExtUtils::MakeMaker; - my $yn = ExtUtils::MakeMaker::prompt - (' Install Module::Build now from CPAN?', 'y'); - - unless ($yn =~ /^y/i) { - die " *** Cannot install without Module::Build. Exiting ...\n"; - } - - require Cwd; - require File::Spec; - require CPAN; - - # Save this 'cause CPAN will chdir all over the place. - my $cwd = Cwd::cwd(); - - CPAN::Shell->install('Module::Build::Compat'); - CPAN::Shell->expand("Module", "Module::Build::Compat")->uptodate - or die "Couldn't install Module::Build, giving up.\n"; - - chdir $cwd or die "Cannot chdir() back to $cwd: $!"; + # Note: this file was auto-generated by Module::Build::Compat version 0.2808_01 + + unless ( eval "use Module::Build::Compat 0.02; 1" ) { + print "This module requires Module::Build to install itself.\n"; + + require ExtUtils::MakeMaker; + my $yn = + ExtUtils::MakeMaker::prompt( ' Install Module::Build now from CPAN?', + 'y' ); + + unless ( $yn =~ /^y/i ) { + die " *** Cannot install without Module::Build. Exiting ...\n"; + } + + require Cwd; + require File::Spec; + require CPAN; + + # Save this 'cause CPAN will chdir all over the place. + my $cwd = Cwd::cwd(); + + CPAN::Shell->install('Module::Build::Compat'); + CPAN::Shell->expand( "Module", "Module::Build::Compat" )->uptodate + or die "Couldn't install Module::Build, giving up.\n"; + + chdir $cwd or die "Cannot chdir() back to $cwd: $!"; } eval "use Module::Build::Compat 0.02; 1" or die $@; - - Module::Build::Compat->run_build_pl(args => \@ARGV); + + Module::Build::Compat->run_build_pl( args => \@ARGV ); require Module::Build; - Module::Build::Compat->write_makefile(build_class => 'Module::Build'); + Module::Build::Compat->write_makefile( build_class => 'Module::Build' ); diff -Nru libconfig-file-perl-1.50/META.yml libconfig-file-perl-1.51/META.yml --- libconfig-file-perl-1.50/META.yml 2009-01-20 19:54:04.000000000 +0000 +++ libconfig-file-perl-1.51/META.yml 2018-11-15 14:31:35.000000000 +0000 @@ -1,6 +1,6 @@ --- name: Config-File -version: 1.50 +version: 1.51 author: - 'Gunnar Wolf ' abstract: Parse a simple configuration file @@ -14,7 +14,7 @@ provides: Config::File: file: lib/Config/File.pm - version: 1.50 + version: 1.51 generated_by: Module::Build version 0.280801 meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.2.html diff -Nru libconfig-file-perl-1.50/README libconfig-file-perl-1.51/README --- libconfig-file-perl-1.50/README 2009-01-20 19:54:04.000000000 +0000 +++ libconfig-file-perl-1.51/README 2018-11-15 14:31:35.000000000 +0000 @@ -59,8 +59,9 @@ COPYRIGHT AND LICENCE -Development was started by Sebastien J. Gross , and since -2003 it is maintained by Gunnar Wolf . +Development was started by Sebastien J. Gross , from 2003 +maintained by Gunnar Wolf . By 2018 Stockholm University took +over as maintainer. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GPL v2 (or later, at your diff -Nru libconfig-file-perl-1.50/t/pod_coverage.t libconfig-file-perl-1.51/t/pod_coverage.t --- libconfig-file-perl-1.50/t/pod_coverage.t 2009-01-20 19:54:04.000000000 +0000 +++ libconfig-file-perl-1.51/t/pod_coverage.t 2018-11-15 14:31:35.000000000 +0000 @@ -1,4 +1,4 @@ use strict; use warnings; -use Test::Pod::Coverage tests=>1; -pod_coverage_ok('Config::File', 'Config::File is covered'); +use Test::Pod::Coverage tests => 1; +pod_coverage_ok( 'Config::File', 'Config::File is covered' ); diff -Nru libconfig-file-perl-1.50/t/pod.t libconfig-file-perl-1.51/t/pod.t --- libconfig-file-perl-1.50/t/pod.t 2009-01-20 19:54:04.000000000 +0000 +++ libconfig-file-perl-1.51/t/pod.t 2018-11-15 14:31:35.000000000 +0000 @@ -6,6 +6,7 @@ all_pod_files_ok(); sub all_pod_files_ok { + # This definition will be overwritten if Test::Pod is available print "1..1\nok 1 - Skipping POD tests - Test::Pod not available?\n"; } diff -Nru libconfig-file-perl-1.50/t/test.t libconfig-file-perl-1.51/t/test.t --- libconfig-file-perl-1.50/t/test.t 2009-01-20 19:54:04.000000000 +0000 +++ libconfig-file-perl-1.51/t/test.t 2018-11-15 14:31:35.000000000 +0000 @@ -2,40 +2,45 @@ use strict; use Test; + #use warnings; # First check that the module loads OK. use vars qw($loaded); -BEGIN { $| = 1; plan tests => 11; } -END {print "not ok 1\n" unless $loaded;} +BEGIN { $| = 1; plan tests => 13; } +END { print "not ok 1\n" unless $loaded; } use Config::File; print "! Testing module load ...\n"; -ok(++$loaded); +ok( ++$loaded ); print "! Testing constructor ...\n"; my $config = Config::File::read_config_file("t/config"); ok($config); print "! Testing simple values ...\n"; -ok($config->{foo}, 'bar'); +ok( $config->{foo}, 'bar' ); print "! Testing embeded values ...\n"; -ok($config->{bar}, 'bar/bar'); +ok( $config->{bar}, 'bar/bar' ); print "! Testing comments do not affect prior characters ...\n"; -ok($config->{comment_limit}, 'Complete value'); +ok( $config->{comment_limit}, 'Complete value' ); print "! Testing embeded values with comment...\n"; -ok($config->{foobar}, 'bar/bar # variable #'); +ok( $config->{foobar}, 'bar/bar # variable #' ); print "! Testing quotes within values...\n(got: $config->{quoted}\n\n"; -ok($config->{quoted}, '"foo \'bar baz\'"'); +ok( $config->{quoted}, '"foo \'bar baz\'"' ); print "! Testing clustered values...\n"; -ok($config->{dummy}->{1}, 'data 1'); -ok($config->{dummy}->{2}, 'data 2'); -ok($config->{dummy}->{3}, 'data 3'); +ok( $config->{dummy}->{1}, 'data 1' ); +ok( $config->{dummy}->{2}, 'data 2' ); +ok( $config->{dummy}->{3}, 'data 3' ); print "! Testing whether we correctly ignore invalid keys\n"; -ok(scalar(keys %$config), 6); +ok( scalar( keys %$config ), 6 ); + +my $empty_config = Config::File::read_config_file("t/empty_config"); +ok( defined($empty_config) ); +ok( ref($empty_config), 'HASH' );