Hello community, here is the log from the commit of package mokutil for openSUSE:Factory checked in at 2013-01-30 11:17:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mokutil (Old) and /work/SRC/openSUSE:Factory/.mokutil.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mokutil", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/mokutil/mokutil.changes 2013-01-20 14:40:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mokutil.new/mokutil.changes 2013-01-30 11:17:27.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Jan 30 08:00:22 UTC 2013 - [email protected] + +- 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 + +------------------------------------------------------------------- New: ---- mokutil-lcrypt-ldflag.patch mokutil-support-crypt-hash-methods.patch mokutil-update-man-page.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mokutil.spec ++++++ --- /var/tmp/diff_new_pack.PvY0VR/_old 2013-01-30 11:17:28.000000000 +0100 +++ /var/tmp/diff_new_pack.PvY0VR/_new 2013-01-30 11:17:28.000000000 +0100 @@ -34,6 +34,14 @@ Patch4: mokutil-support-delete-keys.patch # PATCH-FIX-UPSTREAM mokutil-support-new-pw-hash.patch [email protected] -- Support the new password hash format Patch5: mokutil-support-new-pw-hash.patch +# PATCH-FIX-UPSTREAM mokutil-support-crypt-hash-methods.patch [email protected] -- Support the hash methods used for /etc/shadow +Patch6: mokutil-support-crypt-hash-methods.patch +# PATCH-FIX-UPSTREAM mokutil-update-man-page.patch [email protected] -- Update man page +Patch7: mokutil-update-man-page.patch +# PATCH-FIX-UPSTREAM mokutil-lcrypt-ldflag.patch [email protected] -- 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 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build +autoreconf -i -f %configure make ++++++ mokutil-lcrypt-ldflag.patch ++++++ >From aa48dc644fbf775970d01a368c532d0668015f18 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin <[email protected]> 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-support-crypt-hash-methods.patch ++++++ ++++ 1911 lines (skipped) ++++++ mokutil-update-man-page.patch ++++++ >From 53a40965390cfa3b99d636874c6b9d968380f312 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin <[email protected]> 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
