rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to version 2018.02.8

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2018-12-05 23:24:57 +01:00
parent 32918ded24
commit 5598b1b762
238 changed files with 6567 additions and 2450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
bsp/buildroot/package/x11r7/xdriver_xf86-video-geode/0001-Remove-call-to-LoaderGetOS.patch Normal file
View File

@@ -0,0 +1,53 @@
From 09aaa3d1fae4aeb099b16e7a046151761bcdea95 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 24 Jan 2017 09:53:06 -0500
Subject: Remove call to LoaderGetOS
On OSes that don't have a /dev/videox we'll just fail the open() and not
initialize the Xv adaptor.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Downloaded from upstream commit
https://cgit.freedesktop.org/xorg/driver/xf86-video-geode/commit/?id=09aaa3d1fae4aeb099b16e7a046151761bcdea95
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
src/z4l.c | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/src/z4l.c b/src/z4l.c
index eccefe8..be0d345 100644
--- a/src/z4l.c
+++ b/src/z4l.c
@@ -1709,7 +1709,6 @@ _X_EXPORT XF86ModuleData ztvModuleData = { &z4lVersionRec, z4lSetup, NULL };
static pointer
z4lSetup(pointer module, pointer opts, int *errmaj, int *errmin)
{
- const char *osname;
static Bool setupDone = FALSE;
if (setupDone != FALSE) {
@@ -1719,19 +1718,7 @@ z4lSetup(pointer module, pointer opts, int *errmaj, int *errmin)
}
setupDone = TRUE;
- LoaderGetOS(&osname, NULL, NULL, NULL);
-
- if (osname == NULL || strcmp(osname, "linux") != 0) {
- if (errmaj)
- *errmaj = LDR_BADOS;
- if (errmin)
- *errmin = 0;
-
- return NULL;
- }
-
xf86AddDriver(&Z4l, module, 0);
-
return (pointer) 1;
}
--
cgit v1.1

35
bsp/buildroot/package/x11r7/xdriver_xf86-video-geode/0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch Normal file
View File

@@ -0,0 +1,35 @@
From 8382e6bb0c76a8029493eae3f2d7a3dbfd0cfc12 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 5 Mar 2018 10:28:15 -0500
Subject: gx: Fix RANDR initialization for xserver 1.20
xf86DisableRandR() doesn't exist anymore, and we don't need it anyway,
the core code will notice that we set up RANDR ourselves.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Downloaded from upstream commit
https://cgit.freedesktop.org/xorg/driver/xf86-video-geode/commit/?id=8382e6bb0c76a8029493eae3f2d7a3dbfd0cfc12
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
src/gx_driver.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/gx_driver.c b/src/gx_driver.c
index ab57df1..4de336e 100644
--- a/src/gx_driver.c
+++ b/src/gx_driver.c
@@ -1426,7 +1426,9 @@ GXScreenInit(SCREEN_INIT_ARGS_DECL)
/* Set up RandR */
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24
xf86DisableRandR(); /* We provide our own RandR goodness */
+#endif
/* Try to set up the shadow FB for rotation */
--
cgit v1.1

4
bsp/buildroot/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
View File

@@ -10,8 +10,8 @@ XLIB_LIBFONTENC_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBFONTENC_LICENSE = MIT
XLIB_LIBFONTENC_LICENSE_FILES = COPYING
XLIB_LIBFONTENC_INSTALL_STAGING = YES
XLIB_LIBFONTENC_DEPENDENCIES = zlib xproto_xproto
HOST_XLIB_LIBFONTENC_DEPENDENCIES = host-zlib host-xproto_xproto
XLIB_LIBFONTENC_DEPENDENCIES = zlib xproto_xproto host-pkgconf
HOST_XLIB_LIBFONTENC_DEPENDENCIES = host-zlib host-xproto_xproto host-pkgconf
$(eval $(autotools-package))
$(eval $(host-autotools-package))

2
bsp/buildroot/package/x11r7/xproto_inputproto/xproto_inputproto.mk
View File

@@ -11,6 +11,8 @@ XPROTO_INPUTPROTO_LICENSE = MIT
XPROTO_INPUTPROTO_LICENSE_FILES = COPYING
XPROTO_INPUTPROTO_INSTALL_STAGING = YES
XPROTO_INPUTPROTO_INSTALL_TARGET = NO
XPROTO_INPUTPROTO_CONF_ENV = ac_cv_path_ASCIIDOC=""
HOST_XPROTO_INPUTPROTO_CONF_ENV = ac_cv_path_ASCIIDOC=""
$(eval $(autotools-package))
$(eval $(host-autotools-package))

52
bsp/buildroot/package/x11r7/xserver_xorg-server/1.19.6/0005-Disable-logfile-and-modulepath-when-running-with-ele.patch Normal file
View File

@@ -0,0 +1,52 @@
From 0ff8977a348c316cd9909b890c48d7f5175a5eba Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@herrb.eu>
Date: Tue, 23 Oct 2018 21:29:08 +0200
Subject: [PATCH] Disable -logfile and -modulepath when running with elevated
privileges
Could cause privilege elevation and/or arbitrary files overwrite, when
the X server is running with elevated privileges (ie when Xorg is
installed with the setuid bit set and started by a non-root user).
CVE-2018-14665
Issue reported by Narendra Shinde and Red Hat.
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit 50c0cf885a6e91c0ea71fb49fa8f1b7c86fe330e)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
hw/xfree86/common/xf86Init.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index d59c224d5..183158c21 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1135,14 +1135,18 @@ ddxProcessArgument(int argc, char **argv, int i)
/* First the options that are not allowed with elevated privileges */
if (!strcmp(argv[i], "-modulepath")) {
CHECK_FOR_REQUIRED_ARGUMENT();
- xf86CheckPrivs(argv[i], argv[i + 1]);
+ if (xf86PrivsElevated())
+ FatalError("\nInvalid argument -modulepath "
+ "with elevated privileges\n");
xf86ModulePath = argv[i + 1];
xf86ModPathFrom = X_CMDLINE;
return 2;
}
if (!strcmp(argv[i], "-logfile")) {
CHECK_FOR_REQUIRED_ARGUMENT();
- xf86CheckPrivs(argv[i], argv[i + 1]);
+ if (xf86PrivsElevated())
+ FatalError("\nInvalid argument -logfile "
+ "with elevated privileges\n");
xf86LogFile = argv[i + 1];
xf86LogFileFrom = X_CMDLINE;
return 2;
--
2.11.0