commit shim for openSUSE:13.1

2013-10-29 Thread h_root
Hello community,

here is the log from the commit of package shim for openSUSE:13.1 checked in at 
2013-10-29 09:08:47

Comparing /work/SRC/openSUSE:13.1/shim (Old)
 and  /work/SRC/openSUSE:13.1/.shim.new (New)


Package is shim

Changes:

--- /work/SRC/openSUSE:13.1/shim/shim.changes   2013-10-28 09:41:11.0 
+0100
+++ /work/SRC/openSUSE:13.1/.shim.new/shim.changes  2013-10-29 
09:08:48.0 +0100
@@ -1,0 +2,5 @@
+Tue Oct 29 08:08:30 UTC 2013 - co...@suse.com
+
+- take the fixes from 12.3:Update
+
+---

Old:

  shim-12.3.tar.xz

New:

  shim-12.3-update.tar.xz



Other differences:
--
++ shim.spec ++
--- /var/tmp/diff_new_pack.ugb2Ja/_old  2013-10-29 09:08:48.0 +0100
+++ /var/tmp/diff_new_pack.ugb2Ja/_new  2013-10-29 09:08:48.0 +0100
@@ -23,7 +23,7 @@
 License:BSD-2-Clause
 Group:  System/Boot
 Url:https://github.com/mjg59/shim
-Source: shim-12.3.tar.xz
+Source: shim-12.3-update.tar.xz
 Source3:shim-install
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Recommends: grub2-efi
@@ -49,6 +49,9 @@
 cd %{buildroot}
 tar xvf %{S:0}
 
+%post
+/sbin/update-bootloader --refresh || true
+
 %files
 %defattr(-,root,root)
 %_docdir/%name

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit shim for openSUSE:13.1

2013-10-28 Thread h_root
Hello community,

here is the log from the commit of package shim for openSUSE:13.1 checked in at 
2013-10-28 09:41:10

Comparing /work/SRC/openSUSE:13.1/shim (Old)
 and  /work/SRC/openSUSE:13.1/.shim.new (New)


Package is shim

Changes:

