From bd0e3fb9c2bd54b29e2ec9b63a6aaf4999f54d57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Mon, 18 Feb 2019 07:31:45 -0500
Subject: [PATCH] - rebased to 2.8.0

---
 .gitignore            |  1 +
 s390-tools-pkey.patch | 30 ------------------------------
 s390utils.spec        | 10 +++++-----
 sources               |  2 +-
 4 files changed, 7 insertions(+), 36 deletions(-)
 delete mode 100644 s390-tools-pkey.patch

diff --git a/.gitignore b/.gitignore
index cc528b0..03d6352 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ src_vipa-2.0.4.tar.gz
 /s390-tools-2.6.0.tar.gz
 /s390-tools-2.7.0.tar.gz
 /s390-tools-2.7.1.tar.gz
+/s390-tools-2.8.0.tar.gz
diff --git a/s390-tools-pkey.patch b/s390-tools-pkey.patch
deleted file mode 100644
index a5e9e5b..0000000
--- a/s390-tools-pkey.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 210157480bb075b2ad9497882bd61e5220a261eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Wed, 9 Jan 2019 13:58:10 +0100
-Subject: [PATCH] support autoloading kernel pkey module
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The module is loaded automatically based on CPU features, but it's still
-too late in some use cases. Thus allow distros to use explicit loading.
-
-See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=63c19be095d0f8eb8992674991e44b4228bd4179
-
-Signed-off-by: Dan Horák <dan@danny.cz>
----
- etc/modules-load.d/s390-pkey.conf | 2 ++
- 1 file changed, 2 insertions(+)
- create mode 100644 etc/modules-load.d/s390-pkey.conf
-
-diff --git a/etc/modules-load.d/s390-pkey.conf b/etc/modules-load.d/s390-pkey.conf
-new file mode 100644
-index 0000000..972a099
---- /dev/null
-+++ b/etc/modules-load.d/s390-pkey.conf
-@@ -0,0 +1,2 @@
-+# Load protected key support module on s390 early at boot
-+pkey
--- 
-2.17.2
-
diff --git a/s390utils.spec b/s390utils.spec
index 9ad399a..c79f5fc 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -2,8 +2,8 @@
 
 Name:           s390utils
 Summary:        Utilities and daemons for IBM z Systems
-Version:        2.7.1
-Release:        4%{?dist}
+Version:        2.8.0
+Release:        1%{?dist}
 Epoch:          2
 License:        MIT
 ExclusiveArch:  s390 s390x
@@ -29,8 +29,6 @@ Source24:       91-zipl.install
 # change the defaults to match Fedora environment
 Patch0:         s390-tools-zipl-invert-script-options.patch
 Patch1:         s390-tools-zipl-blscfg-rpm-nvr-sort.patch
-# https://github.com/ibm-s390-tools/s390-tools/pull/51
-Patch2:         s390-tools-pkey.patch
 
 Requires:       s390utils-base = %{epoch}:%{version}-%{release}
 Requires:       s390utils-osasnmpd = %{epoch}:%{version}-%{release}
@@ -55,7 +53,6 @@ be used together with the zSeries (s390) Linux kernel and device drivers.
 # Fedora/RHEL changes
 %patch0 -p1 -b .zipl-invert-script-options
 %patch1 -p1 -b .blscfg-rpm-nvr-sort
-%patch2 -p1 -b .pkey
 
 
 # remove --strip from install
@@ -745,6 +742,9 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Mon Feb 18 2019 Dan Horák <dan[at]danny.cz> - 2:2.8.0-1
+- rebased to 2.8.0
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.7.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index dc410bf..6dd2a53 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (src_vipa-2.1.0.tar.gz) = 8f6048e82b4bcc479dfb09d62da64b9519f66efc31889ff795ee6ca107e262167df57628c305f1b899c41bb3f035e6309552d8548c890855d319e8e60d6a6cf7
-SHA512 (s390-tools-2.7.1.tar.gz) = e2e17ee30b88f8b5bb1cf54638b8320fe1b125686496e9487afd641d72329523695f51097b564303f5c761733de637abc9dd5f3e4579b1c5ad1521e0252f93a0
+SHA512 (s390-tools-2.8.0.tar.gz) = c13a58924b069a832a8c73e450dd6c9c3942787c1fa345450b1537af17ca23eda99025ee78edbe6c7192d82840596f9e07e25a10fccfba69f8a82b29980d82d1