open-dsi
/
clamav
mirror of https://github.com/Cisco-Talos/clamav
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add support for version scripts when using Sun's ld on Solaris.

Browse Source 
use $GREP to grep binary files, needed for autoit to build on Solaris.
add support for both GNU and Sun ld version scripts.
add version script maps to libclamunrar, libclamunrar_iface. Enumerate all symbols, Sun's ld doesn't support cl_* (only *).
cli_decodesig needs a dummy definition on Solaris.


git-svn: trunk@3474
remotes/push_mirror/metadata
Török Edvin 18 years ago
parent a63603ad9d
commit 80cf63099c
26 changed files with 159 additions and 45 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      ChangeLog
  2. 1
      Makefile.in
  3. 4
      acinclude.m4
  4. 1
      clamav-milter/Makefile.in
  5. 1
      clamconf/Makefile.in
  6. 1
      clamd/Makefile.in
  7. 1
      clamdscan/Makefile.in
  8. 1
      clamscan/Makefile.in
  9. 74
      configure
  10. 16
      configure.in
  11. 1
      database/Makefile.in
  12. 1
      docs/Makefile.in
  13. 1
      etc/Makefile.in
  14. 1
      freshclam/Makefile.in
  15. 7
      libclamav/Makefile.am
  16. 8
      libclamav/Makefile.in
  17. 5
      libclamav/dsig.c
  18. 23
      libclamav/libclamav.map
  19. 1
      libclamav/lzma/Makefile.in
  20. 6
      libclamunrar/Makefile.am
  21. 7
      libclamunrar/Makefile.in
  22. 10
      libclamunrar/libclamunrar.map
  23. 6
      libclamunrar_iface/Makefile.am
  24. 7
      libclamunrar_iface/Makefile.in
  25. 9
      libclamunrar_iface/libclamunrar_iface.map
  26. 1
      sigtool/Makefile.in

10
ChangeLog
Unescape View File

@ -1,3 +1,13 @@
Mon Dec 31 14:08:40 EET 2007 (edwin)
------------------------------------
* configure*: add support for version scripts when using Sun's ld on Solaris.
* acinclude.m4: use $GREP to grep binary files, needed for autoit to build on
Solaris.
* */Makefile.am/.in: add support for both GNU and Sun ld version scripts.
* */*.map: add version script maps to libclamunrar, libclamunrar_iface.
Enumerate all symbols, Sun's ld doesn't support cl_* (only *).
* libclamav/dsig.c: cli_decodesig needs a dummy definition on Solaris.
Sun Dec 30 13:57:45 EET 2007 (edwin)
-----------------------------------
* libclamav/str.c: optimize cli_strcasestr()

1
Makefile.in
Unescape View File

@ -186,6 +186,7 @@ STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@

4
acinclude.m4
Unescape View File

@ -594,10 +594,10 @@ AC_DEFUN([AC_C_FPU_BIGENDIAN],
[AC_CACHE_CHECK([whether FPU byte ordering is bigendian], [ac_cv_c_fpu_bigendian],
[ac_cv_c_fpu_bigendian=unknown
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[double d = 3815911171354501045744583353695226502220105394563506259449467213186125718792664588210662403287568710818873279842508553551908601408568128557088985172985437412593385138085986771664896.0;]])],[
if grep emmeelle conftest.$ac_objext >/dev/null 2>&1 ; then
if ${GREP-grep} emmeelle conftest.$ac_objext >/dev/null 2>&1 ; then
ac_cv_c_fpu_bigendian=yes
fi
if grep elleemme conftest.$ac_objext >/dev/null 2>&1 ; then
if ${GREP-grep} elleemme conftest.$ac_objext >/dev/null 2>&1 ; then
ac_cv_c_fpu_bigendian=no
fi
])])

1
clamav-milter/Makefile.in
Unescape View File

@ -169,6 +169,7 @@ STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@

1
clamconf/Makefile.in
Unescape View File

@ -154,6 +154,7 @@ STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@

1
clamd/Makefile.in
Unescape View File

@ -174,6 +174,7 @@ STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@

1
clamdscan/Makefile.in
Unescape View File

@ -163,6 +163,7 @@ STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@

1
clamscan/Makefile.in
Unescape View File

@ -157,6 +157,7 @@ STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@

74
configure vendored
Unescape View File

@ -877,6 +877,7 @@ LIBTOOL
MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE
MAINT
VERSIONSCRIPTFLAG
VERSIONSCRIPT_TRUE
VERSIONSCRIPT_FALSE
sendmailprog
@ -4747,7 +4748,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 4750 "configure"' > conftest.$ac_ext
echo '#line 4751 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@ -7484,11 +7485,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:7487: $lt_compile\"" >&5)
(eval echo "\"\$as_me:7488: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:7491: \$? = $ac_status" >&5
echo "$as_me:7492: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -7774,11 +7775,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:7777: $lt_compile\"" >&5)
(eval echo "\"\$as_me:7778: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:7781: \$? = $ac_status" >&5
echo "$as_me:7782: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -7878,11 +7879,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:7881: $lt_compile\"" >&5)
(eval echo "\"\$as_me:7882: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:7885: \$? = $ac_status" >&5
echo "$as_me:7886: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -10240,7 +10241,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 10243 "configure"
#line 10244 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -10340,7 +10341,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 10343 "configure"
#line 10344 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -12760,11 +12761,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:12763: $lt_compile\"" >&5)
(eval echo "\"\$as_me:12764: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:12767: \$? = $ac_status" >&5
echo "$as_me:12768: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -12864,11 +12865,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:12867: $lt_compile\"" >&5)
(eval echo "\"\$as_me:12868: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:12871: \$? = $ac_status" >&5
echo "$as_me:12872: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -14441,11 +14442,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:14444: $lt_compile\"" >&5)
(eval echo "\"\$as_me:14445: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:14448: \$? = $ac_status" >&5
echo "$as_me:14449: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -14545,11 +14546,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:14548: $lt_compile\"" >&5)
(eval echo "\"\$as_me:14549: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:14552: \$? = $ac_status" >&5
echo "$as_me:14553: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -16745,11 +16746,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:16748: $lt_compile\"" >&5)
(eval echo "\"\$as_me:16749: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:16752: \$? = $ac_status" >&5
echo "$as_me:16753: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -17035,11 +17036,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:17038: $lt_compile\"" >&5)
(eval echo "\"\$as_me:17039: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:17042: \$? = $ac_status" >&5
echo "$as_me:17043: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -17139,11 +17140,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:17142: $lt_compile\"" >&5)
(eval echo "\"\$as_me:17143: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:17146: \$? = $ac_status" >&5
echo "$as_me:17147: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -22105,7 +22106,7 @@ PRIVATE
*;
};
EOF
if { ac_try='${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
if { ac_try='${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
-o conftest.so conftest.c
-Wl,--version-script,conftest.map
1>&5'
@ -22115,14 +22116,30 @@ EOF
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; };
then
VERSIONSCRIPTFLAG=--version-script
ac_cv_ld_version_script=yes
else
ac_cv_ld_version_script=no
if { ac_try='${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
-o conftest.so conftest.c
-Wl,-M,conftest.map
1>&5'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; };
then
VERSIONSCRIPTFLAG=-M
ac_cv_ld_version_script=yes;
else
ac_cv_ld_version_script=no
fi
fi
rm -f conftest*
fi
{ echo "$as_me:$LINENO: result: $ac_cv_ld_version_script" >&5
echo "${ECHO_T}$ac_cv_ld_version_script" >&6; }
if test "x$ac_cv_ld_version_script" = "xyes"; then
VERSIONSCRIPT_TRUE=
VERSIONSCRIPT_FALSE='#'
@ -26413,10 +26430,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
if grep emmeelle conftest.$ac_objext >/dev/null 2>&1 ; then
if ${GREP-grep} emmeelle conftest.$ac_objext >/dev/null 2>&1 ; then
ac_cv_c_fpu_bigendian=yes
fi
if grep elleemme conftest.$ac_objext >/dev/null 2>&1 ; then
if ${GREP-grep} elleemme conftest.$ac_objext >/dev/null 2>&1 ; then
ac_cv_c_fpu_bigendian=no
fi
@ -27314,6 +27331,7 @@ LIBTOOL!$LIBTOOL$ac_delim
MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
MAINT!$MAINT$ac_delim
VERSIONSCRIPTFLAG!$VERSIONSCRIPTFLAG$ac_delim
VERSIONSCRIPT_TRUE!$VERSIONSCRIPT_TRUE$ac_delim
VERSIONSCRIPT_FALSE!$VERSIONSCRIPT_FALSE$ac_delim
sendmailprog!$sendmailprog$ac_delim
@ -27338,7 +27356,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

16
configure.in
Unescape View File

@ -254,6 +254,7 @@ fi
AC_MSG_RESULT($ZLIB_HOME)
])
dnl check for version script support in the linker (GNU ld, or Solaris ld style)
AC_CACHE_CHECK([for ld --version-script], [ac_cv_ld_version_script], [dnl
cat > conftest.c <<EOF
void cl_symbol1(void) {}
@ -275,16 +276,29 @@ PRIVATE
*;
};
EOF
dnl check for GNU ld style linker version script
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
-o conftest.so conftest.c
-Wl,--version-script,conftest.map
1>&AS_MESSAGE_LOG_FD]);
then
VERSIONSCRIPTFLAG=--version-script
ac_cv_ld_version_script=yes
else
ac_cv_ld_version_script=no
dnl check for Solaris ld style linker version script
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
-o conftest.so conftest.c
-Wl,-M,conftest.map
1>&AS_MESSAGE_LOG_FD]);
then
VERSIONSCRIPTFLAG=-M
ac_cv_ld_version_script=yes;
else
ac_cv_ld_version_script=no
fi
fi
rm -f conftest*])
AC_SUBST(VERSIONSCRIPTFLAG)
AM_CONDITIONAL(VERSIONSCRIPT, test "x$ac_cv_ld_version_script" = "xyes")
AC_ARG_ENABLE(zlib-vcheck,

1
database/Makefile.in
Unescape View File

@ -133,6 +133,7 @@ STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@

1
docs/Makefile.in
Unescape View File

@ -138,6 +138,7 @@ STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@

1
etc/Makefile.in
Unescape View File

@ -131,6 +131,7 @@ STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@

1
freshclam/Makefile.in
Unescape View File

@ -159,6 +159,7 @@ STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@

7
libclamav/Makefile.am
Unescape View File

@ -29,7 +29,7 @@ endif
libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined
if VERSIONSCRIPT
libclamav_la_LDFLAGS += -Wl,--version-script=@top_srcdir@/libclamav/libclamav.map
libclamav_la_LDFLAGS += -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map
endif
include_HEADERS = clamav.h
@ -180,8 +180,7 @@ libclamav_la_SOURCES = \
dconf.c \
dconf.h \
lzma_iface.c \
lzma_iface.h \
libclamav.map
lzma_iface.h
libclamav_internal_utils_la_SOURCES=str.c \
str.h \
@ -194,4 +193,4 @@ libclamav_internal_utils_la_LDFLAGS=-static
lib_LTLIBRARIES = libclamav.la
noinst_LTLIBRARIES = libclamav_internal_utils.la
EXTRA_DIST = regex/engine.c
EXTRA_DIST = regex/engine.c libclamav.map

8
libclamav/Makefile.in
Unescape View File

@ -52,7 +52,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
@VERSIONSCRIPT_TRUE@am__append_1 = -Wl,--version-script=@top_srcdir@/libclamav/libclamav.map
@VERSIONSCRIPT_TRUE@am__append_1 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map
subdir = libclamav
DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
@ -200,6 +200,7 @@ STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@ -409,8 +410,7 @@ libclamav_la_SOURCES = \
dconf.c \
dconf.h \
lzma_iface.c \
lzma_iface.h \
libclamav.map
lzma_iface.h
libclamav_internal_utils_la_SOURCES = str.c \
str.h \
@ -422,7 +422,7 @@ libclamav_internal_utils_la_SOURCES = str.c \
libclamav_internal_utils_la_LDFLAGS = -static
lib_LTLIBRARIES = libclamav.la
noinst_LTLIBRARIES = libclamav_internal_utils.la
EXTRA_DIST = regex/engine.c
EXTRA_DIST = regex/engine.c libclamav.map
all: all-recursive
.SUFFIXES:

5
libclamav/dsig.c
Unescape View File

@ -148,4 +148,9 @@ int cli_versig(const char *md5, const char *dsig)
cli_dbgmsg("cli_versig: Digital signature is correct.\n");
return CL_SUCCESS;
}
#else
/* since we are using linker version scripts, we must define all symbols listed in the .map,
* otherwise linking will fail (at least on Solaris).
* So here is a dummy definition for cli_decodesig.*/
unsigned char *cli_decodesig() {}
#endif

23
libclamav/libclamav.map
Unescape View File

@ -1,6 +1,26 @@
CLAMAV_PUBLIC {
global:
cl_*;
cl_build;
cl_cvdfree;
cl_cvdhead;
cl_cvdparse;
cl_cvdverify;
cl_debug;
cl_dup;
cl_free;
cl_load;
cl_loaddb;
cl_loaddbdir;
cl_retdbdir;
cl_retflevel;
cl_retver;
cl_scandesc;
cl_scanfile;
cl_settempdir;
cl_statchkdir;
cl_statfree;
cl_statinidir;
cl_strerror;
local:
*;
};
@ -38,7 +58,6 @@ CLAMAV_PRIVATE {
cli_utf16toascii;
cli_malloc;
cli_strtok_buf;
cli_memstr;
cli_strdup;
cli_realloc;

1
libclamav/lzma/Makefile.in
Unescape View File

@ -151,6 +151,7 @@ STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@

6
libclamunrar/Makefile.am
Unescape View File

@ -8,6 +8,10 @@ INCLUDES = -I$(top_srcdir)
libclamunrar_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined
if VERSIONSCRIPT
libclamunrar_la_LDFLAGS += -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamunrar/libclamunrar.map
endif
libclamunrar_la_SOURCES = \
unrar15.c \
unrar20.h \
@ -28,5 +32,5 @@ libclamunrar_la_SOURCES = \
unrarhlp.h
lib_LTLIBRARIES = libclamunrar.la
EXTRA_DIST = libclamunrar.map
endif

7
libclamunrar/Makefile.in
Unescape View File

@ -37,6 +37,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
@ENABLE_UNRAR_TRUE@@VERSIONSCRIPT_TRUE@am__append_1 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamunrar/libclamunrar.map
subdir = libclamunrar
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -154,6 +155,7 @@ STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@ -211,7 +213,9 @@ target_vendor = @target_vendor@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@ENABLE_UNRAR_TRUE@INCLUDES = -I$(top_srcdir)
@ENABLE_UNRAR_TRUE@libclamunrar_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined
@ENABLE_UNRAR_TRUE@libclamunrar_la_LDFLAGS = @TH_SAFE@ -version-info \
@ENABLE_UNRAR_TRUE@ @LIBCLAMAV_VERSION@ -no-undefined \
@ENABLE_UNRAR_TRUE@ $(am__append_1)
@ENABLE_UNRAR_TRUE@libclamunrar_la_SOURCES = \
@ENABLE_UNRAR_TRUE@ unrar15.c \
@ENABLE_UNRAR_TRUE@ unrar20.h \
@ -232,6 +236,7 @@ top_srcdir = @top_srcdir@
@ENABLE_UNRAR_TRUE@ unrarhlp.h
@ENABLE_UNRAR_TRUE@lib_LTLIBRARIES = libclamunrar.la
@ENABLE_UNRAR_TRUE@EXTRA_DIST = libclamunrar.map
all: all-am
.SUFFIXES:

10
libclamunrar/libclamunrar.map
Unescape View File

@ -0,0 +1,10 @@
CLAMAV_PRIVATE_UNRAR {
global:
ppm_constructor;
ppm_destructor;
rar_init_filters;
rar_unpack;
rarvm_free;
local:
*;
};

6
libclamunrar_iface/Makefile.am
Unescape View File

@ -10,10 +10,14 @@ libclamunrar_iface_la_LIBADD = $(top_builddir)/libclamunrar/libclamunrar.la
libclamunrar_iface_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined
if VERSIONSCRIPT
libclamunrar_iface_la_LDFLAGS += -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamunrar_iface/libclamunrar_iface.map
endif
libclamunrar_iface_la_SOURCES = \
unrar_iface.c \
unrar_iface.h
lib_LTLIBRARIES = libclamunrar_iface.la
EXTRA_DIST = libclamunrar_iface.map
endif

7
libclamunrar_iface/Makefile.in
Unescape View File

@ -37,6 +37,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
@ENABLE_UNRAR_TRUE@@VERSIONSCRIPT_TRUE@am__append_1 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamunrar_iface/unrar_iface.map
subdir = libclamunrar_iface
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -149,6 +150,7 @@ STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@ -207,12 +209,15 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@ENABLE_UNRAR_TRUE@INCLUDES = -I$(top_srcdir)
@ENABLE_UNRAR_TRUE@libclamunrar_iface_la_LIBADD = $(top_builddir)/libclamunrar/libclamunrar.la
@ENABLE_UNRAR_TRUE@libclamunrar_iface_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined
@ENABLE_UNRAR_TRUE@libclamunrar_iface_la_LDFLAGS = @TH_SAFE@ \
@ENABLE_UNRAR_TRUE@ -version-info @LIBCLAMAV_VERSION@ \
@ENABLE_UNRAR_TRUE@ -no-undefined $(am__append_1)
@ENABLE_UNRAR_TRUE@libclamunrar_iface_la_SOURCES = \
@ENABLE_UNRAR_TRUE@ unrar_iface.c \
@ENABLE_UNRAR_TRUE@ unrar_iface.h
@ENABLE_UNRAR_TRUE@lib_LTLIBRARIES = libclamunrar_iface.la
@ENABLE_UNRAR_TRUE@EXTRA_DIST = libclamunrar_iface.map
all: all-am
.SUFFIXES:

9
libclamunrar_iface/libclamunrar_iface.map
Unescape View File

@ -0,0 +1,9 @@
CLAMAV_PRIVATE {
global:
unrar_open;
unrar_extract_next;
unrar_extract_next_prepare;
unrar_close;
local:
*;
};

1
sigtool/Makefile.in
Unescape View File

@ -158,6 +158,7 @@ STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@

Write Preview
Loading…
Cancel
Save