diff options
| author |   Sandino Araico Sanchez <sandino@sandino.net> | 2019-03-25 04:12:13 -0600 |
|---|---|---|
| committer |   Patrice Clement <monsieurp@gentoo.org> | 2019-03-25 22:40:50 +0100 |
| commit | 7b3fe2e4f69b3fc950ecadc3eb10eb91d7a977a1 (patch) | |
| tree | 9ff948b225aa0871e31ed2f63929a009aacdbb33 /sys-cluster/util-vserver | |
| parent | app-arch/tar: stable 1.32 for sparc, bug #681728 (diff) | |
| download | gentoo-7b3fe2e4f69b3fc950ecadc3eb10eb91d7a977a1.tar.gz gentoo-7b3fe2e4f69b3fc950ecadc3eb10eb91d7a977a1.tar.bz2 gentoo-7b3fe2e4f69b3fc950ecadc3eb10eb91d7a977a1.zip | |
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@sandino.net>
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'sys-cluster/util-vserver')
| -rw-r--r-- | sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-dietlibc.patch | 23 | ||||
| -rw-r--r-- | sys-cluster/util-vserver/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 000000000000..cde8ccc500a6 --- /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 d9776666cc1a..89d86a3cb0ab 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 ) |