Module Name: src
Committed By: martin
Date: Wed Mar 8 14:50:37 UTC 2017
Modified Files:
src/external/mit/xorg/server/xorg-server/os [netbsd-6-1]: Makefile
src/x11/Xserver/os [netbsd-6-1]: Makefile
Log Message:
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]
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.16.1 \
src/external/mit/xorg/server/xorg-server/os/Makefile
cvs rdiff -u -r1.18 -r1.18.18.1 src/x11/Xserver/os/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/os/Makefile
diff -u src/external/mit/xorg/server/xorg-server/os/Makefile:1.9 src/external/mit/xorg/server/xorg-server/os/Makefile:1.9.16.1
--- src/external/mit/xorg/server/xorg-server/os/Makefile:1.9 Tue Aug 2 09:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/os/Makefile Wed Mar 8 14:50:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/08/02 09:11:38 mrg Exp $
+# $NetBSD: Makefile,v 1.9.16.1 2017/03/08 14:50:37 martin Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -9,7 +9,8 @@ LIB= os
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 \
Index: src/x11/Xserver/os/Makefile
diff -u src/x11/Xserver/os/Makefile:1.18 src/x11/Xserver/os/Makefile:1.18.18.1
--- src/x11/Xserver/os/Makefile:1.18 Mon May 30 02:12:02 2011
+++ src/x11/Xserver/os/Makefile Wed Mar 8 14:50:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2011/05/30 02:12:02 christos Exp $
+# $NetBSD: Makefile,v 1.18.18.1 2017/03/08 14:50:37 martin Exp $
.include "../Makefile.serverlib"
.include <bsd.own.mk>
@@ -7,7 +7,8 @@ LIB= os
.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} \
