[packages/clamav] Up to 0.104.0 (build system uses cmake now)

arekm arekm at pld-linux.org
Fri Oct 8 16:24:47 CEST 2021


commit 1ac1f471d4a487c7debb205eb8769f1097f4613e
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri Oct 8 14:24:20 2021 +0000

    Up to 0.104.0 (build system uses cmake now)

 ac2.68.patch                                     | 104 -----------
 am-nosilentrules.patch                           |  29 ----
 clamav-add-support-for-system-tomsfastmath.patch | 211 ++++++++++++++++-------
 clamav-headers.patch                             |  69 --------
 clamav-nolibs.patch                              |  14 --
 clamav.spec                                      |  77 +++------
 6 files changed, 174 insertions(+), 330 deletions(-)
---
diff --git a/clamav.spec b/clamav.spec
index 41b6689..d8fd801 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -19,13 +19,13 @@
 Summary:	An anti-virus utility for Unix
 Summary(pl.UTF-8):	Narzędzie antywirusowe dla Uniksów
 Name:		clamav
-Version:	0.103.3
-Release:	2
+Version:	0.104.0
+Release:	1
 License:	GPL v2+
 Group:		Daemons
 #Source0Download: http://www.clamav.net/download
 Source0:	http://www.clamav.net/downloads/production/%{name}-%{version}.tar.gz
-# Source0-md5:	f8dcf678953f6af056ddd5917bcc50c3
+# Source0-md5:	3f4789c09f5a35e9ea580edd5c3e54b6
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}-milter.init
@@ -38,18 +38,11 @@ Source11:	clamd.service
 Source12:	cronjob-clamav.timer
 Source13:	cronjob-clamav.service.in
 Patch0:		%{name}-pld_config.patch
-Patch1:		%{name}-nolibs.patch
-%if "%{pld_release}" == "ac"
-Patch2:		am-nosilentrules.patch
-%endif
-Patch3:		ac2.68.patch
+
 Patch4:		x32.patch
 Patch5:		%{name}-add-support-for-system-tomsfastmath.patch
-Patch6:		%{name}-headers.patch
 URL:		http://www.clamav.net/
-BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake >= 1:1.11.1
-BuildRequires:	bzip2-devel >= 1.0.5
+BuildRequires:	cmake
 BuildRequires:	check-devel
 BuildRequires:	curl-devel >= 7.40
 BuildRequires:	gmp-devel
@@ -58,7 +51,6 @@ BuildRequires:	libltdl-devel
 %{?with_milter:BuildRequires:	libmilter-devel}
 %{?with_system_libmspack:BuildRequires:	libmspack-devel}
 BuildRequires:	libstdc++-devel >= 5:3.4
-BuildRequires:	libtool >= 2:2
 %{?with_milter:BuildRequires:	libwrap-devel}
 BuildRequires:	libxml2-devel >= 2
 %{?with_llvm:%{?with_system_llvm:BuildRequires:	llvm-devel < 3.7}}
@@ -213,40 +205,23 @@ Biblioteki statyczne clamav.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%if "%{pld_release}" == "ac"
-%patch2 -p1
-%endif
-%if "%{pld_release}" != "ac"
-%patch3 -p1
-%endif
+
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
-export CFLAGS="%{rpmcflags} -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99"
-export CXXFLAGS="%{rpmcxxflags} -std=gnu++98"
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--disable-clamav \
-	--enable-clamonacc \
-	--enable-clamdtop \
-	%{?with_llvm:--enable-llvm %{!?with_system_llvm:--with-system-llvm=no}} \
-	%{?with_milter:--enable-milter} \
-	--disable-silent-rules \
-	%{?with_static_libs:--enable-static} \
-	--disable-zlib-vcheck \
-	--with-dbdir=/var/lib/%{name} \
-	--with-ltdl-include=%{_includedir} \
-	--with-ltdl-lib=%{_libdir} \
-	--with-no-cache \
-	%{?with_system_libmspack:--with-system-libmspack}
-
+install -d build
+cd build
+%{cmake} \
+	%{cmake_on_off system_libmspack ENABLE_EXTERNAL_MSPACK} \
+	%{cmake_on_off milter ENABLE_MILTER} \
+	%{cmake_on_off static_libs ENABLE_STATIC_LIB} \
+	-DENABLE_APP=ON \
+	-DENABLE_CLAMONACC=ON \
+	-DENABLE_FRESHCLAM_NO_CACHE=ON \
+	-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/%{name} \
+	-DAPP_CONFIG_DIRECTORY=%{_sysconfdir} \
+	..
 %{__make}
 
 %install
@@ -256,10 +231,15 @@ install -d $RPM_BUILD_ROOT/etc/{cron.d,logrotate.d,rc.d/init.d,sysconfig} \
 	$RPM_BUILD_ROOT%{systemdtmpfilesdir} \
 	$RPM_BUILD_ROOT%{systemdunitdir}
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 %{!?with_milter:rm -f $RPM_BUILD_ROOT%{_mandir}/man8/clamav-milter.8*}
 
+%if %{with static_libs}
+mv $RPM_BUILD_ROOT%{_libdir}/libclamav{_static,}.a
+mv $RPM_BUILD_ROOT%{_libdir}/libfreshclam{_static,}.a
+%endif
+
 cat <<'EOF' >$RPM_BUILD_ROOT/etc/cron.d/%{name}
 5 * * * *	root	%{_sbindir}/clamav-cron-updatedb
 EOF
@@ -461,13 +441,6 @@ fi
 %attr(755,root,root) %{_libdir}/libclamunrar.so
 %attr(755,root,root) %{_libdir}/libfreshclam.so
 %attr(755,root,root) %{_libdir}/libclamunrar_iface.so
-%{_libdir}/libclamav.la
-%if %{without system_libmspack}
-%{_libdir}/libclammspack.la
-%endif
-%{_libdir}/libclamunrar.la
-%{_libdir}/libfreshclam.la
-%{_libdir}/libclamunrar_iface.la
 %dir %{_includedir}/clamav
 %{_includedir}/clamav/clamav.h
 %{_includedir}/clamav/clamav-types.h
@@ -481,6 +454,4 @@ fi
 %if %{without system_libmspack}
 %{_libdir}/libclammspack.a
 %endif
-%{_libdir}/libclamunrar.a
 %{_libdir}/libfreshclam.a
