Merge remote-tracking branch 'origin/apertis/v2021-security' into...

Merge remote-tracking branch 'origin/apertis/v2021-security' into proposed-updates/debian/buster-security/d17054db

* origin/apertis/v2021-security:
  Release xorg-server version 2:1.20.4-1+deb10u3+apertis1
  Refresh the automatically detected licensing information
  d/a/copyright: Add missing copyright information
  Release xorg-server version 2:1.20.4-1+deb10u2+apertis1
  Releasing apertis version 1.20.4-1+deb10u1co1.
  debian/apertis/component: Set to target
  Release xorg-server version 2:1.20.4-1co1
  Import Apertis version 1.20.3-1co1

debian/apertis/component

+target

debian/apertis/copyright.yml

+.*:
+  license: MIT
+.*Makefile.in:
+  license: FSFULLR
+hw/dmx/config/parser.c:
+  override-license: GPL-3+ WITH Bison-exception-2.2
+hw/dmx/config/parser.h:
+  override-license: GPL-3+ WITH Bison-exception-2.2
+hw/xwin/winprefsyacc.c:
+  override-license: GPL-3+ WITH Bison-exception-2.2
+hw/xwin/winprefsyacc.h:
+  override-license: GPL-3+ WITH Bison-exception-2.2

debian/apertis/gitlab-ci.yml

+include:
+  - project: 'infrastructure/ci-package-builder'
+    file: '/ci-package-builder.yml'
+

debian/changelog

@@ -7,18 +7,42 @@ xorg-server (2:1.20.4-1+deb10u4) buster-security; urgency=high
 
  -- Julien Cristau <jcristau@debian.org>  Sat, 18 Dec 2021 10:05:36 +0100
 
+xorg-server (2:1.20.4-1+deb10u3+apertis1) apertis; urgency=medium
+
+  * Merge from Debian buster-security. Remaining changes:
+    - Disable glamor and glxvnd in xwayland to avoid Xwayland
+      depending on big GL.
+
+ -- Ariel D'Alessandro <ariel.dalessandro@collabora.com>  Fri, 27 Aug 2021 16:57:14 -0300
+
 xorg-server (2:1.20.4-1+deb10u3) buster-security; urgency=high
 
   * Fix XChangeFeedbackControl() request underflow (CVE-2021-3472)
 
  -- Julien Cristau <jcristau@debian.org>  Mon, 19 Apr 2021 11:34:38 +0200
 
+xorg-server (2:1.20.4-1+deb10u2+apertis1) apertis; urgency=medium
+
+  * Merge from Debian buster-security. Remaining changes:
+    - Disable glamor and glxvnd in xwayland to avoid Xwayland
+      depending on big GL.
+
+ -- Apertis CI <devel@lists.apertis.org>  Tue, 13 Jul 2021 15:34:23 +0000
+
 xorg-server (2:1.20.4-1+deb10u2) buster-security; urgency=medium
 
   * CVE-2020-14360 CVE-2020-25712
 
  -- Moritz Mühlenhoff <jmm@debian.org>  Tue, 01 Dec 2020 18:59:57 +0100
 
+xorg-server (2:1.20.4-1+deb10u1co1) apertis; urgency=medium
+
+  * Merge from Debian buster-security. Remaining changes:
+    - Disable glamor and glxvnd in xwayland to avoid Xwayland
+      depending on big GL.
+
+ -- Andrew Lee (李健秋) <andrew.lee@collabora.co.uk>  Thu, 12 Nov 2020 16:53:44 +0800
+
 xorg-server (2:1.20.4-1+deb10u1) buster-security; urgency=high
 
   * Non-maintainer upload by the Security Team.
@@ -30,6 +54,13 @@ xorg-server (2:1.20.4-1+deb10u1) buster-security; urgency=high
 
  -- Salvatore Bonaccorso <carnil@debian.org>  Thu, 27 Aug 2020 10:51:48 +0200
 
+xorg-server (2:1.20.4-1co1) apertis; urgency=medium
+
+  [ Ritesh Raj Sarraf ]
+  * Sync changes from Debian Buster
+
+ -- Ritesh Raj Sarraf <ritesh.sarraf@collabora.com>  Fri, 02 Aug 2019 07:37:23 +0000
+
 xorg-server (2:1.20.4-1) unstable; urgency=medium
 
   [ Timo Aaltonen ]
@@ -44,6 +75,13 @@ xorg-server (2:1.20.4-1) unstable; urgency=medium
 
  -- Andreas Boll <aboll@debian.org>  Tue, 05 Mar 2019 21:11:12 +0100
 
+xorg-server (2:1.20.3-1co1) apertis; urgency=medium
+
+  * Disable glamor and glxvnd in xwayland to avoid Xwayland
+    depending on big GL
+
+ -- Sjoerd Simons <sjoerd.simons@collabora.co.uk>  Fri, 29 Mar 2019 11:11:17 +0100
+
 xorg-server (2:1.20.3-1) unstable; urgency=medium
 
   * New upstream release.

debian/patches/disable-libgl-in-xwayland.patch

