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

(Portage version: 2.1.10.63/cvs/Linux x86_64)

5 files changed, 15 insertions, 68 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/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)
 }