Fri Oct 21 09:54:31 UTC 2005

Author: pknirsch

Update of /cvs/dist/rpms/s390utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30204

Modified Files:
	.cvsignore s390utils.spec sources 
Added Files:
	s390-tools-1.5.0-automenu.patch 
	s390-tools-1.5.0-fdasd-raid.patch 
	s390-tools-1.5.0-fmtpercentage.patch 
	s390-tools-1.5.0-rhconf.patch s390-tools-1.5.0-su.patch 
	s390-tools-1.5.0-subdirs.patch 
Removed Files:
	s390-tools-1.1.6-fmtpercentage.patch 
	s390-tools-1.2.1-rhconf.patch s390-tools-1.3.1-automenu.patch 
	s390-tools-1.3.1-fdasd-raid.patch s390-tools-1.3.2-su.patch 
	s390-tools-1.3.2-subdirs.patch 
Log Message:
- Large update from 1.3.2 to 1.5.0
- Include osasnmpd and vmcp now by default


s390-tools-1.5.0-automenu.patch:
 man/zipl.8 |    7 +++
 src/job.c  |  134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 src/scan.c |    4 -
 src/zipl.c |    1 
 4 files changed, 140 insertions(+), 6 deletions(-)

--- NEW FILE s390-tools-1.5.0-automenu.patch ---
--- s390-tools-1.5.0/zipl/man/zipl.8.automenu	2004-10-06 10:11:14.000000000 +0200
+++ s390-tools-1.5.0/zipl/man/zipl.8	2005-10-20 10:09:31.000000000 +0200
@@ -217,6 +217,13 @@
 Note that when working with tapes, the current device position will be changed
 even when specifying this option.
 
+.TP
+.BR "\-x" " or " "\-\-no-automenu"
+Disables the automatic creation of a multiboot menu. Specifying a menu with the
+"-m <MENU>" option or a section disables this feature, too. This option was
+added for compatibility with previous versions of the multiboot version of
+zipl.
+
 .SH EXAMPLE
 1. Scenario: prepare disk for booting a Linux kernel image using the
 following parameters:
--- s390-tools-1.5.0/zipl/src/job.c.automenu	2004-10-06 10:11:14.000000000 +0200
+++ s390-tools-1.5.0/zipl/src/job.c	2005-10-20 10:41:33.000000000 +0200
@@ -42,13 +42,14 @@
 	{ "version",		no_argument,		NULL, 'v'},
 	{ "verbose",		no_argument,		NULL, 'V'},
 	{ "add-files",		no_argument,		NULL, 'a'},
+	{ "no-automenu",	no_argument,		NULL, 'x'},
 	{ "tape",		required_argument,	NULL, 'T'},
 	{ "dry-run",		no_argument,		NULL, '0'},
 	{ NULL,			0,			NULL, 0 }
 };
 
 /* Command line option abbreviations */
-static const char option_string[] = "-c:t:i:r:p:P:d:D:s:m:hHnVvaT:";
+static const char option_string[] = "-c:t:i:r:p:P:d:D:s:m:hHnVvaxT:";
 
 struct command_line {
 	char* data[SCAN_KEYWORD_NUM];
@@ -60,10 +61,13 @@
 	int version;
 	int verbose;
 	int add_files;
+	int automenu;
 	int dry_run;
 	enum scan_section_type type;
 };
 
