- updated to 0.100.0

diff --git a/ac2.68.patch b/ac2.68.patch
index 68fe4d2766324d8d98b3d79d952bd2b062df2774..8691e92c7fe873f37669cd5d131a68e326d84163 100644 (file)
--- a/ac2.68.patch
+++ b/ac2.68.patch
@@ -1,8 +1,8 @@
-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 @@
- AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])
+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
+@@ -43,12 +43,12 @@
+ AC_USE_SYSTEM_EXTENSIONS
  
  m4_include([m4/reorganization/version.m4])
 +m4_include([m4/reorganization/build_tools.m4])
@@ -15,19 +15,20 @@ diff -uNr clamav-0.98.3/configure.ac clamav-0.98.3-ac2.68/configure.ac
  m4_include([m4/reorganization/headers.m4])
  
  AC_CONFIG_FILES([libltdl/Makefile])
-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 @@
+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 @@
 +AM_PROG_AR
  AC_PROG_CC
 +AM_PROG_CC_C_O
+ AM_PROG_LEX
+ AC_PROG_YACC
  AC_PROG_INSTALL
- 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 @@
+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 @@
  if test "$enable_clamdtop" != "no"; then
  
  AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
@@ -38,7 +39,7 @@ diff -uNr clamav-0.98.3/m4/reorganization/clamdtop.m4 clamav-0.98.3-ac2.68/m4/re
            [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
             CURSES_INCLUDE="<ncurses/ncurses.h>"],
            [])
-@@ -15,8 +15,8 @@
+@@ -14,8 +14,8 @@
  if test "X$HAVE_LIBNCURSES" != "Xyes"; then
      HAVE_LIBNCURSES=
      AC_LIB_FIND([ncurses], [ncurses.h],
@@ -49,7 +50,7 @@ diff -uNr clamav-0.98.3/m4/reorganization/clamdtop.m4 clamav-0.98.3-ac2.68/m4/re
            [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
             CURSES_INCLUDE="<ncurses.h>"],
            [])
