rpms/chkrootkit/EL-4 chkrootkit-0.48-chkproc-psver.patch, NONE, 1.1 chkrootkit-0.48-chkutmp-outofbounds.patch, NONE, 1.1 chkrootkit.spec, 1.12, 1.13

[Manuel Wolfshant]

Author: wolfy

Update of /cvs/pkgs/rpms/chkrootkit/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31093

Modified Files:
	chkrootkit.spec 
Added Files:
	chkrootkit-0.48-chkproc-psver.patch 
	chkrootkit-0.48-chkutmp-outofbounds.patch 
Log Message:
sync with rawhide


chkrootkit-0.48-chkproc-psver.patch:
 chkproc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE chkrootkit-0.48-chkproc-psver.patch ---
diff -Nur chkrootkit-0.48-orig/chkproc.c chkrootkit-0.48/chkproc.c
--- chkrootkit-0.48-orig/chkproc.c	2007-08-14 23:32:41.000000000 +0200
+++ chkrootkit-0.48/chkproc.c	2008-05-30 19:57:43.000000000 +0200
@@ -142,7 +142,7 @@
    psinfo_t psbuf;
 #endif
 
-   pv = verbose = 0; 
+   pv = 3; verbose = 0; 
 
    if (!proc)
    {

chkrootkit-0.48-chkutmp-outofbounds.patch:
 chkutmp.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE chkrootkit-0.48-chkutmp-outofbounds.patch ---
--- chkutmp.c~	2006-10-18 13:00:29.000000000 -0500
+++ chkutmp.c	2009-07-21 14:42:41.000000000 -0500
@@ -83 +83 @@
-    struct ps_line *endp = &psl_p[MAXBUF];
+    struct ps_line *endp = &psl_p[MAXBUF-1];
@@ -135 +135 @@
-    struct utmp_line *endp = &utl_p[MAXBUF];
+    struct utmp_line *endp = &utl_p[MAXBUF-1];
--- chkutmp.c~	2009-07-22 07:57:13.000000000 -0500
+++ chkutmp.c	2009-07-22 08:09:41.000000000 -0500
@@ -179 +179 @@
-    for (h = 0; h <= y; h++) {	/* loop through 'ps' data */
+    for (h = 0; h < y; h++) {	/* loop through 'ps' data */
@@ -181 +181 @@
-	for (i = 0; i <= z; i++) {	/* try and match the tty from 'ps' to one in utmp */
+	for (i = 0; i < z; i++) {	/* try and match the tty from 'ps' to one in utmp */
--- chkutmp.c~	2009-07-22 08:09:41.000000000 -0500
+++ chkutmp.c	2009-07-22 08:11:17.000000000 -0500
@@ -60,3 +60,3 @@
-    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];
@@ -66 +66 @@
-    char ut_tty[UT_LINESIZE];
+    char ut_tty[UT_LINESIZE+2];


Index: chkrootkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chkrootkit/EL-4/chkrootkit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- chkrootkit.spec	23 Jul 2008 09:12:39 -0000	1.12
+++ chkrootkit.spec	2 Oct 2009 20:54:57 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           chkrootkit
 Version:        0.48
-Release:        8%{?dist}
+Release:        14%{?dist}
 Summary:        Tool to locally check for signs of a rootkit
 Group:          Applications/System
 License:        BSD and GPLv2+ and Python
@@ -19,10 +19,17 @@ Patch4:         chkrootkit-0.47-warnings
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
 
+%if 0%{?fedora} > 10
+# as of glibc-2.9.90-7 in Rawhide
+BuildRequires:  glibc-static
+%endif
+
 Requires:       %{_bindir}/consolehelper
 
 %description
@@ -49,6 +56,8 @@ It contains:
 %patch6 -p1 -b .chklastlog
 %patch7 -p1 -b .anomalies
 %patch8 -p1 -b .nophpcheck
+%patch9 -p1 -b .chkproc-psver
+%patch10 -p0
 sed -i -e 's!\s\+ at strip.*!!g' Makefile
 
 
@@ -117,6 +126,18 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Fri Oct 02 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 0.48-14
+- sync with rawhide. includes the following changes:
+    Wed Jul 22 2009 Jon Ciesla <limb at jcomserv.net> 0.48-13
+  - Additional items in chkutmp patch.
+    Tue Jul 21 2009 Jon Ciesla <limb at jcomserv.net> 0.48-12
+  - Patch to fix crash in chkutmp on x86_64.
+    Tue Feb 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.48-11
+  - update .desktop file for Icon Theme Specification
+  - Fedora > 10: conditional BR glibc-static as needed for strings-static
+    Fri May 30 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.48-8
+  - Let chkproc default to procps version 3.
+
 * Wed Jul 23 2008 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 0.48-8
 - fix license tag