Tue Jan 9 08:15:31 UTC 2007

Author: ikent

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

Modified Files:
	autofs.spec sources 
Added Files:
	autofs-5.0.1-rc3-fix-typo-rmdir-temp.patch 
	autofs-5.0.1-rc3-remove-rpath-link-option.patch 
Removed Files:
	autofs-5.0.1-rc2-add-export-syntax-checks.patch 
	autofs-5.0.1-rc2-admit-slashify-colons.patch 
	autofs-5.0.1-rc2-afs-buffer-overflow-check.patch 
	autofs-5.0.1-rc2-allow-underscore-in-hostname.patch 
	autofs-5.0.1-rc2-cancelled-check.patch 
	autofs-5.0.1-rc2-change-mount-device-to-map-name.patch 
	autofs-5.0.1-rc2-check-fh-on-direct-mount-and-expire.patch 
	autofs-5.0.1-rc2-close-on-exec.patch 
	autofs-5.0.1-rc2-default-master-uses-hosts.patch 
	autofs-5.0.1-rc2-disallow-multiple-indirect-mounts-fix.patch 
	autofs-5.0.1-rc2-disallow-multiple-indirect-mounts.patch 
	autofs-5.0.1-rc2-dont-create-remote-dirs.patch 
	autofs-5.0.1-rc2-fix-catch-global-options.patch 
	autofs-5.0.1-rc2-fix-incorrect-return-from-spawn.patch 
	autofs-5.0.1-rc2-fix-manual-umount-regression.patch 
	autofs-5.0.1-rc2-fix-master-parse-shift-reduce.patch 
	autofs-5.0.1-rc2-fix-nonstrict-multi-mounts.patch 
	autofs-5.0.1-rc2-fix-null-map-semantics.patch 
	autofs-5.0.1-rc2-fix-use-after-free.patch 
	autofs-5.0.1-rc2-get_query_dn-subtree-2.patch 
	autofs-5.0.1-rc2-get_query_dn-subtree.patch 
	autofs-5.0.1-rc2-handle-autofs-options.patch 
	autofs-5.0.1-rc2-hosts-check-exports-update.patch 
	autofs-5.0.1-rc2-include-check-full-path.patch 
	autofs-5.0.1-rc2-included-map-lookup-fd-leak.patch 
	autofs-5.0.1-rc2-included-map-recursive-key-lookup.patch 
	autofs-5.0.1-rc2-ldap-allow-extra-attrs.patch 
	autofs-5.0.1-rc2-ldap-noexist-rmdir.patch 
	autofs-5.0.1-rc2-long-timout-option-use-space.patch 
	autofs-5.0.1-rc2-macro-table-locking.patch 
	autofs-5.0.1-rc2-masked_match-hostname-independent.patch 
	autofs-5.0.1-rc2-master-map-reload-options-update.patch 
	autofs-5.0.1-rc2-misc-memory-leaks.patch 
	autofs-5.0.1-rc2-mount_nfs-use-fstype.patch 
	autofs-5.0.1-rc2-nfs4-get-port.patch 
	autofs-5.0.1-rc2-nfs4-only-server.patch 
	autofs-5.0.1-rc2-nss-parse-fd-leak.patch 
	autofs-5.0.1-rc2-nsswitch-parser-locking.patch 
	autofs-5.0.1-rc2-numeric-ldap-host-name.patch 
	autofs-5.0.1-rc2-one-master-map-read-only.patch 
	autofs-5.0.1-rc2-parse-bad-master-map-mountpoint.patch 
	autofs-5.0.1-rc2-recursive-bind-mount-use-access-not-opendir.patch 
	autofs-5.0.1-rc2-recursive-bind-mount.patch 
	autofs-5.0.1-rc2-remove-UNDERSCORETODOT.patch 
	autofs-5.0.1-rc2-replace-tempnam.patch 
	autofs-5.0.1-rc2-replicated-close-sock.patch 
	autofs-5.0.1-rc2-request-memory-leak.patch 
	autofs-5.0.1-rc2-require-kproto-v5.patch 
	autofs-5.0.1-rc2-rpc_subs-fd-leak.patch 
	autofs-5.0.1-rc2-set-socket-close-on-exec.patch 
	autofs-5.0.1-rc2-submount-cache-clean.patch 
	autofs-5.0.1-rc2-use-task-done.patch 
