rpms/crash/devel crash.patch,1.16,1.17 crash.spec,1.21,1.22

[David Anderson (crash)]

Author: crash

Update of /cvs/pkgs/rpms/crash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14883

Modified Files:
	crash.patch crash.spec 
Log Message:
update to upstream version 4.0-5.0


crash.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.16 -r 1.17 crash.patch
Index: crash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/crash/devel/crash.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- crash.patch	29 Aug 2007 19:10:11 -0000	1.16
+++ crash.patch	23 Jan 2008 20:55:40 -0000	1.17
@@ -1,48055 +1,78351 @@
---- crash/extensions/Makefile.orig	2007-08-27 15:02:36.000000000 -0400
-+++ crash/extensions/Makefile	2007-05-29 10:16:56.000000000 -0400
-@@ -0,0 +1,43 @@
-+#
-+# Makefile for building crash shared object extensions
-+#
-+# Copyright (C) 2005 David Anderson
-+# Copyright (C) 2005 Red Hat, Inc. All rights reserved.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# To build the extension shared objects in this directory, run 
-+# "make extensions" from the top-level directory.
-+#
-+# To add a new extension object: 
-+#
-+#  - add the new source file to the EXTENSION_SOURCE_FILES list 
-+#    in the top-level Makefile
-+#  - add the object file name to the EXTENSION_OBJECT_FILES list
-+#    in the top-level Makefile
-+#  - create a compile stanza below, typically using "echo.so" as 
-+#    a base template.
-+# 
-+
-+all: link_defs $(OBJECTS)
+--- crash/configure.c.orig	2008-01-17 15:17:20.000000000 -0500
++++ crash/configure.c	2008-01-04 09:42:08.000000000 -0500
+@@ -1,8 +1,8 @@
+ /* configure.c - core analysis suite
+  *
+  * Copyright (C) 1999, 2000, 2001, 2002 Mission Critical Linux, Inc.
+- * Copyright (C) 2002, 2003, 2004, 2005 David Anderson
+- * Copyright (C) 2002, 2003, 2004, 2005 Red Hat, Inc. All rights reserved.
++ * Copyright (C) 2002, 2003, 2004, 2005, 2006 David Anderson
++ * Copyright (C) 2002, 2003, 2004, 2005, 2006 Red Hat, Inc. All rights reserved.
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -56,7 +56,7 @@
+ 
+ void build_configure(void);
+ void release_configure(char *);
+-void make_rh_rpm_package(char *);
++void make_rh_rpm_package(char *, int);
+ void unconfigure(void);
+ void set_warnings(int);
+ void show_configuration(void);
+@@ -222,7 +222,7 @@
+ 
+ 	setup_gdb_defaults();
+ 
+-	while ((c = getopt(argc, argv, "gsqnWwubdr:p:")) > 0) {
++	while ((c = getopt(argc, argv, "gsqnWwubdr:p:P:")) > 0) {
+ 		switch (c) {
+ 		case 'q':
+ 			target_data.flags |= QUIET;
+@@ -239,7 +239,10 @@
+ 			release_configure(optarg);
+ 			break;
+ 		case 'p':
+-			make_rh_rpm_package(optarg);
++			make_rh_rpm_package(optarg, 0);
++			break;
++		case 'P':
++			make_rh_rpm_package(optarg, 1);
+ 			break;
+ 		case 'W':
+ 		case 'w':
+@@ -566,10 +569,11 @@
+  *  Create an .rh_rpm_package file if the passed-in variable is set.
+  */
+ void 
+-make_rh_rpm_package(char *package)
++make_rh_rpm_package(char *package, int release)
+ {
+-	char *p;
++	char *p, *cur;
+ 	FILE *fp;
++	char buf[256];
+ 
+ 	if ((strcmp(package, "remove") == 0)) {
+ 		if (file_exists(".rh_rpm_package")) {
+@@ -589,6 +593,33 @@
+ 	if (!strlen(++p))
+ 		return;
+ 
++	if (release) {
++		if (!(fp = popen("./crash -v", "r"))) {
++			fprintf(stderr, "cannot execute \"crash -v\"\n");
++			exit(1);
++		}
++		cur = NULL;
++		while (fgets(buf, 256, fp)) {
++			if (strncmp(buf, "crash ", 6) == 0) {
++				cur = &buf[6];
++				break;
++			} 
++		}
++		fclose(fp);
 +	
-+link_defs:
-+	@if [ ! -f defs.h ]; then \
-+	  ln -s ../defs.h; fi 
++		if (!cur) {
++			fprintf(stderr, "cannot get version from \"crash -v\"\n");
++			exit(1);
++		} 
++		strip_linefeeds(cur);
 +
-+echo.so: ../defs.h echo.c
-+	gcc -nostartfiles -shared -rdynamic -o echo.so echo.c -fPIC \
-+				 		-D$(TARGET) $(TARGET_CFLAGS)
-+
-+dminfo.so: ../defs.h dminfo.c
-+	gcc -nostartfiles -shared -rdynamic -o dminfo.so dminfo.c -fPIC \
-+				 		-D$(TARGET) $(TARGET_CFLAGS)
-+	
---- crash/extensions/echo.c.orig	2007-08-27 15:02:36.000000000 -0400
-+++ crash/extensions/echo.c	2005-11-08 10:37:53.000000000 -0500
-@@ -0,0 +1,105 @@
-+/* echo.c - simple example of a crash extension
-+ *
-+ * Copyright (C) 2001, 2002 Mission Critical Linux, Inc.
-+ * Copyright (C) 2002, 2003, 2004, 2005 David Anderson
-+ * Copyright (C) 2002, 2003, 2004, 2005 Red Hat, Inc. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ */
++		if (strcmp(cur, p) != 0) {
++			fprintf(stderr, "./crash version: %s\n", cur);
++			fprintf(stderr, "release version: %s\n", p);
++			exit(1);
++		}
++	}
 +
-+#include "defs.h"    /* From the crash source top-level directory */
+         if ((fp = fopen(".rh_rpm_package", "w")) == NULL) {
+                 perror("fopen");
+                 fprintf(stderr, "cannot open .rh_rpm_package\n");
+@@ -1121,14 +1152,14 @@
+ 	printf("#\n");
+ 	printf("# crash core analysis suite\n");
+ 	printf("#\n");
+-	printf("Summary: crash utility for live systems; netdump, diskdump, LKCD or mcore dumpfiles\n");
++	printf("Summary: crash utility for live systems; netdump, diskdump, kdump, LKCD or mcore dumpfiles\n");
+ 	printf("Name: %s\n", lower_case(target_data.program, buf));
+ 	printf("Version: %s\n", Version);
+ 	printf("Release: %s\n", Release);
+ 	printf("License: GPL\n");
+ 	printf("Group: Development/Debuggers\n");
+ 	printf("Source: %%{name}-%%{version}-%%{release}.tar.gz\n");
+-	printf("URL: ftp://people.redhat.com/anderson/%%{name}-%%{version}-%%{release}.tar.gz\n");
++	printf("URL: http://people.redhat.com/anderson\n");
+ 	printf("Distribution: Linux 2.2 or greater\n");
+ 	printf("Vendor: Red Hat, Inc.\n");
+ 	printf("Packager: Dave Anderson <anderson at redhat.com>\n");
+@@ -1141,7 +1172,18 @@
+ 	printf("%%description\n");
+ 	printf("The core analysis suite is a self-contained tool that can be used to\n");
+ 	printf("investigate either live systems, kernel core dumps created from the\n");
+-	printf("netdump and diskdump packages from Red Hat Linux, the mcore kernel patch\n");
++	printf("netdump, diskdump and kdump facilities from Red Hat Linux, the mcore kernel patch\n");
++	printf("offered by Mission Critical Linux, or the LKCD kernel patch.\n");
++	printf("\n");
++	printf("%%package devel\n");
++	printf("Requires: %%{name} = %%{version}\n");
++	printf("Summary: crash utility for live systems; netdump, diskdump, kdump, LKCD or mcore dumpfiles\n");
++	printf("Group: Development/Debuggers\n");
++	printf("\n");
++	printf("%%description devel\n");
++	printf("The core analysis suite is a self-contained tool that can be used to\n");
++	printf("investigate either live systems, kernel core dumps created from the\n");
++	printf("netdump, diskdump and kdump packages from Red Hat Linux, the mcore kernel patch\n");
+ 	printf("offered by Mission Critical Linux, or the LKCD kernel patch.\n");
+ 	printf("\n");
[...123717 lines suppressed...]
++ * Copyright (C) 2002, 2003, 2004, 2005, 2006 David Anderson
++ * Copyright (C) 2002, 2003, 2004, 2005, 2006 Red Hat, Inc. All rights reserved.
+  * Copyright (C) 2005 Michael Holzheu, IBM Corporation
+  *
+  * This program is free software; you can redistribute it and/or modify
+@@ -16,7 +16,7 @@
+  * GNU General Public License for more details.
+  */
+ #include "defs.h"
+-#include <asm/page.h>
++//#include <asm/page.h>
+ #include "ibm_common.h"
  
-     $ crash vmlinux.17 lcore.cr.17
+ static FILE * s390_file;
+@@ -69,10 +69,13 @@
+ 	return WRITE_ERROR;
+ }
  
--    crash 4.0
--    Copyright (C) 2002, 2003, 2004, 2005  Red Hat, Inc.
--    Copyright (C) 2004, 2005  IBM Corporation
--    Copyright (C) 1999-2005  Hewlett-Packard Co
--    Copyright (C) 1999, 2002  Silicon Graphics, Inc.
-+    crash 4.0-4.6
-+    Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007  Red Hat, Inc.
-+    Copyright (C) 2004, 2005, 2006  IBM Corporation
-+    Copyright (C) 1999-2006  Hewlett-Packard Co
-+    Copyright (C) 2005, 2006  Fujitsu Limited
-+    Copyright (C) 2006, 2007  VA Linux Systems Japan K.K.
-+    Copyright (C) 2005  NEC Corporation
-+    Copyright (C) 1999, 2002, 2007  Silicon Graphics, Inc.
-     Copyright (C) 1999, 2000, 2001, 2002  Mission Critical Linux, Inc.
-     This program is free software, covered by the GNU General Public License,
-     and you are welcome to change it and/or distribute copies of it under
---- crash/crash.8.orig	2007-08-27 15:02:36.000000000 -0400
-+++ crash/crash.8	2007-07-13 16:57:38.000000000 -0400
-@@ -5,7 +5,7 @@
- .TH CRASH 8
- .SH NAME
- crash \- Analyze Linux crash data or a live system
--.SH SYNAPSIS
-+.SH SYNOPSIS
- .B crash
- [
- .B -h
-@@ -42,9 +42,13 @@
- is a tool for interactively analyzing the state of the Linux system
- while it is running, or after a kernel crash has occurred and a 
- core dump has been created by the Red Hat 
--.I netdump
--facility.  It is loosely based on the SVR4 UNIX crash 
--command, but has been signficantly enhanced
-+.I netdump,
-+.I diskdump,
-+.I kdump,
-+or
-+.I xendump
-+facilities.  It is loosely based on the SVR4 UNIX crash 
-+command, but has been significantly enhanced
- by completely merging it with the 
- .I gdb
- debugger. The marriage of the two effectively combines the 
-@@ -207,15 +211,15 @@
- .I dis
- disassembles memory, either entire kernel functions, from a
- location for a specified number of instructions, or from the start of a
--fuction up to a specified memory location.
-+function up to a specified memory location.
- .TP
- .I eval
- evalues an expression or numeric type and displays the result
--in hexidecimal, decimal, octal and binary.
-+in hexadecimal, decimal, octal and binary.
- .TP
- .I exit
- causes
--.I crash
-+.B crash
- to exit.
- .TP
- .I extend
-@@ -230,7 +234,7 @@
- in the system.
- .TP
- .I fuser
--displays the tasks using the specifed file or socket.
-+displays the tasks using the specified file or socket.
- .TP
- .I gdb
- passes its argument to the underlying
-@@ -274,7 +278,7 @@
- display various network related data.
- .TP
- .I p
--passes its argumnts to the
-+passes its arguments to the
- .I gdb
- "print" command for evaluation and display.
- .TP
-@@ -361,11 +365,85 @@
- .I wr
- modifies the contents of memory.  When writing to memory on
- a live system, this command should obviously be used with great care.
-+.SH FILES
-+.TP
-+.I .crashrc
-+Initialization commands.  The file can be located in the user's
-+.B HOME 
-+directory and/or the current directory.  Commands found in the
-+.I .crashrc
-+file in the 
-+.B HOME
-+directory are executed before those in the current directory's 
-+.I .crashrc
-+file.
-+.SH ENVIRONMENT
-+.TP
-+.B EDITOR
-+Command input is read using
-+.BR readline(3).
-+If
-+.B EDITOR
-+is set to
-+.I emacs
-+or
-+.I vi
-+then suitable keybindings are used.  If 
-+.B EDITOR
-+is not set, then
-+.I vi
-+is used.  This can be overridden by
-+.B set vi
-+or 
-+.B set emacs
-+commands located in a
-+.IR .crashrc 
-+file, or by entering
-+.B -e emacs
-+on the
-+.B crash
-+command line.
-+.TP
-+.B CRASHPAGER
-+If
-+.B CRASHPAGER
-+is set, its value is used as the name of the program to which command output will be sent. 
-+If not, then command output is sent to 
-+.B /usr/bin/less -E -X 
-+by default.
-+.SH NOTES
-+.PP
-+If
-+.B crash
-+does not work, look for a newer version: kernel evolution frequently makes
-+.B crash
-+updates necessary.
-+.PP
-+The command
-+.B set scroll off
-+will cause output to be sent directly to
-+the terminal rather than through a paging program.  This is useful,
-+for example, if you are running
-+.B crash
-+in a window of
-+.BR emacs .
- .SH AUTHOR
- Dave Anderson <anderson at redhat.com> wrote
--.B Crash
-+.B crash
- .TP
- Jay Fenlason <fenlason at redhat.com> wrote this man page.
- .SH "SEE ALSO"
--netdump(8)
--gdb(1)
-+.PP
-+The
-+.I help
-+command within
-+.B crash
-+provides more complete and accurate documentation than this man page.
-+.PP
-+.I http://people.redhat.com/anderson
-+- the home page of the
-+.B crash
-+utility.
-+.PP
-+.BR netdump (8),
-+.BR gdb (1)
++#define S390_PAGE_SHIFT   12
++#define S390_PAGE_SIZE    (1UL << S390_PAGE_SHIFT)
++
+ uint
+ s390_page_size(void)
+ {
+-	return PAGE_SIZE;
++	return S390_PAGE_SIZE;
+ }
+ 
+ int 


Index: crash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crash/devel/crash.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- crash.spec	29 Aug 2007 19:10:12 -0000	1.21
+++ crash.spec	23 Jan 2008 20:55:42 -0000	1.22
@@ -4,7 +4,7 @@
 Summary: crash utility for live systems; netdump, diskdump, kdump, LKCD or mcore dumpfiles
 Name: crash
 Version: 4.0
-Release: 4.6.2
+Release: 5.0.3
 License: GPL
 Group: Development/Debuggers
 Source: %{name}-%{version}.tar.gz
@@ -46,6 +46,9 @@
 %doc README
 
 %changelog
+* Wed Jan 23 2008 Dave Anderson <anderson at redhat.com> - 4.0-5.0.3
+- Updated crash.patch to match upstream version 4.0-5.0.
+
 * Wed Aug 29 2007 Dave Anderson <anderson at redhat.com> - 4.0-4.6.2
 - Updated crash.patch to match upstream version 4.0-4.6.