Merge branch '3.2' into 3.3

2 files changed, 50 insertions, 50 deletions

diff --git a/keyutils/.footprint b/keyutils/.footprint
index 82fc90214..1531edae3 100644
--- a/keyutils/.footprint
+++ b/keyutils/.footprint
@@ -15,54 +15,54 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libkeyutils.a
 lrwxrwxrwx	root/root	usr/lib/libkeyutils.so -> /lib/libkeyutils.so.1
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/keyctl.1.gz
-drwxr-xr-x	root/root	usr/man/man3/
--rw-r--r--	root/root	usr/man/man3/find_key_by_type_and_name.3.gz
--rw-r--r--	root/root	usr/man/man3/keyctl.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/keyctl_assume_authority.3.gz -> keyctl_instantiate.3.gz
--rw-r--r--	root/root	usr/man/man3/keyctl_chown.3.gz
--rw-r--r--	root/root	usr/man/man3/keyctl_clear.3.gz
--rw-r--r--	root/root	usr/man/man3/keyctl_describe.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/keyctl_describe_alloc.3.gz -> keyctl_describe.3.gz
--rw-r--r--	root/root	usr/man/man3/keyctl_get_keyring_ID.3.gz
--rw-r--r--	root/root	usr/man/man3/keyctl_get_persistent.3.gz
--rw-r--r--	root/root	usr/man/man3/keyctl_get_security.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/keyctl_get_security_alloc.3.gz -> keyctl_get_security.3.gz
--rw-r--r--	root/root	usr/man/man3/keyctl_instantiate.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/keyctl_instantiate_iov.3.gz -> keyctl_instantiate.3.gz
--rw-r--r--	root/root	usr/man/man3/keyctl_invalidate.3.gz
--rw-r--r--	root/root	usr/man/man3/keyctl_join_session_keyring.3.gz
--rw-r--r--	root/root	usr/man/man3/keyctl_link.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/keyctl_negate.3.gz -> keyctl_instantiate.3.gz
--rw-r--r--	root/root	usr/man/man3/keyctl_read.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/keyctl_read_alloc.3.gz -> keyctl_read.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/keyctl_reject.3.gz -> keyctl_instantiate.3.gz
--rw-r--r--	root/root	usr/man/man3/keyctl_revoke.3.gz
--rw-r--r--	root/root	usr/man/man3/keyctl_search.3.gz
--rw-r--r--	root/root	usr/man/man3/keyctl_session_to_parent.3.gz
--rw-r--r--	root/root	usr/man/man3/keyctl_set_reqkey_keyring.3.gz
--rw-r--r--	root/root	usr/man/man3/keyctl_set_timeout.3.gz
--rw-r--r--	root/root	usr/man/man3/keyctl_setperm.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/keyctl_unlink.3.gz -> keyctl_link.3.gz
--rw-r--r--	root/root	usr/man/man3/keyctl_update.3.gz
--rw-r--r--	root/root	usr/man/man3/recursive_key_scan.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/recursive_session_key_scan.3.gz -> recursive_key_scan.3.gz
-drwxr-xr-x	root/root	usr/man/man5/
--rw-r--r--	root/root	usr/man/man5/request-key.conf.5.gz
-drwxr-xr-x	root/root	usr/man/man7/
--rw-r--r--	root/root	usr/man/man7/keyrings.7.gz
--rw-r--r--	root/root	usr/man/man7/keyutils.7.gz
--rw-r--r--	root/root	usr/man/man7/persistent-keyring.7.gz
--rw-r--r--	root/root	usr/man/man7/process-keyring.7.gz
--rw-r--r--	root/root	usr/man/man7/session-keyring.7.gz
--rw-r--r--	root/root	usr/man/man7/thread-keyring.7.gz
--rw-r--r--	root/root	usr/man/man7/user-keyring.7.gz
--rw-r--r--	root/root	usr/man/man7/user-session-keyring.7.gz
-drwxr-xr-x	root/root	usr/man/man8/
--rw-r--r--	root/root	usr/man/man8/key.dns_resolver.8.gz
--rw-r--r--	root/root	usr/man/man8/request-key.8.gz
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/keyutils/
 -rwxr-xr-x	root/root	usr/share/keyutils/request-key-debug.sh
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/keyctl.1.gz
+drwxr-xr-x	root/root	usr/share/man/man3/
+-rw-r--r--	root/root	usr/share/man/man3/find_key_by_type_and_name.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/keyctl.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/keyctl_assume_authority.3.gz -> keyctl_instantiate.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/keyctl_chown.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/keyctl_clear.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/keyctl_describe.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/keyctl_describe_alloc.3.gz -> keyctl_describe.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/keyctl_get_keyring_ID.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/keyctl_get_persistent.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/keyctl_get_security.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/keyctl_get_security_alloc.3.gz -> keyctl_get_security.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/keyctl_instantiate.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/keyctl_instantiate_iov.3.gz -> keyctl_instantiate.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/keyctl_invalidate.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/keyctl_join_session_keyring.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/keyctl_link.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/keyctl_negate.3.gz -> keyctl_instantiate.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/keyctl_read.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/keyctl_read_alloc.3.gz -> keyctl_read.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/keyctl_reject.3.gz -> keyctl_instantiate.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/keyctl_revoke.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/keyctl_search.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/keyctl_session_to_parent.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/keyctl_set_reqkey_keyring.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/keyctl_set_timeout.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/keyctl_setperm.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/keyctl_unlink.3.gz -> keyctl_link.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/keyctl_update.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/recursive_key_scan.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/recursive_session_key_scan.3.gz -> recursive_key_scan.3.gz
+drwxr-xr-x	root/root	usr/share/man/man5/
+-rw-r--r--	root/root	usr/share/man/man5/request-key.conf.5.gz
+drwxr-xr-x	root/root	usr/share/man/man7/
+-rw-r--r--	root/root	usr/share/man/man7/keyrings.7.gz
+-rw-r--r--	root/root	usr/share/man/man7/keyutils.7.gz
+-rw-r--r--	root/root	usr/share/man/man7/persistent-keyring.7.gz
+-rw-r--r--	root/root	usr/share/man/man7/process-keyring.7.gz
+-rw-r--r--	root/root	usr/share/man/man7/session-keyring.7.gz
+-rw-r--r--	root/root	usr/share/man/man7/thread-keyring.7.gz
+-rw-r--r--	root/root	usr/share/man/man7/user-keyring.7.gz
+-rw-r--r--	root/root	usr/share/man/man7/user-session-keyring.7.gz
+drwxr-xr-x	root/root	usr/share/man/man8/
+-rw-r--r--	root/root	usr/share/man/man8/key.dns_resolver.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/request-key.8.gz
diff --git a/keyutils/Pkgfile b/keyutils/Pkgfile
index b66c3bd74..244664b05 100644
--- a/keyutils/Pkgfile
+++ b/keyutils/Pkgfile
@@ -4,12 +4,12 @@
 
 name=keyutils
 version=1.5.9
-release=1
+release=2
 source=(http://people.redhat.com/~dhowells/$name/$name-$version.tar.bz2)
 
 build () {
     cd $name-$version
     sed -i "/^CFLAGS/s/-g/$CFLAGS/" Makefile
     make
-    make install DESTDIR=$PKG MANDIR=/usr/man USRLIBDIR=/usr/lib LIBDIR=/lib
+    make install DESTDIR=$PKG USRLIBDIR=/usr/lib LIBDIR=/lib
 }