X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fphp;h=f068035e7fab1a5a69c5277eef7170756a77a661;hb=998375f855071d6a83f8ef3170a9c293bf175f26;hp=e996a131944a58d35aa5bdc1443a2df17b968a75;hpb=27b8cc241c27a45a15ec78f8ceb8e597cdde2d45;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/php b/lfs/php
index e996a13194..f068035e7f 100644
--- a/lfs/php
+++ b/lfs/php
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.2.4
+VER        = 5.3.15
 
 THISAPP    = php-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -36,13 +36,15 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) idn-0.1.tgz
+objects = $(DL_FILE) idn-0.1.tgz Log-1.9.11.tgz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz
+Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz
 
-$(DL_FILE)_MD5 = 55c97a671fdabf462cc7a82971a656d2
+$(DL_FILE)_MD5 = 5cfcfd0fa4c4da7576f397073e7993cc
 idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
+Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
 
 install : $(TARGET)
 
@@ -52,9 +54,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
-	@$(PAK)
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -74,9 +73,8 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) $(DIR_SRC)/idn-* $(DIR_SRC)/package.xml && \
+	@rm -rf $(DIR_APP) $(DIR_SRC)/idn-* $(DIR_SRC)/Log-* $(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 \
@@ -86,7 +84,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 										            --with-config-file-path=/etc \
 										            --with-openssl \
 										            --with-kerberos \
-										            --with-pcre-regex=/usr \
 										            --with-zlib \
 										            --enable-bcmath \
 										            --with-bz2 \
@@ -120,14 +117,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 										            --with-iconv
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	cd $(DIR_APP) && install -v -m644 php.ini-recommended /etc/php.ini
+	cd $(DIR_APP) && install -v -m644 $(DIR_SRC)/config/php/php.ini /etc/php.ini
 	-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
 	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 $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_SRC)/idn-* && make install
-	@rm -rf $(DIR_APP) $(DIR_SRC)/idn-* $(DIR_SRC)/package.xml
+	cd $(DIR_SRC) && tar xfz $(DIR_DL)/Log-1.9.11.tgz
+	-rm -f $(DIR_SRC)/package.xml
+	cd $(DIR_SRC)/Log-* && cp -av Log Log.php /usr/lib/php 
+	@rm -rf $(DIR_APP) $(DIR_SRC)/idn-* $(DIR_SRC)/Log-* $(DIR_SRC)/package.xml
 	@$(POSTBUILD)