0.92 on all active branches
This commit is contained in:
Tom Callaway
parent
73644b64f3
commit
34e19ca3c9
|
|
@ -1 +1 @@
|
|||
clamav-0.91.2-clean.tar.bz2
|
||||
clamav-0.92.clean.tar.gz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,57 @@
|
|||
diff -up clamav-0.92/Makefile.in.BAD clamav-0.92/Makefile.in
|
||||
--- clamav-0.92/Makefile.in.BAD 2007-12-21 12:39:00.000000000 -0500
|
||||
+++ clamav-0.92/Makefile.in 2007-12-21 12:39:11.000000000 -0500
|
||||
@@ -242,7 +242,7 @@ target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
-SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter
|
||||
+SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter
|
||||
EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL
|
||||
bin_SCRIPTS = clamav-config
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
diff -up clamav-0.92/configure.in.BAD clamav-0.92/configure.in
|
||||
--- clamav-0.92/configure.in.BAD 2007-12-21 12:37:51.000000000 -0500
|
||||
+++ clamav-0.92/configure.in 2007-12-21 12:38:00.000000000 -0500
|
||||
@@ -1214,8 +1214,6 @@ AC_MSG_RESULT($have_signed_rightshift_ex
|
||||
AC_C_FPU_BIGENDIAN
|
||||
|
||||
AC_OUTPUT([
|
||||
-libclamunrar/Makefile
|
||||
-libclamunrar_iface/Makefile
|
||||
libclamav/Makefile
|
||||
clamscan/Makefile
|
||||
database/Makefile
|
||||
diff -up clamav-0.92/Makefile.am.BAD clamav-0.92/Makefile.am
|
||||
--- clamav-0.92/Makefile.am.BAD 2007-12-21 12:38:39.000000000 -0500
|
||||
+++ clamav-0.92/Makefile.am 2007-12-21 12:38:47.000000000 -0500
|
||||
@@ -16,7 +16,7 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||
# MA 02110-1301, USA.
|
||||
|
||||
-SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter
|
||||
+SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter
|
||||
EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL
|
||||
|
||||
bin_SCRIPTS=clamav-config
|
||||
diff -up clamav-0.92/configure.BAD clamav-0.92/configure
|
||||
--- clamav-0.92/configure.BAD 2007-12-21 12:45:38.000000000 -0500
|
||||
+++ clamav-0.92/configure 2007-12-21 12:46:05.000000000 -0500
|
||||
@@ -26397,7 +26397,7 @@ echo "$as_me: WARNING: Unable to determi
|
||||
esac
|
||||
|
||||
|
||||
-ac_config_files="$ac_config_files libclamunrar/Makefile libclamunrar_iface/Makefile libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1"
|
||||
+ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
@@ -27013,8 +27013,6 @@ do
|
||||
case $ac_config_target in
|
||||
"clamav-config.h") CONFIG_HEADERS="$CONFIG_HEADERS clamav-config.h" ;;
|
||||
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
|
||||
- "libclamunrar/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar/Makefile" ;;
|
||||
- "libclamunrar_iface/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar_iface/Makefile" ;;
|
||||
"libclamav/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/Makefile" ;;
|
||||
"clamscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamscan/Makefile" ;;
|
||||
"database/Makefile") CONFIG_FILES="$CONFIG_FILES database/Makefile" ;;
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
--- clamav-0.91.2/clamd/dazukoio_compat12.c.open 2007-03-06 14:38:06.000000000 +0100
|
||||
+++ clamav-0.91.2/clamd/dazukoio_compat12.c 2007-08-25 12:36:30.000000000 +0200
|
||||
@@ -89,7 +89,7 @@ int dazukoRegister_TS_compat12(struct da
|
||||
if (dazuko->device < 0)
|
||||
{
|
||||
|
||||
- dazuko->device = open("/dev/dazuko", 0);
|
||||
+ dazuko->device = open("/dev/dazuko", O_RDONLY);
|
||||
if (dazuko->device < 0)
|
||||
return -1;
|
||||
|
||||
22
clamav.spec
22
clamav.spec
|
|
@ -1,4 +1,4 @@
|
|||
## $Id: clamav.spec,v 1.60 2007/10/29 10:22:00 spot Exp $
|
||||
## $Id: clamav.spec,v 1.60 2007/10/29 14:25:28 spot Exp $
|
||||
|
||||
## Fedora Extras specific customization below...
|
||||
%bcond_without fedora
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
Summary: End-user tools for the Clam Antivirus scanner
|
||||
Name: clamav
|
||||
Version: 0.91.2
|
||||
Version: 0.92
|
||||
Release: %release_func 3
|
||||
|
||||
License: GPLv2
|
||||
|
|
@ -25,7 +25,9 @@ Group: Applications/File
|
|||
URL: http://www.clamav.net
|
||||
# Unfortunately, clamav includes support for RAR v3, derived from GPL
|
||||
# incompatible unrar from RARlabs. We have to pull this code out.
|
||||
Source0: clamav-0.91.2-clean.tar.bz2
|
||||
# All that is needed to make the clean tarball is: rm -rf libclamunrar*
|
||||
# Note that you also need patch26.
|
||||
Source0: clamav-%{version}.clean.tar.gz
|
||||
# Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz
|
||||
# No sense in using this file for the time being.
|
||||
# Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig
|
||||
|
|
@ -39,7 +41,8 @@ Source8: clamav-notify-servers
|
|||
Patch21: clamav-0.70-path.patch
|
||||
Patch22: clamav-0.80-initoff.patch
|
||||
Patch24: clamav-0.90rc3-private.patch
|
||||
Patch25: clamav-0.91.2-open.patch
|
||||
Patch25: clamav-0.92-open.patch
|
||||
Patch26: clamav-0.92-nounrar.patch
|
||||
BuildRoot: %_tmppath/%name-%version-%release-root
|
||||
Requires: clamav-lib = %version-%release
|
||||
Requires: data(clamav)
|
||||
|
|
@ -232,6 +235,7 @@ The SysV initscripts for clamav-milter.
|
|||
%patch22 -p1 -b .initoff
|
||||
%patch24 -p1 -b .private
|
||||
%patch25 -p1 -b .open
|
||||
%patch26 -p1 -b .nounrar
|
||||
|
||||
perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g;
|
||||
s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g;
|
||||
|
|
@ -251,8 +255,12 @@ export LDFLAGS='-Wl,--as-needed'
|
|||
# HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check
|
||||
export LIBS='-lmilter -lpthread'
|
||||
%configure --disable-clamav --with-dbdir=/var/lib/clamav \
|
||||
--enable-milter --disable-static
|
||||
--enable-milter --disable-static --disable-unrar
|
||||
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
|
||||
# No rpath
|
||||
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
|
@ -511,6 +519,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || :
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa@redhat.com> - 0.92-1
|
||||
- updated to 0.92 (SECURITY):
|
||||
- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability
|
||||
|
||||
* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa@redhat.com> - 0.91.2-3
|
||||
- remove RAR decompression code from source tarball because of
|
||||
legal problems (resolves 334371)
|
||||
|
|
|
|||
Loading…
Reference in New Issue