+--- a/hw/xwayland/Makefile.am
++++ b/hw/xwayland/Makefile.am
+@@ -24,7 +24,6 @@
+ Xwayland_LDADD =				\
+ 	$(glamor_lib)				\
+ 	$(XWAYLAND_LIBS)			\
+-	$(top_builddir)/glx/libglxvnd.la	\
+ 	$(XWAYLAND_SYS_LIBS)			\
+ 	$(top_builddir)/Xext/libXvidmode.la	\
+ 	$(XSERVER_SYS_LIBS)
+@@ -32,32 +31,34 @@
+ 
+ Xwayland_built_sources =
+ 
+-if GLAMOR_EGL
+-Xwayland_SOURCES += 				\
+-	xwayland-glamor.c			\
+-	xwayland-glamor-gbm.c			\
+-	xwayland-present.c
+-if XV
+-Xwayland_SOURCES += 				\
+-	xwayland-glamor-xv.c
+-endif
+-
+-if XWAYLAND_EGLSTREAM
+-Xwayland_SOURCES +=				\
+-	xwayland-glamor-eglstream.c
+-endif
+-
+-glamor_built_sources =				\
+-	drm-client-protocol.h			\
+-	drm-protocol.c
+-
+-Xwayland_built_sources += $(glamor_built_sources)
+-
+-glamor_lib = $(top_builddir)/glamor/libglamor.la
+-
+-Xwayland_LDADD += $(GLAMOR_LIBS) $(GBM_LIBS) -lEGL -lGL
+-Xwayland_DEPENDENCIES = $(glamor_lib) $(XWAYLAND_LIBS)
+-endif
++# Hack  hard disable glamor EGL as it cause a hard link to libGL which we don't
++# have on embedded graphics stacks.
++#if GLAMOR_EGL
++#Xwayland_SOURCES += 				\
++#	xwayland-glamor.c			\
++#	xwayland-glamor-gbm.c			\
++#	xwayland-present.c
++#if XV
++#Xwayland_SOURCES += 				\
++#	xwayland-glamor-xv.c
++#endif
++#
++#if XWAYLAND_EGLSTREAM
++#Xwayland_SOURCES +=				\
++#	xwayland-glamor-eglstream.c
++#endif
++#
++#glamor_built_sources =				\
++#	drm-client-protocol.h			\
++#	drm-protocol.c
++#
++#Xwayland_built_sources += $(glamor_built_sources)
++#
++#glamor_lib = $(top_builddir)/glamor/libglamor.la
++#
++#Xwayland_LDADD += $(GLAMOR_LIBS) $(GBM_LIBS) -lEGL -lGL
++#Xwayland_DEPENDENCIES = $(glamor_lib) $(XWAYLAND_LIBS)
++#endif
+ 
+ Xwayland_built_sources +=					\
+ 	relative-pointer-unstable-v1-client-protocol.h		\
+--- a/hw/xwayland/xwayland.c
++++ b/hw/xwayland/xwayland.c
+@@ -43,6 +43,7 @@
+ _X_EXPORT Bool noXFree86VidModeExtension;
+ #endif
+ 
++#undef GLAMOR_HAS_GBM
+ void
+ ddxGiveUp(enum ExitCode error)
+ {
+--- a/configure.ac
++++ b/configure.ac
+@@ -2393,10 +2393,10 @@
+ 		AC_MSG_ERROR([Xwayland build explicitly requested, but required modules not found.])
+ 	fi
+ 
+-	if test "x$GLAMOR" = xyes && test "x$GBM" = xyes; then
+-		AC_DEFINE(XWL_HAS_GLAMOR, 1,
+-			  [Build xwayland with glamor support])
+-	fi
++#	if test "x$GLAMOR" = xyes && test "x$GBM" = xyes; then
++#		AC_DEFINE(XWL_HAS_GLAMOR, 1,
++#			  [Build xwayland with glamor support])
++#	fi
+ 
+ 	PKG_CHECK_MODULES(WAYLAND_EGLSTREAM, [wayland-eglstream-protocols >= 1.0.2], [have_wl_eglstream=yes], [have_wl_eglstream=no])
+ 

debian/patches/series

@@ -11,6 +11,7 @@
 10_Fix-XIChangeHierarchy-integer-underflow.patch
 11_Fix-XkbSelectEvents-integer-underflow.patch
 12_Fix-XRecordRegisterClients-Integer-underflow.patch
+disable-libgl-in-xwayland.patch
 13_record-Fix-out-of-bounds-access-in-SwapCreateRegiste.patch
 14_xfixes-Fix-out-of-bounds-access-in-ProcXFixesCreateP.patch
 15_Xext-Fix-out-of-bounds-access-in-SProcScreenSaverSus.patch

debian/rules.flags

@@ -48,7 +48,7 @@ confflags_main = \
 	--enable-screensaver \
 	--enable-xdmcp \
 	--enable-xdm-auth-1 \
-	--enable-glx \
+	--disable-glx \
 	--enable-present \
 	--enable-xinerama \
 	--enable-xf86vidmode \