diff options
Diffstat (limited to 'www/php3/patches')
-rw-r--r-- | www/php3/patches/patch-aa | 16 | ||||
-rw-r--r-- | www/php3/patches/patch-ab | 29 | ||||
-rw-r--r-- | www/php3/patches/patch-ac | 27 | ||||
-rw-r--r-- | www/php3/patches/patch-ad | 20 | ||||
-rw-r--r-- | www/php3/patches/patch-ae | 13 | ||||
-rw-r--r-- | www/php3/patches/patch-af | 33 |
6 files changed, 138 insertions, 0 deletions
diff --git a/www/php3/patches/patch-aa b/www/php3/patches/patch-aa new file mode 100644 index 00000000000..f610b544cf2 --- /dev/null +++ b/www/php3/patches/patch-aa @@ -0,0 +1,16 @@ +$NetBSD: patch-aa,v 1.4 1999/05/03 19:45:44 tv Exp $ + +--- functions/dl.c.orig Sun May 2 14:34:53 1999 ++++ functions/dl.c Sun May 2 14:35:15 1999 +@@ -123,7 +123,11 @@ + #endif + RETURN_FALSE; + } ++#ifdef __ELF__ + get_module = (php3_module_entry *(*)(void)) dlsym(handle, "get_module"); ++#else ++ get_module = (php3_module_entry *(*)(void)) dlsym(handle, "_get_module"); ++#endif + + if (!get_module) { + dlclose(handle); diff --git a/www/php3/patches/patch-ab b/www/php3/patches/patch-ab new file mode 100644 index 00000000000..c5c825ab4da --- /dev/null +++ b/www/php3/patches/patch-ab @@ -0,0 +1,29 @@ +$NetBSD: patch-ab,v 1.1 1999/05/03 19:45:44 tv Exp $ + +--- php.h.orig Sun May 2 15:38:36 1999 ++++ php.h Sun May 2 15:49:49 1999 +@@ -309,6 +309,24 @@ + # endif + #endif + ++#ifndef PHP_INTERNAL_FUNCS ++#undef PUTS ++#undef PUTC ++#undef PHPWRITE ++#undef BLOCK_INTERRUPTIONS ++#undef UNBLOCK_INTERRUPTIONS ++extern PHPAPI void _php3_puts(const char *s); ++extern PHPAPI void _php3_putc(char c); ++extern PHPAPI int _php3_write(const void *a, int n); ++extern PHPAPI void _php3_block_interruptions(void); ++extern PHPAPI void _php3_unblock_interruptions(void); ++#define PUTS(a) _php3_puts(a) ++#define PUTC(a) _php3_putc(a) ++#define PHPWRITE(a,n) _php3_write((a),(n)) ++#define BLOCK_INTERRUPTIONS _php3_block_interruptions() ++#define UNBLOCK_INTERRUPTIONS _php3_unblock_interruptions() ++#endif ++ + #define E_ERROR 0x1 + #define E_WARNING 0x2 + #define E_PARSE 0x4 diff --git a/www/php3/patches/patch-ac b/www/php3/patches/patch-ac new file mode 100644 index 00000000000..86cf278612f --- /dev/null +++ b/www/php3/patches/patch-ac @@ -0,0 +1,27 @@ +$NetBSD: patch-ac,v 1.1 1999/05/03 19:45:44 tv Exp $ + +--- tls.h.orig Sun May 2 15:36:41 1999 ++++ tls.h Sun May 2 15:38:32 1999 +@@ -120,9 +120,13 @@ + int php3_preprocess; + #if APACHE + request_rec *php3_rqst; ++#else ++ void *__php3_rqst; + #endif + #if USE_SAPI + struct sapi_request_info *sapi_rqst; ++#else ++ void *__sapi_rqst; + #endif + #if WIN32|WINNT + unsigned int wintimer_counter; +@@ -177,6 +181,8 @@ + /*info.c*/ + #if APACHE + module *top_module; ++#else ++ void *__top_module; + #endif + /*pageinfo.c*/ + long page_uid; diff --git a/www/php3/patches/patch-ad b/www/php3/patches/patch-ad new file mode 100644 index 00000000000..71868439bf1 --- /dev/null +++ b/www/php3/patches/patch-ad @@ -0,0 +1,20 @@ +$NetBSD: patch-ad,v 1.1 1999/05/03 19:45:44 tv Exp $ + +--- Makefile.in.orig Sun May 2 16:20:41 1999 ++++ Makefile.in Sun May 2 16:21:02 1999 +@@ -58,13 +58,13 @@ + snprintf.c php3_sprintf.c alloc.c list.c highlight.c debugger.c \ + configuration-parser.tab.c configuration-scanner.c \ + request_info.c safe_mode.c fopen-wrappers.c constants.c \ +- php3_realpath.c alloca.c php_compat.c ++ php3_realpath.c alloca.c php_compat.c abstractions.c + OBJS = language-parser.tab.o language-scanner.o main.o php3_hash.o operators.o \ + variables.o token_cache.o stack.o internal_functions.o \ + snprintf.o php3_sprintf.o alloc.o list.o highlight.o debugger.o \ + configuration-parser.tab.o configuration-scanner.o \ + request_info.o safe_mode.o fopen-wrappers.o constants.o \ +- php3_realpath.o alloca.o php_compat.o @LIBOBJS@ ++ php3_realpath.o alloca.o php_compat.o abstractions.o @LIBOBJS@ + + FUNCTIONS_SOURCE = functions/adabasd.c functions/aspell.c functions/apache.c functions/fhttpd.c \ + functions/basic_functions.c \ diff --git a/www/php3/patches/patch-ae b/www/php3/patches/patch-ae new file mode 100644 index 00000000000..1a86f54c22a --- /dev/null +++ b/www/php3/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 1999/05/03 19:45:44 tv Exp $ + +--- dbase/Makefile.in.orig Sun May 2 17:01:57 1999 ++++ dbase/Makefile.in Sun May 2 17:02:08 1999 +@@ -11,7 +11,7 @@ + LIB=@libdir@ + + CC=@CC@ +-CFLAGS=-I. -I@srcdir@ @CFLAGS@ ++CFLAGS=-I. -I@srcdir@ @CFLAGS@ @CFLAGS_SHLIB@ + RANLIB=@RANLIB@ + + TARGETS = dbflst tmpl dbfadd dbfdel dbfpack dbfget dbfndx dbfcreat \ diff --git a/www/php3/patches/patch-af b/www/php3/patches/patch-af new file mode 100644 index 00000000000..0c5b70a3ea6 --- /dev/null +++ b/www/php3/patches/patch-af @@ -0,0 +1,33 @@ +$NetBSD: patch-af,v 1.1 1999/05/03 19:45:44 tv Exp $ + +--- convertor/Makefile.orig Mon May 3 12:05:58 1999 ++++ convertor/Makefile Mon May 3 12:06:35 1999 +@@ -1,27 +1,15 @@ + convertor: language-scanner.o language-parser.tab.o token_cache.o main.o alloc.o +- gcc -o convertor language-scanner.o language-parser.tab.o token_cache.o main.o alloc.o +- +-language-parser.tab.c language-parser.tab.h: language-parser.y token_cache.h +- bison -p php -v -d language-parser.y +- +-language-scanner.c: language-scanner.lex token_cache.h +- flex -i -Pphp -olanguage-scanner.c language-scanner.lex +- ++ ${LINK.c} -o convertor language-scanner.o language-parser.tab.o token_cache.o main.o alloc.o + + language-parser.tab.o: language-parser.tab.c token_cache.h +- gcc -c language-parser.tab.c -o language-parser.tab.o + + language-scanner.o: language-scanner.c token_cache.h language-parser.tab.h +- gcc -c language-scanner.c -o language-scanner.o + + token_cache.o: token_cache.c token_cache.h +- gcc -c token_cache.c -o token_cache.o + + main.o: main.c token_cache.h +- gcc -c main.c -o main.o + + alloc.o: alloc.c token_cache.h +- gcc -c alloc.c -o alloc.o + + clean: + rm -f *.o *.tab.c *.output language-scanner.c convertor |