diff --git a/groups/perl-rebuilds b/groups/perl-rebuilds index 6335c9316b8d..c7d8c1a3884d 100644 --- a/groups/perl-rebuilds +++ b/groups/perl-rebuilds @@ -71,7 +71,6 @@ lang-perl/perl-text-soundex lang-perl/perl-tk lang-perl/perl-unicode-linebreak lang-perl/perl-unicode-string -lang-perl/perl-www-curl app-doc/qpdf app-network/quagga app-scientific/r diff --git a/lang-perl/perl-crypt-des/autobuild/patches/0001-FEDORA-Fix-C99-compatibility-issue.patch b/lang-perl/perl-crypt-des/autobuild/patches/0001-FEDORA-Fix-C99-compatibility-issue.patch new file mode 100644 index 000000000000..aff122d76d8a --- /dev/null +++ b/lang-perl/perl-crypt-des/autobuild/patches/0001-FEDORA-Fix-C99-compatibility-issue.patch @@ -0,0 +1,57 @@ +From 8840da3fd4375618cd51b44ea82ecd5f303c3531 Mon Sep 17 00:00:00 2001 +From: DJ Delorie +Date: Sun, 5 Oct 2025 17:16:21 +0800 +Subject: [PATCH 1/2] FEDORA: Fix C99 compatibility issue + +Related to: + + + + +Bug reported to upstream tracker via email to bug-Crypt-DES@rt.cpan.org +https://rt.cpan.org/Public/Dist/Display.html?Name=Crypt-DES + +Link: https://src.fedoraproject.org/rpms/perl-Crypt-DES/blob/0a4557f6b118387730b895037e4a17c90f212e68/f/perl-Crypt-DES-fedora-c99.patch +Signed-off-by: DJ Delorie +Signed-off-by: Mingcong Bai +--- + DES.xs | 5 +++-- + _des.h | 2 ++ + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/DES.xs b/DES.xs +index 68db703..b3d6c1a 100644 +--- a/DES.xs ++++ b/DES.xs +@@ -36,7 +36,7 @@ _des_expand_key(key) + if (key_len != sizeof(des_user_key)) + croak("Invalid key"); + +- perl_des_expand_key((i8 *)key, ks); ++ perl_des_expand_key((unsigned char *)key, ks); + + ST(0) = sv_2mortal(newSVpv((char *)ks, sizeof(ks))); + } +@@ -66,7 +66,8 @@ _des_crypt(input, output, ks, enc_flag) + + (SvUPGRADE(output, SVt_PV)); + +- perl_des_crypt(input, SvGROW(output, output_len), (i32 *)ks, enc_flag); ++ perl_des_crypt((unsigned char *)input, (unsigned char *)SvGROW(output, output_len), ++ (unsigned long *)ks, enc_flag); + + SvCUR_set(output, output_len); + *SvEND(output) = '\0'; +diff --git a/_des.h b/_des.h +index ec56b27..ac0da94 100644 +--- a/_des.h ++++ b/_des.h +@@ -5,3 +5,5 @@ 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.51.0 + diff --git a/lang-perl/perl-crypt-des/autobuild/patches/0002-FEDORA-Fix-warning-missing-braces-around-initializer.patch b/lang-perl/perl-crypt-des/autobuild/patches/0002-FEDORA-Fix-warning-missing-braces-around-initializer.patch new file mode 100644 index 000000000000..46ac79e9986c --- /dev/null +++ b/lang-perl/perl-crypt-des/autobuild/patches/0002-FEDORA-Fix-warning-missing-braces-around-initializer.patch @@ -0,0 +1,213 @@ +From 242092cca4f5c0fca2cab67118dcde53f456081d Mon Sep 17 00:00:00 2001 +From: Paul Howarth +Date: Sun, 5 Oct 2025 17:17:53 +0800 +Subject: [PATCH 2/2] FEDORA: Fix "warning: missing braces around initializer + [-Wmissing-braces]" + +Link: https://src.fedoraproject.org/rpms/perl-Crypt-DES/blob/4c6c9cc117e28e87b7679ba63a3a45b35597163f/f/perl-Crypt-DES-init-braces.patch +Signed-off-by: Paul Howarth +Signed-off-by: Mingcong Bai +--- + _des.c | 65 +++++++++++++++++++++++++++++----------------------------- + 1 file changed, 33 insertions(+), 32 deletions(-) + +diff --git a/_des.c b/_des.c +index 1c6ede0..a97e122 100644 +--- a/_des.c ++++ b/_des.c +@@ -77,7 +77,7 @@ + + + unsigned long des_SPtrans_x[8][64]={ +-/* nibble 0 */ ++{ /* nibble 0 */ + 0x00820200, 0x00020000, 0x80800000, 0x80820200, + 0x00800000, 0x80020200, 0x80020000, 0x80800000, + 0x80020200, 0x00820200, 0x00820000, 0x80000200, +@@ -93,9 +93,9 @@ unsigned long des_SPtrans_x[8][64]={ + 0x80820200, 0x00020200, 0x00820000, 0x80800200, + 0x00800000, 0x80000200, 0x80020000, 0x00000000, + 0x00020000, 0x00800000, 0x80800200, 0x00820200, +-0x80000000, 0x80820000, 0x00000200, 0x80020200, ++0x80000000, 0x80820000, 0x00000200, 0x80020200 }, + +-/* nibble 1 */ ++{ /* nibble 1 */ + 0x10042004, 0x00000000, 0x00042000, 0x10040000, + 0x10000004, 0x00002004, 0x10002000, 0x00042000, + 0x00002000, 0x10040004, 0x00000004, 0x10002000, +@@ -111,9 +111,9 @@ unsigned long des_SPtrans_x[8][64]={ + 0x10042000, 0x00002000, 0x00000000, 0x10000004, + 0x00000004, 0x10042004, 0x00042000, 0x10040000, + 0x10040004, 0x00040000, 0x00002004, 0x10002000, +-0x10002004, 0x00000004, 0x10040000, 0x00042000, ++0x10002004, 0x00000004, 0x10040000, 0x00042000 }, + +-/* nibble 2 */ ++{ /* nibble 2 */ + 0x41000000, 0x01010040, 0x00000040, 0x41000040, + 0x40010000, 0x01000000, 0x41000040, 0x00010040, + 0x01000040, 0x00010000, 0x01010000, 0x40000000, +@@ -129,9 +129,9 @@ unsigned long des_SPtrans_x[8][64]={ + 0x40010040, 0x41000000, 0x01000000, 0x41010040, + 0x00010000, 0x01000040, 0x41000040, 0x00010040, + 0x01000040, 0x00000000, 0x41010000, 0x40000040, +-0x41000000, 0x40010040, 0x00000040, 0x01010000, ++0x41000000, 0x40010040, 0x00000040, 0x01010000 }, + +-/* nibble 3 */ ++{ /* nibble 3 */ + 0x00100402, 0x04000400, 0x00000002, 0x04100402, + 0x00000000, 0x04100000, 0x04000402, 0x00100002, + 0x04100400, 0x04000002, 0x04000000, 0x00000402, +@@ -147,9 +147,9 @@ unsigned long des_SPtrans_x[8][64]={ + 0x04000000, 0x04100402, 0x00100402, 0x00100000, + 0x04100402, 0x00000002, 0x04000400, 0x00100402, + 0x00100002, 0x00100400, 0x04100000, 0x04000402, +-0x00000402, 0x04000000, 0x04000002, 0x04100400, ++0x00000402, 0x04000000, 0x04000002, 0x04100400 }, + +-/* nibble 4 */ ++{ /* nibble 4 */ + 0x02000000, 0x00004000, 0x00000100, 0x02004108, + 0x02004008, 0x02000100, 0x00004108, 0x02004000, + 0x00004000, 0x00000008, 0x02000008, 0x00004100, +@@ -165,9 +165,9 @@ unsigned long des_SPtrans_x[8][64]={ + 0x02000108, 0x00000100, 0x00000000, 0x02004108, + 0x02004008, 0x02004100, 0x00000108, 0x00004000, + 0x00004100, 0x02004008, 0x02000100, 0x00000108, +-0x00000008, 0x00004108, 0x02004000, 0x02000008, ++0x00000008, 0x00004108, 0x02004000, 0x02000008 }, + +-/* nibble 5 */ ++{ /* nibble 5 */ + 0x20000010, 0x00080010, 0x00000000, 0x20080800, + 0x00080010, 0x00000800, 0x20000810, 0x00080000, + 0x00000810, 0x20080810, 0x00080800, 0x20000000, +@@ -183,9 +183,9 @@ unsigned long des_SPtrans_x[8][64]={ + 0x20080810, 0x00080800, 0x00080000, 0x20000810, + 0x20000010, 0x20080000, 0x00080810, 0x00000000, + 0x00000800, 0x20000010, 0x20000810, 0x20080800, +-0x20080000, 0x00000810, 0x00000010, 0x20080010, ++0x20080000, 0x00000810, 0x00000010, 0x20080010 }, + +-/* nibble 6 */ ++{ /* nibble 6 */ + 0x00001000, 0x00000080, 0x00400080, 0x00400001, + 0x00401081, 0x00001001, 0x00001080, 0x00000000, + 0x00400000, 0x00400081, 0x00000081, 0x00401000, +@@ -201,9 +201,9 @@ unsigned long des_SPtrans_x[8][64]={ + 0x00000000, 0x00400081, 0x00400080, 0x00001080, + 0x00000081, 0x00001000, 0x00401081, 0x00400000, + 0x00401080, 0x00000001, 0x00001001, 0x00401081, +-0x00400001, 0x00401080, 0x00401000, 0x00001001, ++0x00400001, 0x00401080, 0x00401000, 0x00001001 }, + +-/* nibble 7 */ ++{ /* nibble 7 */ + 0x08200020, 0x08208000, 0x00008020, 0x00000000, + 0x08008000, 0x00200020, 0x08200000, 0x08208020, + 0x00000020, 0x08000000, 0x00208000, 0x00008020, +@@ -219,10 +219,11 @@ unsigned long des_SPtrans_x[8][64]={ + 0x08208020, 0x00200000, 0x08200000, 0x08000020, + 0x00208000, 0x00008020, 0x08008020, 0x08200000, + 0x00000020, 0x08208000, 0x00208020, 0x00000000, +-0x08000000, 0x08200020, 0x00008000, 0x00208020}; ++0x08000000, 0x08200020, 0x00008000, 0x00208020 } ++}; + + unsigned long des_skb[8][64]={ +-/* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */ ++{ /* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */ + 0x00000000,0x00000010,0x20000000,0x20000010, + 0x00010000,0x00010010,0x20010000,0x20010010, + 0x00000800,0x00000810,0x20000800,0x20000810, +@@ -238,8 +239,8 @@ unsigned long des_skb[8][64]={ + 0x00080020,0x00080030,0x20080020,0x20080030, + 0x00090020,0x00090030,0x20090020,0x20090030, + 0x00080820,0x00080830,0x20080820,0x20080830, +-0x00090820,0x00090830,0x20090820,0x20090830, +-/* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */ ++0x00090820,0x00090830,0x20090820,0x20090830 }, ++{ /* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */ + 0x00000000,0x02000000,0x00002000,0x02002000, + 0x00200000,0x02200000,0x00202000,0x02202000, + 0x00000004,0x02000004,0x00002004,0x02002004, +@@ -255,8 +256,8 @@ unsigned long des_skb[8][64]={ + 0x10000400,0x12000400,0x10002400,0x12002400, + 0x10200400,0x12200400,0x10202400,0x12202400, + 0x10000404,0x12000404,0x10002404,0x12002404, +-0x10200404,0x12200404,0x10202404,0x12202404, +-/* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */ ++0x10200404,0x12200404,0x10202404,0x12202404 }, ++{ /* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */ + 0x00000000,0x00000001,0x00040000,0x00040001, + 0x01000000,0x01000001,0x01040000,0x01040001, + 0x00000002,0x00000003,0x00040002,0x00040003, +@@ -272,8 +273,8 @@ unsigned long des_skb[8][64]={ + 0x08000200,0x08000201,0x08040200,0x08040201, + 0x09000200,0x09000201,0x09040200,0x09040201, + 0x08000202,0x08000203,0x08040202,0x08040203, +-0x09000202,0x09000203,0x09040202,0x09040203, +-/* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */ ++0x09000202,0x09000203,0x09040202,0x09040203 }, ++{ /* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */ + 0x00000000,0x00100000,0x00000100,0x00100100, + 0x00000008,0x00100008,0x00000108,0x00100108, + 0x00001000,0x00101000,0x00001100,0x00101100, +@@ -289,8 +290,8 @@ unsigned long des_skb[8][64]={ + 0x04020000,0x04120000,0x04020100,0x04120100, + 0x04020008,0x04120008,0x04020108,0x04120108, + 0x04021000,0x04121000,0x04021100,0x04121100, +-0x04021008,0x04121008,0x04021108,0x04121108, +-/* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */ ++0x04021008,0x04121008,0x04021108,0x04121108 }, ++{ /* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */ + 0x00000000,0x10000000,0x00010000,0x10010000, + 0x00000004,0x10000004,0x00010004,0x10010004, + 0x20000000,0x30000000,0x20010000,0x30010000, +@@ -306,8 +307,8 @@ unsigned long des_skb[8][64]={ + 0x00101000,0x10101000,0x00111000,0x10111000, + 0x00101004,0x10101004,0x00111004,0x10111004, + 0x20101000,0x30101000,0x20111000,0x30111000, +-0x20101004,0x30101004,0x20111004,0x30111004, +-/* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */ ++0x20101004,0x30101004,0x20111004,0x30111004 }, ++{ /* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */ + 0x00000000,0x08000000,0x00000008,0x08000008, + 0x00000400,0x08000400,0x00000408,0x08000408, + 0x00020000,0x08020000,0x00020008,0x08020008, +@@ -323,8 +324,8 @@ unsigned long des_skb[8][64]={ + 0x02000001,0x0A000001,0x02000009,0x0A000009, + 0x02000401,0x0A000401,0x02000409,0x0A000409, + 0x02020001,0x0A020001,0x02020009,0x0A020009, +-0x02020401,0x0A020401,0x02020409,0x0A020409, +-/* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */ ++0x02020401,0x0A020401,0x02020409,0x0A020409 }, ++{ /* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */ + 0x00000000,0x00000100,0x00080000,0x00080100, + 0x01000000,0x01000100,0x01080000,0x01080100, + 0x00000010,0x00000110,0x00080010,0x00080110, +@@ -340,8 +341,8 @@ unsigned long des_skb[8][64]={ + 0x00200200,0x00200300,0x00280200,0x00280300, + 0x01200200,0x01200300,0x01280200,0x01280300, + 0x00200210,0x00200310,0x00280210,0x00280310, +-0x01200210,0x01200310,0x01280210,0x01280310, +-/* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */ ++0x01200210,0x01200310,0x01280210,0x01280310 }, ++{ /* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */ + 0x00000000,0x04000000,0x00040000,0x04040000, + 0x00000002,0x04000002,0x00040002,0x04040002, + 0x00002000,0x04002000,0x00042000,0x04042000, +@@ -357,7 +358,7 @@ unsigned long des_skb[8][64]={ + 0x00000820,0x04000820,0x00040820,0x04040820, + 0x00000822,0x04000822,0x00040822,0x04040822, + 0x00002820,0x04002820,0x00042820,0x04042820, +-0x00002822,0x04002822,0x00042822,0x04042822, ++0x00002822,0x04002822,0x00042822,0x04042822 } + }; + + +-- +2.51.0 + diff --git a/lang-perl/perl-crypt-des/spec b/lang-perl/perl-crypt-des/spec index 2c3f94d6d432..2414808c3010 100644 --- a/lang-perl/perl-crypt-des/spec +++ b/lang-perl/perl-crypt-des/spec @@ -1,4 +1,5 @@ VER=2.07 +REL=1 SRCS="tbl::https://cpan.metacpan.org/authors/id/D/DP/DPARIS/Crypt-DES-$VER.tar.gz" CHKSUMS="sha256::2db1ebb5837b4cb20051c0ee5b733b4453e3137df0a92306034c867621edd7e7" CHKUPDATE="anitya::id=6724" diff --git a/lang-perl/perl-www-curl/autobuild/defines b/lang-perl/perl-www-curl/autobuild/defines deleted file mode 100644 index 0b84558f2354..000000000000 --- a/lang-perl/perl-www-curl/autobuild/defines +++ /dev/null @@ -1,5 +0,0 @@ -PKGNAME="perl-www-curl" -PKGSEC=perl -PKGDEP="curl perl" -PKGDES="Perl extension interface for libcurl" - diff --git a/lang-perl/perl-www-curl/autobuild/patches/0001-Fedora-WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch b/lang-perl/perl-www-curl/autobuild/patches/0001-Fedora-WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch deleted file mode 100644 index 34221c0d20c7..000000000000 --- a/lang-perl/perl-www-curl/autobuild/patches/0001-Fedora-WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0be0223422e6e5f4091c6e4e058d213623eed105 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 12 Sep 2016 14:40:44 +0200 -Subject: [PATCH] Skip preprocessor symbol only CURL_STRICTER -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -CURL_STRICTER leaked into curl-constants.c when building against -curl-7.50.2. This is a preprocessor only macro without a value. - -CPAN RT#117793 - -Signed-off-by: Petr Písař ---- - Makefile.PL | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.PL b/Makefile.PL -index f9170bb..ad2bd3d 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -127,7 +127,7 @@ if (!defined($curl_h)) { - close H; - - for my $e (sort @syms) { -- if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) { -+ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z)/) { - next; - } - my ($group) = $e =~ m/^([^_]+_)/; --- -2.7.4 - diff --git a/lang-perl/perl-www-curl/autobuild/patches/0002-Fedora-WWW-Curl-4.17-define-CURL-as-void.patch b/lang-perl/perl-www-curl/autobuild/patches/0002-Fedora-WWW-Curl-4.17-define-CURL-as-void.patch deleted file mode 100644 index 1fa9b5457fbf..000000000000 --- a/lang-perl/perl-www-curl/autobuild/patches/0002-Fedora-WWW-Curl-4.17-define-CURL-as-void.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up ./Curl.xs.orig ./Curl.xs ---- ./Curl.xs.orig 2019-10-18 07:45:38.380881448 +0200 -+++ ./Curl.xs 2019-10-18 07:46:20.712032844 +0200 -@@ -47,7 +47,7 @@ typedef enum { - - typedef struct { - /* The main curl handle */ -- struct CURL *curl; -+ CURL *curl; - I32 *y; - /* Lists that can be set via curl_easy_setopt() */ - struct curl_slist *slist[SLIST_LAST]; -@@ -73,7 +73,7 @@ typedef struct { - #ifdef __CURL_MULTI_H - struct CURLM *curlm; - #else -- struct void *curlm; -+ void *curlm; - #endif - } perl_curl_multi; - diff --git a/lang-perl/perl-www-curl/autobuild/patches/0003-Fedora-WWW-Curl-4.17-Adapt-to-changes-in-cURL-7.69.0.patch b/lang-perl/perl-www-curl/autobuild/patches/0003-Fedora-WWW-Curl-4.17-Adapt-to-changes-in-cURL-7.69.0.patch deleted file mode 100644 index 3d6829b0cb33..000000000000 --- a/lang-perl/perl-www-curl/autobuild/patches/0003-Fedora-WWW-Curl-4.17-Adapt-to-changes-in-cURL-7.69.0.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ee910449bf764d9f582e612c9b8b61b1d18e3a7c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Thu, 9 Apr 2020 14:31:05 +0200 -Subject: [PATCH] Adapt to changes in cURL 7.69.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -WIN32 macro was removed (1adebe7886ddf20b0733bf9ccbae4ed4866dcfb6) and -then added under a CURL_WIN32 name -(8bd863f97b6c79f561bc063e634cecdf4badf776). This a C preprocessor -macro for driving the C compiler, not a cURL option. Thus this fix -ignores it. - -CURLOPT(na,t,nu) macro was added -(920deff8618a19ae80bd319851722f1b05751f69) as replacement for CINIT() -macro. It's not a cURL option. This fix also ignores it. - -CPAN RT#132197 - -Signed-off-by: Petr Písař ---- - Makefile.PL | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.PL b/Makefile.PL -index ad2bd3d..b9e6a46 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -127,7 +127,7 @@ if (!defined($curl_h)) { - close H; - - for my $e (sort @syms) { -- if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z)/) { -+ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_WIN32\z|^CURLOPT\z|_LAST\z|_LASTENTRY\z)/) { - next; - } - my ($group) = $e =~ m/^([^_]+_)/; --- -2.21.1 - diff --git a/lang-perl/perl-www-curl/spec b/lang-perl/perl-www-curl/spec deleted file mode 100644 index 9d93e7e74a0a..000000000000 --- a/lang-perl/perl-www-curl/spec +++ /dev/null @@ -1,5 +0,0 @@ -VER=4.17 -SRCS="tbl::https://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/WWW-Curl-$VER.tar.gz" -CHKSUMS="sha256::52ffab110e32348d775f241c973eb56f96b08eedbc110d77d257cdb0a24ab7ba" -REL=3 -CHKUPDATE="anitya::id=3501"