X Strike Force SVN commit: rev 575 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2003-09-22 17:27:27 -0500 (Mon, 22 Sep 2003)
New Revision: 575
Added:
branches/4.3.0/sid/debian/patches/067_fix_X11_and_xdm_build_problems.diff
Removed:
branches/4.3.0/sid/debian/patches/067_fix_X11_with_HasXdmAuth.diff
Modified:
branches/4.3.0/sid/debian/changelog
Log:
Give patch #067 a more accurate name now that it has patches to xdm in it.
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-09-22 22:25:14 UTC (rev 574)
+++ branches/4.3.0/sid/debian/changelog 2003-09-22 22:27:27 UTC (rev 575)
@@ -177,10 +177,10 @@
* 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 failures;
- xc/lib/X11/Wrap.c and Wraphelp.c were being linked over from lib/Xdmcap
- but lib/Xdmcp/Wrap.h was not; same problem with xdm, plus identical
- problem with greeter's header files; also fix some problems with
+ * debian/patches/067_fix_X11_and_xdm_build_problems.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; 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
@@ -210,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 17:22:25 -0500
+ -- Branden Robinson <branden@debian.org> Mon, 22 Sep 2003 17:25:58 -0500
xfree86 (4.3.0-0pre1v1) experimental; urgency=low
Copied: branches/4.3.0/sid/debian/patches/067_fix_X11_and_xdm_build_problems.diff (from rev 574, branches/4.3.0/sid/debian/patches/067_fix_X11_with_HasXdmAuth.diff)
Property changes on: branches/4.3.0/sid/debian/patches/067_fix_X11_and_xdm_build_problems.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Deleted: 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 22:25:14 UTC (rev 574)
+++ branches/4.3.0/sid/debian/patches/067_fix_X11_with_HasXdmAuth.diff 2003-09-22 22:27:27 UTC (rev 575)
@@ -1,93 +0,0 @@
-$Id$
-
-This patch by Branden Robinson. Prompted by recent mysterious breakage
-with XDM auth support. LinkSourceFile(Wrap.h,$(XDMCPLIBSRC)) was writing
-targets to the Makefile to create the symlink from the Xdmcp directory but
-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 @@
- MALLOC_DEFINES = XMalloc0ReturnsNullDefines
- #endif
- #if HasXdmAuth
-- XDMAUTHDEFS = -DHASXDMAUTH
-+ XDMAUTHDEFS = -I$(XDMCPLIBSRC) -DHASXDMAUTH
- XDMAUTHOBJS = Wrap.o Wraphelp.o
- XDMAUTHSRCS = Wrap.c Wraphelp.c
- #endif
-@@ -997,6 +997,7 @@
- LinkFile(ximtrans.c,$(TRANSCOMMSRC)/transport.c)
- SpecialCLibObjectRule(OpenDis,$(ICONFIGFILES),$(BC_DEFINES) $(OPEN_DEFINES) $(XTRANS_X_DEFINES) $(XKB_DEFINES))
- SpecialCLibObjectRule(Wrap,$(ICONFIGFILES),$(XDMAUTHDEFS))
-+SpecialCLibObjectRule(Wraphelp,$(ICONFIGFILES),$(XDMAUTHDEFS))
- SpecialCLibObjectRule(XlibInt,$(ICONFIGFILES),$(CONN_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES))
- SpecialCLibObjectRule(Font,$(ICONFIGFILES),$(SHM_DEFINES) $(XF86BIGFONT_DEFINES))
- SpecialCLibObjectRule(FontInfo,$(ICONFIGFILES),$(SHM_DEFINES) $(XF86BIGFONT_DEFINES))
-@@ -1044,7 +1045,6 @@
- LinkSourceFile(k5encode.c,$(XAUTHSRC))
- #endif
- #if HasXdmAuth
--LinkSourceFile(Wrap.h,$(XDMCPLIBSRC))
- 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: