updated to 8.2.001

4 files changed, 54 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2c7b2bcbae9..d26a4010a960 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mingw-w64-readline
 	pkgdesc = GNU readline library (mingw-w64)
-	pkgver = 8.1.002
-	pkgrel = 2
+	pkgver = 8.2.001
+	pkgrel = 1
 	url = https://tiswww.case.edu/php/chet/readline/rltop.html
 	arch = any
 	license = GPL
@@ -12,20 +12,16 @@ pkgbase = mingw-w64-readline
 	options = !strip
 	options = staticlibs
 	options = !buildflags
-	source = https://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz
-	source = https://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz.sig
-	source = fix_signal.diff
-	source = https://ftp.gnu.org/gnu/readline/readline-8.1-patches/readline81-001
-	source = https://ftp.gnu.org/gnu/readline/readline-8.1-patches/readline81-001.sig
-	source = https://ftp.gnu.org/gnu/readline/readline-8.1-patches/readline81-002
-	source = https://ftp.gnu.org/gnu/readline/readline-8.1-patches/readline81-002.sig
+	source = https://ftp.gnu.org/gnu/readline/readline-8.2.tar.gz
+	source = https://ftp.gnu.org/gnu/readline/readline-8.2.tar.gz.sig
+	source = readline-1-fixes.patch
+	source = https://ftp.gnu.org/gnu/readline/readline-8.2-patches/readline82-001
+	source = https://ftp.gnu.org/gnu/readline/readline-8.2-patches/readline82-001.sig
 	validpgpkeys = 7C0135FB088AAF6C66C650B9BB5869F064EA74AB
-	sha256sums = f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02
+	sha256sums = 3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35
 	sha256sums = SKIP
-	sha256sums = 277ee9b021cb0d91c1079736ce8c3a8b7afd116cb5735866a044b6e82a4cdd21
-	sha256sums = 682a465a68633650565c43d59f0b8cdf149c13a874682d3c20cb4af6709b9144
-	sha256sums = SKIP
-	sha256sums = e55be055a68cb0719b0ccb5edc9a74edcc1d1f689e8a501525b3bc5ebad325dc
+	sha256sums = 7e1fea150da3b4c446a3d8b8ce3f449ded5f44e0856b3c9c43d33766f9634f7e
+	sha256sums = bbf97f1ec40a929edab5aa81998c1e2ef435436c597754916e6a5868f273aff7
 	sha256sums = SKIP
 
 pkgname = mingw-w64-readline
diff --git a/PKGBUILD b/PKGBUILD
index b344818ed0c2..8c6b8b0eaf80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
 
 # Thanks to the patch from the MXE project <mxe.cc>
 
-_basever=8.1
-_patchlevel=002
+_basever=8.2
+_patchlevel=001
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-readline
 pkgver=${_basever}.${_patchlevel}
-pkgrel=2
+pkgrel=1
 pkgdesc="GNU readline library (mingw-w64)"
 arch=('any')
 url="https://tiswww.case.edu/php/chet/readline/rltop.html"
@@ -20,19 +20,17 @@ depends=('mingw-w64-crt'
 makedepends=('mingw-w64-configure')
 options=('!strip' 'staticlibs' '!buildflags')
 source=("https://ftp.gnu.org/gnu/readline/readline-${_basever}.tar.gz"{,.sig}
-  fix_signal.diff)
+  readline-1-fixes.patch)
 if [ ${_patchlevel} -gt 00 ]; then
     for (( _p=1; _p<=$((10#${_patchlevel})); _p++ )); do
         source=(${source[@]} "https://ftp.gnu.org/gnu/readline/readline-${_basever}-patches/readline${_basever//./}-$(printf "%03d" ${_p})"{,.sig})
     done
 fi
 
-sha256sums=('f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02'
+sha256sums=('3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35'
             'SKIP'
-            '277ee9b021cb0d91c1079736ce8c3a8b7afd116cb5735866a044b6e82a4cdd21'
-            '682a465a68633650565c43d59f0b8cdf149c13a874682d3c20cb4af6709b9144'
-            'SKIP'
-            'e55be055a68cb0719b0ccb5edc9a74edcc1d1f689e8a501525b3bc5ebad325dc'
+            '7e1fea150da3b4c446a3d8b8ce3f449ded5f44e0856b3c9c43d33766f9634f7e'
+            'bbf97f1ec40a929edab5aa81998c1e2ef435436c597754916e6a5868f273aff7'
             'SKIP')
 validpgpkeys=(7C0135FB088AAF6C66C650B9BB5869F064EA74AB) # Chet Ramey <chet@cwru.edu>
 
@@ -47,7 +45,7 @@ prepare() {
   # Remove RPATH from shared objects (FS#14366)
   sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
 
-  patch -Np1 -i ../fix_signal.diff
+  patch -Np1 -i ../readline-1-fixes.patch
 }
 
 build() {
diff --git a/fix_signal.diff b/fix_signal.diff
deleted file mode 100644
index 2dcd3e148843..000000000000
--- a/fix_signal.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruN readline-8.1/signals.c readline-8.1-fixed/signals.c
---- readline-8.1/signals.c	2021-01-15 16:08:14.477184153 +0800
-+++ readline-8.1-fixed/signals.c	2021-01-15 16:07:04.733781000 +0800
-@@ -266,8 +266,10 @@
-     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 ();
diff --git a/readline-1-fixes.patch b/readline-1-fixes.patch
new file mode 100644
index 000000000000..24b4f38688bc
--- /dev/null
+++ b/readline-1-fixes.patch
@@ -0,0 +1,36 @@
+diff --git a/input.c b/input.c
+index 6f038d4..da4da45 100644
+--- a/input.c
++++ b/input.c
+@@ -151,7 +151,9 @@ int rl_timeout_remaining (unsigned int *, unsigned int *);
+ 
+ int _rl_timeout_init (void);
+ int _rl_timeout_sigalrm_handler (void);
++#if defined (RL_TIMEOUT_USE_SELECT)
+ int _rl_timeout_select (int, fd_set *, fd_set *, fd_set *, const struct timeval *, const sigset_t *);
++#endif
+ 
+ static void _rl_timeout_handle (void);
+ #if defined (RL_TIMEOUT_USE_SIGALRM)
+@@ -818,7 +820,7 @@ rl_getc (FILE *stream)
+       /* We know at this point that _rl_caught_signal == 0 */
+ 
+ #if defined (__MINGW32__)
+-      if (isatty (fd)
++      if (isatty (fd))
+ 	return (_getch ());	/* "There is no error return." */
+ #endif
+       result = 0;
+diff --git a/rlprivate.h b/rlprivate.h
+index d87d07a..cb9cf17 100644
+--- a/rlprivate.h
++++ b/rlprivate.h
+@@ -303,7 +303,7 @@ extern int _rl_pushed_input_available (void);
+ 
+ extern int _rl_timeout_init (void);
+ extern int _rl_timeout_handle_sigalrm (void);
+-#if defined (_POSIXSELECT_H_)
++#if defined (RL_TIMEOUT_USE_SELECT)
+ /* use as a sentinel for fd_set, struct timeval,  and sigset_t definitions */
+ extern int _rl_timeout_select (int, fd_set *, fd_set *, fd_set *, const struct timeval *, const sigset_t *);
+ #endif