public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/clamav-unofficial-sigs] epel9: Update to upstream.
@ 2026-07-04 16:28 Jan ONDREJ
  0 siblings, 0 replies; 3+ messages in thread
From: Jan ONDREJ @ 2026-07-04 16:28 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/clamav-unofficial-sigs
            Branch : epel9
            Commit : e44be220d555604c21ef19456f81fc366d17b1e4
            Author : Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
            Date   : 2026-07-04T18:28:08+02:00
            Stats  : +98/-23 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/clamav-unofficial-sigs/c/e44be220d555604c21ef19456f81fc366d17b1e4?branch=epel9

            Log:
            Update to upstream.

Cleanup spec file, remove very old conditions.

---
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 e67c94b..06df898 100644
--- a/clamav-unofficial-sigs.spec
+++ b/clamav-unofficial-sigs.spec
@@ -13,14 +13,16 @@ 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:  bind-utils
 BuildRequires:  rsync
 %if %{with_systemd}
 BuildRequires:  systemd
 %endif
-Requires:       clamav clamav-update rsync gnupg diffutils curl
-Requires:       (bind-utils or bind9.16-utils)
+Requires:       clamav clamav-update rsync gnupg diffutils curl bind-utils
 %if %{with_systemd}
 Requires(post): systemd-sysv
 %endif
