commit: 7b3fe2e4f69b3fc950ecadc3eb10eb91d7a977a1 Author: Sandino Araico Sanchez <sandino <AT> sandino <DOT> net> AuthorDate: Mon Mar 25 10:12:13 2019 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Mon Mar 25 21:40:50 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b3fe2e4
sys-cluster/util-vserver: fix dietlibc headers patch. This patch replaces the conflicting glibc headers with dietlibc's. Closes: https://bugs.gentoo.org/650578 Closes: https://github.com/gentoo/gentoo/pull/11493 Signed-off-by: Sandino Araico Sanchez <sandino <AT> sandino.net> Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> .../util-vserver-0.30.216_pre3120-dietlibc.patch | 23 ++++++++++++++++++++++ .../util-vserver-0.30.216_pre3120-r1.ebuild | 6 +++--- 2 files changed, 26 insertions(+), 3 deletions(-) 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 new file mode 100644 index 00000000000..cde8ccc500a --- /dev/null +++ b/sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-dietlibc.patch @@ -0,0 +1,23 @@ +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 +--- util-vserver-0.30.216-pre3120.orig/lib_internal/util-cleanupmount.c 2015-05-30 10:18:50.000000000 -0500 ++++ util-vserver-0.30.216-pre3120/lib_internal/util-cleanupmount.c 2019-02-19 02:36:55.000000000 -0600 +@@ -22,7 +22,6 @@ + + #include <stdio.h> + #include <sys/mount.h> +-#include <linux/fs.h> + + #ifndef MS_REC + #define MS_REC 0x4000 +diff -puriN util-vserver-0.30.216-pre3120.orig/src/secure-mount.c util-vserver-0.30.216-pre3120/src/secure-mount.c +--- util-vserver-0.30.216-pre3120.orig/src/secure-mount.c 2015-05-30 10:18:50.000000000 -0500 ++++ util-vserver-0.30.216-pre3120/src/secure-mount.c 2019-02-19 02:37:17.000000000 -0600 +@@ -46,7 +46,7 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <sys/file.h> +-#include <linux/fs.h> ++#include <limits.h> + #include <assert.h> + #include <ctype.h> + #include <sys/wait.h> 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 index d9776666cc1..89d86a3cb0a 100644 --- 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 @@ -30,9 +30,9 @@ RDEPEND=" S="${WORKDIR}/${MY_P}" -PATCHES=( - "${FILESDIR}/${P}-vserver-init-functions.patch" -) +PATCHES=" + ${FILESDIR}/${P}-vserver-init-functions.patch + ${FILESDIR}/${P}-dietlibc.patch " DOCS=( README ChangeLog NEWS AUTHORS THANKS util-vserver.spec )