-%{_libdir}/libclamunrar_iface.a
diff --git a/ac2.68.patch b/ac2.68.patch
deleted file mode 100644
index a855631..0000000
--- a/ac2.68.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -urNp -x '*.orig' clamav-0.103.0.org/configure.ac clamav-0.103.0/configure.ac
---- clamav-0.103.0.org/configure.ac	2020-09-13 02:27:09.000000000 +0200
-+++ clamav-0.103.0/configure.ac	2021-04-06 16:39:49.284297541 +0200
-@@ -50,6 +50,7 @@ dnl the date in the version
- AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])
- 
- m4_include([m4/reorganization/version.m4])
-+m4_include([m4/reorganization/build_tools.m4])
- 
- LT_CONFIG_LTDL_DIR([libltdl])
- LT_INIT([dlopen disable-static])
-@@ -58,7 +59,6 @@ PKG_PROG_PKG_CONFIG(0.16)
- 
- m4_include([m4/reorganization/libclamav-only.m4])
- 
--m4_include([m4/reorganization/build_tools.m4])
- m4_include([m4/reorganization/headers.m4])
- 
- AC_CONFIG_FILES([libltdl/Makefile])
-@@ -394,7 +394,7 @@ if test "X$have_json" = "Xyes" && test "
-     ])
- fi
- 
--if test "x$clamonacc-curl" = "xdeprecated"; then
-+if test "x$clamonacc_curl" = "xdeprecated"; then
-     AC_MSG_WARN([m4_normalize([
- ****** your libcurl (e.g. libcurl-devel) is older than the recommended version. Installing ClamAV with clamonacc requires libcurl 7.40 or higher to use fdpassing.
- ****** fdpassing with clamonacc will be disabled on your system.
-diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/build_tools.m4 clamav-0.103.0/m4/reorganization/build_tools.m4
---- clamav-0.103.0.org/m4/reorganization/build_tools.m4	2020-09-13 02:27:10.000000000 +0200
-+++ clamav-0.103.0/m4/reorganization/build_tools.m4	2021-04-06 16:39:49.284297541 +0200
-@@ -1,3 +1,5 @@
-+AM_PROG_AR
-+AM_PROG_CC_C_O
- AC_PROG_CC
- AM_PROG_LEX
- AC_PROG_YACC
-diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/clamdtop.m4 clamav-0.103.0/m4/reorganization/clamdtop.m4
---- clamav-0.103.0.org/m4/reorganization/clamdtop.m4	2020-09-13 02:27:10.000000000 +0200
-+++ clamav-0.103.0/m4/reorganization/clamdtop.m4	2021-04-06 16:39:49.284297541 +0200
-@@ -13,8 +13,8 @@ PKG_CHECK_MODULES(NCURSES, [ncurses], [
- 
- if test "X$HAVE_LIBNCURSES" != "Xyes"; then
-     AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
--	    AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
--			    [initscr(); KEY_RESIZE;]),
-+	    [AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
-+			    [initscr(); KEY_RESIZE;])],
- 	    [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
- 	     CURSES_INCLUDE="<ncurses/ncurses.h>"],
- 	    [])
-@@ -23,8 +23,8 @@ fi
- if test "X$HAVE_LIBNCURSES" != "Xyes"; then
-     HAVE_LIBNCURSES=
-     AC_LIB_FIND([ncurses], [ncurses.h],
--	    AC_LANG_PROGRAM([#include <ncurses.h>],
--			    [initscr(); KEY_RESIZE;]),
-+	    [AC_LANG_PROGRAM([#include <ncurses.h>],
-+			    [initscr(); KEY_RESIZE;])],
- 	    [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
- 	     CURSES_INCLUDE="<ncurses.h>"],
- 	    [])
-@@ -32,8 +32,8 @@ fi
- 
- if test "X$HAVE_LIBNCURSES" != "Xyes"; then
-     AC_LIB_FIND([pdcurses],[curses.h],
--			    AC_LANG_PROGRAM([#include <curses.h>],
--					    [initscr(); KEY_RESIZE;]),
-+			    [AC_LANG_PROGRAM([#include <curses.h>],
-+					    [initscr(); KEY_RESIZE;])],
- 			    [CURSES_CPPFLAGS="$INCPDCURSES";
- 			     CURSES_LIBS="$LTLIBPDCURSES";
- 			     CURSES_INCLUDE="<curses.h>"],
-diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/code_checks/unit_tests.m4 clamav-0.103.0/m4/reorganization/code_checks/unit_tests.m4
---- clamav-0.103.0.org/m4/reorganization/code_checks/unit_tests.m4	2020-09-13 02:27:10.000000000 +0200
-+++ clamav-0.103.0/m4/reorganization/code_checks/unit_tests.m4	2021-04-06 16:39:49.284297541 +0200
-@@ -19,7 +19,7 @@ case "$host_os" in
- esac
- 
- 	AC_LIB_FIND([check],[check.h],
--			AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)]),
-+			[AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)])],
- 			[CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK $LDFLAGS"],
- 			[])
- 
-diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/libs/curl.m4 clamav-0.103.0/m4/reorganization/libs/curl.m4
---- clamav-0.103.0.org/m4/reorganization/libs/curl.m4	2020-09-13 02:27:10.000000000 +0200
-+++ clamav-0.103.0/m4/reorganization/libs/curl.m4	2021-04-06 16:39:49.284297541 +0200
-@@ -64,12 +64,12 @@ if test "X$have_curl" = "Xyes"; then
-     dnl end of section
- 
-     AM_COND_IF([BUILD_CLAMONACC],
--        $enable_clamonacc="yes"
-+        enable_clamonacc="yes"
- 
--        clamonacc_curl = "current"
-+        clamonacc_curl="current"
-         dnl if version less than to (7.40 0x072800)
-         [if test $curl_version -lt 468992; then
--          clamonacc_curl = "deprecated" 
-+          clamonacc_curl="deprecated" 
-         fi]
-     )
- 
diff --git a/am-nosilentrules.patch b/am-nosilentrules.patch
deleted file mode 100644
index 418a5d0..0000000
--- a/am-nosilentrules.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- clamav-0.96/configure.ac~	2010-04-15 13:38:54.000000000 +0300
-+++ clamav-0.96/configure.ac	2010-04-15 13:38:55.799688151 +0300
-@@ -34,8 +34,7 @@
- 
- dnl -Wall and -Werror here are NOT CFLAGS, they refer to automake warnings
- dnl enable stealth builds and psychedelic tests
--AM_INIT_AUTOMAKE([1.11 -Wall -Wportability -Wno-override std-options foreign dist-bzip2 no-define color-tests parallel-tests tar-ustar])
--AM_SILENT_RULES([yes])
-+AM_INIT_AUTOMAKE([1.10 -Wall -Wportability -Wno-override std-options foreign dist-bzip2 no-define tar-ustar])
- 
- dnl we told automake to not define these, since we want to include
- dnl the date in the version
---- clamav-0.96/m4/acinclude.m4~	2010-04-15 14:58:22.000000000 +0300
-+++ clamav-0.96/m4/acinclude.m4	2010-04-15 14:59:20.072733581 +0300
-@@ -789,9 +789,9 @@
- AC_DEFUN([CL_MSG_STATUS],
- [
-    m4_if($#,3,,[m4_fatal([$0: invalid number of arguments: $#])])
--   AS_ECHO_N(["              $1: "])
--   AS_IF([test "x$3" = "xno"], [AS_ECHO(["$2 (disabled)"])],
--	 [test "x$3" = "xyes"], [AS_ECHO(["$2"])],
--	 [test "x$3" = "x"], [AS_ECHO(["$2"])],
--	 [AS_ECHO(["$2 ($3)"])])
-+   echo ["              $1: "]
-+   AS_IF([test "x$3" = "xno"], [echo ["$2 (disabled)"]],
-+	 [test "x$3" = "xyes"], [echo ["$2"]],
-+	 [test "x$3" = "x"], [echo ["$2"]],
-+	 [echo ["$2 ($3)"]])
- ])
diff --git a/clamav-add-support-for-system-tomsfastmath.patch b/clamav-add-support-for-system-tomsfastmath.patch
index 0adce82..4435deb 100644
--- a/clamav-add-support-for-system-tomsfastmath.patch
+++ b/clamav-add-support-for-system-tomsfastmath.patch
@@ -13,51 +13,6 @@ Patch-Name: add-support-for-system-tomsfastmath.patch
  5 files changed, 28 insertions(+), 4 deletions(-)
  create mode 100644 m4/reorganization/libs/tomsfastmath.m4
 
-diff -urNp -x '*.orig' clamav-0.103.0.org/configure.ac clamav-0.103.0/configure.ac
---- clamav-0.103.0.org/configure.ac	2021-04-06 16:40:12.175486852 +0200
-+++ clamav-0.103.0/configure.ac	2021-04-06 16:40:12.575507635 +0200
-@@ -94,6 +94,7 @@ m4_include([m4/reorganization/libs/opens
- m4_include([m4/reorganization/libs/json.m4])
- m4_include([m4/reorganization/libs/pcre.m4])
- m4_include([m4/reorganization/libs/libmspack.m4])
-+m4_include([m4/reorganization/libs/tomsfastmath.m4])
- 
- if test "x$use_internal_mspack" = "xno"; then
-     mspack_msg="External, $LIBMSPACK_CFLAGS $LIBMSPACK_LIBS"
-@@ -362,6 +363,7 @@ fi
- CL_MSG_STATUS([yara        ],[$enable_yara],[$enable_yara])
- CL_MSG_STATUS([fts         ],[yes],[$lfs_fts_msg])
- 
-+CL_MSG_STATUS([tomsfastmath],[yes],[$tomsfastmath_msg])
- 
- # Yep, downgrading the compiler avoids the bug too:
- # 4.0.x, and 4.1.0 are the known buggy versions
-diff -urNp -x '*.orig' clamav-0.103.0.org/libclamav/Makefile.am clamav-0.103.0/libclamav/Makefile.am
---- clamav-0.103.0.org/libclamav/Makefile.am	2020-09-13 02:27:09.000000000 +0200
-+++ clamav-0.103.0/libclamav/Makefile.am	2021-04-06 16:40:12.575507635 +0200
-@@ -588,7 +588,10 @@ libclamav_la_SOURCES += yara_arena.c \
- 	yara_clam.h
- endif
- 
--libclamav_la_SOURCES += bignum.h\
-+libclamav_la_SOURCES += bignum.h
-+
-+if !SYSTEM_TOMSFASTMATH
-+libclamav_la_SOURCES += \
- 	bignum_fast.h\
- 	tomsfastmath/addsub/fp_add.c\
- 	tomsfastmath/addsub/fp_add_d.c\
-@@ -671,6 +674,10 @@ libclamav_la_SOURCES += bignum.h\
- 	tomsfastmath/sqr/fp_sqr_comba_generic.c\
- 	tomsfastmath/sqr/fp_sqr_comba_small_set.c\
- 	tomsfastmath/sqr/fp_sqrmod.c
-+else
-+libclamav_la_CFLAGS += $(TOMSFASTMATH_CFLAGS)
-+libclamav_la_LIBADD += $(TOMSFASTMATH_LIBS)
-+endif
- 
- .PHONY2: version.h.tmp
- version.c: version.h
 diff -urNp -x '*.orig' clamav-0.103.0.org/libclamav/bignum.h clamav-0.103.0/libclamav/bignum.h
 --- clamav-0.103.0.org/libclamav/bignum.h	2020-09-13 02:27:09.000000000 +0200
 +++ clamav-0.103.0/libclamav/bignum.h	2021-04-06 16:40:12.578841141 +0200
@@ -88,19 +43,153 @@ diff -urNp -x '*.orig' clamav-0.103.0.org/libclamav/xdp.c clamav-0.103.0/libclam
  #include "filetypes.h"
  
  static char *dump_xdp(cli_ctx *ctx, const char *start, size_t sz);
-diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/libs/tomsfastmath.m4 clamav-0.103.0/m4/reorganization/libs/tomsfastmath.m4
---- clamav-0.103.0.org/m4/reorganization/libs/tomsfastmath.m4	1970-01-01 01:00:00.000000000 +0100
-+++ clamav-0.103.0/m4/reorganization/libs/tomsfastmath.m4	2021-04-06 16:40:12.578841141 +0200
-@@ -0,0 +1,12 @@
-+dnl Check for system tomsfastmath
-+PKG_CHECK_MODULES([TOMSFASTMATH], [tomsfastmath], [have_system_tomsfastmath=yes], [have_system_tomsfastmath=no])
-+
-+AM_CONDITIONAL([SYSTEM_TOMSFASTMATH], [test "x$have_system_tomsfastmath" = "xyes"])
-+
-+if test "x$have_system_tomsfastmath" = "xyes"; then
-+    AC_DEFINE([HAVE_SYSTEM_TOMSFASTMATH], [1], [link against system-wide tomsfastmath library])
-+    tomsfastmath_msg="External, $TOMSFASTMATH_CFLAGS $TOMSFASTMATH_LIBS"
-+else
-+    AC_DEFINE([HAVE_SYSTEM_TOMSFASTMATH], [0], [don't link against system-wide tomsfastmath library])
-+    tomsfastmath_msg="Internal"
-+fi
+
+--- clamav-0.104.0/libclamav/CMakeLists.txt~	2021-08-27 22:41:31.000000000 +0000
++++ clamav-0.104.0/libclamav/CMakeLists.txt	2021-10-08 14:11:34.629965363 +0000
+@@ -157,99 +157,6 @@ target_link_libraries( yara
+         PCRE2::pcre2
+         JSONC::jsonc )
+ 
+-add_library( tomsfastmath OBJECT )
+-target_sources( tomsfastmath
+-    PRIVATE
+-        tomsfastmath/addsub/fp_add.c
+-        tomsfastmath/addsub/fp_add_d.c
+-        tomsfastmath/addsub/fp_addmod.c
+-        tomsfastmath/addsub/fp_cmp.c
+-        tomsfastmath/addsub/fp_cmp_d.c
+-        tomsfastmath/addsub/fp_cmp_mag.c
+-        tomsfastmath/addsub/fp_sub.c
+-        tomsfastmath/addsub/fp_sub_d.c
+-        tomsfastmath/addsub/fp_submod.c
+-        tomsfastmath/addsub/s_fp_add.c
+-        tomsfastmath/addsub/s_fp_sub.c
+-        tomsfastmath/bin/fp_radix_size.c
+-        tomsfastmath/bin/fp_read_radix.c
+-        tomsfastmath/bin/fp_read_signed_bin.c
+-        tomsfastmath/bin/fp_read_unsigned_bin.c
+-        tomsfastmath/bin/fp_reverse.c
+-        tomsfastmath/bin/fp_s_rmap.c
+-        tomsfastmath/bin/fp_signed_bin_size.c
+-        tomsfastmath/bin/fp_to_signed_bin.c
+-        tomsfastmath/bin/fp_to_unsigned_bin.c
+-        tomsfastmath/bin/fp_toradix.c
+-        tomsfastmath/bin/fp_toradix_n.c
+-        tomsfastmath/bin/fp_unsigned_bin_size.c
+-        tomsfastmath/bit/fp_cnt_lsb.c
+-        tomsfastmath/bit/fp_count_bits.c
+-        tomsfastmath/bit/fp_div_2.c
+-        tomsfastmath/bit/fp_div_2d.c
+-        tomsfastmath/bit/fp_lshd.c
+-        tomsfastmath/bit/fp_mod_2d.c
+-        tomsfastmath/bit/fp_rshd.c
+-        tomsfastmath/divide/fp_div.c
+-        tomsfastmath/divide/fp_div_d.c
+-        tomsfastmath/divide/fp_mod.c
+-        tomsfastmath/divide/fp_mod_d.c
+-        tomsfastmath/exptmod/fp_2expt.c
+-        tomsfastmath/exptmod/fp_exptmod.c
+-        tomsfastmath/misc/fp_ident.c
+-        tomsfastmath/misc/fp_set.c
+-        tomsfastmath/mont/fp_montgomery_calc_normalization.c
+-        tomsfastmath/mont/fp_montgomery_reduce.c
+-        tomsfastmath/mont/fp_montgomery_setup.c
+-        tomsfastmath/mul/fp_mul.c
+-        tomsfastmath/mul/fp_mul_comba.c
+-        tomsfastmath/mul/fp_mul_2.c
+-        tomsfastmath/mul/fp_mul_2d.c
+-        tomsfastmath/mul/fp_mul_comba_12.c
+-        tomsfastmath/mul/fp_mul_comba_17.c
+-        tomsfastmath/mul/fp_mul_comba_20.c
+-        tomsfastmath/mul/fp_mul_comba_24.c
+-        tomsfastmath/mul/fp_mul_comba_28.c
+-        tomsfastmath/mul/fp_mul_comba_3.c
+-        tomsfastmath/mul/fp_mul_comba_32.c
+-        tomsfastmath/mul/fp_mul_comba_4.c
+-        tomsfastmath/mul/fp_mul_comba_48.c
+-        tomsfastmath/mul/fp_mul_comba_6.c
+-        tomsfastmath/mul/fp_mul_comba_64.c
+-        tomsfastmath/mul/fp_mul_comba_7.c
+-        tomsfastmath/mul/fp_mul_comba_8.c
+-        tomsfastmath/mul/fp_mul_comba_9.c
+-        tomsfastmath/mul/fp_mul_comba_small_set.c
+-        tomsfastmath/mul/fp_mul_d.c
+-        tomsfastmath/mul/fp_mulmod.c
+-        tomsfastmath/numtheory/fp_invmod.c
+-        tomsfastmath/sqr/fp_sqr.c
+-        tomsfastmath/sqr/fp_sqr_comba_12.c
+-        tomsfastmath/sqr/fp_sqr_comba_17.c
+-        tomsfastmath/sqr/fp_sqr_comba_20.c
+-        tomsfastmath/sqr/fp_sqr_comba_24.c
+-        tomsfastmath/sqr/fp_sqr_comba_28.c
+-        tomsfastmath/sqr/fp_sqr_comba_3.c
+-        tomsfastmath/sqr/fp_sqr_comba_32.c
+-        tomsfastmath/sqr/fp_sqr_comba_4.c
+-        tomsfastmath/sqr/fp_sqr_comba_48.c
+-        tomsfastmath/sqr/fp_sqr_comba_6.c
+-        tomsfastmath/sqr/fp_sqr_comba_64.c
+-        tomsfastmath/sqr/fp_sqr_comba_7.c
+-        tomsfastmath/sqr/fp_sqr_comba_8.c
+-        tomsfastmath/sqr/fp_sqr_comba_9.c
+-        tomsfastmath/sqr/fp_sqr_comba_generic.c
+-        tomsfastmath/sqr/fp_sqr_comba_small_set.c
+-        tomsfastmath/sqr/fp_sqrmod.c
+-    PUBLIC
+-        bignum.h
+-        bignum_fast.h )
+-target_include_directories( tomsfastmath
+-    PRIVATE ${CMAKE_BINARY_DIR}
+-    PUBLIC  ${CMAKE_CURRENT_SOURCE_DIR} )
+-set_target_properties( tomsfastmath PROPERTIES
+-    COMPILE_FLAGS "${WARNCFLAGS}" )
+-
+ # Bytecode Runtime
+ add_library( bytecode_runtime OBJECT )
+ if(LLVM_FOUND)
+@@ -424,7 +424,7 @@ if(ENABLE_SHARED_LIB)
+             regex
+             lzma_sdk
+             yara
+-            tomsfastmath
++            tfm
+             bytecode_runtime
+             ${LIBMSPACK}
+             ClamAV::libunrar_iface_iface
+@@ -525,7 +525,7 @@ if(ENABLE_STATIC_LIB)
+             regex
+             lzma_sdk
+             yara
+-            tomsfastmath
++            tfm
+             bytecode_runtime
+             ${LIBMSPACK}
+             OpenSSL::SSL
+--- clamav-0.104.0/unit_tests/CMakeLists.txt~	2021-08-27 22:41:31.000000000 +0000
++++ clamav-0.104.0/unit_tests/CMakeLists.txt	2021-10-08 14:20:36.239965193 +0000
+@@ -52,7 +52,7 @@ if(ENABLE_APP)
+             regex
+             lzma_sdk
+             yara
+-            tomsfastmath
++            tfm
+             bytecode_runtime
+             JSONC::jsonc
+             ${LIBMSPACK}
+@@ -92,7 +92,7 @@ if(ENABLE_APP)
+             regex
+             lzma_sdk
+             yara
+-            tomsfastmath
++            tfm
+             bytecode_runtime
+             JSONC::jsonc
+             ${LIBMSPACK}
+@@ -144,7 +144,7 @@ target_link_libraries(check_clamav
+         regex
+         lzma_sdk
+         yara
+-        tomsfastmath
++        tfm
+         bytecode_runtime
+         JSONC::jsonc
+         ${LIBMSPACK}
diff --git a/clamav-headers.patch b/clamav-headers.patch
deleted file mode 100644
index e2d03b5..0000000
--- a/clamav-headers.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -urNp -x '*.orig' clamav-0.103.0.org/Makefile.am clamav-0.103.0/Makefile.am
---- clamav-0.103.0.org/Makefile.am	2020-09-13 02:27:09.000000000 +0200
-+++ clamav-0.103.0/Makefile.am	2021-04-06 16:40:36.893437739 +0200
-@@ -46,7 +46,7 @@ endif
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libclamav.pc
- 
--nodist_include_HEADERS = clamav-types.h clamav-version.h
-+pkginclude_HEADERS = clamav-types.h clamav-version.h
- 
- # don't complain that configuration files and databases are not removed, this is intended
- distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print
-diff -urNp -x '*.orig' clamav-0.103.0.org/clamav-config.in clamav-0.103.0/clamav-config.in
---- clamav-0.103.0.org/clamav-config.in	2020-09-13 02:27:09.000000000 +0200
-+++ clamav-0.103.0/clamav-config.in	2021-04-06 16:40:36.893437739 +0200
-@@ -3,7 +3,7 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--includedir=@includedir@
-+includedir=@includedir@/clamav
- libdir=@libdir@
- 
- usage()
-@@ -55,7 +55,7 @@ while test $# -gt 0; do
- 	;;
- 
-     --cflags)
--       	echo -I at includedir@ @CFLAGS@
-+       	echo -I${includedir} @CFLAGS@
-        	;;
- 
-     --libs)
-diff -urNp -x '*.orig' clamav-0.103.0.org/libclamav/Makefile.am clamav-0.103.0/libclamav/Makefile.am
---- clamav-0.103.0.org/libclamav/Makefile.am	2021-04-06 16:40:36.403412280 +0200
-+++ clamav-0.103.0/libclamav/Makefile.am	2021-04-06 16:40:36.893437739 +0200
-@@ -251,7 +251,7 @@ if VERSIONSCRIPT
- libclamav_la_LDFLAGS += -Wl, at VERSIONSCRIPTFLAG@, at top_srcdir@/libclamav/libclamav.map
- endif
- 
--include_HEADERS = clamav.h
-+pkginclude_HEADERS = clamav.h
- 
- libclamav_la_SOURCES = \
- 	matcher-ac.c \
-diff -urNp -x '*.orig' clamav-0.103.0.org/libclamav.pc.in clamav-0.103.0/libclamav.pc.in
---- clamav-0.103.0.org/libclamav.pc.in	2020-09-13 02:27:09.000000000 +0200
-+++ clamav-0.103.0/libclamav.pc.in	2021-04-06 16:40:36.893437739 +0200
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=@includedir@
-+includedir=@includedir@/clamav
- 
- Name: libclamav
- Description: A GPL virus scanner
-diff -urNp -x '*.orig' clamav-0.103.0.org/libfreshclam/Makefile.am clamav-0.103.0/libfreshclam/Makefile.am
---- clamav-0.103.0.org/libfreshclam/Makefile.am	2020-09-13 02:27:10.000000000 +0200
-+++ clamav-0.103.0/libfreshclam/Makefile.am	2021-04-06 16:40:36.893437739 +0200
-@@ -32,7 +32,7 @@ AM_LIBTOOLFLAGS = --tag CXX
- 
- EXTRA_DIST = libfreshclam.map libfreshclam_main.c
- 
--include_HEADERS = libfreshclam.h
-+pkginclude_HEADERS = libfreshclam.h
- 
- libfreshclam_la_SOURCES = \
-     libfreshclam.c \
diff --git a/clamav-nolibs.patch b/clamav-nolibs.patch
deleted file mode 100644
index 1d68a6c..0000000
--- a/clamav-nolibs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/code_checks/functions.m4 clamav-0.103.0/m4/reorganization/code_checks/functions.m4
---- clamav-0.103.0.org/m4/reorganization/code_checks/functions.m4	2020-09-13 02:27:10.000000000 +0200
-+++ clamav-0.103.0/m4/reorganization/code_checks/functions.m4	2021-04-06 16:39:26.769794467 +0200
-@@ -1,6 +1,10 @@
- AX_CHECK_UNAME_SYSCALL
-+AC_CHECK_FUNC(socket,, [
- AC_CHECK_LIB([socket], [bind], [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"])
-+])
-+AC_CHECK_FUNC(gethostent,, [
- AC_SEARCH_LIBS([gethostent],[nsl], [(LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl")])
-+])
- 
- AC_CHECK_FUNCS_ONCE([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo madvise getnameinfo])
- AC_CHECK_FUNCS([strndup])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/clamav.git/commitdiff/1ac1f471d4a487c7debb205eb8769f1097f4613e



More information about the pld-cvs-commit mailing list