rpms/autofs/devel autofs-4.1.3-ldap-auto-master.patch, NONE, 1.1 autofs-4.1.4-auto_net-escape-hash.patch, NONE, 1.1 autofs.spec, 1.76, 1.77

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Apr 11 13:46:27 UTC 2006


Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-4.1.3-ldap-auto-master.patch 
	autofs-4.1.4-auto_net-escape-hash.patch 
Log Message:
* Tue Apr 11 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-18
- Add patch to allow customization of arguments to the
  autofs-ldap-auto-master program (bz #187525).
- Add patch to escap "#" characters in exports from auto.net
  program mount (bz#178304).


autofs-4.1.3-ldap-auto-master.patch:
 redhat/autofs.sysconfig |    4 ++++
 samples/rc.autofs.in    |    3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE autofs-4.1.3-ldap-auto-master.patch ---
diff -Nurp autofs-4.1.4.orig/redhat/autofs.sysconfig autofs-4.1.4/redhat/autofs.sysconfig
--- autofs-4.1.4.orig/redhat/autofs.sysconfig	2005-01-17 09:53:17.000000000 -0500
+++ autofs-4.1.4/redhat/autofs.sysconfig	2006-04-11 07:17:34.000000000 -0400
@@ -19,3 +19,7 @@ DISABLE_DIRECT=1
 # this value.
 DAEMON_EXIT_WAIT=10
 
+# LDAPAUTOMASTER contains command line arguments for the
+# /usr/lib/autofs/autofs-ldap-auto-master program
+# Run the program with --help to see available options
+LDAPAUTOMASTER=""
diff -Nurp autofs-4.1.4.orig/samples/rc.autofs.in autofs-4.1.4/samples/rc.autofs.in
--- autofs-4.1.4.orig/samples/rc.autofs.in	2006-04-11 07:05:00.000000000 -0400
+++ autofs-4.1.4/samples/rc.autofs.in	2006-04-11 07:15:03.000000000 -0400
@@ -85,6 +85,7 @@ if [ "$system" = "redhat" ]; then
 	DISABLE_DIRECT=1
 	DAEMON_EXIT_WAIT=20
 	ONE_AUTO_MASTER=0
+	LDAPAUTOMASTER=""
 
 	[ -f /etc/sysconfig/autofs ] && . /etc/sysconfig/autofs
 
@@ -165,7 +166,7 @@ function getnismounts()
 function getldapmounts()
 {
     if [ -x @@autofslibdir@@/autofs-ldap-auto-master ]; then
-        @@autofslibdir@@/autofs-ldap-auto-master 2> /dev/null
+        @@autofslibdir@@/autofs-ldap-auto-master $LDAPAUTOMASTER 2> /dev/null
     fi
 }
 

autofs-4.1.4-auto_net-escape-hash.patch:
 auto.net |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE autofs-4.1.4-auto_net-escape-hash.patch ---
diff -Nurp autofs-4.1.4.orig/samples/auto.net autofs-4.1.4/samples/auto.net
--- autofs-4.1.4.orig/samples/auto.net	2006-04-11 09:24:17.000000000 -0400
+++ autofs-4.1.4/samples/auto.net	2006-04-11 09:27:24.000000000 -0400
@@ -42,4 +42,4 @@ $SHOWMOUNT | LC_ALL=C sort -k 1 | \
 	BEGIN	{ ORS=""; first=1 }
 		{ if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 }
 	END	{ if (!first) print "\n"; else exit 1 }
-	'
+	' | sed 's/#/\\#/g'


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- autofs.spec	11 Feb 2006 02:01:31 -0000	1.76
+++ autofs.spec	11 Apr 2006 13:46:25 -0000	1.77
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 16.2.2
+%define release 18
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -35,6 +35,8 @@
 Patch22: autofs-4.1.4-yp_order-order-type.patch
 Patch23: autofs-4.1.4-ldap-depricated.patch
 Patch24: autofs-4.1.4-underscore_to_dot.patch
+Patch25: autofs-4.1.3-ldap-auto-master.patch
+Patch26: autofs-4.1.4-auto_net-escape-hash.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@@ -98,7 +100,8 @@
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-
+%patch25 -p1
+%patch26 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -152,6 +155,12 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Tue Apr 11 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-18
+- Add patch to allow customization of arguments to the
+  autofs-ldap-auto-master program (bz #187525).
+- Add patch to escap "#" characters in exports from auto.net
+  program mount (bz#178304).
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:4.1.4-16.2.2
 - bump again for double-long bug on ppc(64)
 




More information about the fedora-cvs-commits mailing list