From 97c2b729d777fbfd028b92d389cea8f319df2ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 26 Jul 2018 00:30:28 +0100 Subject: [PATCH] As written in [1] the clamav-0.99.1-setsebool.patch is pointless. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1449616#c1 --- clamav-0.99.1-setsebool.patch | 15 --------------- clamav.spec | 2 -- 2 files changed, 17 deletions(-) delete mode 100644 clamav-0.99.1-setsebool.patch diff --git a/clamav-0.99.1-setsebool.patch b/clamav-0.99.1-setsebool.patch deleted file mode 100644 index f168b55..0000000 --- a/clamav-0.99.1-setsebool.patch +++ /dev/null @@ -1,15 +0,0 @@ -Patch by Robert Scheck for clamav >= 0.99.1 which changes the SELinux -boolean name from the obsolete (and former alias) clamd_use_jit to the current antivirus_use_jit. -See also: https://bugzilla.redhat.com/show_bug.cgi?id=1295473 - ---- clamav-0.99.1/libclamav/builtin_bytecodes.h 2015-12-11 17:26:02.000000000 +0100 -+++ clamav-0.99.1/libclamav/builtin_bytecodes.h.setsebool 2016-03-29 23:32:03.000000000 +0200 -@@ -139,7 +139,7 @@ - if (env.os_features & (1 << feature_selinux)) - /* all SELinux versions deny RWX mapping when policy says so */ - disable_jit_if("^SELinux is preventing 'execmem' access.\n" -- "Run 'setsebool -P clamd_use_jit on'.", 0, 1); -+ "Run 'setsebool -P antivirus_use_jit on'.", 0, 1); - else if (env.os_features & (1 << feature_pax)) - /* recent versions of PaX deny RWX mapping */ - disable_jit_if("^PaX is preventing 'mprotect' access.\n" diff --git a/clamav.spec b/clamav.spec index 9f29ff4..cea5891 100644 --- a/clamav.spec +++ b/clamav.spec @@ -116,7 +116,6 @@ Patch24: clamav-0.99-private.patch Patch27: clamav-0.100.0-umask.patch # https://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp?r1=128086&r2=137567 Patch30: llvm-glibc.patch -Patch31: clamav-0.99.1-setsebool.patch BuildRequires: autoconf automake gettext-devel libtool libtool-ltdl-devel @@ -354,7 +353,6 @@ Empty package just to allow migration of service without stop it and disable it %apply -n24 -p1 -b .private %apply -n27 -p1 -b .umask %apply -n30 -p1 -%apply -n31 -p1 -b .setsebool %{?apply_end} install -p -m0644 %SOURCE300 clamav-milter/