[clamav: 3/3] Revert "Revert "Merge branch 'master' into f12""

Wed Aug 11 09:13:37 UTC 2010

commit c12c295f107c27eebce9378fd63ecc108c3a0fa6
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date:   Wed Aug 11 11:13:09 2010 +0200

    Revert "Revert "Merge branch 'master' into f12""
    
    This reverts commit 383d5967a88859efc2fc9ae0d19f83ea6fac248e.

 clamav-milter.upstart |   11 +++---
 clamav.spec           |   85 +++++++++++++++++++++++++++++++++----------------
 clamd.scan.upstart    |   14 ++++----
 lastver               |    2 +-
 verinfo               |    2 +-
 5 files changed, 71 insertions(+), 43 deletions(-)
---

diff --git a/clamav-milter.upstart b/clamav-milter.upstart
index e0a63f2..02d7080 100644
--- a/clamav-milter.upstart
+++ b/clamav-milter.upstart
@@ -1,15 +1,14 @@
+### !!! Uncomment only *one* of the 'start on' statements !!!
+
 ### Uncomment these lines when you want clamav-milter to be a milter
 ### for a locally running MTA
-#start on starting sendmail
-#start on starting postfix
+#start on (starting sendmail or starting postfix)
 
 ### Uncomment these lines when you want clamav-milter to be a milter
 ### for a remotely running MTA
-#start on starting local
+#start on runlevel [345] and starting local
 
-stop  on runlevel 0
-stop  on runlevel 1
-stop  on runlevel 6
+stop  on runlevel [!345]
 
 respawn
 exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter.conf --nofork=yes
diff --git a/clamav.spec b/clamav.spec
index d8a88e7..bd79214 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -1,4 +1,4 @@
-#global snapshot	rc1
+#global prerelease	rc1
 
 ## Fedora Extras specific customization below...
 %bcond_without		fedora
@@ -8,6 +8,12 @@
 %bcond_without		bytecode
 ##
 
+%ifnarch s390 s390x
+%global have_ocaml	1
+%else
+%global have_ocaml	0
+%endif
+
 %global username	clamupdate
 %global homedir		%_var/lib/clamav
 %global freshclamlog	%_var/log/freshclam.log
@@ -20,25 +26,26 @@
 %global scanstatedir	%_var/run/clamd.scan
 
 %{?with_noarch:%global noarch	BuildArch:	noarch}
-%{!?release_func:%global release_func() %1%{?dist}}
+%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}}
+%{!?apply:%global  apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \
+%nil}
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.96.1
-Release:	%release_func 1200%{?snapshot:.%snapshot}
-
+Release:	%release_func 1401
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
 URL:		http://www.clamav.net
 %if 0%{?with_unrar:1}
-Source0:	http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapshot}.tar.gz
-Source999:	http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapshot}.tar.gz.sig
+Source0:	http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerelease}.tar.gz
+Source999:	http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerelease}.tar.gz.sig
 %else
 # Unfortunately, clamav includes support for RAR v3, derived from GPL
 # incompatible unrar from RARlabs. We have to pull this code out.
 # tarball was created by
 #   make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>]
-Source0:	%name-%version%{?snapshot}-norar.tar.xz
+Source0:	%name-%version%{?prerelease}-norar.tar.xz
 %endif
 Source1:	clamd-wrapper
 Source2:	clamd.sysconfig
@@ -60,7 +67,10 @@ Requires:	data(clamav)
 BuildRequires:	zlib-devel bzip2-devel gmp-devel curl-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	%_includedir/tcpd.h
-%{?with_bytecode:BuildRequires:	bc tcl ocaml groff graphviz}
+%{?with_bytecode:BuildRequires:	bc tcl groff graphviz}
+%if %{have_ocaml}
+%{?with_bytecode:BuildRequires:	ocaml}
+%endif
 
 %package filesystem
 Summary:	Filesystem structure for clamav
@@ -162,8 +172,7 @@ Group:		System Environment/Daemons
 Source410:	clamd.scan.upstart
 Provides:	init(clamav-scanner) = upstart
 Requires:	clamav-scanner = %version-%release
-# implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d
+Requires(pre):		/etc/init
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 %{?noarch}
@@ -211,8 +220,7 @@ Group:		System Environment/Daemons
 Source310:	clamav-milter.upstart
 Provides:	init(clamav-milter) = upstart
 Requires:	clamav-milter = %version-%release
-# implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d
+Requires(pre):		/etc/init
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 %{?noarch}
@@ -312,14 +320,14 @@ The Upstart initscripts for clamav-milter.
 ## ------------------------------------------------------------
 
 %prep
-%setup -q -n %{name}-%{version}%{?snapshot}
+%setup -q -n %{name}-%{version}%{?prerelease}
 
-%patch24 -p1 -b .private
-%patch25 -p1 -b .open
-%patch26 -p1 -b .cliopts
-%patch27 -p1 -b .umask
-%patch28 -p1 -b .jit-disable
-%patch29 -p1 -b .jitoff
+%apply -n24 -p1 -b .private
+%apply -n25 -p1 -b .open
+%apply -n26 -p1 -b .cliopts
+%apply -n27 -p1 -b .umask
+%apply -n28 -p1 -b .jit-disable
+%apply -n29 -p1 -b .jitoff
 
 install -p -m0644 %SOURCE300 clamav-milter/
 
