xorg-server: Changes to 'debian-unstable'
debian/changelog | 12 ++++++++++
debian/patches/03_auto_load_driver.diff | 37 ++++++++++++++------------------
2 files changed, 29 insertions(+), 20 deletions(-)
New commits:
commit 11eee8b2c35e667ab15ee32fd5b89ec27091af9a
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Sep 16 20:20:07 2007 -0400
Minor cleanups of 03_autoload_drivers.diff.
Use strncpy instead of strncat unnecessarily
Credit Julien for finding these cleanup issues
diff --git a/debian/changelog b/debian/changelog
index efe9103..ca7d94a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,14 @@
xorg-server (2:1.4-3) UNRELEASED; urgency=low
- * Minor cleanups of 03_autoload_drivers.diff
+ * Minor cleanups of 03_autoload_drivers.diff. Thanks to Julien for
+ spotting all these ugly bits
+ Newline after #else when picking the driver (this is the failsafe
choice)
+ Change by hacked "ids" file name suffix check to use strncmp and check
for ".ids"
+ + Use strncpy instead of strncat unnecessarily
- -- David Nusinow <dnusinow@debian.org> Sun, 16 Sep 2007 19:14:30 -0400
+ -- David Nusinow <dnusinow@debian.org> Sun, 16 Sep 2007 20:18:34 -0400
xorg-server (2:1.4-2) unstable; urgency=low
diff --git a/debian/patches/03_auto_load_driver.diff b/debian/patches/03_auto_load_driver.diff
index f362a2a..12ef98c 100644
--- a/debian/patches/03_auto_load_driver.diff
+++ b/debian/patches/03_auto_load_driver.diff
@@ -1,7 +1,7 @@
Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-09-16 19:14:28.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-09-16 19:22:30.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-09-16 20:14:26.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-09-16 20:18:17.000000000 -0400
@@ -39,6 +39,7 @@
#include "xf86Config.h"
#include "xf86Priv.h"
@@ -10,7 +10,7 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
/* Sections for the default built-in configuration. */
-@@ -287,3 +288,200 @@
+@@ -287,3 +288,199 @@
return (ret == CONFIG_OK);
}
@@ -116,8 +116,7 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+ /* A tiny bit of sanity checking. We should probably do better */
+ if (strncmp(direntry->d_name[len-4], ".ids", 4) == 0) {
+ /* We need the full path name to open the file */
-+ path_name[0] = '\0';
-+ strncat(path_name, "/usr/share/xserver-xorg/pci/", 256);
++ strncpy(path_name, "/usr/share/xserver-xorg/pci/", 256);
+ strncat(path_name, direntry->d_name, (256 - strlen(path_name)));
+ fp = fopen(path_name, "r");
+ if (fp == NULL) {
@@ -213,8 +212,8 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+}
Index: xorg-server/hw/xfree86/common/xf86Config.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-09-16 19:14:28.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.c 2007-09-16 19:15:52.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-09-16 20:14:26.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.c 2007-09-16 20:15:29.000000000 -0400
@@ -1928,8 +1928,10 @@
return FALSE;
}
@@ -249,8 +248,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
devicep->board = conf_device->dev_board;
Index: xorg-server/hw/xfree86/common/xf86Config.h
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-09-16 19:14:28.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.h 2007-09-16 19:15:52.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-09-16 20:14:26.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.h 2007-09-16 20:15:29.000000000 -0400
@@ -34,6 +34,8 @@
#define _xf86_config_h
@@ -271,8 +270,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.h
#endif /* _xf86_config_h */
Index: xorg-server/hw/xfree86/common/xf86Init.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Init.c 2007-09-16 19:14:28.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Init.c 2007-09-16 19:15:52.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Init.c 2007-09-16 20:14:26.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Init.c 2007-09-16 20:15:29.000000000 -0400
@@ -347,6 +347,15 @@
}
@@ -291,8 +290,8 @@ Index: xorg-server/hw/xfree86/common/xf86Init.c
xfree(modulelist);
Index: xorg-server/hw/xfree86/parser/Screen.c
===================================================================
---- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-09-16 19:14:28.000000000 -0400
-+++ xorg-server/hw/xfree86/parser/Screen.c 2007-09-16 19:15:52.000000000 -0400
+--- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-09-16 20:14:26.000000000 -0400
++++ xorg-server/hw/xfree86/parser/Screen.c 2007-09-16 20:15:29.000000000 -0400
@@ -526,15 +526,7 @@
}
}
@@ -312,8 +311,8 @@ Index: xorg-server/hw/xfree86/parser/Screen.c
while (adaptor)
Index: xorg-server/hw/xfree86/parser/read.c
===================================================================
---- xorg-server.orig/hw/xfree86/parser/read.c 2007-09-16 19:14:28.000000000 -0400
-+++ xorg-server/hw/xfree86/parser/read.c 2007-09-16 19:15:52.000000000 -0400
+--- xorg-server.orig/hw/xfree86/parser/read.c 2007-09-16 20:14:26.000000000 -0400
++++ xorg-server/hw/xfree86/parser/read.c 2007-09-16 20:15:29.000000000 -0400
@@ -80,8 +80,8 @@
static int
xf86validateConfig (XF86ConfigPtr p)
commit e03fdd7f98872e7cd414ed462c6e3266f2c8d969
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Sep 16 20:15:05 2007 -0400
Minor cleanups of 03_autoload_drivers.diff
Change by hacked "ids" file name suffix check to use strncmp and check for
".ids"
diff --git a/debian/changelog b/debian/changelog
index 9f174fe..efe9103 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-xorg-server (2:1.4-3) unstable; urgency=low
+xorg-server (2:1.4-3) UNRELEASED; urgency=low
* Minor cleanups of 03_autoload_drivers.diff
+ Newline after #else when picking the driver (this is the failsafe
choice)
+ + Change by hacked "ids" file name suffix check to use strncmp and check
+ for ".ids"
-- David Nusinow <dnusinow@debian.org> Sun, 16 Sep 2007 19:14:30 -0400
diff --git a/debian/patches/03_auto_load_driver.diff b/debian/patches/03_auto_load_driver.diff
index 24a2f83..f362a2a 100644
--- a/debian/patches/03_auto_load_driver.diff
+++ b/debian/patches/03_auto_load_driver.diff
@@ -1,7 +1,7 @@
Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-09-16 14:58:00.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-09-16 19:14:13.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-09-16 19:14:28.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-09-16 19:22:30.000000000 -0400
@@ -39,6 +39,7 @@
#include "xf86Config.h"
#include "xf86Priv.h"
@@ -10,7 +10,7 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
/* Sections for the default built-in configuration. */
-@@ -287,3 +288,203 @@
+@@ -287,3 +288,200 @@
return (ret == CONFIG_OK);
}
@@ -114,10 +114,7 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+ }
+ len = strlen(direntry->d_name);
+ /* A tiny bit of sanity checking. We should probably do better */
-+ if (direntry->d_name[len-3] == 'i' && \
-+ direntry->d_name[len-2] == 'd' && \
-+ direntry->d_name[len-1] == 's') {
-+
++ if (strncmp(direntry->d_name[len-4], ".ids", 4) == 0) {
+ /* We need the full path name to open the file */
+ path_name[0] = '\0';
+ strncat(path_name, "/usr/share/xserver-xorg/pci/", 256);
@@ -216,8 +213,8 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+}
Index: xorg-server/hw/xfree86/common/xf86Config.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-09-16 14:58:00.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.c 2007-09-16 19:13:53.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-09-16 19:14:28.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.c 2007-09-16 19:15:52.000000000 -0400
@@ -1928,8 +1928,10 @@
return FALSE;
}
@@ -252,8 +249,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
devicep->board = conf_device->dev_board;
Index: xorg-server/hw/xfree86/common/xf86Config.h
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-09-16 14:58:00.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.h 2007-09-16 19:13:53.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-09-16 19:14:28.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.h 2007-09-16 19:15:52.000000000 -0400
@@ -34,6 +34,8 @@
#define _xf86_config_h
@@ -274,8 +271,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.h
#endif /* _xf86_config_h */
Index: xorg-server/hw/xfree86/common/xf86Init.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Init.c 2007-09-16 14:59:51.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Init.c 2007-09-16 19:13:53.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Init.c 2007-09-16 19:14:28.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Init.c 2007-09-16 19:15:52.000000000 -0400
@@ -347,6 +347,15 @@
}
@@ -294,8 +291,8 @@ Index: xorg-server/hw/xfree86/common/xf86Init.c
xfree(modulelist);
Index: xorg-server/hw/xfree86/parser/Screen.c
===================================================================
---- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-09-16 14:58:00.000000000 -0400
-+++ xorg-server/hw/xfree86/parser/Screen.c 2007-09-16 19:13:53.000000000 -0400
+--- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-09-16 19:14:28.000000000 -0400
++++ xorg-server/hw/xfree86/parser/Screen.c 2007-09-16 19:15:52.000000000 -0400
@@ -526,15 +526,7 @@
}
}
@@ -315,8 +312,8 @@ Index: xorg-server/hw/xfree86/parser/Screen.c
while (adaptor)
Index: xorg-server/hw/xfree86/parser/read.c
===================================================================
---- xorg-server.orig/hw/xfree86/parser/read.c 2007-09-16 14:58:00.000000000 -0400
-+++ xorg-server/hw/xfree86/parser/read.c 2007-09-16 19:13:53.000000000 -0400
+--- xorg-server.orig/hw/xfree86/parser/read.c 2007-09-16 19:14:28.000000000 -0400
++++ xorg-server/hw/xfree86/parser/read.c 2007-09-16 19:15:52.000000000 -0400
@@ -80,8 +80,8 @@
static int
xf86validateConfig (XF86ConfigPtr p)
commit b9d60c6c48052741faf49382055e5ffe147de51a
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Sep 16 19:15:39 2007 -0400
Minor cleanups of 03_autoload_drivers.diff
Newline after #else when picking the driver (this is the failsafe choice)
diff --git a/debian/changelog b/debian/changelog
index 35ff826..9f174fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.4-3) unstable; urgency=low
+
+ * Minor cleanups of 03_autoload_drivers.diff
+ + Newline after #else when picking the driver (this is the failsafe
+ choice)
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 16 Sep 2007 19:14:30 -0400
+
xorg-server (2:1.4-2) unstable; urgency=low
[ Brice Goglin ]
diff --git a/debian/patches/03_auto_load_driver.diff b/debian/patches/03_auto_load_driver.diff
index 65a5e1a..24a2f83 100644
--- a/debian/patches/03_auto_load_driver.diff
+++ b/debian/patches/03_auto_load_driver.diff
@@ -1,7 +1,7 @@
Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-08-23 21:55:25.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-08-23 21:56:10.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-09-16 14:58:00.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-09-16 19:14:13.000000000 -0400
@@ -39,6 +39,7 @@
#include "xf86Config.h"
#include "xf86Priv.h"
@@ -10,7 +10,7 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
/* Sections for the default built-in configuration. */
-@@ -287,3 +288,202 @@
+@@ -287,3 +288,203 @@
return (ret == CONFIG_OK);
}
@@ -194,7 +194,8 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+ chosen_driver = "vga";
+ #elif defined __sparc__
+ chosen_driver = "sunffb";
-+ #else chosen_driver = "fbdev";
++ #else
++ chosen_driver = "fbdev";
+ #endif
+ }
+
@@ -215,8 +216,8 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+}
Index: xorg-server/hw/xfree86/common/xf86Config.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-08-23 21:55:25.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.c 2007-08-23 21:55:35.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-09-16 14:58:00.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.c 2007-09-16 19:13:53.000000000 -0400
@@ -1928,8 +1928,10 @@
return FALSE;
}
@@ -251,8 +252,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
devicep->board = conf_device->dev_board;
Index: xorg-server/hw/xfree86/common/xf86Config.h
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-08-23 21:55:25.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.h 2007-08-23 21:56:38.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-09-16 14:58:00.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.h 2007-09-16 19:13:53.000000000 -0400
@@ -34,6 +34,8 @@
#define _xf86_config_h
@@ -273,8 +274,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.h
#endif /* _xf86_config_h */
Index: xorg-server/hw/xfree86/common/xf86Init.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Init.c 2007-08-23 21:55:25.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Init.c 2007-08-23 21:55:35.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Init.c 2007-09-16 14:59:51.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Init.c 2007-09-16 19:13:53.000000000 -0400
@@ -347,6 +347,15 @@
}
@@ -293,8 +294,8 @@ Index: xorg-server/hw/xfree86/common/xf86Init.c
xfree(modulelist);
Index: xorg-server/hw/xfree86/parser/Screen.c
===================================================================
---- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-08-23 21:55:25.000000000 -0400
-+++ xorg-server/hw/xfree86/parser/Screen.c 2007-08-23 21:55:35.000000000 -0400
+--- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-09-16 14:58:00.000000000 -0400
++++ xorg-server/hw/xfree86/parser/Screen.c 2007-09-16 19:13:53.000000000 -0400
@@ -526,15 +526,7 @@
}
}
@@ -314,8 +315,8 @@ Index: xorg-server/hw/xfree86/parser/Screen.c
while (adaptor)
Index: xorg-server/hw/xfree86/parser/read.c
===================================================================
---- xorg-server.orig/hw/xfree86/parser/read.c 2007-08-23 21:55:25.000000000 -0400
-+++ xorg-server/hw/xfree86/parser/read.c 2007-08-23 21:55:35.000000000 -0400
+--- xorg-server.orig/hw/xfree86/parser/read.c 2007-09-16 14:58:00.000000000 -0400
++++ xorg-server/hw/xfree86/parser/read.c 2007-09-16 19:13:53.000000000 -0400
@@ -80,8 +80,8 @@
static int
xf86validateConfig (XF86ConfigPtr p)
Reply to: