From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5221C1395E2 for ; Thu, 10 Nov 2016 06:03:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4152E0881; Thu, 10 Nov 2016 06:03:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AB2EBE0881 for ; Thu, 10 Nov 2016 06:03:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6765134165D for ; Thu, 10 Nov 2016 06:03:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CE3D324BA for ; Thu, 10 Nov 2016 06:03:07 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1478757693.6a6d6915dfc68f4a67a7e8c03265d9e02ed39425.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/bash/files/, app-shells/bash/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/bash/bash-4.4-r1.ebuild app-shells/bash/files/bash-4.4-history-alloclist.patch X-VCS-Directories: app-shells/bash/ app-shells/bash/files/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 6a6d6915dfc68f4a67a7e8c03265d9e02ed39425 X-VCS-Branch: master Date: Thu, 10 Nov 2016 06:03:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6a3534ea-4455-4995-a875-08632cabe4d3 X-Archives-Hash: 3f81e87f8a992c68c45c27929c965a0c commit: 6a6d6915dfc68f4a67a7e8c03265d9e02ed39425 Author: Mike Frysinger gentoo org> AuthorDate: Thu Nov 10 06:01:33 2016 +0000 Commit: Mike Frysinger gentoo 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;