[arch-commits] CVS update of extra/devel/php (PKGBUILD php.ini php.install)
Pierre Schmitz
pierre at archlinux.org
Fri Sep 21 19:53:29 UTC 2007
Date: Friday, September 21, 2007 @ 15:53:29
Author: pierre
Path: /home/cvs-extra/extra/devel/php
Modified: PKGBUILD (1.105 -> 1.106) php.ini (1.18 -> 1.19)
php.install (1.4 -> 1.5)
big cleanup and modularization of php
-------------+
PKGBUILD | 146 +++++++++++++++++++++++++++++-----------------------------
php.ini | 77 +++++++++++-------------------
php.install | 25 ++++++---
3 files changed, 118 insertions(+), 130 deletions(-)
Index: extra/devel/php/PKGBUILD
diff -u extra/devel/php/PKGBUILD:1.105 extra/devel/php/PKGBUILD:1.106
--- extra/devel/php/PKGBUILD:1.105 Thu Sep 13 11:01:02 2007
+++ extra/devel/php/PKGBUILD Fri Sep 21 15:53:29 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.105 2007/09/13 15:01:02 pierre Exp $
+# $Id: PKGBUILD,v 1.106 2007/09/21 19:53:29 pierre Exp $
# Maintainer: Pierre Schmitz <pierre at archlinux.de>
pkgname=php
pkgver=5.2.4
-pkgrel=2
+pkgrel=3
_suhosinver=0.9.6.2
pkgdesc='A high-level scripting language'
arch=('i686' 'x86_64')
@@ -10,95 +10,92 @@
url='http://www.php.net'
backup=('etc/php.ini')
install=php.install
-depends=('openssl' 'pam' 'bzip2' 'gdbm' 'ncurses' 'curl' 'libxslt' 'freetype2' \
- 'libjpeg' 'libpng')
+depends=('glibc')
makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' 'smtp-server' \
- 'sqlite3' 'unixodbc' 'net-snmp' 'libmcrypt' 'tidyhtml')
-conflicts=('php-cgi' 'php-suhosin')
-replaces=('php-cgi' 'php-suhosin')
+ 'ncurses' 'libpng' 'libjpeg' 'sqlite3' 'unixodbc' 'net-snmp' \
+ 'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'freetype2' 'libjpeg' \
+ 'curl' 'libxslt' 'pam' 'openssl' 'bzip2' 'gdbm')
+options=('emptydirs')
source=("http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2" \
"http://www.hardened-php.net/suhosin/_media/suhosin-patch-${pkgver}-${_suhosinver}.patch.gz" \
'php.ini')
md5sums=('55c97a671fdabf462cc7a82971a656d2' \
'58b18d0db00bc52b004fc749190a958f' \
- '2cd735d54ace29279edb1adef1097bce')
+ 'b8a74b5f5f3e5868e525c70488798f5c')
build() {
- export MAKEFLAGS="-j1"
-
- # common config
phpconfig="--prefix=/usr \
--sysconfdir=/etc \
- --with-config-file-scan-dir=/etc \
--with-layout=PHP \
- --with-ttf \
- --enable-mailparse \
+ --with-config-file-path=/etc/ \
+ --with-config-file-scan-dir=/etc/php.d/ \
+ --with-pear=/usr/share/pear \
+ --enable-inline-optimization \
+ --disable-debug \
+ --disable-rpath \
+ --disable-static \
+ "
+
+ phpextensions="--with-openssl=shared \
+ --with-zlib=shared \
--enable-bcmath=shared \
- --enable-calendar=shared \
- --enable-ftp=shared \
- --enable-gd-native-ttf \
- --enable-magic-quotes \
- --enable-posix=shared \
- --enable-session \
- --enable-shared \
- --enable-shmop=shared \
- --enable-pdo=shared \
- --enable-sqlite-utf8 \
- --enable-sockets=shared \
- --enable-xml \
- --enable-sysvsem=shared \
- --enable-sysvshm=shared \
- --enable-sysvmsg=shared \
- --enable-track-vars \
- --enable-trans-sid \
- --enable-safe-mode \
- --with-imap \
- --with-imap-ssl \
- --with-ncurses \
- --with-readline \
--with-bz2=shared \
- --with-curl \
- --with-mime-magic \
- --with-freetype-dir=/usr \
- --with-gd=shared \
- --enable-exif \
- --with-jpeg-dir=/usr \
- --enable-dba \
+ --enable-calendar=shared \
+ --with-curl=shared \
+ --enable-dba=shared \
--without-db2 \
--without-db3 \
- --with-inifile \
- --with-flatfile \
- --with-gdbm \
- --with-openssl \
- --with-gettext \
+ --with-gdbm=shared \
+ --enable-dbase=shared \
+ --enable-exif=shared \
+ --enable-ftp=shared \
+ --with-gd=shared \
+ --enable-gd-native-ttf \
+ --with-jpeg-dir=shared,/usr \
+ --with-png-dir=shared,/usr \
+ --with-gettext=shared \
+ --with-imap=shared \
+ --with-imap-ssl=shared \
--with-ldap=shared \
- --with-mcrypt=shared,/usr \
+ --enable-mbstring=shared \
+ --with-mcrypt=shared \
+ --with-mysql=shared \
+ --with-mysql-sock=/tmp/mysql.sock \
+ --with-mysql=shared \
+ --with-mysqli=shared \
+ --with-ncurses=shared \
--with-unixODBC=shared,/usr \
+ --enable-pdo=shared \
+ --with-pdo-mysql=shared \
+ --with-pdo-sqlite=shared \
--with-pdo-odbc=shared,unixODBC,/usr \
- --with-mysqli=shared \
- --with-mysql-sock=/tmp/mysql.sock \
- --with-pdo-mysql=shared,/usr \
- --with-mysql=shared,/usr \
- --with-pgsql=shared \
- --with-pgsql-sock=/tmp/pgsql.sock \
- --with-pdo-pgsql=shared,/usr \
+ --with-pdo-pgsql=shared \
--with-sqlite=shared \
- --with-pdo-sqlite=shared,/usr \
- --with-pear=/usr/share/pear \
- --with-dom \
- --with-dom-xslt \
- --with-xsl \
- --with-png-dir=/usr \
- --with-regex=php \
- --with-zlib \
+ --with-pgsql=shared \
+ --enable-shmop=shared \
+ --with-snmp=shared \
--enable-soap=shared \
+ --enable-sqlite-utf8=shared \
+ --enable-sysvmsg=shared \
+ --enable-sysvsem=shared \
+ --enable-sysvshm=shared \
+ --with-tidy=shared \
+ --with-xsl=shared \
+ --enable-zip=shared \
+ --enable-posix=shared \
+ --enable-sockets=shared \
+ --enable-xml \
+ --with-ttf=shared \
+ --enable-session=shared \
+ --enable-shared \
+ --with-regex=php \
--enable-mbstring=all \
--enable-mbregex \
- --with-snmp=shared,/usr \
- --enable-dbase \
- --enable-pcntl \
- --enable-tidy \
- --with-tidy=shared"
+ --enable-json=shared \
+ --with-iconv=shared \
+ --with-xmlrpc=shared \
+ --with-pspell=shared \
+ "
cd ${startdir}/src/${pkgname}-${pkgver}
@@ -111,32 +108,35 @@
--enable-cgi \
--enable-discard-path \
--enable-force-cgi-redirect \
- || return 1
+ ${phpextensions} || return 1
make || return 1
make INSTALL_ROOT=${startdir}/pkg install || return 1
# cleanup
- rm -rf ${startdir}/pkg/etc ${startdir}/pkg/{.registry,.channels,.depdb*,.lock,.file*}
+ rm -rf ${startdir}/pkg/{etc,.registry,.channels,.depdb*,.lock,.file*}
rm -rf ${startdir}/pkg/usr/{include,share,lib,man}
rm ${startdir}/pkg/usr/bin/{php,phpize,php-config,pecl,pear*}
# mod_php
make distclean
- ./configure ${phpconfig} --with-apxs2 || return 1
+ ./configure ${phpconfig} --with-apxs2 ${phpextensions} || return 1
make || return 1
install -d -m755 ${startdir}/pkg/usr/lib/apache
sed -i "s|-i -a -n php5|-i -n php5|g" Makefile
make INSTALL_ROOT=${startdir}/pkg install || return 1
+ # remove empty dirs
+ rm -rf ${startdir}/pkg{/etc/httpd,/usr/include/php/include}
# install php.ini
install -D -m644 ${startdir}/src/php.ini ${startdir}/pkg/etc/php.ini
+ install -d -m755 ${startdir}/pkg/etc/php.d/
# FS #3395
cd ${startdir}/pkg/usr/lib/php/extensions && ln -s * php
# fix pear path
sed "s|$PWD||g" -i ${startdir}/pkg/usr/{bin/pear,share/pear/pearcmd.php}
-}
+}
\ No newline at end of file
Index: extra/devel/php/php.ini
diff -u extra/devel/php/php.ini:1.18 extra/devel/php/php.ini:1.19
--- extra/devel/php/php.ini:1.18 Sun Sep 2 08:07:12 2007
+++ extra/devel/php/php.ini Fri Sep 21 15:53:29 2007
@@ -7,8 +7,7 @@
; read it, it must be named 'php.ini'. PHP looks for it in the current
; working directory, in the path designated by the environment variable
; PHPRC, and in the path that was defined in compile time (in that order).
-; Under Windows, the compile-time path is the Windows directory. The
-; path in which the php.ini file is looked for can be overridden using
+; The path in which the php.ini file is looked for can be overridden using
; the -c argument in command line mode.
;
; The syntax of the file is extremely simple. Whitespace and Lines
@@ -303,7 +302,7 @@
max_execution_time = 30 ; Maximum execution time of each script, in seconds
max_input_time = 60 ; Maximum amount of time each script may spend parsing request data
;max_input_nesting_level = 64 ; Maximum input variable nesting level
-memory_limit = 16M ; Maximum amount of memory a script may consume (16MB)
+memory_limit = 32M ; Maximum amount of memory a script may consume (32MB)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -427,7 +426,7 @@
; Log errors to specified file.
;error_log = filename
-; Log errors to syslog (Event Log on NT, not valid in Windows 95).
+; Log errors to syslog.
error_log = syslog
@@ -517,9 +516,6 @@
; UNIX: "/path1:/path2"
include_path = ".:/usr/share/pear"
-;
-; Windows: "\path1;\path2"
-;include_path = ".;c:\php\includes"
; The root of the PHP pages, used only if nonempty.
; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
@@ -538,7 +534,7 @@
; Whether or not to enable the dl() function. The dl() function does NOT work
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
; disabled on them.
-enable_dl = On
+enable_dl = Off
; cgi.force_redirect is necessary to provide security running PHP as a CGI under
; most web servers. Left undefined, PHP turns this on by default. You can
@@ -616,14 +612,6 @@
; Default timeout for socket based streams (seconds)
default_socket_timeout = 60
-; If your scripts have to deal with files from Macintosh systems,
-; or you are running on a Mac and need to deal with files from
-; unix or win32 systems, setting this flag will cause PHP to
-; automatically detect the EOL character in those files so that
-; fgets() and file() will work regardless of the source of the file.
-; auto_detect_line_endings = Off
-
-
;;;;;;;;;;;;;;;;;;;;;;
; Dynamic Extensions ;
;;;;;;;;;;;;;;;;;;;;;;
@@ -688,13 +676,6 @@
define_syslog_variables = Off
[mail function]
-; For Win32 only.
-SMTP = localhost
-smtp_port = 25
-
-; For Win32 only.
-;sendmail_from = me at localhost.org
-
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
;sendmail_path =
@@ -744,8 +725,7 @@
; Default port number for mysql_connect(). If unset, mysql_connect() will use
; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
-; compile-time value defined MYSQL_PORT (in that order). Win32 will only look
-; at MYSQL_PORT.
+; compile-time value defined MYSQL_PORT (in that order).
mysql.default_port =
; Default socket name for local MySQL connects. If empty, uses the built-in
@@ -779,8 +759,7 @@
; Default port number for mysqli_connect(). If unset, mysqli_connect() will use
; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
-; compile-time value defined MYSQL_PORT (in that order). Win32 will only look
-; at MYSQL_PORT.
+; compile-time value defined MYSQL_PORT (in that order).
mysqli.default_port = 3306
; Default socket name for local MySQL connects. If empty, uses the built-in
@@ -956,8 +935,7 @@
session.save_handler = files
; Argument passed to save_handler. In the case of files, this is the path
-; where data files are stored. Note: Windows users have to change this
-; variable in order to use PHP's session functions.
+; where data files are stored.
;
; As of PHP 4.0.1, you can define the path as:
;
@@ -1275,18 +1253,26 @@
; available extensions
-extension=bcmath.so
-extension=bz2.so
-extension=calendar.so
-extension=ftp.so
-;extension=mcrypt.so
-;extension=fam.so
+;extension=bcmath.so
+;extension=bz2.so
+;extension=calendar.so
+;extension=curl.so
+;extension=dba.so
+;extension=dbase.so
+;extension=exif.so
+;extension=ftp.so
;extension=gd.so
+extension=gettext.so
+;extension=iconv.so
+;extension=imap.so
+;extension=json.so
;extension=ldap.so
;extension=mcrypt.so
;extension=mysql.so
;extension=mysqli.so
+;extension=ncurses.so
;extension=odbc.so
+;extension=openssl.so
;extension=pdo.so
;extension=pdo_mysql.so
;extension=pdo_odbc.so
@@ -1294,6 +1280,8 @@
;extension=pdo_sqlite.so
;extension=pgsql.so
;extension=posix.so
+;extension=pspell.so
+extension=session.so
;extension=shmop.so
;extension=snmp.so
;extension=soap.so
@@ -1302,20 +1290,11 @@
;extension=sysvmsg.so
;extension=sysvsem.so
;extension=sysvshm.so
-extension=posix.so
-extension=shmop.so
-
-; install php-apc in order to use this extension
-;extension=apc.so
-;apc.shm_size=64
-
-; install php-fileinfo in order to use this extension
-;extension=fileinfo.so
-
-; install php-suhosin-extension in order to use this extension
-;extension=suhosin.so
-; uncomment this if you use APC 3.0.12p* together with suhosin
-;suhosin.apc_bug_workaround=On
+;extension=tidy.so
+;extension=xmlrpc.so
+;extension=xsl.so
+;extension=zip.so
+extension=zlib.so
; Local Variables:
Index: extra/devel/php/php.install
diff -u extra/devel/php/php.install:1.4 extra/devel/php/php.install:1.5
--- extra/devel/php/php.install:1.4 Fri May 4 17:46:46 2007
+++ extra/devel/php/php.install Fri Sep 21 15:53:29 2007
@@ -7,14 +7,23 @@
==> The optional modules included in php require extra packages
==> to be installed.
==>
-==> - mysql : libmysqlclient
-==> - pgsql : postgresql-libs
-==> - ldap : libldap
-==> - sqlite : sqlite3
-==> - odbc : unixodbc
-==> - snmp : net-snmp
-==> - mcrypt : mcrypt
-
+==> - bz2 : bzip2
+==> - curl : curl
+==> - dba : gdbm
+==> - gd : libpng, libjpeg
+==> - imap : pam
+==> - ldap : libldap
+==> - mcrypt : mcrypt, libtool
+==> - mysql/mysqli : libmysqlclient
+==> - odbc/pdo_odbc : unixodbc
+==> - openssl : openssl
+==> - pgsql : postgresql-libs
+==> - pspell : aspell
+==> - snmp : net-snmp
+==> - sqlite : sqlite3
+==> - tidy : tidyhtml
+==> - xsl : libxslt
+==>
==> FOR PHP-CGI usage:
==> There are several cgi relevant settings in your /etc/php.ini. Make sure
==> you understand them and adjust them according to your needs. At least you
More information about the arch-commits
mailing list