[packages/readline] - rediffed

[hawk]

commit 01f500ef265205a6ebd0cacbf5285a15a9bc620a
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Sun Mar 21 12:55:31 2021 +0100

    - rediffed

 readline-header.patch | 10 +++++-----
 readline-lfs.patch    | 47 +++++++++++++++++++++++++----------------------
 readline-shared.patch | 10 +++++-----
 readline.spec         |  2 +-
 4 files changed, 36 insertions(+), 33 deletions(-)
---
diff --git a/readline.spec b/readline.spec
index 9352b11..de62df6 100644
--- a/readline.spec
+++ b/readline.spec
@@ -194,7 +194,7 @@ Bibliotecas estáticas para desenvolvimento com readline.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p0
+%patch3 -p1
 %patch4 -p1
 
 # force info regeneration
diff --git a/readline-header.patch b/readline-header.patch
index 361abb3..cb488f9 100644
--- a/readline-header.patch
+++ b/readline-header.patch
@@ -1,11 +1,11 @@
-diff -urN readline-4.2.org/readline.h readline-4.2/readline.h
---- readline-4.2.org/readline.h	Sun Jun 17 20:14:22 2001
-+++ readline-4.2/readline.h	Sun Jun 17 20:20:09 2001
-@@ -32,6 +32,7 @@
+diff -urNp -x '*.orig' readline-8.1.org/readline.h readline-8.1/readline.h
+--- readline-8.1.org/readline.h	2020-05-20 16:42:27.000000000 +0200
++++ readline-8.1/readline.h	2021-03-21 12:54:46.986931009 +0100
+@@ -32,6 +32,7 @@ extern "C" {
  #  include "keymaps.h"
  #  include "tilde.h"
  #else
 +#  include <stdio.h>
  #  include <readline/rlstdc.h>
+ #  include <readline/rltypedefs.h>
  #  include <readline/keymaps.h>
- #  include <readline/tilde.h>
diff --git a/readline-lfs.patch b/readline-lfs.patch
index 30ba969..164de18 100644
--- a/readline-lfs.patch
+++ b/readline-lfs.patch
@@ -1,18 +1,9 @@
---- configure.ac~	2004-06-29 16:58:33.000000000 +0200
-+++ configure.ac	2004-12-19 13:53:21.521597432 +0100
-@@ -77,6 +77,7 @@
+diff -urNp -x '*.orig' readline-8.1.org/config.h.in readline-8.1/config.h.in
+--- readline-8.1.org/config.h.in	2016-11-21 19:02:48.000000000 +0100
++++ readline-8.1/config.h.in	2021-03-21 12:54:58.441931009 +0100
+@@ -32,6 +32,12 @@
  
- AC_TYPE_SIZE_T
- AC_CHECK_TYPE(ssize_t, int)
-+AC_SYS_LARGEFILE
- 
- AC_HEADER_STDC
- 
---- config.h.in	2003-02-03 22:49:38.000000000 +0100
-+++ config.h.in	2004-12-19 14:13:09.913934336 +0100
-@@ -19,6 +19,12 @@
- 
- #undef ssize_t
+ #undef volatile
  
 +/* Number of bits in a file offset, on hosts where this is settable. */
 +#undef _FILE_OFFSET_BITS
@@ -21,16 +12,28 @@
 +#undef _LARGE_FILES
 +
  #undef PROTOTYPES
+ #undef __PROTOTYPES
+ 
+diff -urNp -x '*.orig' readline-8.1.org/configure.ac readline-8.1/configure.ac
+--- readline-8.1.org/configure.ac	2020-10-29 20:44:22.000000000 +0100
++++ readline-8.1/configure.ac	2021-03-21 12:54:58.440931009 +0100
+@@ -140,6 +140,7 @@ AC_TYPE_SIGNAL
  
- #undef __CHAR_UNSIGNED__
---- histfile.c~	2004-03-04 04:39:33.000000000 +0100
-+++ histfile.c	2004-12-19 03:53:01.196199720 +0100
-@@ -424,7 +424,7 @@
-   char *output;
-   int file, mode, rv;
+ AC_TYPE_SIZE_T
+ AC_CHECK_TYPE(ssize_t, int)
++AC_SYS_LARGEFILE
+ 
+ AC_HEADER_STDC
+ 
+diff -urNp -x '*.orig' readline-8.1.org/histfile.c readline-8.1/histfile.c
+--- readline-8.1.org/histfile.c	2020-03-17 17:37:35.000000000 +0100
++++ readline-8.1/histfile.c	2021-03-21 12:54:58.441931009 +0100
+@@ -684,7 +684,7 @@ history_do_write (const char *filename,
+   int file, mode, rv, exists;
+   struct stat finfo, nfinfo;
  #ifdef HISTORY_USE_MMAP
 -  size_t cursize;
 +  off_t cursize;
  
-   mode = overwrite ? O_RDWR|O_CREAT|O_TRUNC|O_BINARY : O_RDWR|O_APPEND|O_BINARY;
- #else
+   history_lines_written_to_file = 0;
+ 
diff --git a/readline-shared.patch b/readline-shared.patch
index 39bd4ca..0cdf189 100644
--- a/readline-shared.patch
+++ b/readline-shared.patch
@@ -1,7 +1,7 @@
-diff -urN readline-4.2.org/shlib/Makefile.in readline-4.2/shlib/Makefile.in
---- readline-4.2.org/shlib/Makefile.in	Wed Apr 11 19:45:39 2001
-+++ readline-4.2/shlib/Makefile.in	Wed Apr 11 19:52:49 2001
-@@ -141,11 +141,11 @@
+diff -urNp -x '*.orig' readline-8.1.org/shlib/Makefile.in readline-8.1/shlib/Makefile.in
+--- readline-8.1.org/shlib/Makefile.in	2020-10-29 20:47:57.000000000 +0100
++++ readline-8.1/shlib/Makefile.in	2021-03-21 12:54:35.957931009 +0100
+@@ -174,11 +174,11 @@ unsupported:
  
  $(SHARED_READLINE):	$(SHARED_OBJ)
  	$(RM) $@
@@ -13,5 +13,5 @@ diff -urN readline-4.2.org/shlib/Makefile.in readline-4.2/shlib/Makefile.in
 -	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so $(SHLIB_LIBS)
 +	$(SHOBJ_LD) ${LDFLAGS} ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so -lc $(SHLIB_LIBS)
  
- # Since tilde.c is shared between readline and bash, make sure we compile
+ # Since tilde.c is shared between readline and bash, make sure we compile 
  # it with the right flags when it's built as part of readline
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/readline.git/commitdiff/01f500ef265205a6ebd0cacbf5285a15a9bc620a