From: Jan Rękorajski Date: Fri, 21 Apr 2006 23:40:26 +0000 (+0000) Subject: - orphaned, outdated X-Git-Tag: auto/ac/autofs-4_1_4-3~1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fautofs.git;a=commitdiff_plain;h=0318fe8687cb7ef14670c50cef052faf5a86100c - orphaned, outdated Changed files: autofs-clean.patch -> 1.3 autofs-doc.patch -> 1.2 autofs-hesiod-bind.patch -> 1.3 autofs-initialize.patch -> 1.2 autofs-linux-2.3.patch -> 1.2 autofs-loop.patch -> 1.2 autofs-man.patch -> 1.3 autofs-modules.patch -> 1.2 --- diff --git a/autofs-clean.patch b/autofs-clean.patch deleted file mode 100644 index f3dd687..0000000 --- a/autofs-clean.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- ./daemon/mount.c.orig Sat Jun 23 13:55:53 2001 -+++ ./daemon/mount.c Sat Jun 23 13:56:22 2001 -@@ -21,6 +21,7 @@ - - #include - #include -+#include - #include "automount.h" - - /* These filesystems are known not to work with the "generic" module */ ---- ./modules/parse_sun.c.orig Sat Jun 23 13:57:04 2001 -+++ ./modules/parse_sun.c Sat Jun 23 14:02:22 2001 -@@ -17,6 +17,7 @@ - - #include - #include -+#include - #include - #include - #include ---- ./modules/mount_nfs.c.orig Sat Jun 23 14:02:40 2001 -+++ ./modules/mount_nfs.c Sat Jun 23 14:04:29 2001 -@@ -17,6 +17,7 @@ - - #include - #include -+#include - #include - #include - #include ---- ./modules/mount_generic.c.orig Sat Jun 23 14:04:41 2001 -+++ ./modules/mount_generic.c Sat Jun 23 14:04:59 2001 -@@ -16,6 +16,7 @@ - - #include - #include -+#include - #include - #include - #include ---- ./modules/mount_ext2.c.orig Sat Jun 23 14:05:18 2001 -+++ ./modules/mount_ext2.c Sat Jun 23 14:05:35 2001 -@@ -16,6 +16,7 @@ - - #include - #include -+#include - #include - #include - #include ---- ./Makefile.rules.orig Sat Jun 23 14:07:08 2001 -+++ ./Makefile.rules Sat Jun 23 14:08:24 2001 -@@ -15,13 +15,13 @@ - # The STRIP defined here *must not* remove any dynamic-loading symbols - - ifdef DEBUG --CFLAGS = -O2 -g -DDEBUG --LDFLAGS = -g -+CFLAGS = -O3 -fomit-frame-pointer -Wall -+LDFLAGS = -ggdb - STRIP = : - else --CFLAGS = -O3 -fomit-frame-pointer -Wall --LDFLAGS = -s --STRIP = strip --strip-debug -+CFLAGS = $(RPM_OPT_FLAGS) -+LDFLAGS = -+STRIP = : - endif - - CC = gcc diff --git a/autofs-doc.patch b/autofs-doc.patch deleted file mode 100644 index d51df02..0000000 --- a/autofs-doc.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -uNr autofs-4.0.0pre7/man/auto.master.5 autofs-4.0.0pre7-redhat/man/auto.master.5 ---- autofs-4.0.0pre7/man/auto.master.5 Tue Apr 18 05:54:44 2000 -+++ autofs-4.0.0pre7-redhat/man/auto.master.5 Wed Apr 26 14:41:26 2000 -@@ -31,9 +31,14 @@ - The file has three fields separated by an arbitrary number of blanks or - tabs. Lines beginning with # are comments. The first field is the mount - point. Second field is the map file to be consulted for this mount-point. --The third field is optional and can contain options to be applied to all --entries in the map. Options are cumulative, which is a difference to the --behavior of the SunOS automounter. -+This field is of the form -+.IR maptype:mapname , -+where -+.I maptype -+is one of the supported map types (file, program, yp, nisplus, hesiod, userdir, ldap), and -+.I mapname -+is the name of the map. The third field is optional and can contain options to+ be applied to all entries in the map. Options are cumulative, which is a -+difference from the behavior of the SunOS automounter. - - The format of the map file and the options are described in - .BR autofs (5). -@@ -44,21 +49,27 @@ - .nf - /home /etc/auto.home - /misc /etc/auto.misc -+/mnt yp:mnt.map - .fi - .RE - .sp --This will generate two mountpoints --.I /home -+This will generate three mountpoints -+.IR /home , -+.IR /misc , - and --.IR /misc . -+.IR /mnt . - All accesses to - .I /home - will lead to the consultation of the map in - .IR /etc/auto.home , --and all accesses to -+all accesses to - .I /misc - will consult the map in --.IR /etc/auto.misc . -+.IR /etc/auto.misc , -+and all accesses to -+.I /mnt -+will consult the NIS map -+.IR mnt.map . - .SH "SEE ALSO" - .BR automount (8), - .BR autofs (5), -diff -uNr autofs-4.0.0pre7/samples/auto.master autofs-4.0.0pre7-redhat/samples/auto.master ---- autofs-4.0.0pre7/samples/auto.master Tue Apr 18 05:54:44 2000 -+++ autofs-4.0.0pre7-redhat/samples/auto.master Wed Apr 26 14:42:27 2000 -@@ -3,5 +3,5 @@ - # Format of this file: - # mountpoint map options - # For details of the format look at autofs(8). --/misc /etc/auto.misc --/net /etc/auto.net -+/misc /etc/auto.misc --timeout=60 -+/net /etc/auto.net --timeout=60 -diff -uNr autofs-4.0.0pre7/samples/auto.misc autofs-4.0.0pre7-redhat/samples/auto.misc ---- autofs-4.0.0pre7/samples/auto.misc Tue Apr 18 05:54:44 2000 -+++ autofs-4.0.0pre7-redhat/samples/auto.misc Wed Apr 26 14:41:26 2000 -@@ -3,8 +3,13 @@ - # key [ -mount-options-separated-by-comma ] location - # Details may be found in the autofs(5) manpage - --kernel -ro ftp.kernel.org:/pub/linux --boot -fstype=ext2 :/dev/hda1 --removable -fstype=ext2 :/dev/hdd --cd -fstype=iso9660,ro :/dev/hdc --floppy -fstype=auto :/dev/fd0 -+kernel -ro,soft,intr ftp.kernel.org:/pub/linux -+cd -fstype=iso9660,ro,nosuid,nodev :/dev/cdrom -+ -+# the following entries are samples to pique your imagination -+#boot -fstype=ext2 :/dev/hda1 -+#floppy -fstype=auto :/dev/fd0 -+#floppy -fstype=ext2 :/dev/fd0 -+#e2floppy -fstype=ext2 :/dev/fd0 -+#jaz -fstype=ext2 :/dev/sdc1 -+#removable -fstype=ext2 :/dev/hdd diff --git a/autofs-hesiod-bind.patch b/autofs-hesiod-bind.patch deleted file mode 100644 index 9ae31fa..0000000 --- a/autofs-hesiod-bind.patch +++ /dev/null @@ -1,99 +0,0 @@ ---- ./modules/Makefile.orig Sat Jun 23 14:16:40 2001 -+++ ./modules/Makefile Sat Jun 23 14:17:51 2001 -@@ -24,6 +24,9 @@ - endif - - ifeq ($(HESIOD), 1) -+ ifeq ($(HESIOD_BIND), 1) -+ CFLAGS += -DHESIOD_BIND -+ endif - SRCS += lookup_hesiod.c parse_hesiod.c - MODS += lookup_hesiod.so parse_hesiod.so - endif ---- ./modules/lookup_hesiod.c.orig Sat Jun 23 14:18:07 2001 -+++ ./modules/lookup_hesiod.c Sat Jun 23 14:22:42 2001 -@@ -28,6 +28,9 @@ - - struct lookup_context { - struct parse_mod *parser; -+#ifdef HESIOD_BIND -+ void *hesiod_context; -+#endif - }; - - int lookup_version = AUTOFS_LOOKUP_VERSION; /* Required by protocol */ -@@ -49,6 +52,14 @@ - /* Initialize the resolver. */ - res_init(); - -+#ifdef HESIOD_BIND -+ /* Initialize the hesiod context. */ -+ if(hesiod_init(&(ctxt->hesiod_context)) != 0) { -+ syslog(LOG_CRIT, MODPREFIX "hesiod_init(): %m"); -+ return 1; -+ } -+#endif -+ - /* If a map type isn't explicitly given, parse it as hesiod entries. */ - if ( !mapfmt ) - mapfmt = MAPFMT_DEFAULT; -@@ -72,8 +83,11 @@ - - chdir("/"); /* If this is not here the filesystem stays - busy, for some reason... */ -- -+#ifdef HESIOD_BIND -+ hes_result = hesiod_resolve(ctxt->hesiod_context, name, "filsys"); -+#else - hes_result = hes_resolve(name, "filsys"); -+#endif - - if ( !hes_result ) { - syslog(LOG_NOTICE, MODPREFIX "entry \"%s\" not found in map\n", name); -@@ -83,7 +97,11 @@ - syslog(LOG_DEBUG, MODPREFIX "lookup for \"%s\" gave \"%s\"", - name, hes_result[0]); - rv = ctxt->parser->parse_mount(root,name,name_len,hes_result[0],ctxt->parser->context); -+#ifdef HESIOD_BIND -+ hesiod_free_list(ctxt->hesiod_context, hes_result); -+#else - free(hes_result); -+#endif - return rv; - } - -@@ -93,6 +111,9 @@ - { - struct lookup_context *ctxt = (struct lookup_context *) context; - int rv = close_parse(ctxt->parser); -+#ifdef HESIOD_BIND -+ hesiod_end(ctxt->hesiod_context); -+#endif - free(ctxt); - return rv; - } ---- ./Makefile.conf.in.orig Sat Jun 23 14:12:16 2001 -+++ ./Makefile.conf.in Sat Jun 23 14:12:43 2001 -@@ -12,6 +12,7 @@ - - # Hesiod support: yes (1) no (0) - HESIOD = @HAVE_HESIOD@ -+HESIOD_BIND = @HAVE_HESIOD_BIND@ - LIBHESIOD = @LIBHESIOD@ - HESIOD_FLAGS = @HESIOD_FLAGS@ - ---- ./configure.in.orig Sat Jun 23 14:12:58 2001 -+++ ./configure.in Sat Jun 23 14:16:32 2001 -@@ -78,10 +78,10 @@ - if test -z "$HAVE_HESIOD" - then - HAVE_HESIOD=0 -- AC_CHECK_LIB(hesiod, hes_resolve, HAVE_HESIOD=1 LIBHESIOD="$LIBHESIOD -lhesiod", , -- $LIBRESOLV) -+ AC_CHECK_LIB(bind, hesiod_resolve, HAVE_HESIOD=1 HAVE_HESIOD_BIND=1 LIBHESIOD="$LIBHESIOD -lbind", , $LIBRESOLV) - fi - AC_SUBST(HAVE_HESIOD) -+AC_SUBST(HAVE_HESIOD_BIND) - AC_SUBST(LIBHESIOD) - AC_SUBST(HESIOD_FLAGS) - LDFLAGS="${AF_tmp_ldflags}" diff --git a/autofs-initialize.patch b/autofs-initialize.patch deleted file mode 100644 index 42e7372..0000000 --- a/autofs-initialize.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- autofs-4.0.0pre7/modules/parse_sun.c Tue Aug 1 17:42:17 2000 -+++ autofs-4.0.0pre7-junk/modules/parse_sun.c Tue Aug 1 17:40:50 2000 -@@ -466,6 +466,7 @@ - int len = strlen(options)+1; - - noptions = np = alloca(len); -+ memset(noptions, '\0', len); - - /* Extract fstype= pseudo option */ - for(comma = options; *comma != '\0'; ) { -@@ -489,7 +490,7 @@ - np += comma-cp+1; - } - } -- np[-1] = '\0'; -+ if(np > noptions) np[-1] = '\0'; - - options = noptions; - } diff --git a/autofs-linux-2.3.patch b/autofs-linux-2.3.patch deleted file mode 100644 index 034dd6f..0000000 --- a/autofs-linux-2.3.patch +++ /dev/null @@ -1,13 +0,0 @@ -This patch is needed to get autofs to build on later 2.3-series kernels, and -presumably will be needed for 2.4, at least until autofs 4.0.0 is finished. ---- autofs-3.1.4/daemon/automount.c.2.4 Wed Apr 5 15:49:18 2000 -+++ autofs-3.1.4/daemon/automount.c Wed Apr 5 15:49:55 2000 -@@ -35,6 +35,8 @@ - #include - #include - #include -+/* Prevent inclusion of linux/string.h if we have one. Aaaaaargh! */ -+#define _LINUX_STRING_H_ - #include - - #include "automount.h" diff --git a/autofs-loop.patch b/autofs-loop.patch deleted file mode 100644 index 55694e2..0000000 --- a/autofs-loop.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- autofs-3.1.4/modules/mount_autofs.c Fri Jan 21 18:05:29 2000 -+++ autofs-3.1.4/modules/mount_autofs.c Fri Jan 21 18:07:07 2000 -@@ -72,11 +72,11 @@ - - argc = 5; - if ( options ) { -- char *p = options; -+ char *p = options - 1; - do { - argc++; - if ( *p == ',' ) p++; -- } while ((p = strchr(p,',')) != NULL); -+ } while ((p = strchr(p + 1,',')) != NULL); - } - argv = (char **) alloca((argc+1) * sizeof(char *)); - diff --git a/autofs-man.patch b/autofs-man.patch deleted file mode 100644 index 0238ea5..0000000 --- a/autofs-man.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- ./man/auto.master.5.orig Sat Jun 23 14:37:58 2001 -+++ ./man/auto.master.5 Sat Jun 23 14:44:37 2001 -@@ -1,6 +1,6 @@ - .\" t - .\" $Id$ --.TH AUTO.MASTER 5 "9 Sep 1997" -+.TH AUTO.MASTER 5 "11 Apr 2000" - .SH NAME - /etc/auto.master \- Master Map for automounter - .SH "DESCRIPTION" -@@ -45,14 +45,16 @@ - /home /etc/auto.home - /misc /etc/auto.misc - /mnt yp:mnt.map -+/auto ldap:ldapserver:ou=automount,ou=services,dc=example,dc=com - .fi - .RE - .sp --This will generate three mountpoints -+This will generate four mountpoints - .IR /home , - .IR /misc , -+.IR /mnt , - and --.IR /mnt . -+.IR /auto . - All accesses to - .I /home - will lead to the consultation of the map in -@@ -59,10 +63,14 @@ - .I /misc - will consult the map in - .IR /etc/auto.misc , --and all accesses to -+all accesses to - .I /mnt - will consult the NIS map --.IR mnt.map . -+.IR mnt.map , -+and all accesses to -+.I /auto -+will access the \fIautomount\fP objects in \fIldapserver\fP's subtree under -+.IR ou=automount,ou=services,dc=example,dc=com . - .SH "SEE ALSO" - .BR automount (8), - .BR autofs (5), diff --git a/autofs-modules.patch b/autofs-modules.patch deleted file mode 100644 index ed79dce..0000000 --- a/autofs-modules.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- autofs-3.1.4/modules/Makefile Fri Jan 21 18:21:32 2000 -+++ autofs-3.1.4/modules/Makefile Fri Jan 21 18:21:45 2000 -@@ -43,7 +43,7 @@ - # mount_smbfs.so is an obsolete module which must be removed - install: all - install -d -m 755 $(INSTALLROOT)$(autofslibdir) -- install -c $(MODS) -m 644 $(INSTALLROOT)$(autofslibdir) -+ install -c $(MODS) -m 755 $(INSTALLROOT)$(autofslibdir) - -rm -f $(INSTALLROOT)$(autofslibdir)/mount_smbfs.so - - #