From 996a2bda06cb164877d5d952774a6db1b271c2f3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Jun 2024 00:12:20 +0100 Subject: gentoo auto-resync : 25:06:2024 - 00:12:20 --- app-antivirus/Manifest.gz | Bin 888 -> 887 bytes app-antivirus/clamav/Manifest | 5 +- app-antivirus/clamav/clamav-1.3.0.ebuild | 397 -------------------- app-antivirus/clamav/clamav-1.3.1-r1.ebuild | 412 +++++++++++++++++++++ .../clamav/files/clamav-1.3.1-onenote-rs.patch | 30 ++ 5 files changed, 444 insertions(+), 400 deletions(-) delete mode 100644 app-antivirus/clamav/clamav-1.3.0.ebuild create mode 100644 app-antivirus/clamav/clamav-1.3.1-r1.ebuild create mode 100644 app-antivirus/clamav/files/clamav-1.3.1-onenote-rs.patch (limited to 'app-antivirus') diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz index 66062db4824d..69873fac6d47 100644 Binary files a/app-antivirus/Manifest.gz and b/app-antivirus/Manifest.gz differ diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest index 7dcc52371ec6..7008e8c9fe19 100644 --- a/app-antivirus/clamav/Manifest +++ b/app-antivirus/clamav/Manifest @@ -2,6 +2,7 @@ AUX clamav-0.102.1-libxml2_pkgconfig.patch 4012 BLAKE2B 4c3e4fc3522d317c57bae942 AUX clamav-0.102.2-fix-curl-detection.patch 844 BLAKE2B a813b1f6003b9cff03fca8d72dbd44d6a4f700e3d60aee83f782a87893a3c6753698ca8715237155185660301dd81dc55bf6a6e3b9095f57b099607182c90bf5 SHA512 27e6aa5ad418eaa32b56ea7bbdab0b5b4cd649e55d34eb094b5f02d7e68d8913f39664ffd6bc4a07faf88f60bdbd15b0c381fbbd6d9c1c62cc36e72e34cabd19 AUX clamav-0.103.0-system-tomsfastmath.patch 3725 BLAKE2B 85640ded83600adfdcc03e8f42e3153c71a8b6c5884ca4cbd79a69121943fd171bc528aed26ded895189293008924cef6762a22001b4ee098fe5f680c7619bf0 SHA512 b67df39bc7d60f6ea9bb06d12413f0e4774185d4f020a68bdfdf8fe1ca669f70a62699b0f1100702af5ec47e460a35625dcaa09cfc6ea6d2f3957de227e87306 AUX clamav-0.103.1-upstream-openrc.patch 18249 BLAKE2B 305db3181a4a22acde5b28cef6c2d01b639be8c5b9e9c77737be1ebcb0553040b6eda117285e3e8b4bf06d2565a5d73225d7ce20ba1f115fd08bc822d779b370 SHA512 89e95057ee2f29bcdf5787f659ffe43b055b599d9bb80bf54794859113d760dad135b5b8d80c23e98f8c6b699dc839d4922c4c3b45edf97296f4eea668e62672 +AUX clamav-1.3.1-onenote-rs.patch 1140 BLAKE2B 63cb32c024be74311ac83d74735278fc2de377face2d0d7b89e3fdef380614298293f5e28679798b9841fd500ac19972949d42b4c3d255f5daef2cea4301bbfe SHA512 74a1a98baf264b9019bf03838b2fe7dbb4da01ba5e23658e546c33d238866bb69e24c09301916da45f548d00f0adddd4a5300f027dbf1ff7f49eaaf5887698d0 AUX clamav-milter.README.gentoo 2284 BLAKE2B 7afc18f3dad57c2d7595257b356943efb3d1af28d55ac8f09f0506430fd0dedf0820906ced666a7237e3af44a9bc1b43fff017c03faad844f96b132ca4c5dde6 SHA512 38eadf2d919a0c48345600ea5a39c90e766b62e8b1ffc7bb01969a8fd93c4545f2030058a470ac7efb75a1d6c74f9930438f58aeff5035e19e38241ed381f7b3 AUX clamav-milter.initd 1164 BLAKE2B 190dee3476f8763dc2498e2099e6afa83c36642298618ad959940771e73c07456e30e6319d649291c82fec49e3712e500a65b167fe91b12bd2758f79f040e1c3 SHA512 d21c60e7d3ee5eee65da18831eed905858a1c7ab4ec02de1c16fa36179d9c1cf517eca8402b872f3d995fa1d59a9b2e79994655ca4570370b40dc810af5e0a3d AUX clamav-milter.logrotate-r1 1103 BLAKE2B b506a07f6ebdf697f87060424368ce4e4085564c3fa8e8cc4780ba786f2f543ae51a6e0f9d04db9ea9eb5554c1e395592453235db5abcc243fd2523cb44adec2 SHA512 890744086dcd8d6f7eba0f49df0941c643c6d730ea27a660ecaaab50c51c931489fa25079ad1aa9e307f919ac98a4e5d6b2e952cc46dcea8322b3253c6ba07b1 @@ -49,7 +50,6 @@ DIST clamav-1.0.5.tar.gz 10344955 BLAKE2B 1deceff859c9eec6185f6c83833333d1a030ed DIST clamav-1.0.6.tar.gz 10345779 BLAKE2B fbbef034a7bf6e2b323007a3de2464b60cc0a564551ddd4169a72af0328cfc2485c14395626e8d0258dfbb3bb41bc895d26622ff2dfb5fcd1181e6595da6489b SHA512 907cf51f8e6776a81ec5501026c240266b0eb8f7631fcbbcd0f8514446925dc731d819ae758217f9ed9414ca385b64e67f6de0e5133c04ba7590bd1e4445e09e DIST clamav-1.2.2.tar.gz 10372690 BLAKE2B 47940236e38296ac908be4c5d1c5ce8bbc9ec5c69fa87b2472c941d2de9642e0ab6a59c63038aa706079e8efeb161083db69ad03eaaf27a6d05f4f1a5bb70aff SHA512 32562230f367a230f70dfca5ed5000ee8829a0da7452b0113e9dbaa47ef6b21901001f741b0e52ce52c02fe8f834bd559bcbdf1ea20495bead9c4976c3a4cc92 DIST clamav-1.2.3.tar.gz 10376162 BLAKE2B f881ca93143fc418a475bfd8bcfe26bc964fedc9f50267e60e36b92932232aa219ee61091f23b53882776d1de7faf111faf8b123058d7b0f8feee01d1884133c SHA512 1298107f7d567bfdb151c452acb33edfa99e13f26a711f2c8cb6149fa144a0b164c92f10c7fb592ac4ae3787600b4996e295c2dd31dfac11a8c2ef8c00c61161 -DIST clamav-1.3.0.tar.gz 12937306 BLAKE2B 4db193bd4cbe66cf3e7b3ac6ce26a1e74bc73b6ab0d9ba3b2fe496bba061f4ac1a89d05b797a384343ed02864f5ea9530bedf4f1aea8c5ae33f9fc86ab8521a3 SHA512 7fe05abcd6c6fb76de44471b63a0f31ebbabf477800966e87bd187591f2f6f6b7d4a66f450f05bfeb3ec33253887c8115cb9ddbc2cd744adb5b19af249ae3333 DIST clamav-1.3.1.tar.gz 12938351 BLAKE2B d8fe1be274bcc8091ed4193967120201457d9a4eaaa27e8b5cdde279f25405882bd0cd5de80e7da041db28d3688f4270febda5ca70d69c7d36d1e099d03ddb3e SHA512 0693006c0f283862bf7f4eaeb39b409b92ac017a3d604df1340045c26dc47070d6f23dfb180dcb7753156d02c5e99cec23c53f6c56b007ed737be7060a4131f2 DIST clang-sys-1.4.0.crate 38679 BLAKE2B d15bdae2142ed26b4f6bd037bd2062e8c4b7b87fc5b749b872a95ff1952d000066c255aa0984e5f9c4a5c88066db4a20cfd048db4ba5a59b331d5ffa5e9a281d SHA512 062189bb0a341e2e85de4987f4b564c1fc69e4005c9c42cfedb61dee5f48db9126a8114d1d97be1b9c21b8c885243751232fbe8cf532e1d2be593308fe45216a DIST clang-sys-1.6.1.crate 41346 BLAKE2B b70104e6c6b3c1b85caa111c2b1fb2c20d30eeb85059bc616afc49bce9409f7ee2dd8b800750a466accad6a74ef29d10c6a2ee4459d854a2c0c54050ff51cc4b SHA512 a6c62c1d3faae3796f5e7d98ed4f1a8119f0ffaf8fceee8e728cd4da57b0140e82631012450bb0c551cd13814a97065e9e47015320707a87bdfbb6fd317e952c @@ -86,7 +86,6 @@ DIST fastrand-1.8.0.crate 11369 BLAKE2B 93e911ffcec559e30b2fefa44c4d74d1ffa9b8ef DIST fastrand-2.0.0.crate 14402 BLAKE2B 8bf830151ec616dbc25f216265722e39f8a2cd9ae036b0904b73775a30497368aaf9bb7f49890c330024c3d9b8084749c91f601b60b53bc8cef2da8b0aa71322 SHA512 9449dd52e4b722d5747f68f127843c0d1a402765c2b6186b9526f8ae23293cb1f6b50adcbf18a8ea768292642184cb0eb42b1801d20f6815397903f9977f3cbc DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9 DIST fdeflate-0.3.0.crate 21790 BLAKE2B 3c96f6395fc42f66e436fbf6b747c2f3c2dfd8c38729bd0eb88be872ad55e5d964ba322b703fae122907d51892619687ac9b7a5e7546f8fe6eb7d80a91c1f398 SHA512 1a1862460745780407892c835b4e3431267044285fdd718dc6b316dbce9520d2955bf36e5e28257f2f758ba7bc3051b446e786d11ace83deec492e4c161664bc -DIST fdeflate-0.3.1.crate 26143 BLAKE2B 9decfc50a0d2961960f80e3c7e640c2f4a9c916fed3810031906548d60dc6edae4d32419b5fc7cb5ec9b6e9cadcb71cc723c6fdc6f94ac81e0272739b79277da SHA512 16aae554c5c629266c6b1d628076a7d67d9214988355a76c669152f1981ed12c35959cb1a81cc46a9fd000fe4c25266bcd0486931e8e4d91c47ff7001211fb39 DIST fdeflate-0.3.4.crate 25001 BLAKE2B 69bffdb689dc467bd62738299ea17295bf7dd9d51c78b17e1ef6eee265056308703646791676c44430a686e1d713a8f561c5db972de7ab7c5e7b21050cad70f8 SHA512 a38b493eba656beb97275faf5a2f32c8a2c2cb12c5d5c280d37bbcf1406fe404151fd6312ec496aafdce802ef08745a6927e571890f9b290010ca5ac45ac9bdf DIST flate2-1.0.25.crate 70210 BLAKE2B 992525ffeeb4433a222487cdfb0c3927ad77f914e1db94f612d80e81faef4a2c955c755c2b800251e3416d0b22726d5f7d7e432a81c3582c54b7de95ab7a324e SHA512 d81a463360ee2778f609ff297e04548120d1fda1f9e020fb2f429ea51189b8fe6cae57252fcd924d71fb65ad0f93ff7cdc7235913f8b78fa82925939cf884af7 DIST flate2-1.0.27.crate 73460 BLAKE2B 5603848098ac02c9c83893df79ea9d9ad3df5b7e02ffa155ac74602bda7e28e14e6b7de2ff321b38d24fa3741ccea8a4c811abb47690cc295f90d4cf2bdd0bbf SHA512 e76e76444686433acabd16513e6e5860d4d6fa53a810f37266f36900f154acacac6dcd77b0373599a6d33a09175f5f02146d84726b982c59a78926950e19ff09 @@ -317,6 +316,6 @@ EBUILD clamav-1.0.5.ebuild 10596 BLAKE2B 96cf950ea5ed1fb75e2e14928dac19908d5a0d3 EBUILD clamav-1.0.6.ebuild 10636 BLAKE2B 659fc4ab830d450abfd320c18f5ee82dc67acf1343e776242a5f9e0f0220d9d80465936b6ff1873718098783e6b40411c7815b3c1805024c9b5516ec36653530 SHA512 e1daa8bbb73c11b27d787897e93c35d32f9f518c1eea860d06dd97bca791dd92e64e5702a4fed22878129be94d13a41b4bb7e39d0d73a6cd40eec40f86be14fa EBUILD clamav-1.2.2.ebuild 10643 BLAKE2B 5567e75bf90956baae79534de15f9398bf4e4b2d3438fc210f27efee8ff2d9738fcf0b8ae56697e3c2a139491b7eb727284dc7d90d1f932aac8c825bd3b7c861 SHA512 cbbe5fc4d5e69f9f0573a341f31cd5845486495df53169f8ac2a035e0725bccda3b27c3de8d61bd38987b9ac1ddc77f650238dee9187547033485578269acd13 EBUILD clamav-1.2.3.ebuild 10689 BLAKE2B e752558e70adacebc099360898c3ff9c695231d683a36e79f868e0b104ba2f7f5a7ba66f3c5e9e48395b11b32a2d897e2f95f43b11b6041c9d303e950d19f022 SHA512 c7e52bcbe2c6ad25e04c40e3290ecda0025ed164ae7e70ddb5ebf03d714952448cb857b1175938c81167d80ea330bf20960e0f0df96cc5901f14569e94a74dff -EBUILD clamav-1.3.0.ebuild 10864 BLAKE2B 671b178cb36f9a222d1753aadd47f1430c3566fae902af5733c9d17fb83634dbab23a93d9ff59afb671eb34b4996f27e24a855b6b76318a2eece77cc83999a64 SHA512 ce95d74f6e0f8c69d97c1b81e9d5985772262de1ea9d91a82911a8e3f93931e983de80e638e524c201965c6b151125c75e0647b0a80e3f9f5677ba1ce446521b +EBUILD clamav-1.3.1-r1.ebuild 11522 BLAKE2B 23ab14c67042d9b33dae54b4190f98ddefc61e168cd2e21b98c6fd90e9a6213c628d656844720d6691afbad9d0c56e532b2d5870be3fdcfe7f29aa7c56689829 SHA512 bbcec764950251012a2256fb5e17705ca17085552504970f4febfcb35a4b514b54a5a0390585b657caabf4ec9fac5fc9fcd76b77012d3d771bd32f5e2408793d EBUILD clamav-1.3.1.ebuild 10862 BLAKE2B a579fd4ec7cd9e644f5976a089e38df8211de33eb89f79c3db744d331843bb3ab0c33e4a870a162e802279248d23cbc23310a576cf1c9b405bc4806eac33bff5 SHA512 1371cd4c2e01252bd4fd2bc37c7fa749919532025689b4f4d80f0541ebbeca4379eb943dc8580336eb147a0d3d261ead635e24dc27681fb63c819c2de3910271 MISC metadata.xml 1575 BLAKE2B b069c507c1f2c0fa87825a61b468d294e941264f672ada0fc82b473b5706b37bf512bd35ac42bcdba38f3d295ca95394c3923180093ca59581c74099cf23c447 SHA512 cbe1cb7b54a0c73150149c8a721282e8f20ea9bff0eaa6fa3146a3aa27687245f467788552c33337810c26562e3d916a3f19cb0923397e54031a38e58a07e140 diff --git a/app-antivirus/clamav/clamav-1.3.0.ebuild b/app-antivirus/clamav/clamav-1.3.0.ebuild deleted file mode 100644 index f58385586115..000000000000 --- a/app-antivirus/clamav/clamav-1.3.0.ebuild +++ /dev/null @@ -1,397 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -# Upstream are working on updating clamav's LLVM bytecode interpreter to work -# with later versions of LLVM, but it's not ready yet. See: -# https://github.com/Cisco-Talos/clamav/issues/581 -# This does not impact the ability of the package to build with llvm/clang otherwise. -LLVM_MAX_SLOT=13 -PYTHON_COMPAT=( python3_{10..12} ) - -# Auto-Generated by cargo-ebuild 0.5.4-r1 -CRATES=" - adler@1.0.2 - aho-corasick@1.1.2 - autocfg@1.1.0 - base64@0.21.5 - bindgen@0.65.1 - bit_field@0.10.2 - bitflags@1.3.2 - bitflags@2.4.1 - block-buffer@0.10.4 - bytemuck@1.14.0 - byteorder@1.5.0 - bytes@1.5.0 - cbindgen@0.25.0 - cexpr@0.6.0 - cfg-if@1.0.0 - clang-sys@1.6.1 - color_quant@1.1.0 - cpufeatures@0.2.11 - crc32fast@1.3.2 - crossbeam-deque@0.8.4 - crossbeam-epoch@0.9.16 - crossbeam-utils@0.8.17 - crunchy@0.2.2 - crypto-common@0.1.6 - digest@0.10.7 - either@1.9.0 - encoding_rs@0.8.33 - enum-primitive-derive@0.2.2 - errno@0.3.8 - exr@1.71.0 - fastrand@2.0.1 - fdeflate@0.3.1 - flate2@1.0.28 - flume@0.11.0 - generic-array@0.14.7 - gif@0.12.0 - glob@0.3.1 - half@2.2.1 - hashbrown@0.12.3 - heck@0.4.1 - hex@0.4.3 - hex-literal@0.4.1 - home@0.5.5 - image@0.24.7 - indexmap@1.9.3 - itertools@0.10.5 - itoa@1.0.10 - jpeg-decoder@0.3.0 - lazy_static@1.4.0 - lazycell@1.3.0 - lebe@0.5.2 - libc@0.2.151 - libloading@0.7.4 - linux-raw-sys@0.4.12 - lock_api@0.4.11 - log@0.4.20 - memchr@2.6.4 - memoffset@0.9.0 - minimal-lexical@0.2.1 - miniz_oxide@0.7.1 - nom@7.1.3 - num-complex@0.4.4 - num-integer@0.1.45 - num-rational@0.4.1 - num-traits@0.2.17 - once_cell@1.19.0 - paste@1.0.14 - peeking_take_while@0.1.2 - png@0.17.10 - prettyplease@0.2.15 - primal-check@0.3.3 - proc-macro2@1.0.70 - qoi@0.4.1 - quote@1.0.33 - rayon@1.8.0 - rayon-core@1.12.0 - redox_syscall@0.4.1 - regex@1.10.2 - regex-automata@0.4.3 - regex-syntax@0.8.2 - rustc-hash@1.1.0 - rustdct@0.7.1 - rustfft@6.1.0 - rustix@0.38.28 - ryu@1.0.16 - scopeguard@1.2.0 - serde@1.0.193 - serde_derive@1.0.193 - serde_json@1.0.108 - sha1@0.10.6 - sha2@0.10.8 - shlex@1.3.0 - simd-adler32@0.3.7 - smallvec@1.11.2 - spin@0.9.8 - strength_reduce@0.2.4 - syn@1.0.109 - syn@2.0.41 - tempfile@3.8.1 - thiserror@1.0.50 - thiserror-impl@1.0.50 - tiff@0.9.0 - toml@0.5.11 - transpose@0.2.2 - typenum@1.17.0 - unicode-ident@1.0.12 - unicode-segmentation@1.10.1 - uuid@1.6.1 - version_check@0.9.4 - weezl@0.1.7 - which@4.4.2 - widestring@1.0.2 - winapi@0.3.9 - winapi-i686-pc-windows-gnu@0.4.0 - winapi-x86_64-pc-windows-gnu@0.4.0 - windows-sys@0.48.0 - windows-sys@0.52.0 - windows-targets@0.48.5 - windows-targets@0.52.0 - windows_aarch64_gnullvm@0.48.5 - windows_aarch64_gnullvm@0.52.0 - windows_aarch64_msvc@0.48.5 - windows_aarch64_msvc@0.52.0 - windows_i686_gnu@0.48.5 - windows_i686_gnu@0.52.0 - windows_i686_msvc@0.48.5 - windows_i686_msvc@0.52.0 - windows_x86_64_gnu@0.48.5 - windows_x86_64_gnu@0.52.0 - windows_x86_64_gnullvm@0.48.5 - windows_x86_64_gnullvm@0.52.0 - windows_x86_64_msvc@0.48.5 - windows_x86_64_msvc@0.52.0 - zune-inflate@0.2.54 -" - -# Get the commit from the CLAM-2329-new-from-slice branch -declare -A GIT_CRATES=( - [onenote_parser]="https://github.com/Cisco-Talos/onenote.rs;8b450447e58143004b68dd21c11b710fdb79be92;onenote.rs-%commit%" -) - -inherit cargo cmake flag-o-matic llvm python-any-r1 systemd tmpfiles - -MY_P=${P//_/-} - -DESCRIPTION="Clam Anti-Virus Scanner" -HOMEPAGE="https://www.clamav.net/" -SRC_URI="https://github.com/Cisco-Talos/clamav/archive/refs/tags/${MY_P}.tar.gz - ${CARGO_CRATE_URIS}" -S=${WORKDIR}/clamav-${MY_P} - -LICENSE="Apache-2.0 BSD GPL-2 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB" -# 0/sts (short term support) if not an LTS release -SLOT="0/sts" -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 +system-mspack systemd test" - -REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter ) - clamonacc? ( clamapp ) - milter? ( clamapp ) - test? ( !libclamav-only )" - -RESTRICT="!test? ( test )" - -# Require acct-{user,group}/clamav at build time so that we can set -# the permissions on /var/lib/clamav in src_install rather than in -# pkg_postinst; calling "chown" on the live filesystem scares me. -COMMON_DEPEND=" - acct-group/clamav - acct-user/clamav - app-arch/bzip2 - dev-libs/json-c:= - dev-libs/libltdl - dev-libs/libpcre2:= - dev-libs/libxml2 - dev-libs/openssl:= - >=sys-libs/zlib-1.2.2:= - virtual/libiconv - !libclamav-only? ( net-misc/curl ) - clamapp? ( sys-libs/ncurses:= net-misc/curl ) - elibc_musl? ( sys-libs/fts-standalone ) - jit? ( \ - "${ED}"/etc/clamav/clamd.conf || die - - sed -e "s:^\(Example\):\# \1:" \ - -e "s/^#\(PidFile .*\)/\1/" \ - -e "s/^#\(DatabaseOwner .*\)/\1/" \ - -e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \ - -e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamav/clamd.conf:" \ - -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \ - -e "s/^#\(DatabaseDirectory .*\)/\1/" \ - "${ED}"/etc/clamav/freshclam.conf.sample > \ - "${ED}"/etc/clamav/freshclam.conf || die - - if use milter ; then - # Note: only keep the "unix" ClamdSocket and MilterSocket! - sed -e "s:^\(Example\):\# \1:" \ - -e "s/^#\(PidFile .*\)/\1/" \ - -e "s/^#\(ClamdSocket unix:.*\)/\1/" \ - -e "s/^#\(User .*\)/\1/" \ - -e "s/^#\(MilterSocket unix:.*\)/\1/" \ - -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \ - "${ED}"/etc/clamav/clamav-milter.conf.sample > \ - "${ED}"/etc/clamav/clamav-milter.conf || die - - systemd_newunit "${FILESDIR}/clamav-milter.service-0.104.0" clamav-milter.service - fi - - local i - for i in clamd freshclam clamav-milter - do - if [[ -f "${ED}"/etc/"${i}".conf.sample ]] ; then - mv "${ED}"/etc/"${i}".conf{.sample,} || die - fi - done - - # These both need to be writable by the clamav user - # TODO: use syslog by default; that's what it's for. - diropts -o clamav -g clamav - keepdir /var/lib/clamav - keepdir /var/log/clamav - fi - fi - - if use doc ; then - local HTML_DOCS=( docs/html/. ) - einstalldocs - fi - - # Don't install man pages for utilities we didn't install - if use libclamav-only ; then - rm -r "${ED}"/usr/share/man || die - fi - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - if ! use libclamav-only ; then - if use systemd ; then - tmpfiles_process clamav.conf - fi - fi - - if use milter ; then - elog "For simple instructions how to setup the clamav-milter read the" - elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}" - fi - - local databases=( "${EROOT}"/var/lib/clamav/main.c[lv]d ) - if [[ ! -f "${databases}" ]] ; then - ewarn "You must run freshclam manually to populate the virus database" - ewarn "before starting clamav for the first time." - fi - - if ! systemd_is_booted ; then - ewarn "This version of ClamAV provides separate OpenRC services" - ewarn "for clamd, freshclam, clamav-milter, and clamonacc. The" - ewarn "clamd service now starts only the clamd daemon itself. You" - ewarn "should add freshclam (and perhaps clamav-milter) to any" - ewarn "runlevels that previously contained clamd." - fi -} diff --git a/app-antivirus/clamav/clamav-1.3.1-r1.ebuild b/app-antivirus/clamav/clamav-1.3.1-r1.ebuild new file mode 100644 index 000000000000..04fcfda4d498 --- /dev/null +++ b/app-antivirus/clamav/clamav-1.3.1-r1.ebuild @@ -0,0 +1,412 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +# Upstream are working on updating clamav's LLVM bytecode interpreter to work +# with later versions of LLVM, but it's not ready yet. See: +# https://github.com/Cisco-Talos/clamav/issues/581 +# This does not impact the ability of the package to build with llvm/clang otherwise. +LLVM_MAX_SLOT=13 +PYTHON_COMPAT=( python3_{11..13} ) + +# Autogenerated by pycargoebuild 0.13.2 +CRATES=" + adler@1.0.2 + aho-corasick@1.1.2 + autocfg@1.1.0 + base64@0.21.5 + bindgen@0.65.1 + bit_field@0.10.2 + bitflags@1.3.2 + bitflags@2.4.1 + block-buffer@0.10.4 + bytemuck@1.14.0 + byteorder@1.5.0 + bytes@1.5.0 + cbindgen@0.25.0 + cexpr@0.6.0 + cfg-if@1.0.0 + clang-sys@1.6.1 + color_quant@1.1.0 + cpufeatures@0.2.11 + crc32fast@1.3.2 + crossbeam-deque@0.8.4 + crossbeam-epoch@0.9.16 + crossbeam-utils@0.8.17 + crunchy@0.2.2 + crypto-common@0.1.6 + digest@0.10.7 + either@1.9.0 + encoding_rs@0.8.33 + enum-primitive-derive@0.2.2 + errno@0.3.8 + exr@1.71.0 + fastrand@2.0.1 + fdeflate@0.3.4 + flate2@1.0.28 + flume@0.11.0 + generic-array@0.14.7 + gif@0.12.0 + glob@0.3.1 + half@2.2.1 + hashbrown@0.12.3 + heck@0.4.1 + hex-literal@0.4.1 + hex@0.4.3 + home@0.5.5 + image@0.24.7 + indexmap@1.9.3 + itertools@0.10.5 + itoa@1.0.10 + jpeg-decoder@0.3.0 + lazy_static@1.4.0 + lazycell@1.3.0 + lebe@0.5.2 + libc@0.2.151 + libloading@0.7.4 + linux-raw-sys@0.4.12 + lock_api@0.4.11 + log@0.4.20 + memchr@2.6.4 + memoffset@0.9.0 + minimal-lexical@0.2.1 + miniz_oxide@0.7.1 + nom@7.1.3 + num-complex@0.4.4 + num-integer@0.1.45 + num-rational@0.4.1 + num-traits@0.2.17 + once_cell@1.19.0 + paste@1.0.14 + peeking_take_while@0.1.2 + png@0.17.13 + prettyplease@0.2.15 + primal-check@0.3.3 + proc-macro2@1.0.70 + qoi@0.4.1 + quote@1.0.33 + rayon-core@1.12.0 + rayon@1.8.0 + redox_syscall@0.4.1 + regex-automata@0.4.3 + regex-syntax@0.8.2 + regex@1.10.2 + rustc-hash@1.1.0 + rustdct@0.7.1 + rustfft@6.1.0 + rustix@0.38.28 + ryu@1.0.16 + scopeguard@1.2.0 + serde@1.0.193 + serde_derive@1.0.193 + serde_json@1.0.108 + sha1@0.10.6 + sha2@0.10.8 + shlex@1.3.0 + simd-adler32@0.3.7 + smallvec@1.11.2 + spin@0.9.8 + strength_reduce@0.2.4 + syn@1.0.109 + syn@2.0.41 + tempfile@3.8.1 + thiserror-impl@1.0.50 + thiserror@1.0.50 + tiff@0.9.0 + toml@0.5.11 + transpose@0.2.3 + typenum@1.17.0 + unicode-ident@1.0.12 + unicode-segmentation@1.10.1 + uuid@1.6.1 + version_check@0.9.4 + weezl@0.1.7 + which@4.4.2 + widestring@1.0.2 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.48.5 + windows-targets@0.52.0 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.0 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.0 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.0 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.0 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.0 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.0 + zune-inflate@0.2.54 +" + +# Get the commit from the CLAM-2329-new-from-slice branch +declare -A GIT_CRATES=( + [onenote_parser]="https://github.com/Cisco-Talos/onenote.rs;8b450447e58143004b68dd21c11b710fdb79be92;onenote.rs-%commit%" +) + +inherit cargo cmake flag-o-matic llvm python-any-r1 systemd tmpfiles + +MY_P=${P//_/-} + +DESCRIPTION="Clam Anti-Virus Scanner" +HOMEPAGE="https://www.clamav.net/" +SRC_URI="https://github.com/Cisco-Talos/clamav/archive/refs/tags/${MY_P}.tar.gz + ${CARGO_CRATE_URIS}" +S=${WORKDIR}/clamav-${MY_P} + +LICENSE="Apache-2.0 BSD GPL-2 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB" +# 0/sts (short term support) if not an LTS release +SLOT="0/sts" +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 +system-mspack systemd test" + +REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter ) + clamonacc? ( clamapp ) + milter? ( clamapp ) + test? ( !libclamav-only )" + +RESTRICT="!test? ( test )" + +# Require acct-{user,group}/clamav at build time so that we can set +# the permissions on /var/lib/clamav in src_install rather than in +# pkg_postinst; calling "chown" on the live filesystem scares me. +COMMON_DEPEND=" + acct-group/clamav + acct-user/clamav + app-arch/bzip2 + dev-libs/json-c:= + dev-libs/libltdl + dev-libs/libpcre2:= + dev-libs/libxml2 + dev-libs/openssl:= + >=sys-libs/zlib-1.2.2:= + virtual/libiconv + !libclamav-only? ( net-misc/curl ) + clamapp? ( sys-libs/ncurses:= net-misc/curl ) + elibc_musl? ( sys-libs/fts-standalone ) + jit? ( \ + "${ED}"/etc/clamav/clamd.conf || die + + sed -e "s:^\(Example\):\# \1:" \ + -e "s:^#\(PidFile\) .*:\1 ${EPREFIX}/run/freshclam.pid:" \ + -e "s/^#\(DatabaseOwner .*\)/\1/" \ + -e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \ + -e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamav/clamd.conf:" \ + -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \ + -e "s/^#\(DatabaseDirectory .*\)/\1/" \ + "${ED}"/etc/clamav/freshclam.conf.sample > \ + "${ED}"/etc/clamav/freshclam.conf || die + + if use milter ; then + # Note: only keep the "unix" ClamdSocket and MilterSocket! + sed -e "s:^\(Example\):\# \1:" \ + -e "s:^\#\(PidFile\) .*:\1 ${EPREFIX}/run/clamav-milter.pid:" \ + -e "s/^#\(ClamdSocket unix:.*\)/\1/" \ + -e "s/^#\(User .*\)/\1/" \ + -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \ + "${ED}"/etc/clamav/clamav-milter.conf.sample > \ + "${ED}"/etc/clamav/clamav-milter.conf || die + + systemd_newunit "${FILESDIR}/clamav-milter.service-0.104.0" clamav-milter.service + fi + + local i + for i in clamd freshclam clamav-milter + do + if [[ -f "${ED}"/etc/"${i}".conf.sample ]] ; then + mv "${ED}"/etc/"${i}".conf{.sample,} || die + fi + done + + # These both need to be writable by the clamav user + # TODO: use syslog by default; that's what it's for. + diropts -o clamav -g clamav + keepdir /var/lib/clamav + keepdir /var/log/clamav + fi + fi + + if use doc ; then + local HTML_DOCS=( docs/html/. ) + einstalldocs + fi + + # Don't install man pages for utilities we didn't install + if use libclamav-only ; then + rm -r "${ED}"/usr/share/man || die + fi + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + if ! use libclamav-only ; then + if use systemd ; then + tmpfiles_process clamav.conf + fi + fi + + if use milter ; then + elog "For simple instructions how to setup the clamav-milter read the" + elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}" + fi + + local databases=( "${EROOT}"/var/lib/clamav/main.c[lv]d ) + if [[ ! -f "${databases}" ]] ; then + ewarn "You must run freshclam manually to populate the virus database" + ewarn "before starting clamav for the first time." + fi + + if ! systemd_is_booted ; then + ewarn "This version of ClamAV provides separate OpenRC services" + ewarn "for clamd, freshclam, clamav-milter, and clamonacc. The" + ewarn "clamd service now starts only the clamd daemon itself. You" + ewarn "should add freshclam (and perhaps clamav-milter) to any" + ewarn "runlevels that previously contained clamd." + else + if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -le 1.3.1; then + ewarn "From 1.3.1-r1 the Gentoo-provided systemd services have been" + ewarn "Retired in favour of using the units shipped by upstream." + ewarn "Ensure that any required services are configured and started." + ewarn "clamd@.service has been retired as part of this transition." + fi + fi + + if [[ -z ${REPLACING_VERSIONS} ]] && use clamonacc; then + einfo "'clamonacc' requires additional configuration before it" + einfo "can be enabled, and may not produce any output if not properly" + einfo "configured. Read the appropriate man page if clamonacc is desired." + fi + +} diff --git a/app-antivirus/clamav/files/clamav-1.3.1-onenote-rs.patch b/app-antivirus/clamav/files/clamav-1.3.1-onenote-rs.patch new file mode 100644 index 000000000000..d8421a269606 --- /dev/null +++ b/app-antivirus/clamav/files/clamav-1.3.1-onenote-rs.patch @@ -0,0 +1,30 @@ +From bc17e5a2e1f324461024f5e3e5776085a6b6df37 Mon Sep 17 00:00:00 2001 +From: Matt Jolly +Date: Mon, 24 Jun 2024 17:34:05 +1000 +Subject: [PATCH] PropertType: Specify type for custom discriminant values + +We use custom discriminant values for enum variants for "PropertType" without specifying the type. +This causes it to default to "isize" which on 64bit platforms is big enough to hold the 32bit constants, +but causes overflow when isize is 32bit. + +This issue was uncovered due to build failures on arm for Gentoo Linux as a dependency of ClamAV. + +Bug: https://bugs.gentoo.org/927214 +Signed-off-by: Matt Jolly +Co-authored-by: Steven Newbury +--- + src/one/property/mod.rs | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/one/property/mod.rs b/src/one/property/mod.rs +index 42841c6..fcc0481 100644 +--- a/src/one/property/mod.rs ++++ b/src/one/property/mod.rs +@@ -23,6 +23,7 @@ mod references; + pub(crate) mod simple; + pub(crate) mod time; + ++#[repr(u32)] + #[derive(Debug, Copy, Clone, PartialEq)] + #[allow(dead_code)] + #[allow(clippy::enum_clike_unportable_variant)] -- cgit v1.2.3