ChangeLog | 48 +++++++++++++ HPkeysym.h | 2 Xpoll.h.in | 13 ++- configure.ac | 2 debian/changelog | 9 ++ debian/upstream/signing-key.asc | 138 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 205 insertions(+), 7 deletions(-)
New commits: commit 99d2e8895c198788b3e30633a4c6b3be6e45a815 Author: Julien Cristau <jcris...@debian.org> Date: Fri May 13 10:49:30 2016 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index e9b8978..94d326a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -x11proto-core (7.0.29-1) UNRELEASED; urgency=medium +x11proto-core (7.0.29-1) unstable; urgency=medium * Add my key to debian/upstream/signing-key.asc * New upstream release + Don't let XFD_SETSIZE exceed FD_SETSIZE, fixes the server on hurd (closes: #822179). Thanks, James Clarke! - -- Julien Cristau <jcris...@debian.org> Fri, 13 May 2016 10:44:38 +0200 + -- Julien Cristau <jcris...@debian.org> Fri, 13 May 2016 10:49:14 +0200 x11proto-core (7.0.28-2) unstable; urgency=medium commit bccb8d9ba6087e10a3105cc1428c233daf7a00c4 Author: Julien Cristau <jcris...@debian.org> Date: Fri May 13 10:47:49 2016 +0200 Bump changelogs diff --git a/ChangeLog b/ChangeLog index 74489a1..461da1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,51 @@ +commit 3e975a39b002070d245d21838f837aaf6e5c41d0 +Author: Julien Cristau <jcris...@debian.org> +Date: Fri May 13 10:28:12 2016 +0200 + + xproto 7.0.29 + + Signed-off-by: Julien Cristau <jcris...@debian.org> + +commit de30673937e2d36b84cf50c3eb05bbf9836fabfb +Author: James Clarke <jrt...@jrtc27.com> +Date: Mon Apr 25 17:12:08 2016 +0100 + + Don't let XFD_SETSIZE exceed FD_SETSIZE + + This fixes 2c94cdb453bc641246cc8b9a876da9799bee1ce7 on the Hurd, as + FD_SETSIZE is only 256, and so anyone using XFD_SETSIZE to iterate over + the contents of an fd_set will overrun the array. + + Signed-off-by: James Clarke <jrt...@jrtc27.com> + Reviewed-by: Julien Cristau <jcris...@debian.org> + +commit edc04f87c74abacb57782dc947f81a2810a72537 +Author: Olivier Fourdan <ofour...@redhat.com> +Date: Wed Aug 26 10:11:11 2015 +0200 + + Raise the number of FD on WIN32 as well + + Commit 2c94cdb raised the number of file descriptors from 256 to 512 + but only for non-WIN32 platforms. + + The definition of XFD_SETSIZE being duplicated, we need to do the same + for WIN32 builds as well otherwise a newer X server trying to + use more than 256 clients would fail on that platform. + + Signed-off-by: Olivier Fourdan <ofour...@redhat.com> + Reviewed-by: Jon TURNEY <jon.tur...@dronecode.org.uk> + +commit 446ee4b7f7ce1bb75f0f6b23bbb33d4bfe8d7ad3 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Jul 26 08:38:54 2015 -0700 + + Incorrect guard block in HPkeysym.h + + https://bugs.freedesktop.org/show_bug.cgi?id=91469 + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Thomas Klausner <w...@netbsd.org> + commit d5524e2b8d811aa03ed19c6e8fb2ee4162ca2b23 Author: Adam Jackson <a...@redhat.com> Date: Wed Jul 1 11:35:13 2015 -0400 diff --git a/debian/changelog b/debian/changelog index 271c997..e9b8978 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -x11proto-core (7.0.28-3) UNRELEASED; urgency=medium +x11proto-core (7.0.29-1) UNRELEASED; urgency=medium * Add my key to debian/upstream/signing-key.asc + * New upstream release + + Don't let XFD_SETSIZE exceed FD_SETSIZE, fixes the server on hurd + (closes: #822179). Thanks, James Clarke! - -- Julien Cristau <jcris...@debian.org> Fri, 13 May 2016 10:39:47 +0200 + -- Julien Cristau <jcris...@debian.org> Fri, 13 May 2016 10:44:38 +0200 x11proto-core (7.0.28-2) unstable; urgency=medium commit 08d5dc297687ad4b0b6ec73a5f960fff2d93c307 Author: Julien Cristau <jcris...@debian.org> Date: Fri May 13 10:40:04 2016 +0200 Add my key to debian/upstream/signing-key.asc diff --git a/debian/changelog b/debian/changelog index 561a091..271c997 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x11proto-core (7.0.28-3) UNRELEASED; urgency=medium + + * Add my key to debian/upstream/signing-key.asc + + -- Julien Cristau <jcris...@debian.org> Fri, 13 May 2016 10:39:47 +0200 + x11proto-core (7.0.28-2) unstable; urgency=medium * Upload to unstable diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc index c1ef011..9daf656 100644 --- a/debian/upstream/signing-key.asc +++ b/debian/upstream/signing-key.asc @@ -99,3 +99,141 @@ UKDs0NP3CACfS1DKwgN/rB7Ib+RJiuK0F/BQoEYAoOhr0VXCT5dP0Yr1kIad7njC GBF1 =bYOv -----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2 + +mQINBEoIZDEBEAD5MrFJC9Hi4mXZ97HlFotHIrkMURIFkvl17XEuJ8Jh3hlzJD/q +K1ByzQGHozzVcfbg4lP4lzqfdps6WCbusqtVYcTF61jjFhYo398lBgpKHUBbsEPC +SfYp5WkoICa824zcmWO9qYizGqkpd1C6gdQtK6ZaGjLx3xt08M9oVZqj+E2SsPHz +WaYLugCwCKhlbVTaP28OGy7tBRY6hcLtiZc2CNpr0YjZ53B7Ubs0BVYQutYxho7l +u0ChE9zNesy4KaIOumXZjTUrMCLpxF/01M1tfzXArMMLAqx3F1M6QIuy18F1zJ2W +LlkRwJi47NTiJ6jwLUYKBTN9T3nmy0oNAvv5v4B8nWgZAOjjDC2pFoVJa1O3K8Ab +vSRA3L/N+80MxM9VK5bw451pDqNhxn5q0yeS+RBagmOb2PZSMIuw9adooMurAfDJ +hsxqp3KaCTdYX5p+mCczNkoKMRUQiVUi250426o69IAmtpVi1q+MV0qWLl2tSvx4 +I4iph9XAhho7ycb4jziWf46ZljnhoGn54EU5GEqH0huakYcXK7XoNxU0XzS/eQuD +qVy2NH2C945h3LAtMo4zr49VZXjNnFn++zZqCUHASDX6Y3h8uMpzIY6Eslu2S85W +gpb+V4M5RvKPeuEJTuzxJOOW/B3nyoWFQfN6SXWGVW618dLEmFmQnyLBwwARAQAB +tCxKdWxpZW4gQ3Jpc3RhdSA8anVsaWVuLmNyaXN0YXVAZW5zLWx5b24ub3JnPokC +PAQTAQgAJgIbAwIeAQIXgAYLCQgHAwIGFQoJCAsCBRYCAwEABQJK4Fj7AhkBAAoJ +EDEBgAUJBeQMu/wP/jmGDVXrXZXtNJ7Ov94iDBwcEBlLoNHUyH4FWQG05eW3CqT0 +w9ZOvZEQ/kKlSjpdZzPiYMjgunl7D78aoL4Il2qKyirlT+trt+v79rl5VkD2xJx/ +gi7iN34VJQ50iGBxyxPicUjkXUO17kpJ2/uw/7/pNG0buBDbLGPwYPQFyV3UVOv7 +R8chvmAqtujck1961gRffKPihiv6sj4zjGs8ukmLCO3EgLzpz3shBfJyq6GNMNmy +aVX7hAcwhErKCrPeGVlzFpCLbtqIxpq6uPfxrDI20LhQkQ9NPD/4t1qkvenRCY77 +wqoiUBSYlpsKND2I2mywOE2FVMj34aBKvn96YsZWlj3Rkc++JvzdZQy09WQIUXt5 +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 +RFczHk65xOzyEL2QBacv2vfoakwE +=NonH +-----END PGP PUBLIC KEY BLOCK----- commit 3e975a39b002070d245d21838f837aaf6e5c41d0 Author: Julien Cristau <jcris...@debian.org> Date: Fri May 13 10:28:12 2016 +0200 xproto 7.0.29 Signed-off-by: Julien Cristau <jcris...@debian.org> diff --git a/configure.ac b/configure.ac index 562b5a5..bc6409a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([Xproto], [7.0.28], +AC_INIT([Xproto], [7.0.29], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) commit de30673937e2d36b84cf50c3eb05bbf9836fabfb Author: James Clarke <jrt...@jrtc27.com> Date: Mon Apr 25 17:12:08 2016 +0100 Don't let XFD_SETSIZE exceed FD_SETSIZE This fixes 2c94cdb453bc641246cc8b9a876da9799bee1ce7 on the Hurd, as FD_SETSIZE is only 256, and so anyone using XFD_SETSIZE to iterate over the contents of an fd_set will overrun the array. Signed-off-by: James Clarke <jrt...@jrtc27.com> Reviewed-by: Julien Cristau <jcris...@debian.org> diff --git a/Xpoll.h.in b/Xpoll.h.in index 2878591..9f127e1 100644 --- a/Xpoll.h.in +++ b/Xpoll.h.in @@ -67,10 +67,13 @@ typedef long fd_mask; # endif #endif -#define XFD_SETSIZE 512 - -#ifndef FD_SETSIZE -#define FD_SETSIZE XFD_SETSIZE +#if defined(FD_SETSIZE) && FD_SETSIZE < 512 +# define XFD_SETSIZE FD_SETSIZE +#else +# define XFD_SETSIZE 512 +# ifndef FD_SETSIZE +# define FD_SETSIZE XFD_SETSIZE +# endif #endif #ifndef NBBY commit edc04f87c74abacb57782dc947f81a2810a72537 Author: Olivier Fourdan <ofour...@redhat.com> Date: Wed Aug 26 10:11:11 2015 +0200 Raise the number of FD on WIN32 as well Commit 2c94cdb raised the number of file descriptors from 256 to 512 but only for non-WIN32 platforms. The definition of XFD_SETSIZE being duplicated, we need to do the same for WIN32 builds as well otherwise a newer X server trying to use more than 256 clients would fail on that platform. Signed-off-by: Olivier Fourdan <ofour...@redhat.com> Reviewed-by: Jon TURNEY <jon.tur...@dronecode.org.uk> diff --git a/Xpoll.h.in b/Xpoll.h.in index 01be164..2878591 100644 --- a/Xpoll.h.in +++ b/Xpoll.h.in @@ -165,7 +165,7 @@ typedef struct fd_set { #else /* WIN32 */ -#define XFD_SETSIZE 256 +#define XFD_SETSIZE 512 #ifndef FD_SETSIZE #define FD_SETSIZE XFD_SETSIZE #endif commit 446ee4b7f7ce1bb75f0f6b23bbb33d4bfe8d7ad3 Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Sun Jul 26 08:38:54 2015 -0700 Incorrect guard block in HPkeysym.h https://bugs.freedesktop.org/show_bug.cgi?id=91469 Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> Reviewed-by: Thomas Klausner <w...@netbsd.org> diff --git a/HPkeysym.h b/HPkeysym.h index ed000b1..4a0655a 100644 --- a/HPkeysym.h +++ b/HPkeysym.h @@ -57,7 +57,7 @@ performance, or use of this material. #ifndef _HPKEYSYM_H -#define _HPKEYSYM +#define _HPKEYSYM_H #define hpXK_ClearLine 0x1000FF6F #define hpXK_InsertLine 0x1000FF70