[arch-commits] Commit in php/repos (3 files)
Pierre Schmitz
pierre at archlinux.org
Thu Dec 4 18:24:32 UTC 2008
Date: Thursday, December 4, 2008 @ 13:24:32
Author: pierre
Revision: 20469
Merged revisions 11576,20468 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/php/trunk
........
r11576 | pierre | 2008-09-01 17:16:26 +0200 (Mo, 01 Sep 2008) | 1 line
removed install messages
........
r20468 | pierre | 2008-12-04 19:23:58 +0100 (Do, 04 Dez 2008) | 1 line
upgpkg: php 5.2.7-1
........
Modified:
php/repos/extra-x86_64/ (properties)
php/repos/extra-x86_64/PKGBUILD
Deleted:
php/repos/extra-x86_64/php.install
-------------+
PKGBUILD | 12 ++-----
php.install | 97 ----------------------------------------------------------
2 files changed, 5 insertions(+), 104 deletions(-)
Property changes on: php/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /php/trunk:1-9625
+ /php/trunk:1-20468
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2008-12-04 18:23:58 UTC (rev 20468)
+++ extra-x86_64/PKGBUILD 2008-12-04 18:24:32 UTC (rev 20469)
@@ -2,15 +2,14 @@
# Maintainer: Pierre Schmitz <pierre at archlinux.de>
pkgname=php
-pkgver=5.2.6
-pkgrel=5
-_suhosinver=0.9.6.2
+pkgver=5.2.7
+pkgrel=1
+_suhosinver=0.9.6.3
pkgdesc='A high-level scripting language'
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
backup=('etc/php/php.ini')
-install=php.install
depends=('glibc' 'readline' 'ncurses' 'libxml2' 'pcre')
makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' 'smtp-server' \
'libpng' 'libjpeg' 'sqlite3' 'unixodbc' 'net-snmp' \
@@ -40,8 +39,8 @@
source=("http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2" \
"http://download.suhosin.org/suhosin-patch-${pkgver}-${_suhosinver}.patch.gz" \
'php.ini' 'apache.conf' 'db-configure.patch')
-md5sums=('7380ffecebd95c6edb317ef861229ebd'
- 'f2ec986341a314c271259dbe4d940858'
+md5sums=('9ffc42edbb7faad965699666ddd559bc'
+ 'd455c3dd5b652046dbac2951a58f64fa'
'0ee1dad48f7d67af3d2c78ca6eed68ba'
'96ca078be6729b665be8a865535a97bf'
'74e5ce5a02488ec91b1c59f539e42936')
@@ -172,4 +171,4 @@
make || return 1
install -D -m644 libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so || return 1
install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf || return 1
-}
\ No newline at end of file
+}
Deleted: extra-x86_64/php.install
===================================================================
--- extra-x86_64/php.install 2008-12-04 18:23:58 UTC (rev 20468)
+++ extra-x86_64/php.install 2008-12-04 18:24:32 UTC (rev 20469)
@@ -1,97 +0,0 @@
-post_install() {
- echo '
- ==> PHP modules
-
- PHP has been built with optional modules. To enable these modules,
- uncomment the modules from php.ini
-
- Some of them require extra packages to be installed:
-
- * bz2 : bzip2
- * curl : curl
- * dba : gdbm
- * gd : libpng, libjpeg, freetype2
- * imap : pam
- * ldap : libldap
- * mcrypt : mcrypt, libtool
- * mysql/mysqli : libmysqlclient
- * odbc/pdo_odbc : unixodbc
- * openssl : openssl
- * pgsql/pdo_pgsql : postgresql-libs
- * pspell : aspell
- * snmp : net-snmp
- * sqlite : sqlite3
- * tidy : tidyhtml
- * xsl : libxslt
-
- ==> PHP-CGI and FCGI
-
- There are several cgi relevant settings in your php.ini. Make sure to
- adjust them according to your needs. At least you should activate the
- cgi.fix_pathinfo directive in php.ini by uncommenting it.
-
- ==> PHP and Apache HTTPD
-
- To use mod_php with the Apache webserver, add this to your httpd.conf:
-
- LoadModule php5_module modules/libphp5.so
- [..]
- Include conf/extra/php5_module.conf
-
- '
-}
-
-pre_upgrade() {
- # we moved php.ini from /etc/ to /etc/php
- # lets save the old file before pacman deletes it.
- # can be removed later
- if [ -f /etc/php.ini ] && [ $(vercmp '5.2.4-2' $2) -ge 0 ];then
- echo 'Backing up old php.ini...'
- mv /etc/php.ini /etc/php.ini.pacsave.tmp
- fi
-}
-
-post_upgrade() {
- post_install
- echo '
- ==> Review your php.ini
-
- Your php installation has been updated. You should review your current
- php.ini and check any upstream changes according to the default
- configuration which can be found at php.ini.pacnew.
- '
- # if we upgraded from an installation with old config layout, move the old
- # php.ini to the right place and inform the user about the changes.
- # can be removed later
- if [ -f /etc/php.ini.pacsave.tmp ] && [ $(vercmp '5.2.4-2' $2) -ge 0 ]; then
- echo 'Restoring old php.ini...'
- mv /etc/php/php.ini /etc/php/php.ini.pacnew
- mv /etc/php.ini.pacsave.tmp /etc/php/php.ini
- echo 'Updating extension dir...'
- sed -i -e 's#extension_dir = "/usr/lib/php/extensions/php/"#extension_dir = "/usr/lib/php/20060613/"#g' /etc/php/php.ini
- echo '
- ==> Location of php.ini has changed
-
- A previous configuration was found at /etc/php.ini. PHP stores its
- configuration at /etc/php/ now. Your old php.ini was moved to
- /etc/php/php.ini. You should merge your old file with the
- default one that can be found at /etc/php/php.ini.pacnew.
-
- Make sure to enable the modules you need. A lot of them are shared
- objects now and not statically built into php.
-
- External modules store their configuration in /etc/php/conf.d/. PHP
- scans that directory for any ini files.
- '
- fi
- # be nice to [testing] users and update php.ini to fix bug #8141.
- # can be removed later
- if [ $(vercmp '5.2.4-3' $2) -eq 0 ]; then
- echo 'Updating extension dir...'
- sed -i -e 's#extension_dir = "/usr/lib/php/extensions/"#extension_dir = "/usr/lib/php/20060613/"#g' /etc/php/php.ini
- fi
-}
-
-op=$1
-shift
-[ "$(type -t "$op")" = "function" ] && $op "$@"
\ No newline at end of file
More information about the arch-commits
mailing list