From f1bcb163464f15aac29484dda97437531031d941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <sharkcz@fedoraproject.org>
Date: Wed, 13 Jan 2010 08:53:00 +0000
Subject: [PATCH] - updated device_cio_free script (#533494) - fixed uppercase
 conversion in lscss (#554768)

---
 0018-fix-uppercase-conversion-in-lscss.patch | 38 ++++++++++++++++++++
 device_cio_free                              |  4 ++-
 s390utils.spec                               | 22 ++++++++----
 3 files changed, 56 insertions(+), 8 deletions(-)
 create mode 100644 0018-fix-uppercase-conversion-in-lscss.patch

diff --git a/0018-fix-uppercase-conversion-in-lscss.patch b/0018-fix-uppercase-conversion-in-lscss.patch
new file mode 100644
index 0000000..9c5b945
--- /dev/null
+++ b/0018-fix-uppercase-conversion-in-lscss.patch
@@ -0,0 +1,38 @@
+From a8bcc744ec941c3b34c22c7a7729b52a390c7a08 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
+Date: Wed, 13 Jan 2010 08:39:09 +0100
+Subject: [PATCH] fix uppercase conversion in lscss
+
+Description: lscss: fix uppercase conversion
+Symptom:     when invoking the -u option, lscss will fail with the message "tr: missing operand"
+Problem:     the bash option "nullglob" interferes with the tr operands
+Solution:    avoid expanding of those operands by placing quotes around them
+---
+ zconf/lscss |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/zconf/lscss b/zconf/lscss
+index efdb9ca..fc40fe6 100755
+--- a/zconf/lscss
++++ b/zconf/lscss
+@@ -354,7 +354,7 @@ if [ $SCH_IO ] ;then
+ 	echo "----------------------------------------------------------------------"
+     fi
+     print_io | if [ $UPPERCASE ] ;then
+-	tr [:lower:] [:upper:]
++	tr "[:lower:]" "[:upper:]"
+     else
+ 	cat -
+     fi
+@@ -368,7 +368,7 @@ if [ $SCH_CHSC ] ;then
+     echo "Device   Subchan."
+     echo "-----------------"
+     print_chsc | if [ $UPPERCASE ] ;then
+-	tr [:lower:] [:upper:]
++	tr "[:lower:]" "[:upper:]"
+     else
+ 	cat -
+     fi
+-- 
+1.6.5.2
+
diff --git a/device_cio_free b/device_cio_free
index a17662b..557427a 100644
--- a/device_cio_free
+++ b/device_cio_free
@@ -145,7 +145,9 @@ if [ $MODE = "dasd" ]; then
 	sed -e 's/.*[[:space:]]dasd=\([^[:space:]]*\).*/\1/' -e 's/([^)]*)//g' \
 	-e 's/nopav\|nofcx\|autodetect\|probeonly//g' -e 's/,,/,/g' -e 's/^,//' -e 's/,$//')
 
-    free_device $DEVICES
+    for DEVRANGE in $(echo $DEVICES | tr ',' ' '); do
+	free_device $DEVRANGE
+    done
 fi
 
 if [ $MODE = "znet" ]; then
diff --git a/s390utils.spec b/s390utils.spec
index dc43247..80402c9 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +50,7 @@ Patch14:  0014-dasdview-fdasd-fix-floating-point-error-for-unformat.patch
 Patch15:  0015-s390tools-1.8.2-zipl-dm.patch
 Patch16:  0016-s390tools-1.8.2-lsreipl-nss.patch
 Patch17:  0017-qualified-return-codes-and-further-error-handling-in.patch
+Patch18:  0018-fix-uppercase-conversion-in-lscss.patch
 
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
@@ -130,6 +131,9 @@ be used together with the zSeries (s390) Linux kernel and device drivers.
 # Add qualified return codes and further error handling in znetconf (#548487)
 %patch17 -p1 -b .znetconf-returncodes
 
+# Fixed uppercase conversion in lscss (#554768)
+%patch18 -p1 -b .uppercase
+
 #
 # cmsfs
 #
@@ -446,11 +450,9 @@ fi
 %doc README
 %doc LICENSE
 /sbin/zipl
-/sbin/dasd_cio_free
 /sbin/dasdfmt
 /sbin/dasdinfo
 /sbin/dasdview
-/sbin/device_cio_free
 /sbin/fdasd
 /sbin/chccwdev
 /sbin/chchp
@@ -472,9 +474,7 @@ fi
 /sbin/tape390_crypt
 /sbin/tunedasd
 /sbin/vmcp
-/sbin/zfcp_cio_free
 /sbin/zgetdump
-/sbin/znet_cio_free
 /sbin/znetconf
 /sbin/dbginfo.sh
 %{_sbindir}/lsreipl
@@ -488,8 +488,6 @@ fi
 %{_bindir}/vmconvert
 %{_initddir}/dumpconf
 %config(noreplace) %{_sysconfdir}/sysconfig/dumpconf
-%{_initddir}/cpi
-%config(noreplace) %{_sysconfdir}/sysconfig/cpi
 /lib/s390-tools
 %{_mandir}/man1/zfcpdbf.1*
 %{_mandir}/man4/prandom.4*
@@ -537,8 +535,14 @@ fi
 %config(noreplace) %{_sysconfdir}/udev/rules.d/60-readahead.rules
 %ghost %config(noreplace) %{_sysconfdir}/dasd.conf
 %ghost %config(noreplace) %{_sysconfdir}/zfcp.conf
+%{_initddir}/cpi
+%config(noreplace) %{_sysconfdir}/sysconfig/cpi
 /sbin/dasdconf.sh
 /sbin/zfcpconf.sh
+/sbin/dasd_cio_free
+/sbin/device_cio_free
+/sbin/zfcp_cio_free
+/sbin/znet_cio_free
 
 # src_vipa
 %{_bindir}/src_vipa.sh
@@ -826,6 +830,10 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Wed Jan 13 2010 Dan Horák <dan[at]danny.cz> 2:1.8.2-9
+- updated device_cio_free script (#533494)
+- fixed uppercase conversion in lscss (#554768)
+
 * Fri Jan  8 2010 Dan Horák <dan[at]danny.cz> 2:1.8.2-8
 - updated device_cio_free script (#533494)