Bug#748203: xorg-server: Please enable logind support
Hello again,
I've attached here a 2nd patch that enable the setuid wrapper (and
replaces the X binary that is currently shipped by the xserver-xorg
binary package).
I've tested with the radeon driver (1:7.4.0-2) and
xserver-xorg-input-evdev 1:2.9.0-1. Unfortunately but it's NOT
currently working with nouveau driver yet (the patches for nouveau are
already in the upstream git repository)
With this patch xserver-xorg-core and xserver-xorg are conflicting with
each other so for testing purpose the files needs to be manually
diverted:
dpkg-divert --package xserver-xorg-core --divert /usr/bin/X.orig --rename /usr/bin/X
dpkg-divert --package xserver-xorg-core --divert /usr/share/man/man5/Xwrapper.config.5.gz.orig --rename /usr/share/man/man5/Xwrapper.config.5.gz
We'll have to discuss and see what we gonna do with the debian specific
wrapper.
Cheers,
Laurent Bigonville
diff -u xorg-server-1.16.0/debian/rules xorg-server-1.16.0/debian/rules
--- xorg-server-1.16.0/debian/rules
+++ xorg-server-1.16.0/debian/rules
@@ -149,6 +149,7 @@
--enable-xfree86-utils \
$(wayland) \
$(logind) \
+ --enable-suid-wrapper \
--enable-dmx \
--enable-xvfb \
--enable-xnest \
@@ -182,6 +183,7 @@
--disable-xfree86-utils \
--disable-xwayland \
--disable-systemd-logind \
+ --disable-suid-wrapper \
--disable-dmx \
--disable-xvfb \
--disable-xnest \
@@ -218,6 +220,7 @@
--infodir=\$${prefix}/share/info \
--sysconfdir=/etc \
--localstatedir=/var \
+ --libexecdir=\$${prefix}/lib/xorg-server \
$(confflags) \
$(confflags_$*) \
$(vars)
@@ -308,6 +311,8 @@
dh_lintian
dh_compress
dh_fixperms
+ -chown root:root $(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg-server/Xorg.wrap
+ -chmod ug+s $(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg-server/Xorg.wrap
dh_installdeb
dh_shlibdeps
dh_gencontrol
diff -u xorg-server-1.16.0/debian/xserver-xorg-core.install xorg-server-1.16.0/debian/xserver-xorg-core.install
--- xorg-server-1.16.0/debian/xserver-xorg-core.install
+++ xorg-server-1.16.0/debian/xserver-xorg-core.install
@@ -3,10 +3,14 @@
+main/usr/bin/X usr/bin
main/usr/share/man/man1/Xorg.1 usr/share/man/man1
main/usr/share/man/man4/exa.4 usr/share/man/man4
main/usr/share/man/man4/fbdevhw.4 usr/share/man/man4
main/usr/share/man/man5/xorg.conf.5 usr/share/man/man5
main/usr/share/man/man5/xorg.conf.d.5 usr/share/man/man5
+main/usr/share/man/man1/Xorg.wrap.1 usr/share/man/man1
+main/usr/share/man/man5/Xwrapper.config.5 usr/share/man/man5
main/usr/bin/cvt usr/bin
main/usr/bin/gtf usr/bin
main/usr/share/man/man1/cvt.1 usr/share/man/man1
main/usr/share/man/man1/gtf.1 usr/share/man/man1
main/usr/share/X11/xorg.conf.d usr/share/X11/
+main/usr/lib/xorg-server/* usr/lib/xorg-server/
Reply to: