rpms/minicom
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- rediff patches with fuzz

Browse Source
This commit is contained in:
Miroslav Lichvar 2008-08-29 11:13:07 +00:00
parent bde105db1c
commit a10d38b95b
4 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
minicom-2.2-esc.patch → minicom-2.3-esc.patch
View File

@ -1,7 +1,8 @@
--- minicom-2.2/src/vt100.c.esc 2006-04-02 11:52:30.000000000 +0200
+++ minicom-2.2/src/vt100.c 2007-03-09 13:10:38.000000000 +0100
@@ -1041,7 +1041,7 @@
fputc(P_CONVCAP[0] == 'Y' ? vt_inmap[c] : c, vt_capfp);
diff -up minicom-2.3/src/vt100.c.esc minicom-2.3/src/vt100.c
--- minicom-2.3/src/vt100.c.esc 2007-10-10 22:18:20.000000000 +0200
+++ minicom-2.3/src/vt100.c 2008-08-29 12:53:35.000000000 +0200
@@ -1040,7 +1040,7 @@ void vt_out(int ch)
fputc(P_CONVCAP[0] == 'Y' ? vt_inmap[c] : c, capfp);
c = vt_inmap[c]; /* conversion 04.09.97 / jl */
#if TRANSLATE
- if (vt_type == VT100 && vt_asis == 0)

15
minicom-2.3-gotodir.patch
View File

@ -1,6 +1,7 @@
--- minicom-2.2/src/file.c.gotodir 2005-08-14 22:39:30.000000000 +0200
+++ minicom-2.2/src/file.c 2007-03-09 10:59:51.000000000 +0100
@@ -277,6 +277,8 @@
diff -up minicom-2.3/src/file.c.gotodir minicom-2.3/src/file.c
--- minicom-2.3/src/file.c.gotodir 2008-08-29 12:41:21.000000000 +0200
+++ minicom-2.3/src/file.c 2008-08-29 12:41:21.000000000 +0200
@@ -282,6 +282,8 @@ static int new_filedir(GETSDIR_ENTRY *o_
int initial_y = (76 - (WHAT_NR_OPTIONS * WHAT_WIDTH >= 76
? 74 : WHAT_NR_OPTIONS * WHAT_WIDTH)) / 2;
size_t i;
@ -9,7 +10,7 @@
cur = 0;
ocur = 0;
@@ -290,11 +292,6 @@
@@ -295,11 +297,6 @@ static int new_filedir(GETSDIR_ENTRY *o_
dprev = -1;
tag_cnt = 0;
@ -21,7 +22,7 @@
/*
* get last directory
*/
@@ -324,7 +321,30 @@
@@ -329,7 +326,30 @@ static int new_filedir(GETSDIR_ENTRY *o_
if (strlen(work_dir) > 1 && work_dir[strlen(work_dir) - 1] == '/')
work_dir[strlen(work_dir) - 1] = (char)0;
@ -53,8 +54,8 @@
/* All right, draw the file directory! */
@@ -429,7 +449,7 @@
wredraw(dsub, 1);
@@ -435,7 +455,7 @@ static int new_filedir(GETSDIR_ENTRY *o_
mc_wredraw(dsub, 1);
}
- return 0;

29
minicom-2.2-staticbuf.patch → minicom-2.3-staticbuf.patch
View File

@ -1,6 +1,7 @@
--- minicom-2.2/src/updown.c.staticbuf 2007-03-09 13:10:38.000000000 +0100
+++ minicom-2.2/src/updown.c 2007-03-09 13:10:38.000000000 +0100
@@ -87,40 +87,83 @@
diff -up minicom-2.3/src/updown.c.staticbuf minicom-2.3/src/updown.c
--- minicom-2.3/src/updown.c.staticbuf 2008-08-29 12:55:48.000000000 +0200
+++ minicom-2.3/src/updown.c 2008-08-29 12:55:48.000000000 +0200
@@ -91,40 +91,83 @@ static void udcatch(int dummy)
* Translate %b to the current bps rate, and
* %l to the current tty port.
* %f to the serial port file descriptor
@ -104,7 +105,7 @@
}
/*
@@ -181,7 +224,8 @@
@@ -185,7 +228,8 @@ void updown(int what, int nr)
const char *s ="";
int pipefd[2];
int n, status;
@ -114,7 +115,7 @@
WIN *win = (WIN *)NULL;
if (mcd(what == 'U' ? P_UPDIR : P_DOWNDIR) < 0)
@@ -213,6 +257,7 @@
@@ -217,6 +261,7 @@ void updown(int what, int nr)
#if 1
{
int multiple; /* 0:only directory, 1:one file, -1:any number */
@ -122,7 +123,7 @@
if (P_MUL(g)=='Y')
/* need file(s), or just a directory? */
@@ -232,7 +277,13 @@
@@ -236,7 +281,13 @@ void updown(int what, int nr)
}
/* discard directory if "multiple" == 0 */
@ -137,16 +138,16 @@
}
#endif
@@ -258,6 +309,8 @@
@@ -262,6 +313,8 @@ void updown(int what, int nr)
} else
wreturn();
mc_wreturn();
mcd("");
+ if(cmdline)
+ free(cmdline);
return;
case 0: /* Child */
if (P_PIORED(g) == 'Y') {
@@ -276,11 +329,21 @@
@@ -280,11 +333,21 @@ void updown(int what, int nr)
set_privs();
setgid((gid_t)real_gid);
setuid((uid_t)real_uid);
@ -169,15 +170,15 @@
if (win) {
setcbreak(1); /* Cbreak, no echo. */
enab_sig(1, 0); /* But enable SIGINT */
@@ -384,6 +447,7 @@
@@ -388,6 +451,7 @@ void kermit(void)
char buf[81];
int fd;
#endif
+ char * translated_cmdline;
/* Clear screen, set keyboard modes etc. */
wleave();
@@ -404,7 +468,11 @@
mc_wleave();
@@ -408,7 +472,11 @@ void kermit(void)
for (n = 0; n < _NSIG; n++)
signal(n, SIG_DFL);
@ -190,7 +191,7 @@
exit(1);
default: /* Parent */
break;
@@ -518,6 +586,7 @@
@@ -522,6 +590,7 @@ void runscript(int ask, const char *s, c
char buf[81];
char scr_lines[5];
char cmdline[128];
@ -198,7 +199,7 @@
char *ptr;
WIN *w;
int done = 0;
@@ -623,7 +692,12 @@
@@ -627,7 +696,12 @@ void runscript(int ask, const char *s, c
mc_setenv("LOGIN", scr_user);
mc_setenv("PASS", scr_passwd);
mc_setenv("TERMLIN", scr_lines); /* jl 13.09.97 */

9
minicom.spec
View File

@ -1,7 +1,7 @@
Summary: A text-based modem control and terminal emulation program
Name: minicom
Version: 2.3
Release: 2%{?dist}
Release: 3%{?dist}
URL: http://alioth.debian.org/projects/minicom/
License: GPLv2+
Group: Applications/Communications
@ -19,8 +19,8 @@ Patch4: minicom-2.2-umask.patch
Patch6: minicom-2.2-spaces.patch
Patch7: minicom-2.3-gotodir.patch
Patch8: minicom-2.3-rh.patch
Patch9: minicom-2.2-esc.patch
Patch10: minicom-2.2-staticbuf.patch
Patch9: minicom-2.3-esc.patch
Patch10: minicom-2.3-staticbuf.patch
%description
Minicom is a simple text-based modem control and terminal emulation
@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/*
%changelog
* Fri Aug 29 2008 Miroslav Lichvar <mlichvar@redhat.com> 2.3-3
- rediff patches with fuzz
* Thu Mar 13 2008 Lubomir Kundrak <lkundrak@redhat.com> 2.3-2
- Add ChangeLog to %doc