From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 002A0139487 for ; Wed, 14 Nov 2018 07:06:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7E55E099F; Wed, 14 Nov 2018 07:06:38 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 654D5E099F for ; Wed, 14 Nov 2018 07:06:36 +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 C5A8F335C39 for ; Wed, 14 Nov 2018 07:06:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22D4445A for ; Wed, 14 Nov 2018 07:06:33 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1542179189.5d2eef62c1e6dea87e974fdf99667914ec6a1807.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/ssh-ldap-pubkey/metadata.xml sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild X-VCS-Directories: sys-auth/ssh-ldap-pubkey/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 5d2eef62c1e6dea87e974fdf99667914ec6a1807 X-VCS-Branch: master Date: Wed, 14 Nov 2018 07:06:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 94e56879-a5bc-4e7c-bb1a-239692f5dae6 X-Archives-Hash: 53267ac5651ce6ad82af363d0278e5e1 commit: 5d2eef62c1e6dea87e974fdf99667914ec6a1807 Author: Robin H. Johnson gentoo org> AuthorDate: Wed Nov 14 07:03:52 2018 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Wed Nov 14 07:06:29 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2eef62 sys-auth/ssh-ldap-pubkey: selectively install LPK schema file The LPK schema file is only needed on LDAP servers, and otherwise causes this package to block the OpenSSH upgrade everywhere. By making it optional and not enabled by default, the OpenSSH upgrade is much smoother. Signed-off-by: Robin H. Johnson gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.10 sys-auth/ssh-ldap-pubkey/metadata.xml | 3 +++ sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild | 10 ++++++---- sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild | 12 +++++++----- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/sys-auth/ssh-ldap-pubkey/metadata.xml b/sys-auth/ssh-ldap-pubkey/metadata.xml index 798419df911..d01451ddfcc 100644 --- a/sys-auth/ssh-ldap-pubkey/metadata.xml +++ b/sys-auth/ssh-ldap-pubkey/metadata.xml @@ -9,4 +9,7 @@ https://github.com/jirutka/ssh-ldap-pubkey/issues jirutka/ssh-ldap-pubkey + + Install a copy of the LPK schema, only needed on LDAP servers. + diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild index 628ee8f4f19..33d171a2c2b 100644 --- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild +++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild @@ -20,7 +20,7 @@ fi LICENSE="MIT" SLOT="0" -IUSE="test" +IUSE="schema test" RESTRICT="!test? ( test )" MY_CDEPEND=" @@ -40,7 +40,7 @@ DEPEND=" # We need to block previous net-misc/openssh packages # to avoid file collision on "/etc/openldap/schema/openssh-lpk.schema" RDEPEND="${MY_CDEPEND} - !net-misc/openssh[ldap]" + schema? ( !net-misc/openssh[ldap] )" DOCS=( README.md CHANGELOG.adoc ) @@ -56,8 +56,10 @@ python_test() { python_install_all() { distutils-r1_python_install_all - insinto /etc/openldap/schema - doins etc/openssh-lpk.schema + if use schema; then + insinto /etc/openldap/schema + doins etc/openssh-lpk.schema + fi local MY_DOCDIR="/usr/share/doc/${PF}/examples" insinto "${MY_DOCDIR}" diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild index 1c422cf550f..7d04c5fd300 100644 --- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild +++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -20,7 +20,7 @@ fi LICENSE="MIT" SLOT="0" -IUSE="test" +IUSE="schema test" RESTRICT="!test? ( test )" MY_CDEPEND=" @@ -40,7 +40,7 @@ DEPEND=" # We need to block previous net-misc/openssh packages # to avoid file collision on "/etc/openldap/schema/openssh-lpk.schema" RDEPEND="${MY_CDEPEND} - !net-misc/openssh[ldap]" + schema? ( !net-misc/openssh[ldap] )" DOCS=( README.md CHANGELOG.adoc ) @@ -51,8 +51,10 @@ python_test() { python_install_all() { distutils-r1_python_install_all - insinto /etc/openldap/schema - doins etc/openssh-lpk.schema + if use schema; then + insinto /etc/openldap/schema + doins etc/openssh-lpk.schema + fi local MY_DOCDIR="/usr/share/doc/${PF}/examples" insinto "${MY_DOCDIR}"