diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index d790bca..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-amavisd-new-2.5.2.tar.gz
diff --git a/README.fedora b/README.fedora
deleted file mode 100644
index dd2506f..0000000
--- a/README.fedora
+++ /dev/null
@@ -1,68 +0,0 @@
-INSTALLATION
-------------
-Installing amavisd-new from Fedora Extras is simple.  First, install
-the amavisd-new package:
-
-  yum -y install amavisd-new
-
-Don't be alarmed at the number of dependencies this installs.  This
-package tries to be as full-featured as possible, including many
-optional components for amavisd-new.
-
-Next, configure amavisd-new to start on boot:
-
-  chkconfig --level 2345 amavisd on
-
-If you want to use the Clam Antivirus daemon (recommended), set it to
-start on boot as well:
-
-  chkconfig --level 2345 clamd.amavisd on
-
-When you are ready, start the clamd.amavisd (optional but recommended)
-and amavisd services:
-
-  service clamd.amavisd start
-  service amavisd start
-
-Check /var/log/maillog for startup messages from both daemons.
-
-The next step is to integrate amavisd with your MTA.
-
-POSTFIX
--------
-The simplest method for enabling amavisd-new support in postfix is to
-use the content_filter configuration option to tell postfix to relay
-mail through amavisd-new using SMTP.  In this configuration, incoming
-mail passes from postfix to amavisd and back to postfix.  (Mail never
-actually leaves the control of postfix however, since amavisd does not
-answer OK until it scans the message and transfers it back to postfix.
-The worst that can happen is a failure at just the right time could
-allow a message to be queued twice.)
-
-Add the following to /etc/postfix/main.cf:
-
-  content_filter = smtp:[127.0.0.1]:10024
-
-You will probably also want to limit the number of postfix processes
-to keep mail from coming in faster than it can be processed by adding
-the following to /etc/postfix/main.cf:
-
-  default_process_limit = 20
-
-Add the following to /etc/postfix/master.cf:
-
-  127.0.0.1:10025 inet n - - - 0 smtpd -o content_filter=
-
-Be sure to read the TUNING section in README.postfix for information
-on process limits.
-
-SENDMAIL
---------
-See README.sendmail* in this directory.
-
-Please note that amavisd-new's milter functionality is not enabled in
-this package.
-
-EXIM
-----
-See README.exim* in this directory.
diff --git a/README.quarantine b/README.quarantine
deleted file mode 100644
index 21d805e..0000000
--- a/README.quarantine
+++ /dev/null
@@ -1,24 +0,0 @@
-To enable quarantine support simply change the following line in
-/etc/amavisd/amavisd.conf:
-
-  $QUARANTINEDIR = undef;      # -Q
-
-to
-
-  $QUARANTINEDIR = "$MYHOME/quarantine";      # -Q
-
-then restart amavisd.
-
-The following will make the change for you:
-
-  sed -i.orig -e '/\$QUARANTINEDIR =/s,undef,"$MYHOME/quarantine",' \
-      /etc/amavisd/amavisd.conf
-
-PLEASE NOTE:  This is intentionally a manual step.  Before turning on
-the quarantine feature of amavisd-new, be sure that there is a
-sufficient amount of free space on /var/spool/amavisd/quarantine.
-"Sufficient" depends entirely on your environment.
-
-In the default configuration, files in the quarantine directory will
-be automatically deleted by tmpwatch after 30 days.  See
-/etc/cron.daily/amavisd to adjust this behavior for your environment.
diff --git a/amavis-clamd.conf b/amavis-clamd.conf
deleted file mode 100644
index 0449325..0000000
--- a/amavis-clamd.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# Use system logger.
-LogSyslog yes
-
-# Specify the type of syslog messages - please refer to 'man syslog'
-# for facility names.
-LogFacility LOG_MAIL
-
-# This option allows you to save a process identifier of the listening
-# daemon (main thread).
-PidFile /var/run/amavisd/clamd.pid
-
-# Remove stale socket after unclean shutdown.
-# Default: disabled
-FixStaleSocket yes
-
-# Run as a selected user (clamd must be started by root).
-User amavis
-
-# Path to a local socket file the daemon will listen on.
-LocalSocket /var/spool/amavisd/clamd.sock
diff --git a/amavis-clamd.init b/amavis-clamd.init
deleted file mode 100644
index 27a6f87..0000000
--- a/amavis-clamd.init
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-#
-# chkconfig: - 78 32
-# description: The clamd server running for amavisd
-
-CLAMD_SERVICE=amavisd
-. /usr/share/clamav/clamd-wrapper
diff --git a/amavis-clamd.sysconfig b/amavis-clamd.sysconfig
deleted file mode 100644
index 55fb40a..0000000
--- a/amavis-clamd.sysconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-CLAMD_CONFIGFILE=/etc/clamd.d/amavisd.conf
-CLAMD_SOCKET=/var/spool/amavisd/clamd.sock
-CLAMD_OPTIONS=
diff --git a/amavisd-condrestart.patch b/amavisd-condrestart.patch
deleted file mode 100644
index 02cac2a..0000000
--- a/amavisd-condrestart.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- amavisd_init.sh.orig	2004-02-23 16:09:02.000000000 -0600
-+++ amavisd_init.sh	2004-02-23 16:13:52.000000000 -0600
-@@ -60,8 +60,12 @@
- 	action $"Reloading ${prog_base}:" ${prog} -c ${prog_config_file} reload
- 	RETVAL=$?
- 	;;
-+  condrestart)
-+	[ -f /var/lock/subsys/${prog_base} ] && $0 restart || :
-+	RETVAL=$?
-+	;;
-   *)
--	echo "Usage: $0 {start|stop|status|restart|reload}"
-+	echo "Usage: $0 {start|stop|status|restart|reload|condrestart}"
- 	exit 1
- esac
- 
diff --git a/amavisd-conf.patch b/amavisd-conf.patch
deleted file mode 100644
index 7a10d80..0000000
--- a/amavisd-conf.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- amavisd-new-2.5.1/amavisd.conf.orig	2007-05-31 07:09:55.000000000 -0500
-+++ amavisd-new-2.5.1/amavisd.conf	2007-06-22 16:35:04.000000000 -0500
-@@ -15,23 +15,23 @@
- # $bypass_decode_parts = 1;         # controls running of decoders&dearchivers
- 
- $max_servers = 2;            # num of pre-forked children (2..15 is common), -m
--$daemon_user  = 'vscan';     # (no default;  customary: vscan or amavis), -u
--$daemon_group = 'vscan';     # (no default;  customary: vscan or amavis), -g
-+$daemon_user  = 'amavis';     # (no default;  customary: vscan or amavis), -u
-+$daemon_group = 'amavis';     # (no default;  customary: vscan or amavis), -g
- 
- $mydomain = 'example.com';   # a convenient default for other settings
- 
--# $MYHOME = '/var/amavis';   # a convenient default for other settings, -H
-+$MYHOME = '/var/spool/amavisd';   # a convenient default for other settings, -H
- $TEMPBASE = "$MYHOME/tmp";   # working directory, needs to exist, -T
- $ENV{TMPDIR} = $TEMPBASE;    # environment variable TMPDIR, used by SA, etc.
--$QUARANTINEDIR = '/var/virusmails';  # -Q
-+$QUARANTINEDIR = undef;      # -Q
- # $quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
- 
- # $daemon_chroot_dir = $MYHOME;   # chroot directory or undef, -R
- 
- # $db_home   = "$MYHOME/db";      # dir for bdb nanny/cache/snmp databases, -D
- # $helpers_home = "$MYHOME/var";  # working directory for SpamAssassin, -S
--# $lock_file = "$MYHOME/var/amavisd.lock";  # -L
--# $pid_file  = "$MYHOME/var/amavisd.pid";   # -P
-+$lock_file = "/var/run/amavisd/amavisd.lock";  # -L
-+$pid_file  = "/var/run/amavisd/amavisd.pid";   # -P
- #NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually
- 
- $log_level = 0;              # verbosity 0..5, -d
-@@ -110,11 +110,11 @@
- # $timestamp_fmt_mysql = 1; # if using MySQL *and* msgs.time_iso is TIMESTAMP;
- #   defaults to 0, which is good for non-MySQL or if msgs.time_iso is CHAR(16)
- 
--$virus_admin               = "virusalert\@$mydomain";  # notifications recip.
-+$virus_admin               = undef;                    # notifications recip.
- 
--$mailfrom_notify_admin     = "virusalert\@$mydomain";  # notifications sender
--$mailfrom_notify_recip     = "virusalert\@$mydomain";  # notifications sender
--$mailfrom_notify_spamadmin = "spam.police\@$mydomain"; # notifications sender
-+$mailfrom_notify_admin     = undef;                    # notifications sender
-+$mailfrom_notify_recip     = undef;                    # notifications sender
-+$mailfrom_notify_spamadmin = undef;                    # notifications sender
- $mailfrom_to_quarantine = ''; # null return path; uses original sender if undef
- 
- @addr_extension_virus_maps      = ('virus');
-@@ -148,10 +148,10 @@
- # $notify_method  = 'smtp:[127.0.0.1]:10025';
- # $forward_method = 'smtp:[127.0.0.1]:10025';  # set to undef with milter!
- 
--# $final_virus_destiny      = D_DISCARD;
--# $final_banned_destiny     = D_BOUNCE;
--# $final_spam_destiny       = D_BOUNCE;
--# $final_bad_header_destiny = D_PASS;
-+$final_virus_destiny      = D_DISCARD;
-+$final_banned_destiny     = D_BOUNCE;
-+$final_spam_destiny       = D_DISCARD;
-+$final_bad_header_destiny = D_BOUNCE;
- 
- # $os_fingerprint_method = 'p0f:127.0.0.1:2345';  # to query p0f-analyzer.pl
- 
-@@ -353,10 +353,10 @@
- # ['Sophos SAVI', \&sophos_savi ],
- 
- # ### http://www.clamav.net/
--# ['ClamAV-clamd',
--#   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
--#   qr/\bOK$/, qr/\bFOUND$/,
--#   qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
-+['ClamAV-clamd',
-+  \&ask_daemon, ["CONTSCAN {}\n", "/var/spool/amavisd/clamd.sock"],
-+  qr/\bOK$/, qr/\bFOUND$/,
-+  qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
- # # NOTE: run clamd under the same user as amavisd, or run it under its own
- # #   uid such as clamav, add user clamav to the amavis group, and then add
- # #   AllowSupplementaryGroups to clamd.conf;
diff --git a/amavisd-db.patch b/amavisd-db.patch
deleted file mode 100644
index 7a607ab..0000000
--- a/amavisd-db.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./amavisd-nanny.org	2005-09-19 15:26:59.000000000 +0200
-+++ ./amavisd-nanny	2005-09-19 15:27:37.000000000 +0200
-@@ -51,7 +51,7 @@
- my($activettl) = 10*60; # stuck active children are sent a SIGTERM after this
-                         # many seconds
- 
--my($db_home) = '/var/amavis/db';  # DB databases directory
-+my($db_home) = '/var/spool/amavisd/db';  # DB databases directory
- my($dbfile)  = 'nanny.db';
- my($wakeuptime) = 2;  # seconds
- 
---- ./amavisd-agent.org	2005-09-19 15:28:15.000000000 +0200
-+++ ./amavisd-agent	2005-09-19 15:20:24.000000000 +0200
-@@ -107,7 +107,7 @@
- # main program starts here
-   $SIG{INT} = sub { die "\n" };  # do the END code block
-   my($env) = BerkeleyDB::Env->new(
--    '-Home'=>'/var/amavis/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
-+    '-Home'=>'/var/spool/amavisd/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
-   defined $env or die "BDB no env: $BerkeleyDB::Error $!";
-   my($db) = BerkeleyDB::Hash->new(
-     '-Filename'=>'snmp.db', '-Flags'=>DB_RDONLY, '-Env'=>$env );
diff --git a/amavisd-init.patch b/amavisd-init.patch
deleted file mode 100644
index ff850cd..0000000
--- a/amavisd-init.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- amavisd-new-2.3.2.orig/amavisd_init.sh	2002-11-15 22:22:47.000000000 -0600
-+++ amavisd-new-2.3.2/amavisd_init.sh	2005-07-06 16:11:23.000000000 -0500
-@@ -4,10 +4,10 @@
- #		(to be used with version amavisd-new-20020630 or later)
- #
- 
--# chkconfig: 2345 79 31
-+# chkconfig: - 79 31
- # description: amavisd is an interface between MTA and content checkers
- # processname: amavisd
--# pidfile: /var/amavis/amavisd.pid
-+# pidfile: /var/run/amavisd/amavisd.pid
- 
- # Source function library.
- . /etc/rc.d/init.d/functions
-@@ -19,7 +19,7 @@
- prog="/usr/sbin/amavisd"
- prog_base="$(basename ${prog})"
- 
--prog_config_file="/etc/amavisd.conf"
-+prog_config_file="/etc/amavisd/amavisd.conf"
- 
- # Source configuration.
- [ -e /etc/sysconfig/${prog_base} ] && . /etc/sysconfig/${prog_base}
diff --git a/amavisd-new.spec b/amavisd-new.spec
deleted file mode 100644
index db342d2..0000000
--- a/amavisd-new.spec
+++ /dev/null
@@ -1,303 +0,0 @@
-#%%define prerelease rc2
-
-Summary:        Email filter with virus scanner and spamassassin support
-Name:           amavisd-new
-Version:        2.5.2
-Release:        4%{?prerelease:.%{prerelease}}%{?dist}
-License:        GPL
-Group:          Applications/System
-URL:            http://www.ijs.si/software/amavisd/
-Source0:        http://www.ijs.si/software/amavisd/amavisd-new-%{version}%{?prerelease:-%{prerelease}}.tar.gz
-Source1:        amavis-clamd.init
-Source2:        amavis-clamd.conf
-Source3:        amavis-clamd.sysconfig
-Source4:        README.fedora
-Source5:        README.quarantine
-Source6:        amavisd.cron
-Patch0:         amavisd-conf.patch
-Patch1:         amavisd-init.patch
-Patch2:         amavisd-condrestart.patch
-Patch3:         amavisd-db.patch
-Patch4:         amavisd-sa_fix.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root/
-Requires:       smtpdaemon
-Requires:       /usr/sbin/clamd, /etc/clamd.d
-Requires:       /usr/sbin/tmpwatch, /etc/cron.daily
-Requires:       /usr/bin/ar
-Requires:       altermime
-Requires:       arj
-Requires:       bzip2
-Requires:       cabextract
-Requires:       cpio
-Requires:       file
-Requires:       freeze
-Requires:       gzip
-Requires:       lzop
-Requires:       nomarch
-Requires:       p7zip
-Requires:       tar
-# We probably should parse the fetch_modules() code in amavisd for this list.
-# These are just the dependencies that don't get picked up otherwise.
-Requires:       perl(Archive::Tar)
-Requires:       perl(Archive::Zip)
-Requires:       perl(Authen::SASL)
-Requires:       perl(Compress::Zlib) >= 1.35
-Requires:       perl(Convert::TNEF)
-Requires:       perl(Convert::UUlib)
-Requires:       perl(DBD::SQLite)
-Requires:       perl(DBI)
-Requires:       perl(IO::Socket::INET6)
-Requires:       perl(IO::Stringy)
-Requires:       perl(MIME::Body)
-Requires:       perl(MIME::Decoder::Base64)
-Requires:       perl(MIME::Decoder::Binary)
-Requires:       perl(MIME::Decoder::Gzip64)
-Requires:       perl(MIME::Decoder::NBit)
-Requires:       perl(MIME::Decoder::QuotedPrint)
-Requires:       perl(MIME::Decoder::UU)
-Requires:       perl(MIME::Head)
-Requires:       perl(Mail::Field)
-Requires:       perl(Mail::Header)
-Requires:       perl(Mail::Internet)
-Requires:       perl(Mail::SPF)
-Requires:       perl(Mail::SpamAssassin)
-Requires:       perl(Net::DNS)
-Requires:       perl(Net::LDAP)
-Requires:       perl(Razor2::Client::Version)
-Requires:       perl(URI)
-Requires(pre):  /usr/sbin/useradd
-Requires(post): /sbin/chkconfig
-Requires(post): /sbin/service
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-BuildArch:      noarch
-
-%description
-amavisd-new is a high-performance and reliable interface between mailer
-(MTA) and one or more content checkers: virus scanners, and/or
-Mail::SpamAssassin Perl module. It is written in Perl, assuring high
-reliability, portability and maintainability. It talks to MTA via (E)SMTP
-or LMTP, or by using helper programs. No timing gaps exist in the design
-which could cause a mail loss.
-
-%prep
-%setup -q -n %{name}-%{version}%{?prerelease:-%{prerelease}}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p0
-%patch3 -p0
-%patch4 -p1
-install -m644 %{SOURCE4} %{SOURCE5} README_FILES/
-
-sed -i -e 's,/var/amavis/amavisd.sock\>,/var/spool/amavisd/amavisd.sock,' \
-    amavisd-release
-
-%build
-
-%install
-rm -rf "$RPM_BUILD_ROOT"
-
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-install -m755 amavisd $RPM_BUILD_ROOT%{_sbindir}/
-( cd $RPM_BUILD_ROOT%{_sbindir} && ln -s clamd clamd.amavisd )
-
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m755 amavisd-{agent,nanny,release} $RPM_BUILD_ROOT%{_bindir}/
-
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -m755 amavisd_init.sh $RPM_BUILD_ROOT%{_initrddir}/amavisd
-install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/clamd.amavisd
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/amavisd
-install -m644 amavisd.conf $RPM_BUILD_ROOT%{_sysconfdir}/amavisd/
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/clamd.d
-install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/clamd.d/amavisd.conf
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/clamd.amavisd
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
-install -m755 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/amavisd
-
-mkdir -p $RPM_BUILD_ROOT/var/spool/amavisd/{tmp,db,quarantine}
-touch $RPM_BUILD_ROOT/var/spool/amavisd/clamd.sock
-mkdir -p $RPM_BUILD_ROOT/var/run/amavisd/
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-%pre
-if ! id amavis &>/dev/null ; then
-    /usr/sbin/useradd -r -s /sbin/nologin -d /var/spool/amavisd amavis
-fi
-
-%preun
-if [ "$1" = 0 ]; then
-    /sbin/service amavisd stop 2>/dev/null || :
-    /sbin/chkconfig --del amavisd || :
-    /sbin/service clamd.amavisd stop 2>/dev/null || :
-    /sbin/chkconfig --del clamd.amavisd || :
-fi
-
-%post
-/sbin/chkconfig --add clamd.amavisd || :
-/sbin/service clamd.amavisd condrestart || :
-/sbin/chkconfig --add amavisd || :
-/sbin/service amavisd condrestart || :
-
-%files
-%doc AAAREADME.first LDAP.schema LICENSE RELEASE_NOTES TODO
-%doc README_FILES test-messages amavisd.conf-*
-%dir %{_sysconfdir}/amavisd/
-%attr(755,root,root) %{_initrddir}/amavisd
-%attr(755,root,root) %{_initrddir}/clamd.amavisd
-%config(noreplace) %{_sysconfdir}/amavisd/amavisd.conf
-%config(noreplace) %{_sysconfdir}/clamd.d/amavisd.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/clamd.amavisd
-%config(noreplace) %{_sysconfdir}/cron.daily/amavisd
-%{_sbindir}/amavisd
-%{_sbindir}/clamd.amavisd
-%{_bindir}/amavisd-*
-%dir %attr(750,amavis,amavis) /var/spool/amavisd
-%dir %attr(750,amavis,amavis) /var/spool/amavisd/tmp
-%dir %attr(750,amavis,amavis) /var/spool/amavisd/db
-%dir %attr(750,amavis,amavis) /var/spool/amavisd/quarantine
-%dir %attr(755,amavis,amavis) /var/run/amavisd
-%ghost /var/spool/amavisd/clamd.sock
-
-%changelog
-* Mon Nov 30 2015 Juan Orti Alcaine <jorti@fedoraproject.org> 2.5.2-4
-- Add patch to fix Spamassassin (rhbz#1286589)
-
-* Thu Aug 07 2014 Juan Orti Alcaine <jorti@fedoraproject.org> 2.5.2-3
-- Change permissions of /var/spool/amavisd folders to 750
-
-* Sun Aug 12 2007 Steven Pritchard <steve@kspei.com> 2.5.2-2
-- Fix pre/preun/post dependencies and improve scriptlets a bit.
-- Drop dependencies on DBD::mysql and Mail::SPF::Query.
-- Add dependencies on IO::Socket::INET6, Mail::SPF, and altermime.
-
-* Sun Jul 08 2007 Steven Pritchard <steve@kspei.com> 2.5.2-1
-- Update to 2.5.2.
-
-* Fri Jun 22 2007 Steven Pritchard <steve@kspei.com> 2.5.2-0.1.rc2
-- Update to 2.5.2-rc2.
-
-* Fri Jun 22 2007 Steven Pritchard <steve@kspei.com> 2.5.1-1
-- Update to 2.5.1.
-- Fix amavis-clamd.conf (bug #237252).
-- Update amavisd-conf.patch.
-- Require p7zip and tar.
-- Improve pre/preun/post scripts.
-
-* Thu Feb 22 2007 Steven Pritchard <steve@kspei.com> 2.4.5-1
-- Update to 2.4.5.
-
-* Mon Dec 18 2006 Steven Pritchard <steve@kspei.com> 2.4.4-2
-- Fix the path to amavisd.sock in amavisd-release.
-
-* Tue Dec 05 2006 Steven Pritchard <steve@kspei.com> 2.4.4-1
-- Update to 2.4.4.
-
-* Fri Dec 01 2006 Steven Pritchard <steve@kspei.com> 2.4.3-5
-- Add missing amavisd-release script.
-
-* Tue Nov 14 2006 Steven Pritchard <steve@kspei.com> 2.4.3-4
-- Rebuild.
-
-* Tue Nov 14 2006 Steven Pritchard <steve@kspei.com> 2.4.3-3
-- Add dependency on file. (#215492)
-
-* Sat Oct 14 2006 Steven Pritchard <steve@kspei.com> 2.4.3-2
-- Fix permissions on the cron.daily script.
-
-* Tue Oct 10 2006 Steven Pritchard <steve@kspei.com> 2.4.3-1
-- Update to 2.4.3.
-- Add quarantine directory and instructions for enabling it.
-- Add tmpwatch cron script.
-
-* Thu Sep 28 2006 Steven Pritchard <steve@kspei.com> 2.4.2-4
-- Drop lha dependency and add arj.
-
-* Sun Sep 17 2006 Steven Pritchard <steve@kspei.com> 2.4.2-3
-- Rebuild.
-
-* Wed Aug 02 2006 Steven Pritchard <steve@kspei.com> 2.4.2-2
-- Fix path to clamd socket in amavisd-conf.patch.
-
-* Mon Jul 31 2006 Steven Pritchard <steve@kspei.com> 2.4.2-1
-- Update to 2.4.2
-- Fix permissions on README.fedora (bug #200769)
-
-* Tue Jun 20 2006 Steven Pritchard <steve@kspei.com> 2.4.1-1
-- Update to 2.4.1
-- Drop zoo dependency due to Extras maintainer security concerns
-
-* Tue Apr 25 2006 Steven Pritchard <steve@kspei.com> 2.4.0-1
-- Update to 2.4.0
-
-* Thu Feb 02 2006 Steven Pritchard <steve@kspei.com> 2.3.3-5
-- Add dist to Release
-
-* Wed Sep 21 2005 Steven Pritchard <steve@kspei.com> 2.3.3-4
-- Add TODO and amavisd.conf-* to %%doc
-
-* Mon Sep 19 2005 Steven Pritchard <steve@kspei.com> 2.3.3-3
-- Add amavisd-db.patch to fix the path to the db directory in
-  amavisd-agent and amavisd-nanny.  (Thanks to Julien Tognazzi.)
-
-* Fri Sep 02 2005 Steven Pritchard <steve@kspei.com> 2.3.3-2
-- Requires: perl(Compress::Zlib) >= 1.35
-
-* Thu Sep 01 2005 Steven Pritchard <steve@kspei.com> 2.3.3-1
-- Update to 2.3.3
-- Remove explicit dependencies on core perl modules
-
-* Fri Aug 19 2005 Steven Pritchard <steve@kspei.com> 2.3.2-10
-- Recommend using 127.0.0.1 instead of localhost in README.fedora
-- .deb support requires ar
-
-* Wed Aug 17 2005 Steven Pritchard <steve@kspei.com> 2.3.2-9
-- Set $virus_admin, $mailfrom_notify_admin, $mailfrom_notify_recip,
-  and $mailfrom_notify_spamadmin to undef in the default config to
-  turn off notification emails
-
-* Fri Aug 12 2005 Steven Pritchard <steve@kspei.com> 2.3.2-8
-- Add dependencies for freeze, lzop, nomarch, zoo, cabextract
-
-* Wed Jul 27 2005 Steven Pritchard <steve@kspei.com> 2.3.2-7
-- Add README.fedora with simplified Postfix instructions
-
-* Mon Jul 25 2005 Steven Pritchard <steve@kspei.com> 2.3.2-6
-- Create /var/spool/amavisd/db
-
-* Thu Jul 21 2005 Steven Pritchard <steve@kspei.com> 2.3.2-5
-- Add perl(Mail::SPF::Query) (now packaged for Extras) dependency
-- Drop /var/log/amavisd since we weren't using it
-- Fix paths for clamd.sock and amavisd.pid in a couple of places
-
-* Tue Jul 12 2005 Steven Pritchard <steve@kspei.com> 2.3.2-4
-- Add a bunch of other missing Requires (both actually required modules
-  and optional modules)
-
-* Tue Jul 12 2005 Steven Pritchard <steve@kspei.com> 2.3.2-3
-- Add missing Requires: perl(Convert::TNEF)
-
-* Wed Jul 06 2005 Steven Pritchard <steve@kspei.com> 2.3.2-2
-- Fix init script ordering
-- Don't enable amavisd by default
-
-* Wed Jul 06 2005 Steven Pritchard <steve@kspei.com> 2.3.2-1
-- Update to 2.3.2
-
-* Wed Jun 29 2005 Steven Pritchard <steve@kspei.com> 2.3.2-0.1.rc1
-- Update to 2.3.2-rc1
-- Fedora Extras clamav integration
-- Drop amavisd-syslog.patch (Unix::Syslog is in Extras)
-
-* Mon Feb 23 2004 Steven Pritchard <steve@kspei.com> 0.20030616.p7-0.fdr.0.1
-- Add amavisd-syslog.patch to eliminate Unix::Syslog dependency
-- Add in clamd helper
-- Fix up init script
-- Initial package
diff --git a/amavisd-sa_fix.patch b/amavisd-sa_fix.patch
deleted file mode 100644
index 23ada10..0000000
--- a/amavisd-sa_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/amavisd b/amavisd
-index bc2f365..58273aa 100755
---- a/amavisd
-+++ b/amavisd
-@@ -17971,7 +17971,7 @@ sub call_spamassassin($$$) {
-   my($self,$msginfo,$lines) = @_;
-   my($mail_obj,$per_msg_status);
-   my($which_section) = 'SA prepare';
--  my($data_representation) = 'GLOB';  # pass data as ARRAY or a GLOB to SA
-+  my($data_representation) = 'ARRAY';  # pass data as ARRAY or a GLOB to SA
-   my($saved_umask) = umask; my($saved_pid) = $$;
-   my($spamassassin_obj) = $self->{'spamassassin_obj'};
-   my($sa_version) = $self->sa_version;
diff --git a/amavisd.cron b/amavisd.cron
deleted file mode 100644
index 3e408d9..0000000
--- a/amavisd.cron
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/sbin/tmpwatch 24 /var/spool/amavisd/tmp
-/usr/sbin/tmpwatch -d 720 /var/spool/amavisd/quarantine
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..f76cc4b
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Renamed to amavis
diff --git a/sources b/sources
deleted file mode 100644
index d1f83c4..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-52d227d442fac64916488b83d79806d7  amavisd-new-2.5.2.tar.gz