xorg-server: Changes to 'ubuntu'
ChangeLog | 135 ++++++++++
configure.ac | 6
debian/changelog | 41 +++
debian/control | 1
debian/patches/os-move-arpa-inet.h-for-any-win32-system.patch | 42 +++
debian/patches/series | 2
debian/patches/xfree86-hurd-include-hurd.h.patch | 53 +++
debian/rules | 5
hw/kdrive/src/kinput.c | 2
9 files changed, 279 insertions(+), 8 deletions(-)
New commits:
commit db47cd69aacbfc2ac985024aa13ecfa8568b3cb3
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Oct 3 12:55:16 2013 +0300
release to saucy
diff --git a/debian/changelog b/debian/changelog
index 1723281..83fe687 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.14.3-3ubuntu1) saucy; urgency=low
+
+ * Merge from unreleased debian git.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 03 Oct 2013 12:54:24 +0300
+
xorg-server (2:1.14.3-4) UNRELEASED; urgency=low
* rules: Drop defoma support from the font path. (Closes: #689233,
commit 14b38b7f3a6896871bbc38aa8e537c1161ac5a17
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Sep 25 16:30:43 2013 +0300
closes #689233
diff --git a/debian/changelog b/debian/changelog
index 0749068..15ec5ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.14.3-4) UNRELEASED; urgency=low
- * rules: Drop defoma support from the font path. (LP: #986061)
+ * rules: Drop defoma support from the font path. (Closes: #689233,
+ LP: #986061)
-- Timo Aaltonen <tjaalton@ubuntu.com> Wed, 25 Sep 2013 15:53:06 +0300
commit 3f53c7f2feb724f98c2c6200e2a2f293c8e72abb
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Sep 25 15:54:14 2013 +0300
rules: Drop defoma support from the font path. (LP: #986061)
diff --git a/debian/changelog b/debian/changelog
index 6fdfe99..0749068 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.14.3-4) UNRELEASED; urgency=low
+
+ * rules: Drop defoma support from the font path. (LP: #986061)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Wed, 25 Sep 2013 15:53:06 +0300
+
xorg-server (2:1.14.3-3) unstable; urgency=low
* Upload to unstable.
diff --git a/debian/rules b/debian/rules
index c42d3ee..9933dc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,7 +116,7 @@ confflags += \
--disable-install-setuid
confflags_main = \
- --with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType,built-ins" \
+ --with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,built-ins" \
--enable-aiglx \
--enable-glx-tls \
--enable-registry \
commit 96eaa187b9c10dcea4e5e335a4c283f7ce4ce463
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 22 16:32:33 2013 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 112b9cc..c265855 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.14.3-3) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 22 Sep 2013 16:32:19 +0200
+
xorg-server (2:1.14.3-2) experimental; urgency=low
* Delete test-driver on clean.
commit 4cf9fe0f18eb88e85eb01ca0e3a26c5f16ebef2d
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 20 00:21:49 2013 +0200
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index 7201546..112b9cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.14.3-2) UNRELEASED; urgency=low
+xorg-server (2:1.14.3-2) experimental; urgency=low
* Delete test-driver on clean.
* Add a couple patches to fix FTBFS on hurd (closes: #720736). Thanks, Pino
Toscano!
- -- Julien Cristau <jcristau@debian.org> Mon, 16 Sep 2013 01:22:24 +0200
+ -- Julien Cristau <jcristau@debian.org> Fri, 20 Sep 2013 00:21:41 +0200
xorg-server (2:1.14.3-1) experimental; urgency=low
commit e9e6da833df164266653fc4f7585536281bab847
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 20 00:09:09 2013 +0200
Add a couple patches to fix FTBFS on hurd (closes: #720736).
Thanks, Pino Toscano!
diff --git a/debian/changelog b/debian/changelog
index c232113..7201546 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xorg-server (2:1.14.3-2) UNRELEASED; urgency=low
* Delete test-driver on clean.
+ * Add a couple patches to fix FTBFS on hurd (closes: #720736). Thanks, Pino
+ Toscano!
-- Julien Cristau <jcristau@debian.org> Mon, 16 Sep 2013 01:22:24 +0200
diff --git a/debian/patches/os-move-arpa-inet.h-for-any-win32-system.patch b/debian/patches/os-move-arpa-inet.h-for-any-win32-system.patch
new file mode 100644
index 0000000..70b1862
--- /dev/null
+++ b/debian/patches/os-move-arpa-inet.h-for-any-win32-system.patch
@@ -0,0 +1,42 @@
+From 006b123a801afab44a9e1a3d6e2ff5e1c6415362 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino@tiscali.it>
+Date: Wed, 28 Aug 2013 17:15:03 +0200
+Subject: [PATCH] os: move <arpa/inet.h> for any !win32 system
+
+It is needed in IPv6 configurations (for inet_pton) also when
+SIOCGIFCONF is not defined.
+
+Signed-off-by: Pino Toscano <toscano.pino@tiscali.it>
+---
+ os/access.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/os/access.c b/os/access.c
+index 88a44d9..6d991b3 100644
+--- a/os/access.c
++++ b/os/access.c
+@@ -163,6 +163,10 @@ SOFTWARE.
+ /* #endif */
+ #endif
+
++#if defined(IPv6) && defined(AF_INET6)
++#include <arpa/inet.h>
++#endif
++
+ #endif /* WIN32 */
+
+ #define X_INCLUDE_NETDB_H
+@@ -461,10 +465,6 @@ DefineSelf(int fd)
+ #endif
+
+ #if defined(IPv6) && defined(AF_INET6)
+-#include <arpa/inet.h>
+-#endif
+-
+-#if defined(IPv6) && defined(AF_INET6)
+ static void
+ in6_fillscopeid(struct sockaddr_in6 *sin6)
+ {
+--
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index c42a991..a032067 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,5 @@
06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
08_xfree86_fix_ia64_inx_outx.diff
10_Include-missing-selection-h.diff
+os-move-arpa-inet.h-for-any-win32-system.patch
+xfree86-hurd-include-hurd.h.patch
diff --git a/debian/patches/xfree86-hurd-include-hurd.h.patch b/debian/patches/xfree86-hurd-include-hurd.h.patch
new file mode 100644
index 0000000..b36602d
--- /dev/null
+++ b/debian/patches/xfree86-hurd-include-hurd.h.patch
@@ -0,0 +1,53 @@
+From ef6a236cf9b795017c9c8c4447a6735fa04bb061 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino@tiscali.it>
+Date: Wed, 28 Aug 2013 17:04:48 +0200
+Subject: [PATCH] xfree86/hurd: include <hurd.h>
+
+Needed for using get_privileged_port.
+
+Signed-off-by: Pino Toscano <toscano.pino@tiscali.it>
+---
+ hw/xfree86/os-support/hurd/hurd_init.c | 1 +
+ hw/xfree86/os-support/hurd/hurd_mmap.c | 1 +
+ hw/xfree86/os-support/hurd/hurd_video.c | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/hw/xfree86/os-support/hurd/hurd_init.c b/hw/xfree86/os-support/hurd/hurd_init.c
+index 185b2b9..fe1a764 100644
+--- a/hw/xfree86/os-support/hurd/hurd_init.c
++++ b/hw/xfree86/os-support/hurd/hurd_init.c
+@@ -42,6 +42,7 @@
+ #include <sys/file.h>
+ #include <assert.h>
+ #include <mach.h>
++#include <hurd.h>
+
+ int
+ xf86ProcessArgument(int argc, char **argv, int i)
+diff --git a/hw/xfree86/os-support/hurd/hurd_mmap.c b/hw/xfree86/os-support/hurd/hurd_mmap.c
+index 6ac9efd..8e089ca 100644
+--- a/hw/xfree86/os-support/hurd/hurd_mmap.c
++++ b/hw/xfree86/os-support/hurd/hurd_mmap.c
+@@ -27,6 +27,7 @@
+ #include<mach.h>
+ #include<device/device.h>
+ #include<mach/machine/mach_i386.h>
++#include <hurd.h>
+
+ #include <X11/X.h>
+
+diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c
+index 72474ba..b3b94c9 100644
+--- a/hw/xfree86/os-support/hurd/hurd_video.c
++++ b/hw/xfree86/os-support/hurd/hurd_video.c
+@@ -28,6 +28,7 @@
+ #include <mach.h>
+ #include <device/device.h>
+ #include <mach/machine/mach_i386.h>
++#include <hurd.h>
+
+ #include <X11/X.h>
+ #include "input.h"
+--
+1.7.10.4
+
commit 29c4751f18e60504c5a1f294b5364e05a3953b6f
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Sep 16 01:22:44 2013 +0200
Delete test-driver on clean.
diff --git a/debian/changelog b/debian/changelog
index afdacd3..c232113 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.14.3-2) UNRELEASED; urgency=low
+
+ * Delete test-driver on clean.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 16 Sep 2013 01:22:24 +0200
+
xorg-server (2:1.14.3-1) experimental; urgency=low
[ Julien Cristau ]
diff --git a/debian/rules b/debian/rules
index 0c3257f..c42d3ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -219,7 +219,6 @@ build-indep: build
clean: unpatch abibumpcheck
dh_testdir
-
rm -rf $(STAMP_DIR)
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
@@ -231,7 +230,7 @@ clean: unpatch abibumpcheck
rm -f include/do-not-use-config.h.in
rm -f m4/lt*.m4 m4/libtool.m4
find -name Makefile.in -delete
-
+ rm -f test-driver
dh_clean
install: build
commit dda35e75c1d9ce972d62c67a529a1d85b27e340f
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 15 23:57:32 2013 +0200
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index ca23988..afdacd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.14.3-1) UNRELEASED; urgency=low
+xorg-server (2:1.14.3-1) experimental; urgency=low
[ Julien Cristau ]
* Remove the Replaces: xdmx from xdmx-tools, that was before lenny. That
@@ -8,7 +8,7 @@ xorg-server (2:1.14.3-1) UNRELEASED; urgency=low
[ Michele Cane ]
* New upstream release.
- -- Michele Cane <michele.cane@gmail.com> Sun, 15 Sep 2013 22:46:06 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 15 Sep 2013 23:57:26 +0200
xorg-server (2:1.14.2.901-2) experimental; urgency=low
commit 2ca352e25962fea04d0553ba94af46e86f9ae908
Author: Michele Cane <michele.cane@gmail.com>
Date: Sun Sep 15 22:47:10 2013 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 800af89..fc7ffc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,138 @@
+commit 9acb64f54ee9dd2fe41afda159b919280850ad8e
+Author: Matt Dew <marcoz@osource.org>
+Date: Thu Sep 12 21:17:40 2013 -0600
+
+ bump version from 1.14.2.902 to 1.14.3
+
+commit af1c57152e10cfa55843e6330cffc6a3c8c517d3
+Author: Chris Clayton <chris2553@googlemail.com>
+Date: Wed Sep 4 15:42:04 2013 +1000
+
+ kdrive: fix build error on gcc 4.8 for out-of-bounds array access
+
+ I'm getting a error building xorg-server-1.14.1.902 with thelatest snapshot
+ of gcc-4.8:
+
+ input.c:225:43: error: array subscript is above array bounds
+ [-Werror=array-bounds]
+
+ This is because kdNumInputFds can become equal to KD_MAX_INPUT_FDS in
+ KdRegisterFd(). This means that in KdUnregisterFd(), kdInputFds[j + 1] can
+ be beyond the end of the array.
+
+ Signed-off-by: Chris Clayton <chris2553@googlemail.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 0e37fefea5e91dfdcd18ffd941daa7d05cc3180d
+Author: Matt Dew <marcoz@osource.org>
+Date: Thu Aug 22 17:43:51 2013 -0600
+
+ bump rev number from 1.14.2.901 to 1.14.2.902
+
+commit 917c11ff97eb302d3c2d0565c8dd6d93101d6466
+Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+Date: Tue Jul 30 15:31:24 2013 +0200
+
+ test/xi2: fix protocol-xiqueryversion test
+
+ The old code was broken and allowed setting client version >= XIVersion,
+ this was fixed in the previous patch, but updating the value for XIVersion
+ broke the tests, so fix the tests too.
+
+ Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit b6e5c4669e0db391966deb397e8c975ec7f0124d)
+
+commit 804836c53083fdb9f43be6f51740df5d12d57cb4
+Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+Date: Tue Jul 30 14:45:21 2013 +0200
+
+ Xi: Clamp XIClient maximal version to XIVersion
+
+ Do not allow setting client version to an arbitrary value >= XIVersion.
+ Fixes a test error with test/xi2/protocol-xiqueryversion.c, introduced by
+ commit 4360514d1c "Xi: Allow clients to ask for 2.3 and then 2.2 without failing"
+
+ Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 500e844a24962c9e70abb3d614f1973013b2de73)
+
+commit 7250c310b50c96709f2082e7752fc889557abc26
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Aug 13 10:50:25 2013 +1000
+
+ Revert "test: fix XIQueryVersion check for new behaviour"
+
+ This reverts commit cdcb708678c4785cd7b026b90e316691176e5244.
+
+commit cdcb708678c4785cd7b026b90e316691176e5244
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jul 30 08:03:12 2013 +1000
+
+ test: fix XIQueryVersion check for new behaviour
+
+ As of 4360514d1cc8e3132f93f56172d291074e8c770f, XIQueryVersion supports
+ requesting versions 2.2+ in random order, only 2.0 and 2.1 are restricted.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit a5abf790183798ad8aa2c29c056df3647777cfbd)
+
+commit e6da18f67516dcee394cd0eff591a255b59fe544
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Jul 10 22:42:55 2013 -0700
+
+ Xi: Allow clients to ask for 2.3 and then 2.2 without failing
+
+ This allows different sub-systems within the same application to
+ request different Xi versions without either getting old behaviour
+ everywhere or simply failing with a BadValue.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 4360514d1cc8e3132f93f56172d291074e8c770f)
+
+commit 0857f3c72d0d1bf5eac52f084e9a1adf077e7397
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Jul 22 13:43:07 2013 +1000
+
+ dix: set the valuator mask to ensure XI 1.x events have data
+
+ XI 1.x only allows for first + num valuators, so if a device sends data for
+ valuators 0 and 2+ only (i.e. valuator 1 is missing) we still need to get
+ the data for that from somewhere.
+ XI 1.x uses the hack of an unset valuator mask to get the right coordinates,
+ i.e. we set the value but don't set the mask for it so XI2 events have the
+ right mask.
+
+ For an absolute device in relative mode, this broke in b28a1af55cf, the
+ value was now always 0. This wasn't visible on the cursor, only in an XI 1.x
+ client. The GIMP e.g. sees jumps to x/0 every few events.
+
+ Drop the condition introduced in b28a1af55cf, data in valuators is always
+ absolute, regardless of the mode.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 3d8756631070c440cefa31b35fea3d407f187810)
+
+commit ef54bd89b17f3dd1f854435339f66d357121c64c
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Jul 24 11:50:00 2013 +1000
+
+ dix: check the xi2mask, not the grab type for touch listeners
+
+ grab->type is only non-zero for passive grabs. We're checking an active grab
+ here, so we need to check if the touch mask is set on the grab.
+
+ Test case: grab the device, then start two simultaneous touches. The
+ grabbing client won't see the second touchpoints because grab->type is 0
+ and the second touch is not an emulating pointer.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 4fb686d6a6777950f0e0d55b848cd2af4cbad372)
+
commit bc41226f7741098e55a3b0df924986991576d50a
Merge: 4ebd618 2cd62dc
Author: Matt Dew <marcoz@osource.org>
diff --git a/debian/changelog b/debian/changelog
index c90609e..ca23988 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xorg-server (2:1.14.2.901-3) UNRELEASED; urgency=low
+xorg-server (2:1.14.3-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Remove the Replaces: xdmx from xdmx-tools, that was before lenny. That
change was done in the 1.10.x timeframe and then lost when moving to
1.11.x.
- -- Julien Cristau <jcristau@debian.org> Tue, 13 Aug 2013 19:48:22 +0200
+ [ Michele Cane ]
+ * New upstream release.
+
+ -- Michele Cane <michele.cane@gmail.com> Sun, 15 Sep 2013 22:46:06 +0200
xorg-server (2:1.14.2.901-2) experimental; urgency=low
commit 9acb64f54ee9dd2fe41afda159b919280850ad8e
Author: Matt Dew <marcoz@osource.org>
Date: Thu Sep 12 21:17:40 2013 -0600
bump version from 1.14.2.902 to 1.14.3
diff --git a/configure.ac b/configure.ac
index 68484db..9bc7c73 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.14.2.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2013-08-22"
-RELEASE_NAME="Act semi-normal-rc2"
+AC_INIT([xorg-server], 1.14.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2013-09-12"
+RELEASE_NAME="September Rain"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit af1c57152e10cfa55843e6330cffc6a3c8c517d3
Author: Chris Clayton <chris2553@googlemail.com>
Date: Wed Sep 4 15:42:04 2013 +1000
kdrive: fix build error on gcc 4.8 for out-of-bounds array access
I'm getting a error building xorg-server-1.14.1.902 with thelatest snapshot
of gcc-4.8:
input.c:225:43: error: array subscript is above array bounds
[-Werror=array-bounds]
This is because kdNumInputFds can become equal to KD_MAX_INPUT_FDS in
KdRegisterFd(). This means that in KdUnregisterFd(), kdInputFds[j + 1] can
be beyond the end of the array.
Signed-off-by: Chris Clayton <chris2553@googlemail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index b1068bb..09aae44 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -221,7 +221,7 @@ KdUnregisterFd(void *closure, int fd, Bool do_close)
if (do_close)
close(kdInputFds[i].fd);
kdNumInputFds--;
- for (j = i; j < kdNumInputFds; j++)
+ for (j = i; j < (kdNumInputFds - 1); j++)
kdInputFds[j] = kdInputFds[j + 1];
break;
}
commit 0e37fefea5e91dfdcd18ffd941daa7d05cc3180d
Author: Matt Dew <marcoz@osource.org>
Date: Thu Aug 22 17:43:51 2013 -0600
bump rev number from 1.14.2.901 to 1.14.2.902
diff --git a/configure.ac b/configure.ac
index 271e49d..68484db 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.14.2.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2013-07-25"
-RELEASE_NAME="Act semi-normal-rc1"
+AC_INIT([xorg-server], 1.14.2.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2013-08-22"
+RELEASE_NAME="Act semi-normal-rc2"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 474af88a63d8f9614163047bf1d9bc4a74e94771
Author: Michael Stapelberg <stapelberg@debian.org>
Date: Thu Aug 22 18:34:33 2013 +0200
update changelog
diff --git a/debian/changelog b/debian/changelog
index faf29dc..c419b3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.12.4-6.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Cherry-pick Julien Cristau’s commits from debian-experimental:
+ Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.
+ 02_improve-posix-saved-ids-check.diff
+
+ -- Michael Stapelberg <stapelberg@debian.org> Thu, 22 Aug 2013 18:34:21 +0200
+
xorg-server (2:1.12.4-6.1) unstable; urgency=low
* Non-maintainer upload.
commit 8a49c15974be31ca284744a6406db638509d1258
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 2 19:18:47 2013 +0200
Replace kbsd fix with a better one
issetugid is now declared by libc, and we can use _POSIX_SAVED_IDS
Conflicts:
debian/changelog
debian/patches/series
diff --git a/debian/patches/02_improve-posix-saved-ids-check.diff b/debian/patches/02_improve-posix-saved-ids-check.diff
new file mode 100644
index 0000000..657dd23
--- /dev/null
+++ b/debian/patches/02_improve-posix-saved-ids-check.diff
@@ -0,0 +1,65 @@
+From a2b08b941b841db226d7c9dfd264045abcd8f8b4 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Sat, 27 Jul 2013 20:09:16 +0200
+Subject: [PATCH] xfree86: improve check for posix saved ids
+
+Replace hardcoded SVR4 || linux || CSRG_BASED with an autoconf check and
+the _POSIX_SAVED_IDS macro.
+
+Suggested-by: Mark Kettenis <mark.kettenis@xs4all.nl>
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+ configure.ac | 2 +-
+ hw/xfree86/parser/write.c | 3 ++-
+ include/xorg-config.h.in | 3 +++
+ 3 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c6ecba4..d27ca23 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -215,7 +215,7 @@ AC_SUBST(DLOPEN_LIBS)
+ dnl Checks for library functions.
+ AC_CHECK_FUNCS([backtrace ffs geteuid getuid issetugid getresuid \
+ getdtablesize getifaddrs getpeereid getpeerucred getzoneid \
+- mmap shmctl64 strncasecmp vasprintf vsnprintf walkcontext])
++ mmap seteuid shmctl64 strncasecmp vasprintf vsnprintf walkcontext])
+ AC_REPLACE_FUNCS([strcasecmp strcasestr strlcat strlcpy strndup])
+
+ dnl Find the math libary, then check for cbrt function in it.
+diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c
+index 9c706a0..eb5e3cf 100644
+--- a/hw/xfree86/parser/write.c
++++ b/hw/xfree86/parser/write.c
+@@ -55,6 +55,7 @@
+ #include <xorg-config.h>
+ #endif
+
++#include "os.h"
+ #include "xf86Parser.h"
+ #include "xf86tokens.h"
+ #include "Configint.h"
+@@ -65,7 +66,7 @@
+ #include <signal.h>
+ #include <errno.h>
+
+-#if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
++#if defined(HAVE_SETEUID) && defined(_POSIX_SAVED_IDS) && _POSIX_SAVED_IDS > 0
+ #define HAS_SAVED_IDS_AND_SETEUID
+ #endif
+ #if defined(WIN32)
+diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
+index a71b25d..0df31ae 100644
+--- a/include/xorg-config.h.in
++++ b/include/xorg-config.h.in
+@@ -139,4 +139,7 @@
+ /* Have X server platform bus support */
+ #undef XSERVER_PLATFORM_BUS
+
++/* Define to 1 if you have the `seteuid' function. */
++#undef HAVE_SETEUID
++
+ #endif /* _XORG_CONFIG_H_ */
+--
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index e05122f..ed90d53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@
## Ubuntu patches start with 100.
001_fedora_extramodes.patch
02_Add-libnettle-as-option-for-sha1.diff
+02_improve-posix-saved-ids-check.diff
03_fix-panning.diff
#13_debian_add_xkbpath_env_variable.diff
04_int10-fix-pci_device_read_rom-usage.diff
commit b56298b5219e7f237131f37ea0b7a4d68b1aff81
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 27 18:51:09 2013 +0200
Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.
Require dpkg-dev 1.16.1 for dpkg-buildflags --export=configure.
Conflicts:
debian/changelog
diff --git a/debian/control b/debian/control
index 6077dec..b6ab21f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
# everything on is for the DMX and Xnest servers.
Build-Depends:
debhelper (>= 7),
+ dpkg-dev (>= 1.16.1),
quilt,
lsb-release,
pkg-config,
diff --git a/debian/rules b/debian/rules
index 7308463..e102143 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,21 +16,6 @@ $(STAMP_DIR)/stampdir:
include /usr/share/quilt/quilt.make
-# we don't have a good way to check for dpkg-dev version, so use presence of
-# buildflags.mk as a substitute.
-ifneq (,$(wildcard /usr/share/dpkg/buildflags.mk))
-vars = $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,-Bsymbolic" DEB_CPPFLAGS_MAINT_APPEND="-DPRE_RELEASE=0" dpkg-buildflags --export=configure)
-else
-CFLAGS = -Wall -g
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-CPPFLAGS = -DPRE_RELEASE=0
-vars = CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)"
-endif
-
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
@@ -79,11 +64,14 @@ else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
config_backend += --disable-config-udev
config_backend_main += --enable-config-hal
config_backend_udeb += --disable-config-hal
- libs = LIBS=-lbsd
+ libs = $(shell pkg-config --libs libbsd-overlay)
+ cppflags = $(shell pkg-config --cflags libbsd-overlay)
else # hurd
config_backend += --disable-config-udev --disable-config-hal
endif
+vars = $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,-Bsymbolic" DEB_CPPFLAGS_MAINT_APPEND="-DPRE_RELEASE=0 $(cppflags)" dpkg-buildflags --export=configure) LIBS="$(libs)"
+
ifneq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
config_tests = --disable-unit-tests
else
@@ -127,8 +115,7 @@ confflags += \
--disable-xquartz \
--disable-xwin \
--disable-xfake \
- --disable-install-setuid \
- $(libs)
+ --disable-install-setuid
confflags_main = \
--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType,built-ins" \
commit e74ce3cf7ee92479861170dcc003da1e58010b2a
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Jul 9 12:19:59 2011 +0200
Remove the Replaces: xdmx from xdmx-tools, that was before lenny.
[cherry-pick from the 2:1.10.3-1 package version]
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 9a468f3..c90609e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.14.2.901-3) UNRELEASED; urgency=low
+
+ * Remove the Replaces: xdmx from xdmx-tools, that was before lenny. That
+ change was done in the 1.10.x timeframe and then lost when moving to
+ 1.11.x.
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 13 Aug 2013 19:48:22 +0200
+
xorg-server (2:1.14.2.901-2) experimental; urgency=low
* Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.
diff --git a/debian/control b/debian/control
index 9901864..f06251e 100644
--- a/debian/control
+++ b/debian/control
@@ -222,7 +222,6 @@ Depends:
xdmx,
${shlibs:Depends},
${misc:Depends},
-Replaces: xdmx (<= 2:1.1.1-10)
Description: Distributed Multihead X tools
This package provides a collection of tools used for administration of
the Xdmx server; see the xdmx package for more information.
Reply to: