rpms/autofs/FC-4 autofs-4.1.4-ldap-depricated.patch, NONE, 1.1 autofs.spec, 1.65, 1.66

Fri Feb 3 11:25:33 UTC 2006

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-4.1.4-ldap-depricated.patch 
Log Message:
* Fri Feb 3 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-15.1
- Add patch to use LDAP_DEPRICATED compile option. (bz #173833)


autofs-4.1.4-ldap-depricated.patch:
 aclocal.m4          |    6 +--
 configure           |   34 ++++++++++++++------
 configure.in        |    5 +--
 include/config.h.in |   85 +++++++++++++++++++++++++++++++++++++++++-----------
 4 files changed, 97 insertions(+), 33 deletions(-)

--- NEW FILE autofs-4.1.4-ldap-depricated.patch ---

This patch defines the LDAP_DEPRICATED macro to the compile flags.

This prevents a SIGSEGV when using the depricated LDAP calls on x86_64
archictecture. A word of warning - as far as I know this should function
ok with recent versions of openldap but I don't know if it will behave
as expected on older versions, so use with caution.

diff -Nurp autofs-4.1.4.orig/aclocal.m4 autofs-4.1.4/aclocal.m4
--- autofs-4.1.4.orig/aclocal.m4	2003-09-29 16:22:35.000000000 +0800
+++ autofs-4.1.4/aclocal.m4	2006-01-25 11:06:23.000000000 +0800
@@ -9,8 +9,8 @@ dnl ------------------------------------
 AC_DEFUN(AF_PATH_INCLUDE,
 [AC_PATH_PROGS($1,$2,$3,$4)
 if test -n "$$1"; then
-  AC_DEFINE(HAVE_$1)
-  AC_DEFINE_UNQUOTED(PATH_$1, "$$1")
+  AC_DEFINE(HAVE_$1,1,[define if you have $1])
+  AC_DEFINE_UNQUOTED(PATH_$1, "$$1", [define if you have $1])
   HAVE_$1=1
 else
   HAVE_$1=0
@@ -28,7 +28,7 @@ AC_DEFUN(AF_SLOPPY_MOUNT,
 [if test -n "$MOUNT" ; then
   AC_MSG_CHECKING([if mount accepts the -s option])
   if "$MOUNT" -s > /dev/null 2>&1 ; then
-    AC_DEFINE(HAVE_SLOPPY_MOUNT)
+    AC_DEFINE(HAVE_SLOPPY_MOUNT, 1, [define if the mount command supports the -s option])
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
diff -Nurp autofs-4.1.4.orig/configure autofs-4.1.4/configure
--- autofs-4.1.4.orig/configure	2006-01-25 11:04:56.000000000 +0800
+++ autofs-4.1.4/configure	2006-01-25 11:06:41.000000000 +0800
@@ -1359,11 +1359,13 @@ done
 test -n "$MOUNT" || MOUNT="/bin/mount"
 
 if test -n "$MOUNT"; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_MOUNT 1
 _ACEOF
 
-  cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<_ACEOF
 #define PATH_MOUNT "$MOUNT"
 _ACEOF
 
@@ -1418,11 +1420,13 @@ done
 test -n "$UMOUNT" || UMOUNT="/bin/umount"
 
 if test -n "$UMOUNT"; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_UMOUNT 1
 _ACEOF
 
-  cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<_ACEOF
 #define PATH_UMOUNT "$UMOUNT"
 _ACEOF
 
@@ -1476,11 +1480,13 @@ fi
 done
 
 if test -n "$E2FSCK"; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_E2FSCK 1
 _ACEOF
 
-  cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<_ACEOF
 #define PATH_E2FSCK "$E2FSCK"
 _ACEOF
 
@@ -1534,11 +1540,13 @@ fi
 done
 
 if test -n "$E3FSCK"; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_E3FSCK 1
 _ACEOF
 
-  cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<_ACEOF
 #define PATH_E3FSCK "$E3FSCK"
 _ACEOF
 
@@ -1556,7 +1564,8 @@ if test -n "$MOUNT" ; then
   echo "$as_me:$LINENO: checking if mount accepts the -s option" >&5
 echo $ECHO_N "checking if mount accepts the -s option... $ECHO_C" >&6
   if "$MOUNT" -s > /dev/null 2>&1 ; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_SLOPPY_MOUNT 1
 _ACEOF
 
@@ -3403,6 +3412,7 @@ if test "${with_openldap+set}" = set; th
 fi;
 if test -z "$HAVE_LDAP"; then
 	HAVE_LDAP=0
+	LDAP_FLAGS="$LDAP_FLAGS -DLDAP_DEPRECATED=1"
 	echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5
 echo $ECHO_N "checking for ldap_init in -lldap... $ECHO_C" >&6
 if test "${ac_cv_lib_ldap_ldap_init+set}" = set; then
@@ -4302,7 +4312,8 @@ else
   enableval=yes
 fi;
 if test x$enable_ext_env = xyes; then
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ENABLE_EXT_ENV 1
 _ACEOF
 
@@ -4319,7 +4330,8 @@ else
   enableval=yes
 fi;
 if test x$enable_mount_locking = xyes -o x$enableval = xyes; then
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ENABLE_MOUNT_LOCKING 1
 _ACEOF
 
diff -Nurp autofs-4.1.4.orig/configure.in autofs-4.1.4/configure.in
--- autofs-4.1.4.orig/configure.in	2006-01-25 11:04:56.000000000 +0800
+++ autofs-4.1.4/configure.in	2006-01-25 11:06:23.000000000 +0800
@@ -118,6 +118,7 @@ AC_ARG_WITH(openldap,
 )
 if test -z "$HAVE_LDAP"; then
 	HAVE_LDAP=0
+	LDAP_FLAGS="$LDAP_FLAGS -DLDAP_DEPRECATED=1"
 	AC_CHECK_LIB(ldap, ldap_init, HAVE_LDAP=1 LIBLDAP="$LIBLDAP -lldap -llber -lresolv", ,
 		     -llber -lresolv $LIBS)
 fi
@@ -163,7 +164,7 @@ AC_ARG_ENABLE(ext-env,
 --disable-ext-env          disable search in environment for substitution variable,,
 	enableval=yes)
 if test x$enable_ext_env = xyes; then
-	AC_DEFINE(ENABLE_EXT_ENV, 1)
+	AC_DEFINE(ENABLE_EXT_ENV, 1, [leave this alone])
 fi
 
 #
@@ -173,7 +174,7 @@ AC_ARG_ENABLE(mount-locking,
 --disable-mount-locking          disable use of locking when spawning mount command,,
 	enableval=yes)
 if test x$enable_mount_locking = xyes -o x$enableval = xyes; then
-	AC_DEFINE(ENABLE_MOUNT_LOCKING, 1)
+	AC_DEFINE(ENABLE_MOUNT_LOCKING, 1, [disable mount table locking -- use this if your maps contain recursive mounts -- EXPERIMENTAL])
 fi
 
 #
diff -Nurp autofs-4.1.4.orig/include/config.h.in autofs-4.1.4/include/config.h.in
--- autofs-4.1.4.orig/include/config.h.in	2006-01-25 11:04:56.000000000 +0800
+++ autofs-4.1.4/include/config.h.in	2006-01-25 11:06:43.000000000 +0800
@@ -1,29 +1,80 @@
-#ident "$Id: config.h.in,v 1.4 2004/02/03 15:23:21 raven Exp $"
-/* -*- c -*-
- *
- * config.h.in: Pattern file for autofs to be filled in by configure
- *
- */
+/* include/config.h.in.  Generated from configure.in by autoheader.  */
 
-/* Program paths */
+/* leave this alone */
+#undef ENABLE_EXT_ENV
+
+/* disable mount table locking -- use this if your maps contain recursive
+   mounts -- EXPERIMENTAL */
+#undef ENABLE_MOUNT_LOCKING
+
+/* define if you have E2FSCK */
+#undef HAVE_E2FSCK
+
+/* define if you have E3FSCK */
+#undef HAVE_E3FSCK
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* define if you have MOUNT */
 #undef HAVE_MOUNT
-#undef PATH_MOUNT
 
+/* define if the mount command supports the -s option */
+#undef HAVE_SLOPPY_MOUNT
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* define if you have UMOUNT */
 #undef HAVE_UMOUNT
-#undef PATH_UMOUNT
 
-#undef HAVE_SMBMOUNT
-#undef PATH_SMBMOUNT
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
 
-#undef HAVE_E2FSCK
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* define if you have E2FSCK */
 #undef PATH_E2FSCK
 
-#undef HAVE_E3FSCK
+/* define if you have E3FSCK */
 #undef PATH_E3FSCK
 
-/* Define this option if mount(8) supports the -s (sloppy) option */
-#undef HAVE_SLOPPY_MOUNT
+/* define if you have MOUNT */
+#undef PATH_MOUNT
 
-#undef ENABLE_EXT_ENV
+/* define if you have UMOUNT */
+#undef PATH_UMOUNT
 
-#undef ENABLE_MOUNT_LOCKING
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-4/autofs.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- autofs.spec	19 Jan 2006 01:23:50 -0000	1.65
+++ autofs.spec	3 Feb 2006 11:25:30 -0000	1.66
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 15
+%define release 15.1
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -33,6 +33,7 @@
 Patch20: autofs-4.1.4-sol10-schema.patch
 Patch21: autofs-4.1.4-sockopt-len-type.patch
 Patch22: autofs-4.1.4-yp_order-order-type.patch
+Patch23: autofs-4.1.4-ldap-depricated.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@@ -94,6 +95,7 @@
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -147,6 +149,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Fri Feb 3 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-15.1
+- Add patch to use LDAP_DEPRICATED compile option. (bz #173833)
+
 * Tue Jan 17 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-15
 - Sync patches with rawhide.
 - Replace deferred syslog patch with reentrant syslog patch.


