xorg-server: Changes to 'debian-squeeze'
debian/changelog | 7 +++++++
debian/control | 2 ++
debian/rules | 4 +++-
3 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 752d3d0db0308a2b8243d4bc0f402771a8bd410e
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Mar 13 21:27:49 2013 +0100
Upload to squeeze
diff --git a/debian/changelog b/debian/changelog
index 137c032..6fc6748 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.7.7-15) UNRELEASED; urgency=low
+xorg-server (2:1.7.7-15) squeeze; urgency=low
* Link against -lbsd on kfreebsd to get access to getpeereid() and make
MIT-SHM work with non-world-accessible segments.
- -- Julien Cristau <jcristau@debian.org> Sat, 23 Feb 2013 10:13:16 +0100
+ -- Julien Cristau <jcristau@debian.org> Wed, 13 Mar 2013 21:27:46 +0100
xorg-server (2:1.7.7-14) squeeze; urgency=low
commit 15227a04e43982972502cdbbdc94e427b50b0c65
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Feb 23 10:34:21 2013 +0100
Link against -lbsd on kfreebsd
It gives us access to getpeereid() and makes MIT-SHM work with
non-world-accessible segments. See Debian bug#700530.
diff --git a/debian/changelog b/debian/changelog
index 4d8d03c..137c032 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.7.7-15) UNRELEASED; urgency=low
+
+ * Link against -lbsd on kfreebsd to get access to getpeereid() and make
+ MIT-SHM work with non-world-accessible segments.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 23 Feb 2013 10:13:16 +0100
+
xorg-server (2:1.7.7-14) squeeze; urgency=low
* GLX: add missing input sanitization (CVE-2010-4818). Also fix a couple
diff --git a/debian/control b/debian/control
index 03b0ad3..55eaa8b 100644
--- a/debian/control
+++ b/debian/control
@@ -77,6 +77,8 @@ Build-Depends:
libglib2.0-dev,
xkb-data,
x11-xkb-utils,
+# getpeereid()
+ libbsd-dev [kfreebsd-any],
Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
diff --git a/debian/rules b/debian/rules
index 52c0094..51d271a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,6 +64,7 @@ ifeq ($(DEB_HOST_ARCH_OS), linux)
config_backend += --enable-config-udev --disable-config-hal
else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
config_backend += --disable-config-udev --enable-config-hal
+ libs = LIBS=-lbsd
else # hurd
config_backend += --disable-config-udev --disable-config-hal
endif
@@ -112,7 +113,8 @@ confflags += \
--disable-xwin \
--disable-xsdl \
--disable-xfake \
- --disable-install-setuid
+ --disable-install-setuid \
+ $(libs)
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: