rpms/sagator/EL-5 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 sagator.spec, 1.1, 1.2 sources, 1.2, 1.3
Ján ONDREJ (ondrejj)
fedora-extras-commits at redhat.com
Mon Jul 14 10:07:49 UTC 2008
Author: ondrejj
Update of /cvs/pkgs/rpms/sagator/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16614/EL-5
Modified Files:
.cvsignore sagator.spec sources
Added Files:
import.log
Log Message:
New release.
--- NEW FILE import.log ---
sagator-1_1_0-1_fc9:EL-5:sagator-1.1.0-1.fc9.src.rpm:1216030000
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 25 Jan 2008 19:37:03 -0000 1.2
+++ .cvsignore 14 Jul 2008 10:06:54 -0000 1.3
@@ -1 +1 @@
-sagator-1.0.0.tar.bz2
+sagator-1.1.0.tar.bz2
Index: sagator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/EL-5/sagator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sagator.spec 25 Jan 2008 19:37:03 -0000 1.1
+++ sagator.spec 14 Jul 2008 10:06:54 -0000 1.2
@@ -3,10 +3,11 @@
%define ARCHIVERS tar,arc,unace,unrar,rar,zoo,unarj,arj,unzip,zip,gzip,bzip2
%define ANTIVIRS clamav,clamav-libs,avglinux,nod32ls,nod32lfs,kav4mailservers-linux
%define ANTISPAMS bogofilter,qsf
+%define CLAMAV_VERSION 0.92
Summary: SAGATOR - antivir/antispam gateway for smtp server
Name: sagator
-Version: 1.0.0
+Version: 1.1.0
Release: 1%{?dist}
Source: http://www.salstar.sk/pub/antivir/snapshots/sagator-%{version}.tar.bz2
URL: http://www.salstar.sk/sagator/
@@ -15,24 +16,22 @@
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel >= 2.2.2, ed, gettext
+Obsoletes: sagator-libclamav <= 1.2.3
+Obsoletes: sagator-pydspam <= 0.9.1
Requires: python >= 2.2.2, sed
%if %_vendor == "suse"
-Requires: aaa_base, smtp_daemon
-BuildRequires: aaa_base, python-xml
+BuildRequires: aaa_base, python-xml, clamav >= %{CLAMAV_VERSION}
+Requires: aaa_base, smtp_daemon, clamav >= %{CLAMAV_VERSION}
+%if 0%suse_version < 01030
+Requires: python-ctypes
+%endif
%else
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
Requires: initscripts, smtpdaemon, shadow-utils
-BuildRequires: initscripts, logwatch
-
-# SElinux policy for Fedoras and RHEL>=5
-%if 0%{?fedora} || 0%{?rhel} >= 5
-BuildRequires: selinux-policy-devel
-# SElinux directory and policy package
-%define sedir %{_datadir}/%{name}/selinux
-%define sepolicy %{sedir}/%{name}.pp
-%endif
+Requires: clamav-lib >= %{CLAMAV_VERSION}
+BuildRequires: initscripts, logwatch, clamav-devel >= %{CLAMAV_VERSION}
%endif
@@ -67,6 +66,25 @@
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%{?fedora} || 0%{?rhel} >= 5
+%package selinux
+Summary: SELinux support for SAGATOR
+Group: System Environment/Daemons
+Requires: %{name} = %{version}
+Requires(postun): policycoreutils, selinux-policy
+BuildRequires: selinux-policy-devel
+# SElinux directory and policy package
+%define install_sepolicy 1
+%define sepolicy %{_datadir}/%{name}/selinux/%{name}.pp
+
+%description selinux
+This package helps moving to the upstream SELinux module.
+
+%else
+%define install_sepolicy 0
+%endif
+
%prep
%setup -q
@@ -83,11 +101,6 @@
ln -s ../../../..%{_sysconfdir}/sagator.conf \
%{buildroot}%{_datadir}/%{name}/etc/sgconf.py
mkdir -p %{buildroot}%{CHROOTDIR}/tmp/quarantine
-# add SElinux policy
-if [ -e %{buildroot}%{sepolicy} ]; then
- echo "%dir %{sedir}" >> filelist
- echo "%{sepolicy}" >> filelist
-fi
%find_lang %{name}
%pre
@@ -112,12 +125,6 @@
elif [ -x /sbin/insserv ]; then
insserv sagator
fi
- # selinux
- [ ! -x %{_sbindir}/semodule ] || [ ! -x %{_sbindir}/sestatus ] ||
- [ ! -x %{_sbindir}/selinuxenabled ] || ! %{_sbindir}/selinuxenabled || \
- [ ! -e %{sepolicy} ] || \
- %{_sbindir}/semodule -i %{sepolicy} \
- >/dev/null 2>/dev/null
fi
%preun
@@ -132,6 +139,19 @@
fi
fi
+%if %{install_sepolicy}
+%post selinux
+if selinuxenabled; then
+ # Replace the module by the upstream one
+ #. /etc/selinux/config 2>/dev/null || :
+ semodule -i %{sepolicy} 2>/dev/null || :
+ # relabel files
+ fixfiles -R %{name} restore || :
+ # relabel chroot
+ restorecon -R %{CHROOTDIR} || :
+fi
+%endif
+
%triggerin -- sagator-webq,%{BASE_LIBS},%{ARCHIVERS},%{ANTIVIRS},%{ANTISPAMS}
touch %{_var}/lib/sagator-mkchroot
@@ -161,6 +181,10 @@
%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}/interscan
@@ -173,12 +197,24 @@
%attr(0770,vscan,vscan) %dir %{CHROOTDIR}/tmp/quarantine
%files webq -f sagator.lang
+%defattr(-,root,root)
%dir %{_datadir}/%{name}/srv/web
%{_datadir}/%{name}/srv/web/*.py*
%{_datadir}/%{name}/srv/web/*.kid
+%if %{install_sepolicy}
+%files selinux
+%defattr(-,root,root)
+%{sepolicy}
+%endif
+
%changelog
-* Fri Jan 3 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.0.0-1
+* Sun Feb 17 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.1.0-1
+- added libclamav module
+- added pydspam module
+- selinux module moved to separate subpackage
+
+* Fri Jan 3 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.0.0
- /var/spool/vscan replaced by CHROOTDIR macro
- posttrans section moved to init script (start section)
- more macros used
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 25 Jan 2008 19:37:03 -0000 1.2
+++ sources 14 Jul 2008 10:06:54 -0000 1.3
@@ -1 +1 @@
-bf14d88d95645c41c489350bad74e1de sagator-1.0.0.tar.bz2
+a5ac5ad840ba512b27d0fa53ed0108d5 sagator-1.1.0.tar.bz2
More information about the fedora-extras-commits
mailing list