Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Bash 5.1 and Readline 8.1
@ 2020-12-10 20:09 leahneukirchen
  2020-12-11  0:50 ` sgn
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: leahneukirchen @ 2020-12-10 20:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 323 bytes --]

There is a new pull request by leahneukirchen against master on the void-packages repository

https://github.com/leahneukirchen/void-packages bash51
https://github.com/void-linux/void-packages/pull/27083

Bash 5.1 and Readline 8.1


A patch file from https://github.com/void-linux/void-packages/pull/27083.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bash51-27083.patch --]
[-- Type: text/x-diff, Size: 6201 bytes --]

From 36f1759ccfc5f89620f62afe37e18703c07d36a6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 10 Dec 2020 21:05:18 +0100
Subject: [PATCH 1/2] bash: update to 5.1.

---
 srcpkgs/bash/template | 59 +++++++++++++++----------------------------
 1 file changed, 21 insertions(+), 38 deletions(-)

diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template
index 6274068b2d2..e351b4aee5e 100644
--- a/srcpkgs/bash/template
+++ b/srcpkgs/bash/template
@@ -1,10 +1,11 @@
 # Template file for 'bash'
 pkgname=bash
-version=5.0.018
+version=5.1
 revision=1
-_bash_distver=${version%.*}
-_bash_patchlevel=${version##*.}
-_patchprefix="bash${_bash_distver/./}"
+_bash_distver=$version
+#_bash_distver=${version%.*}
+#_bash_patchlevel=${version##*.}
+#_patchprefix="bash${_bash_distver/./}"
 wrksrc="${pkgname}-${_bash_distver}"
 build_style=gnu-configure
 configure_args="--without-bash-malloc --with-curses --without-installed-readline"
@@ -17,33 +18,15 @@ license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/bash/bash.html"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${_bash_distver}.tar.gz"
 
-_url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
-for _p in 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017 018; do
-	distfiles+=" ${_url}/${_patchprefix}-${_p}"
-	skip_extraction+=" ${_patchprefix}-${_p}"
-done
-unset _url
-unset _p
+#_url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
+#for _p in 001; do
+#	distfiles+=" ${_url}/${_patchprefix}-${_p}"
+#	skip_extraction+=" ${_patchprefix}-${_p}"
+#done
+#unset _url
+#unset _p
 
-checksum="b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d
- f2fe9e1f0faddf14ab9bfa88d450a75e5d028fedafad23b88716bd657c737289
- 87e87d3542e598799adb3e7e01c8165bc743e136a400ed0de015845f7ff68707
- 4eebcdc37b13793a232c5f2f498a5fcbf7da0ecb3da2059391c096db620ec85b
- 14447ad832add8ecfafdce5384badd933697b559c4688d6b9e3d36ff36c62f08
- 5bf54dd9bd2c211d2bfb34a49e2c741f2ed5e338767e9ce9f4d41254bf9f8276
- d68529a6ff201b6ff5915318ab12fc16b8a0ebb77fda3308303fcc1e13398420
- 17b41e7ee3673d8887dd25992417a398677533ab8827938aa41fad70df19af9b
- eec64588622a82a5029b2776e218a75a3640bef4953f09d6ee1f4199670ad7e3
- ed3ca21767303fc3de93934aa524c2e920787c506b601cc40a4897d4b094d903
- d6fbc325f0b5dc54ddbe8ee43020bced8bd589ddffea59d128db14b2e52a8a11
- 2c4de332b91eaf797abbbd6c79709690b5cbd48b12e8dfe748096dbd7bf474ea
- 2943ee19688018296f2a04dbfe30b7138b889700efa8ff1c0524af271e0ee233
- f5d7178d8da30799e01b83a0802018d913d6aa972dd2ddad3b927f3f3eb7099a
- 5d6eee6514ee6e22a87bba8d22be0a8621a0ae119246f1c5a9a35db1f72af589
- a517df2dda93b26d5cbf00effefea93e3a4ccd6652f152f4109170544ebfa05e
- ffd1d7a54a99fa7f5b1825e4f7e95d8c8876bc2ca151f150e751d429c650b06d
- 4cf3b9fafb8a66d411dd5fc9120032533a4012df1dc6ee024c7833373e2ddc31
- 7c314e375a105a6642e8ed44f3808b9def89d15f7492fe2029a21ba9c0de81d3"
+checksum=cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa
 
 make_dirs="/etc/bash/bashrc.d 755 root root"
 conflicts="chroot-bash>=0"
@@ -55,14 +38,14 @@ alternatives="
 
 CFLAGS="-DSYS_BASHRC='\"/etc/bash/bashrc\"'"
 
-post_patch() {
-	local _p
-	cd ${wrksrc}
-	for _p in $(seq -w 001 ${_bash_patchlevel}); do
-		msg_normal " Applying patch ${_patchprefix}-${_p}.\n"
-		patch -sNp0 -i ${XBPS_SRCDISTDIR}/bash-$version/${_patchprefix}-${_p}
-	done
-}
+#post_patch() {
+#	local _p
+#	cd ${wrksrc}
+#	for _p in $(seq -w 001 ${_bash_patchlevel}); do
+#		msg_normal " Applying patch ${_patchprefix}-${_p}.\n"
+#		patch -sNp0 -i ${XBPS_SRCDISTDIR}/bash-$version/${_patchprefix}-${_p}
+#	done
+#}
 
 do_check() {
 	make tests

From 4c4b13cd4e19fa87a7aba455e1523ccac11c39e5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 10 Dec 2020 21:05:23 +0100
Subject: [PATCH 2/2] libreadline8: update to 8.1.

---
 srcpkgs/libreadline8/template | 39 +++++++++++++----------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/libreadline8/template b/srcpkgs/libreadline8/template
index 4f24bd643c1..d90b1df2b5f 100644
--- a/srcpkgs/libreadline8/template
+++ b/srcpkgs/libreadline8/template
@@ -1,9 +1,10 @@
 # Template file for 'libreadline8'
 pkgname=libreadline8
-_dist_ver=8.0
-_patch_ver=004
-version="${_dist_ver}.${_patch_ver}"
-revision=2
+_dist_ver=8.1
+#_patch_ver=004
+#version="${_dist_ver}.${_patch_ver}"
+version="${_dist_ver}"
+revision=1
 bootstrap=yes
 wrksrc="readline-${_dist_ver}"
 build_style=gnu-configure
@@ -13,28 +14,16 @@ short_desc="GNU Readline Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://tiswww.cwru.edu/php/chet/readline/rltop.html"
-distfiles="${GNU_SITE}/readline/readline-${_dist_ver}.tar.gz
- ${GNU_SITE}/readline/readline-${_dist_ver}-patches/readline${_dist_ver/./}-001
- ${GNU_SITE}/readline/readline-${_dist_ver}-patches/readline${_dist_ver/./}-002
- ${GNU_SITE}/readline/readline-${_dist_ver}-patches/readline${_dist_ver/./}-003
- ${GNU_SITE}/readline/readline-${_dist_ver}-patches/readline${_dist_ver/./}-004"
-checksum="e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461
- d8e5e98933cf5756f862243c0601cb69d3667bb33f2c7b751fe4e40b2c3fd069
- 36b0febff1e560091ae7476026921f31b6d1dd4c918dcb7b741aa2dad1aec8f7
- 94ddb2210b71eb5389c7756865d60e343666dfb722c85892f8226b26bb3eeaef
- b1aa3d2a40eee2dea9708229740742e649c32bb8db13535ea78f8ac15377394c"
-skip_extraction="readline${_dist_ver/./}-001
- readline${_dist_ver/./}-002
- readline${_dist_ver/./}-003
- readline${_dist_ver/./}-004"
+distfiles="${GNU_SITE}/readline/readline-${_dist_ver}.tar.gz"
+checksum=f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02
 
-post_patch() {
-	cd ${wrksrc}
-	for p in $(seq -w 001 ${_patch_ver}); do
-		patch -s -Np0 -i ${XBPS_SRCDISTDIR}/${pkgname}-${version}/readline${_dist_ver/./}-${p}
-		msg_normal " Applying patch readline${_dist_ver/./}-$p.\n"
-	done
-}
+#post_patch() {
+#	cd ${wrksrc}
+#	for p in $(seq -w 001 ${_patch_ver}); do
+#		patch -s -Np0 -i ${XBPS_SRCDISTDIR}/${pkgname}-${version}/readline${_dist_ver/./}-${p}
+#		msg_normal " Applying patch readline${_dist_ver/./}-$p.\n"
+#	done
+#}
 
 post_install() {
 	# Examples and README, COPYING, INSTALL

^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-12-30 18:17 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-10 20:09 [PR PATCH] Bash 5.1 and Readline 8.1 leahneukirchen
2020-12-11  0:50 ` sgn
2020-12-15 12:35 ` leahneukirchen
2020-12-15 12:37 ` [PR PATCH] [Updated] " leahneukirchen
2020-12-15 12:41 ` leahneukirchen
2020-12-26 13:52 ` leahneukirchen
2020-12-26 15:18 ` leahneukirchen
2020-12-30 18:17 ` [PR PATCH] [Merged]: " leahneukirchen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).