Merge branch 'testing'

# By James Meyer (1091) and others
# Via James Meyer (5) and others
* testing: (1148 commits)
  LinHES-config: during install don't kill off lirc.  This keeps the remote active all the way to the finish
  Change version numbers to 8.0  to match the release number. LinHES-conifg LinHES-system mythdb-initial runit-scripts supplemental-web
  LinHES-conifig: mv_install.py  for the last partition don't go all the way to the end.  Gotta leave room for gpt tables.
  xf86-video-ati: xorg ati driver.
  LinHES-config: timezip.py  add syncing up of parental lvl passwords and starting level with MBE.
  LinHES-system: correct the logic for breaking out of the wmctrl loop.   As written it would break out of the inner loop..but not the 60 iteration loop.
  e16_theme_settings:  remove slide-in prop for new windows.   For whatever reason this was preventing mplayer from being positioned correctly for appletrailers.
  LinHES-config, mythinstall:  change  case of hd_pvr and   serial to all lower refs #902
  zilog-firmware:   firmware for TX support of the hdpvr and pvr-150 In general I can't recommend anybody using these transmitters  but including the firmware just in case someone really wants to
  linhes-udev-rules:  added hdprv_lirc rule. All of these lirc rules are limited to exactly one device.  If more then one device is present then only the last device in init will get the symlink
  runit-scripts:  fix logging for igdeamon,   add support to remote init script so that the blaster is always the first device in the chain. added support specificly for hd_pvr
  LinHES-system:   add lh_system_restore and lh_system_backup.  These scripts are called from the mythmenu. refs #900
  iguanair: rebuild with python 2.7
  LinHES-system: msg_daemon.py fix  init and nasty bug related to timeout. In a nutshell timeout wouldn't work unless a msg without a timeout was called first.
  linhes-udev-rules:  add rules for mce,streamzap,serial  lirc devices.
  mythinstall: recompile for matching libs
  mythtv:  latest .25-fixes  and change mythbackup/restore call lh_system_$op   to replace mythbackup/mythrestore.  mythbackup no longer works correctly with the new windowmanager
  linhes-scripts: myth2mp3, myth2x264, myth2xvid: use mythutil to get cutlist
  LinHES-config, supplimental-web:  Fix proxy numbering for Ceton infiniTV
  linhes-system:  add additional stuff to the system backup and also introduced an exclude file. The exclude/include files are locate in /home/mythtv/backup_config/
  ...

1 files changed, 9 insertions, 70 deletions

diff --git a/abs/core/php/php.install b/abs/core/php/php.install
index b040032..772c0ea 100644..100755
--- a/abs/core/php/php.install
+++ b/abs/core/php/php.install
@@ -1,75 +1,14 @@
 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
-		if [ -f /etc/php/php.ini ]
-		then
-	       	    sed -i 's|^.*date.timezone.*$|date.timezone='${timezone}'|' /etc/php/php.ini
-		fi
-	fi
-}
-
-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
+    if [ -f /etc/systemconfig ]
+    then
+        . /etc/systemconfig
+        if [ -f /etc/php/php.ini ]
+        then
+            sed -i 's|^.*date.timezone.*$|date.timezone='${timezone}'|' /etc/php/php.ini
+        fi
+    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
-    if [ -f /etc/systemconfig ]
-	then
-		. /etc/systemconfig
-		if [ -f /etc/php/php.ini ]
-		then
-	       	    sed -i 's|^.*date.timezone.*$|date.timezone='${timezone}'|' /etc/php/php.ini
-		fi
-	fi
-    echo 'Updating extension dir...'
-    sed -i -e 's/#extension_dir = "/usr/lib/php/20060613/"/#extension_dir = "/usr/lib/php/modules/"#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
+	post_install
 }
-
-op=$1
-shift
-[ "$(type -t "$op")" = "function" ] && $op "$@"