Accepting request 546853 from hardware

OBS-URL: https://build.opensuse.org/request/show/546853
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qclib?expand=0&rev=2

qclib-1.2.0.tgz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7899b6558749d0d32e69a1d9c957cb2ed2845e18fcc14c9f1f4a64957c617f6
-size 72740

qclib-1.3.0.tgz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4b5ef6e9ddccb13fc6f9d94fdcf098a75987ff6744c93fe5cf8d2eb7930f86ac
+size 74070

qclib.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Thu Nov  2 20:03:27 UTC 2017 - mpost@suse.com
+
+- Upgraded to version 1.3.0
+  Changes:
+  * Added STHYI support in LPAR
+  * Added new env variable QC_DEBUG_FILE (see qc_open())
+      Note: Failure to open a file for logging is now treated as a fatal error
+  * Added script qc_dump to collect debug data in a standardized manner
+  * Added attributes qc_layer_uuid and qc_layer_extended_name to LPAR layer
+  * /proc/sysinfo parsing: Switch from "KVM/Linux" to the less strict "KVM"
+      to detect KVM systems
+  * Detect unregistered and closed handles
+  * Makefile: Compile SONAME into shared library
+  Bug fixes:
+  * STHYI: Properly support cc==3&&rc==4 as introduced in APAR VM65419
+  * Logs: Fix month in timestamp (was off by 1)
+  * qc_test: Fix flags for qc_layer_name in QC_LAYER_TYPE_ZVM_HYPERVISOR
+- Dropped obsolete patch qclib.correctly.interpret.sthyi.check.patch
+
 -------------------------------------------------------------------
 Mon Mar 27 16:58:14 UTC 2017 - mpost@suse.com
 

qclib.correctly.interpret.sthyi.check.patch

@@ -1,56 +0,0 @@
-diff -Naurp qclib-1.2.0-vanilla/query_capacity.c qclib-1.2.0/query_capacity.c
---- qclib-1.2.0-vanilla/query_capacity.c	2016-06-03 09:14:01.000000000 +0200
-+++ qclib-1.2.0/query_capacity.c	2017-03-21 08:53:50.000000000 +0100
-@@ -96,7 +96,7 @@ static int qc_debug_file_init(void) {
- 			close(fd);
- 			goto out_err;
- 		}
--		qc_debug(NULL, "This is qclib v1.2.0, level a7ecaf7, date 2016-06-03 09:04:14 +0200\n");
-+		qc_debug(NULL, "This is qclib v1.2.0, level e5679bb, date 2017-03-21 08:49:07 +0100\n");
- 	}
- 
- 	return 0;
-diff -Naurp qclib-1.2.0-vanilla/query_capacity_sthyi.c qclib-1.2.0/query_capacity_sthyi.c
---- qclib-1.2.0-vanilla/query_capacity_sthyi.c	2016-06-03 09:14:01.000000000 +0200
-+++ qclib-1.2.0/query_capacity_sthyi.c	2017-03-21 08:53:50.000000000 +0100
-@@ -65,10 +65,10 @@ static int qc_is_sthyi_available(void) {
- #endif
- }
- 
--static int qc_sthyi(char *sthyi_buffer) {
-+static int qc_sthyi(struct sthyi_priv *priv) {
- #if defined __s390x__ || __s390__
- 	register unsigned long function_code asm("2") = 0;
--	register unsigned long buffer asm("4") = (unsigned long) sthyi_buffer;
-+	register unsigned long buffer asm("4") = (unsigned long) priv->data;
- 	register unsigned long return_code asm("5");
- 	int cc = -1;
- 
-@@ -80,10 +80,11 @@ static int qc_sthyi(char *sthyi_buffer)
- 		      : "memory", "cc");
- 	if (cc == 0) {
- 		/* buffer was updated */
-+		priv->avail = STHYI_AVAILABLE;
- 		return 1;
- 	}
--	/* if cc==-1: exception. never mind, return 0 */
--	/* if cc==3: never mind, r carries return code */
-+	if (cc == 3 && return_code == 4)
-+		return 1;
- #endif
- 
- 	return 0;
-@@ -496,12 +497,11 @@ static int qc_sthyi_open(struct qc_handl
- 		}
- 		qc_debug(hdl, "STHYI is available\n");
- 		/* we assume we are not relocated at this spot, between STFLE and STHYI */
--		if (!qc_sthyi(priv->data)) {
-+		if (!qc_sthyi(priv)) {
- 			qc_debug(hdl, "Error: STHYI execution failed\n");
- 			rc = -3;
- 			goto out;
- 		}
--		priv->avail = STHYI_AVAILABLE;
- 	}
- 	goto out;
- 

qclib.spec

@@ -17,7 +17,7 @@
 
 
 Name:           qclib
-Version:        1.2.0
+Version:        1.3.0
 Release:        0
 Summary:        Query Capacity library
 License:        BSD-3-Clause
@@ -26,7 +26,6 @@ Url:            http://www.ibm.com/developerworks/linux/linux390/qclib.html
 Source:         %{name}-%{version}.tgz
 Source1:        %{name}-rpmlintrc
 Patch1:         qclib.makefile.libdir.patch
-Patch2:         qclib.correctly.interpret.sthyi.check.patch
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -77,8 +76,8 @@ Systems.
 
 %package devel
 Summary:        Development files for Query Capacity library
-Requires:       libqc1 = %{version}-%{release}
 Group:          Development/Libraries/C and C++
+Requires:       libqc1 = %{version}-%{release}
 
 %description devel
 qclib provides a C API for extraction of system information for Linux on z
@@ -86,9 +85,9 @@ Systems.
 
 %package devel-static
 Summary:        Development files for Query Capacity library
+Group:          Development/Libraries/C and C++
 Requires:       libqc1 = %{version}-%{release}
 Requires:       qclib-devel = %{version}-%{release}
-Group:          Development/Libraries/C and C++
 
 %description devel-static
 qclib provides a C API for extraction of system information for Linux on z
@@ -97,7 +96,6 @@ Systems.
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
 
 %build
 MYCFLAGS=$(grep ^CFLAGS Makefile | cut -f2 -d=)