[gentoo-commits] gentoo-x86 commit in net-fs/autofs: autofs-5.0.7-r3.ebuild autofs-9999.ebuild ChangeLog

[Maxim Koltsov (maksbotan)]

maksbotan    13/07/30 07:31:20

  Modified:             autofs-9999.ebuild ChangeLog
  Added:                autofs-5.0.7-r3.ebuild
  Log:
  1) fix broken libtirpc link error, bug #464120 2) fix occational parallel build error 3) fix duplicated user_patch 4) fix dmalloc deps. Thanks to Dennis 'dlan' Lan.
  
  (Portage version: 2.1.13.1/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)

Revision  Changes    Path
1.3                  net-fs/autofs/autofs-9999.ebuild

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

Index: autofs-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-9999.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- autofs-9999.ebuild	13 Jun 2013 15:03:59 -0000	1.2
+++ autofs-9999.ebuild	30 Jul 2013 07:31:20 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-9999.ebuild,v 1.2 2013/06/13 15:03:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-9999.ebuild,v 1.3 2013/07/30 07:31:20 maksbotan Exp $
 
 EAPI=5
 
@@ -24,6 +24,7 @@
 
 # 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? (
@@ -40,11 +41,6 @@
 
 CONFIG_CHECK="~AUTOFS4_FS"
 
-src_prepare() {
-	epatch_user
-	autotools-utils_src_prepare
-}
-
 src_configure() {
 	# --with-confdir is for bug #361481
 	# --with-mapdir is for bug #385113
@@ -62,12 +58,16 @@
 		$(use_enable mount-locking)
 		--disable-ext-env
 		--enable-sloppy-mount
-		--enable-forced-shutdown
+		--enable-force-shutdown
 		--enable-ignore-busy
 	)
 	autotools-utils_src_configure
 }
 
+src_compile() {
+	autotools-utils_src_compile DONTSTRIP=1
+}
+
 src_install() {
 	autotools-utils_src_install
 



1.155                net-fs/autofs/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- ChangeLog	22 Jul 2013 11:05:44 -0000	1.154
+++ ChangeLog	30 Jul 2013 07:31:20 -0000	1.155
@@ -1,6 +1,17 @@
 # ChangeLog for net-fs/autofs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.154 2013/07/22 11:05:44 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.155 2013/07/30 07:31:20 maksbotan Exp $
+
+*autofs-5.0.7-r3 (30 Jul 2013)
+
+  30 Jul 2013; Maxim Koltsov <maksbotan@g.o> +autofs-5.0.7-r3.ebuild,
+  +files/autofs-5.0.7-libtirpc-link.patch,
+  +files/autofs-5.0.7-parallel-make.patch,
+  +files/autofs-5.0.7-respect-user-flags-and-fix-asneeded-r3.patch,
+  autofs-9999.ebuild:
+  1) fix broken libtirpc link error, bug #464120 2) fix occational parallel
+  build error 3) fix duplicated user_patch 4) fix dmalloc deps. Thanks to Dennis
+  'dlan' Lan.
 
   22 Jul 2013; Tom Wijsman <TomWij@g.o> metadata.xml:
   Drop Dustin from metadata.xml, make Dennis (dlan) Lan primary maintainer;



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

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

Index: autofs-5.0.7-r3.ebuild
===================================================================
# Copyright 1999-2013 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-r3.ebuild,v 1.1 2013/07/30 07:31:20 maksbotan Exp $

EAPI=5

AUTOTOOLS_AUTORECONF=true

inherit autotools-utils linux-info multilib

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
	)

AUTOTOOLS_IN_SOURCE_BUILD=1

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

src_configure() {
	# --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
	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
	)
	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."
}