[ptxdist] [PATCH 1/3] xorg-lib-xtrans: version bump 1.3.4 -> 1.3.5

[ptxdist] [PATCH 1/3] xorg-lib-xtrans: version bump 1.3.4 -> 1.3.5

[Lucas Stach]

Required for xorg-server >= 1.17

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/xorg-lib-xtrans.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/xorg-lib-xtrans.make b/rules/xorg-lib-xtrans.make
index 983d1c5eed52..9c1c83274337 100644
--- a/rules/xorg-lib-xtrans.make
+++ b/rules/xorg-lib-xtrans.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_XORG_LIB_XTRANS) += xorg-lib-xtrans
 #
 # Paths and names
 #
-XORG_LIB_XTRANS_VERSION	:= 1.3.4
-XORG_LIB_XTRANS_MD5	:= a615e17d9fee6f097fc3b716eacb3dca
+XORG_LIB_XTRANS_VERSION	:= 1.3.5
+XORG_LIB_XTRANS_MD5	:= c5ba432dd1514d858053ffe9f4737dd8
 XORG_LIB_XTRANS		:= xtrans-$(XORG_LIB_XTRANS_VERSION)
 XORG_LIB_XTRANS_SUFFIX	:= tar.bz2
 XORG_LIB_XTRANS_URL	:= $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XTRANS).$(XORG_LIB_XTRANS_SUFFIX))
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/3] xorg-server: version bump 1.16.1 -> 1.17.1

[Lucas Stach]

Brings many security fixes and some new features. We keep the default
socket listen policy to keep the attack surface low. This can be overridden
at runtime if needed.

Also disable BINDNOW hardening, as it interferes with the xorg module loader
and prevents modules with dependencies to load correctly.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/xorg-server.make | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/rules/xorg-server.make b/rules/xorg-server.make
index 5e82580f4593..46e9514aa4a5 100644
--- a/rules/xorg-server.make
+++ b/rules/xorg-server.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_XORG_SERVER) += xorg-server
 #
 # Paths and names
 #
-XORG_SERVER_VERSION	:= 1.16.1
-XORG_SERVER_MD5		:= b1ff364222e921d32de40c4786e8bc47
+XORG_SERVER_VERSION	:= 1.17.1
+XORG_SERVER_MD5		:= 5986510d59e394a50126a8e2833e79d3
 XORG_SERVER		:= xorg-server-$(XORG_SERVER_VERSION)
 XORG_SERVER_SUFFIX	:= tar.bz2
 XORG_SERVER_URL		:= $(call ptx/mirror, XORG, individual/xserver/$(XORG_SERVER).$(XORG_SERVER_SUFFIX))
@@ -28,6 +28,10 @@ XORG_SERVER_DIR		:= $(BUILDDIR)/$(XORG_SERVER)
 # Prepare
 # ----------------------------------------------------------------------------
 
+# The xorg module loader needs lazy symbol binding
+XORG_SERVER_WRAPPER_BLACKLIST := \
+        TARGET_HARDEN_BINDNOW
+
 XORG_SERVER_ENV 	:= $(CROSS_ENV) \
 	ac_cv_sys_linker_h=yes \
 	ac_cv_file__usr_share_sgml_X11_defs_ent=no
@@ -61,7 +65,6 @@ XORG_SERVER_CONF_OPT	= \
 	--disable-install-libxf86config \
 	--$(call ptx/endis, PTXCONF_XORG_SERVER_OPT_AIGLX)-aiglx \
 	--$(call ptx/endis, PTXCONF_XORG_SERVER_OPT_GLX_TLS)-glx-tls \
-	--$(call ptx/endis, PTXCONF_XORG_SERVER_STRING_REGISTRY)-registry \
 	--$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_COMPOSITE)-composite \
 	--$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_SHM)-mitshm \
 	--$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_XRES)-xres \
@@ -100,6 +103,9 @@ XORG_SERVER_CONF_OPT	= \
 	--$(call ptx/endis, PTXCONF_XORG_SERVER_XORG)-pciaccess \
 	--enable-linux-acpi \
 	--enable-linux-apm \
+	--disable-listen-tcp \
+	--enable-listen-unix \
+	--enable-listen-local \
 	--disable-systemd-logind \
 	--disable-suid-wrapper \
 	--$(call ptx/endis, PTXCONF_XORG_SERVER_XORG)-xorg \
@@ -107,6 +113,7 @@ XORG_SERVER_CONF_OPT	= \
 	--$(call ptx/endis, PTXCONF_XORG_SERVER_XVFB)-xvfb \
 	--$(call ptx/endis, PTXCONF_XORG_SERVER_XNEST)-xnest \
 	--disable-xquartz \
+	--disable-xshmfence \
 	--$(call ptx/endis, PTXCONF_XORG_SERVER_XWAYLAND)-xwayland \
 	--disable-standalone-xpbproxy \
 	--$(call ptx/endis, PTXCONF_XORG_SERVER_XWIN)-xwin \
@@ -239,22 +246,6 @@ ifdef PTXCONF_XORG_DRIVER_VIDEO
 		$(XORG_PREFIX)/lib/xorg/modules/libvgahw.so)
 endif
 
-# FIXME: Should be included on demand only
-	@$(call install_copy, xorg-server, 0, 0, 0644, -, \
-		/usr/lib/xorg/modules/multimedia/bt829_drv.so)
-	@$(call install_copy, xorg-server, 0, 0, 0644, -, \
-		/usr/lib/xorg/modules/multimedia/tda8425_drv.so)
-	@$(call install_copy, xorg-server, 0, 0, 0644, -, \
-		/usr/lib/xorg/modules/multimedia/tda9850_drv.so)
-	@$(call install_copy, xorg-server, 0, 0, 0644, - ,\
-		/usr/lib/xorg/modules/multimedia/uda1380_drv.so)
-	@$(call install_copy, xorg-server, 0, 0, 0644, -, \
-		/usr/lib/xorg/modules/multimedia/fi1236_drv.so)
-	@$(call install_copy, xorg-server, 0, 0, 0644, - ,\
-		/usr/lib/xorg/modules/multimedia/msp3430_drv.so)
-	@$(call install_copy, xorg-server, 0, 0, 0644, -, \
-		/usr/lib/xorg/modules/multimedia/tda9885_drv.so)
-
 ifdef PTXCONF_XORG_SERVER_EXT_GLX
 	@$(call install_copy, xorg-server, 0, 0, 0644, -, \
 		/usr/lib/xorg/modules/extensions/libglx.so)
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/3] xorg-server: add xf86-video-modesetting driver option

[Lucas Stach]

With xorg-server 1.17 the xf86-video-modesetting driver has been integrated
into the xserver codebase as a generic video driver on top of KMS and OpenGL.
Add options which allow to build and install this driver.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/xorg-driver.in   | 9 +++++++++
 rules/xorg-server.make | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/rules/xorg-driver.in b/rules/xorg-driver.in
index b9511977f21c..c94953cfaa5c 100644
--- a/rules/xorg-driver.in
+++ b/rules/xorg-driver.in
@@ -11,5 +11,14 @@ menuconfig XORG_DRIVER_VIDEO
         bool "xorg video drivers            "
 
 if XORG_DRIVER_VIDEO
+
+config XORG_DRIVER_VIDEO_MODESETTING
+	tristate "modesetting"
+	select XORG_SERVER_LIBDRM
+	help
+	  Generic xorg video driver on top of KMS. Can be used with
+	  hardware acceleration on top of OpenGL if the GLAMOR module
+	  is also selected.
+
 source "generated/multimedia_xorg_driver_video.in"
 endif
diff --git a/rules/xorg-server.make b/rules/xorg-server.make
index 46e9514aa4a5..e35c591f8df6 100644
--- a/rules/xorg-server.make
+++ b/rules/xorg-server.make
@@ -244,6 +244,10 @@ ifdef PTXCONF_XORG_DRIVER_VIDEO
 		$(XORG_PREFIX)/lib/xorg/modules/libwfb.so)
 	@$(call install_copy, xorg-server, 0, 0, 0644, -, \
 		$(XORG_PREFIX)/lib/xorg/modules/libvgahw.so)
+ifdef PTXCONF_XORG_DRIVER_VIDEO_MODESETTING
+	@$(call install_copy, xorg-server, 0, 0, 0644, -, \
+		/usr/lib/xorg/modules/drivers/modesetting_drv.so)
+endif
 endif
 
 ifdef PTXCONF_XORG_SERVER_EXT_GLX
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de