--- rpms/spamassassin/sme9/spamassassin.spec	2015/07/10 15:22:41	1.7
+++ rpms/spamassassin/sme9/spamassassin.spec	2020/11/25 15:24:27	1.12
@@ -1,14 +1,14 @@
 %define pkgname Mail-SpamAssassin
 
 Name: spamassassin
-Version: 3.3.2
-Release: 60%{?dist}
+Version: 3.4.4
+Release: 1%{?dist}
 Summary: Spam filter for email which can be invoked from mail delivery agents
 License: Apache
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
 Source0: http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-%{version}.tar.bz2
-Source1: http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-%{version}-r1104058.tar.gz
+Source1: http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-%{version}.r1873061.tgz
 Source2: redhat_local3.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -25,8 +25,6 @@ Source50: http://www.apache.org/dist/spa
 #Source60: http://yerp.org/rules/GPG.KEY
 Source60: GPG-sought.KEY
 Patch0: Mail-SpamAssassin-3.0.0-krb5.patch
-#Patch1: sa-1027163-for-3.3.diff
-Patch1000: Mail-SpamAssassin-3.3.2-update_RegistrarBoundaries.patch
 Buildroot: %{_tmppath}/%{name}-root
 Requires(pre): /sbin/chkconfig /sbin/service
 
@@ -42,7 +40,7 @@ BuildRequires: perl(HTML::Parser) >= 3.4
 BuildRequires: perl(Archive::Tar) >= 1.23
 BuildRequires: perl(Mail::DKIM) >= 0.37
 BuildRequires: perl(Net::DNS) >= 0.58
-BuildRequires: perl(NetAddr::IP)
+BuildRequires: perl(NetAddr::IP) >= 4.010
 BuildRequires: perl(Sys::Hostname)
 BuildRequires: perl(Time::HiRes)
 BuildRequires: perl(Time::Local)
@@ -72,6 +70,9 @@ BuildRequires: mod_perl
 BuildRequires: %{_bindir}/dccproc
 BuildRequires: %{_bindir}/pyzor
 
+##JPP
+BuildRequires: perl(Net::DNS::Nameserver)
+
 ###
 Requires: perl(Digest::SHA)
 Requires: perl(File::Spec) >= 0.8
@@ -138,8 +139,6 @@ To filter spam for all users, add that l
 %prep
 %setup -q -n %{pkgname}-%{version}
 %patch0 -p1 -b .krb5
-#patch1 -p0 -b .goto
-%patch1000 -p1
 
 %build
 (cd spamc; autoconf)
@@ -188,7 +187,7 @@ popd
 
 install -p -m 0644 %{SOURCE20} %{buildroot}%{_datadir}/spamassassin/99_bogus-virus-warnings.cf
 
-install -p -m 0644 %{SOURCE60} %{buildroot}%{_datadir}/spamassassin/sought.rules.yerp.org-key.txt
+#install -p -m 0644 %{SOURCE60} %{buildroot}%{_datadir}/spamassassin/sought.rules.yerp.org-key.txt
 install -p -m 0644 %{SOURCE50} %{buildroot}%{_datadir}/spamassassin/release-spamassassin.org-key.txt
 install -p -m 0644 %{SOURCE40} %{buildroot}%{_datadir}/spamassassin/updates.spamassassin.org-key.txt
 #install -p -m 0644 %{SOURCE30} %{buildroot}%{_datadir}/spamassassin/saupdates.openprotect.com-key.txt
@@ -247,7 +246,7 @@ done
 sa-update --import %{_datadir}/spamassassin/release-spamassassin.org-key.txt
 sa-update --import %{_datadir}/spamassassin/updates.spamassassin.org-key.txt
 #sa-update --import %{_datadir}/spamassassin/saupdates.openprotect.com-key.txt
-sa-update --import %{_datadir}/spamassassin/sought.rules.yerp.org-key.txt
+#sa-update --import %{_datadir}/spamassassin/sought.rules.yerp.org-key.txt
 
 %postun
 if [ "$1" -ge "1" ]; then
@@ -262,6 +261,19 @@ fi
 exit 0
 
 %changelog
+* Mon Jan 07 2019 John Crisp <jcrisp@safeandsoundit.co.uk> 3.4.2-2.sme
+- Obsolete sought.rules.yerp.org references [SME:10597]
+- Comment out sought.rules.yerp.org in channels
+
+* Wed Dec 12 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 3.4.2-1.sme
+- update to 3.4.2 [SME: 10597]
+
+* Tue Jun 19 2018 Jean-Philipe Pialasse <tests@pialasse.com> 3.4.1-2.sme
+- add build require perl(Net::DNS::Nameserver)  and import dependencies [SME: 10597]
+
+* Wed Jan 6 2016 Daniel Berteaud <daniel@firewall-services.com> - 3.4.1-1.sme
+- Update to 3.4.1 [SME: 9153]
+
 * Fri Jul 10 2015 Daniel Berteaud <daniel@firewall-services.com> - 3.3.2-60.sme
 - Expand atrpms macro and remove BuildReq on atrpms-rpm-config [SME: 8980]