make mosh-hardening optional for slow machines (add USE mosh-hardening, bug 417919, thanks fling)

Package-Manager: portage-2.1.10.63/cvs/Linux x86_64

6 files changed, 22 insertions, 77 deletions

diff --git a/net-misc/mosh/ChangeLog b/net-misc/mosh/ChangeLog
index 16abf418b5cf..79320fbbf4aa 100644
--- a/net-misc/mosh/ChangeLog
+++ b/net-misc/mosh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/mosh
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/ChangeLog,v 1.22 2012/05/27 06:21:28 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/ChangeLog,v 1.23 2012/05/28 16:43:19 xmw Exp $
+
+  28 May 2012; Michael Weber <xmw@gentoo.org> -mosh-1.2.0.97.ebuild,
+  mosh-1.2.1.ebuild, mosh-9999.ebuild, metadata.xml:
+  make mosh-hardening optional for slow machines (add USE mosh-hardening, bug
+  417919, thanks fling)
 
 *mosh-1.2.1 (27 May 2012)
 
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index adb7fea8c3d8..e5c93a975e64 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -1,17 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST mosh-1.2.0.97.tar.gz 282447 RMD160 db9f2cb88d16866f6c758e65c8dda51a2f5448b0 SHA1 98fd53c08cbb8f943666b072fcab2f9ac594fb78 SHA256 75c4651c5d667cbff55144273f2c582762942f474c0e722ee635eaed1b3a3022
 DIST mosh-1.2.1.tar.gz 282635 RMD160 efed9fcebd1d7538a6995d087a30d3246cf37fb5 SHA1 73b95b11699d8321c749a9590e0c12caeed52405 SHA256 e11e050a8d15603caa32d0f874c39245d1bffa258c7dadfc5f8d820d6ff61656
-EBUILD mosh-1.2.0.97.ebuild 1424 RMD160 3855db76d9fa513f7a1f9fe7a87fe2c47312ca40 SHA1 f73ed2dc57e91ec81ef4d8f97b3b69ae3476dc73 SHA256 2ea1888fa78835c575d8d8d448e341246893c9e3e2f643bf05a880b88a786334
-EBUILD mosh-1.2.1.ebuild 1354 RMD160 211dd51f087df02ea268b8551655adcf12236b50 SHA1 b84bbc488c3d41ad2c9f1053e22a1798876f8808 SHA256 48f70b2c2a9c7bd8b1fa6d570d99856676dc03675d56e3e48b67792e9a07ec96
-EBUILD mosh-9999.ebuild 1387 RMD160 a22e174c7d8e36e9c6eddfaa9b141c2b220e1320 SHA1 ba7919e904584b68cbad561ca469fdc142a7139b SHA256 323b6282aa08b4504c4bd3ee382b9152678e40ed9ac143a06d7efe35295377fe
-MISC ChangeLog 3336 RMD160 a06cd6ba6521d2e3bdd3637c5707edef212fcf92 SHA1 5745ed14bdb519ef5445e1ec904b8ed6cfa980a7 SHA256 6dafbef6444e694751b3e07d2bf31c4d1376d46aa08eeb1e88d692b029d7d759
-MISC metadata.xml 907 RMD160 73f0637e836e8c64db18a9f8fb4dcad772592e11 SHA1 9d899ba9d5b05515298b64e50ebb8730816ff918 SHA256 6002c5af80ba011ae5157adf942c3b73658e1511545406ff6a84feaad51b5b31
+EBUILD mosh-1.2.1.ebuild 1413 RMD160 f24038b2b1af1c03ca0491748a42a8e81fdbf0a2 SHA1 57abfc9af94b60f4e5ed89121003d1f3d7e1a375 SHA256 5bdd000e418d972fd196a0a9a1fc4d172ef236e138ea4d1e944caed147d1582f
+EBUILD mosh-9999.ebuild 1465 RMD160 ab012a8a0c3030d203b9590ef2a476107f434036 SHA1 2d5272b1c2b0141f1352d16fa7f472e1469f6a0e SHA256 8c937ad9c53ab59dd05cdef048a0cc3367c5d960601713dc5c56791558167f15
+MISC ChangeLog 3561 RMD160 becb0d26f383047af57d6b5e6baab502f1b25a60 SHA1 1cb928b77e5936249d8ed914badb29e84126bc32 SHA256 d01912a98d393d74cf9a46214e84005f183c916d459ec4b4acd2884fe68f23e7
+MISC metadata.xml 1018 RMD160 7398e8fde6d7dc223f1d0bd54521624e3436a520 SHA1 37281d97e2d2f1bfc3e76eb2150238ca4bffb19f SHA256 72eee63d90ac2cf1a0386ee16edfb7c3e68d715805004bbe7f72f1a473a1a9dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk/Bx9sACgkQknrdDGLu8JC9NwD+KrMfXIUL9BwcQ4HcuHwWhQXi
-hQaToXNLbQCngOpu18oA/1guk9lHL4RWGwkuZ3R015wyGeSTqxCusSzsIZusRuD7
-=fQIW
+iF4EAREIAAYFAk/DqxcACgkQknrdDGLu8JBPrQD/fW7icRII0knRHkupyRRPpZ3Q
+SnKbv6/cdAshOL1qm7YA/2MP9WCEawoIjmOX6fwWLOxx5mSD8imVAX/kGOEfsPKr
+=SJHe
 -----END PGP SIGNATURE-----
