update to micq-0.5.0.1 (translation and bug fix release)

This commit is contained in:
david 2005-03-01 00:12:23 +00:00
parent b66eb54e50
commit e10f0c3bad
4 changed files with 6 additions and 47 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.35 2005/02/26 21:26:44 david Exp $
# $OpenBSD: Makefile,v 1.36 2005/03/01 00:12:23 david Exp $
# $FreeBSD: Makefile,v 1.6 1999/06/03 08:31:06 ache Exp $
COMMENT= "text-based ICQ implementation"
DISTNAME= micq-0.5
DISTNAME= micq-0.5.0.1
PKGNAME= ${DISTNAME}p0
CATEGORIES= net

View File

@ -1,4 +1,4 @@
MD5 (micq-0.5.tgz) = 225e95df26c18c4d1daf378056c09c4d
RMD160 (micq-0.5.tgz) = 4d352b025d5389b22435407dd9d92d8cecd69e53
SHA1 (micq-0.5.tgz) = d1efcae19f0a12b2ba3b09c2466bc5439ef1f9e0
SIZE (micq-0.5.tgz) = 1023631
MD5 (micq-0.5.0.1.tgz) = 48e73cc7163953aece85d76da9d8c029
RMD160 (micq-0.5.0.1.tgz) = d45cf1a966cfd48e5481eb372146cac6ccdbf66b
SHA1 (micq-0.5.0.1.tgz) = 8226b228b522ef405df4cabb212cae59410aa635
SIZE (micq-0.5.0.1.tgz) = 1025312

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-src_tcp_c,v 1.1 2005/02/20 07:19:57 david Exp $
--- src/tcp.c.orig 2004-12-21 13:09:54.000000000 -0600
+++ src/tcp.c 2005-02-20 01:14:55.000000000 -0600
@@ -596,9 +596,10 @@ static void TCPDispatchPeer (Connection
return;
}
+ peer->connect &= ~CONNECT_SELECT_W;
/* Recv all packets before doing anything else.
The objective is to delete any packets CANCELLED by the remote user. */
- while (UtilIOSelectIs (peer->sok, READFDS) && i++ <= TCP_MSG_QUEUE)
+ while (UtilIOSelectIs (peer->sok, READFDS | WRITEFDS) && i++ <= TCP_MSG_QUEUE)
{
if (!(pak = TCPReceivePacket (peer)))
return;
@@ -645,7 +646,6 @@ static void TCPDispatchPeer (Connection
UtilIOSelectAdd (peer->sok, READFDS);
UtilIOSelect();
}
- peer->connect &= ~CONNECT_SELECT_W;
}
/*********************************************/

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-src_util_ssl_c,v 1.1 2005/02/20 07:19:57 david Exp $
--- src/util_ssl.c.orig 2005-02-11 17:33:11.000000000 -0600
+++ src/util_ssl.c 2005-02-20 01:14:55.000000000 -0600
@@ -538,9 +538,13 @@ int ssl_handshake (Connection *conn DEBU
#ifdef SSL_ERROR_WANT_ACCEPT
case SSL_ERROR_WANT_ACCEPT:
#endif
+ case SSL_ERROR_WANT_READ:
+ conn->ssl_status = SSL_STATUS_HANDSHAKE;
+ conn->connect |= CONNECT_SELECT_R;
+ return 1;
+
case SSL_ERROR_WANT_CONNECT:
case SSL_ERROR_WANT_WRITE:
- case SSL_ERROR_WANT_READ:
case SSL_ERROR_WANT_X509_LOOKUP:
conn->ssl_status = SSL_STATUS_HANDSHAKE;
conn->connect |= CONNECT_SELECT_R | CONNECT_SELECT_W;