*** ./appl/telnet/libtelnet/encrypt.h.osr6 Thu May 22 19:34:19 2008 --- ./appl/telnet/libtelnet/encrypt.h Thu Jun 19 19:46:30 2008 *************** *** 68,73 **** --- 68,75 ---- #define SAMEKEY(k1, k2) (!memcmp(k1, k2, sizeof(des_cblock))) + #include + typedef struct { short type; int length; *** ./appl/telnet/libtelnet/misc-proto.h.osr6 Thu May 22 19:34:19 2008 --- ./appl/telnet/libtelnet/misc-proto.h Thu Jun 19 19:47:31 2008 *************** *** 58,63 **** --- 58,65 ---- #ifndef __MISC_PROTO__ #define __MISC_PROTO__ + #include + void auth_encrypt_init (const char *, const char *, const char *, int); void auth_encrypt_user(const char *name); void auth_encrypt_connect (int); *** ./appl/telnet/telnetd/Makefile.in.osr6 Thu May 22 19:39:03 2008 --- ./appl/telnet/telnetd/Makefile.in Thu Jun 19 19:19:20 2008 *************** *** 138,144 **** CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ ! CFLAGS = @CFLAGS@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ --- 138,144 ---- CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ ! CFLAGS = @CFLAGS@ -D_KMEMUSER COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ *** ./appl/telnet/telnetd/telnetd.c.osr6 Thu May 22 19:34:19 2008 --- ./appl/telnet/telnetd/telnetd.c Thu Jun 19 19:16:56 2008 *************** *** 77,83 **** /* make sure we don't get the bsd version */ /* what is this here for? solaris? /joda */ # ifdef HAVE_SYS_TTY_H ! # include "/usr/include/sys/tty.h" # endif # ifdef HAVE_SYS_PTYVAR_H # include --- 77,83 ---- /* make sure we don't get the bsd version */ /* what is this here for? solaris? /joda */ # ifdef HAVE_SYS_TTY_H ! # include # endif # ifdef HAVE_SYS_PTYVAR_H # include *** ./appl/telnet/Makefile.in.osr6 Thu May 22 19:39:03 2008 --- ./appl/telnet/Makefile.in Thu Jun 19 19:52:23 2008 *************** *** 330,336 **** @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la @KRB5_TRUE@LIB_tsasl = $(top_builddir)/lib/tsasl/libtsasl.la @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la ! SUBDIRS = libtelnet telnet telnetd EXTRA_DIST = README.ORIG telnet.state all: all-recursive --- 330,336 ---- @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la @KRB5_TRUE@LIB_tsasl = $(top_builddir)/lib/tsasl/libtsasl.la @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la ! SUBDIRS = libtelnet telnetd EXTRA_DIST = README.ORIG telnet.state all: all-recursive *** ./appl/Makefile.in.osr6 Thu May 22 19:39:01 2008 --- ./appl/Makefile.in Thu Jun 19 19:53:21 2008 *************** *** 104,110 **** ETAGS = etags CTAGS = ctags DIST_SUBDIRS = afsutil ftp login otp gssmask popper push rsh rcp su \ ! xnlock telnet test kx kf dceutils DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AIX_EXTRA_KAFS = @AIX_EXTRA_KAFS@ --- 104,110 ---- ETAGS = etags CTAGS = ctags DIST_SUBDIRS = afsutil ftp login otp gssmask popper push rsh rcp su \ ! xnlock telnet test kf dceutils DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AIX_EXTRA_KAFS = @AIX_EXTRA_KAFS@ *************** *** 347,353 **** xnlock \ telnet \ test \ - kx \ kf \ $(dir_dce) --- 347,352 ---- *** ./lib/hx509/hx_locl.h.osr6 Thu May 22 19:37:43 2008 --- ./lib/hx509/hx_locl.h Thu Jun 19 19:28:04 2008 *************** *** 48,53 **** --- 48,54 ---- #include #include #include + #include #include #include #include *** ./lib/roken/ndbm_wrap.c.osr6 Thu May 22 19:37:53 2008 --- ./lib/roken/ndbm_wrap.c Thu Jun 19 19:16:56 2008 *************** *** 51,57 **** --- 51,60 ---- #include /* XXX undefine open so this works on Solaris with large file support */ + /* fcntl.h defines open as open64 which confuses SVR5 cc */ + #if defined(open) #undef open + #endif #define DBT2DATUM(DBT, DATUM) do { (DATUM)->dptr = (DBT)->data; (DATUM)->dsize = (DBT)->size; } while(0) #define DATUM2DBT(DATUM, DBT) do { (DBT)->data = (DATUM)->dptr; (DBT)->size = (DATUM)->dsize; } while(0) *** ./Install-OSR6.osr6 Thu Jun 19 19:16:56 2008 --- ./Install-OSR6 Thu Jun 19 19:16:56 2008 *************** *** 0 **** --- 1,13 ---- + #!/bin/sh + + MOUT=mout-install + D=/u/tmp/heimdal + DESTDIR=$D + export DESTDIR + + [ -f $MOUT ] && mv $MOUT $MOUT-prev + [ -d $D ] && rm -rf $D + mkdir -p $D + make install DESTDIR=$D 2>&1 | tee $MOUT + [ -d $DESTDIR/etc ] || mkdir -p $DESTDIR/etc + cp krb5.conf $DESTDIR/etc/krb5.conf *** ./Configure-OSR6.osr6 Thu Jun 19 19:16:56 2008 --- ./Configure-OSR6 Thu Jun 19 19:16:56 2008 *************** *** 0 **** --- 1,27 ---- + #!/bin/sh + # + HOST=i586-sco-sysv5 + CFLAGS="-O2 -DOPENSSL_DES_LIBDES_COMPATIBILITY" + INSTALL=/usr/gnu/bin/install + NM=nm-p + M4=/usr/gnu/bin/m4 + if [ "$1" = "-g" ] + then + CC="gcc -D_REENTRANT" + CXX="g++ -D_REENTRANT" + CFLAGS="$CFLAGS -Wall" + else + CC="cc -Kpthread -Kalloca" + CXX="CC -Kpthread -Kalloca" + fi + export CC CXX CFLAGS NM M4 INSTALL + rm -f mout-configure + ./configure --enable-shared --prefix=/usr/lib/heimdal \ + --with-x \ + --with-openldap=/usr \ + --libexecdir=/usr/lib/heimdal/sbin \ + --includedir=/usr/include/heimdal \ + --with-readline-include=/usr/include/readline \ + --with-readline-lib=/usr/lib \ + --with-openldap=/usr \ + --host=$HOST --target=$HOST --build=$HOST 2>&1 | tee mout-configure