- updated to 0.102.1, merged PLD changes

diff --git a/ac2.68.patch b/ac2.68.patch
index d348901f208ef73874966e28a18b3e88432ff37c..a352068ff53459ac5523a4197995a5b4e788bdb8 100644 (file)
--- a/ac2.68.patch
+++ b/ac2.68.patch
@@ -1,7 +1,7 @@
-diff -ur clamav-0.100.0.orig/configure.ac clamav-0.100.0/configure.ac
---- clamav-0.100.0.orig/configure.ac   2018-05-28 14:49:17.067975543 +0000
-+++ clamav-0.100.0/configure.ac        2018-05-28 14:49:34.516975347 +0000
-@@ -48,13 +48,13 @@
+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
+@@ -53,6 +53,7 @@
  AC_USE_SYSTEM_EXTENSIONS
  
  m4_include([m4/reorganization/version.m4])
@@ -9,27 +9,27 @@ diff -ur clamav-0.100.0.orig/configure.ac clamav-0.100.0/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])
  
  AC_CONFIG_FILES([libltdl/Makefile])
-diff -ur clamav-0.100.0.orig/m4/reorganization/build_tools.m4 clamav-0.100.0/m4/reorganization/build_tools.m4
---- clamav-0.100.0.orig/m4/reorganization/build_tools.m4       2018-05-28 14:49:17.050975544 +0000
-+++ clamav-0.100.0/m4/reorganization/build_tools.m4    2018-05-28 14:49:34.516975347 +0000
-@@ -1,4 +1,6 @@
+diff -uNr clamav-0.98.3/m4/reorganization/build_tools.m4 clamav-0.98.3-ac2.68/m4/reorganization/build_tools.m4
+--- clamav-0.98.3/m4/reorganization/build_tools.m4     2014-05-06 20:39:56.000000000 +0200
++++ clamav-0.98.3-ac2.68/m4/reorganization/build_tools.m4      2014-05-09 10:53:30.800262620 +0200
+@@ -1,3 +1,5 @@
 +AM_PROG_AR
- AC_PROG_CC
 +AM_PROG_CC_C_O
- AM_PROG_LEX
- AC_PROG_YACC
+ AC_PROG_CC
  AC_PROG_INSTALL
-diff -ur clamav-0.100.0.orig/m4/reorganization/clamdtop.m4 clamav-0.100.0/m4/reorganization/clamdtop.m4
---- clamav-0.100.0.orig/m4/reorganization/clamdtop.m4  2018-05-28 14:49:17.050975544 +0000
-+++ clamav-0.100.0/m4/reorganization/clamdtop.m4       2018-05-28 14:49:34.516975347 +0000
-@@ -5,8 +5,8 @@
+ AC_PROG_LN_S
+diff -uNr clamav-0.98.3/m4/reorganization/clamdtop.m4 clamav-0.98.3-ac2.68/m4/reorganization/clamdtop.m4
+--- clamav-0.98.3/m4/reorganization/clamdtop.m4        2014-05-06 20:39:56.000000000 +0200
++++ clamav-0.98.3-ac2.68/m4/reorganization/clamdtop.m4 2014-05-09 10:51:06.963907781 +0200
+@@ -6,8 +6,8 @@
  if test "$enable_clamdtop" != "no"; then
  
  AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
@@ -40,7 +40,7 @@ diff -ur clamav-0.100.0.orig/m4/reorganization/clamdtop.m4 clamav-0.100.0/m4/reo
            [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
             CURSES_INCLUDE="<ncurses/ncurses.h>"],
            [])
-@@ -14,8 +14,8 @@
+@@ -15,8 +15,8 @@
  if test "X$HAVE_LIBNCURSES" != "Xyes"; then
      HAVE_LIBNCURSES=
      AC_LIB_FIND([ncurses], [ncurses.h],
@@ -51,7 +51,7 @@ diff -ur clamav-0.100.0.orig/m4/reorganization/clamdtop.m4 clamav-0.100.0/m4/reo
            [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
             CURSES_INCLUDE="<ncurses.h>"],
            [])
