Compare commits
No commits in common. "5ece6ba64d41c5b3df464c1c09920c1022949308" and "47efe417dacc3bc12d111df131ffd425bc22e3e8" have entirely different histories.
5ece6ba64d
...
47efe417da
|
|
@ -1 +0,0 @@
|
|||
1
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
26390aa8c9176c7d280252e4f01defe031373d32 Mail-SpamAssassin-3.4.6.tar.bz2
|
||||
bc4a64ed49f6df75d6bce8396fa476548a66d755 Mail-SpamAssassin-rules-3.4.6.r1888502.tgz
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm 2020/11/20 06:45:02 1883659
|
||||
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm 2020/11/20 07:33:00 1883660
|
||||
@@ -480,14 +480,14 @@
|
||||
my $flags = 0;
|
||||
my $flag_isp = 0;
|
||||
my $flag_silent = 0;
|
||||
- eval '$flags = GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE' if ($gip_wanted >= $gip_have);
|
||||
- eval '$flag_silent = Geo::IP::GEOIP_SILENCE' if ($gip_wanted >= $gip_have);
|
||||
- eval '$flag_isp = GEOIP_ISP_EDITION' if ($gip_wanted >= $gip_have);
|
||||
+ eval '$flags = GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE' if ($gip_have >= $gip_wanted);
|
||||
+ eval '$flag_silent = GEOIP_SILENCE' if ($gip_have >= $gip_wanted);
|
||||
+ eval '$flag_isp = GEOIP_ISP_EDITION' if ($gip_have >= $gip_wanted);
|
||||
|
||||
eval {
|
||||
- if ($flag_silent && $gic_wanted >= $gic_have) {
|
||||
+ if ($flag_silent && $gic_have >= $gic_wanted) {
|
||||
$self->{geoip} = Geo::IP->new($flags | $flag_silent);
|
||||
- $self->{geoisp} = Geo::IP->open_type($flag_isp | $flag_silent | $flags);
|
||||
+ $self->{geoisp} = Geo::IP->open_type($flag_isp, $flag_silent | $flags);
|
||||
} else {
|
||||
open(OLDERR, ">&STDERR");
|
||||
open(STDERR, ">", "/dev/null");
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
|
||||
|
||||
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
summary: Test plan that runs all tests from tests repo.
|
||||
discover:
|
||||
how: fmf
|
||||
url: https://src.fedoraproject.org/tests/spamassassin.git
|
||||
execute:
|
||||
how: tmt
|
||||
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
summary: CI plan, picks Tier1 tests, runs in beakerlib.
|
||||
discover:
|
||||
- name: rhel
|
||||
how: fmf
|
||||
filter: 'tier: 1'
|
||||
url: git://pkgs.devel.redhat.com/tests/spamassassin
|
||||
- name: fedora
|
||||
how: fmf
|
||||
filter: 'tier: 1'
|
||||
url: "https://src.fedoraproject.org/tests/spamassassin.git"
|
||||
execute:
|
||||
how: tmt
|
||||
adjust:
|
||||
enabled: false
|
||||
when: distro == centos-stream-9
|
||||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (Mail-SpamAssassin-3.4.6.tar.bz2) = bb53ba928917b02071b2e6690a11240e1af503334f292c870a8c49c24b0a58b44c78f827e2f43e71a3ce920481fa0e1e62b78a39452658c57d18f4e11daeb593
|
||||
SHA512 (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz) = 29167c2ab50de26954181ad53395d4270b8b15b7d3bb13d6c62aa2f13ed3bb7a54adcda944bbd4c8d0cf4fe918a2eb0f542ef420af2bd96a121cb3d9b55dd572
|
||||
SHA512 (Mail-SpamAssassin-3.4.4.tar.bz2) = 7dfd0cf3426df683f608218da8881538a24e833024f2a1eb0f8513bdf3e4bc6ac48198c4f380efe024a01ae7b6a5ab9d76205cec185d0e4818f1cc79bda0ea3f
|
||||
SHA512 (Mail-SpamAssassin-rules-3.4.4.r1873061.tgz) = cc2f6949db4662cdcaf5dcef922e69d18320a591deb7fb98c1fb729d91d37f5164052ab6cd2e294657334874fbfc0cccdefc750910e0453cb8da0b3f263b3ede
|
||||
|
|
|
|||
|
|
@ -53,19 +53,19 @@
|
|||
%define real_name Mail-SpamAssassin
|
||||
%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
|
||||
|
||||
%global saversion 3.004006
|
||||
%global saversion 3.004004
|
||||
#%%global prerev rc2
|
||||
|
||||
Summary: Spam filter for email which can be invoked from mail delivery agents
|
||||
Name: spamassassin
|
||||
Version: 3.4.6
|
||||
Version: 3.4.4
|
||||
#Release: 0.8.%%{prerev}%%{?dist}
|
||||
Release: 5%{?dist}
|
||||
Release: 8%{?dist}
|
||||
License: ASL 2.0
|
||||
URL: https://spamassassin.apache.org/
|
||||
Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2
|
||||
#Source0: %%{real_name}-%%{version}-%%{prerev}.tar.bz2
|
||||
Source1: https://www.apache.org/dist/%{name}/source/%{real_name}-rules-%{version}.r1888502.tgz
|
||||
Source1: https://www.apache.org/dist/%{name}/source/%{real_name}-rules-%{version}.r1873061.tgz
|
||||
#Source1: %%{real_name}-rules-%%{version}.%%{prerev}.tgz
|
||||
Source2: redhat_local.cf
|
||||
Source3: spamassassin-default.rc
|
||||
|
|
@ -90,6 +90,9 @@ Source17: sa-update.timer
|
|||
# Switch to using gnupg2 instead of gnupg1
|
||||
Patch0: spamassassin-3.3.2-gnupg2.patch
|
||||
Patch1: spamassassin-3.4.1-add-logfile-homedir-options.patch
|
||||
# Patches 100+ are SVN backports (DO NOT REUSE!)
|
||||
# https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7871
|
||||
Patch100: GeoIP-fix.patch
|
||||
# end of patches
|
||||
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
||||
%if %{use_systemd} == 0
|
||||
|
|
@ -209,6 +212,8 @@ To filter spam for all users, add that line to /etc/procmailrc
|
|||
# Patches 0-99 are RH specific
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
# Patches 100+ are SVN backports (DO NOT REUSE!)
|
||||
%patch100 -p3
|
||||
# end of patches
|
||||
|
||||
echo "RHEL=%{?rhel} FEDORA=%{?fedora}"
|
||||
|
|
@ -388,30 +393,6 @@ exit 0
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Jan 17 2022 Martin Osvald <mosvald@redhat.com> - 3.4.6-5
|
||||
- Forgot to reference CVE-2020-1946 as fixed after rebase to 3.4.6
|
||||
|
||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.4.6-4
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.4.6-3
|
||||
- Rebuilt for RHEL 9 BETA for openssl 3.0
|
||||
Related: rhbz#1971065
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.4.6-2
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Wed Apr 14 2021 Pavel Zhukov <pzhukov@redhat.com> - 3.4.6-1
|
||||
- New release 3.4.6 (#1948520)
|
||||
|
||||
* Tue Apr 06 2021 Pavel Zhukov <landgraf@fedoraproject.org> - 3.4.5-2
|
||||
- Bump config version
|
||||
|
||||
* Thu Mar 25 2021 Kevin Fenzi <kevin@scrye.com> - 3.4.5-1
|
||||
- Update to 3.4.5. Fixes rhbz#1942575
|
||||
- Fixes CVE-2020-1946
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.4-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue