xorg: Changes to 'debian-unstable'
debian/changelog | 7 ++++++-
debian/control | 2 +-
debian/local/rgb.txt | 1 +
debian/local/xserver-wrapper.c | 6 +++---
4 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 502e6300b432725fa477637e5485cf24a62f5cec
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Tue May 15 21:59:20 2007 +0200
Add conflict for x11-common against vide (<= 1.21-3).
diff --git a/debian/changelog b/debian/changelog
index 1697581..7e34cb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ xorg (1:7.2-4) UNRELEASED; urgency=low
* Add DebianRed to rgb.txt, closes: #243288.
* Fix possible buffer overflows in xserver-wrapper.c.
Thanks Jochen Voss (closes: #396958).
+ * Add conflict for x11-common against vide (<= 1.21-3).
+ Thanks Pierre Machard, closes: #370167.
[ Timo Aaltonen ]
* Xsession.d/*: change 'which' -> '/usr/bin/which', since the zsh builtin
diff --git a/debian/control b/debian/control
index 3d8c70e..ed93371 100644
--- a/debian/control
+++ b/debian/control
@@ -63,7 +63,7 @@ Conflicts: xfree86-common, xorg-common, xserver-common, x-common,
opera (<< 9.10-20060616), hamsoft (<< 0.2.3-1), phototk, tkworld,
ucbmpeg-play (<< 2.3p-13), netscape-base-4, communicator-smotif-477, epan,
navigator-smotif-477, stella (<< 2.2-1), xfractint (<< 20.3.01-1), xgobi,
- xpostitplus, xisp
+ xpostitplus, xisp, vide (<= 1.21-3)
Replaces: xfree86-common, xorg-common, xserver-common, x-common
Description: X Window System (X.Org) infrastructure
x11-common contains the filesystem infrastructure required for further
commit aa86272058bf5369d095073485de55f210e98b46
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Tue May 15 19:08:14 2007 +0200
Fix possible buffer overflows in xserver-wrapper.c.
diff --git a/debian/changelog b/debian/changelog
index 88fa41f..1697581 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ xorg (1:7.2-4) UNRELEASED; urgency=low
75dbus_dbus-launch header in the dbus package, closes: #322284.
* Minor fixes in Xsession(5), thanks Lajos Parkatti, closes: #372519.
* Add DebianRed to rgb.txt, closes: #243288.
+ * Fix possible buffer overflows in xserver-wrapper.c.
+ Thanks Jochen Voss (closes: #396958).
[ Timo Aaltonen ]
* Xsession.d/*: change 'which' -> '/usr/bin/which', since the zsh builtin
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index 0d42920..b621189 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -201,10 +201,10 @@ main(int argc, char **argv)
{
FILE *cf;
struct stat statbuf;
- char xserver[1024];
+ char xserver[1025];
char line[1024];
- char var[64];
- char value[256];
+ char var[65];
+ char value[257];
int length;
int i;
int intval;
commit 84aa5f582d5d9cf36e57ea5434b20ec5fac76c59
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Tue May 15 18:43:13 2007 +0200
Add DebianRed to rgb.txt.
diff --git a/debian/changelog b/debian/changelog
index 78de2e3..88fa41f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,12 +15,13 @@ xorg (1:7.2-4) UNRELEASED; urgency=low
* Add documentation for use-session-dbus in Xsession.options(5), based on
75dbus_dbus-launch header in the dbus package, closes: #322284.
* Minor fixes in Xsession(5), thanks Lajos Parkatti, closes: #372519.
+ * Add DebianRed to rgb.txt, closes: #243288.
[ Timo Aaltonen ]
* Xsession.d/*: change 'which' -> '/usr/bin/which', since the zsh builtin
command can in some circumstances make the login fail.
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Tue, 15 May 2007 09:06:05 +0200
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Tue, 15 May 2007 18:41:22 +0200
xorg (1:7.2-3) unstable; urgency=low
diff --git a/debian/local/rgb.txt b/debian/local/rgb.txt
index 62eb896..b9e56c6 100644
--- a/debian/local/rgb.txt
+++ b/debian/local/rgb.txt
@@ -475,6 +475,7 @@
238 0 0 red2
205 0 0 red3
139 0 0 red4
+215 7 81 DebianRed
255 20 147 DeepPink1
238 18 137 DeepPink2
205 16 118 DeepPink3
Reply to: