1 files changed, 0 insertions, 69 deletions
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-dri-weak-glx.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-dri-weak-glx.patch
deleted file mode 100644
index fff5ce1..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-dri-weak-glx.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Index: xorg-server-1.0.2/hw/xfree86/dri/dri.c
-===================================================================
---- xorg-server-1.0.2.orig/hw/xfree86/dri/dri.c
-+++ xorg-server-1.0.2/hw/xfree86/dri/dri.c
-@@ -75,6 +75,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
- extern Bool noPanoramiXExtension;
- #endif
- 
-+#ifdef XFree86LOADER
-+typedef __GLXscreen *(*__glXgetActiveScreenFn)(int);
-+__glXgetActiveScreenFn __glXgetActiveScreenPtr = NULL;
-+#endif
-+
- static int DRIScreenPrivIndex = -1;
- static int DRIWindowPrivIndex = -1;
- static unsigned long DRIGeneration = 0;
-@@ -783,13 +788,24 @@ static Bool
- DRICreateDummyContext(ScreenPtr pScreen, Bool needCtxPriv)
- {
-     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
--    __GLXscreenInfo *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
--    __GLcontextModes *modes = pGLXScreen->modes;
--    void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
-     DRIContextPrivPtr pDRIContextPriv;
-     void *contextStore;
-     VisualPtr visual;
-     int visNum;
-+#if defined(XFree86LOADER)
-+    __GLXscreen *pGLXScreen;
-+    __GLcontextModes *modes;
-+    void **pVisualConfigPriv;
-+    if (__glXgetActiveScreenPtr == NULL)
-+	__glXgetActiveScreenPtr = (__glXgetActiveScreenFn)LoaderSymbol("__glXgetActiveScreen");
-+    pGLXScreen = (*__glXgetActiveScreenPtr)(pScreen->myNum);
-+    modes = pGLXScreen->modes;
-+    pVisualConfigPriv = pGLXScreen->pVisualPriv;
-+#else
-+    __GLXscreen *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
-+    __GLcontextModes *modes = pGLXScreen->modes;
-+    void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
-+#endif
- 
-     visual = pScreen->visuals;
- 
-@@ -847,11 +863,22 @@ DRICreateContext(ScreenPtr pScreen, Visu
-                  XID context, drm_context_t * pHWContext)
- {
-     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-+    DRIContextPrivPtr pDRIContextPriv;
-+    void *contextStore;
-+#if defined(XFree86LOADER)
-+    __GLXscreen *pGLXScreen;
-+    __GLcontextModes *modes;
-+    void **pVisualConfigPriv;
-+    if (__glXgetActiveScreenPtr == NULL)
-+	__glXgetActiveScreenPtr = (__glXgetActiveScreenFn)LoaderSymbol("__glXgetActiveScreen");
-+    pGLXScreen = (*__glXgetActiveScreenPtr)(pScreen->myNum);
-+    modes = pGLXScreen->modes;
-+    pVisualConfigPriv = pGLXScreen->pVisualPriv;
-+#else
-     __GLXscreenInfo *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
-     __GLcontextModes *modes = pGLXScreen->modes;
-     void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
--    DRIContextPrivPtr pDRIContextPriv;
--    void *contextStore;
-+#endif
- 
-     if (pDRIPriv->createDummyCtx && !pDRIPriv->dummyCtxPriv) {
-         if (!DRICreateDummyContext(pScreen, pDRIPriv->createDummyCtxPriv)) {