Update to 3.2.4

This is just a summary of changes, for full details see:
	http://www.unrealircd.com/txt/unreal3_2_4_release_notes.txt

> ==[ MAJOR BUGS FIXED ]==
> - Two issues with an incorrect badword { } block in the config file causing a crash.
> - Incorrect TKL/*LINE causing a crash
> - Complete resolver recode: now using c-ares + caching to fix some (rare?) crash bugs and
>   to make our code much more cleaner.
> - Using GCC4 caused a crash on-link.
> - Crash when a class block was removed and had any other blocks were referencing it.
> - OpenBSD crash on /REHASH.
> - Several AMD64 crash issues.
> - Sometimes a serious flood of notices was generated if link::options::nodnscache was used.
> - Spamfilter: action 'viruschan' combined with target 'user' caused crashes.
> - chinese-* nick characters support caused memory corruption.
> - Crash issue regarding SSL and junk snomask.
>
> ==[ MINOR BUGS FIXED ]==
> - Now properly resolves hostnames again that use CNAME delegation (got broken in 3.2.3).
> - Fedora Core w/IPv6 failed to compile.
> - A few read-after-free bugs that could have caused crashes.
> - ./Config was not loading the settings properly on Solaris 10
> - Crash if high ascii in set::network-name
> - Fixed advanced channel aliases not working properly
> - Fixed \* and \? escaping not always working properly (for example in ~r/~c bans).

3 files changed, 58 insertions, 20 deletions

diff --git a/chat/unrealircd/Makefile b/chat/unrealircd/Makefile
index 74ac997f3f4..d1ee99cb675 100644
--- a/chat/unrealircd/Makefile
+++ b/chat/unrealircd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/12/29 06:21:33 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/02/04 21:13:54 adrianp Exp $
 
-DISTNAME=	Unreal3.2.3
-PKGNAME=	unrealircd-3.2.3
-PKGREVISION=	1
+DISTNAME=	Unreal3.2.4
+PKGNAME=	unrealircd-3.2.4
 CATEGORIES=	chat
 MASTER_SITES=	http://unrealircd.atlanti-ka.org/ \
 		http://www.ilmarinen.us/unreal/ \
@@ -15,16 +14,21 @@ COMMENT=	Advanced IRC server with IPv6 and SSL support
 CONFLICTS+=	ircu-[0-9]*
 
 GNU_CONFIGURE=	YES
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	pkg-config gmake
 WRKSRC=		${WRKDIR}/Unreal3.2
 TRE_NEEDED=	0.7.2
+CARES_NEEDED=	1.3.0
 
 BUILDLINK_DEPENDS.tre+=	tre-${TRE_NEEDED}
+BUILDLINK_DEPENDS.libcares+= libcares-${CARES_NEEDED}
 
 .include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ENV+=	tre_version=${TRE_NEEDED:Q}
 CONFIGURE_ENV+=	TRELIBS="-L${PREFIX}/lib -ltre"
+CONFIGURE_ENV+= cares_version=${CARES_NEEDED:Q}
+CONFIGURE_ENV+= CARESINCDIR="${PREFIX}/include"
+CONFIGURE_ENV+= CARESLIBS="-L${PREFIX}/lib -lcares"
 
 CONFIGURE_ARGS+=	--with-dpath=${UIRCD_HOME:Q}
 CONFIGURE_ARGS+=	--with-spath=${PREFIX}/sbin/ircd
@@ -57,7 +61,7 @@ UIRCD_SENDQ?=		3000000
 UIRCD_LISTEN?=		5
 UIRCD_BUFFER?=		18
 UIRCD_NICKHIST?=	2000
-UIRCD_FDSIZE?=		512
+UIRCD_FDSIZE?=		1024
 UIRCD_USER?=		uircd
 UIRCD_GROUP?=		uircd
 UIRCD_HOST?=		localhost
@@ -73,7 +77,7 @@ PKG_GROUPS=	${UIRCD_GROUP}
 RCD_SCRIPTS=	unrealircd
 
 MESSAGE_SRC+=	${WRKDIR}/.MESSAGE_SRC
-MESSAGE_SUBST+=	UIRCD_HOME=${UIRCD_HOME}
+MESSAGE_SUBST+=	UIRCD_HOME=${UIRCD_HOME:Q}
 FILES_SUBST+=	UIRCD_HOME=${UIRCD_HOME:Q}
 FILES_SUBST+=	UIRCD_USER=${UIRCD_USER:Q}
 FILES_SUBST+=	UIRCD_GROUP=${UIRCD_GROUP:Q}
@@ -83,7 +87,7 @@ SUBST_STAGE.homedir=	post-patch
 SUBST_FILES.homedir=	doc/example.conf
 SUBST_SED.homedir=	-e "s|src/modules|${IRCD_SHARE}/modules|g" \
 			-e "s|include \"|include \"${IRCD_SHARE}/|g"
-SUBST_MESSAGE.homedir=	"Fixing home directory of IRC server."
+SUBST_MESSAGE.homedir=	Fixing home directory of the IRC server.
 
 OWN_DIRS_PERMS+=	${UIRCD_HOME} ${UIRCD_USER} ${UIRCD_GROUP} 0770
 OWN_DIRS_PERMS+=	${UIRCD_HOME}/tmp ${UIRCD_USER} ${UIRCD_GROUP} 0770
@@ -92,6 +96,7 @@ OWN_DIRS_PERMS+=	${UIRCD_HOME}/tmp ${UIRCD_USER} ${UIRCD_GROUP} 0770
 INSTALL_UNSTRIPPED=YES
 .endif
 
+.include "../../net/libcares/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/tre/buildlink3.mk"
 
diff --git a/chat/unrealircd/distinfo b/chat/unrealircd/distinfo
index 419d194b7dd..948e9797d9a 100644
--- a/chat/unrealircd/distinfo
+++ b/chat/unrealircd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2005/12/16 15:52:03 joerg Exp $
+$NetBSD: distinfo,v 1.4 2006/02/04 21:13:54 adrianp Exp $
 
-SHA1 (Unreal3.2.3.tar.gz) = 5820906434f0c9e2cd027882e85900a919a2065d
-RMD160 (Unreal3.2.3.tar.gz) = e304e58457847fd371216d2e68293f7daad08dd5
-Size (Unreal3.2.3.tar.gz) = 1881275 bytes
-SHA1 (patch-aa) = 70dbd3e7c40f8be5e8e5f759845d9100770c269a
+SHA1 (Unreal3.2.4.tar.gz) = 9cc51736fc4815cba3c8724e70e9053727b36677
+RMD160 (Unreal3.2.4.tar.gz) = 95a9867f451ba6893f53450d85ea11cde7d27463
+Size (Unreal3.2.4.tar.gz) = 2446695 bytes
+SHA1 (patch-aa) = 762764ac4b520f3e4497f1ded834dc08bb2868e2
 SHA1 (patch-ab) = b66ae1990e25479abe9087a9308a2185692fcba2
 SHA1 (patch-ac) = 4c3e7219d03e93c2a3e8f735c350d919efdf8fbb
 SHA1 (patch-ad) = 3bef7c197efb59def9e77114ad9356ef2f23fa26
diff --git a/chat/unrealircd/patches/patch-aa b/chat/unrealircd/patches/patch-aa
index d2fd6468ac6..3a6759f7829 100644
--- a/chat/unrealircd/patches/patch-aa
+++ b/chat/unrealircd/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2005/12/01 18:09:37 adrianp Exp $
+$NetBSD: patch-aa,v 1.3 2006/02/04 21:13:54 adrianp Exp $
 
---- configure.orig	2005-03-13 21:02:17.000000000 +0000
+--- configure.orig	2006-02-03 13:57:17.000000000 +0000
 +++ configure
-@@ -10221,7 +10221,7 @@ if test "${enable_libcurl+set}" = set; t
+@@ -10247,7 +10247,7 @@ if test "${enable_libcurl+set}" = set; t
  		CURLLIBS=`$enableval/bin/curl-config --libs`
  
  				if test "x`echo $CURLLIBS |grep .*ares.*`" = x ; then
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2005/12/01 18:09:37 adrianp Exp $
  		fi
  		IRCDLIBS="$IRCDLIBS $CURLLIBS"
  		URL="url.o"
-@@ -10614,39 +10614,6 @@ IRCDLIBS="$IRCDLIBS -lresolv "
+@@ -10692,72 +10692,6 @@ IRCDLIBS="$IRCDLIBS -lresolv "
  ;;
  esac
  
@@ -32,13 +32,13 @@ $NetBSD: patch-aa,v 1.2 2005/12/01 18:09:37 adrianp Exp $
 -echo "$as_me:$LINENO: result: configuring TRE regex library" >&5
 -echo "${ECHO_T}configuring TRE regex library" >&6
 -cd tre-$tre_version
--./configure --disable-agrep --disable-shared --disable-system-abi --disable-wchar --disable-multibyte --prefix=$cur_dir/extras/regexp
+-./configure --disable-agrep --disable-shared --disable-system-abi --disable-wchar --disable-multibyte --prefix=$cur_dir/extras/regexp || exit 1
 -echo "$as_me:$LINENO: result: compiling TRE regex library" >&5
 -echo "${ECHO_T}compiling TRE regex library" >&6
--$ac_cv_prog_MAKER
+-$ac_cv_prog_MAKER || exit 1
 -echo "$as_me:$LINENO: result: installing TRE regex library" >&5
 -echo "${ECHO_T}installing TRE regex library" >&6
--$ac_cv_prog_MAKER install
+-$ac_cv_prog_MAKER install || exit 1
 -TREINCDIR="$cur_dir/extras/regexp/include"
 -
 -if test "x$ac_cv_path_PKGCONFIG" = "x" ; then
@@ -48,6 +48,39 @@ $NetBSD: patch-aa,v 1.2 2005/12/01 18:09:37 adrianp Exp $
 -fi
 -
 -cd $cur_dir
+-
+-
+-cares_version="1.3.0"
+-echo "$as_me:$LINENO: result: extracting c-ares resolver library" >&5
+-echo "${ECHO_T}extracting c-ares resolver library" >&6
+-cur_dir=`pwd`
+-cd extras
+-rm -rf c-ares-$cares_version
+-if test "x$ac_cv_path_GUNZIP" = "x" ; then
+-	tar xfz c-ares.tar.gz
+-else
+-	cp c-ares.tar.gz c-ares.tar.gz.bak
+-	gunzip -f c-ares.tar.gz
+-	cp c-ares.tar.gz.bak c-ares.tar.gz
+-	tar xf c-ares.tar
+-fi
+-echo "$as_me:$LINENO: result: configuring c-ares library" >&5
+-echo "${ECHO_T}configuring c-ares library" >&6
+-cd c-ares-$cares_version
+-./configure --prefix=$cur_dir/extras/c-ares || exit 1
+-echo "$as_me:$LINENO: result: compiling c-ares resolver library" >&5
+-echo "${ECHO_T}compiling c-ares resolver library" >&6
+-$ac_cv_prog_MAKER || exit 1
+-echo "$as_me:$LINENO: result: installing c-ares resolver library" >&5
+-echo "${ECHO_T}installing c-ares resolver library" >&6
+-$ac_cv_prog_MAKER install || exit 1
+-CARESINCDIR="$cur_dir/extras/c-ares/include"
+-
+-CARESLIBS="-L../extras/c-ares/lib -lcares"
+-
+-cd $cur_dir
+-
+-
  ac_config_files="$ac_config_files Makefile src/modules/Makefile unreal ircdcron/ircdchk"
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure