diff options
Diffstat (limited to 'net-fs/autofs/files')
16 files changed, 0 insertions, 1550 deletions
diff --git a/net-fs/autofs/files/autofs-4.1.4-clean-up-maps.patch b/net-fs/autofs/files/autofs-4.1.4-clean-up-maps.patch deleted file mode 100644 index 51ccf9543baf..000000000000 --- a/net-fs/autofs/files/autofs-4.1.4-clean-up-maps.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- samples/auto.net.old 2010-06-20 22:13:27.049079018 +0200 -+++ samples/auto.net 2010-06-20 22:15:31.729124132 +0200 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - # $Id: autofs-4.1.4-clean-up-maps.patch,v 1.1 2011/04/06 14:10:32 pva Exp $ - -@@ -11,7 +11,7 @@ key="$1" - - # add "nosymlink" here if you want to suppress symlinking local filesystems - # add "nonstrict" to make it OK for some filesystems to not mount --opts="-fstype=nfs,hard,intr,nodev,nosuid" -+opts="-fstype=nfs,hard,intr,nodev,nosuid,nonstrict" - - # Showmount comes in a number of names and varieties. "showmount" is - # typically an older version which accepts the '--no-headers' flag -@@ -20,24 +20,14 @@ opts="-fstype=nfs,hard,intr,nodev,nosuid - #SHOWMOUNT="kshowmount --no-headers -e $key" - #SHOWMOUNT="showmount -e $key | tail -n +2" - --for P in /bin /sbin /usr/bin /usr/sbin --do -- for M in showmount kshowmount -- do -- if [ -x $P/$M ] -- then -- SMNT=$P/$M -- break -- fi -- done --done -+SMNT=/usr/sbin/showmount - - [ -x $SMNT ] || exit 1 - - # Newer distributions get this right - SHOWMOUNT="$SMNT --no-headers -e $key" - --$SHOWMOUNT | LC_ALL=C sort +0 | \ -+$SHOWMOUNT | LC_ALL=C sort -k 1 | \ - awk -v key="$key" -v opts="$opts" -- ' - BEGIN { ORS=""; first=1 } - { if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 } ---- samples/auto.smb.old 2010-06-20 22:10:17.507329273 +0200 -+++ samples/auto.smb 2010-06-20 22:15:58.884079957 +0200 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - # $Id: autofs-4.1.4-clean-up-maps.patch,v 1.1 2011/04/06 14:10:32 pva Exp $ - -@@ -7,14 +7,7 @@ - key="$1" - opts="-fstype=cifs" - --for P in /bin /sbin /usr/bin /usr/sbin --do -- if [ -x $P/smbclient ] -- then -- SMBCLIENT=$P/smbclient -- break -- fi --done -+SMBCLIENT="/usr/bin/smbclient" - - [ -x $SMBCLIENT ] || exit 1 - diff --git a/net-fs/autofs/files/autofs-4.1.4-fix-install-ldap-samples-and-maps.patch b/net-fs/autofs/files/autofs-4.1.4-fix-install-ldap-samples-and-maps.patch deleted file mode 100644 index 02939a7c34b0..000000000000 --- a/net-fs/autofs/files/autofs-4.1.4-fix-install-ldap-samples-and-maps.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- samples/Makefile.old 2010-06-21 16:08:54.916105841 +0200 -+++ samples/Makefile 2010-06-21 16:11:52.867934825 +0200 -@@ -13,34 +13,33 @@ endif - CFLAGS += -I../include - LIBS = -lldap -llber - --all: $(BINS) rc.autofs -+all: $(BINS) - - autofs-ldap-auto-master: $(OBJS) - $(CC) $(AUTOFS_LDFLAGS) $(LDFLAGS) -o autofs-ldap-auto-master $(OBJS) $(LIBS) - --rc.autofs: rc.autofs.in -- sed -e "s|@@sbindir@@|$(sbindir)|g" \ -- -e "s|@@autofslibdir@@|$(autofslibdir)|g" \ -- -e "s|@@initdir@@|$(initdir)|g" < rc.autofs.in > rc.autofs -- - install: all -- install -d -m 755 $(INSTALLROOT)/etc -- -mv -f $(INSTALLROOT)/etc/auto.master $(INSTALLROOT)/etc/auto.master.old -- install -c auto.master -m 644 $(INSTALLROOT)/etc -- -mv -f $(INSTALLROOT)/etc/auto.misc $(INSTALLROOT)/etc/auto.misc.old -- install -c auto.misc -m 644 $(INSTALLROOT)/etc -- -mv -f $(INSTALLROOT)/etc/auto.net $(INSTALLROOT)/etc/auto.net.old -- install -c auto.net -m 755 $(INSTALLROOT)/etc -- -mv -f $(INSTALLROOT)/etc/auto.smb $(INSTALLROOT)/etc/auto.smb.old -- install -c auto.smb -m 755 $(INSTALLROOT)/etc -- install -d -m 755 $(INSTALLROOT)$(initdir) -- install -c rc.autofs -m 755 $(INSTALLROOT)$(initdir)/autofs -- install -d -m 755 $(INSTALLROOT)$(autofslibdir) -+ install -d -m 755 $(INSTALLROOT)/etc/autofs -+ install -c auto.master -m 644 $(INSTALLROOT)/etc/autofs -+ install -c auto.misc -m 644 $(INSTALLROOT)/etc/autofs -+ install -c auto.net -m 755 $(INSTALLROOT)/etc/autofs -+ install -c auto.smb -m 755 $(INSTALLROOT)/etc/autofs -+ install -c auto.home -m 755 $(INSTALLROOT)/etc/autofs - install -d -m 755 $(INSTALLROOT)/var/run/autofs - ifeq ($(LDAP), 1) -+ install -d -m 755 $(INSTALLROOT)$(autofslibdir) - install -c autofs-ldap-auto-master -m 755 $(INSTALLROOT)$(autofslibdir) -+ install -d -m 755 $(INSTALLROOT)/etc/openldap/schema -+ install -c autofs.schema -m 644 $(INSTALLROOT)/etc/openldap/schema -+ install -d -m 755 $(INSTALLROOT)/usr/share/doc/${P}/samples -+ install -c auto.master.ldap -m 644 $(INSTALLROOT)/usr/share/doc/${P}/samples -+ install -c ldap-automount-auto.direct -m 644 $(INSTALLROOT)/usr/share/doc/${P}/samples -+ install -c ldap-automount-auto.indirect -m 644 $(INSTALLROOT)/usr/share/doc/${P}/samples -+ install -c ldap-automount-auto.master -m 644 $(INSTALLROOT)/usr/share/doc/${P}/samples -+ install -c ldap-nis-auto.direct -m 644 $(INSTALLROOT)/usr/share/doc/${P}/samples -+ install -c ldap-nis-auto.indirect -m 644 $(INSTALLROOT)/usr/share/doc/${P}/samples -+ install -c ldap-nis-auto.master -m 644 $(INSTALLROOT)/usr/share/doc/${P}/samples - endif - - clean): - rm -f *.o *.s autofs-ldap-auto-master rc.autofs -- diff --git a/net-fs/autofs/files/autofs-4.1.4-fix-man-pages.patch b/net-fs/autofs/files/autofs-4.1.4-fix-man-pages.patch deleted file mode 100644 index ffda7d0f360d..000000000000 --- a/net-fs/autofs/files/autofs-4.1.4-fix-man-pages.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- man/autofs.8.in.old 2005-01-05 11:12:42.000000000 +0100 -+++ man/autofs.8.in 2010-05-31 23:10:16.589319809 +0200 -@@ -4,7 +4,7 @@ - @@INIT.D@@/autofs \- Control Script for automounter - .SH SYNOPSIS - .B @@INIT.D@@/autofs --.I start|stop|reload|status -+.I start|stop|reload|stats|status - .SH "DESCRIPTION" - .B autofs - control the operation of the -@@ -30,7 +30,7 @@ to find mount points on the system. For - .BR automount (8) - process is started with the appropriate parameters. You can check the - active mount points for the automounter with the --.B @@INIT.D@@/autofs status -+.B @@INIT.D@@/autofs stats - command. If the - .I auto.master - configuration file contains a line of the form -@@ -54,9 +54,12 @@ map is modified then the - .B autofs - script must be rerun to activate the changes. - .P --.B @@INIT.D@@/autofs status -+.B @@INIT.D@@/autofs stats - will display the current configuration and a list of currently running - automount daemons. -+.P -+.B @@INIT.D@@/autofs status -+will display whether automount service is running. - .SH "SEE ALSO" - .BR automount (8), - .BR autofs (5), -@@ -64,4 +67,5 @@ automount daemons. - .SH AUTHOR - This manual page was written by Christoph Lameter <chris@waterf.org>, - for the Debian GNU/Linux system. Edited by H. Peter Anvin --<hpa@transmeta.com>. -+<hpa@transmeta.com>. Edited by D. Polke <dustin.polke@uni-siegen.de> to -+reflect Gentoo's init script implementation. diff --git a/net-fs/autofs/files/autofs-4.1.4-init.patch b/net-fs/autofs/files/autofs-4.1.4-init.patch deleted file mode 100644 index cdb66e73ef21..000000000000 --- a/net-fs/autofs/files/autofs-4.1.4-init.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- gentoo/net-fs/autofs/files/autofs.init.orig -+++ gentoo/net-fs/autofs/files/autofs.init -@@ -11,11 +11,12 @@ DAEMON=/usr/sbin/automount - SYSCONFDIR=/etc/autofs - - depend() { -- need localmount portmap -- use ypbind nfs slapd portmap -+ need localmount -+ use ypbind nfs slapd portmap net - } - --opts="start stop status stats reload restart" -+extra_commands="stats" -+extra_started_commands="reload" - - # - # Check for all maps that are to be loaded diff --git a/net-fs/autofs/files/autofs-4.1.4-respect-user-flags-and-fix-asneeded.patch b/net-fs/autofs/files/autofs-4.1.4-respect-user-flags-and-fix-asneeded.patch deleted file mode 100644 index 505cf4e8fd44..000000000000 --- a/net-fs/autofs/files/autofs-4.1.4-respect-user-flags-and-fix-asneeded.patch +++ /dev/null @@ -1,140 +0,0 @@ -=== modified file 'Makefile.conf.in' ---- Makefile.conf.in 2011-04-06 13:55:30 +0000 -+++ Makefile.conf.in 2011-04-06 13:56:05 +0000 -@@ -58,3 +58,6 @@ - - # Location for init.d files - initdir = @initdir@ -+ -+# Use the compiler detected by configure -+CC := @CC@ - -=== modified file 'Makefile.rules' ---- Makefile.rules 2011-04-06 13:55:30 +0000 -+++ Makefile.rules 2011-04-06 13:57:27 +0000 -@@ -11,24 +11,20 @@ - Makefile.conf.in .version .autofs-* configure.in aclocal.m4 \ - configure *.patch autofs.spec - -+# Attempt to be friends with autotools -+INSTALLROOT = $(DESTDIR) -+ - # autofs utility library - AUTOFS_LIB = ../lib/autofs.a - - # Compilers, linkers and flags --# The STRIP defined here *must not* remove any dynamic-loading symbols -- - ifdef DEBUG --CFLAGS = -O2 -g -DDEBUG --LDFLAGS = -g --STRIP = : -+CFLAGS ?= -O2 -g -DDEBUG - else --CFLAGS = -O3 -fomit-frame-pointer -Wall --LDFLAGS = -s --STRIP = strip --strip-debug -+CFLAGS ?= -O3 -fomit-frame-pointer -Wall - endif -+AUTOFS_LDFLAGS = -g - --CC = gcc --CXX = g++ - CXXFLAGS = $(CFLAGS) - LD = ld - SOLDFLAGS = -shared -Xlinker -rpath -Xlinker $(autofslibdir) -@@ -44,5 +40,4 @@ - $(CC) $(CFLAGS) -S $< - - .c.so: -- $(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) -- $(STRIP) $*.so -+ $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) - -=== modified file 'daemon/Makefile' ---- daemon/Makefile 2011-04-06 13:55:30 +0000 -+++ daemon/Makefile 2011-04-06 13:56:05 +0000 -@@ -12,14 +12,13 @@ - version := $(shell cat ../.version) - - CFLAGS += -rdynamic $(DAEMON_CFLAGS) -DAUTOFS_LIB_DIR=\"$(autofslibdir)\" -DVERSION_STRING=\"$(version)\" -I../include --LDFLAGS += -rdynamic -+AUTOFS_LDFLAGS += -rdynamic - LIBS = -ldl - - 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-06 13:55:30 +0000 -+++ lib/Makefile 2011-04-06 13:56:05 +0000 -@@ -35,18 +35,15 @@ - - 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 - - listmount.o: listmount.c - $(CC) $(CFLAGS) -o listmount.o -c listmount.c -- $(STRIP) listmount.o - - install: all - - -=== modified file 'modules/Makefile' ---- modules/Makefile 2011-04-06 13:55:30 +0000 -+++ modules/Makefile 2011-04-06 13:56:42 +0000 -@@ -69,20 +69,16 @@ - # Ad hoc compilation rules for modules which need auxilliary libraries - # - lookup_yp.so: lookup_yp.c -- $(CC) $(SOLDFLAGS) $(CFLAGS) -o lookup_yp.so lookup_yp.c $(AUTOFS_LIB) $(LIBNSL) -- $(STRIP) lookup_yp.so -+ $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o lookup_yp.so lookup_yp.c $(AUTOFS_LIB) $(LIBNSL) - - lookup_nisplus.so: lookup_nisplus.c -- $(CC) $(SOLDFLAGS) $(CFLAGS) -o lookup_nisplus.so lookup_nisplus.c \ -+ $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o lookup_nisplus.so lookup_nisplus.c \ - $(AUTOFS_LIB) $(LIBNSL) -- $(STRIP) lookup_nisplus.so - - 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 - - lookup_ldap.so: lookup_ldap.c -- $(CC) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \ -+ $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \ - lookup_ldap.c $(AUTOFS_LIB) $(LIBLDAP) -- $(STRIP) lookup_ldap.so - -=== modified file 'samples/Makefile' ---- samples/Makefile 2011-04-06 13:55:30 +0000 -+++ samples/Makefile 2011-04-06 13:56:05 +0000 -@@ -16,8 +16,7 @@ - all: $(BINS) rc.autofs - - autofs-ldap-auto-master: $(OBJS) -- $(CC) $(LDFLAGS) -o autofs-ldap-auto-master $(OBJS) $(LIBS) -- $(STRIP) autofs-ldap-auto-master -+ $(CC) $(AUTOFS_LDFLAGS) $(LDFLAGS) -o autofs-ldap-auto-master $(OBJS) $(LIBS) - - rc.autofs: rc.autofs.in - sed -e "s|@@sbindir@@|$(sbindir)|g" \ - diff --git a/net-fs/autofs/files/autofs-5.0.4-user-ldflags-and-as-needed-v2.patch b/net-fs/autofs/files/autofs-5.0.4-user-ldflags-and-as-needed-v2.patch deleted file mode 100644 index 931ebf494878..000000000000 --- a/net-fs/autofs/files/autofs-5.0.4-user-ldflags-and-as-needed-v2.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -ur autofs-5.0.4-old/Makefile.rules autofs-5.0.4/Makefile.rules ---- autofs-5.0.4-old/Makefile.rules 2009-04-27 10:54:19.000000000 +0200 -+++ autofs-5.0.4/Makefile.rules 2009-04-27 10:55:55.000000000 +0200 -@@ -24,16 +24,16 @@ - - ifdef DEBUG - CFLAGS ?= -g -Wall -DDEBUG --LDFLAGS = -g -+AUTOFS_LDFLAGS = -g - STRIP = : - else - ifdef DONTSTRIP - CFLAGS ?= -O2 -g --LDFLAGS = -g -+AUTOFS_LDFLAGS = -g - STRIP = : - else - CFLAGS ?= -O2 -Wall --LDFLAGS = -s -+AUTOFS_LDFLAGS = -s - STRIP = strip --strip-debug - endif - endif -@@ -45,15 +45,14 @@ - 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 -diff -ur autofs-5.0.4-old/daemon/Makefile autofs-5.0.4/daemon/Makefile ---- autofs-5.0.4-old/daemon/Makefile 2009-04-27 10:54:19.000000000 +0200 -+++ autofs-5.0.4/daemon/Makefile 2009-04-27 10:54:37.000000000 +0200 -@@ -20,12 +20,12 @@ - CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\" - CFLAGS += -DVERSION_STRING=\"$(version)\" - LDFLAGS += -rdynamic --LIBS = -ldl -+LIBS = -ldl -lpthread - - all: automount - - automount: $(OBJS) $(AUTOFS_LIB) -- $(CC) $(LDFLAGS) $(DAEMON_LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS) -+ $(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS) - $(STRIP) automount - - clean: diff --git a/net-fs/autofs/files/autofs-5.0.4-user-ldflags-and-as-needed.patch b/net-fs/autofs/files/autofs-5.0.4-user-ldflags-and-as-needed.patch deleted file mode 100644 index ba650593b92d..000000000000 --- a/net-fs/autofs/files/autofs-5.0.4-user-ldflags-and-as-needed.patch +++ /dev/null @@ -1,66 +0,0 @@ -1/2) Patch 177057 to bug #253412: use user ldflags, don't add pthreads through ldflags - -diff -ru a/Makefile.rules b/Makefile.rules ---- a/Makefile.rules 2009-01-01 21:54:02.000000000 -0600 -+++ b/Makefile.rules 2009-01-01 22:17:41.000000000 -0600 -@@ -24,16 +24,16 @@ - - ifdef DEBUG - CFLAGS ?= -g -Wall -DDEBUG --LDFLAGS = -g -+AUTOFS_LDFLAGS = -g - STRIP = : - else - ifdef DONTSTRIP - CFLAGS ?= -O2 -g --LDFLAGS = -g -+AUTOFS_LDFLAGS = -g - STRIP = : - else - CFLAGS ?= -O2 -Wall --LDFLAGS = -s -+AUTOFS_LDFLAGS = -s - STRIP = strip --strip-debug - endif - endif -@@ -45,10 +45,9 @@ - SOLDFLAGS = -shared - - CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64 --LDFLAGS += -lpthread - - ifdef DMALLOCLIB --LDFLAGS += $(DMALLOCLIB) -+AUTOFS_LDFLAGS += $(DMALLOCLIB) - endif - - # Standard rules -diff -ru a/daemon/Makefile b/daemon/Makefile ---- a/daemon/Makefile 2009-01-01 22:14:10.000000000 -0600 -+++ b/daemon/Makefile 2009-01-01 22:24:03.000000000 -0600 -@@ -25,7 +25,7 @@ - all: automount - - automount: $(OBJS) $(AUTOFS_LIB) -- $(CC) $(LDFLAGS) $(DAEMON_LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS) -+ $(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS) - $(STRIP) automount - - clean: - - - -2/2) Patch 177056 to bug #247969: add -lpthread the correct way (removed from LDFLAGS in above patch) - -diff -ru a/daemon/Makefile b/daemon/Makefile ---- a/daemon/Makefile 2009-01-01 22:14:10.000000000 -0600 -+++ b/daemon/Makefile 2009-01-01 22:21:16.000000000 -0600 -@@ -20,7 +20,7 @@ - CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\" - CFLAGS += -DVERSION_STRING=\"$(version)\" - LDFLAGS += -rdynamic --LIBS = -ldl -+LIBS = -ldl -lpthread - - all: automount - diff --git a/net-fs/autofs/files/autofs-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch b/net-fs/autofs/files/autofs-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch deleted file mode 100644 index 4d70d2a2f766..000000000000 --- a/net-fs/autofs/files/autofs-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- ./modules/lookup_ldap.c -+++ ./modules/lookup_ldap.c -@@ -591,10 +591,12 @@ static LDAP *do_connect(unsigned logopt, const char *uri, struct lookup_context - { - LDAP *ldap; - -+#ifdef HAVE_SASL - if (ctxt->extern_cert && ctxt->extern_key) { - set_env(logopt, ENV_LDAPTLS_CERT, ctxt->extern_cert); - set_env(logopt, ENV_LDAPTLS_KEY, ctxt->extern_key); - } -+#endif - - ldap = init_ldap_connection(logopt, uri, ctxt); - if (ldap) { -@@ -1372,10 +1374,12 @@ static void free_context(struct lookup_context *ctxt) - defaults_free_searchdns(ctxt->sdns); - if (ctxt->dclist) - free_dclist(ctxt->dclist); -+#ifdef HAVE_SASL - if (ctxt->extern_cert) - free(ctxt->extern_cert); - if (ctxt->extern_key) - free(ctxt->extern_key); -+#endif - free(ctxt); - - return; diff --git a/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch b/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch deleted file mode 100644 index 3429b6f05893..000000000000 --- a/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch +++ /dev/null @@ -1,76 +0,0 @@ -=== modified file 'Makefile.rules' ---- Makefile.rules 2011-04-30 18:13:36 +0000 -+++ Makefile.rules 2011-04-30 18:12:37 +0000 -@@ -42,6 +42,10 @@ - AUTOFS_LDFLAGS += $(DMALLOCLIB) - endif - -+ifdef SASL -+CFLAGS += $(XML_FLAGS) -+endif -+ - # Standard rules - - .SUFFIXES: .c .o .s .so - -=== modified file 'lib/defaults.c' ---- lib/defaults.c 2011-04-30 18:13:36 +0000 -+++ lib/defaults.c 2011-04-30 18:12:37 +0000 -@@ -19,7 +19,10 @@ - - #include "list.h" - #include "defaults.h" -+#include "config.h" -+#ifdef WITH_LDAP - #include "lookup_ldap.h" -+#endif - #include "log.h" - #include "automount.h" - -@@ -197,6 +200,7 @@ - return 1; - } - -+#ifdef WITH_LDAP - void defaults_free_uris(struct list_head *list) - { - struct list_head *next; -@@ -252,9 +256,11 @@ - - return 1; - } -+#endif - - struct list_head *defaults_get_uris(void) - { -+#ifdef WITH_LDAP - FILE *f; - char buf[MAX_LINE_LEN]; - char *res; -@@ -288,6 +294,9 @@ - - fclose(f); - return list; -+#else -+ return NULL; -+#endif - } - - /* -@@ -450,6 +459,7 @@ - return res; - } - -+#ifdef WITH_LDAP - struct ldap_schema *defaults_get_default_schema(void) - { - struct ldap_schema *schema; -@@ -645,6 +655,7 @@ - - return schema; - } -+#endif - - unsigned int defaults_get_mount_nfs_default_proto(void) - { - diff --git a/net-fs/autofs/files/autofs-5.0.6-ipv6_name_lookup_regression.patch b/net-fs/autofs/files/autofs-5.0.6-ipv6_name_lookup_regression.patch deleted file mode 100644 index 7465a98a3993..000000000000 --- a/net-fs/autofs/files/autofs-5.0.6-ipv6_name_lookup_regression.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- modules/replicated.c -+++ 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/net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch b/net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch deleted file mode 100644 index a61696b6fb16..000000000000 --- a/net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch +++ /dev/null @@ -1,154 +0,0 @@ ---- a/Makefile.conf.in -+++ b/Makefile.conf.in -@@ -100,3 +100,6 @@ initdir = @initdir@ - - # Location of systemd unit files - systemddir = @systemddir@ -+ -+# Use the compiler determined by configure -+CC := @CC@ ---- a/Makefile.rules -+++ b/Makefile.rules -@@ -16,44 +16,30 @@ INSTALLROOT = $(DESTDIR) - 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 -+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 - - ifdef SASL -@@ -71,5 +57,4 @@ endif - $(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) ---- a/configure.in -+++ b/configure.in -@@ -183,7 +183,7 @@ AC_ARG_WITH(hesiod, - : 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 ---- a/daemon/Makefile -+++ b/daemon/Makefile -@@ -2,8 +2,8 @@ - # Makefile for autofs - # - ---include ../Makefile.conf - include ../Makefile.rules -+-include ../Makefile.conf - - 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_FIFO_DIR=\"$(autofsfi - 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 @@ endif - 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 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -41,14 +41,12 @@ mount_clnt.c: mount.h - - 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_ $? ---- a/modules/Makefile -+++ b/modules/Makefile -@@ -87,9 +87,8 @@ endif - # 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 $< -@@ -98,13 +97,10 @@ cyrus-sasl-extern.o: cyrus-sasl-extern.c - $(CC) $(CFLAGS) $(LDAP_FLAGS) -c $< - - lookup_ldap.so: lookup_ldap.c dclist.o base64.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 base64.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 -- diff --git a/net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded.patch b/net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded.patch deleted file mode 100644 index 276eb27d1f58..000000000000 --- a/net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded.patch +++ /dev/null @@ -1,160 +0,0 @@ ---- Makefile.conf.in -+++ Makefile.conf.in -@@ -95,3 +95,5 @@ - # Location for init.d files - initdir = @initdir@ - -+# Use the compiler determined by configure -+CC := @CC@ - ---- Makefile.rules -+++ Makefile.rules -@@ -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) - ---- configure.in -+++ configure.in -@@ -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 - ---- daemon/Makefile -+++ daemon/Makefile -@@ -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 - ---- lib/Makefile -+++ lib/Makefile -@@ -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_ $? - ---- modules/Makefile -+++ modules/Makefile -@@ -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 base64.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 base64.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 -- - diff --git a/net-fs/autofs/files/autofs-5.0.7-mount-sloppy.patch b/net-fs/autofs/files/autofs-5.0.7-mount-sloppy.patch deleted file mode 100644 index 670d9bc7c547..000000000000 --- a/net-fs/autofs/files/autofs-5.0.7-mount-sloppy.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/453778 - -we've had a stable util-linux that supports -s for a long time (and the ebuild -forces a recent version), so disable this test which implicitly tries to modify -files like /etc/mtab and piss off the sandbox. - ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -65,7 +65,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 -+ if true > /dev/null 2>&1 ; then - AC_DEFINE(HAVE_SLOPPY_MOUNT, 1, [define if the mount command supports the -s option]) - AC_MSG_RESULT(yes) - else diff --git a/net-fs/autofs/files/autofs.rc12 b/net-fs/autofs/files/autofs.rc12 deleted file mode 100644 index 9fdfc20bdd98..000000000000 --- a/net-fs/autofs/files/autofs.rc12 +++ /dev/null @@ -1,288 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc12,v 1.1 2005/03/15 04:18:38 robbat2 Exp $ - -# rc file for automount using a Sun-style "master map". -# We first look for a local /etc/autofs/auto.master, then a YP -# map with that name - -DAEMON=/usr/sbin/automount -SYSCONFDIR=/etc/autofs - -depend() { - need localmount - use ypbind nfs slapd portmap net -} - -opts="start stop status stats reload restart" - -# this file is used to avoid the subshell-die problem -TMPSRC=/var/run/autofs.tmp - -# -# Check for all maps that are to be loaded -# -function getschemes() { - schemes="$(awk '/^automount:/{ $1="" ; gsub("\\[.*\\]","") ; print $0 }' /etc/nsswitch.conf)" - # have a default entry - [ -z "$schemes" ] && echo 'files' || echo $schemes -} - -function getfilemounts() { - if [ -f /etc/autofs/auto.master ] ; then - sed -e '/^#/d' -e '/^$/d' < /etc/autofs/auto.master - fi -} - -function catnismap() { - [ -z "$1" ] && map="auto_master" || map="$1" - /usr/bin/ypcat -k ${map} 2> /dev/null | sed -e '/^#/d' -e '/^$/d' -} - -function getnismounts() { - YPMAP="$(catnismap auto.master)" - if [ -z "$YPMAP" ]; then - catnismap - else - catnismap auto.master - fi -} - -function getldapmounts() { - autofs_lam=/usr/lib/autofs/autofs-ldap-auto-master - if [ -f $autofs_lam -a -x $autofs_lam ]; then - ${autofs_lam} \ - -m ${ldap_map_oc} -e ${ldap_entry_oc} \ - -n ${ldap_map_key} -k ${ldap_entry_key} \ - -v ${ldap_value} 2> /dev/null - fi -} - -function getrawmounts() -{ - for scheme in `getschemes` ; do - case "$scheme" in - files) - getfilemounts - ;; - nis*) - getnismounts - ;; - ldap*) - getldapmounts - ;; - esac - done -} - - -# -# This function will build a list of automount commands to execute in -# order to activate all the mount points. It is used to figure out -# the difference of automount points in case of a reload -# -function getmounts() -{ - knownmaps=" " - # seperate storage variable to avoid clobbering the other $TMPSRC - TMPSRC_mounts="$TMPSRC.mounts" - getrawmounts >$TMPSRC_mounts - while read dir map options - do - # These checks screen out duplicates and skip over directories - # where the map is '-'. - if [ ! -z "$dir" -a ! -z "$map" \ - -a "x${map:0:1}" != "x-" \ - -a "`echo "$knownmaps" | grep -w $dir/`" = "" ]; then - # If the options include a -t or --timeout parameter, then - # pull those particular options out. - # echo DAEMONOPTIONS OPTIONS $daemonoptions $options - startupoptions="" - opt_timeout="" - opt_pidfile="" - opt_verbose="" - opt_debug="" - opt_ghost="" - - # use getopt to parse all of it - #getopteval="$(getopt -q -o -t:p:vdg --long timeout:,pid-file:,verbose,debug,ghost -- "$daemonoptions $options") " - getopt_input="$daemonoptions $options" - getopt_eval="$(getopt -q -o -t:vdg --long timeout:,verbose,debug,ghost -- $getopt_input) " - eval set -- "${getopt_eval}" - while [ -n "$1" ]; do - #-p|--pid-file) opt_pidfile="$2" ; shift 2 ;; - case $1 in - -t|--timeout) opt_timeout="$2" ; shift 2 ;; - -v|--verbose) opt_verbose="--verbose" ; shift ;; - -d|--debug) opt_debug="--debug" ; shift ;; - -g|--ghost) opt_ghost="--ghost" ; shift ;; - --) shift ; break ;; - *) shift ;; # just ignore other params for now - esac - done - # build the parameters - [ -n "${opt_timeout}" ] && startupoptions="${startupoptions} --timeout ${opt_timeout}" - #[ -n "${opt_pidfile}" ] && startupoptions="${startupoptions} --pid-file ${opt_pidfile}" - startupoptions="${startupoptions} ${opt_ghost} ${opt_verbose} ${opt_debug}" - - # Other option flags are intended for maps. - # unfortuntely this can't be integrated with the above getopt(1) - mapoptions="$(echo $daemonoptions $options | sed \ - -e '/-t/{s/--*t\(imeout\)*[[:space:]=]*\([0-9][0-9]*\)//g }' \ - -e '/-v/{s/--*v\(erbose\)*//g }' \ - -e '/-d/{s/--*d\(ebug\)*//g }' \ - -e '/-g/{s/--*g\(host\)*//g }' \ - -e 's/^[[:space:]]*//g' \ - -e 's/[[:space:]]*$//g')" - #-e '/-p/{s/--*p\(id-file\)*[[:space:]=]*\([^[:space:]]*\)//g }' \ - - # Break up the maptype and map, if the map type is specified - maptype="${map/:*}" - # Handle degenerate map specifiers - if [ "$maptype" = "$map" ] ; then - if [ -x "$map" ]; then - maptype="program" - elif [ -x "/etc/$map" ]; then - maptype="program" - map="/etc/$map" - map="${map//\/\//\/}" # strip doubles - elif [ -f "$map" ]; then - maptype="file" - elif [ -f "/etc/$map" ]; then - maptype="file" - map="/etc/$map" - map="${map//\/\//\/}" # strip doubles - elif [ "$map" = "hesiod" -o "$map" = "userhome" ] ; then - maptype="$map" - map= - elif [ "$map" = "multi" ] ; then - maptype="$map" - map= - else - maptype=yp - map="${map/*\/}" # same as "basename $map" - map="${map/#auto_/auto.}" # echo $map | sed -e 's/^auto_home/auto.home/' -e 's/^auto_mnt/auto.mnt/' - fi - fi - map="${map#*:}" - - #echo >>/tmp/debug - #date >>/tmp/debug - #echo STARTUPOPTIONS $startupoptions >> /tmp/debug - #echo DIR $dir >> /tmp/debug - #echo MAPTYPE $maptype >> /tmp/debug - #echo MAP $map >> /tmp/debug - #echo MAPOPTIONS $mapoptions >> /tmp/debug - #echo LOCALOPTIONS $localoptions >> /tmp/debug - #echo OPTIONS $options >>/tmp/debug - #echo GETOPT_INPUT $getopt_input >>/tmp/debug - - [ -z "${startupoptions}" ] && startupoptions=" " # to make life easier later - # protect startupoptions with _X_ to use it later - cmdline="$DAEMON ${startupoptions// /_X_} $dir $maptype $map ${mapoptions} ${localoptions}" - # leave out the " so that white space gets compressed - echo ${cmdline} - - # echo ------------------------ - fi - knownmaps=" $dir/ $knownmaps" - done <$TMPSRC_mounts - rm -f $TMPSRC_mounts -} - - -start() { - ebegin "Starting automounter" - # ensure autofs support is loaded - grep -q autofs /proc/filesystems || modprobe -q autofs4 || modprobe -q autofs - if [ $? -ne 0 ]; then - eend 1 "No autofs support available" - return 1 - fi - - getmounts >$TMPSRC - - # Check that maps exist - if [ ! -s $TMPSRC ]; then - eend 1 "No automount maps defined" - return 1 - fi - - while read cmd startupopts mnt rest ; do - pidfile=/var/run/autofs${mnt//\//.}.pid - startupopts="$(echo ${startupopts//_X_/ } --pid-file ${pidfile} )" - bin="/usr/sbin/automount" - params="$(echo $startupopts $mnt $rest)" - - echo -n " $mnt" - #echo " $mnt ($params)" - - start-stop-daemon --start --pidfile $pidfile --quiet \ - --exec ${bin} -- ${params} - #ps ax | grep "[0-9]:[0-9][0-9] ${bin} ${params}" | ( - # read pid rest - # echo $pid > $pidfile - # echo "$mnt $rest" >> $pidfile - #) - if [ $? -ne 0 ]; then - eerror "Failure on $mnt" - else - echo "${params}" >> $pidfile - fi - done < $TMPSRC - # clean up - rm -f $TMPSRC - - echo - - eend $? -} - -stop() { - ebegin "Stopping automounter" - start-stop-daemon --stop --quiet --signal USR2 --exec /usr/sbin/automount - eend $? -} - -stats() { - echo "Configured Mount Points:" - echo "------------------------" - getmounts >$TMPSRC - while read cmd startupopts mnt rest ; do - pidfile=/var/run/autofs${mnt//\//.}.pid - startupopts="$(echo ${startupopts//_X_/ } --pid-file ${pidfile} )" - params="$(echo $startupopts $mnt $rest)" - echo $cmd $params - done <$TMPSRC - rm -f $TMPSRC - echo "" - echo "Active Mount Points:" - echo "--------------------" - ps ax|grep "[0-9]:[0-9][0-9] /usr/sbin/automount " | ( - while read pid tt stat time command; do echo $command; done - ) -} - -reload() { - echo "Reloading automounter: checking for changes ... " - getmounts >$TMPSRC - for i in /var/run/autofs.*.pid - do - pid=`head -n 1 $i 2>/dev/null` - [ -z "$pid" ] && continue - command=`tail -n +2 $i` - if ! grep -q "^$command" $TMPSRC - then - echo "Stopping automounter: $command" - kill -USR2 $pid - fi - done - rm -f $TMPSRC - svc_start -} - -restart() { - svc_stop - svc_start -} diff --git a/net-fs/autofs/files/autofs.rc13 b/net-fs/autofs/files/autofs.rc13 deleted file mode 100644 index 6d2a0d71f314..000000000000 --- a/net-fs/autofs/files/autofs.rc13 +++ /dev/null @@ -1,289 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc13,v 1.1 2008/01/24 10:09:19 stefaan Exp $ - -# rc file for automount using a Sun-style "master map". -# We first look for a local /etc/autofs/auto.master, then a YP -# map with that name - -DAEMON=/usr/sbin/automount -SYSCONFDIR=/etc/autofs - -depend() { - need localmount - use ypbind nfs slapd portmap net -} - -opts="start stop status stats reload restart" - -# this file is used to avoid the subshell-die problem -TMPSRC=/var/run/autofs.tmp - -# -# Check for all maps that are to be loaded -# -function getschemes() { - schemes="$(awk '/^automount:/{ $1="" ; gsub("\\[.*\\]","") ; print $0 }' /etc/nsswitch.conf)" - # have a default entry - [ -z "$schemes" ] && echo 'files' || echo $schemes -} - -function getfilemounts() { - if [ -f /etc/autofs/auto.master ] ; then - sed -e '/^#/d' -e '/^$/d' < /etc/autofs/auto.master - fi -} - -function catnismap() { - [ -z "$1" ] && map="auto_master" || map="$1" - /usr/bin/ypcat -k ${map} 2> /dev/null | sed -e '/^#/d' -e '/^$/d' -} - -function getnismounts() { - YPMAP="$(catnismap auto.master)" - if [ -z "$YPMAP" ]; then - catnismap - else - catnismap auto.master - fi -} - -function getldapmounts() { - autofs_lam=/usr/lib/autofs/autofs-ldap-auto-master - if [ -f $autofs_lam -a -x $autofs_lam ]; then - ${autofs_lam} \ - -m ${ldap_map_oc} -e ${ldap_entry_oc} \ - -n ${ldap_map_key} -k ${ldap_entry_key} \ - -v ${ldap_value} 2> /dev/null - fi -} - -function getrawmounts() -{ - for scheme in `getschemes` ; do - case "$scheme" in - files) - getfilemounts - ;; - nis*) - getnismounts - ;; - ldap*) - getldapmounts - ;; - esac - done -} - - -# -# This function will build a list of automount commands to execute in -# order to activate all the mount points. It is used to figure out -# the difference of automount points in case of a reload -# -function getmounts() -{ - knownmaps=" " - # seperate storage variable to avoid clobbering the other $TMPSRC - TMPSRC_mounts="$TMPSRC.mounts" - getrawmounts >$TMPSRC_mounts - while read dir map options - do - # These checks screen out duplicates and skip over directories - # where the map is '-'. - if [ ! -z "$dir" -a ! -z "$map" \ - -a "x${map:0:1}" != "x-" \ - -a "`echo "$knownmaps" | grep -w $dir/`" = "" ]; then - # If the options include a -t or --timeout parameter, then - # pull those particular options out. - # echo DAEMONOPTIONS OPTIONS $daemonoptions $options - startupoptions="" - opt_timeout="" - opt_pidfile="" - opt_verbose="" - opt_debug="" - opt_ghost="" - - # use getopt to parse all of it - #getopteval="$(getopt -q -o -t:p:vdg --long timeout:,pid-file:,verbose,debug,ghost -- "$daemonoptions $options") " - getopt_input="$daemonoptions $options" - getopt_eval="$(getopt -q -o -t:vdg --long timeout:,verbose,debug,ghost -- $getopt_input) " - eval set -- "${getopt_eval}" - while [ -n "$1" ]; do - #-p|--pid-file) opt_pidfile="$2" ; shift 2 ;; - case $1 in - -t|--timeout) opt_timeout="$2" ; shift 2 ;; - -v|--verbose) opt_verbose="--verbose" ; shift ;; - -d|--debug) opt_debug="--debug" ; shift ;; - -g|--ghost) opt_ghost="--ghost" ; shift ;; - --) shift ; break ;; - *) shift ;; # just ignore other params for now - esac - done - # build the parameters - [ -n "${opt_timeout}" ] && startupoptions="${startupoptions} --timeout ${opt_timeout}" - #[ -n "${opt_pidfile}" ] && startupoptions="${startupoptions} --pid-file ${opt_pidfile}" - startupoptions="${startupoptions} ${opt_ghost} ${opt_verbose} ${opt_debug}" - - # Other option flags are intended for maps. - # unfortuntely this can't be integrated with the above getopt(1) - mapoptions="$(echo $daemonoptions $options | sed \ - -e '/-t/{s/--*t\(imeout\)*[[:space:]=]*\([0-9][0-9]*\)//g }' \ - -e '/-v/{s/--*v\(erbose\)*//g }' \ - -e '/-d/{s/--*d\(ebug\)*//g }' \ - -e '/-g/{s/--*g\(host\)*//g }' \ - -e 's/^[[:space:]]*//g' \ - -e 's/[[:space:]]*$//g')" - #-e '/-p/{s/--*p\(id-file\)*[[:space:]=]*\([^[:space:]]*\)//g }' \ - - # Break up the maptype and map, if the map type is specified - maptype="${map/:*}" - # Handle degenerate map specifiers - if [ "$maptype" = "$map" ] ; then - if [ -x "$map" ]; then - maptype="program" - elif [ -x "/etc/$map" ]; then - maptype="program" - map="/etc/$map" - map="${map//\/\//\/}" # strip doubles - elif [ -f "$map" ]; then - maptype="file" - elif [ -f "/etc/$map" ]; then - maptype="file" - map="/etc/$map" - map="${map//\/\//\/}" # strip doubles - elif [ "$map" = "hesiod" -o "$map" = "userhome" ] ; then - maptype="$map" - map= - elif [ "$map" = "multi" ] ; then - maptype="$map" - map= - else - maptype=yp - map="${map/*\/}" # same as "basename $map" - map="${map/#auto_/auto.}" # echo $map | sed -e 's/^auto_home/auto.home/' -e 's/^auto_mnt/auto.mnt/' - fi - fi - map="${map#*:}" - - #echo >>/tmp/debug - #date >>/tmp/debug - #echo STARTUPOPTIONS $startupoptions >> /tmp/debug - #echo DIR $dir >> /tmp/debug - #echo MAPTYPE $maptype >> /tmp/debug - #echo MAP $map >> /tmp/debug - #echo MAPOPTIONS $mapoptions >> /tmp/debug - #echo LOCALOPTIONS $localoptions >> /tmp/debug - #echo OPTIONS $options >>/tmp/debug - #echo GETOPT_INPUT $getopt_input >>/tmp/debug - - [ -z "${startupoptions}" ] && startupoptions=" " # to make life easier later - # protect startupoptions with _X_ to use it later - cmdline="$DAEMON ${startupoptions// /_X_} $dir $maptype $map ${mapoptions} ${localoptions}" - # leave out the " so that white space gets compressed - echo ${cmdline} - - # echo ------------------------ - fi - knownmaps=" $dir/ $knownmaps" - done <$TMPSRC_mounts - rm -f $TMPSRC_mounts -} - - -start() { - ebegin "Starting automounter" - # ensure autofs support is loaded - grep -q autofs /proc/filesystems || modprobe -q autofs4 || modprobe -q autofs - if [ $? -ne 0 ]; then - eend 1 "No autofs support available" - return 1 - fi - - getmounts >$TMPSRC - - # Check that maps exist - if [ ! -s $TMPSRC ]; then - eend 1 "No automount maps defined" - return 1 - fi - - while read cmd startupopts mnt rest ; do - pidfile=/var/run/autofs${mnt//\//.}.pid - startupopts="$(echo ${startupopts//_X_/ } --pid-file ${pidfile} )" - bin="/usr/sbin/automount" - params="$(echo $startupopts $mnt $rest)" - - echo -n " $mnt" - #echo " $mnt ($params)" - - start-stop-daemon --start --pidfile $pidfile --quiet \ - --exec ${bin} -- ${params} - #ps ax | grep "[0-9]:[0-9][0-9] ${bin} ${params}" | ( - # read pid rest - # echo $pid > $pidfile - # echo "$mnt $rest" >> $pidfile - #) - # Omitted these five lines, see http://bugs.gentoo.org/110887 - #if [ $? -ne 0 ]; then - # eerror "Failure on $mnt" - #else - # echo "${params}" >> $pidfile - #fi - done < $TMPSRC - # clean up - rm -f $TMPSRC - - echo - - eend $? -} - -stop() { - ebegin "Stopping automounter" - start-stop-daemon --stop --quiet --signal USR2 --exec /usr/sbin/automount - eend $? -} - -stats() { - echo "Configured Mount Points:" - echo "------------------------" - getmounts >$TMPSRC - while read cmd startupopts mnt rest ; do - pidfile=/var/run/autofs${mnt//\//.}.pid - startupopts="$(echo ${startupopts//_X_/ } --pid-file ${pidfile} )" - params="$(echo $startupopts $mnt $rest)" - echo $cmd $params - done <$TMPSRC - rm -f $TMPSRC - echo "" - echo "Active Mount Points:" - echo "--------------------" - ps ax|grep "[0-9]:[0-9][0-9] /usr/sbin/automount " | ( - while read pid tt stat time command; do echo $command; done - ) -} - -reload() { - echo "Reloading automounter: checking for changes ... " - getmounts >$TMPSRC - for i in /var/run/autofs.*.pid - do - pid=`head -n 1 $i 2>/dev/null` - [ -z "$pid" ] && continue - command=`tail -n +2 $i` - if ! grep -q "^$command" $TMPSRC - then - echo "Stopping automounter: $command" - kill -USR2 $pid - fi - done - rm -f $TMPSRC - svc_start -} - -restart() { - svc_stop - svc_start -} diff --git a/net-fs/autofs/files/autofs5.rc1 b/net-fs/autofs/files/autofs5.rc1 deleted file mode 100644 index 9e4252adf3ea..000000000000 --- a/net-fs/autofs/files/autofs5.rc1 +++ /dev/null @@ -1,42 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs5.rc1,v 1.1 2008/02/05 12:32:20 stefaan Exp $ - -DAEMON=/usr/sbin/automount -PIDFILE=/var/run/autofs.pid - -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 || modprobe -q autofs - if [ $? -ne 0 ]; then - eend 1 "No autofs support available" - return 1 - fi - - start-stop-daemon --start --exec ${DAEMON} -- -p ${PIDFILE} ${daemonoptions} - - eend $? -} - -stop() { - ebegin "Stopping automounter" - start-stop-daemon --stop --quiet --signal TERM -p ${PIDFILE} - eend $? -} - -reload() { - ebegin "Reloading automounter" - kill -HUP $(cat ${PIDFILE}) - eend $? -} - |