From a4e64f4edce907da3ee553203c545415b5426030 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Thu, 26 Jul 2018 11:09:19 +0200 Subject: [PATCH] - up to 0.100.1 --- clamav-pld_config.patch | 16 +--------------- clamav.spec | 14 ++++++++++---- x32.patch | 8 ++++---- 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/clamav-pld_config.patch b/clamav-pld_config.patch index 381237d..abb2094 100644 --- a/clamav-pld_config.patch +++ b/clamav-pld_config.patch @@ -25,15 +25,6 @@ diff -ur clamav-0.97.1/etc//clamav-milter.conf.sample clamav-0.97.1.new/etc//cla # Sets the permissions on the (unix) milter socket to the specified mode. # Default: disabled (obey umask) -@@ -41,7 +41,7 @@ - # Initialize supplementary group access (clamav-milter must be started by root). - # - # Default: no --#AllowSupplementaryGroups no -+AllowSupplementaryGroups yes - - # Waiting for data from clamd will timeout after this time (seconds). - # Value of 0 disables the timeout. @@ -64,7 +64,7 @@ # daemon (main thread). # @@ -125,18 +116,13 @@ diff -ur clamav-0.97.1/etc//clamd.conf.sample clamav-0.97.1.new/etc//clamd.conf. # Sets the permissions on the unix socket to the specified mode. # Default: disabled (socket is world accessible) -@@ -186,11 +186,11 @@ +@@ -204,7 +204,7 @@ LocalSocket /var/lib/clamav/clamd.socket # Run as another user (clamd must be started by root for this option to work) # Default: don't drop privileges -#User clamav +User clamav - # Initialize supplementary group access (clamd must be started by root). - # Default: no --#AllowSupplementaryGroups no -+AllowSupplementaryGroups yes - # Stop daemon when libclamav reports out of memory condition. #ExitOnOOM yes diff -ur clamav-0.97.1/etc//freshclam.conf.sample clamav-0.97.1.new/etc//freshclam.conf.sample diff --git a/clamav.spec b/clamav.spec index aafdd55..ed841a1 100644 --- a/clamav.spec +++ b/clamav.spec @@ -19,12 +19,12 @@ Summary: An anti-virus utility for Unix Summary(pl.UTF-8): Narzędzie antywirusowe dla Uniksów Name: clamav -Version: 0.99.4 +Version: 0.100.1 Release: 1 License: GPL v2+ Group: Daemons Source0: http://www.clamav.net/downloads/production/%{name}-%{version}.tar.gz -# Source0-md5: b9359b90086948b3c4eb97c84cf4b400 +# Source0-md5: 0f653df0480eebcd828939e8db9f0443 Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}-milter.init @@ -203,7 +203,7 @@ export CXXFLAGS="%{rpmcxxflags} -std=gnu++98" --disable-silent-rules \ --disable-clamav \ --enable-clamdtop \ - %{?with_llvm:--enable-llvm %{?with_system_llvm:--with-system-llvm}} \ + %{?with_llvm:--enable-llvm %{!?with_system_llvm:--with-system-llvm=no}} \ %{?with_milter:--enable-milter} \ --with-dbdir=/var/lib/%{name} \ --with-no-cache \ @@ -346,7 +346,7 @@ fi %files %defattr(644,root,root,755) -%doc AUTHORS ChangeLog FAQ NEWS README docs/*.pdf +%doc ChangeLog.md NEWS.md README.md %attr(755,root,root) %{_bindir}/clambc %attr(755,root,root) %{_bindir}/clamdscan %attr(755,root,root) %{_bindir}/clamdtop @@ -397,6 +397,8 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libclamav.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libclamav.so.7 +%attr(755,root,root) %{_libdir}/libclammspack.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libclammspack.so.0 %attr(755,root,root) %{_libdir}/libclamunrar.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libclamunrar.so.7 %attr(755,root,root) %{_libdir}/libclamunrar_iface.so.*.*.* @@ -406,16 +408,20 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/clamav-config %attr(755,root,root) %{_libdir}/libclamav.so +%attr(755,root,root) %{_libdir}/libclammspack.so %attr(755,root,root) %{_libdir}/libclamunrar.so %attr(755,root,root) %{_libdir}/libclamunrar_iface.so %{_libdir}/libclamav.la +%{_libdir}/libclammspack.la %{_libdir}/libclamunrar.la %{_libdir}/libclamunrar_iface.la %{_includedir}/clamav.h %{_pkgconfigdir}/libclamav.pc +%{_pkgconfigdir}/libclammspack.pc %files static %defattr(644,root,root,755) %{_libdir}/libclamav.a +%{_libdir}/libclammspack.a %{_libdir}/libclamunrar.a %{_libdir}/libclamunrar_iface.a diff --git a/x32.patch b/x32.patch index 0dcb994..0da8b55 100644 --- a/x32.patch +++ b/x32.patch @@ -1,13 +1,13 @@ ---- clamav-0.98.7/libclamav/bytecode_vm.c~ 2015-04-22 21:50:01.000000000 +0200 -+++ clamav-0.98.7/libclamav/bytecode_vm.c 2015-05-03 21:40:54.448612567 +0200 -@@ -1248,7 +1248,11 @@ +--- clamav-0.100.1/libclamav/bytecode_vm.c~ 2018-06-27 21:12:10.000000000 +0200 ++++ clamav-0.100.1/libclamav/bytecode_vm.c 2018-07-26 10:48:10.316153596 +0200 +@@ -1248,7 +1248,11 @@ int cli_vm_execute(const struct cli_bc * gettimeofday(&tv1, NULL); tv1.tv_sec -= tv0.tv_sec; tv1.tv_usec -= tv0.tv_usec; +#ifdef __ILP32__ + cli_dbgmsg("intepreter bytecode run finished in %lluus, after executing %u opcodes\n", +#else - cli_dbgmsg("intepreter bytecode run finished in %luus, after executing %u opcodes\n", + cli_dbgmsg("interpreter bytecode run finished in %luus, after executing %u opcodes\n", +#endif tv1.tv_sec*1000000 + tv1.tv_usec, pc); } -- 2.44.0