From 2d2b55ed19c3facc124e7c9c5b075ca6edb80bf7 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Mon, 22 Jun 2020 11:16:06 +0200
Subject: [PATCH] Upgrade to 2.25 as provided in perl-5.32.0

---
 perl-threads.spec                  |  10 ++-
 threads-2.21-Upgrade-to-2.25.patch | 103 +++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+), 2 deletions(-)
 create mode 100644 threads-2.21-Upgrade-to-2.25.patch

diff --git a/perl-threads.spec b/perl-threads.spec
index b482517..410fd8b 100644
--- a/perl-threads.spec
+++ b/perl-threads.spec
@@ -1,14 +1,16 @@
 %global base_version 2.21
 Name:           perl-threads
 Epoch:          1
-Version:        2.22
-Release:        442%{?dist}
+Version:        2.25
+Release:        456%{?dist}
 Summary:        Perl interpreter-based threads
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/threads
 Source0:        https://cpan.metacpan.org/authors/id/J/JD/JDHEDDEN/threads-%{base_version}.tar.gz
 # Unbundled from perl 5.28.0
 Patch0:         threads-2.21-Upgrade-to-2.22.patch
+# Unbundled from perl 5.32.0
+Patch1:         threads-2.21-Upgrade-to-2.25.patch
 BuildRequires:  coreutils
 BuildRequires:  findutils
 BuildRequires:  gcc
@@ -55,6 +57,7 @@ This threading model has been deprecated, and was removed as of Perl 5.10.0.)
 %prep
 %setup -q -n threads-%{base_version}
 %patch0 -p1
+%patch1 -p1
 chmod -x examples/*
 
 %build
@@ -78,6 +81,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1:2.25-456
+- Upgrade to 2.25 as provided in perl-5.32.0
+
 * Thu Feb 06 2020 Petr Pisar <ppisar@redhat.com> - 1:2.22-442
 - Specify all dependencies
 
diff --git a/threads-2.21-Upgrade-to-2.25.patch b/threads-2.21-Upgrade-to-2.25.patch
new file mode 100644
index 0000000..02ac54e
--- /dev/null
+++ b/threads-2.21-Upgrade-to-2.25.patch
@@ -0,0 +1,103 @@
+From 0bb2d0b00e011f1d77d1766fac4777c6bc376af7 Mon Sep 17 00:00:00 2001
+From: Jitka Plesnikova <jplesnik@redhat.com>
+Date: Mon, 1 Jun 2020 13:23:16 +0200
+Subject: [PATCH] Upgrade to 2.25
+
+---
+ lib/threads.pm | 22 +++++++++++-----------
+ threads.xs     |  2 +-
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/lib/threads.pm b/lib/threads.pm
+index 1b99567..ee201a2 100644
+--- a/lib/threads.pm
++++ b/lib/threads.pm
+@@ -5,7 +5,7 @@ use 5.008;
+ use strict;
+ use warnings;
+ 
+-our $VERSION = '2.22';      # remember to update version in POD!
++our $VERSION = '2.25';      # remember to update version in POD!
+ my $XS_VERSION = $VERSION;
+ $VERSION = eval $VERSION;
+ 
+@@ -134,13 +134,13 @@ threads - Perl interpreter-based threads
+ 
+ =head1 VERSION
+ 
+-This document describes threads version 2.21
++This document describes threads version 2.25
+ 
+ =head1 WARNING
+ 
+ The "interpreter-based threads" provided by Perl are not the fast, lightweight
+ system for multitasking that one might expect or hope for.  Threads are
+-implemented in a way that make them easy to misuse.  Few people know how to
++implemented in a way that makes them easy to misuse.  Few people know how to
+ use them correctly or will be able to provide help.
+ 
+ The use of interpreter-based threads in perl is officially
+@@ -914,7 +914,7 @@ C<-E<gt>import()>) after any threads are started, and in such a way that no
+ other threads are started afterwards.
+ 
+ If the above does not work, or is not adequate for your application, then file
+-a bug report on L<http://rt.cpan.org/Public/> against the problematic module.
++a bug report on L<https://rt.cpan.org/Public/> against the problematic module.
+ 
+ =item Memory consumption
+ 
+@@ -1090,7 +1090,7 @@ determine whether your system supports it.
+ 
+ In prior perl versions, spawning threads with open directory handles would
+ crash the interpreter.
+-L<[perl #75154]|http://rt.perl.org/rt3/Public/Bug/Display.html?id=75154>
++L<[perl #75154]|https://rt.perl.org/rt3/Public/Bug/Display.html?id=75154>
+ 
+ =item Detached threads and global destruction
+ 
+@@ -1118,8 +1118,8 @@ unreferenced scalars.  However, such warnings are harmless, and may safely be
+ ignored.
+ 
+ You can search for L<threads> related bug reports at
+-L<http://rt.cpan.org/Public/>.  If needed submit any new bugs, problems,
+-patches, etc. to: L<http://rt.cpan.org/Public/Dist/Display.html?Name=threads>
++L<https://rt.cpan.org/Public/>.  If needed submit any new bugs, problems,
++patches, etc. to: L<https://rt.cpan.org/Public/Dist/Display.html?Name=threads>
+ 
+ =back
+ 
+@@ -1137,14 +1137,14 @@ L<https://github.com/Dual-Life/threads>
+ 
+ L<threads::shared>, L<perlthrtut>
+ 
+-L<http://www.perl.com/pub/a/2002/06/11/threads.html> and
+-L<http://www.perl.com/pub/a/2002/09/04/threads.html>
++L<https://www.perl.com/pub/a/2002/06/11/threads.html> and
++L<https://www.perl.com/pub/a/2002/09/04/threads.html>
+ 
+ Perl threads mailing list:
+-L<http://lists.perl.org/list/ithreads.html>
++L<https://lists.perl.org/list/ithreads.html>
+ 
+ Stack size discussion:
+-L<http://www.perlmonks.org/?node_id=532956>
++L<https://www.perlmonks.org/?node_id=532956>
+ 
+ Sample code in the I<examples> directory of this distribution on CPAN.
+ 
+diff --git a/threads.xs b/threads.xs
+index 3da9165..ab64dc0 100644
+--- a/threads.xs
++++ b/threads.xs
+@@ -676,7 +676,7 @@ S_ithread_run(void * arg)
+     }
+ 
+     /* At this point, the interpreter may have been freed, so call
+-     * free in the the context of of the 'main' interpreter which
++     * free in the context of the 'main' interpreter which
+      * can't have been freed due to the veto_cleanup mechanism.
+      */
+     aTHX = MY_POOL.main_thread.interp;
+-- 
+2.25.4
+