diff options
Diffstat (limited to 'time/sunbird/patches/patch-af')
| -rw-r--r-- | time/sunbird/patches/patch-af | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/time/sunbird/patches/patch-af b/time/sunbird/patches/patch-af index ccb38695192..c549f04cdad 100644 --- a/time/sunbird/patches/patch-af +++ b/time/sunbird/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.3 2006/10/12 13:42:34 ghen Exp $ +$NetBSD: patch-af,v 1.4 2009/05/29 13:22:11 he Exp $ ---- security/nss/lib/freebl/unix_rand.c.orig 2006-04-04 01:01:51.000000000 +0000 +--- security/nss/lib/freebl/unix_rand.c.orig 2007-07-26 01:18:55.000000000 +0200 +++ security/nss/lib/freebl/unix_rand.c @@ -35,6 +35,7 @@ * ***** END LICENSE BLOCK ***** */ @@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.3 2006/10/12 13:42:34 ghen Exp $ #include <string.h> #include <signal.h> #include <unistd.h> -@@ -183,7 +183,8 @@ static SECStatus RNG_kstat(PRUint32* fed +@@ -185,7 +186,8 @@ static SECStatus RNG_kstat(PRUint32* fed #endif #if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) \ @@ -20,16 +20,3 @@ $NetBSD: patch-af,v 1.3 2006/10/12 13:42:34 ghen Exp $ #include <sys/times.h> #define getdtablesize() sysconf(_SC_OPEN_MAX) -@@ -694,7 +696,11 @@ safe_popen(char *cmd) - /* dup write-side of pipe to stderr and stdout */ - if (p[1] != 1) dup2(p[1], 1); - if (p[1] != 2) dup2(p[1], 2); -- close(0); -+ fd = open("/dev/null", O_RDONLY); -+ if (fd != 0) { -+ dup2(fd, 0); -+ close(fd); -+ } - { - int ndesc = getdtablesize(); - for (fd = PR_MIN(65536, ndesc); --fd > 2; close(fd)); |