Patched to work on Debian Bookworm

SimonPinches · Jan 26, 2024 · 4dab87b · 4dab87b
1 parent 4ed58b6
commit 4dab87b
Show file tree

Hide file tree

Showing 3 changed files with 256 additions and 2 deletions.
diff --git a/easybuild/easyconfigs/p/Perl-bundle-CPAN/Perl-bundle-5.36.1-debian-release.patch b/easybuild/easyconfigs/p/Perl-bundle-CPAN/Perl-bundle-5.36.1-debian-release.patch
@@ -0,0 +1,73 @@
+From a1c14cce4121862bb12fe34f294b5ab1d3dce7da Mon Sep 17 00:00:00 2001
+From: Vincent Lefevre <[email protected]>
+Date: Tue, 8 Oct 2019 17:06:57 +0200
+Subject: [PATCH] Update for Debian 8.0 (jessie), 9.0 (stretch) and 10.0
+ (buster).
+
+Also removed the obsolete debian_version and debian_release lines,
+as Distribution.pm no longer supports multiple release files and
+they made the tests fail (fixes issue #2 for Debian).
+
+Bug: https://github.com/burak/CPAN-Sys-Info-Driver-Linux/pull/3
+
+Added bullseye and bookworm as well.
+
+---
+ lib/Sys/Info/Driver/Linux/OS/Distribution/Conf.pm | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+--- a/lib/Sys/Info/Driver/Linux/OS/Distribution/Conf.pm
++++ b/lib/Sys/Info/Driver/Linux/OS/Distribution/Conf.pm
+@@ -31,8 +31,6 @@
+ <debian>
+     manufacturer  = Debian Project
+     version_match = (.+)
+-    release = debian_version
+-    release = debian_release
+     <edition>
+            1.1  = buzz
+            1.2  = rex
+@@ -46,21 +44,31 @@
+            5.0  = lenny
+            6.0  = squeeze
+            7.0  = wheezy
++           8.0  = jessie
++           9.0  = stretch
++          10.0  = buster
++          11.0  = bullseye
++          12.0  = bookworm
+     </edition>
+     # we get the version as "lenny/sid" for example
+     <vfix>
+-        buzz    = 1.1
+-        rex     = 1.2
+-        bo      = 1.3
+-        hamm    = 2.0
+-        slink   = 2.1
+-        potato  = 2.2
+-        woody   = 3.0
+-        sarge   = 3.1
+-        etch    = 4.0
+-        lenny   = 5.0
+-        squeeze = 6.0
+-        wheezy  = 7.0
++        buzz     = 1.1
++        rex      = 1.2
++        bo       = 1.3
++        hamm     = 2.0
++        slink    = 2.1
++        potato   = 2.2
++        woody    = 3.0
++        sarge    = 3.1
++        etch     = 4.0
++        lenny    = 5.0
++        squeeze  = 6.0
++        wheezy   = 7.0
++        jessie   = 8.0
++        stretch  = 9.0
++        buster   = 10.0
++        bullseye = 11.0
++        bookworm = 12.0
+     </vfix>
+ </debian>
+
diff --git a/easybuild/easyconfigs/p/Perl-bundle-CPAN/Perl-bundle-5.36.1-pod.patch b/easybuild/easyconfigs/p/Perl-bundle-CPAN/Perl-bundle-5.36.1-pod.patch
@@ -0,0 +1,159 @@
+Description: remove duplicate NAME sections, keep the one with a synopsis
+Origin: vendor
+Author: gregor herrmann <[email protected]>
+Last-Update: 2019-10-25
+
+--- a/lib/Sys/Info/Driver/Linux.pm
++++ b/lib/Sys/Info/Driver/Linux.pm
+@@ -29,7 +29,7 @@
+
+ =head1 NAME
+
+-Sys::Info::Driver::Linux
++Sys::Info::Driver::Linux - Linux driver for Sys::Info
+
+ =head1 VERSION
+
+@@ -43,10 +43,6 @@
+
+ This is the main module in the C<Linux> driver collection.
+
+-=head1 NAME
+-
+-Sys::Info::Driver::Linux - Linux driver for Sys::Info
+-
+ =head1 METHODS
+
+ None.
+--- a/lib/Sys/Info/Driver/Linux/Constants.pm
++++ b/lib/Sys/Info/Driver/Linux/Constants.pm
+@@ -74,7 +74,7 @@
+
+ =head1 NAME
+
+-Sys::Info::Driver::Linux::Constants
++Sys::Info::Driver::Linux::Constants - Constants for Linux driver
+
+ =head1 VERSION
+
+@@ -86,10 +86,6 @@
+
+ Constants for Linux driver.
+
+-=head1 NAME
+-
+-Sys::Info::Driver::Linux::Constants - Constants for Linux driver
+-
+ =head1 METHODS
+
+ None.
+--- a/lib/Sys/Info/Driver/Linux/Device.pm
++++ b/lib/Sys/Info/Driver/Linux/Device.pm
+@@ -13,7 +13,7 @@
+
+ =head1 NAME
+
+-Sys::Info::Driver::Linux::Device
++Sys::Info::Driver::Linux::Device - Base class for Linux device drivers
+
+ =head1 VERSION
+
+@@ -27,10 +27,6 @@
+
+ Base class for Linux device drivers.
+
+-=head1 NAME
+-
+-Sys::Info::Driver::Linux::Device - Base class for Linux device drivers
+-
+ =head1 METHODS
+
+ None.
+--- a/lib/Sys/Info/Driver/Linux/Device/CPU.pm
++++ b/lib/Sys/Info/Driver/Linux/Device/CPU.pm
+@@ -94,7 +94,7 @@
+
+ =head1 NAME
+
+-Sys::Info::Driver::Linux::Device::CPU
++Sys::Info::Driver::Linux::Device::CPU - Linux CPU Device Driver
+
+ =head1 VERSION
+
+@@ -108,10 +108,6 @@
+
+ Identifies the CPU with L<Unix::Processors>, L<POSIX> and C<< /proc >>.
+
+-=head1 NAME
+-
+-Sys::Info::Driver::Linux::Device::CPU - Linux CPU Device Driver
+-
+ =head1 METHODS
+
+ =head2 identify
+--- a/lib/Sys/Info/Driver/Linux/OS.pm
++++ b/lib/Sys/Info/Driver/Linux/OS.pm
+@@ -263,7 +263,7 @@
+
+ =head1 NAME
+
+-Sys::Info::Driver::Linux::OS
++Sys::Info::Driver::Linux::OS - Linux backend
+
+ =head1 VERSION
+
+@@ -277,10 +277,6 @@
+
+ -
+
+-=head1 NAME
+-
+-Sys::Info::Driver::Linux::OS - Linux backend
+-
+ =head1 METHODS
+
+ Please see L<Sys::Info::OS> for definitions of these methods and more.
+--- a/lib/Sys/Info/Driver/Linux/OS/Distribution.pm
++++ b/lib/Sys/Info/Driver/Linux/OS/Distribution.pm
+@@ -360,7 +360,7 @@
+
+ =head1 NAME
+
+-Sys::Info::Driver::Linux::OS::Distribution
++Sys::Info::Driver::Linux::OS::Distribution - Linux distribution probe
+
+ =head1 VERSION
+
+@@ -394,10 +394,6 @@
+ redflag and ubuntu(lsb). People running unsupported distro's are greatly
+ encouraged to submit patches.
+
+-=head1 NAME
+-
+-Sys::Info::Driver::Linux::OS::Distribution - Linux distribution probe
+-
+ =head1 METHODS
+
+ =head2 build
+--- a/lib/Sys/Info/Driver/Linux/OS/Distribution/Conf.pm
++++ b/lib/Sys/Info/Driver/Linux/OS/Distribution/Conf.pm
+@@ -259,7 +259,7 @@
+
+ =head1 NAME
+
+-Sys::Info::Driver::Linux::OS::Distribution::Conf
++Sys::Info::Driver::Linux::OS::Distribution::Conf - Distro configuration
+
+ =head1 VERSION
+
+@@ -269,10 +269,6 @@
+
+ =head1 DESCRIPTION
+
+-=head1 NAME
+-
+-Sys::Info::Driver::Linux::OS::Distribution::Conf - Distro configuration
+-
+ =head1 AUTHOR
+
+ Burak Gursoy <[email protected]>
diff --git a/easybuild/easyconfigs/p/Perl-bundle-CPAN/Perl-bundle-CPAN-5.36.1-GCCcore-12.3.0.eb b/easybuild/easyconfigs/p/Perl-bundle-CPAN/Perl-bundle-CPAN-5.36.1-GCCcore-12.3.0.eb
@@ -2053,7 +2053,18 @@ exts_list = [
     ('Sys::Info::Driver::Linux::Device::CPU', '0.7905', {
         'source_tmpl': 'Sys-Info-Driver-Linux-%(version)s.tar.gz',
         'source_urls': ['https://cpan.metacpan.org/authors/id/B/BU/BURAK'],
-        'checksums': ['899c329bd3508ec5849ad0e5dadfa7c3679bbacaea9dda12404a7893032e8b7b'],
+        'patches': [
+            ('Perl-bundle-5.36.1-debian-release.patch'),
+            ('Perl-bundle-5.36.1-pod.patch'),
+        ],
+        'checksums': [
+            {'Sys-Info-Driver-Linux-%(version)s.tar.gz':
+             '899c329bd3508ec5849ad0e5dadfa7c3679bbacaea9dda12404a7893032e8b7b'},
+            {'Perl-bundle-5.36.1-debian-release.patch':
+             '18b8d876db5b3abe7e5a1bb8c6abf8b5fef481b56294472fcf9f96f974c56c48'},
+            {'Perl-bundle-5.36.1-pod.patch':
+             '7c70bd91a06c256a8d85845e011e53a1a9d4f8a250d9f06bd06f5004596f271a'},
+        ],
     }),
     ('Sys::Info', '0.7811', {
         'source_tmpl': 'Sys-Info-%(version)s.tar.gz',
@@ -2103,7 +2114,18 @@ exts_list = [
     ('Sys::Info::Driver::Linux', '0.7905', {
         'source_tmpl': 'Sys-Info-Driver-Linux-%(version)s.tar.gz',
         'source_urls': ['https://cpan.metacpan.org/authors/id/B/BU/BURAK'],
-        'checksums': ['899c329bd3508ec5849ad0e5dadfa7c3679bbacaea9dda12404a7893032e8b7b'],
+        'patches': [
+            ('Perl-bundle-5.36.1-debian-release.patch'),
+            ('Perl-bundle-5.36.1-pod.patch'),
+        ],
+        'checksums': [
+            {'Sys-Info-Driver-Linux-%(version)s.tar.gz':
+             '899c329bd3508ec5849ad0e5dadfa7c3679bbacaea9dda12404a7893032e8b7b'},
+            {'Perl-bundle-5.36.1-debian-release.patch':
+             '18b8d876db5b3abe7e5a1bb8c6abf8b5fef481b56294472fcf9f96f974c56c48'},
+            {'Perl-bundle-5.36.1-pod.patch':
+             '7c70bd91a06c256a8d85845e011e53a1a9d4f8a250d9f06bd06f5004596f271a'},
+        ],
     }),
     ('Unix::Processors', '2.046', {
         'source_tmpl': 'Unix-Processors-%(version)s.tar.gz',