Attachment #87312 for bug #123911

View | Details | Raw Unified | Return to bug 123911
Collapse All | Expand All

Lines 7-13 Link Here

(-)/usr/ports/lang/php5/Makefile (-1 / +1 lines)
7		7
8	PORTNAME= php5	8	PORTNAME= php5
9	PORTVERSION= 5.2.6	9	PORTVERSION= 5.2.6
10	PORTREVISION?= 0	10	PORTREVISION?= 1
11	CATEGORIES?= lang devel www	11	CATEGORIES?= lang devel www
12	MASTER_SITES= ${MASTER_SITE_PHP}	12	MASTER_SITES= ${MASTER_SITE_PHP}
13	MASTER_SITE_SUBDIR= distributions	13	MASTER_SITE_SUBDIR= distributions




--- ext/standard/basic_functions.c.orig	2008-05-21 20:47:35.000000000 -0500
+++ ext/standard/basic_functions.c	2008-05-21 20:52:46.000000000 -0500
@@ -87,6 +87,7 @@
 # include <sys/loadavg.h>
 #endif

 #ifdef HARTMUT_0
 #include <getopt.h>
 #endif
@@ -3861,7 +3862,7 @@
 		SetEnvironmentVariable(pe->key, "bugbug");
 #endif
 		putenv(pe->previous_value);
-# if defined(PHP_WIN32)
+# if defined(PHP_WIN32) || __FreeBSD_version < 700050
 		efree(pe->previous_value);
 # endif
 	} else {
@@ -4463,7 +4464,7 @@
 		unsetenv(pe->key);
@@ -4463,12 +4462,8 @@
 		pe.previous_value = NULL;
 		for (env = environ; env != NULL && *env != NULL; env++) {
 			if (!strncmp(*env, pe.key, pe.key_len) && (*env)[pe.key_len] == '=') {	/* found it */
-#if defined(PHP_WIN32)
+#if defined(PHP_WIN32) || __FreeBSD_version < 700050
 				/* must copy previous value because MSVCRT's putenv can free the string without notice */
 				pe.previous_value = estrdup(*env);
 #else
-				pe.previous_value = *env;
-#endif
 				break;
 			}
 		}

Return to bug 123911

Lines 1-5 Link Here

(-)/usr/ports/lang/php5/files/patch-ext_standard_basic_functions.c (-13 / +8 lines)
1	--- ext/standard/basic_functions.c.orig 2008-05-02 08:44:06.000000000 +0200	1	--- ext/standard/basic_functions.c.orig 2008-05-21 20:47:35.000000000 -0500
2	+++ ext/standard/basic_functions.c 2008-05-02 08:54:00.000000000 +0200	2	+++ ext/standard/basic_functions.c 2008-05-21 20:52:46.000000000 -0500
3	@@ -87,6 +87,7 @@	3	@@ -87,6 +87,7 @@
4	# include <sys/loadavg.h>	4	# include <sys/loadavg.h>
5	#endif	5	#endif
Lines 8-33 Link Here
8	#ifdef HARTMUT_0	8	#ifdef HARTMUT_0
9	#include <getopt.h>	9	#include <getopt.h>
10	#endif	10	#endif
11	@@ -3861,9 +3862,7 @@	11	@@ -3861,7 +3862,7 @@
12	SetEnvironmentVariable(pe->key, "bugbug");	12	SetEnvironmentVariable(pe->key, "bugbug");
13	#endif	13	#endif
14	putenv(pe->previous_value);	14	putenv(pe->previous_value);
15	-# if defined(PHP_WIN32)	15	-# if defined(PHP_WIN32)
		16	+# if defined(PHP_WIN32) \|\| __FreeBSD_version < 700050
16	efree(pe->previous_value);	17	efree(pe->previous_value);
17	-# endif	18	# endif
18	} else {	19	} else {
19	# if HAVE_UNSETENV	20	@@ -4463,7 +4464,7 @@
20	unsetenv(pe->key);
21	@@ -4463,12 +4462,8 @@
22	pe.previous_value = NULL;	21	pe.previous_value = NULL;
23	for (env = environ; env != NULL && *env != NULL; env++) {	22	for (env = environ; env != NULL && *env != NULL; env++) {
24	if (!strncmp(env, pe.key, pe.key_len) && (env)[pe.key_len] == '=') { /* found it */	23	if (!strncmp(env, pe.key, pe.key_len) && (env)[pe.key_len] == '=') { /* found it */
25	-#if defined(PHP_WIN32)	24	-#if defined(PHP_WIN32)
		25	+#if defined(PHP_WIN32) \|\| __FreeBSD_version < 700050
26	/* must copy previous value because MSVCRT's putenv can free the string without notice */	26	/* must copy previous value because MSVCRT's putenv can free the string without notice */
27	pe.previous_value = estrdup(*env);	27	pe.previous_value = estrdup(*env);
28	-#else	28	#else
29	- pe.previous_value = *env;
30	-#endif
31	break;
32	}
33	}