[chkrootkit/f12/master: 43/43] Merge branch 'master' into f12

[Jon Ciesla]

commit 1a227c4d3019328fdfb127e089ed32077ae5f0c9
Merge: 17cbd2f fcff464
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Tue Oct 19 08:25:04 2010 -0500

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	chkrootkit.spec
    	sources

 .gitignore                                |    3 +-
 chkrootkit-0.49-chkproc-psver.patch       |   11 ++++
 chkrootkit-0.49-chkutmp-outofbounds.patch |   74 +++++++++++++++++++++++++++++
 chkrootkit-0.49-nophpcheck.patch          |   28 +++++++++++
 chkrootkit-0.49-warnings.patch            |   26 ++++++++++
 chkrootkit.spec                           |   37 +++++++++-----
 sources                                   |    3 +-
 7 files changed, 164 insertions(+), 18 deletions(-)
---
diff --cc chkrootkit.spec
index 00fd168,b5cce91..adea23a
--- a/chkrootkit.spec
+++ b/chkrootkit.spec
@@@ -1,6 -1,6 +1,7 @@@
  Name:           chkrootkit
- Version:        0.48
- Release:        14%{?dist}
+ Version:        0.49
+ Release:        2%{?dist}
++
  Summary:        Tool to locally check for signs of a rootkit
  Group:          Applications/System
  License:        BSD and GPLv2+ and Python
@@@ -14,13 -14,13 +15,14 @@@ Source5:        chkrootkit.pa
  Source6:        README.false_positives
  Patch1:         chkrootkit-0.44-getCMD.patch
  Patch2:         chkrootkit-0.44-inetd.patch
- Patch3:         chkrootkit-0.45-includes.patch
- Patch4:         chkrootkit-0.47-warnings.patch
+ #Patch3:         chkrootkit-0.45-includes.patch
+ #Patch4:         chkrootkit-0.49-warnings.patch
  Patch6:         chkrootkit-0.47-chklastlog.patch
- Patch7:         chkrootkit-0.48-anomalies.patch
- Patch8:         chkrootkit-0.48-nophpcheck.patch
- Patch9:         chkrootkit-0.48-chkproc-psver.patch
- Patch10:	chkrootkit-0.48-chkutmp-outofbounds.patch
+ #Patch7:         chkrootkit-0.48-anomalies.patch
+ Patch8:         chkrootkit-0.49-nophpcheck.patch
+ Patch9:         chkrootkit-0.49-chkproc-psver.patch
+ Patch10:	chkrootkit-0.49-chkutmp-outofbounds.patch
++
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildRequires:  desktop-file-utils
@@@ -51,13 -51,13 +53,14 @@@ It contains
  %setup -q -n %{name}-%{version}
  %patch1 -p1 -b .getCMD
  %patch2 -p1 -b .inetd
- %patch3 -p1 -b .includes
- %patch4 -p1 -b .warnings
+ #%patch3 -p1 -b .includes
+ #%patch4 -p1 -b .warnings
  %patch6 -p1 -b .chklastlog
- %patch7 -p1 -b .anomalies
- %patch8 -p1 -b .nophpcheck
- %patch9 -p1 -b .chkproc-psver
- %patch10 -p0
+ #%patch7 -p1 -b .anomalies
+ %patch8 -p0 -b .nophpcheck
+ %patch9 -p0 -b .chkproc-psver
+ %patch10 -p1
++
  sed -i -e 's!\s\+ at strip.*!!g' Makefile