[gentoo-commits] repo/gentoo:master commit in: sys-libs/readline/files/, sys-libs/readline/

2020-12-20 Thread Lars Wendler 
commit: 20a6be318ebc738b8ca0fb36e01499035277f39d
Author: John Helmert III  posteo  net>
AuthorDate: Thu Jul 30 19:08:10 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Dec 21 01:55:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20a6be31

sys-libs/readline: Security cleanup (drop <8)

Bug: https://bugs.gentoo.org/717924
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: John Helmert III  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/16911
Signed-off-by: Lars Wendler  gentoo.org>

 sys-libs/readline/Manifest |  15 --
 .../readline-6.3-fix-long-prompt-vi-search.patch   |  26 ---
 .../readline/files/readline-6.3-read-eof.patch |  54 ---
 sys-libs/readline/files/readline-7.0-mingw.patch   | 152 --
 .../files/readline-7.0-missing-echo-proto.patch|  14 --
 sys-libs/readline/readline-6.3_p8-r3.ebuild| 163 ---
 sys-libs/readline/readline-7.0_p5-r1.ebuild| 174 -
 7 files changed, 598 deletions(-)

diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 30df2545548..db9715837e8 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,20 +1,5 @@
-DIST readline-6.3.tar.gz 2468560 BLAKE2B 
24488ec141734c050ba985a93423692396f105619bae3ce5b109bc68a4f43862bcf3a6fb8d82fec1145d665cdb408765e179379bb35f008d09c441fa2e5739df
 SHA512 
f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401
-DIST readline-7.0.tar.gz 2910016 BLAKE2B 
679b8aa7ce003017b729e6d8d4cb69d0f991578441a3e69005090079e61f6aa48b7ad4d0b1f34b6041528cf33254a1bf3ddb05b60db53a06e443d7922d49d0d4
 SHA512 
18243189d39bf0d4c8a76cddcce75243c1bae8824c686e9b6ba352667607e5b10c5feb79372a1093c1c388d821841670702e940df12eae94bcebdeed90047870
 DIST readline-8.0.tar.gz 2975937 BLAKE2B 
95e08b28cc46582f036379413810ca40c97d4d3bc59a9e03e04e57d531573abfbe955f6f1cb86e39c208bf6c3f4c618cff70a87bec596d0b9120909d6c5a2f69
 SHA512 
41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f
 DIST readline-8.1.tar.gz 2993288 BLAKE2B 
f0feca1ea3517b2b613adacac8c997cce0e86aa2f410c82a40ce1a2e128067112b4c68dbf25b808291c28c47583345abac994ce10b8d117958afcb96ee5e7c69
 SHA512 
27790d0461da3093a7fee6e89a51dcab5dc61928ec42e9228ab36493b17220641d5e481ea3d8fee5ee0044c70bf960f55c7d3f1a704cf6b9c42e5c269b797e00
-DIST readline63-001 1366 BLAKE2B 
82af5be99597719329db3f1d6049e75a5654ccf6597cf557c71ad7ada0ac03be87381a7738931eb78716de65902ae87498f574b84150a69eae9cc308c4bfffdd
 SHA512 
e70f89ca52a4eae7e1cddd70de6a7162252231ee029c89bb3fcb0f6c8c8b46c666be910c8b2eee72e96983ec2f1a23663694dc222f67228d82e8e4684f1504a2
-DIST readline63-002 1297 BLAKE2B 
5ace4a81381910ee48dee8cdbb2ca95a1bef2d1f8acca6d39a910c078c86de10a0fc29486939b336110ecb0281b3edb16e4b985f41e7ee161904728f289fff04
 SHA512 
4e23bd67433577e6e361d10a6c32768ea9e13b10e77493e565b870f56069b673fbcb0b860225f79fa9931845fc91d35c9a82c1385c23f8b757ebfd59f27851f4
-DIST readline63-003 985 BLAKE2B 
cf2cda505b100d5f820d8bfc99eed6b50e65c92b6a495073352fc7385c6456478594e5c2dc293ce556b66853dff705050fb97982aa25fce452ae53d2cb272cf4
 SHA512 
6bfb84a5b980091b995e2b96bdf5680f97fe670e6cac1b8606d2d75a1ef922ff5bd4e73f029f7af98a115006b7ab7828146f2cd6986287543d8a29987c91dc12
-DIST readline63-004 1363 BLAKE2B 
c1aec93f1e23acd51b36068d3aac31b93ffd9c1039be2c45ff4e6479135f153888030c68cf19c5ced950f6fbbb38ee7fa644d5a737f3f8ed511e97bf342940f5
 SHA512 
6b683e9fe28831885135391b5a23bc580cacf0ffe720951a80f545574eda4eb064fe189801d44329b2eb2d3577db5a90f9e5ad9ed131e7e8a8ae349511632721
-DIST readline63-005 1664 BLAKE2B 
f98f62be8676aca81b91d919bc4eccfe40c382a8baab0e64b1659b714f0d72424e29b709cc5e226fd73daf67eef264a17e07982d2553ce80f5e5f39fad70610b
 SHA512 
b0332d7f999376788155341319d138a899a2278c338a6faaac89ecf3ed1e2248a07413dd810a76996bf25f211de787182b55f34ab3d7d31eb7519d7a48ebed32
-DIST readline63-006 1982 BLAKE2B 
ad6d16ff769eb8e367cf961ffe152c04778b046a04e4a62e0ce21d08fa16b0eca3d278dbdc274b082d24fa2ec959ffb62168ea7693b4de94b59a4526b1f0c4a2
 SHA512 
e9fbfa38d7b03ab2aff2e9e48918b85b4b67a729862ee47d1cc8e0aeb90c3224394a79f68829951e1377cae65742aa5385eae865f75e9c0b2e2abde42889431c
-DIST readline63-007 1428 BLAKE2B 
60e64c2dd36457e3992cfbfbbcc261337e515be360a37d71b9de236c62c781f10f0ec37e4e196b4634e5d547edebbf915370091ca42fff873b78cd80cfe3a7f2
 SHA512 
abee331894846b360203a521d9a66fa02c03214120d5cafbd1cb4d680bd7bbef14321ae845dd67f7b5e8c87322801fd96fc9a5fd0ae026b41d98dc24a8949854
-DIST readline63-008 1452 BLAKE2B 
4e41c45be1479fba9f74bf9cedb8d1f6237e650962d5b45ea1a61cc48a8323a0fa60d76f68c011b6e7c73a1078b5ff80f9966e983b994f814d471d0efd9efde6
 SHA512 
8e30bbca3aa5cea8c2ee511abe0ec8f131608d74fe5ab24d68bcf452267f0f97446ed6e7cd482360876ce6c027280e4f4450cae05eb18f56046240f4c224841c
-DIST readline70-001 1777 BLAKE2B

[gentoo-commits] repo/gentoo:master commit in: sys-libs/readline/files/, sys-libs/readline/

2019-01-07 Thread Lars Wendler 
commit: a2183713c540b7052f2bbf926be567adc7254ae3
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jan  7 23:05:48 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jan  7 23:07:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2183713

sys-libs/readline: Bump to version 8.0 (without KEYWORDS)

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 sys-libs/readline/Manifest |   1 +
 sys-libs/readline/files/readline-8.0-headers.patch |  17 ++
 sys-libs/readline/readline-8.0.ebuild  | 173 +
 3 files changed, 191 insertions(+)

diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 8a1588192c8..268cc05765b 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -2,6 +2,7 @@ DIST readline-4.3.tar.gz 961662 BLAKE2B 
a7267200b79c8010d08f8aaa4e0ed357eaddb970
 DIST readline-5.2.tar.gz 2037705 BLAKE2B 
df1012925f7cac8aa5d513097de97fa55c801993fbcf651e64468c0255cb27f7a2357613f8ab67791ab7799def57bde34376d3c41e65285689318f4b9cbedf84
 SHA512 
74318b32c56e888716bda2507228ecc374a24e85b2faeec4778227a9f04eb19de1fc8468c78746954c84f9e616a06dd0f8a4332ba4b438fefb7e222699baa379
 DIST readline-6.3.tar.gz 2468560 BLAKE2B 
24488ec141734c050ba985a93423692396f105619bae3ce5b109bc68a4f43862bcf3a6fb8d82fec1145d665cdb408765e179379bb35f008d09c441fa2e5739df
 SHA512 
f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401
 DIST readline-7.0.tar.gz 2910016 BLAKE2B 
679b8aa7ce003017b729e6d8d4cb69d0f991578441a3e69005090079e61f6aa48b7ad4d0b1f34b6041528cf33254a1bf3ddb05b60db53a06e443d7922d49d0d4
 SHA512 
18243189d39bf0d4c8a76cddcce75243c1bae8824c686e9b6ba352667607e5b10c5feb79372a1093c1c388d821841670702e940df12eae94bcebdeed90047870
+DIST readline-8.0.tar.gz 2975937 BLAKE2B 
95e08b28cc46582f036379413810ca40c97d4d3bc59a9e03e04e57d531573abfbe955f6f1cb86e39c208bf6c3f4c618cff70a87bec596d0b9120909d6c5a2f69
 SHA512 
41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f
 DIST readline43-001 1126 BLAKE2B 
42e7637b71936b59334dae72589b8b44256af7d3c79bec28490e13fa1fea954ce42afc1f51bb1d592da14c403d0c64565fa8823874d305ad385962b462536b5f
 SHA512 
1bfcaf9fd36d154230682ef66a9561281822f09629f9923acfbacbaafd650974b4d94267e1bf74ab4a66f0e2da95e64894c78373c82bee593bd9afbae4af58bc
 DIST readline43-002 738 BLAKE2B 
b4aca8deb8e32c94228c41e6a1e9dd2865e01662b6a8e28307e64b260f4a614d17949cab68aea0c4d2c9ca32a888f11a753cf6849a0a95fc5e9b315ea7e20a1d
 SHA512 
546a7bfab27dd0b77f8b0683b82358a295d47e4e249e01d2e49612a2f113c18580c8276b17451e1edab61a26ddcff0267457a804120d5e0052dfe8e88632ddd2
 DIST readline43-003 2202 BLAKE2B 
435bf8c01a2c8419e97550c421945e11ad0d6f3326181c2e9e9c66d8baf12b4dc30894bad590532f917bbf30568e93439b49054c7b023179d5dd95aa309a8f8d
 SHA512 
fbabbe5a11c2a17dd0cb47adfb40940c860069f0e99b1478546b0351471663094d032c8049e1a2ca060f4b51835bb6a824276e1864a627711e0805268386cb8e

diff --git a/sys-libs/readline/files/readline-8.0-headers.patch 
b/sys-libs/readline/files/readline-8.0-headers.patch
new file mode 100644
index 000..f19a3b136eb
--- /dev/null
+++ b/sys-libs/readline/files/readline-8.0-headers.patch
@@ -0,0 +1,17 @@
+Required by bash-5.0 or else compilation fails:
+
+ bashline.c:69:10: fatal error: readline/rlmbutil.h: No such file or directory
+  #include 
+   ^
+
+--- readline-8.0/Makefile.in
 readline-8.0/Makefile.in
+@@ -153,7 +153,7 @@
+ CREATED_TAGS = TAGS tags
+ 
+ INSTALLED_HEADERS = readline.h chardefs.h keymaps.h history.h tilde.h \
+-  rlstdc.h rlconf.h rltypedefs.h
++  rlstdc.h rlconf.h rltypedefs.h rlmbutil.h
+ 
+ OTHER_DOCS = $(srcdir)/CHANGES $(srcdir)/INSTALL $(srcdir)/README
+ OTHER_INSTALLED_DOCS = CHANGES INSTALL README

diff --git a/sys-libs/readline/readline-8.0.ebuild 
b/sys-libs/readline/readline-8.0.ebuild
new file mode 100644
index 000..8632bb9f9b2
--- /dev/null
+++ b/sys-libs/readline/readline-8.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+# Official patches
+# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+   [[ ${PLEVEL} -eq 0 ]] && return 1
+   local opt=$1
+   eval set -- {1..${PLEVEL}}
+   set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
+   if [[ ${opt} == -s ]] ; then
+   echo "${@/#/${DISTDIR}/}"
+   else
+   local u
+   for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
+   printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
+   done
+

[gentoo-commits] repo/gentoo:master commit in: sys-libs/readline/files/, sys-libs/readline/

2018-04-12 Thread Lars Wendler 
commit: a19fc243299db597a1897e8c423c98d19b092998
Author: Marty E. Plummer  startmail  com>
AuthorDate: Sun Mar 25 12:43:15 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Apr 12 15:29:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a19fc243

sys-libs/readline: EAPI bump and mingw-w64 patch

EAPI 6, patches reformatted to be -p1 (still usable for the older
ebuilds), upstreamish[1] patch added to support mingw-w64.
dohtml changed to HTML_DOCS einstalldocs. Removed src_unpack as
unneeded (probably a holdover from a much older version).

[1]: http://lists.gnu.org/archive/html/bug-readline/2018-01/msg1.html

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7616

 .../readline/files/readline-5.0-no_rpath.patch |   4 +-
 sys-libs/readline/files/readline-7.0-headers.patch |   4 +-
 sys-libs/readline/files/readline-7.0-mingw.patch   | 152 +++
 .../files/readline-7.0-missing-echo-proto.patch|   4 +-
 sys-libs/readline/readline-7.0_p3-r1.ebuild| 163 +
 5 files changed, 321 insertions(+), 6 deletions(-)

diff --git a/sys-libs/readline/files/readline-5.0-no_rpath.patch 
b/sys-libs/readline/files/readline-5.0-no_rpath.patch
index 624b2d7dea2..befad63e425 100644
--- a/sys-libs/readline/files/readline-5.0-no_rpath.patch
+++ b/sys-libs/readline/files/readline-5.0-no_rpath.patch
@@ -1,7 +1,7 @@
 ripped from Fedora
 
 support/shobj-conf
-+++ support/shobj-conf
+--- a/support/shobj-conf
 b/support/shobj-conf
 @@ -102,7 +102,7 @@
SHOBJ_LD='${CC}'
SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'

diff --git a/sys-libs/readline/files/readline-7.0-headers.patch 
b/sys-libs/readline/files/readline-7.0-headers.patch
index dfe4e22ad1a..892ec21f51e 100644
--- a/sys-libs/readline/files/readline-7.0-headers.patch
+++ b/sys-libs/readline/files/readline-7.0-headers.patch
@@ -9,8 +9,8 @@ Subject: [PATCH] include ctype.h for isdigit usage
 
 diff --git a/lib/readline/histexpand.c b/lib/readline/histexpand.c
 index 46a99aa62e30..13248db83048 100644
 a/lib/readline/histexpand.c
-+++ b/lib/readline/histexpand.c
+--- a/histexpand.c
 b/histexpand.c
 @@ -26,6 +26,7 @@
  #endif
  

diff --git a/sys-libs/readline/files/readline-7.0-mingw.patch 
b/sys-libs/readline/files/readline-7.0-mingw.patch
new file mode 100644
index 000..f003038d2c0
--- /dev/null
+++ b/sys-libs/readline/files/readline-7.0-mingw.patch
@@ -0,0 +1,152 @@
+--- a/colors.c
 b/colors.c
+@@ -37,6 +37,10 @@
+ #include "posixstat.h" // stat related macros (S_ISREG, ...)
+ #include  // S_ISUID
+ 
++#ifndef S_ISDIR
++#define   S_ISDIR(m)  (((m) & S_IFMT) == S_IFDIR)
++#endif
++
+ // strlen()
+ #if defined (HAVE_STRING_H)
+ #  include 
+@@ -182,12 +186,17 @@ _rl_print_color_indicator (const char *f
+   if (S_ISREG (mode))
+ {
+   colored_filetype = C_FILE;
+-
++#ifdef S_ISUID
+   if ((mode & S_ISUID) != 0 && is_colored (C_SETUID))
+ colored_filetype = C_SETUID;
+-  else if ((mode & S_ISGID) != 0 && is_colored (C_SETGID))
++  else
++#endif
++#ifdef S_ISGID
++  if ((mode & S_ISGID) != 0 && is_colored (C_SETGID))
+ colored_filetype = C_SETGID;
+-  else if (is_colored (C_CAP) && 0) //f->has_capability)
++  else
++#endif
++if (is_colored (C_CAP) && 0) //f->has_capability)
+ colored_filetype = C_CAP;
+   else if ((mode & S_IXUGO) != 0 && is_colored (C_EXEC))
+ colored_filetype = C_EXEC;
+@@ -211,12 +220,16 @@ _rl_print_color_indicator (const char *f
+ colored_filetype = C_STICKY;
+ #endif
+ }
++#if defined (S_ISLNK)
+   else if (S_ISLNK (mode))
+ colored_filetype = C_LINK;
++#endif
+   else if (S_ISFIFO (mode))
+ colored_filetype = C_FIFO;
++#if defined (S_ISSOCK)
+   else if (S_ISSOCK (mode))
+ colored_filetype = C_SOCK;
++#endif
+   else if (S_ISBLK (mode))
+ colored_filetype = C_BLK;
+   else if (S_ISCHR (mode))
+--- a/histfile.c
 b/histfile.c
+@@ -606,12 +606,14 @@ history_truncate_file (fname, lines)
+   history_lines_written_to_file = 0;
+ }
+ 
++#if defined (HAVE_CHOWN)
+   /* Make sure the new filename is owned by the same user as the old.  If one
+  user is running this, it's a no-op.  If the shell is running after sudo
+  with a shared history file, we don't want to leave the history file
+  owned by root. */
+   if (rv == 0 && exists)
+ r = chown (filename, finfo.st_uid, finfo.st_gid);
++#endif
+ 
+   xfree (filename);
+   FREE (tempname);
+@@ -753,12 +755,14 @@ mmap_error:
+   history_lines_written_to_file = 0;
+ }
+ 
++#if defined (HAVE_CHOWN)
+   /* Make sure the new filename is owned by the same user as the old.  If one
+  user is running this, it's a no-op.  If the shell is running after sudo
+  with a shared history file, we

[gentoo-commits] repo/gentoo:master commit in: sys-libs/readline/files/, sys-libs/readline/

2016-12-09 Thread Mike Frysinger 
commit: eebfd6c16cebfd78779e12215ef1a07e3bf0ebbf
Author: Mike Frysinger  gentoo  org>
AuthorDate: Fri Dec  9 19:08:12 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Fri Dec  9 19:08:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eebfd6c1

sys-libs/readline: add missing prototype from upstream

 .../readline/files/readline-7.0-missing-echo-proto.patch   | 14 ++
 .../{readline-7.0_p1.ebuild => readline-7.0_p1-r1.ebuild}  |  1 +
 2 files changed, 15 insertions(+)

diff --git a/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch 
b/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch
new file mode 100644
index ..fe945be
--- /dev/null
+++ b/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch
@@ -0,0 +1,14 @@
+https://lists.gnu.org/archive/html/bug-readline/2016-11/msg0.html
+
+fix from upstream
+
+--- a/lib/readline/readline.h
 b/lib/readline/readline.h
+@@ -413,6 +413,7 @@
+ extern void rl_tty_set_default_bindings PARAMS((Keymap));
+ extern void rl_tty_unset_default_bindings PARAMS((Keymap));
+ 
++extern int rl_tty_set_echoing PARAMS((int));
+ extern int rl_reset_terminal PARAMS((const char *));
+ extern void rl_resize_terminal PARAMS((void));
+ extern void rl_set_screen_size PARAMS((int, int));

diff --git a/sys-libs/readline/readline-7.0_p1.ebuild 
b/sys-libs/readline/readline-7.0_p1-r1.ebuild
similarity index 98%
rename from sys-libs/readline/readline-7.0_p1.ebuild
rename to sys-libs/readline/readline-7.0_p1-r1.ebuild
index 56fddcb..f460715 100644
--- a/sys-libs/readline/readline-7.0_p1.ebuild
+++ b/sys-libs/readline/readline-7.0_p1-r1.ebuild
@@ -54,6 +54,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
epatch "${FILESDIR}"/${PN}-7.0-headers.patch
+   epatch "${FILESDIR}"/${PN}-7.0-missing-echo-proto.patch
 
# Force ncurses linking. #71420
# Use pkg-config to get the right values. #457558

[gentoo-commits] repo/gentoo:master commit in: sys-libs/readline/files/, sys-libs/readline/

2016-11-18 Thread Lars Wendler 
commit: 0b8bb23ef469bbbf88a695582219c0a79fa19ba9
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Nov 18 09:02:52 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Nov 18 09:03:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b8bb23e

sys-libs/readline: Bump to version 7.0_p1. Removed old.

We already had the issue fixed in 7.0-r1 that 7.0_p1 is fixing but now we have
the official patch.

Package-Manager: portage-2.3.2

 sys-libs/readline/Manifest |  1 +
 .../files/readline-7.0-history-alloclist.patch | 29 --
 ...adline-7.0-r1.ebuild => readline-7.0_p1.ebuild} |  1 -
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 22a0b3d..296f740 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -35,3 +35,4 @@ DIST readline63-005 1664 SHA256 
877788f9228d1a9907a4bcfe3d6dd0439c08d728949458b4
 DIST readline63-006 1982 SHA256 
5c237ab3c6c97c23cf52b2a118adc265b7fb411b57c93a5f7c221d50fafbe556 SHA512 
e9fbfa38d7b03ab2aff2e9e48918b85b4b67a729862ee47d1cc8e0aeb90c3224394a79f68829951e1377cae65742aa5385eae865f75e9c0b2e2abde42889431c
 WHIRLPOOL 
7b88ad9fcad9eee0762d881307d2f865c66a9ee246bc1a648d6203677fc307759ca7ee216fb632114d3da76ca27a67222aefd830bcf99ee9a96d1ba2f2105290
 DIST readline63-007 1428 SHA256 
4d79b5a2adec3c2e8114cbd3d63c1771f7c6cf64035368624903d257014f5bea SHA512 
abee331894846b360203a521d9a66fa02c03214120d5cafbd1cb4d680bd7bbef14321ae845dd67f7b5e8c87322801fd96fc9a5fd0ae026b41d98dc24a8949854
 WHIRLPOOL 
fc9d866a6e0f0c2a2f752c65e6fcae56a1b0e1b5cef45154ff51b5d1b49fc75ffaa30bdf90c221fb6493381b9d67eb20168bdfd273fa0dd89602f18680bb3e5f
 DIST readline63-008 1452 SHA256 
3bc093cf526ceac23eb80256b0ec87fa1735540d659742107b6284d635c43787 SHA512 
8e30bbca3aa5cea8c2ee511abe0ec8f131608d74fe5ab24d68bcf452267f0f97446ed6e7cd482360876ce6c027280e4f4450cae05eb18f56046240f4c224841c
 WHIRLPOOL 
94d9371e6ca35e72565c1990e0ec8bedf8a141f0a3d061e4928f6184c3ef4a4b472f4278d443b990a53977ad6f3f7bdbf41e51a999202b48414df3a946bb9796
+DIST readline70-001 1777 SHA256 
9ac1b3ac2ec7b1bf0709af047f2d7d2a34ccde353684e57c6b47ebca77d7a376 SHA512 
4402186905af8cd42c609d640c2e13b9ad61c7778e5a3fd2c2d9da301f0deab05b04d7836f31527262f44f406517823dbb18cb07f2c73931186c806b494699ec
 WHIRLPOOL 
3f52c3e5b0c5a600585e58ed2e013cdba2dee47f3604e7db96b811d715618f19fd75835a5cd9790f582493a32f54993cbac69ee04fa6c73775f14741c215fd65

diff --git a/sys-libs/readline/files/readline-7.0-history-alloclist.patch 
b/sys-libs/readline/files/readline-7.0-history-alloclist.patch
deleted file mode 100644
index 73faa60..
--- a/sys-libs/readline/files/readline-7.0-history-alloclist.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/597006
-https://lists.gnu.org/archive/html/bug-bash/2016-10/msg00010.html
-
-*** ../bash-4.4/lib/readline/history.c 2015-12-28 13:50:31.0 -0500
 lib/readline/history.c 2016-09-30 14:28:40.0 -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;

diff --git a/sys-libs/readline/readline-7.0-r1.ebuild 
b/sys-libs/readline/readline-7.0_p1.ebuild
similarity index 98%
rename from sys-libs/readline/readline-7.0-r1.ebuild
rename to sys-libs/readline/readline-7.0_p1.ebuild
index aecaa1c..56fddcb 100644
--- a/sys-libs/readline/readline-7.0-r1.ebuild
+++ b/sys-libs/readline/readline-7.0_p1.ebuild
@@ -54,7 +54,6 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
epatch "${FILESDIR}"/${PN}-7.0-headers.patch
-   epatch "${FILESDIR}"/${PN}-7.0-history-alloclist.patch #597006
 
# Force ncurses linking. #71420
# Use pkg-config to get the right values. #457558

[gentoo-commits] repo/gentoo:master commit in: sys-libs/readline/files/, sys-libs/readline/

2016-08-11 Thread Mike Frysinger 
commit: ce243d53596e2b4f98f527bf35753e280b350fc4
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Aug 11 10:28:06 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Aug 11 12:58:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce243d53

sys-libs/readline: version bump to 7.0_beta2

 sys-libs/readline/Manifest |  2 +-
 sys-libs/readline/files/readline-7.0-headers.patch | 24 ++
 ...ne-7.0_rc1.ebuild => readline-7.0_beta2.ebuild} |  8 ++--
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 44e64fb..d52b1ac 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -2,7 +2,7 @@ DIST readline-4.3.tar.gz 961662 SHA256 
eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061
 DIST readline-5.2.tar.gz 2037705 SHA256 
12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45 SHA512 
74318b32c56e888716bda2507228ecc374a24e85b2faeec4778227a9f04eb19de1fc8468c78746954c84f9e616a06dd0f8a4332ba4b438fefb7e222699baa379
 WHIRLPOOL 
8641abf42316ab278207c0a25d9155d4d4fddaf0e704255b40708875b9f31bd3e6caf903550783c15b160bd2b86ffc129b2eb7a1fb4a641d8d58edc3b53145c3
 DIST readline-6.2.tar.gz 2277926 SHA256 
79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381 SHA512 
fa5b4f1b6f81bc0b3be0739adb06dab0668603ff256fe62b59ebfe21d5a9e340a758a8eef569df8c4c4ecb86cdd9698a6dabc2ee8c70a769de2bd5930c32ff59
 WHIRLPOOL 
5d92645085f253206c16533e3cb35bb382d6fe616bf2144feb06f9ffb9b4d7cc25ceaa846b98f17aa442552a0e80642a62d57fe20982e0ed8fdefb75c2f9bbf0
 DIST readline-6.3.tar.gz 2468560 SHA256 
56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43 SHA512 
f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401
 WHIRLPOOL 
7c68627559890dbebf1394b911cfd4675ec8862b84d4e067a207dd37a0a94482c8d92216195df2873bcdf03a0a86150663a9604cd65a0d78363376bc8ee4cfda
-DIST readline-7.0-rc1.tar.gz 2897058 SHA256 
bb7e9cd745e9e6609a560ae458c61c22e641cd731eed2c2a2b7bdd93ff80beac SHA512 
2a7b0e54bb79824c164f993839c585deff0bcf823cde38b8d48e2a13601df692123d40e0af39959b3b7e5c408b07876aac2d4422279cd18cd2802559a8cdb1f5
 WHIRLPOOL 
333e330e2d0dd0998d627bf845b24abaee6206c5449dfeab7ad89637014dec90678be9df32f47a5a48515a883ddd86c684dfb3b2e5ed61dbbdd48dab7a852887
+DIST readline-7.0-beta2.tar.gz 2899447 SHA256 
4b78c5998c588ff5a233a4cbfea08f1248c2d7febfafe82cee9479de9265e43f SHA512 
36ff46c63d89bca2d198ea32a37db9157ac55ce6369f5bccb3acfdfcd1a144551b4db4c907daef87773d8bdac57ce262a2b5f3c9598da85c7aba570fca9d55fb
 WHIRLPOOL 
5bb584d8b0b1582061fe8e5edb596335028826952010f20e0d910327cf1bb85dde532f8cb1134b77cc9fe3e2cc27c02307c9879ef12045b51897c0b90915fd13
 DIST readline43-001 1126 SHA256 
787244afefceeaf8bfbdc95eef0c4d163ab05ecf178bb631fff287354df0d955 SHA512 
1bfcaf9fd36d154230682ef66a9561281822f09629f9923acfbacbaafd650974b4d94267e1bf74ab4a66f0e2da95e64894c78373c82bee593bd9afbae4af58bc
 WHIRLPOOL 
080c0cffb0637bba2f6819524291c8efd1832b42b7ca619fda551b00ed82558d9c03a6f739b350b8a1de2c32e6ab92fd86137a9620473439c5b6ced6d3a06f91
 DIST readline43-002 738 SHA256 
3fd4694c4043b61010c44778ed61581073ac5ddee53436b0e4e1ad2bbe4da226 SHA512 
546a7bfab27dd0b77f8b0683b82358a295d47e4e249e01d2e49612a2f113c18580c8276b17451e1edab61a26ddcff0267457a804120d5e0052dfe8e88632ddd2
 WHIRLPOOL 
d3b43145a4ed207f353c5b95b52bdb81be31bd5b077ad60152799333ca582c7524c5587a4e0d9a0fc9246a114552f0c26933d2bc8f60e9de2536a8b6ec9f2cda
 DIST readline43-003 2202 SHA256 
346120970e3860c776e3cf5fd78e4f09b0d326a3b633a508f35f3f0b56f4412b SHA512 
fbabbe5a11c2a17dd0cb47adfb40940c860069f0e99b1478546b0351471663094d032c8049e1a2ca060f4b51835bb6a824276e1864a627711e0805268386cb8e
 WHIRLPOOL 
076d101812e7a98d445fd447d816fd0b15c9690869f4a567d76287c495c257f85e4e79f11f7e6e8354093613ca1c0a758514672cec98d303279daf597dee2577

diff --git a/sys-libs/readline/files/readline-7.0-headers.patch 
b/sys-libs/readline/files/readline-7.0-headers.patch
new file mode 100644
index 000..dfe4e22
--- /dev/null
+++ b/sys-libs/readline/files/readline-7.0-headers.patch
@@ -0,0 +1,24 @@
+From 4bc0aa68aff12a59628dd3c99a53360a9aa1ce93 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+Date: Thu, 11 Aug 2016 17:49:27 +0800
+Subject: [PATCH] include ctype.h for isdigit usage
+
+---
+ lib/readline/histexpand.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/readline/histexpand.c b/lib/readline/histexpand.c
+index 46a99aa62e30..13248db83048 100644
+--- a/lib/readline/histexpand.c
 b/lib/readline/histexpand.c
+@@ -26,6 +26,7 @@
+ #endif
+ 
+ #include 
++#include 
+ 
+ #if defined (HAVE_STDLIB_H)
+ #  include 
+-- 
+2.9.0
+

diff --git a/sys-libs/readline/readline-7.0_rc1.ebuild 
b/sys-libs/readline/readline-7.0_beta2.ebuild
similarity index 95%
rename from sys-libs/readline/readline-7.0_rc1.ebuild
rename to sys-libs/readline/readline-7.0_beta2.ebuild
index