X Strike Force SVN commit: rev 574 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2003-09-22 17:25:14 -0500 (Mon, 22 Sep 2003)
New Revision: 574
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/067_fix_X11_with_HasXdmAuth.diff
Log:
Fix more build failures with xdm.
xc/programs/xdm/Imakefile has the same problem with LinkSourceFile() as
xc/lib/X11/Imakefile did with Wrap.h, and an identical problem with the
greeter's header files.
xc/programs/xdm/genauth.c had some problems with attempting to use
variables that weren't defined, plus an attempt to compare the integer
prngdPort with NULL.
- debian/patches/067_fix_X11_with_HasXdmAuth.diff
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-09-22 21:52:28 UTC (rev 573)
+++ branches/4.3.0/sid/debian/changelog 2003-09-22 22:25:14 UTC (rev 574)
@@ -177,9 +177,11 @@
* debian/patches/063_fix_weak_deps.diff: fix weak shared object dependencies
in libDPS and libDPSTK (Closes: #210651)
- * debian/patches/067_fix_X11_with_HasXdmAuth.diff: fix build failure;
+ * debian/patches/067_fix_X11_with_HasXdmAuth.diff: fix build failures;
xc/lib/X11/Wrap.c and Wraphelp.c were being linked over from lib/Xdmcap
- but lib/Xdmcp/Wrap.h was not
+ but lib/Xdmcp/Wrap.h was not; same problem with xdm, plus identical
+ problem with greeter's header files; also fix some problems with
+ undeclared variables and pointer-to-integer comparison in genauth.c
* debian/patches/068_fix_InstallAppDefFiles_screwage.diff: always define the
Imake symbol "InstallAppDefFiles" to "YES" on Debian systems; shuts up an
@@ -208,7 +210,7 @@
include a "Source:" field. (Closes: #212186)
- debian/local/xlibmesa-drm-source/debian/control.m4
- -- Branden Robinson <branden@debian.org> Mon, 22 Sep 2003 13:43:45 -0500
+ -- Branden Robinson <branden@debian.org> Mon, 22 Sep 2003 17:22:25 -0500
xfree86 (4.3.0-0pre1v1) experimental; urgency=low
Modified: branches/4.3.0/sid/debian/patches/067_fix_X11_with_HasXdmAuth.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/067_fix_X11_with_HasXdmAuth.diff 2003-09-22 21:52:28 UTC (rev 573)
+++ branches/4.3.0/sid/debian/patches/067_fix_X11_with_HasXdmAuth.diff 2003-09-22 22:25:14 UTC (rev 574)
@@ -6,6 +6,13 @@
neither Wrap.o nor Wraphelp.o were depending on Wrap.h, so the Wrap.h
target never got invoked.
+xc/programs/xdm/Imakefile has exactly the same problem with exactly the
+same file, plus the same problem with the greeter's header files.
+
+xc/programs/xdm/genauth.c had some problems with attempting to use
+variables that weren't defined, plus an attempt to compare the integer
+prngdPort with NULL.
+
--- xc/lib/X11/Imakefile~ 2003-09-18 01:12:10.000000000 -0500
+++ xc/lib/X11/Imakefile 2003-09-18 01:13:32.000000000 -0500
@@ -49,7 +49,7 @@
@@ -33,3 +40,54 @@
LinkSourceFile(Wrap.c,$(XDMCPLIBSRC))
LinkSourceFile(Wraphelp.c,$(XDMCPLIBSRC))
#endif
+--- xc/programs/xdm~/Imakefile 2003-09-22 16:23:20.000000000 -0500
++++ xc/programs/xdm/Imakefile 2003-09-22 17:15:01.000000000 -0500
+@@ -25,7 +25,7 @@
+ #endif
+
+ #if HasXdmAuth
+-XDMAUTH_DEFINES = -DHASXDMAUTH
++XDMAUTH_DEFINES = -I$(XDMCPLIBSRC) -DHASXDMAUTH
+ XDMAUTHOBJS = xdmauth.o
+ XDMAUTHSRCS = xdmauth.c
+ #endif
+@@ -323,6 +323,7 @@
+ LinkSourceFile(Login.c,greeter)
+ LinkSourceFile(Login.h,greeter)
+ LinkSourceFile(LoginP.h,greeter)
++SpecialCObjectRule(greet,Login.h LoginP.h,-I.)
+ #if BuildBoth
+ ObjectFromSpecialSource(greetsh,greet,-DUSESHADOW)
+ ObjectFromSpecialSource(verifysh,verify,-DUSESHADOW)
+--- xc/programs/xdm~/genauth.c 2003-09-22 14:00:07.000000000 -0500
++++ xc/programs/xdm/genauth.c 2003-09-22 16:57:56.000000000 -0500
+@@ -47,9 +47,7 @@
+ #include <time.h>
+ #define Time_t time_t
+
+-#if !defined(ARC4_RANDOM) && !defined(DEV_RANDOM) && !defined(HASXDMAUTH)
+ static unsigned char key[8];
+-#endif
+
+ #ifdef DEV_RANDOM
+ extern char *randomDevice;
+@@ -370,8 +368,8 @@
+ }
+ #endif
+ /* Try some pseudo-random number genrator daemon next */
+- if (prngdSocket != NULL || prngdPort != NULL) {
+- if (get_prngd_bytes(tmpkey, len, prngdPort, prngdSocket) == 0) {
++ if (prngdSocket != NULL || prngdPort != 0) {
++ if (get_prngd_bytes(tmpkey, 8, prngdPort, prngdSocket) == 0) {
+ tmpkey[0] = 0;
+ _XdmcpWrapperToOddParity(tmpkey, key);
+ return;
+@@ -398,7 +396,7 @@
+ GenerateAuthData (char *auth, int len)
+ {
+ #ifdef HASXDMAUTH
+- int bit;
++ int i, bit;
+ auth_wrapper_schedule schedule;
+ unsigned char data[8];
+ static int xdmcpAuthInited;
Reply to: