xorg-server: Changes to 'debian-experimental'
debian/changelog | 5 -
debian/patches/02_improve-posix-saved-ids-check.diff | 65 +++++++++++++++++++
debian/patches/02_kbsd-issetugid.diff | 57 ----------------
debian/patches/03_kbsd-parser-include.diff | 26 -------
debian/patches/03_static-nettle.diff | 17 ++++
debian/patches/04_hashtabletest-s390x.diff | 27 +++++++
debian/patches/series | 5 -
7 files changed, 115 insertions(+), 87 deletions(-)
New commits:
commit c1cb0e67380f8d0c21929bd5e8e1dec0cb1c4bc0
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Aug 3 00:10:53 2013 +0200
Fix a test failure on 64bit big-endian (s390x, ppc64, sparc64).
diff --git a/debian/changelog b/debian/changelog
index 17a6253..e705c9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xorg-server (2:1.14.2.901-2) UNRELEASED; urgency=low
Require dpkg-dev 1.16.1.
* Also improve POSIX_SAVED_IDS check to work on kbsd.
* Link against libnettle.a, to unbreak the udeb (there's no libnettle udeb).
+ * Fix a test failure on 64bit big-endian (s390x, ppc64, sparc64).
-- Julien Cristau <jcristau@debian.org> Sat, 27 Jul 2013 18:48:37 +0200
diff --git a/debian/patches/04_hashtabletest-s390x.diff b/debian/patches/04_hashtabletest-s390x.diff
new file mode 100644
index 0000000..0401035
--- /dev/null
+++ b/debian/patches/04_hashtabletest-s390x.diff
@@ -0,0 +1,27 @@
+From 3562cb865b13d6f59e5c3b472d073ad6bbc06ceb Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Fri, 2 Aug 2013 23:40:55 +0200
+Subject: [PATCH] test: include dix-config.h in hashtabletest.c
+
+Missing _XSERVER64 define caused inconsistent sizeof(XID) between the
+test and hashtable code, leading to test failures on 64bit big endian
+archs like s390x or ppc64.
+---
+ test/hashtabletest.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/test/hashtabletest.c b/test/hashtabletest.c
+index 64c7091..6af14a8 100644
+--- a/test/hashtabletest.c
++++ b/test/hashtabletest.c
+@@ -1,3 +1,7 @@
++#ifdef HAVE_DIX_CONFIG_H
++#include <dix-config.h>
++#endif
++
+ #include <misc.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+--
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 015811b..c42a991 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@
001_fedora_extramodes.patch
02_improve-posix-saved-ids-check.diff
03_static-nettle.diff
+04_hashtabletest-s390x.diff
05_Revert-Unload-submodules.diff
06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
08_xfree86_fix_ia64_inx_outx.diff
commit 73d2fba2c9c61d4e4f45089fece8e18a58d9becb
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 2 20:18:37 2013 +0200
Link against libnettle.a, to unbreak the udeb (there's no libnettle udeb).
diff --git a/debian/changelog b/debian/changelog
index 4318093..17a6253 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg-server (2:1.14.2.901-2) UNRELEASED; urgency=low
* Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.
Require dpkg-dev 1.16.1.
* Also improve POSIX_SAVED_IDS check to work on kbsd.
+ * Link against libnettle.a, to unbreak the udeb (there's no libnettle udeb).
-- Julien Cristau <jcristau@debian.org> Sat, 27 Jul 2013 18:48:37 +0200
diff --git a/debian/patches/03_static-nettle.diff b/debian/patches/03_static-nettle.diff
new file mode 100644
index 0000000..4a48338
--- /dev/null
+++ b/debian/patches/03_static-nettle.diff
@@ -0,0 +1,17 @@
+Link against static libnettle
+
+There's no libnettle udeb.
+
+Index: xorg-server/configure.ac
+===================================================================
+--- xorg-server.orig/configure.ac 2013-08-02 20:15:25.471466837 +0200
++++ xorg-server/configure.ac 2013-08-02 20:17:12.875999417 +0200
+@@ -1433,7 +1433,7 @@
+ if test "x$with_sha1" = xlibnettle; then
+ AC_DEFINE([HAVE_SHA1_IN_LIBNETTLE], [1],
+ [Use libnettle SHA1 functions])
+- SHA1_LIBS=-lnettle
++ SHA1_LIBS=-l:libnettle.a
+ fi
+ AC_CHECK_LIB([gcrypt], [gcry_md_open], [HAVE_LIBGCRYPT=yes])
+ if test "x$with_sha1" = x && test "x$HAVE_LIBGCRYPT" = xyes; then
diff --git a/debian/patches/series b/debian/patches/series
index c85071a..015811b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@
## Ubuntu patches start with 100.
001_fedora_extramodes.patch
02_improve-posix-saved-ids-check.diff
+03_static-nettle.diff
05_Revert-Unload-submodules.diff
06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
08_xfree86_fix_ia64_inx_outx.diff
commit d816d729d2746a186ee1489ce4ddc3cdd211fa4b
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
diff --git a/debian/changelog b/debian/changelog
index 6938725..4318093 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,7 @@ xorg-server (2:1.14.2.901-2) UNRELEASED; urgency=low
* Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.
Require dpkg-dev 1.16.1.
- * Also add missing include and AC_CHECK_DECLS([issetugid]) for more kfreebsd
- fail.
+ * Also improve POSIX_SAVED_IDS check to work on kbsd.
-- Julien Cristau <jcristau@debian.org> Sat, 27 Jul 2013 18:48:37 +0200
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/02_kbsd-issetugid.diff b/debian/patches/02_kbsd-issetugid.diff
deleted file mode 100644
index 4ac82de..0000000
--- a/debian/patches/02_kbsd-issetugid.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-From e3eef88873d47ee62df5d01eaf1577e7e71cefe5 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Sat, 27 Jul 2013 20:01:50 +0200
-Subject: [PATCH 1/2] xfree86: Check for issetugid declaration
-
-Avoids 'implicit function declaration' build error on gnu/kfreebsd.
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
----
- configure.ac | 1 +
- hw/xfree86/common/xf86Init.c | 2 +-
- include/xorg-config.h.in | 4 ++++
- 3 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c6ecba4..a93e903 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -213,6 +213,7 @@ AC_CHECK_FUNC([dlopen], [],
- AC_SUBST(DLOPEN_LIBS)
-
- dnl Checks for library functions.
-+AC_CHECK_DECLS([issetugid])
- AC_CHECK_FUNCS([backtrace ffs geteuid getuid issetugid getresuid \
- getdtablesize getifaddrs getpeereid getpeerucred getzoneid \
- mmap shmctl64 strncasecmp vasprintf vsnprintf walkcontext])
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index 91ec4c8..6caaa51 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -253,7 +253,7 @@ xf86PrivsElevated(void)
- privsElevated = TRUE;
- }
- else {
--#if defined(HAVE_ISSETUGID)
-+#if defined(HAVE_ISSETUGID) && HAVE_DECL_ISSETUGID
- privsElevated = issetugid();
- #elif defined(HAVE_GETRESUID)
- uid_t ruid, euid, suid;
-diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
-index a71b25d..d9e7ec5 100644
---- a/include/xorg-config.h.in
-+++ b/include/xorg-config.h.in
-@@ -130,6 +130,10 @@
- /* Use libpciaccess */
- #undef XSERVER_LIBPCIACCESS
-
-+/* Define to 1 if you have the declaration of `issetugid', and to 0 if you
-+ don't. */
-+#undef HAVE_DECL_ISSETUGID
-+
- /* Have setugid */
- #undef HAVE_ISSETUGID
-
---
-1.7.10.4
-
diff --git a/debian/patches/03_kbsd-parser-include.diff b/debian/patches/03_kbsd-parser-include.diff
deleted file mode 100644
index a03661b..0000000
--- a/debian/patches/03_kbsd-parser-include.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-From d9079fc23e3cd7c78885ee9316be11878312d0de Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Sat, 27 Jul 2013 20:09:16 +0200
-Subject: [PATCH 2/2] xfree86: include os.h for FatalError
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
----
- hw/xfree86/parser/write.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c
-index 9c706a0..b525b11 100644
---- a/hw/xfree86/parser/write.c
-+++ b/hw/xfree86/parser/write.c
-@@ -67,6 +67,8 @@
-
- #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
- #define HAS_SAVED_IDS_AND_SETEUID
-+#else
-+#include "os.h"
- #endif
- #if defined(WIN32)
- #define HAS_NO_UIDS
---
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 7dc7264..c85071a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,7 @@
## Patches with a number < 100 are applied in debian.
## Ubuntu patches start with 100.
001_fedora_extramodes.patch
-02_kbsd-issetugid.diff
-03_kbsd-parser-include.diff
+02_improve-posix-saved-ids-check.diff
05_Revert-Unload-submodules.diff
06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
08_xfree86_fix_ia64_inx_outx.diff
Reply to: