xorg: Changes to 'ubuntu'
debian/changelog | 2633 -------------------------------
debian/control | 6
debian/local/xserver-wrapper.c | 14
debian/po/sr.po | 60
debian/po/sr@latin.po | 61
debian/rules | 9
debian/scripts/vars.s390x | 8
debian/xserver-xorg.postinst.in | 17
xsf-docs/index.txt | 1
xsf-docs/reference/squeeze-backports.txt | 134 -
10 files changed, 291 insertions(+), 2652 deletions(-)
New commits:
commit f2dba93ad941cbc42fb4adc0b6c0ce2b63b7c0bc
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Dec 15 23:46:14 2011 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 13dc513..632ff14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+10) UNRELEASED; urgency=low
+xorg (1:7.6+10) unstable; urgency=high
* Fixes for xserver-wrapper:
- when we drop privileges, don't forget to also reset effective group id,
@@ -9,7 +9,7 @@ xorg (1:7.6+10) UNRELEASED; urgency=low
- use major() and minor() macros instead of manually extracting them
* Build the X wrapper with hardening enabled.
- -- Julien Cristau <jcristau@debian.org> Tue, 01 Nov 2011 15:13:52 +0100
+ -- Julien Cristau <jcristau@debian.org> Thu, 15 Dec 2011 23:45:48 +0100
xorg (1:7.6+9) unstable; urgency=low
commit 0ebabb840bf52e5e5347414487668ae26ec16332
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Dec 15 21:22:22 2011 +0100
Build the X wrapper with hardening enabled.
diff --git a/debian/changelog b/debian/changelog
index 20d3f7f..13dc513 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xorg (1:7.6+10) UNRELEASED; urgency=low
things like /dev/tty and /dev/ptmx, which are world-readable (closes:
#652249). Thanks to vladz for the report.
- use major() and minor() macros instead of manually extracting them
+ * Build the X wrapper with hardening enabled.
-- Julien Cristau <jcristau@debian.org> Tue, 01 Nov 2011 15:13:52 +0100
diff --git a/debian/control b/debian/control
index b825221..dfa7aa4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
Standards-Version: 3.9.2
Build-Depends:
+ dpkg (>= 1.16.1),
debhelper (>= 7),
po-debconf,
# xsf-docs:
diff --git a/debian/rules b/debian/rules
index 861737a..8d2c970 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,13 @@ CC=$(DEB_HOST_GNU_TYPE)-gcc
else
CC ?=gcc
endif
+CFLAGS = \
+ -Wall \
+ $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get CFLAGS)
+CPPFLAGS = \
+ $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get CPPFLAGS)
+LDFLAGS = \
+ $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get LDFLAGS)
# debhelper
export DH_OPTIONS
@@ -49,7 +56,7 @@ build: build-stamp
build-stamp: scripts-stamp
dh_testdir
# build Debian's X server wrapper
- $(CC) -Wall -g -O2 -o debian/local/X debian/local/xserver-wrapper.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o debian/local/X debian/local/xserver-wrapper.c
$(MAKE) -C xsf-docs
touch $@
commit 1d5cfd6fe0d46fcfcb6f79316cdc600f6da77f54
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Dec 15 21:06:31 2011 +0100
xserver-wrapper: use major() and minor() macros instead of manually extracting them
diff --git a/debian/changelog b/debian/changelog
index ac28258..20d3f7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
xorg (1:7.6+10) UNRELEASED; urgency=low
- * xserver-wrapper: when we drop privileges, don't forget to also reset
- effective group id, since we're installed setgid root.
- * xserver-wrapper: revert change to allow devices with major 5 as consoles.
- This includes things like /dev/tty and /dev/ptmx, which are
- world-readable (closes: #652249). Thanks to vladz for the report.
+ * Fixes for xserver-wrapper:
+ - when we drop privileges, don't forget to also reset effective group id,
+ since we're installed setgid root.
+ - revert change to allow devices with major 5 as consoles. This includes
+ things like /dev/tty and /dev/ptmx, which are world-readable (closes:
+ #652249). Thanks to vladz for the report.
+ - use major() and minor() macros instead of manually extracting them
-- Julien Cristau <jcristau@debian.org> Tue, 01 Nov 2011 15:13:52 +0100
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index 1e0d416..d4a6ab8 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -162,8 +162,8 @@ onConsole()
return FALSE;
}
if (S_ISCHR(s.st_mode) &&
- (((s.st_rdev >> 8) & 0xff) == TTY_MAJOR_DEV &&
- (s.st_rdev & 0xff) < 64)) {
+ (major(s.st_rdev) == TTY_MAJOR_DEV &&
+ minor(s.st_rdev) < 64)) {
return TRUE;
}
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
commit acc6eda78b98d8a7af554bc578f5fdc21ec934bb
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Dec 15 21:02:12 2011 +0100
xserver-wrapper: revert change to allow devices with major 5 as consoles.
This includes things like /dev/tty and /dev/ptmx, which are
world-readable (closes: #652249). Thanks to vladz for the report.
diff --git a/debian/changelog b/debian/changelog
index 475555f..ac28258 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ xorg (1:7.6+10) UNRELEASED; urgency=low
* xserver-wrapper: when we drop privileges, don't forget to also reset
effective group id, since we're installed setgid root.
+ * xserver-wrapper: revert change to allow devices with major 5 as consoles.
+ This includes things like /dev/tty and /dev/ptmx, which are
+ world-readable (closes: #652249). Thanks to vladz for the report.
-- Julien Cristau <jcristau@debian.org> Tue, 01 Nov 2011 15:13:52 +0100
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index bfb28d4..1e0d416 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -83,6 +83,7 @@
* Julien Cristau: don't check the mode of the DRI device directory
* (11 Aug 2009)
* Julien Cristau: also drop group privileges (1 Nov 2011)
+ * Julien Cristau: disallow major 5 again for consoles (15 Dec 2011)
*
* This is free software; you may redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -113,7 +114,6 @@
#if defined(__linux__)
#define TTY_MAJOR_DEV 4
-#define ALT_TTY_MAJOR_DEV 5
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <sys/consio.h>
#endif
@@ -162,11 +162,8 @@ onConsole()
return FALSE;
}
if (S_ISCHR(s.st_mode) &&
- ((((s.st_rdev >> 8) & 0xff) == TTY_MAJOR_DEV &&
- (s.st_rdev & 0xff) < 64) ||
- (((s.st_rdev >> 8) & 0xff) == ALT_TTY_MAJOR_DEV &&
- (s.st_rdev & 0xff) < 64)
- )) {
+ (((s.st_rdev >> 8) & 0xff) == TTY_MAJOR_DEV &&
+ (s.st_rdev & 0xff) < 64)) {
return TRUE;
}
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
commit e81b3943be75ca6674867fc7756905490e979522
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Nov 1 15:15:04 2011 +0100
Fix privileges dropping in the X wrapper
xserver-wrapper: when we drop privileges, don't forget to also reset
effective group id, since we're installed setgid root.
diff --git a/debian/changelog b/debian/changelog
index f2198f9..475555f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.6+10) UNRELEASED; urgency=low
+
+ * xserver-wrapper: when we drop privileges, don't forget to also reset
+ effective group id, since we're installed setgid root.
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 01 Nov 2011 15:13:52 +0100
+
xorg (1:7.6+9) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index db503b5..bfb28d4 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -82,6 +82,7 @@
* -showDefaultLibPath options (11 Aug 2009)
* Julien Cristau: don't check the mode of the DRI device directory
* (11 Aug 2009)
+ * Julien Cristau: also drop group privileges (1 Nov 2011)
*
* This is free software; you may redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -313,12 +314,12 @@ main(int argc, char **argv)
for (i = 1; i < argc; i++) {
if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config")) {
- if (setuid(getuid())) {
+ if (setgid(getgid()) || setuid(getuid())) {
perror("X unable to drop setuid privileges for alternate config");
exit(1);
}
} else if (strlen(argv[i]) > 256) {
- if (setuid(getuid())) {
+ if (setgid(getgid()) || setuid(getuid())) {
perror("X unable to drop setuid privileges for suspiciously long "
"argument");
exit(1);
@@ -354,7 +355,7 @@ main(int argc, char **argv)
(strcmp(argv[1], "-version") == 0) ||
(strcmp(argv[1], "-showDefaultModulePath") == 0) ||
(strcmp(argv[1], "-showDefaultLibPath") == 0) ) ) {
- if (setuid(getuid())) {
+ if (setgid(getgid()) || setuid(getuid())) {
perror("X unable to drop setuid privileges");
exit(1);
}
commit b30bcf426b34f7fe048b3fd87deef22e2d960e21
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Sep 24 11:09:04 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 22f9b19..f2198f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-xorg (1:7.6+9) UNRELEASED; urgency=low
+xorg (1:7.6+9) unstable; urgency=low
+ [ Julien Cristau ]
* Copy debian/scripts/vars.s390 to debian/scripts/vars.s390x
(closes: #637902). Thanks, Aurélien Jarno!
* Bump xserver-xorg-core dependency to 1.11.
- -- Julien Cristau <jcristau@debian.org> Mon, 15 Aug 2011 20:16:17 +0200
+ -- Cyril Brulebois <kibi@debian.org> Sat, 24 Sep 2011 11:08:54 +0200
xorg (1:7.6+8) unstable; urgency=high
commit b58174338173195e4a0d07ecd1e94289db66147c
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Fri Sep 9 15:34:08 2011 +0300
releasing version 1:7.6+7ubuntu7
diff --git a/debian/changelog b/debian/changelog
index 8a2c372..1854c1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg (1:7.6+7ubuntu7) UNRELEASED; urgency=low
+xorg (1:7.6+7ubuntu7) oneiric; urgency=low
* Add '/etc/init/failsafe-x.conf' to the list of old failsafe-x config
files to purge.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 26 Aug 2011 11:49:20 +0300
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 09 Sep 2011 15:33:19 +0300
xorg (1:7.6+7ubuntu6) oneiric; urgency=low
commit 9eb70d982a6d1d757c53085701eb12a7f700b5c7
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Sep 8 21:24:54 2011 +0200
Bump xserver-xorg-core dependency to 1.11.
diff --git a/debian/changelog b/debian/changelog
index 2cedd60..22f9b19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg (1:7.6+9) UNRELEASED; urgency=low
* Copy debian/scripts/vars.s390 to debian/scripts/vars.s390x
(closes: #637902). Thanks, Aurélien Jarno!
+ * Bump xserver-xorg-core dependency to 1.11.
-- Julien Cristau <jcristau@debian.org> Mon, 15 Aug 2011 20:16:17 +0200
diff --git a/debian/control b/debian/control
index 20d09b4..b825221 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Description: X Window System (X.Org) infrastructure
Package: xserver-xorg
Architecture: any
Depends:
- xserver-xorg-core (>= 2:1.9.0.901),
+ xserver-xorg-core (>= 2:1.11),
xserver-xorg-video-all | xorg-driver-video,
xserver-xorg-input-all | xorg-driver-input,
xserver-xorg-input-evdev [linux-any],
commit 31daee6d5acf73478e5203c7d3542146201bd2b9
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 15 20:17:45 2011 +0200
Copy debian/scripts/vars.s390 to debian/scripts/vars.s390x (closes: #637902).
Thanks, Aurélien Jarno!
diff --git a/debian/changelog b/debian/changelog
index 2fbbd56..2cedd60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.6+9) UNRELEASED; urgency=low
+
+ * Copy debian/scripts/vars.s390 to debian/scripts/vars.s390x
+ (closes: #637902). Thanks, Aurélien Jarno!
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 15 Aug 2011 20:16:17 +0200
+
xorg (1:7.6+8) unstable; urgency=high
[ Julien Cristau ]
diff --git a/debian/scripts/vars.s390x b/debian/scripts/vars.s390x
new file mode 100644
index 0000000..525866e
--- /dev/null
+++ b/debian/scripts/vars.s390x
@@ -0,0 +1,8 @@
+
+# This file is NOT a shell script.
+#
+# This file gets included by both debian/rules (make) AND the scripts in
+# debian/scripts (Bourne shell).
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-dummy"
+
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-void"
commit 737214d2dfa2016a749eafd3c622c8ef4933630e
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Aug 14 23:11:09 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index bff3516..2fbbd56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+8) UNRELEASED; urgency=high
+xorg (1:7.6+8) unstable; urgency=high
[ Julien Cristau ]
* Add Provides: xserver to xserver-xorg.
@@ -15,7 +15,7 @@ xorg (1:7.6+8) UNRELEASED; urgency=high
missing step.
* Run debian-updatepo, and specify language fields.
- -- Julien Cristau <jcristau@debian.org> Mon, 01 Aug 2011 01:23:42 +0200
+ -- Cyril Brulebois <kibi@debian.org> Sun, 14 Aug 2011 23:11:05 +0200
xorg (1:7.6+7) unstable; urgency=low
commit e51f122c60b81df53fa34b12a1d8e29cd1835d15
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Aug 14 23:10:59 2011 +0200
Bump urgency again.
diff --git a/debian/changelog b/debian/changelog
index 5277d96..bff3516 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+8) UNRELEASED; urgency=medium
+xorg (1:7.6+8) UNRELEASED; urgency=high
[ Julien Cristau ]
* Add Provides: xserver to xserver-xorg.
@@ -10,7 +10,9 @@ xorg (1:7.6+8) UNRELEASED; urgency=medium
[ Cyril Brulebois ]
* Merge xsf-docs up to the f931b66804 commit:
- Update: reference/squeeze-backports
- * Set urgency to “medium” for the HAL vs. GNU/kFreeBSD bug fix.
+ * Set urgency to “medium” for the HAL vs. GNU/kFreeBSD bug fix, and then
+ to “high” to speed up backporting since this source package is the last
+ missing step.
* Run debian-updatepo, and specify language fields.
-- Julien Cristau <jcristau@debian.org> Mon, 01 Aug 2011 01:23:42 +0200
commit 0431ec1258d2c1a208c1247aba1686fdaf0b0099
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Aug 14 23:08:50 2011 +0200
Update documentation.
diff --git a/debian/changelog b/debian/changelog
index 65fab5a..5277d96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ xorg (1:7.6+8) UNRELEASED; urgency=medium
(closes: #624398).
[ Cyril Brulebois ]
- * Merge xsf-docs up to the 58c0ca7f5c commit:
+ * Merge xsf-docs up to the f931b66804 commit:
- Update: reference/squeeze-backports
* Set urgency to “medium” for the HAL vs. GNU/kFreeBSD bug fix.
* Run debian-updatepo, and specify language fields.
commit f931b66804f2288a37a540be4aadf6b5615494da
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Aug 14 23:07:35 2011 +0200
squeeze-backports: Mention the Linux kernel.
diff --git a/xsf-docs/reference/squeeze-backports.txt b/xsf-docs/reference/squeeze-backports.txt
index 214a003..e9e3a1f 100644
--- a/xsf-docs/reference/squeeze-backports.txt
+++ b/xsf-docs/reference/squeeze-backports.txt
@@ -66,3 +66,7 @@ sufficient:
----
apt-get install -t squeeze-backports xorg xserver-xorg xserver-xorg-core xserver-xorg-input-synaptics xserver-xorg-video-intel
----
+
+It is probably a very good idea to install the Linux kernel from
+`squeeze-backports` as well. It is even required for the `nouveau`
+video driver.
commit f1586b8f1674e0f7510a2ed4681399fc29e45159
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Aug 14 23:00:54 2011 +0200
Run debian-updatepo, and specify language fields.
diff --git a/debian/changelog b/debian/changelog
index ad05ec5..65fab5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xorg (1:7.6+8) UNRELEASED; urgency=medium
* Merge xsf-docs up to the 58c0ca7f5c commit:
- Update: reference/squeeze-backports
* Set urgency to “medium” for the HAL vs. GNU/kFreeBSD bug fix.
+ * Run debian-updatepo, and specify language fields.
-- Julien Cristau <jcristau@debian.org> Mon, 01 Aug 2011 01:23:42 +0200
diff --git a/debian/po/sr.po b/debian/po/sr.po
index be90b6d..9a40e81 100644
--- a/debian/po/sr.po
+++ b/debian/po/sr.po
@@ -12,6 +12,7 @@ msgstr ""
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Zlatan Todoric <zlatan.todoric@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: Serbian cyrillic\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -51,9 +52,9 @@ msgid ""
"compromise is to permit the X server to be started only by users logged in "
"to one of the virtual consoles."
msgstr ""
-"Због покретања Х сервера са суперкорисничким привилегијам, није препоручљиво"
-"дозволити корисницима да га покрену, из сигурносних разлога. С друге стране, још"
-"мање је препоручљиво покренути Х клијента опште намјене као главни корисник, што "
-"се може десити ако је само главном кориснику дозвољено да покрене Х сервер."
-"Компромис би био дозволити покретање Х сервера од стране корисника који су само"
-"улоговани на једну од виртуелних конзола."
+"Због покретања Х сервера са суперкорисничким привилегијам, није "
+"препоручљиводозволити корисницима да га покрену, из сигурносних разлога. С "
+"друге стране, јошмање је препоручљиво покренути Х клијента опште намјене као "
+"главни корисник, што се може десити ако је само главном кориснику дозвољено "
+"да покрене Х сервер.Компромис би био дозволити покретање Х сервера од стране "
+"корисника који су самоулоговани на једну од виртуелних конзола."
diff --git a/debian/po/sr@latin.po b/debian/po/sr@latin.po
index fbb6944..fe37e2e 100644
--- a/debian/po/sr@latin.po
+++ b/debian/po/sr@latin.po
@@ -12,6 +12,7 @@ msgstr ""
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Zlatan Todoric <zlatan.todoric@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: Serbian latin\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -51,9 +52,10 @@ msgid ""
"compromise is to permit the X server to be started only by users logged in "
"to one of the virtual consoles."
msgstr ""
-"Zbog pokretanja X servera sa superkorisničkim privilegijam, nije preporučljivo"
-"dozvoliti korisnicima da ga pokrenu, iz sigurnosnih razloga. S druge strane, još"
-"manje je preporučljivo pokrenuti X klijenta opšte namjene kao glavni korisnik, što"
-"se može desiti ako je samo glavnom korisniku dozvoljeno da pokrene X server."
-"Kompromis bi bio dozvoliti pokretanje X servera od strane korisnika koji su samo"
-"ulogovani na jednu od virtuelnih konzola."
+"Zbog pokretanja X servera sa superkorisničkim privilegijam, nije "
+"preporučljivodozvoliti korisnicima da ga pokrenu, iz sigurnosnih razloga. S "
+"druge strane, jošmanje je preporučljivo pokrenuti X klijenta opšte namjene "
+"kao glavni korisnik, štose može desiti ako je samo glavnom korisniku "
+"dozvoljeno da pokrene X server.Kompromis bi bio dozvoliti pokretanje X "
+"servera od strane korisnika koji su samoulogovani na jednu od virtuelnih "
+"konzola."
commit 98adffe5cd75b7934b704b77dd2f60ccc5e4e62a
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Aug 14 22:52:54 2011 +0200
Set urgency to “medium” for the HAL vs. GNU/kFreeBSD bug fix.
diff --git a/debian/changelog b/debian/changelog
index 0477e3f..ad05ec5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+8) UNRELEASED; urgency=low
+xorg (1:7.6+8) UNRELEASED; urgency=medium
[ Julien Cristau ]
* Add Provides: xserver to xserver-xorg.
@@ -10,6 +10,7 @@ xorg (1:7.6+8) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Merge xsf-docs up to the 58c0ca7f5c commit:
- Update: reference/squeeze-backports
+ * Set urgency to “medium” for the HAL vs. GNU/kFreeBSD bug fix.
-- Julien Cristau <jcristau@debian.org> Mon, 01 Aug 2011 01:23:42 +0200
commit 149c5d376910adb36aa26bb64f0bed1467a814ed
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Aug 14 22:51:03 2011 +0200
Document the xsf-docs merge.
diff --git a/debian/changelog b/debian/changelog
index 35ba425..0477e3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
xorg (1:7.6+8) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Add Provides: xserver to xserver-xorg.
* Add Serbian cyrillic and Serbian latin debconf translations (closes:
#635009, #635016). Thanks, Zlatan Todoric!
* Use dbus activation to restart hal on kfreebsd, its init script is gone
(closes: #624398).
+ [ Cyril Brulebois ]
+ * Merge xsf-docs up to the 58c0ca7f5c commit:
+ - Update: reference/squeeze-backports
+
-- Julien Cristau <jcristau@debian.org> Mon, 01 Aug 2011 01:23:42 +0200
xorg (1:7.6+7) unstable; urgency=low
commit 58c0ca7f5c2de8edd1ad5c1a32e71d65cc577432
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Aug 14 22:43:18 2011 +0200
squeeze-backports: Fix typo.
diff --git a/xsf-docs/reference/squeeze-backports.txt b/xsf-docs/reference/squeeze-backports.txt
index a54ebd0..214a003 100644
--- a/xsf-docs/reference/squeeze-backports.txt
+++ b/xsf-docs/reference/squeeze-backports.txt
@@ -12,7 +12,7 @@ to: the server itself, input and video drivers, libdrm, and mesa.
To keep things simple, the idea is to backport all of those to
`squeeze` through `squeeze-backports`, along with some of the
additional packages which might be involved (like `libxfont` or
-`x11proto-xfixes-dev`).
+`x11proto-fixes-dev`).
The backports were prepared so that it’s possible to upgrade the
`input-all` and `video-all` meta packages on `amd64` and `i386`. If
commit d60d3c7c6cdef76b029c0832fd277ca89e8b592e
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Aug 14 22:39:45 2011 +0200
squeeze-backports: Update title, and drop ToC.
diff --git a/xsf-docs/reference/squeeze-backports.txt b/xsf-docs/reference/squeeze-backports.txt
index 300596d..a54ebd0 100644
--- a/xsf-docs/reference/squeeze-backports.txt
+++ b/xsf-docs/reference/squeeze-backports.txt
@@ -1,6 +1,5 @@
-Backports policy for squeeze
-============================
-:toc:
+Backports for squeeze
+=====================
Cyril Brulebois <kibi@debian.org>
commit abb2a7005f0fadec0213962f06af3efa8a9ad0b5
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Aug 14 22:38:34 2011 +0200
squeeze-backports: Mention best effort.
diff --git a/xsf-docs/reference/squeeze-backports.txt b/xsf-docs/reference/squeeze-backports.txt
index 5e0f265..300596d 100644
--- a/xsf-docs/reference/squeeze-backports.txt
+++ b/xsf-docs/reference/squeeze-backports.txt
@@ -15,6 +15,13 @@ To keep things simple, the idea is to backport all of those to
additional packages which might be involved (like `libxfont` or
`x11proto-xfixes-dev`).
+The backports were prepared so that it’s possible to upgrade the
+`input-all` and `video-all` meta packages on `amd64` and `i386`. If
+specific drivers (maintained by the X Strike Force) are wanted,
+requesting them on the `debian-backports@` / `debian-x@` mailing lists
+should do the trick. For other drivers, please contact the relevant
+package maintainers.
+
Instructions
------------
commit 5b047a8a718a5e2aadfd06ad731b1996eb3181c2
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Aug 14 22:06:42 2011 +0200
squeeze-backports: Rework doc.
diff --git a/xsf-docs/reference/squeeze-backports.txt b/xsf-docs/reference/squeeze-backports.txt
index 11c2e30..5e0f265 100644
--- a/xsf-docs/reference/squeeze-backports.txt
+++ b/xsf-docs/reference/squeeze-backports.txt
@@ -4,73 +4,59 @@ Backports policy for squeeze
Cyril Brulebois <kibi@debian.org>
-Proposed plans
---------------
+Bird’s-eye view
+---------------
If one forgets about libraries and clients, a whole X stack boils down
to: the server itself, input and video drivers, libdrm, and mesa.
-Since upgrading the server means upgrading all input and video drivers
-(more than 50 source packages), that’s certainly too much to backport,
-since we’re already trying to support `stable` (through stable
-updates), `testing`/`unstable`, and `experimental`. For example, in
-February 2011, that means `xorg-server` 1.7 in `stable`, 1.9 in
-`unstable` (and “soon” in `testing`), and 1.10 in `experimental`.
-
-So the plan is to keep `xorg-server` as it is in `squeeze` (possibly
-preparing/testing targeted fix if appropriate), and backporting
-drivers when possible. With API/ABI updates, the minimal server
-version required tend to get raised from time to time, but usually
-drivers can be built against a rather large range of server
-versions. In case a driver stop building against the server available
-in `stable`, we’ll likely stick to the highest version still building
-against it, and then tell people to upgrade the whole stack if they
-need something more recent (unless some trivial cherry-picking is
-possible, of course).
-
-The plan is to backport a few drivers on a possibly regular fashion,
-and other drivers upon request.
-
-
-Input drivers
-~~~~~~~~~~~~~
-
- * `evdev`: Linux-only keyboard & mouse/pointer driver.
- * `keyboard` and `mouse`: Needed for non-Linux ports.
- * `synaptics`: Better touchpad support than `evdev`.
-
-
-Video drivers
-~~~~~~~~~~~~~
-
- * `ati`: Drivers for ATI cards.
- * `intel`: Driver for Intel cards.
- * `nouveau`: Driver for NVidia cards. Not possible since upstream’s http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nouveau.git;a=commit;h=a4d580bf05d7aac1d486e5d1ba9a2201c026e5f5[a4d580bf05].
- * `fbdev` and `vesa`: Generic drivers.
- * `dummy`: Dummy driver, suitable when there’s no monitor connected.
-
-.Note
-There are a few other drivers for ATI cards (`mach64`, `r128`), which
-are pulled by `ati`, but there are versions available in `squeeze`
-already, so backporting them isn’t required.
-
-
-Libraries
-~~~~~~~~~
-
-The important libraries are `libdrm` and `mesa`. The former will
-likely get pulled at some point by a driver, so a backport will be
-needed for this library. The latter is under very heavy development,
-so one may want to try a new release or a snapshot without having to
-upgrade everything to `unstable`. It’s a huge package to build, so we
-link:../howto/build-mesa.html[documented how to build it] locally. But
-there’s some hope to make some weekly or daily builds available at
-some point.
-
-
-Kernel
-~~~~~~
-
-Some of those drivers might need a more recent kernel version than
-the one in `squeeze`, but hopefully it’ll be available through
-`squeeze-backports` as well.
+To keep things simple, the idea is to backport all of those to
+`squeeze` through `squeeze-backports`, along with some of the
+additional packages which might be involved (like `libxfont` or
+`x11proto-xfixes-dev`).
+
+
+Instructions
+------------
+
+The usual link:http://backports-master.debian.org/[backports instructions]
+apply. But let’s gather everything in a single place.
+
+Add that to your `sources.list`:
+----
+deb http://backports.debian.org/debian-backports squeeze-backports main
+----
+
+Update your cache:
+----
+apt-get update
+----
+
+If you’re interested in just upgrading the usual `mesa` packages:
+----
+apt-get install -t squeeze-backports libgl1-mesa-dri libgl1-mesa-glx
+----
+
+If you want the whole stack, we should distinguish between two
+cases.
+
+In the usual case, both the `xserver-xorg-input-all` and
+`xserver-xorg-video-all` meta packages were installed, and pulled a
+lot of packages, which should work for most users. In that case, due
+to a bug in `apt`, one has to remove the `wacom` input package before
+proceeding to the upgrade (the `xserver-xorg-input-all` package might
+be scheduled for removal as a consequence, but that doesn’t
+hurt). Then specifying a few packages to upgrade should pull
+everything from `squeeze-backports`.
+
+----
+apt-get purge xserver-xorg-input-wacom
+apt-get install -t squeeze-backports xorg xserver-xorg xserver-xorg-core xserver-xorg-input-all xserver-xorg-video-all
+----
+
+In case only the needed packages were installed, like the `synaptics`
+input driver and the `intel` video driver, the following should be
+sufficient:
+----
+apt-get install -t squeeze-backports xorg xserver-xorg xserver-xorg-core xserver-xorg-input-synaptics xserver-xorg-video-intel
+----
commit e4d5a2aa626bdae31cbbd0095719adcfde89b8a0
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 12 12:56:16 2011 +0200
Use dbus activation to restart hal on kfreebsd, its init script is gone
Closes: #624398
diff --git a/debian/changelog b/debian/changelog
index 24db1a3..35ba425 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xorg (1:7.6+8) UNRELEASED; urgency=low
* Add Provides: xserver to xserver-xorg.
* Add Serbian cyrillic and Serbian latin debconf translations (closes:
#635009, #635016). Thanks, Zlatan Todoric!
+ * Use dbus activation to restart hal on kfreebsd, its init script is gone
+ (closes: #624398).
-- Julien Cristau <jcristau@debian.org> Mon, 01 Aug 2011 01:23:42 +0200
diff --git a/debian/control b/debian/control
index e0fc96c..20d09b4 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Depends:
xserver-xorg-video-all | xorg-driver-video,
xserver-xorg-input-all | xorg-driver-input,
xserver-xorg-input-evdev [linux-any],
- hal (>= 0.5.12~git20090406) [kfreebsd-any],
+ hal (>= 0.5.14-4~) [kfreebsd-any],
${shlibs:Depends},
${misc:Depends},
xkb-data (>= 1.4),
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 5b38145..e595e94 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -137,6 +137,21 @@ if dpkg --compare-versions "$2" lt-nl "1:7.4~3"; then
fi
fi
+get_hal_pid() {
+ dbus-send --system --dest=org.freedesktop.DBus --print-reply \
+ /org/freedesktop/DBus org.freedesktop.DBus.GetConnectionUnixProcessID \
+ string:org.freedesktop.Hal 2>/dev/null | awk '/uint32/ {print $2}'
+}
+
+restart_hal() {
+ # restart hald if it was running before
+ pid=$(get_hal_pid)
+ if [ -n "$pid" ]; then
+ kill $pid 2>/dev/null || true
+ lshal >/dev/null || true # will trigger through D-Bus activation
+ fi
+}
+
case "$1" in
configure)
if dpkg --compare-versions "$2" lt-nl "1:7.3+11"; then
@@ -147,7 +162,7 @@ case "$1" in
fi
if dpkg --compare-versions "$2" lt "1:7.5~3"; then
if [ `uname -s` = "GNU/kFreeBSD" ]; then
- invoke-rc.d hal restart >/dev/null
+ restart_hal
fi
fi
;;
commit 7e7912eb8ed8985210b8fc85ae0ac7341e106f51
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Aug 7 16:42:37 2011 +0200
Add Serbian latin debconf translation
diff --git a/debian/changelog b/debian/changelog
index e0a1288..24db1a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
xorg (1:7.6+8) UNRELEASED; urgency=low
* Add Provides: xserver to xserver-xorg.
- * Add Serbian cyrillic debconf translation (closes: #635009). Thanks,
- Zlatan Todoric!
+ * Add Serbian cyrillic and Serbian latin debconf translations (closes:
+ #635009, #635016). Thanks, Zlatan Todoric!
-- Julien Cristau <jcristau@debian.org> Mon, 01 Aug 2011 01:23:42 +0200
diff --git a/debian/po/sr@latin.po b/debian/po/sr@latin.po
new file mode 100644
index 0000000..fbb6944
--- /dev/null
+++ b/debian/po/sr@latin.po
@@ -0,0 +1,59 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2011
+# This file is distributed under the same license as the PACKAGE package.
+# Zlatan Todoric <zlatan.todoric@gmail.com>, 2011.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
+"POT-Creation-Date: 2009-06-02 20:32+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Zlatan Todoric <zlatan.todoric@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../x11-common.templates:2001
+msgid "Root Only"
+msgstr "Samo glavni korisnik"
+
+#. Type: select
+#. Choices
+#: ../x11-common.templates:2001
+msgid "Console Users Only"
+msgstr "Samo za korisnike konzole"
+
+#. Type: select
+#. Choices
+#: ../x11-common.templates:2001
+msgid "Anybody"
+msgstr "Svako"
+
+#. Type: select
+#. Description
+#: ../x11-common.templates:2002
+msgid "Users allowed to start the X server:"
+msgstr "Korisnici kojima je dozvoljeno pokretanje X servera:"
+
+#. Type: select
+#. Description
+#: ../x11-common.templates:2002
+msgid ""
+"Because the X server runs with superuser privileges, it may be unwise to "
+"permit any user to start it, for security reasons. On the other hand, it is "
+"even more unwise to run general-purpose X client programs as root, which is "
+"what may happen if only root is permitted to start the X server. A good "
+"compromise is to permit the X server to be started only by users logged in "
+"to one of the virtual consoles."
+msgstr ""
+"Zbog pokretanja X servera sa superkorisničkim privilegijam, nije preporučljivo"
+"dozvoliti korisnicima da ga pokrenu, iz sigurnosnih razloga. S druge strane, još"
+"manje je preporučljivo pokrenuti X klijenta opšte namjene kao glavni korisnik, što"
+"se može desiti ako je samo glavnom korisniku dozvoljeno da pokrene X server."
+"Kompromis bi bio dozvoliti pokretanje X servera od strane korisnika koji su samo"
+"ulogovani na jednu od virtuelnih konzola."
commit 1b4179906ca5d4b9a8f512d31cf88aa113f365fc
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Aug 7 16:41:10 2011 +0200
Add Serbian cyrillic debconf translation (closes: #635009).
Thanks, Zlatan Todoric!
diff --git a/debian/changelog b/debian/changelog
index 06ab597..e0a1288 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xorg (1:7.6+8) UNRELEASED; urgency=low
* Add Provides: xserver to xserver-xorg.
+ * Add Serbian cyrillic debconf translation (closes: #635009). Thanks,
+ Zlatan Todoric!
-- Julien Cristau <jcristau@debian.org> Mon, 01 Aug 2011 01:23:42 +0200
diff --git a/debian/po/sr.po b/debian/po/sr.po
new file mode 100644
index 0000000..be90b6d
--- /dev/null
+++ b/debian/po/sr.po
@@ -0,0 +1,59 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2011
+# This file is distributed under the same license as the xorg package.
+# Zlatan Todoric <zlatan.todoric@gmail.com>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
+"POT-Creation-Date: 2009-06-02 20:32+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Zlatan Todoric <zlatan.todoric@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
Reply to: