diff options
author | Michael Mair-Keimberger <m.mairkeimberger@gmail.com> | 2018-02-01 18:10:55 +0100 |
---|---|---|
committer | Patrice Clement <monsieurp@gentoo.org> | 2018-04-12 00:56:16 +0200 |
commit | 4ba7e7b97b267038daa1c0935b1879d1eb081436 (patch) | |
tree | 17dc13ef98b61c219ea5c388750e7662dbc544f5 /net-fs/autofs | |
parent | dev-util/cmake-fedora: fix HOMEPAGE and SRC_URI. (diff) | |
download | gentoo-4ba7e7b97b267038daa1c0935b1879d1eb081436.tar.gz gentoo-4ba7e7b97b267038daa1c0935b1879d1eb081436.tar.bz2 gentoo-4ba7e7b97b267038daa1c0935b1879d1eb081436.zip |
net-fs/autofs: remove unused patches.
Closes: https://bugs.gentoo.org/650196
Closes: https://github.com/gentoo/gentoo/pull/7018
Diffstat (limited to 'net-fs/autofs')
9 files changed, 0 insertions, 454 deletions
diff --git a/net-fs/autofs/files/autofs-5.0.3-heimdal.patch b/net-fs/autofs/files/autofs-5.0.3-heimdal.patch deleted file mode 100644 index 707364df2f97..000000000000 --- a/net-fs/autofs/files/autofs-5.0.3-heimdal.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- autofs-5.0.3.orig/modules/cyrus-sasl.c 2008-04-28 16:17:03.000000000 +0200 -+++ autofs-5.0.3/modules/cyrus-sasl.c 2008-04-28 16:41:58.000000000 +0200 -@@ -66,6 +66,15 @@ - #endif - #endif - -+/** -+ * The type of a principal is different for MIT Krb5 and Heimdal. -+ * These macros are provided by Heimdal, and introduced here for MIT. -+ */ -+#ifndef krb5_realm_length -+#define krb5_realm_length(r) ((r).length) -+#define krb5_realm_data(r) ((r).data) -+#endif -+ - /* - * Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME - * environment variable so that the library knows where to find it. -@@ -452,11 +461,11 @@ - - /* setup a principal for the ticket granting service */ - ret = krb5_build_principal_ext(ctxt->krb5ctxt, &tgs_princ, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, -+ krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), -+ krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), - strlen(KRB5_TGS_NAME), KRB5_TGS_NAME, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, -+ krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), -+ krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), - 0); - if (ret) { - error(logopt, - diff --git a/net-fs/autofs/files/autofs-5.0.5-fix-install-deadlink.patch b/net-fs/autofs/files/autofs-5.0.5-fix-install-deadlink.patch deleted file mode 100644 index 8ab10fcf7471..000000000000 --- a/net-fs/autofs/files/autofs-5.0.5-fix-install-deadlink.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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) diff --git a/net-fs/autofs/files/autofs-5.0.6-revert-ldap.patch b/net-fs/autofs/files/autofs-5.0.6-revert-ldap.patch deleted file mode 100644 index 49901ddfc69b..000000000000 --- a/net-fs/autofs/files/autofs-5.0.6-revert-ldap.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- modules/lookup_ldap.c -+++ modules/lookup_ldap.c -@@ -1488,6 +1488,7 @@ int lookup_init(const char *mapfmt, int - } - } - -+#ifdef WITH_SASL - /* - * First, check to see if a preferred authentication method was - * specified by the user. parse_ldap_config will return error -@@ -1500,7 +1501,6 @@ int lookup_init(const char *mapfmt, int - return 1; - } - --#ifdef WITH_SASL - /* Init the sasl callbacks */ - if (!autofs_sasl_client_init(LOGOPT_NONE)) { - error(LOGOPT_ANY, "failed to init sasl client"); diff --git a/net-fs/autofs/files/autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch b/net-fs/autofs/files/autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch deleted file mode 100644 index 366b1eaaba3b..000000000000 --- a/net-fs/autofs/files/autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch +++ /dev/null @@ -1,45 +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; - modules/lookup_ldap.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c -index dbec753..ce1e2e5 100644 ---- a/modules/lookup_ldap.c -+++ b/modules/lookup_ldap.c -@@ -28,7 +28,9 @@ - #include <arpa/nameser.h> - #include <resolv.h> - #include <lber.h> -+#ifdef HAVE_SASL - #include <libxml/tree.h> -+#endif - - #define MODULE_LOOKUP - #include "automount.h" diff --git a/net-fs/autofs/files/autofs-5.0.7-libtirpc-link.patch b/net-fs/autofs/files/autofs-5.0.7-libtirpc-link.patch deleted file mode 100644 index 92143f1d3066..000000000000 --- a/net-fs/autofs/files/autofs-5.0.7-libtirpc-link.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/modules/Makefile b/modules/Makefile -index 4ecbd6a..6a17540 100644 ---- a/modules/Makefile -+++ b/modules/Makefile -@@ -114,4 +114,4 @@ lookup_ldap.so: lookup_ldap.c dclist.o base64.o $(SASL_OBJ) - - mount_nfs.so: mount_nfs.c replicated.o - $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \ -- mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL) -+ mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL) $(TIRPCLIB) diff --git a/net-fs/autofs/files/autofs-5.0.7-parallel-make.patch b/net-fs/autofs/files/autofs-5.0.7-parallel-make.patch deleted file mode 100644 index f510f8fa2015..000000000000 --- a/net-fs/autofs/files/autofs-5.0.7-parallel-make.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ed85b855e1bcdb814b3dca7f6c768b86e6353fe7 Mon Sep 17 00:00:00 2001 -From: "Lan Yixun (dlan)" <dennis.yxun@gmail.com> -Date: Thu, 25 Jul 2013 10:04:23 +0800 -Subject: [PATCH] fix occasional build error when enable parallel compiling - -the problem here we pass "-jX" ( X> 1) to "make", and "rpc_subs.c" -occasionally fail to compile due to it can't find "mount.h", -the root cause it that "mount.h" haven't generated by that time, -add this patch should fix this problem. -to make rpc_subs.o explicitly depend on "mount.h". - ---- -error message: - -x86_64-pc-linux-gnu-gcc -O2 -pipe -march=core2 -D_REENTRANT --D_FILE_OFFSET_BITS=64 -I/usr/include/tirp c -D_REENTRANT --D_FILE_OFFSET_BITS=64 -I/usr/include/tirpc -I../include -fPIC --D_GNU_SOURCE -DAUTOFS_MA P_DIR=\"/etc/autofs\" --DAUTOFS_CONF_DIR=\"/etc/conf.d\" -c rpc_subs.c -rpc_subs.c:46:19: fatal error: mount.h: No such file or directory - #include "mount.h" - ^ -compilation terminated. -make[1]: *** [rpc_subs.o] Error 1 -make[1]: *** Waiting for unfinished -jobs.... - -Signed-off-by: Lan Yixun (dlan) <dennis.yxun@gmail.com> ---- - lib/Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/Makefile b/lib/Makefile -index 5418009..314779b 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -70,6 +70,8 @@ nss_tok.o: nss_tok.c nss_parse.tab.h - - nss_parse.tab.o: nss_parse.tab.c nss_parse.tab.h - -+rpc_subs.o: mount.h -+ - install: all - - clean: --- -1.8.3.2 - diff --git a/net-fs/autofs/files/autofs-5.0.7-respect-user-flags-and-fix-asneeded-r3.patch b/net-fs/autofs/files/autofs-5.0.7-respect-user-flags-and-fix-asneeded-r3.patch deleted file mode 100644 index c12d4bbe2b17..000000000000 --- a/net-fs/autofs/files/autofs-5.0.7-respect-user-flags-and-fix-asneeded-r3.patch +++ /dev/null @@ -1,144 +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 -@@ -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.7-sasl-def.patch b/net-fs/autofs/files/autofs-5.0.7-sasl-def.patch deleted file mode 100644 index a12d3798bdf0..000000000000 --- a/net-fs/autofs/files/autofs-5.0.7-sasl-def.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c -index ce1e2e5..35a2106 100644 ---- a/modules/lookup_ldap.c -+++ b/modules/lookup_ldap.c -@@ -28,9 +28,6 @@ - #include <arpa/nameser.h> - #include <resolv.h> - #include <lber.h> --#ifdef HAVE_SASL --#include <libxml/tree.h> --#endif - - #define MODULE_LOOKUP - #include "automount.h" -@@ -38,6 +35,10 @@ - #include "lookup_ldap.h" - #include "base64.h" - -+#ifdef WITH_SASL -+#include <libxml/tree.h> -+#endif -+ - #define MAPFMT_DEFAULT "sun" - - #define MODPREFIX "lookup(ldap): " -@@ -587,7 +588,7 @@ static LDAP *do_connect(unsigned logopt, const char *uri, struct lookup_context - { - LDAP *ldap; - --#ifdef HAVE_SASL -+#ifdef WITH_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); -@@ -1389,7 +1390,7 @@ static void free_context(struct lookup_context *ctxt) - defaults_free_searchdns(ctxt->sdns); - if (ctxt->dclist) - free_dclist(ctxt->dclist); --#ifdef HAVE_SASL -+#ifdef WITH_SASL - if (ctxt->extern_cert) - free(ctxt->extern_cert); - if (ctxt->extern_key) diff --git a/net-fs/autofs/files/autofs-5.0.7-sloppy-mount.patch b/net-fs/autofs/files/autofs-5.0.7-sloppy-mount.patch deleted file mode 100644 index 86e02bce5558..000000000000 --- a/net-fs/autofs/files/autofs-5.0.7-sloppy-mount.patch +++ /dev/null @@ -1,99 +0,0 @@ -From: Ian Kent <ikent@redhat.com> - -Historically autofs added an option to mounts, called the sloppy -option, meant to allow mount(8) to ignore invalid mount options. -This was done so that mount map entries for sites that needed to -use different mount options for some machines would still work. -It was needed for nfs mounts in particular. - -Recent changes to mount(8) cause the sloppy option to be passed on -for all mounts when it is given. - -Previously mount(8) only passed on the option to nfs mounts so now, -for other than nfs mounts, the mount will fail if the file system -doesn't understand the sloppy option. - -Since the option was not passed on to other than nfs mounts before -it seems sensible for autofs to not add it for other than nfs mounts -now. - -Signed-off-by: Ian Kent <ikent@redhat.com> ---- - modules/mount_bind.c | 9 ++++----- - modules/mount_changer.c | 6 +++--- - modules/mount_ext2.c | 6 +++--- - modules/mount_generic.c | 4 ++-- - 4 files changed, 12 insertions(+), 13 deletions(-) - ---- a/modules/mount_bind.c -+++ b/modules/mount_bind.c -@@ -158,13 +158,12 @@ int mount_mount(struct autofs_point *ap, - if (!status) - existed = 0; - -- debug(ap->logopt, -- MODPREFIX -- "calling mount --bind " SLOPPY " -o %s %s %s", -+ debug(ap->logopt, MODPREFIX -+ "calling mount --bind -o %s %s %s", - options, what, fullpath); - -- err = spawn_bind_mount(ap->logopt, -- SLOPPYOPT "-o", options, what, fullpath, NULL); -+ err = spawn_bind_mount(ap->logopt, "-o", -+ options, what, fullpath, NULL); - - if (err) { - if (ap->type != LKP_INDIRECT) ---- a/modules/mount_changer.c -+++ b/modules/mount_changer.c -@@ -103,12 +103,12 @@ int mount_mount(struct autofs_point *ap, - } - - if (options && options[0]) { -- debug(ap->logopt, -- MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s", -+ debug(ap->logopt, MODPREFIX -+ "calling mount -t %s -o %s %s %s", - fstype, options, what, fullpath); - - err = spawn_mount(ap->logopt, "-t", fstype, -- SLOPPYOPT "-o", options, what, fullpath, NULL); -+ "-o", options, what, fullpath, NULL); - } else { - debug(ap->logopt, - MODPREFIX "calling mount -t %s %s %s", ---- a/modules/mount_ext2.c -+++ b/modules/mount_ext2.c -@@ -116,11 +116,11 @@ int mount_mount(struct autofs_point *ap, - } - - if (options) { -- debug(ap->logopt, -- MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s", -+ debug(ap->logopt, MODPREFIX -+ "calling mount -t %s -o %s %s %s", - fstype, options, what, fullpath); - err = spawn_mount(ap->logopt, "-t", fstype, -- SLOPPYOPT "-o", options, what, fullpath, NULL); -+ "-o", options, what, fullpath, NULL); - } else { - debug(ap->logopt, - MODPREFIX "calling mount -t %s %s %s", ---- a/modules/mount_generic.c -+++ b/modules/mount_generic.c -@@ -97,11 +97,11 @@ int mount_mount(struct autofs_point *ap, - - if (options && options[0]) { - debug(ap->logopt, -- MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s", -+ MODPREFIX "calling mount -t %s -o %s %s %s", - fstype, options, loc, fullpath); - - err = spawn_mount(ap->logopt, "-t", fstype, -- SLOPPYOPT "-o", options, loc, fullpath, NULL); -+ "-o", options, loc, fullpath, NULL); - } else { - debug(ap->logopt, MODPREFIX "calling mount -t %s %s %s", - fstype, loc, fullpath); - |