diff options
author | 2017-01-31 20:29:33 +0100 | |
---|---|---|
committer | 2017-01-31 20:29:33 +0100 | |
commit | cbd52aaf10737c2cb0cc9a5545022e0af2bcea83 (patch) | |
tree | 19d4940e286cd84fd0c159e39c39fd9f55360f30 | |
parent | Drop empty folders net-analyzer/tcpreplay. (diff) | |
download | DuPol-cbd52aaf10737c2cb0cc9a5545022e0af2bcea83.tar.gz DuPol-cbd52aaf10737c2cb0cc9a5545022e0af2bcea83.tar.bz2 DuPol-cbd52aaf10737c2cb0cc9a5545022e0af2bcea83.zip |
[net-fs/autofs] Drop old.
-rw-r--r-- | net-fs/autofs/ChangeLog | 13 | ||||
-rw-r--r-- | net-fs/autofs/Manifest | 14 | ||||
-rw-r--r-- | net-fs/autofs/autofs-5.0.6-r6.ebuild | 115 | ||||
-rw-r--r-- | net-fs/autofs/files/autofs-5.0.3-heimdal.patch | 35 | ||||
-rw-r--r-- | net-fs/autofs/files/autofs-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch | 28 | ||||
-rw-r--r-- | net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch | 61 | ||||
-rw-r--r-- | net-fs/autofs/files/autofs-5.0.5-fix-install-deadlink.patch | 12 | ||||
-rw-r--r-- | net-fs/autofs/files/autofs-5.0.6-make-piddir-specifiable-by-user.patch | 42 | ||||
-rw-r--r-- | net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch | 158 | ||||
-rw-r--r-- | net-fs/autofs/files/autofs-5.0.6-revert-ldap.patch | 18 | ||||
-rw-r--r-- | net-fs/autofs/files/autofs5-auto.master | 24 | ||||
-rw-r--r-- | net-fs/autofs/files/autofs5.initd | 70 |
12 files changed, 12 insertions, 578 deletions
diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog index 46179e3..699ebed 100644 --- a/net-fs/autofs/ChangeLog +++ b/net-fs/autofs/ChangeLog @@ -1,7 +1,18 @@ # ChangeLog for net-fs/autofs -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.90 2009/09/23 18:35:30 patrick Exp $ + 31 Jan 2017; Dustin Polke <DuPol@gmx.de> -autofs-5.0.6-r6.ebuild, + -files/autofs-5.0.3-heimdal.patch, + -files/autofs-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patc + h, -files/autofs-5.0.5-fix-building-without-ldap.patch, + -files/autofs-5.0.5-fix-install-deadlink.patch, + -files/autofs-5.0.6-make-piddir-specifiable-by-user.patch, + -files/autofs-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch, + -files/autofs-5.0.6-revert-ldap.patch, -files/autofs5-auto.master, + -files/autofs5.initd: + Drop old. + 19 Jul 2012; Dustin Polke <DuPol@gmx.de> Manifest: Update upstream patchset. diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest deleted file mode 100644 index 27cd68e..0000000 --- a/net-fs/autofs/Manifest +++ /dev/null @@ -1,14 +0,0 @@ -AUX autofs-5.0.3-heimdal.patch 1380 SHA256 ca62546abf6b6ae2ed95f53d439d25770f20e70651fdaf5a0edf9d69920b108a SHA512 f8f0528988085691899c3f4c1b3f13c6b189b4fe7fa160e713a819f25cb1c860ed896e096c4226e9e6449526037b263e832d27a5e5ce9b13bc5416ee28cb7317 WHIRLPOOL b6060d5074eb3a523724d85bcf1fef24f8af70372f6806be18a0e4fecff6f6e26638192490935ccf99bb90f140b9dedfc195fb42cc582512acdf4a2616dfb8d3 -AUX autofs-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch 756 SHA256 0917780bf6f9be61d523535e42bcdcc460810d6f06b5b505230801f7a549efb4 SHA512 d367ccdde8aa459080195122c12b5c22692b3577c4fa9ae17f09012d570d68f0b03a222d5dacba83465a26aebfb486646e11f6dcb21d11e91824073049f5f170 WHIRLPOOL 6913b58176690dcfc5b4ce50ae1f89698c67282087d58c048809eb4707f9461c6ef2a3b17970de7b0479164bf36aa5af206425e8137abc350b2860d8fe82dbcd -AUX autofs-5.0.5-fix-building-without-ldap.patch 947 SHA256 621f308606de8435be6e3c3eff2f599d5b166ae6404626376a86dfcc1f72b6eb SHA512 2bb73b358e3692e5b33144da9fefede0b1c9fc18811c5196145b087f8e76f690e7264006141258b6734ab8e8f1fbd6a1e3c4a6400a500e570700963ad844b60d WHIRLPOOL b726347a861bd896a6a504ce3d47e91d9ae09efeba730b748ce82c7efe84a333653b61fb5a42ea359197be4c56416d4ba3c344c2d4ed4664e074a1cda493bcb5 -AUX autofs-5.0.5-fix-install-deadlink.patch 544 SHA256 48393e00ddb51c5b0588ea45711abb16bf256c487c584062bc3de59b30bae053 SHA512 03f4f8fa6721e5ddd16560b9d7385a3734c7614f2903bd142869b2f2b099317ae2f73f6aa59f6e62b166f00d90baba3345d5fd5c3af3344b2348984d09ba3020 WHIRLPOOL c8c202220584c8cedcf0d90f066cad3311f60c90e5b36a8a52847f1b0723babb8b97a95264cd64fb1fd2164e64f3f314df1ef357c822cb0028cd9ff498d7d13f -AUX autofs-5.0.6-make-piddir-specifiable-by-user.patch 1014 SHA256 225aeb0f26509029c41fac959417e60eb415a646dfb00626b64b5fc446aeae95 SHA512 256a18cfc1fef2701b74b895dde9d5f0174c12ec9170397ab832ba0e12a05bc38c01b1664f31507027e36bfb36c8f8ae1a0dab11d4317936869a04e7df73b18f WHIRLPOOL db573ac617af28ad21223fa0561ea157fd5ab00ddbcc2742b54d3df983400e333478eb60aa587fac32a1e38ca125a806eca72db6f7d481e46fa2dac22a8ebc7a -AUX autofs-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch 4154 SHA256 32d1f9fc9b2488df5f7692cf307016d84ea179a8629eb47f3fe7e1f1c1240f2c SHA512 fdd457e59fb483ada6f9e57d247c30f328d3c9023b2790724acbe4cfe3aaf43475c46a3fd0e4b54d313dd86818ee91f6f738e076f4176e0db91a7f4bac51a0b8 WHIRLPOOL a59043763aabdee5a80586766f0c24cb9e4a33baf451d9929dce592bcb5c3727beed0c72d44550505a50bb2defd1e0f3661c4ae1c43a93e32b618d56ff1fbad7 -AUX autofs-5.0.6-revert-ldap.patch 512 SHA256 67e4f23d0c1ef771f861ec295a2780d9c09b37d26718c21e3f20d3b4936738e9 SHA512 e929bbe145c19ac5180094205a9095387e90126e8360ede99ab972cca864c40c1caf779503454784804e925e0efc0b4c459accb734f63482c758989bb17d7313 WHIRLPOOL 70c541931415e7d35955196c683bef2bf08c16b920f7398a679eaa8abeda5364cd3f0afec674e02e126447ca5c29d8c2934eb33d3f09aeb48fa0ae7a798cc56f -AUX autofs5-auto.master 756 SHA256 8651b42b338ffdb8be24ed88893ca90f95d0221f2684274957de154fd89df5cb SHA512 3c6e6dab6beb595f4bfa3af7be3c1f5343a80ea81bc9fb26e073e96ea1b75bf2fd304c4e54dad9ec1c233e01c62310bbdbc7f97a2370e82bc31138855819d3b2 WHIRLPOOL 2c5a885f76d6e2adfc6c3b5a739c7bf820ba48adfca28cd7a2a50b81ec150011b93f283b8bb5058a427bfd5c701b1da8cbd31fc9a15b121d310d3048dacfba72 -AUX autofs5.initd 1665 SHA256 52ce5649ead901659b51409f583276e53f5221b1eceb8d39a98e0c07df5271da SHA512 a9ba6b49dc156cd670ebf519a7c68a65e635e9d3f180eecaebc4d32e6384620f600f32fc90f162e3f82b981220bf558102d133816c61e710c26049d3fb1a4631 WHIRLPOOL 3c4415f8b6c2ad7fddae15c27c174e8deb5cff7a09ac7f9f16d2b572bd144a3faa5b9a1b447268e15ac84d9ab39e0eb6423b1c4ec60c8cc31f5f1279d2f9b455 -DIST autofs-5.0.6-patches-2.tar.lzma 69177 SHA256 2498f03582c415e555ff361235d24dca729c618e22ade3a03d431332d6bfe7f0 SHA512 d593531f01ae60e52322dd8171cfed2a0fc4a4a3c359de8b1118916de29ab48d9de71f57b10d70c21054e3ccb9dd9abdff07fd77842bf5508e47287a9669efbb WHIRLPOOL 56b6bef6c4dfb574c56564a9eb0f0567c23003748907de14db7861c9cd815b4a9abc82d97875b3ccc98d9473119ad9a4284754a8fddd2ec0494dbea46d043d44 -DIST autofs-5.0.6.tar.bz2 311857 SHA256 125b439a311939f247936ad697bc53b11a8e694aaff8ddf44a9fd7fa850e692c SHA512 cedfa6b6a6c81390a9302732ddfd880870e53f4995c8d87f9150669aa05b65c645763cf3bbda2ecd46a1dae1c3a80fe0601c0b4bb8dbb370c2af1392671e6355 WHIRLPOOL 61b0d36235805eee61b8cf445bc16d72c91ce9fa0d3bb0dfac94a54bb51a47548a16003d2888a92ef6afa449d4b81d9ddd086a69b63579c04088139286a1a410 -EBUILD autofs-5.0.6-r6.ebuild 3689 SHA256 92ee3ef1b9b68e0bb3f94b5e3fdee3ee4f09fa1109789786d9454ffcc94bf2cd SHA512 dde4daa9098f9b2ffd04f8de84dad436f38d7bd3b7af116a9bf7b01ba75b7cc0bff2d68244e041c23339b2461c7fac19807d6ef8db8361b163c92f3c2a9abac7 WHIRLPOOL b9f9fa480d14477899e312327277af1c54d4ae62a4b4c3fe9be37e31d3bd760b42a8c925d5e9ff69e05ccd2caf0210f75b7390564dace9ca4683d31118074733 -MISC ChangeLog 5402 SHA256 0c900d2410169252c636b67cd266e6dfb7c7444660964eafc529a63cebb06167 SHA512 f8245ecd9b00683ebe2bf061d9765d42200b8e4c71a6ac478405b611d923e7dead855c7a62b9aea8281545d0e580f896b85f6166f86c4bff4fd49ec8f0bc8918 WHIRLPOOL a37d2039a7fdd79fd9596e775e63aa4475ca2e76fd03dcf07c1683af4eddd9544b9b54ef7e3d239ac66f811b5908e615fa60d7234d5292450346bcb773c423a0 -MISC metadata.xml 808 SHA256 27f971446823d8ca65276ccc736268e2f5a0cfde4b3083e4420829ef73b0117e SHA512 ab7e732e1ec9561d1d643a9bcf8924a87aa8df17eb347cba799afe93400792dc59d430e05db4080a93af1ce14e80a386e88c690b92a2aeb03484740812aee0d4 WHIRLPOOL da3985dffdbb9674bfbecdb1e9a7d6d985f4e4445e01e38f68efcb644b0e23a65e6918ef7fb7f502e580c5e0d1f91a66b716cbffba4e237ae033a079294a78e3 diff --git a/net-fs/autofs/autofs-5.0.6-r6.ebuild b/net-fs/autofs/autofs-5.0.6-r6.ebuild deleted file mode 100644 index 7b9c133..0000000 --- a/net-fs/autofs/autofs-5.0.6-r6.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.6-r5.ebuild,v 1.1 2011/12/17 03:45:15 pva Exp $ - -EAPI="4" -inherit eutils multilib autotools linux-info - -DESCRIPTION="Kernel based automounter" -HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" -PATCH_VER="2" -[[ -n ${PATCH_VER} ]] && \ - PATCHSET_URI="http://home.arcor.de/dpolke/distfiles/${P}-patches-${PATCH_VER}.tar.lzma" -SRC_URI="mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.bz2 - ${PATCHSET_URI}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="hesiod ldap mount-locking sasl" - -# USE="sasl" adds SASL support to the LDAP module which will not be build. If -# SASL support should be available, please add "ldap" to the USE flags. -REQUIRED_USE="sasl? ( ldap )" - -# currently, sasl code assumes the presence of kerberosV -RDEPEND=" - hesiod? ( net-dns/hesiod ) - ldap? ( >=net-nds/openldap-2.0 - sasl? ( dev-libs/cyrus-sasl - dev-libs/libxml2 - virtual/krb5 ) )" -DEPEND="${RDEPEND} - sys-devel/flex - virtual/yacc" - -src_prepare() { - # Upstream's patchset - if [[ -n ${PATCH_VER} ]]; then - EPATCH_SUFFIX="patch" \ - epatch "${WORKDIR}"/patches - fi - - # Fix for bug #210762 - # Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/4203 - epatch "${FILESDIR}"/${PN}-5.0.3-heimdal.patch - - # Accumulated fixes for bugs - # #154797: Respect CC and CFLAGS - # #253412: Respect LDFLAGS - # #247969: Link order for --as-needed - epatch "${FILESDIR}"/${P}-respect-user-flags-and-fix-asneeded-r2.patch - - # Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/5371 - epatch "${FILESDIR}"/${PN}-5.0.5-fix-install-deadlink.patch - - # Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/6039 - # Disable LDAP specific code if USE="-ldap", let's see what upstream says... - epatch "${FILESDIR}"/${PN}-5.0.5-fix-building-without-ldap.patch - - # https://bugs.gentoo.org/show_bug.cgi?id=361899 - epatch "${FILESDIR}"/${PN}-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch - - # https://bugs.gentoo.org/show_bug.cgi?id=381315 - epatch "${FILESDIR}"/${P}-revert-ldap.patch - eautoreconf -} - -src_configure() { - # work around bug #355975 (mount modifies timestamp of /etc/mtab) - # with >=sys-apps/util-linux-2.19, - addpredict "/etc/mtab" - - # --with-confdir is for bug #361481 - # --with-mapdir is for bug #385113 - # for systemd support (not enabled yet): - # --with-systemd - # --disable-move-mount: requires kernel >=2.6.39 - econf \ - --with-confdir=/etc/conf.d \ - --with-mapdir=/etc/autofs \ - $(use_with ldap openldap) \ - $(use_with sasl) \ - $(use_with hesiod) \ - $(use_enable mount-locking) \ - --enable-ignore-busy -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc README* CHANGELOG CREDITS COPYRIGHT INSTALL - - # kernel patches - docinto patches - dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch - - newinitd "${FILESDIR}"/autofs5.initd autofs - insinto etc/autofs - newins "${FILESDIR}"/autofs5-auto.master auto.master -} - -pkg_postinst() { - if kernel_is -lt 2 6 30; then - elog "This version of ${PN} requires a kernel with autofs4 supporting" - elog "protocol version 5.00. Patches for kernels older than 2.6.30 have" - elog "been installed into" - elog "${EROOT}usr/share/doc/${P}/patches." - elog "For further instructions how to patch the kernel, please refer to" - elog "${EROOT}usr/share/doc/${P}/INSTALL." - elog - fi - elog "If you plan on using autofs for automounting remote NFS mounts," - elog "please check that both portmap (or rpcbind) and rpc.statd/lockd" - elog "are running." -} 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 707364d..0000000 --- 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-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 4d70d2a..0000000 --- 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 8086961..0000000 --- a/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch +++ /dev/null @@ -1,61 +0,0 @@ -=== 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.5-fix-install-deadlink.patch b/net-fs/autofs/files/autofs-5.0.5-fix-install-deadlink.patch deleted file mode 100644 index 8ab10fc..0000000 --- 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-make-piddir-specifiable-by-user.patch b/net-fs/autofs/files/autofs-5.0.6-make-piddir-specifiable-by-user.patch deleted file mode 100644 index 32b5b79..0000000 --- a/net-fs/autofs/files/autofs-5.0.6-make-piddir-specifiable-by-user.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 584468f3c8eb5574811b67cd4a3f0b8736a3d99c Mon Sep 17 00:00:00 2001 -From: Dustin Polke <dustin.polke@uni-siegen.de> -Date: Thu, 15 Dec 2011 21:35:21 +0100 -Subject: [PATCH] autofs-5.0.6 - make piddir specifiable by user - -Let the user specify where to put pid files. This is helpful if /var/run -and /run exist and the user wants to supersede the use of /run by -/var/run. ---- - configure.in | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) - -diff --git a/configure.in b/configure.in -index 05ee67f..d2cd73a 100644 ---- a/configure.in -+++ b/configure.in -@@ -43,7 +43,22 @@ AF_LINUX_PROCFS() - # - AF_INIT_D() - AC_SUBST(initdir) -+ -+# -+# Location of pid file directory? -+# - AF_PID_D() -+AC_ARG_WITH(piddir, -+[ --with-piddir=DIR use DIR for autofs pid file directory], -+ if test -z "$withval" -o "$withval" = "yes" -o "$withval" = "no" -+ then -+ : -+ else -+ piddir="${withval}" -+ fi -+) -+AC_MSG_CHECKING([for autofs pid file directory]) -+AC_MSG_RESULT([$piddir]) - AC_SUBST(piddir) - - # --- -1.7.3.4 - 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 21d74be..0000000 --- a/net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch +++ /dev/null @@ -1,158 +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,34 @@ 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 -+CFLAGS += $(XML_FLAGS) - endif - - # Standard rules -@@ -67,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-revert-ldap.patch b/net-fs/autofs/files/autofs-5.0.6-revert-ldap.patch deleted file mode 100644 index 49901dd..0000000 --- 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/autofs5-auto.master b/net-fs/autofs/files/autofs5-auto.master deleted file mode 100644 index 4b10001..0000000 --- a/net-fs/autofs/files/autofs5-auto.master +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: autofs5-auto.master,v 1.1 2011/05/23 08:29:05 pva Exp $ -# Sample auto.master file -# This is an automounter map and it has the following format -# key [ -mount-options-separated-by-comma ] location -# For details of the format look at autofs(5). -# -#/misc /etc/autofs/auto.misc -#/net /etc/autofs/auto.net -# -# NOTE: mounts done from a hosts map will be mounted with the -# "nosuid" and "nodev" options unless the "suid" and "dev" -# options are explicitly given. -# -#/net -hosts -# -# Include central master map if it can be found using -# nsswitch sources. -# -# Note that if there are entries for /net or /misc (as -# above) in the included master map any keys that are the -# same will not be seen as the first read key seen takes -# precedence. -# -#+auto.master diff --git a/net-fs/autofs/files/autofs5.initd b/net-fs/autofs/files/autofs5.initd deleted file mode 100644 index 47939f0..0000000 --- a/net-fs/autofs/files/autofs5.initd +++ /dev/null @@ -1,70 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 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.3 2011/10/05 14:27:26 pva Exp $ - -DAEMON=/usr/sbin/automount -PIDFILE=/var/run/autofs.pid -DEVICE=autofs - -depend() { - need localmount - use ypbind nfs slapd portmap net -} - -extra_started_commands="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) - if [ -n "${MINOR}" -a ! -c "/dev/${DEVICE}" ]; then - mknod -m 0600 "/dev/${DEVICE}" c 10 ${MINOR} - if [ $? -ne 0 ]; then - eend 1 "Could not create '/dev/${DEVICE}'" - return 1 - fi - fi - fi - if [ -x /sbin/restorecon -a -c "/dev/${DEVICE}" ]; then - /sbin/restorecon "/dev/${DEVICE}" - if [ $? -ne 0 ]; then - eend 1 "Failed to execute '/sbin/restorecon \"/dev/${DEVICE}\"'" - return 1 - fi - 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 -} |