From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1263280-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 2ED551382C5
	for <garchives@archives.gentoo.org>; Mon, 22 Mar 2021 04:02:02 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 28D10E08C8;
	Mon, 22 Mar 2021 04:02:01 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 89309E08C8
	for <gentoo-commits@lists.gentoo.org>; Mon, 22 Mar 2021 04:02:00 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id EA033335CD2
	for <gentoo-commits@lists.gentoo.org>; Mon, 22 Mar 2021 04:01:58 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 387A1478
	for <gentoo-commits@lists.gentoo.org>; Mon, 22 Mar 2021 04:01:57 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1616385628.8b5133c451fba89337cf87bea32a1aec61184b32.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/nss_ldap/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-auth/nss_ldap/nss_ldap-265-r6.ebuild
X-VCS-Directories: sys-auth/nss_ldap/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 8b5133c451fba89337cf87bea32a1aec61184b32
X-VCS-Branch: master
Date: Mon, 22 Mar 2021 04:01:57 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d8160cbe-eaef-4fbc-99d1-04ed8c8fbbd9
X-Archives-Hash: bf1141002be59e76b617fd05c1566c04

commit:     8b5133c451fba89337cf87bea32a1aec61184b32
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 22 04:00:24 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 22 04:00:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b5133c4

sys-auth/nss_ldap: update EAPI 5 -> 7

* Port to EAPI 7
* Drop unused inherits (multilib)
* Use consistent ${EPREFIX}/usr/$(get_libdir) for both multilib native
  and non-native
* Tidy src_configure logic using array
* Sort inherits
* Add missing || dies

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-auth/nss_ldap/nss_ldap-265-r6.ebuild | 147 +++++++++++++++++++++++++++++++
 1 file changed, 147 insertions(+)

diff --git a/sys-auth/nss_ldap/nss_ldap-265-r6.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r6.ebuild
new file mode 100644
index 00000000000..b5c7180427c
--- /dev/null
+++ b/sys-auth/nss_ldap/nss_ldap-265-r6.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fixheadtails multilib-minimal prefix
+
+DESCRIPTION="NSS LDAP Module"
+HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
+SRC_URI="http://www.padl.com/download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="debug ssl sasl kerberos"
+
+DEPEND="
+	>=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}]
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${DEPEND}
+	!<net-fs/autofs-4.1.3
+"
+
+src_prepare() {
+	default
+
+	# Patch is for Prefix
+	# eprefixify is safe on non-Prefix systems, so go unconditional
+	# Note: comment this out or make it conditional on 'use prefix'
+	# if needs rebasing. Don't remove.
+	eapply "${FILESDIR}"/${P}-installdir.patch
+	eprefixify Makefile.am
+
+	# bug 438692
+	eapply -p0 "${FILESDIR}"/${P}-pthread.patch
+
+	eapply -p0 "${FILESDIR}"/nsswitch.ldap.diff
+
+	# Applied by upstream
+	#eapply "${FILESDIR}"/${PN}-239-tls-security-bug.patch
+
+	eapply -p0 "${FILESDIR}"/${PN}-249-sasl-compile.patch
+
+	eapply "${FILESDIR}"/${PN}-265-reconnect-timeouts.patch
+
+	# Applied by upstream
+	#eapply "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
+
+	eapply "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
+
+	sed -i.orig \
+		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
+		"${S}"/ldap.conf \
+		|| die
+
+	# Fix head/tail stuff
+	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
+
+	# Fix build borkage
+	local i
+	for i in Makefile.{in,am}; do
+		sed -i.orig \
+			-e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
+			"${S}"/$i || die
+	done
+
+	eapply "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
+
+	# Bug #214750, no automagic deps
+	eapply "${FILESDIR}"/${PN}-264-disable-automagic.patch
+
+	# Upstream forgets the version number sometimes
+	#sed -i \
+	#	-e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
+	#	"${S}"/configure.in || die
+
+	# Include an SONAME
+	eapply "${FILESDIR}"/${PN}-254-soname.patch
+
+	# Fix broken oneshot connections
+	eapply "${FILESDIR}/nss_ldap-265-missing-entries-oneshot.patch"
+
+	sed -i \
+		-e 's, vers_string , PERL5LIB="@top_srcdir@" @top_srcdir@/vers_string ,g' \
+		"${S}"/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# --enable-schema-mapping
+		--with-ldap-lib=openldap
+		--with-ldap-conf-file="${EPREFIX}/etc/ldap.conf"
+		--enable-paged-results
+		--enable-rfc2307bis
+		$(use_enable ssl)
+		$(use_enable sasl)
+		$(use_enable kerberos krb)
+	)
+
+	use debug && myconf+=( --enable-debugging )
+	use kerberos && myconf+=( --enable-configurable-krb5-ccname-gssapi )
+
+	# Note: this was "${EPREFIX}/$(get_libdir)" while the 32-bit ABI ended
+	# up in /usr/lib. Intentional...?
+	multilib_is_native_abi && myconf+=( --libdir="${EPREFIX}/usr/$(get_libdir)" )
+
+	ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	emake -j1 DESTDIR="${D}" \
+		INST_UID=${PORTAGE_USER:-root} \
+		INST_GID=${PORTAGE_GROUP:-root} \
+		install
+}
+
+multilib_src_install_all() {
+	# Dumb /usr/lib* -> /lib* symlinks gone wrong
+	rm -rf "${ED}"/usr/usr || die
+
+	insinto /etc
+	doins ldap.conf
+
+	# Append two blank lines and some skip entries
+	echo >>"${ED}"/etc/ldap.conf || die
+	echo >>"${ED}"/etc/ldap.conf || die
+	sed -i "${ED}"/etc/ldap.conf \
+		-e '$inss_initgroups_ignoreusers ldap,openldap,mysql,syslog,root,postgres' \
+		|| die
+
+	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
+		CVSVersionInfo.txt README nsswitch.ldap certutil
+
+	docinto docs
+	dodoc doc/*
+}
+
+pkg_postinst() {
+	elog "If you use a ldaps:// string in the 'uri' setting of"
+	elog "your /etc/ldap.conf, you must set 'ssl on'!"
+}