[rpms/spamassassin-iXhash2] epel10: Remove retired iXhash blacklists from default configuration

[rpms/spamassassin-iXhash2] epel10: Remove retired iXhash blacklists from default configuration

[Robert Scheck]

A new commit has been pushed.

Repo   : rpms/spamassassin-iXhash2
Branch : epel10
Commit : d819093b261524cedd13d5ef0b5803c8f1a7238b
Author : Robert Scheck <robert@fedoraproject.org>
Date   : 2017-12-06T11:48:53+01:00
Stats  : +23/-29 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/spamassassin-iXhash2/c/d819093b261524cedd13d5ef0b5803c8f1a7238b?branch=epel10

Log:
Remove retired iXhash blacklists from default configuration

---
diff --git a/spamassassin-iXhash2-2.05-conf.patch b/spamassassin-iXhash2-2.05-conf.patch
index 37ed7e8..648ec98 100644
--- a/spamassassin-iXhash2-2.05-conf.patch
+++ b/spamassassin-iXhash2-2.05-conf.patch
@@ -2,8 +2,8 @@ Patch by Robert Scheck <robert@fedoraproject.org> for iXhash2 >= 2.05 which
 sets some useful defaults based on Mail::SpamAssassin::Plugin::iXhash2.
 
 --- iXhash2-2.05/iXhash2.cf		2012-07-08 13:29:31.000000000 +0200
-+++ iXhash2-2.05/iXhash2.cf.conf	2012-07-08 14:03:16.000000000 +0200
-@@ -1,20 +1,29 @@
++++ iXhash2-2.05/iXhash2.cf.conf	2017-12-05 23:44:34.000000000 +0100
+@@ -1,20 +1,17 @@
 +# iXhash computes MD5 checksums of fragments of the body of an e-mail
 +# and compares them to those of known spam using DNS queries to a RBL-
 +# like name server. So it works similar to the standard plugins that
@@ -15,23 +15,19 @@ sets some useful defaults based on Mail::SpamAssassin::Plugin::iXhash2.
  
  ifplugin Mail::SpamAssassin::Plugin::iXhash2
  
- ixhashdnsbl	GENERIC_IXHASH  generic.ixhash.net.
- body		GENERIC_IXHASH  eval:check_ixhash('GENERIC_IXHASH')
-+describe	GENERIC_IXHASH  http://www.ixhash.net/listinfo.html
- tflags		GENERIC_IXHASH  net
-+score		GENERIC_IXHASH  1.5
- 
+-ixhashdnsbl	GENERIC_IXHASH  generic.ixhash.net.
+-body		GENERIC_IXHASH  eval:check_ixhash('GENERIC_IXHASH')
+-tflags		GENERIC_IXHASH  net
+-
  ixhashdnsbl	NIXSPAM_IXHASH  ix.dnsbl.manitu.net.
  body		NIXSPAM_IXHASH  eval:check_ixhash('NIXSPAM_IXHASH')
-+describe	NIXSPAM_IXHASH  http://www.ixhash.net/listinfo.html
++describe	NIXSPAM_IXHASH  http://www.nixspam.org/
  tflags		NIXSPAM_IXHASH  net
-+score		NIXSPAM_IXHASH  1.5
- 
- ixhashdnsbl	SEM_IXHASH  ixhash.spameatingmonkey.net.
- body		SEM_IXHASH  eval:check_ixhash('SEM_IXHASH')
-+describe	SEM_IXHASH  http://spameatingmonkey.com/lists.html
- tflags		SEM_IXHASH  net
-+score		SEM_IXHASH  1.5
+-
+-ixhashdnsbl	SEM_IXHASH  ixhash.spameatingmonkey.net.
+-body		SEM_IXHASH  eval:check_ixhash('SEM_IXHASH')
+-tflags		SEM_IXHASH  net
++score		NIXSPAM_IXHASH  3.0
  
  endif
 -

diff --git a/spamassassin-iXhash2.spec b/spamassassin-iXhash2.spec
index b8cc39c..132b42e 100644
--- a/spamassassin-iXhash2.spec
+++ b/spamassassin-iXhash2.spec
@@ -3,7 +3,7 @@
 Summary:        SpamAssassin plugin to lookup e-mail checksums in blacklists
 Name:           spamassassin-%{pkgname}
 Version:        2.05
-Release:        11%{?dist}
+Release:        12%{?dist}
 License:        ASL 2.0
 Group:          Applications/Internet
 URL:            http://mailfud.org/%{pkgname}/
@@ -22,11 +22,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 iXhash2 is an unofficial improved version of the iXhash spam filter
 plugin for SpamAssassin, adding async DNS lookups for performance and
 removing unneeded features but fully compatible with the iXhash 1.5.5
-(http://www.ixhash.net/) implementation. It computes MD5 checksums of
-fragments of the body of an e-mail and compares them to those of known
-spam using DNS queries to a RBL-like name server. So it works similar
-to the standard plugins that use the Pyzor, Razor and DCC software
-packages from within SpamAssassin.
+(https://sourceforge.net/projects/ixhash/) implementation. It computes
+MD5 checksums of fragments of the body of an e-mail and compares them
+to those of known spam using DNS queries to a RBL-like name server. So
+it works similar to the standard plugins that use the Pyzor, Razor and
+DCC software packages from within SpamAssassin.
 
 %prep
 %setup -q -n %{pkgname}-%{version}
@@ -36,25 +36,23 @@ cp -pf %{SOURCE1} iXhash2.eml
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 install -D -p -m 644 %{pkgname}.cf $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/%{pkgname}.cf
 touch -c -r %{pkgname}.cf.conf $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/%{pkgname}.cf
 install -D -p -m 644 %{pkgname}.pm $RPM_BUILD_ROOT%{perl_vendorlib}/Mail/SpamAssassin/Plugin/%{pkgname}.pm
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3/
 perldoc %{pkgname}.pm > $RPM_BUILD_ROOT%{_mandir}/man3/Mail::SpamAssassin::Plugin::%{pkgname}.3pm
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
-%doc CHANGELOG LICENSE README iXhash2.eml
+%license LICENSE
+%doc CHANGELOG README iXhash2.eml
 %config(noreplace) %{_sysconfdir}/mail/spamassassin/%{pkgname}.cf
 %{perl_vendorlib}/Mail/SpamAssassin/Plugin/%{pkgname}.pm
 %{_mandir}/man3/*.3pm*
 
 %changelog
+* Wed Dec 06 2017 Robert Scheck <robert@fedoraproject.org> 2.05-12
+- Remove retired iXhash blacklists from default configuration
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.05-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild