commit shim-leap for openSUSE:Factory

2020-08-29 Thread root 
Hello community,

here is the log from the commit of package shim-leap for openSUSE:Factory 
checked in at 2020-08-29 20:38:52

Comparing /work/SRC/openSUSE:Factory/shim-leap (Old)
 and  /work/SRC/openSUSE:Factory/.shim-leap.new.3399 (New)


Package is "shim-leap"

Sat Aug 29 20:38:52 2020 rev:14 rq:829908 version:15+git47

Changes:

--- /work/SRC/openSUSE:Factory/shim-leap/shim-leap.changes  2020-08-12 
10:37:24.076318177 +0200
+++ /work/SRC/openSUSE:Factory/.shim-leap.new.3399/shim-leap.changes
2020-08-29 20:39:00.913381202 +0200
@@ -1,0 +2,7 @@
+Thu Aug 27 07:27:54 UTC 2020 - Gary Ching-Pang Lin 
+
+- Update shim to 15+git47-lp152.4.5.1 from openSUSE Leap 15.2
+  + shim-install: install MokManager to \EFI\boot to process the
+pending MOK request (bsc#1175626, bsc#1175656)
+
+---

Old:

  shim-15+git47-lp152.4.3.1.x86_64.rpm

New:

  shim-15+git47-lp152.4.5.1.x86_64.rpm



Other differences:
--
++ shim-leap.spec ++
--- /var/tmp/diff_new_pack.pPMUK1/_old  2020-08-29 20:39:01.849381596 +0200
+++ /var/tmp/diff_new_pack.pPMUK1/_new  2020-08-29 20:39:01.853381598 +0200
@@ -30,7 +30,7 @@
 Summary:UEFI shim loader
 License:BSD-2-Clause
 Group:  System/Boot
-Source: shim-15+git47-lp152.4.3.1.x86_64.rpm
+Source: shim-15+git47-lp152.4.5.1.x86_64.rpm
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  x86_64
 

++ shim-15+git47-lp152.4.3.1.x86_64.rpm -> 
shim-15+git47-lp152.4.5.1.x86_64.rpm ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/usr/sbin/shim-install new/usr/sbin/shim-install
--- old/usr/sbin/shim-install   2020-08-10 18:31:22.0 +0200
+++ new/usr/sbin/shim-install   2020-08-24 17:48:08.0 +0200
@@ -260,6 +260,8 @@
 if test "$update_boot" = "yes"; then
 rm -f "${efibootdir}/${def_boot_efi}"
 rm -f "${efibootdir}/fallback.efi"
+# bsc#1175626, bsc#1175656 also clean up MokManager
+rm -f "${efibootdir}/MokManager.efi"
 fi
 if test "$no_nvram" = no && test -n "$bootloader_id"; then
 # Delete old entries from the same distributor.
@@ -296,6 +298,11 @@
 cp "${source_dir}/shim.efi" "${efibootdir}/${def_boot_efi}"
 if test "$removable" = "no"; then
 cp "${source_dir}/fallback.efi" "${efibootdir}"
+# bsc#1175626, bsc#1175656 Since shim 15, loading MokManager becomes
+# mandatory if a MOK request exists. Copy MokManager to \EFI\boot so
+# that boot*.efi can load MokManager to process the request instead
+# of shutting down the system immediately.
+cp "${source_dir}/MokManager.efi" "${efibootdir}"
 fi
 fi
 
Binary files old/usr/share/efi/x86_64/MokManager.efi and 
new/usr/share/efi/x86_64/MokManager.efi differ
Binary files old/usr/share/efi/x86_64/fallback.efi and 
new/usr/share/efi/x86_64/fallback.efi differ
Binary files old/usr/share/efi/x86_64/shim-opensuse.efi and 
new/usr/share/efi/x86_64/shim-opensuse.efi differ

commit shim-leap for openSUSE:Factory

2020-08-12 Thread root 
Hello community,

here is the log from the commit of package shim-leap for openSUSE:Factory 
checked in at 2020-08-12 10:33:13

Comparing /work/SRC/openSUSE:Factory/shim-leap (Old)
 and  /work/SRC/openSUSE:Factory/.shim-leap.new.3399 (New)


Package is "shim-leap"

Wed Aug 12 10:33:13 2020 rev:13 rq:825704 version:15+git47

Changes:

--- /work/SRC/openSUSE:Factory/shim-leap/shim-leap.changes  2020-07-24 
10:06:52.461990267 +0200
+++ /work/SRC/openSUSE:Factory/.shim-leap.new.3399/shim-leap.changes
2020-08-12 10:37:24.076318177 +0200
@@ -1,0 +2,7 @@
+Tue Aug 11 06:36:37 UTC 2020 - Gary Ching-Pang Lin 
+
+- Update shim to 15+git47-lp152.4.3.1 from openSUSE Leap 15.2
+  + Version: 15+git47 "Fri Jul 31 07:41:26 UTC 2020"
+  + Use shim-install in the rpm package
+
+---

Old:

  shim-14-lp150.8.5.1.x86_64.rpm
  shim-install

New:

  shim-15+git47-lp152.4.3.1.x86_64.rpm



Other differences:
--
++ shim-leap.spec ++
--- /var/tmp/diff_new_pack.npwuwX/_old  2020-08-12 10:37:24.792318533 +0200
+++ /var/tmp/diff_new_pack.npwuwX/_new  2020-08-12 10:37:24.792318533 +0200
@@ -25,13 +25,12 @@
 %endif
 
 Name:   shim-leap
-Version:14
+Version:15+git47
 Release:0
 Summary:UEFI shim loader
 License:BSD-2-Clause
 Group:  System/Boot
-Source: shim-14-lp150.8.5.1.x86_64.rpm
-Source1:shim-install
+Source: shim-15+git47-lp152.4.3.1.x86_64.rpm
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  x86_64
 
@@ -55,14 +54,7 @@
 %install
 # purely repackaged
 cp -a * %{buildroot}
-install -m 755 %{SOURCE1} %{buildroot}/%{_sbindir}
-
-# Move 'efi'-executables to '/usr/share/efi' (FATE#326960, bsc#1166523)
-install -d %{buildroot}/%{sysefidir}
-mv %{buildroot}/usr/lib64/efi/* %{buildroot}/%{sysefidir}
-%if %{defined shim_lib64_share_compat}
-ln -srf %{buildroot}/%{sysefidir}/*.efi %{buildroot}/usr/lib64/efi/
-%endif
+# NOTE: shim-15+git47 already contains the sym-link to /usr/lib64/efi.
 
 %post -n shim
 /sbin/update-bootloader --reinit || true

commit shim-leap for openSUSE:Factory

2020-07-24 Thread root 
Hello community,

here is the log from the commit of package shim-leap for openSUSE:Factory 
checked in at 2020-07-24 10:04:49

Comparing /work/SRC/openSUSE:Factory/shim-leap (Old)
 and  /work/SRC/openSUSE:Factory/.shim-leap.new.3592 (New)


Package is "shim-leap"

Fri Jul 24 10:04:49 2020 rev:12 rq:822331 version:14

Changes:

--- /work/SRC/openSUSE:Factory/shim-leap/shim-leap.changes  2020-04-01 
19:17:03.691496648 +0200
+++ /work/SRC/openSUSE:Factory/.shim-leap.new.3592/shim-leap.changes
2020-07-24 10:06:52.461990267 +0200
@@ -1,0 +2,10 @@
+Wed Jul 22 09:33:51 UTC 2020 - Gary Ching-Pang Lin 
+
+- Update the path to grub-tpm.efi in shim-install (bsc#1174320)
+- shim-install: add check for btrfs is used as root file system to enable
+  relative path lookup for file. (bsc#1153953)
+- Update shim-install to handle the partitioned MD devices
+  (bsc#1119762, bsc#1119763)
+- Update grub2 path in shim-install
+
+---



Other differences:
--
++ shim-install ++
--- /var/tmp/diff_new_pack.RKk8sO/_old  2020-07-24 10:06:52.865990577 +0200
+++ /var/tmp/diff_new_pack.RKk8sO/_new  2020-07-24 10:06:52.865990577 +0200
@@ -1,5 +1,6 @@
 #! /bin/bash -e
 
+arch=`uname -m`
 rootdir=
 bootdir=
 efidir=
@@ -10,8 +11,9 @@
 removable=no
 clean=no
 sysconfdir="/etc"
-libdir="/usr/lib64"
-source_dir="$libdir/efi"
+libdir="/usr/lib64"# Beware, this is arch dependent!
+datadir="/usr/share"
+source_dir="${datadir}/efi/${arch}"
 efibootmgr="/usr/sbin/efibootmgr"
 grub_probe="/usr/sbin/grub2-probe"
 grub_mkrelpath="/usr/bin/grub2-mkrelpath"
@@ -23,7 +25,6 @@
 def_grub_efi="${source_dir}/grub.efi"
 def_boot_efi=
 
-arch=`uname -m`
 if [ x${arch} = xx86_64 ] ; then
grub_install_target="x86_64-efi"
def_boot_efi="bootx64.efi"
@@ -35,6 +36,12 @@
exit 1
 fi
 
+if [ ! -d "${source_dir}" -o ! -e "${def_grub_efi}" ] ; then
+# for outdated packages fall back to previous behavior
+source_dir="$libdir/efi"
+def_grub_efi="${source_dir}/grub.efi"
+fi
+ 
 # Get GRUB_DISTRIBUTOR.
 if test -f "${sysconfdir}/default/grub" ; then
 . "${sysconfdir}/default/grub"
@@ -139,7 +146,17 @@
no_nvram=yes ;;
 
 --suse-enable-tpm)
-source_grub_efi="/usr/lib/grub2/${grub_install_target}/grub-tpm.efi" ;;
+# bsc#1174320 shim-install uses wrong paths for EFI files
+# There are 3 possible locations of grub-tpm.efi and we will check them
+# one by one.
+if [ -e "${source_dir}/grub-tpm.efi" ]; then
+source_grub_efi="${source_dir}/grub-tpm.efi"
+   elif [ -e "${datadir}/grub2/${grub_install_target}/grub-tpm.efi" ] ; 
then
+
source_grub_efi="${datadir}/grub2/${grub_install_target}/grub-tpm.efi"
+else
+
source_grub_efi="/usr/lib/grub2/${grub_install_target}/grub-tpm.efi"
+fi
+   ;;
 
 --clean)
clean=yes ;;
@@ -288,8 +305,13 @@
 grub_cfg_dirname=`dirname $grub_cfg`
 grub_cfg_basename=`basename $grub_cfg`
 cfg_fs_uuid=`"$grub_probe" --target=fs_uuid "$grub_cfg_dirname"`
+# bsc#1153953 - Leap 42.3 boot error snapshot missing
+# We have to check btrfs is used as root file system to enable relative path
+# lookup for file to be on par with other utility which also accounts for it.
+GRUB_FS="$(stat -f --printf=%T / || echo unknown)"
 
-if test "x$SUSE_BTRFS_SNAPSHOT_BOOTING" = "xtrue"; then
+if test "x$SUSE_BTRFS_SNAPSHOT_BOOTING" = "xtrue" &&
+   [ "x${GRUB_FS}" = "xbtrfs" ] ; then
 cat <&2
-elif [[ "$efidir_drive" == \(mduuid/* ]]; then
+# bsc#1119762 If the MD device is partitioned, we just need to create one
+# boot entry since the partitions are nested partitions and the mirrored
+# partitions share the same UUID.
+elif [[ "$efidir_drive" == \(mduuid/* && "$efidir_drive" != \(mduuid/*,* 
]]; then
 eval $(mdadm --detail --export "$efidir_disk" |
   perl -ne 'print if m{^MD_LEVEL=}; push( @D, $1) if 
(m{^MD_DEVICE_\S+_DEV=(\S+)$});
 sub END() {print "MD_DEVS=\"", join( " ", @D), "\"\n";};')

commit shim-leap for openSUSE:Factory

2020-04-01 Thread root 
Hello community,

here is the log from the commit of package shim-leap for openSUSE:Factory 
checked in at 2020-04-01 19:16:28

Comparing /work/SRC/openSUSE:Factory/shim-leap (Old)
 and  /work/SRC/openSUSE:Factory/.shim-leap.new.3248 (New)


Package is "shim-leap"

Wed Apr  1 19:16:28 2020 rev:11 rq:790405 version:14

Changes:

--- /work/SRC/openSUSE:Factory/shim-leap/shim-leap.changes  2020-03-30 
23:02:08.040133128 +0200
+++ /work/SRC/openSUSE:Factory/.shim-leap.new.3248/shim-leap.changes
2020-04-01 19:17:03.691496648 +0200
@@ -1,0 +2,6 @@
+Tue Mar 31 08:38:56 UTC 2020 - Gary Ching-Pang Lin 
+
+- Use the full path of efibootmgr to avoid errors when invoking
+  shim-install from packagekitd (bsc#1168104)
+
+---



Other differences:
--
++ shim-install ++
--- /var/tmp/diff_new_pack.uC2FCs/_old  2020-04-01 19:17:04.275496911 +0200
+++ /var/tmp/diff_new_pack.uC2FCs/_new  2020-04-01 19:17:04.279496913 +0200
@@ -12,6 +12,7 @@
 sysconfdir="/etc"
 libdir="/usr/lib64"
 source_dir="$libdir/efi"
+efibootmgr="/usr/sbin/efibootmgr"
 grub_probe="/usr/sbin/grub2-probe"
 grub_mkrelpath="/usr/bin/grub2-mkrelpath"
 grub_install="/usr/sbin/grub2-install"
@@ -245,9 +246,9 @@
 fi
 if test "$no_nvram" = no && test -n "$bootloader_id"; then
 # Delete old entries from the same distributor.
-for bootnum in `efibootmgr | grep '^Boot[0-9]' | \
+for bootnum in `$efibootmgr | grep '^Boot[0-9]' | \
 fgrep -i " $bootloader_id" | cut -b5-8`; do
-efibootmgr -b "$bootnum" -B
+$efibootmgr -b "$bootnum" -B
 done
fi
exit 0
@@ -323,9 +324,9 @@
 modprobe -q efivars 2>/dev/null || true
 
 # Delete old entries from the same distributor.
-for bootnum in `efibootmgr | grep '^Boot[0-9]' | \
+for bootnum in `$efibootmgr | grep '^Boot[0-9]' | \
 fgrep -i " $bootloader_id" | cut -b5-8`; do
-efibootmgr -b "$bootnum" -B
+$efibootmgr -b "$bootnum" -B
 done
 
 efidir_drive="$("$grub_probe" --target=drive --device-map= "$efidir")"
@@ -344,12 +345,12 @@
 efidir_disk="$("$grub_probe" --target=disk --device-map= -d 
"$mddev")"
 efidir_part="$(echo "$efidir_drive" | sed 's/^([^,]*,[^0-9]*//; 
s/[^0-9].*//')"
 efidir_d=${mddev#/dev/}
-efibootmgr -c -d "$efidir_disk" -p "$efidir_part" -w \
+$efibootmgr -c -d "$efidir_disk" -p "$efidir_part" -w \
   -L "$bootloader_id ($efidir_d)" -l 
"\\EFI\\$efi_distributor\\$efi_file"
 done
 else
 efidir_part="$(echo "$efidir_drive" | sed 's/^([^,]*,[^0-9]*//; 
s/[^0-9].*//')"
-efibootmgr -c -d "$efidir_disk" -p "$efidir_part" -w \
+$efibootmgr -c -d "$efidir_disk" -p "$efidir_part" -w \
-L "$bootloader_id" -l "\\EFI\\$efi_distributor\\$efi_file"
 fi
 fi

commit shim-leap for openSUSE:Factory

2020-03-30 Thread root 
Hello community,

here is the log from the commit of package shim-leap for openSUSE:Factory 
checked in at 2020-03-30 23:02:06

Comparing /work/SRC/openSUSE:Factory/shim-leap (Old)
 and  /work/SRC/openSUSE:Factory/.shim-leap.new.3160 (New)


Package is "shim-leap"

Mon Mar 30 23:02:06 2020 rev:10 rq:789646 version:14

Changes:

--- /work/SRC/openSUSE:Factory/shim-leap/shim-leap.changes  2018-12-06 
12:19:10.801399833 +0100
+++ /work/SRC/openSUSE:Factory/.shim-leap.new.3160/shim-leap.changes
2020-03-30 23:02:08.040133128 +0200
@@ -1,0 +2,12 @@
+Mon Mar 30 06:05:58 UTC 2020 - Gary Ching-Pang Lin 
+
+- Use "suse_version" instead of "sle_version" to avoid
+  shim_lib64_share_compat being set in Tumbleweed forever.
+
+---
+Fri Mar 27 05:32:11 UTC 2020 - Gary Ching-Pang Lin 
+
+- Move 'efi'-executables to '/usr/share/efi'
+  (FATE#326960, bsc#1166523)
+
+---



Other differences:
--
++ shim-leap.spec ++
--- /var/tmp/diff_new_pack.esA942/_old  2020-03-30 23:02:08.952133648 +0200
+++ /var/tmp/diff_new_pack.esA942/_new  2020-03-30 23:02:08.952133648 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package shim-leap
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,14 @@
 #
 
 
+# Move 'efi'-executables to '/usr/share/efi' (FATE#326960, bsc#1166523)
+%define sysefibasedir  %{_datadir}/efi
+%define sysefidir  %{sysefibasedir}/%{_target_cpu}
+%if 0%{?suse_version} < 1600
+# provide compatibility sym-link for residual kiwi, etc.
+%define shim_lib64_share_compat 1
+%endif
+
 Name:   shim-leap
 Version:14
 Release:0
@@ -49,13 +57,31 @@
 cp -a * %{buildroot}
 install -m 755 %{SOURCE1} %{buildroot}/%{_sbindir}
 
+# Move 'efi'-executables to '/usr/share/efi' (FATE#326960, bsc#1166523)
+install -d %{buildroot}/%{sysefidir}
+mv %{buildroot}/usr/lib64/efi/* %{buildroot}/%{sysefidir}
+%if %{defined shim_lib64_share_compat}
+ln -srf %{buildroot}/%{sysefidir}/*.efi %{buildroot}/usr/lib64/efi/
+%endif
+
 %post -n shim
 /sbin/update-bootloader --reinit || true
 
 %files -n shim
+%dir %{?sysefibasedir}
+%dir %{sysefidir}
+%{sysefidir}/shim.efi
+%{sysefidir}/shim-*.efi
+%{sysefidir}/shim-*.der
+%{sysefidir}/MokManager.efi
+%{sysefidir}/fallback.efi
+%if %{defined shim_lib64_share_compat}
+# provide compatibility sym-link for previous kiwi, etc.
+%dir /usr/lib64/efi
+/usr/lib64/efi/*.efi
+%endif
 /etc/uefi
 /usr/sbin/shim-install
-/usr/lib64/efi
 /usr/share/doc/packages/shim
 
 %changelog

commit shim-leap for openSUSE:Factory

2018-12-06 Thread root 
Hello community,

here is the log from the commit of package shim-leap for openSUSE:Factory 
checked in at 2018-12-06 12:19:08

Comparing /work/SRC/openSUSE:Factory/shim-leap (Old)
 and  /work/SRC/openSUSE:Factory/.shim-leap.new.19453 (New)


Package is "shim-leap"

Thu Dec  6 12:19:08 2018 rev:9 rq:655468 version:14

Changes:

--- /work/SRC/openSUSE:Factory/shim-leap/shim-leap.changes  2018-06-13 
15:38:44.30743 +0200
+++ /work/SRC/openSUSE:Factory/.shim-leap.new.19453/shim-leap.changes   
2018-12-06 12:19:10.801399833 +0100
@@ -1,0 +2,6 @@
+Thu Dec  6 03:23:04 UTC 2018 - Gary Ching-Pang Lin 
+
+- Update shim-install to set the grub2-install target explicitly
+  for some special cases. (bsc#1118363)
+
+---

New:

  shim-install



Other differences:
--
++ shim-leap.spec ++
--- /var/tmp/diff_new_pack.XO5jpW/_old  2018-12-06 12:19:11.273399327 +0100
+++ /var/tmp/diff_new_pack.XO5jpW/_new  2018-12-06 12:19:11.277399323 +0100
@@ -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/
 #
 
 
@@ -23,6 +23,7 @@
 License:BSD-2-Clause
 Group:  System/Boot
 Source: shim-14-lp150.8.5.1.x86_64.rpm
+Source1:shim-install
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  x86_64
 
@@ -46,6 +47,7 @@
 %install
 # purely repackaged
 cp -a * %{buildroot}
+install -m 755 %{SOURCE1} %{buildroot}/%{_sbindir}
 
 %post -n shim
 /sbin/update-bootloader --reinit || true

++ shim-install ++
#! /bin/bash -e

rootdir=
bootdir=
efidir=
install_device=
efibootdir=
ca_string=
no_nvram=no
removable=no
clean=no
sysconfdir="/etc"
libdir="/usr/lib64"
source_dir="$libdir/efi"
grub_probe="/usr/sbin/grub2-probe"
grub_mkrelpath="/usr/bin/grub2-mkrelpath"
grub_install="/usr/sbin/grub2-install"
grub_install_target=
self="`basename $0`"
grub_cfg="/boot/grub2/grub.cfg"
update_boot=no
def_grub_efi="${source_dir}/grub.efi"
def_boot_efi=

arch=`uname -m`
if [ x${arch} = xx86_64 ] ; then
grub_install_target="x86_64-efi"
def_boot_efi="bootx64.efi"
elif [ x${arch} = xaarch64 ] ; then
grub_install_target="arm64-efi"
def_boot_efi="bootaa64.efi"
else
echo "Unsupported architecture: ${arch}"
exit 1
fi

# Get GRUB_DISTRIBUTOR.
if test -f "${sysconfdir}/default/grub" ; then
. "${sysconfdir}/default/grub"
fi

if [ x"${GRUB_DISTRIBUTOR}" = x ] && [ -f "${sysconfdir}/os-release" ] ; then
. "${sysconfdir}/os-release"
GRUB_DISTRIBUTOR="${NAME} ${VERSION}"
fi

bootloader_id="$(echo "$GRUB_DISTRIBUTOR" | tr 'A-Z' 'a-z' | cut -d' ' -f1)"
if test -z "$bootloader_id"; then
bootloader_id=grub
fi

efi_distributor="$bootloader_id"
bootloader_id="${bootloader_id}-secureboot"

case "$bootloader_id" in
"sle"*)
ca_string='SUSE Linux Enterprise Secure Boot CA1';;
"opensuse"*)
ca_string='openSUSE Secure Boot CA1';;
*) ca_string="";;
esac

usage () {
echo "Usage: $self [OPTION] [INSTALL_DEVICE]"
echo
echo "Install Secure Boot Loaders on your drive."
echo
echo "--directory=DIR use images from DIR."
echo "--grub-probe=FILE use FILE as grub-probe."
echo "--removable the installation device is removable."
echo "--no-nvram don't update the NVRAM variable."
echo "--bootloader-id=ID the ID of bootloader."
echo "--efi-directory=DIR use DIR as the EFI System Partition root."
echo "--config-file=FILE use FILE as config file, default is $grub_cfg."
echo "--clean remove all installed files and configs."
echo "--suse-enable-tpm install grub.efi with TPM support."
echo
echo "INSTALL_DEVICE must be system device filename."
}

argument () {
  opt="$1"
  shift

  if test $# -eq 0; then
  echo "$0: option requires an argument -- \`$opt'" 1>&2
  exit 1
  fi
  echo "$1"
}

# Check the arguments.
while test $# -gt 0
do
option=$1
shift

case "$option" in
-h | --help)
usage
exit 0 ;;

--root-directory)
rootdir="`argument $option "$@"`"; shift;;
--root-directory=*)
rootdir="`echo "$option" | sed 's/--root-directory=//'`" ;;

--efi-directory)
efidir="`argument $option "$@"`"; shift;;
--efi-directory=*)
efidir="`echo "$option" | sed 's/--efi-directory=//'`" ;;

--directory | -d)
source_dir="`argument $option "$@"`"; shift;;
--directory=*)
source_dir="`echo "$option" | sed 's/--directory=//'`" ;;

--bootloader-id)
bootloader_id="`argument $option

commit shim-leap for openSUSE:Factory

2018-06-13 Thread root 
Hello community,

here is the log from the commit of package shim-leap for openSUSE:Factory 
checked in at 2018-06-13 15:38:17

Comparing /work/SRC/openSUSE:Factory/shim-leap (Old)
 and  /work/SRC/openSUSE:Factory/.shim-leap.new (New)


Package is "shim-leap"

Wed Jun 13 15:38:17 2018 rev:8 rq:615203 version:14

Changes:

--- /work/SRC/openSUSE:Factory/shim-leap/shim-leap.changes  2018-05-16 
11:42:18.730729699 +0200
+++ /work/SRC/openSUSE:Factory/.shim-leap.new/shim-leap.changes 2018-06-13 
15:38:44.30743 +0200
@@ -1,0 +2,8 @@
+Fri Jun  8 10:39:42 UTC 2018 - g...@suse.com
+
+- Update shim to 14-lp150.8.5.1
+  + Replace shim-bsc1092000-fallback-always-try-first-option.patch
+with shim-bsc1092000-fallback-menu.patch to show a countdown
+menu before reset (bsc#1092000)
+
+---

Old:

  shim-14-lp150.7.3.x86_64.rpm

New:

  shim-14-lp150.8.5.1.x86_64.rpm



Other differences:
--
++ shim-leap.spec ++
--- /var/tmp/diff_new_pack.clDt7u/_old  2018-06-13 15:38:45.117970010 +0200
+++ /var/tmp/diff_new_pack.clDt7u/_new  2018-06-13 15:38:45.125969715 +0200
@@ -22,7 +22,7 @@
 Summary:UEFI shim loader
 License:BSD-2-Clause
 Group:  System/Boot
-Source: shim-14-lp150.7.3.x86_64.rpm
+Source: shim-14-lp150.8.5.1.x86_64.rpm
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  x86_64
 

++ shim-14-lp150.7.3.x86_64.rpm -> shim-14-lp150.8.5.1.x86_64.rpm ++
Binary files old/usr/lib64/efi/MokManager.efi and 
new/usr/lib64/efi/MokManager.efi differ
Binary files old/usr/lib64/efi/fallback.efi and new/usr/lib64/efi/fallback.efi 
differ
Binary files old/usr/lib64/efi/shim-opensuse.efi and 
new/usr/lib64/efi/shim-opensuse.efi differ

commit shim-leap for openSUSE:Factory

2018-05-16 Thread root 
Hello community,

here is the log from the commit of package shim-leap for openSUSE:Factory 
checked in at 2018-05-16 11:40:48

Comparing /work/SRC/openSUSE:Factory/shim-leap (Old)
 and  /work/SRC/openSUSE:Factory/.shim-leap.new (New)


Package is "shim-leap"

Wed May 16 11:40:48 2018 rev:7 rq:607410 version:14

Changes:

--- /work/SRC/openSUSE:Factory/shim-leap/shim-leap.changes  2018-04-26 
13:38:25.847201799 +0200
+++ /work/SRC/openSUSE:Factory/.shim-leap.new/shim-leap.changes 2018-05-16 
11:42:18.730729699 +0200
@@ -1,0 +2,7 @@
+Mon May 14 08:52:34 UTC 2018 - g...@suse.com
+
+- Update shim to 14-lp150.7.3
+  + Amend fallback.efi to avoid being trapped in the infinite reset
+loop (bsc#1092000)
+
+---

Old:

  shim-14-lp150.4.1.x86_64.rpm

New:

  shim-14-lp150.7.3.x86_64.rpm



Other differences:
--
++ shim-leap.spec ++
--- /var/tmp/diff_new_pack.qxwAfB/_old  2018-05-16 11:42:19.746692722 +0200
+++ /var/tmp/diff_new_pack.qxwAfB/_new  2018-05-16 11:42:19.746692722 +0200
@@ -22,7 +22,7 @@
 Summary:UEFI shim loader
 License:BSD-2-Clause
 Group:  System/Boot
-Source: shim-14-lp150.4.1.x86_64.rpm
+Source: shim-14-lp150.7.3.x86_64.rpm
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  x86_64
 

++ shim-14-lp150.4.1.x86_64.rpm -> shim-14-lp150.7.3.x86_64.rpm ++
Binary files old/usr/lib64/efi/MokManager.efi and 
new/usr/lib64/efi/MokManager.efi differ
Binary files old/usr/lib64/efi/fallback.efi and new/usr/lib64/efi/fallback.efi 
differ
Binary files old/usr/lib64/efi/shim-opensuse.efi and 
new/usr/lib64/efi/shim-opensuse.efi differ

commit shim-leap for openSUSE:Factory

2018-04-26 Thread root 
Hello community,

here is the log from the commit of package shim-leap for openSUSE:Factory 
checked in at 2018-04-26 13:38:23

Comparing /work/SRC/openSUSE:Factory/shim-leap (Old)
 and  /work/SRC/openSUSE:Factory/.shim-leap.new (New)


Package is "shim-leap"

Thu Apr 26 13:38:23 2018 rev:6 rq:600832 version:14

Changes:

--- /work/SRC/openSUSE:Factory/shim-leap/shim-leap.changes  2017-04-28 
09:13:36.123554900 +0200
+++ /work/SRC/openSUSE:Factory/.shim-leap.new/shim-leap.changes 2018-04-26 
13:38:25.847201799 +0200
@@ -1,0 +2,6 @@
+Wed Apr 25 08:17:45 UTC 2018 - m...@suse.com
+
+- Update shim to 14-lp150.4.1
+- New signature from Microsoft
+
+---

Old:

  shim-0.9-15.3.1.x86_64.rpm

New:

  shim-14-lp150.4.1.x86_64.rpm



Other differences:
--
++ shim-leap.spec ++
--- /var/tmp/diff_new_pack.5eaHK1/_old  2018-04-26 13:38:26.483178488 +0200
+++ /var/tmp/diff_new_pack.5eaHK1/_new  2018-04-26 13:38:26.483178488 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package shim-leap
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -17,12 +17,12 @@
 
 
 Name:   shim-leap
-Version:0.9
+Version:14
 Release:0
 Summary:UEFI shim loader
 License:BSD-2-Clause
 Group:  System/Boot
-Source: shim-0.9-15.3.1.x86_64.rpm
+Source: shim-14-lp150.4.1.x86_64.rpm
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  x86_64

commit shim-leap for openSUSE:Factory

2017-04-28 Thread root 
Hello community,

here is the log from the commit of package shim-leap for openSUSE:Factory 
checked in at 2017-04-28 09:13:19

Comparing /work/SRC/openSUSE:Factory/shim-leap (Old)
 and  /work/SRC/openSUSE:Factory/.shim-leap.new (New)


Package is "shim-leap"

Fri Apr 28 09:13:19 2017 rev:5 rq:490912 version:0.9

Changes:

--- /work/SRC/openSUSE:Factory/shim-leap/shim-leap.changes  2017-02-21 
22:47:12.001423777 +0100
+++ /work/SRC/openSUSE:Factory/.shim-leap.new/shim-leap.changes 2017-04-28 
09:13:36.123554900 +0200
@@ -1,0 +2,7 @@
+Tue Apr 25 03:44:04 UTC 2017 - g...@suse.com
+
+- Update shim to 0.9-15.3.1
+  + shim-install: add option --suse-enable-tpm (fate#315831)
+(Fix from mch...@suse.com)
+
+---

Old:

  shim-0.9-13.1.x86_64.rpm

New:

  shim-0.9-15.3.1.x86_64.rpm



Other differences:
--
++ shim-leap.spec ++
--- /var/tmp/diff_new_pack.Ziscd2/_old  2017-04-28 09:13:37.235398112 +0200
+++ /var/tmp/diff_new_pack.Ziscd2/_new  2017-04-28 09:13:37.239397548 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package shim-leap
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -22,7 +22,7 @@
 Summary:UEFI shim loader
 License:BSD-2-Clause
 Group:  System/Boot
-Source: shim-0.9-13.1.x86_64.rpm
+Source: shim-0.9-15.3.1.x86_64.rpm
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  x86_64
 

++ shim-0.9-13.1.x86_64.rpm -> shim-0.9-15.3.1.x86_64.rpm ++
Binary files old/usr/lib64/efi/MokManager.efi and 
new/usr/lib64/efi/MokManager.efi differ
Binary files old/usr/lib64/efi/fallback.efi and new/usr/lib64/efi/fallback.efi 
differ
Binary files old/usr/lib64/efi/shim-opensuse.efi and 
new/usr/lib64/efi/shim-opensuse.efi differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/usr/sbin/shim-install new/usr/sbin/shim-install
--- old/usr/sbin/shim-install   2016-12-15 16:57:45.0 +0100
+++ new/usr/sbin/shim-install   2017-04-12 11:43:48.0 +0200
@@ -18,6 +18,7 @@
 self="`basename $0`"
 grub_cfg="/boot/grub2/grub.cfg"
 update_boot=no
+def_grub_efi="${source_dir}/grub.efi"
 
 # Get GRUB_DISTRIBUTOR.
 if test -f "${sysconfdir}/default/grub" ; then
@@ -58,6 +59,7 @@
 echo "--efi-directory=DIR use DIR as the EFI System Partition root."
 echo "--config-file=FILE use FILE as config file, default is $grub_cfg."
 echo "--clean remove all installed files and configs."
+echo "--suse-enable-tpm install grub.efi with TPM support."
 echo
 echo "INSTALL_DEVICE must be system device filename."
 }
@@ -121,6 +123,9 @@
 --no-nvram)
no_nvram=yes ;;
 
+--suse-enable-tpm)
+source_grub_efi="/usr/lib/grub2/x86_64-efi/grub-tpm.efi" ;;
+
 --clean)
clean=yes ;;
 
@@ -235,7 +240,18 @@
 fi
 
 cp "${source_dir}/MokManager.efi" "${efidir}"
-cp "${source_dir}/grub.efi" "${efidir}"
+
+if test -n "$source_grub_efi" && ! test -f "$source_grub_efi"; then
+echo "File $source_grub_efi doesn't exist, fallback to default one" 1>&2
+source_grub_efi=""
+fi
+
+if test -z "$source_grub_efi"; then
+source_grub_efi="$def_grub_efi"
+fi
+
+echo "copying $source_grub_efi to ${efidir}/grub.efi"
+cp "$source_grub_efi" "${efidir}/grub.efi"
 
 if test "$efidir" != "$efibootdir" ; then 
 cp "${source_dir}/shim.efi" "${efidir}"

commit shim-leap for openSUSE:Factory

2017-02-21 Thread root 
Hello community,

here is the log from the commit of package shim-leap for openSUSE:Factory 
checked in at 2017-02-21 22:47:11

Comparing /work/SRC/openSUSE:Factory/shim-leap (Old)
 and  /work/SRC/openSUSE:Factory/.shim-leap.new (New)


Package is "shim-leap"

Changes:

--- /work/SRC/openSUSE:Factory/shim-leap/shim-leap.changes  2017-02-19 
01:03:20.272147589 +0100
+++ /work/SRC/openSUSE:Factory/.shim-leap.new/shim-leap.changes 2017-02-21 
22:47:12.001423777 +0100
@@ -2,6 +1,0 @@
-Fri Feb 17 04:04:36 UTC 2017 - g...@suse.com
-
-- Support %posttrans with marcos provided by update-bootloader-rpm-macros
-  package (bsc#997317) (fix from mch...@suse.com)
-




Other differences:
--
++ shim-leap.spec ++
--- /var/tmp/diff_new_pack.pbTcJ7/_old  2017-02-21 22:47:12.557345158 +0100
+++ /var/tmp/diff_new_pack.pbTcJ7/_new  2017-02-21 22:47:12.565344026 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package shim-leap
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -32,14 +32,7 @@
 %package -n shim
 Summary:UEFI shim loader
 Group:  System/Boot
-%if 0%{?suse_version} > 1320
-BuildRequires:  update-bootloader-rpm-macros
-%endif
-%if 0%{?update_bootloader_requires:1}
-%update_bootloader_requires
-%else
 Requires:   perl-Bootloader
-%endif
 
 %description -n shim
 shim is a trivial EFI application that, when run, attempts to open and
@@ -55,14 +48,7 @@
 cp -a * %{buildroot}
 
 %post -n shim
-%if 0%{?update_bootloader_check_type_reinit_post:1} 
-%update_bootloader_check_type_reinit_post grub2-efi
-%else
 /sbin/update-bootloader --reinit || true
-%endif
-
-%posttrans -n shim
-%{?update_bootloader_posttrans}
 
 %files -n shim
 /etc/uefi

commit shim-leap for openSUSE:Factory

2017-02-18 Thread root 
Hello community,

here is the log from the commit of package shim-leap for openSUSE:Factory 
checked in at 2017-02-19 01:03:19

Comparing /work/SRC/openSUSE:Factory/shim-leap (Old)
 and  /work/SRC/openSUSE:Factory/.shim-leap.new (New)


Package is "shim-leap"

Changes:

--- /work/SRC/openSUSE:Factory/shim-leap/shim-leap.changes  2016-12-29 
22:51:45.569532739 +0100
+++ /work/SRC/openSUSE:Factory/.shim-leap.new/shim-leap.changes 2017-02-19 
01:03:20.272147589 +0100
@@ -1,0 +2,6 @@
+Fri Feb 17 04:04:36 UTC 2017 - g...@suse.com
+
+- Support %posttrans with marcos provided by update-bootloader-rpm-macros
+  package (bsc#997317) (fix from mch...@suse.com)
+
+---



Other differences:
--
++ shim-leap.spec ++
--- /var/tmp/diff_new_pack.PV0VbP/_old  2017-02-19 01:03:20.640095894 +0100
+++ /var/tmp/diff_new_pack.PV0VbP/_new  2017-02-19 01:03:20.640095894 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package shim-leap
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -32,7 +32,14 @@
 %package -n shim
 Summary:UEFI shim loader
 Group:  System/Boot
+%if 0%{?suse_version} > 1320
+BuildRequires:  update-bootloader-rpm-macros
+%endif
+%if 0%{?update_bootloader_requires:1}
+%update_bootloader_requires
+%else
 Requires:   perl-Bootloader
+%endif
 
 %description -n shim
 shim is a trivial EFI application that, when run, attempts to open and
@@ -48,7 +55,14 @@
 cp -a * %{buildroot}
 
 %post -n shim
+%if 0%{?update_bootloader_check_type_reinit_post:1} 
+%update_bootloader_check_type_reinit_post grub2-efi
+%else
 /sbin/update-bootloader --reinit || true
+%endif
+
+%posttrans -n shim
+%{?update_bootloader_posttrans}
 
 %files -n shim
 /etc/uefi