Accepting request 653160 from home:markkp:branches:Base:System
- Added the following patches for Fate#326862 (bsc#1113328) zcrypt DD: introduce APQN tags to support deterministic driver binding * s390-tools-sles15sp1-01-chzcrypt-Corrections-at-the-chzcrypt-man-page.patch * s390-tools-sles15sp1-02-lszcrypt-support-for-alternate-zcrypt-device-drivers.patch - Added the following patches for Fate#326804 (bsc#1113330) Extended access controls for AP queue * s390-tools-sles15sp1-01-zcryptctl-new-tool-zcryptctl-for-multiple-zcrypt-node.patch OBS-URL: https://build.opensuse.org/request/show/653160 OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=59
This commit is contained in:
Mark Post
Git OBS Bridge
parent
a7f8ed0265
commit
6f83d79828
@ -0,0 +1,54 @@
|
||||
Subject: zcrypt: Corrections at the chzcrypt man page.
|
||||
From: Harald Freudenberger <freude@linux.ibm.com>
|
||||
|
||||
Summary: lszcrypt: support for alternate zcrypt device drivers
|
||||
Description: With kernel 4.19 there comes an extension to the
|
||||
existing AP bus which supports alternate zcrypt
|
||||
drivers. For details about this see kernel patch
|
||||
"s390/zcrypt: AP bus support for alternate
|
||||
driver(s)". So now lszcrypt displays the driver name
|
||||
in verbose mode. As some of the information
|
||||
displayed by lszcrypt was based on sysfs attributes,
|
||||
which are only available when the default zcrypt
|
||||
driver is bound to the device, this also needed some
|
||||
rework. If a sysfs attribute is not available
|
||||
because of an alternate driver binding (or no
|
||||
driver) a question mark is printed into the field.
|
||||
Upstream-ID: 13648dd6f424bdbf855cd756e3039c8d4e9fd944
|
||||
Problem-ID: SEC1806
|
||||
|
||||
Upstream-Description:
|
||||
|
||||
zcrypt: Corrections at the chzcrypt man page.
|
||||
|
||||
Fixed typo and added one sentence to explain more details
|
||||
about online switching of queue devices.
|
||||
|
||||
Signed-off-by: Harald Freudenberger <freude@linux.vnet.ibm.com>
|
||||
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
|
||||
|
||||
|
||||
Signed-off-by: Harald Freudenberger <freude@linux.ibm.com>
|
||||
---
|
||||
zconf/zcrypt/chzcrypt.8 | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/zconf/zcrypt/chzcrypt.8
|
||||
+++ b/zconf/zcrypt/chzcrypt.8
|
||||
@@ -57,6 +57,7 @@ Set all available cryptographic device(s
|
||||
.B <device id>
|
||||
Specifies a cryptographic device which will be set either online or offline.
|
||||
The device can either be a card device or a queue device.
|
||||
+A queue device can only get switched online when the providing card is online.
|
||||
|
||||
Please note that the card device and queue device representation are both
|
||||
in hexadecimal notation.
|
||||
@@ -95,7 +96,7 @@ Print version information and exit.
|
||||
.B chzcrypt -e 0 1 12
|
||||
Will set the cryptographic card devices 0, 1 and 12 online.
|
||||
.TP
|
||||
-.B chzcrypt -e 01.0038
|
||||
+.B chzcrypt -e 10.0038
|
||||
Will set the cryptographic device '10.0038' respectively card id 16
|
||||
(0x10) with domain 56 (0x38) online.
|
||||
.TP
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,369 @@
|
||||
Subject: lszcrypt: support for alternate zcrypt device drivers
|
||||
From: Harald Freudenberger <freude@linux.ibm.com>
|
||||
|
||||
Summary: lszcrypt: support for alternate zcrypt device drivers
|
||||
Description: With kernel 4.19 there comes an extension to the
|
||||
existing AP bus which supports alternate zcrypt
|
||||
drivers. For details about this see kernel patch
|
||||
"s390/zcrypt: AP bus support for alternate
|
||||
driver(s)". So now lszcrypt displays the driver name
|
||||
in verbose mode. As some of the information
|
||||
displayed by lszcrypt was based on sysfs attributes,
|
||||
which are only available when the default zcrypt
|
||||
driver is bound to the device, this also needed some
|
||||
rework. If a sysfs attribute is not available
|
||||
because of an alternate driver binding (or no
|
||||
driver) a question mark is printed into the field.
|
||||
Upstream-ID: 0a0b4c382693cded5652404e8fa2c0e483aa33df
|
||||
Problem-ID: SEC1806
|
||||
|
||||
Upstream-Description:
|
||||
|
||||
lszcrypt: support for alternate zcrypt device drivers
|
||||
|
||||
With kernel 4.19 there comes an extension to the existing
|
||||
AP bus which supports alternate zcrypt drivers. For details
|
||||
about this see kernel patch "s390/zcrypt: AP bus support for
|
||||
alternate driver(s)". So now lszcrypt displays the driver
|
||||
name in verbose mode. As some of the information displayed
|
||||
by lszcrypt was based on sysfs attributes, which are only
|
||||
available when the default zcrypt driver is bound to the
|
||||
device, this also needed some rework. If a sysfs attribute
|
||||
is not available because of an alternate driver binding
|
||||
(or no driver) a question mark is printed into the field.
|
||||
|
||||
Together with this a slight rework of the displayed information
|
||||
has been done. The two columns for pending requests and pending
|
||||
replies has been merged to one pending column and the column
|
||||
sizes have been adjusted.
|
||||
|
||||
Signed-off-by: Harald Freudenberger <freude@linux.ibm.com>
|
||||
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
|
||||
|
||||
|
||||
Signed-off-by: Harald Freudenberger <freude@linux.ibm.com>
|
||||
---
|
||||
zconf/zcrypt/lszcrypt.8 | 4 -
|
||||
zconf/zcrypt/lszcrypt.c | 163 ++++++++++++++++++++++++++++++++----------------
|
||||
2 files changed, 112 insertions(+), 55 deletions(-)
|
||||
|
||||
--- a/zconf/zcrypt/lszcrypt.8
|
||||
+++ b/zconf/zcrypt/lszcrypt.8
|
||||
@@ -54,8 +54,8 @@ status.
|
||||
.B -V, --verbose
|
||||
The verbose level for cryptographic device information.
|
||||
With this verbose level additional information like hardware card type,
|
||||
-hardware queue depth, pending request queue count, outstanding
|
||||
-request queue count, and installed function facilities are displayed.
|
||||
+hardware queue depth, pending requests count, installed function
|
||||
+facilities and driver binding is displayed.
|
||||
.TP 8
|
||||
.B <device-id>
|
||||
Specifies a cryptographic device to display. A cryptographic device can be
|
||||
--- a/zconf/zcrypt/lszcrypt.c
|
||||
+++ b/zconf/zcrypt/lszcrypt.c
|
||||
@@ -1,7 +1,7 @@
|
||||
/**
|
||||
* lszcrypt - Display zcrypt devices and configuration settings
|
||||
*
|
||||
- * Copyright IBM Corp. 2008, 2017
|
||||
+ * Copyright IBM Corp. 2008, 2018
|
||||
*
|
||||
* s390-tools is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the MIT license. See LICENSE for details.
|
||||
@@ -57,6 +57,25 @@ struct lszcrypt_l *lszcrypt_l = &l;
|
||||
#define CLASS_STATELESS "restricted function set"
|
||||
|
||||
/*
|
||||
+ * facility bits
|
||||
+ */
|
||||
+#define MAX_FAC_BITS 9
|
||||
+static struct fac_bits_s {
|
||||
+ int mask;
|
||||
+ char c;
|
||||
+} fac_bits[MAX_FAC_BITS] = {
|
||||
+ { 0x80000000, 'S' },
|
||||
+ { 0x40000000, 'M' },
|
||||
+ { 0x20000000, 'C' },
|
||||
+ { 0x10000000, 'D' },
|
||||
+ { 0x08000000, 'A' },
|
||||
+ { 0x04000000, 'X' },
|
||||
+ { 0x02000000, 'N' },
|
||||
+ { 0x00800000, 'F' },
|
||||
+ { 0x00400000, 'R' },
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
* Program configuration
|
||||
*/
|
||||
const struct util_prg prg = {
|
||||
@@ -66,7 +85,7 @@ const struct util_prg prg = {
|
||||
{
|
||||
.owner = "IBM Corp.",
|
||||
.pub_first = 2008,
|
||||
- .pub_last = 2017,
|
||||
+ .pub_last = 2018,
|
||||
},
|
||||
UTIL_PRG_COPYRIGHT_END
|
||||
}
|
||||
@@ -255,7 +274,8 @@ static void show_capability(const char *
|
||||
/* Skip devices, which are not supported by zcrypt layer */
|
||||
if (!util_path_is_readable("%s/type", dev) ||
|
||||
!util_path_is_readable("%s/online", dev)) {
|
||||
- printf("Detailed capability information for %s (hardware type %ld) is not available.\n", card, hwtype);
|
||||
+ printf("Detailed capability information for %s (hardware type %ld) is not available.\n",
|
||||
+ card, hwtype);
|
||||
return;
|
||||
}
|
||||
cbuf[0] = '\0';
|
||||
@@ -299,11 +319,13 @@ static void show_capability(const char *
|
||||
} else if (func_val & MASK_EP11) {
|
||||
printf("%s", CAP_EP11);
|
||||
} else {
|
||||
- printf("Detailed capability information for %s (hardware type %ld) is not available.", card, hwtype);
|
||||
+ printf("Detailed capability information for %s (hardware type %ld) is not available.",
|
||||
+ card, hwtype);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
- printf("Detailed capability information for %s (hardware type %ld) is not available.", card, hwtype);
|
||||
+ printf("Detailed capability information for %s (hardware type %ld) is not available.",
|
||||
+ card, hwtype);
|
||||
break;
|
||||
}
|
||||
printf("\n");
|
||||
@@ -315,17 +337,22 @@ static void show_capability(const char *
|
||||
static void read_subdev_rec_default(struct util_rec *rec, const char *grp_dev,
|
||||
const char *sub_dev)
|
||||
{
|
||||
- unsigned long facility;
|
||||
char buf[256];
|
||||
+ unsigned long facility;
|
||||
|
||||
- util_file_read_line(buf, sizeof(buf), "%s/type", grp_dev);
|
||||
- util_rec_set(rec, "type", buf);
|
||||
+ if (util_file_read_line(buf, sizeof(buf), "%s/type", grp_dev))
|
||||
+ util_rec_set(rec, "type", "-");
|
||||
+ else
|
||||
+ util_rec_set(rec, "type", buf);
|
||||
|
||||
- util_file_read_line(buf, sizeof(buf), "%s/%s/online", grp_dev, sub_dev);
|
||||
- if (strcmp(buf, "0") == 0)
|
||||
- util_rec_set(rec, "online", "offline");
|
||||
+ if (util_file_read_line(buf, sizeof(buf), "%s/%s/online",
|
||||
+ grp_dev, sub_dev))
|
||||
+ util_rec_set(rec, "online", "-");
|
||||
else
|
||||
- util_rec_set(rec, "online", "online");
|
||||
+ if (strcmp(buf, "0") == 0)
|
||||
+ util_rec_set(rec, "online", "offline");
|
||||
+ else
|
||||
+ util_rec_set(rec, "online", "online");
|
||||
|
||||
util_file_read_ul(&facility, 16, "%s/ap_functions", grp_dev);
|
||||
if (facility & MASK_COPRO)
|
||||
@@ -339,7 +366,7 @@ static void read_subdev_rec_default(stru
|
||||
|
||||
util_file_read_line(buf, sizeof(buf), "%s/%s/request_count",
|
||||
grp_dev, sub_dev);
|
||||
- util_rec_set(rec, "request_count", buf);
|
||||
+ util_rec_set(rec, "requests", buf);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -348,20 +375,19 @@ static void read_subdev_rec_default(stru
|
||||
static void read_subdev_rec_verbose(struct util_rec *rec, const char *grp_dev,
|
||||
const char *sub_dev)
|
||||
{
|
||||
+ int i;
|
||||
unsigned long facility;
|
||||
- char buf[256];
|
||||
- long depth;
|
||||
+ char buf[256], afile[PATH_MAX];
|
||||
+ long depth, pending1, pending2;
|
||||
|
||||
if (l.verbose == 0)
|
||||
return;
|
||||
|
||||
- util_file_read_line(buf, sizeof(buf), "%s/%s/pendingq_count",
|
||||
- grp_dev, sub_dev);
|
||||
- util_rec_set(rec, "pendingq_count", buf);
|
||||
-
|
||||
- util_file_read_line(buf, sizeof(buf), "%s/%s/requestq_count",
|
||||
- grp_dev, sub_dev);
|
||||
- util_rec_set(rec, "requestq_count", buf);
|
||||
+ util_file_read_l(&pending1, 10, "%s/%s/pendingq_count",
|
||||
+ grp_dev, sub_dev);
|
||||
+ util_file_read_l(&pending2, 10, "%s/%s/requestq_count",
|
||||
+ grp_dev, sub_dev);
|
||||
+ util_rec_set(rec, "pending", "%ld", pending1 + pending2);
|
||||
|
||||
util_file_read_line(buf, sizeof(buf), "%s/hwtype", grp_dev);
|
||||
util_rec_set(rec, "hwtype", buf);
|
||||
@@ -370,7 +396,18 @@ static void read_subdev_rec_verbose(stru
|
||||
util_rec_set(rec, "depth", "%02d", depth + 1);
|
||||
|
||||
util_file_read_ul(&facility, 16, "%s/ap_functions", grp_dev);
|
||||
- util_rec_set(rec, "facility", "0x%08x", facility);
|
||||
+ for (i = 0; i < MAX_FAC_BITS; i++)
|
||||
+ buf[i] = facility & fac_bits[i].mask ? fac_bits[i].c : '-';
|
||||
+ buf[i] = '\0';
|
||||
+ util_rec_set(rec, "facility", buf);
|
||||
+
|
||||
+ snprintf(afile, sizeof(afile), "%s/%s/driver", grp_dev, sub_dev);
|
||||
+ afile[sizeof(afile) - 1] = '\0';
|
||||
+ memset(buf, 0, sizeof(buf));
|
||||
+ if (readlink(afile, buf, sizeof(buf)) > 0)
|
||||
+ util_rec_set(rec, "driver", strrchr(buf, '/') + 1);
|
||||
+ else
|
||||
+ util_rec_set(rec, "driver", "-no-driver-");
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -382,9 +419,13 @@ static void show_subdevice(struct util_r
|
||||
if (!util_path_is_dir("%s/%s", grp_dev, sub_dev))
|
||||
errx(EXIT_FAILURE, "Error - cryptographic device %s/%s does not exist.", grp_dev, sub_dev);
|
||||
|
||||
- /* Skip devices, which are not supported by zcrypt layer */
|
||||
- if (!util_path_is_readable("%s/type", grp_dev) ||
|
||||
- !util_path_is_readable("%s/%s/online", grp_dev, sub_dev))
|
||||
+ /*
|
||||
+ * If not verbose mode, skip devices which are not supported
|
||||
+ * by the zcrypt layer.
|
||||
+ */
|
||||
+ if (l.verbose == 0 &&
|
||||
+ (!util_path_is_readable("%s/type", grp_dev) ||
|
||||
+ !util_path_is_readable("%s/%s/online", grp_dev, sub_dev)))
|
||||
return;
|
||||
|
||||
util_rec_set(rec, "card", sub_dev);
|
||||
@@ -414,11 +455,13 @@ static void show_subdevices(struct util_
|
||||
*/
|
||||
static void read_rec_default(struct util_rec *rec, const char *grp_dev)
|
||||
{
|
||||
- unsigned long facility;
|
||||
char buf[256];
|
||||
+ unsigned long facility;
|
||||
|
||||
- util_file_read_line(buf, sizeof(buf), "%s/type", grp_dev);
|
||||
- util_rec_set(rec, "type", buf);
|
||||
+ if (util_file_read_line(buf, sizeof(buf), "%s/type", grp_dev))
|
||||
+ util_rec_set(rec, "type", "-");
|
||||
+ else
|
||||
+ util_rec_set(rec, "type", buf);
|
||||
|
||||
util_file_read_ul(&facility, 16, "%s/ap_functions", grp_dev);
|
||||
if (facility & MASK_COPRO)
|
||||
@@ -430,14 +473,16 @@ static void read_rec_default(struct util
|
||||
else
|
||||
util_rec_set(rec, "mode", "Unknown");
|
||||
|
||||
- util_file_read_line(buf, sizeof(buf), "%s/online", grp_dev);
|
||||
- if (strcmp(buf, "0") == 0)
|
||||
- util_rec_set(rec, "online", "offline");
|
||||
+ if (util_file_read_line(buf, sizeof(buf), "%s/online", grp_dev))
|
||||
+ util_rec_set(rec, "online", "-");
|
||||
else
|
||||
- util_rec_set(rec, "online", "online");
|
||||
+ if (strcmp(buf, "0") == 0)
|
||||
+ util_rec_set(rec, "online", "offline");
|
||||
+ else
|
||||
+ util_rec_set(rec, "online", "online");
|
||||
|
||||
util_file_read_line(buf, sizeof(buf), "%s/request_count", grp_dev);
|
||||
- util_rec_set(rec, "request_count", buf);
|
||||
+ util_rec_set(rec, "requests", buf);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -445,18 +490,17 @@ static void read_rec_default(struct util
|
||||
*/
|
||||
static void read_rec_verbose(struct util_rec *rec, const char *grp_dev)
|
||||
{
|
||||
+ int i;
|
||||
unsigned long facility;
|
||||
- char buf[256];
|
||||
- long depth;
|
||||
+ char buf[256], afile[PATH_MAX];
|
||||
+ long depth, pending1, pending2;
|
||||
|
||||
if (l.verbose == 0)
|
||||
return;
|
||||
|
||||
- util_file_read_line(buf, sizeof(buf), "%s/pendingq_count", grp_dev);
|
||||
- util_rec_set(rec, "pendingq_count", buf);
|
||||
-
|
||||
- util_file_read_line(buf, sizeof(buf), "%s/requestq_count", grp_dev);
|
||||
- util_rec_set(rec, "requestq_count", buf);
|
||||
+ util_file_read_l(&pending1, 10, "%s/pendingq_count", grp_dev);
|
||||
+ util_file_read_l(&pending2, 10, "%s/requestq_count", grp_dev);
|
||||
+ util_rec_set(rec, "pending", "%ld", pending1 + pending2);
|
||||
|
||||
util_file_read_line(buf, sizeof(buf), "%s/hwtype", grp_dev);
|
||||
util_rec_set(rec, "hwtype", buf);
|
||||
@@ -465,7 +509,18 @@ static void read_rec_verbose(struct util
|
||||
util_rec_set(rec, "depth", "%02d", depth + 1);
|
||||
|
||||
util_file_read_ul(&facility, 16, "%s/ap_functions", grp_dev);
|
||||
- util_rec_set(rec, "facility", "0x%08x", facility);
|
||||
+ for (i = 0; i < MAX_FAC_BITS; i++)
|
||||
+ buf[i] = facility & fac_bits[i].mask ? fac_bits[i].c : '-';
|
||||
+ buf[i] = '\0';
|
||||
+ util_rec_set(rec, "facility", buf);
|
||||
+
|
||||
+ snprintf(afile, sizeof(afile), "%s/driver", grp_dev);
|
||||
+ afile[sizeof(afile) - 1] = '\0';
|
||||
+ memset(buf, 0, sizeof(buf));
|
||||
+ if (readlink(afile, buf, sizeof(buf)) > 0)
|
||||
+ util_rec_set(rec, "driver", strrchr(buf, '/') + 1);
|
||||
+ else
|
||||
+ util_rec_set(rec, "driver", "-no-driver-");
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -481,9 +536,14 @@ static void show_device(struct util_rec
|
||||
grp_dev = util_path_sysfs("devices/ap/%s", device);
|
||||
if (!util_path_is_dir(grp_dev))
|
||||
errx(EXIT_FAILURE, "Error - cryptographic device %s does not exist.", device);
|
||||
- /* Skip devices, which are not supported by zcrypt layer */
|
||||
- if (!util_path_is_readable("%s/type", grp_dev) ||
|
||||
- !util_path_is_readable("%s/online", grp_dev)) {
|
||||
+
|
||||
+ /*
|
||||
+ * If not verbose mode, skip devices which are not supported
|
||||
+ * by the zcrypt layer.
|
||||
+ */
|
||||
+ if (l.verbose == 0 &&
|
||||
+ (!util_path_is_readable("%s/type", grp_dev) ||
|
||||
+ !util_path_is_readable("%s/online", grp_dev))) {
|
||||
goto out_free;
|
||||
}
|
||||
util_rec_set(rec, "card", card);
|
||||
@@ -506,8 +566,7 @@ static void define_rec_default(struct ut
|
||||
util_rec_def(rec, "type", UTIL_REC_ALIGN_LEFT, 5, "TYPE");
|
||||
util_rec_def(rec, "mode", UTIL_REC_ALIGN_LEFT, 11, "MODE");
|
||||
util_rec_def(rec, "online", UTIL_REC_ALIGN_LEFT, 7, "STATUS");
|
||||
- util_rec_def(rec, "request_count", UTIL_REC_ALIGN_RIGHT, 11,
|
||||
- "REQUEST_CNT");
|
||||
+ util_rec_def(rec, "requests", UTIL_REC_ALIGN_RIGHT, 8, "REQUESTS");
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -517,13 +576,11 @@ static void define_rec_verbose(struct ut
|
||||
{
|
||||
if (l.verbose == 0)
|
||||
return;
|
||||
- util_rec_def(rec, "pendingq_count", UTIL_REC_ALIGN_RIGHT, 12,
|
||||
- "PENDINGQ_CNT");
|
||||
- util_rec_def(rec, "requestq_count", UTIL_REC_ALIGN_RIGHT, 12,
|
||||
- "REQUESTQ_CNT");
|
||||
- util_rec_def(rec, "hwtype", UTIL_REC_ALIGN_RIGHT, 7, "HW_TYPE");
|
||||
- util_rec_def(rec, "depth", UTIL_REC_ALIGN_RIGHT, 7, "Q_DEPTH");
|
||||
+ util_rec_def(rec, "pending", UTIL_REC_ALIGN_RIGHT, 8, "PENDING");
|
||||
+ util_rec_def(rec, "hwtype", UTIL_REC_ALIGN_RIGHT, 6, "HWTYPE");
|
||||
+ util_rec_def(rec, "depth", UTIL_REC_ALIGN_RIGHT, 6, "QDEPTH");
|
||||
util_rec_def(rec, "facility", UTIL_REC_ALIGN_LEFT, 10, "FUNCTIONS");
|
||||
+ util_rec_def(rec, "driver", UTIL_REC_ALIGN_LEFT, 11, "DRIVER");
|
||||
}
|
||||
|
||||
/*
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 29 00:03:01 UTC 2018 - mpost@suse.com
|
||||
|
||||
- Added the following patches for Fate#326862 (bsc#1113328)
|
||||
zcrypt DD: introduce APQN tags to support deterministic driver binding
|
||||
* s390-tools-sles15sp1-01-chzcrypt-Corrections-at-the-chzcrypt-man-page.patch
|
||||
* s390-tools-sles15sp1-02-lszcrypt-support-for-alternate-zcrypt-device-drivers.patch
|
||||
- Added the following patches for Fate#326804 (bsc#1113330)
|
||||
Extended access controls for AP queue
|
||||
* s390-tools-sles15sp1-01-zcryptctl-new-tool-zcryptctl-for-multiple-zcrypt-node.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 13 19:22:01 UTC 2018 - mpost@suse.com
|
||||
|
||||
@ -5,6 +16,7 @@ Tue Nov 13 19:22:01 UTC 2018 - mpost@suse.com
|
||||
(bsc#1112536)
|
||||
zdev: qeth BridgePort and VNICC attribute conflict
|
||||
- Added the following patches for Fate#326376 (bsc#1113321)
|
||||
PCI error reporting tool (zpcictl)
|
||||
* s390-tools-sles15sp1-01-util_path-add-function-to-check-if-a-path-exists.patch
|
||||
* s390-tools-sles15sp1-02-util_path-Add-description-for-util_path_exists.patch
|
||||
* s390-tools-sles15sp1-03-util_path-Make-true-false-handling-consistent-with-o.patch
|
||||
@ -16,6 +28,7 @@ Tue Nov 13 19:22:01 UTC 2018 - mpost@suse.com
|
||||
* s390-tools-sles15sp1-09-zpcictl-Make-device-node-for-NVMe-optional.patch
|
||||
* s390-tools-sles15sp1-10-zpcictl-Change-wording-of-man-page-and-help-output.patch
|
||||
- Added the following patches for Fate#325684 (bsc#1113323)
|
||||
Protected key dm-crypt key management tool (crypto)
|
||||
* s390-tools-sles15sp1-0001-zkey-Add-properties-file-handling-routines.patch
|
||||
* s390-tools-sles15sp1-0002-zkey-Add-build-dependency-to-OpenSSL-libcrypto.patch
|
||||
* s390-tools-sles15sp1-0003-zkey-Add-helper-functions-for-comma-separated-string.patch
|
||||
@ -27,6 +40,7 @@ Tue Nov 13 19:22:01 UTC 2018 - mpost@suse.com
|
||||
* s390-tools-sles15sp1-0009-zkey-let-packaging-create-the-zkeyadm-group-and-perm.patch
|
||||
* s390-tools-sles15sp1-0010-zkey-Update-README-to-add-info-about-packaging-requi.patch
|
||||
- Added the following patches for Fate#326390 (bsc#1113353)
|
||||
dm-crypt with protected keys - change master key tool
|
||||
* s390-tools-sles15sp1-0011-zkey-Typo-in-message.patch
|
||||
* s390-tools-sles15sp1-0012-zkey-Fix-memory-leak.patch
|
||||
* s390-tools-sles15sp1-0013-zkey-Fix-APQN-validation-routine.patch
|
||||
@ -37,9 +51,11 @@ Tue Nov 13 19:22:01 UTC 2018 - mpost@suse.com
|
||||
* s390-tools-sles15sp1-0018-zkey-Add-key-verification-pattern-property.patch
|
||||
* s390-tools-sles15sp1-0019-zkey-Add-volume-type-property-to-support-LUKS2-volum.patch
|
||||
- Added the following patches for Fate#325691 (bsc#1113324)
|
||||
Add support for new crypto hardware
|
||||
* s390-tools-sles15sp1-01-lszcrypt-CEX6S-exploitation.patch
|
||||
* s390-tools-sles15sp1-02-lszcrypt-fix-date-and-wrong-indentation.patch
|
||||
- Added the following patches for Fate#326388 (bsc#1113331)
|
||||
CPUMF Counters for z14
|
||||
* s390-tools-sles15sp1-01-cpumf-Add-extended-counter-defintion-files-for-IBM-z.patch
|
||||
* s390-tools-sles15sp1-02-cpumf-z14-split-counter-sets-according-to-CFVN-CSVN-.patch
|
||||
* s390-tools-sles15sp1-03-cpumf-cpumf_helper-read-split-counter-sets-part-2-2.patch
|
||||
@ -48,6 +64,7 @@ Tue Nov 13 19:22:01 UTC 2018 - mpost@suse.com
|
||||
* s390-tools-sles15sp1-06-cpumf-correct-counter-name-for-z13-and-z14.patch
|
||||
* s390-tools-sles15sp1-07-cpumf-Add-IBM-z14-ZR1-to-the-CPU-Measurement-Facilit.patch
|
||||
- Added the following patch for Fate#326361 (bsc#1113333)
|
||||
Collect NVMe-related debug data
|
||||
* s390-tools-sles15sp1-dbginfo-gather-nvme-related-data.patch
|
||||
- Temporarily added "HAVE_CRYPTSETUP2=0" to the make and make install
|
||||
commands, because a couple of Fate requests have not been approved
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
Name: s390-tools
|
||||
Version: 2.1.0
|
||||
Release: 0
|
||||
Url: https://github.com/ibm-s390-tools/s390-tools
|
||||
URL: https://github.com/ibm-s390-tools/s390-tools
|
||||
Summary: S/390 tools like zipl and dasdfmt
|
||||
License: MIT
|
||||
Group: System/Kernel
|
||||
@ -153,45 +153,48 @@ Patch41: s390-tools-sles15-6-lstape-fix-description-of-type-and-devbusid-
|
||||
Patch42: s390-tools-sles15-7-lstape-fix-SCSI-output-description-in-man-page.patch
|
||||
Patch43: s390-tools-sles15-8-lstape-fix-SCSI-HBA-CCW-device-bus-ID-e.g.-for-virti.patch
|
||||
Patch44: s390-tools-sles15-zdev-fix-qeth-BridgePort-and-VNICC-conflict-checking.patch
|
||||
Patch45: s390-tools-sles15sp1-01-util_path-add-function-to-check-if-a-path-exists.patch
|
||||
Patch46: s390-tools-sles15sp1-02-util_path-Add-description-for-util_path_exists.patch
|
||||
Patch47: s390-tools-sles15sp1-03-util_path-Make-true-false-handling-consistent-with-o.patch
|
||||
Patch48: s390-tools-sles15sp1-04-zpcictl-Introduce-new-tool-zpcictl.patch
|
||||
Patch49: s390-tools-sles15sp1-05-zpcictl-include-sys-sysmacros.h-to-avoid-minor-major.patch
|
||||
Patch50: s390-tools-sles15sp1-06-zpcictl-Rephrase-man-page-entries-and-tool-output.patch
|
||||
Patch51: s390-tools-sles15sp1-07-zpcictl-Use-fopen-instead-of-open-for-writes.patch
|
||||
Patch52: s390-tools-sles15sp1-08-zpcictl-Read-device-link-to-obtain-device-address.patch
|
||||
Patch53: s390-tools-sles15sp1-09-zpcictl-Make-device-node-for-NVMe-optional.patch
|
||||
Patch54: s390-tools-sles15sp1-10-zpcictl-Change-wording-of-man-page-and-help-output.patch
|
||||
Patch55: s390-tools-sles15sp1-0001-zkey-Add-properties-file-handling-routines.patch
|
||||
Patch56: s390-tools-sles15sp1-0002-zkey-Add-build-dependency-to-OpenSSL-libcrypto.patch
|
||||
Patch57: s390-tools-sles15sp1-0003-zkey-Add-helper-functions-for-comma-separated-string.patch
|
||||
Patch58: s390-tools-sles15sp1-0004-zkey-Externalize-secure-key-back-end-functions.patch
|
||||
Patch59: s390-tools-sles15sp1-0005-zkey-Add-keystore-implementation.patch
|
||||
Patch60: s390-tools-sles15sp1-0006-zkey-Add-keystore-related-commands.patch
|
||||
Patch61: s390-tools-sles15sp1-0007-zkey-Create-key-repository-and-group-during-make-ins.patch
|
||||
Patch62: s390-tools-sles15sp1-0008-zkey-Man-page-updates.patch
|
||||
Patch63: s390-tools-sles15sp1-0009-zkey-let-packaging-create-the-zkeyadm-group-and-perm.patch
|
||||
Patch64: s390-tools-sles15sp1-0010-zkey-Update-README-to-add-info-about-packaging-requi.patch
|
||||
Patch65: s390-tools-sles15sp1-0011-zkey-Typo-in-message.patch
|
||||
Patch66: s390-tools-sles15sp1-0012-zkey-Fix-memory-leak.patch
|
||||
Patch67: s390-tools-sles15sp1-0013-zkey-Fix-APQN-validation-routine.patch
|
||||
Patch68: s390-tools-sles15sp1-0014-zkey-Fix-generate-and-import-leaving-key-in-an-incon.patch
|
||||
Patch69: s390-tools-sles15sp1-0015-zkey-Add-zkey-cryptsetup-tool.patch
|
||||
Patch70: s390-tools-sles15sp1-0016-zkey-Add-man-page-for-zkey-cryptsetup.patch
|
||||
Patch71: s390-tools-sles15sp1-0017-zkey-Add-build-dependency-for-libcryptsetup-and-json.patch
|
||||
Patch72: s390-tools-sles15sp1-0018-zkey-Add-key-verification-pattern-property.patch
|
||||
Patch73: s390-tools-sles15sp1-0019-zkey-Add-volume-type-property-to-support-LUKS2-volum.patch
|
||||
Patch74: s390-tools-sles15sp1-01-lszcrypt-CEX6S-exploitation.patch
|
||||
Patch75: s390-tools-sles15sp1-02-lszcrypt-fix-date-and-wrong-indentation.patch
|
||||
Patch76: s390-tools-sles15sp1-01-cpumf-Add-extended-counter-defintion-files-for-IBM-z.patch
|
||||
Patch77: s390-tools-sles15sp1-02-cpumf-z14-split-counter-sets-according-to-CFVN-CSVN-.patch
|
||||
Patch78: s390-tools-sles15sp1-03-cpumf-cpumf_helper-read-split-counter-sets-part-2-2.patch
|
||||
Patch79: s390-tools-sles15sp1-04-cpumf-correct-z14-counter-number.patch
|
||||
Patch80: s390-tools-sles15sp1-05-cpumf-add-missing-Description-tag-for-z13-z14-ctr-12.patch
|
||||
Patch81: s390-tools-sles15sp1-06-cpumf-correct-counter-name-for-z13-and-z14.patch
|
||||
Patch82: s390-tools-sles15sp1-07-cpumf-Add-IBM-z14-ZR1-to-the-CPU-Measurement-Facilit.patch
|
||||
Patch83: s390-tools-sles15sp1-dbginfo-gather-nvme-related-data.patch
|
||||
Patch45: s390-tools-sles15sp1-0001-zkey-Add-properties-file-handling-routines.patch
|
||||
Patch46: s390-tools-sles15sp1-0002-zkey-Add-build-dependency-to-OpenSSL-libcrypto.patch
|
||||
Patch47: s390-tools-sles15sp1-0003-zkey-Add-helper-functions-for-comma-separated-string.patch
|
||||
Patch48: s390-tools-sles15sp1-0004-zkey-Externalize-secure-key-back-end-functions.patch
|
||||
Patch49: s390-tools-sles15sp1-0005-zkey-Add-keystore-implementation.patch
|
||||
Patch50: s390-tools-sles15sp1-0006-zkey-Add-keystore-related-commands.patch
|
||||
Patch51: s390-tools-sles15sp1-0007-zkey-Create-key-repository-and-group-during-make-ins.patch
|
||||
Patch52: s390-tools-sles15sp1-0008-zkey-Man-page-updates.patch
|
||||
Patch53: s390-tools-sles15sp1-0009-zkey-let-packaging-create-the-zkeyadm-group-and-perm.patch
|
||||
Patch54: s390-tools-sles15sp1-0010-zkey-Update-README-to-add-info-about-packaging-requi.patch
|
||||
Patch55: s390-tools-sles15sp1-0011-zkey-Typo-in-message.patch
|
||||
Patch56: s390-tools-sles15sp1-0012-zkey-Fix-memory-leak.patch
|
||||
Patch57: s390-tools-sles15sp1-0013-zkey-Fix-APQN-validation-routine.patch
|
||||
Patch58: s390-tools-sles15sp1-0014-zkey-Fix-generate-and-import-leaving-key-in-an-incon.patch
|
||||
Patch59: s390-tools-sles15sp1-0015-zkey-Add-zkey-cryptsetup-tool.patch
|
||||
Patch60: s390-tools-sles15sp1-0016-zkey-Add-man-page-for-zkey-cryptsetup.patch
|
||||
Patch61: s390-tools-sles15sp1-0017-zkey-Add-build-dependency-for-libcryptsetup-and-json.patch
|
||||
Patch62: s390-tools-sles15sp1-0018-zkey-Add-key-verification-pattern-property.patch
|
||||
Patch63: s390-tools-sles15sp1-0019-zkey-Add-volume-type-property-to-support-LUKS2-volum.patch
|
||||
Patch64: s390-tools-sles15sp1-01-lszcrypt-CEX6S-exploitation.patch
|
||||
Patch65: s390-tools-sles15sp1-02-lszcrypt-fix-date-and-wrong-indentation.patch
|
||||
Patch66: s390-tools-sles15sp1-01-chzcrypt-Corrections-at-the-chzcrypt-man-page.patch
|
||||
Patch67: s390-tools-sles15sp1-02-lszcrypt-support-for-alternate-zcrypt-device-drivers.patch
|
||||
Patch68: s390-tools-sles15sp1-01-zcryptctl-new-tool-zcryptctl-for-multiple-zcrypt-node.patch
|
||||
Patch69: s390-tools-sles15sp1-01-cpumf-Add-extended-counter-defintion-files-for-IBM-z.patch
|
||||
Patch70: s390-tools-sles15sp1-02-cpumf-z14-split-counter-sets-according-to-CFVN-CSVN-.patch
|
||||
Patch71: s390-tools-sles15sp1-03-cpumf-cpumf_helper-read-split-counter-sets-part-2-2.patch
|
||||
Patch72: s390-tools-sles15sp1-04-cpumf-correct-z14-counter-number.patch
|
||||
Patch73: s390-tools-sles15sp1-05-cpumf-add-missing-Description-tag-for-z13-z14-ctr-12.patch
|
||||
Patch74: s390-tools-sles15sp1-06-cpumf-correct-counter-name-for-z13-and-z14.patch
|
||||
Patch75: s390-tools-sles15sp1-07-cpumf-Add-IBM-z14-ZR1-to-the-CPU-Measurement-Facilit.patch
|
||||
Patch76: s390-tools-sles15sp1-01-util_path-add-function-to-check-if-a-path-exists.patch
|
||||
Patch77: s390-tools-sles15sp1-02-util_path-Add-description-for-util_path_exists.patch
|
||||
Patch78: s390-tools-sles15sp1-03-util_path-Make-true-false-handling-consistent-with-o.patch
|
||||
Patch79: s390-tools-sles15sp1-04-zpcictl-Introduce-new-tool-zpcictl.patch
|
||||
Patch80: s390-tools-sles15sp1-05-zpcictl-include-sys-sysmacros.h-to-avoid-minor-major.patch
|
||||
Patch81: s390-tools-sles15sp1-06-zpcictl-Rephrase-man-page-entries-and-tool-output.patch
|
||||
Patch82: s390-tools-sles15sp1-07-zpcictl-Use-fopen-instead-of-open-for-writes.patch
|
||||
Patch83: s390-tools-sles15sp1-08-zpcictl-Read-device-link-to-obtain-device-address.patch
|
||||
Patch84: s390-tools-sles15sp1-09-zpcictl-Make-device-node-for-NVMe-optional.patch
|
||||
Patch85: s390-tools-sles15sp1-10-zpcictl-Change-wording-of-man-page-and-help-output.patch
|
||||
Patch86: s390-tools-sles15sp1-dbginfo-gather-nvme-related-data.patch
|
||||
|
||||
Patch999: customize-zdev-root-update-script.patch
|
||||
|
||||
@ -333,6 +336,9 @@ to list files and directories.
|
||||
%patch81 -p1
|
||||
%patch82 -p1
|
||||
%patch83 -p1
|
||||
%patch84 -p1
|
||||
%patch85 -p1
|
||||
%patch86 -p1
|
||||
|
||||
%patch999 -p1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user