[src/netbsd-6]: src external/mit/xorg/server/xorg-server.old/os/Makefile 1.2 ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1ab14c06952e
branches:  netbsd-6
changeset: 777148:1ab14c06952e
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Mar 08 14:48:15 2017 +0000

description:
external/mit/xorg/server/xorg-server.old/os/Makefile 1.2 (patch)
external/mit/xorg/server/xorg-server/os/Makefile 1.15 (patch)

        Apply upstream fixes for generation and comparision of
        MIT-MAGIC-COOKIES, fixing CVE-2017-2624
        [mrg, ticket #1381]

diffstat:

 external/mit/xorg/server/xorg-server/os/Makefile |  5 +++--
 x11/Xserver/os/Makefile                          |  5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r a991720f5146 -r 1ab14c06952e external/mit/xorg/server/xorg-server/os/Makefile
--- a/external/mit/xorg/server/xorg-server/os/Makefile  Wed Mar 08 00:38:33 2017 +0000
+++ b/external/mit/xorg/server/xorg-server/os/Makefile  Wed Mar 08 14:48:15 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2011/08/02 09:11:38 mrg Exp $
+#      $NetBSD: Makefile,v 1.9.4.1 2017/03/08 14:48:15 martin Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -9,7 +9,8 @@
 SRCS=  WaitFor.c access.c auth.c connection.c io.c mitauth.c \
        oscolor.c osinit.c utils.c xdmauth.c \
        xstrans.c xprintf.c log.c xdmcp.c \
-       rpcauth.c backtrace.c xprintf.c xsha1.c
+       rpcauth.c backtrace.c xprintf.c xsha1.c \
+       timingsafe_memcmp.c
 
 CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/include \
                -I${DESTDIR}${X11INCDIR}/X11 \
diff -r a991720f5146 -r 1ab14c06952e x11/Xserver/os/Makefile
--- a/x11/Xserver/os/Makefile   Wed Mar 08 00:38:33 2017 +0000
+++ b/x11/Xserver/os/Makefile   Wed Mar 08 14:48:15 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.18 2011/05/30 02:12:02 christos Exp $
+#      $NetBSD: Makefile,v 1.18.6.1 2017/03/08 14:48:15 martin Exp $
 
 .include "../Makefile.serverlib"
 .include <bsd.own.mk>
@@ -7,7 +7,8 @@
 .PATH: ${X11SRCDIR.xc}/lib/xtrans
 SRCS=  WaitFor.c access.c connection.c io.c oscolor.c osinit.c \
        utils.c log.c auth.c mitauth.c secauth.c xdmauth.c xdmcp.c \
-       xdmcp.c transport.c lbxio.c GetTimeInMillis.c
+       xdmcp.c transport.c lbxio.c GetTimeInMillis.c \
+       timingsafe_memcmp.c
 
 CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/include \
                -I${XSERVERINCDIR} \