public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/clamav-unofficial-sigs] epel8: Merge branch 'rawhide' into epel8
@ 2026-07-04 16:51 Jan ONDREJ
0 siblings, 0 replies; only message in thread
From: Jan ONDREJ @ 2026-07-04 16:51 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/clamav-unofficial-sigs
Branch : epel8
Commit : c2879b57342a87e7bd89fc95192de05eec5f12d9
Author : Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date : 2026-07-04T18:51:11+02:00
Stats : +87/-25 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/clamav-unofficial-sigs/c/c2879b57342a87e7bd89fc95192de05eec5f12d9?branch=epel8
Log:
Merge branch 'rawhide' into epel8
---
diff --git a/.gitignore b/.gitignore
index c219d73..1a291db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/clamav-unofficial-sigs-7.2.2.tar.gz
/clamav-unofficial-sigs-7.2.4.tar.gz
/clamav-unofficial-sigs-7.2.5.tar.gz
+/clamav-unofficial-sigs-8.0.0.tar.gz
diff --git a/clamav-unofficial-sigs.spec b/clamav-unofficial-sigs.spec
index 762d203..9f94b10 100644
--- a/clamav-unofficial-sigs.spec
+++ b/clamav-unofficial-sigs.spec
@@ -1,15 +1,10 @@
-%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
%global with_systemd 1
%global clamupdateuser clamupdate
%global clamupdategrp clamupdate
-%else
-%global with_systemd 0
-%global clamupdateuser clam-update
-%global clamupdategrp clam-update
-%endif
+
Name: clamav-unofficial-sigs
-Version: 7.2.5
-Release: 11%{?dist}
+Version: 8.0.0
+Release: 1%{?dist}
Summary: Scripts to download unofficial clamav signatures
Group: Applications/System
License: BSD-3-Clause
@@ -18,9 +13,6 @@ Source0: https://github.com/extremeshok/%{name}/archive/%{version}/%{name
Source1: clamav-unofficial-sigs.cron
Source2: clamav-unofficial-sigs.logrotate
Source3: clamav-unofficial-sigs.man8
-Patch1: clamav-unofficial-sigs-grep-backslash.patch
-# Fix urlhaus mkdir and ownership (https://github.com/extremeshok/clamav-unofficial-sigs/pull/390)
-Patch2: https://patch-diff.githubusercontent.com/raw/extremeshok/clamav-unofficial-sigs/pull/390.patch#/clamav-unofficial-sigs-7.2.5-urlhaus.patch
BuildArch: noarch
BuildRequires: (bind-utils or bind9.16-utils)
BuildRequires: rsync
@@ -50,18 +42,11 @@ sed -i -e '/ExecStart/ s^/usr/local/sbin^/usr/sbin^' systemd/clamav-unofficial-s
cp %{SOURCE1} clamav-unofficial-sigs.cron
cp %{SOURCE2} clamav-unofficial-sigs.logrotate
cp %{SOURCE3} clamav-unofficial-sigs.man8
-%if 0%{?rhel} && 0%{?rhel} == 6
-sed -i -e '/create/ s/clamupdate/%{clamupdateuser}/g' clamav-unofficial-sigs.logrotate
-%endif
# Fix shebang
sed -i -e 's^/usr/bin/env bash^/bin/bash^g' clamav-unofficial-sigs.sh
sed -i -e 's^/usr/bin/bash^/bin/bash^g' clamav-unofficial-sigs.cron
-%if 0%{?rhel} && 0%{?rhel} <= 7
-sed -i -e '/^#pkg_mgr/ s/^#//;s/""/"yum"/' config/master.conf
-%else
sed -i -e '/^#pkg_mgr/ s/^#//;s/""/"dnf"/' config/master.conf
-%endif
# Fix script path
sed -i -e '/ExecStart=/ s|/usr/local/sbin|%{_sbindir}|' systemd/clamav-unofficial-sigs.service
# Disable yara rules
@@ -79,11 +64,7 @@ install -d -p %{buildroot}%{_sysconfdir}/logrotate.d
install -d -p %{buildroot}%{_mandir}/man8
install -p -m0755 clamav-unofficial-sigs.sh %{buildroot}%{_sbindir}/clamav-unofficial-sigs.sh
# config/packaging/os.centos7.conf file is for epel and fedora
-%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
install -p -m0644 config/packaging/os.centos7.conf %{buildroot}%{_sysconfdir}/%{name}/os.conf
-%else
-install -p -m0644 config/packaging/os.centos6.conf %{buildroot}%{_sysconfdir}/%{name}/os.conf
-%endif
install -p -m0644 config/user.conf %{buildroot}%{_sysconfdir}/%{name}/user.conf
install -p -m0644 config/master.conf %{buildroot}%{_sysconfdir}/%{name}/master.conf
install -Dp -m 0644 systemd/clamav-unofficial-sigs.service %{buildroot}%{_unitdir}/clamav-unofficial-sigs.service
@@ -111,6 +92,28 @@ install -p -m0644 clamav-unofficial-sigs.man8 %{buildroot}%{_mandir}/man8/clamav
%{_mandir}/man*/%{name}*
%changelog
+* Fri Jul 03 2026 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 8.0.0-1
+- Update to upstream.
+- Cleanup spec file, remove very old conditions.
+
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.5-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.5-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.5-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Jul 17 2025 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 7.2.5-14
+- Fix urlhaus typo too (bz#1949414)
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.5-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.5-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
* Thu May 16 2024 Robert Scheck <robert@fedoraproject.org> - 7.2.5-11
- Added upstream patch to fix urlhaus mkdir and ownership
diff --git a/sources b/sources
index c6cd213..2bfcd2f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (clamav-unofficial-sigs-7.2.5.tar.gz) = 04f97782d1b1632834eeeb5c2c90d18490c154a9a73c8ec461af5d42e7786dc6650dbb12520868a2693f849bfba71d208d3981a2e28a8a6092780745a84c9b57
+SHA512 (clamav-unofficial-sigs-8.0.0.tar.gz) = 2eb0744a2cee05bde789fad96c902d5119053a0ac8a8b0ffc9fb9c06bbbba83cf7d76ed8e70ddefa21aa3dbfc6699217885bd9f3379029bd29e9a5b58a6f7a4a
diff --git a/clamav-unofficial-sigs-7.2.5-urlhaus.patch b/clamav-unofficial-sigs-7.2.5-urlhaus.patch
new file mode 100644
index 0000000..06324da
--- /dev/null
+++ b/clamav-unofficial-sigs-7.2.5-urlhaus.patch
@@ -0,0 +1,45 @@
+From af01c650a64b8a6ec455d36a00b07791acae8278 Mon Sep 17 00:00:00 2001
+From: Jeffrey Jansma <me@perplexity.nl>
+Date: Wed, 14 Apr 2021 08:46:26 +0200
+Subject: [PATCH 1/2] Fix urlhaus ownership and mkdir
+
+Fix urlhaus ownership and mkdir
+---
+ clamav-unofficial-sigs.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
+index 36b7cfb2..07e1020c 100755
+--- a/clamav-unofficial-sigs.sh
++++ b/clamav-unofficial-sigs.sh
+@@ -2763,6 +2763,7 @@ xshok_mkdir_ownership "$work_dir_sanesecurity"
+ xshok_mkdir_ownership "$work_dir_securiteinfo"
+ xshok_mkdir_ownership "$work_dir_work_configs"
+ xshok_mkdir_ownership "$work_dir_yararulesproject"
++xshok_mkdir_ownership "$work_dir_urlhaus"
+
+ # Set secured access permissions to the GPG directory
+ perms chmod -f 0700 "${work_dir_gpg}"
+
+From 05374882c679ec02360fbce71262aaf0a30662f2 Mon Sep 17 00:00:00 2001
+From: Jeffrey Jansma <me@perplexity.nl>
+Date: Wed, 14 Apr 2021 08:47:16 +0200
+Subject: [PATCH 2/2] Add urlhaus to the update hours force
+
+Add urlhaus to the update hours force
+---
+ clamav-unofficial-sigs.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
+index 07e1020c..885eff5f 100755
+--- a/clamav-unofficial-sigs.sh
++++ b/clamav-unofficial-sigs.sh
+@@ -2173,6 +2173,7 @@ if [ "$force_updates" == "yes" ] ; then
+ malwareexpert_update_hours="0"
+ malwarepatrol_update_hours="0"
+ yararulesproject_update_hours="0"
++ urlhaus_update_hours="0"
+ additional_update_hours="0"
+ fi
+
diff --git a/clamav-unofficial-sigs-grep-backslash.patch b/clamav-unofficial-sigs-grep-backslash.patch
new file mode 100644
index 0000000..c2296da
--- /dev/null
+++ b/clamav-unofficial-sigs-grep-backslash.patch
@@ -0,0 +1,12 @@
+diff -urN clamav-unofficial-sigs-7.2.5/clamav-unofficial-sigs.sh clamav-unofficial-sigs-7.2.5.fixed/clamav-unofficial-sigs.sh
+--- clamav-unofficial-sigs-7.2.5/clamav-unofficial-sigs.sh 2021-03-20 03:49:21.000000000 +0100
++++ clamav-unofficial-sigs-7.2.5.fixed/clamav-unofficial-sigs.sh 2023-04-17 10:20:54.020368888 +0200
+@@ -1832,7 +1832,7 @@
+ fi
+
+ # Check there is an = for every set of "" optional whitespace \s* between = and "
+- config_check_vars="$(echo "$clean_config" | $grep_bin -c '=[[:space:]]*\"' )"
++ config_check_vars="$(echo "$clean_config" | $grep_bin -c '=[[:space:]]*"' )"
+
+ if [ $(( ${#config_check} / 2 )) -ne "$config_check_vars" ] ; then
+ xshok_pretty_echo_and_log "ERROR: Your configuration has errors, every = requires a pair of \"\""
diff --git a/clamav-unofficial-sigs.spec b/clamav-unofficial-sigs.spec
index 5508415..9f94b10 100644
--- a/clamav-unofficial-sigs.spec
+++ b/clamav-unofficial-sigs.spec
@@ -14,12 +14,13 @@ Source1: clamav-unofficial-sigs.cron
Source2: clamav-unofficial-sigs.logrotate
Source3: clamav-unofficial-sigs.man8
BuildArch: noarch
-BuildRequires: bind-utils
+BuildRequires: (bind-utils or bind9.16-utils)
BuildRequires: rsync
%if %{with_systemd}
BuildRequires: systemd
%endif
-Requires: clamav clamav-update rsync gnupg diffutils curl bind-utils
+Requires: clamav clamav-update rsync gnupg diffutils curl
+Requires: (bind-utils or bind9.16-utils)
%if %{with_systemd}
Requires(post): systemd-sysv
%endif
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-04 16:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-04 16:51 [rpms/clamav-unofficial-sigs] epel8: Merge branch 'rawhide' into epel8 Jan ONDREJ
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox