[chkrootkit/el5] fix patch ( remove leftovers from merge )

[wolfy]

commit d3eb68bcf85d4ac94d1e72bbdf191b8471cb7b2c
Author: Manuel Wolfshant <wolfy at fedoraproject.org>
Date:   Tue Feb 25 23:37:57 2014 +0200

    fix patch ( remove leftovers from merge )

 chkrootkit-0.49-chkutmp-outofbounds.patch |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)
---
diff --git a/chkrootkit-0.49-chkutmp-outofbounds.patch b/chkrootkit-0.49-chkutmp-outofbounds.patch
index df4ba26..ffb620a 100644
--- a/chkrootkit-0.49-chkutmp-outofbounds.patch
+++ b/chkrootkit-0.49-chkutmp-outofbounds.patch
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
---- chkutmp.c~	2009-07-22 08:09:41.000000000 -0500
-+++ chkutmp.c	2009-07-22 08:11:17.000000000 -0500
-@@ -60,3 +60,3 @@
-=======
 diff -Nur chkrootkit-0.49-orig/chkutmp.c chkrootkit-0.49/chkutmp.c
 --- chkrootkit-0.49-orig/chkutmp.c	2009-07-30 15:43:17.000000000 +0200
 +++ chkrootkit-0.49/chkutmp.c	2010-10-14 22:31:16.000000000 +0200
@@ -18,18 +13,12 @@ diff -Nur chkrootkit-0.49-orig/chkutmp.c chkrootkit-0.49/chkutmp.c
  #endif
  
  struct ps_line {
->>>>>>> el6
 -    char ps_tty[UT_LINESIZE];
 -    char ps_user[UT_NAMESIZE];
 -    char ps_args[MAXLENGTH];
 +    char ps_tty[UT_LINESIZE+2];
 +    char ps_user[UT_NAMESIZE+2];
 +    char ps_args[MAXLENGTH+2];
-<<<<<<< HEAD
-@@ -66 +66 @@
--    char ut_tty[UT_LINESIZE];
-+    char ut_tty[UT_LINESIZE+2];
-=======
      int ps_pid;
  };
  struct utmp_line {
@@ -83,4 +72,3 @@ diff -Nur chkrootkit-0.49-orig/chkutmp.c chkrootkit-0.49/chkutmp.c
      } else {
  	fprintf(stderr, "\nfailed running 'ps' !\n");
  	exit(EXIT_FAILURE);
->>>>>>> el6