[keyutils] Version 1.5.4

[David Howells]

commit 61cc7351b5f4336dfb6e9222d4b1873e38f012a0
Author: David Howells <dhowells at redhat.com>
Date:   Wed Nov 30 15:17:05 2011 +0000

    Version 1.5.4
    
    - Fix the keyctl padd command and similar to handle binary input.
    - Make keyctl show able to take a keyring to dump.
    - Make keyctl show able to take a flag to request hex key IDs.
    - Make keyctl show print the real ID of the root keyring.
    - Allow /sbin/request-key to have multiple config files.
    - Adjust the manual page for 'keyctl unlink' to show keyring is optional.
    - Add --version support for the keyutils version and build date.

 .gitignore    |    1 +
 keyutils.spec |   39 +++++++++++++++++++++++++++++----------
 sources       |    2 +-
 3 files changed, 31 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9cb65b7..4f9edae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ keyutils-1.2.tar.bz2
 keyutils-1.5.tar.bz2
 /keyutils-1.5.1.tar.bz2
 /keyutils-1.5.2.tar.bz2
+/keyutils-1.5.4.tar.bz2
diff --git a/keyutils.spec b/keyutils.spec
index 1a18a2e..7a13bbb 100644
--- a/keyutils.spec
+++ b/keyutils.spec
@@ -1,15 +1,17 @@
 %define vermajor 1
-%define verminor 5.2
+%define verminor 5.4
 %define version %{vermajor}.%{verminor}
 %define libdir /%{_lib}
 %define usrlibdir %{_prefix}/%{_lib}
 %define libapivermajor 1
 %define libapiversion %{libapivermajor}.4
 
+# % define buildid .local
+
 Summary: Linux Key Management Utilities
 Name: keyutils
 Version: %{version}
-Release: 1%{?dist}
+Release: 1%{?dist}%{?buildid}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 ExclusiveOS: Linux
@@ -19,6 +21,7 @@ Source0: http://people.redhat.com/~dhowells/keyutils/keyutils-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glibc-kernheaders >= 2.4-9.1.92
+Requires: keyutils-libs == %{version}-%{release}
 
 %description
 Utilities to control the kernel key management facility and to provide
@@ -92,14 +95,30 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
-* Tue Jul 26 2011 David Howells  <dhowells at redhat.com> - 1.5.2-1
+* Tue Nov 30 2011 David Howells <dhowells at redhat.com> - 1.5.4-1
+- Fix the keyctl padd command and similar to handle binary input.
+- Make keyctl show able to take a keyring to dump.
+- Make keyctl show able to take a flag to request hex key IDs.
+- Make keyctl show print the real ID of the root keyring.
+
+* Tue Nov 15 2011 David Howells <dhowells at redhat.com>
+- Allow /sbin/request-key to have multiple config files.
+
+* Wed Aug 14 2011 David Howells <dhowells at redhat.com>
+- Adjust the manual page for 'keyctl unlink' to show keyring is optional.
+- Add --version support for the keyutils version and build date.
+
+* Thu Aug 11 2011 David Howells <dhowells at redhat.com> - 1.5.3-1
+- Make the keyutils rpm depend on the same keyutils-libs rpm version.
+
+* Tue Jul 26 2011 David Howells <dhowells at redhat.com> - 1.5.2-1
 - Use correct format spec for printing pointer subtraction results.
 
-* Tue Jul 19 2011 David Howells  <dhowells at redhat.com> - 1.5.1-1
+* Tue Jul 19 2011 David Howells <dhowells at redhat.com> - 1.5.1-1
 - Fix unread variables.
 - Licence file update.
 
-* Thu Mar 10 2011 David Howells  <dhowells at redhat.com> - 1.5-1
+* Thu Mar 10 2011 David Howells <dhowells at redhat.com> - 1.5-1
 - Disable RPATH setting in Makefile.
 - Add -I. to build to get this keyutils.h.
 - Make CFLAGS override on make command line work right.
@@ -115,7 +134,7 @@ rm -rf $RPM_BUILD_ROOT
 - Handle multi-line commands in keyctl command table.
 - Move the package to version to 1.5.
 
-* Tue Mar 1 2011 David Howells  <dhowells at redhat.com> - 1.4-4
+* Tue Mar 1 2011 David Howells <dhowells at redhat.com> - 1.4-4
 - Make build guess at default libdirs and word size.
 - Make program build depend on library in Makefile.
 - Don't include $(DESTDIR) in MAN* macros.
@@ -127,19 +146,19 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Dec 17 2010 Diego Elio Pettenò <flameeyes at hosting.flameeyes.eu> - 1.4-3
 - Fix local linking and RPATH.
 
-* Thu Jun 10 2010 David Howells  <dhowells at redhat.com> - 1.4-2
+* Thu Jun 10 2010 David Howells <dhowells at redhat.com> - 1.4-2
 - Fix prototypes in manual pages (some char* should be void*).
 - Rename the keyctl_security.3 manpage to keyctl_get_security.3.
 
-* Fri Mar 19 2010 David Howells  <dhowells at redhat.com> - 1.4-1
+* Fri Mar 19 2010 David Howells <dhowells at redhat.com> - 1.4-1
 - Fix the library naming wrt the version.
 - Move the package to version to 1.4.
 
-* Fri Mar 19 2010 David Howells  <dhowells at redhat.com> - 1.3-3
+* Fri Mar 19 2010 David Howells <dhowells at redhat.com> - 1.3-3
 - Fix spelling mistakes in manpages.
 - Add an index manpage for all the keyctl functions.
 
-* Thu Mar 11 2010 David Howells  <dhowells at redhat.com> - 1.3-2
+* Thu Mar 11 2010 David Howells <dhowells at redhat.com> - 1.3-2
 - Fix rpmlint warnings.
 
 * Fri Feb 26 2010 David Howells <dhowells at redhat.com> - 1.3-1
diff --git a/sources b/sources
index 3a28e8c..d6b4c29 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-19811ee31f683058a9aae3e6a3a23a7f  keyutils-1.5.2.tar.bz2
+2f6ae44171c40b901b907a016f3ec7d1  keyutils-1.5.4.tar.bz2