| 1 |
vapier 09/04/20 05:32:10 |
| 2 |
|
| 3 |
Modified: ChangeLog openssh-5.2_p1-r2.ebuild |
| 4 |
Log: |
| 5 |
Skip pkcs11/kerberos support when USE=static by Alon Bar-Lev #266404 by Jan Paesmans. |
| 6 |
(Portage version: 2.2_rc28/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.350 net-misc/openssh/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/ChangeLog?rev=1.350&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/ChangeLog?rev=1.350&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/ChangeLog?r1=1.349&r2=1.350 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v |
| 18 |
retrieving revision 1.349 |
| 19 |
retrieving revision 1.350 |
| 20 |
diff -u -r1.349 -r1.350 |
| 21 |
--- ChangeLog 12 Apr 2009 21:07:56 -0000 1.349 |
| 22 |
+++ ChangeLog 20 Apr 2009 05:32:10 -0000 1.350 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for net-misc/openssh |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.349 2009/04/12 21:07:56 robbat2 Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.350 2009/04/20 05:32:10 vapier Exp $ |
| 28 |
+ |
| 29 |
+ 20 Apr 2009; Mike Frysinger <vapier@g.o> openssh-5.2_p1-r2.ebuild: |
| 30 |
+ Skip pkcs11/kerberos support when USE=static by Alon Bar-Lev #266404 by |
| 31 |
+ Jan Paesmans. |
| 32 |
|
| 33 |
12 Apr 2009; Robin H. Johnson <robbat2@g.o> |
| 34 |
openssh-5.2_p1-r2.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.8 net-misc/openssh/openssh-5.2_p1-r2.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild?rev=1.8&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild?rev=1.8&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild?r1=1.7&r2=1.8 |
| 43 |
|
| 44 |
Index: openssh-5.2_p1-r2.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild,v |
| 47 |
retrieving revision 1.7 |
| 48 |
retrieving revision 1.8 |
| 49 |
diff -u -r1.7 -r1.8 |
| 50 |
--- openssh-5.2_p1-r2.ebuild 12 Apr 2009 22:39:03 -0000 1.7 |
| 51 |
+++ openssh-5.2_p1-r2.ebuild 20 Apr 2009 05:32:10 -0000 1.8 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2009 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild,v 1.7 2009/04/12 22:39:03 vapier Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild,v 1.8 2009/04/20 05:32:10 vapier Exp $ |
| 57 |
|
| 58 |
inherit eutils flag-o-matic multilib autotools pam |
| 59 |
|
| 60 |
@@ -111,18 +111,26 @@ |
| 61 |
eautoreconf |
| 62 |
} |
| 63 |
|
| 64 |
+static_use_with() { |
| 65 |
+ local flag=$1 |
| 66 |
+ if use static && use ${flag} ; then |
| 67 |
+ ewarn "Disabling '${flag}' support because of USE='static'" |
| 68 |
+ # rebuild args so that we invert the first one (USE flag) |
| 69 |
+ # but otherwise leave everything else working so we can |
| 70 |
+ # just leverage use_with |
| 71 |
+ [[ -z $1 ]] && flag="${flag} ${flag}" |
| 72 |
+ shift |
| 73 |
+ set -- !${flag} "$@" |
| 74 |
+ fi |
| 75 |
+ use_with "$@" |
| 76 |
+} |
| 77 |
+ |
| 78 |
src_compile() { |
| 79 |
addwrite /dev/ptmx |
| 80 |
addpredict /etc/skey/skeykeys #skey configure code triggers this |
| 81 |
|
| 82 |
local myconf="" |
| 83 |
- if use static ; then |
| 84 |
- append-ldflags -static |
| 85 |
- use pam && ewarn "Disabling pam support becuse of static flag" |
| 86 |
- myconf="${myconf} --without-pam" |
| 87 |
- else |
| 88 |
- myconf="${myconf} $(use_with pam)" |
| 89 |
- fi |
| 90 |
+ use static && append-ldflags -static |
| 91 |
|
| 92 |
econf \ |
| 93 |
--with-ldflags="${LDFLAGS}" \ |
| 94 |
@@ -134,10 +142,11 @@ |
| 95 |
--with-privsep-user=sshd \ |
| 96 |
--with-md5-passwords \ |
| 97 |
--with-ssl-engine \ |
| 98 |
- $(use_with kerberos kerberos5 /usr) \ |
| 99 |
+ $(static_use_with pam) \ |
| 100 |
+ $(static_use_with kerberos kerberos5 /usr) \ |
| 101 |
${LDAP_PATCH:+$(use ldap && use_with ldap)} \ |
| 102 |
$(use_with libedit) \ |
| 103 |
- ${PKCS11_PATCH:+$(use pkcs11 && use_with pkcs11)} \ |
| 104 |
+ ${PKCS11_PATCH:+$(use pkcs11 && static_use_with pkcs11)} \ |
| 105 |
$(use_with selinux) \ |
| 106 |
$(use_with skey) \ |
| 107 |
$(use_with smartcard opensc) \ |
Archives