Add USE=pie to control building sshd as a PIE #504764 by David Kredba. Reject pie/static USE combos #507434 by Alexander Hof.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 24 insertions, 18 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index b83a75c4dd3b..cd6db2e9dbc2 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.525 2014/09/28 18:18:48 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.526 2014/11/15 20:13:58 vapier Exp $
+
+  15 Nov 2014; Mike Frysinger <vapier@gentoo.org> openssh-6.6.1_p1-r4.ebuild:
+  Add USE=pie to control building sshd as a PIE #504764 by David Kredba.  Reject
+  pie/static USE combos #507434 by Alexander Hof.
 
 *openssh-6.6.1_p1-r4 (28 Sep 2014)
 
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index ef9672e577d7..0397ef2c5c20 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -24,24 +24,24 @@ DIST openssh-6.6p1+x509-8.0.diff.gz 235994 SHA256 bcacf522dd649e45b6f7bac7ef8bcc
 DIST openssh-6.6p1-hpnssh14v4.diff.xz 20932 SHA256 16dcc68c399990ec0c801d421d022ceeae0e3aec1e6ffd3fecc5e2f4768cc91b SHA512 7900ccf5ba5fcef5e6f3ed1b3263ad348a4bf63879905bbf9ce5212af64c7f4dae396989c67361ef1b5dfaf97a2d340b3bf75bf37f206b9a18ebee5d84044e2d WHIRLPOOL 163ce9e319cef4dcaf6f38f42afc3b75c6e89c38b43c04189c64c72b4b58bc3f9d7042c7b67243879c87cbe410a607296917e94ff042df2c0a29f2ef82792774
 DIST openssh-6.6p1.tar.gz 1282502 SHA256 48c1f0664b4534875038004cc4f3555b8329c2a81c1df48db5c517800de203bb SHA512 3d3566ed87649882702cad52db1adefebfb3ef788c9f77a493f99db7e9ca2e8edcde793dd426df7df0aed72a42a31c20a63ef51506111369d3a7c49e0bf6c82b WHIRLPOOL 8630c81481a813a92da9c302d22135fe519fcc4826a892080e5a15368d13a6b47947ef47d53aad0a34e6ea49ce4caccc8f06e8afc2c90db0402fbcc2184efe89
 DIST openssh-lpk-6.5p1-0.3.14.patch.gz 18217 SHA256 ad678f366dd7ef63ee164e29b59a4a4d264de9ddf9ad2c1d59178779e83539f3 SHA512 16f0053663ffc9a0670dbf8956dc070e6891e1e47cb1fbbea9567a6a4368c5500bf7e2ff7a2eb7208e651a0121088c271fb0a6ece62b98d103b3337866374610 WHIRLPOOL 34ee5a67e4cb0eb5d8126fde5469b73e0c81d4a7795cd9849c671922227eb8a6767cecf3097acbff338a47c3a7930b285fa4ecf2ebe74cb2e9186f93ec70c40c
