From b7f837f9981a356898b6a523febd902ec009fe29f81ff0749487788de78d1fb0 Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <null@suse.de>
Date: Wed, 20 Apr 2011 11:35:48 +0000
Subject: [PATCH] Accepting request 67896 from security

Accepted submit request 67896 from user coolo

OBS-URL: https://build.opensuse.org/request/show/67896
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/keyutils?expand=0&rev=13
---
 keyutils-1.2-strict-aliasing-punning.patch | 13 -------------
 keyutils-1.3.tar.bz2                       |  3 ---
 keyutils-1.4.tar.bz2                       |  3 +++
 keyutils.changes                           | 12 ++++++++++++
 keyutils.spec                              |  7 +++----
 parallel-make.patch                        | 20 ++++++++++++++++++++
 6 files changed, 38 insertions(+), 20 deletions(-)
 delete mode 100644 keyutils-1.2-strict-aliasing-punning.patch
 delete mode 100644 keyutils-1.3.tar.bz2
 create mode 100644 keyutils-1.4.tar.bz2
 create mode 100644 parallel-make.patch

diff --git a/keyutils-1.2-strict-aliasing-punning.patch b/keyutils-1.2-strict-aliasing-punning.patch
deleted file mode 100644
index 0e2ca71..0000000
--- a/keyutils-1.2-strict-aliasing-punning.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: Makefile
-===================================================================
---- Makefile.orig	2006-08-22 18:40:00.000000000 +0200
-+++ Makefile	2008-11-12 01:04:22.000000000 +0100
-@@ -76,7 +76,7 @@ keyctl: keyctl.c keyutils.h Makefile
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L. -lkeyutils -Wl,-rpath,$(LIB)
- 
- request-key: request-key.c keyutils.h Makefile
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L. -lkeyutils -Wl,-rpath,$(LIB)
-+	$(CC) $(CFLAGS) -fno-strict-aliasing $(LDFLAGS) -o $@ $< -L. -lkeyutils -Wl,-rpath,$(LIB)
- 
- 
- MAN1	:= $(DESTDIR)/usr/share/man/man1
diff --git a/keyutils-1.3.tar.bz2 b/keyutils-1.3.tar.bz2
deleted file mode 100644
index b8044e0..0000000
--- a/keyutils-1.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6d7645b04f629deffae0532fe87b8c197b4bb5296eb99dffee0a301403abeffc
-size 38951
diff --git a/keyutils-1.4.tar.bz2 b/keyutils-1.4.tar.bz2
new file mode 100644
index 0000000..7db697b
--- /dev/null
+++ b/keyutils-1.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c3b143bbed5b242dab8bc733e494dbc37a132a5a64b7c658f2332f2cd4843ec6
+size 39016
diff --git a/keyutils.changes b/keyutils.changes
index a1c9795..305e2cf 100644
--- a/keyutils.changes
+++ b/keyutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Apr 19 13:45:30 CEST 2011 - meissner@suse.de
+
+- Upgraded to 1.4
+  - Fix the library naming wrt the version.
+  - Move the package to version to 1.4.
+  - Fix spelling mistakes in manpages.
+  - Add an index manpage for all the keyctl functions.
+  - Fix rpmlint warnings.
+- fixed parallel make
+- do not include empty rpaths
+
 -------------------------------------------------------------------
 Thu Mar 18 13:27:59 CET 2010 - meissner@suse.de
 
diff --git a/keyutils.spec b/keyutils.spec
index 8c655fb..10e28e6 100644
--- a/keyutils.spec
+++ b/keyutils.spec
@@ -24,12 +24,12 @@ License:        GPLv2+ ; LGPLv2.1+
 Group:          System/Kernel
 AutoReqProv:    on
 Summary:        Linux Key Management Utilities
-Version:        1.3
+Version:        1.4
 Release:        1
 Source0:        http://people.redhat.com/~dhowells/keyutils/%name-%version.tar.bz2
 Source1:        baselibs.conf
-Patch0:         keyutils-1.2-strict-aliasing-punning.patch
 Patch1:         request-key-cifs.patch
+Patch2:         parallel-make.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -75,8 +75,8 @@ Authors:
 
 %prep
 %setup -q
-%patch0
 %patch1
+%patch2 -p1
 
 %build
 make %{?jobs:-j%jobs} NO_ARLIB=1 CFLAGS="$RPM_OPT_FLAGS"
@@ -100,7 +100,6 @@ make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/%_lib USRLIBDIR=/usr/%_l
 %files libs
 %defattr(-,root,root,-)
 %doc LICENCE.LGPL
-/%{_lib}/libkeyutils-*.so
 /%{_lib}/libkeyutils.so.*
 
 %files devel
diff --git a/parallel-make.patch b/parallel-make.patch
new file mode 100644
index 0000000..8fc2f9f
--- /dev/null
+++ b/parallel-make.patch
@@ -0,0 +1,20 @@
+Index: keyutils-1.4/Makefile
+===================================================================
+--- keyutils-1.4.orig/Makefile
++++ keyutils-1.4/Makefile
+@@ -72,11 +72,11 @@ keyutils.os: keyutils.c keyutils.h Makef
+ 	$(CC) $(CFLAGS) -fPIC -o $@ -c $<
+ 
+ 
+-keyctl: keyctl.c keyutils.h Makefile
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L. -lkeyutils -Wl,-rpath,$(LIB)
++keyctl: keyctl.c keyutils.h Makefile $(DEVELLIB)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L. -lkeyutils
+ 
+-request-key: request-key.c keyutils.h Makefile
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L. -lkeyutils -Wl,-rpath,$(LIB)
++request-key: request-key.c keyutils.h Makefile $(DEVELLIB)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L. -lkeyutils
+ 
+ 
+ MAN1	:= $(DESTDIR)/usr/share/man/man1