public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
To: git-commits@fedoraproject.org
Subject: [rpms/clamav-unofficial-sigs] epel9: Remove unused patches.
Date: Sat, 04 Jul 2026 16:32:57 GMT	[thread overview]
Message-ID: <178318277781.1.15423837143943908110.rpms-clamav-unofficial-sigs-21ddd16aa116@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/clamav-unofficial-sigs
Branch : epel9
Commit : 21ddd16aa1168b1150641cc4db7effada6ef28f5
Author : Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date   : 2026-07-04T18:32:29+02:00
Stats  : +0/-66 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/clamav-unofficial-sigs/c/21ddd16aa1168b1150641cc4db7effada6ef28f5?branch=epel9

Log:
Remove unused patches.

---
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 06324da..0000000
--- a/clamav-unofficial-sigs-7.2.5-urlhaus.patch
+++ /dev/null
@@ -1,45 +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
- 

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 06df898..5508415 100644
--- a/clamav-unofficial-sigs.spec
+++ b/clamav-unofficial-sigs.spec
@@ -13,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
@@ -140,12 +137,6 @@ 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

                 reply	other threads:[~2026-07-04 16:32 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=178318277781.1.15423837143943908110.rpms-clamav-unofficial-sigs-21ddd16aa116@fedoraproject.org \
    --to=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