dlan        15/04/21 02:21:50

  Modified:             ChangeLog
  Added:                autofs-5.0.7-r5.ebuild autofs-5.1.0-r1.ebuild
                        autofs-5.0.9-r1.ebuild autofs-5.0.8-r2.ebuild
  Log:
  fix sloopy mount option which break other than nfs, bug 545258
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
0xAABEFD55)

Revision  Changes    Path
1.177                net-fs/autofs/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/ChangeLog?rev=1.177&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/ChangeLog?rev=1.177&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/ChangeLog?r1=1.176&r2=1.177

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- ChangeLog   14 Jun 2014 15:29:00 -0000      1.176
+++ ChangeLog   21 Apr 2015 02:21:50 -0000      1.177
@@ -1,6 +1,16 @@
 # ChangeLog for net-fs/autofs
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.176 2014/06/14 
15:29:00 dlan Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.177 2015/04/21 
02:21:50 dlan Exp $
+
+*autofs-5.1.0-r1 (21 Apr 2015)
+*autofs-5.0.9-r1 (21 Apr 2015)
+*autofs-5.0.8-r2 (21 Apr 2015)
+*autofs-5.0.7-r5 (21 Apr 2015)
+
+  21 Apr 2015; Yixun Lan <[email protected]> +autofs-5.0.7-r5.ebuild,
+  +autofs-5.0.8-r2.ebuild, +autofs-5.0.9-r1.ebuild, +autofs-5.1.0-r1.ebuild,
+  +files/autofs-5.0.7-sloppy-mount.patch:
+  fix sloopy mount option which break other than nfs, bug 545258
 
   14 Jun 2014; Yixun Lan <[email protected]> autofs-5.1.0.ebuild,
   +files/autofs-5.1.0-fix-missing-stdarg.patch:



1.1                  net-fs/autofs/autofs-5.0.7-r5.ebuild

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

Index: autofs-5.0.7-r5.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.7-r5.ebuild,v 1.1 
2015/04/21 02:21:50 dlan Exp $

EAPI=5

AUTOTOOLS_AUTORECONF=true

inherit autotools-utils linux-info multilib systemd toolchain-funcs

PATCH_VER=3
[[ -n ${PATCH_VER} ]] && \
        
PATCHSET_URI="http://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma";

DESCRIPTION="Kernel based automounter"
HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html";
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="-dmalloc hesiod ldap libtirpc 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=">=sys-apps/util-linux-2.20
        dmalloc? ( dev-libs/dmalloc[threads] )
        hesiod? ( net-dns/hesiod )
        ldap? ( >=net-nds/openldap-2.0
                sasl? (
                        dev-libs/cyrus-sasl
                        dev-libs/libxml2
                        virtual/krb5
                )
        )
        libtirpc? ( net-libs/libtirpc )"

DEPEND="${RDEPEND}
        sys-devel/flex
        virtual/yacc"

CONFIG_CHECK="~AUTOFS4_FS"

PATCHES=(
        # Fix for bug #210762
        # Upstream reference: 
http://thread.gmane.org/gmane.linux.kernel.autofs/4203
        "${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
        "${FILESDIR}"/${PN}-5.0.7-respect-user-flags-and-fix-asneeded-r3.patch

        # Upstream reference: 
http://thread.gmane.org/gmane.linux.kernel.autofs/5371
        "${FILESDIR}"/${PN}-5.0.5-fix-install-deadlink.patch

        
"${FILESDIR}"/${P}-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch 
#361899, #468606
        "${FILESDIR}"/${PN}-5.0.6-revert-ldap.patch #381315
        "${FILESDIR}"/${PN}-5.0.7-sasl-def.patch #469324
        "${FILESDIR}"/${PN}-5.0.7-libtirpc-link.patch #464120
        "${FILESDIR}"/${PN}-5.0.7-parallel-make.patch
        "${FILESDIR}"/${PN}-5.0.7-sloppy-mount.patch #545258
        )

AUTOTOOLS_IN_SOURCE_BUILD=1

src_prepare() {
        # Upstream's patchset
        if [[ -n ${PATCH_VER} ]]; then
                EPATCH_SUFFIX="patch" \
                        epatch "${WORKDIR}"/patches
        fi
        sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die 
#bug #479492
        autotools-utils_src_prepare
}

