[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/files/, app-shells/bash/

["Mike Frysinger" <vapier@gentoo.org>]

commit:     6a6d6915dfc68f4a67a7e8c03265d9e02ed39425
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 06:01:33 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 06:01:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a6d6915

app-shells/bash: drop unused memory patch #597006

The patch applies against the readline source which we delete in the
bash ebuild, so it doesn't do anything useful here.

 app-shells/bash/bash-4.4-r1.ebuild                 |  3 ---
 .../bash/files/bash-4.4-history-alloclist.patch    | 26 ----------------------
 2 files changed, 29 deletions(-)

diff --git a/app-shells/bash/bash-4.4-r1.ebuild b/app-shells/bash/bash-4.4-r1.ebuild
index caed46f..41a6506 100644
--- a/app-shells/bash/bash-4.4-r1.ebuild
+++ b/app-shells/bash/bash-4.4-r1.ebuild
@@ -74,9 +74,6 @@ src_prepare() {
 	# Include official patches
 	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
 
-	# bug 597006: large HISTFILESIZE value may result in upfront memory exhaustion
-	epatch "${FILESDIR}"/${PN}-4.4-history-alloclist.patch
-
 	# Clean out local libs so we know we use system ones w/releases.
 	if [[ ${PV} != *_rc* ]] ; then
 		rm -rf lib/{readline,termcap}/*

diff --git a/app-shells/bash/files/bash-4.4-history-alloclist.patch b/app-shells/bash/files/bash-4.4-history-alloclist.patch
deleted file mode 100644
index 8072bde..00000000
--- a/app-shells/bash/files/bash-4.4-history-alloclist.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-*** ../bash-4.4/lib/readline/history.c	2015-12-28 13:50:31.000000000 -0500
---- lib/readline/history.c	2016-09-30 14:28:40.000000000 -0400
-***************
-*** 58,61 ****
---- 58,63 ----
-  #define DEFAULT_HISTORY_INITIAL_SIZE	502
-  
-+ #define MAX_HISTORY_INITIAL_SIZE	8192
-+ 
-  /* The number of slots to increase the_history by. */
-  #define DEFAULT_HISTORY_GROW_SIZE 50
-***************
-*** 308,312 ****
-  	{
-  	  if (history_stifled && history_max_entries > 0)
-! 	    history_size = history_max_entries + 2;
-  	  else
-  	    history_size = DEFAULT_HISTORY_INITIAL_SIZE;
---- 310,316 ----
-  	{
-  	  if (history_stifled && history_max_entries > 0)
-! 	    history_size = (history_max_entries > MAX_HISTORY_INITIAL_SIZE)
-! 				? MAX_HISTORY_INITIAL_SIZE
-! 				: history_max_entries + 2;
-  	  else
-  	    history_size = DEFAULT_HISTORY_INITIAL_SIZE;