+/* Global variable for default boot target. Ugly but necessary... */
+static char *default_target;
 
 static int
 store_option(struct command_line* cmdline, enum scan_keyword_id keyword,
@@ -89,6 +93,7 @@
 	int i;
 
 	memset((void *) &cmdline, 0, sizeof(struct command_line));
+	cmdline.automenu = 1;
 	cmdline.type = section_invalid;
 	/* Turn off standard option parser errors - we have our own */
 	opterr = 0;
@@ -176,6 +181,9 @@
 		case '0':
 			cmdline.dry_run = 1;
 			break;
+		case 'x':
+			cmdline.automenu = 0;
+			break;
 		case 1:
 			/* Non-option is interpreted as section name */
 			if (cmdline.section != NULL) {
@@ -221,6 +229,9 @@
 	if (cmdline.help || cmdline.version) {
 		/* Always accept --help and --version */
 	} else if ((cmdline.menu != NULL) || (cmdline.section != NULL)) {
+		/* If either menu or section has been selected disable
+		   automenu generation */
+		cmdline.automenu = 0;
 		/* Config file mode */
 		if ((cmdline.menu != NULL) && (cmdline.section != NULL)) {
 			error_reason("Option 'menu' cannot be used when "
@@ -759,7 +770,10 @@
 		/* IPL job */
 		job->id = job_ipl;
 		/* Fill in name of bootmap directory */
-		job->bootmap_dir = misc_strdup(data[(int) scan_keyword_target]);
+		if (data[(int) scan_keyword_target] == NULL)
+			job->bootmap_dir = misc_strdup(default_target);
+		else
+			job->bootmap_dir = misc_strdup(data[(int) scan_keyword_target]);
 		if (job->bootmap_dir == NULL)
 			return -1;
 		/* Fill in name and address of image file */
@@ -1008,6 +1022,8 @@
 		if (temp_job == NULL)
 			return -1;
 		memset((void *) temp_job, 0, sizeof(struct job_data));
+		if (data[(int) scan_keyword_target] == NULL)
+			data[(int) scan_keyword_target] = misc_strdup(job->bootmap_dir);
 		rc = get_job_from_section_data(data, temp_job,
 					job->data.menu.entry[current].name);
 		if (rc) {
@@ -1174,10 +1190,109 @@
 }
 
 
+/* Create a fake menu to simulate the old s390utils-1.1.7 multiboot
+ * behaviour. */
+static struct scan_token *
+create_fake_menu(struct scan_token *scan)
+{
+	int i, j, pos, numsec, size, defaultpos;
+	char *name;
+	char *target;
+	char *seclist[1024];
+	char *defaultsection;
+	char buf[1024];
+	struct scan_token *tmp;
+
+	/* Count # of sections */
+	numsec = 0;
+	name = NULL;
+	target = NULL;
+	for (i = 0; (int) scan[i].id != 0; i++) {
+		if (scan[i].id == scan_id_section_heading) {
+			name = scan[i].content.section.name;
+			if (strcmp(DEFAULTBOOT_SECTION, name))
+				seclist[numsec++] = name;
+		}
+		if (scan[i].id == scan_id_keyword_assignment &&
+		    (scan[i].content.keyword.keyword == scan_keyword_dumpto ||
+		     scan[i].content.keyword.keyword == scan_keyword_dumptofs)) {
+			numsec--;
+			continue;
+		}
+		if (scan[i].id == scan_id_keyword_assignment &&
+		    scan[i].content.keyword.keyword == scan_keyword_target &&
+		    !strcmp(DEFAULTBOOT_SECTION, name))
+			target = scan[i].content.keyword.value;
+	}
+	get_default_section(scan, &defaultsection, &j);
+
+	if (defaultsection == NULL) {
+		error_text("Unable to find default section in your config file.");
+		return NULL;
+	}
+
+	if (target == NULL) {
+		error_text("Keyword target is missing in default section.");
+		return NULL;
+	}
+
+	default_target = misc_strdup(target);
+
+	size = i+6+numsec;
+	tmp = (struct scan_token *) misc_malloc(size * sizeof(struct scan_token));
+	if (tmp == NULL) {
+		error_text("Couldn't allocate memory for menu entries");
+		return NULL;
+	}
+
+	memset(tmp, 0, size * sizeof(struct scan_token));
+	memcpy(tmp, scan, i * sizeof(struct scan_token)); 
+	free(scan);
+	scan = tmp;
+
+	defaultpos = 0;
+	for (j = 0; j < numsec; j++) {
+		if (!strcmp(defaultsection, seclist[j]))
+			defaultpos = j+1;
+	}
+
+	snprintf(buf, 1024, "%d", defaultpos);
+
+	scan[i].id = scan_id_menu_heading;
+	scan[i].line = i;
+	scan[i++].content.menu.name = misc_strdup("rh-automatic-menu");
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_target;
+	scan[i++].content.keyword.value = misc_strdup(target);
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_default;
+	scan[i++].content.keyword.value = misc_strdup(buf);
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_prompt;
+	scan[i++].content.keyword.value = misc_strdup("1");
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_timeout;
+	scan[i++].content.keyword.value = misc_strdup("15");
+
+	pos = i;
+	for (i = 0; i<numsec; i++) {
+		scan[pos].id = scan_id_number_assignment;
+		scan[pos].line = pos;
+		scan[pos].content.number.number = i+1;
+		scan[pos++].content.number.value = misc_strdup(seclist[i]);
+	}
+
+	return scan;
+}
+
 static int
 get_job_from_config_file(struct command_line* cmdline, struct job_data* job)
 {
-	struct scan_token* scan;
+	struct scan_token* scan, *nscan;
 	char* filename;
 	char* source;
 	int rc;
@@ -1209,9 +1324,20 @@
 		scan_free(scan);
 		return rc;
 	}
+
+	nscan = create_fake_menu(scan);
+	if (nscan == NULL) {
+		scan_free(scan);
+		return -1;
+	}
+	scan = nscan;
+
 	/* Get job from config file data */
-	if (cmdline->menu != NULL)
+	if (cmdline->menu != NULL || cmdline->automenu) {
+		if (cmdline->automenu)
+			cmdline->menu = misc_strdup("rh-automatic-menu");
 		rc = get_menu_job(scan, cmdline->menu, job);
+	}
 	else {
 		rc = get_section_job(scan, cmdline->section, job,
 				cmdline->data[(int) scan_keyword_parameters]);
--- s390-tools-1.5.0/zipl/src/scan.c.automenu	2004-07-20 15:09:21.000000000 +0200
+++ s390-tools-1.5.0/zipl/src/scan.c	2005-10-20 10:09:31.000000000 +0200
@@ -33,9 +33,9 @@
  *			     rs                                 enu
  */
 /* defaultboot	*/
-	{opt, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, opt, inv},
+	{opt, inv, inv, inv, inv, inv, inv, inv, req, inv, inv, opt, inv},
 /* ipl		*/
-	{inv, inv, inv, req, opt, opt, opt, inv, req, inv, inv, inv, inv},
+	{inv, inv, inv, req, opt, opt, opt, inv, opt, inv, inv, inv, inv},
 /* segment load */
 	{inv, inv, inv, inv, inv, inv, inv, req, req, inv, inv, inv, inv},
 /* part dump	*/
--- s390-tools-1.5.0/zipl/src/zipl.c.automenu	2004-11-22 14:05:21.000000000 +0100
+++ s390-tools-1.5.0/zipl/src/zipl.c	2005-10-20 10:41:21.000000000 +0200
@@ -73,6 +73,7 @@
 "-n, --noninteractive            Answer all confirmation questions with 'yes'",
 "-V, --verbose                   Provide more verbose output",
 "-a, --add-files                 Add all referenced files to bootmap file",
+"-x, --no-automenu               Don't autogenerate multiboot menu",
 "    --dry-run                   Simulate run but don't modify IPL records",
 ""
 };

s390-tools-1.5.0-fdasd-raid.patch:
 fdasd.c |   48 +++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 39 insertions(+), 9 deletions(-)

--- NEW FILE s390-tools-1.5.0-fdasd-raid.patch ---
--- s390-tools-1.5.0/fdasd/fdasd.c.fdasd-raid	2005-10-20 09:22:40.000000000 +0200
+++ s390-tools-1.5.0/fdasd/fdasd.c	2005-10-20 09:34:03.000000000 +0200
@@ -215,10 +215,10 @@
 static int
 read_line(void) 
 {
-	bzero(line_buffer, LINE_LENGTH);
 	line_ptr = line_buffer;
         if (!fgets(line_buffer, LINE_LENGTH, stdin))
 		return 0;
+	line_buffer[LINE_LENGTH-1] = 0;
 	while (*line_ptr && !isgraph(*line_ptr))
 		line_ptr++;
 	return *line_ptr;
@@ -279,6 +279,8 @@
 		strcpy(str, "Linux native");
 	else if (strncmp("SWAP  ", str, 6) == 0)
 		strcpy(str, "Linux swap");
+	else if (strncmp("RAID  ", str, 6) == 0)
+		strcpy(str, "Linux Raid");
 	else
 		strcpy(str, "unknown");
 
@@ -1065,6 +1067,7 @@
 			strncpy(c1, s2, 31);
 		}
 		else {
+			char str[20];
 			char *tmp = strstr(ch, "SWAP");
 
 			/* create a new data set name */
@@ -1072,7 +1075,15 @@
 				k++;
 
 			setpos(anc, k, i-1);
-			
+
+			strncpy(s2, ch, 44);
+			s2[44]=0;
+			vtoc_ebcdic_dec(s2, s2, 44);
+			c2 = strstr(s2, "PART");
+			if (c2 != NULL) strncpy(str, c2+=9, 6);
+			str[6] = '\0';
+			fdasd_partition_type(str);
+
 			strncpy(ch, "LINUX.V               "
 				"                      ", 44);
 
@@ -1090,8 +1101,16 @@
 			c1 += 4;
 			if (tmp)
 				strncpy(c1, ".SWAP", 5);
-			else
-				strncpy(c1, ".NATIVE", 7);
+			else {
+				if (strcmp("unknown", str) == 0) {
+					strncpy(c1, ".NATIVE", 7);
+				}
+				else {
+					strncpy(c1, ".", 1);
+					strncpy(c1+1, c2, 6);
+				}
+			}
+
 		}
 		vtoc_ebcdic_enc(ch, ch, 44);
 		if (anc->verbose) printf("f1 ");
@@ -1328,9 +1347,10 @@
 
 	printf("current partition type is: %s\n\n", fdasd_partition_type(str));
 	printf("   1  Linux native\n" \
-	       "   2  Linux swap\n\n");
+	       "   2  Linux swap\n" \
+	       "   3  Linux raid\n\n");
 	part_type = 0;
-	while ((part_type < 1) || (part_type > 2)) {
+	while ((part_type < 1) || (part_type > 3)) {
         	while (!isdigit(part_type = 
 				read_char("new partition type: ")));
         	part_type -= 48;
@@ -1343,6 +1363,9 @@
         case 2:
 		strncpy(str, "SWAP  ", 6);
                 break;
+        case 3:
+		strncpy(str, "RAID  ", 6);
+                break;
         default:
                 printf("'%d' is not supported!\n", part_type);
         }
@@ -1541,14 +1564,21 @@
 			vtoc_ebcdic_enc(part_info->f1->DS1DSNAM,
 					part_info->f1->DS1DSNAM, 44);
 
-			if ((part_no < 0) || (part_no >= USABLE_PARTITIONS))
+			if (((oldfmt == 0) && (part_no < 0))
+			    || (part_no >= USABLE_PARTITIONS))
 				printf("WARNING: partition number (%i) found "
 				       "in data set name of an existing "
 				       "partition\ndoes not match range of "
 				       "possible partition numbers (1-%d)\n\n",
 				       part_no + 1, USABLE_PARTITIONS);
-			else
-				setpos(anc, part_no, f1_counter);
+			else {
+				if (oldfmt) /* correct +1 */ {
+					setpos(anc, part_no+1, f1_counter);
+					printf("Correcting f1 header number!\n");
+				}
+				else
+					setpos(anc, part_no, f1_counter);
+			}
 
 			part_info = part_info->next;
 			f1_counter++;

s390-tools-1.5.0-fmtpercentage.patch:
 dasdfmt.c |   32 +++++++++++++++++++++++++++++---
 dasdfmt.h |    4 +++-
 2 files changed, 32 insertions(+), 4 deletions(-)

--- NEW FILE s390-tools-1.5.0-fmtpercentage.patch ---
--- s390-tools-1.5.0/dasdfmt/dasdfmt.c.fmtpercentage	2005-09-16 09:18:32.000000000 +0200
+++ s390-tools-1.5.0/dasdfmt/dasdfmt.c	2005-10-20 09:36:21.000000000 +0200
@@ -48,6 +48,7 @@
 	       "       -V or --version  means print version\n"
 	       "       -L or --no_label means don't write disk label\n"
 	       "       -p or --progressbar means show a progress bar\n"
+	       "       -P or --percentage means show a progress bar\n"
 	       "       -m x or --hashmarks=x means show a hashmark every x "
 	       "cylinders\n"
 	       "       -v means verbose mode\n"
@@ -172,6 +173,7 @@
 	info->print_progressbar = 0;
 	info->print_hashmarks   = 0;
 	info->hashstep          = 0;
+	info->print_percentage  = 0;
 	info->force             = 0;
 	info->writenolabel      = 0;
 	info->labelspec         = 0;
@@ -553,7 +555,7 @@
 			   format_data_t *format_params)
 {
 	format_data_t format_step;
-	int j, k, cyl, tmp, p1, p2;
+	int j, k, cyl, tmp, p1, p2, p;
 
 	if (info->print_hashmarks) {
 		if ((info->hashstep < 1) || (info->hashstep > 1000)) {
@@ -612,6 +614,24 @@
 				printf("#");
 				fflush(stdout);
 			}
+                if(info->print_percentage)
+                {
+                        p2 = p1;
+                        p1 = cyl*100/drive_geo->cylinders;
+                        if (p1 != p2)
+                         {
+                                p = (k - format_params->start_unit) * 100 /
+                                    (format_params->stop_unit
+                                     - format_params->start_unit);
+                                printf("cyl %5d of %5d |  %3d%%\n",
+                                    (k - format_params->start_unit)
+                                    / drive_geo->heads,
+                                    (format_params->stop_unit
+                                     - format_params->start_unit)
+                                    / drive_geo->heads, p);
+                                fflush(stdout);
+                        }
+                }
 
 		if (k % drive_geo->heads == 0) {
 			k += drive_geo->heads;
@@ -846,11 +866,17 @@
 			break;
 
 		case 'p':
-			if (!info.print_hashmarks) info.print_progressbar=1;
+			if (!info.print_hashmarks && !info.print_percentage)
+				info.print_progressbar=1;
+			break;
+
+                case 'P':
+                        if (!info.print_hashmarks && !info.print_progressbar)
+                                info.print_percentage=1;
 			break;
 
 		case 'm':
-			if (!info.print_progressbar) 
+			if (!info.print_progressbar && !info.print_percentage) 
 			{
 				hashstep_str=optarg;
 				info.print_hashmarks=1;
--- s390-tools-1.5.0/dasdfmt/dasdfmt.h.fmtpercentage	2005-05-18 19:24:28.000000000 +0200
+++ s390-tools-1.5.0/dasdfmt/dasdfmt.h	2005-10-20 09:45:14.000000000 +0200
@@ -148,7 +148,7 @@
 	if (*endptr) ERRMSG_EXIT(EXIT_MISUSE,"%s: " str " "    \
 	"is in invalid format\n",prog_name);}
 
-#define dasdfmt_getopt_string "b:n:l:f:d:m:hpLty?vVFk"
+#define dasdfmt_getopt_string "b:n:l:f:d:m:hpPLty?vVFk"
 
 static struct option dasdfmt_getopt_long_options[]=
 {
@@ -159,6 +159,7 @@
         { "force",       0, 0, 'F'},
         { "progressbar", 0, 0, 'p'},
         { "hashmarks",   1, 0, 'm'},
+	{ "percentage",  0, 0, 'P'},
         { "label",       1, 0, 'l'},
         { "devno",       1, 0, 'n'},
         { "device",      1, 0, 'f'},
@@ -193,6 +194,7 @@
         int   withoutprompt;
         int   print_progressbar;
         int   print_hashmarks, hashstep;
+	int   print_percentage;
         int   force;
         int   writenolabel;
         int   labelspec;

s390-tools-1.5.0-rhconf.patch:
 common.mak |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE s390-tools-1.5.0-rhconf.patch ---
--- s390-tools-1.5.0/common.mak.rhconf	2005-09-14 17:45:14.000000000 +0200
+++ s390-tools-1.5.0/common.mak	2005-10-21 11:35:55.000000000 +0200
@@ -25,11 +25,11 @@
 export AS LD CC CPP AR NM STRIP OBJCOPY OBJDUMP INSTALL
 
 # Support alternate install root
-INSTROOT        =
-USRBINDIR       = $(INSTROOT)/usr/bin
-BINDIR          = $(INSTROOT)/sbin
-LIBDIR          = $(INSTROOT)/lib
-MANDIR          = $(INSTROOT)/usr/share/man
+INSTROOT        := $(INSTROOT)
+USRBINDIR       = $(bindir)
+BINDIR          = $(sbindir)
+LIBDIR          = $(libdir)
+MANDIR          = $(mandir)
 OWNER           = $(shell id -un)
 GROUP		= $(shell id -gn)
 export INSTROOT BINDIR LIBDIR MANDIR OWNER GROUP

s390-tools-1.5.0-su.patch:
 fdasd.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE s390-tools-1.5.0-su.patch ---
--- s390-tools-1.5.0/fdasd/fdasd.c.su	2005-09-16 09:18:33.000000000 +0200
+++ s390-tools-1.5.0/fdasd/fdasd.c	2005-10-20 09:21:45.000000000 +0200
@@ -1854,10 +1854,12 @@
 	if (anc->verbose) printf("disk type check     : ok\n");
 
         if (dasd_info.FBA_layout != 0) {
-                snprintf(err_str, ERROR_STRING_SIZE, 
-			"%s is not formatted with z/OS compatible "
-			"disk layout!", options.device);
-                fdasd_error(anc, wrong_disk_format, err_str);
+                if(!anc->silent) {
+                    snprintf(err_str, ERROR_STRING_SIZE, 
+			    "%s is not formatted with z/OS compatible "
+			    "disk layout!", options.device);
+                    fdasd_error(anc, wrong_disk_format, err_str);
+                }
         }      
 
 	if (anc->verbose) printf("disk layout check   : ok\n");

s390-tools-1.5.0-subdirs.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE s390-tools-1.5.0-subdirs.patch ---
--- s390-tools-1.5.0/Makefile.subdirs	2005-05-30 15:07:36.000000000 +0200
+++ s390-tools-1.5.0/Makefile	2005-10-20 10:08:35.000000000 +0200
@@ -3,7 +3,7 @@
 # Include commond definitions
 include common.mak
 
-SUB_DIRS  = libvtoc zipl zdump zfcpdump fdasd dasdfmt dasdview tunedasd tape390 osasnmpd qetharp ip_watcher qethconf scripts zconf vmconvert zt_error vmcp
+SUB_DIRS  = libvtoc zipl zdump fdasd dasdfmt dasdview tunedasd tape390 osasnmpd qetharp ip_watcher qethconf scripts zconf zt_error vmcp
 
 ifeq ($(strip $(SYSFS)),true)
 	SUB_DIRS+=libu2s


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/s390utils/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	15 Oct 2004 15:44:16 -0000	1.11
+++ .cvsignore	21 Oct 2005 09:54:26 -0000	1.12
@@ -1,3 +1,4 @@
 cmsfs-1.1.8.tar.gz
 s390-tools-1.3.1.tar.gz
 s390-tools-1.3.2.tar.gz
+s390-tools-1.5.0.tar.gz


Index: s390utils.spec
===================================================================
RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- s390utils.spec	6 Sep 2005 15:01:17 -0000	1.24
+++ s390utils.spec	21 Oct 2005 09:54:26 -0000	1.25
@@ -2,8 +2,8 @@
 %define vipaver 2.0.3
 Summary: Linux/390 specific utilities.
 Name: s390utils
-Version: 1.3.2
-Release: 7
+Version: 1.5.0
+Release: 1
 Epoch: 2
 License: GPL
 Group: System Environment/Base
@@ -13,18 +13,18 @@
 Source4: cmsfs-%{cmsfsver}.tar.gz
 Source5: zfcpconf.sh
 Source6: src_vipa-%{vipaver}.tar.gz
-Patch1: s390-tools-1.3.2-su.patch
-Patch2: s390-tools-1.3.1-fdasd-raid.patch
-Patch3: s390-tools-1.1.6-fmtpercentage.patch
-Patch4: s390-tools-1.3.2-subdirs.patch
-Patch5: s390-tools-1.3.1-automenu.patch
-Patch6: s390-tools-1.2.1-rhconf.patch
-Patch7: s390-tools-1.3.1-zfcpdump.patch
+Patch1: s390-tools-1.5.0-su.patch
+Patch2: s390-tools-1.5.0-fdasd-raid.patch
+Patch3: s390-tools-1.5.0-fmtpercentage.patch
+Patch4: s390-tools-1.5.0-subdirs.patch
+Patch5: s390-tools-1.5.0-automenu.patch
+Patch6: s390-tools-1.5.0-rhconf.patch
+#Patch7: s390-tools-1.3.1-zfcpdump.patch
 Patch8: s390-tools-1.3.1-kernheader.patch
 Patch9: s390-tools-1.3.2-warnings.patch
 Patch20: cmsfs-1.1.8-kernel26.patch
 BuildRoot: /var/tmp/%{name}-root
-ExclusiveArch: s390 s390x
+#ExclusiveArch: s390 s390x
 %define _sbindir /sbin
 
 %description
@@ -40,10 +40,12 @@
     of a DASD to the console.
   - fdasd, which is used to create or modify partitions on
     eckd-dasds formatted with the z/OS compatible disk layout.
+  - osasnmpd, a subagent for net-snmp to access the OSA hardware.
   - qetharp to query and purge address data in the OSA and HiperSockets hardware
   - qethconf to configure IBM QETH function IPA, VIPA and Proxy ARP.
   - src_vipa.sh to start applications using VIPA capabilities
   - tunedasd, a tool to adjust tunable parameters on DASD devices
+  - vmcp, a tool to send CP commands from a Linux guest to the VM.
   - zipl, which is used to make either dasds or tapes bootable
     for system IPL or system dump.
   - zdump, which is used to retrieve system dumps from either
@@ -51,9 +53,17 @@
 
 %prep
 %setup -q -n s390-tools-%{version} -a 4 -a 6
+
+# Fix to honor the silent flag for wrongly formated disks
 %patch1 -p1 -b .su
+
+# Enhancement to add raid partiton support to dasds
 %patch2 -p1 -b .fdasd-raid
+
+# Enhancement to add a percentage output bar to dasdfmt, needed for anaconda
 %patch3 -p1 -b .fmtpercentage
+
+# Limit the subdirs and tools we support
 %patch4 -p1 -b .subdirs
 
 # Patch to maintain backwards compatibility with older zipl multiboot feature
@@ -63,7 +73,8 @@
 %patch6 -p1 -b .rhconf
 
 # Patch to make zfcpdump build without getting tarballs from the internet.
-%patch7 -p1 -b .zfcpdump
+# Disabled and unmaintained for now as we don't ship and support zfcpdump
+# %patch7 -p1 -b .zfcpdump
 
 # Patch to fix conflicting include of asm/statfs.h and bits/statfs.h
 %patch8 -p1 -b .kernheader
@@ -135,6 +146,10 @@
 %{_mandir}/man5/*
 
 %changelog
+* Thu Oct 20 2005 Phil Knirsch <pknirsch at redhat.com> 2:1.5.0-1
+- Large update from 1.3.2 to 1.5.0
+- Include osasnmpd and vmcp now by default
+
 * Tue Sep 06 2005 Phil Knirsch <pknirsch at redhat.com> 2:1.3.2-7
 - Fixed a couple of code bugs (#143808)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/s390utils/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	21 Jun 2005 10:15:34 -0000	1.12
+++ sources	21 Oct 2005 09:54:26 -0000	1.13
@@ -1,3 +1,3 @@
 fb114c924837ee702e56149c27519588  cmsfs-1.1.8.tar.gz
-38bdde5fec5f266ab5a054a3dad437ff  s390-tools-1.3.2.tar.gz
 54ad59b0c1dfa84ba17c34114368a3af  src_vipa-2.0.3.tar.gz
+7fa31ecd41044220908af8432ef2bc45  s390-tools-1.5.0.tar.gz


--- s390-tools-1.1.6-fmtpercentage.patch DELETED ---


--- s390-tools-1.2.1-rhconf.patch DELETED ---


--- s390-tools-1.3.1-automenu.patch DELETED ---


--- s390-tools-1.3.1-fdasd-raid.patch DELETED ---


--- s390-tools-1.3.2-su.patch DELETED ---


--- s390-tools-1.3.2-subdirs.patch DELETED ---


