[gentoo-commits] gentoo-x86 commit in net-fs/autofs/files: autofs-5.0.5-fix-building-without-ldap.patch autofs5.initd autofs-5.0.5-fix-install-deadlink.patch autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch

[Peter Volkov (pva)]

pva         11/04/03 09:49:15

  Added:                autofs-5.0.5-fix-building-without-ldap.patch
                        autofs5.initd
                        autofs-5.0.5-fix-install-deadlink.patch
                        autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch
  Log:
  Rev bump, bug #346537. Mention nfs-utils in elog for NFS mounts, bug 163210 reported by Kai Krakow. Fixed ldap module linkage with krb5, bug 285216 reported by Jonas Jonsson and bug 302377 reported by Duncan Exon Smith. Finally respect LDFLAGS, bug 333971 wrt Cyprien Nicolas (fulax). Incoporate upstream fix to fix ghost entries upon SIGHUP, bug 340761 reported by Faustus. Avoid /etc/mtab access violation, bug 355975 thank Sean McGovern for report. Install /etc/conf.d/autofs on systems with /etc/sysconfig dir, bug 361481 thank Juergen Rose for report. And of course thank Dustin Polke - autofs maintainer!
  
  (Portage version: 2.1.9.45/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch?rev=1.1&content-type=text/plain

Index: autofs-5.0.5-fix-building-without-ldap.patch
===================================================================
--- lib/defaults.c.orig
+++ lib/defaults.c
@@ -19,7 +19,9 @@
 
 #include "list.h"
 #include "defaults.h"
+#ifdef HAVE_LDAP
 #include "lookup_ldap.h"
+#endif
 #include "log.h"
 #include "automount.h"
 
@@ -197,6 +199,7 @@ static int parse_line(char *line, char *
 	return 1;
 }
 
+#ifdef HAVE_LDAP
 void defaults_free_uris(struct list_head *list)
 {
 	struct list_head *next;
@@ -252,9 +255,11 @@ static unsigned int add_uris(char *value
 
 	return 1;
 }
+#endif
 
 struct list_head *defaults_get_uris(void)
 {
+#ifdef HAVE_LDAP
 	FILE *f;
 	char buf[MAX_LINE_LEN];
 	char *res;
@@ -288,6 +292,9 @@ struct list_head *defaults_get_uris(void
 
 	fclose(f);
 	return list;
+#else
+	return NULL;
+#endif
 }
 
 /*
@@ -450,6 +457,7 @@ unsigned int defaults_get_ldap_network_t
 	return res;
 }
 
+#ifdef HAVE_LDAP
 struct ldap_schema *defaults_get_default_schema(void)
 {
 	struct ldap_schema *schema;
@@ -645,6 +653,7 @@ struct ldap_schema *defaults_get_schema(
 
 	return schema;
 }
+#endif
 
 unsigned int defaults_get_mount_nfs_default_proto(void)
 {



1.1                  net-fs/autofs/files/autofs5.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs5.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs5.initd?rev=1.1&content-type=text/plain

Index: autofs5.initd
===================================================================
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs5.initd,v 1.1 2011/04/03 09:49:15 pva Exp $

DAEMON=/usr/sbin/automount
PIDFILE=/var/run/autofs.pid
DEVICE=autofs

depend() {
	need localmount	
	use ypbind nfs slapd portmap net
}

opts="start stop restart status reload"

start() {
	ebegin "Starting automounter"

	# Ensure autofs support is loaded
	grep -q autofs /proc/filesystems || modprobe -q autofs4
	if [ $? -ne 0 ]; then
		eend 1 "No autofs support available in kernel"
		return 1
	fi

	# Check misc device
	if [ -n "${USE_MISC_DEVICE}" -a "${USE_MISC_DEVICE}" = "yes" ]; then
		sleep 1
		if [ -e "/proc/misc" ]; then
			MINOR=$(awk "/${DEVICE}/ {print \$1}" /proc/misc)
			[ -n "${MINOR}" -a ! -c "/dev/${DEVICE}" ] && \
				mknod -m 0600 "/dev/${DEVICE}" c 10 ${MINOR}
			if [ $? -ne 0 ]; then
				eend 1 "Could not create '/dev/${DEVICE}'"
				return 1
			fi
		fi
		[ -x /sbin/restorecon -a -c "/dev/${DEVICE}" ] && \
			/sbin/restorecon "/dev/${DEVICE}"
		if [ $? -ne 0 ]; then
			eend 1 "Failed to execute '/sbin/restorecon \"/dev/${DEVICE}\"'"
			return 1
		fi
	else
		[ -c "/dev/${DEVICE}" ] && rm -rf "/dev/${DEVICE}"
	fi

	start-stop-daemon --start --exec ${DAEMON} -- -p ${PIDFILE} ${OPTIONS}

	eend $?
}

stop() {
	ebegin "Stopping automounter"
	start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
	eend $?
}

reload() {
	ebegin "Reloading automounter"
	if [ ! -r "${PIDFILE}" ]; then
		eend 1 "automount not running"
	else
		kill -HUP $(cat "${PIDFILE}") 2> /dev/null
		eend $?
	fi
}



1.1                  net-fs/autofs/files/autofs-5.0.5-fix-install-deadlink.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs-5.0.5-fix-install-deadlink.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs-5.0.5-fix-install-deadlink.patch?rev=1.1&content-type=text/plain

Index: autofs-5.0.5-fix-install-deadlink.patch
===================================================================
--- modules/Makefile.old	2010-06-19 20:43:45.373371321 +0200
+++ modules/Makefile	2010-06-19 20:45:26.062417092 +0200
@@ -63,7 +63,9 @@ install: all
 	-rm -f $(INSTALLROOT)$(autofslibdir)/mount_smbfs.so
 	ln -fs lookup_file.so $(INSTALLROOT)$(autofslibdir)/lookup_files.so
 	ln -fs lookup_yp.so $(INSTALLROOT)$(autofslibdir)/lookup_nis.so
+ifeq ($(SASL), 1)
 	ln -fs lookup_ldap.so $(INSTALLROOT)$(autofslibdir)/lookup_ldaps.so
+endif
 	ln -fs mount_nfs.so $(INSTALLROOT)$(autofslibdir)/mount_nfs4.so
 ifeq ($(EXT2FS), 1)
  ifeq ($(EXT3FS), 1)



1.1                  net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch?rev=1.1&content-type=text/plain

Index: autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch
===================================================================
=== modified file 'Makefile.conf.in'
--- Makefile.conf.in	2011-04-02 14:53:02 +0000
+++ Makefile.conf.in	2011-04-02 14:53:26 +0000
@@ -95,3 +95,5 @@
 # Location for init.d files
 initdir = @initdir@
 
+# Use the compiler determined by configure
+CC := @CC@

=== modified file 'Makefile.rules'
--- Makefile.rules	2011-04-02 14:53:02 +0000
+++ Makefile.rules	2011-04-02 14:54:11 +0000
@@ -16,44 +16,30 @@
 AUTOFS_LIB = ../lib/autofs.a
 
 # Compilers, linkers and flags
-# The STRIP defined here *must not* remove any dynamic-loading symbols
-
 ifdef DMALLOCLIB
 DEBUG=1
 endif
 
 ifdef DEBUG
 CFLAGS    ?= -g -Wall -DDEBUG
-LDFLAGS   = -g
-STRIP     = :
 else
-ifdef DONTSTRIP
 CFLAGS    ?= -O2 -g
-LDFLAGS   = -g
-STRIP     = :
-else
-CFLAGS    ?= -O2 -Wall
-LDFLAGS   = -s
-STRIP     = strip --strip-debug
-endif
-endif
+endif
+AUTOFS_LDFLAGS = -g
 
-CC        = gcc
-CXX       = g++
 CXXFLAGS  = $(CFLAGS)
 LD        = ld
 SOLDFLAGS = -shared
 
 CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
-LDFLAGS += -lpthread
 
 ifdef TIRPCLIB
 CFLAGS += -I/usr/include/tirpc
-LDFLAGS += $(TIRPCLIB)
+AUTOFS_LDFLAGS += $(TIRPCLIB)
 endif
 
 ifdef DMALLOCLIB
-LDFLAGS += $(DMALLOCLIB)
+AUTOFS_LDFLAGS += $(DMALLOCLIB)
 endif
 
 # Standard rules
@@ -67,5 +53,4 @@
 	$(CC) $(CFLAGS) -S $<
 
 .c.so:
-	$(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL)
-	$(STRIP) $*.so
+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL)

=== modified file 'configure.in'
--- configure.in	2011-04-02 14:53:02 +0000
+++ configure.in	2011-04-02 14:53:26 +0000
@@ -174,7 +174,7 @@
 		: Search for Hesiod in normal directory path
 	else
 		: Search for Hesiod in specific directory
-		LDFLAGS="$LDFLAGS -L${withval}/lib"
+		LDFLAGS="$LDFLAGS -Wl,--no-as-needed -L${withval}/lib"
 		LIBHESIOD="-L${withval}/lib"
 		HESIOD_FLAGS="-I${withval}/include"
 	fi

=== modified file 'daemon/Makefile'
--- daemon/Makefile	2011-04-02 14:53:02 +0000
+++ daemon/Makefile	2011-04-02 14:53:26 +0000
@@ -2,8 +2,8 @@
 # Makefile for autofs
 #
 
+include ../Makefile.rules
 -include ../Makefile.conf
-include ../Makefile.rules
 
 SRCS = automount.c indirect.c direct.c spawn.c module.c mount.c \
 	lookup.c state.c flag.c
@@ -20,7 +20,7 @@
 CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\"
 CFLAGS += -DVERSION_STRING=\"$(version)\"
 LDFLAGS += -rdynamic
-LIBS = -ldl
+LIBS = -ldl -lpthread
 
 ifeq ($(LDAP), 1)
     CFLAGS += $(XML_FLAGS)
@@ -30,8 +30,7 @@
 all: automount
 
 automount: $(OBJS) $(AUTOFS_LIB)
-	$(CC) $(LDFLAGS) $(DAEMON_LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
-	$(STRIP) automount
+	$(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
 
 clean:
 	rm -f *.o *.s *~ automount

=== modified file 'lib/Makefile'
--- lib/Makefile	2011-04-02 14:53:02 +0000
+++ lib/Makefile	2011-04-02 14:53:26 +0000
@@ -41,14 +41,12 @@
 
 mount_clnt.o: mount_clnt.c
 	$(CC) $(CFLAGS) -o mount_clnt.o -c mount_clnt.c
-	$(STRIP) mount_clnt.o
 
 mount_xdr.c: mount.h
 	$(RPCGEN) -c -o mount_xdr.c mount.x
 
 mount_xdr.o: mount_xdr.c
 	$(CC) $(CFLAGS) -Wno-unused-variable -o mount_xdr.o -c mount_xdr.c
-	$(STRIP) mount_xdr.o
 
 master_tok.c: master_tok.l
 	$(LEX) -o$@ -Pmaster_ $?

=== modified file 'modules/Makefile'
--- modules/Makefile	2011-04-02 14:53:02 +0000
+++ modules/Makefile	2011-04-02 14:55:06 +0000
@@ -85,9 +85,8 @@
 # Ad hoc compilation rules for modules which need auxilliary libraries
 #
 lookup_hesiod.so: lookup_hesiod.c
-	$(CC) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \
+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \
 		lookup_hesiod.c $(AUTOFS_LIB) $(LIBHESIOD) $(LIBRESOLV)
-	$(STRIP) lookup_hesiod.so
 
 cyrus-sasl.o: cyrus-sasl.c
 	$(CC) $(CFLAGS) $(LDAP_FLAGS) -c $<
@@ -96,13 +95,10 @@
 	$(CC) $(CFLAGS) $(LDAP_FLAGS) -c $<
 
 lookup_ldap.so: lookup_ldap.c dclist.o $(SASL_OBJ)
-	$(CC) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \
+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \
 		lookup_ldap.c dclist.o $(SASL_OBJ) \
 		$(AUTOFS_LIB) $(LIBLDAP) $(LIBRESOLV)
-	$(STRIP) lookup_ldap.so
 
 mount_nfs.so: mount_nfs.c replicated.o
-	$(CC) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \
+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \
 		mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL)
-	$(STRIP) mount_nfs.so
-