Skip to content

Commit 8ba3061

Browse files
authored
Merge pull request #43 from mathstuf/no-libkeyutils
keyutils-raw: remove usage of libkeyutils
2 parents 402b40f + 0bfb38f commit 8ba3061

File tree

7 files changed

+537
-352
lines changed

7 files changed

+537
-352
lines changed

.cirrus.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@ rustfmt_task:
1919
linux_task:
2020
matrix:
2121
- container:
22-
image: rust:1.36.0
22+
image: rust:1.38.0
2323
- container:
2424
image: rust:latest
2525
- allow_failures: true
2626
container:
2727
image: rustlang/rust:nightly
28-
keyutils_script: apt-get update && apt-get install libkeyutils-dev
2928
lockfile_script: cargo generate-lockfile
3029
cargo_cache:
3130
folder: $CARGO_HOME/registry
@@ -50,7 +49,6 @@ coverage_task:
5049
image: rust:latest
5150
environment:
5251
CODECOV_TOKEN: ENCRYPTED[1e221ef78a37c960613ff80db7141f3158e3218031934395466f4720f450b7acfd74e587819435ce9be0b13fa1b68f1b]
53-
keyutils_script: apt-get update && apt-get install libkeyutils-dev
5452
tarpaulin_cache:
5553
folder: .ci
5654
populate_script: .ci/tarpaulin.sh

Cargo.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ edition = "2018"
1313
[workspace]
1414
members = ["keyutils-raw"]
1515

16-
[features]
17-
static = ["keyutils-raw/static"]
18-
1916
[dev-dependencies]
2017
lazy_static = "1"
2118
regex = "1"
@@ -26,7 +23,9 @@ semver = "*"
2623
[dependencies]
2724
bitflags = "1.0.4"
2825
errno = "0.2"
26+
itertools = "0.9"
2927
keyutils-raw = { path = "keyutils-raw" }
3028
log = "0.4.4"
29+
uninit = "0.3"
3130

32-
libc = "0.2"
31+
libc = "0.2.68"

keyutils-raw/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ description = "Raw bindings to Linux keyring syscalls"
77
repository = "https://github.com/mathstuf/rust-keyutils.git"
88
homepage = "https://github.com/mathstuf/rust-keyutils"
99
keywords = ["keyutils"]
10-
links = "keyutils"
1110
edition = "2018"
1211

13-
[features]
14-
static = []
15-
1612
[dependencies]
13+
log = "0.4.4"
14+
15+
errno = "0.2"
1716
libc = "0.2"
17+
uninit = "0.3"

keyutils-raw/build.rs

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)