[rkhunter] Add patch for now to help spaces in allowdev file handling. Fixes bug #984180

Kevin Fenzi kevin at fedoraproject.org
Sun Sep 1 19:07:34 UTC 2013


commit bc6587ce481fc46bd4a88c21fd84cc388370df42
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sun Sep 1 13:07:20 2013 -0600

    Add patch for now to help spaces in allowdev file handling. Fixes bug #984180

 rkhunter-1.4.0-allowdevfile-space.patch |   21 +++++++++++++++++++++
 rkhunter.spec                           |    8 ++++++++
 2 files changed, 29 insertions(+), 0 deletions(-)
---
diff --git a/rkhunter-1.4.0-allowdevfile-space.patch b/rkhunter-1.4.0-allowdevfile-space.patch
new file mode 100644
index 0000000..74d06f2
--- /dev/null
+++ b/rkhunter-1.4.0-allowdevfile-space.patch
@@ -0,0 +1,21 @@
+diff -Nur rkhunter-1.4.0.orig/files/rkhunter rkhunter-1.4.0/files/rkhunter
+--- rkhunter-1.4.0.orig/files/rkhunter	2012-05-01 09:14:11.000000000 -0600
++++ rkhunter-1.4.0/files/rkhunter	2013-09-01 13:05:39.260244636 -0600
+@@ -3593,14 +3593,14 @@
+ 	ALLOWDEVFILE_OPT=`get_option 2 multi ALLOWDEVFILE` || exit 1
+ 
+ 	if [ -n "${ALLOWDEVFILE_OPT}" ]; then
++
++		check_paths ALLOWDEVFILE_OPT ALLOWDEVFILE
++
+ 		#
+ 		# We 'echo' the variable so that any wildcards get expanded.
+ 		#
+ 
+ 		ALLOWDEVFILES=`echo ${ALLOWDEVFILE_OPT}`
+-
+-		check_paths ALLOWDEVFILES ALLOWDEVFILE
+-
+ 		ALLOWDEVFILES=`echo " ${ALLOWDEVFILES} " | tr '%' ' '`
+ 	fi
+ 
diff --git a/rkhunter.spec b/rkhunter.spec
index 4371500..9742e40 100644
--- a/rkhunter.spec
+++ b/rkhunter.spec
@@ -13,6 +13,9 @@ Source0:        http://downloads.sourceforge.net/rkhunter/rkhunter-%{version}.ta
 Source2:        01-rkhunter
 Source3:        rkhunter.sysconfig
 Patch0:         rkhunter-1.4.0-fedoraconfig.patch
+# Patch to help with spaces in allow dev file. 
+# https://bugzilla.redhat.com/show_bug.cgi?id=984180
+Patch1:         rkhunter-1.4.0-allowdevfile-space.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,6 +35,8 @@ and other unwanted tools.
 
 %patch0 -p1
 
+%patch1 -p1
+
 %{__cat} <<'EOF' >%{name}.logrotate
 %{_localstatedir}/log/%{name}/%{name}.log {
     weekly
@@ -99,6 +104,9 @@ EOF
 %{_mandir}/man8/*
 
 %changelog
+* Sun Sep 01 2013 Kevin Fenzi <kevin at scrye.com> 1.4.0-9
+- Add patch for now to help spaces in allowdev file handling. Fixes bug #984180
+
 * Sat Aug 03 2013 Petr Pisar <ppisar at redhat.com> - 1.4.0-9
 - Perl 5.18 rebuild
 


More information about the scm-commits mailing list