public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Gwyn Ciesla <gwync@protonmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/clamav] epel9: Merge branch 'rawhide' into epel9
Date: Thu, 02 Jul 2026 19:48:55 GMT [thread overview]
Message-ID: <178302173590.1.6700205174439786215.rpms-clamav-a3d2248d0787@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/clamav
Branch : epel9
Commit : a3d2248d0787191135e9f9fcb0e113dae247caac
Author : Gwyn Ciesla <gwync@protonmail.com>
Date : 2026-03-05T15:12:27-06:00
Stats : +78/-73 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/clamav/c/a3d2248d0787191135e9f9fcb0e113dae247caac?branch=epel9
Log:
Merge branch 'rawhide' into epel9
---
diff --git a/clamav-rust-dependency-versions.patch b/clamav-rust-dependency-versions.patch
index 56bd08d..3d12c03 100644
--- a/clamav-rust-dependency-versions.patch
+++ b/clamav-rust-dependency-versions.patch
@@ -1,18 +1,9 @@
diff -Naur clamav-1.4.3-original/libclamav_rust/Cargo.toml clamav-1.4.3/libclamav_rust/Cargo.toml
--- clamav-1.4.3-original/libclamav_rust/Cargo.toml 2025-12-04 10:01:33.233889863 +0000
+++ clamav-1.4.3/libclamav_rust/Cargo.toml 2025-12-04 10:02:29.088468217 +0000
-@@ -12,7 +12,7 @@
- sha2 = "0.10"
- tempfile = "3"
- thiserror = "1"
--image = "0.24"
-+image = ">=0.24, <0.26"
- rustdct = "0.7"
- transpose = "0.2"
- num-traits = "0.2"
@@ -21,7 +21,7 @@
unicode-segmentation = "1.10"
- bindgen = "0.69"
+ bindgen = "0.72"
onenote_parser = "0.3.1"
-hex-literal = "0.4"
+hex-literal = ">=0.4, <2.0"
diff --git a/clamav.spec b/clamav.spec
index 01e32b6..3513d9d 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -25,8 +25,8 @@
Summary: End-user tools for the Clam Antivirus scanner
Name: clamav
-Version: 1.4.3
-Release: 3%{?dist}
+Version: 1.4.4
+Release: 1%{?dist}
License: %{?with_unrar:proprietary}%{!?with_unrar:GPL-2.0-only}
URL: https://www.clamav.net/
%if %{with unrar}
@@ -48,11 +48,11 @@ Source5: clamd-README
# Check the first line of the file for version or run file *cvd
# Attention file < 5.33-7 have bugs see https://bugzilla.redhat.com/show_bug.cgi?id=1539107
#http://database.clamav.net/main.cvd
-Source10: main-62.cvd
+Source10: main-63.cvd
#http://database.clamav.net/daily.cvd
-Source11: daily-27673.cvd
+Source11: daily-27930.cvd
#http://database.clamav.net/bytecode.cvd
-Source12: bytecode-336.cvd
+Source12: bytecode-339.cvd
#for update
Source200: freshclam-sleep
Source201: freshclam.sysconfig
@@ -82,7 +82,7 @@ Patch7: https://salsa.debian.org/clamav-team/clamav/-/raw/unstable/debian/pa
# upstream yet due to MSRV
Patch8: clamav-rust-dependency-versions.patch
-BuildRequires: cmake3
+BuildRequires: cmake
BuildRequires: gettext-devel
BuildRequires: make
BuildRequires: gcc-c++
@@ -165,7 +165,6 @@ Summary: Filesystem structure for clamav
# Prevent version mix
Conflicts: %{name} < %{version}-%{release}
Conflicts: %{name} > %{version}-%{release}
-Requires(pre): shadow-utils
BuildArch: noarch
%description filesystem
@@ -299,7 +298,6 @@ Requires: data(clamav)
Requires: clamav-filesystem = %{version}-%{release}
Requires: clamav-lib = %{version}-%{release}
Requires: coreutils
-Requires(pre): shadow-utils
# This is still used by clamsmtp and exim-clamav
Provides: clamav-server = %{version}-%{release}
Provides: clamav-scanner-systemd = %{version}-%{release}
@@ -320,9 +318,9 @@ Summary: Milter module for the Clam Antivirus scanner
#Requires: clamd = %%{version}-%%{release}
#Requires: /usr/sbin/sendmail
Requires: clamav-filesystem = %{version}-%{release}
-Requires(pre): shadow-utils
Provides: clamav-milter-systemd = %{version}-%{release}
Obsoletes: clamav-milter-systemd < %{version}-%{release}
+Requires: group(clamscan)
%description milter
This package contains files which are needed to run the clamav-milter.
@@ -337,7 +335,7 @@ This package contains files which are needed to run the clamav-milter.
%cargo_prep
cd libclamav_rust
sed -i -e '/^base64 *=/s/= .*/= "0.22"/' Cargo.toml
-sed -i -e '/^bindgen *=/s/= .*/= "0.69"/' Cargo.toml
+sed -i -e '/^bindgen *=/s/= .*/= "0.72"/' Cargo.toml
sed -i -e '/^cbindgen *=/s/= *".*"/= "0.26"/' Cargo.toml
sed -i -e '/^onenote_parser *=/s/= *.*/= "0.3.1"/' Cargo.toml
%cargo_prep
@@ -356,6 +354,21 @@ install -p -m0644 %{SOURCE300} clamav-milter/
mkdir -p libclamunrar{,_iface}
%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}}
+# Create sysusers.d config files
+cat >clamav.sysusers.conf <<EOF
+g virusgroup -
+u clamupdate - 'Clamav database update user' %{homedir} -
+m clamupdate virusgroup
+EOF
+cat >clamd.sysusers.conf <<EOF
+u clamscan - 'Clamav scanner user' - -
+m clamscan virusgroup
+EOF
+cat >clamav-milter.sysusers.conf <<EOF
+u clamilt - 'Clamav milter user' %{_rundir}/clamav-milter -
+m clamilt virusgroup
+m clamilt clamscan
+EOF
%if 0%{?fedora} || 0%{?rhel} >= 9
%generate_buildrequires
@@ -365,14 +378,13 @@ cd libclamav_rust
%cargo_generate_buildrequires
%endif
-
%build
# add -Wl,--as-needed if not exist
export LDFLAGS=$(echo %{?__global_ldflags} | sed '/-Wl,--as-needed/!s/$/ -Wl,--as-needed/')
# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine
export have_cv_ipv6=yes
-%cmake3 \
+%cmake \
%if 0%{?fedora} || 0%{?rhel} >= 8
-DRUSTFLAGS="%build_rustflags" \
%else
@@ -389,7 +401,11 @@ export have_cv_ipv6=yes
# TODO: check periodically that CLAMAVUSER is used for freshclam only
-%cmake3_build
+%cmake_build
+
+cd libclamav_rust
+%cargo_license_summary
+%{cargo_license} > ../LICENSES.dependencies
cd libclamav_rust
%cargo_license_summary
@@ -398,7 +414,7 @@ cd libclamav_rust
%install
rm -rf _doc*
-%cmake3_install
+%cmake_install
install -d -m 0755 \
%{buildroot}%{_tmpfilesdir} \
@@ -483,17 +499,21 @@ install -m 0644 %SOURCE1 %{buildroot}%{_includedir}/clamav-types.h
# TODO: Evaluate using upstream's unit with clamav-daemon.socket
rm %{buildroot}%{_unitdir}/clamav-daemon.*
+install -m0644 -D clamav.sysusers.conf %{buildroot}%{_sysusersdir}/clamav.conf
+install -m0644 -D clamd.sysusers.conf %{buildroot}%{_sysusersdir}/clamd.conf
+install -m0644 -D clamav-milter.sysusers.conf %{buildroot}%{_sysusersdir}/clamav-milter.conf
+
%check
%ifarch s390x
# Tests fail on s390x
# https://github.com/Cisco-Talos/clamav/issues/759
-%ctest3 -- -E valgrind || :
+%ctest -E valgrind || :
%else
-%ctest3 -- -E valgrind
+%ctest -E valgrind
%endif
# valgrind tests fail https://github.com/Cisco-Talos/clamav/issues/584
-%ctest3 -- -R valgrind || :
+%ctest -R valgrind || :
%post
@@ -516,24 +536,6 @@ do
[ -f $f -a $f -nt $cvd ] && rm -f $cvd || :
done
-%pre filesystem
-getent group %{updateuser} >/dev/null || groupadd -r %{updateuser}
-getent passwd %{updateuser} >/dev/null || \
- useradd -r -g %{updateuser} -d %{homedir} -s /sbin/nologin \
- -c "Clamav database update user" %{updateuser}
-getent group virusgroup >/dev/null || groupadd -r virusgroup
-usermod %{updateuser} -a -G virusgroup
-exit 0
-
-
-%pre -n clamd
-getent group %{scanuser} >/dev/null || groupadd -r %{scanuser}
-getent passwd %{scanuser} >/dev/null || \
- useradd -r -g %{scanuser} -d / -s /sbin/nologin \
- -c "Clamav scanner user" %{scanuser}
-usermod %{scanuser} -a -G virusgroup
-exit 0
-
%post -n clamd
# Point to the new service unit
[ -L /etc/systemd/system/multi-user.target.wants/clamd@scan.service ] &&
@@ -546,19 +548,6 @@ exit 0
%postun -n clamd
%systemd_postun_with_restart clamd@scan.service
-%triggerin milter -- clamav-scanner
-# Add the milteruser to the scanuser group; this is required when
-# milter and clamd communicate through local sockets
-/usr/sbin/groupmems -g %{scanuser} -a %{milteruser} &>/dev/null || :
-
-%pre milter
-getent group %{milteruser} >/dev/null || groupadd -r %{milteruser}
-getent passwd %{milteruser} >/dev/null || \
- useradd -r -g %{milteruser} -d %{_rundir}/clamav-milter -s /sbin/nologin \
- -c "Clamav Milter user" %{milteruser}
-usermod %{milteruser} -a -G virusgroup
-exit 0
-
%post milter
%systemd_post clamav-milter.service
@@ -625,6 +614,7 @@ exit 0
%dir %{_sysconfdir}/clamd.d
# Used by both clamd, clamdscan, and clamonacc
%config(noreplace) %{_sysconfdir}/clamd.d/scan.conf
+%{_sysusersdir}/clamav.conf
%files data
@@ -664,6 +654,7 @@ exit 0
%{_sbindir}/clamd
%{_unitdir}/clamd@.service
%{_tmpfilesdir}/clamd.scan.conf
+%{_sysusersdir}/clamd.conf
%files milter
@@ -674,26 +665,45 @@ exit 0
%dir %{_sysconfdir}/mail
%config(noreplace) %{_sysconfdir}/mail/clamav-milter.conf
%{_tmpfilesdir}/clamav-milter.conf
+%{_sysusersdir}/clamav-milter.conf
%changelog
+* Wed Mar 04 2026 Gwyn Ciesla <gwync@protonmail.com> - 1.4.4-1
+- Update to 1.4.4
+
+* Thu Jan 29 2026 Fabio Valentini <decathorpe@gmail.com> - 1.4.3-6
+- Bump rust-bindgen version to 0.72 for compatibility with LLVM 22
+
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
* Thu Dec 04 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.4.3-3
- Bump EVR, hex-literal patches.
-* Mon Aug 25 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.4.3-2
-- Revert sysuser change
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-* Wed Jul 23 2025 Orion Poplawski <orion@nwra.com> - 1.4.1-1
-- Update to 1.4.1
+* Wed Jun 18 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.4.3-1
+- 1.4.3
-* Wed Jul 23 2025 Orion Poplawski <orion@nwra.com> - 1.0.9-2
-- Update the image crate dependency to 0.25, the current release
+* Sat Feb 8 2025 Zbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl> - 1.4.2-2
+- Add sysusers.d config files to allow rpm to create users/groups automatically
+
+* Thu Jan 23 2025 Orion Poplawski <orion@nwra.com> - 1.4.2-1
+- Update to 1.4.2
-* Wed Jun 18 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.0.9-1
-- Update to 1.0.9
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-* Sun Jan 26 2025 Orion Poplawski <orion@nwra.com> - 1.0.8-1
-- Update to 1.0.8
+* Wed Sep 25 2024 Orion Poplawski <orion@nwra.com> - 1.4.1-1
+- Update to 1.4.1
+
+* Sun Sep 15 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 1.0.7-2
+- Update the image crate dependency to 0.25, the current release
* Thu Sep 05 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 1.0.7-1
- Update to 1.0.7
diff --git a/sources b/sources
index 71ea01c..df6e9ec 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (clamav-1.4.3-norar.tar.xz) = d9e6835b88e4934a36b037d28cf01e627b7843e52ef9fc6858f59000acf26120f3534e7a6b262d3ad66a2668557f3a1d0a93fb676711c91f64c8b97fa36fe191
-SHA512 (main-62.cvd) = b52e5d9ecacbd9b11c3b0cc460388746fccb353a7520522ed15ee25f645a432bed5be7e6b38512f134f085eb9be76a1e26c19de8b09491d4ec46da8c5afc318e
-SHA512 (daily-27673.cvd) = e0447f80ef2cc8981b0e1ea430a7006a1027de0b989f5a3256766804f74a50aac52f577ef929c8e1789b9353d1a4cf18d289a27b1f7e609098e11ad81bb62226
-SHA512 (bytecode-336.cvd) = 62a7f8b62da2a2476d3f66851d71e84f055f84543112b18f14e86484b02370d4daff0cb3e2b9ec77acf4a179327619a8b9950122e7882003074a9a0bf4a7ebab
+SHA512 (clamav-1.4.4-norar.tar.xz) = e70ad93aa776fe93f29e829eaf76ee30d733ba7456f7eef95d0d30bc611a25549234c4266e0492f0b9a2781bba5adc2c43b903e12e897aedb4f89c8a06babf4e
+SHA512 (bytecode-339.cvd) = 14614110b4bf1c24d7fe8a0e152380b155e6cf7b218138398f3d359a865d011a733dae3c76c85227711c423e71d07b627b3ea9881bfe1e8c63fd33a2552be094
+SHA512 (daily-27930.cvd) = 46b4a1ffa149cccd669a9f6be2ae3db9eaa77a9bc375dea39d0bd64a2f20549f51a3e85b197584968064494df163ead13580298fa8fe3a5d30446ef8a526751f
+SHA512 (main-63.cvd) = e20a7b1998dfc56ff1f52faf67a97071680d98f7f12bb58541f3144118eb4f8765fd41be57bcdc55147630ab87d4471c450e04881fcc42eb68fcf8101eddef3a
diff --git a/update_clamav.sh b/update_clamav.sh
index 7718896..9f542a9 100755
--- a/update_clamav.sh
+++ b/update_clamav.sh
@@ -1,4 +1,4 @@
-VERSION=1.4.3
+VERSION=1.4.4
REPOS="n"
if [ -z "$1" ]
diff --git a/clamav.spec b/clamav.spec
index 5f35cc6..3513d9d 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -407,6 +407,10 @@ cd libclamav_rust
%cargo_license_summary
%{cargo_license} > ../LICENSES.dependencies
+cd libclamav_rust
+%cargo_license_summary
+%{cargo_license} > ../LICENSES.dependencies
+
%install
rm -rf _doc*
reply other threads:[~2026-07-02 19:48 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178302173590.1.6700205174439786215.rpms-clamav-a3d2248d0787@fedoraproject.org \
--to=gwync@protonmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox