* [gentoo-commits] repo/gentoo:master commit in: net-misc/dropbear/, net-misc/dropbear/files/
@ 2015-08-09 12:56 Mike Frysinger
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger @ 2015-08-09 12:56 UTC (permalink / raw
To: gentoo-commits
commit: ceef36bd30b9f9ac1e58450fc434344fb964fd95
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 9 08:34:29 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Aug 9 12:56:21 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceef36bd
dropbear: drop old ebuilds
Package-Manager: portage-2.2.20
net-misc/dropbear/Manifest | 4 -
net-misc/dropbear/dropbear-2013.60.ebuild | 103 ---------------------
net-misc/dropbear/dropbear-2013.62.ebuild | 103 ---------------------
net-misc/dropbear/dropbear-2014.63.ebuild | 101 --------------------
net-misc/dropbear/dropbear-2014.65.ebuild | 99 --------------------
.../files/dropbear-2013.62-multi-install-man.patch | 13 ---
.../files/dropbear-2013.62-multi-no-relink.patch | 20 ----
7 files changed, 443 deletions(-)
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index a736b37..7f98dcb 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -1,7 +1,3 @@
-DIST dropbear-2013.60.tar.bz2 1584837 SHA256 4c0c52453b4dd96ef79e5968ed3676de008ee0cf133632acae12bbad588681bb SHA512 2d9c374f17eef22a783d5fef9f30ee2fcbb8778ff7319bb028d8f6181f49827867e3b7f02eec580cbd48f2d97cad789a541c1fbe43fe3d23f6cb396d4138d712 WHIRLPOOL 901beb6fb1e09295aaeb32f9032a653cdeb87e69758f3b598af15f358605e77e24ceea99a418245e86ce665fef1d3a8da38d99105310fa4376586e60f41cb5d8
-DIST dropbear-2013.62.tar.bz2 1598084 SHA256 c6656302bbcc54b0a9c361f505822f6994039117ec32d2897ead3364da079ffa SHA512 8811eae921333bbb242227c52d057a01d0536bf47d37b553834a2cd4730ab1693460a7b4eacfafc8a2c20cc1ac6a4b8c5cdb735e9dd069f9499e4144767fe37b WHIRLPOOL d0b8a95bea6435cbdba86b985229e84a30b36aa7f9b871dac6e2a2eed878ce00799cc59d8ba9c6476a3173bd3ac851dc0314fe4315a464367a56c61f43b3eea1
-DIST dropbear-2014.63.tar.bz2 1598479 SHA256 595992de432ba586a0e7e191bbb1ad587727678bb3e345b018c395b8c55b57ae SHA512 19eccfc59b239b08c6e7d81707a9194ff43aaa6dcc7b572d149175deae74ce9a08bbd73ce5faab8124b3e6e28c33e4fa0d8eca11414b5ac97850c857c17e9323 WHIRLPOOL 0918dbfd61317021c2a9eb7d4cf1deafbae108da3775cac7606ecf7ba2e89db9bbea5888d6fa8496fbffa0ad1ee9a0763ace5ad75d32cf15aeffa555e1393ac2
-DIST dropbear-2014.65.tar.bz2 1604532 SHA256 e20057aa7db0f9ea4efdcbfc6fc6b73a648b47b6ab6a01659472142b06f5f56c SHA512 21ad2568d3ad369b55d8e04b86467fb204c775fe1fd8bfd5a310557e83bbb562db9041bd79a20edbaa1c6b8658a5d41fd54d87476f5e2d7bcf54ebc28615b878 WHIRLPOOL 4c0c3107a64fab185da2139d65ca5a85e687a05527e3ee3d64de63bbac947f3655fae222d895177a73467ce8bebc6dd2aa2d651267e1a6c80c7db8f839378692
DIST dropbear-2014.66.tar.bz2 1604981 SHA256 ab3fe2670a517cc0bbe398ff5d15e9ca12cd14f2fc18930a8111ae2baa64ab76 SHA512 3005f754ad97e5eb84221740577f4dd962e38f38b3f6ba84dbb0811a7a35d487069c35b30055e129541c224769fe0a7e594084a9b0f1cc667029ad43d4988149 WHIRLPOOL c077328bf5c21faa655f3a2e6fe1aa775b046eec7cf0f527a86c0ec01b62ab9c6ae3530fcdf49db19be8208ea22f8cd198cd3ab6a5eb605a55daf0bf0c40e4ff
DIST dropbear-2015.67.tar.bz2 1606312 SHA256 7e690594645dfde5787065c78a5d2e4d15e288babfa06e140197ce05f698c8e5 SHA512 6a23f7dbe8ccd39683488a16ce4db39cdba529e9d302165742eb818d3cf520a3793660ff6c8ce0520ddb87dcac726ff34ed3dbcb7efa83115deafad2c6c0a5f3 WHIRLPOOL c1103be19c86a0b40ca262715646244911032e97aba52279be1f7a0382367554c34455497b604dacacb69da0873fd26d3d457abeb7d265e6ca6bdff8938dc065
DIST dropbear-2015.68.tar.bz2 1611161 SHA256 55ea7c1e904ffe4b1cdbe1addca8291a2533d7d285fd22ac33608e9502a62446 SHA512 7725cd4077a3968684db3646f6013c6202977e79d281619e029366e45fca9c4e33e271812626237b6e33938eeb4c8b260902fe2b57cff085086bf930713a934a WHIRLPOOL a80d3907528b0d754f1a474846794ac9ba48003bbb723164c7db84c9b46263b47631712b15e29b863e64ad924d889976250e8af98b2b1ca91fb586ff0a1d4186
diff --git a/net-misc/dropbear/dropbear-2013.60.ebuild b/net-misc/dropbear/dropbear-2013.60.ebuild
deleted file mode 100644
index a45873d..0000000
--- a/net-misc/dropbear/dropbear-2013.60.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils savedconfig pam user
-
-DESCRIPTION="small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
- http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="bsdpty minimal multicall pam +shadow static syslog zlib"
-
-LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
- dev-libs/libtommath[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
-
-REQUIRED_USE="pam? ( !static )"
-
-set_options() {
- progs=(
- dropbear dbclient dropbearkey
- $(usex minimal "" "dropbearconvert scp")
- )
- makeopts=(
- MULTI=$(usex multicall 1 0)
- STATIC=$(usex static 1 0)
- )
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
- epatch "${FILESDIR}"/${PN}-2013.62-multi-install-man.patch
- epatch "${FILESDIR}"/${PN}-2013.62-multi-no-relink.patch
- sed -i '1i#define _GNU_SOURCE' scpmisc.c || die
- sed -i \
- -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
- -e '/XAUTH_COMMAND/s:/X11R6/:/:' \
- options.h || die
- sed -i \
- -e '/pam_start/s:sshd:dropbear:' \
- svr-authpam.c || die
- restore_config options.h
-}
-
-src_configure() {
- # XXX: Need to add libtomcrypt to the tree and re-enable this.
- # --disable-bundled-libtom
- econf \
- $(use_enable zlib) \
- $(use_enable pam) \
- $(use_enable !bsdpty openpty) \
- $(use_enable shadow) \
- $(use_enable syslog)
-}
-
-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 TODO SMALL MULTI
-
- # The multi install target does not install the links right.
- if use multicall ; then
- cd "${ED}"/usr/bin
- 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}"
- fi
- save_config options.h
-
- if ! use minimal ; then
- mv "${ED}"/usr/bin/{,db}scp || die
- fi
-
- pamd_mimic system-remote-login dropbear auth account password session
-}
-
-pkg_preinst() {
- enewgroup sshd 22
- enewuser sshd 22 -1 /var/empty sshd
-}
diff --git a/net-misc/dropbear/dropbear-2013.62.ebuild b/net-misc/dropbear/dropbear-2013.62.ebuild
deleted file mode 100644
index bcb7ea8..0000000
--- a/net-misc/dropbear/dropbear-2013.62.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils savedconfig pam user
-
-DESCRIPTION="small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
- http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="bsdpty minimal multicall pam +shadow static syslog zlib"
-
-LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
- dev-libs/libtommath[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
-
-REQUIRED_USE="pam? ( !static )"
-
-set_options() {
- progs=(
- dropbear dbclient dropbearkey
- $(usex minimal "" "dropbearconvert scp")
- )
- makeopts=(
- MULTI=$(usex multicall 1 0)
- STATIC=$(usex static 1 0)
- )
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
- epatch "${FILESDIR}"/${PN}-2013.62-multi-install-man.patch
- epatch "${FILESDIR}"/${PN}-2013.62-multi-no-relink.patch
- sed -i '1i#define _GNU_SOURCE' scpmisc.c || die
- sed -i \
- -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
- -e '/XAUTH_COMMAND/s:/X11R6/:/:' \
- options.h || die
- sed -i \
- -e '/pam_start/s:sshd:dropbear:' \
- svr-authpam.c || die
- restore_config options.h
-}
-
-src_configure() {
- # XXX: Need to add libtomcrypt to the tree and re-enable this.
- # --disable-bundled-libtom
- econf \
- $(use_enable zlib) \
- $(use_enable pam) \
- $(use_enable !bsdpty openpty) \
- $(use_enable shadow) \
- $(use_enable syslog)
-}
-
-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 TODO SMALL MULTI
-
- # The multi install target does not install the links right.
- if use multicall ; then
- cd "${ED}"/usr/bin
- 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}"
- fi
- save_config options.h
-
- if ! use minimal ; then
- mv "${ED}"/usr/bin/{,db}scp || die
- fi
-
- pamd_mimic system-remote-login dropbear auth account password session
-}
-
-pkg_preinst() {
- enewgroup sshd 22
- enewuser sshd 22 -1 /var/empty sshd
-}
diff --git a/net-misc/dropbear/dropbear-2014.63.ebuild b/net-misc/dropbear/dropbear-2014.63.ebuild
deleted file mode 100644
index 73771a1..0000000
--- a/net-misc/dropbear/dropbear-2014.63.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils savedconfig pam user
-
-DESCRIPTION="small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
- http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="bsdpty minimal multicall pam +shadow static syslog zlib"
-
-LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
- dev-libs/libtommath[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
-
-REQUIRED_USE="pam? ( !static )"
-
-set_options() {
- progs=(
- dropbear dbclient dropbearkey
- $(usex minimal "" "dropbearconvert scp")
- )
- makeopts=(
- MULTI=$(usex multicall 1 0)
- STATIC=$(usex static 1 0)
- )
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
-# sed -i '1i#define _GNU_SOURCE' scpmisc.c || die
- sed -i \
- -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
- -e '/XAUTH_COMMAND/s:/X11R6/:/:' \
- options.h || die
- sed -i \
- -e '/pam_start/s:sshd:dropbear:' \
- svr-authpam.c || die
- restore_config options.h
-}
-
-src_configure() {
- # XXX: Need to add libtomcrypt to the tree and re-enable this.
- # --disable-bundled-libtom
- econf \
- $(use_enable zlib) \
- $(use_enable pam) \
- $(use_enable !bsdpty openpty) \
- $(use_enable shadow) \
- $(use_enable syslog)
-}
-
-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 TODO SMALL MULTI
-
- # The multi install target does not install the links right.
- if use multicall ; then
- cd "${ED}"/usr/bin
- 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}"
- fi
- save_config options.h
-
- if ! use minimal ; then
- mv "${ED}"/usr/bin/{,db}scp || die
- fi
-
- pamd_mimic system-remote-login dropbear auth account password session
-}
-
-pkg_preinst() {
- enewgroup sshd 22
- enewuser sshd 22 -1 /var/empty sshd
-}
diff --git a/net-misc/dropbear/dropbear-2014.65.ebuild b/net-misc/dropbear/dropbear-2014.65.ebuild
deleted file mode 100644
index 15508f3..0000000
--- a/net-misc/dropbear/dropbear-2014.65.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils savedconfig pam user
-
-DESCRIPTION="small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
- http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="bsdpty minimal multicall pam +shadow static syslog zlib"
-
-LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
- dev-libs/libtommath[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
-
-REQUIRED_USE="pam? ( !static )"
-
-set_options() {
- progs=(
- dropbear dbclient dropbearkey
- $(usex minimal "" "dropbearconvert scp")
- )
- makeopts=(
- MULTI=$(usex multicall 1 0)
- STATIC=$(usex static 1 0)
- )
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
- sed -i \
- -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
- options.h || die
- sed -i \
- -e '/pam_start/s:sshd:dropbear:' \
- svr-authpam.c || die
- restore_config options.h
-}
-
-src_configure() {
- # XXX: Need to add libtomcrypt to the tree and re-enable this.
- # --disable-bundled-libtom
- econf \
- $(use_enable zlib) \
- $(use_enable pam) \
- $(use_enable !bsdpty openpty) \
- $(use_enable shadow) \
- $(use_enable syslog)
-}
-
-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 TODO SMALL MULTI
-
- # The multi install target does not install the links right.
- if use multicall ; then
- cd "${ED}"/usr/bin
- 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}"
- fi
- save_config options.h
-
- if ! use minimal ; then
- mv "${ED}"/usr/bin/{,db}scp || die
- fi
-
- pamd_mimic system-remote-login dropbear auth account password session
-}
-
-pkg_preinst() {
- enewgroup sshd 22
- enewuser sshd 22 -1 /var/empty sshd
-}
diff --git a/net-misc/dropbear/files/dropbear-2013.62-multi-install-man.patch b/net-misc/dropbear/files/dropbear-2013.62-multi-install-man.patch
deleted file mode 100644
index efaeb87..0000000
--- a/net-misc/dropbear/files/dropbear-2013.62-multi-install-man.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-only install man pages that exist as things like scp.1 do not
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -136,7 +136,7 @@ insmulti%: dropbearmulti
- -rm -f $(DESTDIR)$(bindir)/$*$(EXEEXT)
- -ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir)/$*$(EXEEXT)
- $(INSTALL) -d $(DESTDIR)$(mandir)/man1
-- $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1
-+ if test -e $*.1; then $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1; fi
-
- # dropbear should go in sbin, so it needs a seperate rule
- inst_dropbear: dropbear
diff --git a/net-misc/dropbear/files/dropbear-2013.62-multi-no-relink.patch b/net-misc/dropbear/files/dropbear-2013.62-multi-no-relink.patch
deleted file mode 100644
index cd12a96..0000000
--- a/net-misc/dropbear/files/dropbear-2013.62-multi-no-relink.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-turn dropbearmulti into a real target so we don't constantly re-link it
-
-otherwise make has no idea what "multibinary" is and so always re-links it
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -175,10 +175,10 @@ ifeq ($(MULTI),1)
- CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI
- endif
-
--dropbearmulti: multilink
-+dropbearmulti$(EXEEXT): $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile
-+ $(CC) $(LDFLAGS) -o $@ $(MULTIOBJS) $(LIBS)
-
--multibinary: $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile
-- $(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS)
-+multibinary: dropbearmulti$(EXEEXT)
-
- multilink: multibinary $(addprefix link, $(PROGRAMS))
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dropbear/, net-misc/dropbear/files/
@ 2022-11-15 9:07 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-11-15 9:07 UTC (permalink / raw
To: gentoo-commits
commit: 8628153ddde353e830573c4569c99f9c23ea6eb1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 09:02:53 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 09:05:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8628153d
net-misc/dropbear: work towards fixing tests
Restrict for now as they end up wanting interactive input.
Closes: https://bugs.gentoo.org/836990
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dropbear/dropbear-2022.82.ebuild | 36 ++++++++++++++++++++--
.../dropbear/files/dropbear-2022.82-tests.patch | 25 +++++++++++++++
2 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/net-misc/dropbear/dropbear-2022.82.ebuild b/net-misc/dropbear/dropbear-2022.82.ebuild
index 2538b0bcfa84..e9746bf468b8 100644
--- a/net-misc/dropbear/dropbear-2022.82.ebuild
+++ b/net-misc/dropbear/dropbear-2022.82.ebuild
@@ -3,8 +3,9 @@
EAPI=7
+PYTHON_COMPAT=( python3_{8..11} )
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/dropbear.asc
-inherit savedconfig pam verify-sig
+inherit savedconfig pam python-any-r1 verify-sig
DESCRIPTION="Small SSH 2 client/server designed for small memory environments"
HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
@@ -18,7 +19,8 @@ SRC_URI+=" verify-sig? (
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"
+IUSE="bsdpty minimal multicall pam +shadow static +syslog test zlib"
+RESTRICT="!test? ( test ) test"
LIB_DEPEND="
virtual/libcrypt[static-libs(+)]
@@ -39,13 +41,28 @@ DEPEND="
static? ( ${LIB_DEPEND} )
"
RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-dropbear )"
+BDEPEND="
+ test? (
+ $(python_gen_any_dep '
+ dev-python/attrs[${PYTHON_USEDEP}]
+ dev-python/iniconfig[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/pluggy[${PYTHON_USEDEP}]
+ dev-python/py[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ ')
+ )
+ verify-sig? ( sec-keys/openpgp-keys-dropbear )
+"
REQUIRED_USE="pam? ( !static )"
PATCHES=(
"${FILESDIR}"/${PN}-0.46-dbscp.patch
"${FILESDIR}"/${PN}-2022.82-x11.patch
+ "${FILESDIR}"/${PN}-2022.82-tests.patch
)
set_options() {
@@ -58,7 +75,20 @@ set_options() {
)
}
+python_check_deps() {
+ python_has_version "dev-python/attrs[${PYTHON_USEDEP}]" && \
+ python_has_version "dev-python/iniconfig[${PYTHON_USEDEP}]" && \
+ python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" && \
+ python_has_version "dev-python/pluggy[${PYTHON_USEDEP}]" && \
+ python_has_version "dev-python/py[${PYTHON_USEDEP}]" && \
+ python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" && \
+ python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \
+ python_has_version "dev-python/psutil[${PYTHON_USEDEP}]"
+}
+
pkg_setup() {
+ use test && python-any-r1_pkg_setup
+
if use static ; then
ewarn "Using bundled copies of libtommath and libtomcrypt"
fi
diff --git a/net-misc/dropbear/files/dropbear-2022.82-tests.patch b/net-misc/dropbear/files/dropbear-2022.82-tests.patch
new file mode 100644
index 000000000000..6619e6c07551
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-2022.82-tests.patch
@@ -0,0 +1,25 @@
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -4,18 +4,13 @@ SHELL=bash
+
+ all: test
+
+-test: venv/bin/pytest fakekey
+- (source ./venv/bin/activate; pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) )
++test: fakekey
++ pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir)
+
+-one: venv/bin/pytest fakekey
+- (source ./venv/bin/activate; pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) -k exit)
++one: fakekey
++ pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) -k exit
+
+ fakekey:
+ ../dropbearkey -t ecdsa -f $@
+
+-venv/bin/pytest: $(srcdir)/requirements.txt
+- python3 -m venv init venv
+- ./venv/bin/pip install --upgrade pip
+- ./venv/bin/pip install -r $(srcdir)/requirements.txt
+-
+ .PHONY: test
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dropbear/, net-misc/dropbear/files/
@ 2024-04-06 17:51 Viorel Munteanu
0 siblings, 0 replies; 3+ messages in thread
From: Viorel Munteanu @ 2024-04-06 17:51 UTC (permalink / raw
To: gentoo-commits
commit: a8fa1aff3bcbb91cbdee0344a251f44110376747
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 6 17:47:56 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Apr 6 17:50:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8fa1aff
net-misc/dropbear: fix client-server tests
Use sys-libs/nss_wrapper to fake home dir for dropbear server.
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
net-misc/dropbear/dropbear-2024.84.ebuild | 4 ++-
.../dropbear-2024.84-fix-channels-tests.patch | 36 ++++++++++++++++++++++
2 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/net-misc/dropbear/dropbear-2024.84.ebuild b/net-misc/dropbear/dropbear-2024.84.ebuild
index 68f1c4674d72..83d23fbcf782 100644
--- a/net-misc/dropbear/dropbear-2024.84.ebuild
+++ b/net-misc/dropbear/dropbear-2024.84.ebuild
@@ -43,6 +43,7 @@ DEPEND="
RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
BDEPEND="
test? (
+ sys-libs/nss_wrapper
$(python_gen_any_dep '
dev-python/attrs[${PYTHON_USEDEP}]
dev-python/iniconfig[${PYTHON_USEDEP}]
@@ -63,6 +64,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2024.84-dbscp.patch
"${FILESDIR}"/${PN}-2022.82-tests.patch
"${FILESDIR}"/${PN}-2024.84-non-interactive-tests.patch
+ "${FILESDIR}"/${PN}-2024.84-fix-channels-tests.patch
)
set_options() {
@@ -106,7 +108,7 @@ src_prepare() {
restore_config localoptions.h
# remove tests that fail
- rm test/test_aslr.py test/test_channels.py || die
+ rm test/test_aslr.py || die
# dropbearconver is not build with USE minimal
if use minimal; then
diff --git a/net-misc/dropbear/files/dropbear-2024.84-fix-channels-tests.patch b/net-misc/dropbear/files/dropbear-2024.84-fix-channels-tests.patch
new file mode 100644
index 000000000000..0db292da8332
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-2024.84-fix-channels-tests.patch
@@ -0,0 +1,36 @@
+dbclient obeys $HOME, but dropbear (the server) resolves HOME using getpwnam.
+Use sys-libs/nss_wrapper to fake it during tests.
+
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -4,7 +4,15 @@ SHELL=bash
+
+ all: test
+
++uid:=$(shell id -u)
++gid:=$(shell id -g)
+ test: fakekey
++ mkdir -p ~/.ssh
++ ../dropbearkey -t ecdsa -f ~/.ssh/id_dropbear
++ ../dropbearkey -y -f ~/.ssh/id_dropbear | grep ^ecdsa > ~/.ssh/authorized_keys
++ echo "$(LOGNAME)::$(uid):$(gid):$(USER):$(HOME):/bin/bash" >> ~/passwd
++ echo "$(LOGNAME)::$(gid):" >> ~/group
++ chmod 0700 ~ ~/.ssh ~/.ssh/authorized_keys ~/passwd ~/group
+ pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir)
+
+ one: fakekey
+--- a/test/test_dropbear.py
++++ b/test/test_dropbear.py
+@@ -27,7 +27,11 @@ def dropbear(request):
+ ]
+ print("subprocess args: ", args)
+
+- p = subprocess.Popen(args, stderr=subprocess.PIPE, text=True)
++ env = os.environ
++ env['LD_PRELOAD'] = 'libnss_wrapper.so'
++ env['NSS_WRAPPER_PASSWD'] = env['HOME'] + '/passwd'
++ env['NSS_WRAPPER_GROUP'] = env['HOME'] + '/group'
++ p = subprocess.Popen(args, stderr=subprocess.PIPE, text=True, env=env)
+ # Wait until it has started listening
+ for l in p.stderr:
+ if "Not backgrounding" in l:
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-04-06 17:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-15 9:07 [gentoo-commits] repo/gentoo:master commit in: net-misc/dropbear/, net-misc/dropbear/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-04-06 17:51 Viorel Munteanu
2015-08-09 12:56 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox