rpms/s390utils/F-12 0019-ziorep-fix-return-codes.patch, NONE, 1.1 0020-lstape-fix-return-code.patch, NONE, 1.1 0021-cpuplugd-fix-reading-the-size-of-proc-sys-vm-cmm_pag.patch, NONE, 1.1 0022-lsqeth-support-new-attributes.patch, NONE, 1.1 s390utils.spec, 1.21, 1.22

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28832

Modified Files:
	s390utils.spec 
Added Files:
	0019-ziorep-fix-return-codes.patch 
	0020-lstape-fix-return-code.patch 
	0021-cpuplugd-fix-reading-the-size-of-proc-sys-vm-cmm_pag.patch 
	0022-lsqeth-support-new-attributes.patch 
Log Message:
* Wed Jan 20 2010 Dan Horák <dan[at]danny.cz> 2:1.8.2-10
- fixed return codes in ziorep (#556849)
- fixed return code in lstape (#556910)
- fixed reading the size of /proc/sys/vm/cmm_pages in cpuplugd (#556911)
- support new attributes in lsqeth (#556915)


0019-ziorep-fix-return-codes.patch:
 ziorep_traffic.cpp     |    5 ++++-
 ziorep_utilization.cpp |    6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE 0019-ziorep-fix-return-codes.patch ---
>From a8ffd7242da2adcc4ab5b0f23193cfe764dc376d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 20 Jan 2010 08:42:52 +0100
Subject: [PATCH 19/22] ziorep: fix return codes

Description: ziomon: ziorep tools return 1 when using options -h and -v
Symptom:     Using ziorep_traffic/utilization with these options give an
error.
Problem:     1 as been introduced as rc for parse_parms besides error codes,
but is not distinguished from them when parse_params is called.
Solution:    After calling  parse_parms check for rc 1 and substitute through 0.
---
 ziomon/ziorep_traffic.cpp     |    5 ++++-
 ziomon/ziorep_utilization.cpp |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ziomon/ziorep_traffic.cpp b/ziomon/ziorep_traffic.cpp
index 1461e55..20ee32f 100644
--- a/ziomon/ziorep_traffic.cpp
+++ b/ziomon/ziorep_traffic.cpp
@@ -529,8 +529,11 @@ int main(int argc, char **argv)
 	verbose = 0;
 
 	init_opts(&opts);
-	if ( (rc = parse_params(argc, argv, &opts)) )
+	if ( (rc = parse_params(argc, argv, &opts)) ) {
+		if (rc == 1)
+			rc = 0;
 		goto out;
+	}
 	if ( (rc = check_opts(&opts, &cfg)) )
 		goto out;
 
diff --git a/ziomon/ziorep_utilization.cpp b/ziomon/ziorep_utilization.cpp
index 3f57a47..ac4576f 100644
--- a/ziomon/ziorep_utilization.cpp
+++ b/ziomon/ziorep_utilization.cpp
@@ -352,8 +352,11 @@ int main(int argc, char **argv)
 	verbose = 0;
 
 	init_opts(&opts);
-	if ( (rc = parse_params(argc, argv, &opts)) )
+	if ( (rc = parse_params(argc, argv, &opts)) ) {
+		if (rc == 1)
+			rc = 0;
 		goto out;
+	}
 	if ( (rc = check_opts(&opts, &cfg)) )
 		goto out;
 
-- 
1.6.5.2


0020-lstape-fix-return-code.patch:
 lstape |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0020-lstape-fix-return-code.patch ---
>From 72ec5b5bd9a7fd23e2d1aaed455df8f2bda952ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 20 Jan 2010 08:44:43 +0100
Subject: [PATCH 20/22] lstape: fix return code

Description: lstape: help function returns 1, although it was successful
Symptom:     Issuing "lstape -h" or "lstape --help" and then looking for the
error code on the console through e.g. "echo $?" shows 1. Which
looks like an error.
Problem:     exit 1, where we chould have exit 0.
Solution:    Return 0 after calling the help function with exit 0.
---
 zconf/lstape |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zconf/lstape b/zconf/lstape
index efacfc9..5671315 100755
--- a/zconf/lstape
+++ b/zconf/lstape
@@ -90,7 +90,7 @@ while [ $# -ne 0 ]; do
 	case $1 in
 		-h|--help)
 			PrintUsage
-			exit 1
+			exit 0
 			;;
 		-t|--type)
 			if [ $# -lt 2 ]; then
-- 
1.6.5.2


0021-cpuplugd-fix-reading-the-size-of-proc-sys-vm-cmm_pag.patch:
 mem.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0021-cpuplugd-fix-reading-the-size-of-proc-sys-vm-cmm_pag.patch ---
>From d3c4eb2ced3a8e3c8f7a528f88721324028534e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 20 Jan 2010 08:46:14 +0100
Subject: [PATCH 21/22] cpuplugd: fix reading the size of /proc/sys/vm/cmm_pages

Description: cpuplugd: fix fscanf file handling in get_cmmpages_size
Symptom:     cpuplugd was not able to correctly read the size of the
/proc/sys/vm/cmm_pages file. This prevented cpuplugd from using
the cmm feature correctly.
Problem:     The code checked for the wrong return code (!= 0 instead of ==0)
Solution:    Check for the right return code in the get_cmmpages_size error
handling function.
---
 cpuplugd/mem.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cpuplugd/mem.c b/cpuplugd/mem.c
index a8f2a8e..8d5f05f 100644
--- a/cpuplugd/mem.c
+++ b/cpuplugd/mem.c
@@ -230,7 +230,7 @@ int get_cmmpages_size()
 		return -1;
 	}
 	rc = fscanf(filp, "%d", &size);
-	if (rc != 0) {
+	if (rc == 0) {
 		fprintf(stderr, "Can not read /proc/sys/vm/cmm_pages: %s\n",
 				strerror(errno));
 		if (foreground == 0)
-- 
1.6.5.2


0022-lsqeth-support-new-attributes.patch:
 README       |    2 ++
 zconf/lsqeth |   12 +++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

--- NEW FILE 0022-lsqeth-support-new-attributes.patch ---
>From c986172e782ae2afa41209e7c238315175d589e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 20 Jan 2010 08:48:52 +0100
Subject: [PATCH 22/22] lsqeth: support new attributes

Description: lsqeth: add recent qeth attributes
Symptom:     no information about "isolation" and "sniffer" values
Problem:     new sysfs attributes "isolation" and "sniffer" not mentioned in
lsqeth output.
Solution:    add attributes "isolation" and "sniffer" to lsqeth.
---
 README       |    2 ++
 zconf/lsqeth |   11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/README b/README
index 30ba06f..7c75563 100644
--- a/README
+++ b/README
@@ -192,6 +192,8 @@ Release History:
 
     - lscss: Also show devices on the defunct subchannel.
 
+    - lsqeth: add attributes "isolation" and "sniffer"
+
     - all: Reworked s390-tools build process.
 
     Bug Fixes:
diff --git a/zconf/lsqeth b/zconf/lsqeth
index 9b155e9..b1c2809 100755
--- a/zconf/lsqeth
+++ b/zconf/lsqeth
@@ -3,7 +3,7 @@
 #  File...........: lsqeth
 #  Author(s)......: Steffen Thoss	<thoss at de.ibm.com>
 #  		    Peter Tiedemann	<ptiedem at de.ibm.com>
-#  Copyright IBM Corp. 2004, 2009
+#  Copyright IBM Corp. 2004, 2010
 # 
 #  History of changes:
 # 
@@ -63,7 +63,9 @@ output_array=( if_name
 	       buffer_count 
 	       add_hhlen
 	       layer2 
-	       large_send )
+	       large_send
+	       isolation
+	       sniffer )
 # Array for sysfs values
 sysfs_entries=( "sw checksumming" "hw checksumming" "no checksumming"
 		"always queue 0" "always queue 1" 
@@ -87,7 +89,7 @@ parp_array=0
 function PrintVersion
 {
         echo "$script_name: version %S390_TOOLS_VERSION%" 
-	echo "Copyright IBM Corp. 2003, 2009"
+	echo "Copyright IBM Corp. 2003, 2010"
 }
 
 
@@ -308,7 +310,8 @@ function __print_normal_format
 function __layer2_print
 {
 	del_layer2=( route4 route6
-		     fake_ll fake_broadcast )
+		     fake_ll fake_broadcast
+		     sniffer )
 
 	for l in ${del_layer2[@]}
  		do
-- 
1.6.5.2



Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-12/s390utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- s390utils.spec	13 Jan 2010 08:22:51 -0000	1.21
+++ s390utils.spec	20 Jan 2010 08:21:58 -0000	1.22
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,6 +51,10 @@ Patch15:  0015-s390tools-1.8.2-zipl-dm.p
 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
+Patch19:  0019-ziorep-fix-return-codes.patch
+Patch20:  0020-lstape-fix-return-code.patch
+Patch21:  0021-cpuplugd-fix-reading-the-size-of-proc-sys-vm-cmm_pag.patch
+Patch22:  0022-lsqeth-support-new-attributes.patch
 
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
@@ -134,6 +138,18 @@ be used together with the zSeries (s390)
 # Fixed uppercase conversion in lscss (#554768)
 %patch18 -p1 -b .uppercase
 
+# Fixed return codes in ziorep (#556849)
+%patch19 -p1 -b .ziorep-returncodes
+
+# Fixed return code in lstape (#556910)
+%patch20 -p1 -b .lstape-returncode
+
+# Fixed reading the size of /proc/sys/vm/cmm_pages in cpuplugd (#556911)
+%patch21 -p1 -b .cpuplugd-fscanf
+
+# Support new attributes in lsqeth (#556915)
+%patch22 -p1 -b .lsqeth-new-attrs
+
 #
 # cmsfs
 #
@@ -830,6 +846,12 @@ User-space development files for the s39
 
 
 %changelog
+* Wed Jan 20 2010 Dan Horák <dan[at]danny.cz> 2:1.8.2-10
+- fixed return codes in ziorep (#556849)
+- fixed return code in lstape (#556910)
+- fixed reading the size of /proc/sys/vm/cmm_pages in cpuplugd (#556911)
+- support new attributes in lsqeth (#556915)
+
 * 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)