Log Message:
* Tue Jan 9 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.2
- consolidate to rc3.
- fix typo in Fix typo in var when removing temp directory (bz 221847).
- remove redundant rpath link option.
- Resolves: rhbz#221847


autofs-5.0.1-rc3-fix-typo-rmdir-temp.patch:
 CHANGELOG            |    4 ++++
 modules/mount_bind.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE autofs-5.0.1-rc3-fix-typo-rmdir-temp.patch ---

diff --git a/CHANGELOG b/CHANGELOG
index f74203a..596d29a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+?/?/2007 autofs-5.0.1
+---------------------
+- fix typo in Fix typo in var when removing temp directory.
+
 4/1/2007 autofs-5.0.1 rc3
 -------------------------
 - fix handling of autofs specific mount options.
diff --git a/modules/mount_bind.c b/modules/mount_bind.c
index 16ae758..cb17ce4 100644
--- a/modules/mount_bind.c
+++ b/modules/mount_bind.c
@@ -64,7 +64,7 @@ int mount_init(void **context)
 	spawn_umount(log_debug, "-n", t2_dir, NULL);
 
 out:
-	rmdir(t2_dir);
+	rmdir(t1_dir);
 	rmdir(t2_dir);
 
 	return 0;

autofs-5.0.1-rc3-remove-rpath-link-option.patch:
 CHANGELOG      |    1 +
 Makefile.rules |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE autofs-5.0.1-rc3-remove-rpath-link-option.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 596d29a..b043e7e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 ?/?/2007 autofs-5.0.1
 ---------------------
 - fix typo in Fix typo in var when removing temp directory.
+- remove redundant rpath link option.
 
 4/1/2007 autofs-5.0.1 rc3
 -------------------------
diff --git a/Makefile.rules b/Makefile.rules
index 072f0d6..5179ea4 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -44,7 +44,7 @@ CC        = gcc
 CXX       = g++
 CXXFLAGS  = $(CFLAGS)
 LD        = ld
