From e4464eb86af34d9321cc406413e4629ad81f6328 Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Mon, 9 Dec 2024 16:54:20 +0000 Subject: [PATCH] Add MIME::Base32 and add patches for XML::Bare and Crypt:DES --- ...rl_des_expand_key-and-perl_des_crypt.patch | 23 +++++++ .../Perl-bundle-CPAN-5.40.0-GCCcore-14.2.0.eb | 19 +++++- .../Perl-bundle-CPAN/XML-Bare-0.53_c99.patch | 61 +++++++++++++++++++ 3 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 easybuild/easyconfigs/p/Perl-bundle-CPAN/Crypt-DES-2.07_expose-perl_des_expand_key-and-perl_des_crypt.patch create mode 100644 easybuild/easyconfigs/p/Perl-bundle-CPAN/XML-Bare-0.53_c99.patch diff --git a/easybuild/easyconfigs/p/Perl-bundle-CPAN/Crypt-DES-2.07_expose-perl_des_expand_key-and-perl_des_crypt.patch b/easybuild/easyconfigs/p/Perl-bundle-CPAN/Crypt-DES-2.07_expose-perl_des_expand_key-and-perl_des_crypt.patch new file mode 100644 index 00000000000..fef8544d3eb --- /dev/null +++ b/easybuild/easyconfigs/p/Perl-bundle-CPAN/Crypt-DES-2.07_expose-perl_des_expand_key-and-perl_des_crypt.patch @@ -0,0 +1,23 @@ +From 51fda02d223f516c4948606c050bfc732b95f481 Mon Sep 17 00:00:00 2001 +From: Brian Fraser +Date: Thu, 24 Sep 2020 15:00:20 +0200 +Subject: [PATCH] _des.h: expose perl_des_expand_key() and perl_des_crypt() to + prevent implicit delaration errors/warnings + +--- + _des.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/_des.h b/_des.h +index ec56b27..b636cda 100644 +--- a/_des.h ++++ b/_des.h +@@ -4,4 +4,6 @@ typedef unsigned long des_ks[32]; + + void _des_crypt( des_cblock in, des_cblock out, des_ks key, int encrypt ); + void _des_expand_key( des_user_key userKey, des_ks key ); ++void perl_des_expand_key(des_user_key userKey, des_ks ks); ++void perl_des_crypt( des_cblock input, des_cblock output, des_ks ks, int encrypt ); + +-- +2.24.3 (Apple Git-128) diff --git a/easybuild/easyconfigs/p/Perl-bundle-CPAN/Perl-bundle-CPAN-5.40.0-GCCcore-14.2.0.eb b/easybuild/easyconfigs/p/Perl-bundle-CPAN/Perl-bundle-CPAN-5.40.0-GCCcore-14.2.0.eb index 7e287c21239..b76649ae62e 100644 --- a/easybuild/easyconfigs/p/Perl-bundle-CPAN/Perl-bundle-CPAN-5.40.0-GCCcore-14.2.0.eb +++ b/easybuild/easyconfigs/p/Perl-bundle-CPAN/Perl-bundle-CPAN-5.40.0-GCCcore-14.2.0.eb @@ -542,6 +542,11 @@ exts_list = [ 'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PETDANCE'], 'checksums': ['eb89e145a608ed1f8f141a57472ee5f69e67592a432dcd2e8b1dbb445f2b230b'], }), + ('MIME::Base32', '1.303', { + 'source_tmpl': 'MIME-Base32-%(version)s.tar.gz', + 'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'], + 'checksums': ['ab21fa99130e33a0aff6cdb596f647e5e565d207d634ba2ef06bdbef50424e99'], + }), ('URI', '5.31', { 'source_tmpl': 'URI-%(version)s.tar.gz', 'source_urls': ['https://cpan.metacpan.org/authors/id/O/OA/OALDERS'], @@ -924,7 +929,12 @@ exts_list = [ ('XML::Bare', '0.53', { 'source_tmpl': 'XML-Bare-%(version)s.tar.gz', 'source_urls': ['https://cpan.metacpan.org/authors/id/C/CO/CODECHILD'], - 'checksums': ['865e198e98d904be1683ef5a53a4948f02dabdacde59fc554a082ffbcc5baefd'], + 'patches': ['XML-Bare-0.53_c99.patch'], + 'checksums': [ + {'XML-Bare-0.53.tar.gz': '865e198e98d904be1683ef5a53a4948f02dabdacde59fc554a082ffbcc5baefd'}, + {'XML-Bare-0.53_c99.patch': + 'ce62ce2fb65b495193a969df987facb280669dfe5c5013441f1e7fc59614a713'}, + ], }), ('Dist::CheckConflicts', '0.11', { 'source_tmpl': 'Dist-CheckConflicts-%(version)s.tar.gz', @@ -1130,7 +1140,12 @@ exts_list = [ ('Crypt::DES', '2.07', { 'source_tmpl': 'Crypt-DES-%(version)s.tar.gz', 'source_urls': ['https://cpan.metacpan.org/authors/id/D/DP/DPARIS'], - 'checksums': ['2db1ebb5837b4cb20051c0ee5b733b4453e3137df0a92306034c867621edd7e7'], + 'patches': ['Crypt-DES-2.07_expose-perl_des_expand_key-and-perl_des_crypt.patch'], + 'checksums': [ + {'Crypt-DES-2.07.tar.gz': '2db1ebb5837b4cb20051c0ee5b733b4453e3137df0a92306034c867621edd7e7'}, + {'Crypt-DES-2.07_expose-perl_des_expand_key-and-perl_des_crypt.patch': + '1c8346121049b8dffd06a34d98b0e0484db2b0f2ab66655531009b53b42b03a1'}, + ], }), ('XML::XPath', '1.48', { 'source_tmpl': 'XML-XPath-%(version)s.tar.gz', diff --git a/easybuild/easyconfigs/p/Perl-bundle-CPAN/XML-Bare-0.53_c99.patch b/easybuild/easyconfigs/p/Perl-bundle-CPAN/XML-Bare-0.53_c99.patch new file mode 100644 index 00000000000..d572537aec8 --- /dev/null +++ b/easybuild/easyconfigs/p/Perl-bundle-CPAN/XML-Bare-0.53_c99.patch @@ -0,0 +1,61 @@ +From +* https://rt.cpan.org/Public/Bug/Display.html?id=145653 +* https://rt.cpan.org/Public/Bug/Display.html?id=151041 + +diff --git a/parser.c b/parser.c +index 4d770e0efba0e336..26fbd4127fa64753 100644 +--- a/parser.c ++++ b/parser.c +@@ -1,8 +1,6 @@ + #include "parser.h" +-#include +-#ifdef DARWIN +- #include "stdlib.h" +-#endif ++#include ++#include + #ifdef NOSTRING + void memset(char *s, int c, int n) { + char *se = s + n; + +diff --git a/parser.c b/parser.c +index 26fbd4127fa64753..e6cea50335b28eb5 100644 +--- a/parser.c ++++ b/parser.c +@@ -417,7 +417,7 @@ int parserc_parse( struct parserc *self, char *xmlin ) { + case 0: last_state = ST_att_name; goto done; + case '/': // self closing !! /> is assumed !! + curatt = nodec_addattr( curnode, attname, attname_len ); +- if( !att_has_val ) { curatt->value = -1; curatt->vallen = 0; } ++ if( !att_has_val ) { curatt->value = (char *) -1; curatt->vallen = 0; } + attname_len = 0; + + curnode->z = cpos+1-xmlin; +@@ -436,7 +436,7 @@ int parserc_parse( struct parserc *self, char *xmlin ) { + goto att_space; + case '>': + curatt = nodec_addattr( curnode, attname, attname_len ); +- if( !att_has_val ) { curatt->value = -1; curatt->vallen = 0; } ++ if( !att_has_val ) { curatt->value = (char *) -1; curatt->vallen = 0; } + attname_len = 0; + cpos++; + goto val_1; +@@ -832,7 +832,7 @@ int parserc_parse_unsafely( struct parserc *self, char *xmlin ) { + switch( let ) { + case '/': // self closing !! /> is assumed !! + curatt = nodec_addattr( curnode, attname, attname_len ); +- if( !att_has_val ) { curatt->value = -1; curatt->vallen = 0; } ++ if( !att_has_val ) { curatt->value = (char *) -1; curatt->vallen = 0; } + attname_len = 0; + + curnode = curnode->parent; +@@ -850,7 +850,7 @@ int parserc_parse_unsafely( struct parserc *self, char *xmlin ) { + goto u_att_space; + case '>': + curatt = nodec_addattr( curnode, attname, attname_len ); +- if( !att_has_val ) { curatt->value = -1; curatt->vallen = 0; } ++ if( !att_has_val ) { curatt->value = (char *) -1; curatt->vallen = 0; } + attname_len = 0; + cpos++; + goto u_val_1; +