tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

gnu: perl-crypt-des: Fix build.

Browse Source 
* gnu/packages/patches/perl-crypt-des-implicit-func-decl.patch: New file.
* gnu/local.mk: Register patch.
* gnu/packages/games.scm (perl-crypt-des)[patches]: Add patch.

Change-Id: Ia9d55640f7ffcc5cc24cff34c246c1e6b870cec7
Signed-off-by: Sughosha <sughosha@disroot.org>
This commit is contained in:
AwesomeAdam54321
2025-11-02 20:16:07 +08:00
committed by Sughosha
parent 06ab49a653
commit 0a6dbaeb66
3 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/local.mk
View File

@@ -2089,6 +2089,7 @@ dist_patch_DATA = \
%D%/packages/patches/perl-5.14-no-sys-dirs.patch \
%D%/packages/patches/perl-autosplit-default-time.patch \
%D%/packages/patches/perl-class-methodmaker-reproducible.patch \
%D%/packages/patches/perl-crypt-des-implicit-func-decl.patch \
%D%/packages/patches/perl-image-exiftool-CVE-2021-22204.patch \
%D%/packages/patches/perl-net-amazon-s3-moose-warning.patch \
%D%/packages/patches/perl-net-dns-resolver-programmable-fix.patch \

34
gnu/packages/patches/perl-crypt-des-implicit-func-decl.patch Normal file
View File

@@ -0,0 +1,34 @@
https://src.fedoraproject.org/rpms/perl-Crypt-DES/raw/0a4557f6b118387730b895037e4a17c90f212e68/f/perl-Crypt-DES-fedora-c99.patch
https://rt.cpan.org/Public/Bug/Display.html?id=133363
https://rt.cpan.org/Public/Bug/Display.html?id=133412
https://bugs.gentoo.org/870427
--- 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';
--- 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 );

3
gnu/packages/perl.scm
View File

@@ -2567,7 +2567,8 @@ are compatible with the encryption format used by SSLeay.")
version ".tar.gz"))
(sha256
(base32
"1rypxlhpd1jc0c327aghgl9y6ls47drmpvn0a40b4k3vhfsypc9d"))))
"1rypxlhpd1jc0c327aghgl9y6ls47drmpvn0a40b4k3vhfsypc9d"))
(patches (search-patches "perl-crypt-des-implicit-func-decl.patch"))))
(build-system perl-build-system)
(native-inputs
(list perl-crypt-cbc))