diff --git a/.cvsignore b/.cvsignore index ffb3a81..2ab75eb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -minicom-2.2.tar.gz +minicom-2.3.tar.gz diff --git a/minicom-2.2-capture.patch b/minicom-2.2-capture.patch deleted file mode 100644 index 01ca9ad..0000000 --- a/minicom-2.2-capture.patch +++ /dev/null @@ -1,192 +0,0 @@ -Patch for #302081 - -This removes unncessary duplicate variable vt_capfp and fixes handling -of capture file descriptors so that minicom doesn't crash after the -capture file was closed. - -Lubomir Kundrak - -diff -Nurp minicom-2.2/src/dial.c minicom-2.2.capture/src/dial.c ---- minicom-2.2/src/dial.c 2005-10-31 13:13:51.000000000 +0100 -+++ minicom-2.2.capture/src/dial.c 2007-09-23 10:07:46.000000000 +0200 -@@ -1355,7 +1355,7 @@ static void dial_entry(struct dialent *d - mode_status(); - } - newtype = d->term; -- vt_set(-1, d->flags & FL_WRAP, NULL, -1, -1, d->flags & FL_ECHO, -1, -1); -+ vt_set(-1, d->flags & FL_WRAP, -1, -1, d->flags & FL_ECHO, -1, -1); - local_echo = d->flags & FL_ECHO; - if (newtype != terminal) - init_emul(newtype, 1); -diff -Nurp minicom-2.2/src/ipc.c minicom-2.2.capture/src/ipc.c ---- minicom-2.2/src/ipc.c 2007-09-23 10:10:00.000000000 +0200 -+++ minicom-2.2.capture/src/ipc.c 2007-09-23 10:08:03.000000000 +0200 -@@ -87,13 +87,13 @@ int keyboard(int cmd, int arg) - escape = arg; - break; - case KSETBS: -- vt_set(-1, -1, NULL, -1, arg, -1, -1, -1); -+ vt_set(-1, -1, -1, arg, -1, -1, -1); - break; - case KCURST: -- vt_set(-1, -1, NULL, -1, -1, -1, NORMAL, -1); -+ vt_set(-1, -1, -1, -1, -1, NORMAL, -1); - break; - case KCURAPP: -- vt_set(-1, -1, NULL, -1, -1, -1, APPL, -1); -+ vt_set(-1, -1, -1, -1, -1, APPL, -1); - break; - default: - /* The rest is only meaningful if a keyserv runs. */ -diff -Nurp minicom-2.2/src/minicom.c minicom-2.2.capture/src/minicom.c ---- minicom-2.2/src/minicom.c 2007-09-23 10:10:00.000000000 +0200 -+++ minicom-2.2.capture/src/minicom.c 2007-09-23 10:08:39.000000000 +0200 -@@ -873,14 +873,14 @@ static void helpthem(void) - void toggle_addlf(void) - { - addlf = !addlf; -- vt_set(addlf, -1, NULL, -1, -1, -1, -1, -1); -+ vt_set(addlf, -1, -1, -1, -1, -1, -1); - } - - /* Toggle local echo. Can be called through the menu, or by a macro. */ - void toggle_local_echo(void) - { - local_echo = !local_echo; -- vt_set(-1, -1, NULL, -1, -1, local_echo, -1 ,-1); -+ vt_set(-1, -1, -1, -1, local_echo, -1 ,-1); - } - - int main(int argc, char **argv) -@@ -1137,7 +1137,7 @@ int main(int argc, char **argv) - exit(1); - } - docap = 1; -- vt_set(addlf, -1, capfp, docap, -1, -1, -1, -1); -+ vt_set(addlf, -1, docap, -1, -1, -1, -1); - seteuid(eff_uid); - setegid(eff_gid); - break; -@@ -1170,7 +1170,7 @@ int main(int argc, char **argv) - - if (screen_iso && screen_ibmpc) - /* init VT */ -- vt_set(-1, -1, (FILE*)NULL, -1, -1, -1, -1, 1); -+ vt_set(-1, -1, -1, -1, -1, -1, 1); - - - -@@ -1464,7 +1464,7 @@ dirty_goto: - if (c == 1) - docap = 0; - } -- vt_set(addlf, -1, capfp, docap, -1, -1, -1, -1); -+ vt_set(addlf, -1, docap, -1, -1, -1, -1); - break; - case 'p': /* Set parameters */ - get_bbp(P_BAUDRATE, P_BITS, P_PARITY, P_STOPB, 0); -@@ -1489,7 +1489,7 @@ dirty_goto: - break; - case 'w': /* Line wrap on-off */ - c = (!us->wrap); -- vt_set(addlf, c, capfp, docap, -1, -1, -1, -1); -+ vt_set(addlf, c, docap, -1, -1, -1, -1); - s = c ? _("Linewrap ON") : _("Linewrap OFF"); - werror("%s", s); - break; -diff -Nurp minicom-2.2/src/vt100.c minicom-2.2.capture/src/vt100.c ---- minicom-2.2/src/vt100.c 2007-09-23 10:10:00.000000000 +0200 -+++ minicom-2.2.capture/src/vt100.c 2007-09-23 10:08:51.000000000 +0200 -@@ -175,7 +175,6 @@ static int vt_crlf = 0; /* Return sends - static int vt_om; /* Origin mode. */ - WIN *vt_win = NULL; /* Output window. */ - static int vt_docap; /* Capture on/off. */ --static FILE *vt_capfp; /* Capture file. */ - static void (*vt_keyb)(int, int);/* Gets called for NORMAL/APPL switch. */ - static void (*termout)(const char *, int);/* Gets called to output a string. */ - -@@ -273,15 +272,13 @@ void vt_init(int type, int fg, int bg, i - } - - /* Change some things on the fly. */ --void vt_set(int addlf, int wrap, FILE *capfp, int docap, int bscode, -+void vt_set(int addlf, int wrap, int docap, int bscode, - int echo, int cursor, int asis) - { - if (addlf >= 0) - vt_addlf = addlf; - if (wrap >= 0) - vt_win->wrap = vt_wrap = wrap; -- if (capfp != NULL) -- vt_capfp = capfp; - if (docap >= 0) - vt_docap = docap; - if (bscode >= 0) -@@ -961,7 +958,7 @@ void vt_out(int ch) - c = (unsigned char)ch; - - if (vt_docap == 2) /* Literal. */ -- fputc(c, vt_capfp); -+ fputc(c, capfp); - - /* Process <31 chars first, even in an escape sequence. */ - switch (c) { -@@ -977,7 +974,7 @@ void vt_out(int ch) - if (vt_addlf) { - wputc(vt_win, '\n'); - if (vt_docap == 1) -- fputc('\n', vt_capfp); -+ fputc('\n', capfp); - } - break; - case '\t': /* Non - destructive TAB */ -@@ -989,7 +986,7 @@ void vt_out(int ch) - f = vt_win->xs - 1; - wlocate(vt_win, f, vt_win->cury); - if (vt_docap == 1) -- fputc(c, vt_capfp); -+ fputc(c, capfp); - break; - case 013: /* Old Minix: CTRL-K = up */ - wlocate(vt_win, vt_win->curx, vt_win->cury - 1); -@@ -1025,7 +1022,7 @@ void vt_out(int ch) - case 7: /* Bell */ - wputc(vt_win, c); - if (vt_docap == 1) -- fputc(c, vt_capfp); -+ fputc(c, capfp); - break; - default: - go_on = 1; -@@ -1038,7 +1035,7 @@ void vt_out(int ch) - switch (esc_s) { - case 0: /* Normal character */ - if (vt_docap == 1) -- fputc(P_CONVCAP[0] == 'Y' ? vt_inmap[c] : c, vt_capfp); -+ 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_trans[vt_charset] && vt_asis == 0) -@@ -1080,8 +1077,8 @@ void vt_out(int ch) - - /* Flush output to capture file so that all output is visible there - * immediately. Causes a write syscall for every call though. */ -- if (vt_capfp) -- fflush(vt_capfp); -+ if (capfp) -+ fflush(capfp); - } - - /* Translate keycode to escape sequence. */ -diff -Nurp minicom-2.2/src/vt100.h minicom-2.2.capture/src/vt100.h ---- minicom-2.2/src/vt100.h 2005-08-04 22:33:34.000000000 +0200 -+++ minicom-2.2.capture/src/vt100.h 2007-09-23 10:07:37.000000000 +0200 -@@ -29,7 +29,7 @@ extern int vt_nl_delay; /* Delay after - void vt_install(void(*)(const char *, int), void (*)(int, int), WIN *); - void vt_init(int, int, int, int, int); - void vt_pinit(WIN *, int, int); --void vt_set(int, int, FILE *, int, int, int, int, int); -+void vt_set(int, int, int, int, int, int, int); - void vt_out(int); - void vt_send(int ch); - diff --git a/minicom-2.2-ncurses.patch b/minicom-2.2-ncurses.patch deleted file mode 100644 index 0966615..0000000 --- a/minicom-2.2-ncurses.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- minicom-2.2/configure.ncurses 2006-10-16 09:54:20.000000000 +0200 -+++ minicom-2.2/configure 2007-03-08 19:01:21.000000000 +0100 -@@ -6067,7 +6067,7 @@ - - LIBS="$LIBS $TERMLIBS" - --if test "x$termlib" = xncurses; then -+if test "x$termlib" = xncurses || test "x$termlib" = xtinfo; then - - for ac_header in ncurses/termcap.h - do ---- minicom-2.2/src/port.h.ncurses 2005-10-31 11:31:38.000000000 +0100 -+++ minicom-2.2/src/port.h 2007-03-08 18:59:52.000000000 +0100 -@@ -29,6 +29,8 @@ - #endif - #ifdef HAVE_TERMCAP_H - # include -+#elif defined (HAVE_NCURSES_TERMCAP_H) -+# include - #else - char *tgetstr(void), *tgoto(void); - int tgetent(void), tputs(void), tgetnum(void), tgetflag(void); diff --git a/minicom-2.2-setlocale.patch b/minicom-2.2-setlocale.patch deleted file mode 100644 index 5eb9814..0000000 --- a/minicom-2.2-setlocale.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- minicom-2.2/src/intl.h.setlocale 2003-03-30 20:55:51.000000000 +0200 -+++ minicom-2.2/src/intl.h 2007-03-08 18:01:03.000000000 +0100 -@@ -3,9 +3,6 @@ - #ifdef HAVE_LOCALE_H - # include - #endif --#if !HAVE_SETLOCALE --# define setlocale(Category, Locale) /* empty */ --#endif - - #define N_(Str) (Str) - diff --git a/minicom-2.2-sigs.patch b/minicom-2.2-sigs.patch deleted file mode 100644 index 573ca31..0000000 --- a/minicom-2.2-sigs.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- minicom-2.2/src/minicom.c.sigs 2007-07-10 13:52:51.000000000 +0200 -+++ minicom-2.2/src/minicom.c 2007-07-10 14:48:52.000000000 +0200 -@@ -107,11 +107,17 @@ static void hangsig(int sig) - /*ARGSUSED*/ - static void shjump(int dummy /* __attribute__((unused)) */) - { -+ sigset_t ss, oldss; -+ - dummy = dummy; /* avoid compiler warning, should be optimized away... */ - wleave(); - signal(SIGTSTP, SIG_DFL); -+ sigemptyset(&ss); -+ sigaddset(&ss, SIGTSTP); -+ sigprocmask(SIG_UNBLOCK, &ss, &oldss); - fputs(_("Suspended. Type \"fg\" to resume.\n"),stdout); - kill(getpid(), SIGTSTP); -+ sigprocmask(SIG_SETMASK, &oldss, NULL); - signal(SIGTSTP, shjump); - wreturn(); - if (use_status) -@@ -1524,6 +1530,14 @@ dirty_goto: - do_log("%s", _("Quit without reset while online.")); - m_hupcl(portfd, 0); - } -+ -+ signal(SIGTERM, SIG_IGN); -+ signal(SIGHUP, SIG_IGN); -+#ifdef SIGTSTP -+ signal(SIGTSTP, SIG_DFL); -+#endif -+ signal(SIGQUIT, SIG_DFL); -+ - if (capfp != (FILE *)0) - fclose(capfp); - wclose(us, 0); diff --git a/minicom-2.2-ttyerror.patch b/minicom-2.2-ttyerror.patch deleted file mode 100644 index 2ebd806..0000000 --- a/minicom-2.2-ttyerror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- minicom-2.2/src/ipc.c.ttyerror 2005-10-31 11:31:38.000000000 +0100 -+++ minicom-2.2/src/ipc.c 2007-07-25 15:22:28.000000000 +0200 -@@ -62,6 +62,8 @@ int check_io(int fd1, int fd2, int tmout - if (!i && portfd_is_socket && portfd == fd1) - term_socket_close(); - #endif /* USE_SOCKET */ -+ if (i <= 0 && !portfd_is_socket && portfd == fd1) -+ leave(_("Read error on tty device.")); - } - buf[i > 0 ? i : 0] = 0; - if (buflen) diff --git a/minicom-2.2-wchar.patch b/minicom-2.2-wchar.patch deleted file mode 100644 index 6aa4837..0000000 --- a/minicom-2.2-wchar.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- minicom-2.2/src/minicom.c.wchar 2007-03-09 13:09:01.000000000 +0100 -+++ minicom-2.2/src/minicom.c 2007-03-09 13:09:01.000000000 +0100 -@@ -27,7 +27,6 @@ - RCSID(PKG_VER "$Id: minicom.c,v 1.29 2005/10/31 12:13:51 al-guest Exp $") - - #include --#include - #include - - #define EXTERN ---- minicom-2.2/src/window.c.wchar 2005-11-06 20:20:57.000000000 +0100 -+++ minicom-2.2/src/window.c 2007-03-09 13:09:01.000000000 +0100 -@@ -23,7 +23,6 @@ - - #include - #include --#include - - #include "port.h" - #include "minicom.h" diff --git a/minicom-2.2-drop-privs.patch b/minicom-2.3-drop-privs.patch similarity index 50% rename from minicom-2.2-drop-privs.patch rename to minicom-2.3-drop-privs.patch index f439654..1dc2c89 100644 --- a/minicom-2.2-drop-privs.patch +++ b/minicom-2.3-drop-privs.patch @@ -1,6 +1,7 @@ ---- minicom-2.2/src/minicom.c.privs 2005-10-31 13:13:51.000000000 +0100 -+++ minicom-2.2/src/minicom.c 2007-03-09 13:08:23.000000000 +0100 -@@ -1124,6 +1124,8 @@ +diff -urp minicom-2.3.orig/src/minicom.c minicom-2.3/src/minicom.c +--- minicom-2.3.orig/src/minicom.c 2008-02-02 23:49:53.000000000 +0100 ++++ minicom-2.3/src/minicom.c 2008-02-24 20:45:35.000000000 +0100 +@@ -1132,6 +1132,8 @@ int main(int argc, char **argv) use_status = 1; break; case 'C': /* Capturing */ @@ -9,12 +10,14 @@ capfp = sfopen(optarg, "a"); if (capfp == NULL) { werror(_("Cannot open capture file")); -@@ -1131,6 +1133,8 @@ +@@ -1139,6 +1141,8 @@ int main(int argc, char **argv) } docap = 1; - vt_set(addlf, -1, capfp, docap, -1, -1, -1, -1); + vt_set(addlf, -1, docap, -1, -1, -1, -1); + seteuid(eff_uid); + setegid(eff_gid); break; case 'S': /* start Script */ strncpy(scr_name, optarg, 33); +Only in minicom-2.3/src: minicom.c.orig +Only in minicom-2.3/src: minicom.c.rej diff --git a/minicom-2.2-gotodir.patch b/minicom-2.3-gotodir.patch similarity index 98% rename from minicom-2.2-gotodir.patch rename to minicom-2.3-gotodir.patch index 5ca1ad2..6ab0131 100644 --- a/minicom-2.2-gotodir.patch +++ b/minicom-2.3-gotodir.patch @@ -40,7 +40,7 @@ + } + else { + /* Could not change to the new working directory */ -+ wbell(); ++ mc_wbell(); + werror( + _("Could not change to directory %s (%s)"), + work_dir, diff --git a/minicom-2.3-ncurses.patch b/minicom-2.3-ncurses.patch new file mode 100644 index 0000000..0b5cdc9 --- /dev/null +++ b/minicom-2.3-ncurses.patch @@ -0,0 +1,28 @@ +diff -urp minicom-2.3.orig/configure minicom-2.3/configure +--- minicom-2.3.orig/configure 2008-02-24 11:45:38.000000000 +0100 ++++ minicom-2.3/configure 2008-02-24 20:38:16.000000000 +0100 +@@ -6718,7 +6718,7 @@ done + + LIBS="$LIBS $TERMLIBS" + +-if test "x$termlib" = xncurses; then ++if test "x$termlib" = xncurses || test "x$termlib" = xtinfo; then + + for ac_header in ncurses/termcap.h + do +diff -urp minicom-2.3.orig/src/window.c minicom-2.3/src/window.c +--- minicom-2.3.orig/src/window.c 2008-02-24 21:04:29.000000000 +0100 ++++ minicom-2.3/src/window.c 2008-02-24 21:05:17.000000000 +0100 +@@ -28,7 +28,11 @@ RCSID("$Id: window.c,v 1.21 2008-02-06 2 + #include + #include + #include +-#include ++#ifdef HAVE_TERMCAP_H ++# include ++#elif defined (HAVE_NCURSES_TERMCAP_H) ++# include ++#endif + + #include "port.h" + #include "minicom.h" diff --git a/minicom-2.2-rh.patch b/minicom-2.3-rh.patch similarity index 64% rename from minicom-2.2-rh.patch rename to minicom-2.3-rh.patch index ce22967..5f09dfa 100644 --- a/minicom-2.2-rh.patch +++ b/minicom-2.3-rh.patch @@ -1,6 +1,7 @@ ---- minicom-2.2/src/main.c.rh 2005-10-31 13:13:51.000000000 +0100 -+++ minicom-2.2/src/main.c 2007-03-09 13:10:12.000000000 +0100 -@@ -82,7 +82,7 @@ +diff -urp minicom-2.3.orig/src/main.c minicom-2.3/src/main.c +--- minicom-2.3.orig/src/main.c 2008-02-02 23:49:53.000000000 +0100 ++++ minicom-2.3/src/main.c 2008-02-24 21:26:20.000000000 +0100 +@@ -87,7 +87,7 @@ void leave(const char *s) } set_privs(); if (lockfile[0]) @@ -9,8 +10,8 @@ if (P_CALLIN[0]) fastsystem(P_CALLIN, NULL, NULL, NULL); if (real_uid) -@@ -154,10 +154,13 @@ - int open_term(int doinit) +@@ -161,10 +161,13 @@ void term_socket_close(void) + int open_term(int doinit, int show_win_on_error) { struct stat stt; +#ifdef NOTNOW @@ -24,7 +25,7 @@ #ifdef HAVE_ERRNO_H int s_errno; #endif -@@ -165,6 +168,8 @@ +@@ -172,6 +175,8 @@ int open_term(int doinit, int show_win_o /* Upgrade our status. */ set_privs(); @@ -33,7 +34,7 @@ /* First see if the lock file directory is present. */ if (P_LOCK[0] && stat(P_LOCK, &stt) == 0) { -@@ -236,6 +241,30 @@ +@@ -243,6 +248,30 @@ int open_term(int doinit, int show_win_o close(fd); } @@ -54,7 +55,7 @@ + snprintf(lockfile, sizeof(lockfile), "%s", dial_tty); + } + if (rc) { -+ if (stdwin) wclose(stdwin, 1); ++ if (stdwin) mc_wclose(stdwin, 1); + drop_privs(); + return(-1); + } @@ -64,8 +65,8 @@ /* Run a special program to disable callin if needed. */ if (doinit > 0 && P_CALLOUT[0]) { if (fastsystem(P_CALLOUT, NULL, NULL, NULL) < 0) { -@@ -243,7 +272,7 @@ - wclose(stdwin, 1); +@@ -250,7 +279,7 @@ int open_term(int doinit, int show_win_o + mc_wclose(stdwin, 1); fprintf(stderr, _("Could not setup for dial out.\n")); if (lockfile[0]) - unlink(lockfile); @@ -73,7 +74,7 @@ drop_privs(); return -1; } -@@ -303,12 +332,12 @@ +@@ -310,12 +339,12 @@ int open_term(int doinit, int show_win_o fprintf(stderr, _("minicom: cannot open %s. Sorry.\n"), dial_tty); #endif if (lockfile[0]) @@ -85,32 +86,15 @@ if (lockfile[0]) - unlink(lockfile); + ttyunlock(lockfile); - werror(_("Cannot open %s!"), dial_tty); + if (show_win_on_error) + werror(_("Cannot open %s!"), dial_tty); drop_privs(); - return -1; ---- minicom-2.2/src/minicom.h.rh 2005-10-31 12:10:57.000000000 +0100 -+++ minicom-2.2/src/minicom.h 2007-03-09 13:10:12.000000000 +0100 -@@ -29,6 +29,8 @@ - #include "vt100.h" - #include "libport.h" - -+#include -+ - #ifdef USE_SOCKET - #include - #include -@@ -78,7 +80,7 @@ - EXTERN int escape; /* Escape code. */ - EXTERN int disable_online_time; /* disable online time display */ - --EXTERN char lockfile[128]; /* UUCP lock file of terminal */ -+EXTERN char lockfile[1024]; /* UUCP lock file of terminal */ - EXTERN char homedir[256]; /* Home directory of user */ - EXTERN char logfname[PARS_VAL_LEN]; /* Name of the logfile */ - EXTERN char username[16]; /* Who is using minicom? */ ---- minicom-2.2/src/minicom.c.rh 2007-03-09 13:10:12.000000000 +0100 -+++ minicom-2.2/src/minicom.c 2007-03-09 13:10:12.000000000 +0100 -@@ -1532,7 +1532,7 @@ +Only in minicom-2.3/src: main.c.orig +Only in minicom-2.3/src: main.c.rej +diff -urp minicom-2.3.orig/src/minicom.c minicom-2.3/src/minicom.c +--- minicom-2.3.orig/src/minicom.c 2008-02-24 21:21:30.000000000 +0100 ++++ minicom-2.3/src/minicom.c 2008-02-24 21:26:07.000000000 +0100 +@@ -1548,7 +1548,7 @@ dirty_goto: set_privs(); keyboard(KUNINSTALL, 0); if (lockfile[0]) @@ -119,9 +103,33 @@ close(portfd); /* Please - if your system doesn't have uid_t and/or gid_t, define 'em * conditionally in "port.h". ---- minicom-2.2/src/updown.c.rh 2005-08-14 22:39:30.000000000 +0200 -+++ minicom-2.2/src/updown.c 2007-03-09 13:10:12.000000000 +0100 -@@ -380,8 +380,10 @@ +Only in minicom-2.3/src: minicom.c.orig +diff -urp minicom-2.3.orig/src/minicom.h minicom-2.3/src/minicom.h +--- minicom-2.3.orig/src/minicom.h 2008-02-02 23:49:53.000000000 +0100 ++++ minicom-2.3/src/minicom.h 2008-02-24 21:26:07.000000000 +0100 +@@ -35,6 +35,8 @@ + + #include + ++#include ++ + #ifdef USE_SOCKET + #include + #include +@@ -84,7 +86,7 @@ EXTERN int tempst; /* Status line is tem + EXTERN int escape; /* Escape code. */ + EXTERN int disable_online_time; /* disable online time display */ + +-EXTERN char lockfile[128]; /* UUCP lock file of terminal */ ++EXTERN char lockfile[1024]; /* UUCP lock file of terminal */ + EXTERN char homedir[256]; /* Home directory of user */ + EXTERN char logfname[PARS_VAL_LEN]; /* Name of the logfile */ + EXTERN char username[16]; /* Who is using minicom? */ +Only in minicom-2.3/src: minicom.h.orig +diff -urp minicom-2.3.orig/src/updown.c minicom-2.3/src/updown.c +--- minicom-2.3.orig/src/updown.c 2007-10-10 22:18:20.000000000 +0200 ++++ minicom-2.3/src/updown.c 2008-02-24 21:26:07.000000000 +0100 +@@ -384,8 +384,10 @@ void kermit(void) { int status; int pid, n; @@ -131,8 +139,8 @@ +#endif /* Clear screen, set keyboard modes etc. */ - wleave(); -@@ -395,7 +397,7 @@ + mc_wleave(); +@@ -399,7 +401,7 @@ void kermit(void) /* Remove lockfile */ set_privs(); if (lockfile[0]) @@ -141,7 +149,7 @@ setgid((gid_t)real_gid); setuid((uid_t)real_uid); -@@ -416,6 +418,7 @@ +@@ -420,6 +422,7 @@ void kermit(void) /* Re-create lockfile */ if (lockfile[0]) { set_privs(); @@ -149,7 +157,7 @@ n = umask(022); /* Create lockfile compatible with UUCP-1.2 */ if ((fd = open(lockfile, O_WRONLY | O_CREAT | O_EXCL, 0666)) < 0) { -@@ -427,6 +430,9 @@ +@@ -431,6 +434,9 @@ void kermit(void) close(fd); } umask(n); @@ -159,3 +167,4 @@ drop_privs(); } m_flush(portfd); +Only in minicom-2.3/src: updown.c.orig diff --git a/minicom-2.3-wchar.patch b/minicom-2.3-wchar.patch new file mode 100644 index 0000000..9d856b4 --- /dev/null +++ b/minicom-2.3-wchar.patch @@ -0,0 +1,23 @@ +diff -urp minicom-2.3.orig/src/minicom.c minicom-2.3/src/minicom.c +--- minicom-2.3.orig/src/minicom.c 2008-02-24 20:46:09.000000000 +0100 ++++ minicom-2.3/src/minicom.c 2008-02-24 20:48:03.000000000 +0100 +@@ -31,7 +31,6 @@ + RCSID(PKG_VER "$Id: minicom.c,v 1.34 2008-02-02 22:49:53 al-guest Exp $") + + #include +-#include + #include + + #define EXTERN +Only in minicom-2.3/src: minicom.c.wchar +diff -urp minicom-2.3.orig/src/window.c minicom-2.3/src/window.c +--- minicom-2.3.orig/src/window.c 2008-02-24 21:06:29.000000000 +0100 ++++ minicom-2.3/src/window.c 2008-02-24 21:06:42.000000000 +0100 +@@ -27,7 +27,6 @@ RCSID("$Id: window.c,v 1.21 2008-02-06 2 + + #include + #include +-#include + #ifdef HAVE_TERMCAP_H + # include + #elif defined (HAVE_NCURSES_TERMCAP_H) diff --git a/minicom.spec b/minicom.spec index 6080918..7ea2990 100644 --- a/minicom.spec +++ b/minicom.spec @@ -1,7 +1,7 @@ Summary: A text-based modem control and terminal emulation program Name: minicom -Version: 2.2 -Release: 6%{?dist} +Version: 2.3 +Release: 1%{?dist} URL: http://alioth.debian.org/projects/minicom/ License: GPLv2+ Group: Applications/Communications @@ -10,21 +10,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: lockdev-devel ncurses-devel Requires: lockdev lrzsz -Source: minicom-%{version}.tar.gz +Source0: http://alioth.debian.org/frs/download.php/2332/minicom-2.3.tar.gz -Patch1: minicom-2.2-ncurses.patch -Patch2: minicom-2.2-drop-privs.patch -Patch3: minicom-2.2-wchar.patch +Patch1: minicom-2.3-ncurses.patch +Patch2: minicom-2.3-drop-privs.patch +Patch3: minicom-2.3-wchar.patch Patch4: minicom-2.2-umask.patch -Patch5: minicom-2.2-setlocale.patch Patch6: minicom-2.2-spaces.patch -Patch7: minicom-2.2-gotodir.patch -Patch8: minicom-2.2-rh.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 -Patch11: minicom-2.2-sigs.patch -Patch12: minicom-2.2-ttyerror.patch -Patch13: minicom-2.2-capture.patch %description Minicom is a simple text-based modem control and terminal emulation @@ -35,18 +31,14 @@ language, and other features. %prep %setup -q %patch1 -p1 -b .ncurses -%patch2 -p1 -b .privs +%patch2 -p1 -b .drop-privs %patch3 -p1 -b .wchar %patch4 -p1 -b .umask -%patch5 -p1 -b .setlocale %patch6 -p1 -b .spaces %patch7 -p1 -b .gotodir %patch8 -p1 -b .rh %patch9 -p1 -b .esc %patch10 -p1 -b .staticbuf -%patch11 -p1 -b .sigs -%patch12 -p1 -b .ttyerror -%patch13 -p1 -b .capture %build %configure @@ -75,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Sun Feb 24 2008 Lubomir Kundrak 2.3-1 +- 2.3 + * Tue Feb 19 2008 Fedora Release Engineering - 2.2-6 - Autorebuild for GCC 4.3 diff --git a/sources b/sources index 00c88f4..d6c6823 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13933c8777839f00e3730df23599dc93 minicom-2.2.tar.gz +0ebe7a91898384ca906787cc4e2c3f25 minicom-2.3.tar.gz