xorg-server: Changes to 'debian-unstable'
debian/changelog | 9 ++
debian/control | 1
debian/patches/02_improve-posix-saved-ids-check.diff | 65 +++++++++++++++++++
debian/patches/series | 1
debian/rules | 23 +-----
5 files changed, 81 insertions(+), 18 deletions(-)
New commits:
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" \
Reply to: