mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-17 09:56:59 +02:00
Merge pull request #187 from kinvolk/sayan/update-readline-8.0
sys-libs/readline: Sync with Gentoo upstream; updates to 8.1
This commit is contained in:
commit
6f9eb8dd31
@ -1,34 +1,2 @@
|
||||
DIST readline-4.3.tar.gz 961662 BLAKE2B a7267200b79c8010d08f8aaa4e0ed357eaddb970287b262404074a1e50b0d7865bcee5492730808dc998799a1b64685d3bd91fb7098d1da778e40a2364f16126 SHA512 4dbc4d9f16a453f8cf6adefb5723b0f35ef79b8db7dcdfcdd2d6465cb62ca961035e5e9547bfa46d4cb1370d738b042e0e10f9233c3751925c6bccab41e7d182
|
||||
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 readline43-001 1126 BLAKE2B 42e7637b71936b59334dae72589b8b44256af7d3c79bec28490e13fa1fea954ce42afc1f51bb1d592da14c403d0c64565fa8823874d305ad385962b462536b5f SHA512 1bfcaf9fd36d154230682ef66a9561281822f09629f9923acfbacbaafd650974b4d94267e1bf74ab4a66f0e2da95e64894c78373c82bee593bd9afbae4af58bc
|
||||
DIST readline43-002 738 BLAKE2B b4aca8deb8e32c94228c41e6a1e9dd2865e01662b6a8e28307e64b260f4a614d17949cab68aea0c4d2c9ca32a888f11a753cf6849a0a95fc5e9b315ea7e20a1d SHA512 546a7bfab27dd0b77f8b0683b82358a295d47e4e249e01d2e49612a2f113c18580c8276b17451e1edab61a26ddcff0267457a804120d5e0052dfe8e88632ddd2
|
||||
DIST readline43-003 2202 BLAKE2B 435bf8c01a2c8419e97550c421945e11ad0d6f3326181c2e9e9c66d8baf12b4dc30894bad590532f917bbf30568e93439b49054c7b023179d5dd95aa309a8f8d SHA512 fbabbe5a11c2a17dd0cb47adfb40940c860069f0e99b1478546b0351471663094d032c8049e1a2ca060f4b51835bb6a824276e1864a627711e0805268386cb8e
|
||||
DIST readline43-004 3140 BLAKE2B 1032175956801dbf7435a2a162066c69b73d6c066bab7a1e80277c6190f6f81fc30ae002df7e32c98d6a43c11313de97937168fb149c323785a46747102cb4ed SHA512 8bc87915f5340f7f88266af0bb3aa976b40d8636373def11ec23dc412d112bc314eeac5ee2832be7993a03f2d0e38643964e838d69321c7d3e2e9ea1c606df79
|
||||
DIST readline43-005 1056 BLAKE2B 67905f87ec2042cc403cc1f8de2efccd74273aeddb4f32109ee226915f816a24f55102a130e66cb1b216115b619a3642901a892311e100f7ee95a39bcfcc725d SHA512 853fcb9cacce7a9ad0d29abe979a60291253fcb3fcae1fc067718a75d123ceb16e60d11a31583c8b5bd217d5f2460ebc77d8d2c89487a7331627348d5901281c
|
||||
DIST readline52-001 874 BLAKE2B c1ad1cc90dadcc01fa14a3315eb6317ad7640d1503d0d31309d912a19d295ad7eef1d8155a619c61728f78e5455b3e12d0d52cfef5aa7a2c06fecc9b5fe806d2 SHA512 65b92b5e03c20566eb3c7626e3ee9631e2b26932c34f2f95d88ae731df2805bcf63fc1215b97c97a2948e83b9373e3985ca1f64a598d84f1457bb33b605e5d9c
|
||||
DIST readline52-002 1433 BLAKE2B 90ff0d1cff96d3f06e33d25570519aff602fc71f65ae508dc565586a0d729674011619ad973a321b2ebc84a184b6eb487a0eceff02c1cbbf641759136ddcd8c0 SHA512 9d5b5549c355e80608d76b532bdf358a4e26dac0b62f7c51055bb15ea831a74ad2ef25391ddc2b1615bff8974a2e89a8045567fb0c6d2726dde37aa02a0e6b31
|
||||
DIST readline52-003 1204 BLAKE2B c6327edd4c483ba122fa68cb5a06825e8bd0df83ff87294347a1fd923111b5dc7c309c9b6f9fbd9a53ba36a4a53e57d00fdbfec441012be37298bba2fec0d0be SHA512 7f1722adea9bb9a94277cfbc66d47f600654a0d43bce7def1405e1bb925e5fb324615dd588d1ff2555e6bdebbe3b4609237ba7f52d80689a45f80935e440a37c
|
||||
DIST readline52-004 2192 BLAKE2B 0bd5fba77facfe4a445b19394b1de5186fe976d038283342a9f0d068a2e69e55127fdfd7c7fe67c3549b16f8d3d807d61b9bebdbc23c5adbd188ab8969621298 SHA512 e0c0f87ca14a3d473aa31627385f1cb9c2daaf685d8bc0c25bfb2214d5665077a74c4589e3ff5bbc6d0e8b5321ac7fe0c4f7620761d46bbdca787a751e6dbd02
|
||||
DIST readline52-005 8029 BLAKE2B 16c9208e451630566595c668b3f69d49257186543dd82e70d34d422c9e59cc57b6d5b0ed2be0c0afb769021c832915c3f9cfb3889e7ebcfb4a653658dbf26ea8 SHA512 bd7af4e71f1572811b37bccb68d5ebc20f2e7c21850d9ec55bc48fdf756f9ebaac888b0fc6d83b70e94e335056646e5021ec86b26100a976883ff72ee6d8d521
|
||||
DIST readline52-006 2820 BLAKE2B 4b6dbd3ad093f31deaeee388854e471d38859252ad127e319dc65de42ae98746cd2d1783df09cbd7f1379d8d4171b74f31da07f9560c2bb882bd374502d08dc9 SHA512 3523800517b24fa512f3bc8750ecb83be73d57c7d48636ac3aa6b681ee185b6460ce8461a046734b64d78834f89d18d4c9c1de92d1eee94294eeae7e2911ce93
|
||||
DIST readline52-007 1523 BLAKE2B 8a7a47bf5647b162f36c32c5572481803f3bc6f203db55780f706aed2881ee1a21f4be8f47677ce3d6609ff8d4128e0a068c32d765fc6ed64239673ce7c12b21 SHA512 fe9471b237713ef7ce53fd0cf7bbb5a60720c64ec3df9dc58146d9c187511f0a6f480ae3f3b65168723e416ba4f08c67a2add0b01ede1149f72e7fc2ef21050f
|
||||
DIST readline52-008 2277 BLAKE2B c03d7f8f7d4e1b6215552dd9c11f0766d9c413633a052ee2364f007767bb0ac323727320f84292eb2d4cece5c696bbce32b59bf74daa7b8f05d8ff864a8a87ad SHA512 a864e970006146533dac885b00f53dcf1471f95d6143d8874fe8c8e056477d6c237cf2814625bf2031844285484757fa0ccf66d064ac2065ac62a21384d67c93
|
||||
DIST readline52-009 1332 BLAKE2B 79a59ff0b88c243abc1772ebd2ac20db02e714193c0db173d449df45d7da043e3641cfa8ee21a7e4d1682bb380364ae9bfd80699b35af79f9213fd6a93ae65c5 SHA512 a19ca5b5875208f8ea4804461c1ba1b0e27feabb0a2a0db1fe9ea94b8d84e366e754688f5d8840f48c6bc22a02b0abcbaf35dd3361784b7db4e9e83629d840be
|
||||
DIST readline52-010 1543 BLAKE2B 72d41d913e89ade35d5771090e6ed138b52cc405bf81924aaf42e6e99587d38dd5b9678f3f98a47019663295f619a5323a8e177c33c84d02235e6d7013d53c02 SHA512 851b7ee9fa3ab84e570723d445ade084fbb5af17fd4131520650f53000e93cb7c799c56cb00e8f906b230524b2fdda60970e72a44d1673d9bcd2c4de7ae400f8
|
||||
DIST readline52-011 886 BLAKE2B d1c308f766e25e7f8105264ace08a6e979b4b7781ff39ac2b2fb63ef98e35971c012a69a4cb037fb9d984531aa6f50d530f40853d535127eb188ae3876002a6f SHA512 b4d813c3aa9c1f35962ea8ca6ad1abb34f4ed3ab91dd31eb1fc5e9b9e54da032e6fbfea583e472cc6d8c6baa4f2ad8f63efc22c749fd713e0704474aad74f0ae
|
||||
DIST readline52-012 3870 BLAKE2B d448fd35898a182aec77fda4db392d308bbbd2f3619318c13362c5ccb9c62271ddfd843420deedb85a7bbcd3ac8b1380c15f5c535c157a5a164564ec97e681a8 SHA512 2964c1c3a234223216ca3a099c42d8ee7de94fa7bee73ac346cc9991b9a11ad0406d3f9d785548f15170bf803714f4ffb0c2dfad19bb633358805c9b2e2873d3
|
||||
DIST readline52-013 5147 BLAKE2B e111ac594922d5cb095b33bdca3e0a1255db597f68c577df85ea9675a003763f7572ad31f094249be3d643ec6f8277509a09c2dcff8fbb980e516a9ecfef672e SHA512 6c9addc3b130d5f034488cc9506f22bd183794fd1a8ac820c674b39761c8c47df1b69dc41c8be60054a068b2ae5fb63a76268b977ea07b33a8fcc4a829b55a8f
|
||||
DIST readline52-014 1244 BLAKE2B 421af06b92cfc59b2ec0fa9ae59c99e91a26542210f258667d5a44a8b1a119da7b58d2a0410f7690eeb5ace98a2797bddabaabf28175d650cb48c974f522ae59 SHA512 d262861e67b79059de3967ba820ce02a7d28eff33175ecb30b748d24c08f3a151da3c53430fc2d26da5934f198075c55d2f616b93fabd297d60b9c82bae17cf0
|
||||
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 ab217bd9d27f30351397db2b745cb33ac7e0ce18bbc00112bb87570da0f62ee0e8d182395c97e4ecc21af51e7e1e580ba48076de1095c556f0744475e4019821 SHA512 4402186905af8cd42c609d640c2e13b9ad61c7778e5a3fd2c2d9da301f0deab05b04d7836f31527262f44f406517823dbb18cb07f2c73931186c806b494699ec
|
||||
DIST readline70-002 2953 BLAKE2B 47d729b1babe904855fe5d4f780a5b2153a743def527479c3cb82759cdee5bb4260be722e1050be680f5c0dd6dec8ca25c4c1ff557415abae6b3fac2bd481f0b SHA512 13d1489578508d4d2c3a1618024198a709dbce74a6bbf0f6d7ec67d2419c55bfec9f0ca9de0ed93f129d21d5c3a94307ccdc49408455bbb301c5e3a772b03185
|
||||
DIST readline70-003 1294 BLAKE2B 9473e18b582fba69cea83e3f5b9fa278dd8b0544325439307d2b4053cbeca8d2f008104bee181ae5d9405d702e6d3bcf26379c4d46e269906474c8544367b780 SHA512 eaf962a1480eb3870519017b81ecc5cef171e4c41fcf8c17da61ccbfd0379ed6bca85c17b03e2207ae4d51509f33fd010294c75f4bd0433a52118015d4160385
|
||||
DIST readline-8.1.tar.gz 2993288 BLAKE2B f0feca1ea3517b2b613adacac8c997cce0e86aa2f410c82a40ce1a2e128067112b4c68dbf25b808291c28c47583345abac994ce10b8d117958afcb96ee5e7c69 SHA512 27790d0461da3093a7fee6e89a51dcab5dc61928ec42e9228ab36493b17220641d5e481ea3d8fee5ee0044c70bf960f55c7d3f1a704cf6b9c42e5c269b797e00
|
||||
DIST readline81-001 2454 BLAKE2B 7ec4e5c39a224a70643b44b88bcfef5198e199c76f2a34f0b0ce24f1747dd46be49ddf93871c474cda64322b4358127fec4c2401d19422f84934546bbe1f3bf2 SHA512 cfbef10bdeb562a302ccf214878d02ebadf799343b3d2d7996a282f81bcfde83997ba6dcc9a8477af4dd7c73bca74105ca00a81e42ed13321672bd2930550e54
|
||||
|
@ -1,26 +0,0 @@
|
||||
https://lists.gnu.org/archive/html/bug-bash/2014-08/msg00082.html
|
||||
|
||||
From 2774192e93991e3d85ccc37c714aa018e442af6d Mon Sep 17 00:00:00 2001
|
||||
From: Dylan Cali <calid1984@gmail.com>
|
||||
Date: Sat, 23 Aug 2014 02:26:05 -0500
|
||||
Subject: [PATCH] fix vi search prompt bug for long prompts
|
||||
|
||||
---
|
||||
display.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/display.c b/display.c
|
||||
index 4df1f73..e575b16 100644
|
||||
--- a/display.c
|
||||
+++ b/display.c
|
||||
@@ -2259,7 +2259,7 @@ rl_message (va_alist)
|
||||
va_start (args);
|
||||
format = va_arg (args, char *);
|
||||
#endif
|
||||
- vsnprintf (msg_buf, msg_bufsiz - 1, format, args);
|
||||
+ vsnprintf (msg_buf, msg_bufsiz, format, args);
|
||||
}
|
||||
#else
|
||||
vsprintf (msg_buf, format, args);
|
||||
--
|
||||
1.7.10.4
|
@ -1,54 +0,0 @@
|
||||
http://lists.gnu.org/archive/html/bug-bash/2014-12/msg00152.html
|
||||
|
||||
*** ../bash-4.3-patched/lib/readline/readline.c 2014-10-01 13:08:28.000000000 -0400
|
||||
--- lib/readline/readline.c 2014-12-20 22:37:28.000000000 -0500
|
||||
***************
|
||||
*** 580,592 ****
|
||||
}
|
||||
|
||||
! /* EOF typed to a non-blank line is a <NL>. If we want to change this,
|
||||
! to force any existing line to be ignored when read(2) reads EOF,
|
||||
! for example, this is the place to change. */
|
||||
if (c == EOF && rl_end)
|
||||
! c = NEWLINE;
|
||||
|
||||
/* The character _rl_eof_char typed to blank line, and not as the
|
||||
! previous character is interpreted as EOF. */
|
||||
! if (((c == _rl_eof_char && lastc != c) || c == EOF) && !rl_end)
|
||||
{
|
||||
#if defined (READLINE_CALLBACKS)
|
||||
--- 587,620 ----
|
||||
}
|
||||
|
||||
! /* EOF typed to a non-blank line is ^D the first time, EOF the second
|
||||
! time in a row. This won't return any partial line read from the tty.
|
||||
! If we want to change this, to force any existing line to be returned
|
||||
! when read(2) reads EOF, for example, this is the place to change. */
|
||||
if (c == EOF && rl_end)
|
||||
! {
|
||||
! if (RL_SIG_RECEIVED ())
|
||||
! {
|
||||
! RL_CHECK_SIGNALS ();
|
||||
! if (rl_signal_event_hook)
|
||||
! (*rl_signal_event_hook) (); /* XXX */
|
||||
! }
|
||||
!
|
||||
! /* XXX - reading two consecutive EOFs returns EOF */
|
||||
! if (RL_ISSTATE (RL_STATE_TERMPREPPED))
|
||||
! {
|
||||
! if (lastc == _rl_eof_char || lastc == EOF)
|
||||
! rl_end = 0;
|
||||
! else
|
||||
! c = _rl_eof_char;
|
||||
! }
|
||||
! else
|
||||
! c = NEWLINE;
|
||||
! }
|
||||
|
||||
/* The character _rl_eof_char typed to blank line, and not as the
|
||||
! previous character is interpreted as EOF. This doesn't work when
|
||||
! READLINE_CALLBACKS is defined, so hitting a series of ^Ds will
|
||||
! erase all the chars on the line and then return EOF. */
|
||||
! if (((c == _rl_eof_char && lastc != c) || c == EOF) && rl_end == 0)
|
||||
{
|
||||
#if defined (READLINE_CALLBACKS)
|
@ -1,152 +0,0 @@
|
||||
--- a/colors.c
|
||||
+++ b/colors.c
|
||||
@@ -37,6 +37,10 @@
|
||||
#include "posixstat.h" // stat related macros (S_ISREG, ...)
|
||||
#include <fcntl.h> // S_ISUID
|
||||
|
||||
+#ifndef S_ISDIR
|
||||
+#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
|
||||
+#endif
|
||||
+
|
||||
// strlen()
|
||||
#if defined (HAVE_STRING_H)
|
||||
# include <string.h>
|
||||
@@ -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 don't want to leave the history file
|
||||
owned by root. */
|
||||
if (rv == 0 && exists)
|
||||
mode = chown (histname, finfo.st_uid, finfo.st_gid);
|
||||
+#endif
|
||||
|
||||
FREE (histname);
|
||||
FREE (tempname);
|
||||
--- a/input.c
|
||||
+++ b/input.c
|
||||
@@ -71,6 +71,10 @@ extern int errno;
|
||||
#include "rlshell.h"
|
||||
#include "xmalloc.h"
|
||||
|
||||
+#if defined (__MINGW32__)
|
||||
+#include <conio.h>
|
||||
+#endif
|
||||
+
|
||||
/* What kind of non-blocking I/O do we have? */
|
||||
#if !defined (O_NDELAY) && defined (O_NONBLOCK)
|
||||
# define O_NDELAY O_NONBLOCK /* Posix style */
|
||||
--- a/posixstat.h
|
||||
+++ b/posixstat.h
|
||||
@@ -78,30 +78,44 @@
|
||||
|
||||
#if defined (S_IFBLK) && !defined (S_ISBLK)
|
||||
#define S_ISBLK(m) (((m)&S_IFMT) == S_IFBLK) /* block device */
|
||||
+#elif !defined (S_IFBLK)
|
||||
+#define S_ISBLK(m) 0
|
||||
#endif
|
||||
|
||||
#if defined (S_IFCHR) && !defined (S_ISCHR)
|
||||
#define S_ISCHR(m) (((m)&S_IFMT) == S_IFCHR) /* character device */
|
||||
+#elif !defined (S_IFCHR)
|
||||
+#define S_ISCHR(m) 0
|
||||
#endif
|
||||
|
||||
#if defined (S_IFDIR) && !defined (S_ISDIR)
|
||||
#define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) /* directory */
|
||||
+#elif !defined (S_IFDIR)
|
||||
+#define S_ISDIR(m) 0
|
||||
#endif
|
||||
|
||||
#if defined (S_IFREG) && !defined (S_ISREG)
|
||||
#define S_ISREG(m) (((m)&S_IFMT) == S_IFREG) /* file */
|
||||
+#elif !defined (S_IFREG)
|
||||
+#define S_ISREG(m) 0
|
||||
#endif
|
||||
|
||||
#if defined (S_IFIFO) && !defined (S_ISFIFO)
|
||||
#define S_ISFIFO(m) (((m)&S_IFMT) == S_IFIFO) /* fifo - named pipe */
|
||||
+#elif !defined (S_IFIFO)
|
||||
+#define S_ISFIFO(m) 0
|
||||
#endif
|
||||
|
||||
#if defined (S_IFLNK) && !defined (S_ISLNK)
|
||||
#define S_ISLNK(m) (((m)&S_IFMT) == S_IFLNK) /* symbolic link */
|
||||
+#elif !defined (S_IFLNK)
|
||||
+#define S_ISLNK(m) 0
|
||||
#endif
|
||||
|
||||
#if defined (S_IFSOCK) && !defined (S_ISSOCK)
|
||||
#define S_ISSOCK(m) (((m)&S_IFMT) == S_IFSOCK) /* socket */
|
||||
+#elif !defined (S_IFSOCK)
|
||||
+#define S_ISSOCK(m) 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -137,6 +151,8 @@
|
||||
/* These are non-standard, but are used in builtins.c$symbolic_umask() */
|
||||
#define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH)
|
||||
#define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH)
|
||||
+#if defined(S_IXUSR) && defined(S_IXOTH)
|
||||
#define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH)
|
||||
+#endif
|
||||
|
||||
#endif /* _POSIXSTAT_H_ */
|
@ -1,14 +0,0 @@
|
||||
https://lists.gnu.org/archive/html/bug-readline/2016-11/msg00000.html
|
||||
|
||||
fix from upstream
|
||||
|
||||
--- a/readline.h
|
||||
+++ b/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));
|
@ -0,0 +1,41 @@
|
||||
darwin: don't do multi-arch stuff, just build a normal shared library
|
||||
|
||||
--- a/support/shobj-conf
|
||||
+++ b/support/shobj-conf
|
||||
@@ -180,34 +180,8 @@
|
||||
SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
|
||||
SHLIB_LIBSUFF='dylib'
|
||||
|
||||
- # unused at this time
|
||||
- SHLIB_SONAME='$(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF)'
|
||||
-
|
||||
- case "${host_os}" in
|
||||
- # Darwin versions 1, 5, 6, 7 correspond to Mac OS X 10.0, 10.1, 10.2,
|
||||
- # and 10.3, respectively.
|
||||
- darwin[1-7].*)
|
||||
- SHOBJ_STATUS=unsupported
|
||||
- SHOBJ_LDFLAGS='-dynamic'
|
||||
- SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -v'
|
||||
- ;;
|
||||
- # Darwin 8 == Mac OS X 10.4; Mac OS X 10.N == Darwin N+4
|
||||
- *)
|
||||
- case "${host_os}" in
|
||||
- darwin[89]*|darwin1[012]*)
|
||||
- SHOBJ_ARCHFLAGS='-arch_only `/usr/bin/arch`'
|
||||
- ;;
|
||||
- *) # Mac OS X 10.9 (Mavericks) and later
|
||||
- SHOBJ_ARCHFLAGS=
|
||||
- # for 32 and 64bit universal library
|
||||
- #SHOBJ_ARCHFLAGS='-arch i386 -arch x86_64'
|
||||
- #SHOBJ_CFLAGS=${SHOBJ_CFLAGS}' -arch i386 -arch x86_64'
|
||||
- ;;
|
||||
- esac
|
||||
- SHOBJ_LDFLAGS="-dynamiclib -dynamic -undefined dynamic_lookup ${SHOBJ_ARCHFLAGS}"
|
||||
- SHLIB_XLDFLAGS="-dynamiclib ${SHOBJ_ARCHFLAGS}"' -install_name $(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -v'
|
||||
- ;;
|
||||
- esac
|
||||
+ SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup'
|
||||
+ SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/`basename $@ $(SHLIB_MINOR)$(SHLIB_DOT)$(SHLIB_LIBSUFF)`$(SHLIB_DOT)$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR)'
|
||||
|
||||
SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1
|
||||
;;
|
17
sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-8.0-headers.patch
vendored
Normal file
17
sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-8.0-headers.patch
vendored
Normal file
@ -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/rlmbutil.h>
|
||||
^~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
--- 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
|
@ -0,0 +1,23 @@
|
||||
fix from upstream
|
||||
|
||||
commit 4be5608573b2be2e31f3d2a01446e22e1c9d7839
|
||||
Author: Chet Ramey <chet.ramey@case.edu>
|
||||
Date: Wed Jan 27 11:49:50 2021 -0500
|
||||
|
||||
commit bash-20210122 snapshot
|
||||
|
||||
diff --git a/lib/readline/signals.c b/lib/readline/signals.c
|
||||
index 0943c643b27d..ecaf699e9261 100644
|
||||
--- a/signals.c
|
||||
+++ b/signals.c
|
||||
@@ -266,8 +266,10 @@ _rl_handle_signal (int sig)
|
||||
case SIGQUIT:
|
||||
#endif
|
||||
|
||||
+#if defined (HAVE_POSIX_SIGNALS)
|
||||
if (block_sig)
|
||||
sigprocmask (SIG_BLOCK, &set, &oset);
|
||||
+#endif
|
||||
|
||||
rl_echo_signal_char (sig);
|
||||
rl_cleanup_after_signal ();
|
@ -8,4 +8,7 @@
|
||||
<use>
|
||||
<flag name="utils">Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:gnu:readline</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
@ -1,64 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
# This version is just for the ABI .4 library
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils multilib-minimal flag-o-matic
|
||||
|
||||
# Official patches
|
||||
# See ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/
|
||||
PLEVEL=${PV##*_p}
|
||||
MY_PV=${PV/_p*}
|
||||
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
|
||||
fi
|
||||
}
|
||||
|
||||
DESCRIPTION="Another cute console display library"
|
||||
HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
|
||||
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="${PV:0:1}"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=sys-libs/ncurses-5.2-r2:0=[${MULTILIB_USEDEP}]"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
|
||||
# force ncurses linking #71420
|
||||
sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
append-cppflags -D_GNU_SOURCE
|
||||
ECONF_SOURCE=${S} \
|
||||
econf --with-curses --disable-static
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
emake -C shlib
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake -C shlib DESTDIR="${D}" install
|
||||
rm -f "${D}"/usr/lib*/*.so
|
||||
}
|
@ -1,65 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
# This version is just for the ABI .5 library
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils multilib-minimal flag-o-matic
|
||||
|
||||
# Official patches
|
||||
# See ftp://ftp.cwru.edu/pub/bash/readline-5.1-patches/
|
||||
PLEVEL=${PV##*_p}
|
||||
MY_PV=${PV/_p*}
|
||||
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
|
||||
fi
|
||||
}
|
||||
|
||||
DESCRIPTION="Another cute console display library"
|
||||
HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
|
||||
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="${PV:0:1}"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=sys-libs/ncurses-5.2-r2:0=[${MULTILIB_USEDEP}]"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
|
||||
epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
|
||||
# force ncurses linking #71420
|
||||
sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
append-cppflags -D_GNU_SOURCE
|
||||
ECONF_SOURCE=${S} \
|
||||
econf --with-curses --disable-static
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
emake -C shlib
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake -C shlib DESTDIR="${D}" install
|
||||
rm -f "${D}"/usr/lib*/*.so
|
||||
}
|
@ -1,163 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
|
||||
|
||||
# Official patches
|
||||
# See ftp://ftp.cwru.edu/pub/bash/readline-6.3-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
|
||||
fi
|
||||
}
|
||||
|
||||
DESCRIPTION="Another cute console display library"
|
||||
HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
|
||||
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
|
||||
IUSE="static-libs utils"
|
||||
|
||||
RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-5.0-no_rpath.patch
|
||||
"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
|
||||
"${FILESDIR}"/${PN}-6.3-fix-long-prompt-vi-search.patch
|
||||
"${FILESDIR}"/${PN}-6.3-read-eof.patch
|
||||
)
|
||||
|
||||
src_unpack() {
|
||||
unpack ${MY_P}.tar.gz
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
|
||||
epatch "${PATCHES[@]}"
|
||||
|
||||
# Force ncurses linking. #71420
|
||||
# Use pkg-config to get the right values. #457558
|
||||
local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
|
||||
sed -i \
|
||||
-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
|
||||
support/shobj-conf || die
|
||||
sed -i \
|
||||
-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
|
||||
examples/rlfe/configure || die
|
||||
|
||||
# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
|
||||
# objformat for years, so we don't want to rely on that.
|
||||
sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
|
||||
|
||||
ln -s ../.. examples/rlfe/readline # for local readline headers
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# fix implicit decls with widechar funcs
|
||||
append-cppflags -D_GNU_SOURCE
|
||||
# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
|
||||
append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
|
||||
|
||||
# Make sure configure picks a better ar than `ar`. #484866
|
||||
export ac_cv_prog_AR=$(tc-getAR)
|
||||
|
||||
# Force the test since we used sed above to force it.
|
||||
export bash_cv_termcap_lib=ncurses
|
||||
|
||||
# Control cross-compiling cases when we know the right answer.
|
||||
# In cases where the C library doesn't support wide characters, readline
|
||||
# itself won't work correctly, so forcing the answer below should be OK.
|
||||
if tc-is-cross-compiler ; then
|
||||
export bash_cv_func_sigsetjmp='present'
|
||||
export bash_cv_func_ctype_nonascii='yes'
|
||||
export bash_cv_wcwidth_broken='no' #503312
|
||||
fi
|
||||
|
||||
# This is for rlfe, but we need to make sure LDFLAGS doesn't change
|
||||
# so we can re-use the config cache file between the two.
|
||||
append-ldflags -L.
|
||||
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
ECONF_SOURCE=${S} \
|
||||
econf \
|
||||
--cache-file="${BUILD_DIR}"/config.cache \
|
||||
--docdir='$(datarootdir)'/doc/${PF} \
|
||||
--with-curses \
|
||||
$(use_enable static-libs static)
|
||||
|
||||
if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
|
||||
# code is full of AC_TRY_RUN()
|
||||
mkdir -p examples/rlfe || die
|
||||
cd examples/rlfe || die
|
||||
ECONF_SOURCE=${S}/examples/rlfe \
|
||||
econf --cache-file="${BUILD_DIR}"/config.cache
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
emake
|
||||
|
||||
if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
|
||||
# code is full of AC_TRY_RUN()
|
||||
cd examples/rlfe || die
|
||||
local l
|
||||
for l in readline history ; do
|
||||
ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
|
||||
ln -sf ../../lib${l}.a lib${l}.a
|
||||
done
|
||||
emake
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
default
|
||||
|
||||
if multilib_is_native_abi ; then
|
||||
gen_usr_ldscript -a readline history #4411
|
||||
|
||||
if use utils && ! tc-is-cross-compiler; then
|
||||
dobin examples/rlfe/rlfe
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
dodoc USAGE
|
||||
dohtml -r doc/.
|
||||
docinto ps
|
||||
dodoc doc/*.ps
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5}
|
||||
}
|
@ -1,163 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
|
||||
|
||||
# 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
|
||||
fi
|
||||
}
|
||||
|
||||
DESCRIPTION="Another cute console display library"
|
||||
HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
|
||||
case ${PV} in
|
||||
*_alpha*|*_beta*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" ;;
|
||||
*) SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" ;;
|
||||
esac
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0/7" # subslot matches SONAME major
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
|
||||
IUSE="static-libs utils"
|
||||
|
||||
RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_unpack() {
|
||||
unpack ${MY_P}.tar.gz
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
|
||||
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
|
||||
local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
|
||||
sed -i \
|
||||
-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
|
||||
support/shobj-conf || die
|
||||
sed -i \
|
||||
-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
|
||||
examples/rlfe/configure || die
|
||||
|
||||
# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
|
||||
# objformat for years, so we don't want to rely on that.
|
||||
sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
|
||||
|
||||
ln -s ../.. examples/rlfe/readline # for local readline headers
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# fix implicit decls with widechar funcs
|
||||
append-cppflags -D_GNU_SOURCE
|
||||
# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
|
||||
append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
|
||||
|
||||
# Make sure configure picks a better ar than `ar`. #484866
|
||||
export ac_cv_prog_AR=$(tc-getAR)
|
||||
|
||||
# Force the test since we used sed above to force it.
|
||||
export bash_cv_termcap_lib=ncurses
|
||||
|
||||
# Control cross-compiling cases when we know the right answer.
|
||||
# In cases where the C library doesn't support wide characters, readline
|
||||
# itself won't work correctly, so forcing the answer below should be OK.
|
||||
if tc-is-cross-compiler ; then
|
||||
export bash_cv_func_sigsetjmp='present'
|
||||
export bash_cv_func_ctype_nonascii='yes'
|
||||
export bash_cv_wcwidth_broken='no' #503312
|
||||
fi
|
||||
|
||||
# This is for rlfe, but we need to make sure LDFLAGS doesn't change
|
||||
# so we can re-use the config cache file between the two.
|
||||
append-ldflags -L.
|
||||
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
ECONF_SOURCE=${S} \
|
||||
econf \
|
||||
--cache-file="${BUILD_DIR}"/config.cache \
|
||||
--docdir='$(datarootdir)'/doc/${PF} \
|
||||
--with-curses \
|
||||
$(use_enable static-libs static)
|
||||
|
||||
if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
|
||||
# code is full of AC_TRY_RUN()
|
||||
mkdir -p examples/rlfe || die
|
||||
cd examples/rlfe || die
|
||||
ECONF_SOURCE=${S}/examples/rlfe \
|
||||
econf --cache-file="${BUILD_DIR}"/config.cache
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
emake
|
||||
|
||||
if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
|
||||
# code is full of AC_TRY_RUN()
|
||||
cd examples/rlfe || die
|
||||
local l
|
||||
for l in readline history ; do
|
||||
ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
|
||||
ln -sf ../../lib${l}.a lib${l}.a
|
||||
done
|
||||
emake
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
default
|
||||
|
||||
if multilib_is_native_abi ; then
|
||||
gen_usr_ldscript -a readline history #4411
|
||||
|
||||
if use utils && ! tc-is-cross-compiler; then
|
||||
dobin examples/rlfe/rlfe
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
dodoc USAGE
|
||||
dohtml -r doc/.
|
||||
docinto ps
|
||||
dodoc doc/*.ps
|
||||
}
|
||||
pkg_preinst() {
|
||||
# bug #29865
|
||||
# Reappeared in #595324 with paludis so keeping this for now...
|
||||
preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6}
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6}
|
||||
}
|
@ -1,9 +1,9 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
EAPI=7
|
||||
|
||||
inherit flag-o-matic multilib-minimal toolchain-funcs
|
||||
inherit flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript
|
||||
|
||||
# Official patches
|
||||
# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
|
||||
@ -28,7 +28,7 @@ patches() {
|
||||
}
|
||||
|
||||
DESCRIPTION="Another cute console display library"
|
||||
HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
|
||||
HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
|
||||
|
||||
case ${PV} in
|
||||
*_alpha*|*_beta*|*_rc*)
|
||||
@ -40,22 +40,26 @@ case ${PV} in
|
||||
esac
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0/7" # subslot matches SONAME major
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
|
||||
IUSE="static-libs utils"
|
||||
SLOT="0/8" # subslot matches SONAME major
|
||||
[[ "${PV}" == *_rc* ]] || \
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="static-libs +unicode utils"
|
||||
|
||||
RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-5.0-no_rpath.patch
|
||||
"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
|
||||
"${FILESDIR}"/${PN}-7.0-headers.patch
|
||||
"${FILESDIR}"/${PN}-7.0-missing-echo-proto.patch
|
||||
"${FILESDIR}"/${PN}-7.0-mingw.patch
|
||||
"${FILESDIR}"/${PN}-8.0-headers.patch
|
||||
"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
|
||||
"${FILESDIR}"/${PN}-8.1-windows-signals.patch
|
||||
)
|
||||
|
||||
# Needed because we don't want the patches being unpacked
|
||||
@ -70,7 +74,7 @@ src_prepare() {
|
||||
|
||||
# Force ncurses linking. #71420
|
||||
# Use pkg-config to get the right values. #457558
|
||||
local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
|
||||
local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
|
||||
sed -i \
|
||||
-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
|
||||
support/shobj-conf || die
|
||||
@ -166,9 +170,17 @@ multilib_src_install_all() {
|
||||
pkg_preinst() {
|
||||
# bug #29865
|
||||
# Reappeared in #595324 with paludis so keeping this for now...
|
||||
preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6}
|
||||
preserve_old_lib \
|
||||
/$(get_libdir)/lib{history,readline}$(get_libname 4) \
|
||||
/$(get_libdir)/lib{history,readline}$(get_libname 5) \
|
||||
/$(get_libdir)/lib{history,readline}$(get_libname 6) \
|
||||
/$(get_libdir)/lib{history,readline}$(get_libname 7)
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6}
|
||||
preserve_old_lib_notify \
|
||||
/$(get_libdir)/lib{history,readline}$(get_libname 4) \
|
||||
/$(get_libdir)/lib{history,readline}$(get_libname 5) \
|
||||
/$(get_libdir)/lib{history,readline}$(get_libname 6) \
|
||||
/$(get_libdir)/lib{history,readline}$(get_libname 7)
|
||||
}
|
Loading…
Reference in New Issue
Block a user