OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Aug-2004 20:48:18
Branch: HEAD Handle: 2004081219481700
Added files:
openpkg-src/minicom minicom.patch
Modified files:
openpkg-src/minicom minicom.spec
Log:
add some Debian bugfixes
Summary:
Revision Changes Path
1.3 +97 -0 openpkg-src/minicom/minicom.patch
1.45 +4 -2 openpkg-src/minicom/minicom.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/minicom/minicom.patch
============================================================================
$ cvs diff -u -r0 -r1.3 minicom.patch
--- /dev/null 2004-08-12 20:48:17 +0200
+++ minicom.patch 2004-08-12 20:48:17 +0200
@@ -0,0 +1,97 @@
+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/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("");
+ timer_update();
+
++ /* return code == 1 if exeve failed */
++ if (win && status == 0x0001) {
++#if VC_MUSIC
++ if (P_SOUND[0] == 'Y') {
++ wprintf(win, _("\n Failure executing protocol. Press any key to
continue..."));
++ music();
++ } else
++ sleep(1);
++#else
++ /* MARK updated 02/17/94 - If there was no VC_MUSIC capability, */
++ /* then at least make some beeps! */
++ if (P_SOUND[0] == 'Y') wprintf(win, "\007\007\007");
++ sleep(1);
++#endif
++ } else
++
+ /* If we got interrupted, status != 0 */
+ 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 @@
+
+ /* 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);
+
+ /* Split line into words */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/minicom/minicom.spec
============================================================================
$ cvs diff -u -r1.44 -r1.45 minicom.spec
--- openpkg-src/minicom/minicom.spec 7 Feb 2004 17:56:40 -0000 1.44
+++ openpkg-src/minicom/minicom.spec 12 Aug 2004 18:48:17 -0000 1.45
@@ -34,10 +34,11 @@
Group: Communication
License: BSD
Version: 2.1
-Release: 20040207
+Release: 20040812
# list of sources
Source0: http://alioth.debian.org/download.php/123/minicom-%{version}.tar.gz
+Patch0: minicom.patch
# build information
Prefix: %{l_prefix}
@@ -53,12 +54,13 @@
%track
prog minicom = {
version = %{version}
- url =
http://alioth.debian.org/project/showfiles.php?group_id=31&release_id=57
+ url =
http://alioth.debian.org/project/showfiles.php?group_id=30018&release_id=96
regex = minicom-(__VER__)\.tar\.gz
}
%prep
%setup -q
+ %patch -p0
# be compatible with non-gcc
%{l_shtool} subst -e 's;-Wall -W;;' src/Makefile.in
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