-@@ -23,8 +23,8 @@
+@@ -24,8 +24,8 @@
  
  if test "X$HAVE_LIBNCURSES" != "Xyes"; then
      AC_LIB_FIND([pdcurses],[curses.h],
@@ -62,10 +62,10 @@ diff -ur clamav-0.100.0.orig/m4/reorganization/clamdtop.m4 clamav-0.100.0/m4/reo
                            [CURSES_CPPFLAGS="$INCPDCURSES";
                             CURSES_LIBS="$LTLIBPDCURSES";
                             CURSES_INCLUDE="<curses.h>"],
-diff -ur clamav-0.100.0.orig/m4/reorganization/code_checks/unit_tests.m4 clamav-0.100.0/m4/reorganization/code_checks/unit_tests.m4
---- clamav-0.100.0.orig/m4/reorganization/code_checks/unit_tests.m4    2018-05-28 14:49:17.049975544 +0000
-+++ clamav-0.100.0/m4/reorganization/code_checks/unit_tests.m4 2018-05-28 14:49:34.517975347 +0000
-@@ -19,7 +19,7 @@
+diff -uNr clamav-0.98.3/m4/reorganization/code_checks/unit_tests.m4 clamav-0.98.3-ac2.68/m4/reorganization/code_checks/unit_tests.m4
+--- clamav-0.98.3/m4/reorganization/code_checks/unit_tests.m4  2014-05-06 20:39:56.000000000 +0200
++++ clamav-0.98.3-ac2.68/m4/reorganization/code_checks/unit_tests.m4   2014-05-09 10:51:06.963907781 +0200
+@@ -12,7 +12,7 @@
  esac
  
        AC_LIB_FIND([check],[check.h],

diff --git a/clamav-major.patch b/clamav-major.patch
deleted file mode 100644 (file)
index 0ec6ea9..0000000
--- a/clamav-major.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur clamav-0.100.0.orig/m4/reorganization/version.m4 clamav-0.100.0/m4/reorganization/version.m4
---- clamav-0.100.0.orig/m4/reorganization/version.m4   2018-05-28 14:50:16.761974871 +0000
-+++ clamav-0.100.0/m4/reorganization/version.m4        2018-05-28 14:50:37.396974639 +0000
-@@ -10,10 +10,11 @@
- 
- major=`expr $LC_CURRENT - $LC_AGE`
- 
--AC_DEFINE_UNQUOTED([LIBCLAMAV_FULLVER], "$major.$LC_AGE.$LC_REVISION",
-+MAJOR_VER=$(( $LC_CURRENT - $LC_AGE ))
-+AC_DEFINE_UNQUOTED([LIBCLAMAV_FULLVER], "$MAJOR_VER.$LC_AGE.$LC_REVISION",
-         ["Full library version number"])
- 
--AC_DEFINE_UNQUOTED([LIBCLAMAV_MAJORVER], $major, ["Major library version number"])
-+AC_DEFINE_UNQUOTED([LIBCLAMAV_MAJORVER], $MAJOR_VER, ["Major library version number"])
- 
- AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package])
- AC_DEFINE_UNQUOTED([VERSION_SUFFIX],"$VERSION_SUFFIX",[Version suffix for package])

diff --git a/clamav.spec b/clamav.spec
index dd6875f958b122a644ba5645d2aa51e83ff2e188..7116ce7f2a7097076fc956ff64eac7616ba73b24 100644 (file)
--- a/clamav.spec
+++ b/clamav.spec
@@ -3,18 +3,24 @@
 # - restart amavis in triggers if group membership was modified?
 #
 # Conditional build:
-%bcond_without milter          # milter interface subpackage
-%bcond_without llvm            # LLVM support
+%bcond_without milter                  # milter interface subpackage
+%bcond_without llvm                    # LLVM support
+%bcond_without system_libmspack        # system libmspack library
+%bcond_with    system_llvm             # system LLVM (< 3.7)
 
+%ifarch x32
+%undefine with_llvm
+%endif
 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.1
+Release:       2
 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: 3d5f5f10a1bea212823050286c8c5b96
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}-milter.init
@@ -24,25 +30,34 @@ Source8:    %{name}-post-updatedb
 Source9:       %{name}-milter.sysconfig
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-nolibs.patch
-Patch2:                ac2.68.patch
-Patch3:                %{name}-major.patch
+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
-BuildRequires: automake
+BuildRequires: autoconf >= 2.59
+BuildRequires: automake >= 1:1.11
 BuildRequires: bzip2-devel
