Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/util-vserver/, sys-cluster/util-vserver/files/
Date: Mon, 25 Mar 2019 21:41:26
Message-Id: 1553550050.7b3fe2e4f69b3fc950ecadc3eb10eb91d7a977a1.monsieurp@gentoo
1 commit: 7b3fe2e4f69b3fc950ecadc3eb10eb91d7a977a1
2 Author: Sandino Araico Sanchez <sandino <AT> sandino <DOT> net>
3 AuthorDate: Mon Mar 25 10:12:13 2019 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 25 21:40:50 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b3fe2e4
7
8 sys-cluster/util-vserver: fix dietlibc headers patch.
9
10 This patch replaces the conflicting glibc headers with dietlibc's.
11
12 Closes: https://bugs.gentoo.org/650578
13 Closes: https://github.com/gentoo/gentoo/pull/11493
14 Signed-off-by: Sandino Araico Sanchez <sandino <AT> sandino.net>
15 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
16
17 .../util-vserver-0.30.216_pre3120-dietlibc.patch | 23 ++++++++++++++++++++++
18 .../util-vserver-0.30.216_pre3120-r1.ebuild | 6 +++---
19 2 files changed, 26 insertions(+), 3 deletions(-)
20
21 diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-dietlibc.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-dietlibc.patch
22 new file mode 100644
23 index 00000000000..cde8ccc500a
24 --- /dev/null
25 +++ b/sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-dietlibc.patch
26 @@ -0,0 +1,23 @@
27 +diff -puriN util-vserver-0.30.216-pre3120.orig/lib_internal/util-cleanupmount.c util-vserver-0.30.216-pre3120/lib_internal/util-cleanupmount.c
28 +--- util-vserver-0.30.216-pre3120.orig/lib_internal/util-cleanupmount.c 2015-05-30 10:18:50.000000000 -0500
29 ++++ util-vserver-0.30.216-pre3120/lib_internal/util-cleanupmount.c 2019-02-19 02:36:55.000000000 -0600
30 +@@ -22,7 +22,6 @@
31 +
32 + #include <stdio.h>
33 + #include <sys/mount.h>
34 +-#include <linux/fs.h>
35 +
36 + #ifndef MS_REC
37 + #define MS_REC 0x4000
38 +diff -puriN util-vserver-0.30.216-pre3120.orig/src/secure-mount.c util-vserver-0.30.216-pre3120/src/secure-mount.c
39 +--- util-vserver-0.30.216-pre3120.orig/src/secure-mount.c 2015-05-30 10:18:50.000000000 -0500
40 ++++ util-vserver-0.30.216-pre3120/src/secure-mount.c 2019-02-19 02:37:17.000000000 -0600
41 +@@ -46,7 +46,7 @@
42 + #include <sys/stat.h>
43 + #include <sys/types.h>
44 + #include <sys/file.h>
45 +-#include <linux/fs.h>
46 ++#include <limits.h>
47 + #include <assert.h>
48 + #include <ctype.h>
49 + #include <sys/wait.h>
50
51 diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild
52 index d9776666cc1..89d86a3cb0a 100644
53 --- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild
54 +++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild
55 @@ -30,9 +30,9 @@ RDEPEND="
56
57 S="${WORKDIR}/${MY_P}"
58
59 -PATCHES=(
60 - "${FILESDIR}/${P}-vserver-init-functions.patch"
61 -)
62 +PATCHES="
63 + ${FILESDIR}/${P}-vserver-init-functions.patch
64 + ${FILESDIR}/${P}-dietlibc.patch "
65
66 DOCS=( README ChangeLog NEWS AUTHORS THANKS util-vserver.spec )