rpms/sagator/EL-4 sagator-remove-virus.diff, NONE, 1.1 import.log, 1.2, 1.3 sagator.spec, 1.3, 1.4

[Ján ONDREJ]

Author: ondrejj

Update of /cvs/pkgs/rpms/sagator/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31259/EL-4

Modified Files:
	import.log sagator.spec 
Added Files:
	sagator-remove-virus.diff 
Log Message:
Removed viruses, BZ#492105

sagator-remove-virus.diff:

--- NEW FILE sagator-remove-virus.diff ---
Index: doc/README
===================================================================
--- doc/README	(revision 1880)
+++ doc/README	(working copy)
@@ -484,7 +484,8 @@
 
   There some test scripts. Go into test directory and try:
 
-    ./smtptest localhost 25 Eicar
+    ./download_viruses.sh
+    ./smtptest localhost 25 tmp/Eicar
     ./smtptest localhost 25 spam
     ...
 
Index: test/download_viruses.sh
===================================================================
--- test/download_viruses.sh	(revision 0)
+++ test/download_viruses.sh	(revision 1881)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+DIR=`dirname $0`/tmp
+mkdir -p $DIR
+cd $DIR
+for fn in Eicar test.zip test.rar rtest.zip; do
+  wget -O $fn http://www.salstar.sk/sagator/testfiles/$fn
+done
+cd -
Index: test/Eicar
===================================================================
--- test/Eicar	(revision 1880)
+++ test/Eicar	(working copy)
@@ -1,5 +0,0 @@
-From: virus-tester
-To: undisclosed-recipients:;
-Subject: sagator test - virus scanner test pattern
-
-X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*
Index: test/pack/test.zip
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: test/pack/rtest.zip
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: test/pack/test.rar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	9 Mar 2009 10:57:17 -0000	1.2
+++ import.log	28 Mar 2009 18:54:53 -0000	1.3
@@ -1,2 +1,3 @@
 sagator-1_1_0-1_fc9:EL-4:sagator-1.1.0-1.fc9.src.rpm:1216030241
 sagator-1_1_1-1_fc10:EL-4:sagator-1.1.1-1.fc10.src.rpm:1236596208
+sagator-1_1_1-4_el5:EL-4:sagator-1.1.1-4.el5.src.rpm:1238266467


Index: sagator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/EL-4/sagator.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sagator.spec	9 Mar 2009 10:57:17 -0000	1.3
+++ sagator.spec	28 Mar 2009 18:54:53 -0000	1.4
@@ -8,14 +8,15 @@
 Summary:   Antivir/antispam gateway for smtp server
 Name:      sagator
 Version:   1.1.1
-Release:   1%{?dist}
+Release:   4%{?dist}
 Source:    http://www.salstar.sk/pub/antivir/snapshots/sagator-%{version}.tar.bz2
+Patch1:    sagator-remove-virus.diff
 URL:       http://www.salstar.sk/sagator/
 License:   GPLv2+
 Group:     System Environment/Daemons
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: python-devel >= 2.2.2, ed, gettext
+BuildRequires: python-devel, ed, gettext
 Requires:  %{name}-core = %{version}-%{release}
 Requires:  python >= 2.2.2, sed
 Requires:  spamassassin
@@ -51,7 +52,7 @@
 Group:          System Environment/Daemons
 Requires:       python >= 2.2.2, sed
 %if %_vendor == "suse"
-BuildRequires: aaa_base, python-xml, clamav >= %{CLAMAV_VERSION}
+BuildRequires: aaa_base, python-xml, clamav
 Requires:  aaa_base, smtp_daemon
 %if 0%suse_version < 01030
 Requires:  python-ctypes
@@ -61,7 +62,7 @@
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires:       initscripts, smtpdaemon, shadow-utils
-BuildRequires:  initscripts, logwatch, clamav-devel >= %{CLAMAV_VERSION}
+BuildRequires:  initscripts, logwatch, clamav-devel
 Requires: clamav-lib >= %{CLAMAV_VERSION}
 Requires: spamassassin
 %endif
@@ -103,6 +104,9 @@
 
 %prep
 %setup -q
+%patch1 -p0
+chmod +x test/*.sh
+rm -rf test/pack
 
 %build
 sh configure --prefix=%{_prefix} --filelist
@@ -230,6 +234,9 @@
 %endif
 
 %changelog
+* Sat Mar 28 2009 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.1.1-4
+- removed viruses, applied upstream patch
+
 * Wed Sep 17 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.1.1-1
 - core files moved to core packages, sagator package now requires clamav
   and spamassassin