xorg-server: Changes to 'debian-experimental'
debian/changelog | 9 ++++
debian/control | 1
debian/patches/02_kbsd-issetugid.diff | 57 +++++++++++++++++++++++++++++
debian/patches/03_kbsd-parser-include.diff | 26 +++++++++++++
debian/patches/series | 3 +
debian/rules | 23 ++---------
6 files changed, 100 insertions(+), 19 deletions(-)
New commits:
commit e8236644c6808ac7b21d99867c6a789ad445d9fc
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 27 20:13:48 2013 +0200
kfreebsd build fix
diff --git a/debian/changelog b/debian/changelog
index de97c37..6938725 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ 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.
-- Julien Cristau <jcristau@debian.org> Sat, 27 Jul 2013 18:48:37 +0200
diff --git a/debian/patches/02_kbsd-issetugid.diff b/debian/patches/02_kbsd-issetugid.diff
new file mode 100644
index 0000000..4ac82de
--- /dev/null
+++ b/debian/patches/02_kbsd-issetugid.diff
@@ -0,0 +1,57 @@
+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
new file mode 100644
index 0000000..a03661b
--- /dev/null
+++ b/debian/patches/03_kbsd-parser-include.diff
@@ -0,0 +1,26 @@
+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 b231575..7dc7264 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,8 @@
## Patches with a number < 100 are applied in debian.
## Ubuntu patches start with 100.
001_fedora_extramodes.patch
-#13_debian_add_xkbpath_env_variable.diff
+02_kbsd-issetugid.diff
+03_kbsd-parser-include.diff
05_Revert-Unload-submodules.diff
06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
08_xfree86_fix_ia64_inx_outx.diff
commit 1e2c8637ff648ed3fcd09e81289ac0cbca5c3d7f
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.
diff --git a/debian/changelog b/debian/changelog
index 63f9c84..de97c37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 27 Jul 2013 18:48:37 +0200
+
xorg-server (2:1.14.2.901-1) experimental; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index 90aaa86..9901864 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 993372e..0c3257f 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
@@ -125,8 +113,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: