Add support by rpansky for USE=mem-scramble #286990.

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

4 files changed, 23 insertions, 7 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 341aac5474d8..4d2ed2841ea1 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.229 2009/10/09 16:42:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.230 2009/10/09 21:32:10 vapier Exp $
+
+  09 Oct 2009; Mike Frysinger <vapier@gentoo.org> bash-4.0_p33.ebuild,
+  metadata.xml:
+  Add support by rpansky for USE=mem-scramble #286990.
 
   09 Oct 2009; Raúl Porcel <armin76@gentoo.org> bash-4.0_p28.ebuild:
   ia64/s390/sh stable wrt #270008
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 3be021af9475..703a3ce0f3fb 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX autoconf-mktime-2.59.patch 4686 RMD160 64f719df39ae0a17999cb6b87ce9c5e275fcd7eb SHA1 4355b22b415c703c8ca9cc1b7b89ec44edc7ad4c SHA256 3c16de6cbe24fc806c29390eaf4c7e1d9ceda3df523bb18941cf0a3184356bba
 AUX bash-3.0-configs.patch 2538 RMD160 00e8015531efb6a59298782581928f1aff2247e6 SHA1 7f4615de4ac2219372d34dfbead3311fcfdfab2a SHA256 09d11c8e6158b2346fc39830d75af2210cd1cec7c8e9965aed96b66213310d3f
 AUX bash-3.0-etc-inputrc.patch 1443 RMD160 8bf34837bef20bfc7062e32e4a23aa6af9ef2b49 SHA1 a58b9011f61e7e60be0fcd8741d91292222eff61 SHA256 b43736c32ed9d9088ee1cbbff11b78d6f6993492f9da3e1eb5151a64a082d025
@@ -132,6 +135,13 @@ EBUILD bash-3.2_p39.ebuild 5977 RMD160 c053f7f72dbbc9831794da77d4b93c52c1aab8f3
 EBUILD bash-3.2_p48-r1.ebuild 6151 RMD160 3c9454c27c6dc1770ef1acf5d3a6052218b6e1d8 SHA1 ba75c32939f48234e856866194d42778a3268d94 SHA256 9d96156f36a972a5f972b509ca0d9122e27ae1b4c095e4489397ecf3b78d039d
 EBUILD bash-3.2_p48.ebuild 5988 RMD160 1189a2e142ef38b30b20960cccc3a997b76c3f71 SHA1 1f626a8e00abb29359ac07f7251977fedbca54b7 SHA256 7eb6f2828f2cb157d759333983d2f9a3616d2288cbbc9228a88472c278088882
 EBUILD bash-4.0_p28.ebuild 5651 RMD160 dfb32f8221deaf493d855da63a74125b73a68895 SHA1 6b633da5e83eb2a7cce163304676668651a47a7e SHA256 de95d93675736380eb58b64f675e096fc238eecfdf862a699662a3469d4c57b0
-EBUILD bash-4.0_p33.ebuild 5734 RMD160 b2b9680fd16a7c9807de7a3f9a6feb9da55ba23c SHA1 09a16ff879674f13e21c273627d90136bbacaea7 SHA256 b6151ffbbd0c0360439e925a36d202009d4033ab360e33e69a936d258400efd4
-MISC ChangeLog 36878 RMD160 085531ea085c8fe8d54010ebbc2ee86a263f0220 SHA1 c4e2aedadc39e91d86a1a1aac50b263a70cafa79 SHA256 1385a4873a3ffc8832c57642f677a7aa655e06513884c4879a819565c12ac7f0
-MISC metadata.xml 468 RMD160 9f720f1227381137311440f58d93250f29969786 SHA1 34bdfd1f0ed219ed79850647615a3b2603a4e079 SHA256 152d66c4d8f40627855ad3b4613e0ab88ff4bbf4333542eae52d411bdeb66e5f
+EBUILD bash-4.0_p33.ebuild 5794 RMD160 6f1c342e92a726297b0307491bb94e3c2edeee39 SHA1 097a79c6d8770fc814c293fb76a65fefb0ae390f SHA256 a597aea23bc6799afde9fed119a839ed2bf49814da00f710a851648f1db68896
+MISC ChangeLog 37020 RMD160 f102205cfb41b824a8124b8c476f4e8d78bed793 SHA1 8970391660708be9beec4c84bf2c6a3bb0525347 SHA256 905a7a773163b9cd3e43d88e2a350b10ba115847446f3b5f2994892c19c0ab21
+MISC metadata.xml 568 RMD160 c778ff1669af3c368238bcf481b344b741f0d6e1 SHA1 8d74d1c518351ad8085c9c26a5f2554d8c768b20 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrPq+AACgkQlPl3HsVfCDq6LACcDhpo2+KIYGqZ5tjHxNMAPn2D
+SAAAnRdXLhpj4JrD3WOXKUb0rhz+zvnX
+=0s+m
+-----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.0_p33.ebuild b/app-shells/bash/bash-4.0_p33.ebuild
index c6e3a7d2cade..d1d741c490e3 100644
--- a/app-shells/bash/bash-4.0_p33.ebuild
+++ b/app-shells/bash/bash-4.0_p33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0_p33.ebuild,v 1.1 2009/09/10 00:23:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0_p33.ebuild,v 1.2 2009/10/09 21:32:10 vapier Exp $
 
 EAPI="1"
 
@@ -37,7 +37,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="afs bashlogger examples +net nls plugins vanilla"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2
 	nls? ( virtual/libintl )"
@@ -117,7 +117,8 @@ src_compile() {
 		$(use_with afs) \
 		$(use_enable net net-redirections) \
 		--disable-profiling \
-		--without-gnu-malloc \
+		$(use_enable mem-scramble) \
+		$(use_with mem-scramble bash-malloc) \
 		${myconf} || die
 	emake || die "make failed"
 
diff --git a/app-shells/bash/metadata.xml b/app-shells/bash/metadata.xml
index 67c5507b189d..23e4a905e0ef 100644
--- a/app-shells/bash/metadata.xml
+++ b/app-shells/bash/metadata.xml
@@ -5,6 +5,7 @@
 <use>
   <flag name='bashlogger'>Log ALL commands typed into bash; should ONLY be
     used in restricted environments such as honeypots</flag>
+  <flag name='mem-scramble'>Build with custom malloc/free overwriting allocated/freed memory</flag>
   <flag name='net'>Enable /dev/tcp/host/port redirection</flag>
   <flag name='plugins'>Add support for loading builtins at runtime via
     'enable'</flag>