[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit 0f505d61f8c1940edad50b457512fa8bdfc6457b
Author: Török Edvin <edwin at clamav.net>
Date:   Mon Sep 7 15:57:41 2009 +0300

    Add missing file.

diff --git a/libclamav/ishield.h b/libclamav/bytecode_api_impl.h
similarity index 66%
copy from libclamav/ishield.h
copy to libclamav/bytecode_api_impl.h
index 0147102..0c2191d 100644
--- a/libclamav/ishield.h
+++ b/libclamav/bytecode_api_impl.h
@@ -1,7 +1,9 @@
 /*
+ *  ClamAV bytecode internal API
+ *
  *  Copyright (C) 2009 Sourcefire, Inc.
  *
- *  Authors: aCaB <acab at clamav.net>
+ *  Authors: Török Edvin
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -17,13 +19,9 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA 02110-1301, USA.
  */
+struct cli_bc_ctx;
+uint32_t cli_bcapi_test0(struct cli_bc_ctx *, struct foo*, uint32_t);
+uint32_t cli_bcapi_test1(struct cli_bc_ctx *, uint32_t, uint32_t);
 
-#ifndef __ISHIELD_H
-#define __ISHIELD_H
-
-#include "others.h"
-
-int cli_scanishield_msi(int desc, cli_ctx *ctx, off_t off);
-int cli_scanishield(int desc, cli_ctx *ctx, off_t off, size_t sz);
-
-#endif
+int32_t cli_bcapi_read(struct cli_bc_ctx*, uint8_t *data, int32_t size);
+int32_t cli_bcapi_seek(struct cli_bc_ctx*, int32_t pos, uint32_t whence);
diff --git a/libclamav/c++/Makefile.am b/libclamav/c++/Makefile.am
index 60ae5cd..ade389a 100644
--- a/libclamav/c++/Makefile.am
+++ b/libclamav/c++/Makefile.am
@@ -33,7 +33,7 @@ libclamavcxx_la_CPPFLAGS = $(AM_CPPFLAGS) $(LLVM_INCLUDES) $(LLVM_DEFS)
 libclamavcxx_la_LIBADD=libllvmexecutionengine.la
 libclamavcxx_la_LDFLAGS=-no-undefined
 #libclamavcxx_la_LDFLAGS = `$(LLVM_CONFIG) --ldflags --libs jit nativecodegen`
-libclamavcxx_la_SOURCES = bytecode2llvm.cpp dummy.h
+libclamavcxx_la_SOURCES = bytecode2llvm.cpp
 
 LLVM_INCLUDES=-I$(top_srcdir)/llvm/include -I$(top_builddir)/llvm/include
 # TODO: _DEBUG should be defined for --enable-debug, and NDEBUG otherwise, but
@@ -42,7 +42,8 @@ LLVM_INCLUDES=-I$(top_srcdir)/llvm/include -I$(top_builddir)/llvm/include
 LLVM_DEFS=-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DNDEBUG -D_GNU_SOURCE
 LLVM_CXXFLAGS=-Woverloaded-virtual -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings
 
-EXTRA_DIST=llvm/lib/System/README.txt
+EXTRA_DIST=llvm
+
 libllvmsystem_la_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS)
 libllvmsystem_la_CXXFLAGS=$(LLVM_CXXFLAGS) -fno-exceptions
 libllvmsystem_la_LDFLAGS=-pthread
diff --git a/libclamav/c++/Makefile.in b/libclamav/c++/Makefile.in
index 312bf6f..9f7a265 100644
--- a/libclamav/c++/Makefile.in
+++ b/libclamav/c++/Makefile.in
@@ -602,14 +602,14 @@ libclamavcxx_la_CPPFLAGS = $(AM_CPPFLAGS) $(LLVM_INCLUDES) $(LLVM_DEFS)
 libclamavcxx_la_LIBADD = libllvmexecutionengine.la
 libclamavcxx_la_LDFLAGS = -no-undefined
 #libclamavcxx_la_LDFLAGS = `$(LLVM_CONFIG) --ldflags --libs jit nativecodegen`
-libclamavcxx_la_SOURCES = bytecode2llvm.cpp dummy.h
+libclamavcxx_la_SOURCES = bytecode2llvm.cpp
 LLVM_INCLUDES = -I$(top_srcdir)/llvm/include -I$(top_builddir)/llvm/include
 # TODO: _DEBUG should be defined for --enable-debug, and NDEBUG otherwise, but
 # keep it like this while I'm testing LLVM
 # TODO: HP-UX should have -D_REENTRANT -D_HPUX_SOURCE
 LLVM_DEFS = -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DNDEBUG -D_GNU_SOURCE
 LLVM_CXXFLAGS = -Woverloaded-virtual -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings
-EXTRA_DIST = llvm/lib/System/README.txt
+EXTRA_DIST = llvm
 libllvmsystem_la_CPPFLAGS = $(LLVM_INCLUDES) $(LLVM_DEFS)
 libllvmsystem_la_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions
 libllvmsystem_la_LDFLAGS = -pthread

-- 
Debian repository for ClamAV