Accepting request 150401 from Base:System

- Merge patches for FATE#314506
  + Add mokutil-support-crypt-hash-methods.patch to support the
    password hashes from /etc/shadow
  + Add mokutil-update-man-page.patch to update man page for the
    new added options
- Add mokutil-lcrypt-ldflag.patch to correct LDFLAGS (forwarded request 150393 from gary_lin)

OBS-URL: https://build.opensuse.org/request/show/150401
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mokutil?expand=0&rev=4

mokutil-lcrypt-ldflag.patch

@@ -0,0 +1,29 @@
+From aa48dc644fbf775970d01a368c532d0668015f18 Mon Sep 17 00:00:00 2001
+From: Gary Ching-Pang Lin <glin@suse.com>
+Date: Wed, 30 Jan 2013 16:30:23 +0800
+Subject: [PATCH] Include lcrypt in LDFLAGS
+
+---
+ src/Makefile.am |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index afe1752..de7ddca 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,10 +1,10 @@
+ bin_PROGRAMS    = mokutil
+ 
+ mokutil_CFLAGS  = $(OPENSSL_CFLAGS) \
+-		  -lcrypt \
+ 		  $(WARNINGFLAGS_C)
+ 
+-mokutil_LDADD   = $(OPENSSL_LIBS)
++mokutil_LDADD   = $(OPENSSL_LIBS) \
++		  -lcrypt
+ 
+ mokutil_SOURCES = efi.h \
+ 		  efilib.c \
+-- 
+1.7.10.4
+

mokutil-update-man-page.patch

@@ -0,0 +1,124 @@
+From 53a40965390cfa3b99d636874c6b9d968380f312 Mon Sep 17 00:00:00 2001
+From: Gary Ching-Pang Lin <glin@suse.com>
+Date: Wed, 30 Jan 2013 14:16:16 +0800
+Subject: [PATCH] Update man page
+
+---
+ man/mokutil.1 |   59 +++++++++++++++++++++++++++++++++++++++++----------------
+ 1 file changed, 43 insertions(+), 16 deletions(-)
+
+diff --git a/man/mokutil.1 b/man/mokutil.1
+index 7a70d3e..fabd7a9 100644
+--- a/man/mokutil.1
++++ b/man/mokutil.1
+@@ -1,27 +1,41 @@
+-.TH MOKUTIL 1 "Wed Nov 07 2012"
++.TH MOKUTIL 1 "Wed Jan 30 2013"
+ .SH NAME
+ 
+ mokutil \- utility to manipulate machine owner keys
+ 
+ .SH SYNOPSIS
+-\fBmokutil\fR [--list-enrolled | -le]
++\fBmokutil\fR [--list-enrolled]
+ .br
+-\fBmokutil\fR [--list-new | -ln]
++\fBmokutil\fR [--list-new]
+ .br
+-\fBmokutil\fR [--import | -i] ...
++\fBmokutil\fR [--import \fIkeylist\fR| -i \fIkeylist\fR]
++        ([--hash-file \fIhashfile\fR | -f \fIhashfile\fR] | [--root-pw | -P])
+ .br
+-\fBmokutil\fR [--delete-all | -D]
++\fBmokutil\fR [--delete \fIkeylist\fR | -d \fIkeylist\fR]
++        ([--hash-file \fIhashfile\fR | -f \fIhashfile\fR] | [--root-pw | -P])
+ .br
+-\fBmokutil\fR [--revoke | -r]
++\fBmokutil\fR [--revoke-import]
++.br
++\fBmokutil\fR [--revoke-delete]
+ .br
+ \fBmokutil\fR [--export | -x]
+ .br
+ \fBmokutil\fR [--password | -p]
++        ([--hash-file \fIhashfile\fR | -f \fIhashfile\fR] | [--root-pw | -P])
+ .br
+ \fBmokutil\fR [--disable-validation]
+ .br
+ \fBmokutil\fR [--enable-validation]
+ .br
++\fBmokutil\fR [--sb-state]
++.br
++\fBmokutil\fR [--test-key | -t] ...
++.br
++\fBmokutil\fR [--reset]
++        ([--hash-file \fIhashfile\fR | -f \fIhashfile\fR] | [--root-pw | -P])
++.br
++\fBmokutil\fR [--generate-hash=\fIpassword\fR | -g\fIpassword\fR]
++.br
+ 
+ .SH DESCRIPTION
+ \fBmokutil\fR is a tool to import or delete the machines owner keys
+@@ -31,36 +45,49 @@ mokutil \- utility to manipulate machine owner keys
+ .TP
+ \fB--list-enrolled\fR
+ List the keys the already stored in the database
+-
+ .TP
+ \fB--list-new\fR
+ List the keys to be enrolled
+-
+ .TP
+ \fB--import\fR
+ Collect the followed files and form a request to shim. The files must be in DER
+ format.
+-
+ .TP
+ \fB--delete-all\fR
+ Request shim to delete all stored keys
+-
+ .TP
+-\fB--revoke\fR
+-Revoke the current request
+-
++\fB--revoke-import\fR
++Revoke the current import request (MokNew)
++.TP
++\fB--revoke-delete\fR
++Revoke the current delete request (MokDel)
+ .TP
+ \fB--export\fR
+ Export the keys stored in MokListRT
+-
+ .TP
+ \fB--password\fR
+ Setup the password for MokManager
+-
+ .TP
+ \fB--disable-validation\fR
+ Disable the validation process in shim
+-
+ .TP
+ \fB--enrolled-validation\fR
+ Enable the validation process in shim
++.TP
++\fB--sb-state\fR
++Show SecureBoot State
++.TP
++\fB--test-key\fR
++Test if the key is enrolled or not
++.TP
++\fB--reset\fR
++Reset MOK list
++.TP
++\fB--generate-hash\fR
++Generate the password hash
++.TP
++\fB--hash-file\fR
++Use the password hash from a specific file
++.TP
++\fB--root-pw\fR
++Use the root password hash from /etc/shadow
+-- 
+1.7.10.4
+

