diff options
| -rw-r--r-- | x11/modular-xorg-server/Makefile.common | 4 | ||||
| -rw-r--r-- | x11/modular-xorg-server/distinfo | 11 | ||||
| -rw-r--r-- | x11/modular-xorg-server/patches/patch-exa_exa__render.c | 20 |
3 files changed, 7 insertions, 28 deletions
diff --git a/x11/modular-xorg-server/Makefile.common b/x11/modular-xorg-server/Makefile.common index 2749eef6416..b64b483315f 100644 --- a/x11/modular-xorg-server/Makefile.common +++ b/x11/modular-xorg-server/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.10 2016/04/13 18:43:17 wiz Exp $ +# $NetBSD: Makefile.common,v 1.11 2016/07/19 20:04:04 wiz Exp $ # used by x11/modular-xorg-server/Makefile # used by x11/modular-xorg-xephyr/Makefile -XORG_VERSION= 1.18.3 +XORG_VERSION= 1.18.4 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo index 35e8cf8fdd1..5915ddd579a 100644 --- a/x11/modular-xorg-server/distinfo +++ b/x11/modular-xorg-server/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.75 2016/04/13 18:43:17 wiz Exp $ +$NetBSD: distinfo,v 1.76 2016/07/19 20:04:04 wiz Exp $ -SHA1 (xorg-server-1.18.3.tar.bz2) = b3d8818bb3e1deeeb8f02d741c1223a72182e63c -RMD160 (xorg-server-1.18.3.tar.bz2) = a09617c34be796aacd6edcbe470179b2abdcb188 -SHA512 (xorg-server-1.18.3.tar.bz2) = 9540b2fb69bf531b57e54af09b103c92c8d9d9cc4e6abe911f63b73b7c63eb6587eeae87927d7bdd7be83749785bf6b395891f85394e86ad2b01c182749f2171 -Size (xorg-server-1.18.3.tar.bz2) = 5867330 bytes +SHA1 (xorg-server-1.18.4.tar.bz2) = ff088ee29dee46a2d68925c8df3f0515ef15ec52 +RMD160 (xorg-server-1.18.4.tar.bz2) = 6f58d84d3bbc59a773e6a2e1eafc208827a5923f +SHA512 (xorg-server-1.18.4.tar.bz2) = 2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b +Size (xorg-server-1.18.4.tar.bz2) = 6009508 bytes SHA1 (patch-configure) = b3c5ae8cd7aca96dbb5a237dda061e8c2569b2f2 -SHA1 (patch-exa_exa__render.c) = 4e144b977797d9cdc7e08c286aaedb303f1a1aa8 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92 SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3 diff --git a/x11/modular-xorg-server/patches/patch-exa_exa__render.c b/x11/modular-xorg-server/patches/patch-exa_exa__render.c deleted file mode 100644 index 25fc21c7442..00000000000 --- a/x11/modular-xorg-server/patches/patch-exa_exa__render.c +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-exa_exa__render.c,v 1.2 2015/04/25 11:47:03 tnn Exp $ - -Fix CVE-2013-6424 using -http://lists.x.org/archives/xorg-devel/2013-October/037996.html - -XXX why does upstream not have this patch? -XXX was it fixed differently or is it still unpatched? - ---- exa/exa_render.c.orig 2015-01-17 23:42:52.000000000 +0000 -+++ exa/exa_render.c -@@ -1141,7 +1141,8 @@ exaTrapezoids(CARD8 op, PicturePtr pSrc, - - exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST); - for (; ntrap; ntrap--, traps++) -- (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); -+ if (xTrapezoidValid(traps)) -+ (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); - exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST); - - xRel = bounds.x1 + xSrc - xDst; |