Subject: cvs diff vs diff(1)
To: None <tech-pkg@netbsd.org>
From: Jonathan Perkin <sketch@rd.bbc.co.uk>
List: tech-pkg
Date: 01/22/2003 12:24:19
--ZwgA9U+XZDXt4+m+
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
chat/irssi/patches/patch-a{c,d,e} seem to be in cvs diff format. I
don't know whether this is a difference in using pkgsrc on Solaris and
they patch fine on NetBSD, or whether it's simply an honest mistake.
If a mistake, patches are attached.
Cheers,
--
Jonathan Perkin - Internet Operations Engineer - BBC Internet Services
24x7 Hotline: +44 (0)1628 407 777 (x37777) - http://support.bbc.co.uk/
--ZwgA9U+XZDXt4+m+
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="irssi.patch"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/chat/irssi/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo 2003/01/12 17:56:05 1.13
+++ distinfo 2003/01/22 12:10:14
@@ -4,6 +4,6 @@
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) = 0b088ba735a336e852ed12c4a5f641ef16a9f7ec
+SHA1 (patch-ad) = 7c4c3587265b1b134cefe9e2463434d8e5b043e1
+SHA1 (patch-ae) = e8b6f6c8e119dfb46105647ce2a0c0dee5552439
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/chat/irssi/patches/patch-ac,v
retrieving revision 1.3
diff -u -r1.3 patch-ac
--- patches/patch-ac 2003/01/12 17:52:20 1.3
+++ patches/patch-ac 2003/01/22 12:10:14
@@ -1,27 +1,12 @@
$NetBSD: patch-ac,v 1.3 2003/01/12 17:52:20 veego 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 16:00:02 2002
++++ src/irc/dcc/dcc-send.c Wed Jan 22 12:03:06 2003
+@@ -400,7 +400,7 @@
+ 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);
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/chat/irssi/patches/patch-ad,v
retrieving revision 1.3
diff -u -r1.3 patch-ad
--- patches/patch-ad 2003/01/12 17:53:19 1.3
+++ patches/patch-ad 2003/01/22 12:10:14
@@ -1,103 +1,66 @@
$NetBSD: patch-ad,v 1.3 2003/01/12 17:53:19 veego 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 20:10:02 2002
++++ src/core/network.c Wed Jan 22 12:03:11 2003
+@@ -201,10 +201,13 @@
+ /* 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_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);
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/chat/irssi/patches/patch-ae,v
retrieving revision 1.1
diff -u -r1.1 patch-ae
--- patches/patch-ae 2003/01/12 17:53:42 1.1
+++ patches/patch-ae 2003/01/22 12:10:14
@@ -1,20 +1,12 @@
$NetBSD: patch-ae,v 1.1 2003/01/12 17:53:42 veego 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 17:30:03 2002
++++ src/irc/core/modes.c Wed Jan 22 12:03:15 2003
+@@ -512,7 +512,6 @@
+ curmode = cmd_get_param(&modestr);
+ if (*curmode == '\0')
+ break;
+- continue;
+ }
+
+ if (*curmode == '+' || *curmode == '-') {
--ZwgA9U+XZDXt4+m+--