-@@ -24,8 +24,8 @@
+@@ -23,8 +23,8 @@
  
  if test "X$HAVE_LIBNCURSES" != "Xyes"; then
      AC_LIB_FIND([pdcurses],[curses.h],
@@ -60,10 +61,10 @@ diff -uNr clamav-0.98.3/m4/reorganization/clamdtop.m4 clamav-0.98.3-ac2.68/m4/re
                            [CURSES_CPPFLAGS="$INCPDCURSES";
                             CURSES_LIBS="$LTLIBPDCURSES";
                             CURSES_INCLUDE="<curses.h>"],
-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 @@
+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 @@
  esac
  
        AC_LIB_FIND([check],[check.h],

diff --git a/clamav-config.patch b/clamav-config.patch
index 595fae764fb2f353d4a3c17b39431e3cdeb050d6..ac27eeb81f5f1507c6ccf8f2de3fec913a0fd750 100644 (file)
--- a/clamav-config.patch
+++ b/clamav-config.patch
@@ -1,6 +1,6 @@
-diff -ur clamav-0.98.orig/etc/clamav-milter.conf.sample clamav-0.98/etc/clamav-milter.conf.sample
---- clamav-0.98.orig/etc/clamav-milter.conf.sample     2013-09-16 19:28:14.000000000 +0000
-+++ clamav-0.98/etc/clamav-milter.conf.sample  2013-09-21 11:55:39.030891567 +0000
+diff -ur clamav-0.100.0.orig/etc/clamav-milter.conf.sample clamav-0.100.0/etc/clamav-milter.conf.sample
+--- clamav-0.100.0.orig/etc/clamav-milter.conf.sample  2018-05-28 14:42:59.566979794 +0000
++++ clamav-0.100.0/etc/clamav-milter.conf.sample       2018-05-28 14:45:47.337977905 +0000
 @@ -3,7 +3,7 @@
  ##
  
@@ -25,16 +25,7 @@ diff -ur clamav-0.98.orig/etc/clamav-milter.conf.sample clamav-0.98/etc/clamav-m
  
  # 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 @@
+@@ -61,7 +61,7 @@
  # daemon (main thread).
  #
  # Default: disabled
@@ -43,8 +34,8 @@ diff -ur clamav-0.98.orig/etc/clamav-milter.conf.sample clamav-0.98/etc/clamav-m
  
  # Optional path to the global temporary directory.
  # Default: system specific (usually /tmp or /var/tmp).
-@@ -90,7 +90,7 @@
- # with the same socket: clamd servers will be selected in a round-robin fashion.
+@@ -88,7 +88,7 @@
+ # fashion.
  #
  # Default: no default
 -#ClamdSocket tcp:scanner.mydomain:7357
@@ -52,7 +43,7 @@ diff -ur clamav-0.98.orig/etc/clamav-milter.conf.sample clamav-0.98/etc/clamav-m
  
  
  ##
-@@ -239,13 +239,13 @@
+@@ -238,13 +238,13 @@
  # Use system logger (can work together with LogFile).
  #
  # Default: no
@@ -68,9 +59,9 @@ diff -ur clamav-0.98.orig/etc/clamav-milter.conf.sample clamav-0.98/etc/clamav-m
  
  # Enable verbose logging.
  #
-diff -ur clamav-0.98.orig/etc/clamd.conf.sample clamav-0.98/etc/clamd.conf.sample
---- clamav-0.98.orig/etc/clamd.conf.sample     2013-09-16 19:28:14.000000000 +0000
-+++ clamav-0.98/etc/clamd.conf.sample  2013-09-21 11:55:39.031891555 +0000
+diff -ur clamav-0.100.0.orig/etc/clamd.conf.sample clamav-0.100.0/etc/clamd.conf.sample
+--- clamav-0.100.0.orig/etc/clamd.conf.sample  2018-05-28 14:42:59.566979794 +0000
++++ clamav-0.100.0/etc/clamd.conf.sample       2018-05-28 14:46:31.706977405 +0000
 @@ -5,13 +5,13 @@
  
  
@@ -102,7 +93,7 @@ diff -ur clamav-0.98.orig/etc/clamd.conf.sample clamav-0.98/etc/clamd.conf.sampl
  
  # Enable verbose logging.
  # Default: no
-@@ -63,7 +63,7 @@
+@@ -71,7 +71,7 @@
  # This option allows you to save a process identifier of the listening
  # daemon (main thread).
  # Default: disabled
@@ -111,7 +102,7 @@ diff -ur clamav-0.98.orig/etc/clamd.conf.sample clamav-0.98/etc/clamd.conf.sampl
  
  # Optional path to the global temporary directory.
  # Default: system specific (usually /tmp or /var/tmp).
-@@ -82,11 +82,11 @@
+@@ -90,11 +90,11 @@
  
  # Path to a local socket file the daemon will listen on.
  # Default: disabled (must be specified by a user)
@@ -125,23 +116,18 @@ diff -ur clamav-0.98.orig/etc/clamd.conf.sample clamav-0.98/etc/clamd.conf.sampl
  
  # Sets the permissions on the unix socket to the specified mode.
  # Default: disabled (socket is world accessible)
-@@ -191,11 +191,11 @@
+@@ -204,7 +204,7 @@
  
  # 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.98.orig/etc/freshclam.conf.sample clamav-0.98/etc/freshclam.conf.sample
---- clamav-0.98.orig/etc/freshclam.conf.sample 2013-09-16 19:28:14.000000000 +0000
-+++ clamav-0.98/etc/freshclam.conf.sample      2013-09-21 11:57:49.466891498 +0000
+diff -ur clamav-0.100.0.orig/etc/freshclam.conf.sample clamav-0.100.0/etc/freshclam.conf.sample
+--- clamav-0.100.0.orig/etc/freshclam.conf.sample      2018-05-28 14:42:59.566979794 +0000
++++ clamav-0.100.0/etc/freshclam.conf.sample   2018-05-28 14:45:47.337977905 +0000
 @@ -3,9 +3,11 @@
  ## Please read the freshclam.conf(5) manual before editing this file.
  ##
@@ -176,9 +162,9 @@ diff -ur clamav-0.98.orig/etc/freshclam.conf.sample clamav-0.98/etc/freshclam.co
 -#DatabaseOwner clamav
 +DatabaseOwner clamav
  
- # Initialize supplementary group access (freshclam must be started by root).
- # Default: no
-@@ -114,7 +116,7 @@
+ # Use DNS to verify virus database version. Freshclam uses DNS TXT records
+ # to verify database and software versions. With this directive you can change
+@@ -110,7 +112,7 @@
  
  # Number of database checks per day.
  # Default: 12 (every two hours)
@@ -187,7 +173,7 @@ diff -ur clamav-0.98.orig/etc/freshclam.conf.sample clamav-0.98/etc/freshclam.co
  
  # Proxy settings
  # Default: disabled
-@@ -136,7 +138,7 @@
+@@ -132,7 +134,7 @@
  
  # Send the RELOAD command to clamd.
  # Default: no

diff --git a/clamav-major.patch b/clamav-major.patch
index e5fab9c299a4290568d39275409345dc725f6a20..0ec6ea9a2e1d243a9129437b0d2d91aaa8e25a6e 100644 (file)
--- a/clamav-major.patch
+++ b/clamav-major.patch
@@ -1,8 +1,9 @@
---- clamav-0.98.3/m4/reorganization/version.m4~        2014-05-06 20:59:19.000000000 +0200
-+++ clamav-0.98.3/m4/reorganization/version.m4 2014-05-14 20:33:00.181291208 +0200
-@@ -8,10 +8,11 @@
- LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
- AC_SUBST([LIBCLAMAV_VERSION])
+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 ))

