From eac8f3e108e0230f658f6c1f6c9e6676ddb8a384 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 24 Sep 2018 11:57:18 +0200 Subject: [PATCH] Update to 0.9 release --- .gitignore | 1 + keyctl.h | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++ libell.spec | 10 ++++++++- sources | 2 +- 4 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 keyctl.h diff --git a/.gitignore b/.gitignore index 11d9971..799df2a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /ell-0.2.tar.xz /ell-0.5.tar.xz /ell-0.8.tar.xz +/ell-0.9.tar.xz diff --git a/keyctl.h b/keyctl.h new file mode 100644 index 0000000..840cb99 --- /dev/null +++ b/keyctl.h @@ -0,0 +1,61 @@ +/* keyctl.h: keyctl command IDs + * + * Copyright (C) 2004, 2008 Red Hat, Inc. All Rights Reserved. + * Written by David Howells (dhowells@redhat.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + */ + +#ifndef _LINUX_KEYCTL_H +#define _LINUX_KEYCTL_H + +/* special process keyring shortcut IDs */ +#define KEY_SPEC_THREAD_KEYRING -1 /* - key ID for thread-specific keyring */ +#define KEY_SPEC_PROCESS_KEYRING -2 /* - key ID for process-specific keyring */ +#define KEY_SPEC_SESSION_KEYRING -3 /* - key ID for session-specific keyring */ +#define KEY_SPEC_USER_KEYRING -4 /* - key ID for UID-specific keyring */ +#define KEY_SPEC_USER_SESSION_KEYRING -5 /* - key ID for UID-session keyring */ +#define KEY_SPEC_GROUP_KEYRING -6 /* - key ID for GID-specific keyring */ +#define KEY_SPEC_REQKEY_AUTH_KEY -7 /* - key ID for assumed request_key auth key */ +#define KEY_SPEC_REQUESTOR_KEYRING -8 /* - key ID for request_key() dest keyring */ + +/* request-key default keyrings */ +#define KEY_REQKEY_DEFL_NO_CHANGE -1 +#define KEY_REQKEY_DEFL_DEFAULT 0 +#define KEY_REQKEY_DEFL_THREAD_KEYRING 1 +#define KEY_REQKEY_DEFL_PROCESS_KEYRING 2 +#define KEY_REQKEY_DEFL_SESSION_KEYRING 3 +#define KEY_REQKEY_DEFL_USER_KEYRING 4 +#define KEY_REQKEY_DEFL_USER_SESSION_KEYRING 5 +#define KEY_REQKEY_DEFL_GROUP_KEYRING 6 +#define KEY_REQKEY_DEFL_REQUESTOR_KEYRING 7 + +/* keyctl commands */ +#define KEYCTL_GET_KEYRING_ID 0 /* ask for a keyring's ID */ +#define KEYCTL_JOIN_SESSION_KEYRING 1 /* join or start named session keyring */ +#define KEYCTL_UPDATE 2 /* update a key */ +#define KEYCTL_REVOKE 3 /* revoke a key */ +#define KEYCTL_CHOWN 4 /* set ownership of a key */ +#define KEYCTL_SETPERM 5 /* set perms on a key */ +#define KEYCTL_DESCRIBE 6 /* describe a key */ +#define KEYCTL_CLEAR 7 /* clear contents of a keyring */ +#define KEYCTL_LINK 8 /* link a key into a keyring */ +#define KEYCTL_UNLINK 9 /* unlink a key from a keyring */ +#define KEYCTL_SEARCH 10 /* search for a key in a keyring */ +#define KEYCTL_READ 11 /* read a key or keyring's contents */ +#define KEYCTL_INSTANTIATE 12 /* instantiate a partially constructed key */ +#define KEYCTL_NEGATE 13 /* negate a partially constructed key */ +#define KEYCTL_SET_REQKEY_KEYRING 14 /* set default request-key keyring */ +#define KEYCTL_SET_TIMEOUT 15 /* set key timeout */ +#define KEYCTL_ASSUME_AUTHORITY 16 /* assume request_key() authorisation */ +#define KEYCTL_GET_SECURITY 17 /* get key security label */ +#define KEYCTL_SESSION_TO_PARENT 18 /* apply session keyring to parent process */ +#define KEYCTL_REJECT 19 /* reject a partially constructed key */ +#define KEYCTL_INSTANTIATE_IOV 20 /* instantiate a partially constructed key */ +#define KEYCTL_INVALIDATE 21 /* invalidate a key */ +#define KEYCTL_GET_PERSISTENT 22 /* get a user's persistent keyring */ + +#endif /* _LINUX_KEYCTL_H */ diff --git a/libell.spec b/libell.spec index 2662a4e..99e912c 100644 --- a/libell.spec +++ b/libell.spec @@ -1,11 +1,14 @@ Name: libell -Version: 0.8 +Version: 0.9 Release: 1%{?dist} Summary: Embedded Linux library License: LGPLv2+ URL: https://01.org/ell Source0: https://www.kernel.org/pub/linux/libs/ell/ell-%{version}.tar.xz +# https://lore.kernel.org/lkml/20180924094723.487697-1-lkundrak@v3.sk/T/#u +Source1: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/plain/include/uapi/linux/keyctl.h?h=v4.6#/keyctl.h + BuildRequires: gcc %description @@ -27,6 +30,8 @@ Headers for developing against libell. %prep %setup -q -n ell-%{version} +mkdir linux +cp -p %{SOURCE1} linux/keyctl.h %build @@ -52,6 +57,9 @@ Headers for developing against libell. %changelog +* Mon Sep 24 2018 Lubomir Rintel - 0.9-1 +- Update to 0.9 release + * Sat Aug 11 2018 Lubomir Rintel - 0.8-1 - Update to 0.8 release diff --git a/sources b/sources index 1eda3f1..c31f733 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ell-0.8.tar.xz) = 2eb7c4d31c24de6c0cfc537c6dca5bf050bb419cb4606c531685d63bddb21a71ba71fdac68845d1b4d880d1fd7bb6847cb9d8c94b199f050df5f45e296dbe3ca +SHA512 (ell-0.9.tar.xz) = e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3