commit: 1c8e77c5a1069626ffce882f0e7555820818fffd
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 17:39:24 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 17:39:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c8e77c5
net-misc/dropbear: install pam files conditionally
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
...020.80-r1.ebuild => dropbear-2020.80-r2.ebuild} | 6 +-
...020.81-r1.ebuild => dropbear-2020.81-r2.ebuild} | 4 +-
net-misc/dropbear/dropbear-2020.81.ebuild | 111 ---------------------
3 files changed, 7 insertions(+), 114 deletions(-)
diff --git a/net-misc/dropbear/dropbear-2020.80-r1.ebuild
b/net-misc/dropbear/dropbear-2020.80-r2.ebuild
similarity index 95%
rename from net-misc/dropbear/dropbear-2020.80-r1.ebuild
rename to net-misc/dropbear/dropbear-2020.80-r2.ebuild
index 88a15ff55ba..8ae9dcf0279 100644
--- a/net-misc/dropbear/dropbear-2020.80-r1.ebuild
+++ b/net-misc/dropbear/dropbear-2020.80-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -106,5 +106,7 @@ src_install() {
mv "${ED}"/usr/bin/{,db}scp || die
fi
- pamd_mimic system-remote-login dropbear auth account password session
+ if use pam; then
+ pamd_mimic system-remote-login dropbear auth account password
session
+ fi
}
diff --git a/net-misc/dropbear/dropbear-2020.81-r1.ebuild
b/net-misc/dropbear/dropbear-2020.81-r2.ebuild
similarity index 96%
rename from net-misc/dropbear/dropbear-2020.81-r1.ebuild
rename to net-misc/dropbear/dropbear-2020.81-r2.ebuild
index b52672266a0..2ff85973af9 100644
--- a/net-misc/dropbear/dropbear-2020.81-r1.ebuild
+++ b/net-misc/dropbear/dropbear-2020.81-r2.ebuild
@@ -118,5 +118,7 @@ src_install() {
mv "${ED}"/usr/bin/{,db}scp || die
fi
- pamd_mimic system-remote-login dropbear auth account password session
+ if use pam; then
+ pamd_mimic system-remote-login dropbear auth account password
session
+ fi
}
diff --git a/net-misc/dropbear/dropbear-2020.81.ebuild
b/net-misc/dropbear/dropbear-2020.81.ebuild
deleted file mode 100644
index 1224921683b..00000000000
--- a/net-misc/dropbear/dropbear-2020.81.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit savedconfig pam
-
-DESCRIPTION="small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html";
-SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
- https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2";
-
-LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
-
-LIB_DEPEND="
- zlib? ( sys-libs/zlib[static-libs(+)] )
- >=dev-libs/libtommath-1.2.0[static-libs(+)]
-"
-RDEPEND="
- acct-group/sshd
- acct-user/sshd
- !static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- pam? ( sys-libs/pam )
-"
-DEPEND="
- ${RDEPEND}
- static? ( ${LIB_DEPEND} )
-"
-RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
-
-REQUIRED_USE="pam? ( !static )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.46-dbscp.patch
-)
-
-set_options() {
- progs=(
- dropbear dbclient dropbearkey
- $(usex minimal "" "dropbearconvert scp")
- )
- makeopts=(
- MULTI=$(usex multicall 1 0)
- )
-}
-
-src_prepare() {
- default
- sed \
- -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
- default_options.h > localoptions.h || die
- sed \
- -e '/pam_start/s:sshd:dropbear:' \
- -i svr-authpam.c || die
- restore_config localoptions.h
-}
-
-src_configure() {
- # XXX: Need to add libtomcrypt to the tree and re-enable this.
- # --disable-bundled-libtom
- # We disable the hardening flags as our compiler already enables them
- # by default as is appropriate for the target.
- local myeconfargs=(
- --disable-harden
- --enable-bundled-libtom
- $(use_enable zlib)
- $(use_enable pam)
- $(use_enable !bsdpty openpty)
- $(use_enable shadow)
- $(use_enable static)
- $(use_enable syslog)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- set_options
- emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
-}
-
-src_install() {
- set_options
- emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
- doman *.8
- newinitd "${FILESDIR}"/dropbear.init.d dropbear
- newconfd "${FILESDIR}"/dropbear.conf.d dropbear
- dodoc CHANGES README SMALL MULTI
-
- # The multi install target does not install the links right.
- if use multicall ; then
- cd "${ED}"/usr/bin || die
- local x
- for x in "${progs[@]}" ; do
- ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti
to ${x} failed"
- done
- rm -f dropbear
- dodir /usr/sbin
- dosym ../bin/dropbearmulti /usr/sbin/dropbear
- cd "${S}" || die
- fi
- save_config localoptions.h
-
- if ! use minimal ; then
- mv "${ED}"/usr/bin/{,db}scp || die
- fi
-
- pamd_mimic system-remote-login dropbear auth account password session
-}
