From 666661166b4818c22f3cfbb747606e6b823ec26c Mon Sep 17 00:00:00 2001
From: zhangyao <zhangyao108@huawei.com>
Date: Thu, 18 Jul 2024 13:22:52 +0800
Subject: [PATCH] revert Always rely on Clone::clone() as the provider of
 HTTP::Headers::clone()

---
 perl-HTTP-Message.spec                        | 15 +++-
 ...ly-on-Clone-clone-as-the-provider-of.patch | 68 +++++++++++++++++++
 2 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 revert-Always-rely-on-Clone-clone-as-the-provider-of.patch

diff --git a/perl-HTTP-Message.spec b/perl-HTTP-Message.spec
index ad539fb..520b680 100644
--- a/perl-HTTP-Message.spec
+++ b/perl-HTTP-Message.spec
@@ -3,11 +3,14 @@
 
 Name:           perl-HTTP-Message
 Version:        6.44
-Release:        1
+Release:        2
 Summary:        HTTP style message
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/HTTP-Message
 Source0:        https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTTP-Message-%{version}.tar.gz
+
+Patch9000:      revert-Always-rely-on-Clone-clone-as-the-provider-of.patch
+
 BuildArch:      noarch
 BuildRequires:  perl-generators perl-interpreter perl(ExtUtils::MakeMaker) >= 6.76
 BuildRequires:  perl(strict) perl(base) perl(Carp)
@@ -18,7 +21,7 @@ BuildRequires:  perl(IO::Uncompress::Bunzip2) >= 2.021 perl(IO::Uncompress::Gunz
 BuildRequires:  perl(IO::Uncompress::RawInflate) perl(LWP::MediaTypes) >= 6 perl(MIME::Base64) >= 2.1
 BuildRequires:  perl(MIME::QuotedPrint) perl(Storable) perl(URI) >= 1.10 perl(Config)
 BuildRequires:  perl(File::Spec) perl(PerlIO::encoding) perl(Test::More) perl(Try::Tiny)
-BuildRequires:  perl(Clone) perl(File::Temp) perl(overload) perl(Test::Needs)
+BuildRequires:  perl(File::Temp) perl(overload) perl(Test::Needs)
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(Compress::Raw::Zlib) perl(Encode) >= 2.21 perl(Encode::Locale) >= 1
@@ -26,7 +29,7 @@ Requires:       perl(HTTP::Date) >= 6 perl(IO::Compress::Bzip2) >= 2.021 perl(IO
 Requires:       perl(IO::Compress::Gzip) perl(IO::HTML) perl(IO::Uncompress::Bunzip2) >= 2.021
 Requires:       perl(IO::Uncompress::Gunzip) perl(IO::Uncompress::Inflate) perl(IO::Uncompress::RawInflate)
 Requires:       perl(LWP::MediaTypes) >= 6 perl(MIME::Base64) >= 2.1 perl(MIME::QuotedPrint)
-Requires:       perl(Storable) perl(URI) >= 1.10 perl(Clone) => 0.45
+Requires:       perl(Storable) perl(URI) >= 1.10
 Conflicts:      perl-libwww-perl < 6
 
 %description
@@ -67,6 +70,12 @@ make test
 
 
 %changelog
+* Thu Jul 18 2024 zhangyao <zhangyao108@huawei.com> - 6.44-2
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:revert Always rely on Clone::clone() as the provider of HTTP::Headers::clone()
+
 * Mon May 29 2023 chenchen <chen_aka_jan@163.com> - 6.44-1
 - Upgrade to version 6.44
 
diff --git a/revert-Always-rely-on-Clone-clone-as-the-provider-of.patch b/revert-Always-rely-on-Clone-clone-as-the-provider-of.patch
new file mode 100644
index 0000000..3cb0fd5
--- /dev/null
+++ b/revert-Always-rely-on-Clone-clone-as-the-provider-of.patch
@@ -0,0 +1,68 @@
+From 6d7c3c8b2da98a523b1bed934b293611e288141f Mon Sep 17 00:00:00 2001
+From: zhangyao <zhangyao108@huawei.com>
+Date: Thu, 18 Jul 2024 13:03:12 +0800
+Subject: [PATCH] revert Always rely on Clone::clone() as the provider of
+ HTTP::Headers::clone()
+
+---
+ dist.ini            |  6 +++++-
+ lib/HTTP/Headers.pm | 12 +++++++++++-
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/dist.ini b/dist.ini
+index e4ea7a7..ff74005 100644
+--- a/dist.ini
++++ b/dist.ini
+@@ -22,7 +22,6 @@ LWP::MediaTypes = 6
+ MIME::Base64 = 2.1
+ perl = 5.008001
+ URI = 1.10
+-Clone = 0.46
+ 
+ [@Author::OALDERS]
+ ; all these tests are TODO
+@@ -36,6 +35,11 @@ Clone = 0.46
+ StaticInstall.mode = on
+ StaticInstall.dry_run = 0
+ 
++[Prereqs::Soften]
++to_relationship = suggests
++copy_to = develop.requires
++module = Clone
++
+ [Prereqs::Soften / Brotli]
+ to_relationship = recommends
+ copy_to = test.recommends
+diff --git a/lib/HTTP/Headers.pm b/lib/HTTP/Headers.pm
+index e53b2b8..c6ec293 100644
+--- a/lib/HTTP/Headers.pm
++++ b/lib/HTTP/Headers.pm
+@@ -5,7 +5,6 @@ use warnings;
+ 
+ our $VERSION = '6.44';
+ 
+-use Clone qw(clone);
+ use Carp ();
+ 
+ # The $TRANSLATE_UNDERSCORE variable controls whether '_' can be used
+@@ -298,6 +297,17 @@ sub _process_newline {
+     $_;
+ }
+ 
++if (eval { require Clone; 1 }) {
++    *clone = \&Clone::clone;
++} else {
++    *clone = sub {
++	my $self = shift;
++	my $clone = HTTP::Headers->new;
++	$self->scan(sub { $clone->push_header(@_);} );
++	$clone;
++    };
++}
++
+ 
+ sub _date_header
+ {
+-- 
+2.33.0
+
-- 
Gitee