-EBUILD openssh-6.6.1_p1-r4.ebuild 9944 SHA256 0763c45d27af872b2783e23f26a2f79238ad2a73e2b9f74e2bf457f07602c261 SHA512 c476993dbb31f4966780dba7b7db9084788760b8e2863b483e70069129dab4b1ed16d1f7139874b7bf8fbe66f943a24571ff80f43003d76f41d2d14ba8d7fc9a WHIRLPOOL a5cc0afd153700dd2ba6e6725dbc58826f5fabd1542283c35297ae44b0580e45035d3590004f9c5446c65420b69e89c64533880e949f2978b0acfd68b2efb680
+EBUILD openssh-6.6.1_p1-r4.ebuild 9995 SHA256 51403706d20087030b45e1cdaa63e450939bb36be790be7dadd9fb971dcada57 SHA512 1c0b2e3774601391d04c101a2faed7bce67c4aea962d730d2c3037a7dd5d60a620a4fdf7b833897b3b1fc9d7a124752b09247f3839acfa68fe572be6fe0ee2af WHIRLPOOL 47c20ccb64e8d417468ed21c42a7b3d8ec042d600a299ffe4fd1496f7da8d58d543427c0fc7674664fad4243a4d6987c58fa60b6c051af8482956b302ffb9924
 EBUILD openssh-6.6_p1-r1.ebuild 9874 SHA256 223b5e4c5d0d3152e8ffadd20e8bcc391620c779749cf6ff235f0d3a857f7409 SHA512 3104586dedfb189adc780bf56cb030f3a9c2427fe07ce340424ea4e279b6335653b2eb38f9d86a8f6ac76360cd94b87d858863fd79b2054763f72ccb83f1a0ed WHIRLPOOL 1bef688d59baf3cf10ce3ab60f3eeb6e6cf875989ffcf711628f56b34a1344838c3a46ae548399c49f11459e5dd2045fcef810691421e69ef02eb92489c22824
