[rkhunter/el5: 40/40] Merge remote-tracking branch 'origin/el6' into el5

[Kevin Fenzi]

commit 119fea2d6e2f704e23d6b309d5c8329f7754a865
Merge: 15dfb57 d7a3757
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sun May 13 14:21:01 2012 -0600

    Merge remote-tracking branch 'origin/el6' into el5
    
    Conflicts:
    	.gitignore
    	rkhunter.spec
    	sources

 .gitignore                                         |    2 +
 rkhunter-1.3.4.tar.gz.sha1.txt                     |   48 -----
 rkhunter-1.3.6-fedoraconfig.patch                  |  196 --------------------
 ...nfig.patch => rkhunter-1.4.0-fedoraconfig.patch |   94 ++++++----
 rkhunter.spec                                      |   19 ++-
 sources                                            |    2 +-
 6 files changed, 73 insertions(+), 288 deletions(-)
---
diff --cc rkhunter-1.4.0-fedoraconfig.patch
index d9f410f,0bc24dd..ae5f5a8
--- a/rkhunter-1.4.0-fedoraconfig.patch
+++ b/rkhunter-1.4.0-fedoraconfig.patch
@@@ -1,16 -1,7 +1,7 @@@
- diff -Nur rkhunter-1.3.8.orig/files/rkhunter.conf rkhunter-1.3.8/files/rkhunter.conf
- --- rkhunter-1.3.8.orig/files/rkhunter.conf	2010-11-13 13:25:22.000000000 -0700
- +++ rkhunter-1.3.8/files/rkhunter.conf	2010-12-07 18:49:08.194871526 -0700
- @@ -76,7 +76,7 @@
-  # NOTE: This option should be present in the configuration file.
-  #
-  #MAIL-ON-WARNING=me at mydomain   root at mydomain
- -MAIL-ON-WARNING=""
- +MAIL-ON-WARNING="root"
-  
-  #
-  # Specify the mail command to use if MAIL-ON-WARNING is set.
- @@ -94,16 +94,19 @@
+ diff -Nur rkhunter-1.4.0.orig/files/rkhunter.conf rkhunter-1.4.0/files/rkhunter.conf
+ --- rkhunter-1.4.0.orig/files/rkhunter.conf	2011-12-17 14:36:02.000000000 -0700
 -+++ rkhunter-1.4.0/files/rkhunter.conf	2012-05-13 11:55:13.636876200 -0600
+++++ rkhunter-1.4.0/files/rkhunter.conf	2012-05-13 13:53:35.189364175 -0600
+ @@ -100,16 +100,19 @@
   # sure that the directory permissions are tight.
   #
   #TMPDIR=/var/lib/rkhunter/tmp
@@@ -144,16 -155,26 +155,27 @@@
   
   #
   # Allow the specified processes to use deleted files. The
- @@ -583,6 +620,8 @@
 -@@ -586,6 +634,18 @@
++@@ -586,6 +634,19 @@
   #
   #ALLOWDEVFILE="/dev/shm/pulse-shm-*"
   #ALLOWDEVFILE="/dev/shm/sem.ADBE_*"
  +ALLOWDEVFILE=/dev/shm/pulse-shm-*
  +ALLOWDEVFILE=/dev/md/md-device-map
+ +# tomboy creates this one
+ +ALLOWDEVFILE="/dev/shm/mono.*"
+ +# created by libv4l
+ +ALLOWDEVFILE="/dev/shm/libv4l-*"
+ +# created by spice video
+ +ALLOWDEVFILE="/dev/shm/spice.*"
+ +ALLOWDEVFILE=/dev/.mdadm.map
+ +ALLOWDEVFILE=/dev/.udev/queue.bin
+ +ALLOWDEVFILE=/dev/.udev/db/*
+ +ALLOWDEVFILE=/dev/.udev/rules.d/99-root.rules
+++ALLOWDEVFILE=/dev/.udev/uevent_seqnum
   
   #
   # This setting tells rkhunter where the inetd configuration
- @@ -721,6 +760,7 @@
 -@@ -724,6 +784,7 @@
++@@ -724,6 +785,7 @@
   # The option may be specified more than once.
   #
   #SUSPSCAN_DIRS="/tmp /var/tmp"
@@@ -161,7 -182,7 +183,7 @@@
   
   #
   # Directory for temporary files. A memory-based one is better (faster).
- @@ -976,3 +1016,5 @@
 -@@ -980,3 +1041,5 @@
++@@ -980,3 +1042,5 @@
   # both programs, then disable the 'hidden_procs' test.
   #
   #DISABLE_UNHIDE=0