update to 0.100.0 [release 0.100.0-1mamba;Sat Jun 23 2018]

clamav-0.100.0-config.patch

@@ -1,6 +1,5 @@
-diff -Nru clamav-0.94.2.orig/etc/clamd.conf clamav-0.94.2/etc/clamd.conf
+--- clamav-0.100.0/etc/clamd.conf.sample.orig	2018-04-04 02:13:58.000000000 +0200
---- clamav/etc/clamd.conf.sample.orig	2010-04-27 16:37:30.000000000 +0200
++++ clamav-0.100.0/etc/clamd.conf.sample	2018-06-23 13:24:55.169343560 +0200
-+++ clamav/etc/clamd.conf.sample	2010-05-30 15:43:12.389016952 +0200
 @@ -4,14 +4,12 @@
  ##
  
@@ -17,12 +16,7 @@ diff -Nru clamav-0.94.2.orig/etc/clamd.conf clamav-0.94.2/etc/clamd.conf
  
  # By default the log file is locked for writing - the lock protects against
  # running clamd multiple times (if want to run another clamd, please
-@@ -27,11 +25,11 @@
+@@ -32,7 +30,7 @@
- # and 'K' or 'k' for kilobytes (1K = 1k = 1024 bytes). To specify the size
- # in bytes just don't use modifiers.
- # Default: 1M
--#LogFileMaxSize 2M
-+LogFileMaxSize 0
  
  # Log time with each message.
  # Default: no
@@ -31,7 +25,16 @@ diff -Nru clamav-0.94.2.orig/etc/clamd.conf clamav-0.94.2/etc/clamd.conf
  
  # Also log clean files. Useful in debugging but drastically increases the
  # log size.
-@@ -54,7 +52,7 @@
+@@ -41,7 +39,7 @@
+ 
+ # Use system logger (can work together with LogFile).
+ # Default: no
+-#LogSyslog yes
++LogSyslog yes
+ 
+ # Specify the type of syslog messages - please refer to 'man syslog'
+ # for facility names.
+@@ -71,7 +69,7 @@
  # This option allows you to save a process identifier of the listening
  # daemon (main thread).
  # Default: disabled
@@ -40,7 +43,7 @@ diff -Nru clamav-0.94.2.orig/etc/clamd.conf clamav-0.94.2/etc/clamd.conf
  
  # Optional path to the global temporary directory.
  # Default: system specific (usually /tmp or /var/tmp).
-@@ -73,7 +71,7 @@
+@@ -90,7 +88,7 @@
  
  # Path to a local socket file the daemon will listen on.
  # Default: disabled (must be specified by a user)
@@ -49,7 +52,7 @@ diff -Nru clamav-0.94.2.orig/etc/clamd.conf clamav-0.94.2/etc/clamd.conf
  
  # Sets the group ownership on the unix socket.
  # Default: disabled (the primary group of the user running clamd)
-@@ -162,11 +160,11 @@
+@@ -183,11 +181,11 @@
  
  # Follow directory symlinks.
  # Default: no
@@ -63,17 +66,12 @@ diff -Nru clamav-0.94.2.orig/etc/clamd.conf clamav-0.94.2/etc/clamd.conf
  
  # Scan files and directories on other filesystems.
  # Default: yes
-@@ -183,11 +181,11 @@
+@@ -204,7 +202,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

clamav-0.100.0-freshclam_config.patch

@@ -0,0 +1,40 @@
+--- clamav-0.100.0/etc/freshclam.conf.sample.orig	2018-04-04 02:13:58.000000000 +0200
++++ clamav-0.100.0/etc/freshclam.conf.sample	2018-06-23 13:20:49.022255364 +0200
+@@ -5,16 +5,16 @@
+ 
+ 
+ # Comment or remove the line below.
+-Example
++#Example
+ 
+ # Path to the database directory.
+ # WARNING: It must match clamd.conf's directive!
+ # Default: hardcoded (depends on installation options)
+-#DatabaseDirectory /var/lib/clamav
++DatabaseDirectory /var/lib/clamav
+ 
+ # Path to the log file (make sure it has proper permissions)
+ # Default: disabled
+-#UpdateLogFile /var/log/freshclam.log
++#UpdateLogFile /var/log/clamav/freshclam.log
+ 
+ # Maximum size of the log file.
+ # Value of 0 disables the limit.
+@@ -35,7 +35,7 @@
+ 
+ # Use system logger (can work together with UpdateLogFile).
+ # Default: no
+-#LogSyslog yes
++LogSyslog yes
+ 
+ # Specify the type of syslog messages - please refer to 'man syslog'
+ # for facility names.
+@@ -48,7 +48,7 @@
+ 
+ # This option allows you to save the process identifier of the daemon
+ # Default: disabled
+-#PidFile /var/run/freshclam.pid
++PidFile /run/freshclam.pid
+ 
+ # By default when started freshclam drops privileges and switches to the
+ # "clamav" user. This directive allows you to change the database owner.