-MISC ChangeLog 87228 SHA256 64dddbecffb54a8378848f2a9e9a89e0758d331fd0962578526a7521e2cc7a5e SHA512 b3c2e017a3dfca3466ed3c9e94407584c35d982c387856e22a5e98da36f4ce4da43c605edaecd91bbb5498bd2906884823df69dcfea19f2e22f58c55d1825f04 WHIRLPOOL 56aeccb264dbfcefc1c91b0b7080860e314fd293f6cf6a3d63ca5c35291390f032a341c1d8e8dca80bf272344931a22d39ca65d34faf6eea04585df3e00e4bb4
+MISC ChangeLog 87432 SHA256 10d9214447541775a1098aae3599d00e7f69bdec5fb123734e811a313d4e8023 SHA512 7175dfe5b4e9e3ae29eb21cb2b13e374c73fb7a7781c7715e88a207893f3313cc2653f2a55d31858bea3c7e16091766f40cda2d3c5734e0f077c2685d92c22e1 WHIRLPOOL 6deceee8267101a5a738b1c032ba3fe7c17e42662a12aa00db816de3977732993577356e5aa437642acc7e4e61a0f8e4059faa8bcc30c2e469626710a1b7eb55
 MISC metadata.xml 1837 SHA256 5f8be0245926a5dc8007dd78594febffc68bbcb45306630d027666872e664050 SHA512 76e044611e16ede9bb9697c0ad448c149131f1f20b84ef1000fb77d6cec954abd48542fd26299a372b4411aa0ecb161ed38396b2c3b5c11c71a4bc247e0b23ed WHIRLPOOL 46c8b0f7911fec3ca086e1601cfab5d03e01a7d8cd2069460975545438f6fa5964f138d19a70ec7db7f1f8c9c0fbb48dcec6ee8269fa9d7b432214e9e3e46806
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUKFEJAAoJEPiazRVxLXTF3rIP/1XhB4+J6YrN60+PdlnEnqSd
-kjXCO1pim47ckoesfoVuyO4B3YzI8gW+PetS9tJTxwzeA/9+2YfzMTF73GESzYc3
-JiPy9Kq7m+GeSEYY5wYp1xX0TVDw9NrZutIx4Xw7XjJk15aSlzswwPRMkvqZauz4
-/QVKNl8UiRZkF7SSSugtq1Wx51ZH6KVEsBLelHBzMSJSKweqQ9LDQ5Eozv+OvGm8
-739ahhWoJcj92Vhc64/FXxOwIHoyHvJq14E4XPxVa1M42tG3xuK1/VEVViQgb2Nz
-OLFxlOeaobblacgP2dP7gA88Ea8tCOgqs1OWVNlxdOalXzkONVyI9HQYsihaBw9h
-BP8ttKnOaXNt8r4+zvzbsIc5iHP4xUzlEdfl71cqvwqQKrlRRTd45/7mpeQSXxmQ
-UiOabyBl21ypd6dH6Y5HAqJUZb9to/8grvKCyUHKebOXQ3S+ICWvvfC9L33J10Hh
-d6OrWBLI4DRbT6iUjnASUn69QEex/u0/BSmIOjO+byakj9UX+doTnVNXnkqxxX2G
-caBEOjc12ILpFyM3l+MCGPvn4U66YUahjXdi5QofDtmsI32N9atmQp9t8xzHuLma
-FTAuzx9Jh8HwgtO10zWDuuDcZt6jlsw/FUK9t5QU17Y1Gpm1gUN6ph5wE4hwxBFc
-31J6g7LyaOo8LNB13gly
-=giBD
+iQIcBAEBCAAGBQJUZ7QHAAoJEPGu1DbS6WIA7U4P/1CoT7bsWyXUydvji/rjb/8n
+Sp/P4QTaDc+qElls61b86mT822AjZ5BK+DwpZGwmIFqP8cRIOO+FLhoGDc37fgRY
+DBksb+O0NrsbCamF0eAvah0zCFQGdkuik6KRrqpcOn+1w/z2J1XWgN4LemC3kp3W
+Qy82CaYl1G/C6zJAo2xVVeFPzjqKl66fvAh6lK6iyAvP+WFjcHCIndP4ak5s7fPy
+ctlfsTzm/OKrKpvpnKDKxUPLFi1ZZ/6DDg5OTaRqh5AP/L7ADp0YwABfHffB1uRa
+nHa0blsPTkxpn7HZDa1OypOmcs0hXs5IHmxiXpbR2D5OyiZg99w5dRq97Vweswrb
+yrQ7Wt8UL50ohoJKvEW/5oar59guEMinFlDO1FYRiN+pKEgOOCWV8a9PVeD0rHDi
+UhfL6qiJwYxfNknGmqb1jUsg4Ly5YbsfvsYmSM+//snrnn4szzs4m9bRieKz1JNB
+xM6katsFOrDGceQ+FKuJ2NY9bFzK/7X9fU8foXGefE5IgfKOcc14OoAqizOmO7pv
+eNnTeVKW4f8bojAKBbnwqX0mFO6G2LB6jbQY9rHiy/7sy+w8aPwXw30CqRl3Ebmv
+rVSQBQHtpC3QXlyseHauAI2y0nCJpYAX1EXOWsfJfUm61v0oz0vJTy2v0PP4mKg5
+Z3Ir4WLcarEpi6rjUawx
+=fk8M
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/openssh-6.6.1_p1-r4.ebuild b/net-misc/openssh/openssh-6.6.1_p1-r4.ebuild
index 9e035a6ace04..399eaa73263a 100644
--- a/net-misc/openssh/openssh-6.6.1_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-6.6.1_p1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.6.1_p1-r4.ebuild,v 1.1 2014/09/28 18:18:48 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.6.1_p1-r4.ebuild,v 1.2 2014/11/15 20:13:58 vapier Exp $
 
 EAPI="4"
 inherit eutils user flag-o-matic multilib autotools pam systemd versionator
@@ -26,7 +26,8 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="bindist ${HPN_PATCH:++}hpn kerberos ldap ldns libedit pam selinux skey static tcpd X X509"
+IUSE="bindist ${HPN_PATCH:++}hpn kerberos ldap ldns libedit pam +pie selinux skey static tcpd X X509"
+REQUIRED_USE="pie? ( !static )"
 
 LIB_DEPEND="selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
 	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
@@ -199,6 +200,7 @@ src_configure() {
 		${LDAP_PATCH:+$(use X509 || ( use ldap && use_with ldap ))} \
 		$(use_with ldns) \
 		$(use_with libedit) \
+		$(use_with pie) \
 		$(use_with selinux) \
 		$(use_with skey) \
 		$(use_with tcpd tcp-wrappers) \