1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00

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
This commit is contained in:
Alex Dupre 2011-08-25 08:35:59 +00:00
parent e94a89a1ab
commit 2c0f349438
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=280389
6 changed files with 78 additions and 3 deletions

View File

@ -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

View File

@ -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 <sys/types.h>
+#include <sys/wait.h>
#include <cstdio>
#include <cstdlib>
#include <unistd.h>
@@ -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);
}

View File

@ -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

View File

@ -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 <sys/types.h>
+#include <sys/wait.h>
#include <cstdio>
#include <cstdlib>
#include <unistd.h>
@@ -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);
}

View File

@ -7,7 +7,7 @@
PORTNAME= seamonkey
DISTVERSION= 2.3
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES?= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source

View File

@ -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 <sys/types.h>
+#include <sys/wait.h>
#include <cstdio>
#include <cstdlib>
#include <unistd.h>
@@ -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);
}