Author: branden Date: 2003-10-08 21:47:33 -0500 (Wed, 08 Oct 2003) New Revision: 635
Modified: branches/4.3.0/sid/debian/changelog branches/4.3.0/sid/debian/patches/002_xdm_fixes.diff Log: Fix exciting new build failure in genauth.c. - debian/patches/002_xdm_fixes.diff Modified: branches/4.3.0/sid/debian/changelog =================================================================== --- branches/4.3.0/sid/debian/changelog 2003-10-08 02:37:17 UTC (rev 634) +++ branches/4.3.0/sid/debian/changelog 2003-10-09 02:47:33 UTC (rev 635) @@ -25,11 +25,12 @@ - don't use struct sockaddr_storage - debian/patches/002_xdm_fixes.diff: + resynchronize and drop patches applied upstream + + fix for exciting new build failure in genauth.c + more stylistic cleanups to session.c - debian/patches/067_fix_X11_and_xdm_build_problems.diff: drop patches applied upstream - -- Branden Robinson <[EMAIL PROTECTED]> Tue, 7 Oct 2003 21:28:53 -0500 + -- Branden Robinson <[EMAIL PROTECTED]> Wed, 8 Oct 2003 21:46:10 -0500 xfree86 (4.3.0-0pre1v3) experimental; urgency=high Modified: branches/4.3.0/sid/debian/patches/002_xdm_fixes.diff =================================================================== --- branches/4.3.0/sid/debian/patches/002_xdm_fixes.diff 2003-10-08 02:37:17 UTC (rev 634) +++ branches/4.3.0/sid/debian/patches/002_xdm_fixes.diff 2003-10-09 02:47:33 UTC (rev 635) @@ -1825,8 +1825,8 @@ } d->displayType = displayType; diff -urN xc/programs/xdm~/genauth.c xc/programs/xdm/genauth.c ---- xc/programs/xdm~/genauth.c 2003-10-07 18:06:53.000000000 -0500 -+++ xc/programs/xdm/genauth.c 2003-10-07 18:07:41.000000000 -0500 +--- xc/programs/xdm~/genauth.c 2003-10-08 21:42:04.000000000 -0500 ++++ xc/programs/xdm/genauth.c 2003-10-08 21:43:33.000000000 -0500 @@ -33,14 +33,16 @@ * Author: Keith Packard, MIT X Consortium */ @@ -1849,7 +1849,32 @@ #include <time.h> #define Time_t time_t -@@ -339,7 +341,7 @@ +@@ -54,16 +56,6 @@ + #endif + + #ifdef HASXDMAUTH +- +-typedef unsigned char auth_cblock[8]; /* block size */ +- +-typedef struct auth_ks_struct { auth_cblock _; } auth_wrapper_schedule[16]; +- +-extern int _XdmcpAuthSetup(unsigned char *, auth_wrapper_schedule); +-extern int _XdmcpAuthDoIt(unsigned char *, unsigned char *, +- auth_wrapper_schedule, int); +-extern void _XdmcpWrapperToOddParity(unsigned char *, unsigned char *); +- + static void + longtochars (long l, unsigned char *c) + { +@@ -72,7 +64,6 @@ + c[2] = (l >> 8) & 0xff; + c[3] = l & 0xff; + } +- + #endif + + #ifdef POLL_DEV_RANDOM +@@ -339,7 +330,7 @@ if ((offset = sumFile (randomFile, BSIZ, SEEK_SET, 0)) == BSIZ) return; } @@ -1858,7 +1883,7 @@ } #endif /* !ARC4_RANDOM && !DEV_RANDOM */ -@@ -372,7 +374,7 @@ +@@ -372,7 +363,7 @@ close(fd); } } else { @@ -1867,7 +1892,7 @@ randomDevice, errno); } #endif -@@ -459,10 +461,10 @@ +@@ -459,10 +450,10 @@ return 1; } close(fd); -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]