rpms/autofs/devel autofs-5.0.3-correct-ldap-lib.patch, NONE, 1.1 autofs-5.0.3-nfs4-tcp-only.patch, NONE, 1.1 autofs-5.0.3-basedn-with-spaces-fix-3.patch, 1.1, 1.2 autofs.spec, 1.231, 1.232
Ian Kent (iankent)
fedora-extras-commits at redhat.com
Fri Jan 25 05:41:08 UTC 2008
Author: iankent
Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27113
Modified Files:
autofs-5.0.3-basedn-with-spaces-fix-3.patch autofs.spec
Added Files:
autofs-5.0.3-correct-ldap-lib.patch
autofs-5.0.3-nfs4-tcp-only.patch
Log Message:
* Fri Jan 25 2008 Ian Kent <ikent at redhat.com> - 5.0.3-4
- correction to the correction for handling of LDAP base dns with spaces.
- avoid using UDP for probing NFSv4 mount requests.
- use libldap instead of libldap_r.
autofs-5.0.3-correct-ldap-lib.patch:
--- NEW FILE autofs-5.0.3-correct-ldap-lib.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 5a85a8e..e393f33 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
- catch "-xfn" map type and issue "no supported" message.
- correction for handling of LDAP base dns with spaces.
- avoid using UDP for probing NFSv4 mount requests.
+- use libldap instead of libldap_r (Guillaume Rousse).
14/01/2008 autofs-5.0.3
-----------------------
diff --git a/aclocal.m4 b/aclocal.m4
index f24e076..a1105ae 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -232,7 +232,7 @@ AC_DEFUN([AF_CHECK_FUNC_LDAP_CREATE_PAGE_CONTROL],
# save current ldflags
af_check_ldap_create_page_control_save_ldflags="$LDFLAGS"
-LDFLAGS="$LDFLAGS -lldap_r"
+LDFLAGS="$LDFLAGS -lldap"
AC_TRY_LINK(
[ #include <ldap.h> ],
@@ -265,7 +265,7 @@ AC_DEFUN([AF_CHECK_FUNC_LDAP_PARSE_PAGE_CONTROL],
# save current ldflags
af_check_ldap_parse_page_control_save_ldflags="$LDFLAGS"
-LDFLAGS="$LDFLAGS -lldap_r"
+LDFLAGS="$LDFLAGS -lldap"
AC_TRY_LINK(
[ #include <ldap.h> ],
diff --git a/configure b/configure
index e872392..0d3268c 100755
--- a/configure
+++ b/configure
@@ -4563,7 +4563,7 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_initialize" >&5
echo "${ECHO_T}$ac_cv_lib_ldap_ldap_initialize" >&6; }
if test $ac_cv_lib_ldap_ldap_initialize = yes; then
- HAVE_LDAP=1 LIBLDAP="$LIBLDAP -lldap_r -llber -lresolv"
+ HAVE_LDAP=1 LIBLDAP="$LIBLDAP -lldap -llber -lresolv"
fi
if test "$HAVE_LDAP" = "1"; then
@@ -4578,7 +4578,7 @@ echo $ECHO_N "checking for ldap_create_page_control in -lldap... $ECHO_C" >&6; }
# save current ldflags
af_check_ldap_create_page_control_save_ldflags="$LDFLAGS"
-LDFLAGS="$LDFLAGS -lldap_r"
+LDFLAGS="$LDFLAGS -lldap"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4648,7 +4648,7 @@ echo $ECHO_N "checking for ldap_parse_page_control in -lldap... $ECHO_C" >&6; }
# save current ldflags
af_check_ldap_parse_page_control_save_ldflags="$LDFLAGS"
-LDFLAGS="$LDFLAGS -lldap_r"
+LDFLAGS="$LDFLAGS -lldap"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
diff --git a/configure.in b/configure.in
index a9c86dd..27b9bec 100644
--- a/configure.in
+++ b/configure.in
@@ -197,7 +197,7 @@ AC_ARG_WITH(openldap,
if test -z "$HAVE_LDAP" -o "$HAVE_LDAP" != "0"; then
HAVE_LDAP=0
LDAP_FLAGS="$LDAP_FLAGS -DLDAP_DEPRECATED=1"
- AC_CHECK_LIB(ldap, ldap_initialize, HAVE_LDAP=1 LIBLDAP="$LIBLDAP -lldap_r -llber -lresolv", ,
+ AC_CHECK_LIB(ldap, ldap_initialize, HAVE_LDAP=1 LIBLDAP="$LIBLDAP -lldap -llber -lresolv", ,
-llber -lresolv $LIBS)
if test "$HAVE_LDAP" = "1"; then
AC_DEFINE(WITH_LDAP,1,
autofs-5.0.3-nfs4-tcp-only.patch:
--- NEW FILE autofs-5.0.3-nfs4-tcp-only.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index b172579..5a85a8e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
- correct configure test for ldapr page control functions.
- catch "-xfn" map type and issue "no supported" message.
- correction for handling of LDAP base dns with spaces.
+- avoid using UDP for probing NFSv4 mount requests.
14/01/2008 autofs-5.0.3
-----------------------
diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
index 0e7aebe..df01fd6 100644
--- a/modules/mount_nfs.c
+++ b/modules/mount_nfs.c
@@ -129,7 +129,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
}
if (strcmp(fstype, "nfs4") == 0)
- vers = NFS4_VERS_MASK | NFS_PROTO_MASK;
+ vers = NFS4_VERS_MASK | TCP_SUPPORTED;
else
vers = NFS_VERS_MASK | NFS_PROTO_MASK;
autofs-5.0.3-basedn-with-spaces-fix-3.patch:
Index: autofs-5.0.3-basedn-with-spaces-fix-3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs-5.0.3-basedn-with-spaces-fix-3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autofs-5.0.3-basedn-with-spaces-fix-3.patch 21 Jan 2008 03:32:04 -0000 1.1
+++ autofs-5.0.3-basedn-with-spaces-fix-3.patch 25 Jan 2008 05:41:00 -0000 1.2
@@ -19,7 +19,7 @@
}
- {DNNAMESTR1}/"," {
-+ {DNNAMESTR1}/","{DNATTRSTR} {
++ {DNNAMESTR1}/","{DNATTRSTR}"=" {
strcpy(master_lval.strtype, master_text);
return DNNAME;
}
Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- autofs.spec 21 Jan 2008 03:32:04 -0000 1.231
+++ autofs.spec 25 Jan 2008 05:41:00 -0000 1.232
@@ -4,7 +4,7 @@
Summary: A tool for automatically mounting and unmounting filesystems
Name: autofs
Version: 5.0.3
-Release: 3
+Release: 4
Epoch: 1
License: GPL
Group: System Environment/Daemons
@@ -13,6 +13,8 @@
Patch1: autofs-5.0.3-ldap-page-control-configure-fix.patch
Patch2: autofs-5.0.3-xfn-not-supported.patch
Patch3: autofs-5.0.3-basedn-with-spaces-fix-3.patch
+Patch4: autofs-5.0.3-nfs4-tcp-only.patch
+Patch5: autofs-5.0.3-correct-ldap-lib.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
Conflicts: kernel < 2.6.17
@@ -57,6 +59,8 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -109,6 +113,11 @@
%{_libdir}/autofs/
%changelog
+* Fri Jan 25 2008 Ian Kent <ikent at redhat.com> - 5.0.3-4
+- correction to the correction for handling of LDAP base dns with spaces.
+- avoid using UDP for probing NFSv4 mount requests.
+- use libldap instead of libldap_r.
+
* Mon Jan 21 2008 Ian Kent <ikent at redhat.com> - 5.0.3-3
- catch "-xfn" map type and issue "no supported" message.
- another correction for handling of LDAP base dns with spaces.
More information about the fedora-extras-commits
mailing list