[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-80-g33a95c7
Michael Tautschnig
mt at debian.org
Fri Apr 10 16:11:06 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit e7447e0df681099befca2ee06118d144d201cfc6
Author: Michael Tautschnig <mt at debian.org>
Date: Fri Apr 10 17:52:45 2009 +0200
Merged changes from tarball
Signed-off-by: Michael Tautschnig <mt at debian.org>
diff --git a/Makefile.am b/Makefile.am
index cd4c978..eca97c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
ACLOCAL_AMFLAGS=-I m4
SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test unit_tests clamdtop
-EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256
+EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 contrib
bin_SCRIPTS=clamav-config
diff --git a/Makefile.in b/Makefile.in
index 699b06a..0382c22 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -283,7 +283,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test unit_tests clamdtop
-EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256
+EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 contrib
bin_SCRIPTS = clamav-config
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libclamav.pc
diff --git a/configure b/configure
index 6e54809..eae2657 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.63 for clamav devel.
+# Generated by GNU Autoconf 2.63 for clamav 0.95.1.
#
# Report bugs to <http://bugs.clamav.net/>.
#
@@ -747,8 +747,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='clamav'
PACKAGE_TARNAME='clamav'
-PACKAGE_VERSION='devel'
-PACKAGE_STRING='clamav devel'
+PACKAGE_VERSION='0.95.1'
+PACKAGE_STRING='clamav 0.95.1'
PACKAGE_BUGREPORT='http://bugs.clamav.net/'
ac_unique_file="clamscan/clamscan.c"
@@ -1578,7 +1578,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.95.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1649,7 +1649,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.95.1:";;
esac
cat <<\_ACEOF
@@ -1799,7 +1799,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-clamav configure devel
+clamav configure 0.95.1
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1813,7 +1813,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.95.1, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2849,7 +2849,7 @@ fi
# Define the identity of the package.
PACKAGE='clamav'
- VERSION='devel'
+ VERSION='0.95.1'
# Some tools Automake needs.
@@ -2989,7 +2989,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
-VERSION="0.95"
+VERSION="0.95.1"
cat >>confdefs.h <<_ACEOF
#define VERSION "$VERSION"
@@ -26013,7 +26013,7 @@ exec 6>&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.95.1, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -26076,7 +26076,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-clamav config.status devel
+clamav config.status 0.95.1
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.in b/configure.in
index 9e5f964..cc4d033 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/])
+AC_INIT([clamav], [0.95.1], [http://bugs.clamav.net/])
dnl put configure auxiliary into config
AC_CONFIG_AUX_DIR([config])
@@ -38,8 +38,7 @@ dnl we told automake to not define these, since we want to include
dnl the date in the version
AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])
-dnl change this on a release
-VERSION="0.95"
+VERSION="0.95.1"
AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package])
LC_CURRENT=6
diff --git a/contrib/phishing/gdbwhitelist.sh b/contrib/phishing/gdbwhitelist.sh
deleted file mode 100755
index cf5c092..0000000
--- a/contrib/phishing/gdbwhitelist.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-if test $# -ne 1; then
- echo "Usage: $0 /path/to/sample\n";
- exit 1;
-fi
-
-clamscan --debug $1 >/dev/null 2>debugout
-grep "This hash matched" debugout | sed -e 's/.*matched: \(.*\)/S:W:\1/'
diff --git a/contrib/split-tarball.sh b/contrib/split-tarball.sh
deleted file mode 100755
index b7b5e9c..0000000
--- a/contrib/split-tarball.sh
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/bash
-# Split an upstream tarball into -dfsg, and -unrarplugin.
-if test $# -ne 2; then
- echo -e "Usage: $0 <PATH> <VERSION>\n\t<PATH> - directory that contains clamav-<VERSION>.tar.gz";
- exit 1;
-fi
-
-test -d $1 || { echo "Directory $1 doesn't exist"; exit 2; }
-TARBALL=`realpath "$1/clamav-$2.tar.gz"`
-test -f $TARBALL || { echo "Tarball $TARBALL doesn't exist"; exit 3; }
-
-TEMP=`mktemp -d __splitXXXXXX` || { echo "Cannot create temporary directory"; exit 2; }
-echo "Temporary directory is $TEMP"
-cd $TEMP || exit 3;
-echo "Extracting $TARBALL";
-tar -xzf $TARBALL || { echo "Failed to extract $TARBALL"; exit 4; }
-
-UNRARPKG=clamav-$2-unrar.tar.gz
-DFSGPKG=clamav-$2-dfsg.tar.gz
-UNRARDIR="clamav-$2-unrar"
-MAKEFLAGS=-j4
-
-mkdir testpfx || { echo "Failed to create testpfx"; exit 5; }
-TESTPFX=`realpath testpfx`
-mv clamav-$2 clamav-$2-dfsg &&
-mkdir $UNRARDIR &&
-UNRARDIR=`realpath "$UNRARDIR"` &&
-echo "Preparing dfsg package" &&
-cd clamav-$2-dfsg &&
-cp -R libclamunrar_iface $UNRARDIR &&
-mv libclamunrar $UNRARDIR &&
-cp -R m4/ $UNRARDIR &&
-cp -R config/ $UNRARDIR &&
-cp configure.in $UNRARDIR &&
-cd ../ &&
-tar -czf $DFSGPKG clamav-$2-dfsg/ &&
-cd $UNRARDIR &&
-echo "Preparing unrar package" &&
-sed -ie '/AC_OUTPUT/,/])/ {
-/^AC_OUTPUT/p
-s/^libclamav\/Makefile/libclamunrar_iface\/Makefile/p
-/^Makefile/p
-/^])/p
-d
-}
-/LTDL/d
-/ltdl/d
-s/clamscan\/clamscan.c/libclamunrar_iface\/unrar_iface.c/
-' configure.in &&
-cat <<EOF >Makefile.am &&
-ACLOCAL_AMFLAGS=-I m4
-DISTCLEANFILES = target.h
-SUBDIRS = libclamunrar_iface
-EOF
-autoreconf &&
-cd .. &&
-tar -czf $UNRARPKG clamav-$2-unrar/ &&
-mkdir buildtest && cd buildtest &&
-echo "Running build-test for $DFSGPKG" &&
-tar -xzf ../$DFSGPKG && cd clamav-$2-dfsg &&
-echo "Configuring" &&
-./configure --disable-clamav --disable-unrar --enable-milter --prefix=$TESTPFX >makelog &&
-echo "Building" &&
-make $MAKEFLAGS >>makelog&&
-echo "Checking" &&
-make $MAKEFLAGS check >>makelog 2>&1&&
-make $MAKEFLAGS install >>makelog&&
-make $MAKFELAGS installcheck >>makelog&&
-echo "OK" &&
-cd .. &&
-echo "Running build-test for $UNRARPKG" &&
-tar -xzf ../$UNRARPKG && cd clamav-$2-unrar &&
-echo "Configuring" &&
-./configure --disable-clamav --prefix=$TESTPFX >makelog &&
-echo "Building" &&
-make $MAKEFLAGS >>makelog &&
-make $MAKEFLAGS install >>makelog &&
-make $MAKEFLAGS installcheck >>makelog &&
-echo "OK" &&
-cd ../.. &&
-echo "Testing whether unrar functionality works" &&
-cat <<EOF >test.hdb
-aa15bcf478d165efd2065190eb473bcb:544:ClamAV-Test-File
-EOF
-
-if test $? -ne 0; then
- tail makelog
- echo
- echo "Failed"
- exit 50;
-fi
-$TESTPFX/bin/clamscan buildtest/clamav-$2-dfsg/test/clam-v*.rar -dtest.hdb >clamscanlog
-if test $? -ne 1; then
- echo "Test failed";
- cat clamscanlog
- exit 10;
-fi
-NDET=`grep FOUND clamscanlog | wc -l`
-if test "0$NDET" -eq "2"; then
- echo "All testfiles detected"
- echo "Copying tarballs to current directory"
- mv $UNRARPKG ../ &&
- mv $DFSGPKG ../ &&
- echo "Ready: $UNRARPKG $DFSGPKG" &&
- rm -rf $TEMP &&
- echo "Removed temporary directory $TEMP" &&
- exit 0
- exit 30
-fi
-echo "Test failed"
-cat clamscanlog
-exit 100
diff --git a/database/daily.cvd b/database/daily.cvd
index 38b6f9d..99012e3 100644
Binary files a/database/daily.cvd and b/database/daily.cvd differ
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list