@@ -138,9 +140,12 @@ install -p -m0644 clamav-unofficial-sigs.man8 %{buildroot}%{_mandir}/man8/clamav
 
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+<<<<<<< HEAD
 
 * Fri May 13 2022 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 7.2.5-4
 - Change dependency on bind-utils or bind9.16-utils (bz#2084662).
+=======
+>>>>>>> b2b28cf5925c0726afc240895184133d2f11758f
 
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

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 a4813d1..06df898 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
@@ -49,18 +44,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
@@ -78,11 +66,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
@@ -110,6 +94,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
 
@@ -134,6 +140,12 @@ install -p -m0644 clamav-unofficial-sigs.man8 %{buildroot}%{_mandir}/man8/clamav
 
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+<<<<<<< HEAD
+
+* Fri May 13 2022 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 7.2.5-4
+- Change dependency on bind-utils or bind9.16-utils (bz#2084662).
+=======
+>>>>>>> b2b28cf5925c0726afc240895184133d2f11758f
 
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [rpms/clamav-unofficial-sigs] epel9: Update to upstream.
@ 2026-07-04 16:28 Jan ONDREJ
  0 siblings, 0 replies; 3+ messages in thread
From: Jan ONDREJ @ 2026-07-04 16:28 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/clamav-unofficial-sigs
            Branch : epel9
            Commit : 685338ded4049e837e49c51dc089cee0aa6fdf55
            Author : Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
            Date   : 2026-07-04T18:27:28+02:00
            Stats  : +60/-26 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/clamav-unofficial-sigs/c/685338ded4049e837e49c51dc089cee0aa6fdf55?branch=epel9

            Log:
            Update to upstream.

Cleanup spec file, remove very old conditions.

---
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 4f8a64f..e67c94b 100644
--- a/clamav-unofficial-sigs.spec
+++ b/clamav-unofficial-sigs.spec
@@ -1,18 +1,13 @@
-%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:        4%{?dist}
+Version:        8.0.0
+Release:        1%{?dist}
 Summary:        Scripts to download unofficial clamav signatures 
 Group:          Applications/System
-License:        BSD
+License:        BSD-3-Clause
 URL:            https://github.com/extremeshok/%{name}
 Source0:        https://github.com/extremeshok/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 Source1:        clamav-unofficial-sigs.cron
@@ -39,6 +34,7 @@ INetMsg and ScamNailer.
 
 %prep
 %setup -qn %{name}-%{version}
+%autopatch -p1
 sed -i -e '/user_configuration_complete/ s/^#//' config/user.conf
 sed -i -e '/ExecStart/ s^/usr/local/sbin^/usr/sbin^' systemd/clamav-unofficial-sigs.service
 
@@ -46,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
@@ -75,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
@@ -88,9 +73,6 @@ install -p -m0644 clamav-unofficial-sigs.cron %{buildroot}%{_sysconfdir}/cron.d/
 install -p -m0644 clamav-unofficial-sigs.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav-unofficial-sigs
 install -p -m0644 clamav-unofficial-sigs.man8 %{buildroot}%{_mandir}/man8/clamav-unofficial-sigs.8
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %doc README.md 
 %license LICENSE
@@ -110,6 +92,53 @@ rm -rf %{buildroot}
 %{_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
+
+* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.5-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.5-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Nov 04 2023 Didier Fabert <didier.fabert@gmail.com> - 7.2.5-8
+- migrated to SPDX license
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Apr 17 2023 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 7.2.5-6
+- Fix: grep: warning: stray \ before "
+- Remove clean section
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Fri May 13 2022 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 7.2.5-4
 - Change dependency on bind-utils or bind9.16-utils (bz#2084662).
 

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.spec b/clamav-unofficial-sigs.spec
index 5508415..e67c94b 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
@@ -138,6 +139,9 @@ install -p -m0644 clamav-unofficial-sigs.man8 %{buildroot}%{_mandir}/man8/clamav
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
+* Fri May 13 2022 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 7.2.5-4
+- Change dependency on bind-utils or bind9.16-utils (bz#2084662).
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [rpms/clamav-unofficial-sigs] epel9: Update to upstream.
@ 2026-07-04 16:28 Jan ONDREJ
  0 siblings, 0 replies; 3+ messages in thread
From: Jan ONDREJ @ 2026-07-04 16:28 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/clamav-unofficial-sigs
            Branch : epel9
            Commit : 40d0e969affd86baf62fd39e4bcdedeb4635bb2f
            Author : Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
            Date   : 2026-07-04T06:51:58+02:00
            Stats  : +9/-103 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/clamav-unofficial-sigs/c/40d0e969affd86baf62fd39e4bcdedeb4635bb2f?branch=epel9

            Log:
            Update to upstream.

Cleanup spec file, remove very old conditions.

---
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-7.2.5-urlhaus.patch b/clamav-unofficial-sigs-7.2.5-urlhaus.patch
deleted file mode 100644
index 16378a3..0000000
--- a/clamav-unofficial-sigs-7.2.5-urlhaus.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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
- 
-From a586c14f83e4f849944c17a0c11badd5361ff69c Mon Sep 17 00:00:00 2001
-From: Jeffrey Jansma <me@perplexity.nl>
-Date: Mon, 12 Apr 2021 12:19:26 +0200
-Subject: [PATCH] Fix url workdir typo
-
-Fix url workdir typo
----
- clamav-unofficial-sigs.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
-index 36b7cfb2..c7928209 100755
---- a/clamav-unofficial-sigs.sh
-+++ b/clamav-unofficial-sigs.sh
-@@ -1920,7 +1920,7 @@ if [ -z "$work_dir_malwarepatrol" ] ; then
- else
-   shopt -s extglob; work_dir_malwarepatrol="${work_dir_malwarepatrol%%+(/)}"
- fi
--if [ -z "$work_dir_urlhaust" ] ; then
-+if [ -z "$work_dir_urlhaus" ] ; then
-   work_dir_urlhaus="$(echo "${work_dir}/${urlhaus_dir}" | $sed_bin 's:/*$::')"
- else
-   shopt -s extglob; work_dir_urlhaus="${work_dir_urlhaus%%+(/)}"

diff --git a/clamav-unofficial-sigs-grep-backslash.patch b/clamav-unofficial-sigs-grep-backslash.patch
deleted file mode 100644
index c2296da..0000000
--- a/clamav-unofficial-sigs-grep-backslash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 fdf9b1b..5508415 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:        17%{?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
 BuildRequires:  rsync
@@ -49,18 +41,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
@@ -78,11 +63,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
@@ -110,6 +91,10 @@ 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
 

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-07-04 16:28 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-04 16:28 [rpms/clamav-unofficial-sigs] epel9: Update to upstream Jan ONDREJ
  -- strict thread matches above, loose matches on Subject: below --
2026-07-04 16:28 Jan ONDREJ
2026-07-04 16:28 Jan ONDREJ

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox