- Add in the map expiry patch

- Bring in other patches that have been committed to other branches. This
    version should now contain all fixes we have to date
- Merge conflicts due to map expiry changes

autofs.spec

@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.3
-%define release 57
+%define release 74
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -22,12 +22,11 @@ Patch14: autofs-4.1.3-underlinei18n.patch
 Patch15: autofs-4.1.3-rpc-ping.patch
 Patch16: autofs-4.1.3-bad_chdir.patch
 Patch17: autofs-4.1.3-mtab_lock.patch
-#Patch18: autofs-4.1.3-ian-map-expiry-1.patch
+Patch18: autofs-4.1.3-ian-map-expiry-1.patch
 Patch19: autofs-4.1.3-disable-direct.patch
 Patch20: autofs-4.1.3-one-auto-master.patch
 Patch21: autofs-4.1.3-signal-race-fix.patch
 Patch22: autofs-4.1.3-sock-leak-fix.patch
-#Patch23: autofs-4.1.3-nss.patch
 Patch24: autofs-4.1.3-umount-loopback.patch
 Patch25: autofs-4.1.3-close-fix.patch
 Patch26: autofs-4.1.3-intl-status.patch
@@ -38,10 +37,16 @@ Patch30: autofs-4.1.3-init-duplicate-map2.patch
 Patch31: autofs-4.1.3-plus-map-ordering.patch
 Patch32: autofs-4.1.3-ldap-search-limit.patch
 Patch33: autofs-4.1.3-browse.patch
-#Patch34: autofs-4.1.3-ian-map-expiry-multimount-fix.patch
 Patch35: autofs-4.1.3-large-program-map.patch
 Patch36: autofs-4.1.3-user-message-typo.patch
 Patch37: autofs-4.1.3-no-reserved-ports.patch
+Patch38: autofs-4.1.3-init-cwd-map.patch
+Patch39: autofs-4.1.3-init-lc-all.patch
+Patch40: autofs-4.1.3-ldap-multiple-map.patch
+Patch41: autofs-4.1.3-replicated-server-select.patch
+Patch42: autofs-4.1.3-ian-map-expiry-multimount-fix.patch
+Patch43: autofs-4.1.3-yp-direct-lookup.patch
+Patch44: autofs-4.1.3-filestream-leak.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
 Prereq: chkconfig
@@ -90,14 +95,13 @@ echo %{version}-%{release} > .version
 %patch15 -p1 -b .rpc-ping
 %patch16 -p1 -b .bad-chdir
 %patch17 -p1 -b .mtab-lock
-#%patch18 -p1 -b .map-expiry
+%patch18 -p1 -b .map-expiry
 %patch19 -p1 -b .disable-direct
 #%patch20 -p1 -b .one-auto-master
 %patch21 -p1 -b .signal-race-fix
 %patch22 -p1 -b .sock-leak-fix-2
-#%patch23 -p1 -b .nss
 %patch24 -p1 -b .umount-loopback
-#%patch25 -p1 -b .close-fix
+%patch25 -p1 -b .close-fix
 %patch26 -p1 -b .intl-status
 %patch27 -p1 -b .localopts-multi
 %patch28 -p1 -b .init-duplicate-map
@@ -106,10 +110,16 @@ echo %{version}-%{release} > .version
 %patch31 -p1 -b .plus-map-ordering.patch
 %patch32 -p1 -b .ldap-search-limit.patch
 %patch33 -p1 -b .browse
-#%patch34 -p1 -b .expire-multi
 %patch35 -p1 -b .large-program-map
 %patch36 -p1 -b .user-message-typo
 %patch37 -p1 -b .no-reserved-ports
+%patch38 -p1 -b .init-cwd
+%patch39 -p1 -b .init-lc-all
+%patch40 -p1 -b .ldap-multiple-map
+%patch41 -p1 -b .replicated-server-select
+%patch42 -p1 -b .expire-multi
+%patch43 -p1 -b .yp-direct-lookup
+%patch44 -p1 -b .filestream-leak
 cp $RPM_SOURCE_DIR/autofs.sysconfig .
 
 %build
@@ -163,6 +173,12 @@ exit 0
 %{_libdir}/autofs/*
 
 %changelog
+* Thu Jan  6 2005  <jmoyer@redhat.com> - 1:4.1.3-74
+- Add in the map expiry patch
+- Bring in other patches that have been committed to other branches. This 
+  version should now contain all fixes we have to date
+- Merge conflicts due to map expiry changes
+
 * Fri Nov 19 2004 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.3-57
 - Pass a socket into clntudp_bufcreate so that we don't use up additional 
   reserved ports.  This patch, along with the socket leak fix, addresses