1 --- php-4.4.2/Makefile.global~ 2006-04-04 00:35:27.582384109 +0300
2 +++ php-4.4.2/Makefile.global 2006-04-04 00:40:19.318848123 +0300
4 mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
5 INSTALL = $(top_srcdir)/build/shtool install -c
6 INSTALL_DATA = $(INSTALL) -m 644
7 +LD_VERSION_SCRIPT = -Wl,--version-script=$(top_srcdir)/php.ver
9 DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
10 COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)
11 --- /dev/null 2006-03-28 14:00:37.387408000 +0300
12 +++ php-4.4.2/php.ver 2006-04-04 00:40:55.609652026 +0300
15 --- php-4.4.2/acinclude.m4~ 2006-04-05 14:07:34.806469587 +0300
16 +++ php-4.4.2/acinclude.m4 2006-04-05 14:07:59.667022065 +0300
21 - link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(LDFLAGS) -o [$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
22 + link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(LDFLAGS) -o [$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) libphp_common.la $(EXTRA_LDFLAGS) $(LD_VERSION_SCRIPT) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
26 # this would add dependency, but meanwhile require libphp_common.la linking at external extension build time. sigh
27 #@@ -1215,7 +1215,7 @@
28 # \$(phplibdir)/$1.$suffix: $3/$1.$suffix
29 # \$(LIBTOOL) --mode=install cp $3/$1.$suffix \$(phplibdir)
31 #-$3/$1.$suffix: \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES)
32 #+$3/$1.$suffix: libphp_common.la \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES)
36 --- php-4.4.2/Makefile.global~ 2006-04-05 02:56:01.208583507 +0300
37 +++ php-4.4.2/Makefile.global 2006-04-05 02:57:01.759935067 +0300
39 build-modules: $(PHP_MODULES)
41 libphp_common.la: $(PHP_GLOBAL_OBJS)
42 - $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION)
43 + $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(LD_VERSION_SCRIPT) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(MAJOR_VERSION)
44 $(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la
46 libphp4.la: libphp_common.la $(PHP_SAPI_OBJS)
47 - $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
48 + $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(LD_VERSION_SCRIPT) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
50 $(LIBTOOL_SAPI): libphp_common.la $(PHP_SAPI_OBJS)
51 - $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
52 + $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(LD_VERSION_SCRIPT) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
54 libtool-sapi: $(LIBTOOL_SAPI)
56 --- php-4.4.2/scripts/Makefile.frag~ 2006-04-05 19:13:33.607375995 +0300
57 +++ php-4.4.2/scripts/Makefile.frag 2006-04-05 19:20:46.147058812 +0300
68 --- php-4.4.2/scripts/phpize.in~ 2006-04-05 19:39:16.851897371 +0300
69 +++ php-4.4.2/scripts/phpize.in 2006-04-05 19:39:17.921921323 +0300
73 FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
74 -FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh"
75 +FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh php.ver"
76 CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \
77 mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
78 aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache autom4te.cache/ \
79 --- php-4.4.2/configure.in~ 2006-04-13 14:14:51.449570523 +0300
80 +++ php-4.4.2/configure.in 2006-04-15 15:37:40.676749564 +0300
84 PHP_SUBST_OLD(PHP_VERSION)
85 +PHP_SUBST_OLD(MAJOR_VERSION)
86 +PHP_SUBST_OLD(MINOR_VERSION)
87 +PHP_SUBST_OLD(RELEASE_VERSION)
88 PHP_SUBST(PROG_SENDMAIL)
91 --- php-4.4.2/sapi/apache/mod_php4.c~ 2006-01-01 15:47:01.000000000 +0200
92 +++ php-4.4.2/sapi/apache/mod_php4.c 2006-04-04 02:02:52.348791307 +0300
94 handler_rec php_handlers[] =
96 {"application/x-httpd-php", send_parsed_php},
97 + {"application/x-httpd-php4", send_parsed_php},
98 {"application/x-httpd-php-source", send_parsed_php_source},
99 + {"application/x-httpd-php4-source", send_parsed_php_source},
100 {"text/html", php_xbithack_handler},