Date: 20 Aug 2003 22:22:59 -0000 From: Paolo Gatti <onel0ve@libero.it> To: FreeBSD-gnats-submit@freebsd.org Cc: ports@freebsd.org Subject: [PATCH] Update irc/irc to 2.10.3p3 Message-ID: <20030820222259.3784.qmail@ones.ws>
next in thread | raw e-mail | index | archive | help
>Submitter-Id: current-users >Originator: Paolo Gatti >Confidential: no >Severity: serious >Priority: medium >Category: ports >Class: update >Release: FreeBSD 5.1-RELEASE-p2 i386 >Environment: System: FreeBSD ones.ws 5.1-RELEASE-p2 FreeBSD 5.1-RELEASE-p2 #0: Mon Aug 11 13:24:10 CEST 2003 root@ones.ws:/usr/obj/usr/src/sys/FREEBSD i386 >Description: Update irc/irc port from 2.10.3 to 2.10.3p3 >How-To-Repeat: >Fix: Also available at http://bsd.altervista.org/irc.diff diff -urN irc.orig/Makefile irc/Makefile --- irc.orig/Makefile Thu Feb 20 19:17:24 2003 +++ irc/Makefile Tue Aug 19 00:37:03 2003 @@ -6,7 +6,7 @@ # PORTNAME= irc -PORTVERSION= 2.10.3 +PORTVERSION= 2.10.3p3 CATEGORIES= irc ipv6 MASTER_SITES= ftp://ftp.funet.fi/pub/networking/services/irc/server/ \ ftp://ftp.irc.org/irc/server/ \ diff -urN irc.orig/README.html irc/README.html --- irc.orig/README.html Thu Jan 16 19:41:56 2003 +++ irc/README.html Mon Aug 18 15:28:52 2003 @@ -3,7 +3,7 @@ <head><h1> The FreeBSD Ports Collection ("irc/irc")</h1> </head> <hr> <body> -<p>You are now in the directory for the port "irc/irc" (package name "irc-2.10.3"). +<p>You are now in the directory for the port "irc/irc" (package name "irc2.10.3p3"). <p>This is the one-line description for this port: diff -urN irc.orig/distinfo irc/distinfo --- irc.orig/distinfo Wed Jan 26 22:08:16 2000 +++ irc/distinfo Mon Aug 18 15:27:58 2003 @@ -1 +1 @@ -MD5 (irc2.10.3.tgz) = c7edd9285ff64435f39cbbde2fc77b73 +MD5 (irc2.10.3p3.tgz) = bec7916f39043609c528afac507a2e00 diff -urN irc.orig/files/patch-ab irc/files/patch-ab --- irc.orig/files/patch-ab Wed Dec 9 21:15:30 1998 +++ irc/files/patch-ab Mon Aug 18 15:57:34 2003 @@ -1,24 +1,18 @@ ---- support/config.h.dist.old Wed Dec 9 15:05:45 1998 -+++ support/config.h.dist Wed Dec 9 15:09:34 1998 -@@ -168,13 +168,13 @@ - * if 'OPER_x' is undefined so you can't give local operators more rights - * than global ones. - */ --#undef OPER_KILL -+#define OPER_KILL - #define OPER_REHASH - #undef OPER_RESTART --#define OPER_DIE +--- 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 +#undef OPER_DIE - #undef OPER_REMOTE --#undef LOCOP_REHASH --#undef LOCOP_RESTART -+#define LOCOP_REHASH -+#define LOCOP_RESTART - #undef LOCOP_DIE - - /* -@@ -299,32 +299,32 @@ +-#undef OPER_REMOTE ++#define OPER_REMOTE +-#undef LOCOP_REHASH ++#define LOCOP_REHASH +-#undef LOCOP_RESTART ++#define LOCOP_RESTART +@@ -249,32 +249,32 @@ * this option is used unless you tell the system administrator beforehand * and obtain their permission to send messages to the system log files. */ @@ -60,7 +54,7 @@ /* * If you want to store encrypted passwords in N-lines for server links, -@@ -376,7 +376,7 @@ +@@ -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. */ @@ -69,7 +63,7 @@ /* Remote query flood protection. */ #define CHREPLLEN 8192 -@@ -414,7 +414,7 @@ +@@ -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. */ diff -urN irc.orig/files/patch-ac irc/files/patch-ac --- irc.orig/files/patch-ac Wed Jan 26 22:08:17 2000 +++ irc/files/patch-ac Mon Aug 18 15:19:14 2003 @@ -1,54 +1,11 @@ ---- ircd/res.c- Fri Jan 21 20:57:31 2000 -+++ ircd/res.c Fri Jan 21 21:04:03 2000 -@@ -588,8 +588,7 @@ - hp = (struct hent *)&(rptr->he); - 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 @@ +--- support/configure.orig Mon Aug 18 15:17:52 2003 ++++ support/configure Mon Aug 18 15:17:52 2003 +@@ -1296,7 +1296,7 @@ + fi - #ifdef DEBUG - #ifdef INET6 -- Debug((DEBUG_INFO,"add_to_cache:added %s[%08x%08x%08x%08x] cache %#x.", -- ocp->he.h_name, -- ((struct in6_addr *)ocp->he.h_addr_list)->s6_laddr[0], -- ((struct in6_addr *)ocp->he.h_addr_list)->s6_laddr[1], -- ((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)); + 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 diff -urN irc.orig/files/patch-ad irc/files/patch-ad --- irc.orig/files/patch-ad Thu Oct 19 15:26:02 2000 +++ irc/files/patch-ad Thu Jan 1 01:00:00 1970 @@ -1,20 +0,0 @@ ---- 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" diff -urN irc.orig/files/patch-ae irc/files/patch-ae --- irc.orig/files/patch-ae Wed Jan 26 22:08:17 2000 +++ irc/files/patch-ae Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- ircd/s_user.c~ Sat Jul 17 20:47:49 1999 -+++ ircd/s_user.c Thu Jan 13 03:01:14 2000 -@@ -2379,7 +2379,7 @@ - parv[0], sptr->user->username, sptr->user->host, - sptr->auth, IsUnixSocket(sptr) ? sptr->sockhost : - #ifdef INET6 -- inet_ntop(AF_INET6, (char *)&sptr->ip), mydummy, MYDUMMY_SIZE); -+ inet_ntop(AF_INET6, (char *)&sptr->ip, mydummy, MYDUMMY_SIZE)); - #else - inetntoa((char *)&sptr->ip)); - #endif diff -urN irc.orig/files/patch-af irc/files/patch-af --- irc.orig/files/patch-af Wed Jan 26 22:08:18 2000 +++ irc/files/patch-af Thu Jan 1 01:00:00 1970 @@ -1,12 +0,0 @@ ---- 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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030820222259.3784.qmail>