Merge branch 'HEAD' of ssh://jams@linhes.org/mount/repository/linhes_pkgbuild into testing

6 files changed, 11 insertions, 8 deletions

diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index 421d774..3bdc2c4 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=7
-pkgrel=18
+pkgrel=20
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -97,4 +97,4 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          '35693f50939d5827aeabfce8c5dce589'
          'a94fe6d980f4b810f2e2ae5352084b39'
          '974c137d3fcb85942ba8945a1bc815fe'
-         'd279763f58a9bc9998f3cba6e7224ced')
+         'aad75575c9af70aa8bf3a06718985664')
diff --git a/abs/core/linhes-scripts/upgrade_linhes_script.sh b/abs/core/linhes-scripts/upgrade_linhes_script.sh
index 851bcc5..1c543fc 100644
--- a/abs/core/linhes-scripts/upgrade_linhes_script.sh
+++ b/abs/core/linhes-scripts/upgrade_linhes_script.sh
@@ -33,6 +33,7 @@ echo "Removing misc outdated packages "
 pacman -R --noconfirm  aufs-utils aufs >> $LOGFILE
 pacman -R --noconfirm xf86-video-sis >> $LOGFILE
 pacman -R --noconfirm madwifi >> $LOGFILE
+pacman -R --noconfirm hauppauge-hvr-firmware >> $LOGFILE
 
 
 echo "Resyncing with repository"
@@ -42,7 +43,7 @@ if [ ! -s /tmp/linhes_upgrade ]
 then
 	echo "No upgrades found.  This could mean the repository is busy."
 	echo "Or your system is already up to date."
-	echo "If you have not upgrade, please try again later."
+	echo "If you have not upgraded, please try again later."
 	echo "Starting the backend."
 	sv start mythbackend &>/dev/null
 	exit 1
@@ -145,8 +146,6 @@ remove_service.sh portmap
 wget ftp://ftp.knoppmyth.net/R6/sources/wallpaper.png -P /tmp
 mv /tmp/wallpaper.png /home/mythtv/.fluxbox/
 chown mythtv.mythtv /home/mythtv/.fluxbox/wallpaper.png
-mv /etc/php/php.ini /etc/php/php.ini.prer7
-mv /etc/php/php.ini.pacnew /etc/php/php.ini
 echo "All done!"
 
 
diff --git a/abs/core/php/PKGBUILD b/abs/core/php/PKGBUILD
index 28bd83f..394f495 100644
--- a/abs/core/php/PKGBUILD
+++ b/abs/core/php/PKGBUILD
@@ -1,7 +1,7 @@
 pkgbase=php
 pkgname=('php' 'php-cgi' 'php-pear')
 pkgver=5.3.3
-pkgrel=7
+pkgrel=8
 _suhosinver=${pkgver}-0.9.10
 pkgdesc='A high-level scripting language'
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ makedepends=('mysql' 'libpng' 'libjpeg' 'sqlite3' 'libmcrypt' 'libtool' \
              'freetype2' 'libjpeg' 'curl' 'libxslt' 'pam' 'openssl' 'bzip2' \
              'gdbm' 'db>=4.8.26')
 options=('emptydirs')
-source=("http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2" \
+source=("http://museum.php.net/php5/${pkgname}-${pkgver}.tar.bz2" \
         "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" \
         'php.ini' 'apache.conf')
 
diff --git a/abs/core/php/__changelog b/abs/core/php/__changelog
index 592eff9..754dc7c 100644
--- a/abs/core/php/__changelog
+++ b/abs/core/php/__changelog
@@ -11,3 +11,5 @@ split package into "php" "php-cgi" and "php-pear" -mh
 php-pear replaces PearLog -mh
 
 php.ini:  mysql.default_socket = /var/run/mysqld/mysqld.sock  Ref #753 -mh
+
+php.install: Change mysql.default_socket
diff --git a/abs/core/php/php.install b/abs/core/php/php.install
index fb543f3..b040032 100644
--- a/abs/core/php/php.install
+++ b/abs/core/php/php.install
@@ -1,4 +1,6 @@
 post_install() {
+	# change mysql.default_socket for mythweb
+	sed -i 's/^mysql.default_socket.*$/mysql.default_socket = \/var\/run\/mysqld\/mysqld.sock/g' /etc/php/php.ini
 	if [ -f /etc/systemconfig ]
 	then
 		. /etc/systemconfig
diff --git a/abs/core/python2/PKGBUILD b/abs/core/python2/PKGBUILD
index 1574208..da78268 100644
--- a/abs/core/python2/PKGBUILD
+++ b/abs/core/python2/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=python2
 pkgver=2.6.6
-pkgrel=4
+pkgrel=5
 _pybasever=2.6
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')