[chkrootkit/el5: 33/33] update chkutmp-outofbounds.patch

[wolfy]

commit f57fbe83fc7f7dbf61fd9e0b269978def5e69747
Author: Manuel Wolfshant <wolfy at fedoraproject.org>
Date:   Tue Feb 25 23:24:35 2014 +0200

    update chkutmp-outofbounds.patch

 chkrootkit.spec |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)
---
diff --git a/chkrootkit.spec b/chkrootkit.spec
index cf4c981..b084e17 100644
--- a/chkrootkit.spec
+++ b/chkrootkit.spec
@@ -1,10 +1,6 @@
 Name:           chkrootkit
 Version:        0.49
-<<<<<<< HEAD
-Release:        2%{?dist}
-=======
 Release:        3%{?dist}
->>>>>>> el6
 Summary:        Tool to locally check for signs of a rootkit
 Group:          Applications/System
 License:        BSD and GPLv2+ and Python
@@ -60,11 +56,7 @@ It contains:
 #%patch7 -p1 -b .anomalies
 %patch8 -p0 -b .nophpcheck
 %patch9 -p0 -b .chkproc-psver
-<<<<<<< HEAD
-%patch10 -p0
-=======
 %patch10 -p1 -b .chkutmp-outofbounds
->>>>>>> el6
 sed -i -e 's!\s\+ at strip.*!!g' Makefile
 
 
@@ -132,12 +124,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
-<<<<<<< HEAD
-=======
 * Tue Feb 25 2014 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 0.49-3
 - update chkutmp-outofbounds.patch with the one from fedora. should fix #1069632
 
->>>>>>> el6
 * Fri Jul 02 2010 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 0.49 -2
 - add BR for glibc-static, allowing to build in EL-6