[libdbix-class-schema-loader-perl] 01/04: Add patch 0001-Disable-cloning-when-merging-hashes.patch

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libdbix-class-schema-loader-perl.

commit 5c422180e28ee04e2d6197f9f7c27e5e09b15d07
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Jan 20 17:34:54 2018 +0100

    Add patch 0001-Disable-cloning-when-merging-hashes.patch
    
    to handle Hash::Merge's changed cloning behaviour.
    
    Thanks: Niko Tyni for writing the patch.
    Closes: #882618
---
 .../0001-Disable-cloning-when-merging-hashes.patch | 46 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 47 insertions(+)

diff --git a/debian/patches/0001-Disable-cloning-when-merging-hashes.patch b/debian/patches/0001-Disable-cloning-when-merging-hashes.patch
new file mode 100644
index 0000000..2a36baf
--- /dev/null
+++ b/debian/patches/0001-Disable-cloning-when-merging-hashes.patch
@@ -0,0 +1,46 @@
+From 421f0c87f50862786b98934575d3f73a02119181 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni at debian.org>
+Date: Fri, 22 Dec 2017 19:40:14 +0200
+Subject: [PATCH] Disable cloning when merging hashes
+
+Newer versions of Hash::Merge changed their cloning
+behaviour, causing corruption of DBI handles.
+
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=123681
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=882618
+---
+ lib/DBIx/Class/Schema/Loader.pm | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/lib/DBIx/Class/Schema/Loader.pm b/lib/DBIx/Class/Schema/Loader.pm
+index d100408..1f879cf 100644
+--- a/lib/DBIx/Class/Schema/Loader.pm
++++ b/lib/DBIx/Class/Schema/Loader.pm
+@@ -10,7 +10,7 @@ use Scalar::Util 'weaken';
+ use Sub::Util 'set_subname';
+ use DBIx::Class::Schema::Loader::Utils 'array_eq';
+ use Try::Tiny;
+-use Hash::Merge 'merge';
++use Hash::Merge;
+ use namespace::clean;
+ 
+ # Always remember to do all digits for the version even if they're 0
+@@ -232,10 +232,13 @@ sub _merge_state_from {
+ 
+     $self->_copy_state_from($from);
+ 
+-    $self->class_mappings(merge($orig_class_mappings, $self->class_mappings))
++    my $merger = Hash::Merge->new;
++    $merger->set_clone_behavior(0);
++
++    $self->class_mappings($merger->merge($orig_class_mappings, $self->class_mappings))
+         if $orig_class_mappings;
+ 
+-    $self->source_registrations(merge($orig_source_registrations, $self->source_registrations))
++    $self->source_registrations($merger->merge($orig_source_registrations, $self->source_registrations))
+         if $orig_source_registrations;
+ }
+ 
+-- 
+2.15.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2c6edf9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Disable-cloning-when-merging-hashes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libdbix-class-schema-loader-perl.git