From c527fd1f14c27855a37f2e8ac5346ce8d940ced2 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Thu, 16 Oct 2014 03:05:19 +0200 Subject: initial commit for Enea Linux 4.0-140929 Migrated from the internal git server on the daisy-enea-point-release branch Signed-off-by: Tudor Florea --- .../ossp-uuid/0004-fix-data-uuid-from-string.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch (limited to 'meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch') diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch new file mode 100644 index 0000000000..bc5e111ee5 --- /dev/null +++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch @@ -0,0 +1,43 @@ +Description: Support dash-less args to from_string. +Author: Tim Retout +Bug-Debian: http://bugs.debian.org/635607 + +The module Data::GUID depends on Data::UUID supporting this behaviour. + +---- +Upstream-Status: Inappropriate [not author] + +This patch is from debian ossp-uuid 1.6.2 integration. + +Signed-off-by: Mark Hatle + +--- a/perl/uuid_compat.pm ++++ b/perl/uuid_compat.pm +@@ -93,7 +93,9 @@ + $uuid->import('str', + $str =~ /^0x/ + ? join '-', unpack('x2 a8 a4 a4 a4 a12', $str) +- : $str ++ : $str =~ /-/ ++ ? $str ++ : join '-', unpack('A8 A4 A4 A4 A12', $str) + ); + return $uuid->export('bin'); + } +--- a/perl/uuid_compat.ts ++++ b/perl/uuid_compat.ts +@@ -28,7 +28,7 @@ + ## uuid_compat.ts: Data::UUID Backward Compatibility Perl API (Perl test suite part) + ## + +-use Test::More tests => 14; ++use Test::More tests => 16; + + BEGIN { + use_ok('Data::UUID'); +@@ -53,3 +53,5 @@ + ok($uuid8 = $ug->from_string("6ba7b811-9dad-11d1-80b4-00c04fd430c8")); + ok($ug->compare($uuid7, $uuid8) == 0); + ++ok($uuid9 = $ug->from_string("6ba7b8119dad11d180b400c04fd430c8")); ++ok($ug->compare($uuid7, $uuid9) == 0); -- cgit v1.2.3-54-g00ecf