diff --git a/clamav-nolibs.patch b/clamav-nolibs.patch
index 6196a05ee3d51c3a788af659eed0c10f33096be1..f6fc5899fc93290eb2b175c6a9e16aa260f4ecd0 100644 (file)
--- a/clamav-nolibs.patch
+++ b/clamav-nolibs.patch
@@ -1,6 +1,6 @@
-diff -uNr clamav-0.98.3/m4/reorganization/code_checks/functions.m4 clamav-0.98.3.nolibs/m4/reorganization/code_checks/functions.m4
---- clamav-0.98.3/m4/reorganization/code_checks/functions.m4   2014-05-06 20:39:56.000000000 +0200
-+++ clamav-0.98.3.nolibs/m4/reorganization/code_checks/functions.m4    2014-05-09 10:38:20.376934561 +0200
+diff -ur clamav-0.100.0.orig/m4/reorganization/code_checks/functions.m4 clamav-0.100.0/m4/reorganization/code_checks/functions.m4
+--- clamav-0.100.0.orig/m4/reorganization/code_checks/functions.m4     2018-05-28 14:48:02.575976382 +0000
++++ clamav-0.100.0/m4/reorganization/code_checks/functions.m4  2018-05-28 14:48:28.266976093 +0000
 @@ -1,6 +1,10 @@
  AX_CHECK_UNAME_SYSCALL
 +AC_CHECK_FUNC(socket,, [
@@ -10,5 +10,5 @@ diff -uNr clamav-0.98.3/m4/reorganization/code_checks/functions.m4 clamav-0.98.3
  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([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo madvise])
- AC_FUNC_FSEEKO
+ 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])

diff --git a/clamav.spec b/clamav.spec
index 6c2c47524e826285d0f99a9479e862dba02c223d..092ec2491c660400eea498a20a3c6d03250796ea 100644 (file)
--- a/clamav.spec
+++ b/clamav.spec
@@ -9,12 +9,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.0
 Release:       1
 License:       GPL v2+
 Group:         Daemons
 Source0:       http://www.clamav.net/downloads/production/%{name}-%{version}.tar.gz
-# Source0-md5: b9359b90086948b3c4eb97c84cf4b400
+# Source0-md5: 93e8efb489c2afdfca73703b76c24e01
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}-milter.init
@@ -295,7 +295,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog FAQ NEWS README docs/*.pdf
+%doc docs/*.pdf
 %attr(755,root,root) %{_bindir}/clambc
 %attr(755,root,root) %{_bindir}/clamdscan
 %attr(755,root,root) %{_bindir}/clamdtop
@@ -338,6 +338,8 @@ 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.7
 %attr(755,root,root) %{_libdir}/libclamunrar.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libclamunrar.so.7
@@ -348,16 +350,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