vapier 15/03/19 20:56:56 Modified: ChangeLog Manifest openssh-6.8_p1-r1.ebuild Log: Move more conflicting USE flag checks to REQUIRED_USE.
Revision Changes Path 1.547 net-misc/openssh/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/ChangeLog?rev=1.547&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/ChangeLog?rev=1.547&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/ChangeLog?r1=1.546&r2=1.547 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v retrieving revision 1.546 retrieving revision 1.547 diff -u -r1.546 -r1.547 --- ChangeLog 19 Mar 2015 17:02:59 -0000 1.546 +++ ChangeLog 19 Mar 2015 20:56:56 -0000 1.547 @@ -1,6 +1,9 @@ # ChangeLog for net-misc/openssh # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.546 2015/03/19 17:02:59 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.547 2015/03/19 20:56:56 vapier Exp $ + + 19 Mar 2015; Mike Frysinger <[email protected]> openssh-6.8_p1-r1.ebuild: + Move more conflicting USE flag checks to REQUIRED_USE. *openssh-6.8_p1-r1 (19 Mar 2015) 1.702 net-misc/openssh/Manifest file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/Manifest?rev=1.702&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/Manifest?rev=1.702&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/Manifest?r1=1.701&r2=1.702 Index: Manifest =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/openssh/Manifest,v retrieving revision 1.701 retrieving revision 1.702 diff -u -r1.701 -r1.702 --- Manifest 19 Mar 2015 17:03:30 -0000 1.701 +++ Manifest 19 Mar 2015 20:56:56 -0000 1.702 @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX openssh-4.7_p1-GSSAPI-dns.patch 4494 SHA256 88a08f349258d4be5b2faa838a89fe1aa0196502990b745ac0e3a70dda30a0d7 SHA512 4d00a9ed79f66b92502c3e5ee580523f63d7b3643fe1bd330ff97994acce527d4d285d38199cef66eddc0ef68afabf7b268abc60cba871bac5d2e99045d4ac11 WHIRLPOOL 2f118fd2f016c529dbc31e8f2b6b418931e6770ab02c28b7feeaba93e84e7fcd1c742f4420a43a9fec0bdfaa4d4bc7cf14fb860c0a56c68a30e7b136fb60bcdb AUX openssh-6.3_p1-x509-hpn14v2-glue.patch 1451 SHA256 d7179b3c16edd065977aaf56a410e2b9b237206fb619474f312972b430b73c8d SHA512 02577e3f718ff994bb4e962189f17048b4c03104d0a1981683f3c6a1d6d30701db368e132102c8396da2c0f5eb2f6602b26f32f74d19382af34bd9a93fc508f3 WHIRLPOOL b7d224d71634f380bd31b3a1dd3e588a29582255f717a6a308738ad58b485b693d827a53704479995ec2ebca53c9dc9b2113d8de52a1336b67ce83943f946b77 AUX openssh-6.6.1_p1-x509-glue.patch 635 SHA256 381794bdfc4880da4411041ab1f795cba303644b0a35e88f0f452fca8c2bfbb8 SHA512 6d3adefc5449f812052221b69c588f9948e6116dd5c5644db4e0426264f06fd9a15f04364c2484ce03267f4a84b8806de7d7a7c9140538d73be9e7b50f4eeb47 WHIRLPOOL 823249e96f7175eef09f86dbcc67f6158c23f453eaa940a33c18a838389204cd3a43f5dccd39b6004e05cb05ea327d33be91c2ee1eb4525f13dc29e6943ea6b6 @@ -32,24 +29,7 @@ EBUILD openssh-6.7_p1-r3.ebuild 10078 SHA256 1a58e95c28b5b938f2f15b3fec5688dc9509bb038805b0348b11ac31ed3c57e0 SHA512 add8eaebb3c91983a7bac78011700c110917dea6409bf46e784d7e17b1891facb3baacaa0bda71eb2c9b6017fbf1a21b5846434fba8d588724da871e7824f498 WHIRLPOOL 47e04a0644a592e29aaa9ac00b03a377e81cdb1d886119c21a77a0a351c0cea34018a24406449faa814c2f06e1c03b43ac16a78983bb4a9f57c36834ad7babcb EBUILD openssh-6.7_p1-r4.ebuild 10138 SHA256 e4f6c4e80485352cc75e62c0212670a0d7f4a19bcf1eed9972bbeaff8b7a2743 SHA512 fdcd7759a85412bdf05be5003d20289a862f13f945e1972e56a36602df426641ef3497399e06ff0da9a51cf2bd54831b6208ac399d42d3ce3e3b1493ffa7655c WHIRLPOOL ae24dbcc182627c356961f4ce290cb1b489e29fa13beaf27212bd4847a36f02af53a8508320cf2a76be88741297ac7533faf53c1d3b15d70299cff536ae8502f EBUILD openssh-6.7_p1.ebuild 10067 SHA256 970be3a06c0293262f6c59d068d290cc71935fe91f4295b1352b6c41c46c3bf7 SHA512 f2b689767c8da075f16e9e5d9fe258e22fb4019034539883d63632c1543d3141787883ec7013f87c23d709a554b4f994c4c2f41b1829e5301b55f7a5da3fbf46 WHIRLPOOL 8d70fd99a1f3307b801999a9c80be4bcc603cbc151170160d78a2fa8a50ceb701657cbb0b0eb9ccfe1287bff9299dcffb36f884b860a5ca88ac4a9936b21a574 -EBUILD openssh-6.8_p1-r1.ebuild 10059 SHA256 3e4b22bda6b95e645eb2ca34c427384b8aff7ec34913c8005ffac5b298e10529 SHA512 39b844cd68ecd0f2b6e619ff8e166e9267095a58b82a134fe42b8238b03a69f9d178095435cde9987240d145e42409622eea2db135d272c07865956ad2acb75a WHIRLPOOL 9b914cc7e768c3cddf6b68c66ead33f49161602662d9ade420dfe37af20a3a3be7792e2d6207e3f996d0e9c6546fab956768746cdfac5319f359839e60881cdc +EBUILD openssh-6.8_p1-r1.ebuild 9921 SHA256 726cb94a584270f2f31210e917d5f36df3e51fc4430b4ee46040a68c51faf0c0 SHA512 e79a9c728932a7908032af1fe0e92b9f7476d5b0a4c843e92a20c3ddc3e53f3c2266a2f83ac84a9716ecae238cab67ddc3ddbe209c6ae5adf8d1ff17e6877aa4 WHIRLPOOL f3b9ac2dda106861f9d6cc84db8c0119a250120577a04bdcb1fab0e7666b789f8b0f6309093a7f7556c40fb1f90d7080dfe01a4c5278e6d0e90a9278ba11a68e EBUILD openssh-6.8_p1.ebuild 10045 SHA256 13378c09cc4ceec7cd1b8c12ad925db87c9d37910edb679eb2404527226ee18d SHA512 daa5ba19f6fbc0ac7104c8c7822b22745736bf864999ade1e205d1b7184e0fd67f997c4635ab2335eafdf2d2917cf677764080d3004b24935f4189fce338010f WHIRLPOOL b8d40e35bf44bf26296c8d87e3b293b31f767920afb288a10deff8a9ceeb1c130b4da2697d7ce970091d0810c5d1e3839640e2ebee2f0d63b8ca5b0f430c0c0c MISC ChangeLog 90996 SHA256 ed070ce1d88460b0889ef867ab97adfae2e69715de6d154c64f10e3c3f658c8a SHA512 dc39d8dd8147a14db587be9ba6af39ec4b255284c7794462cc8bd29a0341dfd6c131e0daf620acc3dc1a681a32639ae748ddcffc92814d94ad5170e293a94dee WHIRLPOOL b88dcf0ca72c856f8be8abc44736f8f1f6191266736afd499fbb2def6d7baf34a91f0e078ae0303b58c74a85530d545469296f7fc3b44f5124a5f5424997f750 MISC metadata.xml 2049 SHA256 db7830f81086b967b8212af7c318bf27d22ac7db58b1a4d9c80cc86453ff03ab SHA512 3641e38203376c78fddc11b9d5861bdb629a1f9faf2768be5dc35f62ef3d37636a2f9f990e3ade1de2cec45d33a5fcdf7bb0dcd5f4376d40753fe29b354da42e WHIRLPOOL 6a7497491a150ede87bf20f5da5ed9003d545c9c376db7b78a6c1db66b1b90213f5f97d9211fb8b1ab204c1814c1a90d7be77a2d83cc045cf0762b4d2708c56a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJVCwFbAAoJEHy/RO9cNQiDRFkQAM/6L6+0EvN3MwtFY5ZeWJco -5m4AInZoTRpgER1nuWkuInR4ZacBcROFKflfbzN30Tme7J3nqk0IxYrXBzIogj+1 -kGqJSJZW9MyyU5Zp1aBeKtX2Qq4p1AhoWGGlxEC+NzS2R3dViJkWAAF7QtOZgKDH -kDt4wWxtMQoPoeSho4ZwOjrEs2jGoNtzIJdhN/3VCdzdYLquNbUCnaPHK7FpHRUk -3PQJhCLJLk+NQKuyWlV+M0EKWR8xaCj6nF5kfEKsYoUEf3SLoCGLPGTPizI1TYR6 -qfUzgYCosE6ZOsutoVXBhEoV7fjXWx/hgHzMPL/cTTXYaWKwub73Lw40vPy0INKf -WRW2AdfH3jNdNqvmqwTfD7KEhrZVbj3zFWl7xHjahjLnhvA+jjLO7uTiffeJJhiF -yh2ntY7FhQcy/L4Md1OLVxUgO91FajRCsr2oXTASoM3H/tNhy5jdxvW4QOxQsdim -UM0xJh2ijNmfPub84aQCYUe+jXeXk1tTfaOQRLXTwvW115364rLR09ta6eNl8m1E -uVXKRnkhe6alUPmqP8EpRwQKfkMw0psbsFI2sufo3fylwxG3xuT/9j9XegfJyMkG -gvYJo6E0Jo9QflUnnynZWrVhUZCpH0T0F/OkA2niMROBHQI5WdrevsY+eokCok0S -mWK29Q2pcUWwzPDk7Vt6 -=52MO ------END PGP SIGNATURE----- 1.2 net-misc/openssh/openssh-6.8_p1-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/openssh-6.8_p1-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/openssh-6.8_p1-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/openssh-6.8_p1-r1.ebuild?r1=1.1&r2=1.2 Index: openssh-6.8_p1-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.8_p1-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openssh-6.8_p1-r1.ebuild 19 Mar 2015 17:02:59 -0000 1.1 +++ openssh-6.8_p1-r1.ebuild 19 Mar 2015 20:56:56 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.8_p1-r1.ebuild,v 1.1 2015/03/19 17:02:59 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.8_p1-r1.ebuild,v 1.2 2015/03/19 20:56:56 vapier Exp $ EAPI="4" inherit eutils user flag-o-matic multilib autotools pam systemd versionator @@ -36,7 +36,8 @@ IUSE="bindist ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit pam +pie sctp selinux skey +ssh1 +ssl static X X509" REQUIRED_USE="pie? ( !static ) ssh1? ( ssl ) - static? ( !kerberos !pam )" + static? ( !kerberos !pam ) + X509? ( !ldap ssl )" LIB_DEPEND="sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) @@ -129,19 +130,16 @@ epatch "${FILESDIR}"/${PN}-6.3_p1-x509-hpn14v2-glue.patch save_version X509 fi - if ! use X509 ; then - if [[ -n ${LDAP_PATCH} ]] && use ldap ; then - epatch "${WORKDIR}"/${LDAP_PATCH%.*} - save_version LPK - fi - else - use ldap && ewarn "Sorry, X509 and LDAP conflict internally, disabling LDAP" + if use ldap ; then + epatch "${WORKDIR}"/${LDAP_PATCH%.*} + save_version LPK fi epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch + # The X509 patchset fixes this independently. use X509 || epatch "${FILESDIR}"/${PN}-6.8_p1-ssl-engine-configure.patch epatch "${WORKDIR}"/${P}-sctp.patch - if [[ -n ${HPN_PATCH} ]] && use hpn; then + if use hpn ; then epatch "${WORKDIR}"/${HPN_PATCH%.*.*}/* save_version HPN fi @@ -197,7 +195,7 @@ --with-privsep-path="${EPREFIX}"/var/empty \ --with-privsep-user=sshd \ $(use_with kerberos kerberos5 "${EPREFIX}"/usr) \ - ${LDAP_PATCH:+$(use X509 || (use ldap && use_with ldap))} \ + $(use ldap && use_with ldap) \ $(use_with ldns) \ $(use_with libedit) \ $(use_with pam) \ @@ -206,7 +204,7 @@ $(use_with selinux) \ $(use_with skey) \ $(use_with ssh1) \ - $(use X509 || use_with ssl openssl) \ + $(use_with ssl openssl) \ $(use_with ssl md5-passwords) \ $(use_with ssl ssl-engine) \ "${myconf[@]}"