-SOLDFLAGS = -shared -Xlinker -rpath -Xlinker $(autofslibdir)
+SOLDFLAGS = -shared
 
 CFLAGS += -D_REENTRANT
 LDFLAGS += -lpthread


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-6/autofs.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- autofs.spec	27 Dec 2006 04:43:28 -0000	1.163
+++ autofs.spec	9 Jan 2007 08:15:29 -0000	1.164
@@ -4,65 +4,15 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc2.40
+%define release 0.rc3.2
 Version: %{version}
 Release: %{release}
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
-Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}-rc2.tar.bz2
-Patch0: autofs-5.0.1-rc2-handle-autofs-options.patch
-Patch1: autofs-5.0.1-rc2-include-check-full-path.patch
-Patch2: autofs-5.0.1-rc2-submount-cache-clean.patch
-Patch3: autofs-5.0.1-rc2-ldap-noexist-rmdir.patch
-Patch4: autofs-5.0.1-rc2-replicated-close-sock.patch
-Patch5: autofs-5.0.1-rc2-remove-UNDERSCORETODOT.patch
-Patch6: autofs-5.0.1-rc2-default-master-uses-hosts.patch
-Patch7: autofs-5.0.1-rc2-included-map-recursive-key-lookup.patch
-Patch8: autofs-5.0.1-rc2-master-map-reload-options-update.patch
-Patch9: autofs-5.0.1-rc2-mount_nfs-use-fstype.patch
-Patch10: autofs-5.0.1-rc2-get_query_dn-subtree.patch
-Patch11: autofs-5.0.1-rc2-long-timout-option-use-space.patch
-Patch12: autofs-5.0.1-rc2-masked_match-hostname-independent.patch
-Patch13: autofs-5.0.1-rc2-nss-parse-fd-leak.patch
-Patch14: autofs-5.0.1-rc2-request-memory-leak.patch
-Patch15: autofs-5.0.1-rc2-cancelled-check.patch
-Patch16: autofs-5.0.1-rc2-rpc_subs-fd-leak.patch
-Patch17: autofs-5.0.1-rc2-included-map-lookup-fd-leak.patch
-Patch18: autofs-5.0.1-rc2-nfs4-only-server.patch
-Patch19: autofs-5.0.1-rc2-close-on-exec.patch
-Patch20: autofs-5.0.1-rc2-numeric-ldap-host-name.patch
-Patch21: autofs-5.0.1-rc2-get_query_dn-subtree-2.patch
-Patch22: autofs-5.0.1-rc2-ldap-allow-extra-attrs.patch
-Patch23: autofs-5.0.1-rc2-dont-create-remote-dirs.patch
-Patch24: autofs-5.0.1-rc2-fix-master-parse-shift-reduce.patch
-Patch25: autofs-5.0.1-rc2-macro-table-locking.patch
-Patch26: autofs-5.0.1-rc2-nsswitch-parser-locking.patch
-Patch27: autofs-5.0.1-rc2-one-master-map-read-only.patch
-Patch28: autofs-5.0.1-rc2-misc-memory-leaks.patch
-Patch29: autofs-5.0.1-rc2-check-fh-on-direct-mount-and-expire.patch
-Patch30: autofs-5.0.1-rc2-recursive-bind-mount.patch
-Patch31: autofs-5.0.1-rc2-require-kproto-v5.patch
-Patch32: autofs-5.0.1-rc2-fix-manual-umount-regression.patch
-Patch33: autofs-5.0.1-rc2-recursive-bind-mount-use-access-not-opendir.patch
-Patch34: autofs-5.0.1-rc2-fix-catch-global-options.patch
-Patch35: autofs-5.0.1-rc2-fix-incorrect-return-from-spawn.patch
-Patch36: autofs-5.0.1-rc2-parse-bad-master-map-mountpoint.patch
-Patch37: autofs-5.0.1-rc2-fix-use-after-free.patch
-Patch38: autofs-5.0.1-rc2-use-task-done.patch
-Patch39: autofs-5.0.1-rc2-nfs4-get-port.patch
-Patch40: autofs-5.0.1-rc2-fix-null-map-semantics.patch
-Patch41: autofs-5.0.1-rc2-disallow-multiple-indirect-mounts.patch
-Patch42: autofs-5.0.1-rc2-add-export-syntax-checks.patch
-Patch43: autofs-5.0.1-rc2-hosts-check-exports-update.patch
-Patch44: autofs-5.0.1-rc2-change-mount-device-to-map-name.patch
-Patch45: autofs-5.0.1-rc2-afs-buffer-overflow-check.patch
-Patch46: autofs-5.0.1-rc2-replace-tempnam.patch
-Patch47: autofs-5.0.1-rc2-admit-slashify-colons.patch
-Patch48: autofs-5.0.1-rc2-allow-underscore-in-hostname.patch
-Patch49: autofs-5.0.1-rc2-set-socket-close-on-exec.patch
-Patch50: autofs-5.0.1-rc2-fix-nonstrict-multi-mounts.patch
-Patch51: autofs-5.0.1-rc2-disallow-multiple-indirect-mounts-fix.patch
+Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}-rc3.tar.bz2
+Patch1: autofs-5.0.1-rc3-fix-typo-rmdir-temp.patch
+Patch2: autofs-5.0.1-rc3-remove-rpath-link-option.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -102,58 +52,8 @@
 %prep
 %setup -q
 echo %{version}-%{release} > .version
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-%patch45 -p1
-%patch46 -p1
-%patch47 -p1
-%patch48 -p1
-%patch49 -p1
-%patch50 -p1
-%patch51 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -210,6 +110,11 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Tue Jan 9 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.2
+- consolidate to rc3.
+- fix typo in Fix typo in var when removing temp directory (bz 221847).
+- remove redundant rpath link option.
+
 * Wed Dec 27 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc2.41
 - fix nonstrict multi-mount handling (bz 219383).
 - correct detection of duplicate indirect mount entries (bz 220799).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	1 Sep 2006 06:12:06 -0000	1.14
+++ sources	9 Jan 2007 08:15:29 -0000	1.15
@@ -1 +1 @@
-4ff63b6833cc1eac8d75bff0c10f6d76  autofs-5.0.1-rc2.tar.bz2
+7cf64434fd19a56506fcd1f64034740c  autofs-5.0.1-rc3.tar.bz2


--- autofs-5.0.1-rc2-add-export-syntax-checks.patch DELETED ---


--- autofs-5.0.1-rc2-admit-slashify-colons.patch DELETED ---


--- autofs-5.0.1-rc2-afs-buffer-overflow-check.patch DELETED ---


--- autofs-5.0.1-rc2-allow-underscore-in-hostname.patch DELETED ---


--- autofs-5.0.1-rc2-cancelled-check.patch DELETED ---


