From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1549166-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 1D33E15800A
for <garchives@archives.gentoo.org>; Thu, 24 Aug 2023 23:25:43 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 290132BC017;
Thu, 24 Aug 2023 23:25:42 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 14B592BC017
for <gentoo-commits@lists.gentoo.org>; Thu, 24 Aug 2023 23:25:41 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 14404340B29
for <gentoo-commits@lists.gentoo.org>; Thu, 24 Aug 2023 23:25:41 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 770D21071
for <gentoo-commits@lists.gentoo.org>; Thu, 24 Aug 2023 23:25:39 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1692919492.9bf0d743d96a432b16331ad9474a1d296166ada1.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-antivirus/clamav/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-antivirus/clamav/clamav-1.2.0_rc.ebuild app-antivirus/clamav/metadata.xml
X-VCS-Directories: app-antivirus/clamav/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 9bf0d743d96a432b16331ad9474a1d296166ada1
X-VCS-Branch: master
Date: Thu, 24 Aug 2023 23:25:39 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f4cfb73a-58c4-4c09-890b-a992c464101d
X-Archives-Hash: 7316e82d2ddaed41047229519c84939e
commit: 9bf0d743d96a432b16331ad9474a1d296166ada1
Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Wed Aug 16 08:58:40 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 23:24:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf0d743
app-antivirus/clamav: package maintenance
- fix failing build
- add USE=system-mspack
- Bump minimum rust version
Closes: https://bugs.gentoo.org/912178
Bug: https://bugs.gentoo.org/911402
Bug: https://bugs.gentoo.org/911589
Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-antivirus/clamav/clamav-1.2.0_rc.ebuild | 15 +++++++--------
app-antivirus/clamav/metadata.xml | 6 +++---
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/app-antivirus/clamav/clamav-1.2.0_rc.ebuild b/app-antivirus/clamav/clamav-1.2.0_rc.ebuild
index 58bd5cfeb5d5..9985517bf6ae 100644
--- a/app-antivirus/clamav/clamav-1.2.0_rc.ebuild
+++ b/app-antivirus/clamav/clamav-1.2.0_rc.ebuild
@@ -174,7 +174,7 @@ if [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
fi
-IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux systemd test"
+IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux +system-mspack systemd test"
REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter )
clamonacc? ( clamapp )
@@ -192,7 +192,6 @@ COMMON_DEPEND="
app-arch/bzip2
dev-libs/json-c:=
dev-libs/libltdl
- dev-libs/libmspack
dev-libs/libpcre2:=
dev-libs/libxml2
dev-libs/openssl:=
@@ -204,12 +203,14 @@ COMMON_DEPEND="
jit? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
milter? ( mail-filter/libmilter:= )
rar? ( app-arch/unrar )
+ system-mspack? ( dev-libs/libmspack )
test? ( dev-python/pytest )
"
-
+# rust-bin < 1.71 has an executable stack
+# which is not supported on selinux #911589
BDEPEND="
virtual/pkgconfig
- >=virtual/rust-1.61
+ >=virtual/rust-1.71
doc? ( app-doc/doxygen )
test? (
${PYTHON_DEPS}
@@ -246,7 +247,7 @@ src_configure() {
-DENABLE_CLAMONACC=$(usex clamonacc ON OFF)
-DENABLE_DOXYGEN=$(usex doc)
-DENABLE_EXPERIMENTAL=$(usex experimental ON OFF)
- -DENABLE_EXTERNAL_MSPACK=ON
+ -DENABLE_EXTERNAL_MSPACK=$(usex system-mspack ON OFF)
-DENABLE_JSON_SHARED=ON
-DENABLE_MAN_PAGES=ON
-DENABLE_MILTER=$(usex milter ON OFF)
@@ -352,10 +353,8 @@ src_install() {
fi
done
- # These both need to be writable by the clamav user;
- # remove the installer-created empty directories
+ # These both need to be writable by the clamav user
# TODO: use syslog by default; that's what it's for.
- rm -r "${ED}"/var/lib/clamav || die
diropts -o clamav -g clamav
keepdir /var/lib/clamav
keepdir /var/log/clamav
diff --git a/app-antivirus/clamav/metadata.xml b/app-antivirus/clamav/metadata.xml
index b28f9ad70e51..ad6c8d27e1b3 100644
--- a/app-antivirus/clamav/metadata.xml
+++ b/app-antivirus/clamav/metadata.xml
@@ -21,17 +21,17 @@
<flag name="clamapp">
Build applications (clamscan, clamd, clamdscan, clamonacc (also has its own USE flag), sigtool, clambc, clamav-milter (also requires milter USE flag), clamdtop, clamsubmit, clamconf).
</flag>
- <flag name="clamonacc">Build the clamonacc on-access scanner</flag>
<flag name="clamdtop">A Top like tool which shows what clamd is currently scanning amongst other things</flag>
+ <flag name="clamonacc">Build the clamonacc on-access scanner</flag>
<flag name="clamsubmit">A tool to submit false positives / negatives</flag>
<flag name="experimental">Enable experimental features</flag>
<flag name="libclamav-only">Bypass building of libfreshclam and the ClamAV CLI applications.</flag>
<flag name="metadata-analysis-api">Enables collection of file property metadata using ClamAV API for analysis by ClamAV bytecode programs.</flag>
- <flag name="xml">DMG and XAR support</flag>
<flag name="rar">RAR support</flag>
+ <flag name="system-mspack">Use <pkg>dev-libs/libmspack</pkg> instead of the version bundled with ClamAV</flag>
+ <flag name="xml">DMG and XAR support</flag>
</use>
<upstream>
<remote-id type="github">Cisco-Talos/clamav</remote-id>
- <remote-id type="sourceforge">clamav</remote-id>
</upstream>
</pkgmetadata>