X-Git-Url: https://git.piment-noir.org/?p=deb_xorg-server.git;a=blobdiff_plain;f=debian%2Fpatches%2FCVE-2014-8xxx%2F0017-Add-request-length-checking-test-cases-for-some-Xinp.patch;fp=debian%2Fpatches%2FCVE-2014-8xxx%2F0017-Add-request-length-checking-test-cases-for-some-Xinp.patch;h=6a40d95b5929be658d85a1d79f5eb001c501f2f0;hp=cbad490446cec8fba73524c05b5c7637ce22a302;hb=4db25562fe97995f20b8adc0f2e6959ed82e8635;hpb=7217e0ca50bba73dad94782e67980aeeb24ab693

diff --git a/debian/patches/CVE-2014-8xxx/0017-Add-request-length-checking-test-cases-for-some-Xinp.patch b/debian/patches/CVE-2014-8xxx/0017-Add-request-length-checking-test-cases-for-some-Xinp.patch
index cbad490..6a40d95 100644
--- a/debian/patches/CVE-2014-8xxx/0017-Add-request-length-checking-test-cases-for-some-Xinp.patch
+++ b/debian/patches/CVE-2014-8xxx/0017-Add-request-length-checking-test-cases-for-some-Xinp.patch
@@ -15,11 +15,9 @@ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
  create mode 100644 test/xi1/Makefile.am
  create mode 100644 test/xi1/protocol-xchangedevicecontrol.c
 
-Index: xorg-server-1.15.1/configure.ac
-===================================================================
---- xorg-server-1.15.1.orig/configure.ac	2014-12-04 11:54:14.712587810 -0500
-+++ xorg-server-1.15.1/configure.ac	2014-12-04 11:54:14.708587787 -0500
-@@ -2553,6 +2553,7 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2553,6 +2553,7 @@ hw/kdrive/fbdev/Makefile
  hw/kdrive/linux/Makefile
  hw/kdrive/src/Makefile
  test/Makefile
@@ -27,10 +25,8 @@ Index: xorg-server-1.15.1/configure.ac
  test/xi2/Makefile
  xserver.ent
  xorg-server.pc
-Index: xorg-server-1.15.1/test/xi1/Makefile.am
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server-1.15.1/test/xi1/Makefile.am	2014-12-04 11:54:14.708587787 -0500
+--- /dev/null
++++ b/test/xi1/Makefile.am
 @@ -0,0 +1,34 @@
 +if ENABLE_UNIT_TESTS
 +if HAVE_LD_WRAP
@@ -66,10 +62,8 @@ Index: xorg-server-1.15.1/test/xi1/Makefile.am
 +	$(AM_V_GEN)chmod +x $@
 +endif
 +endif
-Index: xorg-server-1.15.1/test/xi1/protocol-xchangedevicecontrol.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server-1.15.1/test/xi1/protocol-xchangedevicecontrol.c	2014-12-04 11:54:14.708587787 -0500
+--- /dev/null
++++ b/test/xi1/protocol-xchangedevicecontrol.c
 @@ -0,0 +1,122 @@
 +/**
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.