[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6589-g162c5dd
Michael Tautschnig
mt at debian.org
Mon Sep 20 17:11:13 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 0b94524246855dc90a0bf94d01dd58f5f6da8c9f
Author: Michael Tautschnig <mt at debian.org>
Date: Mon Sep 20 18:50:30 2010 +0200
Merged changes from upstream tarball
Signed-off-by: Michael Tautschnig <mt at debian.org>
diff --git a/configure b/configure
index a972d7e..8789001 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for ClamAV devel.
+# Generated by GNU Autoconf 2.67 for ClamAV 0.96.3.
#
# Report bugs to <http://bugs.clamav.net/>.
#
@@ -703,8 +703,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ClamAV'
PACKAGE_TARNAME='clamav'
-PACKAGE_VERSION='devel'
-PACKAGE_STRING='ClamAV devel'
+PACKAGE_VERSION='0.96.3'
+PACKAGE_STRING='ClamAV 0.96.3'
PACKAGE_BUGREPORT='http://bugs.clamav.net/'
PACKAGE_URL='http://www.clamav.net/'
@@ -1541,7 +1541,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ClamAV devel to adapt to many kinds of systems.
+\`configure' configures ClamAV 0.96.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1612,7 +1612,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ClamAV devel:";;
+ short | recursive ) echo "Configuration of ClamAV 0.96.3:";;
esac
cat <<\_ACEOF
@@ -1769,7 +1769,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ClamAV configure devel
+ClamAV configure 0.96.3
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2238,7 +2238,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ClamAV $as_me devel, which was
+It was created by ClamAV $as_me 0.96.3, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -3359,7 +3359,7 @@ fi
# Define the identity of the package.
PACKAGE='clamav'
- VERSION='devel'
+ VERSION='0.96.3'
# Some tools Automake needs.
@@ -3488,7 +3488,7 @@ AM_BACKSLASH='\'
$as_echo "#define PACKAGE PACKAGE_NAME" >>confdefs.h
-VERSION="devel-`date +%Y%m%d`"
+VERSION="0.96.3"
cat >>confdefs.h <<_ACEOF
#define VERSION "$VERSION"
@@ -20622,7 +20622,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ClamAV $as_me devel, which was
+This file was extended by ClamAV $as_me 0.96.3, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20689,7 +20689,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ClamAV config.status devel
+ClamAV config.status 0.96.3
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
@@ -23225,7 +23225,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ClamAV $as_me devel, which was
+This file was extended by ClamAV $as_me 0.96.3, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23292,7 +23292,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ClamAV config.status devel
+ClamAV config.status 0.96.3
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
diff --git a/configure.in b/configure.in
index bb098e9..0264675 100644
--- a/configure.in
+++ b/configure.in
@@ -20,7 +20,7 @@ dnl MA 02110-1301, USA.
AC_PREREQ([2.59])
dnl For a release change [devel] to the real version [0.xy]
dnl also change VERSION below
-AC_INIT([ClamAV], [devel], [http://bugs.clamav.net/], [clamav], [http://www.clamav.net/])
+AC_INIT([ClamAV], [0.96.3], [http://bugs.clamav.net/], [clamav], [http://www.clamav.net/])
AH_BOTTOM([#include "platform.h"])
dnl put configure auxiliary into config
@@ -42,8 +42,7 @@ dnl the date in the version
AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])
dnl change this on a release
-VERSION="devel-`date +%Y%m%d`"
-dnl VERSION="0.94rc1"
+VERSION="0.96.3"
AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package])
LC_CURRENT=7
diff --git a/contrib/mpoolparse/filtersizes.pl b/contrib/mpoolparse/filtersizes.pl
deleted file mode 100644
index f78e824..0000000
--- a/contrib/mpoolparse/filtersizes.pl
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/perl
-# Usage:
-# perl poolsize.pl <log >log_sizes
-# perl filtersizes.pl <voidptrsize> <sizeoverhead> <log_sizes >log_final
-# (for example: perl filtersizes.pl 4 1252 <log_sizes >log_final)
-use strict;
-use warnings;
-my %size_counts;
-my @sizes;
-die "Usage: filtersizes.pl <voidptrsize> <sizeoverhead>\n" if $#ARGV != 1;
-my $size_overhead = $ARGV[1];
-my $voidptrsize = $ARGV[0];
-while (<STDIN>) {
- if (/(\d+).+(\d+)\s+(\d+)\s+(\d+).+ USE/) {
- $size_counts{$1} = $4;
- push @sizes, $1;
- }
-}
-my $pow2 = $voidptrsize;
-my $max_overhead = 2*$size_overhead;
-for (my $i = 0; $i < $#sizes-1; $i++) {
- my $size = $sizes[$i];
- my $count = $size_counts{$size};
- my $waste = $count*($sizes[$i+1]-$size);
- # keep power of 2 sizes
- if ($size == $pow2) {
- $pow2 <<= 1;
- next;
- }
- # if removing this size adds less overhead then max, remove it
- next unless $waste <= $max_overhead || $size < $voidptrsize;
- $size_counts{$sizes[$i+1]} += $count;
- delete $size_counts{$size};
-}
-foreach (sort { $a <=> $b } keys %size_counts)
-{
- printf "%7u, /* %7u */\n", $_, $size_counts{$_};
-}
diff --git a/database/daily.cvd b/database/daily.cvd
index 4dc2a1b..edbe5de 100644
Binary files a/database/daily.cvd and b/database/daily.cvd differ
diff --git a/libclamav/clambc.h b/libclamav/clambc.h
index 4351567..3c60910 100644
--- a/libclamav/clambc.h
+++ b/libclamav/clambc.h
@@ -131,6 +131,4 @@ enum bc_global {
};
#define BC_START_TID 69
-
-
#endif
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list