[packages/minicom] - rediffed

[qboosh]

commit 210c68b95735dd01971f59a53b5fdbf4185fb730
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jan 27 20:17:35 2022 +0100

    - rediffed

 minicom-check_exec.patch | 15 +++++++--------
 minicom-man.patch        | 15 +++++++--------
 2 files changed, 14 insertions(+), 16 deletions(-)
---
diff --git a/minicom-check_exec.patch b/minicom-check_exec.patch
index 488709d..d497409 100644
--- a/minicom-check_exec.patch
+++ b/minicom-check_exec.patch
@@ -1,6 +1,6 @@
---- minicom-2.2/src/updown.c.orig	2005-08-14 22:39:30.000000000 +0200
-+++ minicom-2.2/src/updown.c	2006-10-25 20:03:31.063131250 +0200
-@@ -332,6 +332,8 @@
+--- minicom-2.8/src/updown.c.orig	2021-01-01 18:45:55.000000000 +0100
++++ minicom-2.8/src/updown.c	2022-01-27 20:13:24.765495507 +0100
+@@ -406,6 +406,8 @@ void updown(int what, int nr)
    }
  
    while (udpid != m_wait(&status));
@@ -9,7 +9,7 @@
    if (win) {
      enab_sig(0, 0);
      signal(SIGINT, SIG_IGN);
-@@ -409,6 +411,8 @@
+@@ -546,6 +548,8 @@ void kermit(void)
    }
  
    m_wait(&status);
@@ -17,9 +17,9 @@
 +    werror(_("Error executing `%s'"), P_KERMIT);
  
    /* Restore screen and keyboard modes */
-   wreturn();
-@@ -638,6 +642,8 @@
-   
+   mc_wreturn();
+@@ -784,6 +788,8 @@ void runscript(int ask, const char *s, c
+ 
    /* Collect status, and clean up. */
    m_wait(&status);
 +  if (status)
@@ -27,4 +27,3 @@
    enab_sig(0, 0);
    signal(SIGINT, SIG_IGN);
    setcbreak(2); /* Raw, no echo */
-
diff --git a/minicom-man.patch b/minicom-man.patch
index 3d409d5..5936352 100644
--- a/minicom-man.patch
+++ b/minicom-man.patch
@@ -1,21 +1,20 @@
-diff -Nur minicom-1.82/man/minicom.1 minicom-1.82.new/man/minicom.1
---- minicom-1.82/man/minicom.1	Sun Sep  6 17:28:28 1998
-+++ minicom-1.82.new/man/minicom.1	Mon Dec 28 17:46:45 1998
-@@ -25,7 +25,7 @@
+--- minicom-2.8/man/minicom.1.orig	2022-01-27 19:30:05.604342263 +0100
++++ minicom-2.8/man/minicom.1	2022-01-27 20:07:19.026828517 +0100
+@@ -22,7 +22,7 @@ configurations, and more.
  .TP 0.5i
- .B -s
+ .B \-s, \-\-setup
  .BR S etup.
 -Root edits the system-wide defaults in /etc/minirc.dfl with this option. 
 +Root edits the system-wide defaults in /etc/minicom/minirc.dfl with this option. 
  When it is used, minicom does 
  .I not 
  initialize, but puts you directly into the
-@@ -746,7 +746,7 @@
+@@ -845,7 +845,7 @@ escape-sequences. To see how dirty this
  But it works like a charm!
  .SH FILES
  Minicom keeps it's configuration files in one directory, usually
 -/var/lib/minicom, /usr/local/etc or /etc. To find out what default
 +/var/lib/minicom, /usr/local/etc or /etc/minicom. To find out what default
  directory minicom has compiled in, issue the command \fIminicom -h\fP.
- You'll probably also find the demo files for \fBrunscript\fP(1) there.
- .sp 1
+ You'll probably also find the demo files for \fBrunscript\fP(1),
+ and the examples of character conversion tables either there or 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/minicom.git/commitdiff/210c68b95735dd01971f59a53b5fdbf4185fb730