mokutil.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jan 30 08:00:22 UTC 2013 - glin@suse.com
+
+- Merge patches for FATE#314506
+  + Add mokutil-support-crypt-hash-methods.patch to support the
+    password hashes from /etc/shadow
+  + Add mokutil-update-man-page.patch to update man page for the
+    new added options
+- Add mokutil-lcrypt-ldflag.patch to correct LDFLAGS
+
 -------------------------------------------------------------------
 Fri Jan 18 10:05:27 UTC 2013 - glin@suse.com
 

mokutil.spec

@@ -34,6 +34,14 @@ Patch3:         mokutil-allow-password-from-pipe.patch
 Patch4:         mokutil-support-delete-keys.patch
 # PATCH-FIX-UPSTREAM mokutil-support-new-pw-hash.patch glin@suse.com -- Support the new password hash format
 Patch5:         mokutil-support-new-pw-hash.patch
+# PATCH-FIX-UPSTREAM mokutil-support-crypt-hash-methods.patch glin@suse.com -- Support the hash methods used for /etc/shadow
+Patch6:         mokutil-support-crypt-hash-methods.patch
+# PATCH-FIX-UPSTREAM mokutil-update-man-page.patch glin@suse.com -- Update man page
+Patch7:         mokutil-update-man-page.patch
+# PATCH-FIX-UPSTREAM mokutil-lcrypt-ldflag.patch glin@suse.com -- Add -lcrpyt correctly
+Patch8:         mokutil-lcrypt-ldflag.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  libopenssl-devel >= 0.9.8
 BuildRequires:  pkg-config
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -56,8 +64,12 @@ Authors:
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
+autoreconf -i -f
 %configure
 make