Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package perl-Config-General for
openSUSE:Factory checked in at 2022-04-14 17:25:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Config-General (Old)
and /work/SRC/openSUSE:Factory/.perl-Config-General.new.1941 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Config-General"
Thu Apr 14 17:25:21 2022 rev:38 rq:969989 version:2.65
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Config-General/perl-Config-General.changes
2016-11-07 12:21:44.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.perl-Config-General.new.1941/perl-Config-General.changes
2022-04-14 17:25:55.195295259 +0200
@@ -1,0 +2,20 @@
+Mon Apr 11 03:06:12 UTC 2022 - Tina M??ller <timueller+p...@suse.de>
+
+- updated to 2.65
+ see /usr/share/doc/packages/perl-Config-General/Changelog
+
+ 2.65 - fix rt.cpan.org#132893: clarified license, now licensed
+ under the Artistic License 2.0.
+ - fix rt.cpan.org#139261: correctly include directories.
+ - fix rt.cpan.org#118746: remove the comma from legal
+ variable names, added mandatory start characters a-zA-Z0-9,
+ added a section in the POD to clarify this.
+ - fix rt.cpan.org#119160: fix IfDefine code. Thanks for the patch.
+ 2.64 - fix rt.cpan.org#142095: copy default hash, avoid modification.
+ - the Catalyst folks who hosted the source of this module
+ closed or moved the repository, I have not been informed and
+ have therefore lost all history of the module. So I moved
+ to github (https://github.com/TLINDEN/Config-General).
+ Thanks for nothing, Catalyst.
+
+-------------------------------------------------------------------
Old:
----
Config-General-2.63.tar.gz
New:
----
Config-General-2.65.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Config-General.spec ++++++
--- /var/tmp/diff_new_pack.ZJ7FnU/_old 2022-04-14 17:25:55.643295783 +0200
+++ /var/tmp/diff_new_pack.ZJ7FnU/_new 2022-04-14 17:25:55.647295787 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-Config-General
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,21 +12,19 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+%define cpan_name Config-General
Name: perl-Config-General
-Version: 2.63
+Version: 2.65
Release: 0
-%define cpan_name Config-General
+License: Artistic-2.0
Summary: Generic Config Module
-License: Artistic-1.0 or GPL-1.0+
-Group: Development/Libraries/Perl
-Url: http://search.cpan.org/dist/Config-General/
-Source0:
http://www.cpan.org/authors/id/T/TL/TLINDEN/%{cpan_name}-%{version}.tar.gz
+URL: https://metacpan.org/release/%{cpan_name}
+Source0:
https://cpan.metacpan.org/authors/id/T/TL/TLINDEN/%{cpan_name}-%{version}.tar.gz
Source1: cpanspec.yml
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
%{perl_requires}
@@ -46,14 +44,14 @@
enhancements such as here-documents, C-style comments or multiline options.
%prep
-%setup -q -n %{cpan_name}-%{version}
+%autosetup -n %{cpan_name}-%{version}
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
-%{__make} %{?_smp_mflags}
+perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
+%make_build
%check
-%{__make} test
+make test
%install
%perl_make_install
@@ -61,7 +59,6 @@
%perl_gen_filelist
%files -f %{name}.files
-%defattr(-,root,root,755)
%doc Changelog README
%changelog
++++++ Config-General-2.63.tar.gz -> Config-General-2.65.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-General-2.63/Changelog
new/Config-General-2.65/Changelog
--- old/Config-General-2.63/Changelog 2016-07-29 08:06:23.000000000 +0200
+++ new/Config-General-2.65/Changelog 2022-04-10 14:07:53.000000000 +0200
@@ -1,3 +1,21 @@
+2.65 - fix rt.cpan.org#132893: clarified license, now licensed
+ under the Artistic License 2.0.
+ - fix rt.cpan.org#139261: correctly include directories.
+
+ - fix rt.cpan.org#118746: remove the comma from legal
+ variable names, added mandatory start characters a-zA-Z0-9,
+ added a section in the POD to clarify this.
+
+ - fix rt.cpan.org#119160: fix IfDefine code. Thanks for the patch.
+
+2.64 - fix rt.cpan.org#142095: copy default hash, avoid modification.
+
+ - the Catalyst folks who hosted the source of this module
+ closed or moved the repository, I have not been informed and
+ have therefore lost all history of the module. So I moved
+ to github (https://github.com/TLINDEN/Config-General).
+ Thanks for nothing, Catalyst.
+
2.63 - fix for rt.cpan.org#116340: do only consider a backslash
as meta escape char, but not if it appears on it's own,
as it happens on windows platforms. Thanks to for finding
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-General-2.63/General/Extended.pm
new/Config-General-2.65/General/Extended.pm
--- old/Config-General-2.63/General/Extended.pm 2015-10-22 14:41:29.000000000
+0200
+++ new/Config-General-2.65/General/Extended.pm 2022-04-10 13:32:08.000000000
+0200
@@ -1,9 +1,9 @@
#
# Config::General::Extended - special Class based on Config::General
#
-# Copyright (c) 2000-2014 Thomas Linden <tlinden |AT| cpan.org>.
+# Copyright (c) 2000-2022 Thomas Linden <tlinden |AT| cpan.org>.
# All Rights Reserved. Std. disclaimer applies.
-# Artistic License, same as perl itself. Have fun.
+# Licensed under the Artistic License 2.0.
#
# namespace
@@ -96,33 +96,33 @@
elsif (ref($this->{config}->{$key}) eq "ARRAY") {
my @objlist;
foreach my $element (@{$this->{config}->{$key}}) {
- if (ref($element) eq "HASH") {
- push @objlist,
- $this->SUPER::new( -ExtendedAccess => 1,
- -ConfigHash => $element,
- %{$this->{Params}} );
- }
- else {
- if ($this->{StrictObjects}) {
- croak "element in list \"$key\" does not point to a hash
reference!\n";
- }
- # else: skip this element
- }
+ if (ref($element) eq "HASH") {
+ push @objlist,
+ $this->SUPER::new( -ExtendedAccess => 1,
+ -ConfigHash => $element,
+ %{$this->{Params}} );
+ }
+ else {
+ if ($this->{StrictObjects}) {
+ croak "element in list \"$key\" does not point to a hash
reference!\n";
+ }
+ # else: skip this element
+ }
}
return \@objlist;
}
elsif (ref($this->{config}->{$key}) eq "HASH") {
return $this->SUPER::new( -ExtendedAccess => 1,
- -ConfigHash => $this->{config}->{$key},
%{$this->{Params}} );
+ -ConfigHash => $this->{config}->{$key},
%{$this->{Params}} );
}
else {
# nothing supported
if ($this->{StrictObjects}) {
- croak "key \"$key\" does not point to a hash reference!\n";
+ croak "key \"$key\" does not point to a hash reference!\n";
}
else {
- # be cool, create an empty object!
- return $empty;
+ # be cool, create an empty object!
+ return $empty;
}
}
}
@@ -148,10 +148,10 @@
}
else {
if ($this->{StrictObjects}) {
- croak "Key \"$key\" does not exist within current object\n";
+ croak "Key \"$key\" does not exist within current object\n";
}
else {
- return "";
+ return "";
}
}
}
@@ -640,10 +640,10 @@
=head1 COPYRIGHT
-Copyright (c) 2000-2014 Thomas Linden
+Copyright (c) 2000-2022 Thomas Linden
This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
+modify it under the terms of the Artistic License 2.0.
=head1 BUGS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-General-2.63/General/Interpolated.pm
new/Config-General-2.65/General/Interpolated.pm
--- old/Config-General-2.63/General/Interpolated.pm 2014-04-30
14:16:54.000000000 +0200
+++ new/Config-General-2.65/General/Interpolated.pm 2022-04-10
13:56:47.000000000 +0200
@@ -2,13 +2,13 @@
# Config::General::Interpolated - special Class based on Config::General
#
# Copyright (c) 2001 by Wei-Hon Chen <plasmab...@pchome.com.tw>.
-# Copyright (c) 2000-2014 by Thomas Linden <tlinden |AT| cpan.org>.
+# Copyright (c) 2000-2022 by Thomas Linden <tlinden |AT| cpan.org>.
# All Rights Reserved. Std. disclaimer applies.
-# Artistic License, same as perl itself. Have fun.
+# Licensed under the terms of the Artistic License 2.0.
#
package Config::General::Interpolated;
-$Config::General::Interpolated::VERSION = "2.15";
+$Config::General::Interpolated::VERSION = "2.16";
use strict;
use Carp;
@@ -47,7 +47,7 @@
# but can't begin with a '\'
\$ # dollar sign
(\{)? # $2: optional opening curly
- ([a-zA-Z0-9_\-\.:\+,]+) # $3: capturing variable name (fix of
#33447)
+ ([a-zA-Z0-9][a-zA-Z0-9_\-\.:\+]*) # $3: capturing variable name (fix
of #33447+118746)
(?(2) # $4: if there's the opening curly...
\} # ... match closing curly
)
@@ -327,6 +327,21 @@
In addition you can surround variable names with curly braces to
avoid misinterpretation by the parser.
+=head1 NAMING CONVENTIONS
+
+Variable names must:
+
+=over
+
+=item * start with a US-ASCII letter(a-z or A-Z) or a digit (0-9).
+
+=item * contain only US-ASCII letter(a-z or A-Z), digits (0-9), the dash (-)
+ colon (:), dot (.), underscore (_) and plus (+) characters.
+
+=back
+
+For added clarity variable names can be surrounded by curly braces.
+
=head1 SEE ALSO
L<Config::General>
@@ -340,16 +355,16 @@
=head1 COPYRIGHT
Copyright 2001 by Wei-Hon Chen E<lt>plasmab...@pchome.com.twe<gt>.
-Copyright 2002-2014 by Thomas Linden <tlinden |AT| cpan.org>.
+Copyright 2002-2022 by Thomas Linden <tlinden |AT| cpan.org>.
This program is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
+modify it under the terms of the Artistic License 2.0.
See L<http://www.perl.com/perl/misc/Artistic.html>
=head1 VERSION
-2.15
+2.16
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-General-2.63/General.pm
new/Config-General-2.65/General.pm
--- old/Config-General-2.63/General.pm 2016-07-29 08:10:28.000000000 +0200
+++ new/Config-General-2.65/General.pm 2022-04-10 14:07:09.000000000 +0200
@@ -5,9 +5,9 @@
# config values from a given file and
# return it as hash structure
#
-# Copyright (c) 2000-2016 Thomas Linden <tlinden |AT| cpan.org>.
+# Copyright (c) 2000-2022 Thomas Linden <tlinden |AT| cpan.org>.
# All Rights Reserved. Std. disclaimer applies.
-# Artistic License, same as perl itself. Have fun.
+# Licensed under the Artistic License 2.0.
#
# namespace
package Config::General;
@@ -32,7 +32,7 @@
use Carp;
use Exporter;
-$Config::General::VERSION = "2.63";
+$Config::General::VERSION = "2.65";
use vars qw(@ISA @EXPORT_OK);
use base qw(Exporter);
@@ -339,7 +339,8 @@
if (exists $conf{-DefaultConfig}) {
if ($conf{-DefaultConfig} && ref($conf{-DefaultConfig}) eq 'HASH') {
- $self->{DefaultConfig} = $conf{-DefaultConfig};
+ # copy the hashref so that it is not being modified by subsequent calls,
fixes bug#142095
+ $self->{DefaultConfig} = $self->_copy($conf{-DefaultConfig});
}
elsif ($conf{-DefaultConfig} && ref($conf{-DefaultConfig}) eq q()) {
$self->_read($conf{-DefaultConfig}, 'SCALAR');
@@ -516,7 +517,9 @@
# A directory was included; include all the files inside that directory in
ASCII order
local *INCLUDEDIR;
opendir INCLUDEDIR, $configfile or croak "Config::General: Could not open
directory $configfile!($!)\n";
- my @files = sort grep { -f catfile($configfile, $_) } catfile($configfile,
$_), readdir INCLUDEDIR;
+ #my @files = sort grep { -f catfile($configfile, $_) }
catfile($configfile, $_), readdir INCLUDEDIR;
+ # fixes rt.cpan.org#139261
+ my @files = sort grep { -f catfile($configfile, $_) } readdir INCLUDEDIR;
closedir INCLUDEDIR;
local $this->{CurrentConfigFilePath} = $configfile;
for (@files) {
@@ -832,29 +835,35 @@
my($this, $rawlines) = @_;
my @filtered;
- my $includeFlag = 1;
- my $blockLevel = 0;
+ my @includeFlag = (1);
foreach (@{$rawlines}) {
- if (/^<\s*IfDefine\s+([!]*)("[^"]+"|\S+)\s*>/i) {
+ if (/^\s*<\s*IfDefine\s+([!]*)("[^"]+"|\S+)\s*>/i) {
# new IFDEF block, mark following content to be included if
# the DEF is known, otherwise skip it til end of IFDEF
my ($negate, $define) = ($1 eq '!',$2);
- $blockLevel++;
- $includeFlag &= ((not $negate) & (exists $this->{Define}{$define}));
- } elsif (/^<\s*\/IfDefine\s*>/i) {
- $blockLevel--;
- $includeFlag = $blockLevel == 0;
- } elsif ($includeFlag && /\s*Define\s+("[^"]+"|\S+)/i) {
+ push(@includeFlag,
+ $includeFlag[-1] &
+ ((not $negate) & (exists $this->{Define}{$define}))
+ );
+ }
+ elsif (/^\s*<\s*\/IfDefine\s*>/i) {
+ if (scalar(@includeFlag) <= 1) {
+ croak qq(Config::General: </IfDefine> without a <IfDefine>!\n);
+ }
+ pop(@includeFlag);
+ }
+ elsif ($includeFlag[-1] && /^\s*Define\s+("[^"]+"|\S+)/i) {
# inline Define, add it to our list
$this->{Define}{$1} = 1;
- } elsif ($includeFlag) {
+ }
+ elsif ($includeFlag[-1]) {
push @filtered, $_;
}
}
- if ($blockLevel) {
+ if (scalar(@includeFlag) > 1) {
croak qq(Config::General: Block <IfDefine> has no EndBlock statement!\n);
}
@@ -2845,10 +2854,10 @@
=head1 LICENSE AND COPYRIGHT
-Copyright (c) 2000-2016 Thomas Linden
+Copyright (c) 2000-2022 Thomas Linden
This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
+modify it under the same terms of the Artistic License 2.0.
=head1 BUGS AND LIMITATIONS
@@ -2874,7 +2883,7 @@
=head1 VERSION
-2.63
+2.65
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-General-2.63/META.json
new/Config-General-2.65/META.json
--- old/Config-General-2.63/META.json 2016-07-29 08:10:54.000000000 +0200
+++ new/Config-General-2.65/META.json 2022-04-10 14:18:58.000000000 +0200
@@ -4,13 +4,13 @@
"unknown"
],
"dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter
version 2.130880",
+ "generated_by" : "ExtUtils::MakeMaker version 7.44, CPAN::Meta::Converter
version 2.150010",
"license" : [
- "perl_5"
+ "artistic_2"
],
"meta-spec" : {
"url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";,
- "version" : "2"
+ "version" : 2
},
"name" : "Config-General",
"no_index" : {
@@ -42,8 +42,9 @@
"release_status" : "stable",
"resources" : {
"repository" : {
- "url" : "http://dev.catalyst.perl.org/repos/Config-General/trunk/";
+ "url" : "https://github.com/TLINDEN/Config-General";
}
},
- "version" : "2.63"
+ "version" : "2.65",
+ "x_serialization_backend" : "JSON::PP version 4.04"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-General-2.63/META.yml
new/Config-General-2.65/META.yml
--- old/Config-General-2.63/META.yml 2016-07-29 08:10:54.000000000 +0200
+++ new/Config-General-2.65/META.yml 2022-04-10 14:18:58.000000000 +0200
@@ -3,25 +3,26 @@
author:
- unknown
build_requires:
- ExtUtils::MakeMaker: 0
+ ExtUtils::MakeMaker: '0'
configure_requires:
- ExtUtils::MakeMaker: 0
+ ExtUtils::MakeMaker: '0'
dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version
2.130880'
-license: perl
+generated_by: 'ExtUtils::MakeMaker version 7.44, CPAN::Meta::Converter version
2.150010'
+license: artistic_2
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
+ version: '1.4'
name: Config-General
no_index:
directory:
- t
- inc
requires:
- File::Glob: 0
- File::Spec::Functions: 0
- FileHandle: 0
- IO::File: 0
+ File::Glob: '0'
+ File::Spec::Functions: '0'
+ FileHandle: '0'
+ IO::File: '0'
resources:
- repository: http://dev.catalyst.perl.org/repos/Config-General/trunk/
-version: 2.63
+ repository: https://github.com/TLINDEN/Config-General
+version: '2.65'
+x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-General-2.63/Makefile.PL
new/Config-General-2.65/Makefile.PL
--- old/Config-General-2.63/Makefile.PL 2014-04-30 14:16:54.000000000 +0200
+++ new/Config-General-2.65/Makefile.PL 2022-04-10 13:29:17.000000000 +0200
@@ -1,31 +1,30 @@
#
# Makefile.PL - build file for Config::General
#
-# Copyright (c) 2000-2014 Thomas Linden <t...@daemon.de>.
+# Copyright (c) 2000-2022 Thomas Linden <t...@daemon.de>.
# All Rights Reserved. Std. disclaimer applies.
-# Artistic License, same as perl itself. Have fun.
+# Licensed under the Artistic License 2.0.
#
use ExtUtils::MakeMaker;
WriteMakefile(
- 'NAME' => 'Config::General',
- 'VERSION_FROM' => 'General.pm',
- 'clean' => {
- FILES => 't/*.out t/test.cfg
*~ */*~'
- },
- 'PREREQ_PM' => {
- 'IO::File' => 0,
- 'FileHandle' => 0,
- 'File::Spec::Functions' => 0,
- 'File::Glob' => 0
- },
- 'META_MERGE' => {
- resources => {
- repository =>
'http://dev.catalyst.perl.org/repos/Config-General/trunk/',
- },
- },
- ($ExtUtils::MakeMaker::VERSION ge '6.31'?
- ('LICENSE' => 'perl', ) : ()),
-);
-
+ 'NAME' => 'Config::General',
+ 'VERSION_FROM' => 'General.pm',
+ 'clean' => {
+ FILES => 't/*.out
t/test.cfg *~ */*~'
+ },
+ 'PREREQ_PM' => {
+ 'IO::File' => 0,
+ 'FileHandle' => 0,
+ 'File::Spec::Functions' => 0,
+ 'File::Glob' => 0
+ },
+ 'META_MERGE' => {
+ resources => {
+ repository =>
'https://github.com/TLINDEN/Config-General'
+ },
+ },
+ ($ExtUtils::MakeMaker::VERSION ge '6.31'?
+ ('LICENSE' => 'artistic_2', ) : ()),
+ );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-General-2.63/README
new/Config-General-2.65/README
--- old/Config-General-2.63/README 2016-07-29 08:06:53.000000000 +0200
+++ new/Config-General-2.65/README 2022-04-10 13:26:22.000000000 +0200
@@ -80,14 +80,14 @@
COPYRIGHT
Config::General
Config::General::Extended
- Copyright (c) 2000-2015 by Thomas Linden <t...@daemon.de>
+ Copyright (c) 2000-2022 by Thomas Linden <t...@daemon.de>
Config::General::Interpolated
Copyright (c) 2001 by Wei-Hon Chen <plasmab...@pchome.com.tw>
- Copyright (c) 2002-2014 by Thomas Linden <t...@daemon.de>.
+ Copyright (c) 2002-2022 by Thomas Linden <t...@daemon.de>.
This library is free software; you can redistribute it
- and/or modify it under the same terms as Perl itself.
+ and/or modify it under the terms of the Artistic 2.0 license.
HOMEPAGE
@@ -104,4 +104,4 @@
VERSION
- 2.63
+ 2.65
