[arch-commits] Commit in autofs/trunk (PKGBUILD auto.master auto.misc auto.net)

[Andrea Scarpino]

    Date: Monday, March 16, 2009 @ 11:28:35
  Author: andrea
Revision: 30099

upgpkg: autofs 4.1.4-5

Modified:
  autofs/trunk/PKGBUILD
  autofs/trunk/auto.master
  autofs/trunk/auto.misc
  autofs/trunk/auto.net

-------------+
 PKGBUILD    |   11 +++++++----
 auto.master |    4 ++--
 auto.misc   |   10 +++++-----
 auto.net    |    2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-16 15:13:09 UTC (rev 30098)
+++ PKGBUILD	2009-03-16 15:28:35 UTC (rev 30099)
@@ -8,7 +8,7 @@
 pkgrel=5
 pkgdesc="A kernel-based automounter for Linux."
 arch=('i686' 'x86_64')
-url="ftp://ftp.kernel.org/pub/linux/daemons/autofs"
+url="http://wiki.autofs.net/FrontPage"
 license=('GPL2')
 depends=('libldap')
 backup=(etc/autofs/auto.master etc/conf.d/autofs)
@@ -18,9 +18,12 @@
         auto.master
         auto.misc
         auto.net)
-md5sums=('7e3949114c00665b4636f0c318179657' '80b77182aa957646a2074433d3890518'\
-         'ddd69346754419faee15fc4c7edeb8b8' '0543a0d172eaec300e8d08708440dd4b'\
-         '0be409ef0cdf0255ce701ed4ba9e46b5' '74d102e637e53050ef095f1cbd9d461b')
+md5sums=('7e3949114c00665b4636f0c318179657'
+         '80b77182aa957646a2074433d3890518'
+         'ddd69346754419faee15fc4c7edeb8b8'
+         '2fd068c5b84a3f408670fe23afd34759'
+         '6d84d7ea43cdf092c64956f8cf4977f9'
+         'e4d945d63abc0488a47a5e2a750e8c3b')
 
 build() {
   export MAKEFLAGS="-j1"

Modified: auto.master
===================================================================
--- auto.master	2009-03-16 15:13:09 UTC (rev 30098)
+++ auto.master	2009-03-16 15:28:35 UTC (rev 30099)
@@ -3,5 +3,5 @@
 # mountpoint map options
 # For details of the format look at autofs(5).
 
-/var/autofs/misc	/etc/autofs/auto.misc
-/var/autofs/net	  /etc/autofs/auto.net
+/var/autofs/misc        /etc/autofs/auto.misc
+/var/autofs/net         /etc/autofs/auto.net

Modified: auto.misc
===================================================================
--- auto.misc	2009-03-16 15:13:09 UTC (rev 30098)
+++ auto.misc	2009-03-16 15:28:35 UTC (rev 30099)
@@ -2,8 +2,8 @@
 # key [ -mount-options-separated-by-comma ] location
 # Details may be found in the autofs(5) manpage
 
-kernel		  -ro			        ftp.kernel.org:/pub/linux
-boot		    -fstype=ext2		              :/dev/hda1
-removable	  -fstype=ext2		              :/dev/hdd
-cd		      -fstype=iso9660,ro	          :/dev/hdc
-floppy		  -fstype=auto		              :/dev/fd0
+#kernel   -ro                                        ftp.kernel.org:/pub/linux
+#boot     -fstype=ext2                               :/dev/hda1
+usbstick  -fstype=auto,async,nodev,nosuid,umask=000  :/dev/sda1
+cdrom     -fstype=iso9660,ro                         :/dev/cdrom
+#floppy   -fstype=auto                               :/dev/fd0
\ No newline at end of file

Modified: auto.net
===================================================================
--- auto.net	2009-03-16 15:13:09 UTC (rev 30098)
+++ auto.net	2009-03-16 15:28:35 UTC (rev 30099)
@@ -21,7 +21,7 @@
 # Newer distributions get this right
 SHOWMOUNT="/usr/sbin/showmount --no-headers -e $key"
 
-$SHOWMOUNT | LC_ALL=C sort -k 1 | \
+$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 }