update micq to 0.4.10.2 (bug fix and translation update release)

my snprintf and spelling patches were integrated
ok pvalchev@
This commit is contained in:
david 2003-03-28 21:34:40 +00:00
parent 0916ac25b1
commit 2b161ae40b
6 changed files with 19 additions and 74 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.23 2003/02/28 00:26:59 david Exp $
# $OpenBSD: Makefile,v 1.24 2003/03/28 21:34:40 david Exp $
# $FreeBSD: Makefile,v 1.6 1999/06/03 08:31:06 ache Exp $
COMMENT= "text-based ICQ implementation"
DISTNAME= micq-0.4.10
DISTNAME= micq-0.4.10.2
CATEGORIES= net
MAINTAINER= David Krause <david@openbsd.org>

View File

@ -1,3 +1,3 @@
MD5 (micq-0.4.10.tgz) = 7f18607d0a3a66ac5e3f78fdcf23cf92
RMD160 (micq-0.4.10.tgz) = a765d5955008e130539ad66d0aee5b615bb899e4
SHA1 (micq-0.4.10.tgz) = 2023b16ebb86b5c1c83c94c8ab8ac8b1a8c6cd2a
MD5 (micq-0.4.10.2.tgz) = 9fa8f58d78ff5851c7725cc56df1a003
RMD160 (micq-0.4.10.2.tgz) = 8980c39e40b0b6b13948ff72898b850213c69dc7
SHA1 (micq-0.4.10.2.tgz) = 6e8e68ffaaedecfa909f9bd89a10bd3cd0c3d8b7

View File

@ -1,27 +0,0 @@
$OpenBSD: patch-src_cmd_user_c,v 1.1 2003/01/22 07:30:26 pvalchev Exp $
--- src/cmd_user.c.orig Tue Jan 7 09:30:33 2003
+++ src/cmd_user.c Tue Jan 21 19:25:16 2003
@@ -2959,7 +2959,7 @@ static JUMP_F(CmdUserURL)
msg = "";
IMCliMsg (conn, cont, ExtraSet (NULL, EXTRA_MESSAGE, MSG_URL,
- s_sprintf ("%s%c%s", url, ConvSep (), msg)));
+ s_sprintf ("%s%c%s", msg, ConvSep (), url)));
free (url);
return 0;
@@ -3833,12 +3833,12 @@ static int CmdUserProcessAlias (const ch
ptr = strstr (exp, "%s");
*ptr = '\0';
- sprintf (cmdline, "%s%s%s", exp, argsd, ptr + 2);
+ snprintf (cmdline, sizeof(cmdline), "%s%s%s", exp, argsd, ptr + 2);
free (exp);
}
else
- sprintf (cmdline, "%s %s", alias->expansion, argsd);
+ snprintf (cmdline, sizeof(cmdline), "%s %s", alias->expansion, argsd);
recurs_level++;
CmdUserProcess (cmdline, idle_val, idle_flag);

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_contact_c,v 1.1 2003/01/22 07:30:26 pvalchev Exp $
--- src/contact.c.orig Tue Jan 7 10:12:05 2003
+++ src/contact.c Fri Jan 10 03:03:00 2003
@@ -885,9 +885,9 @@ void ContactSetVersion (Contact *cont)
if (cont->v1 || cont->v2 || cont->v3 || cont->v4)
{
strcat (buf, " ");
- sprintf (buf + strlen (buf), "%d.%d", cont->v1, cont->v2);
- if (cont->v3 || cont->v4) sprintf (buf + strlen (buf), ".%d", cont->v3);
- if (cont->v4) sprintf (buf + strlen (buf), ".%d", cont->v4);
+ snprintf (buf + strlen (buf), sizeof(buf) - strlen (buf), "%d.%d", cont->v1, cont->v2);
+ if (cont->v3 || cont->v4) snprintf (buf + strlen (buf), sizeof(buf) - strlen (buf), ".%d", cont->v3);
+ if (cont->v4) snprintf (buf + strlen (buf), sizeof(buf) - strlen (buf), ".%d", cont->v4);
}
if (tail) strcat (buf, tail);
}

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-src_mreadline_c,v 1.6 2003/01/22 07:30:26 pvalchev Exp $
--- src/mreadline.c.orig Tue Jan 7 13:17:51 2003
+++ src/mreadline.c Fri Jan 10 02:42:40 2003
@@ -392,7 +392,7 @@ void R_process_input_tab (void)
if (bytelen < strlen (msgcmd) &&
!strncmp (s, msgcmd, bytelen < strlen (msgcmd) ? bytelen : strlen (msgcmd)))
{
- sprintf (s, "%s ", msgcmd);
+ snprintf (s, sizeof(s), "%s ", msgcmd);
bytepos = bytelen = strlen (s);
#ifdef ENABLE_UTF8
curpos = curlen = c_strlen (s);
@@ -414,9 +414,9 @@ void R_process_input_tab (void)
}
if ((uin = TabGetNext ()))
- sprintf (s, "%s %s ", msgcmd, (cont = ContactFind (NULL, 0, uin, NULL, 1)) ? ConvFromUTF8 (cont->nick, prG->enc_loc) : s_sprintf ("%ld", uin));
+ snprintf (s, sizeof(s), "%s %s ", msgcmd, (cont = ContactFind (NULL, 0, uin, NULL, 1)) ? ConvFromUTF8 (cont->nick, prG->enc_loc) : s_sprintf ("%ld", uin));
else
- sprintf (s, "%s ", msgcmd);
+ snprintf (s, sizeof(s), "%s ", msgcmd);
R_remprompt ();
curlen = curpos = strlen (s);

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2003/01/09 08:26:37 pvalchev Exp $
@comment $OpenBSD: PLIST,v 1.11 2003/03/28 21:34:40 david Exp $
bin/micq
man/de/man1/micq.1
man/de/man5/micqrc.5
@ -13,9 +13,13 @@ man/man5/micqrc.5
man/man7/micq.7
man/pt_BR/man1/micq.1
man/pt_BR/man5/micqrc.5
man/pt_BR/man7/micq.7
man/ru/man1/micq.1
man/ru/man5/micqrc.5
man/ru/man7/micq.7
man/sr/man1/micq.1
man/sr/man5/micqrc.5
man/sr/man7/micq.7
man/uk/man1/micq.1
man/uk/man7/micq.7
share/micq/C.i18n
@ -32,12 +36,15 @@ share/micq/fr.i18n
share/micq/hr.i18n
share/micq/id.i18n
share/micq/it.i18n
share/micq/ja_JP.UTF-8.i18n
share/micq/ja.UTF-8.i18n
share/micq/ja.i18n
share/micq/nl.i18n
share/micq/pl.i18n
share/micq/ro.i18n
share/micq/ru.i18n
share/micq/se.i18n
share/micq/sr.UTF-8.i18n
share/micq/sr.i18n
share/micq/uk.i18n
share/micq/yu.i18n
share/micq/zh_CN.i18n
@ -45,10 +52,15 @@ share/micq/zh_CN.i18n
@dirrm man/uk/man7
@dirrm man/uk/man1
@dirrm man/uk
@dirrm man/sr/man7
@dirrm man/sr/man5
@dirrm man/sr/man1
@dirrm man/sr
@dirrm man/ru/man7
@dirrm man/ru/man5
@dirrm man/ru/man1
@dirrm man/ru
@dirrm man/pt_BR/man7
@dirrm man/pt_BR/man5
@dirrm man/pt_BR/man1
@dirrm man/pt_BR