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

Sun Apr 26 19:56:19 UTC 2009

Date: Sunday, April 26, 2009 @ 15:56:18
  Author: giovanni
Revision: 36644

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

........
  r30098 | andrea | 2009-03-16 08:13:09 -0700 (lun, 16 mar 2009) | 1 line
  
  upgpkg: autofs 4.1.4-5
........
  r30099 | andrea | 2009-03-16 08:28:35 -0700 (lun, 16 mar 2009) | 1 line
  
  upgpkg: autofs 4.1.4-5
........
  r30100 | andrea | 2009-03-16 08:38:47 -0700 (lun, 16 mar 2009) | 1 line
  
  upgpkg: autofs 4.1.4-5
........
  r30166 | giovanni | 2009-03-16 14:44:38 -0700 (lun, 16 mar 2009) | 1 line
  
  upgpkg: autofs 4.1.4-6
........
  r30172 | giovanni | 2009-03-16 19:03:34 -0700 (lun, 16 mar 2009) | 1 line
  
  upgpkg: autofs 4.1.4-7
........
  r36597 | andrea | 2009-04-25 03:45:24 -0700 (sab, 25 apr 2009) | 1 line
  
  moved htdig in [extra] as optdepends of kdebase-runtime
........
  r36620 | andrea | 2009-04-26 07:28:04 -0700 (dom, 26 apr 2009) | 1 line
  
  upgpkg: autofs 5.0.4-3
........
  r36637 | andrea | 2009-04-26 12:00:27 -0700 (dom, 26 apr 2009) | 1 line
  
  upgpkg: autofs 5.0.4-4
........
  r36639 | andrea | 2009-04-26 12:03:45 -0700 (dom, 26 apr 2009) | 1 line
........

Added:
  autofs/repos/extra-x86_64/autofs.install
    (from rev 36639, autofs/trunk/autofs.install)
Modified:
  autofs/repos/extra-x86_64/	(properties)
  autofs/repos/extra-x86_64/PKGBUILD
  autofs/repos/extra-x86_64/auto.master
  autofs/repos/extra-x86_64/autofs
  autofs/repos/extra-x86_64/autofs.conf.d
Deleted:
  autofs/repos/extra-x86_64/auto.net

----------------+
 PKGBUILD       |   17 +++++++++--------
 auto.master    |    1 -
 auto.net       |   29 -----------------------------
 autofs         |    6 +++---
 autofs.conf.d  |    3 +--
 autofs.install |    5 +++++
 6 files changed, 18 insertions(+), 43 deletions(-)


Property changes on: autofs/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /autofs/trunk:1-24467
   + /autofs/trunk:1-36643

Modified: extra-x86_64/PKGBUILD
===================================================================

--- extra-x86_64/PKGBUILD	2009-04-26 19:51:09 UTC (rev 36643)
+++ extra-x86_64/PKGBUILD	2009-04-26 19:56:18 UTC (rev 36644)
@@ -5,22 +5,23 @@
 
 pkgname=autofs
 pkgver=5.0.4
-pkgrel=2
+pkgrel=4
 pkgdesc="A kernel-based automounter for Linux."
 arch=('i686' 'x86_64')
 url="http://wiki.autofs.net/FrontPage"
 license=('GPL2')
 depends=('libldap' 'libxml2' 'heimdal')
 backup=(etc/autofs/auto.master etc/autofs/auto.misc etc/conf.d/autofs)
+install=autofs.install
 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')
