From 7497e851b4b492c042df452c85b9fb61b1f11809 Mon Sep 17 00:00:00 2001 From: lukem Date: Thu, 29 Apr 2004 01:30:17 +0000 Subject: [PATCH] Add -DARC4_RANDOM to the global CPPFLAGS and X11EXTRAMANDEFS. Remove -DDEV_RANDOM, since ARC4_RANDOM takes precedence anyway. --- x11/bin/xdm/Makefile | 5 ++--- x11/bin/xdm/Makefile.xdm | 7 +++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/x11/bin/xdm/Makefile b/x11/bin/xdm/Makefile index 01779fa90df7..091ff8902e75 100644 --- a/x11/bin/xdm/Makefile +++ b/x11/bin/xdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/04/16 12:58:06 rtr Exp $ +# $NetBSD: Makefile,v 1.7 2004/04/29 01:30:17 lukem Exp $ .include @@ -9,8 +9,7 @@ SRCS= access.c auth.c choose.c daemon.c dm.c dpylist.c \ streams.c util.c xdmauth.c xdmcp.c \ Login.c greet.c verify.c -CPPFLAGS.auth.c= -DBSD44SOCKETS -DHAS_MKSTEMP -CPPFLAGS.genauth.c= -DARC4_RANDOM +CPPFLAGS.auth.c= -DBSD44SOCKETS CPPFLAGS.socket.c= -DBSD44SOCKETS CPPFLAGS.xdmcp.c= -DBSD44SOCKETS CPPFLAGS.xdmshell.c= -DHAS_VFORK diff --git a/x11/bin/xdm/Makefile.xdm b/x11/bin/xdm/Makefile.xdm index cb00d864ebb8..eef0b11dcbe3 100644 --- a/x11/bin/xdm/Makefile.xdm +++ b/x11/bin/xdm/Makefile.xdm @@ -1,12 +1,15 @@ -# $NetBSD: Makefile.xdm,v 1.3 2004/03/26 21:29:54 fredb Exp $ +# $NetBSD: Makefile.xdm,v 1.4 2004/04/29 01:30:17 lukem Exp $ CPPFLAGS+= -DBINDIR=\"${X11BINDIR}\" -DXDMDIR=\"${X11LIBDIR}/xdm\" \ -DHASXDMAUTH ${X11FLAGS.CONNECTION} -DGREET_USER_STATIC \ - -DFRAGILE_DEV_MEM -DDEV_RANDOM=\"/dev/urandom\" \ + -DFRAGILE_DEV_MEM -DARC4_RANDOM \ -DXPM -DUSE_XINERAMA -DHAS_SETPROCTITLE -UIPv6 \ + -DHAS_MKSTEMP \ -I${X11SRCDIR.xc}/programs/xdm \ ${X11FLAGS.VERSION} +X11EXTRAMANDEFS+=-DARC4_RANDOM + CHOOSERPATH= ${X11ROOTDIR}/libexec/chooser .PATH: ${X11SRCDIR.xc}/programs/xdm