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

Wed Jan 27 10:06:21 UTC 2010

Author: ondrejj

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

Modified Files:
	.cvsignore import.log sagator.spec sources 
Removed Files:
	sagator-remove-virus.diff 
Log Message:
Stable version released


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5

--- .cvsignore	9 Mar 2009 10:57:17 -0000	1.4
+++ .cvsignore	27 Jan 2010 10:06:21 -0000	1.5
@@ -1 +1 @@
-sagator-1.1.1.tar.bz2
+sagator-1.2.0.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/EL-4/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	28 Mar 2009 18:54:53 -0000	1.3
+++ import.log	27 Jan 2010 10:06:21 -0000	1.4
@@ -1,3 +1,4 @@
 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
+sagator-1_2_0-1_fc12:EL-4:sagator-1.2.0-1.fc12.src.rpm:1264586765


Index: sagator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/EL-4/sagator.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sagator.spec	28 Mar 2009 18:54:53 -0000	1.4
+++ sagator.spec	27 Jan 2010 10:06:21 -0000	1.5
@@ -7,23 +7,22 @@
 
 Summary:   Antivir/antispam gateway for smtp server
 Name:      sagator
-Version:   1.1.1
-Release:   4%{?dist}
+Version:   1.2.0
+Release:   1%{?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, ed, gettext
+BuildRequires: python-devel >= 2.2.2, ed, gettext
 Requires:  %{name}-core = %{version}-%{release}
 Requires:  python >= 2.2.2, sed
 Requires:  spamassassin
 %if %_vendor == "suse"
 Requires:  clamav >= %{CLAMAV_VERSION}
 %else
-Requires:  clamav-lib >= %{CLAMAV_VERSION}
+Requires:  clamav-lib >= %{CLAMAV_VERSION}, clamav-update
 %endif
 
 %description
@@ -36,23 +35,30 @@ It has some internal checkers (string_sc
 can parse MIME mails and decompress archives, if it is configured so.
 
 Features:
+    *  simple chroot support
     * modular antivirus/spamchecker support
+          o you can attach an intrascanner to another intrascanner or realscanner
+          o you can combine intrascanners
+          o you can combine realscanners
+          o virus/spam level based scanners
+    * database support
+          o SQL logging
+          o dynamic scanner (antivirus/antispam) configuration
+    * daily reports for users
+    * web quarantine accessible for all users
     * you don't need any perl modules or any other modules, only python
     * you can return any quarantined mail to mailq/user mailbox
     * mailbox/maildir scanning and cleaning
     * smtp policy service (greylist)
-    * nice statistics via RRDTOOL or MRTG
-    * web-quarantine access for users
-    * daily reports for users
-    * SQL database logging and configuration
-    * simple chroot support
+    * nice statistics via WWW or MRTG
+    * easy installation and configuration
 
 %package core
 Summary:        Antivir/antispam gateway for smtp server, core files
 Group:          System Environment/Daemons
 Requires:       python >= 2.2.2, sed
 %if %_vendor == "suse"
-BuildRequires: aaa_base, python-xml, clamav
+BuildRequires: aaa_base, python-xml, clamav >= %{CLAMAV_VERSION}
 Requires:  aaa_base, smtp_daemon
 %if 0%suse_version < 01030
 Requires:  python-ctypes
@@ -61,8 +67,13 @@ Requires:  python-ctypes
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
-Requires:       initscripts, smtpdaemon, shadow-utils
-BuildRequires:  initscripts, logwatch, clamav-devel
+Requires:       initscripts, shadow-utils
+%if 0%{?fedora} || 0%{?rhel} > 5
+Requires:       server(smtp)
+%else
+Requires:       smtpdaemon
+%endif
+BuildRequires:  initscripts, logwatch, clamav-devel >= %{CLAMAV_VERSION}
 Requires: clamav-lib >= %{CLAMAV_VERSION}
 Requires: spamassassin
 %endif
@@ -76,8 +87,7 @@ not to depend on other software, require
 %package webq
 Summary:        SAGATOR's web quarantine access
 Group:          System Environment/Daemons
-Requires:       sagator-core = %{version}-%{release}, python-kid >= 0.9.5
-BuildRequires:  python-kid
+Requires:       sagator-core = %{version}-%{release}, python-genshi >= 0.4
 
 %description webq
 SAGATOR's web quarantine access can be used to allow users (or admin)
@@ -104,9 +114,6 @@ This package helps moving to the upstrea
 
 %prep
 %setup -q
-%patch1 -p0
-chmod +x test/*.sh
-rm -rf test/pack
 
 %build
 sh configure --prefix=%{_prefix} --filelist
@@ -195,7 +202,7 @@ rm -rf %{buildroot}
 %{_initrddir}/%{name}
 %config(noreplace) %verify(not md5 size mtime) %attr(644,root,root) %{_sysconfdir}/cron.d/%{name}
 %doc doc/README doc/FAQ doc/*.txt doc/*.html TODO COPYING ChangeLog test
-%doc scripts/db scripts/graphs scripts/*.sh
+%doc scripts/db scripts/graphs scripts/*.sh scripts/log/analyzer.py
 %{_bindir}/*
 %{_sbindir}/*
 %dir %{_datadir}/%{name}
@@ -203,14 +210,14 @@ rm -rf %{buildroot}
 %dir %attr(750,root,vscan) %{_datadir}/%{name}/etc
 %{_datadir}/%{name}/etc/*.py*
 %exclude %{_datadir}/%{name}/etc/sgconf.py?
-%dir %{_datadir}/%{name}/av
-%{_datadir}/%{name}/av/*.py*
-%dir %{_datadir}/%{name}/av/libclamav
-%{_datadir}/%{name}/av//libclamav/*.py*
-%dir %{_datadir}/%{name}/as/pydspam
-%{_datadir}/%{name}/as//pydspam/*.py*
-%dir %{_datadir}/%{name}/as
-%{_datadir}/%{name}/as/*.py*
+%dir %{_datadir}/%{name}/avir
+%{_datadir}/%{name}/avir/*.py*
+%dir %{_datadir}/%{name}/avir/libclamav
+%{_datadir}/%{name}/avir/libclamav/*.py*
+%dir %{_datadir}/%{name}/aspam/pydspam
+%{_datadir}/%{name}/aspam/pydspam/*.py*
+%dir %{_datadir}/%{name}/aspam
+%{_datadir}/%{name}/aspam/*.py*
 %dir %{_datadir}/%{name}/interscan
 %{_datadir}/%{name}/interscan/*.py*
 %dir %{_datadir}/%{name}/srv
@@ -224,7 +231,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root)   
 %dir %{_datadir}/%{name}/srv/web
 %{_datadir}/%{name}/srv/web/*.py*
-%{_datadir}/%{name}/srv/web/*.kid
+%{_datadir}/%{name}/srv/web/*.html
 
 %if %{install_sepolicy}
 %files selinux
@@ -234,8 +241,8 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
-* Sat Mar 28 2009 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.1.1-4
-- removed viruses, applied upstream patch
+* Tue Jul 28 2009 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.2.0-1
+- Requires: smtpdaemon again for EPEL
 
 * 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Mar 2009 10:57:17 -0000	1.4
+++ sources	27 Jan 2010 10:06:21 -0000	1.5
@@ -1 +1 @@
-a8be96499866353a56d4b49b1c3c2cd2  sagator-1.1.1.tar.bz2
+d8be084c94a8b582547cd5d4b8d2e3ea  sagator-1.2.0.tar.bz2


--- sagator-remove-virus.diff DELETED ---