diff --git a/net-misc/mosh/metadata.xml b/net-misc/mosh/metadata.xml
index 5bcf39e9d431..0c999214bb4d 100644
--- a/net-misc/mosh/metadata.xml
+++ b/net-misc/mosh/metadata.xml
@@ -7,8 +7,9 @@
 </maintainer>
 <use>
 	<flag name="client">Build network client</flag>
-	<flag name="server">Build network server</flag>
 	<flag name="examples">Include example scripts</flag>
+	<flag name="mosh-hardening">Enable compiler and linker options to frustrate memory corruption exploits</flag>
+	<flag name="server">Build network server</flag>
 	<flag name="ufw">Install net-firewall/ufw rule set</flag>
 	<flag name="utempter">Include libutempter support</flag>
 </use>
diff --git a/net-misc/mosh/mosh-1.2.0.97.ebuild b/net-misc/mosh/mosh-1.2.0.97.ebuild
deleted file mode 100644
index 623b9780b468..000000000000
--- a/net-misc/mosh/mosh-1.2.0.97.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.2.0.97.ebuild,v 1.1 2012/05/23 22:27:31 xmw Exp $
-
-EAPI=4
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
-HOMEPAGE="http://mosh.mit.edu"
-SRC_URI="https://github.com/downloads/keithw/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion +client examples +server ufw +utempter"
-REQUIRED_USE="|| ( client server )
-	examples? ( client )"
-
-RDEPEND="dev-libs/protobuf
-	sys-libs/ncurses:5
-	virtual/ssh
-	client? ( dev-lang/perl
-		dev-perl/IO-Tty )
-	utempter? ( sys-libs/libutempter )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable test tests) \
-		$(use_enable bash-completion completion) \
-		$(use_enable client) \
-		$(use_enable server) \
-		$(use_enable examples) \
-		$(use_enable ufw) \
-		$(use_with utempter)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_test() {
-	einfo "running test encrypt-decrypt"
-	./src/tests/encrypt-decrypt -q || die
-	einfo "running test ocb-aes"
-	./src/tests/ocb-aes -q || die
-}
-
-src_install() {
-	default
-
-	for myprog in $(find src/examples -type f -perm /0111) ; do
-		newbin ${myprog} ${PN}-$(basename ${myprog})
-		elog "${myprog} installed as ${PN}-$(basename ${myprog})"
-	done
-}
diff --git a/net-misc/mosh/mosh-1.2.1.ebuild b/net-misc/mosh/mosh-1.2.1.ebuild
index 8765d5db70bd..6e592d808797 100644
--- a/net-misc/mosh/mosh-1.2.1.ebuild
+++ b/net-misc/mosh/mosh-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.2.1.ebuild,v 1.1 2012/05/27 06:21:28 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.2.1.ebuild,v 1.2 2012/05/28 16:43:19 xmw Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/downloads/keithw/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion +client examples +server ufw +utempter"
+IUSE="bash-completion +client examples +mosh-hardening +server ufw +utempter"
 REQUIRED_USE="|| ( client server )
 	examples? ( client )"
 
@@ -32,6 +32,7 @@ src_configure() {
 		$(use_enable server) \
 		$(use_enable examples) \
 		$(use_enable ufw) \
+		$(use_enable mosh-hardening hardening) \
 		$(use_with utempter)
 }
 
diff --git a/net-misc/mosh/mosh-9999.ebuild b/net-misc/mosh/mosh-9999.ebuild
index 0d894369ecdf..5b049f1f1873 100644
--- a/net-misc/mosh/mosh-9999.ebuild
+++ b/net-misc/mosh/mosh-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-9999.ebuild,v 1.10 2012/05/27 06:21:28 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-9999.ebuild,v 1.11 2012/05/28 16:43:19 xmw Exp $
 
 EAPI=4
 EGIT_REPO_URI="https://github.com/keithw/mosh.git"
@@ -13,7 +13,7 @@ HOMEPAGE="http://mosh.mit.edu"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="bash-completion +client examples +server ufw +utempter"
+IUSE="bash-completion +client examples +mosh-hardening +server ufw +utempter"
 REQUIRED_USE="|| ( client server )
 	examples? ( client )"
 
@@ -24,6 +24,7 @@ RDEPEND="dev-libs/protobuf
 		dev-perl/IO-Tty )
 	utempter? ( sys-libs/libutempter )"
 DEPEND="${RDEPEND}
+	dev-vcs/git[curl]
 	virtual/pkgconfig"
 
 src_prepare() {
@@ -38,6 +39,7 @@ src_configure() {
 		$(use_enable server) \
 		$(use_enable examples) \
 		$(use_enable ufw) \
+		$(use_enable mosh-hardening hardening) \
 		$(use_with utempter)
 }