Compare commits

..

No commits in common. 'epel9' and 'i10cs' have entirely different histories.
epel9 ... i10cs

2
.gitignore vendored

@ -1 +1 @@
/Crypt-DES-[0-9.]*.tar.gz
SOURCES/Crypt-DES-2.07.tar.gz

@ -0,0 +1 @@
1fa769fa6f1dbe9781388cd9738ea93e579517df SOURCES/Crypt-DES-2.07.tar.gz

@ -0,0 +1,31 @@
diff -rup a/DES.xs b/DES.xs
--- a/DES.xs 2013-07-23 11:23:00.000000000 -0400
+++ b/DES.xs 2023-03-15 15:50:47.568400586 -0400
@@ -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 -rup a/_des.h b/_des.h
--- a/_des.h 2005-12-08 10:53:47.000000000 -0500
+++ b/_des.h 2023-03-13 21:37:53.334642006 -0400
@@ -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 );

@ -0,0 +1,197 @@
Fix "warning: missing braces around initializer [-Wmissing-braces]"
--- _des.c
+++ _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 }
};

@ -7,11 +7,14 @@
Name: perl-Crypt-DES
Version: 2.07
Release: 24%{?dist}
Release: 40%{?dist}
Summary: Perl DES encryption module
License: BSD
License: BSD-Systemics
URL: https://metacpan.org/release/Crypt-DES
Source0: https://cpan.metacpan.org/authors/id/D/DP/DPARIS/Crypt-DES-%{version}.tar.gz
Source0: https://cpan.metacpan.org/modules/by-module/Crypt/Crypt-DES-%{version}.tar.gz
Patch0: perl-Crypt-DES-init-braces.patch
Patch99: perl-Crypt-DES-fedora-c99.patch
# Build
BuildRequires: coreutils
BuildRequires: findutils
BuildRequires: gcc
@ -33,24 +36,29 @@ BuildRequires: perl(Data::Dumper)
# Optional tests:
BuildRequires: perl(Crypt::CBC) > 1.22
%endif
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
%{?perl_default_filter}
%description
DES encryption module.
DES encryption module. The module implements the Crypt::CBC interface.
%prep
%setup -q -n Crypt-DES-%{version}
# Fix "warning: missing braces around initializer [-Wmissing-braces]"
%patch -P 0
# Fix C99 compatibility (CPAN RT#133363)
%patch -P 99 -p1
%build
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 OPTIMIZE="$RPM_OPT_FLAGS"
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 OPTIMIZE="%{optflags}"
%{make_build}
%install
%{make_install}
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -delete
%{_fixperms} $RPM_BUILD_ROOT
find %{buildroot} -type f -name '*.bs' -empty -delete
%{_fixperms} -c %{buildroot}
%check
make test
@ -60,9 +68,66 @@ make test
%doc README
%{perl_vendorarch}/auto/Crypt/
%{perl_vendorarch}/Crypt/
%{_mandir}/man3/Crypt::DES.3pm*
%{_mandir}/man3/Crypt::DES.3*
%changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.07-40
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.07-39
- Rebuilt for MSVSphere 10
* Thu Aug 08 2024 Troy Dawson <tdawson@redhat.com> - 2.07-39
- Bump release for Aug 2024 java mass rebuild
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.07-38
- Bump release for June 2024 mass rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.07-37
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.07-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Sep 14 2023 Michal Josef Špaček <mspacek@redhat.com> - 2.07-35
- Update license field to new BSD-Systemics SPDX license id
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.07-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 2.07-33
- Perl 5.38 rebuild
* Thu Mar 16 2023 Paul Howarth <paul@city-fan.org> - 2.07-32
- Package tidy-up
- Use author-independent source URL
- Fix "warning: missing braces around initializer [-Wmissing-braces]"
- Avoid deprecated patch syntax
- Simplify find command using -empty
- Fix permissions verbosely
* Wed Mar 15 2023 DJ Delorie <dj@redhat.com> - 2.07-31
- Fix C99 compatibility issue
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.07-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.07-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jun 01 2022 Jitka Plesnikova <jplesnik@redhat.com> - 2.07-28
- Perl 5.36 rebuild
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.07-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.07-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Sun May 23 2021 Jitka Plesnikova <jplesnik@redhat.com> - 2.07-25
- Perl 5.34 rebuild
* Mon Feb 22 2021 Petr Pisar <ppisar@redhat.com> - 2.07-24
- Disable optional tests on RHEL > 8
- Modernize packaging

@ -1 +0,0 @@
e845d24cf383ca4a30a3380a2735feac Crypt-DES-2.07.tar.gz
Loading…
Cancel
Save