From ead00d630697f9a376ea86e6632e6b1a66b5b1ba2dc772f93fc298a4c7a80f52 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 4 Jan 2021 11:40:47 +0000 Subject: [PATCH 1/2] Accepting request 860137 from home:dirkmueller:branches:security - update to 1.6.3: * Revert the change notifications that were using /dev/watch_queue. * Apply the change notifications that use pipe2(O_NOTIFICATION_PIPE). * Allow "keyctl supports" to retrieve raw capability data. * Allow "keyctl id" to turn a symbolic key ID into a numeric ID. * Allow "keyctl new_session" to name the keyring. * Allow "keyctl add/padd/etc." to take hex-encoded data. * Add "keyctl watch*" to expose kernel change notifications on keys. * Add caps for namespacing and notifications. * Set a default TTL on keys that upcall for name resolution. * Explicitly clear memory after it's held sensitive information. * Various manual page fixes. * Fix C++-related errors. * Add support for keyctl_move(). * Add support for keyctl_capabilities(). * Make key=val list optional for various public-key ops. * Fix system call signature for KEYCTL_PKEY_QUERY. * Fix 'keyctl pkey_query' argument passing. * Use keyctl_read_alloc() in dump_key_tree_aux(). * Various manual page fixes. - spec-cleaner run (fixup failing homepage url) OBS-URL: https://build.opensuse.org/request/show/860137 OBS-URL: https://build.opensuse.org/package/show/security/keyutils?expand=0&rev=53 --- keyutils-1.6.3.tar.gz | 3 +++ keyutils-1.6.tar.bz2 | 3 --- keyutils.changes | 25 +++++++++++++++++++++++++ keyutils.spec | 41 +++++++++++++++++++---------------------- 4 files changed, 47 insertions(+), 25 deletions(-) create mode 100644 keyutils-1.6.3.tar.gz delete mode 100644 keyutils-1.6.tar.bz2 diff --git a/keyutils-1.6.3.tar.gz b/keyutils-1.6.3.tar.gz new file mode 100644 index 0000000..4e9b42a --- /dev/null +++ b/keyutils-1.6.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a61d5706136ae4c05bd48f86186bcfdbd88dd8bd5107e3e195c924cfc1b39bb4 +size 137022 diff --git a/keyutils-1.6.tar.bz2 b/keyutils-1.6.tar.bz2 deleted file mode 100644 index 0925854..0000000 --- a/keyutils-1.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3aef20cec0005c0fa6b4be40079885567473185b1a57b629b030e67942c7115 -size 93973 diff --git a/keyutils.changes b/keyutils.changes index f2c1a05..a325d09 100644 --- a/keyutils.changes +++ b/keyutils.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Mon Jan 4 10:50:03 UTC 2021 - Dirk Müller + +- update to 1.6.3: + * Revert the change notifications that were using /dev/watch_queue. + * Apply the change notifications that use pipe2(O_NOTIFICATION_PIPE). + * Allow "keyctl supports" to retrieve raw capability data. + * Allow "keyctl id" to turn a symbolic key ID into a numeric ID. + * Allow "keyctl new_session" to name the keyring. + * Allow "keyctl add/padd/etc." to take hex-encoded data. + * Add "keyctl watch*" to expose kernel change notifications on keys. + * Add caps for namespacing and notifications. + * Set a default TTL on keys that upcall for name resolution. + * Explicitly clear memory after it's held sensitive information. + * Various manual page fixes. + * Fix C++-related errors. + * Add support for keyctl_move(). + * Add support for keyctl_capabilities(). + * Make key=val list optional for various public-key ops. + * Fix system call signature for KEYCTL_PKEY_QUERY. + * Fix 'keyctl pkey_query' argument passing. + * Use keyctl_read_alloc() in dump_key_tree_aux(). + * Various manual page fixes. +- spec-cleaner run (fixup failing homepage url) + ------------------------------------------------------------------- Fri Oct 16 09:59:07 UTC 2020 - Ludwig Nussel diff --git a/keyutils.spec b/keyutils.spec index 20e0dcf..b348e10 100644 --- a/keyutils.spec +++ b/keyutils.spec @@ -1,7 +1,7 @@ # # spec file for package keyutils # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,43 +16,44 @@ # -Name: keyutils %define lname libkeyutils1 -URL: http://people.redhat.com/~dhowells/keyutils/ +Name: keyutils +Version: 1.6.3 +Release: 0 Summary: Linux Key Management Utilities License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Kernel -Version: 1.6 -Release: 0 -Source0: https://people.redhat.com/~dhowells/keyutils/%name-%version.tar.bz2 +URL: https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/ +Source0: https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-%{version}.tar.gz Source1: baselibs.conf -Source3: %name.keyring +Source3: %{name}.keyring Patch1: request-key-cifs.patch Patch2: request-key-nfs4.patch Patch3: keyutils-nodate.patch Patch4: keyutils-usr-move.patch +BuildRequires: gcc-c++ +BuildRequires: pkgconfig BuildRequires: pkgconfig(krb5) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description 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. -%package -n %lname +%package -n %{lname} Summary: Key utilities library Group: System/Kernel -Obsoletes: keyutils-libs < %version-%release -Provides: keyutils-libs = %version-%release +Obsoletes: keyutils-libs < %{version}-%{release} +Provides: keyutils-libs = %{version}-%{release} -%description -n %lname +%description -n %{lname} This package provides a wrapper library for the key management facility system calls. %package devel Summary: Development package for building linux key management utilities Group: System/Kernel -Requires: %lname = %version +Requires: %{lname} = %{version} Requires: glibc-devel %description devel @@ -60,13 +61,13 @@ This package provides headers and libraries for building key utilities. %prep %setup -q -%patch1 -p0 +%patch1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %build -make %{?_smp_mflags} NO_ARLIB=1 CFLAGS="%{optflags}" CC="%__cc" +%make_build NO_ARLIB=1 CFLAGS="%{optflags}" CC="gcc" %install make install NO_ARLIB=1 DESTDIR=%{buildroot} BINDIR=/%{_bindir} SBINDIR=/%{_sbindir} LIBDIR=/%{_libdir} USRLIBDIR=%{_libdir} @@ -77,12 +78,10 @@ ln -s /%{_sbindir}/key.dns_resolver %{buildroot}/sbin ln -s /%{_sbindir}/request-key %{buildroot}/sbin %endif -%post -n %lname -p /sbin/ldconfig - -%postun -n %lname -p /sbin/ldconfig +%post -n %{lname} -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig %files -%defattr(-,root,root,-) %license LICENCE.GPL %doc README %if !0%{?usrmerged} @@ -96,13 +95,11 @@ ln -s /%{_sbindir}/request-key %{buildroot}/sbin %config(noreplace) %{_sysconfdir}/request-key.conf %dir %{_sysconfdir}/request-key.d/ -%files -n %lname -%defattr(-,root,root,-) +%files -n %{lname} %license LICENCE.LGPL /%{_libdir}/libkeyutils.so.* %files devel -%defattr(-,root,root,-) %{_libdir}/libkeyutils.so %{_includedir}/* %attr(0644, root, root) %{_libdir}/pkgconfig/libkeyutils.pc From 7c0c889ec44addbc05ddb563c535a889f33d1d6230a6b1a51dfa75e2dbf74a45 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 6 Jan 2021 10:27:43 +0000 Subject: [PATCH 2/2] - the license of the library and -devel package is LGPL only, the tools are GPL. OBS-URL: https://build.opensuse.org/package/show/security/keyutils?expand=0&rev=54 --- keyutils.changes | 6 ++++++ keyutils.spec | 2 ++ 2 files changed, 8 insertions(+) diff --git a/keyutils.changes b/keyutils.changes index a325d09..2eb3abf 100644 --- a/keyutils.changes +++ b/keyutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 6 10:27:14 UTC 2021 - Marcus Meissner + +- the license of the library and -devel package is LGPL only, the + tools are GPL. + ------------------------------------------------------------------- Mon Jan 4 10:50:03 UTC 2021 - Dirk Müller diff --git a/keyutils.spec b/keyutils.spec index b348e10..0e59541 100644 --- a/keyutils.spec +++ b/keyutils.spec @@ -42,6 +42,7 @@ key instantiated. %package -n %{lname} Summary: Key utilities library +License: LGPL-2.1-or-later Group: System/Kernel Obsoletes: keyutils-libs < %{version}-%{release} Provides: keyutils-libs = %{version}-%{release} @@ -52,6 +53,7 @@ system calls. %package devel Summary: Development package for building linux key management utilities +License: LGPL-2.1-or-later Group: System/Kernel Requires: %{lname} = %{version} Requires: glibc-devel