From 06a0eaa97bc4295c006556858944cc0a76345c6d Mon Sep 17 00:00:00 2001
From: Yasuhiro Kimura <yasu@utahime.org>
Date: Thu, 8 Apr 2021 04:35:10 +0900
Subject: [PATCH] security/clamav: Update to 0.103.2

* Update to 0.103.2, which fixes multiple vulnerabilities.
* Sort pkg-plist.

Release Note: https://blog.clamav.net/2021/04/clamav-01032-security-patch-release.html
Security: 9ae2c00f-97d0-11eb-8cd6-080027f515ea

Bug #254861 describes vulnerabilities fixed with this release. So
please commit it together.
---
 security/clamav/Makefile  |  2 +-
 security/clamav/distinfo  |  6 ++---
 security/clamav/pkg-plist | 47 ++++++++++++++++++++-------------------
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index c675411dc0ca..39ce3332ba1e 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	clamav
-PORTVERSION=	0.103.1
+PORTVERSION=	0.103.2
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	https://www.clamav.net/downloads/production/
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index 9543cb32cae0..66c9ae6e10af 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612395758
-SHA256 (clamav-0.103.1.tar.gz) = 7308c47b89b268af3b9f36140528927a49ff3e633a9c9c0aac2712d81056e257
-SIZE (clamav-0.103.1.tar.gz) = 13369791
+TIMESTAMP = 1617822258
+SHA256 (clamav-0.103.2.tar.gz) = d4b5d0ac666262e423a326fb54778caa7c69624d6c3f9542895feb8478271bd2
+SIZE (clamav-0.103.2.tar.gz) = 13387954
diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist
index db14d904b9ac..726d7d1722df 100644
--- a/security/clamav/pkg-plist
+++ b/security/clamav/pkg-plist
@@ -1,8 +1,14 @@
+bin/clamav-config
+bin/clambc
+bin/clamconf
+bin/clamdscan
+bin/clamdtop
+bin/clamscan
 %%JSON%%bin/clamsubmit
-%%JSON%%man/man1/clamsubmit.1.gz
-%%MILTER%%@sample etc/clamav-milter.conf.sample
-%%MILTER%%sbin/clamav-milter
+bin/freshclam
+bin/sigtool
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Contribute.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Installation-Unix.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Installation-Unix/Steps-Debian-Ubuntu.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Installation-Unix/Steps-Redhat-CentOS.html
@@ -11,8 +17,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Introduction.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/OnAccess.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures.html
-%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/AuthenticodeRules.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/AllowLists.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/AuthenticodeRules.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/BodySignatureFormat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/BytecodeSignatures.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/ContainerMetadata.html
@@ -34,25 +40,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/development.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/images/demon.png
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/libclamav.html
-%%UNRAR%%lib/libclamunrar.so
-%%UNRAR%%lib/libclamunrar.so.9
-%%UNRAR%%lib/libclamunrar.so.9.0.5
-%%UNRAR%%lib/libclamunrar_iface.so
-%%UNRAR%%lib/libclamunrar_iface.so.9
-%%UNRAR%%lib/libclamunrar_iface.so.9.0.5
-@dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%DBDIR%%
-@dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%LOGDIR%%
-@dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%RUNDIR%%
-@sample etc/clamd.conf.sample
-@sample etc/freshclam.conf.sample
-bin/clamav-config
-bin/clambc
-bin/clamconf
-bin/clamdscan
-bin/clamdtop
-bin/clamscan
-bin/freshclam
-bin/sigtool
 include/clamav-config.h
 include/clamav-types.h
 include/clamav-version.h
@@ -61,6 +48,12 @@ include/libfreshclam.h
 lib/libclamav.so
 lib/libclamav.so.9
 lib/libclamav.so.9.0.5
+%%UNRAR%%lib/libclamunrar.so
+%%UNRAR%%lib/libclamunrar.so.9
+%%UNRAR%%lib/libclamunrar.so.9.0.5
+%%UNRAR%%lib/libclamunrar_iface.so
+%%UNRAR%%lib/libclamunrar_iface.so.9
+%%UNRAR%%lib/libclamunrar_iface.so.9.0.5
 lib/libfreshclam.so
 lib/libfreshclam.so.2
 lib/libfreshclam.so.2.0.1
@@ -70,6 +63,7 @@ man/man1/clamconf.1.gz
 man/man1/clamdscan.1.gz
 man/man1/clamdtop.1.gz
 man/man1/clamscan.1.gz
+%%JSON%%man/man1/clamsubmit.1.gz
 man/man1/freshclam.1.gz
 man/man1/sigtool.1.gz
 man/man5/clamav-milter.conf.5.gz
@@ -77,4 +71,11 @@ man/man5/clamd.conf.5.gz
 man/man5/freshclam.conf.5.gz
 man/man8/clamav-milter.8.gz
 man/man8/clamd.8.gz
+%%MILTER%%sbin/clamav-milter
 sbin/clamd
+@sample etc/clamd.conf.sample
+%%MILTER%%@sample etc/clamav-milter.conf.sample
+@sample etc/freshclam.conf.sample
+@dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%DBDIR%%
+@dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%LOGDIR%%
+@dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%RUNDIR%%
-- 
2.31.1