+BuildRequires: check-devel
 BuildRequires: curl-devel
 BuildRequires: gmp-devel
+BuildRequires: json-c-devel
 BuildRequires: libltdl-devel
 %{?with_milter:BuildRequires:  libmilter-devel}
-BuildRequires: libstdc++-devel
+%{?with_system_libmspack:BuildRequires:        libmspack-devel}
+BuildRequires: libstdc++-devel >= 5:3.4
 BuildRequires: libtool
 %{?with_milter:BuildRequires:  libwrap-devel}
-%{?with_llvm:BuildRequires:    llvm-devel}
+BuildRequires: libxml2-devel >= 2
+%{?with_llvm:%{?with_system_llvm:BuildRequires:        llvm-devel < 3.7}}
 BuildRequires: ncurses-devel
-BuildRequires: openssl-devel
+BuildRequires: openssl-devel >= 0.9.8
+BuildRequires: pcre2-8-devel
+BuildRequires: pkgconfig >= 1:0.16
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.647
-BuildRequires: zlib-devel
+BuildRequires: tomsfastmath-devel >= 0.13.1-2
+BuildRequires: zlib-devel >= 1.2.2
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
@@ -56,7 +71,7 @@ Requires:     %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      /usr/sbin/usermod
 Requires:      rc-scripts >= 0.4.1.23
 Suggests:      clamav-database
-Suggests:      crondaemon
+Suggests:      cronjobs
 Provides:      group(clamav)
 Provides:      user(clamav)
 Conflicts:     logrotate < 3.7-4
@@ -68,7 +83,7 @@ especially for e-mail scanning on mail gateways. It provides a number
 of utilities including a flexible and scalable multi-threaded daemon,
 a command line scanner and advanced tool for automatic database
 updates. The core of the package is an anti-virus engine available in
-a form of shared library.
+a form of shared library (available in clamav-libs).
 
 Here is a list of the main features:
 - command-line scanner
@@ -77,7 +92,7 @@ Here is a list of the main features:
 - advanced database updater with support for scripted updates and
   digital signatures
 - virus scanner C library
-- on-access scanning (Linux® and FreeBSD®)
+- on-access scanning (Linux and FreeBSD)
 - virus database updated multiple times per day (see home page for
   total number of signatures)
 - built-in support for various archive formats, including Zip, RAR,
@@ -90,16 +105,39 @@ Here is a list of the main features:
   and MacOffice files, HTML, RTF and PDF
 
 %description -l pl.UTF-8
-Clam Antivirus jest potężnym skanerem antywirusowym dla systemów
-uniksowych. Wspiera on AMaViSa, skompresowane pliki, skanowanie
-"on-access" i posiada system bezpiecznej, automatycznej aktualizacji.
-Baza wirusów zawiera ponad 90000 sygnatur. Skaner jest wielowątkowy,
-napisany w C i zgodny z POSIXem.
+Clam AntiVirus to mające otwarte źródła narzędzie antywirusowe dla
+systemów uniksowych, zaprojektowane szczególnie pod kątem skanowania
+poczty elektronicznej na bramkach pocztowych. Udostępnia wiele
+narzędzi, w tym elastycznego i skalowalnego, multiwątkowego demona,
+skaner działający z linii poleceń oraz zaawansowane narzędzie do
+automatycznej aktualizacji bazy danych. Główna część pakietu to
+silnik antywirusowy dostępny w postaci biblioteki współdzielonej
+(dostępnej w pakiecie clamav-libs).
+
+Lista podstawowych możliwości:
+- skaner działający z linii poleceń
+- szybki, wielowątkowy demon z obsługą skanowania przy odczycie
+- interfejs milter dla sendmaila
+- zaawansowane narzędzie do aktualizacji bazy danych z obsługą
+  aktualizacji oskryptowanych oraz podpisów cyfrowych
+- biblioteka C skanera antywirusowego
+- skanowanie przy odczycie (dla Linuksa i FreeBSD)
+- baza danych wirusów aktualizowana wiele razy dziennie (liczba
+  sygnatur dostępna na stronie projektu)
+- wbudowana obsługa różnych formatów archiwów, w tym Zip, RAR, Tar,
+  Gzip, Bzip2, OLE2, Cabinet, CHM, BinHex, SIS i inne
+- wbudowana obsługa prawie wszystkich formatów plików pocztowych
+- wbudowana obsługa plików wykonywalnych ELF i PE skompresowanych
+  programami UPX, FSG, Petite, NsPack, wwpack32, MEW, Upack oraz
+  zaciemnionych przy użyciu programów SUE, Y0da Cryptor i innych
+- wbudowana obsługa popularnych formatów dokumentów, w tym plików MS
+  Office, MacOffice, HTML, RTF i PDF
 
 %package libs
 Summary:       Shared libraries for clamav
 Summary(pl.UTF-8):     Biblioteki dzielone clamav
 Group:         Libraries
