From 2862123bca02eb278f3b56334532914bcbbbc93b Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Sat, 24 Jan 2004 13:15:56 +0000 Subject: [PATCH] Finally remove PHP3 support, because PHP3 is already obsolete for years (even PHP5 is already coming) and we have a "php3" package and together with suPHP it allows one to still provide PHP3 in Apache. This removes a great bunch of extra complexity from the packaging of Apache now. --- apache/apache.base | 5 -- apache/apache.spec | 112 ++++----------------------------------------- 2 files changed, 8 insertions(+), 109 deletions(-) diff --git a/apache/apache.base b/apache/apache.base index ea60b4021a..d4dd72ccf0 100644 --- a/apache/apache.base +++ b/apache/apache.base @@ -235,11 +235,6 @@ DefaultType text/plain AddType application/x-httpd-php .php -# PHP3 support - - AddType application/x-httpd-php3 .php3 - - # suPHP support suPHP_Engine on diff --git a/apache/apache.spec b/apache/apache.spec index f3cc2250b2..676b606342 100644 --- a/apache/apache.spec +++ b/apache/apache.spec @@ -37,7 +37,6 @@ %define V_mod_ssl 2.8.16-1.3.29 %define V_mod_perl 1.29 %define V_mod_php 4.3.4 -%define V_mod_php3 3.0.18 %define V_mod_dav 1.0.3-1.3.6 %define V_mod_layout 3.2.1 %define V_mod_macro 1.1.2 @@ -78,7 +77,6 @@ Release: 20040124 %option with_mod_ssl no %option with_mod_perl no %option with_mod_php no -%option with_mod_php3 no %option with_mod_dav no %option with_mod_layout no %option with_mod_macro no @@ -133,14 +131,6 @@ Release: 20040124 %option with_mod_php_exif no %option with_mod_php_iconv no -# package options (optional PHP3 specific settings; requires "with_mod_php3") -%option with_mod_php3_ftp no -%option with_mod_php3_gd no -%option with_mod_php3_jpeg no -%option with_mod_php3_mysql no -%option with_mod_php3_ssl no -%option with_mod_php3_zlib no - # package options (braindead ones only) %option with_gdbm_ndbm no %option with_shared_core no @@ -151,9 +141,6 @@ Release: 20040124 # fixing implicit inter-module dependencies and correlations %if "%{with_mod_php}" == "yes" -%if "%{with_mod_php3}" == "yes" - %{error:build-time options 'with_mod_php' and 'with_mod_php3' conflict} -%endif %if "%{with_mod_ssl}" == "yes" %undefine with_mod_php_ssl %undefine with_mod_php_mm @@ -172,21 +159,11 @@ Release: 20040124 %undefine with_mod_php_ssl %define with_mod_php_ssl yes %endif -%endif -%if "%{with_mod_php3}" == "yes" -%if "%{with_mod_ssl}" == "yes" -%undefine with_mod_php3_ssl -%define with_mod_php3_ssl yes -%endif -%if "%{with_mod_php3_mysql}" == "yes" -%undefine with_mod_php3_zlib -%define with_mod_php3_zlib yes -%endif -%endif %if "%{with_mod_php_gdbm}" == "yes" %undefine with_gdbm_ndbm %define with_gdbm_ndbm yes %endif +%endif # list of sources Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz @@ -203,10 +180,9 @@ Source10: http://www.snert.com/Software/mod_throttle/mod_throttle%{V_mod_thr Source11: http://download.sourceforge.net/accessreferer/mod_access_referer-%{V_mod_access_referer}.tar.gz Source12: http://www.klomp.org/mod_roaming/mod_roaming-%{V_mod_roaming}.tar.gz Source13: http://software.tangent.org/download/mod_relocate-%{V_mod_relocate}.tar.gz -Source14: http://www.php.net/distributions/php-%{V_mod_php3}.tar.gz -Source15: http://www.muquit.com/muquit/software/mod_auth_ldap/mod_auth_ldap.tar.gz -Source16: http://www.suphp.org/download/suphp-%{V_suphp}.tar.gz -Source17: http://osdn.dl.sourceforge.net/sourceforge/modauthmysql/mod_auth_mysql.tgz +Source14: http://www.muquit.com/muquit/software/mod_auth_ldap/mod_auth_ldap.tar.gz +Source15: http://www.suphp.org/download/suphp-%{V_suphp}.tar.gz +Source16: http://osdn.dl.sourceforge.net/sourceforge/modauthmysql/mod_auth_mysql.tgz Source20: apache.conf Source21: apache.base Source22: apache.vhost @@ -334,29 +310,6 @@ BuildPreReq: libiconv PreReq: libiconv %endif %endif -%if "%{with_mod_php3}" == "yes" -BuildPreReq: make, bison, flex -%if "%{with_mod_php3_gd}" == "yes" -BuildPreReq: gd -PreReq: gd -%endif -%if "%{with_mod_php3_jpeg}" == "yes" -BuildPreReq: jpeg -PreReq: jpeg -%endif -%if "%{with_mod_php3_mysql}" == "yes" -BuildPreReq: mysql -PreReq: mysql -%endif -%if "%{with_mod_php3_ssl}" == "yes" -BuildPreReq: openssl -PreReq: openssl -%endif -%if "%{with_mod_php3_zlib}" == "yes" -BuildPreReq: zlib -PreReq: zlib -%endif -%endif %if "%{with_mod_auth_ldap}" == "yes" BuildPreReq: openldap, openssl PreReq: openldap, openssl @@ -442,16 +395,13 @@ AutoReqProv: no %if "%{with_mod_relocate}" == "yes" %setup13 -q -T -D -a 13 %endif -%if "%{with_mod_php3}" == "yes" +%if "%{with_mod_auth_ldap}" == "yes" %setup14 -q -T -D -a 14 %endif -%if "%{with_mod_auth_ldap}" == "yes" +%if "%{with_suphp}" == "yes" %setup15 -q -T -D -a 15 %endif %if "%{with_mod_auth_mysql}" == "yes" - %setup17 -q -T -D -a 17 -%endif -%if "%{with_suphp}" == "yes" %setup16 -q -T -D -a 16 %endif @@ -469,8 +419,8 @@ AutoReqProv: no ) || exit $? %endif - # optionally pre-configure Apache for mod_php, mod_php3 and mod_dav -%if "%{with_mod_php}" == "yes" || "%{with_mod_php3}" == "yes" || "%{with_mod_dav}" == "yes" + # optionally pre-configure Apache for mod_php and mod_dav +%if "%{with_mod_php}" == "yes" || "%{with_mod_dav}" == "yes" ( cd apache_%{V_apache} CC="%{l_cc}" \ %if "%{with_debug}" == "yes" @@ -719,49 +669,6 @@ AutoReqProv: no ) || exit $? %endif - # optionally prepare mod_php3 -%if "%{with_mod_php3}" == "yes" - ( cd php-%{V_mod_php3} - CC="%{l_cc}" \ -%if "%{with_mod_ssl}" == "yes" - CFLAGS="%{l_cflags -O} %{l_cppflags} -DEAPI" \ -%else - CFLAGS="%{l_cflags -O} %{l_cppflags}" \ -%endif - CPPFLAGS="%{l_cflags -O} %{l_cppflags}" \ - LDFLAGS="%{l_cflags -O} %{l_ldflags}" \ - ./configure \ - --prefix=%{l_prefix} \ - --with-apache=../apache_%{V_apache} \ - --with-config-file-path=%{l_prefix}/etc/apache \ -%if "%{with_mod_php3_ftp}" == "yes" - --with-ftp \ -%endif -%if "%{with_mod_php3_mysql}" == "yes" - --with-mysql=%{l_prefix} \ -%else - --without-mysql \ -%endif -%if "%{with_mod_php3_zlib}" == "yes" - --with-zlib=%{l_prefix} \ -%endif -%if "%{with_mod_php3_jpeg}" == "yes" - --with-jpeg=%{l_prefix} \ -%endif -%if "%{with_mod_php3_gd}" == "yes" - --with-gd=%{l_prefix} \ -%endif -%if "%{with_mod_php3_ssl}" == "yes" - --with-openssl=%{l_prefix} \ -%endif - --disable-shared \ - --enable-track-vars - %{l_make} %{l_mflags} - %{l_make} %{l_mflags} install \ - prefix=$RPM_BUILD_ROOT%{l_prefix} - ) || exit $? -%endif - # optionally prepare mod_dav %if "%{with_mod_dav}" == "yes" ( cd mod_dav-%{V_mod_dav} @@ -970,9 +877,6 @@ AutoReqProv: no %if "%{with_mod_php}" == "yes" --activate-module=src/modules/php4/libphp4.a \ %endif -%if "%{with_mod_php3}" == "yes" - --activate-module=src/modules/php3/libphp3.a \ -%endif %if "%{with_mod_dav}" == "yes" --activate-module=src/modules/dav/libdav.a \ --enable-rule=EXPAT \