X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fphp;h=e996a131944a58d35aa5bdc1443a2df17b968a75;hp=fa1c6fea5141c3209aea1e2db06ce071b7baa403;hb=27b8cc241c27a45a15ec78f8ceb8e597cdde2d45;hpb=c8ead4a543859582497e107173c650cec4203d4f

diff --git a/lfs/php b/lfs/php
index fa1c6fea51..e996a13194 100644
--- a/lfs/php
+++ b/lfs/php
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,7 +24,7 @@
 
 include Config
 
-VER        = 4.4.4
+VER        = 5.2.4
 
 THISAPP    = php-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -38,11 +36,13 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) idn-0.1.tgz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz
 
-$(DL_FILE)_MD5 = bc6fa8908e2ac36e93bab9f7d42cda3a
+$(DL_FILE)_MD5 = 55c97a671fdabf462cc7a82971a656d2
+idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
 
 install : $(TARGET)
 
@@ -74,16 +74,60 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) $(DIR_SRC)/idn-* $(DIR_SRC)/package.xml && \
+		cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && sed -i 's/const char \*errpfx,/const DB_ENV *dbenv, & const/' ext/dba/dba_db4.c
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
-					    --with-apxs2 --with-config-file-path=/etc \
-					    --with-zlib --with-bz2 --enable-ftp --with-gettext \
-					    --with-iconv --with-mysql=/usr --with-ncurses
+	cd $(DIR_APP) && ./configure --prefix=/usr \
+										            --sysconfdir=/etc \
+										            --with-apxs2 \
+										            --enable-force-cgi-redirect \
+										            --enable-discard-path \
+										            --enable-fastcgi \
+										            --with-config-file-path=/etc \
+										            --with-openssl \
+										            --with-kerberos \
+										            --with-pcre-regex=/usr \
+										            --with-zlib \
+										            --enable-bcmath \
+										            --with-bz2 \
+										            --enable-calendar \
+										            --with-curl \
+										            --with-curlwrappers \
+										            --enable-dba=shared \
+										            --with-gdbm \
+										            --with-db4 \
+										            --with-inifile \
+										            --with-flatfile \
+										            --enable-exif \
+										            --enable-ftp \
+										            --with-openssl-dir=/usr \
+										            --with-gd=/usr \
+										            --with-jpeg-dir=/usr \
+										            --with-png-dir=/usr \
+										            --with-zlib-dir=/usr \
+										            --with-freetype-dir=/usr \
+										            --with-gettext \
+										            --with-gmp \
+										            --enable-mbstring \
+										            --with-mysql \
+										            --with-mysql-sock=/var/run/mysql \
+										            --with-ncurses \
+										            --with-pdo-mysql \
+										            --without-pdo-sqlite \
+										            --with-readline \
+										            --enable-sockets \
+										            --with-xsl \
+										            --with-iconv
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	cd $(DIR_APP) && install -v -m644 php.ini-recommended /etc/php.ini
-	grep -v libphp4.so < /etc/httpd/conf/httpd.conf > /etc/httpd/conf/httpd.conf.bak
+	-grep -v libphp5.so < /etc/httpd/conf/httpd.conf > /etc/httpd/conf/httpd.conf.bak
 	mv -f /etc/httpd/conf/httpd.conf.bak /etc/httpd/conf/httpd.conf
-	@rm -rf $(DIR_APP)
+	cd $(DIR_SRC) && tar xfz $(DIR_DL)/idn-0.1.tgz
+	-rm -f $(DIR_SRC)/package.xml
+	cd $(DIR_SRC)/idn-* && phpize
+	cd $(DIR_SRC)/idn-* && ./configure --prefix=/usr --with-idn
+	cd $(DIR_SRC)/idn-* && make
+	cd $(DIR_SRC)/idn-* && make install
+	@rm -rf $(DIR_APP) $(DIR_SRC)/idn-* $(DIR_SRC)/package.xml
 	@$(POSTBUILD)