[sagator: 1/2] Update to upstream.

Thu Jul 24 12:08:26 UTC 2014

commit 630ebe1445379f2bfdd491b612f9928b2f38d9a2
Author: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date:   Thu Jul 24 14:00:30 2014 +0200

    Update to upstream.

 .gitignore   |    1 +
 sagator.spec |   73 +++++++++++++++++++++++----------------------------------
 sources      |    2 +-
 3 files changed, 32 insertions(+), 44 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index e0216b2..5a47107 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 sagator-1.2.1.tar.bz2
 /sagator-1.2.2.tar.bz2
 /sagator-1.2.3.tar.bz2
+/sagator-1.3.0.tar.bz2
diff --git a/sagator.spec b/sagator.spec
index caebf6a..6020cd7 100644
--- a/sagator.spec
+++ b/sagator.spec
@@ -12,10 +12,10 @@
 %define sepolicy %{_datadir}/%{name}/selinux/%{name}.pp
 %endif
 
-Summary:   Antivir/antispam gateway for smtp server
+Summary:   Antivirus/anti-spam gateway for smtp server
 Name:      sagator
-Version:   1.2.3
-Release:   7%{?dist}
+Version:   1.3.0
+Release:   1%{?dist}
 Source:    http://www.salstar.sk/pub/antivir/snapshots/sagator-%{version}.tar.bz2
 URL:       http://www.salstar.sk/sagator/
 License:   GPLv2+
@@ -33,24 +33,24 @@ Requires:  clamav-lib >= %{CLAMAV_VERSION}, clamav-update
 %endif
 
 %description
-This program is an email antivirus/antispam gateway. It is an interface to
+This program is an email antivirus/anti-spam gateway. It is an interface to
 the postfix, sendmail, or any other smtpd, which runs antivirus and/or
-spamchecker. Its modular architecture can use any combination of
-antivirus/spamchecker according to configuration.
+spam checker. Its modular architecture can use any combination of
+antivirus/spam checker according to configuration.
 
 It has some internal checkers (string_scanner and regexp_scanner). Sagator
 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
+    * modular antivirus/spam checker support
+          o attach an intrascanner to another intrascanner or realscanner
+          o combine intrascanners
+          o combine realscanners
           o virus/spam level based scanners
     * database support
           o SQL logging
-          o dynamic scanner (antivirus/antispam) configuration
+          o dynamic scanner (antivirus/anti-spam) configuration
     * daily reports for users
     * web quarantine accessible for all users
     * you don't need any perl modules or any other modules, only python
@@ -61,14 +61,14 @@ Features:
     * easy installation and configuration
 
 %package core
-Summary:        Antivir/antispam gateway for smtp server, core files
+Summary:        Antivirus/anti-spam 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 >= %{CLAMAV_VERSION}
-Requires:  aaa_base, smtp_daemon
+Requires:       aaa_base, smtp_daemon
 %if 0%suse_version < 01030
-Requires:  python-ctypes
+Requires:       python-ctypes
 %endif
 %else
 Requires(post): chkconfig
@@ -80,12 +80,13 @@ Requires:       server(smtp)
 %else
 Requires:       smtpdaemon
 %endif
-BuildRequires:  initscripts, logwatch, clamav-devel >= %{CLAMAV_VERSION}
-Requires: clamav-lib >= %{CLAMAV_VERSION}
-Requires: spamassassin
+BuildRequires:  initscripts, clamav-devel >= %{CLAMAV_VERSION}
+Requires:       clamav-lib >= %{CLAMAV_VERSION}
 %endif
-Obsoletes: sagator-libclamav <= 1.2.3
-Obsoletes: sagator-pydspam <= 0.9.1
+Requires:       spamassassin
+BuildRequires:  logwatch
+Obsoletes:      sagator-libclamav <= 1.2.3
+Obsoletes:      sagator-pydspam <= 0.9.1
 
 %description core
 SAGATOR's core files. You can use this package separatelly, if you do
@@ -94,13 +95,12 @@ not to depend on other software, required by sagator.
 %package webq
 Summary:        SAGATOR's web quarantine access
 Group:          System Environment/Daemons
-Requires:       sagator-core = %{version}-%{release}, python-genshi >= 0.4
+Requires:       sagator-core = %{version}-%{release}, python-jinja2
 
 %description webq
 SAGATOR's web quarantine access can be used to allow users (or admin)
 to access their emails in sagator's quarantine.
 
-# SElinux policy for Fedoras and RHEL>=5
 %if 0%{?install_sepolicy}>0
 %package        selinux
 Summary:        SELinux support for SAGATOR
@@ -111,7 +111,6 @@ BuildRequires: selinux-policy-devel
 
 %description selinux
 This package helps moving to the upstream SELinux module.
-
 %endif
 
 %prep
@@ -236,6 +235,9 @@ rm -rf %{buildroot}
 %dir %{_datadir}/%{name}/srv/web
 %{_datadir}/%{name}/srv/web/*.py*
 %{_datadir}/%{name}/srv/web/*.html
+%dir %{_datadir}/%{name}/srv/templates
+%{_datadir}/%{name}/srv/templates/*.py*
+%{_datadir}/%{name}/srv/templates/*.html
 
 %if 0%{?install_sepolicy}>0
 %files selinux
@@ -245,25 +247,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Mon Feb 18 2013 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.2.3-6
-- Selinux subpackage temporarily disabled.
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* Wed Jul  9 2014 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.3.0-1
+- update to upstream
 
-* Sat Jan 14 2012 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.2.3-3
-- added selinux devpts_t to sagator.te policy file
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Thu May 14 2011 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.2.3-1
+* Sat May 14 2011 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.3.0-1
 - added Sanesecurity.Spam an Sanesecurity.Junk to default DROP pattern
 
 * Thu Dec  9 2010 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.2.2-1
@@ -290,12 +277,12 @@ rm -rf %{buildroot}
 - added pydspam module
 - selinux module moved to separate subpackage
 
-* Fri Jan 3 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.0.0-1
+* Thu Jan 3 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.0.0-2
 - /var/spool/vscan replaced by CHROOTDIR macro
 - posttrans section moved to init script (start section)
 - more macros used
 
-* Thu Jan 3 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.0.0-2
+* Thu Jan 3 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.0.0-1
 - clean buildroot before install
 - sagator.conf symlink is now relative
 
@@ -355,7 +342,7 @@ rm -rf %{buildroot}
 * Thu Aug 26 2004 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
 - logrotate script added
 
-* Thu Aug  6 2004 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
+* Fri Aug  6 2004 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
 - srv/* added
 - updatecfg.py in postinstall script
 
diff --git a/sources b/sources
index 7c3832d..3a16126 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d6c517eea8e83ed3268b7f262cb6aac  sagator-1.2.3.tar.bz2
+9c638e2e020e86136185fb900c1a0cc7  sagator-1.3.0.tar.bz2