@@ -397,7 +405,7 @@ function smartsubst() {
 
 
 install -d -m755 \
-	${RPM_BUILD_ROOT}%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,sysconfig,event.d} \
+	${RPM_BUILD_ROOT}%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,sysconfig,init} \
 	${RPM_BUILD_ROOT}%_var/log \
 	${RPM_BUILD_ROOT}%milterstatedir \
 	${RPM_BUILD_ROOT}%pkgdatadir/template \
@@ -453,7 +461,7 @@ sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \
 sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \
     > $RPM_BUILD_ROOT%_initrddir/clamd.scan
 
-install -p -m 644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamd.scan
+install -p -m 644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf
 
 touch $RPM_BUILD_ROOT%scanstatedir/clamd.sock
 
@@ -467,14 +475,14 @@ sed -r \
     -e 's! /tmp/clamav-milter.log! %milterlog!g' \
     etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf
 
-install -p -m 644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamav-milter
+install -p -m 644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/init/clamav-milter.conf
 install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter
 
 
 rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf
 touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.socket,%milterlog}
 
-%{!?with_upstart:rm -rf $RPM_BUILD_ROOT%_sysconfdir/event.d}
+%{!?with_upstart:rm -rf $RPM_BUILD_ROOT%_sysconfdir/init}
 
 ## ------------------------------------------------------------
 
@@ -679,7 +687,7 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || :
 %if 0%{?with_upstart:1}
 %files scanner-upstart
 %defattr(-,root,root,-)
-%config(noreplace) %_sysconfdir/event.d/clamd.scan
+%config(noreplace) %_sysconfdir/init/clamd.scan*
 %endif
 
 ## -----------------------
@@ -701,23 +709,44 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || :
 %if 0%{?with_upstart:1}
 %files milter-upstart
 %defattr(-,root,root,-)
-%config(noreplace) %_sysconfdir/event.d/clamav-milter
+%config(noreplace) %_sysconfdir/init/clamav-milter*
 %endif
 
 
 %changelog
-* Sun Jun 20 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.96.1-1200
+* Tue Jul 13 2010 Dan Horák <dan[at]danny.cz> - 0.96.1-1401
+- ocaml not available (at least) on s390(x)
+
+* Tue Jun  1 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.96.1-1400
 - updated to 0.96.1
+- rediffed patches
+
+* Sat May 19 2010 Rakesh Pandit <rakesh at fedoraproject.org> - 0.96.1403
+- CVE-2010-1639 Clam AntiVirus: Heap-based overflow, when processing malicious PDF file(s)
+
+* Wed Apr 21 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.96-1402
+- updated to final 0.96
 - applied upstream patch which allows to disable JIT compiler (#573191)
+- build JIT compiler again
 - disabled JIT compiler by default
 - removed explicit 'pkgconfig' requirements in -devel (#533956)
+
+* Sat Mar 20 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.96-0.1401.rc1
+- do not build the bytecode JIT compiler for now until it can be disabled
+  at runtime (#573191)
+
+* Thu Mar 11 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.96-1400.rc1
+- updated to 0.96rc1
 - added some BRs
-- rediffed patches
+
+* Sun Dec  6 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.3-1301
+- updated -upstart to upstart 0.6.3
 
 * Sat Nov 21 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - adjusted chkconfig positions for clamav-milter (#530101)
+- use %%apply instead of %%patch
 
-* Thu Oct 29 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.3-1200
+* Thu Oct 29 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.3-1300
 - updated to 0.95.3
 
 * Sun Sep 13 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
diff --git a/clamd.scan.upstart b/clamd.scan.upstart
index b6280f5..cb20b29 100644
--- a/clamd.scan.upstart
+++ b/clamd.scan.upstart
@@ -1,14 +1,14 @@
-### Uncomment these lines when you want clamd.scan to be a scanner
-### for a locally running clamav-milter
+### !!! Uncomment only *one* of the 'start on' statements !!!
+
+### Uncomment this line when you want clamd.scan to be a scanner for a
+### locally running clamav-milter
 #start on starting clamav-milter
 
-### Uncomment these lines when you want clamd.scan to be a generic
+### Uncomment this line when you want clamd.scan to be a generic
 ### scanner service
-#start on starting local
+#start on runlevel [345] and starting local
 
-stop  on runlevel 0
-stop  on runlevel 1
-stop  on runlevel 6
+stop  on runlevel [!345]
 
 respawn
 exec /usr/sbin/clamd -c /etc/clamd.d/scan.conf --nofork=yes
diff --git a/lastver b/lastver
index 483b771..10b1865 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.96.1
+0.96
diff --git a/verinfo b/verinfo
index 814d953..460dd77 100644
--- a/verinfo
+++ b/verinfo
@@ -1,2 +1,2 @@
 http://sourceforge.net/project/showfiles.php?group_id=86638&package_id=90197
-clamav-([0-9.-]*?)\.tar\.
+href="/projects/clamav/files/clamav/([0-9.-]*?)"
