[arch-commits] Commit in php/trunk (PKGBUILD php.install)

[Pierre Schmitz]

    Date: Thursday, December 4, 2008 @ 13:23:58
  Author: pierre
Revision: 20468

upgpkg: php 5.2.7-1

Modified:
  php/trunk/PKGBUILD
Deleted:
  php/trunk/php.install

-------------+
 PKGBUILD    |   12 +++++-------
 php.install |   42 ------------------------------------------
 2 files changed, 5 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-12-04 17:53:01 UTC (rev 20467)
+++ PKGBUILD	2008-12-04 18:23:58 UTC (rev 20468)
@@ -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: php.install
===================================================================
--- php.install	2008-12-04 17:53:01 UTC (rev 20467)
+++ php.install	2008-12-04 18:23:58 UTC (rev 20468)
@@ -1,42 +0,0 @@
-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() {
-  # 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
-}