From 6e43d95cf10738dd7000b2e1186ff9f8158eda44 Mon Sep 17 00:00:00 2001 From: ale Date: Thu, 25 Aug 2011 08:35:59 +0000 Subject: Add a patch to fix enigmail and bump PORTREVISION. Issue analysis: fire_glxtest_process() forks a new process, but doesn't wait(2) for it. So when wait(2) is invoked later it may return a pid of this child before any other child. Submitted by: avg Approved by: flo --- mail/thunderbird/Makefile | 2 +- .../files/patch-mozilla_toolkit_xre_glxtest.cpp | 25 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 mail/thunderbird/files/patch-mozilla_toolkit_xre_glxtest.cpp (limited to 'mail/thunderbird') diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index f5b815fa8add..5f3b0a47034a 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -7,7 +7,7 @@ PORTNAME= thunderbird DISTVERSION= 6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source diff --git a/mail/thunderbird/files/patch-mozilla_toolkit_xre_glxtest.cpp b/mail/thunderbird/files/patch-mozilla_toolkit_xre_glxtest.cpp new file mode 100644 index 000000000000..f338b4bdedb5 --- /dev/null +++ b/mail/thunderbird/files/patch-mozilla_toolkit_xre_glxtest.cpp @@ -0,0 +1,25 @@ +--- mozilla/toolkit/xre/glxtest.cpp.orig 2011-08-19 18:57:10.604870746 +0300 ++++ mozilla/toolkit/xre/glxtest.cpp 2011-08-19 18:59:43.620447963 +0300 +@@ -51,6 +51,8 @@ + // which runs the glxtest() static function. This creates a X connection, a GLX context, calls glGetString, and writes that + // to the 'write' end of the pipe. + ++#include ++#include + #include + #include + #include +@@ -224,6 +226,7 @@ + void fire_glxtest_process() + { + int pfd[2]; ++ int status; + if (pipe(pfd) == -1) { + perror("pipe"); + exit(EXIT_FAILURE); +@@ -244,4 +247,5 @@ + close(pfd[1]); + mozilla::widget::glxtest_pipe = pfd[0]; + mozilla::widget::glxtest_pid = pid; ++ waitpid(pid, &status, 0); + } -- cgit