Report forwarded to debian-bugs-dist@lists.debian.org, eichin@kitten.gen.ma.us (Mark W. Eichin):
Bug#9692; Package xbase.
debian-bugs-dist@lists.debian.orgeichin@kitten.gen.ma.us (Mark W. Eichin)
Subject: Bug#9692: xbase: Changes for glibc/alpha
Reply-To: Michael Alan Dorman , 9692@bugs.debian.org
Resent-From: Michael Alan Dorman
Resent-To: debian-bugs-dist@lists.debian.org
Resent-CC: eichin@kitten.gen.ma.us (Mark W. Eichin)
Resent-Date: Fri, 09 May 1997 19:03:03 GMT
Resent-Message-ID:
Resent-Sender: iwj@debian.org
X-Debian-PR-Message: report 9692
X-Debian-PR-Package: xbase
X-Debian-PR-Keywords:
X-Loop: owner@bugs.debian.org
Received: via spool by bugs@bugs.debian.org id=B.8632039263225
(code B ref -1); Fri, 09 May 1997 19:03:03 GMT
Date: 9 May 1997 18:51:58 -0000
Message-ID: <19970509185158.1746.qmail@lot49.med.miami.edu>
From: Michael Alan Dorman
To: submit@bugs.debian.org
X-Mailer: bug 2.92
Package: xbase
Version: 3.2-5
Mark,
Here are some diffs to the X sources for glibc and/or the alpha.
A large part of this set of diffs is the patch that's included in
LinuxThreads to make the multithreaded servers.
The rest is miscellaneous changes to support GLIBC cleanly, along with
some changes to the control file to more accurately reflect the
servers that are multi-platform.
It occurs to me that I haven't changed the shlibs file, even though
libXThrStubs is now built. The change should be obvious.
There are still some problems I need to work out, and I'd love to hear
your thoughts on them.
For instance, I cannot figure out how to get xdm-shadow to be built,
which seems necessary to get shadow passwords working. It seems that
that's because BuildBoth isn't #defined, but that seems to be because
UseElfFormat is defined, which should also be defined for the
i386/Linux---so what's your secret?
Anyways, this represents a good start---it runs, at least---and it's
as far as I'm likely to go for the moment, because I'm about to loose
the extra 1.6GB HD that I've had for building this stuff on.
Mike.
diff -uNr xfree86-3.2/config/cf/linux.cf xfree86-3.2.a/config/cf/linux.cf
--- xfree86-3.2/config/cf/linux.cf Fri May 9 13:37:35 1997
+++ xfree86-3.2.a/config/cf/linux.cf Thu May 8 17:56:49 1997
@@ -12,6 +12,14 @@
#ifndef OSName
#if UseElfFormat
#define OSName Linux [ELF]
+#ifdef AlphaArchitecture
+#ifndef HasLibCrypt
+#define HasLibCrypt YES
+#endif
+#ifndef HasShadowPasswd
+# define HasShadowPasswd YES
+#endif
+#endif
#else
#ifdef AlphaArchitecture
#define OSName Linux [ECOFF]
@@ -50,7 +58,9 @@
#define GccUsesGas YES
#define UseGas YES
#define GnuCpp YES
-#define HasShadowPasswd NO
+#ifndef HasShadowPasswd
+# define HasShadowPasswd NO
+#endif
#ifndef HasLibCrypt
# define HasLibCrypt NO
#endif
@@ -61,6 +71,14 @@
#define HasSnprintf YES
#endif
+#define HasPosixThreads YES
+#define ThreadedX YES
+#define BuildThreadStubLibrary YES
+#define NeedUIThrStubs YES
+#define HasThreadSafeAPI NO
+#define SystemMTDefines -D_REENTRANT
+#define ThreadsLibraries -lpthread
+
#define AvoidNullMakeCommand YES
#define StripInstalledPrograms YES
#define CompressAllFonts YES
@@ -158,7 +176,7 @@
#define LdPostLib /* Never needed */
#ifdef i386Architecture
-#define OptimizedCDebugFlags DefaultGcc2i386Opt -m486
+#define OptimizedCDebugFlags DefaultGcc2i386Opt -m486 -pipe
#define StandardDefines -Dlinux -D__i386__ -D_POSIX_SOURCE \
-D_BSD_SOURCE -D_SVID_SOURCE -DX_LOCALE
#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
diff -uNr xfree86-3.2/config/cf/lnxLib.tmpl xfree86-3.2.a/config/cf/lnxLib.tmpl
--- xfree86-3.2/config/cf/lnxLib.tmpl Fri Feb 23 23:32:52 1996
+++ xfree86-3.2.a/config/cf/lnxLib.tmpl Thu May 8 17:56:49 1997
@@ -19,7 +19,7 @@
#define CplusplusLibC
-#define SharedX11Reqs
+#define SharedX11Reqs -L$(BUILDLIBDIR) -lXThrStub
#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY)
#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
diff -uNr xfree86-3.2/debian/control xfree86-3.2.a/debian/control
--- xfree86-3.2/debian/control Fri May 9 13:37:37 1997
+++ xfree86-3.2.a/debian/control Thu May 8 17:56:49 1997
@@ -131,7 +131,7 @@
Depends: xbase | xserver
Package: xserver-8514
-Architecture: any
+Architecture: i386
Description: X server for 8514/A-based graphics cards
This package provides an X server suitable for use with video cards based
on the 8514/A chipset.
@@ -139,7 +139,7 @@
Provides: xserver
Package: xserver-agx
-Architecture: any
+Architecture: i386
Description: X server for AGX-based graphics cards
This server currently supports the IIT AGX-016, AGX-015, AGX-014 and
XGA-2 chipsets. The AGX chipset is based on XGA architecture, but is
@@ -164,7 +164,7 @@
Provides: xserver
Package: xserver-mach32
-Architecture: any
+Architecture: i386
Description: X server for Mach32-based graphics cards
This package provides an X server suitable for use with video cards based
on the Mach32 chipset.
@@ -180,7 +180,7 @@
Provides: xserver
Package: xserver-mach8
-Architecture: any
+Architecture: i386
Description: X server for Mach8-based graphics cards
This package provides an X server suitable for use with video cards based
on the Mach8 chipset.
@@ -188,7 +188,7 @@
Provides: xserver
Package: xserver-mono
-Architecture: any
+Architecture: i386
Description: X server for mono graphics cards
This package provides a 1-bit X server suitable for use with most VGA
and SVGA cards. It also supports some other monochrome cards at high
@@ -226,7 +226,7 @@
Provides: xserver
Package: xserver-svga
-Architecture: any
+Architecture: i386
Description: X server for SVGA graphics cards
This package provides an X server suitable for use with all SVGA video
cards. The server also makes use of the accelerator features of Cirrus,
@@ -235,7 +235,7 @@
Provides: xserver
Package: xserver-vga16
-Architecture: any
+Architecture: i386
Description: X server for VGA graphics cards and X server setup program
This package provides an X server suitable for use with generic VGA cards.
It may be run in a dual-headed configuration.
@@ -249,10 +249,18 @@
Recommends: xbase (>=3.2-0), xfntbase, xlib6
Package: xserver-w32
-Architecture: any
+Architecture: i386
Description: X server for W32-based graphics cards
This package provides a server that supports the w32, w32i,
and w32p chips.
+Depends: ${xserver:Depends}
+Provides: xserver
+
+Package: xserver-tga
+Architecture: alpha
+Description: X server for TGA-based graphics cards
+ This package provides a server that supports the DEC 21130
+ (aka TGA) chipset, as found in the Multia
Depends: ${xserver:Depends}
Provides: xserver
diff -uNr xfree86-3.2/debian/create-arch-servers xfree86-3.2.a/debian/create-arch-servers
--- xfree86-3.2/debian/create-arch-servers Fri May 9 13:37:38 1997
+++ xfree86-3.2.a/debian/create-arch-servers Thu May 8 17:56:49 1997
@@ -15,3 +15,4 @@
debian/create-server svga SVGA
debian/create-server vga16 VGA16
debian/create-server w32 W32
+debian/create-server tga TGA
diff -uNr xfree86-3.2/debian/create-arch-xslib xfree86-3.2.a/debian/create-arch-xslib
--- xfree86-3.2/debian/create-arch-xslib Fri May 9 13:37:38 1997
+++ xfree86-3.2.a/debian/create-arch-xslib Thu May 8 17:56:49 1997
@@ -12,8 +12,10 @@
cp debian/copyright $temp/usr/doc/xslib/copyright
for i in $tree/usr/X11R6/lib/lib*.so.*.* ; do
- T=`echo $i | sed 's/\\.so\\..\..*$//'`.a
- cp $T $temp/usr/X11R6/lib
+ T=`echo $i | sed 's/\\.so\\..\..*$//'`
+ if [ -f $T.a ]; then
+ cp $T.a $temp/usr/X11R6/lib
+ fi
done
dpkg-gencontrol -P$temp -pxslib
diff -uNr xfree86-3.2/debian/rules xfree86-3.2.a/debian/rules
--- xfree86-3.2/debian/rules Fri May 9 13:37:38 1997
+++ xfree86-3.2.a/debian/rules Thu May 8 17:56:49 1997
@@ -32,10 +32,12 @@
# This method builds the architecture-dependent packages
binary-arch: checkroot build
+ chmod +x debian/create-* debian/xbase-writeconfig
for i in debian/create-arch-* ; do $$i ; done
# This method builds the architecture-independent packages
binary-indep: checkroot build
+ chmod +x debian/create-*
for i in debian/create-indep-* ; do $$i ; done
binary: binary-arch binary-indep
diff -uNr xfree86-3.2/include/Xthreads.h xfree86-3.2.a/include/Xthreads.h
--- xfree86-3.2/include/Xthreads.h Fri Jan 5 08:09:52 1996
+++ xfree86-3.2.a/include/Xthreads.h Thu May 8 17:56:49 1997
@@ -229,12 +229,12 @@
#define xcondition_wait(c,m) pthread_cond_wait(c,m)
#define xcondition_signal(c) pthread_cond_signal(c)
#define xcondition_broadcast(c) pthread_cond_broadcast(c)
-#ifdef _DECTHREADS_
+#if defined(_DECTHREADS_) || defined(linux)
static xthread_t _X_no_thread_id;
#define xthread_have_id(id) !pthread_equal(id, _X_no_thread_id)
#define xthread_clear_id(id) id = _X_no_thread_id
#define xthread_equal(id1,id2) pthread_equal(id1, id2)
-#endif /* _DECTHREADS_ */
+#endif /* _DECTHREADS_ || linux */
#if _CMA_VENDOR_ == _CMA__IBM
#ifdef DEBUG /* too much of a hack to enable normally */
/* see also cma__obj_set_name() */
diff -uNr xfree86-3.2/lib/X11/util/makekeys.c xfree86-3.2.a/lib/X11/util/makekeys.c
--- xfree86-3.2/lib/X11/util/makekeys.c Wed Apr 27 03:11:54 1994
+++ xfree86-3.2.a/lib/X11/util/makekeys.c Thu May 8 17:56:50 1997
@@ -73,7 +73,7 @@
register char c;
int first;
int best_max_rehash;
- int best_z;
+ int best_z = 0;
int num_found;
KeySym val;
diff -uNr xfree86-3.2/lib/XThrStub/Imakefile xfree86-3.2.a/lib/XThrStub/Imakefile
--- xfree86-3.2/lib/XThrStub/Imakefile Wed Nov 1 19:27:05 1995
+++ xfree86-3.2.a/lib/XThrStub/Imakefile Thu May 8 17:56:50 1997
@@ -25,7 +25,7 @@
DEFINES = $(ALLOC_DEFINES)
INCLUDES =
SRCS = $(STUBSRCS)
- OBJS = $(STUBOBJS
+ OBJS = $(STUBOBJS)
LINTLIBS = $(LINTXLIB)
#include
diff -uNr xfree86-3.2/lib/XThrStub/UIThrStubs.c xfree86-3.2.a/lib/XThrStub/UIThrStubs.c
--- xfree86-3.2/lib/XThrStub/UIThrStubs.c Wed Nov 1 19:27:07 1995
+++ xfree86-3.2.a/lib/XThrStub/UIThrStubs.c Thu May 8 17:56:50 1997
@@ -37,16 +37,43 @@
* specificies the thread library on the link line.
*/
+#if defined(linux)
+#include
+#else
#include
#include
+#endif
+#if defined(linux)
+static pthread_t no_thread_id;
+#endif /* defined(linux) */
+
+#if defined(linux)
+#pragma weak pthread_self = _Xthr_self_stub_
+pthread_t
+_Xthr_self_stub_()
+{
+ return(no_thread_id);
+}
+#else /* defined(linux) */
#pragma weak thr_self = _Xthr_self_stub_
thread_t
_Xthr_self_stub_()
{
return((thread_t)0);
}
+#endif /* defined(linux) */
+#if defined(linux)
+#pragma weak pthread_mutex_init = _Xmutex_init_stub_
+int
+_Xmutex_init_stub_(m, a)
+ pthread_mutex_t *m;
+ __const pthread_mutexattr_t *a;
+{
+ return(0);
+}
+#else /* defined(linux) */
#pragma weak mutex_init = _Xmutex_init_stub_
int
_Xmutex_init_stub_(m, t, a)
@@ -56,7 +83,17 @@
{
return(0);
}
+#endif /* defined(linux) */
+#if defined(linux)
+#pragma weak pthread_mutex_destroy = _Xmutex_destroy_stub_
+int
+_Xmutex_destroy_stub_(m)
+ pthread_mutex_t *m;
+{
+ return(0);
+}
+#else /* defined(linux) */
#pragma weak mutex_destroy = _Xmutex_destroy_stub_
int
_Xmutex_destroy_stub_(m)
@@ -64,7 +101,17 @@
{
return(0);
}
+#endif /* defined(linux) */
+#if defined(linux)
+#pragma weak pthread_mutex_lock = _Xmutex_lock_stub_
+int
+_Xmutex_lock_stub_(m)
+ pthread_mutex_t *m;
+{
+ return(0);
+}
+#else /* defined(linux) */
#pragma weak mutex_lock = _Xmutex_lock_stub_
int
_Xmutex_lock_stub_(m)
@@ -72,7 +119,17 @@
{
return(0);
}
+#endif /* defined(linux) */
+#if defined(linux)
+#pragma weak pthread_mutex_unlock = _Xmutex_unlock_stub_
+int
+_Xmutex_unlock_stub_(m)
+ pthread_mutex_t *m;
+{
+ return(0);
+}
+#else /* defined(linux) */
#pragma weak mutex_unlock = _Xmutex_unlock_stub_
int
_Xmutex_unlock_stub_(m)
@@ -80,7 +137,18 @@
{
return(0);
}
+#endif /* defined(linux) */
+#if defined(linux)
+#pragma weak pthread_cond_init = _Xcond_init_stub_
+int
+_Xcond_init_stub_(c, a)
+ pthread_cond_t *c;
+ __const pthread_condattr_t *a;
+{
+ return(0);
+}
+#else /* defined(linux) */
#pragma weak cond_init = _Xcond_init_stub_
int
_Xcond_init_stub_(c, t, a)
@@ -90,7 +158,17 @@
{
return(0);
}
+#endif /* defined(linux) */
+#if defined(linux)
+#pragma weak pthread_cond_destroy = _Xcond_destroy_stub_
+int
+_Xcond_destroy_stub_(c)
+ pthread_cond_t *c;
+{
+ return(0);
+}
+#else /* defined(linux) */
#pragma weak cond_destroy = _Xcond_destroy_stub_
int
_Xcond_destroy_stub_(c)
@@ -98,7 +176,18 @@
{
return(0);
}
+#endif /* defined(linux) */
+#if defined(linux)
+#pragma weak pthread_cond_wait = _Xcond_wait_stub_
+int
+_Xcond_wait_stub_(c,m)
+ pthread_cond_t *c;
+ pthread_mutex_t *m;
+{
+ return(0);
+}
+#else /* defined(linux) */
#pragma weak cond_wait = _Xcond_wait_stub_
int
_Xcond_wait_stub_(c,m)
@@ -107,7 +196,17 @@
{
return(0);
}
+#endif /* defined(linux) */
+#if defined(linux)
+#pragma weak pthread_cond_signal = _Xcond_signal_stub_
+int
+_Xcond_signal_stub_(c)
+ pthread_cond_t *c;
+{
+ return(0);
+}
+#else /* defined(linux) */
#pragma weak cond_signal = _Xcond_signal_stub_
int
_Xcond_signal_stub_(c)
@@ -115,7 +214,17 @@
{
return(0);
}
+#endif /* defined(linux) */
+#if defined(linux)
+#pragma weak pthread_cond_broadcast = _Xcond_broadcast_stub_
+int
+_Xcond_broadcast_stub_(c)
+ pthread_cond_t *c;
+{
+ return(0);
+}
+#else /* defined(linux) */
#pragma weak cond_broadcast = _Xcond_broadcast_stub_
int
_Xcond_broadcast_stub_(c)
@@ -123,3 +232,15 @@
{
return(0);
}
+#endif /* defined(linux) */
+
+#if defined(linux)
+#pragma weak pthread_equal = _Xthr_equal_stub_
+int
+_Xthr_equal_stub_(t1, t2)
+ pthread_t t1;
+ pthread_t t2;
+{
+ return(1);
+}
+#endif /* defined(linux) */
diff -uNr xfree86-3.2/lib/Xdmcp/Fill.c xfree86-3.2.a/lib/Xdmcp/Fill.c
--- xfree86-3.2/lib/Xdmcp/Fill.c Fri Jan 5 08:12:03 1996
+++ xfree86-3.2.a/lib/Xdmcp/Fill.c Thu May 8 17:56:50 1997
@@ -57,7 +57,11 @@
int fd;
XdmcpBufferPtr buffer;
XdmcpNetaddr from; /* return */
+#if ! defined(__GLIBC__)
int *fromlen; /* return */
+#else /* __GLIBC__ */
+ size_t *fromlen; /* return */
+#endif /* __GLIBC__ */
{
BYTE *newBuf;
#ifdef STREAMSCONN
diff -uNr xfree86-3.2/lib/font/Type1/spaces.c xfree86-3.2.a/lib/font/Type1/spaces.c
--- xfree86-3.2/lib/font/Type1/spaces.c Wed Jun 14 03:15:48 1995
+++ xfree86-3.2.a/lib/font/Type1/spaces.c Thu May 8 17:56:50 1997
@@ -37,6 +37,7 @@
:h3.Include Files
*/
+#include
#include "objects.h"
#include "spaces.h"
#include "paths.h"
diff -uNr xfree86-3.2/lib/xtrans/Xtranssock.c xfree86-3.2.a/lib/xtrans/Xtranssock.c
--- xfree86-3.2/lib/xtrans/Xtranssock.c Fri May 9 13:37:38 1997
+++ xfree86-3.2.a/lib/xtrans/Xtranssock.c Thu May 8 17:56:50 1997
@@ -293,7 +293,11 @@
{
struct sockaddr_in sockname;
+#if !defined(__GLIBC__)
int namelen = sizeof sockname;
+#else /* __GLIBC__ */
+ size_t namelen = sizeof sockname;
+#endif /* __GLIBC__ */
PRMSG (3,"SocketINETGetAddr(%x)\n", ciptr, 0, 0);
@@ -336,7 +340,11 @@
{
struct sockaddr_in sockname;
+#if !defined(__GLIBC__)
int namelen = sizeof(sockname);
+#else /* __GLIBC__ */
+ size_t namelen = sizeof(sockname);
+#endif /* __GLIBC__ */
PRMSG (3,"SocketINETGetPeerAddr(%x)\n", ciptr, 0, 0);
@@ -1102,7 +1110,11 @@
{
XtransConnInfo newciptr;
struct sockaddr_in sockname;
+#if !defined(__GLIBC__)
int namelen = sizeof(sockname);
+#else /* __GLIBC__ */
+ size_t namelen = sizeof(sockname);
+#endif /* __GLIBC__ */
PRMSG (2, "SocketINETAccept(%x,%d)\n", ciptr, ciptr->fd, 0);
@@ -1181,7 +1193,11 @@
{
XtransConnInfo newciptr;
struct sockaddr_un sockname;
+#if !defined(__GLIBC__)
int namelen = sizeof(sockname);
+#else /* __GLIBC__ */
+ size_t namelen = sizeof(sockname);
+#endif /* __GLIBC__ */
PRMSG (2, "SocketUNIXAccept(%x,%d)\n", ciptr, ciptr->fd, 0);
diff -uNr xfree86-3.2/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.c xfree86-3.2.a/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.c
--- xfree86-3.2/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.c Sun Mar 10 07:03:33 1996
+++ xfree86-3.2.a/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.c Thu May 8 17:56:50 1997
@@ -36,6 +36,7 @@
#include "p9000orchid.h"
#include "p9000viper.h"
+#include
#include
static unsigned int p9000OrchidSaveMisc; /* Stored value of misc register */
diff -uNr xfree86-3.2/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.c xfree86-3.2.a/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.c
--- xfree86-3.2/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.c Sun Mar 10 07:03:35 1996
+++ xfree86-3.2.a/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.c Thu May 8 17:56:50 1997
@@ -34,6 +34,7 @@
#include "ICD2061A.h"
#include "p9000viper.h"
+#include
#include
static unsigned p9000ViperSaveMisc; /* Stored value of misc register */
diff -uNr xfree86-3.2/programs/Xserver/os/xdmcp.c xfree86-3.2.a/programs/Xserver/os/xdmcp.c
--- xfree86-3.2/programs/Xserver/os/xdmcp.c Fri Jan 5 08:20:07 1996
+++ xfree86-3.2.a/programs/Xserver/os/xdmcp.c Thu May 8 17:56:50 1997
@@ -743,7 +743,11 @@
receive_packet()
{
struct sockaddr_in from;
+#if !defined(__GLIBC__)
int fromlen = sizeof(struct sockaddr_in);
+#else /* __GLIBC__ */
+ size_t fromlen = sizeof(struct sockaddr_in);
+#endif /* __GLIBC__ */
XdmcpHeader header;
/* read message off socket */
diff -uNr xfree86-3.2/programs/xdm/Imakefile xfree86-3.2.a/programs/xdm/Imakefile
--- xfree86-3.2/programs/xdm/Imakefile Wed Oct 16 10:45:03 1996
+++ xfree86-3.2.a/programs/xdm/Imakefile Thu May 8 18:00:47 1997
@@ -62,7 +62,9 @@
SYS_LIBRARIES1 = -lsec
#endif
#if defined(LinuxArchitecture)
+#if !defined(AlphaArchitecture)
SYS_LIBRARIES1 = -lshadow
+#endif
#endif
#endif
diff -uNr xfree86-3.2/programs/xdm/choose.c xfree86-3.2.a/programs/xdm/choose.c
--- xfree86-3.2/programs/xdm/choose.c Wed Aug 31 00:50:49 1994
+++ xfree86-3.2.a/programs/xdm/choose.c Thu May 8 17:56:50 1997
@@ -383,7 +383,11 @@
{
int client_fd;
char buf[1024];
+#if !defined(__GLIBC__)
int len;
+#else /* __GLIBC__ */
+ size_t len;
+#endif /* __GLIBC__ */
XdmcpBuffer buffer;
ARRAY8 clientAddress;
CARD16 connectionType;
diff -uNr xfree86-3.2/programs/xdm/chooser.c xfree86-3.2.a/programs/xdm/chooser.c
--- xfree86-3.2/programs/xdm/chooser.c Thu Oct 3 04:49:46 1996
+++ xfree86-3.2.a/programs/xdm/chooser.c Thu May 8 17:56:51 1997
@@ -487,7 +487,11 @@
ARRAY8 status;
int saveHostname = 0;
struct sockaddr addr;
+#if !defined(__GLIBC__)
int addrlen;
+#else /* __GLIBC__ */
+ size_t addrlen;
+#endif /* __GLIBC__ */
#ifdef MINIX
int r;
#endif
diff -uNr xfree86-3.2/programs/xdm/socket.c xfree86-3.2.a/programs/xdm/socket.c
--- xfree86-3.2/programs/xdm/socket.c Wed Aug 31 00:50:53 1994
+++ xfree86-3.2.a/programs/xdm/socket.c Thu May 8 17:56:51 1997
@@ -209,7 +209,11 @@
int *lenp;
{
struct sockaddr_in in_addr;
+#if !defined(__GLIBC__)
int len;
+#else /* __GLIBC__ */
+ size_t len;
+#endif /* __GLIBC__ */
len = sizeof in_addr;
if (getsockname (chooserFd, (struct sockaddr *)&in_addr, &len) < 0)
diff -uNr xfree86-3.2/programs/xdm/xdmcp.c xfree86-3.2.a/programs/xdm/xdmcp.c
--- xfree86-3.2/programs/xdm/xdmcp.c Sun Oct 6 09:18:58 1996
+++ xfree86-3.2.a/programs/xdm/xdmcp.c Thu May 8 17:56:51 1997
@@ -280,7 +280,11 @@
{
XdmcpHeader header;
struct sockaddr_in addr;
+#if !defined(__GLIBC__)
int addrlen = sizeof addr;
+#else /* __GLIBC__ */
+ size_t addrlen = sizeof addr;
+#endif /* __GLIBC__ */
#ifdef MINIX
int r;
#endif
diff -uNr xfree86-3.2/programs/xterm/main.c xfree86-3.2.a/programs/xterm/main.c
--- xfree86-3.2/programs/xterm/main.c Fri May 9 13:37:41 1997
+++ xfree86-3.2.a/programs/xterm/main.c Thu May 8 17:56:51 1997
@@ -173,6 +173,9 @@
#define HAS_UTMP_UT_HOST
#define LASTLOG
#define WTMP
+#if defined(__GLIBC__)
+#include
+#endif
#endif
#ifdef Lynx
@@ -190,7 +193,9 @@
#define _SVID3
#endif
+#if !defined(__GLIBC__)
#include
+#endif /* __GLIBC__ */
#include
#ifdef Lynx
@@ -211,7 +216,9 @@
#include
#else
#ifdef USE_TERMIOS
+#if !defined(__GLIBC__)
#include
+#endif /* __GLIBC__ */
/* this hacked termios support only works on SYSV */
#define USE_SYSV_TERMIO
#define termio termios
-- System Information
Debian Release: 1.2
Kernel Version: Linux lot49 2.0.29 #3 Sat Apr 8 14:34:43 Local time zone must be set--see zic manualalpha alpha unknown
Versions of the packages xbase depends on:
libc6.1 Version: 2.0.3-3
ncurses3.0 Version: 1.9.9e-3
xlib6 Version: 3.2-5
cpp Version: 2.7.2.1-9
--- Begin /etc/X11/Xserver (modified conffile)
/usr/X11R6/bin/XF86_TGA
Console
The first line in this file is the full pathname of the default X server.
The second line shows who is allowed to run the X server:
RootOnly
Console (anyone whose controlling tty is on the console)
Anybody
--- End /etc/X11/Xserver
--- Begin /etc/X11/xdm/Xservers (modified conffile)
:0 local /usr/X11R6/bin/X
--- End /etc/X11/xdm/Xservers
Acknowledgement sent to Michael Alan Dorman <mdorman@lot49.med.miami.edu>:
New bug report received and forwarded. Copy sent to eichin@kitten.gen.ma.us (Mark W. Eichin).
-t
From: owner@bugs.debian.org (Ian Jackson)
To: Michael Alan Dorman
Subject: Bug#9692: Acknowledgement (was: xbase: Changes for glibc/alpha)
Message-ID:
In-Reply-To: <19970509185158.1746.qmail@lot49.med.miami.edu>
References: <19970509185158.1746.qmail@lot49.med.miami.edu>
X-Debian-PR-Message: ack 9692
Thank you for the problem report you have sent regarding Debian Linux.
This is an automatically generated reply, to let you know your message has
been received. It is being forwarded to the developers' mailing list for
their attention; they will reply in due course.
Your message has been sent to the package maintainer(s):
eichin@kitten.gen.ma.us (Mark W. Eichin)
If you wish to submit further information on your problem, please send
it to 9692@bugs.debian.org (and *not* to
bugs@bugs.debian.org).
Please do not reply to the address at the top of this message,
unless you wish to report a problem with the bug-tracking system.
Ian Jackson
(maintainer, Debian bug tracking system)
Received: (at submit) by bugs.debian.org; 9 May 1997 18:52:06 +0000
Received: (qmail 3185 invoked from network); 9 May 1997 18:52:04 -0000
Received: from lot49.med.miami.edu (qmailr@129.171.78.10)
by master.debian.org with SMTP; 9 May 1997 18:52:03 -0000
Received: (qmail 1747 invoked by uid 1000); 9 May 1997 18:51:59 -0000
Date: 9 May 1997 18:51:58 -0000
Message-ID: <19970509185158.1746.qmail@lot49.med.miami.edu>
From: Michael Alan Dorman
Subject: xbase: Changes for glibc/alpha
To: submit@bugs.debian.org
X-Mailer: bug 2.92
Package: xbase
Version: 3.2-5
Mark,
Here are some diffs to the X sources for glibc and/or the alpha.
A large part of this set of diffs is the patch that's included in
LinuxThreads to make the multithreaded servers.
The rest is miscellaneous changes to support GLIBC cleanly, along with
some changes to the control file to more accurately reflect the
servers that are multi-platform.
It occurs to me that I haven't changed the shlibs file, even though
libXThrStubs is now built. The change should be obvious.
There are still some problems I need to work out, and I'd love to hear
your thoughts on them.
For instance, I cannot figure out how to get xdm-shadow to be built,
which seems necessary to get shadow passwords working. It seems that
that's because BuildBoth isn't #defined, but that seems to be because
UseElfFormat is defined, which should also be defined for the
i386/Linux---so what's your secret?
Anyways, this represents a good start---it runs, at least---and it's
as far as I'm likely to go for the moment, because I'm about to loose
the extra 1.6GB HD that I've had for building this stuff on.
Mike.
diff -uNr xfree86-3.2/config/cf/linux.cf xfree86-3.2.a/config/cf/linux.cf
--- xfree86-3.2/config/cf/linux.cf Fri May 9 13:37:35 1997
+++ xfree86-3.2.a/config/cf/linux.cf Thu May 8 17:56:49 1997
@@ -12,6 +12,14 @@
#ifndef OSName
#if UseElfFormat
#define OSName Linux [ELF]
+#ifdef AlphaArchitecture
+#ifndef HasLibCrypt
+#define HasLibCrypt YES
+#endif
+#ifndef HasShadowPasswd
+# define HasShadowPasswd YES
+#endif
+#endif
#else
#ifdef AlphaArchitecture
#define OSName Linux [ECOFF]
@@ -50,7 +58,9 @@
#define GccUsesGas YES
#define UseGas YES
#define GnuCpp YES
-#define HasShadowPasswd NO
+#ifndef HasShadowPasswd
+# define HasShadowPasswd NO
+#endif
#ifndef HasLibCrypt
# define HasLibCrypt NO
#endif
@@ -61,6 +71,14 @@
#define HasSnprintf YES
#endif
+#define HasPosixThreads YES
+#define ThreadedX YES
+#define BuildThreadStubLibrary YES
+#define NeedUIThrStubs YES
+#define HasThreadSafeAPI NO
+#define SystemMTDefines -D_REENTRANT
+#define ThreadsLibraries -lpthread
+
#define AvoidNullMakeCommand YES
#define StripInstalledPrograms YES
#define CompressAllFonts YES
@@ -158,7 +176,7 @@
#define LdPostLib /* Never needed */
#ifdef i386Architecture
-#define OptimizedCDebugFlags DefaultGcc2i386Opt -m486
+#define OptimizedCDebugFlags DefaultGcc2i386Opt -m486 -pipe
#define StandardDefines -Dlinux -D__i386__ -D_POSIX_SOURCE \
-D_BSD_SOURCE -D_SVID_SOURCE -DX_LOCALE
#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
diff -uNr xfree86-3.2/config/cf/lnxLib.tmpl xfree86-3.2.a/config/cf/lnxLib.tmpl
--- xfree86-3.2/config/cf/lnxLib.tmpl Fri Feb 23 23:32:52 1996
+++ xfree86-3.2.a/config/cf/lnxLib.tmpl Thu May 8 17:56:49 1997
@@ -19,7 +19,7 @@
#define CplusplusLibC
-#define SharedX11Reqs
+#define SharedX11Reqs -L$(BUILDLIBDIR) -lXThrStub
#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY)
#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
diff -uNr xfree86-3.2/debian/control xfree86-3.2.a/debian/control
--- xfree86-3.2/debian/control Fri May 9 13:37:37 1997
+++ xfree86-3.2.a/debian/control Thu May 8 17:56:49 1997
@@ -131,7 +131,7 @@
Depends: xbase | xserver
Package: xserver-8514
-Architecture: any
+Architecture: i386
Description: X server for 8514/A-based graphics cards
This package provides an X server suitable for use with video cards based
on the 8514/A chipset.
@@ -139,7 +139,7 @@
Provides: xserver
Package: xserver-agx
-Architecture: any
+Architecture: i386
Description: X server for AGX-based graphics cards
This server currently supports the IIT AGX-016, AGX-015, AGX-014 and
XGA-2 chipsets. The AGX chipset is based on XGA architecture, but is
@@ -164,7 +164,7 @@
Provides: xserver
Package: xserver-mach32
-Architecture: any
+Architecture: i386
Description: X server for Mach32-based graphics cards
This package provides an X server suitable for use with video cards based
on the Mach32 chipset.
@@ -180,7 +180,7 @@
Provides: xserver
Package: xserver-mach8
-Architecture: any
+Architecture: i386
Description: X server for Mach8-based graphics cards
This package provides an X server suitable for use with video cards based
on the Mach8 chipset.
@@ -188,7 +188,7 @@
Provides: xserver
Package: xserver-mono
-Architecture: any
+Architecture: i386
Description: X server for mono graphics cards
This package provides a 1-bit X server suitable for use with most VGA
and SVGA cards. It also supports some other monochrome cards at high
@@ -226,7 +226,7 @@
Provides: xserver
Package: xserver-svga
-Architecture: any
+Architecture: i386
Description: X server for SVGA graphics cards
This package provides an X server suitable for use with all SVGA video
cards. The server also makes use of the accelerator features of Cirrus,
@@ -235,7 +235,7 @@
Provides: xserver
Package: xserver-vga16
-Architecture: any
+Architecture: i386
Description: X server for VGA graphics cards and X server setup program
This package provides an X server suitable for use with generic VGA cards.
It may be run in a dual-headed configuration.
@@ -249,10 +249,18 @@
Recommends: xbase (>=3.2-0), xfntbase, xlib6
Package: xserver-w32
-Architecture: any
+Architecture: i386
Description: X server for W32-based graphics cards
This package provides a server that supports the w32, w32i,
and w32p chips.
+Depends: ${xserver:Depends}
+Provides: xserver
+
+Package: xserver-tga
+Architecture: alpha
+Description: X server for TGA-based graphics cards
+ This package provides a server that supports the DEC 21130
+ (aka TGA) chipset, as found in the Multia
Depends: ${xserver:Depends}
Provides: xserver
diff -uNr xfree86-3.2/debian/create-arch-servers xfree86-3.2.a/debian/create-arch-servers
--- xfree86-3.2/debian/create-arch-servers Fri May 9 13:37:38 1997
+++ xfree86-3.2.a/debian/create-arch-servers Thu May 8 17:56:49 1997
@@ -15,3 +15,4 @@
debian/create-server svga SVGA
debian/create-server vga16 VGA16
debian/create-server w32 W32
+debian/create-server tga TGA
diff -uNr xfree86-3.2/debian/create-arch-xslib xfree86-3.2.a/debian/create-arch-xslib
--- xfree86-3.2/debian/create-arch-xslib Fri May 9 13:37:38 1997
+++ xfree86-3.2.a/debian/create-arch-xslib Thu May 8 17:56:49 1997
@@ -12,8 +12,10 @@
cp debian/copyright $temp/usr/doc/xslib/copyright
for i in $tree/usr/X11R6/lib/lib*.so.*.* ; do
- T=`echo $i | sed 's/\\.so\\..\..*$//'`.a
- cp $T $temp/usr/X11R6/lib
+ T=`echo $i | sed 's/\\.so\\..\..*$//'`
+ if [ -f $T.a ]; then
+ cp $T.a $temp/usr/X11R6/lib
+ fi
done
dpkg-gencontrol -P$temp -pxslib
diff -uNr xfree86-3.2/debian/rules xfree86-3.2.a/debian/rules
--- xfree86-3.2/debian/rules Fri May 9 13:37:38 1997
+++ xfree86-3.2.a/debian/rules Thu May 8 17:56:49 1997
@@ -32,10 +32,12 @@
# This method builds the architecture-dependent packages
binary-arch: checkroot build
+ chmod +x debian/create-* debian/xbase-writeconfig
for i in debian/create-arch-* ; do $$i ; done
# This method builds the architecture-independent packages
binary-indep: checkroot build
+ chmod +x debian/create-*
for i in debian/create-indep-* ; do $$i ; done
binary: binary-arch binary-indep
diff -uNr xfree86-3.2/include/Xthreads.h xfree86-3.2.a/include/Xthreads.h
--- xfree86-3.2/include/Xthreads.h Fri Jan 5 08:09:52 1996
+++ xfree86-3.2.a/include/Xthreads.h Thu May 8 17:56:49 1997
@@ -229,12 +229,12 @@
#define xcondition_wait(c,m) pthread_cond_wait(c,m)
#define xcondition_signal(c) pthread_cond_signal(c)
#define xcondition_broadcast(c) pthread_cond_broadcast(c)
-#ifdef _DECTHREADS_
+#if defined(_DECTHREADS_) || defined(linux)
static xthread_t _X_no_thread_id;
#define xthread_have_id(id) !pthread_equal(id, _X_no_thread_id)
#define xthread_clear_id(id) id = _X_no_thread_id
#define xthread_equal(id1,id2) pthread_equal(id1, id2)
-#endif /* _DECTHREADS_ */
+#endif /* _DECTHREADS_ || linux */
#if _CMA_VENDOR_ == _CMA__IBM
#ifdef DEBUG /* too much of a hack to enable normally */
/* see also cma__obj_set_name() */
diff -uNr xfree86-3.2/lib/X11/util/makekeys.c xfree86-3.2.a/lib/X11/util/makekeys.c
--- xfree86-3.2/lib/X11/util/makekeys.c Wed Apr 27 03:11:54 1994
+++ xfree86-3.2.a/lib/X11/util/makekeys.c Thu May 8 17:56:50 1997
@@ -73,7 +73,7 @@
register char c;
int first;
int best_max_rehash;
- int best_z;
+ int best_z = 0;
int num_found;
KeySym val;
diff -uNr xfree86-3.2/lib/XThrStub/Imakefile xfree86-3.2.a/lib/XThrStub/Imakefile
--- xfree86-3.2/lib/XThrStub/Imakefile Wed Nov 1 19:27:05 1995
+++ xfree86-3.2.a/lib/XThrStub/Imakefile Thu May 8 17:56:50 1997
@@ -25,7 +25,7 @@
DEFINES = $(ALLOC_DEFINES)
INCLUDES =
SRCS = $(STUBSRCS)
- OBJS = $(STUBOBJS
+ OBJS = $(STUBOBJS)
LINTLIBS = $(LINTXLIB)
#include
diff -uNr xfree86-3.2/lib/XThrStub/UIThrStubs.c xfree86-3.2.a/lib/XThrStub/UIThrStubs.c
--- xfree86-3.2/lib/XThrStub/UIThrStubs.c Wed Nov 1 19:27:07 1995
+++ xfree86-3.2.a/lib/XThrStub/UIThrStubs.c Thu May 8 17:56:50 1997
@@ -37,16 +37,43 @@
* specificies the thread library on the link line.
*/
+#if defined(linux)
+#include
+#else
#include
#include
+#endif
+#if defined(linux)
+static pthread_t no_thread_id;
+#endif /* defined(linux) */
+
+#if defined(linux)
+#pragma weak pthread_self = _Xthr_self_stub_
+pthread_t
+_Xthr_self_stub_()
+{
+ return(no_thread_id);
+}
+#else /* defined(linux) */
#pragma weak thr_self = _Xthr_self_stub_
thread_t
_Xthr_self_stub_()
{
return((thread_t)0);
}
+#endif /* defined(linux) */
+#if defined(linux)
+#pragma weak pthread_mutex_init = _Xmutex_init_stub_
+int
+_Xmutex_init_stub_(m, a)
+ pthread_mutex_t *m;
+ __const pthread_mutexattr_t *a;
+{
+ return(0);
+}
+#else /* defined(linux) */
#pragma weak mutex_init = _Xmutex_init_stub_
int
_Xmutex_init_stub_(m, t, a)
@@ -56,7 +83,17 @@
{
return(0);
}
+#endif /* defined(linux) */
+#if defined(linux)
+#pragma weak pthread_mutex_destroy = _Xmutex_destroy_stub_
+int
+_Xmutex_destroy_stub_(m)
+ pthread_mutex_t *m;
+{
+ return(0);
+}
+#else /* defined(linux) */
#pragma weak mutex_destroy = _Xmutex_destroy_stub_
int
_Xmutex_destroy_stub_(m)
@@ -64,7 +101,17 @@
{
return(0);
}
+#endif /* defined(linux) */
+#if defined(linux)
+#pragma weak pthread_mutex_lock = _Xmutex_lock_stub_
+int
+_Xmutex_lock_stub_(m)
+ pthread_mutex_t *m;
+{
+ return(0);
+}
+#else /* defined(linux) */
#pragma weak mutex_lock = _Xmutex_lock_stub_
int
_Xmutex_lock_stub_(m)
@@ -72,7 +119,17 @@
{
return(0);
}
+#endif /* defined(linux) */
+#if defined(linux)
+#pragma weak pthread_mutex_unlock = _Xmutex_unlock_stub_
+int
+_Xmutex_unlock_stub_(m)
+ pthread_mutex_t *m;
+{
+ return(0);
+}
+#else /* defined(linux) */
#pragma weak mutex_unlock = _Xmutex_unlock_stub_
int
_Xmutex_unlock_stub_(m)
@@ -80,7 +137,18 @@
{
return(0);
}
+#endif /* defined(linux) */
+#if defined(linux)
+#pragma weak pthread_cond_init = _Xcond_init_stub_
+int
+_Xcond_init_stub_(c, a)
+ pthread_cond_t *c;
+ __const pthread_condattr_t *a;
+{
+ return(0);
+}
+#else /* defined(linux) */
#pragma weak cond_init = _Xcond_init_stub_
int
_Xcond_init_stub_(c, t, a)
@@ -90,7 +158,17 @@
{
return(0);
}
+#endif /* defined(linux) */
+#if defined(linux)
+#pragma weak pthread_cond_destroy = _Xcond_destroy_stub_
+int
+_Xcond_destroy_stub_(c)
+ pthread_cond_t *c;
+{
+ return(0);
+}
+#else /* defined(linux) */
#pragma weak cond_destroy = _Xcond_destroy_stub_
int
_Xcond_destroy_stub_(c)
@@ -98,7 +176,18 @@
{
return(0);
}
+#endif /* defined(linux) */
+#if defined(linux)
+#pragma weak pthread_cond_wait = _Xcond_wait_stub_
+int
+_Xcond_wait_stub_(c,m)
+ pthread_cond_t *c;
+ pthread_mutex_t *m;
+{
+ return(0);
+}
+#else /* defined(linux) */
#pragma weak cond_wait = _Xcond_wait_stub_
int
_Xcond_wait_stub_(c,m)
@@ -107,7 +196,17 @@
{
return(0);
}
+#endif /* defined(linux) */
+#if defined(linux)
+#pragma weak pthread_cond_signal = _Xcond_signal_stub_
+int
+_Xcond_signal_stub_(c)
+ pthread_cond_t *c;
+{
+ return(0);
+}
+#else /* defined(linux) */
#pragma weak cond_signal = _Xcond_signal_stub_
int
_Xcond_signal_stub_(c)
@@ -115,7 +214,17 @@
{
return(0);
}
+#endif /* defined(linux) */
+#if defined(linux)
+#pragma weak pthread_cond_broadcast = _Xcond_broadcast_stub_
+int
+_Xcond_broadcast_stub_(c)
+ pthread_cond_t *c;
+{
+ return(0);
+}
+#else /* defined(linux) */
#pragma weak cond_broadcast = _Xcond_broadcast_stub_
int
_Xcond_broadcast_stub_(c)
@@ -123,3 +232,15 @@
{
return(0);
}
+#endif /* defined(linux) */
+
+#if defined(linux)
+#pragma weak pthread_equal = _Xthr_equal_stub_
+int
+_Xthr_equal_stub_(t1, t2)
+ pthread_t t1;
+ pthread_t t2;
+{
+ return(1);
+}
+#endif /* defined(linux) */
diff -uNr xfree86-3.2/lib/Xdmcp/Fill.c xfree86-3.2.a/lib/Xdmcp/Fill.c
--- xfree86-3.2/lib/Xdmcp/Fill.c Fri Jan 5 08:12:03 1996
+++ xfree86-3.2.a/lib/Xdmcp/Fill.c Thu May 8 17:56:50 1997
@@ -57,7 +57,11 @@
int fd;
XdmcpBufferPtr buffer;
XdmcpNetaddr from; /* return */
+#if ! defined(__GLIBC__)
int *fromlen; /* return */
+#else /* __GLIBC__ */
+ size_t *fromlen; /* return */
+#endif /* __GLIBC__ */
{
BYTE *newBuf;
#ifdef STREAMSCONN
diff -uNr xfree86-3.2/lib/font/Type1/spaces.c xfree86-3.2.a/lib/font/Type1/spaces.c
--- xfree86-3.2/lib/font/Type1/spaces.c Wed Jun 14 03:15:48 1995
+++ xfree86-3.2.a/lib/font/Type1/spaces.c Thu May 8 17:56:50 1997
@@ -37,6 +37,7 @@
:h3.Include Files
*/
+#include
#include "objects.h"
#include "spaces.h"
#include "paths.h"
diff -uNr xfree86-3.2/lib/xtrans/Xtranssock.c xfree86-3.2.a/lib/xtrans/Xtranssock.c
--- xfree86-3.2/lib/xtrans/Xtranssock.c Fri May 9 13:37:38 1997
+++ xfree86-3.2.a/lib/xtrans/Xtranssock.c Thu May 8 17:56:50 1997
@@ -293,7 +293,11 @@
{
struct sockaddr_in sockname;
+#if !defined(__GLIBC__)
int namelen = sizeof sockname;
+#else /* __GLIBC__ */
+ size_t namelen = sizeof sockname;
+#endif /* __GLIBC__ */
PRMSG (3,"SocketINETGetAddr(%x)\n", ciptr, 0, 0);
@@ -336,7 +340,11 @@
{
struct sockaddr_in sockname;
+#if !defined(__GLIBC__)
int namelen = sizeof(sockname);
+#else /* __GLIBC__ */
+ size_t namelen = sizeof(sockname);
+#endif /* __GLIBC__ */
PRMSG (3,"SocketINETGetPeerAddr(%x)\n", ciptr, 0, 0);
@@ -1102,7 +1110,11 @@
{
XtransConnInfo newciptr;
struct sockaddr_in sockname;
+#if !defined(__GLIBC__)
int namelen = sizeof(sockname);
+#else /* __GLIBC__ */
+ size_t namelen = sizeof(sockname);
+#endif /* __GLIBC__ */
PRMSG (2, "SocketINETAccept(%x,%d)\n", ciptr, ciptr->fd, 0);
@@ -1181,7 +1193,11 @@
{
XtransConnInfo newciptr;
struct sockaddr_un sockname;
+#if !defined(__GLIBC__)
int namelen = sizeof(sockname);
+#else /* __GLIBC__ */
+ size_t namelen = sizeof(sockname);
+#endif /* __GLIBC__ */
PRMSG (2, "SocketUNIXAccept(%x,%d)\n", ciptr, ciptr->fd, 0);
diff -uNr xfree86-3.2/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.c xfree86-3.2.a/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.c
--- xfree86-3.2/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.c Sun Mar 10 07:03:33 1996
+++ xfree86-3.2.a/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.c Thu May 8 17:56:50 1997
@@ -36,6 +36,7 @@
#include "p9000orchid.h"
#include "p9000viper.h"
+#include
#include
static unsigned int p9000OrchidSaveMisc; /* Stored value of misc register */
diff -uNr xfree86-3.2/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.c xfree86-3.2.a/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.c
--- xfree86-3.2/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.c Sun Mar 10 07:03:35 1996
+++ xfree86-3.2.a/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.c Thu May 8 17:56:50 1997
@@ -34,6 +34,7 @@
#include "ICD2061A.h"
#include "p9000viper.h"
+#include
#include
static unsigned p9000ViperSaveMisc; /* Stored value of misc register */
diff -uNr xfree86-3.2/programs/Xserver/os/xdmcp.c xfree86-3.2.a/programs/Xserver/os/xdmcp.c
--- xfree86-3.2/programs/Xserver/os/xdmcp.c Fri Jan 5 08:20:07 1996
+++ xfree86-3.2.a/programs/Xserver/os/xdmcp.c Thu May 8 17:56:50 1997
@@ -743,7 +743,11 @@
receive_packet()
{
struct sockaddr_in from;
+#if !defined(__GLIBC__)
int fromlen = sizeof(struct sockaddr_in);
+#else /* __GLIBC__ */
+ size_t fromlen = sizeof(struct sockaddr_in);
+#endif /* __GLIBC__ */
XdmcpHeader header;
/* read message off socket */
diff -uNr xfree86-3.2/programs/xdm/Imakefile xfree86-3.2.a/programs/xdm/Imakefile
--- xfree86-3.2/programs/xdm/Imakefile Wed Oct 16 10:45:03 1996
+++ xfree86-3.2.a/programs/xdm/Imakefile Thu May 8 18:00:47 1997
@@ -62,7 +62,9 @@
SYS_LIBRARIES1 = -lsec
#endif
#if defined(LinuxArchitecture)
+#if !defined(AlphaArchitecture)
SYS_LIBRARIES1 = -lshadow
+#endif
#endif
#endif
diff -uNr xfree86-3.2/programs/xdm/choose.c xfree86-3.2.a/programs/xdm/choose.c
--- xfree86-3.2/programs/xdm/choose.c Wed Aug 31 00:50:49 1994
+++ xfree86-3.2.a/programs/xdm/choose.c Thu May 8 17:56:50 1997
@@ -383,7 +383,11 @@
{
int client_fd;
char buf[1024];
+#if !defined(__GLIBC__)
int len;
+#else /* __GLIBC__ */
+ size_t len;
+#endif /* __GLIBC__ */
XdmcpBuffer buffer;
ARRAY8 clientAddress;
CARD16 connectionType;
diff -uNr xfree86-3.2/programs/xdm/chooser.c xfree86-3.2.a/programs/xdm/chooser.c
--- xfree86-3.2/programs/xdm/chooser.c Thu Oct 3 04:49:46 1996
+++ xfree86-3.2.a/programs/xdm/chooser.c Thu May 8 17:56:51 1997
@@ -487,7 +487,11 @@
ARRAY8 status;
int saveHostname = 0;
struct sockaddr addr;
+#if !defined(__GLIBC__)
int addrlen;
+#else /* __GLIBC__ */
+ size_t addrlen;
+#endif /* __GLIBC__ */
#ifdef MINIX
int r;
#endif
diff -uNr xfree86-3.2/programs/xdm/socket.c xfree86-3.2.a/programs/xdm/socket.c
--- xfree86-3.2/programs/xdm/socket.c Wed Aug 31 00:50:53 1994
+++ xfree86-3.2.a/programs/xdm/socket.c Thu May 8 17:56:51 1997
@@ -209,7 +209,11 @@
int *lenp;
{
struct sockaddr_in in_addr;
+#if !defined(__GLIBC__)
int len;
+#else /* __GLIBC__ */
+ size_t len;
+#endif /* __GLIBC__ */
len = sizeof in_addr;
if (getsockname (chooserFd, (struct sockaddr *)&in_addr, &len) < 0)
diff -uNr xfree86-3.2/programs/xdm/xdmcp.c xfree86-3.2.a/programs/xdm/xdmcp.c
--- xfree86-3.2/programs/xdm/xdmcp.c Sun Oct 6 09:18:58 1996
+++ xfree86-3.2.a/programs/xdm/xdmcp.c Thu May 8 17:56:51 1997
@@ -280,7 +280,11 @@
{
XdmcpHeader header;
struct sockaddr_in addr;
+#if !defined(__GLIBC__)
int addrlen = sizeof addr;
+#else /* __GLIBC__ */
+ size_t addrlen = sizeof addr;
+#endif /* __GLIBC__ */
#ifdef MINIX
int r;
#endif
diff -uNr xfree86-3.2/programs/xterm/main.c xfree86-3.2.a/programs/xterm/main.c
--- xfree86-3.2/programs/xterm/main.c Fri May 9 13:37:41 1997
+++ xfree86-3.2.a/programs/xterm/main.c Thu May 8 17:56:51 1997
@@ -173,6 +173,9 @@
#define HAS_UTMP_UT_HOST
#define LASTLOG
#define WTMP
+#if defined(__GLIBC__)
+#include
+#endif
#endif
#ifdef Lynx
@@ -190,7 +193,9 @@
#define _SVID3
#endif
+#if !defined(__GLIBC__)
#include
+#endif /* __GLIBC__ */
#include
#ifdef Lynx
@@ -211,7 +216,9 @@
#include
#else
#ifdef USE_TERMIOS
+#if !defined(__GLIBC__)
#include
+#endif /* __GLIBC__ */
/* this hacked termios support only works on SYSV */
#define USE_SYSV_TERMIO
#define termio termios
-- System Information
Debian Release: 1.2
Kernel Version: Linux lot49 2.0.29 #3 Sat Apr 8 14:34:43 Local time zone must be set--see zic manualalpha alpha unknown
Versions of the packages xbase depends on:
libc6.1 Version: 2.0.3-3
ncurses3.0 Version: 1.9.9e-3
xlib6 Version: 3.2-5
cpp Version: 2.7.2.1-9
--- Begin /etc/X11/Xserver (modified conffile)
/usr/X11R6/bin/XF86_TGA
Console
The first line in this file is the full pathname of the default X server.
The second line shows who is allowed to run the X server:
RootOnly
Console (anyone whose controlling tty is on the console)
Anybody
--- End /etc/X11/Xserver
--- Begin /etc/X11/xdm/Xservers (modified conffile)
:0 local /usr/X11R6/bin/X
--- End /etc/X11/xdm/Xservers
Information forwarded to debian-bugs-dist@lists.debian.org, Branden Robinson <branden@debian.org>:
Bug#9692; Package xbase.
debian-bugs-dist@lists.debian.orgBranden Robinson
Subject: Bug#9692: xbase: Changes for glibc/alpha
Reply-To: Branden Robinson , 9692@bugs.debian.org
Resent-From: Branden Robinson
Resent-To: debian-bugs-dist@lists.debian.org
Resent-CC: Branden Robinson
Resent-Date: Mon, 20 Apr 1998 15:03:00 GMT
Resent-Message-ID:
Resent-Sender: iwj@debian.org
X-Debian-PR-Message: report 9692
X-Debian-PR-Package: xbase
X-Debian-PR-Keywords:
X-Loop: owner@bugs.debian.org
Received: via spool by 9692-bugs@bugs.debian.org id=B9692.89308403018150
(code B ref 9692); Mon, 20 Apr 1998 15:03:00 GMT
Resent-Message-Id: <199804201446.JAA04301@apocalypse.sequitur.org>
Message-ID: <19980420044826.A3108@purdue.edu>
Date: Mon, 20 Apr 1998 04:48:26 -0500
From: Branden Robinson
To: 9692@bugs.debian.org
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
micalg=pgp-md5; boundary=9jxsPFA5p3P2qPhR
X-Mailer: Mutt 0.91.1i
Resent-From: branden@purdue.edu
Resent-Date: Mon, 20 Apr 1998 09:46:58 -0500
Resent-To: 9692@bugs.debian.org
--9jxsPFA5p3P2qPhR
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: quoted-printable
Uh, these patches are really old. Have the requisite changes already been
made upstream? If so, please tell me and I will close this bug. If not,
please find out what changes still need to be made against the current
source tree and I *will* apply them.
--=20
G. Branden Robinson | The first thing the communists do wh=
en
Purdue University | they take over a country is to outlaw
branden@purdue.edu | cockfighting.
http://www.ecn.purdue.edu/~branden/ | -- Oklahoma State Senator John Monks
--9jxsPFA5p3P2qPhR
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: 2.6.3a
iQCVAwUBNTsZ6qiRn0nSNFD5AQFWuAQAxr9ijLlCRXLKB9fPcx6k2bcKzRtLSRlr
xkeSxFbPcczfAI5LJl2xuzNcbiI7n/2/b0fKXuOdwH14xQw5Rt0K6l1m7i8dwcRH
Wh+TYpa2PQa8tjFpzN6TROzVvjRehmBDRGUHrKBn9BXO1vo0j6TXlJFwS9C3YrSJ
FFdE4lZd3P4=
=EMen
-----END PGP SIGNATURE-----
--9jxsPFA5p3P2qPhR--
Acknowledgement sent to Branden Robinson <branden@purdue.edu>:
Extra info received and forwarded to list. Copy sent to Branden Robinson <branden@debian.org>.
-t
From: owner@bugs.debian.org (Ian Jackson)
To: Branden Robinson
Subject: Bug#9692: Info received (was xbase: Changes for glibc/alpha)
Message-ID:
In-Reply-To: <19980420044826.A3108@purdue.edu>
References: <19980420044826.A3108@purdue.edu>
X-Debian-PR-Message: ack-info-maintonly 9692
Thank you for the additional information you have supplied regarding
this problem report. It has been forwarded to the developer(s) and
to the developers' mailing list to accompany the original report.
Your message has been sent to the package maintainer(s):
Branden Robinson
If you wish to continue to submit further information on your problem,
please send it to 9692@bugs.debian.org, as before.
Please do not reply to the address at the top of this message,
unless you wish to report a problem with the bug-tracking system.
Ian Jackson
(administrator, Debian bugs database)
Received: (at 9692) by bugs.debian.org; 20 Apr 1998 14:53:50 +0000
Received: (qmail 18147 invoked from network); 20 Apr 1998 14:53:49 -0000
Received: from roger.ecn.purdue.edu (HELO apocalypse.sequitur.org) (branden@128.46.147.87)
by debian.novare.net with SMTP; 20 Apr 1998 14:53:49 -0000
Received: (from branden@localhost)
by apocalypse.sequitur.org (8.8.8/8.8.8/Debian/GNU) id JAA04301
for 9692@bugs.debian.org; Mon, 20 Apr 1998 09:46:58 -0500
Resent-Message-Id: <199804201446.JAA04301@apocalypse.sequitur.org>
Message-ID: <19980420044826.A3108@purdue.edu>
Date: Mon, 20 Apr 1998 04:48:26 -0500
From: Branden Robinson
To: 9692@bugs.debian.org
Subject: xbase: Changes for glibc/alpha
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
micalg=pgp-md5; boundary=9jxsPFA5p3P2qPhR
X-Mailer: Mutt 0.91.1i
Resent-From: branden@purdue.edu
Resent-Date: Mon, 20 Apr 1998 09:46:58 -0500
Resent-To: 9692@bugs.debian.org
--9jxsPFA5p3P2qPhR
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: quoted-printable
Uh, these patches are really old. Have the requisite changes already been
made upstream? If so, please tell me and I will close this bug. If not,
please find out what changes still need to be made against the current
source tree and I *will* apply them.
--=20
G. Branden Robinson | The first thing the communists do wh=
en
Purdue University | they take over a country is to outlaw
branden@purdue.edu | cockfighting.
http://www.ecn.purdue.edu/~branden/ | -- Oklahoma State Senator John Monks
--9jxsPFA5p3P2qPhR
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: 2.6.3a
iQCVAwUBNTsZ6qiRn0nSNFD5AQFWuAQAxr9ijLlCRXLKB9fPcx6k2bcKzRtLSRlr
xkeSxFbPcczfAI5LJl2xuzNcbiI7n/2/b0fKXuOdwH14xQw5Rt0K6l1m7i8dwcRH
Wh+TYpa2PQa8tjFpzN6TROzVvjRehmBDRGUHrKBn9BXO1vo0j6TXlJFwS9C3YrSJ
FFdE4lZd3P4=
=EMen
-----END PGP SIGNATURE-----
--9jxsPFA5p3P2qPhR--