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/
  ...

6 files changed, 45 insertions, 67 deletions

diff --git a/abs/core/m4/PKGBUILD b/abs/core/m4/PKGBUILD
index b0738c8..29f1c9c 100644
--- a/abs/core/m4/PKGBUILD
+++ b/abs/core/m4/PKGBUILD
@@ -1,24 +1,37 @@
-# $Id: PKGBUILD 17049 2008-10-24 17:18:43Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# $Id: PKGBUILD 142068 2011-11-04 23:36:00Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=m4
-pkgver=1.4.12
-pkgrel=1
-pkgdesc="m4 macro processor"
-arch=(i686 x86_64)
-license=('GPL')
+pkgver=1.4.16
+pkgrel=2
+pkgdesc="The GNU macro processor"
+arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/m4"
-install=m4.install
+license=('GPL3')
 groups=('base-devel')
-depends=('glibc' 'bash' 'texinfo')
-source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.gz)
-md5sums=('0499a958a561781b125c740f18061ea8')
+depends=('glibc' 'bash')
+install=m4.install
+source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig}
+        m4-1.4.16-readlink-einval.patch)
+md5sums=('7548ec061a1ba993790159764f522d0e'
+         'eebe5c94e74e7551e2e30c5844f1b653'
+         'cea138fa9b568d06e46269611cec8dd0')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
+  patch -Np1 -i $srcdir/m4-1.4.16-readlink-einval.patch
+  sed -i '/gets is a security hole/d' lib/stdio.in.h
   ./configure --prefix=/usr
-  make || return 1
-  make prefix=${pkgdir}/usr install || return 1
+  make
+}
 
-  rm -f ${pkgdir}/usr/share/info/dir
+check() {
+  cd ${srcdir}/$pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+  make prefix=${pkgdir}/usr install
 }
diff --git a/abs/core/m4/__changelog b/abs/core/m4/__changelog
new file mode 100644
index 0000000..f7bfd9a
--- /dev/null
+++ b/abs/core/m4/__changelog
@@ -0,0 +1 @@
+sed -i '/gets is a security hole/d' lib/stdio.in.h
diff --git a/abs/core/m4/m4-1.4.16-readlink-einval.patch b/abs/core/m4/m4-1.4.16-readlink-einval.patch
new file mode 100644
index 0000000..6a98751
--- /dev/null
+++ b/abs/core/m4/m4-1.4.16-readlink-einval.patch
@@ -0,0 +1,12 @@
+diff -up m4-1.4.16/tests/test-readlink.h.orig m4-1.4.16/tests/test-readlink.h
+--- m4-1.4.16/tests/test-readlink.h.orig	2011-09-19 12:44:58.745546826 +0200
++++ m4-1.4.16/tests/test-readlink.h	2011-09-19 12:46:00.079548410 +0200
+@@ -38,7 +38,7 @@ test_readlink (ssize_t (*func) (char con
+   ASSERT (errno == ENOENT);
+   errno = 0;
+   ASSERT (func ("", buf, sizeof buf) == -1);
+-  ASSERT (errno == ENOENT);
++  ASSERT (errno == ENOENT || errno == EINVAL);
+   errno = 0;
+   ASSERT (func (".", buf, sizeof buf) == -1);
+   ASSERT (errno == EINVAL);
diff --git a/abs/core/m4/m4.install b/abs/core/m4/m4.install
index 7954ba9..be41381 100644
--- a/abs/core/m4/m4.install
+++ b/abs/core/m4/m4.install
@@ -1,9 +1,10 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(m4.info m4.info-1 m4.info-2)
 
 post_install() {
+  [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
 
@@ -12,9 +13,8 @@ post_upgrade() {
 }
 
 pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/abs/core/m4/m4/PKGBUILD b/abs/core/m4/m4/PKGBUILD
deleted file mode 100644
index 9e0a802..0000000
--- a/abs/core/m4/m4/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 90203 2010-09-09 05:37:32Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=m4
-pkgver=1.4.15
-pkgrel=1
-pkgdesc="The GNU macro processor"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/m4"
-license=('GPL3')
-groups=('base-devel')
-depends=('glibc' 'bash')
-install=m4.install
-source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz)
-md5sums=('1caf3410e6590f493834dc99ee04d027')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-  make check
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make prefix=${pkgdir}/usr install
-}
diff --git a/abs/core/m4/m4/m4.install b/abs/core/m4/m4/m4.install
deleted file mode 100644
index 88a9606..0000000
--- a/abs/core/m4/m4/m4.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(m4.info m4.info-1 m4.info-2)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}