+  'autofs' 'autofs.conf.d' 'auto.master' 'auto.misc'
+  'heimdal.patch')
 md5sums=('2646dde61edd08dd952255558c733c08'
-         'e857b28b8a660602d349a5e21edab9f0'
-         'ddd69346754419faee15fc4c7edeb8b8'
-         '036bb5731400b7b0a89797e949169734'
+         'b4984b3161f50cba3d189b0ec594d014'
+         '47f597c870410055e0fdb66103daf928'
+         'a6cefb591e77b31b79dbb7243646c96b'
          'd8a15ec9186c5c0b36e5cea1e2739e8a'
-         'e4d945d63abc0488a47a5e2a750e8c3b'
-	 '1ee4825e26ad72bfe86acec3d3da5d2a')
+         '1ee4825e26ad72bfe86acec3d3da5d2a')
 
 build() {
   export MAKEFLAGS="-j1"
@@ -31,6 +32,7 @@
 
   ./configure --prefix=/usr \
     --sysconfdir=/etc/autofs \
+    --with-mapdir=/etc/autofs \
     --without-hesiod
   make || return 1
   make INSTALLROOT=${pkgdir} install
@@ -40,7 +42,6 @@
     install -D -m 644 ${srcdir}/$conf_file ${pkgdir}/etc/autofs/$conf_file
   done
 
-  install -m 755 ${srcdir}/auto.net ${pkgdir}/etc/autofs/auto.net
   sed -i "s:/etc:/etc/autofs:g" ${pkgdir}/usr/share/man/man5/auto.master.5
   install -D -m 755 ${srcdir}/autofs ${pkgdir}/etc/rc.d/autofs
   install -D -m 644 ${srcdir}/autofs.conf.d ${pkgdir}/etc/conf.d/autofs

Modified: extra-x86_64/auto.master
===================================================================
--- extra-x86_64/auto.master	2009-04-26 19:51:09 UTC (rev 36643)
+++ extra-x86_64/auto.master	2009-04-26 19:56:18 UTC (rev 36644)
@@ -3,4 +3,4 @@
 # mountpoint map options
 # For details of the format look at autofs(5).
 
-/media /etc/autofs/auto.media
\ No newline at end of file
+#/media /etc/autofs/auto.media

Deleted: extra-x86_64/auto.net
===================================================================
--- extra-x86_64/auto.net	2009-04-26 19:51:09 UTC (rev 36643)
+++ extra-x86_64/auto.net	2009-04-26 19:56:18 UTC (rev 36644)
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# $Id: auto.net,v 1.1 2003/11/15 15:40:14 manolis Exp $
-
-# Look at what a host is exporting to determine what we can mount.
-# This is very simple, but it appears to work surprisingly well
-
-key="$1"
-
-# add "nosymlink" here if you want to suppress symlinking local filesystems
-# Note: "nonstrict" is now set by default, remove it if you don't want it.
-opts="-fstype=nfs,hard,intr,nodev,nosuid,nonstrict"
-
-# Showmount comes in a number of names and varieties.  "showmount" is
-# typically an older version which accepts the '--no-headers' flag
-# but ignores it.  "kshowmount" is the newer version installed with knfsd,
-# which both accepts and acts on the '--no-headers' flag.
-#SHOWMOUNT="kshowmount --no-headers -e $key"
-#SHOWMOUNT="showmount -e $key | tail +2"
-
-# Newer distributions get this right
-SHOWMOUNT="/usr/sbin/showmount --no-headers -e $key"
-
-$SHOWMOUNT | LC_ALL=C sort +0 | \
-	awk -v key="$key" -v opts="$opts" -- '
-	BEGIN		{ ORS=""; first=1 }
-			{ if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 }
-	END		{ if (!first) print "\n"; else exit 1 }
-	'

Modified: extra-x86_64/autofs
===================================================================
--- extra-x86_64/autofs	2009-04-26 19:51:09 UTC (rev 36643)
+++ extra-x86_64/autofs	2009-04-26 19:56:18 UTC (rev 36644)
@@ -10,11 +10,11 @@
   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"
-    [ -z "$PID" ] && /usr/sbin/automount $daemonoptions &> /dev/null &
+    [ -z "$PID" ] && /usr/sbin/automount $daemonoptions &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail
     else
@@ -24,7 +24,7 @@
     ;;
   stop)
     stat_busy "Stopping Automounter"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail
     else

Modified: extra-x86_64/autofs.conf.d
===================================================================
--- extra-x86_64/autofs.conf.d	2009-04-26 19:51:09 UTC (rev 36643)
+++ extra-x86_64/autofs.conf.d	2009-04-26 19:56:18 UTC (rev 36644)
@@ -1,5 +1,4 @@
-# e.g. localoptions='rsize=8192,wsize=8192'
-localoptions=''
+#localoptions='rsize=8192,wsize=8192'
 
 # e.g. --timeout=60
 daemonoptions=''

Copied: autofs/repos/extra-x86_64/autofs.install (from rev 36639, autofs/trunk/autofs.install)
===================================================================
--- extra-x86_64/autofs.install	                        (rev 0)
+++ extra-x86_64/autofs.install	2009-04-26 19:56:18 UTC (rev 36644)
@@ -0,0 +1,5 @@
+post_install(){
+	echo "#########################################################"
+	echo "In autofs5 --ghost option isn't valid. In order to start autofs"
+	echo "you must remove that option from your /etc/conf.d/autofs. "
+}