--- /work/SRC/openSUSE:13.1/shim/shim.changes   2013-10-25 13:50:02.0 
+0200
+++ /work/SRC/openSUSE:13.1/.shim.new/shim.changes  2013-10-28 
09:41:11.0 +0100
@@ -1,0 +2,6 @@
+Mon Oct 28 08:34:58 UTC 2013 - co...@suse.com
+
+- replace the full content with 12.3's version as we can't get
+  signature from MS in time ;(
+
+---

Old:

  SLES-UEFI-CA-Certificate.crt
  openSUSE-UEFI-CA-Certificate.crt
  shim-0.2.tar.bz2
  shim-bnc804631-fix-broken-bootpath.patch
  shim-clear-queued-key.patch
  shim-fix-loadoptions.patch
  shim-get-2nd-stage-loader.patch
  shim-keep-unsigned-mokmanager.patch
  shim-local-key-sign-mokmanager.patch
  shim-mokmanager-new-pw-hash.patch
  shim-mokmanager-support-crypt-hash-method.patch
  shim-reboot-after-changes.patch
  shim-signed.efi
  shim-support-mok-delete.patch
  shim-suse-build.patch

New:

  shim-12.3.tar.xz



Other differences:
--
++ shim.spec ++
--- /var/tmp/diff_new_pack.HSKDAT/_old  2013-10-28 09:41:11.0 +0100
+++ /var/tmp/diff_new_pack.HSKDAT/_new  2013-10-28 09:41:11.0 +0100
@@ -16,8 +16,6 @@
 #
 
 
-# needssslcertforbuild
-
 Name:   shim
 Version:0.2
 Release:0
@@ -25,41 +23,8 @@
 License:BSD-2-Clause
 Group:  System/Boot
 Url:https://github.com/mjg59/shim
-Source: %{name}-%{version}.tar.bz2
-# this binary has been signed by UEFI signing service
-# FIXME: evaluate whether using signature only and attaching that
-# to the built binary also works
-Source1:shim-signed.efi
-Source2:openSUSE-UEFI-CA-Certificate.crt
+Source: shim-12.3.tar.xz
 Source3:shim-install
-Source4:SLES-UEFI-CA-Certificate.crt
-# PATCH-FIX-SUSE shim-suse-build.patch g...@suse.com -- Adjust Makefile for 
the build service
-Patch0: shim-suse-build.patch
-# PATCH-FIX-UPSTREAM shim-local-key-sign-mokmanager.patch g...@suse.com -- 
Sign MokManager.efi with the local generated certificate
-Patch1: shim-local-key-sign-mokmanager.patch
-# PATCH-FEATURE-UPSTREAM shim-get-2nd-stage-loader.patch g...@suse.com -- Get 
the second stage loader path from the load options
-Patch2: shim-get-2nd-stage-loader.patch
-# PATCH-FIX-UPSTREAM shim-reboot-after-changes.patch g...@suse.com -- Reboot 
the system after enrolling or erasing keys
-Patch3: shim-reboot-after-changes.patch
-# PATCH-FIX-UPSTREAM shim-clear-queued-key.patch g...@suse.com -- Clear the 
queued key to show the menu properly
-Patch5: shim-clear-queued-key.patch
-# PATCH-FIX-UPSTREAM shim-fix-loadoptions.patch bnc#798043 g...@suse.com -- 
Adopt the UEFI shell style LoadOptions
-Patch6: shim-fix-loadoptions.patch
-# PATCH-FIX-UPSTREAM shim-support-mok-delete.patch g...@suse.com -- Support 
for deleting specific keys
-Patch7: shim-support-mok-delete.patch
-# PATCH-FIX-UPSTREAM shim-mokmanager-new-pw-hash.patch g...@suse.com -- 
Support the new password hash
-Patch8: shim-mokmanager-new-pw-hash.patch
-# PATCH-FIX-UPSTREAM shim-mokmanager-support-crypt-hash-method.patch 
g...@suse.com -- Support the password hashes from /etc/shadow
-Patch9: shim-mokmanager-support-crypt-hash-method.patch
-# PATCH-FIX-OPENSUSE shim-keep-unsigned-mokmanager.patch g...@suse.com -- Keep 
MokManager.efi and sign it with the openSUSE key later
-Patch10:shim-keep-unsigned-mokmanager.patch
-# PATCH-FIX-UPSTREAM shim-bnc804631-fix-broken-bootpath.patch bnc#804631 
g...@suse.com -- Fix the broken bootpath generated in generate_path()
-Patch11:shim-bnc804631-fix-broken-bootpath.patch
-BuildRequires:  gnu-efi = 3.0q
-BuildRequires:  mozilla-nss-tools
-BuildRequires:  openssl = 0.9.8
-BuildRequires:  pesign
-BuildRequires:  pesign-obs-integration
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Recommends: grub2-efi
 ExclusiveArch:  x86_64
@@ -75,73 +40,18 @@
 Matthew Garrett mj...@srcf.ucam.org
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
 
 %build
-chmod +x make-certs
-
-if test -e %{_sourcedir}/_projectcert.crt ; then
-prjsubject=$(openssl x509 -in %{_sourcedir}/_projectcert.crt -noout 
-subject_hash)
-prjissuer=$(openssl x509 -in %{_sourcedir}/_projectcert.crt -noout 
-issuer_hash)
-opensusesubject=$(openssl x509 -in %{SOURCE2} -noout -subject_hash)
-

commit shim for openSUSE:13.1

2013-10-02 Thread h_root
Hello community,

here is the log from the commit of package shim for openSUSE:13.1 checked in at 
2013-10-02 13:33:53

Comparing /work/SRC/openSUSE:13.1/shim (Old)
 and  /work/SRC/openSUSE:13.1/.shim.new (New)


Package is shim

Changes:

--- /work/SRC/openSUSE:13.1/shim/shim.changes   2013-09-25 17:20:35.0 
+0200
+++ /work/SRC/openSUSE:13.1/.shim.new/shim.changes  2013-10-02 
13:33:59.0 +0200
@@ -1,0 +2,9 @@
+Tue Oct  1 04:29:29 UTC 2013 - g...@suse.com
+
+- Add shim-netboot-fixes.patch to include upstream netboot fixes
+- Add shim-mokmanager-disable-gfx-console.patch to disable the
+  graphics console to avoid system hang on some machines
+- Add shim-bnc841426-silence-shim-protocols.patch to silence the
+  shim protocols (bnc#841426)
+
+---

New:

  shim-bnc841426-silence-shim-protocols.patch
  shim-mokmanager-disable-gfx-console.patch
  shim-netboot-fixes.patch



Other differences:
--
++ shim.spec ++
--- /var/tmp/diff_new_pack.X64pLu/_old  2013-10-02 13:33:59.0 +0200
+++ /var/tmp/diff_new_pack.X64pLu/_new  2013-10-02 13:33:59.0 +0200
@@ -58,6 +58,12 @@
 Patch8: shim-bnc808106-correct-certcount.patch
 # PATCH-FIX-UPSTREAM shim-mokmanager-ui-revamp.patch g...@suse.com -- Revamp 
the MokManager UI
 Patch9: shim-mokmanager-ui-revamp.patch
+# PATCH-FIX-UPSTREAM shim-netboot-fixes.patch g...@suse.com -- Upstream 
netboot fixes
+Patch10:shim-netboot-fixes.patch
+# PATCH-FIX-UPSTREAM shim-mokmanager-disable-gfx-console.patch g...@suse.com 
-- Disable graphics console to avoid system hang on some machines
+Patch11:shim-mokmanager-disable-gfx-console.patch
+# PATCH-FIX-UPSTREAM shim-bnc841426-silence-shim-protocols.patch bnc#841426 
g...@suse.com -- Silence the shim protocols to avoid system hang
+Patch12:shim-bnc841426-silence-shim-protocols.patch
 BuildRequires:  gnu-efi = 3.0t
 BuildRequires:  mozilla-nss-tools
 BuildRequires:  openssl = 0.9.8
@@ -90,6 +96,9 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 chmod +x make-certs

++ shim-bnc841426-silence-shim-protocols.patch ++
 789 lines (skipped)

++ shim-mokmanager-disable-gfx-console.patch ++
From c19cef4b4a61c82ba9a2c323659a20ec5d1d7ba2 Mon Sep 17 00:00:00 2001
From: Peter Jones pjo...@redhat.com
Date: Thu, 26 Sep 2013 09:44:50 -0400
Subject: [PATCH] MokManager needs to disable the graphics console.

Without this patch, on some machines we never see MokManager's UI.  This
protocol has never (I think?) been officially published, and yet I still
have new hardware that needs it.

If you're looking for a reference, look at:

EdkCompatibilityPkg/Foundation/Protocol/ConsoleControl/ConsoleControl.c

in the edk2 tree from Tiano.

Signed-off-by: Peter Jones pjo...@redhat.com
---
 Makefile  |  2 +-
 MokManager.c  | 32 
 console_control.h | 44 
 3 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 console_control.h

diff --git a/Makefile b/Makefile
index 77f3e52..1e4aed8 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ OBJS  = shim.o netboot.o cert.o dbx.o
 KEYS   = shim_cert.h ocsp.* ca.* shim.crt shim.csr shim.p12 shim.pem shim.key
 SOURCES= shim.c shim.h netboot.c signature.h PeImage.h
 MOK_OBJS = MokManager.o PasswordCrypt.o crypt_blowfish.o
-MOK_SOURCES = MokManager.c shim.h PasswordCrypt.c PasswordCrypt.h 
crypt_blowfish.c crypt_blowfish.h
+MOK_SOURCES = MokManager.c shim.h console_control.h PasswordCrypt.c 
PasswordCrypt.h crypt_blowfish.c crypt_blowfish.h
 FALLBACK_OBJS = fallback.o
 FALLBACK_SRCS = fallback.c
 
diff --git a/MokManager.c b/MokManager.c
index 604129f..01362f2 100644
--- a/MokManager.c
+++ b/MokManager.c
@@ -6,6 +6,7 @@
 #include signature.h
 #include PeImage.h
 #include PasswordCrypt.h
+#include console_control.h
 
 #include include/console.h
 #include include/simple_file.h
@@ -1741,6 +1742,34 @@ static EFI_STATUS check_mok_request(EFI_HANDLE 
image_handle)
return EFI_SUCCESS;
 }
 
+static VOID setup_console (int text)
+{
+   EFI_STATUS status;
+   EFI_GUID console_control_guid = EFI_CONSOLE_CONTROL_PROTOCOL_GUID;
+   EFI_CONSOLE_CONTROL_PROTOCOL *concon;
+   static EFI_CONSOLE_CONTROL_SCREEN_MODE mode =
+   EfiConsoleControlScreenGraphics;
+   EFI_CONSOLE_CONTROL_SCREEN_MODE new_mode;
+
+   status = LibLocateProtocol(console_control_guid, (VOID **)concon);
+   if (status != EFI_SUCCESS)
+   return;
+
+   if (text) {
+   new_mode = EfiConsoleControlScreenText;
+
+

commit shim for openSUSE:13.1

2013-09-25 Thread h_root
Hello community,

here is the log from the commit of package shim for openSUSE:13.1 checked in at 
2013-09-25 17:20:29

Comparing /work/SRC/openSUSE:13.1/shim (Old)
 and  /work/SRC/openSUSE:13.1/.shim.new (New)


Package is shim

Changes:

--- /work/SRC/openSUSE:13.1/shim/shim.changes   2013-09-23 11:09:08.0 
+0200
+++ /work/SRC/openSUSE:13.1/.shim.new/shim.changes  2013-09-25 
17:20:35.0 +0200
@@ -1,0 +2,5 @@
+Wed Sep 25 07:17:54 UTC 2013 - g...@suse.com
+
+- Create boot.csv in ESP for fallback.efi to restore the boot entry
+
+---



Other differences:
--
++ shim-install ++
--- /var/tmp/diff_new_pack.nfTeCz/_old  2013-09-25 17:20:35.0 +0200
+++ /var/tmp/diff_new_pack.nfTeCz/_new  2013-09-25 17:20:35.0 +0200
@@ -180,6 +180,7 @@
 rm -f ${efidir}/MokManager.efi
 rm -f ${efidir}/grub.efi
 rm -f ${efidir}/grub.cfg
+rm -f ${efidir}/boot.csv
 efibootmgr=`which efibootmgr`
 if test $removable = no  test -n $bootloader_id  test -n 
$efibootmgr; then
 # Delete old entries from the same distributor.
@@ -194,6 +195,7 @@
 cp ${source_dir}/shim.efi ${efidir}
 cp ${source_dir}/MokManager.efi ${efidir}
 cp ${source_dir}/grub.efi ${efidir}
+echo shim.efi,${bootloader_id} | iconv -f ascii -t ucs2  
${efidir}/boot.csv
 
 grub_cfg_dirname=`dirname $grub_cfg`
 grub_cfg_basename=`basename $grub_cfg`

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org