Date: Mon, 21 Sep 1998 21:17:07 +0200 From: Mark Murray <mark@grondar.za> To: Steve Price <sprice@hiwaay.net> Cc: ports@FreeBSD.ORG, current@FreeBSD.ORG Subject: Re: Patch to build XFree86 w/ Krb4 in an ELF world Message-ID: <199809211917.VAA00798@gratis.grondar.za> In-Reply-To: Your message of " Mon, 21 Sep 1998 13:54:43 EST." <Pine.OSF.4.02.9809211353100.750-100000@fly.HiWAAY.net> References: <Pine.OSF.4.02.9809211353100.750-100000@fly.HiWAAY.net>
next in thread | previous in thread | raw e-mail | index | archive | help
------- =_aaaaaaaaaa0 Content-Type: text/plain; charset="us-ascii" Content-ID: <792.906405393.1@grondar.za> Steve Price wrote: > # I have a functioning patch based on your code. > # > # Care to review it? > > Sure send it over. I will have to get kerberos installed > first, but that takes no time in comparison to rebuilding > the XFree86 port (which I've done over a dozen times in > the last couple of weeks). :) Thanks! Enclosed.. M -- Mark Murray Join the anti-SPAM movement: http://www.cauce.org ------- =_aaaaaaaaaa0 Content-Type: text/plain; charset="us-ascii" Content-ID: <792.906405393.2@grondar.za> Content-Description: Xfree86 KerberosIV ELF patches Index: files/kerberos4.diffs =================================================================== RCS file: /home/ncvs/ports/x11/XFree86/files/kerberos4.diffs,v retrieving revision 1.3 diff -u -d -r1.3 kerberos4.diffs --- kerberos4.diffs 1998/04/13 14:28:58 1.3 +++ kerberos4.diffs 1998/09/21 16:45:26 @@ -34,7 +34,7 @@ +#define Krb4Includes /**/ +#endif +#ifndef Krb4Libraries -+#define Krb4Libraries -lkrb -ldes ++#define Krb4Libraries -lkrb -ldes -lcrypt +#endif +#else +#undef Krb4Includes Index: scripts/configure =================================================================== RCS file: /home/ncvs/ports/x11/XFree86/scripts/configure,v retrieving revision 1.35 diff -u -d -r1.35 configure --- configure 1998/09/21 00:04:36 1.35 +++ configure 1998/09/21 16:44:11 @@ -230,6 +230,14 @@ echo "#define HasXdmAuth $answ" >> $F fi +# ELF detection +if [ `sysctl -n kern.osreldate` -ge 300004 && X`objformat` = Xelf ]; then + ELF=yes + echo "#define UseElfFormat YES" >> $F +else + ELF=no +fi + cat <<'END' XDM can be built so that it will get a KerberosIV TGT for your users @@ -250,7 +258,11 @@ answ=NO cpkb=NO if [ $answ = YES ]; then - LIBKRB=/usr/lib/libkrb.a + if [ $ELF = yes ]; then + LIBKRB=/usr/lib/libkrb.a + else + LIBKRB=/usr/lib/aout/libkrb.a + fi K4PATCH=$FILESDIR/kerberos4.diffs K4XDM="$FILESDIR/krb4auth.c $FILESDIR/krb4auth.h" XDMDIR=$WRKDIR/xc/programs/xdm/ @@ -267,11 +279,6 @@ if [ $cpkb != NO ]; then echo "#define HasKrb4 $answ" >> $F fi - -# ELF detection -test `sysctl -n kern.osreldate` -ge 300004 && - test `objformat` = elf && - echo "#define UseElfFormat YES" >> $F echo echo "End of configuration questions. No more user input required" ------- =_aaaaaaaaaa0-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199809211917.VAA00798>