Accepting request 86932 from security
- cross-build fix: use %__cc macro (forwarded request 86726 from uli_suse) OBS-URL: https://build.opensuse.org/request/show/86932 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/keyutils?expand=0&rev=15
This commit is contained in:
Lars Vogdt
Git OBS Bridge
commit
6fdb1f6288
@ -1 +1,5 @@
|
||||
keyutils-libs
|
||||
# Change from "<=" to "<" on 1.5
|
||||
libkeyutils1
|
||||
obsoletes "keyutils-libs <= <version>"
|
||||
provides "keyutils-libs = <version>"
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c3b143bbed5b242dab8bc733e494dbc37a132a5a64b7c658f2332f2cd4843ec6
|
||||
size 39016
|
||||
3
keyutils-1.5.3.tar.bz2
Normal file
3
keyutils-1.5.3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f99866cf0f65c97042c273dd9d8703ce230387619f56ef3ef87b481833ca5e55
|
||||
size 48763
|
||||
@ -1,3 +1,49 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 5 15:04:53 UTC 2011 - uli@suse.com
|
||||
|
||||
- cross-build fix: use %__cc macro
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- Implement shlib package (libkeyutils1)
|
||||
- Cleanup per Specfile Guidelines
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 19 13:45:30 CEST 2011 - meissner@suse.de
|
||||
|
||||
|
||||
@ -15,16 +15,16 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
Name: keyutils
|
||||
%define lname libkeyutils1
|
||||
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
|
||||
@ -37,56 +37,38 @@ Utilities to control the kernel key management facility and to provide
|
||||
a mechanism by which the kernel can call back to user space to get a
|
||||
key instantiated.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
David Howells <dhowells@redhat.com>
|
||||
|
||||
%package libs
|
||||
License: GPLv2+ ; LGPLv2.1+
|
||||
%package -n %lname
|
||||
Summary: Key utilities library
|
||||
Group: System/Kernel
|
||||
Obsoletes: keyutils-libs < %version-%release
|
||||
Provides: keyutils-libs = %version-%release
|
||||
|
||||
%description libs
|
||||
%description -n %lname
|
||||
This package provides a wrapper library for the key management facility
|
||||
system calls.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
David Howells <dhowells@redhat.com>
|
||||
|
||||
%package devel
|
||||
License: GPLv2+ ; LGPLv2.1+
|
||||
Summary: Development package for building linux key management utilities
|
||||
Group: System/Kernel
|
||||
Requires: %{name}-libs = %{version} glibc-devel
|
||||
Requires: %lname = %version, glibc-devel
|
||||
|
||||
%description devel
|
||||
This package provides headers and libraries for building key utilities.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
David Howells <dhowells@redhat.com>
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
%patch1 -p0
|
||||
%patch2 -p0
|
||||
|
||||
%build
|
||||
make %{?jobs:-j%jobs} NO_ARLIB=1 CFLAGS="$RPM_OPT_FLAGS"
|
||||
make %{?_smp_mflags} NO_ARLIB=1 CFLAGS="$RPM_OPT_FLAGS" CC="%__cc"
|
||||
|
||||
%install
|
||||
make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/%_lib USRLIBDIR=/usr/%_lib
|
||||
|
||||
%post libs -p /sbin/ldconfig
|
||||
%post -n %lname -p /sbin/ldconfig
|
||||
|
||||
%postun libs -p /sbin/ldconfig
|
||||
%postun -n %lname -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
@ -97,7 +79,7 @@ make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/%_lib USRLIBDIR=/usr/%_l
|
||||
%{_mandir}/*/*
|
||||
%config(noreplace) /etc/*
|
||||
|
||||
%files libs
|
||||
%files -n %lname
|
||||
%defattr(-,root,root,-)
|
||||
%doc LICENCE.LGPL
|
||||
/%{_lib}/libkeyutils.so.*
|
||||
|
||||
@ -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
|
||||
###############################################################################
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user