clamav-0.98-freshclam_config.patch

@@ -1,32 +0,0 @@
-diff -ru clamav-0.95.2.orig/etc/freshclam.conf clamav-0.95.2/etc/freshclam.conf
---- clamav-0.95.2.orig/etc/freshclam.conf.sample	2009-07-06 20:52:29.000000000 +0200
-+++ clamav-0.95.2/etc/freshclam.conf.sample	2009-07-06 20:54:18.000000000 +0200
-@@ -5,16 +5,16 @@
- 
- 
- # Comment or remove the line below.
--Example
-+#Example
- 
- # Path to the database directory.
- # WARNING: It must match clamd.conf's directive!
- # Default: hardcoded (depends on installation options)
--#DatabaseDirectory /var/lib/clamav
-+DatabaseDirectory /var/lib/clamav
- 
- # Path to the log file (make sure it has proper permissions)
- # Default: disabled
--#UpdateLogFile /var/log/freshclam.log
-+UpdateLogFile /var/log/clamav/freshclam.log
- 
- # Maximum size of the log file.
- # Value of 0 disables the limit.
-@@ -52,7 +52,7 @@
- 
- # Initialize supplementary group access (freshclam must be started by root).
- # Default: no
--#AllowSupplementaryGroups yes
-+AllowSupplementaryGroups yes
- 
- # Use DNS to verify virus database version. Freshclam uses DNS TXT records
- # to verify database and software versions. With this directive you can change

clamav-clamd.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=clamav daemon
-
-[Service]
-Type=simple
-PIDFile=/run/clamav/clamd.pid
-ExecStart=/usr/sbin/clamd -c /etc/clamd.conf
-
-[Install]
-WantedBy=multi-user.target

clamav-freshclamd.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=clamav updater
-
-[Service]
-Type=forking
-PIDFile=/run/clamav/freshclam.pid
-ExecStart=/usr/bin/freshclam -d -p /run/clamav/freshclam.pid
-
-[Install]
-WantedBy=multi-user.target

clamav.spec

@@ -6,7 +6,7 @@
 %define libname     lib%{name}
 
 Name:          clamav
-Version:       0.99.1
+Version:       0.100.0
 Release:       1mamba
 Summary:       Clam AntiVirus is a GPL anti-virus toolkit for UNIX
 Group:         Applications/Security
@@ -14,17 +14,17 @@ Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://www.clamav.net
-Source0:       http://downloads.sourceforge.net/project/clamav/clamav/%{version}/clamav-%{version}.tar.gz
+Source0:       http://www.clamav.net/downloads/production/clamav-%{version}.tar.gz
 #Source0:       http://downloads.sourceforge.net/sourceforge/clamav/clamav-%{version}.tar.gz
 Source1:       %{name}-clamd.initscript
 Source2:       %{name}-clamd.logrotate
 Source3:       %{name}-freshclam.initscript
 Source4:       %{name}-freshclam.logrotate
 #Source5:       http://db.local.clamav.net/daily.cvd
-Source6:       clamav-clamd.service
+#Source6:       clamav-clamd.service
-Source7:       clamav-freshclamd.service
+#Source7:       clamav-freshclamd.service
-Patch0:        %{name}-0.98.4-config.patch
+Patch0:        %{name}-0.100.0-config.patch
-Patch1:        %{name}-0.98-freshclam_config.patch
+Patch1:        %{name}-0.100.0-freshclam_config.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -47,6 +47,7 @@ Requires:      tar
 Requires:      unzip
 Requires(pre): %{libname} = %{?epoch:%epoch:}%{version}-%{release}
 Requires(pre): /usr/sbin/groupadd, /usr/sbin/useradd
+%systemd_requires
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -92,7 +93,8 @@ This package contains the static %{libname} library and its header files.
 %build
 export SENDMAIL="%{_libdir}/sendmail"
 %configure \
-   --with-dbdir=%{_localstatedir}/lib/clamav/
+   --with-dbdir=%{_localstatedir}/lib/clamav/ \
+   --disable-zlib-vcheck
 
 %make
 
@@ -116,14 +118,14 @@ install -d %{buildroot}%{_var}/lib/%{name}
 mv %{buildroot}%{_sysconfdir}/clamd.conf.sample %{buildroot}%{_sysconfdir}/clamd.conf
 mv %{buildroot}%{_sysconfdir}/freshclam.conf.sample %{buildroot}%{_sysconfdir}/freshclam.conf
 
-install -d %{buildroot}%{_unitdir}
+##install -d %{buildroot}%{_unitdir}
-install -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/clamd.service
+#install -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/clamd.service
-install -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/freshclamd.service
+#install -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/freshclamd.service
 
