Hello community, here is the log from the commit of package s390-tools for openSUSE:Factory checked in at 2019-01-29 14:45:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/s390-tools (Old) and /work/SRC/openSUSE:Factory/.s390-tools.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "s390-tools" Tue Jan 29 14:45:54 2019 rev:24 rq:669358 version:2.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/s390-tools/s390-tools.changes 2018-12-10 12:22:50.782855812 +0100 +++ /work/SRC/openSUSE:Factory/.s390-tools.new.28833/s390-tools.changes 2019-01-29 14:45:54.411005400 +0100 @@ -1,0 +2,43 @@ +Mon Jan 28 17:38:15 UTC 2019 - [email protected] + +- Added s390-tools-sles15sp1-zcrypt-refine-lszcrypt-man-page.patch + Added some explanations about the columns shown with the lszcrypt + verbose output. (bsc#1123041) + +------------------------------------------------------------------- +Thu Jan 24 04:43:39 UTC 2019 - [email protected] + +- Updated the spec file to regenerate the initrd in the post, postun, + and poststrans scriptlets. (bsc#1112018) + +------------------------------------------------------------------- +Tue Jan 15 21:37:32 UTC 2019 - [email protected] + +- Enable cryptsetup now that version 2 is included in SLES15 SP1. + (Fate#325684) + +------------------------------------------------------------------- +Mon Jan 14 17:03:37 UTC 2019 - [email protected] + +- Added the following two patches from IBM (bsc#1121719): + * s390-tools-sles15sp1-01-zkey-Include-sbin-into-PATH-when-executing-commands.patch + * s390-tools-sles15sp1-zkey-Enhance-error-message-about-missing-CCA-library.patch +- Added the following patch to correct a problem with CTC network + interfaces not coming up after a reboot (bsc#1119102) + * s390-tools-sles15sp1-zdev-Also-include-the-ctc-driver-in-the-initrd.patch + +------------------------------------------------------------------- +Wed Jan 9 23:17:22 UTC 2019 - [email protected] + +- Added s390-tools-sles15sp1-qethqoat-add-OSA-Express7S-support.patch + qethqoat: add OSA-Express7S support + (Fate#326805, bsc#1121222) +- Modified the spec file to: (bsc#1119966) + * Add a group named zkeyadm + * Create directory /etc/zkey/repository + * Set the permissions on /etc/zkey and /etc/zkey/repository + * Added /usr/lib/modules-load.d/pkey.conf +- Made numerous changes to the spec file based on the output from + spec-cleaner. + +------------------------------------------------------------------- New: ---- pkey.conf s390-tools-sles15sp1-01-zkey-Include-sbin-into-PATH-when-executing-commands.patch s390-tools-sles15sp1-qethqoat-add-OSA-Express7S-support.patch s390-tools-sles15sp1-zcrypt-refine-lszcrypt-man-page.patch s390-tools-sles15sp1-zdev-Also-include-the-ctc-driver-in-the-initrd.patch s390-tools-sles15sp1-zkey-Enhance-error-message-about-missing-CCA-library.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ s390-tools.spec ++++++ --- /var/tmp/diff_new_pack.NkgeTa/_old 2019-01-29 14:45:56.151003292 +0100 +++ /var/tmp/diff_new_pack.NkgeTa/_new 2019-01-29 14:45:56.151003292 +0100 @@ -1,7 +1,7 @@ # # spec file for package s390-tools # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,40 +18,16 @@ #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates + %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: s390-tools Version: 2.1.0 Release: 0 -URL: https://github.com/ibm-s390-tools/s390-tools Summary: S/390 tools like zipl and dasdfmt License: MIT Group: System/Kernel -BuildRequires: dracut -BuildRequires: fuse-devel -BuildRequires: gcc-c++ -BuildRequires: gettext-tools -BuildRequires: glibc-devel-static -BuildRequires: kernel-zfcpdump -BuildRequires: libpfm-devel -BuildRequires: ncurses-devel -BuildRequires: net-snmp-devel -BuildRequires: qclib-devel-static -BuildRequires: tcpd-devel -BuildRequires: zlib-devel-static -PreReq: shadow %fillup_prereq dracut permissions -Requires: coreutils -Requires: gawk -Requires: perl-base -Requires: procps -Requires: rsync -Requires: tar -Requires: util-linux -Provides: s390utils:/sbin/dasdfmt -Recommends: blktrace -# Don't build with pie to avoid problems with zipl -#!BuildIgnore: gcc-PIE +URL: https://github.com/ibm-s390-tools/s390-tools Source: s390-tools-%{version}.tar.gz Source1: s390-tools-rpmlintrc Source2: zipl.conf @@ -90,6 +66,7 @@ Source38: hsnc.service Source39: vmlogrdr.service Source40: xpram.service +Source41: pkey.conf ### Obsolete scripts and man pages to be removed once changes in other tools are made ### That's been delayed to at least SLES12 SP1, but I'm leaving the comments here. @@ -206,8 +183,38 @@ Patch95: s390-tools-sles15sp1-10-zdev-Implement-support-for-early-device-configuratio.patch Patch96: s390-tools-sles15sp1-11-zdev-Do-not-call-zipl-on-initrd-update.patch Patch97: s390-tools-sles15sp1-zdev-fix-qeth-BridgePort-and-VNICC-conflict-checking.patch +Patch98: s390-tools-sles15sp1-qethqoat-add-OSA-Express7S-support.patch +Patch99: s390-tools-sles15sp1-01-zkey-Include-sbin-into-PATH-when-executing-commands.patch +Patch100: s390-tools-sles15sp1-zkey-Enhance-error-message-about-missing-CCA-library.patch +Patch101: s390-tools-sles15sp1-zdev-Also-include-the-ctc-driver-in-the-initrd.patch +Patch102: s390-tools-sles15sp1-zcrypt-refine-lszcrypt-man-page.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: dracut +BuildRequires: fuse-devel +BuildRequires: gcc-c++ +BuildRequires: gettext-tools +BuildRequires: glibc-devel-static +BuildRequires: kernel-zfcpdump +BuildRequires: libcryptsetup-devel > 2.0.3 +BuildRequires: libjson-c-devel +BuildRequires: libpfm-devel +BuildRequires: ncurses-devel +BuildRequires: net-snmp-devel +BuildRequires: qclib-devel-static +BuildRequires: tcpd-devel +BuildRequires: zlib-devel-static +# Don't build with pie to avoid problems with zipl +#!BuildIgnore: gcc-PIE +PreReq: shadow %fillup_prereq dracut permissions +Requires: coreutils +Requires: gawk +Requires: perl-base +Requires: procps +Requires: rsync +Requires: tar +Requires: util-linux +Recommends: blktrace +Provides: s390utils:/sbin/dasdfmt ExclusiveArch: s390x %description @@ -221,7 +228,7 @@ %package -n osasnmpd Summary: OSA-Express SNMP subagent -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Networking/Other Requires: perl @@ -236,7 +243,7 @@ %package zdsfs Summary: QSAM access to z/OS data -License: GPL-2.0+ and SUSE-NonFree +License: GPL-2.0-or-later AND NonFree Group: Productivity/Networking/Other %description zdsfs @@ -250,7 +257,7 @@ %package hmcdrvfs Summary: HMC drive file system based on FUSE -License: GPL-2.0 +License: GPL-2.0-only Group: System/Base Requires: fuse @@ -259,7 +266,7 @@ to list files and directories. %prep -%setup -q -n %{name}-%{version} +%setup -q # SUSE patches %patch1 -p1 @@ -359,8 +366,13 @@ %patch95 -p1 %patch96 -p1 %patch97 -p1 +%patch98 -p1 +%patch99 -p1 +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 -cp -vi %{S:22} CAUTION +cp -vi %{SOURCE22} CAUTION %build @@ -370,69 +382,73 @@ export OPT_FLAGS="%{optflags}" export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}" -make ZFCPDUMP_DIR=/usr/lib/s390-tools/zfcpdump DISTRELEASE=%{release} HAVE_CRYPTSETUP2=0 -gcc -static -o read_values ${OPT_FLAGS} %{S:86} -lqc +make %{?_smp_mflags} \ + ZFCPDUMP_DIR=%{_prefix}/lib/s390-tools/zfcpdump \ + DISTRELEASE=%{release} +gcc -static -o read_values ${OPT_FLAGS} %{SOURCE86} -lqc %install mkdir -p %{buildroot}/boot/zipl -%make_install HAVE_CRYPTSETUP2=0 \ - ZFCPDUMP_DIR=/usr/lib/s390-tools/zfcpdump \ +mkdir -p %{buildroot}%{_sysconfdir}//zkey/repository +%make_install \ + ZFCPDUMP_DIR=%{_prefix}/lib/s390-tools/zfcpdump \ DISTRELEASE=%{release} \ SYSTEMDSYSTEMUNITDIR=%{_unitdir} \ HAVE_DRACUT=1 install -m 755 read_values %{buildroot}/%{_bindir}/ -install -m644 -t %{buildroot}/%{_mandir}/man8 %{S:87} +install -m644 -t %{buildroot}/%{_mandir}/man8 %{SOURCE87} export ROOT_BUILD_DIR="%{_builddir}/%{name}-%{version}/zfcpdump/kernel" -install -D -m600 /boot/image-*-zfcpdump %{buildroot}/usr/lib/s390-tools/zfcpdump/zfcpdump_part.image +install -D -m600 /boot/image-*-zfcpdump %{buildroot}%{_prefix}/lib/s390-tools/zfcpdump/zfcpdump_part.image -install -D -m644 etc/cpuplugd.conf %{buildroot}/etc/cpuplugd.conf -install -D -m644 etc/udev/rules.d/40-z90crypt.rules %{buildroot}/usr/lib/udev/rules.d/40-z90crypt.rules -install -D -m644 etc/udev/rules.d/57-osasnmpd.rules %{buildroot}/usr/lib/udev/rules.d/57-osasnmpd.rules -install -D -m644 etc/udev/rules.d/59-dasd.rules %{buildroot}/usr/lib/udev/rules.d/59-dasd.rules -install -D -m644 etc/udev/rules.d/90-cpi.rules %{buildroot}/usr/lib/udev/rules.d/90-cpi.rules +install -D -m644 etc/cpuplugd.conf %{buildroot}%{_sysconfdir}/cpuplugd.conf +install -D -m644 etc/udev/rules.d/40-z90crypt.rules %{buildroot}%{_prefix}/lib/udev/rules.d/40-z90crypt.rules +install -D -m644 etc/udev/rules.d/57-osasnmpd.rules %{buildroot}%{_prefix}/lib/udev/rules.d/57-osasnmpd.rules +install -D -m644 etc/udev/rules.d/59-dasd.rules %{buildroot}%{_prefix}/lib/udev/rules.d/59-dasd.rules +install -D -m644 etc/udev/rules.d/90-cpi.rules %{buildroot}%{_prefix}/lib/udev/rules.d/90-cpi.rules install -D -m644 etc/sysconfig/cpi %{buildroot}%{_fillupdir}/sysconfig.cpi install -D -m644 etc/sysconfig/dumpconf %{buildroot}%{_fillupdir}/sysconfig.dumpconf install -D -m644 etc/sysconfig/mon_fsstatd %{buildroot}%{_fillupdir}/sysconfig.mon_fsstatd install -D -m644 etc/sysconfig/mon_procd %{buildroot}%{_fillupdir}/sysconfig.mon_procd -mv iucvterm/doc/ts-shell/iucvconn_on_login %{buildroot}/usr/bin/iucvconn_on_login -install -D -m644 %{S:26} %{buildroot}/%{_unitdir}/cio_ignore.service -install -D -m755 %{S:27} %{buildroot}/usr/lib/systemd/scripts/setup_cio_ignore.sh -install -D -m755 %{S:31} %{buildroot}/usr/lib/systemd/scripts/detach_disks.sh -install -D -m644 %{S:35} %{buildroot}/%{_unitdir}/virtsetup.service -install -D -m755 %{S:36} %{buildroot}/usr/lib/systemd/scripts/virtsetup.sh -install -D -m644 %{S:37} %{buildroot}/%{_unitdir}/appldata.service -install -D -m644 %{S:38} %{buildroot}/%{_unitdir}/hsnc.service -install -D -m644 %{S:39} %{buildroot}/%{_unitdir}/vmlogrdr.service -install -D -m644 %{S:40} %{buildroot}/%{_unitdir}/xpram.service - -cp %{S:18} zpxe.rexx -cp %{S:2} zipl.conf.sample -cp %{S:23} README.SUSE +mv iucvterm/doc/ts-shell/iucvconn_on_login %{buildroot}%{_bindir}/iucvconn_on_login +install -D -m644 %{SOURCE26} %{buildroot}/%{_unitdir}/cio_ignore.service +install -D -m755 %{SOURCE27} %{buildroot}%{_prefix}/lib/systemd/scripts/setup_cio_ignore.sh +install -D -m755 %{SOURCE31} %{buildroot}%{_prefix}/lib/systemd/scripts/detach_disks.sh +install -D -m644 %{SOURCE35} %{buildroot}/%{_unitdir}/virtsetup.service +install -D -m755 %{SOURCE36} %{buildroot}%{_prefix}/lib/systemd/scripts/virtsetup.sh +install -D -m644 %{SOURCE37} %{buildroot}/%{_unitdir}/appldata.service +install -D -m644 %{SOURCE38} %{buildroot}/%{_unitdir}/hsnc.service +install -D -m644 %{SOURCE39} %{buildroot}/%{_unitdir}/vmlogrdr.service +install -D -m644 %{SOURCE40} %{buildroot}/%{_unitdir}/xpram.service +install -D -m644 %{SOURCE41} %{buildroot}%{_prefix}/lib/modules-load.d/pkey.conf + +cp %{SOURCE18} zpxe.rexx +cp %{SOURCE2} zipl.conf.sample +cp %{SOURCE23} README.SUSE cd %{buildroot} -install -D -m755 %{S:3} %{buildroot}/usr/lib/systemd/scripts/hsnc -install -D -m644 %{S:4} %{buildroot}%{_fillupdir}/sysconfig.hsnc -install -D -m755 %{S:5} %{buildroot}/usr/lib/systemd/scripts/xpram -install -D -m644 %{S:6} %{buildroot}%{_fillupdir}/sysconfig.xpram -install -D -m755 %{S:7} %{buildroot}/usr/lib/systemd/scripts/appldata -install -D -m644 %{S:8} %{buildroot}%{_fillupdir}/sysconfig.appldata -install -D -m755 %{S:10} sbin/dasdro -install -D -m755 %{S:11} sbin/dasd_reload -install -D -m755 %{S:12} sbin/mkdump -install -D -m644 %{S:13} %{buildroot}%{_fillupdir}/sysconfig.osasnmpd -install -D -m755 %{S:14} sbin/zfcp_san_disc -install -D -m644 %{S:15} %{buildroot}/%{_mandir}/man8 -install -D -m644 %{S:19} %{buildroot}/usr/lib/udev/rules.d/52-xpram.rules -install -D -m644 %{S:20} %{buildroot}/usr/lib/udev/rules.d/52-hw_random.rules -install -D -m644 %{S:21} %{buildroot}/usr/lib/udev/rules.d/59-graf.rules -install -D -m644 %{S:28} %{buildroot}/usr/lib/udev/rules.d/59-prng.rules -install -D -m644 %{S:29} %{buildroot}/usr/lib/udev/rules.d/59-zfcp-compat.rules -install -D -m644 %{S:30} %{buildroot}/etc/modprobe.d/90-s390-tools.conf -install -D -m755 %{S:32} %{buildroot}/sbin/killcdl -install -D -m755 %{S:33} %{buildroot}/sbin/lgr_check -install -D -m644 %{S:34} %{buildroot}%{_fillupdir}/sysconfig.virtsetup +install -D -m755 %{SOURCE3} %{buildroot}%{_prefix}/lib/systemd/scripts/hsnc +install -D -m644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.hsnc +install -D -m755 %{SOURCE5} %{buildroot}%{_prefix}/lib/systemd/scripts/xpram +install -D -m644 %{SOURCE6} %{buildroot}%{_fillupdir}/sysconfig.xpram +install -D -m755 %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/scripts/appldata +install -D -m644 %{SOURCE8} %{buildroot}%{_fillupdir}/sysconfig.appldata +install -D -m755 %{SOURCE10} sbin/dasdro +install -D -m755 %{SOURCE11} sbin/dasd_reload +install -D -m755 %{SOURCE12} sbin/mkdump +install -D -m644 %{SOURCE13} %{buildroot}%{_fillupdir}/sysconfig.osasnmpd +install -D -m755 %{SOURCE14} sbin/zfcp_san_disc +install -D -m644 %{SOURCE15} %{buildroot}/%{_mandir}/man8 +install -D -m644 %{SOURCE19} %{buildroot}%{_prefix}/lib/udev/rules.d/52-xpram.rules +install -D -m644 %{SOURCE20} %{buildroot}%{_prefix}/lib/udev/rules.d/52-hw_random.rules +install -D -m644 %{SOURCE21} %{buildroot}%{_prefix}/lib/udev/rules.d/59-graf.rules +install -D -m644 %{SOURCE28} %{buildroot}%{_prefix}/lib/udev/rules.d/59-prng.rules +install -D -m644 %{SOURCE29} %{buildroot}%{_prefix}/lib/udev/rules.d/59-zfcp-compat.rules +install -D -m644 %{SOURCE30} %{buildroot}%{_sysconfdir}/modprobe.d/90-s390-tools.conf +install -D -m755 %{SOURCE32} %{buildroot}/sbin/killcdl +install -D -m755 %{SOURCE33} %{buildroot}/sbin/lgr_check +install -D -m644 %{SOURCE34} %{buildroot}%{_fillupdir}/sysconfig.virtsetup if [ ! -d %{_sbindir} ]; then rm -f %{_sbindir} @@ -455,13 +471,13 @@ rm -f %{_bindir} mkdir -p %{_bindir} fi -install -D -m755 %{S:24} usr/bin/cputype +install -D -m755 %{SOURCE24} usr/bin/cputype -install -m644 -t %{buildroot}/%{_mandir}/man8 %{S:25} +install -m644 -t %{buildroot}/%{_mandir}/man8 %{SOURCE25} ### Obsolete scripts and man pages to be removed once changes in other tools are made -install -m755 -t sbin/ %{S:88} %{S:89} %{S:90} %{S:91} %{S:92} %{S:93} -install -m644 -t %{buildroot}/%{_mandir}/man8 %{S:94} %{S:95} %{S:96} %{S:97} %{S:98} %{S:99} +install -m755 -t sbin/ %{SOURCE88} %{SOURCE89} %{SOURCE90} %{SOURCE91} %{SOURCE92} %{SOURCE93} +install -m644 -t %{buildroot}/%{_mandir}/man8 %{SOURCE94} %{SOURCE95} %{SOURCE96} %{SOURCE97} %{SOURCE98} %{SOURCE99} ### ### lsmem/chmem have been added to util-linux @@ -471,7 +487,7 @@ rm -fv %{buildroot}/%{_sbindir}/chmem find . ! -type d | - %__sed 's/^.//;\-/man/-s/^.*$/%doc &.gz/' > %{_builddir}/%{name}-filelist + sed 's/^.//;\-/man/-s/^.*$/%doc &.gz/' > %{_builddir}/%{name}-filelist grep -v -E 'osasnmp|*\.conf$' %{_builddir}/%{name}-filelist >%{_builddir}/%{name}.list grep osasnmp[^-] %{_builddir}/%{name}-filelist >%{_builddir}/%{name}.osasnmp @@ -480,25 +496,27 @@ cd usr/lib/net-snmp/agents cat <<EOT >osasnmpd #!/bin/sh -PIDFILE=/var/run/osasnmpd.pid +PIDFILE=%{_localstatedir}/run/osasnmpd.pid function cleanup { rm -f \$PIDFILE - kill \`cat /var/run/osasnmpd.real.pid\` + kill \`cat %{_localstatedir}/run/osasnmpd.real.pid\` } -. /etc/sysconfig/osasnmpd +. %{_sysconfdir}/sysconfig/osasnmpd trap cleanup 0 echo \$\$ >\$PIDFILE -/usr/sbin/osasnmpd -f -P /var/run/osasnmpd.real.pid \$OSASNMPD_PARAMETERS "\$@" +%{_sbindir}/osasnmpd -f -P %{_localstatedir}/run/osasnmpd.real.pid \$OSASNMPD_PARAMETERS "\$@" EOT chmod 755 osasnmpd %verifyscript -%verify_permissions -e /var/log/ts-shell +%verify_permissions -e %{_localstatedir}/log/ts-shell %pre # check for ts-shell group or create it getent group ts-shell >/dev/null 2>&1 || groupadd -r ts-shell +# check for zkeyadm group or create it +getent group zkeyadm >/dev/null 2>&1 || groupadd -r zkeyadm %service_add_pre appldata.service %service_add_pre cio_ignore.service %service_add_pre cpacfstatsd.service @@ -519,7 +537,7 @@ systemctl daemon-reload fi -%set_permissions /var/log/ts-shell +%set_permissions %{_localstatedir}/log/ts-shell # Create symbolic links to the scripts from setup and boot directories %service_add_post appldata.service @@ -547,8 +565,10 @@ %{fillup_only -n xpram} %triggerin -- kernel-default -grep -q '^/usr/bin/ts-shell$' /etc/shells \ - || echo "/usr/bin/ts-shell" >> /etc/shells +grep -q '^%{_bindir}/ts-shell$' %{_sysconfdir}/shells \ + || echo "%{_bindir}/ts-shell" >> %{_sysconfdir}/shells + +%{?regenerate_initrd_post} %post -n osasnmpd %{fillup_only -n osasnmpd} @@ -597,11 +617,16 @@ if test x$1 = x0; then # remove ts-shell from /etc/shells - grep -v '^/usr/bin/ts-shell$' /etc/shells > /etc/shells.ts-new - mv /etc/shells.ts-new /etc/shells - chmod 0644 /etc/shells + grep -v '^%{_bindir}/ts-shell$' %{_sysconfdir}/shells > %{_sysconfdir}/shells.ts-new + mv %{_sysconfdir}/shells.ts-new %{_sysconfdir}/shells + chmod 0644 %{_sysconfdir}/shells fi +%{?regenerate_initrd_post} + +%posttrans +%{?regenerate_initrd_posttrans} + %preun -n osasnmpd %{stop_on_removal osasnmpd} @@ -613,51 +638,54 @@ %doc iucvterm/doc/ts-shell %doc zpxe.rexx %doc zipl.conf.sample -%dir /etc/iucvterm -%config %attr(0640,root,ts-shell) /etc/iucvterm/ts-audit-systems.conf -%config %attr(0640,root,ts-shell) /etc/iucvterm/ts-authorization.conf -%config %attr(0640,root,ts-shell) /etc/iucvterm/ts-shell.conf -%config %attr(0640,root,ts-shell) /etc/iucvterm/unrestricted.conf -%config /etc/modprobe.d/90-s390-tools.conf -%config /etc/cpuplugd.conf +%dir %{_sysconfdir}/iucvterm +%config %attr(0640,root,ts-shell) %{_sysconfdir}/iucvterm/ts-audit-systems.conf +%config %attr(0640,root,ts-shell) %{_sysconfdir}/iucvterm/ts-authorization.conf +%config %attr(0640,root,ts-shell) %{_sysconfdir}/iucvterm/ts-shell.conf +%config %attr(0640,root,ts-shell) %{_sysconfdir}/iucvterm/unrestricted.conf +%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey +%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/repository +%config %{_sysconfdir}/modprobe.d/90-s390-tools.conf +%config %{_sysconfdir}/cpuplugd.conf %config(noreplace) /boot/zipl/active_devices.txt -%dir %attr(2770,root,ts-shell) /var/log/ts-shell -%dir /etc/cmsfs-fuse -%config %attr(0640,root,root) /etc/cmsfs-fuse/filetypes.conf -%dir /usr/lib/s390-tools -%dir /usr/lib/s390-tools/zfcpdump -%dir /usr/lib/udev/rules.d -%dir /usr/lib/systemd/scripts +%dir %attr(2770,root,ts-shell) %{_localstatedir}/log/ts-shell +%dir %{_sysconfdir}/cmsfs-fuse +%config %attr(0640,root,root) %{_sysconfdir}/cmsfs-fuse/filetypes.conf +%dir %{_prefix}/lib/s390-tools +%dir %{_prefix}/lib/s390-tools/zfcpdump +%dir %{_prefix}/lib/udev/rules.d +%dir %{_prefix}/lib/systemd/scripts %dir %{_unitdir} -%dir /usr/share/s390-tools -%dir /usr/share/s390-tools/cpumf -%dir /usr/share/s390-tools/netboot +%dir %{_datadir}/s390-tools +%dir %{_datadir}/s390-tools/cpumf +%dir %{_datadir}/s390-tools/netboot +%dir %{_prefix}/lib/dracut/modules.d/95zdev %dir /boot/zipl %dir /lib/s390-tools/ -%exclude /usr/lib/udev/rules.d/57-osasnmpd.rules -%exclude /usr/bin/zdsfs -%exclude /usr/bin/hmcdrvfs -%exclude /usr/sbin/lshmc +%{_prefix}/lib/modules-load.d/pkey.conf +%exclude %{_prefix}/lib/udev/rules.d/57-osasnmpd.rules +%exclude %{_bindir}/zdsfs +%exclude %{_bindir}/hmcdrvfs +%exclude %{_sbindir}/lshmc %exclude %{_mandir}/man1/zdsfs.1.gz %exclude %{_mandir}/man1/hmcdrvfs.1.gz %exclude %{_mandir}/man8/lshmc.8.gz -/usr/lib/dracut/modules.d/95zdev %files -n osasnmpd -f %{_builddir}/%{name}.osasnmp %defattr(-,root,root) -/usr/lib/net-snmp/agents/osasnmpd +%{_prefix}/lib/net-snmp/agents/osasnmpd %files zdsfs %defattr(-,root,root) %doc CAUTION -/usr/bin/zdsfs -/usr/share/man/man1/zdsfs.1.gz +%{_bindir}/zdsfs +%{_mandir}/man1/zdsfs.1%{?ext_man} %files hmcdrvfs %defattr(-,root,root) -/usr/bin/hmcdrvfs -/usr/sbin/lshmc -%{_mandir}/man1/hmcdrvfs.1.gz -%{_mandir}/man8/lshmc.8.gz +%{_bindir}/hmcdrvfs +%{_sbindir}/lshmc +%{_mandir}/man1/hmcdrvfs.1%{?ext_man} +%{_mandir}/man8/lshmc.8%{?ext_man} %changelog ++++++ pkey.conf ++++++ # # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # All rights reserved. # # load pkey module at boot time pkey ++++++ s390-tools-sles15sp1-01-zkey-Include-sbin-into-PATH-when-executing-commands.patch ++++++ Subject: zkey: Fails to run commands generated by 'zkey cryptsetup' From: Ingo Franzki <[email protected]> Description: zkey: Fails to run commands generated by 'zkey cryptsetup' Symptom: Fails to run commands generated by 'zkey cryptsetup'. Problem: When using 'zkey cryptsetup' with --run option the execution of the generated commands may fail, when the executable to be run is located in '/sbin'. Solution: Include /sbin into PATH when executing commands. Reproduction: Use 'zkey cryptsetup' with option --run on a distribution where 'cryptsetup' is located in '/sbin'. Upstream-ID: - Problem-ID: 173155 Signed-off-by: Ingo Franzki <[email protected]> --- zkey/keystore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/zkey/keystore.c +++ b/zkey/keystore.c @@ -3235,7 +3235,7 @@ static int _keystore_execute_cmd(const c { int rc; - rc = setenv("PATH", "/bin:/usr/bin:/usr/sbin", 1); + rc = setenv("PATH", "/bin:/sbin:/usr/bin:/usr/sbin", 1); if (rc < 0) return rc; ++++++ s390-tools-sles15sp1-qethqoat-add-OSA-Express7S-support.patch ++++++ Subject: [PATCH] [FEAT NET1711] qethqoat: add OSA-Express7S support From: Julian Wiedmann <[email protected]> Summary: qethqoat: add OSA-Express7S support Description: Add the missing identifiers to report the correct card name and link speed. Upstream-ID: 20145b6d06debd47944bff0a471d17e5eba07010 Problem-ID: NET1711 Upstream-Description: qethqoat: add OSA-Express7S support Add the missing identifiers to report the card name and link speed. Signed-off-by: Julian Wiedmann <[email protected]> Signed-off-by: Jan Höppner <[email protected]> Signed-off-by: Julian Wiedmann <[email protected]> --- qethqoat/qethqoat.c | 6 ++++++ qethqoat/qethqoat.h | 2 ++ 2 files changed, 8 insertions(+) --- a/qethqoat/qethqoat.c +++ b/qethqoat/qethqoat.c @@ -208,6 +208,9 @@ static void print_physical(struct qeth_q case OAT_OSA_GEN_OSAE6S: osagen = "OSA-Express6S"; break; + case OAT_OSA_GEN_OSAE7S: + osagen = "OSA-Express7S"; + break; default: sprintf(tmp, "unknown (0x%x)", phdr->osa_gen); osagen = tmp; @@ -239,6 +242,9 @@ static void print_physical(struct qeth_q case OAT_PORT_SPEED_10gbs_full: speed = "10 Gb/s / full duplex"; break; + case OAT_PORT_SPEED_25gbs_full: + speed = "25 Gb/s / full duplex"; + break; case OAT_PORT_SPEED_UNKNOWN: speed = "unknown / unknown"; break; --- a/qethqoat/qethqoat.h +++ b/qethqoat/qethqoat.h @@ -58,6 +58,7 @@ struct qeth_qoat_physical { #define OAT_OSA_GEN_OSAE4S 0x02 #define OAT_OSA_GEN_OSAE5S 0x03 #define OAT_OSA_GEN_OSAE6S 0x04 +#define OAT_OSA_GEN_OSAE7S 0x05 __u8 osa_gen; #define OAT_PORT_SPEED_UNKNOWN 0x00 #define OAT_PORT_SPEED_10mbs_half 0x01 @@ -68,6 +69,7 @@ struct qeth_qoat_physical { #define OAT_PORT_SPEED_1000mbs_full 0x06 #define OAT_PORT_SPEED_NA 0x07 #define OAT_PORT_SPEED_10gbs_full 0x08 +#define OAT_PORT_SPEED_25gbs_full 0x0A __u8 port_speed; #define OAT_PORT_MEDIA_COPPER 0x01 #define OAT_PORT_MEDIA_MULTI_MODE 0x02 ++++++ s390-tools-sles15sp1-zcrypt-refine-lszcrypt-man-page.patch ++++++ >From e9c030f2026b1b8e0399679600845c298aeb508d Mon Sep 17 00:00:00 2001 From: Harald Freudenberger <[email protected]> Date: Mon, 21 Jan 2019 09:07:00 +0100 Subject: zcrypt: refine lszcrypt man page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added some explanations about the columns shown with the lszcrypt verbose output. Signed-off-by: Harald Freudenberger <[email protected]> Signed-off-by: Jan Höppner <[email protected]> --- zconf/zcrypt/lszcrypt.8 | 64 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/zconf/zcrypt/lszcrypt.8 b/zconf/zcrypt/lszcrypt.8 index 826e109..bd235ec 100644 --- a/zconf/zcrypt/lszcrypt.8 +++ b/zconf/zcrypt/lszcrypt.8 @@ -10,7 +10,7 @@ .\" nroff -man lszcrypt.8 .\" to process this source .\" -.TH LSZCRYPT 8 "OCT 2017" "s390-tools" +.TH LSZCRYPT 8 "JAN 2019" "s390-tools" .SH NAME lszcrypt \- display zcrypt device and configuration information .SH SYNOPSIS @@ -111,6 +111,68 @@ Displays help text and exits. .TP 8 .B -v, --version Displays version information and exits. +.SH VERBOSE LISTING DETAILS +Some of the columns showing up in verbose listing mode may need some +explanation: +.TP +.B TYPE and HWTYPE +The HWTYPE is a numeric value showing which type of hardware the zcrypt +device driver presumes that this crypto card is. The currently known values +are 7=CEX3C, 8=CEX3A, 10=CEX4, 11=CEX5 and 12=CEX6. +.br +The TYPE is a human readable value showing the hardware type and the basic +function type (A=Accelerator, C=CCA Coprocessor, P=EP11 Coprocessor). So +for example CEX6P means a CEX6 card in EP11 Coprocessor mode. +.TP +.B REQUESTS +This is the counter value of successful processed requests on card or queue +level. Successful here means the request was processed without any failure +in the whole processing chain. +.TP +.B PENDING +The underlying firmware and hardware layer usually provide some queuing +space for requests. When this queue is already filled up, the zcrypt device +driver maintains a software queue of pending requests. The sum of these +both values is displayed here and shows the amount of requests waiting for +processing on card or queue level. +.TP +.B FUNCTIONS +This column shows firmware and hardware function details: +.br +S - APSC available: card/queue can handle requests with the special bit +enabled. +.br +M - Accelerator card/queue with support for RSA ME with up to 4k key size. +.br +C - Accelerator card/queue with support for RSA CRT with up to 4k key size. +.br +D - Card/queue is providing CCA functions (this is the CCA Coprocessor mode). +.br +A - Card/queue is providing Accelerator functions (this is the Accelerator mode). +.br +X - Card/queue is providing EP11 functions (this is the EP11 Coprocessor mode). +.br +N - APXA available (ability to address more than 16 crypto cards and domains). +.br +F - Full function support (opposed to restricted function support, see below). +.br +R - Restricted function support. The F and R flag both reflect if a +hypervisor is somehow restricting this crypto resource in a virtual +environment. Dependent on the hypervisor configuration the crypto requests +may be filtered by the hypervisor to allow only a subset of functions +within the virtual runtime environment. For example a shared CCA +Coprocessor may be restricted by the hypervisor to allow only clear key +operations within the guests. +.TP +.B DRIVER +.br +Shows which card or queue device driver currently handles this crypto +resource. Currently known drivers are cex4card/cex4queue (CEX4-CEX6 +hardware), cex2card/cex2cqueue (CEX2C and CEX3C hardware), +cex2acard/cex2aqueue (CEX2A and CEX3A hardware) and vfio_ap (queue reserved +for use by kvm hypervisor for kvm guests and not accessible to host +applications). It is also valid to have no driver handling a queue which is +shown as a -no-driver- entry. .SH EXAMPLES .TP .B lszcrypt -- 2.13.7 ++++++ s390-tools-sles15sp1-zdev-Also-include-the-ctc-driver-in-the-initrd.patch ++++++ --- a/zdev/dracut/95zdev/module-setup.sh 2019-01-10 11:39:08.000000000 -0500 +++ b/zdev/dracut/95zdev/module-setup.sh 2019-01-14 13:28:33.983461097 -0500 @@ -32,7 +32,7 @@ installkernel() { # Add modules for all device types supported by chzdev (required for # auto-configuration) - instmods lcs qeth qeth_l2 qeth_l3 dasd_mod dasd_eckd_mod dasd_fba_mod \ + instmods ctcm lcs qeth qeth_l2 qeth_l3 dasd_mod dasd_eckd_mod dasd_fba_mod \ dasd_diag_mod zfcp } ++++++ s390-tools-sles15sp1-zkey-Enhance-error-message-about-missing-CCA-library.patch ++++++ Subject: zkey: Enhance error message about missing CCA library. From: Ingo Franzki <[email protected]> Description: zkey: Enhance error message about missing CCA library. Symptom: "zkey-cryptsetup reencipher" fails with missing library and confusing error message. Problem: The "zkey reencipher" command as well as the "zkey-cryptsetup reencipher" command requires the IBM CCA Host Libraries and Tools package to be installed. This is a closed source library that is not distributed by the distributions, but must be downloaded separately from an IBM web page. Solution: Enhance the error message to point to the web page where the package can be downloaded. Reproduction: Run the "zkey-cryptsetup reencipher" or "zkey reencipher" command without having installed the IBM CCA Host Libraries and Tools package. Upstream-ID: - Problem-ID: 173878 Signed-off-by: Ingo Franzki <[email protected]> --- zkey/pkey.c | 13 +++++++++---- zkey/zkey-cryptsetup.1 | 3 ++- zkey/zkey.1 | 3 ++- 3 files changed, 13 insertions(+), 6 deletions(-) --- a/zkey/pkey.c +++ b/zkey/pkey.c @@ -48,6 +48,7 @@ * Definitions for the CCA library */ #define CCA_LIBRARY_NAME "libcsulcca.so" +#define CCA_WEB_PAGE "http://www.ibm.com/security/cryptocards"; #define DEFAULT_KEYBITS 256 @@ -71,16 +72,20 @@ int load_cca_library(void **lib_csulcca, /* Load the CCA library */ *lib_csulcca = dlopen(CCA_LIBRARY_NAME, RTLD_GLOBAL | RTLD_NOW); if (*lib_csulcca == NULL) { - warnx("%s\nEnsure that the IBM CCA Host Libraries and " - "Tools are installed properly", dlerror()); + pr_verbose(verbose, "%s", dlerror()); + warnx("The command requires the IBM CCA Host Libraries and " + "Tools.\nFor the supported environments and downloads, " + "see:\n%s", CCA_WEB_PAGE); return -ELIBACC; } /* Get the Key Token Change function */ *dll_CSNBKTC = (t_CSNBKTC)dlsym(*lib_csulcca, "CSNBKTC"); if (*dll_CSNBKTC == NULL) { - warnx("%s\nEnsure that the IBM CCA Host Libraries and " - "Tools are installed properly", dlerror()); + pr_verbose(verbose, "%s", dlerror()); + warnx("The command requires the IBM CCA Host Libraries and " + "Tools.\nFor the supported environments and downloads, " + "see:\n%s", CCA_WEB_PAGE); dlclose(*lib_csulcca); *lib_csulcca = NULL; return -ELIBACC; --- a/zkey/zkey-cryptsetup.1 +++ b/zkey/zkey-cryptsetup.1 @@ -182,7 +182,8 @@ behave in the same way as with \fBcrypts .PP .B Note: The \fBreencipher\fP command requires the CCA host library (libcsulcca.so) -to be installed. +to be installed. For the supported environments and downloads, see: +\fIhttp://www.ibm.com/security/cryptocards\fP . . . --- a/zkey/zkey.1 +++ b/zkey/zkey.1 @@ -282,7 +282,8 @@ a staged re-enciphering for the \fBOLD\f .PP .B Note: The \fBreencipher\fP command requires the CCA host library (libcsulcca.so) -to be installed. +to be installed. For the supported environments and downloads, see: +\fIhttp://www.ibm.com/security/cryptocards\fP . .SS "Import existing AES secure keys into the secure key repository" .
