[minicom/f14/master] - update to new upstream version - remove patches merged by upstream
Jan Görig
jgorig at fedoraproject.org
Mon Jan 31 09:54:26 UTC 2011
commit 27ba23ca9bbd88a5a580efbd5262e3de452b190f
Author: Jan Görig <jgorig at redhat.com>
Date: Mon Jan 31 10:52:50 2011 +0100
- update to new upstream version
- remove patches merged by upstream
minicom-2.2-spaces.patch | 45 ------
minicom-2.3-gotodir.patch | 65 --------
minicom-2.4-config-parse.patch | 12 --
minicom-2.4-config.patch | 16 --
minicom-2.4-esc.patch | 12 --
minicom-2.4-man-typo.patch | 21 ---
minicom-2.4-staticbuf.patch | 217 --------------------------
minicom-2.4-umask.patch | 12 --
minicom-2.4-rh.patch => minicom-2.5-rh.patch | 29 ++--
minicom.spec | 30 +---
sources | 2 +-
11 files changed, 26 insertions(+), 435 deletions(-)
---
diff --git a/minicom-2.4-rh.patch b/minicom-2.5-rh.patch
similarity index 85%
rename from minicom-2.4-rh.patch
rename to minicom-2.5-rh.patch
index 6221347..474b842 100644
--- a/minicom-2.4-rh.patch
+++ b/minicom-2.5-rh.patch
@@ -1,13 +1,16 @@
diff --git a/src/main.c b/src/main.c
-index e3f6e45..8009c6e 100644
+index bc4db89..8e68e2c 100644
--- a/src/main.c
+++ b/src/main.c
-@@ -154,13 +154,19 @@ void term_socket_close(void)
- int open_term(int doinit, int show_win_on_error)
+@@ -154,16 +154,22 @@ void term_socket_close(void)
+ int open_term(int doinit, int show_win_on_error, int no_msgs)
{
struct stat stt;
+#ifdef NOTNOW
- char buf[128];
+ union {
+ char bytes[128];
+ int kermit;
+ } buf;
- int fd, n = 0;
+ int fd;
int pid;
@@ -23,7 +26,7 @@ index e3f6e45..8009c6e 100644
/* First see if the lock file directory is present. */
if (P_LOCK[0] && stat(P_LOCK, &stt) == 0) {
-@@ -212,6 +218,44 @@ int open_term(int doinit, int show_win_on_error)
+@@ -215,6 +221,44 @@ int open_term(int doinit, int show_win_on_error, int no_msgs)
if (doinit > 0)
lockfile_create();
@@ -68,7 +71,7 @@ index e3f6e45..8009c6e 100644
/* Run a special program to disable callin if needed. */
if (doinit > 0 && P_CALLOUT[0]) {
if (fastsystem(P_CALLOUT, NULL, NULL, NULL) < 0) {
-@@ -229,7 +273,6 @@ int open_term(int doinit, int show_win_on_error)
+@@ -232,7 +276,6 @@ int open_term(int doinit, int show_win_on_error, int no_msgs)
signal(SIGALRM, get_alrm);
alarm(4);
#ifdef USE_SOCKET
@@ -77,10 +80,10 @@ index e3f6e45..8009c6e 100644
if (strncmp(dial_tty, SOCKET_PREFIX, strlen(SOCKET_PREFIX)) == 0) {
portfd_is_socket = 1;
diff --git a/src/minicom.c b/src/minicom.c
-index 2960112..4d4d22d 100644
+index 7780ff7..8b26f0d 100644
--- a/src/minicom.c
+++ b/src/minicom.c
-@@ -1554,8 +1554,7 @@ dirty_goto:
+@@ -1569,8 +1569,7 @@ dirty_goto:
mc_wclose(st, 0);
mc_wclose(stdwin, 1);
keyboard(KUNINSTALL, 0);
@@ -91,7 +94,7 @@ index 2960112..4d4d22d 100644
if (quit != NORESET && P_CALLIN[0])
diff --git a/src/minicom.h b/src/minicom.h
-index b361dce..e8029e9 100644
+index 309d54a..83f3fca 100644
--- a/src/minicom.h
+++ b/src/minicom.h
@@ -34,10 +34,14 @@
@@ -119,10 +122,10 @@ index b361dce..e8029e9 100644
EXTERN char logfname[PARS_VAL_LEN]; /* Name of the logfile */
EXTERN char username[16]; /* Who is using minicom? */
diff --git a/src/updown.c b/src/updown.c
-index 507717a..ee94978 100644
+index 24531a2..23194e4 100644
--- a/src/updown.c
+++ b/src/updown.c
-@@ -377,12 +377,14 @@ void updown(int what, int nr)
+@@ -441,12 +441,14 @@ void updown(int what, int nr)
void lockfile_remove(void)
{
@@ -137,9 +140,9 @@ index 507717a..ee94978 100644
+ int rc;
+#ifdef NOTNOW
int fd, n;
- char buf[81];
-@@ -399,6 +401,14 @@ void lockfile_create(void)
+ if (!lockfile[0])
+@@ -468,6 +470,14 @@ void lockfile_create(void)
close(fd);
}
umask(n);
diff --git a/minicom.spec b/minicom.spec
index e12665e..1ab255d 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.4
-Release: 3%{?dist}
+Version: 2.5
+Release: 1%{?dist}
URL: http://alioth.debian.org/projects/minicom/
License: GPLv2+
Group: Applications/Communications
@@ -10,17 +10,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: lockdev-devel ncurses-devel
Requires: lockdev lrzsz
-Source0: http://alioth.debian.org/frs/download.php/3195/minicom-2.4.tar.gz
+Source0: http://alioth.debian.org/frs/download.php/3487/minicom-2.5.tar.gz
-Patch1: minicom-2.4-umask.patch
-Patch2: minicom-2.2-spaces.patch
-Patch3: minicom-2.3-gotodir.patch
-Patch4: minicom-2.4-rh.patch
-Patch5: minicom-2.4-esc.patch
-Patch6: minicom-2.4-staticbuf.patch
-Patch7: minicom-2.4-config.patch
-Patch8: minicom-2.4-config-parse.patch
-Patch9: minicom-2.4-man-typo.patch
+Patch1: minicom-2.5-rh.patch
%description
Minicom is a simple text-based modem control and terminal emulation
@@ -30,15 +22,7 @@ language, and other features.
%prep
%setup -q
-%patch1 -p1 -b .umask
-%patch2 -p1 -b .spaces
-%patch3 -p1 -b .gotodir
-%patch4 -p1 -b .rh
-%patch5 -p1 -b .esc
-%patch6 -p1 -b .staticbuf
-%patch7 -p1 -b .config
-%patch8 -p1 -b .config-parse
-%patch9 -p1 -b .man
+%patch1 -p1 -b .rh
cp -pr doc doc_
rm -f doc_/Makefile*
@@ -68,6 +52,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/*
%changelog
+* Mon Jan 31 2011 Jan Görig <jgorig at redhat.com> 2.5-1
+- update to new upstream version
+- remove patches merged by upstream
+
* Fri Jan 14 2011 Jan Görig <jgorig at redhat.com> 2.4-3
- fixed typos in ascii-xfr manpage (#669098)
- fixed empty lines handling in configuration file (#669406)
diff --git a/sources b/sources
index da43475..d8d81ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-700976a3c2dcc8bbd50ab9bb1c08837b minicom-2.4.tar.gz
+a5117d4d21e2c9e825edb586ee2fe8d2 minicom-2.5.tar.gz
More information about the scm-commits
mailing list