Hello community,
here is the log from the commit of package perl-Hash-Merge for openSUSE:Factory
checked in at 2020-08-06 10:39:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Hash-Merge (Old)
and /work/SRC/openSUSE:Factory/.perl-Hash-Merge.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Hash-Merge"
Thu Aug 6 10:39:56 2020 rev:8 rq:824541 version:0.302
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Hash-Merge/perl-Hash-Merge.changes
2018-10-12 13:10:52.807283876 +0200
+++
/work/SRC/openSUSE:Factory/.perl-Hash-Merge.new.3399/perl-Hash-Merge.changes
2020-08-06 10:40:45.234078980 +0200
@@ -1,0 +2,17 @@
+Wed Aug 5 10:47:58 UTC 2020 - Tina Müller <tina.muel...@suse.com>
+
+- Limit description to two paragraphs
+
+-------------------------------------------------------------------
+Sat Aug 1 03:14:47 UTC 2020 - Tina Müller <timueller+p...@suse.de>
+
+- updated to 0.302
+ see /usr/share/doc/packages/perl-Hash-Merge/Changes
+
+ 0.302 2020-07-30
+ - Prevent object-based test from failing randomly on BSDs and MacOS
+
+ 0.301 2020-06-18
+ - fix object-based interface memory leak (RT#132627) (Thanks to mithaldu)
+
+-------------------------------------------------------------------
Old:
----
Hash-Merge-0.300.tar.gz
New:
----
Hash-Merge-0.302.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Hash-Merge.spec ++++++
--- /var/tmp/diff_new_pack.bLXFe5/_old 2020-08-06 10:40:48.130080430 +0200
+++ /var/tmp/diff_new_pack.bLXFe5/_new 2020-08-06 10:40:48.134080432 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-Hash-Merge
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,14 +17,14 @@
Name: perl-Hash-Merge
-Version: 0.300
+Version: 0.302
Release: 0
%define cpan_name Hash-Merge
Summary: Merges arbitrarily deep hashes into a single hash
License: Artistic-1.0 OR GPL-1.0-or-later
Group: Development/Libraries/Perl
-Url: https://metacpan.org/release/%{cpan_name}
-Source0:
https://cpan.metacpan.org/authors/id/R/RE/REHSACK/%{cpan_name}-%{version}.tar.gz
+URL: https://metacpan.org/release/%{cpan_name}
+Source0:
https://cpan.metacpan.org/authors/id/H/HE/HERMES/%{cpan_name}-%{version}.tar.gz
Source1: cpanspec.yml
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -50,20 +50,16 @@
however, if necessary, this behavior can be changed to use as many of the
original values as possible. (See 'set_clone_behavior').
-Because there are a number of possible ways that one may want to merge
-values when keys are conflicting, Hash::Merge provides several preset
-methods for your convenience, as well as a way to define you own.
-
%prep
%setup -q -n %{cpan_name}-%{version}
-find . -type f ! -name \*.pl -print0 | xargs -0 chmod 644
+find . -type f ! -path "*/t/*" ! -name "*.pl" ! -path "*/bin/*" ! -path
"*/script/*" ! -name "configure" -print0 | xargs -0 chmod 644
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__make} %{?_smp_mflags}
+perl Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
%check
-%{__make} test
+make test
%install
%perl_make_install
++++++ Hash-Merge-0.300.tar.gz -> Hash-Merge-0.302.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Hash-Merge-0.300/Changes new/Hash-Merge-0.302/Changes
--- old/Hash-Merge-0.300/Changes 2018-03-09 16:45:44.000000000 +0100
+++ new/Hash-Merge-0.302/Changes 2020-07-30 19:03:42.000000000 +0200
@@ -1,5 +1,11 @@
Revision history for Perl extension Hash::Merge.
+0.302 2020-07-30
+ - Prevent object-based test from failing randomly on BSDs and MacOS
+
+0.301 2020-06-18
+ - fix object-based interface memory leak (RT#132627) (Thanks to mithaldu)
+
0.300 2018-03-09
- fix old EU::MM support (RT#123915)
- rename specify_behavior and improve SYNOPSIS (RT#123785)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Hash-Merge-0.300/MANIFEST
new/Hash-Merge-0.302/MANIFEST
--- old/Hash-Merge-0.300/MANIFEST 2018-03-09 17:03:02.000000000 +0100
+++ new/Hash-Merge-0.302/MANIFEST 2020-07-30 19:10:13.000000000 +0200
@@ -2,7 +2,7 @@
lib/Hash/Merge.pm
MAINTAINER.md
Makefile.PL
-MANIFEST
+MANIFEST This list of files
MANIFEST.SKIP
README.md
t/Auto/00-load.t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Hash-Merge-0.300/MANIFEST.SKIP
new/Hash-Merge-0.302/MANIFEST.SKIP
--- old/Hash-Merge-0.300/MANIFEST.SKIP 2018-03-09 16:19:42.000000000 +0100
+++ new/Hash-Merge-0.302/MANIFEST.SKIP 2020-07-08 18:28:58.000000000 +0200
@@ -26,9 +26,10 @@
^_build/.*
~$
.*\.planner
-^\..*
+\.perltidyrc
+\.travis.yml
Hash-Merge-.*
\bxt
Sandbox
-^MYMETA\.json$
-^MYMETA\..*$
+MYMETA\.json\.lock
+^MYMETA\.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Hash-Merge-0.300/META.json
new/Hash-Merge-0.302/META.json
--- old/Hash-Merge-0.300/META.json 2018-03-09 17:03:02.000000000 +0100
+++ new/Hash-Merge-0.302/META.json 2020-07-30 19:10:13.000000000 +0200
@@ -7,7 +7,7 @@
"Stefan Hermes <her...@cpan.org>"
],
"dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 7.3, CPAN::Meta::Converter
version 2.150010",
+ "generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter
version 2.150010",
"license" : [
"perl_5"
],
@@ -80,6 +80,6 @@
"web" : "https://github.com/perl5-utils/Hash-Merge";
}
},
- "version" : "0.300",
- "x_serialization_backend" : "JSON::PP version 2.97000"
+ "version" : "0.302",
+ "x_serialization_backend" : "JSON::PP version 4.02"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Hash-Merge-0.300/META.yml
new/Hash-Merge-0.302/META.yml
--- old/Hash-Merge-0.300/META.yml 2018-03-09 17:03:01.000000000 +0100
+++ new/Hash-Merge-0.302/META.yml 2020-07-30 19:10:12.000000000 +0200
@@ -10,7 +10,7 @@
configure_requires:
ExtUtils::MakeMaker: '6.64'
dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.3, CPAN::Meta::Converter version
2.150010'
+generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version
2.150010'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -29,5 +29,5 @@
homepage: https://metacpan.org/release/Hash-Merge
license: http://dev.perl.org/licenses/
repository: https://github.com/perl5-utils/Hash-Merge.git
-version: '0.300'
+version: '0.302'
x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Hash-Merge-0.300/README.md
new/Hash-Merge-0.302/README.md
--- old/Hash-Merge-0.300/README.md 2017-11-16 21:53:48.000000000 +0100
+++ new/Hash-Merge-0.302/README.md 2020-07-08 18:28:58.000000000 +0200
@@ -209,8 +209,8 @@
# COPYRIGHT
Copyright (c) 2001,2002 Michael K. Neylon. All rights reserved.
-Copyright (c) 2013-2017 Jens Rehsack. All rights reserved.
-Copyright (c) 2017 Stefan Hermes. All rights reserved.
+Copyright (c) 2013-2020 Jens Rehsack. All rights reserved.
+Copyright (c) 2017-2020 Stefan Hermes. All rights reserved.
This library is free software. You can redistribute it and/or modify it
under the same terms as Perl itself.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Hash-Merge-0.300/lib/Hash/Merge.pm
new/Hash-Merge-0.302/lib/Hash/Merge.pm
--- old/Hash-Merge-0.300/lib/Hash/Merge.pm 2018-03-09 16:47:20.000000000
+0100
+++ new/Hash-Merge-0.302/lib/Hash/Merge.pm 2020-07-30 19:01:01.000000000
+0200
@@ -5,12 +5,12 @@
use Carp;
use Clone::Choose 0.008;
-use Scalar::Util qw(blessed);
+use Scalar::Util qw(blessed weaken);
use base 'Exporter';
our $CONTEXT;
-our $VERSION = '0.300';
+our $VERSION = '0.302';
our @EXPORT_OK = qw( merge _hashify _merge_hashes );
our %EXPORT_TAGS = ('custom' => [qw( _hashify _merge_hashes )]);
@@ -18,6 +18,9 @@
{
my $self = shift;
+ my $weak = $self;
+ weaken $weak;
+
defined $self->{behaviors}
or $self->{behaviors} = {
'LEFT_PRECEDENT' => {
@@ -34,7 +37,7 @@
'HASH' => {
'SCALAR' => sub { $_[0] },
'ARRAY' => sub { $_[0] },
- 'HASH' => sub { $self->_merge_hashes($_[0], $_[1]) },
+ 'HASH' => sub { $weak->_merge_hashes($_[0], $_[1]) },
},
},
@@ -52,7 +55,7 @@
'HASH' => {
'SCALAR' => sub { $_[1] },
'ARRAY' => sub { [values %{$_[0]}, @{$_[1]}] },
- 'HASH' => sub { $self->_merge_hashes($_[0], $_[1]) },
+ 'HASH' => sub { $weak->_merge_hashes($_[0], $_[1]) },
},
},
@@ -70,25 +73,25 @@
'HASH' => {
'SCALAR' => sub { $_[0] },
'ARRAY' => sub { $_[0] },
- 'HASH' => sub { $self->_merge_hashes($_[0], $_[1]) },
+ 'HASH' => sub { $weak->_merge_hashes($_[0], $_[1]) },
},
},
'RETAINMENT_PRECEDENT' => {
'SCALAR' => {
- 'SCALAR' => sub { [$_[0],
$_[1]] },
- 'ARRAY' => sub { [$_[0],
@{$_[1]}] },
- 'HASH' => sub { $self->_merge_hashes($self->_hashify($_[0]),
$_[1]) },
+ 'SCALAR' => sub { [$_[0], $_[1]] },
+ 'ARRAY' => sub { [$_[0], @{$_[1]}] },
+ 'HASH' => sub { $weak->_merge_hashes($weak->_hashify($_[0]),
$_[1]) },
},
'ARRAY' => {
- 'SCALAR' => sub { [@{$_[0]},
$_[1]] },
- 'ARRAY' => sub { [@{$_[0]},
@{$_[1]}] },
- 'HASH' => sub { $self->_merge_hashes($self->_hashify($_[0]),
$_[1]) },
+ 'SCALAR' => sub { [@{$_[0]}, $_[1]] },
+ 'ARRAY' => sub { [@{$_[0]}, @{$_[1]}] },
+ 'HASH' => sub { $weak->_merge_hashes($weak->_hashify($_[0]),
$_[1]) },
},
'HASH' => {
- 'SCALAR' => sub { $self->_merge_hashes($_[0],
$self->_hashify($_[1])) },
- 'ARRAY' => sub { $self->_merge_hashes($_[0],
$self->_hashify($_[1])) },
- 'HASH' => sub { $self->_merge_hashes($_[0], $_[1]) },
+ 'SCALAR' => sub { $weak->_merge_hashes($_[0],
$weak->_hashify($_[1])) },
+ 'ARRAY' => sub { $weak->_merge_hashes($_[0],
$weak->_hashify($_[1])) },
+ 'HASH' => sub { $weak->_merge_hashes($_[0], $_[1]) },
},
},
};
@@ -118,7 +121,7 @@
my $self = &_get_obj; # '&' + no args modifies current @_
my $value = shift;
- my @behaviors = grep { /$value/i } keys %{$self->{'behaviors'}};
+ my @behaviors = grep { /^$value$/i } keys %{$self->{'behaviors'}};
if (scalar @behaviors == 0)
{
carp 'Behavior must be one of : ' . join(', ', keys
%{$self->{'behaviors'}});
@@ -563,8 +566,8 @@
=head1 COPYRIGHT
Copyright (c) 2001,2002 Michael K. Neylon. All rights reserved.
-Copyright (c) 2013-2017 Jens Rehsack. All rights reserved.
-Copyright (c) 2017 Stefan Hermes. All rights reserved.
+Copyright (c) 2013-2020 Jens Rehsack. All rights reserved.
+Copyright (c) 2017-2020 Stefan Hermes. All rights reserved.
This library is free software. You can redistribute it and/or modify it
under the same terms as Perl itself.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Hash-Merge-0.300/t/Auto/02-oo.t
new/Hash-Merge-0.302/t/Auto/02-oo.t
--- old/Hash-Merge-0.300/t/Auto/02-oo.t 2018-03-09 16:58:16.000000000 +0100
+++ new/Hash-Merge-0.302/t/Auto/02-oo.t 2020-07-30 19:09:59.000000000 +0200
@@ -349,6 +349,16 @@
main::ok($merged);
}
+{
+ my $destroyed = 0;
+ no warnings 'once';
+ local *Hash::Merge::DESTROY = sub { $destroyed = 1; };
+ use warnings;
+ Hash::Merge->new;
+ sleep 1;
+ ok $destroyed, "instance did not leak";
+}
+
done_testing;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Hash-Merge-0.300/t/Clone/02-oo.t
new/Hash-Merge-0.302/t/Clone/02-oo.t
--- old/Hash-Merge-0.300/t/Clone/02-oo.t 2018-03-09 16:58:16.000000000
+0100
+++ new/Hash-Merge-0.302/t/Clone/02-oo.t 2020-07-30 19:09:59.000000000
+0200
@@ -351,6 +351,16 @@
main::ok($merged);
}
+{
+ my $destroyed = 0;
+ no warnings 'once';
+ local *Hash::Merge::DESTROY = sub { $destroyed = 1; };
+ use warnings;
+ Hash::Merge->new;
+ sleep 1;
+ ok $destroyed, "instance did not leak";
+}
+
done_testing;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Hash-Merge-0.300/t/ClonePP/02-oo.t
new/Hash-Merge-0.302/t/ClonePP/02-oo.t
--- old/Hash-Merge-0.300/t/ClonePP/02-oo.t 2018-03-09 16:58:16.000000000
+0100
+++ new/Hash-Merge-0.302/t/ClonePP/02-oo.t 2020-07-30 19:09:59.000000000
+0200
@@ -351,6 +351,16 @@
main::ok($merged);
}
+{
+ my $destroyed = 0;
+ no warnings 'once';
+ local *Hash::Merge::DESTROY = sub { $destroyed = 1; };
+ use warnings;
+ Hash::Merge->new;
+ sleep 1;
+ ok $destroyed, "instance did not leak";
+}
+
done_testing;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Hash-Merge-0.300/t/Storable/02-oo.t
new/Hash-Merge-0.302/t/Storable/02-oo.t
--- old/Hash-Merge-0.300/t/Storable/02-oo.t 2018-03-09 16:58:16.000000000
+0100
+++ new/Hash-Merge-0.302/t/Storable/02-oo.t 2020-07-30 19:09:59.000000000
+0200
@@ -351,6 +351,16 @@
main::ok($merged);
}
+{
+ my $destroyed = 0;
+ no warnings 'once';
+ local *Hash::Merge::DESTROY = sub { $destroyed = 1; };
+ use warnings;
+ Hash::Merge->new;
+ sleep 1;
+ ok $destroyed, "instance did not leak";
+}
+
done_testing;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Hash-Merge-0.300/t/inline/02-oo.t
new/Hash-Merge-0.302/t/inline/02-oo.t
--- old/Hash-Merge-0.300/t/inline/02-oo.t 2018-03-09 14:13:09.000000000
+0100
+++ new/Hash-Merge-0.302/t/inline/02-oo.t 2020-07-30 15:30:48.000000000
+0200
@@ -344,4 +344,14 @@
main::ok($merged);
}
+{
+ my $destroyed = 0;
+ no warnings 'once';
+ local *Hash::Merge::DESTROY = sub { $destroyed = 1; };
+ use warnings;
+ Hash::Merge->new;
+ sleep 1;
+ ok $destroyed, "instance did not leak";
+}
+
done_testing;
++++++ cpanspec.yml ++++++
--- /var/tmp/diff_new_pack.bLXFe5/_old 2020-08-06 10:40:48.230080481 +0200
+++ /var/tmp/diff_new_pack.bLXFe5/_new 2020-08-06 10:40:48.230080481 +0200
@@ -1,5 +1,5 @@
---
-#description_paragraphs: 3
+description_paragraphs: 2
#description: |-
# override description from CPAN
#summary: override summary from CPAN
