[s390utils] - rebased to 1.23 (#804774)

[Dan Horák]

commit e9ac32a6715a357b44e4938495e827bf7cb55a74
Author: Dan Horák <dan at danny.cz>
Date:   Wed Jul 24 21:43:43 2013 +0200

    - rebased to 1.23 (#804774)

 .gitignore                     |    1 +
 s390-tools-1.20.0-fedora.patch |  784 ----------------------------------------
 s390-tools-1.23.0-fedora.patch |   61 +++
 s390utils.spec                 |    9 +-
 sources                        |    2 +-
 5 files changed, 69 insertions(+), 788 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b29664a..91b3f12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ src_vipa-2.0.4.tar.gz
 /s390-tools-1.17.0.tar.bz2
 /s390-tools-1.19.0.tar.bz2
 /s390-tools-1.20.0.tar.bz2
+/s390-tools-1.23.0.tar.bz2
diff --git a/s390-tools-1.23.0-fedora.patch b/s390-tools-1.23.0-fedora.patch
new file mode 100644
index 0000000..89027a1
--- /dev/null
+++ b/s390-tools-1.23.0-fedora.patch
@@ -0,0 +1,61 @@
+From 9b225fac81186176075f673dfe5cf8e373b2068a Mon Sep 17 00:00:00 2001
+From: Dan Horak <dan at danny.cz>
+Date: Sun, 20 Jul 2008 09:24:05 +0200
+Subject: [PATCH 1/2] s390-tools-1.5.3-zipl-zfcpdump-2
+
+---
+ common.mak | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/common.mak b/common.mak
+index 44adc6e..4373da5 100644
+--- a/common.mak
++++ b/common.mak
+@@ -62,8 +62,8 @@ GROUP		= $(shell id -gn)
+ export INSTROOT BINDIR LIBDIR MANDIR OWNER GROUP
+ 
+ # Special defines for zfcpdump
+-ZFCPDUMP_DIR    = /usr/local/share/zfcpdump
+-ZFCPDUMP_IMAGE  = zfcpdump.image
++ZFCPDUMP_DIR    = /boot
++ZFCPDUMP_IMAGE  = zfcpdump
+ ZFCPDUMP_RD     = zfcpdump.rd
+ export ZFCPDUMP_DIR ZFCPDUMP_IMAGE ZFCPDUMP_RD
+ 
+-- 
+1.8.1.4
+
+
+From a3d9221076f9eb7cc8434baac71327f786351c63 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Thu, 23 Apr 2009 11:46:01 +0200
+Subject: [PATCH 2/2] s390-tools-1.8.1-fdasd-su
+
+---
+ fdasd/fdasd.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/fdasd/fdasd.c b/fdasd/fdasd.c
+index ba22475..f2ac417 100644
+--- a/fdasd/fdasd.c
++++ b/fdasd/fdasd.c
+@@ -2229,10 +2229,12 @@ static void fdasd_get_geometry (fdasd_anchor_t *anc)
+ 		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");
+-- 
+1.8.1.4
+
diff --git a/s390utils.spec b/s390utils.spec
index 6b70f9e..9905695 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -6,8 +6,8 @@
 Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
-Version:        1.20.0
-Release:        5%{?dist}
+Version:        1.23.0
+Release:        1%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 ExclusiveArch:  s390 s390x
@@ -35,7 +35,7 @@ Source18:       cpuplugd.initd
 Source19:       mon_statd.initd
 Source21:       normalize_dasd_arg
 
-Patch1:         s390-tools-1.20.0-fedora.patch
+Patch1:         s390-tools-1.23.0-fedora.patch
 
 Patch1000:      cmsfs-1.1.8-warnings.patch
 Patch1001:      cmsfs-1.1.8-kernel26.patch
@@ -734,6 +734,9 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Wed Jul 23 2013 Dan Horák <dan[at]danny.cz> - 2:1.23.0-1
+- rebased to 1.23 (#804774)
+
 * Wed Jun 05 2013 Dan Horák <dan[at]danny.cz> - 2:1.20.0-5
 - update with patches from RHEL-6
 - rebase zIPL to 1.21 to fix booting from FBA DASD (#970859)
diff --git a/sources b/sources
index 31af17d..1333117 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 71a8ee5918f2c44c385fcfe8350cdc98  cmsfs-1.1.8c.tar.gz
 ba42772e5b305b5e147344442cd70826  src_vipa-2.0.4.tar.gz
-881237b31201d46ba452fa4ff51c934c  s390-tools-1.20.0.tar.bz2
+d7c8f8d6213f0e61e24c393347dcd8b7  s390-tools-1.23.0.tar.bz2