[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6160-g566249b
Scott Kitterman
scott at kitterman.com
Fri Apr 9 13:59:36 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 566249b95aa9491c13e4a0cd908271e3c33e4fd5
Author: Scott Kitterman <scott at kitterman.com>
Date: Fri Apr 9 09:59:08 2010 -0400
Provide debian/changelog for 0.96-1, update debian/copyright, and debian/clamav-daemon.init.in from Ubuntu.
diff --git a/debian/changelog b/debian/changelog
index 828f740..0f5a396 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,39 @@
+clamav (0.96+dfsg-1) unstable; urgency=low
+
+ [ Scott Kitterman ]
+ * Bump libclamav SO version to 6.1.0 in libclamav6.install and Update SO
+ version for lintian override for libclamav6
+ * Add a check in debian/clamav-daemon.init.in to see if signatures are
+ present before starting and exit with a useful log message if not
+ * Remove deprecated MailFollowURLs option from default clamd.conf in
+ clamav-base.postinst.in
+ * Additional debian/copyright updates for OpenBSD regex in llvm
+
+ [ Alberto WU ]
+ * New upstream release (closes: #576908)
+ * Update debian/clamav-base.templates and clamav-base.postinst.in for new
+ options:
+ - OfficialDatabaseOnly, LocalSocketGroup, LocalSocketMode, CrossFilesystems,
+ ClamukoScannerCount, and BytecodeSecurity
+ * Update debian/clamav-freshclam.postinst.in for new options:
+ - DetectionStatsHostID and Bytecode
+ * Update debian/clamav-milter.templates and clamav-milter.postinst.in for new
+ options:
+ - MilterSocketGroup, MilterSocketMode, and ReportHostname
+ * Update debian/rules to provide appropriate CXXFLAGS because clamav now
+ includes C++ code
+ * Update debian/clamav-testfiles.install to provide all test files
+ * Remove the new bytcode.cvd file along with the other signature files when
+ clamav-base or clamav-freshclam are purged
+ * Drop libclamav.a from libclamav-dev.install (not built by upstream)
+ * Add new Bytecode Testing Tool, usr/bin/clambc, to clamav.install
+ * Add build-depends on python for llvm
+ * Drop build-depends on libwrap0-dev (no longer needed)
+ * Update debian/copyright for the embedded copy of llvm (using the system
+ llvm is not currently feasible)
+
+ -- Alberto WU <acab at digitalfuture.it> Fri, 09 Apr 2010 14:17:19 +0100
+
clamav (0.95.3+dfsg-1) unstable; urgency=low
[ Michael Tautschnig ]
diff --git a/debian/clamav-daemon.init.in b/debian/clamav-daemon.init.in
index 0570c07..2095106 100644
--- a/debian/clamav-daemon.init.in
+++ b/debian/clamav-daemon.init.in
@@ -26,6 +26,7 @@ SUPERVISOR=/usr/bin/daemon
SUPERVISORNAME=daemon
SUPERVISORPIDFILE="/var/run/clamav/daemon-clamd.pid"
SUPERVISORARGS="--name=$NAME --respawn $DAEMON -F $SUPERVISORPIDFILE"
+DATABASEDIR="/var/lib/clamav"
[ -x "$DAEMON" ] || exit 0
[ -r /etc/default/clamav-daemon ] && . /etc/default/clamav-daemon
@@ -89,6 +90,15 @@ fi
case "$1" in
start)
OPTIND=1
+ # Check for database existance (start will fail if it's missing)
+ for db in main daily; do
+ if [ ! -e "$DATABASEDIR"/"$db".cvd ] && [ ! -d "$DATABASEDIR"/"$db".inc ] && [ ! -e "$DATABASEDIR"/"$db".cld ]; then
+ log_failure_msg "Clamav signatures not found in $DATABASEDIR"
+ log_failure_msg "Please retrieve them using freshclam or install the clamav-data package"
+ log_failure_msg "Then run '/etc/init.d/clamav-daemon start'"
+ exit 0
+ fi
+ done
if [ -z "$RUN_SUPERVISED" ] ; then
log_daemon_msg "Starting $DESC" "$NAME "
start-stop-daemon --start -o -c $User --exec $DAEMON
diff --git a/debian/copyright b/debian/copyright
index acde0e0..5e4ae71 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -773,19 +773,15 @@ subjecting your linked code to the terms of the Common Public license version
for NSIS, however, are subject to the terms of the Common Public License
version 1.0.
-
-The libclamunrar code has been stripped from the orig tarball due to
-license incompatibilities.
-
-
For libclamav/c++/llvm/* unless otherwise noted:
+
==============================================================================
LLVM Release License
==============================================================================
University of Illinois/NCSA
Open Source License
-Copyright (c) 2003-2009 University of Illinois at Urbana-Champaign.
+Copyright (c) 2003-2010 University of Illinois at Urbana-Champaign.
All rights reserved.
Developed by:
@@ -838,7 +834,8 @@ University of Illinois to endorse or promote products derived from this
Software.
The following pieces of software have additional or alternate copyrights,
-licenses, and/or restrictions:
+licenses, and/or restrictions (clamav does not ship a full llvm copy, this
+list is limited to those shipped by clamav):
Program Directory
------- ---------
@@ -847,4 +844,116 @@ Autoconf llvm/autoconf
llvm/projects/sample/autoconf
CellSPU backend llvm/lib/Target/CellSPU/README.txt
Google Test llvm/utils/unittest/googletest
+OpenBSD regex llvm/lib/Support/{reg*, COPYRIGHT.regex}
+
+For libclamav/c++/llvm/autoconf/*
+------------------------------------------------------------------------------
+Autoconf Files
+------------------------------------------------------------------------------
+All autoconf files are licensed under the LLVM license with the following
+additions:
+
+llvm/autoconf/install-sh:
+ This script is licensed under the LLVM license, with the following
+ additional copyrights and restrictions:
+
+ Copyright 1991 by the Massachusetts Institute of Technology
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of M.I.T. not be used in advertising or
+ publicity pertaining to distribution of the software without specific,
+ written prior permission. M.I.T. makes no representations about the
+ suitability of this software for any purpose. It is provided "as is"
+ without express or implied warranty.
+
+For libclamav/c++/llvm/utils/unittest/googletest/*
+Copyright 2008, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+For libclamav/c++/llvm/lib/Support/{reg*, COPYRIGHT.regex}:
+$OpenBSD: COPYRIGHT,v 1.3 2003/06/02 20:18:36 millert Exp $
+
+Copyright 1992, 1993, 1994 Henry Spencer. All rights reserved.
+This software is not subject to any license of the American Telephone
+and Telegraph Company or of the Regents of the University of California.
+
+Permission is granted to anyone to use this software for any purpose on
+any computer system, and to alter it and redistribute it, subject
+to the following restrictions:
+
+1. The author is not responsible for the consequences of use of this
+ software, no matter how awful, even if they arise from flaws in it.
+
+2. The origin of this software must not be misrepresented, either by
+ explicit claim or by omission. Since few users ever read sources,
+ credits must appear in the documentation.
+
+3. Altered versions must be plainly marked as such, and must not be
+ misrepresented as being the original software. Since few users
+ ever read sources, credits must appear in the documentation.
+
+4. This notice may not be removed or altered.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+/*-
+ * Copyright (c) 1994
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)COPYRIGHT 8.1 (Berkeley) 3/16/94
+ */
+The libclamunrar code has been stripped from the orig tarball due to
+license incompatibilities.
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list