Date: 18 May 2002 19:18:42 -0000 From: Hiroo Ono <hiroo@oikumene.gcd.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/38254: Update net/micq to 0.4.8pl10 Message-ID: <20020518191842.69678.qmail@barleycoren.oikumene.gcd.org>
next in thread | raw e-mail | index | archive | help
>Number: 38254 >Category: ports >Synopsis: Update net/micq to 0.4.8pl10 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat May 18 12:20:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Hiroo Ono >Release: FreeBSD 5.0-DP1 i386 >Organization: >Environment: System: FreeBSD barleycoren.oikumene.gcd.org 5.0-DP1 FreeBSD 5.0-DP1 #0: Sun Apr 7 02:51:42 GMT 2002 murray@builder.freebsdmall.com:/usr/src/sys/i386/compile/GENERIC i386 >Description: Update the port to 0.4.8pl10. Also, fix bug for russian and japanese display when receiving message. >How-To-Repeat: Patch attached. >Fix: Russian catalog (lang/ru.i18n was updated. As I do not understand Russian, I just deleted FreeBSD patch patch-lang::ru.i18n. Can anyone who understand Russian take a look at? diff -ur micq/Makefile micq.new/Makefile --- micq/Makefile Sat May 18 12:06:06 2002 +++ micq.new/Makefile Sat May 18 12:08:52 2002 @@ -6,11 +6,11 @@ # PORTNAME= micq -PORTVERSION= 0.4.8.9 +PORTVERSION= 0.4.8.10 PORTREVISION= 0 CATEGORIES= net MASTER_SITES= http://micq.org/source/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S/9/pl9/} +DISTNAME= ${PORTNAME}-${PORTVERSION:S/10/pl10/} EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org diff -ur micq/distinfo micq.new/distinfo --- micq/distinfo Sat May 18 12:06:06 2002 +++ micq.new/distinfo Sat May 18 12:10:45 2002 @@ -1 +1 @@ -MD5 (micq-0.4.8.pl9.tgz) = eae3b1e32e78fcdf783fc8a769d77f7c +MD5 (micq-0.4.8.pl10.tgz) = 13c575d2a83e8211019ec1b9cdd5994c diff -ur micq/files/patch-ab micq.new/files/patch-ab --- micq/files/patch-ab Tue Apr 23 02:56:04 2002 +++ micq.new/files/patch-ab Sun May 19 02:46:26 2002 @@ -1,17 +1,16 @@ +$FreeBSD$ -$FreeBSD: ports/net/micq/files/patch-ab,v 1.3 2002/04/22 17:56:04 sobomax Exp $ - ---- src/mreadline.c.orig Fri Feb 8 01:02:42 2002 -+++ src/mreadline.c Fri Apr 5 12:51:45 2002 -@@ -174,9 +174,9 @@ - } +--- src/mreadline.c.orig Mon May 13 20:06:19 2002 ++++ src/mreadline.c Sat May 18 12:17:32 2002 +@@ -257,9 +257,9 @@ + } - if ((uin = TabGetNext ())) -- sprintf (s, "%s %s/", msgcmd, ContactFindName (uin)); -+ snprintf (s, sizeof(s), "%s %s/", msgcmd, ContactFindName (uin)); - else -- sprintf (s, "%s ", msgcmd); -+ snprintf (s, sizeof(s), "%s ", msgcmd); + if ((uin = TabGetNext ())) +- sprintf (s, "%s %s/", msgcmd, ContactFindName (uin)); ++ snprintf (s, sizeof(s), "%s %s/", msgcmd, ContactFindName (uin)); + else +- sprintf (s, "%s ", msgcmd); ++ snprintf (s, sizeof(s), "%s ", msgcmd); - clen = cpos = strlen (s); - R_undraw (); + R_print (); + clen = cpos = strlen (s); diff -ur micq/files/patch-ac micq.new/files/patch-ac --- micq/files/patch-ac Sat May 18 12:06:06 2002 +++ micq.new/files/patch-ac Sun May 19 02:48:01 2002 @@ -1,9 +1,8 @@ +$FreeBSD$ -$FreeBSD: ports/net/micq/files/patch-ac,v 1.4 2002/05/14 07:57:22 sobomax Exp $ - ---- src/server.c 2002/04/05 09:53:54 1.1 -+++ src/server.c 2002/04/05 09:54:20 -@@ -134,7 +134,7 @@ +--- src/server.c.orig Sat May 18 12:17:51 2002 ++++ src/server.c Sat May 18 12:18:10 2002 +@@ -136,7 +136,7 @@ { char buf[450]; Only in micq/files: patch-lang::ru.i18n diff -ur micq/files/patch-src::icq_response.c micq.new/files/patch-src::icq_response.c --- micq/files/patch-src::icq_response.c Sat May 18 12:06:09 2002 +++ micq.new/files/patch-src::icq_response.c Sun May 19 02:49:30 2002 @@ -1,42 +1,31 @@ -*** src/icq_response.c.orig Sat May 11 00:59:50 2002 ---- src/icq_response.c Sat May 11 20:05:32 2002 -*************** -*** 1,4 **** -! /* $Id: icq_response.c,v 1.53 2002/05/10 15:59:50 kuhlmann Exp $ */ - /* Copyright ? */ - - #include "micq.h" ---- 1,4 ---- -! /* $Id: icq_response.c,v 1.1 2002/04/05 10:00:08 root Exp root $ */ - /* Copyright ? */ - - #include "micq.h" -*************** -*** 482,494 **** - { - strcpy (buf, new); - strcat (buf, " "); -! sprintf (buf + strlen (buf), "%d.%d", v1, v2); -! if (v3 || v4) sprintf (buf + strlen (buf), ".%d", v3); -! if (v4) sprintf (buf + strlen (buf), " cvs %d", v4); - if (ssl) strcat (buf, "/SSL"); - } - else if (prG->verbose) -! sprintf (buf, "%s %08x", i18n (1827, "Unknown client"), (unsigned int)tstamp); - else - buf[0] = '\0'; - ---- 482,494 ---- - { - strcpy (buf, new); - strcat (buf, " "); -! snprintf (buf + strlen (buf), sizeof (buf) - strlen (buf), "%d.%d", v1, v2); -! if (v3 || v4) snprintf (buf + strlen (buf), sizeof (buf) - strlen (buf), ".%d", v3); -! if (v4) snprintf (buf + strlen (buf), sizeof (buf) - strlen (buf), " cvs %d", v4); - if (ssl) strcat (buf, "/SSL"); - } - else if (prG->verbose) -! snprintf (buf, sizeof (buf), "%s %08x", i18n (1827, "Unknown client"), (unsigned int)tstamp); - else - buf[0] = '\0'; - +$FreeBSD$ + +--- src/icq_response.c.orig Sat May 18 12:19:16 2002 ++++ src/icq_response.c Sun May 19 02:00:35 2002 +@@ -503,14 +503,14 @@ + if (v1 || v2 || v3 || v4) + { + strcat (buf, " "); +- sprintf (buf + strlen (buf), "%d.%d", v1, v2); +- if (v3 || v4) sprintf (buf + strlen (buf), ".%d", v3); +- if (v4) sprintf (buf + strlen (buf), " cvs %d", v4); ++ snprintf (buf + strlen (buf), sizeof (buf) - strlen (buf), "%d.%d", v1, v2); ++ if (v3 || v4) snprintf (buf + strlen (buf), sizeof (buf) - strlen (buf), ".%d", v3); ++ if (v4) snprintf (buf + strlen (buf), sizeof (buf) - strlen (buf), " cvs %d", v4); + } + if (ssl) strcat (buf, "/SSL"); + } + else if (prG->verbose) +- sprintf (buf, "%s %08x", i18n (1827, "Unknown client"), (unsigned int)tstamp); ++ snprintf (buf, sizeof (buf), "%s %08x", i18n (1827, "Unknown client"), (unsigned int)tstamp); + else + buf[0] = '\0'; + +@@ -663,6 +663,7 @@ + M_print (") "); + } + ++ ConvWinUnix(cdata); + switch (type) + { + case USER_ADDED_MESS: diff -ur micq/files/patch-src::util.c micq.new/files/patch-src::util.c --- micq/files/patch-src::util.c Sat May 18 12:06:09 2002 +++ micq.new/files/patch-src::util.c Sun May 19 02:50:25 2002 @@ -1,46 +1,28 @@ -*** src/util.c.orig Sat May 11 03:01:05 2002 ---- src/util.c Sat May 11 20:10:23 2002 -*************** -*** 319,325 **** - - timeval = time (0); - va_start (args, str); -! sprintf (buf, "\n%-24.24s ", ctime (&timeval)); - vsprintf (&buf[strlen (buf)], str, args); - va_end (args); - ---- 319,325 ---- - - timeval = time (0); - va_start (args, str); -! snprintf (buf, sizeof(buf), "\n%-24.24s ", ctime (&timeval)); - vsprintf (&buf[strlen (buf)], str, args); - va_end (args); - -*************** -*** 332,343 **** - else - return -1; - } -! sprintf (buffer, "%suin%ld.log", prG->logplace, uin); - - #if HAVE_SYMLINK - if (ContactFindNick (uin)) - { -! sprintf (symbuf, "%s%s.log", prG->logplace, ContactFindNick (uin)); - for (b = symbuf + strlen (prG->logplace); (b = strchr (b, '/')); ) - *b = '_'; - symlink (buffer, symbuf); ---- 332,343 ---- - else - return -1; - } -! snprintf (buffer, sizeof (buffer), "%suin%ld.log", prG->logplace, uin); - - #if HAVE_SYMLINK - if (ContactFindNick (uin)) - { -! snprintf (symbuf, sizeof (symbuf), "%s%s.log", prG->logplace, ContactFindNick (uin)); - for (b = symbuf + strlen (prG->logplace); (b = strchr (b, '/')); ) - *b = '_'; - symlink (buffer, symbuf); +$FreeBSD$ + +--- src/util.c.orig Sat May 18 12:21:53 2002 ++++ src/util.c Sat May 18 12:22:58 2002 +@@ -319,7 +319,7 @@ + + timeval = time (0); + va_start (args, str); +- sprintf (buf, "\n%-24.24s ", ctime (&timeval)); ++ snprintf (buf, sizeof (buf), "\n%-24.24s ", ctime (&timeval)); + vsprintf (&buf[strlen (buf)], str, args); + va_end (args); + +@@ -332,12 +332,12 @@ + else + return -1; + } +- sprintf (buffer, "%suin%ld.log", prG->logplace, uin); ++ snprintf (buffer, sizeof (buffer), "%suin%ld.log", prG->logplace, uin); + + #if HAVE_SYMLINK + if (ContactFindNick (uin)) + { +- sprintf (symbuf, "%s%s.log", prG->logplace, ContactFindNick (uin)); ++ snprintf (symbuf, sizeof (symbuf), "%s%s.log", prG->logplace, ContactFindNick (uin)); + for (b = symbuf + strlen (prG->logplace); (b = strchr (b, '/')); ) + *b = '_'; + symlink (buffer, symbuf); >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020518191842.69678.qmail>