-install -d %{buildroot}%{_prefix}/lib/tmpfiles.d
+#install -d %{buildroot}%{_prefix}/lib/tmpfiles.d
-cat > %{buildroot}%{_prefix}/lib/tmpfiles.d/clamav.conf << _EOF
+#cat > %{buildroot}%{_prefix}/lib/tmpfiles.d/clamav.conf << _EOF
-d /run/clamav 711 %{clamav_usr} %{clamav_grp}
+#d /run/clamav 711 %{clamav_usr} %{clamav_grp}
-_EOF
+#_EOF
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
@@ -135,52 +137,35 @@ _EOF
 :
 
 %post
-if [ $1 -eq 1 ]; then
+%systemd_post clamav-freshclam
-   # new install
+#if [ $1 -ge 1 ]; then
-   systemctl -q daemon-reload
+#   # Workaround: remove /0 file created by error in initscript
-   systemd-tmpfiles --create clamav.conf
+#   [ -e /0 ] && rm -f /0
-   systemctl -q enable freshclamd
+#fi
-   systemctl -q start freshclamd
-elif [ $1 -ge 1 ]; then
-   systemctl -q daemon-reload
-   systemd-tmpfiles --create clamav.conf
-   systemctl -q try-restart freshclamd
-   # remove /0 file created by error in initscript
-   [ -e /0 ] && rm -f /0
-fi
 :
 
 %preun
+%systemd_preun clamav-freshclam
 if [ $1 -eq 0 ]; then
    # erase
-   systemctl -q stop freshclamd
-   systemctl -q disable freshclamd
    /usr/sbin/userdel %{clamav_usr} 2>/dev/null
 fi
 :
 
+%postun
+%systemd_postun_with_restart clamav-freshclam
+:
+
 %post -n clamd
-if [ $1 -eq 1 ]; then
+%systemd_post clamav-daemon.socket
-   # new install
-   systemctl -q daemon-reload
-   systemd-tmpfiles --create clamav.conf
-   systemctl -q enable clamd
-   systemctl -q start freshclamd
-   sleep 5
-   systemctl -q start clamd
-elif [ $1 -gt 1 ]; then
-   systemctl -q daemon-reload
-   systemd-tmpfiles --create clamav.conf
-   systemctl -q try-restart clamd
-fi
 :
 
 %preun -n clamd
-if [ $1 -eq 0 ]; then
+%systemd_preun clamav-daemon.socket
-   # erase
+:
-   systemctl -q stop clamd
+
-   systemctl -q disable clamd
+%postun -n clamd
-fi
+%systemd_postun_with_restart clamav-daemon.socket
 :
 
 %post -n %{libname} -p /sbin/ldconfig
@@ -198,8 +183,10 @@ fi
 #%{_datadir}/clamav/*.cvd
 %config(noreplace) %{_sysconfdir}/freshclam.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/freshclam
-%{_prefix}/lib/tmpfiles.d/clamav.conf
+#%{_prefix}/lib/tmpfiles.d/clamav.conf
-%{_unitdir}/freshclamd.service
+%{_unitdir}/clamav-daemon.service
+%{_unitdir}/clamav-daemon.socket
+%{_unitdir}/clamav-freshclam.service
 %dir %attr(0755,%{clamav_usr},%{clamav_grp}) %{_var}/lib/%{name}
 #%ghost %{_var}/lib/%{name}/daily.cvd
 #%ghost %{_var}/lib/%{name}/mani.cvd
@@ -216,7 +203,7 @@ fi
 %{_mandir}/man5/clamd.conf.*
 %{_mandir}/man5/freshclam.conf.*
 %{_mandir}/man8/clamav-milter.*
-%doc AUTHORS COPYING
+%doc COPYING
 
 %files -n clamd
 %defattr(-,root,root)
@@ -224,7 +211,7 @@ fi
 %config(noreplace) %{_sysconfdir}/logrotate.d/clamd
 %{_sbindir}/clamd
 %{_bindir}/clamdtop
-%{_unitdir}/clamd.service
+#%{_unitdir}/clamd.service
 %ghost %attr(0644,%{clamav_usr},%{clamav_grp}) %{_var}/log/%{name}/clamd.log
 %{_mandir}/man1/clamdtop.*
 %{_mandir}/man8/clamd.*
@@ -237,13 +224,19 @@ fi
 %defattr(-,root,root)
 %{_bindir}/clamav-config
 %{_includedir}/*.h
-#%{_libdir}/*.a
+%{_libdir}/*.a
 %{_libdir}/*.la
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
-%doc BUGS ChangeLog NEWS README
+#% doc BUGS ChangeLog NEWS README
 
 %changelog
+* Sat Jun 23 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 0.100.0-1mamba
+- update to 0.100.0
+
+* Wed May 04 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 0.99.2-1mamba
+- update to 0.99.2
+
 * Thu Mar 03 2016 Automatic Build System <autodist@mambasoft.it> 0.99.1-1mamba
 - automatic version update by autodist