|
Line
Link Here
|
| 0 |
-- openssh-6.6_p1-r1.ebuild |
0 |
++ openssh-6.6_p1-r1.ebuild |
|
Lines 141-146
Link Here
|
| 141 |
) |
141 |
) |
| 142 |
sed -i "${sed_args[@]}" configure{.ac,} || die |
142 |
sed -i "${sed_args[@]}" configure{.ac,} || die |
| 143 |
|
143 |
|
|
|
144 |
# setting setuid bit may fail as non-priviledged user (prefix, userpriv?) |
| 145 |
# during build, retry in pkg_preinst |
| 146 |
if [[ $(id -u) != 0 ]]; then |
| 147 |
sed -i -e 's/-m 4711/-m 0711/' "${S}"/Makefile.in || die |
| 148 |
fi |
| 149 |
|
| 144 |
epatch_user #473004 |
150 |
epatch_user #473004 |
| 145 |
|
151 |
|
| 146 |
# Now we can build a sane merged version.h |
152 |
# Now we can build a sane merged version.h |
|
Lines 193-199
Link Here
|
| 193 |
--with-md5-passwords \ |
199 |
--with-md5-passwords \ |
| 194 |
--with-ssl-engine \ |
200 |
--with-ssl-engine \ |
| 195 |
$(static_use_with pam) \ |
201 |
$(static_use_with pam) \ |
| 196 |
$(static_use_with kerberos kerberos5 /usr) \ |
202 |
$(static_use_with kerberos kerberos5 "${EPREFIX}"/usr) \ |
| 197 |
${LDAP_PATCH:+$(use X509 || ( use ldap && use_with ldap ))} \ |
203 |
${LDAP_PATCH:+$(use X509 || ( use ldap && use_with ldap ))} \ |
| 198 |
$(use_with ldns) \ |
204 |
$(use_with ldns) \ |
| 199 |
$(use_with libedit) \ |
205 |
$(use_with libedit) \ |
|
Lines 261-266
Link Here
|
| 261 |
} |
267 |
} |
| 262 |
|
268 |
|
| 263 |
src_test() { |
269 |
src_test() { |
|
|
270 |
use prefix && return # horse drug, see #335343 |
| 264 |
local t tests skipped failed passed shell |
271 |
local t tests skipped failed passed shell |
| 265 |
tests="interop-tests compat-tests" |
272 |
tests="interop-tests compat-tests" |
| 266 |
skipped="" |
273 |
skipped="" |
|
Lines 297-302
Link Here
|
| 297 |
pkg_preinst() { |
304 |
pkg_preinst() { |
| 298 |
enewgroup sshd 22 |
305 |
enewgroup sshd 22 |
| 299 |
enewuser sshd 22 -1 /var/empty sshd |
306 |
enewuser sshd 22 -1 /var/empty sshd |
|
|
307 |
# retry setting setuid bit, may fail as non-priviledged user (prefix). |
| 308 |
$(usex prefix 'nonfatal' '') fperms 4711 /usr/$(get_libdir)/misc/ssh-keysign* |
| 300 |
} |
309 |
} |
| 301 |
|
310 |
|
| 302 |
pkg_postinst() { |
311 |
pkg_postinst() { |
