Attachment #34341 for bug #55824

View | Details | Raw Unified | Return to bug 55824
Collapse All | Expand All

Lines 6-12 Link Here

(-)irc/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= irc	8	PORTNAME= irc
9	PORTVERSION= 2.10.3	9	PORTVERSION= 2.10.3p3
10	CATEGORIES= irc ipv6	10	CATEGORIES= irc ipv6
11	MASTER_SITES= ftp://ftp.funet.fi/pub/networking/services/irc/server/ \	11	MASTER_SITES= ftp://ftp.funet.fi/pub/networking/services/irc/server/ \
12	ftp://ftp.irc.org/irc/server/ \	12	ftp://ftp.irc.org/irc/server/ \

Lines 3-9 Link Here

(-)irc/README.html (-1 / +1 lines)
3	<head><h1> The FreeBSD Ports Collection ("irc/irc")</h1> </head> <hr>	3	<head><h1> The FreeBSD Ports Collection ("irc/irc")</h1> </head> <hr>
4	<body>	4	<body>
5		5
6	<p>You are now in the directory for the port "irc/irc" (package name "irc-2.10.3").	6	<p>You are now in the directory for the port "irc/irc" (package name "irc2.10.3p3").
7		7
8	<p>This is the one-line description for this port:	8	<p>This is the one-line description for this port:
9		9

Line 1 Link Here

(-)irc/distinfo (-1 / +1 lines)
1	MD5 (irc2.10.3.tgz) = c7edd9285ff64435f39cbbde2fc77b73	1	MD5 (irc2.10.3p3.tgz) = bec7916f39043609c528afac507a2e00




--- support/config.h.dist.old	Mon Aug 18 15:17:52 2003
+++ support/config.h.dist	Mon Aug 18 15:17:52 2003
@@ -121,1 +121,1 @@
-#undef	 OPER_KILL
+#define OPER_KILL
@@ -124,4 +124,4 @@
-#define OPER_DIE
+#define	OPER_KILL
 #define	OPER_REHASH
 #undef	OPER_RESTART
-#define	OPER_DIE
+#undef	OPER_DIE
-#undef	 OPER_REMOTE
+#define OPER_REMOTE
-#undef	 LOCOP_REHASH
+#define LOCOP_REHASH
-#undef	 LOCOP_RESTART
+#define LOCOP_RESTART
@@ -249,32 +249,32 @@
 /*
@@ -299,32 +299,32 @@
  * this option is used unless you tell the system administrator beforehand
  * and obtain their permission to send messages to the system log files.
  */

 
 /*
  * If you want to store encrypted passwords in N-lines for server links,
@@ -323,7 +323,7 @@
  * send to the server without processing before disconnecting the client for
  * flooding it.  Values greater than 8000 make no difference to the server.
  */

 
 /* Remote query flood protection. */
 #define	CHREPLLEN	8192
@@ -461,7 +461,7 @@
  * The library and the include files must have been found by configure,
  * if you have installed the zlib after running configure, run it again.
  */




--- support/configure.orig	Mon Aug 18 15:17:52 2003
+++ support/configure	Mon Aug 18 15:17:52 2003
@@ -1296,7 +1296,7 @@
 fi
 	adr = &hp->h_addr;
 #ifdef INET6
-	while (adr->s6_laddr[0] | adr->s6_laddr[1] | adr->s6_laddr[2] |
-	       adr->s6_laddr[3])
+	while (!IN6_IS_ADDR_UNSPECIFIED(adr))
 #else
 	while (adr->s_addr)
 #endif
@@ -667,9 +666,9 @@
 			if (type == T_AAAA)
 				bcopy(cp, (char *)&dr, dlen);
 			else {
-				dr.s6_laddr[0]=dr.s6_laddr[1]=0;
-				dr.s6_laddr[2]=htonl(0xffff);
-				bcopy(cp, &dr.s6_laddr[3], INADDRSZ);
+				memset(&dr, 0, sizeof(dr));
+				dr.s6_addr[10] = dr.s6_addr[11] = 0xff;
+				bcopy(cp, &dr.s6_addr[12], INADDRSZ);
 			}
 			bcopy(dr.s6_addr, adr->s6_addr, IN6ADDRSZ);
 #else
@@ -1052,12 +1051,10 @@
 
 irc_cv_solaris_2=no
-if test "$irc_sun" = no; then
+if test "$irc_cv_sun" = no; then
   echo "$ac_t""no" 1>&6
 else
   if uname -r 2>/dev/null | grep "^5" >/dev/null; then
-	       ((struct in6_addr *)ocp->he.h_addr_list)->s6_laddr[2],
-	       ((struct in6_addr *)ocp->he.h_addr_list)->s6_laddr[3], ocp));
+	inet_ntop(AF_INET6, ((struct in6_addr *)ocp->he.h_addr_list),
+	    mydummy, sizeof(mydummy));
+	Debug((DEBUG_INFO,"add_to_cache:added %s[%s] cache %#x.",
+	       ocp->he.h_name, mydummy, ocp);
 #else
 	Debug((DEBUG_INFO, "add_to_cache:added %s[%08x] cache %#x.",
 		ocp->he.h_name, ocp->he.h_addr_list[0], ocp));
@@ -1275,9 +1272,8 @@
 #ifdef DEBUG
 #ifdef INET6
 	Debug((DEBUG_DNS,
-	       "find_cache_number:find %s[%08x%08x%08x%08x]: hashv = %d",
-	       inet_ntop(AF_INET6, numb,mydummy,MYDUMMY_SIZE), ip->s6_laddr[0],
-	       ip->s6_laddr[1], ip->s6_laddr[2], ip->s6_laddr[3], hashv));
+	       "find_cache_number:find %s: hashv = %d",
+	       inet_ntop(AF_INET6, numb, mydummy,MYDUMMY_SIZE), hashv));
 #else
 	Debug((DEBUG_DNS,"find_cache_number:find %s[%08x]: hashv = %d",
 		inetntoa(numb), ntohl(ip->s_addr), hashv));




--- support/configure.orig	Thu Oct 19 22:17:48 2000
+++ support/configure	Thu Oct 19 22:18:16 2000
@@ -1296,7 +1296,7 @@
 fi
 
 irc_cv_solaris_2=no
-if test "$irc_sun" = no; then
+if test "$irc_cv_sun" = no; then
   echo "$ac_t""no" 1>&6
 else
   if uname -r 2>/dev/null | grep "^5" >/dev/null; then
@@ -4108,8 +4108,6 @@
 
     case $irc_cv_v6type in
 	kame)
-		LIBS="-L/usr/local/v6/lib -linet6 $LIBS"
-		CFLAGS="$CFLAGS -I/usr/local/v6/include"
 		;;
 	linux)
 		LIBS="-L/usr/inet6/lib -linet6 $LIBS"

Lines 1-11 Link Here

(-)irc/files/patch-ae (-11 lines)
1	--- ircd/s_user.c~ Sat Jul 17 20:47:49 1999
2	+++ ircd/s_user.c Thu Jan 13 03:01:14 2000
3	@@ -2379,7 +2379,7 @@
4	parv[0], sptr->user->username, sptr->user->host,
5	sptr->auth, IsUnixSocket(sptr) ? sptr->sockhost :
6	#ifdef INET6
7	- inet_ntop(AF_INET6, (char *)&sptr->ip), mydummy, MYDUMMY_SIZE);
8	+ inet_ntop(AF_INET6, (char *)&sptr->ip, mydummy, MYDUMMY_SIZE));
9	#else
10	inetntoa((char *)&sptr->ip));
11	#endif




--- ircd/s_bsd.c	Sat Jul 24 02:15:14 1999
+++ ircd/s_bsd.c	Fri Jan 21 21:03:36 2000
@@ -760,8 +760,7 @@
 
 #ifdef INET6
 	if (IN6_IS_ADDR_LOOPBACK(&cptr->ip) || IsUnixSocket(cptr) ||
-		(cptr->ip.s6_laddr[0]==mysk.sin6_addr.s6_laddr[0] &&
-		 cptr->ip.s6_laddr[1]==mysk.sin6_addr.s6_laddr[1])
+		memcmp(&cptr->ip, &mysk.sin6_addr, 8) == 0
 /* ||
 	    IN6_ARE_ADDR_SAMEPREFIX(&cptr->ip, &mysk.SIN_ADDR))
  about the same, I think              NOT */

Return to bug 55824

Lines 1-24 Link Here

(-)irc/files/patch-ab (-22 / +16 lines)
1	--- support/config.h.dist.old Wed Dec 9 15:05:45 1998	1	--- support/config.h.dist.old Mon Aug 18 15:17:52 2003
2	+++ support/config.h.dist Wed Dec 9 15:09:34 1998	2	+++ support/config.h.dist Mon Aug 18 15:17:52 2003
3	@@ -168,13 +168,13 @@	3	@@ -121,1 +121,1 @@
4	* if 'OPER_x' is undefined so you can't give local operators more rights	4	-#undef OPER_KILL
5	* than global ones.	5	+#define OPER_KILL
6	*/	6	@@ -124,4 +124,4 @@
7	-#undef OPER_KILL	7	-#define OPER_DIE
8	+#define OPER_KILL
9	#define OPER_REHASH
10	#undef OPER_RESTART
11	-#define OPER_DIE
12	+#undef OPER_DIE	8	+#undef OPER_DIE
13	#undef OPER_REMOTE	9	-#undef OPER_REMOTE
14	-#undef LOCOP_REHASH	10	+#define OPER_REMOTE
15	-#undef LOCOP_RESTART	11	-#undef LOCOP_REHASH
16	+#define LOCOP_REHASH	12	+#define LOCOP_REHASH
17	+#define LOCOP_RESTART	13	-#undef LOCOP_RESTART
18	#undef LOCOP_DIE	14	+#define LOCOP_RESTART
19		15	@@ -249,32 +249,32 @@
20	/*
21	@@ -299,32 +299,32 @@
22	* this option is used unless you tell the system administrator beforehand	16	* this option is used unless you tell the system administrator beforehand
23	* and obtain their permission to send messages to the system log files.	17	* and obtain their permission to send messages to the system log files.
24	*/	18	*/
Lines 60-66 Link Here
60		54
61	/*	55	/*
62	* If you want to store encrypted passwords in N-lines for server links,	56	* If you want to store encrypted passwords in N-lines for server links,
63	@@ -376,7 +376,7 @@	57	@@ -323,7 +323,7 @@
64	* send to the server without processing before disconnecting the client for	58	* send to the server without processing before disconnecting the client for
65	* flooding it. Values greater than 8000 make no difference to the server.	59	* flooding it. Values greater than 8000 make no difference to the server.
66	*/	60	*/
Lines 69-75 Link Here
69		63
70	/* Remote query flood protection. */	64	/* Remote query flood protection. */
71	#define CHREPLLEN 8192	65	#define CHREPLLEN 8192
72	@@ -414,7 +414,7 @@	66	@@ -461,7 +461,7 @@
73	* The library and the include files must have been found by configure,	67	* The library and the include files must have been found by configure,
74	* if you have installed the zlib after running configure, run it again.	68	* if you have installed the zlib after running configure, run it again.
75	*/	69	*/

Lines 1-54 Link Here

(-)irc/files/patch-ac (-53 / +10 lines)
1	--- ircd/res.c- Fri Jan 21 20:57:31 2000	1	--- support/configure.orig Mon Aug 18 15:17:52 2003
2	+++ ircd/res.c Fri Jan 21 21:04:03 2000	2	+++ support/configure Mon Aug 18 15:17:52 2003
3	@@ -588,8 +588,7 @@	3	@@ -1296,7 +1296,7 @@
4	hp = (struct hent *)&(rptr->he);	4	fi
5	adr = &hp->h_addr;
6	#ifdef INET6
7	- while (adr->s6_laddr[0] \| adr->s6_laddr[1] \| adr->s6_laddr[2] \|
8	- adr->s6_laddr[3])
9	+ while (!IN6_IS_ADDR_UNSPECIFIED(adr))
10	#else
11	while (adr->s_addr)
12	#endif
13	@@ -667,9 +666,9 @@
14	if (type == T_AAAA)
15	bcopy(cp, (char *)&dr, dlen);
16	else {
17	- dr.s6_laddr[0]=dr.s6_laddr[1]=0;
18	- dr.s6_laddr[2]=htonl(0xffff);
19	- bcopy(cp, &dr.s6_laddr[3], INADDRSZ);
20	+ memset(&dr, 0, sizeof(dr));
21	+ dr.s6_addr[10] = dr.s6_addr[11] = 0xff;
22	+ bcopy(cp, &dr.s6_addr[12], INADDRSZ);
23	}
24	bcopy(dr.s6_addr, adr->s6_addr, IN6ADDRSZ);
25	#else
26	@@ -1052,12 +1051,10 @@
27		5
28	#ifdef DEBUG	6	irc_cv_solaris_2=no
29	#ifdef INET6	7	-if test "$irc_sun" = no; then
30	- Debug((DEBUG_INFO,"add_to_cache:added %s[%08x%08x%08x%08x] cache %#x.",	8	+if test "$irc_cv_sun" = no; then
31	- ocp->he.h_name,	9	echo "$ac_t""no" 1>&6
32	- ((struct in6_addr *)ocp->he.h_addr_list)->s6_laddr[0],	10	else
33	- ((struct in6_addr *)ocp->he.h_addr_list)->s6_laddr[1],	11	if uname -r 2>/dev/null \| grep "^5" >/dev/null; then
34	- ((struct in6_addr *)ocp->he.h_addr_list)->s6_laddr[2],
35	- ((struct in6_addr *)ocp->he.h_addr_list)->s6_laddr[3], ocp));
36	+ inet_ntop(AF_INET6, ((struct in6_addr *)ocp->he.h_addr_list),
37	+ mydummy, sizeof(mydummy));
38	+ Debug((DEBUG_INFO,"add_to_cache:added %s[%s] cache %#x.",
39	+ ocp->he.h_name, mydummy, ocp);
40	#else
41	Debug((DEBUG_INFO, "add_to_cache:added %s[%08x] cache %#x.",
42	ocp->he.h_name, ocp->he.h_addr_list[0], ocp));
43	@@ -1275,9 +1272,8 @@
44	#ifdef DEBUG
45	#ifdef INET6
46	Debug((DEBUG_DNS,
47	- "find_cache_number:find %s[%08x%08x%08x%08x]: hashv = %d",
48	- inet_ntop(AF_INET6, numb,mydummy,MYDUMMY_SIZE), ip->s6_laddr[0],
49	- ip->s6_laddr[1], ip->s6_laddr[2], ip->s6_laddr[3], hashv));
50	+ "find_cache_number:find %s: hashv = %d",
51	+ inet_ntop(AF_INET6, numb, mydummy,MYDUMMY_SIZE), hashv));
52	#else
53	Debug((DEBUG_DNS,"find_cache_number:find %s[%08x]: hashv = %d",
54	inetntoa(numb), ntohl(ip->s_addr), hashv));

Lines 1-20 Link Here

(-)irc/files/patch-ad (-20 lines)
1	--- support/configure.orig Thu Oct 19 22:17:48 2000
2	+++ support/configure Thu Oct 19 22:18:16 2000
3	@@ -1296,7 +1296,7 @@
4	fi
5
6	irc_cv_solaris_2=no
7	-if test "$irc_sun" = no; then
8	+if test "$irc_cv_sun" = no; then
9	echo "$ac_t""no" 1>&6
10	else
11	if uname -r 2>/dev/null \| grep "^5" >/dev/null; then
12	@@ -4108,8 +4108,6 @@
13
14	case $irc_cv_v6type in
15	kame)
16	- LIBS="-L/usr/local/v6/lib -linet6 $LIBS"
17	- CFLAGS="$CFLAGS -I/usr/local/v6/include"
18	;;
19	linux)
20	LIBS="-L/usr/inet6/lib -linet6 $LIBS"

Lines 1-12 Link Here

(-)irc/files/patch-af (-12 lines)
1	--- ircd/s_bsd.c Sat Jul 24 02:15:14 1999
2	+++ ircd/s_bsd.c Fri Jan 21 21:03:36 2000
3	@@ -760,8 +760,7 @@
4
5	#ifdef INET6
6	if (IN6_IS_ADDR_LOOPBACK(&cptr->ip) \|\| IsUnixSocket(cptr) \|\|
7	- (cptr->ip.s6_laddr[0]==mysk.sin6_addr.s6_laddr[0] &&
8	- cptr->ip.s6_laddr[1]==mysk.sin6_addr.s6_laddr[1])
9	+ memcmp(&cptr->ip, &mysk.sin6_addr, 8) == 0
10	/* \|\|
11	IN6_ARE_ADDR_SAMEPREFIX(&cptr->ip, &mysk.SIN_ADDR))
12	about the same, I think NOT */