Convert to unified format; fixes problem on Linux report on tech-pkg by

Sebastian P.

4 files changed, 92 insertions, 151 deletions

diff --git a/chat/irssi/distinfo b/chat/irssi/distinfo
index e7b1d3d6db3..61f3812df05 100644
--- a/chat/irssi/distinfo
+++ b/chat/irssi/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2003/01/12 17:56:05 veego Exp $
+$NetBSD: distinfo,v 1.14 2003/07/05 14:25:51 wiz Exp $
 
 SHA1 (irssi-0.8.6.tar.bz2) = 1f7a5b409f71d7b99a30f980d2e7eaa7373a406c
 Size (irssi-0.8.6.tar.bz2) = 746551 bytes
 SHA1 (patch-aa) = 45d8161733f58ab3733022c823933bb1cc93a8e2
 SHA1 (patch-ab) = c395fbeeb2dd15490f04f2cb2c94daf6c5955e85
-SHA1 (patch-ac) = c4b47ab294eb390e4b761cb7f85ca1b0290905f3
-SHA1 (patch-ad) = 8f355259a621cfa9bac4983b4ce24d94f3342adf
-SHA1 (patch-ae) = b8aeb6b5669b1f255a0ba89a25199cd4e5abdef0
+SHA1 (patch-ac) = 78134bb8e17b397e9de7e5ba3d7fbda76de16506
+SHA1 (patch-ad) = 11180ed5f1ebea2f1aa806a001db4c9365f68194
+SHA1 (patch-ae) = 43555cce2ed035d824310ce04706ce95b7838205
diff --git a/chat/irssi/patches/patch-ac b/chat/irssi/patches/patch-ac
index 440e2d5d774..6616a3157a1 100644
--- a/chat/irssi/patches/patch-ac
+++ b/chat/irssi/patches/patch-ac
@@ -1,27 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2003/01/12 17:52:20 veego Exp $
+$NetBSD: patch-ac,v 1.4 2003/07/05 14:25:51 wiz Exp $
 
-Index: src/irc/dcc/dcc-send.c
-===================================================================
-RCS file: /home/cvs/irssi/src/irc/dcc/dcc-send.c,v
-retrieving revision 1.17
-retrieving revision 1.18
-diff -c -r1.17 -r1.18
-*** dcc-send.c	17 Nov 2002 15:51:04 -0000	1.17
---- dcc-send.c	19 Nov 2002 12:18:11 -0000	1.18
-***************
-*** 400,406 ****
-  	str = g_strdup_printf(dcc->file_quoted ?
-  			      "DCC SEND \"%s\" %s %d %lu" :
-  			      "DCC SEND %s %s %d %lu",
-! 			      fname, host, port, fsize);
-  	dcc_ctcp_message(server, target, chat, FALSE, str);
-  	g_free(str);
-  
---- 400,406 ----
-  	str = g_strdup_printf(dcc->file_quoted ?
-  			      "DCC SEND \"%s\" %s %d %lu" :
-  			      "DCC SEND %s %s %d %lu",
-! 			      dcc->arg, host, port, fsize);
-  	dcc_ctcp_message(server, target, chat, FALSE, str);
-  	g_free(str);
-  
+--- src/irc/dcc/dcc-send.c.orig	Sun Nov 17 17:00:02 2002
++++ src/irc/dcc/dcc-send.c
+@@ -400,7 +400,7 @@ static int dcc_send_one_file(int queue, 
+ 	str = g_strdup_printf(dcc->file_quoted ?
+ 			      "DCC SEND \"%s\" %s %d %lu" :
+ 			      "DCC SEND %s %s %d %lu",
+-			      fname, host, port, fsize);
++			      dcc->arg, host, port, fsize);
+ 	dcc_ctcp_message(server, target, chat, FALSE, str);
+ 	g_free(str);
+ 
diff --git a/chat/irssi/patches/patch-ad b/chat/irssi/patches/patch-ad
index c09d84f4431..8bbb02efb47 100644
--- a/chat/irssi/patches/patch-ad
+++ b/chat/irssi/patches/patch-ad
@@ -1,103 +1,66 @@
-$NetBSD: patch-ad,v 1.3 2003/01/12 17:53:19 veego Exp $
+$NetBSD: patch-ad,v 1.4 2003/07/05 14:25:51 wiz Exp $
 
-Index: src/core/network.c
-===================================================================
-RCS file: /home/cvs/irssi/src/core/network.c,v
-retrieving revision 1.42
-retrieving revision 1.44
-diff -c -r1.42 -r1.44
-*** network.c	26 Aug 2002 19:05:14 -0000	1.42
---- network.c	29 Nov 2002 13:38:21 -0000	1.44
-***************
-*** 201,210 ****
-  	/* set our own address */
-  	if (my_ip != NULL) {
-  		sin_set_ip(&so, my_ip);
-! 		if (bind(handle, &so.sa, SIZEOF_SOCKADDR(so)) == -1) {
-  			/* failed, set it back to INADDR_ANY */
-! 			sin_set_ip(&so, NULL);
-! 			bind(handle, &so.sa, SIZEOF_SOCKADDR(so));
-  		}
-  	}
-  
---- 201,213 ----
-  	/* set our own address */
-  	if (my_ip != NULL) {
-  		sin_set_ip(&so, my_ip);
-! 		if (bind(handle, &so.sa, SIZEOF_SOCKADDR(so)) < 0) {
-  			/* failed, set it back to INADDR_ANY */
-! 			int old_errno = errno;
-! 
-! 			close(handle);
-! 			errno = old_errno;
-! 			return NULL;
-  		}
-  	}
-  
-***************
-*** 466,498 ****
-  int net_gethostbyaddr(IPADDR *ip, char **name)
-  {
-  #ifdef HAVE_IPV6
-! 	struct addrinfo req, *ai;
-  	int host_error;
-  #else
-  	struct hostent *hp;
-  #endif
-- 	char ipname[MAX_IP_LEN];
-  
-  	g_return_val_if_fail(ip != NULL, -1);
-  	g_return_val_if_fail(name != NULL, -1);
-  
-- 	net_ip2host(ip, ipname);
-- 
-  	*name = NULL;
-  #ifdef HAVE_IPV6
-! 	memset(&req, 0, sizeof(struct addrinfo));
-! 	req.ai_socktype = SOCK_STREAM;
-! 	req.ai_flags = AI_CANONNAME;
-  
-  	/* save error to host_error for later use */
-! 	host_error = getaddrinfo(ipname, NULL, &req, &ai);
-! 	if (host_error != 0)
-! 		return host_error;
-! 	*name = g_strdup(ai->ai_canonname);
-  
-! 	freeaddrinfo(ai);
-  #else
-! 	hp = gethostbyaddr(ipname, strlen(ipname), AF_INET);
-  	if (hp == NULL) return -1;
-  
-  	*name = g_strdup(hp->h_name);
---- 469,499 ----
-  int net_gethostbyaddr(IPADDR *ip, char **name)
-  {
-  #ifdef HAVE_IPV6
-! 	union sockaddr_union so;
-  	int host_error;
-+ 	char hostname[NI_MAXHOST];
-  #else
-  	struct hostent *hp;
-  #endif
-  
-  	g_return_val_if_fail(ip != NULL, -1);
-  	g_return_val_if_fail(name != NULL, -1);
-  
-  	*name = NULL;
-  #ifdef HAVE_IPV6
-! 	memset(&so, 0, sizeof(so));
-! 	sin_set_ip(&so, ip);
-  
-  	/* save error to host_error for later use */
-!         host_error = getnameinfo((struct sockaddr *) &so, sizeof(so),
-!                                  hostname, sizeof(hostname), NULL, 0, 0);
-!         if (host_error != 0)
-!                 return host_error;
-  
-! 	*name = g_strdup(hostname);
-  #else
-! 	if (ip->family != AF_INET) return -1;
-! 	hp = gethostbyaddr(&ip->ip, 4, AF_INET);
-  	if (hp == NULL) return -1;
-  
-  	*name = g_strdup(hp->h_name);
+--- src/core/network.c.orig	Mon Aug 26 21:10:02 2002
++++ src/core/network.c
+@@ -201,10 +201,13 @@ GIOChannel *net_connect_ip(IPADDR *ip, i
+ 	/* set our own address */
+ 	if (my_ip != NULL) {
+ 		sin_set_ip(&so, my_ip);
+-		if (bind(handle, &so.sa, SIZEOF_SOCKADDR(so)) == -1) {
++		if (bind(handle, &so.sa, SIZEOF_SOCKADDR(so)) < 0) {
+ 			/* failed, set it back to INADDR_ANY */
+-			sin_set_ip(&so, NULL);
+-			bind(handle, &so.sa, SIZEOF_SOCKADDR(so));
++			int old_errno = errno;
++
++			close(handle);
++			errno = old_errno;
++			return NULL;
+ 		}
+ 	}
+ 
+@@ -466,33 +469,31 @@ int net_gethostbyname(const char *addr, 
+ int net_gethostbyaddr(IPADDR *ip, char **name)
+ {
+ #ifdef HAVE_IPV6
+-	struct addrinfo req, *ai;
++	union sockaddr_union so;
+ 	int host_error;
++	char hostname[NI_MAXHOST];
+ #else
+ 	struct hostent *hp;
+ #endif
+-	char ipname[MAX_IP_LEN];
+ 
+ 	g_return_val_if_fail(ip != NULL, -1);
+ 	g_return_val_if_fail(name != NULL, -1);
+ 
+-	net_ip2host(ip, ipname);
+-
+ 	*name = NULL;
+ #ifdef HAVE_IPV6
+-	memset(&req, 0, sizeof(struct addrinfo));
+-	req.ai_socktype = SOCK_STREAM;
+-	req.ai_flags = AI_CANONNAME;
++	memset(&so, 0, sizeof(so));
++	sin_set_ip(&so, ip);
+ 
+ 	/* save error to host_error for later use */
+-	host_error = getaddrinfo(ipname, NULL, &req, &ai);
+-	if (host_error != 0)
+-		return host_error;
+-	*name = g_strdup(ai->ai_canonname);
++        host_error = getnameinfo((struct sockaddr *) &so, sizeof(so),
++                                 hostname, sizeof(hostname), NULL, 0, 0);
++        if (host_error != 0)
++                return host_error;
+ 
+-	freeaddrinfo(ai);
++	*name = g_strdup(hostname);
+ #else
+-	hp = gethostbyaddr(ipname, strlen(ipname), AF_INET);
++	if (ip->family != AF_INET) return -1;
++	hp = gethostbyaddr(&ip->ip, 4, AF_INET);
+ 	if (hp == NULL) return -1;
+ 
+ 	*name = g_strdup(hp->h_name);
diff --git a/chat/irssi/patches/patch-ae b/chat/irssi/patches/patch-ae
index 53a8ceaa70c..d5c94794479 100644
--- a/chat/irssi/patches/patch-ae
+++ b/chat/irssi/patches/patch-ae
@@ -1,20 +1,12 @@
-$NetBSD: patch-ae,v 1.1 2003/01/12 17:53:42 veego Exp $
+$NetBSD: patch-ae,v 1.2 2003/07/05 14:25:52 wiz Exp $
 
-Index: src/irc/core/modes.c
-===================================================================
-RCS file: /home/cvs/irssi/src/irc/core/modes.c,v
-retrieving revision 1.51
-retrieving revision 1.52
-diff -c -r1.51 -r1.52
-*** modes.c	31 Oct 2002 17:24:49 -0000	1.51
---- modes.c	9 Dec 2002 21:54:03 -0000	1.52
-***************
-*** 512,518 ****
-  			curmode = cmd_get_param(&modestr);
-  			if (*curmode == '\0')
-  				break;
-- 			continue;
-  		}
-  
-  		if (*curmode == '+' || *curmode == '-') {
---- 512,517 ----
+--- src/irc/core/modes.c.orig	Thu Oct 31 18:30:03 2002
++++ src/irc/core/modes.c
+@@ -512,7 +512,6 @@ void channel_set_mode(IRC_SERVER_REC *se
+ 			curmode = cmd_get_param(&modestr);
+ 			if (*curmode == '\0')
+ 				break;
+-			continue;
+ 		}
+ 
+ 		if (*curmode == '+' || *curmode == '-') {