- Update to 2.7
- Fixing bogus dates in the changelog
This commit is contained in:
Jaromir Capik
parent
e7b0e9ca61
commit
ceaf8eaac8
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@ minicom-2.4.tar.gz
|
||||
/minicom-2.5.tar.gz
|
||||
/minicom-2.6.1.tar.gz
|
||||
/minicom-2.6.2.tar.gz
|
||||
/minicom-2.7.tar.gz
|
||||
|
||||
@ -1,193 +0,0 @@
|
||||
diff -Naur minicom-2.6.2.orig/man/minicom.1 minicom-2.6.2/man/minicom.1
|
||||
--- minicom-2.6.2.orig/man/minicom.1 2012-09-02 19:29:30.000000000 +0200
|
||||
+++ minicom-2.6.2/man/minicom.1 2013-07-31 14:08:12.653963661 +0200
|
||||
@@ -4,7 +4,7 @@
|
||||
.\" It may be distributed under the GNU Public License, version 2, or
|
||||
.\" any higher version. See section COPYING of the GNU Public license
|
||||
.\" for conditions under which this file may be redistributed.
|
||||
-.TH MINICOM 1 "$Date: 2012-09" "User's Manual" "Version 2.6.1"
|
||||
+.TH MINICOM 1 "July 2013" "User's Manual" "Version 2.6.2"
|
||||
.SH NAME
|
||||
minicom \- friendly serial communication program
|
||||
.SH SYNOPSIS
|
||||
@@ -9,10 +9,7 @@
|
||||
minicom \- friendly serial communication program
|
||||
.SH SYNOPSIS
|
||||
.B minicom
|
||||
-.RI "[\-somMlwz8] [\-c on|off] [\-S script] [\-d entry]"
|
||||
-.br
|
||||
-.in 15
|
||||
-.RI "[\-a on|off] [\-t term] [\-p pty] [\-C capturefile] [" configuration ]
|
||||
+.RI "[options] [" configuration ]
|
||||
.SH DESCRIPTION
|
||||
.B minicom
|
||||
is a communication program which somewhat resembles the shareware
|
||||
@@ -23,7 +23,7 @@
|
||||
configurations, and more.
|
||||
.SH COMMAND-LINE
|
||||
.TP 0.5i
|
||||
-.B \-s
|
||||
+.B \-s, --setup
|
||||
.BR S etup.
|
||||
Root edits the system-wide defaults in /etc/minirc.dfl with this option.
|
||||
When it is used, minicom does
|
||||
@@ -33,7 +33,7 @@
|
||||
because your system has changed, or for the first time you run
|
||||
minicom. For most systems, reasonable defaults are already compiled in.
|
||||
.TP 0.5i
|
||||
-.B \-o
|
||||
+.B \-o, --noinit
|
||||
Do not initialize. Minicom will skip the initialization code. This
|
||||
option is handy if you quit from minicom without resetting, and
|
||||
then want to restart a session. It is potentially dangerous though: no
|
||||
@@ -42,7 +42,7 @@
|
||||
it is assumed, that users who are given access to a modem are
|
||||
responsible enough for their actions.
|
||||
.TP 0.5i
|
||||
-.B \-m
|
||||
+.B \-m, --metakey
|
||||
Override command-key with the Meta or ALT key. This is the default in 1.80
|
||||
and it can also be configured in one of minicom's menus, but if you use
|
||||
different terminals all the time, of which some don't have a Meta or ALT key,
|
||||
@@ -51,39 +51,39 @@
|
||||
assumes that your Meta key sends the ESC prefix, not the other variant
|
||||
that sets the highest bit of the character.
|
||||
.TP 0.5i
|
||||
-.B \-M
|
||||
+.B \-M, --metakey8
|
||||
Same as \-m, but assumes that your Meta key sets the 8th bit of the
|
||||
character high (sends 128 + character code).
|
||||
.TP 0.5i
|
||||
-.B \-z
|
||||
+.B \-z, --statline
|
||||
Use terminal status line. This only works on terminals that support it
|
||||
and that have the relevant information in their \fItermcap\fP or
|
||||
\fIterminfo\fP database entry.
|
||||
.TP 0.5i
|
||||
-.B \-l
|
||||
+.B \-l, --ansi
|
||||
.BR L iteral
|
||||
translation of characters with the high bit set. With this flag on,
|
||||
minicom will try to translate the IBM line characters to ASCII. Many PC-unix
|
||||
clones will display character correctly without translation (Linux in a
|
||||
special mode, Coherent and SCO).
|
||||
.TP 0.5i
|
||||
-.B \-L
|
||||
+.B \-L, --iso
|
||||
Ditto but assume screen uses an ISO8859 character set.
|
||||
.TP 0.5i
|
||||
-.B \-w
|
||||
+.B \-w, --wrap
|
||||
Turns line-wrap on at startup by default.
|
||||
.TP 0.5i
|
||||
-.B \-H
|
||||
+.B \-H, --displayhex
|
||||
Turn on output in hex mode.
|
||||
.TP 0.5i
|
||||
-.B \-a
|
||||
+.B \-a, --attrib=on/off
|
||||
.BR A ttribute
|
||||
usage. Some terminals, notably Televideo's, have rotten attribute
|
||||
handling (serial instead of parallel). By default, minicom uses '\-a
|
||||
on', but if you are using such a terminal you can (must!) supply the
|
||||
option '\-a off'. The trailing 'on' or 'off' is needed.
|
||||
.TP 0.5i
|
||||
-.B \-t
|
||||
+.B \-t, --term=TERM
|
||||
.BR T erminal
|
||||
type. With this flag, you can override the environment TERM variable.
|
||||
This is handy for use in the MINICOM environment variable; one can create
|
||||
@@ -91,7 +91,7 @@
|
||||
initializes the screen to raw mode so that in conjunction with the \-l
|
||||
flag, the IBM line characters are displayed untranslated.
|
||||
.TP 0.5i
|
||||
-.B \-c
|
||||
+.B \-c, --color=on/off
|
||||
.BR C olor
|
||||
usage. Some terminals (such as the Linux console) support color with
|
||||
the standard ANSI escape sequences. Because there is apparently no
|
||||
@@ -100,14 +100,14 @@
|
||||
with '\-c on'. This, and the '\-m' option, are good candidates to put
|
||||
into the MINICOM environment variable.
|
||||
.TP 0.5i
|
||||
-.B \-S
|
||||
+.B \-S, --script=SCRIPT
|
||||
.BR script .
|
||||
Run the named script at startup. So far, passing username and password
|
||||
to a startup script is not supported. If you also use the \-d option to
|
||||
start dialing at startup, the \-S script will be run BEFORE dialing the
|
||||
entries specified with \-d.
|
||||
.TP 0.5i
|
||||
-.B \-d
|
||||
+.B \-d, --dial=ENTRY
|
||||
.BR D ial
|
||||
an entry from the dialing directory on startup. You can specify an
|
||||
index number, but also a substring of the name of the entry. If you
|
||||
@@ -117,7 +117,7 @@
|
||||
entry specified after all other program initialization procedures are
|
||||
completed.
|
||||
.TP 0.5i
|
||||
-.B \-p
|
||||
+.B \-p, --ptty=TTYP
|
||||
.BR P seudo
|
||||
terminal
|
||||
to use. This overrides the terminal port defined in the configuration
|
||||
@@ -125,34 +125,40 @@
|
||||
the form (/dev/)tty[p-z/][0-f], (/dev/)pts[p-z/][0-f] or
|
||||
(/dev/)pty[p-z/][0-f]. For example, /dev/ttyp1, pts/0 or /dev/ptyp2.
|
||||
.TP 0.5i
|
||||
-.B \-C
|
||||
+.B \-C, --capturefile=FILE
|
||||
.BR filename .
|
||||
Open capture file at startup.
|
||||
.TP 0.5i
|
||||
-.B \-T
|
||||
+.B \-T, --disabletime
|
||||
Disable the display of the online time in the status bar.
|
||||
.TP 0.5i
|
||||
-.B \-b
|
||||
+.B \-b, --baudrate
|
||||
Specify the baud rate, overriding the value given in the configuration
|
||||
file.
|
||||
.TP 0.5i
|
||||
-.B \-D
|
||||
+.B \-D, --device
|
||||
Specify the device, overriding the value given in the configuration file.
|
||||
.TP 0.5i
|
||||
-.B \-R
|
||||
+.B \-R, --remotecharset
|
||||
Specify the character set of the remote system is using and convert it to
|
||||
the character set of the local side. Example might be 'latin1'.
|
||||
.TP 0.5i
|
||||
-.B \-7
|
||||
+.B \-7, --7bit
|
||||
7bit mode for terminals which aren't 8bit capable. 8bit is default if the
|
||||
environment is configured for this via LANG or LC_ALL, 7bit otherwise.
|
||||
.TP 0.5i
|
||||
-.B \-8
|
||||
+.B \-8, --8bit
|
||||
8bit characters pass through without any modification. 'Continuous'
|
||||
means no locate/attribute control sequences are inserted without
|
||||
real change of locate/attribute. This mode is to display 8bit
|
||||
multi-byte characters such as Japanese. Not needed in every language with
|
||||
8bit characters. (For example displaying Finnish text doesn't need this.)
|
||||
+.TP 0.5i
|
||||
+.B \-h, --help
|
||||
+Display help and exit.
|
||||
+.TP 0.5i
|
||||
+.B \-v, --version
|
||||
+Print the minicom version.
|
||||
.PP
|
||||
.RS 0.5i
|
||||
When
|
||||
diff -Naur minicom-2.6.2.orig/src/minicom.c minicom-2.6.2/src/minicom.c
|
||||
--- minicom-2.6.2.orig/src/minicom.c 2013-01-18 23:41:44.000000000 +0100
|
||||
+++ minicom-2.6.2/src/minicom.c 2013-07-31 14:09:46.912181667 +0200
|
||||
@@ -831,6 +831,7 @@
|
||||
" -T, --disabletime : disable display of online time\n"
|
||||
" -R, --remotecharset : character set of communication partner\n"
|
||||
" -v, --version : output version information and exit\n"
|
||||
+ " -h, --help : show help\n"
|
||||
" configuration : configuration file to use\n\n"
|
||||
"These options can also be specified in the MINICOM environment variable.\n"),
|
||||
PACKAGE);
|
||||
@ -1,104 +0,0 @@
|
||||
diff -r 7bc59ff7fd31 -r 60a0efeec606 ChangeLog
|
||||
--- a/ChangeLog Thu Feb 07 20:59:16 2013 +0100
|
||||
+++ b/ChangeLog Thu Feb 07 21:00:08 2013 +0100
|
||||
@@ -1,3 +1,9 @@
|
||||
+2013-02-07 Adam Lackorzynski <adam@os.inf.tu-dresden.de>
|
||||
+
|
||||
+ * src/main.c, src/minicom.h, src/updown.c:
|
||||
+ [#314018] [PATCH] Disabling lockfile warnings when the
|
||||
+ device disappears (ttyUSB hot-unplug), by Jaromir Capik
|
||||
+
|
||||
2013-02-06 Adam Lackorzynski <adam@os.inf.tu-dresden.de>
|
||||
|
||||
* NEWS: Release 2.6.2
|
||||
diff -r 7bc59ff7fd31 -r 60a0efeec606 src/main.c
|
||||
--- a/src/main.c Thu Feb 07 20:59:16 2013 +0100
|
||||
+++ b/src/main.c Thu Feb 07 21:00:08 2013 +0100
|
||||
@@ -225,7 +225,7 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
- if (doinit > 0 && lockfile_create() != 0)
|
||||
+ if (doinit > 0 && lockfile_create(no_msgs) != 0)
|
||||
return -1;
|
||||
|
||||
nolock:
|
||||
diff -r 7bc59ff7fd31 -r 60a0efeec606 src/minicom.h
|
||||
--- a/src/minicom.h Thu Feb 07 20:59:16 2013 +0100
|
||||
+++ b/src/minicom.h Thu Feb 07 21:00:08 2013 +0100
|
||||
@@ -301,7 +301,7 @@
|
||||
void domacros(void);
|
||||
|
||||
|
||||
-int lockfile_create(void);
|
||||
+int lockfile_create(int no_msgs);
|
||||
void lockfile_remove(void);
|
||||
|
||||
|
||||
diff -r 7bc59ff7fd31 -r 60a0efeec606 src/updown.c
|
||||
--- a/src/updown.c Thu Feb 07 20:59:16 2013 +0100
|
||||
+++ b/src/updown.c Thu Feb 07 21:00:08 2013 +0100
|
||||
@@ -413,7 +413,7 @@
|
||||
if (win == (WIN *)0)
|
||||
mc_wreturn();
|
||||
|
||||
- lockfile_create();
|
||||
+ lockfile_create(0);
|
||||
|
||||
/* MARK updated 02/17/94 - Flush modem port before displaying READY msg */
|
||||
/* because a BBS often displays menu text right after a download, and we */
|
||||
@@ -459,7 +459,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-int lockfile_create(void)
|
||||
+int lockfile_create(int no_msgs)
|
||||
{
|
||||
int n;
|
||||
|
||||
@@ -474,25 +474,29 @@
|
||||
n = umask(022);
|
||||
/* Create lockfile compatible with UUCP-1.2 */
|
||||
if ((fd = open(lockfile, O_WRONLY | O_CREAT | O_EXCL, 0666)) < 0) {
|
||||
- werror(_("Cannot create lockfile!"));
|
||||
+ if (!no_msgs)
|
||||
+ werror(_("Cannot create lockfile!"));
|
||||
} else {
|
||||
// FHS format:
|
||||
char buf[12];
|
||||
snprintf(buf, sizeof(buf), "%10d\n", getpid());
|
||||
buf[sizeof(buf) - 1] = 0;
|
||||
if (write(fd, buf, strlen(buf)) < (ssize_t)strlen(buf))
|
||||
- fprintf(stderr, _("Failed to write lockfile %s\n"), lockfile);
|
||||
+ if (!no_msgs)
|
||||
+ fprintf(stderr, _("Failed to write lockfile %s\n"), lockfile);
|
||||
close(fd);
|
||||
}
|
||||
umask(n);
|
||||
return 0;
|
||||
#else
|
||||
n = ttylock(dial_tty);
|
||||
- if (n < 0) {
|
||||
- fprintf(stderr, _("Cannot create lockfile for %s: %s\n"), dial_tty, strerror(-n));
|
||||
- } else if (n > 0) {
|
||||
- fprintf(stderr, _("Device %s is locked.\n"), dial_tty);
|
||||
- }
|
||||
+ if (!no_msgs)
|
||||
+ {
|
||||
+ if (n < 0)
|
||||
+ fprintf(stderr, _("Cannot create lockfile for %s: %s\n"), dial_tty, strerror(-n));
|
||||
+ else if (n > 0)
|
||||
+ fprintf(stderr, _("Device %s is locked.\n"), dial_tty);
|
||||
+ }
|
||||
return n;
|
||||
#endif
|
||||
}
|
||||
@@ -546,7 +550,7 @@
|
||||
mc_wreturn();
|
||||
|
||||
/* Re-create lockfile */
|
||||
- lockfile_create();
|
||||
+ lockfile_create(0);
|
||||
|
||||
m_flush(portfd);
|
||||
port_init();
|
||||
28
minicom.spec
28
minicom.spec
@ -1,18 +1,18 @@
|
||||
|
||||
Summary: A text-based modem control and terminal emulation program
|
||||
Name: minicom
|
||||
Version: 2.6.2
|
||||
Release: 4%{?dist}
|
||||
Version: 2.7
|
||||
Release: 1%{?dist}
|
||||
URL: http://alioth.debian.org/projects/minicom/
|
||||
License: GPL+ and GPLv2+ and GPLv2 and LGPLv2+ Public Domain and Copyright only
|
||||
Group: Applications/Communications
|
||||
ExcludeArch: s390 s390x
|
||||
|
||||
Source0: https://alioth.debian.org/frs/download.php/file/3977/minicom-2.7.tar.gz
|
||||
|
||||
BuildRequires: lockdev-devel ncurses-devel autoconf automake gettext-devel
|
||||
Requires: lockdev lrzsz
|
||||
|
||||
Source0: https://alioth.debian.org/frs/download.php/3869/minicom-2.6.2.tar.gz
|
||||
|
||||
Patch0: minicom-2.6.2-no-lockfile-messages-with-detached-ttyusb.patch
|
||||
Patch1: minicom-2.6.2-RH-man-page-scan.patch
|
||||
|
||||
%description
|
||||
Minicom is a simple text-based modem control and terminal emulation
|
||||
@ -20,27 +20,28 @@ program somewhat similar to MSDOS Telix. Minicom includes a dialing
|
||||
directory, full ANSI and VT100 emulation, an (external) scripting
|
||||
language, and other features.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch0 -p1 -b .no-lock-warn
|
||||
%patch1 -p1 -b .rh-man-scan
|
||||
|
||||
cp -pr doc doc_
|
||||
rm -f doc_/Makefile*
|
||||
|
||||
|
||||
%build
|
||||
#./autogen.sh
|
||||
autoreconf --verbose --force --install
|
||||
%configure
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
make DESTDIR=%{buildroot} install
|
||||
mkdir -p %{buildroot}%{_sysconfdir}
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
|
||||
%files -f %{name}.lang
|
||||
%doc ChangeLog AUTHORS NEWS TODO doc_/*
|
||||
# DO NOT MAKE minicom SUID/SGID anything.
|
||||
@ -50,7 +51,12 @@ mkdir -p %{buildroot}%{_sysconfdir}
|
||||
%{_bindir}/ascii-xfr
|
||||
%{_mandir}/man1/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jan 06 2014 Jaromir Capik <jcapik@redhat.com> - 2.7-1
|
||||
- Update to 2.7
|
||||
- Fixing bogus dates in the changelog
|
||||
|
||||
* Wed Aug 07 2013 Jaromir Capik <jcapik@redhat.com> - 2.6.2-4
|
||||
- Fixing the license tag
|
||||
|
||||
@ -348,7 +354,7 @@ mkdir -p %{buildroot}%{_sysconfdir}
|
||||
* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
|
||||
- auto rebuild in the new build environment (release 5)
|
||||
|
||||
* Tue Jan 24 1999 Michael Maher <mike@redhat.com>
|
||||
* Sun Jan 24 1999 Michael Maher <mike@redhat.com>
|
||||
- fixed bug, changed groups.
|
||||
|
||||
* Thu Oct 01 1998 Cristian Gafton <gafton@redhat.com>
|
||||
@ -367,7 +373,7 @@ mkdir -p %{buildroot}%{_sysconfdir}
|
||||
- BuildRoot; updated .make patch to cope with the buildroot
|
||||
- fixed the spec file
|
||||
|
||||
* Tue May 06 1998 Michael Maher <mike@redhat.com>
|
||||
* Wed May 06 1998 Michael Maher <mike@redhat.com>
|
||||
- update of package (1.81)
|
||||
|
||||
* Wed Oct 29 1997 Otto Hammersmith <otto@redhat.com>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user