--- autofs-5.0.1-rc2-change-mount-device-to-map-name.patch DELETED ---


--- autofs-5.0.1-rc2-check-fh-on-direct-mount-and-expire.patch DELETED ---


--- autofs-5.0.1-rc2-close-on-exec.patch DELETED ---


--- autofs-5.0.1-rc2-default-master-uses-hosts.patch DELETED ---


--- autofs-5.0.1-rc2-disallow-multiple-indirect-mounts-fix.patch DELETED ---


--- autofs-5.0.1-rc2-disallow-multiple-indirect-mounts.patch DELETED ---


--- autofs-5.0.1-rc2-dont-create-remote-dirs.patch DELETED ---


--- autofs-5.0.1-rc2-fix-catch-global-options.patch DELETED ---


--- autofs-5.0.1-rc2-fix-incorrect-return-from-spawn.patch DELETED ---


--- autofs-5.0.1-rc2-fix-manual-umount-regression.patch DELETED ---


--- autofs-5.0.1-rc2-fix-master-parse-shift-reduce.patch DELETED ---


--- autofs-5.0.1-rc2-fix-nonstrict-multi-mounts.patch DELETED ---


--- autofs-5.0.1-rc2-fix-null-map-semantics.patch DELETED ---


--- autofs-5.0.1-rc2-fix-use-after-free.patch DELETED ---


--- autofs-5.0.1-rc2-get_query_dn-subtree-2.patch DELETED ---


--- autofs-5.0.1-rc2-get_query_dn-subtree.patch DELETED ---


--- autofs-5.0.1-rc2-handle-autofs-options.patch DELETED ---


--- autofs-5.0.1-rc2-hosts-check-exports-update.patch DELETED ---


--- autofs-5.0.1-rc2-include-check-full-path.patch DELETED ---


--- autofs-5.0.1-rc2-included-map-lookup-fd-leak.patch DELETED ---


--- autofs-5.0.1-rc2-included-map-recursive-key-lookup.patch DELETED ---


--- autofs-5.0.1-rc2-ldap-allow-extra-attrs.patch DELETED ---


--- autofs-5.0.1-rc2-ldap-noexist-rmdir.patch DELETED ---


--- autofs-5.0.1-rc2-long-timout-option-use-space.patch DELETED ---


--- autofs-5.0.1-rc2-macro-table-locking.patch DELETED ---


--- autofs-5.0.1-rc2-masked_match-hostname-independent.patch DELETED ---


--- autofs-5.0.1-rc2-master-map-reload-options-update.patch DELETED ---


--- autofs-5.0.1-rc2-misc-memory-leaks.patch DELETED ---


--- autofs-5.0.1-rc2-mount_nfs-use-fstype.patch DELETED ---


--- autofs-5.0.1-rc2-nfs4-get-port.patch DELETED ---


--- autofs-5.0.1-rc2-nfs4-only-server.patch DELETED ---


--- autofs-5.0.1-rc2-nss-parse-fd-leak.patch DELETED ---


--- autofs-5.0.1-rc2-nsswitch-parser-locking.patch DELETED ---


--- autofs-5.0.1-rc2-numeric-ldap-host-name.patch DELETED ---


--- autofs-5.0.1-rc2-one-master-map-read-only.patch DELETED ---


--- autofs-5.0.1-rc2-parse-bad-master-map-mountpoint.patch DELETED ---


--- autofs-5.0.1-rc2-recursive-bind-mount-use-access-not-opendir.patch DELETED ---


--- autofs-5.0.1-rc2-recursive-bind-mount.patch DELETED ---


--- autofs-5.0.1-rc2-remove-UNDERSCORETODOT.patch DELETED ---


--- autofs-5.0.1-rc2-replace-tempnam.patch DELETED ---


--- autofs-5.0.1-rc2-replicated-close-sock.patch DELETED ---


--- autofs-5.0.1-rc2-request-memory-leak.patch DELETED ---


--- autofs-5.0.1-rc2-require-kproto-v5.patch DELETED ---


--- autofs-5.0.1-rc2-rpc_subs-fd-leak.patch DELETED ---


--- autofs-5.0.1-rc2-set-socket-close-on-exec.patch DELETED ---


--- autofs-5.0.1-rc2-submount-cache-clean.patch DELETED ---


--- autofs-5.0.1-rc2-use-task-done.patch DELETED ---


