[packages/clamav] - updated to 0.102.0
adamg
adamg at pld-linux.org
Fri Oct 4 09:22:32 CEST 2019
commit e63bc4470fcba17ed40c98016d1b04aab656cd38
Author: Adam Gołębiowski <adamg at pld-linux.org>
Date: Fri Oct 4 09:22:24 2019 +0200
- updated to 0.102.0
ac2.68.patch | 7 ++++---
clamav-headers.patch | 15 +++++++++++++--
clamav.spec | 20 ++++++++++++++------
x32.patch | 2 +-
4 files changed, 32 insertions(+), 12 deletions(-)
---
diff --git a/clamav.spec b/clamav.spec
index d98dd59..92e40ff 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -18,13 +18,13 @@
Summary: An anti-virus utility for Unix
Summary(pl.UTF-8): Narzędzie antywirusowe dla Uniksów
Name: clamav
-Version: 0.101.3
-Release: 1
+Version: 0.102.0
+Release: 0.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: 1981c5bd299c1f3cbf3f74095a00524c
+# Source0-md5: 51e1dff512350284b4b11c3dc2d00da0
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}-milter.init
@@ -218,7 +218,7 @@ Biblioteki statyczne clamav.
%patch3 -p1
%endif
#%patch4 -p1
-%patch5 -p1
+#%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
@@ -384,6 +384,7 @@ fi
%attr(755,root,root) %{_bindir}/clambc
%attr(755,root,root) %{_bindir}/clamdscan
%attr(755,root,root) %{_bindir}/clamdtop
+%attr(755,root,root) %{_bindir}/clamonacc
%attr(755,root,root) %{_bindir}/clamscan
%attr(755,root,root) %{_bindir}/clamsubmit
%attr(755,root,root) %{_bindir}/freshclam
@@ -419,12 +420,12 @@ fi
%files milter
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/clamav-milter
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/clamav-milter.conf
+#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/clamav-milter.conf
%attr(754,root,root) /etc/rc.d/init.d/clamav-milter
#%attr(755,root,root) %{_sysconfdir}/cron.daily/clamav-milter
#%attr(755,root,root) %{_sysconfdir}/log.d/scripts/services/clamav-milter
#%{_sysconfdir}/log.d/conf/services/clamav-milter.conf
-%attr(755,root,root) %{_sbindir}/clamav-milter
+#%attr(755,root,root) %{_sbindir}/clamav-milter
%{_mandir}/man5/clamav-milter*
%{_mandir}/man8/clamav-milter.8*
%attr(700,clamav,clamav) /var/spool/clamav
@@ -442,6 +443,8 @@ fi
%attr(755,root,root) %ghost %{_libdir}/libclamunrar.so.9
%attr(755,root,root) %{_libdir}/libclamunrar_iface.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libclamunrar_iface.so.9
+%attr(755,root,root) %{_libdir}/libfreshclam.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfreshclam.so.2
%files devel
%defattr(644,root,root,755)
@@ -451,16 +454,20 @@ fi
%attr(755,root,root) %{_libdir}/libclammspack.so
%endif
%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
+%{_includedir}/clamav/clamav-version.h
+%{_includedir}/clamav/libfreshclam.h
%{_pkgconfigdir}/libclamav.pc
%files static
@@ -470,4 +477,5 @@ fi
%{_libdir}/libclammspack.a
%endif
%{_libdir}/libclamunrar.a
+%{_libdir}/libfreshclam.a
%{_libdir}/libclamunrar_iface.a
diff --git a/ac2.68.patch b/ac2.68.patch
index 427ab72..a352068 100644
--- a/ac2.68.patch
+++ b/ac2.68.patch
@@ -1,7 +1,7 @@
diff -uNr clamav-0.98.3/configure.ac clamav-0.98.3-ac2.68/configure.ac
--- clamav-0.98.3/configure.ac 2014-05-06 20:42:41.000000000 +0200
+++ clamav-0.98.3-ac2.68/configure.ac 2014-05-09 10:51:30.508280355 +0200
-@@ -42,12 +42,12 @@
+@@ -53,6 +53,7 @@
AC_USE_SYSTEM_EXTENSIONS
m4_include([m4/reorganization/version.m4])
@@ -9,8 +9,9 @@ diff -uNr clamav-0.98.3/configure.ac clamav-0.98.3-ac2.68/configure.ac
LT_CONFIG_LTDL_DIR([libltdl])
LT_INIT([dlopen disable-static])
- LTDL_INIT([recursive])
- PKG_PROG_PKG_CONFIG(0.16)
+@@ -61,7 +62,6 @@
+
+ m4_include([m4/reorganization/libclamav-only.m4])
-m4_include([m4/reorganization/build_tools.m4])
m4_include([m4/reorganization/headers.m4])
diff --git a/clamav-headers.patch b/clamav-headers.patch
index 41f703d..8b0f354 100644
--- a/clamav-headers.patch
+++ b/clamav-headers.patch
@@ -4,8 +4,8 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libclamav.pc
--nodist_include_HEADERS = clamav-types.h
-+pkginclude_HEADERS = clamav-types.h
+-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
@@ -51,3 +51,14 @@
;;
--libs)
+--- clamav-0.102.0/libfreshclam/Makefile.am~ 2019-10-01 19:24:09.000000000 +0200
++++ clamav-0.102.0/libfreshclam/Makefile.am 2019-10-04 09:08:07.702507579 +0200
+@@ -32,7 +32,7 @@
+
+ EXTRA_DIST = libfreshclam.map
+
+-include_HEADERS = libfreshclam.h
++pkginclude_HEADERS = libfreshclam.h
+
+ libfreshclam_la_SOURCES = \
+ $(top_srcdir)/shared/output.c \
diff --git a/x32.patch b/x32.patch
index 0da8b55..74c216e 100644
--- a/x32.patch
+++ b/x32.patch
@@ -9,6 +9,6 @@
+#else
cli_dbgmsg("interpreter bytecode run finished in %luus, after executing %u opcodes\n",
+#endif
- tv1.tv_sec*1000000 + tv1.tv_usec, pc);
+ tv1.tv_sec * 1000000 + tv1.tv_usec, pc);
}
if (stop == CL_EBYTECODE) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/clamav.git/commitdiff/e63bc4470fcba17ed40c98016d1b04aab656cd38
More information about the pld-cvs-commit
mailing list