From a29b03fce247bf8e581673e8018e27fa473407c9 Mon Sep 17 00:00:00 2001 From: tron Date: Wed, 31 Jan 2001 19:10:12 +0000 Subject: Update "micq" package to version 0.4.6.1 and integrate security fixes from FreeBSD ports collection. --- chat/micq/Makefile | 14 ++++++++------ chat/micq/files/md5 | 4 ++-- chat/micq/files/patch-sum | 8 ++++++-- chat/micq/patches/patch-aa | 20 ++++++++++---------- chat/micq/patches/patch-ab | 13 +++++++++++++ chat/micq/patches/patch-ac | 13 +++++++++++++ chat/micq/patches/patch-ad | 42 ++++++++++++++++++++++++++++++++++++++++++ chat/micq/patches/patch-ae | 28 ++++++++++++++++++++++++++++ 8 files changed, 122 insertions(+), 20 deletions(-) create mode 100644 chat/micq/patches/patch-ab create mode 100644 chat/micq/patches/patch-ac create mode 100644 chat/micq/patches/patch-ad create mode 100644 chat/micq/patches/patch-ae (limited to 'chat/micq') diff --git a/chat/micq/Makefile b/chat/micq/Makefile index 5cdb3b9c494..8192aada413 100644 --- a/chat/micq/Makefile +++ b/chat/micq/Makefile @@ -1,17 +1,19 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/12/15 00:36:29 wiz Exp $ -# +# $NetBSD: Makefile,v 1.2 2001/01/31 19:10:12 tron Exp $ -DISTNAME= micq-0.4.6 +DISTNAME= micq-0.4.6.p1 +PKGNAME= ${DISTNAME:S/p//} CATEGORIES= chat -MASTER_SITES= ftp://micq.chatzone.org/pub/${DISTNAME:S/-/\/V/}/ +MASTER_SITES= http://micq.ukeer.de/source/ EXTRACT_SUFX= .tgz MAINTAINER= packages@netbsd.org -HOMEPAGE= http://micq.maesoft.net/ +HOMEPAGE= http://micq.ukeer.de/ + +WRKSRC= ${WRKDIR}/${DISTNAME:S/.p/-p/}/src do-install: ${INSTALL_PROGRAM} ${WRKSRC}/micq ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/micq - ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/micq + ${INSTALL_MAN} ${WRKSRC}/../README ${PREFIX}/share/doc/micq .include "../../mk/bsd.pkg.mk" diff --git a/chat/micq/files/md5 b/chat/micq/files/md5 index 873a27600bc..b1c4a0d4df6 100644 --- a/chat/micq/files/md5 +++ b/chat/micq/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2000/12/15 00:36:29 wiz Exp $ +$NetBSD: md5,v 1.2 2001/01/31 19:10:12 tron Exp $ -MD5 (micq-0.4.6.tgz) = d6b0b09eaf12e722c12ac14d115e49bf +MD5 (micq-0.4.6.p1.tgz) = 2ea6df0f96606e9c74cace21dd8d39cd diff --git a/chat/micq/files/patch-sum b/chat/micq/files/patch-sum index c208480da80..cb9e7af3c61 100644 --- a/chat/micq/files/patch-sum +++ b/chat/micq/files/patch-sum @@ -1,3 +1,7 @@ -$NetBSD: patch-sum,v 1.1.1.1 2000/12/15 00:36:29 wiz Exp $ +$NetBSD: patch-sum,v 1.2 2001/01/31 19:10:12 tron Exp $ -MD5 (patch-aa) = 7de723a90fdf735cce71cb6397c35652 +MD5 (patch-aa) = 6b6b132faa4550ad6c769418284df2d3 +MD5 (patch-ab) = 743bbce52544e3b5407e0ab4e6203021 +MD5 (patch-ac) = 95f13721e311bbce97554e262baa675f +MD5 (patch-ad) = a08804e6189b0f6b7c4d9cbada99312d +MD5 (patch-ae) = f8f8fd6a0c7c55c90c0eb0296fc3009a diff --git a/chat/micq/patches/patch-aa b/chat/micq/patches/patch-aa index bbb857b2fec..5da1b5f05a2 100644 --- a/chat/micq/patches/patch-aa +++ b/chat/micq/patches/patch-aa @@ -1,15 +1,15 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/12/15 00:36:29 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2001/01/31 19:10:12 tron Exp $ ---- Makefile.orig Sat Jun 10 00:18:38 2000 -+++ Makefile Fri Jun 16 13:56:56 2000 -@@ -5,8 +5,8 @@ - # Most options that were here and soem that weren't have been moved to config.h - # edit that file to set up options. - # +--- Makefile.orig Tue Jan 23 17:49:05 2001 ++++ Makefile Wed Jan 31 19:57:23 2001 +@@ -2,8 +2,8 @@ + # originally by Matt D. Smith + # rewritten by Rico Gloeckner + -CC = gcc -CFLAGS = -O4 -Wall -DUNIX +#CC = gcc +CFLAGS += -Wall -DUNIX - CFLAGS += -DENGLISH_LANG - #CFLAGS += -DBULGARIAN_LANG - #CFLAGS += -DPOLISH_LANG + + # uncomment the line below for debuging info + #CFLAGS += -g diff --git a/chat/micq/patches/patch-ab b/chat/micq/patches/patch-ab new file mode 100644 index 00000000000..073432bd198 --- /dev/null +++ b/chat/micq/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2001/01/31 19:10:12 tron Exp $ + +--- mreadline.c.orig Tue Jan 23 11:49:05 2001 ++++ mreadline.c Wed Jan 24 22:01:31 2001 +@@ -359,7 +359,7 @@ + break; + } + } +- sprintf (s, "%s %s/", message_cmd, ++ snprintf (s, sizeof(s), "%s %s/", message_cmd, + tab_array[tab_pointer]); + clen = cpos = strlen (s); + R_undraw(); diff --git a/chat/micq/patches/patch-ac b/chat/micq/patches/patch-ac new file mode 100644 index 00000000000..0a5de64c499 --- /dev/null +++ b/chat/micq/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2001/01/31 19:10:12 tron Exp $ + +--- sendmsg.c.orig Tue Jan 23 11:49:05 2001 ++++ sendmsg.c Wed Jan 24 22:02:47 2001 +@@ -977,7 +977,7 @@ + { + char buf[450]; + +- sprintf( buf, "%s\xFE%s", url, description ); ++ snprintf( buf, sizeof(buf), "%s\xFE%s", url, description ); + icq_sendmsg( sok, uin, buf, URL_MESS ); + } + diff --git a/chat/micq/patches/patch-ad b/chat/micq/patches/patch-ad new file mode 100644 index 00000000000..ec798279762 --- /dev/null +++ b/chat/micq/patches/patch-ad @@ -0,0 +1,42 @@ +$NetBSD: patch-ad,v 1.1 2001/01/31 19:10:12 tron Exp $ + +--- util_ui.c.orig Tue Jan 23 17:49:05 2001 ++++ util_ui.c Wed Jan 31 20:07:47 2001 +@@ -102,7 +102,7 @@ + assert( 2048 >= strlen( str ) ); + + va_start( args, str ); +- vsprintf( buf, str, args ); ++ vsnprintf( buf, sizeof(buf), str, args ); + k = write( fd, buf, strlen( buf ) ); + if ( k != strlen( buf ) ) + { +@@ -292,7 +292,7 @@ + + va_start( args, str ); + #ifndef CURSES_UI +- vsprintf( buf, str, args ); ++ vsnprintf( buf, sizeof(buf), str, args ); + str2 = buf; + while ( (void *) NULL != ( str1 = strchr( str2, '\x1b' ) ) ) + { +@@ -423,19 +423,6 @@ + thetime=localtime(&p); + + M_print( "%.02d:%.02d:%.02d",thetime->tm_hour,thetime->tm_min,thetime->tm_sec ); +-} +- +-static void remove_tab( int index ) +-{ +- int j; +- +- if ( tab_array[ index ] != NULL ) { +- free( tab_array[ index ] ); +- } +- for ( j=index; j+1