OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Aug-2006 11:51:12
Branch: HEAD Handle: 2006082710511101
Modified files:
openpkg-src/minicom minicom.patch minicom.spec
Log:
upgrading package: minicom 2.1 -> 2.2rc2
Summary:
Revision Changes Path
1.4 +91 -69 openpkg-src/minicom/minicom.patch
1.52 +20 -10 openpkg-src/minicom/minicom.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/minicom/minicom.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 minicom.patch
--- openpkg-src/minicom/minicom.patch 12 Aug 2004 18:48:17 -0000 1.3
+++ openpkg-src/minicom/minicom.patch 27 Aug 2006 09:51:11 -0000 1.4
@@ -1,67 +1,43 @@
-A bunch of bugfixes, taken over from the Debian "minicom" package.
-
-Index: src/file.c
---- src/file.c.orig 2003-04-22 01:56:46 +0200
-+++ src/file.c 2004-08-12 20:42:47 +0200
-@@ -509,7 +509,8 @@
- GETSDIR_ENTRY *d;
- {
- GETSDIR_ENTRY *my_d;
-- int indxr, len;
-+ int indxr, len, i;
-+ char *j;
-
- my_d = d;
- for(indxr = nrents, len = 0; indxr; --indxr, ++my_d)
-@@ -529,8 +530,18 @@
- for(indxr = nrents; indxr; --indxr, ++my_d)
- if(my_d->cflags & FL_TAG) {
- /* this could be *much* more efficient */
-- strcat(ret_buf, my_d->fname);
-- strcat(ret_buf, " ");
-+ for (i = strlen(ret_buf), j = my_d->fname; *j; j++) {
-+ if (*j == ' ') {
-+ if ((ret_buf = (char*)realloc(ret_buf, ++len)) == NULL)
{
-+ file_tell(_("Too many files tagged - buffer would
overflow"));
-+ return(NULL);
-+ }
-+ ret_buf[i++] = '\\';
-+ }
-+ ret_buf[i++] = *j;
-+ }
-+ ret_buf[i++] = ' ';
-+ ret_buf[i] = '\0';
- }
-
- ret_buf[strlen(ret_buf) - 1] = (char) 0;
-Index: src/minicom.c
---- src/minicom.c.orig 2003-05-16 22:33:19 +0200
-+++ src/minicom.c 2004-08-12 20:42:47 +0200
-@@ -998,7 +998,6 @@
- if (lang != NULL) {
- unsigned int j = 0;
- for (; j < sizeof(l)/sizeof(*l); j++) {
-- printf("%s/%s\n", v[i], l[j]);
- if (!strncmp(lang, l[j], strlen(l[j]))) {
- args[argk++] = "-8";
- done = 1;
-Index: src/rwconf.c
---- src/rwconf.c.orig 2003-04-13 00:52:20 +0200
-+++ src/rwconf.c 2004-08-12 20:43:17 +0200
-@@ -105,7 +105,7 @@
- { "", PUBLIC, "pprog11" },
- { "", PUBLIC, "pprog12" },
- /* Serial port & friends */
-- { DFL_PORT, PRIVATE, "port" },
-+ { DFL_PORT, PUBLIC, "port" },
- { CALLIN, PRIVATE, "callin" },
- { CALLOUT, PRIVATE, "callout" },
- { UUCPLOCK, PRIVATE, "lock" },
+Index: src/Makefile.in
+--- src/Makefile.in.orig 2006-07-30 13:45:20 +0200
++++ src/Makefile.in 2006-08-27 11:48:53 +0200
+@@ -209,7 +209,7 @@
+ minicom_keyserv_SOURCES = keyserv.c wkeys.c sysdep2.c
+ MINICOM_LIBPORT = $(top_builddir)/lib/libport.a
+ LDADD = $(MINICOM_LIBPORT)
+-AM_CFLAGS = @CFLAGS@ -Wall -W
++AM_CFLAGS = @CFLAGS@
+ confdir = @MINICOM_CONFDIR@
+ AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/lib -DCONFDIR=\"$(confdir)\" \
+ -DLOCALEDIR=\"$(datadir)/locale\"
+Index: src/minicom.h
+--- src/minicom.h.orig 2005-10-31 12:10:57 +0100
++++ src/minicom.h 2006-08-27 11:49:07 +0200
+@@ -34,6 +34,8 @@
+ #include <sys/un.h>
+ #endif
+
++#include <time.h>
++
+ /*
+ * [EMAIL PROTECTED] 08/08/98
+ * COLS must be equal to or less than MAXCOLS.
+Index: src/port.h
+--- src/port.h.orig 2005-10-31 11:31:38 +0100
++++ src/port.h 2006-08-27 11:48:53 +0200
+@@ -105,4 +105,7 @@
+ # endif
+ #endif
+
++#include <limits.h>
++#include <time.h>
++
+ extern char **environ;
Index: src/updown.c
---- src/updown.c.orig 2003-04-13 00:52:20 +0200
-+++ src/updown.c 2004-08-12 20:43:46 +0200
-@@ -352,6 +352,22 @@
- (void) mcd("");
+--- src/updown.c.orig 2005-08-14 22:39:30 +0200
++++ src/updown.c 2006-08-27 11:48:53 +0200
+@@ -351,6 +351,22 @@
+ mcd("");
timer_update();
+ /* return code == 1 if exeve failed */
@@ -84,14 +60,60 @@
if (win && (status & 0xFF00) == 0) {
#if VC_MUSIC
Index: src/util.c
---- src/util.c.orig 2003-03-30 20:55:54 +0200
-+++ src/util.c 2004-08-12 20:42:47 +0200
-@@ -113,7 +113,7 @@
+--- src/util.c.orig 2005-11-09 00:34:25 +0100
++++ src/util.c 2006-08-27 11:48:53 +0200
+@@ -116,7 +116,7 @@
/* Delete escape-characters ment for the shell */
p = cmd;
-- while((p = strchr(p, '\\')) != (char *)NULL)
-+ while((p = strchr(p, '\\')) != (char *)NULL && *(p+1) != ' ')
- strcpy(p, p + 1);
+- while ((p = strchr(p, '\\')))
++ while ((p = strchr(p, '\\')) && *(p+1) != ' ')
+ memmove(p, p + 1, strlen(p+1));
/* Split line into words */
+Index: src/window.c
+--- src/window.c.orig 2005-11-06 20:20:57 +0100
++++ src/window.c 2006-08-27 11:48:53 +0200
+@@ -58,6 +58,7 @@
+ #define swap(x, y) { int d = (x); (x) = (y); (y) = d; }
+
+ /* Terminal capabilities */
++static const char *BS;
+ static const char *CM, *IS, *RS, *AC, *EA;
+ static const char *ME, *SE, *UE, *AE;
+ static const char *AS, *MB, *MD, *MR, *SO, *US;
+@@ -337,8 +338,8 @@
+ else if (NL != NULL && x == 0 && x == curx && y == cury + 1)
+ outstr(NL);
+ #endif
+- else if (BC != NULL && y == cury && x == curx - 1)
+- outstr(BC);
++ else if (BS != NULL && y == cury && x == curx - 1)
++ outstr(BS);
+ else
+ outstr(tgoto(CM, x, y));
+ curx = x;
+@@ -2002,7 +2003,7 @@
+ CL = tgetstr("cl", &_tptr);
+ IC = tgetstr("ic", &_tptr);
+ DC = tgetstr("dc", &_tptr);
+- BC = tgetstr("bc", &_tptr);
++ BS = tgetstr("bc", &_tptr);
+ CR = tgetstr("cr", &_tptr);
+ NL = tgetstr("nl", &_tptr);
+ AC = tgetstr("ac", &_tptr);
+@@ -2061,11 +2062,11 @@
+ _has_am = tgetflag("am");
+ _mv_standout = tgetflag("ms");
+ if (tgetflag("bs")) {
+- if (BC == NULL)
+- BC = "\b";
++ if (BS == NULL)
++ BS = "\b";
+ }
+ else
+- BC = NULL;
++ BS = NULL;
+
+ /* Special IBM box-drawing characters */
+ D_UL = 201;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/minicom/minicom.spec
============================================================================
$ cvs diff -u -r1.51 -r1.52 minicom.spec
--- openpkg-src/minicom/minicom.spec 23 Feb 2006 14:02:23 -0000 1.51
+++ openpkg-src/minicom/minicom.spec 27 Aug 2006 09:51:12 -0000 1.52
@@ -22,6 +22,11 @@
## SUCH DAMAGE.
##
+# package version
+%define V_major 2.2
+%define V_minor rc2
+%define V_subdir 1721
+
# package information
Name: minicom
Summary: Serial Line Terminal Program
@@ -32,11 +37,11 @@
Class: BASE
Group: Communication
License: BSD
-Version: 2.1
-Release: 20060223
+Version: %{V_major}%{V_minor}
+Release: 20060827
# list of sources
-Source0:
http://alioth.debian.org/download.php/123/minicom-%{version}.tar.gz
+Source0:
http://alioth.debian.org/download.php/%{V_subdir}/minicom-%{V_major}-%{V_minor}.tar.gz
Patch0: minicom.patch
# build information
@@ -48,23 +53,28 @@
AutoReqProv: no
%description
- Minicom is a terminal program for serial line communications.
+ Minicom is a menu driven communication program for serial line
+ communications. It emulates ANSI and VT102 terminals, has a dialing
+ directory and automatic ZMODEM download support.
%track
prog minicom = {
- version = %{version}
+ version = %{V_major}-%{V_minor}
url =
http://alioth.debian.org/project/showfiles.php?group_id=30018&release_id=96
regex = minicom-(__VER__)\.tar\.gz
}
+ prog minicom:subdir = {
+ version = %{V_subdir}
+ url =
http://alioth.debian.org/project/showfiles.php?group_id=30018&release_id=96
+ regex = /(\d+)/minicom-__VER__\.tar\.gz
+ }
%prep
- %setup -q
+ %setup -q -n minicom-%{V_major}-%{V_minor}
%patch -p0
- # be compatible with non-gcc
- %{l_shtool} subst -e 's;-Wall -W;;' src/Makefile.in
%{l_shtool} subst \
- -e 's;BC;BS;g' \
- src/window.c
+ -e 's;wprintf;minicom_wprintf;g' \
+ `find src -name "*.[ch]" -print`
%build
# determine default serial device
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
