Author: branden
Date: 2004-05-07 16:59:55 -0500 (Fri, 07 May 2004)
New Revision: 1371
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD.diff
trunk/debian/patches/002_xdm_fixes.diff
Log:
Grab from XFree86 CVS (2003-11-23) a fix to a problem resolving hostnames
of indirect entries in xdm's Xaccess file. Resync patch #002.
(Closes: #245044)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-05-07 19:37:27 UTC (rev 1370)
+++ trunk/debian/CHANGESETS 2004-05-07 21:59:55 UTC (rev 1371)
@@ -52,4 +52,8 @@
(cosmetic) Rename patches to ATI driver to be more consistent with each other.
1370
+Grab from XFree86 CVS (2003-11-23) a fix to a problem resolving hostnames of
+indirect entries in xdm's Xaccess file. Resync patch #002.
+ 1371
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-05-07 19:37:27 UTC (rev 1370)
+++ trunk/debian/TODO 2004-05-07 21:59:55 UTC (rev 1371)
@@ -12,7 +12,6 @@
These items are listed in descending order of priority; that is, the most
important items come first.
-* #245044: xdm: cannot resolve hostnames from Xaccess Indirect lines
* Apply Adam Conrad's VIA driver patch (on debian-x).
* Grab SiS driver from Thomas Winischhofer's website, per his information.
Should fix #245249 and #246087.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-05-07 19:37:27 UTC (rev 1370)
+++ trunk/debian/changelog 2004-05-07 21:59:55 UTC (rev 1371)
@@ -42,12 +42,16 @@
patches #022, #024, #025, #027, #069, #079, #450, #451, and #600.
+ radeon driver now supports "ForceMinDotClockOption" (Closes: #240581)
+ * Grab from XFree86 CVS (2003-11-23) a fix to a problem resolving hostnames
+ of indirect entries in xdm's Xaccess file. Resync patch #002.
+ (Closes: #245044)
+
Changes by Fabio Massimo Di Nitto:
* Update xutils's package description to refer to bdftruncate and ucs2any
programs by their correct names.
- -- Branden Robinson <[EMAIL PROTECTED]> Fri, 7 May 2004 13:29:58 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Fri, 7 May 2004 16:55:39 -0500
xfree86 (4.3.0.dfsg.1-1) unstable; urgency=low
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2004-05-07 19:37:27 UTC
(rev 1370)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2004-05-07 21:59:55 UTC
(rev 1371)
@@ -166,6 +166,9 @@
xc/programs/Xserver/hw/xfree86/common/xf86xv.c @ 1.35
156. Fix precision problems in xf86XVClipVideoHelper [...] (Marc La France).
+xc/programs/xdm/access.c @ 3.14
+ Fix parsing of IPv4 host names in Xaccess (Chisato Yamauchi). [David Dawes]
+
diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
--- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.000000000 +1100
+++ xc/config/imake/imake.c 2003-04-09 01:58:14.000000000 +1000
@@ -3947,3 +3950,27 @@
}
+#endif /* _XF86_FOURCC_H_ */
+--- xc/programs/xdm/access.c~ 2004-05-07 15:10:12.000000000 -0500
++++ xc/programs/xdm/access.c 2004-05-07 15:10:18.000000000 -0500
+@@ -290,7 +290,7 @@
+ }
+
+ if (hostent) {
+- addr = &(hostent->h_addr);
++ addr = hostent->h_addr;
+ addr_length = hostent->h_length;
+ }
+ h->type = HOST_ADDRESS;
+@@ -382,9 +382,10 @@
+
+ struct hostent *hostent;
+
+- if ((hostent = gethostbyname (displayOrAlias)) == NULL)
++ if ((hostent = gethostbyname (displayOrAlias)) != NULL)
+ {
+- addr = &(hostent->h_addr);
++ Debug("ReadDisplayEntry: %s\n", displayOrAlias);
++ addr = hostent->h_addr;
+ addrtype = hostent->h_addrtype;
+ addr_length = hostent->h_length;
+ }
Modified: trunk/debian/patches/002_xdm_fixes.diff
===================================================================
--- trunk/debian/patches/002_xdm_fixes.diff 2004-05-07 19:37:27 UTC (rev
1370)
+++ trunk/debian/patches/002_xdm_fixes.diff 2004-05-07 21:59:55 UTC (rev
1371)
@@ -161,8 +161,8 @@
# define SystemManDirectory /usr/share/man
# define HasPam YES
diff -urN xc/programs/xdm~/access.c xc/programs/xdm/access.c
---- xc/programs/xdm~/access.c 2003-09-21 15:39:22.000000000 -0500
-+++ xc/programs/xdm/access.c 2003-09-21 15:40:41.000000000 -0500
+--- xc/programs/xdm~/access.c 2004-05-07 15:13:20.000000000 -0500
++++ xc/programs/xdm/access.c 2004-05-07 15:13:24.000000000 -0500
@@ -297,8 +297,8 @@
if (!addr)
@@ -174,7 +174,7 @@
free ((char *) h);
goto tryagain;
}
-@@ -390,7 +390,7 @@
+@@ -391,7 +391,7 @@
}
if (addr == NULL)
{
@@ -183,7 +183,7 @@
free ((char *) d);
return NULL;
}
-@@ -440,7 +440,7 @@
+@@ -441,7 +441,7 @@
*prev = h;
prev = &h->next;
} else {
@@ -192,7 +192,7 @@
FreeHostEntry (h);
}
} else {
-@@ -477,7 +477,7 @@
+@@ -478,7 +478,7 @@
datafile = fopen (accessFile, "r");
if (!datafile)
{
