← Back to branch summary

~ubuntu-branches/debian/sid/clamav/sid

« back to all changes in this revision

Viewing changes to debian/patches/0012-allow-to-use-internal-libmspack-if-the-external-is-n.patch

  • Committer: Package Import Robot
  • Author(s): Andreas Cadhalpun, Andreas Cadhalpun, Sebastian Andrzej Siewior, Frans Spiesschaert
  • Date: 2014-10-15 06:50:20 UTC
  • mfrom: (1.3.13) (42.1.4 experimental)
  • Revision ID: package-import@ubuntu.com-20141015065020-0cpy1hdueggaw35s
Tags: 0.98.5~rc1+dfsg-1
http://bugs.debian.org/763634
[ Andreas Cadhalpun ]
* Import new upstream release candidate.
* Drop patches included upstream and update the others.
* Add 4 new symbols to libclamav6.symbols.
* Fix debian/copyright.
* Update lintian overrides.
* Update Standards-Version to 3.9.6 (no changes needed).
* Add Breaks and Replaces for old clamd package to clamdscan.
* Remove unnecessary shlibs:Depends from clamav-dbg.
* Add patches to support LLVM 3.5.

[ Sebastian Andrzej Siewior ]
* Add embedded copy of libmspack to be used as fallback, when libmspack-dev
  is not available.

[ Frans Spiesschaert ]
* Updated Dutch Debconf template translation (Closes: #763634)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0012-allow-to-use-internal-libmspack-if-the-external-is-n.patch
 
1
From 1314a61da8e729fca0569e03c9897866ea77366b Mon Sep 17 00:00:00 2001
 
2
From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
 
3
Date: Wed, 30 Jul 2014 21:59:17 +0200
 
4
Subject: allow to use internal libmspack if the external is not available
 
5
 
 
6
Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
 
7
---
 
8
 configure.ac          | 16 ++++++++++++++--
 
9
 libclamav/Makefile.am | 30 +++++++++++++++++++++++++++++-
 
10
 2 files changed, 43 insertions(+), 3 deletions(-)
 
11
 
 
12
diff --git a/configure.ac b/configure.ac
 
13
index 081fd66..20e8f43 100644
 
14
--- a/configure.ac
 
15
+++ b/configure.ac
 
16
@@ -131,6 +131,18 @@ m4_include([m4/reorganization/libs/curl.m4])
 
17
 
 
18
 m4_include([m4/reorganization/substitutions.m4])
 
19
 
 
20
+PKG_CHECK_MODULES([LIBMSPACK], [libmspack],
 
21
+                 use_internal_mspack=no, use_internal_mspack=yes)
 
22
+
 
23
+AM_CONDITIONAL([USE_INTERNAL_MSPACK], test "x$use_internal_mspack" = "xyes")
 
24
+
 
25
+if test "x$use_internal_mspack" = "xyes"; then
 
26
+       mspack_msg="Internal"
 
27
+       AC_CONFIG_SUBDIRS([libclamav/libmspack-0.4alpha])
 
28
+else
 
29
+       mspack_msg="External, $LIBMSPACK_CFLAGS $LIBMSPACK_LIBS"
 
30
+fi
 
31
+
 
32
 AM_CONDITIONAL([ENABLE_CLAMSUBMIT], [test "$have_curl" = "yes"])
 
33
 
 
34
 AC_CONFIG_FILES([
 
35
@@ -178,8 +190,6 @@ fi
 
36
 AM_CONDITIONAL([ENABLE_LLVM],
 
37
               [test "$subdirfailed" != "yes" && test "$enable_llvm" != "no"])
 
38
 
 
39
-PKG_CHECK_MODULES([LIBMSPACK], [libmspack])
 
40
-
 
41
 no_recursion="yes";
 
42
 AC_OUTPUT([libclamav/Makefile])
 
43
 
 
44
@@ -236,6 +246,8 @@ if test "x$PCRE_HOME" = "x"; then
 
45
 else
 
46
     CL_MSG_STATUS([pcre        ],[$PCRE_HOME],[$have_pcre])
 
47
 fi
 
48
+CL_MSG_STATUS([preclass    ],[$LIBJSON_HOME],[$have_json])
 
49
+CL_MSG_STATUS([libmspack   ],[yes],[$mspack_msg])
 
50
 if test "x$XML_LIBS" = "x"; then 
 
51
     CL_MSG_STATUS([dmg and xar ],[no],[])
 
52
 else
 
53
diff --git a/libclamav/Makefile.am b/libclamav/Makefile.am
 
54
index 26b5987..3a95955 100644
 
55
--- a/libclamav/Makefile.am
 
56
+++ b/libclamav/Makefile.am
 
57
@@ -122,11 +122,12 @@ libclamav_internal_utils_nothreads_la_SOURCES=str.c\
 
58
 libclamav_internal_utils_nothreads_la_LDFLAGS=-static @SSL_LDFLAGS@ @JSON_LDFLAGS@
 
59
 libclamav_internal_utils_nothreads_la_CFLAGS=$(AM_CFLAGS) -DCL_NOTHREADS @SSL_CPPFLAGS@ @JSON_CPPFLAGS@
 
60
 libclamav_internal_utils_nothreads_la_LIBADD=@SSL_LIBS@ @JSON_LIBS@
 
61
+SUBDIRS=
 
62
 
 
63
 if ENABLE_LLVM
 
64
 LLVMLIBADD=c++/libclamavcxx.la -lstdc++ -lm
 
65
 LLVMDEP=c++/libclamavcxx.la
 
66
-SUBDIRS=c++
 
67
+SUBDIRS+=c++
 
68
 else
 
69
 LLVMLIBADD=libclamav_nocxx.la
 
70
 LLVMDEP=libclamav_nocxx.la
 
71
@@ -147,8 +148,35 @@ if VERSIONSCRIPT
 
72
 libclamav_la_LDFLAGS += -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map
 
73
 endif
 
74
 
 
75
+if USE_INTERNAL_MSPACK
 
76
+SUBDIRS += libmspack-0.4alpha
 
77
+libclamav_la_CFLAGS += -I@top_srcdir@/libclamav/libmspack-0.4alpha/mspack
 
78
+libclamav_la_LIBADD +=  @top_builddir@/libclamav/libmspack-0.4alpha/.libs/cabc.o \
 
79
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/system.o \
 
80
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/kwajd.o \
 
81
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/hlpc.o \
 
82
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/chmd.o \
 
83
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/qtmd.o \
 
84
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/litc.o \
 
85
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/oabc.o \
 
86
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/lzxd.o \
 
87
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/litd.o \
 
88
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/crc32.o \
 
89
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/lzssd.o \
 
90
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/kwajc.o \
 
91
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/cabd.o \
 
92
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/szddd.o \
 
93
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/lzxc.o \
 
94
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/mszipd.o \
 
95
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/szddc.o \
 
96
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/oabd.o \
 
97
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/chmc.o \
 
98
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/mszipc.o \
 
99
+                       @top_builddir@/libclamav/libmspack-0.4alpha/.libs/hlpd.o
 
100
+else
 
101
 libclamav_la_CFLAGS += $(LIBMSPACK_CFLAGS)
 
102
 libclamav_la_LDFLAGS += $(LIBMSPACK_LIBS)
 
103
+endif
 
104
 
 
105
 include_HEADERS = clamav.h
 
106