diff options
| author | Beat Gaetzi <beat@FreeBSD.org> | 2011-12-21 08:02:57 +0000 |
|---|---|---|
| committer | Beat Gaetzi <beat@FreeBSD.org> | 2011-12-21 08:02:57 +0000 |
| commit | d0020d8388b0d885672f14941f9a2d49f6ebffba (patch) | |
| tree | be3330f389c4f4d23ea4238c8292c555970ce8c5 /www/firefox-esr/files/patch-bugzilla-659932 | |
| parent | - Document mozilla -- multiple vulnerabilities (diff) | |
- Update Firefox to 9.0
In collaboration with: cognet, flo, Jan Beich
Approved by: portmgr (erwin, implicit)
Security: http://www.vuxml.org/freebsd/e3ff776b-2ba6-11e1-93c6-0011856a6e37.html
Diffstat (limited to 'www/firefox-esr/files/patch-bugzilla-659932')
| -rw-r--r-- | www/firefox-esr/files/patch-bugzilla-659932 | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/www/firefox-esr/files/patch-bugzilla-659932 b/www/firefox-esr/files/patch-bugzilla-659932 deleted file mode 100644 index d0698cb253c5..000000000000 --- a/www/firefox-esr/files/patch-bugzilla-659932 +++ /dev/null @@ -1,35 +0,0 @@ ---- toolkit/xre/glxtest.cpp.orig 2011-08-11 17:41:31.000000000 -0400 -+++ toolkit/xre/glxtest.cpp 2011-08-23 15:09:48.000000000 -0400 -@@ -114,6 +114,9 @@ - typedef GLXFBConfig* (* PFNGLXQUERYEXTENSION) (Display *, int *, int *); - PFNGLXQUERYEXTENSION glXQueryExtension = cast<PFNGLXQUERYEXTENSION>(dlsym(libgl, "glXQueryExtension")); - -+ typedef GLXFBConfig* (* PFNGLXQUERYVERSION) (Display *, int *, int *); -+ PFNGLXQUERYVERSION glXQueryVersion = cast<PFNGLXQUERYVERSION>(dlsym(libgl, "glXQueryVersion")); -+ - typedef GLXFBConfig* (* PFNGLXCHOOSEFBCONFIG) (Display *, int, const int *, int *); - PFNGLXCHOOSEFBCONFIG glXChooseFBConfig = cast<PFNGLXCHOOSEFBCONFIG>(dlsym(libgl, "glXChooseFBConfig")); - -@@ -139,6 +142,7 @@ - PFNGLGETSTRING glGetString = cast<PFNGLGETSTRING>(dlsym(libgl, "glGetString")); - - if (!glXQueryExtension || -+ !glXQueryVersion || - !glXChooseFBConfig || - !glXGetVisualFromFBConfig || - !glXCreatePixmap || -@@ -158,6 +162,14 @@ - ///// Check that the GLX extension is present ///// - if (!glXQueryExtension(dpy, NULL, NULL)) - fatal_error("GLX extension missing"); -+ -+ ///// Check that the GLX version is >= 1.3, needed for glXCreatePixmap, bug 659932 ///// -+ int majorVersion, minorVersion; -+ if (!glXQueryVersion(dpy, &majorVersion, &minorVersion)) -+ fatal_error("Unable to query GLX version"); -+ -+ if (majorVersion < 1 || (majorVersion == 1 && minorVersion < 3)) -+ fatal_error("GLX version older than the required 1.3"); - - XSetErrorHandler(x_error_handler); - |