diff --git a/keyutils-1.4.tar.bz2 b/keyutils-1.4.tar.bz2 deleted file mode 100644 index 7db697b..0000000 --- a/keyutils-1.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3b143bbed5b242dab8bc733e494dbc37a132a5a64b7c658f2332f2cd4843ec6 -size 39016 diff --git a/keyutils-1.5.3.tar.bz2 b/keyutils-1.5.3.tar.bz2 new file mode 100644 index 0000000..728f704 --- /dev/null +++ b/keyutils-1.5.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f99866cf0f65c97042c273dd9d8703ce230387619f56ef3ef87b481833ca5e55 +size 48763 diff --git a/keyutils.changes b/keyutils.changes index 35b0498..62237b7 100644 --- a/keyutils.changes +++ b/keyutils.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Thu Sep 22 18:05:05 CEST 2011 - meissner@suse.de + +- Updated to 1.5.3 + - Fix unread variables. + - Licence file update. + +- Updated to 1.5 + - Disable RPATH setting in Makefile. + - Add -I. to build to get this keyutils.h. + - Make CFLAGS override on make command line work right. + - Make specfile UTF-8. + - Support KEYCTL_REJECT. + - Support KEYCTL_INSTANTIATE_IOV. + - Add AFSDB DNS lookup program from Wang Lei. + - Generalise DNS lookup program. + - Add recursive scan utility function. + - Add bad key reap command to keyctl. + - Add multi-unlink variant to keyctl unlink command. + - Add multi key purger command to keyctl. + - Handle multi-line commands in keyctl command table. + - Move the package to version to 1.5. + +- Update to 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. + - Remove NO_GLIBC_KEYSYS as it is obsolete. + - Have Makefile extract version info from specfile and version script. + - Provide RPM build rule in Makefile. + - Provide distclean rule in Makefile. + - Fix local linking and RPATH. + - Fix prototypes in manual pages (some char* should be void*). + - Rename the keyctl_security.3 manpage to keyctl_get_security.3. + ------------------------------------------------------------------- Thu Sep 22 12:41:50 UTC 2011 - jengelh@medozas.de diff --git a/keyutils.spec b/keyutils.spec index 796760b..44c974e 100644 --- a/keyutils.spec +++ b/keyutils.spec @@ -19,12 +19,12 @@ Name: keyutils %define lname libkeyutils1 -URL: http://people.redhat.com/~dhowells/keyutils/ +Url: http://people.redhat.com/~dhowells/keyutils/ License: GPLv2+ ; LGPLv2.1+ Group: System/Kernel AutoReqProv: on Summary: Linux Key Management Utilities -Version: 1.4 +Version: 1.5.3 Release: 1 Source0: http://people.redhat.com/~dhowells/keyutils/%name-%version.tar.bz2 Source1: baselibs.conf @@ -57,8 +57,8 @@ This package provides headers and libraries for building key utilities. %prep %setup -q -%patch1 -%patch2 -p1 +%patch1 -p0 +%patch2 -p0 %build make %{?_smp_mflags} NO_ARLIB=1 CFLAGS="$RPM_OPT_FLAGS" diff --git a/parallel-make.patch b/parallel-make.patch index 8fc2f9f..29f5814 100644 --- a/parallel-make.patch +++ b/parallel-make.patch @@ -1,20 +1,21 @@ -Index: keyutils-1.4/Makefile +Index: 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 $< +--- Makefile.orig ++++ Makefile +@@ -125,13 +125,13 @@ keyutils.os: keyutils.c keyutils.h Makef + %.o: %.c keyutils.h Makefile + $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $< +-keyctl: keyctl.o -lkeyutils ++keyctl: keyctl.o $(DEVELLIB) + $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils --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.o -lkeyutils ++request-key: request-key.o $(DEVELLIB) + $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -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 +-key.dns_resolver: key.dns_resolver.o -lkeyutils ++key.dns_resolver: key.dns_resolver.o $(DEVELLIB) + $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils -lresolv - - MAN1 := $(DESTDIR)/usr/share/man/man1 + ############################################################################### diff --git a/request-key-cifs.patch b/request-key-cifs.patch index 630ad57..86a82eb 100644 --- a/request-key-cifs.patch +++ b/request-key-cifs.patch @@ -1,9 +1,10 @@ ---- request-key.conf +Index: request-key.conf +=================================================================== +--- request-key.conf.orig +++ request-key.conf -@@ -34,4 +34,6 @@ - create user debug:* negate /bin/keyctl negate %k 30 %S +@@ -38,4 +38,5 @@ create user debug:* expired + create user debug:* revoked /bin/keyctl reject %k 30 %c %S create user debug:loop:* * |/bin/cat create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S +create cifs.spnego * * /usr/sbin/cifs.upcall -c %k -+create dns_resolver * * /usr/sbin/cifs.upcall %k negate * * * /bin/keyctl negate %k 30 %S