src_configure() {
        # bug #483716
        tc-export AR
        # --with-confdir is for bug #361481
        # --with-mapdir is for bug #385113
        local myeconfargs=(
                --with-confdir=/etc/conf.d
                --with-mapdir=/etc/autofs
                $(use_with dmalloc)
                $(use_with ldap openldap)
                $(use_with libtirpc)
                $(use_with sasl)
                $(use_with hesiod)
                $(use_enable mount-locking)
                --disable-ext-env
                --enable-sloppy-mount # bug #453778
                --enable-forced-shutdown
                --enable-ignore-busy
                --with-systemd
                systemddir="$(systemd_get_unitdir)" #bug #479492
                RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
        )
        autotools-utils_src_configure
}

src_install() {
        autotools-utils_src_install

        if kernel_is -lt 2 6 30; then
                # kernel patches
                docinto patches
                dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
        fi
        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."
}



1.1                  net-fs/autofs/autofs-5.1.0-r1.ebuild

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

Index: autofs-5.1.0-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.1.0-r1.ebuild,v 1.1 
2015/04/21 02:21:50 dlan Exp $

EAPI=5

AUTOTOOLS_AUTORECONF=true
AUTOTOOLS_IN_SOURCE_BUILD=true

inherit autotools-utils linux-info multilib systemd toolchain-funcs

PATCH_VER=
[[ -n ${PATCH_VER} ]] && \
        
PATCHSET_URI="http://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma";

DESCRIPTION="Kernel based automounter"
HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html";
SRC_URI="
        mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz
        ${PATCHSET_URI}"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="-dmalloc hesiod ldap libtirpc 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=">=sys-apps/util-linux-2.20
        dmalloc? ( dev-libs/dmalloc[threads] )
        hesiod? ( net-dns/hesiod )
        ldap? ( >=net-nds/openldap-2.0
                sasl? (
                        dev-libs/cyrus-sasl
                        dev-libs/libxml2
                        virtual/krb5
                )
        )
        libtirpc? ( net-libs/libtirpc )"

DEPEND="${RDEPEND}
        sys-devel/flex
        virtual/yacc"

CONFIG_CHECK="~AUTOFS4_FS"

PATCHES=(
        "${FILESDIR}/${P}-fix-missing-stdarg.patch"
        "${FILESDIR}"/${PN}-5.0.7-sloppy-mount.patch #545258
)

src_prepare() {
        # Upstream's patchset
        if [[ -n ${PATCH_VER} ]]; then
                EPATCH_SUFFIX="patch" \
                        epatch "${WORKDIR}"/patches
        fi

        sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die 
#bug #479492
        autotools-utils_src_prepare
}

src_configure() {
        # bug #483716
        tc-export AR
        # --with-confdir is for bug #361481
        # --with-mapdir is for bug #385113
        local myeconfargs=(
                --with-confdir=/etc/conf.d
                --with-mapdir=/etc/autofs
                $(use_with dmalloc)
                $(use_with ldap openldap)
                $(use_with libtirpc)
                $(use_with sasl)
                $(use_with hesiod)
                $(use_enable mount-locking)
                --disable-ext-env
                --enable-sloppy-mount # bug #453778
                --enable-force-shutdown
                --enable-ignore-busy
                --with-systemd="$(systemd_get_unitdir)" #bug #479492
                RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
        )
        autotools-utils_src_configure
}

src_compile() {
        autotools-utils_src_compile DONTSTRIP=1
}

src_install() {
        autotools-utils_src_install

        if kernel_is -lt 2 6 30; then
                # kernel patches
                docinto patches
                dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
        fi
        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."
}



1.1                  net-fs/autofs/autofs-5.0.9-r1.ebuild

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

Index: autofs-5.0.9-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.9-r1.ebuild,v 1.1 
2015/04/21 02:21:50 dlan Exp $

EAPI=5

AUTOTOOLS_AUTORECONF=true
AUTOTOOLS_IN_SOURCE_BUILD=true

inherit autotools-utils linux-info multilib systemd toolchain-funcs

PATCH_VER=
[[ -n ${PATCH_VER} ]] && \
        
PATCHSET_URI="http://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma";

DESCRIPTION="Kernel based automounter"
HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html";
SRC_URI="
        mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz
        ${PATCHSET_URI}"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="-dmalloc hesiod ldap libtirpc 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=">=sys-apps/util-linux-2.20
        dmalloc? ( dev-libs/dmalloc[threads] )
        hesiod? ( net-dns/hesiod )
        ldap? ( >=net-nds/openldap-2.0
                sasl? (
                        dev-libs/cyrus-sasl
                        dev-libs/libxml2
                        virtual/krb5
                )
        )
        libtirpc? ( net-libs/libtirpc )"

DEPEND="${RDEPEND}
        sys-devel/flex
        virtual/yacc"

CONFIG_CHECK="~AUTOFS4_FS"

PATCHES=(
        "${FILESDIR}"/${PN}-5.0.7-sloppy-mount.patch #545258
)

src_prepare() {
        # Upstream's patchset
        if [[ -n ${PATCH_VER} ]]; then
                EPATCH_SUFFIX="patch" \
                        epatch "${WORKDIR}"/patches
        fi

        sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die 
#bug #479492
        autotools-utils_src_prepare
}

src_configure() {
        # bug #483716
        tc-export AR
        # --with-confdir is for bug #361481
        # --with-mapdir is for bug #385113
        local myeconfargs=(
                --with-confdir=/etc/conf.d
                --with-mapdir=/etc/autofs
                $(use_with dmalloc)
                $(use_with ldap openldap)
                $(use_with libtirpc)
                $(use_with sasl)
                $(use_with hesiod)
                $(use_enable mount-locking)
                --disable-ext-env
                --enable-sloppy-mount # bug #453778
                --enable-force-shutdown
                --enable-ignore-busy
                --with-systemd="$(systemd_get_unitdir)" #bug #479492
                RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
        )
        autotools-utils_src_configure
}

src_compile() {
        autotools-utils_src_compile DONTSTRIP=1
}

src_install() {
        autotools-utils_src_install

        if kernel_is -lt 2 6 30; then
                # kernel patches
                docinto patches
                dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
        fi
        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."
}



1.1                  net-fs/autofs/autofs-5.0.8-r2.ebuild

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

Index: autofs-5.0.8-r2.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.8-r2.ebuild,v 1.1 
2015/04/21 02:21:50 dlan Exp $

EAPI=5

AUTOTOOLS_AUTORECONF=true
AUTOTOOLS_IN_SOURCE_BUILD=true

inherit autotools-utils linux-info multilib systemd toolchain-funcs

PATCH_VER=
[[ -n ${PATCH_VER} ]] && \
        
PATCHSET_URI="http://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma";

DESCRIPTION="Kernel based automounter"
HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html";
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="-dmalloc hesiod ldap libtirpc 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=">=sys-apps/util-linux-2.20
        dmalloc? ( dev-libs/dmalloc[threads] )
        hesiod? ( net-dns/hesiod )
        ldap? ( >=net-nds/openldap-2.0
                sasl? (
                        dev-libs/cyrus-sasl
                        dev-libs/libxml2
                        virtual/krb5
                )
        )
        libtirpc? ( net-libs/libtirpc )"

DEPEND="${RDEPEND}
        sys-devel/flex
        virtual/yacc"

CONFIG_CHECK="~AUTOFS4_FS"

PATCHES=(
        "${FILESDIR}"/${PN}-5.0.7-sloppy-mount.patch #545258
)

src_prepare() {
        # Upstream's patchset
        if [[ -n ${PATCH_VER} ]]; then
                EPATCH_SUFFIX="patch" \
                        epatch "${WORKDIR}"/patches
        fi
        epatch "${FILESDIR}"/${P}-ldap-wo-sasl.patch
        sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die 
#bug #479492
        autotools-utils_src_prepare
}

src_configure() {
        # bug #483716
        tc-export AR
        # --with-confdir is for bug #361481
        # --with-mapdir is for bug #385113
        local myeconfargs=(
                --with-confdir=/etc/conf.d
                --with-mapdir=/etc/autofs
                $(use_with dmalloc)
                $(use_with ldap openldap)
                $(use_with libtirpc)
                $(use_with sasl)
                $(use_with hesiod)
                $(use_enable mount-locking)
                --disable-ext-env
                --enable-sloppy-mount # bug #453778
                --enable-force-shutdown
                --enable-ignore-busy
                --with-systemd
                systemddir="$(systemd_get_unitdir)" #bug #479492
                RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
        )
        autotools-utils_src_configure
}

src_compile() {
        autotools-utils_src_compile DONTSTRIP=1
}

src_install() {
        autotools-utils_src_install

        if kernel_is -lt 2 6 30; then
                # kernel patches
                docinto patches
                dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
        fi
        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."
}




Reply via email to