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 6a1bceb..7c633e4 100644 --- a/clamav-unofficial-sigs.spec +++ b/clamav-unofficial-sigs.spec @@ -9,7 +9,7 @@ %endif Name: clamav-unofficial-sigs Version: 7.2.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Scripts to download unofficial clamav signatures Group: Applications/System License: BSD @@ -18,6 +18,7 @@ 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 BuildArch: noarch BuildRequires: bind-utils BuildRequires: rsync @@ -38,6 +39,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 @@ -87,9 +89,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 @@ -109,6 +108,10 @@ rm -rf %{buildroot} %{_mandir}/man*/%{name}* %changelog +* Mon Apr 17 2023 Ján ONDREJ (SAL) - 7.2.5-6 +- Fix: grep: warning: stray \ before " +- Remove clean section + * Wed Jan 18 2023 Fedora Release Engineering - 7.2.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild