aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/util-linux-tests.patch
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-03-29 02:43:06 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-03-29 02:43:06 +0200
commitab0bdd5456b908a89737cfba1fa431c4e2344f38 (patch)
tree6d4cae04d8f43a00735c46aaa93796972860b5c9 /gnu/packages/patches/util-linux-tests.patch
parent5f69388d70b9772568e55d54c1d84f2a46333be2 (diff)
downloadguix-ab0bdd5456b908a89737cfba1fa431c4e2344f38.tar
guix-ab0bdd5456b908a89737cfba1fa431c4e2344f38.tar.gz
gnu: util-linux: Update to 2.32.
* gnu/packages/patches/util-linux-tests.patch: Adjust context. * gnu/packages/patches/util-linux-CVE-2018-7738.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/linux.scm (util-linux): Update to 2.32. [source](patches): Remove 'util-linux-CVE-2018-7738.patch'.
Diffstat (limited to 'gnu/packages/patches/util-linux-tests.patch')
-rw-r--r--gnu/packages/patches/util-linux-tests.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/patches/util-linux-tests.patch b/gnu/packages/patches/util-linux-tests.patch
index f436299b7f..bb5be66515 100644
--- a/gnu/packages/patches/util-linux-tests.patch
+++ b/gnu/packages/patches/util-linux-tests.patch
@@ -5,14 +5,14 @@ using 'getpwnam' in libmount. This doesn't work in the chroot because
--- util-linux-2.25.2/tests/ts/libmount/optstr 2015-01-23 13:58:41.181151194 +0100
+++ util-linux-2.25.2/tests/ts/libmount/optstr 2015-01-23 13:58:42.829161716 +0100
-@@ -84,10 +84,6 @@ ts_init_subtest "apply-user" # add user,
- ts_valgrind $TESTPROG --apply --user "noexec,nosuid,loop=/dev/looop0" 0x408 &> $TS_OUTPUT
+@@ -108,10 +108,6 @@
+ ts_run $TESTPROG --apply --user "noexec,nosuid,loop=/dev/looop0" 0x408 &> $TS_OUTPUT
ts_finalize_subtest
-ts_init_subtest "fix"
--ts_valgrind $TESTPROG --fix "uid=root,gid=root" &> $TS_OUTPUT
+-ts_run $TESTPROG --fix "uid=root,gid=root" &> $TS_OUTPUT
-ts_finalize_subtest
-
ts_init_subtest "deduplicate"
- ts_valgrind $TESTPROG --dedup bbb,ccc,AAA,xxx,AAA=a,AAA=bbb,ddd,AAA=ccc,fff=eee AAA &> $TS_OUTPUT
+ ts_run $TESTPROG --dedup bbb,ccc,AAA,xxx,AAA=a,AAA=bbb,ddd,AAA=ccc,fff=eee AAA &> $TS_OUTPUT
ts_finalize_subtest