[autofs] * Mon Jul 4 2011 Ian Kent <ikent at redhat.com> - 1:5.0.6-1 - update source to 5.0.6. - fix ipv6 name f
Ian Kent
iankent at fedoraproject.org
Mon Jul 4 02:33:05 UTC 2011
commit 8903773e97e7f9a64f7649cbb65d04f56e551188
Author: Ian Kent <ikent at redhat.com>
Date: Mon Jul 4 10:31:59 2011 +0800
* Mon Jul 4 2011 Ian Kent <ikent at redhat.com> - 1:5.0.6-1
- update source to 5.0.6.
- fix ipv6 name for lookup fix.
- add dir map-type patch.
.gitignore | 1 +
autofs-5.0.4-add-mount-wait-parameter.patch | 172 -----
...-read-file-maps-mount-lookup-map-read-fix.patch | 44 --
...-5.0.5-add-autofs_ldap_auth_conf-man-page.patch | 246 ------
autofs-5.0.5-add-dump-maps-option.patch | 354 ---------
autofs-5.0.5-add-external-bind-method.patch | 404 ----------
...ty-as-valid-ldap-master-map-attribute-fix.patch | 51 --
...cality-as-valid-ldap-master-map-attribute.patch | 35 -
....0.5-add-lsb-force-reload-and-try-restart.patch | 50 --
autofs-5.0.5-add-sasl-mutex-callbacks.patch | 98 ---
autofs-5.0.5-add-simple-bind-auth.patch | 124 ---
autofs-5.0.5-auto-adjust-ldap-page-size.patch | 113 ---
autofs-5.0.5-check-each-dc-server.patch | 199 -----
...for-path-mount-location-in-generic-module.patch | 113 ---
autofs-5.0.5-dont-check-null-cache-on-expire.patch | 48 --
...5-dont-connect-at-ldap-lookup-module-init.patch | 196 -----
autofs-5.0.5-dont-fail-mount-on-access-fail.patch | 55 --
...fs-5.0.5-dont-hold-lock-for-simple-mounts.patch | 117 ---
...-master_lex_destroy-to-clear-parse-buffer.patch | 39 -
autofs-5.0.5-expire-thread-use-pending-mutex.patch | 486 ------------
autofs-5.0.5-fix-add-simple-bind-auth.patch | 72 --
...fs-5.0.5-fix-ampersand-escape-in-auto-smb.patch | 32 -
autofs-5.0.5-fix-backwards-ifndef-INET6.patch | 48 --
...fs-5.0.5-fix-cache_init-on-source-re-read.patch | 90 ---
...0.5-fix-direct-map-not-updating-on-reread.patch | 40 -
autofs-5.0.5-fix-disable-timeout.patch | 35 -
....5-fix-error-handing-in-do_mount_indirect.patch | 43 --
autofs-5.0.5-fix-expire-race.patch | 40 -
autofs-5.0.5-fix-ext4-fsck-at-mount.patch | 208 -----
....0.5-fix-fix-cache_init-on-source-re-read.patch | 28 -
autofs-5.0.5-fix-get-qdn-fail.patch | 39 -
...5.0.5-fix-included-map-read-fail-handling.patch | 44 --
...fs-5.0.5-fix-isspace-wild-card-substition.patch | 78 --
...fs-5.0.5-fix-libxml2-workaround-configure.patch | 79 --
...5.0.5-fix-lsb-service-name-in-init-script.patch | 40 -
...er-map-source-server-unavialable-handling.patch | 129 ----
autofs-5.0.5-fix-memory-leak-on-reload.patch | 72 --
autofs-5.0.5-fix-mountd-vers-retry.patch | 81 --
....5-fix-negative-cache-included-map-lookup.patch | 49 --
autofs-5.0.5-fix-null-cache-race.patch | 187 -----
autofs-5.0.5-fix-parse_sun-module-init.patch | 107 ---
autofs-5.0.5-fix-pidof-init-script-usage.patch | 91 ---
autofs-5.0.5-fix-prune-cache-valid-check.patch | 42 -
...m-selection-for-host-on-different-network.patch | 137 ----
autofs-5.0.5-fix-random-selection-option.patch | 35 -
autofs-5.0.5-fix-reconnect-get-base-dn.patch | 37 -
autofs-5.0.5-fix-remount-locking.patch | 365 ---------
autofs-5.0.5-fix-restart.patch | 25 -
autofs-5.0.5-fix-rpc-large-export-list.patch | 142 ----
....0.5-fix-stale-init-for-file-map-instance.patch | 39 -
autofs-5.0.5-fix-status-privilege-error.patch | 36 -
autofs-5.0.5-fix-strdup-return-value-check.patch | 38 -
autofs-5.0.5-fix-submount-shutdown-wait.patch | 43 --
autofs-5.0.5-fix-timeout-in-connect_nb.patch | 44 --
autofs-5.0.5-fix-wildcard-map-entry-match.patch | 59 --
autofs-5.0.5-include-krb5-library.patch | 204 -----
...ocumentation-for-set-log-priority-clearer.patch | 43 --
...4-default-for-redhat-replicated-selection.patch | 25 -
...ake-redhat-init-script-more-lsb-compliant.patch | 112 ---
...5-make-verbose-mode-a-little-less-verbose.patch | 94 ---
...0.5-mapent-becomes-negative-during-lookup.patch | 73 --
autofs-5.0.5-more-code-analysis-corrections.patch | 241 ------
autofs-5.0.5-refactor-ldap-sasl-bind.patch | 223 ------
....0.5-remove-ERR_remove_state-openssl-call.patch | 44 --
...s-5.0.5-remove-extra-read-master-map-call.patch | 33 -
autofs-5.0.5-remove-state-machine-timed-wait.patch | 114 ---
autofs-5.0.5-replace-gplv3-code.patch | 791 --------------------
autofs-5.0.5-special-case-cifs-escapes.patch | 99 ---
....0.5-use-weight-only-for-server-selection.patch | 568 --------------
autofs-5.0.6-add-dir-map-type.patch | 380 ++++++++++
autofs-5.0.6-fix-ipv6-name-for-lookup-fix.patch | 79 ++
autofs.spec | 145 +----
sources | 2 +-
73 files changed, 470 insertions(+), 8419 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8541b10..a678fd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
autofs-5.0.5.tar.bz2
+/autofs-5.0.6.tar.gz
diff --git a/autofs-5.0.6-add-dir-map-type.patch b/autofs-5.0.6-add-dir-map-type.patch
new file mode 100644
index 0000000..056076e
--- /dev/null
+++ b/autofs-5.0.6-add-dir-map-type.patch
@@ -0,0 +1,380 @@
+autofs-5.0.5 - dir map-type patch v2
+
+From: Masatake YAMATO <yamato at redhat.com>
+
+This is the second post of "dir map-type" patch.
+
+Changes since last post:
+
+ - Don't use auto. as prefix for included map.
+ Use .autofs suffix instead. Suggested by Steve Linn.
+
+ - Use scandir instead of using opendir/readdir/closedir.
+
+
+What is dir map-type?
+
+
+`dir' map-type is for including files under a directory into master
+map.
+`file' map-type can be used for including a file with + notation like:
+
+ +/etc/auto.mine
+
+in auto.master. However, for specifying a new file to be included you
+have to edit auto.master file. Editing is also needed when you want to
+remove the included file. When you have to do this with your shell
+script you may have to use sed or awk.
+
+`dir' map-type permits you adding new master map entries with cp
+command and removing the entries with rm command. `dir' map-type is
+inspired from /etc/httpd/conf.d and /etc/modprobe.d.
+
+`dir' map-type can be used for included files under a directory
+(e.g. /etc/auto.master.d) with + notation like:
+
+ +dir:/etc/auto.master.d
+
+in auto.master. With this notation /etc/auto.master.d/*.autofs files
+are included except a file which name is started with ".". With the
+name of the file you can control whether a file under the directory is
+included or not: the file which name ends with ".autofs" is included.
+
+
+Signed-off-by: Masatake YAMATO <yamato at redhat.com>
+---
+
+ autofs.spec | 2
+ daemon/lookup.c | 3 -
+ man/auto.master.5.in | 10 ++
+ modules/Makefile | 6 +
+ modules/lookup_dir.c | 219 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ samples/auto.master | 4 +
+ 6 files changed, 239 insertions(+), 5 deletions(-)
+ create mode 100644 modules/lookup_dir.c
+
+
+diff --git a/autofs.spec b/autofs.spec
+index 91d4f8b..82edd1e 100644
+--- a/autofs.spec
++++ b/autofs.spec
+@@ -67,6 +67,7 @@ mkdir -p -m755 $RPM_BUILD_ROOT%{_sbindir}
+ mkdir -p -m755 $RPM_BUILD_ROOT%{_libdir}/autofs
+ mkdir -p -m755 $RPM_BUILD_ROOT%{_mandir}/{man5,man8}
+ mkdir -p -m755 $RPM_BUILD_ROOT/etc/sysconfig
++mkdir -p -m755 $RPM_BUILD_ROOT/etc/auto.master.d
+
+ make install mandir=%{_mandir} initdir=/etc/rc.d/init.d INSTALLROOT=$RPM_BUILD_ROOT
+ make -C redhat
+@@ -104,6 +105,7 @@ fi
+ %dir %{_libdir}/autofs
+ %{_libdir}/autofs/*
+ %{_mandir}/*/*
++%dir /etc/auto.master.d
+
+ %changelog
+ * Tue Jun 3 2011 Ian Kent <raven at themaw.net>
+diff --git a/daemon/lookup.c b/daemon/lookup.c
+index 958d8cc..098588c 100644
+--- a/daemon/lookup.c
++++ b/daemon/lookup.c
+@@ -176,7 +176,8 @@ int lookup_nss_read_master(struct master *master, time_t age)
+ !strncmp(name, "nis:", 4) ||
+ !strncmp(name, "nisplus:", 8) ||
+ !strncmp(name, "ldap:", 5) ||
+- !strncmp(name, "ldaps:", 6)) {
++ !strncmp(name, "ldaps:", 6) ||
++ !strncmp(name, "dir:", 4)) {
+ strncpy(source, name, tmp - name);
+
+ /*
+diff --git a/man/auto.master.5.in b/man/auto.master.5.in
+index de692d2..fff9943 100644
+--- a/man/auto.master.5.in
++++ b/man/auto.master.5.in
+@@ -107,6 +107,14 @@ appropriate certificate must be configured in the LDAP client.
+ .B multi
+ This map type allows the specification of multiple maps separated
+ by "--". These maps are searched in order to resolve key lookups.
++.TP
++.B dir
++This map type can be used at
++.BR +
++master map including notation. The contents of files under given directory are included
++to the master map. The name of file to be included must be ended with ".autofs". A file
++will be ignored if its name is not ended with the suffix. In addition a dot file, a file
++which name is started with "." is also ignored.
+ .RE
+ .TP
+ \fBformat\fP
+@@ -118,7 +126,7 @@ left unspecified, it defaults to \fBsun\fP for all map types except
+ .TP
+ \fBmap\fP
+ Name of the map to use. This is an absolute UNIX pathname
+-for maps of types \fBfile\fP or \fBprogram\fP, and the name of a database
++for maps of types \fBfile\fP, \fBdir\fP, or \fBprogram\fP, and the name of a database
+ in the case for maps of type \fByp\fP, \fBnisplus\fP, or \fBhesiod\fP or
+ the \fBdn\fP of an LDAP entry for maps of type \fBldap\fP.
+ .TP
+diff --git a/modules/Makefile b/modules/Makefile
+index a35c0a5..6090127 100644
+--- a/modules/Makefile
++++ b/modules/Makefile
+@@ -5,14 +5,14 @@
+ -include ../Makefile.conf
+ include ../Makefile.rules
+
+-SRCS := lookup_yp.c lookup_file.c lookup_program.c lookup_userhome.c \
+- lookup_multi.c lookup_hosts.c \
++SRCS := lookup_yp.c lookup_file.c lookup_program.c lookup_userhome.c \
++ lookup_multi.c lookup_hosts.c lookup_dir.c \
+ parse_sun.c \
+ mount_generic.c mount_nfs.c mount_afs.c mount_autofs.c \
+ mount_changer.c mount_bind.c
+
+ MODS := lookup_yp.so lookup_file.so lookup_program.so lookup_userhome.so \
+- lookup_multi.so lookup_hosts.so \
++ lookup_multi.so lookup_hosts.so lookup_dir.so \
+ parse_sun.so \
+ mount_generic.so mount_nfs.so mount_afs.so mount_autofs.so \
+ mount_changer.so mount_bind.so
+diff --git a/modules/lookup_dir.c b/modules/lookup_dir.c
+new file mode 100644
+index 0000000..658cc29
+--- /dev/null
++++ b/modules/lookup_dir.c
+@@ -0,0 +1,219 @@
++/* ----------------------------------------------------------------------- *
++ *
++ * lookup_dir.c - module for including master files in a directory.
++ *
++ * Copyright 2011 Red Hat, Inc. All rights reserved.
++ * Copyright 2011 Masatake YAMATO <yamato at redhat.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
++ * USA; either version 2 of the License, or (at your option) any later
++ * version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * ----------------------------------------------------------------------- */
++
++#include <stdio.h>
++#include <malloc.h>
++#include <pwd.h>
++#include <string.h>
++#include <sys/param.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <dirent.h>
++
++
++#define MODULE_LOOKUP
++#include "automount.h"
++#include "nsswitch.h"
++
++#define MODPREFIX "lookup(dir): "
++
++#define MAX_INCLUDE_DEPTH 16
++
++#define AUTOFS_DIR_EXT ".autofs"
++#define AUTOFS_DIR_EXTSIZ (sizeof(AUTOFS_DIR_EXT) - 1)
++
++struct lookup_context {
++ const char *mapname;
++};
++
++int lookup_version = AUTOFS_LOOKUP_VERSION; /* Required by protocol */
++
++
++int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **context)
++{
++ struct lookup_context *ctxt;
++ char buf[MAX_ERR_BUF];
++ struct stat st;
++
++ *context = NULL;
++ ctxt = malloc(sizeof(struct lookup_context));
++ if (!ctxt) {
++ char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
++ logerr(MODPREFIX "malloc: %s", estr);
++ return 1;
++ }
++
++ if (argc < 1) {
++ free(ctxt);
++ logerr(MODPREFIX "No map name");
++ return 1;
++ }
++
++ ctxt->mapname = argv[0];
++
++ if (ctxt->mapname[0] != '/') {
++ free(ctxt);
++ logmsg(MODPREFIX
++ "dir map %s is not an absolute pathname", argv[0]);
++ return 1;
++ }
++
++ if (access(ctxt->mapname, R_OK)) {
++ free(ctxt);
++ warn(LOGOPT_NONE, MODPREFIX
++ "dir map %s missing or not readable", argv[0]);
++ return 1;
++ }
++
++ if (stat(ctxt->mapname, &st)) {
++ free(ctxt);
++ warn(LOGOPT_NONE, MODPREFIX
++ "dir map %s, could not stat", argv[0]);
++ return 1;
++ }
++
++ if ( (!S_ISDIR(st.st_mode)) && (!S_ISLNK(st.st_mode)) ) {
++ free(ctxt);
++ warn(LOGOPT_NONE, MODPREFIX
++ "dir map %s, is not a directory", argv[0]);
++ }
++
++ *context = ctxt;
++ return 0;
++}
++
++static int acceptable_dirent_p(const struct dirent *e)
++{
++ size_t namesz;
++
++
++ if (!(e->d_type == DT_REG || e->d_type == DT_LNK))
++ return 0;
++
++ namesz = strlen(e->d_name);
++ if (!namesz)
++ return 0;
++
++ if (e->d_name[0] == '.')
++ return 0;
++
++ if (namesz < AUTOFS_DIR_EXTSIZ + 1 ||
++ strcmp(e->d_name + (namesz - AUTOFS_DIR_EXTSIZ),
++ AUTOFS_DIR_EXT))
++ return 0;
++
++ return 1;
++}
++
++
++static int include_file(struct master *master, time_t age, struct lookup_context* ctxt, struct dirent *e)
++{
++ unsigned int logopt = master->logopt;
++ char included_path[PATH_MAX + 1];
++ int included_path_len;
++ char *save_name;
++ int status;
++
++ included_path_len = snprintf(included_path,
++ PATH_MAX + 1,
++ "%s/%s",
++ ctxt->mapname,
++ e->d_name);
++ if (included_path_len > PATH_MAX)
++ return NSS_STATUS_NOTFOUND;
++
++ save_name = master->name;
++ master->name = included_path;
++
++ master->depth++;
++ debug(logopt, MODPREFIX "include: %s", master->name);
++ status = lookup_nss_read_master(master, age);
++ if (!status) {
++ warn(logopt,
++ MODPREFIX
++ "failed to read included master map %s",
++ master->name);
++ }
++ master->depth--;
++
++ master->name = save_name;
++ return NSS_STATUS_SUCCESS;
++}
++
++
++int lookup_read_master(struct master *master, time_t age, void *context)
++{
++ int n, i;
++ struct dirent **namelist = NULL;
++ struct lookup_context *ctxt = (struct lookup_context *) context;
++ unsigned int logopt = master->logopt;
++ char buf[MAX_ERR_BUF];
++
++
++ if (master->depth > MAX_INCLUDE_DEPTH) {
++ error(logopt, MODPREFIX
++ "maximum include depth exceeded %s", master->name);
++ return NSS_STATUS_UNAVAIL;
++ }
++
++ debug(logopt, MODPREFIX "scandir: %s", ctxt->mapname);
++ n = scandir(ctxt->mapname, &namelist, acceptable_dirent_p, versionsort);
++ if (n < 0) {
++ char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
++
++ error(logopt,
++ MODPREFIX "could not scan master map dir %s: %s",
++ ctxt->mapname,
++ estr);
++ return NSS_STATUS_UNAVAIL;
++ }
++
++ for (i = 0; i < n; i++) {
++ struct dirent *e = namelist[i];
++
++ include_file(master, age, ctxt, e);
++ free(e);
++ }
++ free(namelist);
++
++ return NSS_STATUS_SUCCESS;
++}
++
++int lookup_read_map(struct autofs_point *ap, time_t age, void *context)
++{
++ ap->entry->current = NULL;
++ master_source_current_signal(ap->entry);
++ return NSS_STATUS_UNKNOWN;
++}
++
++int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *context)
++{
++ ap->entry->current = NULL;
++ master_source_current_signal(ap->entry);
++ return NSS_STATUS_UNKNOWN;
++}
++
++int lookup_done(void *context)
++{
++ struct lookup_context *ctxt = (struct lookup_context *) context;
++
++ free(ctxt);
++ return 0;
++}
+diff --git a/samples/auto.master b/samples/auto.master
+index 9fe5609..72f086c 100644
+--- a/samples/auto.master
++++ b/samples/auto.master
+@@ -12,6 +12,10 @@
+ #
+ /net -hosts
+ #
++# Include /etc/auto.master.d/*.autofs
++#
+++dir:/etc/auto.master.d
++#
+ # Include central master map if it can be found using
+ # nsswitch sources.
+ #
diff --git a/autofs-5.0.6-fix-ipv6-name-for-lookup-fix.patch b/autofs-5.0.6-fix-ipv6-name-for-lookup-fix.patch
new file mode 100644
index 0000000..fbb8473
--- /dev/null
+++ b/autofs-5.0.6-fix-ipv6-name-for-lookup-fix.patch
@@ -0,0 +1,79 @@
+autofs-5.0.6 - fix ipv6 name for lookup fix
+
+From: Ian Kent <ikent at redhat.com>
+
+Fix an error in the recent ipv6 name for lookup patch.
+
+Reported by Leonardo Chiquitto who provided a patch to resolve the
+problem. The patch below is a slightly modified version of his patch.
+---
+
+ CHANGELOG | 4 ++++
+ modules/replicated.c | 13 ++++++++-----
+ 2 files changed, 12 insertions(+), 5 deletions(-)
+
+
+diff --git a/CHANGELOG b/CHANGELOG
+index 849a38c..e5dfa83 100644
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -1,3 +1,7 @@
++??/??/20?? autofs-5.0.7
++=======================
++- fix ipv6 name for lookup fix.
++
+ 28/06/2011 autofs-5.0.6
+ -----------------------
+ - fix included map read fail handling.
+diff --git a/modules/replicated.c b/modules/replicated.c
+index 7f2b892..a10a817 100644
+--- a/modules/replicated.c
++++ b/modules/replicated.c
+@@ -1111,7 +1111,8 @@ static int add_host_addrs(struct host **list, const char *host,
+ unsigned int weight, unsigned int options)
+ {
+ struct addrinfo hints, *ni, *this;
+- char *name = strdup(host);
++ char *n_ptr;
++ char *name = n_ptr = strdup(host);
+ int len;
+ char buf[MAX_ERR_BUF];
+ int rr = 0;
+@@ -1125,15 +1126,17 @@ static int add_host_addrs(struct host **list, const char *host,
+ }
+ len = strlen(name);
+
+- if (name[0] == '[' && name[--len] == ']')
++ if (name[0] == '[' && name[--len] == ']') {
+ name[len] = '\0';
++ name++;
++ }
+
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_flags = AI_NUMERICHOST;
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_DGRAM;
+
+- ret = getaddrinfo(name + 1, NULL, &hints, &ni);
++ ret = getaddrinfo(name, NULL, &hints, &ni);
+ if (ret)
+ goto try_name;
+
+@@ -1153,7 +1156,7 @@ try_name:
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_DGRAM;
+
+- ret = getaddrinfo(name + 1, NULL, &hints, &ni);
++ ret = getaddrinfo(name, NULL, &hints, &ni);
+ if (ret) {
+ error(LOGOPT_ANY, "hostname lookup failed: %s",
+ gai_strerror(ret));
+@@ -1172,7 +1175,7 @@ try_name:
+ }
+ freeaddrinfo(ni);
+ done:
+- free(name);
++ free(n_ptr);
+ return ret;
+ }
+
diff --git a/autofs.spec b/autofs.spec
index adc264f..08236d3 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -3,80 +3,14 @@
#
Summary: A tool for automatically mounting and unmounting filesystems
Name: autofs
-Version: 5.0.5
-Release: 38%{?dist}
+Version: 5.0.6
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+
Group: System Environment/Daemons
Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.bz2
-Patch1: autofs-5.0.5-fix-included-map-read-fail-handling.patch
-Patch2: autofs-5.0.5-refactor-ldap-sasl-bind.patch
-Patch3: autofs-5.0.4-add-mount-wait-parameter.patch
-Patch4: autofs-5.0.5-special-case-cifs-escapes.patch
-Patch5: autofs-5.0.5-fix-libxml2-workaround-configure.patch
-Patch6: autofs-5.0.5-more-code-analysis-corrections.patch
-Patch7: autofs-5.0.5-fix-backwards-ifndef-INET6.patch
-Patch8: autofs-5.0.5-fix-stale-init-for-file-map-instance.patch
-Patch9: autofs-5.0.5-fix-ext4-fsck-at-mount.patch
-Patch10: autofs-5.0.5-dont-use-master_lex_destroy-to-clear-parse-buffer.patch
-Patch11: autofs-5.0.5-make-documentation-for-set-log-priority-clearer.patch
-Patch12: autofs-5.0.5-fix-timeout-in-connect_nb.patch
-Patch13: autofs-5.0.5-fix-pidof-init-script-usage.patch
-Patch14: autofs-5.0.5-check-for-path-mount-location-in-generic-module.patch
-Patch15: autofs-5.0.5-dont-fail-mount-on-access-fail.patch
-Patch16: autofs-5.0.5-fix-rpc-large-export-list.patch
-Patch17: autofs-5.0.5-fix-memory-leak-on-reload.patch
-Patch18: autofs-5.0.5-dont-connect-at-ldap-lookup-module-init.patch
-Patch19: autofs-5.0.5-fix-random-selection-option.patch
-Patch20: autofs-5.0.5-fix-disable-timeout.patch
-Patch21: autofs-5.0.5-fix-strdup-return-value-check.patch
-Patch22: autofs-5.0.5-fix-reconnect-get-base-dn.patch
-Patch23: autofs-5.0.5-add-sasl-mutex-callbacks.patch
-Patch24: autofs-5.0.5-fix-get-qdn-fail.patch
-Patch25: autofs-5.0.5-fix-ampersand-escape-in-auto-smb.patch
-Patch26: autofs-5.0.5-add-locality-as-valid-ldap-master-map-attribute.patch
-Patch27: autofs-5.0.5-add-locality-as-valid-ldap-master-map-attribute-fix.patch
-Patch28: autofs-5.0.5-make-nfs4-default-for-redhat-replicated-selection.patch
-Patch29: autofs-5.0.5-add-simple-bind-auth.patch
-Patch30: autofs-5.0.5-fix-master-map-source-server-unavialable-handling.patch
-Patch31: autofs-5.0.5-add-autofs_ldap_auth_conf-man-page.patch
-Patch32: autofs-5.0.5-fix-random-selection-for-host-on-different-network.patch
-Patch33: autofs-5.0.5-make-redhat-init-script-more-lsb-compliant.patch
-Patch34: autofs-5.0.5-dont-hold-lock-for-simple-mounts.patch
-Patch35: autofs-5.0.5-fix-remount-locking.patch
-Patch36: autofs-5.0.5-fix-wildcard-map-entry-match.patch
-Patch37: autofs-5.0.5-fix-parse_sun-module-init.patch
-Patch38: autofs-5.0.5-dont-check-null-cache-on-expire.patch
-Patch39: autofs-5.0.5-fix-null-cache-race.patch
-Patch40: autofs-5.0.5-fix-cache_init-on-source-re-read.patch
-Patch41: autofs-5.0.5-mapent-becomes-negative-during-lookup.patch
-Patch42: autofs-5.0.5-check-each-dc-server.patch
-Patch43: autofs-5.0.5-fix-negative-cache-included-map-lookup.patch
-Patch44: autofs-5.0.5-remove-state-machine-timed-wait.patch
-Patch45: autofs-5.0.5-remove-extra-read-master-map-call.patch
-Patch46: autofs-5.0.5-fix-fix-cache_init-on-source-re-read.patch
-Patch47: autofs-5.0.5-fix-error-handing-in-do_mount_indirect.patch
-Patch48: autofs-5.0.5-expire-thread-use-pending-mutex.patch
-Patch49: autofs-5.0.5-include-krb5-library.patch
-Patch50: autofs-5.0.5-make-verbose-mode-a-little-less-verbose.patch
-Patch51: autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch
-Patch52: autofs-5.0.5-fix-restart.patch
-Patch53: autofs-5.0.5-fix-status-privilege-error.patch
-Patch54: autofs-5.0.4-always-read-file-maps-mount-lookup-map-read-fix.patch
-Patch55: autofs-5.0.5-fix-direct-map-not-updating-on-reread.patch
-Patch56: autofs-5.0.5-add-external-bind-method.patch
-Patch57: autofs-5.0.5-fix-add-simple-bind-auth.patch
-Patch58: autofs-5.0.5-add-dump-maps-option.patch
-Patch59: autofs-5.0.5-fix-submount-shutdown-wait.patch
-Patch60: autofs-5.0.5-use-weight-only-for-server-selection.patch
-Patch61: autofs-5.0.5-fix-isspace-wild-card-substition.patch
-Patch62: autofs-5.0.5-auto-adjust-ldap-page-size.patch
-Patch63: autofs-5.0.5-fix-prune-cache-valid-check.patch
-Patch64: autofs-5.0.5-fix-mountd-vers-retry.patch
-Patch65: autofs-5.0.5-fix-expire-race.patch
-Patch66: autofs-5.0.5-add-lsb-force-reload-and-try-restart.patch
-Patch67: autofs-5.0.5-replace-gplv3-code.patch
-Patch68: autofs-5.0.5-fix-lsb-service-name-in-init-script.patch
+Patch1: autofs-5.0.6-fix-ipv6-name-for-lookup-fix.patch
+Patch2: autofs-5.0.5-add-dir-map-type.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 module-init-tools util-linux nfs-utils e2fsprogs libtirpc-devel
Conflicts: cyrus-sasl-lib < 2.1.23-9
@@ -121,72 +55,6 @@ inkludera nätfilsystem, CD-ROM, floppydiskar, och så vidare.
echo %{version}-%{release} > .version
%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
-%patch52 -p1
-%patch53 -p1
-%patch54 -p1
-%patch55 -p1
-%patch56 -p1
-%patch57 -p1
-%patch58 -p1
-%patch59 -p1
-%patch60 -p1
-%patch61 -p1
-%patch62 -p1
-%patch63 -p1
-%patch64 -p1
-%patch65 -p1
-%patch66 -p1
-%patch67 -p1
-%patch68 -p1
%build
#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -239,6 +107,11 @@ fi
%{_libdir}/autofs/
%changelog
+* Mon Jul 4 2011 Ian Kent <ikent at redhat.com> - 1:5.0.6-1
+- update source to 5.0.6.
+- fix ipv6 name for lookup fix.
+- add dir map-type patch.
+
* Tue Jun 14 2011 Ian Kent <ikent at redhat.com> - 1:5.0.5-38
- fix lsb service name in init script (bz692963).
diff --git a/sources b/sources
index 443ca64..b1e5c96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1d262cb6ebef0c2dd0fe22232fb3d5a autofs-5.0.5.tar.bz2
+93f46c8e54ef8ab970a2849d571bfc98 autofs-5.0.6.tar.gz
More information about the scm-commits
mailing list