Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/dropbear/
Date: Wed, 01 Apr 2020 19:19:19
Message-Id: 1585768746.e95328af49490a2ec8eb58b4a79e0dd154ce18e3.whissi@gentoo
1 commit: e95328af49490a2ec8eb58b4a79e0dd154ce18e3
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 1 19:18:53 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 1 19:19:06 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e95328af
7
8 net-misc/dropbear: security cleanup (bug #713102)
9
10 Bug: https://bugs.gentoo.org/713102
11 Package-Manager: Portage-2.3.96, Repoman-2.3.22
12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
13
14 net-misc/dropbear/Manifest | 2 -
15 net-misc/dropbear/dropbear-2017.75.ebuild | 98 -----------------------------
16 net-misc/dropbear/dropbear-2018.76.ebuild | 101 ------------------------------
17 3 files changed, 201 deletions(-)
18
19 diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
20 index bd290b6381e..b40fc58dbf5 100644
21 --- a/net-misc/dropbear/Manifest
22 +++ b/net-misc/dropbear/Manifest
23 @@ -1,3 +1 @@
24 -DIST dropbear-2017.75.tar.bz2 1623392 BLAKE2B c024037d3ebcb3f16aed2a5f24e07c06699a510b327a0ea528db7160ad2a8e554af2a233a266f869e0e30c78f3b0b7792a817d9c07f058f605dbf2dc749a4fda SHA512 9c2f2a5e718339f83abc0ad7719bda12bfc75e5bcb87a7c0eec0afefc743e5c0a1575d290d5fde152ff2100b0f0e6fd5ef4431f7bbcb5ca9a332d93c20f5a8f4
25 -DIST dropbear-2018.76.tar.bz2 2688697 BLAKE2B 1c22d38487e94427b2678d070f8d370eb09bb2d69253fd6f76d8d80fd637ff86a44b00ab42e1f6d84042c72cbcbd4bb6cbb415f961502e0437c7c8c1b812f059 SHA512 82323279f7e78c366ba1ea07ff242259132b2576122429f54326518dd6092aba8ae5de4a0b8a3cef7efc3507015741abe2ac23376c03b40b247527da7a88120e
26 DIST dropbear-2019.78.tar.bz2 2708659 BLAKE2B 212b173cfea8655b43a8d93422dd4d3e0d669a67681cb17d6494b6083e6e4c58d21d52850c0cdf414617ee3dcaa071e376d0b5b156b6856cee2e4fe111550f7d SHA512 f667ba8dae17ea89c118642b566f2c134c71bfd0b8bacea5cf7ec87d75ac79bd7cd1864a8788367a89d30ee35427d389ef6416375adff6e83caae30ff3e0549f
27
28 diff --git a/net-misc/dropbear/dropbear-2017.75.ebuild b/net-misc/dropbear/dropbear-2017.75.ebuild
29 deleted file mode 100644
30 index ea753868e9a..00000000000
31 --- a/net-misc/dropbear/dropbear-2017.75.ebuild
32 +++ /dev/null
33 @@ -1,98 +0,0 @@
34 -# Copyright 1999-2020 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI="5"
38 -
39 -inherit eutils savedconfig pam user
40 -
41 -DESCRIPTION="small SSH 2 client/server designed for small memory environments"
42 -HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
43 -SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
44 - https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
45 -
46 -LICENSE="MIT"
47 -SLOT="0"
48 -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
49 -IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
50 -
51 -LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
52 - dev-libs/libtommath[static-libs(+)]"
53 -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
54 - pam? ( sys-libs/pam )"
55 -DEPEND="${RDEPEND}
56 - static? ( ${LIB_DEPEND} )"
57 -RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
58 -
59 -REQUIRED_USE="pam? ( !static )"
60 -
61 -set_options() {
62 - progs=(
63 - dropbear dbclient dropbearkey
64 - $(usex minimal "" "dropbearconvert scp")
65 - )
66 - makeopts=(
67 - MULTI=$(usex multicall 1 0)
68 - STATIC=$(usex static 1 0)
69 - )
70 -}
71 -
72 -src_prepare() {
73 - epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
74 - sed -i \
75 - -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
76 - options.h || die
77 - sed -i \
78 - -e '/pam_start/s:sshd:dropbear:' \
79 - svr-authpam.c || die
80 - restore_config options.h
81 -}
82 -
83 -src_configure() {
84 - # XXX: Need to add libtomcrypt to the tree and re-enable this.
85 - # --disable-bundled-libtom
86 - econf \
87 - $(use_enable zlib) \
88 - $(use_enable pam) \
89 - $(use_enable !bsdpty openpty) \
90 - $(use_enable shadow) \
91 - $(use_enable syslog)
92 -}
93 -
94 -src_compile() {
95 - set_options
96 - emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
97 -}
98 -
99 -src_install() {
100 - set_options
101 - emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
102 - doman *.8
103 - newinitd "${FILESDIR}"/dropbear.init.d dropbear
104 - newconfd "${FILESDIR}"/dropbear.conf.d dropbear
105 - dodoc CHANGES README TODO SMALL MULTI
106 -
107 - # The multi install target does not install the links right.
108 - if use multicall ; then
109 - cd "${ED}"/usr/bin
110 - local x
111 - for x in "${progs[@]}" ; do
112 - ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
113 - done
114 - rm -f dropbear
115 - dodir /usr/sbin
116 - dosym ../bin/dropbearmulti /usr/sbin/dropbear
117 - cd "${S}"
118 - fi
119 - save_config options.h
120 -
121 - if ! use minimal ; then
122 - mv "${ED}"/usr/bin/{,db}scp || die
123 - fi
124 -
125 - pamd_mimic system-remote-login dropbear auth account password session
126 -}
127 -
128 -pkg_preinst() {
129 - enewgroup sshd 22
130 - enewuser sshd 22 -1 /var/empty sshd
131 -}
132
133 diff --git a/net-misc/dropbear/dropbear-2018.76.ebuild b/net-misc/dropbear/dropbear-2018.76.ebuild
134 deleted file mode 100644
135 index 0eaa06d25d9..00000000000
136 --- a/net-misc/dropbear/dropbear-2018.76.ebuild
137 +++ /dev/null
138 @@ -1,101 +0,0 @@
139 -# Copyright 1999-2020 Gentoo Authors
140 -# Distributed under the terms of the GNU General Public License v2
141 -
142 -EAPI="5"
143 -
144 -inherit eutils savedconfig pam user
145 -
146 -DESCRIPTION="small SSH 2 client/server designed for small memory environments"
147 -HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
148 -SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
149 - https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
150 -
151 -LICENSE="MIT"
152 -SLOT="0"
153 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
154 -IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
155 -
156 -LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
157 - dev-libs/libtommath[static-libs(+)]"
158 -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
159 - pam? ( sys-libs/pam )"
160 -DEPEND="${RDEPEND}
161 - static? ( ${LIB_DEPEND} )"
162 -RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
163 -
164 -REQUIRED_USE="pam? ( !static )"
165 -
166 -set_options() {
167 - progs=(
168 - dropbear dbclient dropbearkey
169 - $(usex minimal "" "dropbearconvert scp")
170 - )
171 - makeopts=(
172 - MULTI=$(usex multicall 1 0)
173 - STATIC=$(usex static 1 0)
174 - )
175 -}
176 -
177 -src_prepare() {
178 - epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
179 - sed \
180 - -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
181 - default_options.h > localoptions.h || die
182 - sed -i \
183 - -e '/pam_start/s:sshd:dropbear:' \
184 - svr-authpam.c || die
185 - restore_config localoptions.h
186 -}
187 -
188 -src_configure() {
189 - # XXX: Need to add libtomcrypt to the tree and re-enable this.
190 - # --disable-bundled-libtom
191 - # We disable the hardening flags as our compiler already enables them
192 - # by default as is appropriate for the target.
193 - econf \
194 - --disable-harden \
195 - $(use_enable zlib) \
196 - $(use_enable pam) \
197 - $(use_enable !bsdpty openpty) \
198 - $(use_enable shadow) \
199 - $(use_enable syslog)
200 -}
201 -
202 -src_compile() {
203 - set_options
204 - emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
205 -}
206 -
207 -src_install() {
208 - set_options
209 - emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
210 - doman *.8
211 - newinitd "${FILESDIR}"/dropbear.init.d dropbear
212 - newconfd "${FILESDIR}"/dropbear.conf.d dropbear
213 - dodoc CHANGES README SMALL MULTI
214 -
215 - # The multi install target does not install the links right.
216 - if use multicall ; then
217 - cd "${ED}"/usr/bin
218 - local x
219 - for x in "${progs[@]}" ; do
220 - ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
221 - done
222 - rm -f dropbear
223 - dodir /usr/sbin
224 - dosym ../bin/dropbearmulti /usr/sbin/dropbear
225 - cd "${S}"
226 - fi
227 - save_config localoptions.h
228 -
229 - if ! use minimal ; then
230 - mv "${ED}"/usr/bin/{,db}scp || die
231 - fi
232 -
233 - pamd_mimic system-remote-login dropbear auth account password session
234 -}
235 -
236 -pkg_preinst() {
237 - enewgroup sshd 22
238 - enewuser sshd 22 -1 /var/empty sshd
239 -}