Bug#926540: unblock: xorg-server/2:1.20.4-1

[Andreas Boll]

Hi Cyril and Niels,

On Tue, Jun 4, 2019 at 8:02 PM Niels Thykier  wrote:
>
> Cyril Brulebois:
> > Apologies for the delay, been busy…
> >
> > Runtime tests look good, no objections.
> >
> >
> > Cheers,
> >
>
> Unblocked, thanks.
> ~Niels
>

Thanks for reviewing and unblocking!
Andreas

Bug#926540: unblock: xorg-server/2:1.20.4-1

[Cyril Brulebois]

Hi,

Andreas Boll  (2019-05-11):
> On Sat, Apr 06, 2019 at 10:25:31PM +0200, Cyril Brulebois wrote:
> > Hi,
> > 
> > Andreas Boll  (2019-04-06):
> > > CCing kibi for unblock-udeb review
> > 
> > This is coming a little late for RC1 that should be published very soon.
> > I've added this to my local todo list but feel free to prod me once RC1
> > is published.
> 
> Ping :)

Apologies for the delay, been busy…

Runtime tests look good, no objections.


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Bug#926540: unblock: xorg-server/2:1.20.4-1

[Andreas Boll]

Hi kibi,

On Sat, Apr 06, 2019 at 10:25:31PM +0200, Cyril Brulebois wrote:
> Hi,
> 
> Andreas Boll  (2019-04-06):
> > CCing kibi for unblock-udeb review
> 
> This is coming a little late for RC1 that should be published very soon.
> I've added this to my local todo list but feel free to prod me once RC1
> is published.
> 

Ping :)

Thanks,
Andreas

Bug#926540: unblock: xorg-server/2:1.20.4-1

[Cyril Brulebois]

Hi,

Andreas Boll  (2019-04-06):
> CCing kibi for unblock-udeb review

This is coming a little late for RC1 that should be published very soon.
I've added this to my local todo list but feel free to prod me once RC1
is published.

> On Sat, Apr 06, 2019 at 07:13:34PM +0200, Andreas Boll wrote:
> > Package: release.debian.org
> > Severity: normal
> > User: release.debian@packages.debian.org
> > Usertags: unblock
> > 
> > Please unblock package xorg-server:
> > 
> > This stable release fixes a bunch of important issues including
> > xserver crashes. There are multiple fixes related to xwayland, present
> > and modesetting.
> > 
> > Debian changelog entry:
> > xorg-server (2:1.20.4-1) unstable; urgency=medium
> > 
> >   [ Timo Aaltonen ]
> >   * New upstream release.
> > - present/wnmd: Fix use after free on CRTC removal
> >   (Closes: #920665).
> > - xwayland: Replace xwl_window::present_window with
> >   ::present_flipped (Closes: #921734).
> > 
> >   [ Andreas Boll ]
> >   * Refresh 07_use-modesetting-driver-by-default-on-GeForce.diff.
> > 
> >  -- Andreas Boll   Tue, 05 Mar 2019 21:11:12 +0100
> > 
> > 
> > Further I've attached a git-diff with the following command to exclude
> > uninteresting CI stuff and tests to make the diff more readable:
> > 
> > git diff xorg-server-2_1.20.3-1..xorg-server-2_1.20.4-1 -- . 
> > ':(exclude)test' ':(exclude).gitlab-ci*' ':(exclude).travis.yml' > 
> > ../xorg-server_1.20.4-1.diff
> > 
> > I've also attached the output of git-shortlog to list all commit
> > titles.
> > 
> > unblock xorg-server/2:1.20.4-1
> > 
> > Thanks,
> > Andreas
> 

Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Bug#926540: unblock: xorg-server/2:1.20.4-1

[Andreas Boll]

CCing kibi for unblock-udeb review

On Sat, Apr 06, 2019 at 07:13:34PM +0200, Andreas Boll wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian@packages.debian.org
> Usertags: unblock
> 
> Please unblock package xorg-server:
> 
> This stable release fixes a bunch of important issues including
> xserver crashes. There are multiple fixes related to xwayland, present
> and modesetting.
> 
> Debian changelog entry:
> xorg-server (2:1.20.4-1) unstable; urgency=medium
> 
>   [ Timo Aaltonen ]
>   * New upstream release.
> - present/wnmd: Fix use after free on CRTC removal
>   (Closes: #920665).
> - xwayland: Replace xwl_window::present_window with
>   ::present_flipped (Closes: #921734).
> 
>   [ Andreas Boll ]
>   * Refresh 07_use-modesetting-driver-by-default-on-GeForce.diff.
> 
>  -- Andreas Boll   Tue, 05 Mar 2019 21:11:12 +0100
> 
> 
> Further I've attached a git-diff with the following command to exclude
> uninteresting CI stuff and tests to make the diff more readable:
> 
> git diff xorg-server-2_1.20.3-1..xorg-server-2_1.20.4-1 -- . ':(exclude)test' 
> ':(exclude).gitlab-ci*' ':(exclude).travis.yml' > ../xorg-server_1.20.4-1.diff
> 
> I've also attached the output of git-shortlog to list all commit
> titles.
> 
> unblock xorg-server/2:1.20.4-1
> 
> Thanks,
> Andreas

Bug#926540: unblock: xorg-server/2:1.20.4-1

[Andreas Boll]

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package xorg-server:

This stable release fixes a bunch of important issues including
xserver crashes. There are multiple fixes related to xwayland, present
and modesetting.

Debian changelog entry:
xorg-server (2:1.20.4-1) unstable; urgency=medium

  [ Timo Aaltonen ]
  * New upstream release.
- present/wnmd: Fix use after free on CRTC removal
  (Closes: #920665).
- xwayland: Replace xwl_window::present_window with
  ::present_flipped (Closes: #921734).

  [ Andreas Boll ]
  * Refresh 07_use-modesetting-driver-by-default-on-GeForce.diff.

 -- Andreas Boll   Tue, 05 Mar 2019 21:11:12 +0100


Further I've attached a git-diff with the following command to exclude
uninteresting CI stuff and tests to make the diff more readable:

git diff xorg-server-2_1.20.3-1..xorg-server-2_1.20.4-1 -- . ':(exclude)test' 
':(exclude).gitlab-ci*' ':(exclude).travis.yml' > ../xorg-server_1.20.4-1.diff

I've also attached the output of git-shortlog to list all commit
titles.

unblock xorg-server/2:1.20.4-1

Thanks,
Andreas
diff --git a/Makefile.am b/Makefile.am
index 32d4d21e76..19511f765d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,7 +72,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xorg-server.pc
 endif
 
-EXTRA_DIST = xorg-server.pc.in xorg-server.m4 autogen.sh
+EXTRA_DIST = xorg-server.pc.in xorg-server.m4 autogen.sh README.md
 
 DISTCHECK_CONFIGURE_FLAGS=\
 	--with-xkb-path=$(XKB_BASE_DIRECTORY) \
diff --git a/README b/README.md
similarity index 65%
rename from README
rename to README.md
index 529526d189..bc39f41cd4 100644
--- a/README
+++ b/README.md
@@ -1,4 +1,5 @@
-	X Server
+X Server
+
 
 The X server accepts requests from client applications to create windows,
 which are (normally rectangular) "virtual screens" that the client program
@@ -16,29 +17,19 @@ https://en.wikipedia.org/wiki/X_server
 All questions regarding this software should be directed at the
 Xorg mailing list:
 
-https://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+  https://lists.freedesktop.org/mailman/listinfo/xorg
 
 The master development code repository can be found at:
 
-git://anongit.freedesktop.org/git/xorg/xserver
-
-https://cgit.freedesktop.org/xorg/xserver
+  https://gitlab.freedesktop.org/xorg/xserver
 
 For patch submission instructions, see:
 
-	https://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
-https://wiki.x.org/wiki/GitPage
+  https://www.x.org/wiki/Development/Documentation/SubmittingPatches
 
 As with other projects hosted on freedesktop.org, X.Org follows its
 Code of Conduct, based on the Contributor Covenant. Please conduct
 yourself in a respectful and civilized manner when using the above
 mailing lists, bug trackers, etc:
 
-	https://www.freedesktop.org/wiki/CodeOfConduct
+  https://www.freedesktop.org/wiki/CodeOfConduct
diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c
index d0be701352..1926762add 100644
--- a/Xi/xibarriers.c
+++ b/Xi/xibarriers.c
@@ -611,7 +611,9 @@ CreatePointerBarrierClient(ClientPtr client,
 }
 pbd->deviceid = dev->id;
 
+input_lock();
 xorg_list_add(&pbd->entry, &ret->per_device);
+input_unlock();
 }
 
 ret->id = stuff->barrier;
@@ -626,7 +628,9 @@ CreatePointerBarrierClient(ClientPtr client,
 ret->barrier.directions &= ~(BarrierPositiveX | BarrierNegativeX);
 if (barrier_is_vertical(&ret->barrier))
 ret->barrier.directions &= ~(BarrierPositiveY | BarrierNegativeY);
+input_lock();
 xorg_list_add(&ret->entry, &cs->barriers);
+input_unlock();
 
 *client_out = ret;
 return Success;
@@ -689,7 +693,9 @@ BarrierFreeBarrier(void *data, XID id)
 mieqEnqueue(dev, (InternalEvent *) &ev);
 }
 
+input_lock();
 xorg_list_del(&c->entry);
+input_unlock();
 
 FreePointerBarrierClient(c);
 return Success;
@@ -709,7 +715,9 @@ static void add_master_func(void *res, XID id, void *devid)
 pbd = AllocBarrierDevice();
 pbd->deviceid = *deviceid;
 
+input_lock();
 xorg_list_add(&pbd->entry, &barrier->per_device);
+input_unlock();
 }
 
 static void remove_master_func(void *res, XID id, void *devid)
@@ -752,7 +760,9 @@ static void remove_master_func(void *res, XID id, void *devid)
 mieqEnqueue(dev, (InternalEvent *) &ev);
 }
 
+input_lock();
 xorg_list_del(&pbd->entry);
+input_unlock();
 free(pbd);
 }
 
diff --git a/configure.ac b/configure.ac
index 80f0ce7853..30544218a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.20.3, [https://bugs.freedesktop.org/enter_b