From ab0a4f040eec4d48d4bb1c6f0ad8cf1dc263a8b6 Mon Sep 17 00:00:00 2001 From: Sreenivasulu Malavathula Date: Thu, 19 Dec 2024 20:55:52 -0600 Subject: [PATCH] perl-Razor-Agent: Update Version from 2.85 -> 2.86 --- .../perl-Razor-Agent-2.85-mandir.patch | 14 -- .../perl-Razor-Agent-2.85-parallel-make.patch | 20 -- .../perl-Razor-Agent-2.86-digest-sha.patch | 199 ++++++++++++++++++ .../perl-Razor-Agent-2.86-parallel-make.patch | 31 +++ .../perl-Razor-Agent.signatures.json | 4 +- .../perl-Razor-Agent/perl-Razor-Agent.spec | 187 ++++++++++------ .../razor-agents-2.85-use-sha-not-sha1.patch | 117 ---------- cgmanifest.json | 4 +- 8 files changed, 361 insertions(+), 215 deletions(-) delete mode 100644 SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent-2.85-mandir.patch delete mode 100644 SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent-2.85-parallel-make.patch create mode 100644 SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent-2.86-digest-sha.patch create mode 100644 SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent-2.86-parallel-make.patch delete mode 100644 SPECS-EXTENDED/perl-Razor-Agent/razor-agents-2.85-use-sha-not-sha1.patch diff --git a/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent-2.85-mandir.patch b/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent-2.85-mandir.patch deleted file mode 100644 index 6b8e139b4bf..00000000000 --- a/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent-2.85-mandir.patch +++ /dev/null @@ -1,14 +0,0 @@ -Patch by Gregor Herrmann for razor-agents <= 2.85 which adjusts -the regular expression for perl 5.22. See also Debian bug report #807478. - ---- razor-agents-2.85/Makefile.PL 2007-05-09 00:47:53.000000000 +0200 -+++ razor-agents-2.85/Makefile.PL.mandir 2016-01-11 03:57:13.000000000 +0100 -@@ -142,7 +142,7 @@ - my $man5 = q{ \\ - $(INST_MAN5DIR) $(INSTALLMAN5DIR)}; - -- $inherited =~ s/(\$\((?:DEST)?INSTALL\w*MAN1DIR\))/$1$man5/gm; -+ $inherited =~ s/(\$\((?:DEST)?INSTALL\w*MAN1DIR\)"?)/$1$man5/gm; - - return $inherited; - } diff --git a/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent-2.85-parallel-make.patch b/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent-2.85-parallel-make.patch deleted file mode 100644 index 0de4ec8b9b5..00000000000 --- a/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent-2.85-parallel-make.patch +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD$ - - manifypods-razor depends on INST_MAN5DIR which gets created by the 'config' - target. Without this, there may problems building with parallel make. - -See also: - - https://sourceforge.net/p/razor/bugs/67/ - - https://bugzilla.redhat.com/show_bug.cgi?id=1379566 - ---- Makefile.PL.orig 2007-05-09 00:47:53.000000000 +0200 -+++ Makefile.PL -@@ -115,7 +115,7 @@ sub MY::manifypods { - # begin razor-agents - %s - --manifypods-razor : docs/razor-agent.conf.pod \ -+manifypods-razor : config docs/razor-agent.conf.pod \ - docs/razor-agents.pod \ - docs/razor-whitelist.pod - $(POD2MAN) \ diff --git a/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent-2.86-digest-sha.patch b/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent-2.86-digest-sha.patch new file mode 100644 index 00000000000..557a83084de --- /dev/null +++ b/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent-2.86-digest-sha.patch @@ -0,0 +1,199 @@ +From 1a8dc0ea64c6bbe187babdb1079bc0cf05926e59 Mon Sep 17 00:00:00 2001 +From: Robert Scheck +Date: Fri, 10 Dec 2021 00:21:56 +0100 +Subject: [PATCH] Use Digest::SHA instead of Digest::SHA1 + +Switch from Digest::SHA1 to Digest::SHA, because: Digest::SHA is a bit +faster than Digest::SHA1, Digest::SHA1 has been removed from some Linux +distributions, Digest::SHA is a core library (as of Perl >= 5.10.0) and +Digest::SHA1 is not (and never will be). See also: + + - https://src.fedoraproject.org/rpms/perl-Razor-Agent/c/75fa8a6c1f1fdf779312dac68f331a288bd2920f?branch=rawhide + - https://stackoverflow.com/questions/3420720/what-are-the-advantages-of-digestsha-over-digestsha1 + +Original author: Warren Togami +--- + INSTALL | 2 +- + META.json | 2 +- + META.yml | 2 +- + Makefile.PL | 2 +- + lib/Razor2/Client/Engine.pm | 1 - + lib/Razor2/Signature/Ephemeral.pm | 14 +++++++------- + lib/Razor2/Signature/Whiplash.pm | 14 ++++++-------- + lib/Razor2/String.pm | 17 +++++++---------- + 8 files changed, 24 insertions(+), 30 deletions(-) + +diff --git a/INSTALL b/INSTALL +index 2de1b42..1852ba0 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -25,7 +25,7 @@ option, like so: + following Perl modules from CPAN: + + Time::HiRes +- Digest::SHA1 ++ Digest::SHA + MIME::Base64 + Test::Simple + Test::Harness +diff --git a/META.json b/META.json +index f893748..e616292 100644 +--- a/META.json ++++ b/META.json +@@ -33,7 +33,7 @@ + }, + "runtime" : { + "requires" : { +- "Digest::SHA1" : "0", ++ "Digest::SHA" : "0", + "File::Copy" : "0", + "File::Spec" : "0", + "Getopt::Long" : "0", +diff --git a/META.yml b/META.yml +index 4a0831c..314b0fc 100644 +--- a/META.yml ++++ b/META.yml +@@ -19,7 +19,7 @@ no_index: + - t + - inc + requires: +- Digest::SHA1: '0' ++ Digest::SHA: '0' + File::Copy: '0' + File::Spec: '0' + Getopt::Long: '0' +diff --git a/Makefile.PL b/Makefile.PL +index 833d1dc..095f7e3 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -22,7 +22,7 @@ WriteMakefile( + ( $ExtUtils::MakeMaker::VERSION >= 6.3002 ? ( 'LICENSE' => 'perl', ) : () ), + EXE_FILES => [qw( bin/razor-client bin/razor-admin bin/razor-check bin/razor-report bin/razor-revoke )], + PREREQ_PM => { +- 'Digest::SHA1' => 0, ++ 'Digest::SHA' => 0, + 'File::Copy' => 0, + 'File::Spec' => 0, + 'Getopt::Long' => 0, +diff --git a/lib/Razor2/Client/Engine.pm b/lib/Razor2/Client/Engine.pm +index 98f2f44..f3610b4 100644 +--- a/lib/Razor2/Client/Engine.pm ++++ b/lib/Razor2/Client/Engine.pm +@@ -1,7 +1,6 @@ + package Razor2::Client::Engine; + + use strict; +-use Digest::SHA1 qw(sha1_hex); + use Data::Dumper; + use Razor2::Signature::Ephemeral; + use Razor2::Engine::VR8; +diff --git a/lib/Razor2/Signature/Ephemeral.pm b/lib/Razor2/Signature/Ephemeral.pm +index 4310b6c..6764e8e 100644 +--- a/lib/Razor2/Signature/Ephemeral.pm ++++ b/lib/Razor2/Signature/Ephemeral.pm +@@ -2,9 +2,13 @@ + + package Razor2::Signature::Ephemeral; + use strict; +-use Digest::SHA1; + use Data::Dumper; + ++BEGIN { ++ eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 } ++ or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) } ++} ++ + sub new { + + my ( $class, %args ) = @_; +@@ -88,17 +92,13 @@ sub hexdigest { + } + + my $digest; +- my $ctx = Digest::SHA1->new; + + if ( $seclength > 128 ) { +- $ctx->add($section1); +- $ctx->add($section2); +- $digest = $ctx->hexdigest; ++ $digest = sha1_hex($section1, $section2); + } + else { + debug("Sections too small... reverting back to orginal content."); +- $ctx->add($content); +- $digest = $ctx->hexdigest; ++ $digest = sha1_hex($content); + } + + debug("Computed e-hash is $digest"); +diff --git a/lib/Razor2/Signature/Whiplash.pm b/lib/Razor2/Signature/Whiplash.pm +index 2977371..40ace61 100644 +--- a/lib/Razor2/Signature/Whiplash.pm ++++ b/lib/Razor2/Signature/Whiplash.pm +@@ -7,7 +7,10 @@ + + package Razor2::Signature::Whiplash; + +-use Digest::SHA1; ++BEGIN { ++ eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 } ++ or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) } ++} + + sub new { + +@@ -682,13 +685,8 @@ sub whiplash { + # the value of length to the nearest multiple of ``length_error''. + # Take the first 20 hex chars from SHA1 and call it the signature. + +- my $sha1 = Digest::SHA1->new(); +- +- $sha1->add($host); +- $sig = substr $sha1->hexdigest, 0, 12; +- +- $sha1->add($corrected_length); +- $sig .= substr $sha1->hexdigest, 0, 4; ++ $sig = substr sha1_hex($host), 0, 12; ++ $sig .= substr sha1_hex($corrected_length), 0, 4; + + push @sigs, $sig; + $sig_meta{$sig} = [ $host, $corrected_length ]; +diff --git a/lib/Razor2/String.pm b/lib/Razor2/String.pm +index dbcb903..b623917 100644 +--- a/lib/Razor2/String.pm ++++ b/lib/Razor2/String.pm +@@ -1,11 +1,15 @@ + # $Id: String.pm,v 1.48 2005/06/13 21:09:59 vipul Exp $ + package Razor2::String; + +-use Digest::SHA1 qw(sha1_hex); + use URI::Escape; + use Razor2::Preproc::enBase64; + use Data::Dumper; + ++BEGIN { ++ eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 } ++ or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) } ++} ++ + #use MIME::Parser; + + require Exporter; +@@ -65,15 +69,8 @@ sub hmac2_sha1 { + return unless $text && $iv1 && $iv2; + die "no ref's allowed" if ref($text); + +- my $ctx = Digest::SHA1->new; +- $ctx->add($iv2); +- $ctx->add($text); +- my $digest = $ctx->hexdigest; +- +- $ctx = Digest::SHA1->new; +- $ctx->add($iv1); +- $ctx->add($digest); +- $digest = $ctx->hexdigest; ++ my $digest = sha1_hex($iv2, $text); ++ $digest = sha1_hex($iv1, $digest); + + return ( hextobase64($digest), $digest ); + } diff --git a/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent-2.86-parallel-make.patch b/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent-2.86-parallel-make.patch new file mode 100644 index 00000000000..b80b2759a74 --- /dev/null +++ b/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent-2.86-parallel-make.patch @@ -0,0 +1,31 @@ +From 033b00e94741550ef3ef087d9903742ac881a7ba Mon Sep 17 00:00:00 2001 +From: Robert Scheck +Date: Thu, 9 Dec 2021 03:10:51 +0100 +Subject: [PATCH] Unbreak builds with parallel make at manifypods-razor + +The 'manifypods-razor' target depends on INST_MAN5DIR which gets +created by the 'config' target. Without this, there may problems +building with parallel make. See also: + + - https://sourceforge.net/p/razor/bugs/67/ + - https://bugzilla.redhat.com/show_bug.cgi?id=1379566 + +Original author: Klaus Heinz +--- + Makefile.PL | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile.PL b/Makefile.PL +index 833d1dc..bcfbee3 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -131,7 +131,8 @@ MAKE_FRAG + # begin razor-agents + %s + +-manifypods-razor : docs/razor-agent.conf.pod \ ++manifypods-razor : config \ ++ docs/razor-agent.conf.pod \ + docs/razor-agents.pod \ + docs/razor-whitelist.pod + $(POD2MAN) \ diff --git a/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent.signatures.json b/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent.signatures.json index 23bb062f836..1bf3b70ad4a 100644 --- a/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent.signatures.json +++ b/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "perl-Razor-Agent-2.85.tar.bz2": "7fe0afe73e5b3979444dd86e2ad25ea99bc05b23d5648d357544f78f0b6eb6d7" + "Razor2-Client-Agent-2.86.tar.gz": "5e062e02ebb65e24b708e7eefa5300c43d6f657bf20d08fec4ca8a0a3b94845f" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent.spec b/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent.spec index 8b7bc2331c4..28fff7cbf67 100644 --- a/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent.spec +++ b/SPECS-EXTENDED/perl-Razor-Agent/perl-Razor-Agent.spec @@ -1,92 +1,159 @@ -Summary: Use a Razor catalogue server to filter spam messages -Name: perl-Razor-Agent -Version: 2.85 -Release: 37%{?dist} -License: Artistic 2.0 Vendor: Microsoft Corporation Distribution: Azure Linux -URL: https://razor.sourceforge.net/ -Source: https://downloads.sourceforge.net/project/razor/razor-agents/%{version}/razor-agents-%{version}.tar.bz2#/%{name}-%{version}.tar.bz2 -Patch0: razor-agents-2.85-use-sha-not-sha1.patch -Patch1: perl-Razor-Agent-2.85-mandir.patch -Patch2: perl-Razor-Agent-2.85-parallel-make.patch +# Filter the Perl extension module +%{?perl_default_filter} + +%global pkgname Razor2-Client-Agent + +Summary: Collaborative, content-based spam filtering network agent +Name: perl-Razor-Agent +Version: 2.86 +Release: 13%{?dist} +License: Artistic-2.0 +URL: https://metacpan.org/release/%{pkgname} +Source0: https://cpan.metacpan.org/authors/id/T/TO/TODDR/%{pkgname}-%{version}.tar.gz +Patch0: https://github.com/toddr/Razor2-Client-Agent/commit/033b00e94741550ef3ef087d9903742ac881a7ba.patch#/perl-Razor-Agent-2.86-parallel-make.patch +Patch1: https://github.com/toddr/Razor2-Client-Agent/commit/1a8dc0ea64c6bbe187babdb1079bc0cf05926e59.patch#/perl-Razor-Agent-2.86-digest-sha.patch +Requires: perl(Digest::SHA) +BuildRequires: coreutils +BuildRequires: findutils BuildRequires: gcc +BuildRequires: make BuildRequires: perl-devel BuildRequires: perl-generators -BuildRequires: perl(Digest::SHA1) +BuildRequires: perl-interpreter +BuildRequires: perl(AutoLoader) +BuildRequires: perl(Config) +BuildRequires: perl(Digest::SHA) +BuildRequires: perl(Exporter) BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(Net::DNS) +BuildRequires: perl(strict) +BuildRequires: perl(Test::More) BuildRequires: perl(Time::HiRes) -BuildRequires: perl(URI) -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) -Requires: perl(Net::DNS) -# Filter the Perl extension module -%{?perl_default_filter} +BuildRequires: perl(URI::Escape) +BuildRequires: perl(vars) +Provides: perl-%{pkgname} = %{version}-%{release} +Provides: perl-%{pkgname}%{?_isa} = %{version}-%{release} %description Vipul's Razor is a distributed, collaborative, spam detection and filtering network. Razor establishes a distributed and constantly updating catalogue of spam in propagation. This catalogue is used by clients to filter out known spam. On receiving a spam, a Razor -Reporting Agent (run by an end-user or a troll box) calculates and -submits a 20-character unique identification of the spam (a SHA -Digest) to its closest Razor Catalogue Server. The Catalogue Server -echos this signature to other trusted servers after storing it in its -database. Prior to manual processing or transport-level reception, -Razor Filtering Agents (end-users and MTAs) check their incoming mail -against a Catalogue Server and filter out or deny transport in case of -a signature match. Catalogued spam, once identified and reported by -a Reporting Agent, can be blocked out by the rest of the Filtering -Agents on the network. +Reporting Agent (run by an end-user or a troll box) calculates +and submits a 20-character unique identification of the spam (a +SHA Digest) to its closest Razor Catalogue Server. The Catalogue +Server echos this signature to other trusted servers after storing +it in its database. Prior to manual processing or transport-level +reception, Razor Filtering Agents (end-users and MTAs) check their +incoming mail against a Catalogue Server and filter out or deny +transport in case of a signature match. Catalogued spam, once +identified and reported by a Reporting Agent, can be blocked out +by the rest of the Filtering Agents on the network. %prep -%setup -q -n razor-agents-%{version} -%patch 0 -p1 -%patch 1 -p1 -%patch 2 +%setup -q -n %{pkgname}-%{version} +%patch -P0 -p1 +%patch -P1 -p1 %build -export CFLAGS="%{optflags}" -perl Makefile.PL INSTALLDIRS=vendor -cd Razor2-Preproc-deHTMLxs -perl Makefile.PL INSTALLDIRS=vendor -cd .. -%make_build OPTIMIZE="%{optflags}" +perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 OPTIMIZE="$RPM_OPT_FLAGS" +%make_build %install -make install -C Razor2-Preproc-deHTMLxs \ - PERL_INSTALL_ROOT=%{buildroot} \ - INSTALLARCHLIB=%{buildroot}%{perl_archlib} -make install PERL_INSTALL_ROOT=%{buildroot} \ - PERL_INSTALL_ROOT=%{buildroot} \ - INSTALLARCHLIB=%{buildroot}%{perl_archlib} \ - INSTALLMAN5DIR=%{_mandir}/man5 \ - PERL5LIB=%{buildroot}%{perl_vendorarch} - -find %{buildroot} -type f -a \( -name perllocal.pod -o -name .packlist \ - -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' -find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -chmod -R u+w %{buildroot}/* +%make_install +%if 0%{?rhel} && 0%{?rhel} <= 7 +find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -f {} \; +find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' +%endif +chmod -R u+w $RPM_BUILD_ROOT/* %check make test %files %license LICENSE -%doc BUGS Changes CREDITS FAQ README SERVICE_POLICY -%{_bindir}/* -%{perl_vendorlib}/Razor2 -%{perl_vendorlib}/auto/Razor2 -%{perl_vendorarch}/Razor2 -%{perl_vendorarch}/auto/Razor2 -%{_mandir}/man*/* +%doc BUGS Changes CREDITS FAQ README.md SERVICE_POLICY +%{_bindir}/razor-admin +%{_bindir}/razor-check +%{_bindir}/razor-client +%{_bindir}/razor-report +%{_bindir}/razor-revoke +%{perl_vendorarch}/Razor2/ +%{perl_vendorarch}/auto/Razor2/ +%{_mandir}/man1/razor-admin.1* +%{_mandir}/man1/razor-check.1* +%{_mandir}/man1/razor-report.1* +%{_mandir}/man1/razor-revoke.1* +%{_mandir}/man3/Razor2::Errorhandler.3pm* +%{_mandir}/man3/Razor2::Preproc::deHTMLxs.3pm* +%{_mandir}/man3/Razor2::Syslog.3pm* +%{_mandir}/man5/razor-agent.conf.5* +%{_mandir}/man5/razor-agents.5* +%{_mandir}/man5/razor-whitelist.5* %changelog -* Tue Mar 07 2023 Muhammad Falak - 2.85-37 +* Fri Dec 20 2024 Sreenivasulu Malavathula - 2.86-13 +- Initial Azure Linux import from Fedora 41 (license: MIT) - License verified -* Fri Oct 15 2021 Pawel Winogrodzki - 2.85-36 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Fri Jul 19 2024 Fedora Release Engineering - 2.86-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jun 10 2024 Jitka Plesnikova - 2.86-11 +- Perl 5.40 rebuild + +* Sat Apr 20 2024 Miroslav Suchý - 2.86-10 +- convert license to SPDX + +* Thu Jan 25 2024 Fedora Release Engineering - 2.86-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2.86-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 2.86-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Jitka Plesnikova - 2.86-6 +- Perl 5.38 rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 2.86-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 2.86-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue May 31 2022 Jitka Plesnikova - 2.86-3 +- Perl 5.36 rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 2.86-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Dec 10 2021 Robert Scheck 2.86-1 +- Upgrade to 2.86 (#1584474, #2030889) + +* Thu Jul 22 2021 Fedora Release Engineering - 2.85-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat May 22 2021 Jitka Plesnikova - 2.85-41 +- Perl 5.34 rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 2.85-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 2.85-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 14 2020 Tom Stellard - 2.85-38 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + +* Tue Jun 23 2020 Jitka Plesnikova - 2.85-37 +- Perl 5.32 rebuild + +* Tue Mar 17 2020 Jitka Plesnikova - 2.85-36 +- Specify all build dependencies * Thu Jan 30 2020 Fedora Release Engineering - 2.85-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/SPECS-EXTENDED/perl-Razor-Agent/razor-agents-2.85-use-sha-not-sha1.patch b/SPECS-EXTENDED/perl-Razor-Agent/razor-agents-2.85-use-sha-not-sha1.patch deleted file mode 100644 index 57eec26a7d5..00000000000 --- a/SPECS-EXTENDED/perl-Razor-Agent/razor-agents-2.85-use-sha-not-sha1.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff -up razor-agents-2.85/lib/Razor2/Client/Engine.pm.old razor-agents-2.85/lib/Razor2/Client/Engine.pm ---- razor-agents-2.85/lib/Razor2/Client/Engine.pm.old 2005-06-14 01:42:25.000000000 +0200 -+++ razor-agents-2.85/lib/Razor2/Client/Engine.pm 2010-12-22 09:14:57.644814001 +0100 -@@ -1,7 +1,6 @@ - package Razor2::Client::Engine; - - use strict; --use Digest::SHA1 qw(sha1_hex); - use Data::Dumper; - use Razor2::Signature::Ephemeral; - use Razor2::Engine::VR8; -diff -up razor-agents-2.85/lib/Razor2/Signature/Ephemeral.pm.old razor-agents-2.85/lib/Razor2/Signature/Ephemeral.pm ---- razor-agents-2.85/lib/Razor2/Signature/Ephemeral.pm.old 2003-03-04 00:09:50.000000000 +0100 -+++ razor-agents-2.85/lib/Razor2/Signature/Ephemeral.pm 2010-12-22 09:14:57.646814001 +0100 -@@ -2,9 +2,13 @@ - - package Razor2::Signature::Ephemeral; - use strict; --use Digest::SHA1; - use Data::Dumper; - -+BEGIN { -+ eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 } -+ or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) } -+} -+ - sub new { - - my ($class, %args) = @_; -@@ -86,16 +90,12 @@ sub hexdigest { - } - - my $digest; -- my $ctx = Digest::SHA1->new; - - if ($seclength > 128) { -- $ctx->add($section1); -- $ctx->add($section2); -- $digest = $ctx->hexdigest; -+ $digest = sha1_hex($section1, $section2); - } else { - debug("Sections too small... reverting back to orginal content."); -- $ctx->add($content); -- $digest = $ctx->hexdigest; -+ $digest = sha1_hex($content); - } - - debug("Computed e-hash is $digest"); -diff -up razor-agents-2.85/lib/Razor2/Signature/Whiplash.pm.old razor-agents-2.85/lib/Razor2/Signature/Whiplash.pm ---- razor-agents-2.85/lib/Razor2/Signature/Whiplash.pm.old 2007-05-09 00:22:36.000000000 +0200 -+++ razor-agents-2.85/lib/Razor2/Signature/Whiplash.pm 2010-12-22 09:14:57.648814001 +0100 -@@ -7,7 +7,10 @@ - - package Razor2::Signature::Whiplash; - --use Digest::SHA1; -+BEGIN { -+ eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 } -+ or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) } -+} - - sub new { - -@@ -683,13 +686,8 @@ sub whiplash { - # the value of length to the nearest multiple of ``length_error''. - # Take the first 20 hex chars from SHA1 and call it the signature. - -- my $sha1 = Digest::SHA1->new(); -- -- $sha1->add($host); -- $sig = substr $sha1->hexdigest, 0, 12; -- -- $sha1->add($corrected_length); -- $sig .= substr $sha1->hexdigest, 0, 4; -+ $sig = substr sha1_hex($host), 0, 12; -+ $sig .= substr sha1_hex($corrected_length), 0, 4; - - push @sigs, $sig; - $sig_meta{$sig} = [$host, $corrected_length]; -diff -up razor-agents-2.85/lib/Razor2/String.pm.old razor-agents-2.85/lib/Razor2/String.pm ---- razor-agents-2.85/lib/Razor2/String.pm.old 2005-06-13 23:09:59.000000000 +0200 -+++ razor-agents-2.85/lib/Razor2/String.pm 2010-12-22 09:14:57.651814001 +0100 -@@ -1,11 +1,15 @@ - # $Id: String.pm,v 1.48 2005/06/13 21:09:59 vipul Exp $ - package Razor2::String; - --use Digest::SHA1 qw(sha1_hex); - use URI::Escape; - use Razor2::Preproc::enBase64; - use Data::Dumper; - -+BEGIN { -+ eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 } -+ or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) } -+} -+ - #use MIME::Parser; - - require Exporter; -@@ -69,15 +73,8 @@ sub hmac2_sha1 { - return unless $text && $iv1 && $iv2; - die "no ref's allowed" if ref($text); - -- my $ctx = Digest::SHA1->new; -- $ctx->add($iv2); -- $ctx->add($text); -- my $digest = $ctx->hexdigest; -- -- $ctx = Digest::SHA1->new; -- $ctx->add($iv1); -- $ctx->add($digest); -- $digest = $ctx->hexdigest; -+ my $digest = sha1_hex($iv2, $text); -+ $digest = sha1_hex($iv1, $digest); - - return (hextobase64($digest), $digest); - } diff --git a/cgmanifest.json b/cgmanifest.json index e724680b882..82163502dec 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -19293,8 +19293,8 @@ "type": "other", "other": { "name": "perl-Razor-Agent", - "version": "2.85", - "downloadUrl": "https://downloads.sourceforge.net/project/razor/razor-agents/2.85/razor-agents-2.85.tar.bz2" + "version": "2.86", + "downloadUrl": "https://cpan.metacpan.org/authors/id/T/TO/TODDR/Razor2-Client-Agent-2.86.tar.gz" } } },