rpms/autofs/devel autofs-5.0.2-fix-largefile-dumbness.patch, NONE, 1.1 autofs-5.0.2-instance-stale-mark.patch, NONE, 1.1 autofs.spec, 1.213, 1.214

[Ian Kent (iankent)]

Author: iankent

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28105

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.2-fix-largefile-dumbness.patch 
	autofs-5.0.2-instance-stale-mark.patch 
Log Message:
* Mon Jul 30 2007 Ian Kent <ikent at redhat.com> - 5.0.2-10
- mark map instances stale so they aren't "cleaned" during updates.
- fix large file compile time option.


autofs-5.0.2-fix-largefile-dumbness.patch:

--- NEW FILE autofs-5.0.2-fix-largefile-dumbness.patch ---
diff --git a/Makefile.rules b/Makefile.rules
index b1d1a49..30716dc 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -44,7 +44,7 @@ CXXFLAGS  = $(CFLAGS)
 LD        = ld
 SOLDFLAGS = -shared
 
-CFLAGS += -D_REENTRANT
+CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
 LDFLAGS += -lpthread
 
 ifdef DMALLOCLIB

autofs-5.0.2-instance-stale-mark.patch:

--- NEW FILE autofs-5.0.2-instance-stale-mark.patch ---
diff --git a/daemon/lookup.c b/daemon/lookup.c
index 70b9e02..4f2b318 100644
--- a/daemon/lookup.c
+++ b/daemon/lookup.c
@@ -325,6 +325,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source
 		instance->recurse = map->recurse;
 		instance->depth = map->depth;
 	}
+	instance->stale = map->stale;
 
 	return do_read_map(ap, instance, age);
 }
@@ -346,6 +347,7 @@ static int read_source_instance(struct autofs_point *ap, struct map_source *map,
 		instance->recurse = map->recurse;
 		instance->depth = map->depth;
 	}
+	instance->stale = map->stale;
 
 	return do_read_map(ap, instance, age);
 }


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- autofs.spec	27 Jul 2007 08:12:52 -0000	1.213
+++ autofs.spec	30 Jul 2007 09:10:19 -0000	1.214
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.2
-Release: 9
+Release: 10
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
@@ -20,6 +20,8 @@
 Patch7: autofs-5.0.2-quoted-slash-alone.patch 
 Patch8: autofs-5.0.2-fix-dnattr-parse.patch
 Patch9: autofs-5.0.2-fix-nfs-version-in-get-supported-ver-and-cost.patch
+Patch10: autofs-5.0.2-fix-largefile-dumbness.patch
+Patch11: autofs-5.0.2-instance-stale-mark.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Conflicts: kernel < 2.6.17
@@ -71,6 +73,8 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -123,6 +127,10 @@
 %{_libdir}/autofs/
 
 %changelog
+* Mon Jul 30 2007 Ian Kent <ikent at redhat.com> - 5.0.2-10
+- mark map instances stale so they aren't "cleaned" during updates.
+- fix large file compile time option.
+
 * Fri Jul 27 2007 Ian Kent <ikent at redhat.com> - 5.0.2-9
 - fix version passed to get_supported_ver_and_cost (bz 249574).