+Requires:      zlib >= 1.2.2
 
 %description libs
 Shared libraries for clamav.
@@ -130,8 +168,8 @@ Requires:   %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      bzip2-devel
 Requires:      curl-devel
 Requires:      gmp-devel
-Requires:      openssl-devel
-Requires:      zlib-devel
+Requires:      openssl-devel >= 0.9.8
+Requires:      zlib-devel >= 1.2.2
 
 %description devel
 This package contains the development header files and libraries
@@ -157,24 +195,31 @@ Biblioteki statyczne clamav.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
+%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-silent-rules \
        --disable-clamav \
        --enable-clamdtop \
+       %{?with_llvm:--enable-llvm %{!?with_system_llvm:--with-system-llvm=no}} \
        %{?with_milter:--enable-milter} \
+       --disable-silent-rules \
+       --disable-zlib-vcheck \
        --with-dbdir=/var/lib/%{name} \
-       --with-no-cache \
        --with-ltdl-include=%{_includedir} \
-       --with-ltdl-lib=%{_libdir}
+       --with-ltdl-lib=%{_libdir} \
+       --with-no-cache \
+       %{?with_system_libmspack:--with-system-libmspack}
 
 %{__make} \
        LIBTOOL=%{_bindir}/libtool
@@ -295,9 +340,11 @@ fi
 
 %files
 %defattr(644,root,root,755)
+%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
+%attr(755,root,root) %{_bindir}/clamonacc
 %attr(755,root,root) %{_bindir}/clamscan
 %attr(755,root,root) %{_bindir}/clamsubmit
 %attr(755,root,root) %{_bindir}/freshclam
@@ -317,7 +364,9 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/clamd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/clamd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/clamav
-%{_mandir}/man[15]/*
+%{_mandir}/man1/*
+%{_mandir}/man5/clamd*
+%{_mandir}/man5/freshclam*
 %{_mandir}/man8/clamd*
 
 %if %{with milter}
@@ -330,6 +379,7 @@ fi
 #%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
+%{_mandir}/man5/clamav-milter*
 %{_mandir}/man8/clamav-milter.8*
 %attr(700,clamav,clamav) /var/spool/clamav
 %endif
@@ -337,31 +387,48 @@ fi
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libclamav.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclammspack.so.0
-%attr(755,root,root) %{_libdir}/libclammspack.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libclamav.so.9
+%if %{without system_libmspack}
+%attr(755,root,root) %{_libdir}/libclammspack.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclammspack.so.0
+%endif
 %attr(755,root,root) %{_libdir}/libclamunrar.so.*.*.*
 %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)
 %attr(755,root,root) %{_bindir}/clamav-config
 %attr(755,root,root) %{_libdir}/libclamav.so
+%if %{without system_libmspack}
 %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
-%{_includedir}/clamav.h
+%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
 %defattr(644,root,root,755)
 %{_libdir}/libclamav.a
+%if %{without system_libmspack}
 %{_libdir}/libclammspack.a
+%endif
 %{_libdir}/libclamunrar.a
+%{_libdir}/libfreshclam.a
 %{_libdir}/libclamunrar_iface.a