[arch-commits] Commit in autofs/repos (3 files)

[Andrea Scarpino]

    Date: Sunday, April 26, 2009 @ 10:28:32
  Author: andrea
Revision: 36621

Merged revisions 30098-30100,30166,30172,36597,36620 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/autofs/trunk

........
  r30098 | andrea | 2009-03-16 16:13:09 +0100 (Mon, 16 Mar 2009) | 1 line
  
  upgpkg: autofs 4.1.4-5
........
  r30099 | andrea | 2009-03-16 16:28:35 +0100 (Mon, 16 Mar 2009) | 1 line
  
  upgpkg: autofs 4.1.4-5
........
  r30100 | andrea | 2009-03-16 16:38:47 +0100 (Mon, 16 Mar 2009) | 1 line
  
  upgpkg: autofs 4.1.4-5
........
  r30166 | giovanni | 2009-03-16 22:44:38 +0100 (Mon, 16 Mar 2009) | 1 line
  
  upgpkg: autofs 4.1.4-6
........
  r30172 | giovanni | 2009-03-17 03:03:34 +0100 (Tue, 17 Mar 2009) | 1 line
  
  upgpkg: autofs 4.1.4-7
........
  r36597 | andrea | 2009-04-25 12:45:24 +0200 (Sat, 25 Apr 2009) | 1 line
  
  moved htdig in [extra] as optdepends of kdebase-runtime
........
  r36620 | andrea | 2009-04-26 16:28:04 +0200 (Sun, 26 Apr 2009) | 1 line
  
  upgpkg: autofs 5.0.4-3
........

Modified:
  autofs/repos/testing-i686/	(properties)
  autofs/repos/testing-i686/PKGBUILD
  autofs/repos/testing-i686/autofs

----------+
 PKGBUILD |    7 ++++---
 autofs   |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)


Property changes on: autofs/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /autofs/trunk:1-24091
   + /autofs/trunk:1-36620

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-04-26 14:28:04 UTC (rev 36620)
+++ testing-i686/PKGBUILD	2009-04-26 14:28:32 UTC (rev 36621)
@@ -5,7 +5,7 @@
 
 pkgname=autofs
 pkgver=5.0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A kernel-based automounter for Linux."
 arch=('i686' 'x86_64')
 url="http://wiki.autofs.net/FrontPage"
@@ -15,12 +15,12 @@
 source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2"
 	'autofs' 'autofs.conf.d' 'auto.master' 'auto.misc' 'auto.net' 'heimdal.patch')
 md5sums=('2646dde61edd08dd952255558c733c08'
-         'e857b28b8a660602d349a5e21edab9f0'
+         '7c91067f29b9c3c608e890505acbca88'
          'ddd69346754419faee15fc4c7edeb8b8'
          '036bb5731400b7b0a89797e949169734'
          'd8a15ec9186c5c0b36e5cea1e2739e8a'
          'e4d945d63abc0488a47a5e2a750e8c3b'
-	 '1ee4825e26ad72bfe86acec3d3da5d2a')
+         '1ee4825e26ad72bfe86acec3d3da5d2a')
 
 build() {
   export MAKEFLAGS="-j1"
@@ -31,6 +31,7 @@
 
   ./configure --prefix=/usr \
     --sysconfdir=/etc/autofs \
+    --with-mapdir=/etc/autofs \
     --without-hesiod
   make || return 1
   make INSTALLROOT=${pkgdir} install

Modified: testing-i686/autofs
===================================================================
--- testing-i686/autofs	2009-04-26 14:28:04 UTC (rev 36620)
+++ testing-i686/autofs	2009-04-26 14:28:32 UTC (rev 36621)
@@ -10,7 +10,7 @@
   daemonoptions="--timeout=$TIMEOUT $daemonoptions"
 fi
 
-PID=`cat /var/run/autofs-running &> /dev/null`
+PID=`cat /var/run/autofs-running 2> /dev/null`
 case "$1" in
   start)
     stat_busy "Starting Automounter"