rpms/autofs/devel autofs-4.1.4-fix-sort-opts.patch, NONE, 1.1 autofs.spec, 1.67, 1.68

[fedora-cvs-commits at redhat.com]

Author: jmoyer

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5553

Modified Files:
	autofs.spec 
Added Files:
	autofs-4.1.4-fix-sort-opts.patch 
Log Message:
- The sort command no longer accepts options of the form "+0".  This broke
  auto.net, so the option was removed.  Fixes bz #172111.



autofs-4.1.4-fix-sort-opts.patch:
 auto.net |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE autofs-4.1.4-fix-sort-opts.patch ---
--- autofs-4.1.4/samples/auto.net.orig	2005-11-03 19:15:10.000000000 -0500
+++ autofs-4.1.4/samples/auto.net	2005-11-03 19:15:19.000000000 -0500
@@ -37,7 +37,7 @@ done
 # Newer distributions get this right
 SHOWMOUNT="$SMNT --no-headers -e $key"
 
-$SHOWMOUNT | LC_ALL=C sort +0 | \
+$SHOWMOUNT | LC_ALL=C sort | \
 	awk -v key="$key" -v opts="$opts" -- '
 	BEGIN	{ ORS=""; first=1 }
 		{ if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 }


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- autofs.spec	26 Oct 2005 22:44:34 -0000	1.67
+++ autofs.spec	4 Nov 2005 00:17:58 -0000	1.68
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 11
+%define release 12
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -25,6 +25,7 @@
 Patch12: autofs-4.1.4-keylen-length-check.patch
 Patch13: autofs-4.1.4-sun-parse-fixes.patch
 Patch14: autofs-4.1.4-check-return-of-is-local-addr.patch
+Patch15: autofs-4.1.4-fix-sort-opts.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@@ -78,6 +79,7 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -131,6 +133,10 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Thu Nov  3 2005 Jeff Moyer <jmoyer at redhat.com> - 1:4.1.4-12
+- The sort command no longer accepts options of the form "+0".  This broke
+  auto.net, so the option was removed.  Fixes bz #172111.
+
 * Wed Oct 26 2005  <jmoyer at redhat.com> - 1:4.1.4-11
 - Check the return code of is_local_addr in get_best_mount. (bz #169523)