Update to 2.10.12.10

Some of the changes include:
* doc/example.conf: Document new options for General block.
* doc/example.conf (Features): Illustrate URLREG feature.
* ircd/m_burst.c (ms_burst): Properly handle member mode :ov.
* doc/example.conf (Port): Document the method to select IPv4 or
  IPv6 restriction for a port.
* ircd/s_auth.c (auth_ping_timeout): If the client never had an
  auth request, kill them on ping timeout.
* ircd/s_auth.c (check_auth_finished): Only check passwords on
  user ports.

See the ChangeLog for the full details

11 files changed, 28 insertions, 199 deletions

diff --git a/chat/ircu/Makefile b/chat/ircu/Makefile
index 022e472ea50..a35c13d8751 100644
--- a/chat/ircu/Makefile
+++ b/chat/ircu/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2007/01/06 14:34:50 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2007/04/09 12:39:25 adrianp Exp $
 #
 
-DISTNAME=	ircu2.10.11.07
-PKGNAME=	ircu-2.10.11.07
-PKGREVISION=	1
+DISTNAME=	ircu2.10.12.10
+PKGNAME=	${DISTNAME:S/ircu2/ircu-2/}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=undernet-ircu/}
 
@@ -36,7 +35,7 @@ EGDIR=			${PREFIX}/share/examples/ircd
 DOCDIR=			${PREFIX}/share/doc/ircd
 BUILD_DEFS+=		VARBASE
 
-CONF_FILES_PERMS+=	${EGDIR}/ircd.conf.sample ${PKG_SYSCONFDIR}/ircd.conf \
+CONF_FILES_PERMS+=	${EGDIR}/example.conf ${PKG_SYSCONFDIR}/ircd.conf \
 			${IRCD_USER} ${IRCD_GROUP} 0600
 
 SPECIAL_PERMS+=		${PKG_SYSCONFDIR} ${IRCD_USER} ${IRCD_GROUP} 0700
@@ -53,36 +52,18 @@ PKG_USERS=		${IRCD_USER}:${IRCD_GROUP}
 PKG_GECOS.${IRCD_USER}=	IRC server user
 PKG_SHELL.${IRCD_USER}=	${SH}
 
-SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
-SUBST_FILES.paths=	tools/README doc/ircd.conf.sample
-SUBST_SED.paths=	-e "s|/usr/local/lib/irc|${PKG_SYSCONFDIR}|g"
-SUBST_SED.paths+=	-e "s|@PREFIX@|${PREFIX}|g"
-SUBST_MESSAGE.paths=	Fixing hardcoded paths.
-
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 
-post-extract:
-	mv ${WRKSRC}/tools/Makefile.crypt ${WRKSRC}/tools/Makefile.crypt.in
-
-post-build:
-	cd ${WRKSRC}/tools && \
-		env ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
-		-f Makefile.crypt
-
 do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/ircd/ircd ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/ircd/chkconf \
-		${PREFIX}/sbin/ircd-chkconf
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/mkpasswd \
-		${PREFIX}/sbin/ircd-mkpasswd
 	${INSTALL_MAN} ${WRKSRC}/doc/ircd.8 ${PREFIX}/${PKGMANDIR}/man8
-	${INSTALL_DATA} ${WRKSRC}/doc/ircd.conf.sample ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/tools/README ${DOCDIR}/README.mkpasswd
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} readme.* iauth.txt ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/RELEASE.NOTES ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/readme.* ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/ircu/PLIST b/chat/ircu/PLIST
index 9df8415f2d4..de8e977dd1a 100644
--- a/chat/ircu/PLIST
+++ b/chat/ircu/PLIST
@@ -1,24 +1,25 @@
-@comment $NetBSD: PLIST,v 1.4 2005/05/02 20:33:58 reed Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/04/09 12:39:26 adrianp Exp $
 man/man8/ircd.8
 sbin/ircd
-sbin/ircd-chkconf
-sbin/ircd-mkpasswd
 share/doc/ircd/README
-share/doc/ircd/README.mkpasswd
-share/doc/ircd/iauth.txt
+share/doc/ircd/RELEASE.NOTES
+share/doc/ircd/INSTALL
+share/doc/ircd/iso-time.html
+share/doc/ircd/p10.html
+share/doc/ircd/snomask.html
 share/doc/ircd/readme.asll
 share/doc/ircd/readme.chroot
 share/doc/ircd/readme.crules
 share/doc/ircd/readme.cvs
 share/doc/ircd/readme.features
 share/doc/ircd/readme.gline
+share/doc/ircd/readme.iauth
 share/doc/ircd/readme.indent
 share/doc/ircd/readme.jupe
 share/doc/ircd/readme.log
 share/doc/ircd/readme.who
 share/doc/ircd/readme.www
 share/examples/ircd/example.conf
-share/examples/ircd/ircd.conf.sample
 share/examples/rc.d/ircd
 @dirrm share/examples/ircd
 @dirrm share/doc/ircd
diff --git a/chat/ircu/distinfo b/chat/ircu/distinfo
index 318b67332f0..88236aa2de1 100644
--- a/chat/ircu/distinfo
+++ b/chat/ircu/distinfo
@@ -1,13 +1,6 @@
-$NetBSD: distinfo,v 1.10 2006/12/21 16:13:54 jmmv Exp $
+$NetBSD: distinfo,v 1.11 2007/04/09 12:39:26 adrianp Exp $
 
-SHA1 (ircu2.10.11.07.tar.gz) = 1e1518cbbdf096aaaabf5f56a1ec266769d847ad
-RMD160 (ircu2.10.11.07.tar.gz) = 359f92bb7a4464baf9af571865ee4bf9fbe56426
-Size (ircu2.10.11.07.tar.gz) = 844971 bytes
-SHA1 (patch-aa) = 5bba1aa64e8b611688a1de1c3106b83a92a2cedd
-SHA1 (patch-ab) = 92d532072fd291c077a8ff2ebc2f1f245da78c87
-SHA1 (patch-af) = da533f03542c268c9e3502278f51777c3b85824d
-SHA1 (patch-ag) = f34df6342c8e26b4cdf59e56c893b4845f7d3974
-SHA1 (patch-ah) = f89f24ebc1f79070c16b1b6ca7689221afa98d6b
-SHA1 (patch-ai) = 83119426e72a4833460bced3cd11bf47829e8992
-SHA1 (patch-aj) = ac16fd3e8a4c6d7da7e6f5383c746a9cfc2674ea
-SHA1 (patch-ak) = dec69de5c6b678cb5736173cccc34907d16b1ab8
+SHA1 (ircu2.10.12.10.tar.gz) = 75218fdc7b4d8b77e27a0a616d577d4e5965d873
+RMD160 (ircu2.10.12.10.tar.gz) = d4f0f010d970839ce51533c132437d15cda8ac5f
+Size (ircu2.10.12.10.tar.gz) = 990601 bytes
+SHA1 (patch-ah) = 2ffd8cc861bbe8aad697bd3b8ca63aa145104eea
diff --git a/chat/ircu/patches/patch-aa b/chat/ircu/patches/patch-aa
deleted file mode 100644
index 1edac2fdc33..00000000000
--- a/chat/ircu/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/12/21 16:13:54 jmmv Exp $
-
---- ircd/res.c.orig	2004-01-11 01:23:32.000000000 +0100
-+++ ircd/res.c
-@@ -43,6 +43,9 @@
- #include <unistd.h>
- #include <regex.h>
- 
-+/* bind 8 compatibility needed because of T_PTR and other macros.  Seen
-+ * under Mac OS X 10.4. */
-+#define BIND_8_COMPAT
- #include <arpa/nameser.h>
- #include <resolv.h>
- #include <netdb.h>
diff --git a/chat/ircu/patches/patch-ab b/chat/ircu/patches/patch-ab
deleted file mode 100644
index 83a18bc12e5..00000000000
--- a/chat/ircu/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/12/21 16:13:54 jmmv Exp $
-
---- tools/Makefile.crypt.in.orig	2004-09-18 04:17:52.000000000 +0200
-+++ tools/Makefile.crypt.in
-@@ -21,7 +21,7 @@
- #
- IRCDCONF = /usr/local/lib/irc/ircd.conf
- 
--LIBS = -lcrypt
-+LIBS = @LIBS@
- 
- all: mkpasswd
- crypt: install
diff --git a/chat/ircu/patches/patch-af b/chat/ircu/patches/patch-af
deleted file mode 100644
index a70d376c7d9..00000000000
--- a/chat/ircu/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/03/01 05:22:24 grant Exp $
-
---- doc/ircd.conf.sample.orig	Sun Dec 15 12:02:38 2002
-+++ doc/ircd.conf.sample
-@@ -349,7 +349,8 @@ H:*.*::hub07.eu.undernet.org
- # - O: lines are not required
- #
- # Notes:
--#	- Use the tools/mkpasswd tool to encrypt passwords
-+#	- Use the @PREFIX@/sbin/ircd-mkpasswd tool to encrypt passwords
-+#	  (See @PREFIX@/share/doc/ircd/README.mkpasswd)
- #	- Choose safe passwords
- #	- Make the <host|ip> mask as narrowly matching as possible
- #
diff --git a/chat/ircu/patches/patch-ag b/chat/ircu/patches/patch-ag
deleted file mode 100644
index fa6c3a31f04..00000000000
--- a/chat/ircu/patches/patch-ag
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2004/09/28 12:32:17 adrianp Exp $
-
---- tools/README.orig	2004-09-22 17:24:06.000000000 +0100
-+++ tools/README	2004-09-22 17:26:41.000000000 +0100
-@@ -35,12 +35,12 @@
- very obvious problem.
- 
- So, how do you generate these icky looking strings for passwords?
--There's a simple program called mkpasswd to do that for you. To
--compile mkpasswd, just "make -f Makefile.crypt" in this directory. After it
--compiles, just run mkpasswd, and at the prompt type in your plaintext 
--password. It will spit out the encrypted password, which you should then 
--just copy into your ircd.conf file. This should be done only when adding 
--new passwords to your ircd.conf file. Crypting of oper passwords is 
-+There's a simple program called ircd-mkpasswd to do that for you. To
-+compile ircd-mkpasswd, just "make -f Makefile.crypt" in this directory. 
-+After it compiles, just run ircd-mkpasswd, and at the prompt type in your 
-+plaintext password. It will spit out the encrypted password, which you 
-+should then just copy into your ircd.conf file. This should be done only 
-+when adding new passwords to your ircd.conf file. Crypting of oper passwords is 
- automatically done with the new F:lines so there is nothing to enable to 
- be able to use crypted oper passwords. All you have to do is edit the 
- Makefile.crypt in this directory and change "IRCDCONF = 
diff --git a/chat/ircu/patches/patch-ah b/chat/ircu/patches/patch-ah
index 0126d04c06c..87bb0ed5a5a 100644
--- a/chat/ircu/patches/patch-ah
+++ b/chat/ircu/patches/patch-ah
@@ -1,17 +1,9 @@
-$NetBSD: patch-ah,v 1.4 2006/12/21 16:13:54 jmmv Exp $
+$NetBSD: patch-ah,v 1.5 2007/04/09 12:39:27 adrianp Exp $
 
---- configure.orig	2004-09-18 04:17:45.000000000 +0200
+--- configure.orig	2005-12-14 03:03:09.000000000 +0000
 +++ configure
-@@ -2370,7 +2370,6 @@ if test x"$CFLAGS" != x; then
- fi
- if test x"$CFLAGS" != x; then
-     unet_old_cflags=$CFLAGS
--    CFLAGS=`echo "$CFLAGS" | sed -e 's/-g//g'`
- fi
- if test x"$CFLAGS" != x"$unet_old_cflags"; then
-     # If -g was already there, force symbols to be enabled
-@@ -7237,7 +7236,7 @@ echo "${ECHO_T}OpenBSD ($host) found." >
- 	OSDEP_C=os_openbsd.c
+@@ -9837,7 +9837,7 @@ echo "${ECHO_T}OpenBSD ($host) found." >
+ 	fi
  	;;
  
 -    *-*bsd*)
@@ -19,10 +11,11 @@ $NetBSD: patch-ah,v 1.4 2006/12/21 16:13:54 jmmv Exp $
  	echo "$as_me:$LINENO: result: Generic BSD ($host) found." >&5
  echo "${ECHO_T}Generic BSD ($host) found." >&6
  	if test x"$ac_cv_header_poll_h" = xyes; then
-@@ -7968,9 +7967,25 @@ cat >>confdefs.h <<_ACEOF
+@@ -10727,10 +10727,25 @@ cat >>confdefs.h <<_ACEOF
+ #define LPATH "$unet_lpath"
  _ACEOF
  
- 
+-
 -unet_maxcon=`ulimit -Hn`
 -if test x"$unet_maxcon" = xunlimited; then
 -    unet_maxcon=`ulimit -Sn`
@@ -43,25 +36,8 @@ $NetBSD: patch-ah,v 1.4 2006/12/21 16:13:54 jmmv Exp $
 +else
 +    unet_maxcon=`ulimit -Hn`
 +    if test x"$unet_maxcon" = xunlimited; then
-+        unet_maxcon=`ulimit -Sn`
++	unet_maxcon=`ulimit -Sn`
 +    fi
  fi
  unet_maxcon=`expr $unet_maxcon - 4`
  echo "$as_me:$LINENO: checking max connections" >&5
-@@ -8002,7 +8017,7 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
- 
- 
--                              ac_config_files="$ac_config_files Makefile ircd/Makefile doc/Makefile"
-+                              ac_config_files="$ac_config_files Makefile ircd/Makefile doc/Makefile tools/Makefile.crypt"
-           ac_config_commands="$ac_config_commands default"
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -8534,6 +8549,7 @@ do
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "ircd/Makefile" ) CONFIG_FILES="$CONFIG_FILES ircd/Makefile" ;;
-   "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-+  "tools/Makefile.crypt" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile.crypt" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff --git a/chat/ircu/patches/patch-ai b/chat/ircu/patches/patch-ai
deleted file mode 100644
index 8cc1425938e..00000000000
--- a/chat/ircu/patches/patch-ai
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/05/12 08:32:51 rillig Exp $
-
-These macros hide the crypt(3) function on NetBSD.
-
---- ircd/ircd_xopen.c.orig	Sat Apr 21 23:49:12 2001
-+++ ircd/ircd_xopen.c	Thu May 12 10:17:41 2005
-@@ -20,8 +20,10 @@
-  */
- #include "config.h"
- 
-+#ifndef __NetBSD__
- #define _XOPEN_SOURCE
- #define _XOPEN_VERSION 4
-+#endif
- #include "ircd_xopen.h"
- 
- #include <assert.h>
diff --git a/chat/ircu/patches/patch-aj b/chat/ircu/patches/patch-aj
deleted file mode 100644
index 3ab208203d3..00000000000
--- a/chat/ircu/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/05/12 08:32:51 rillig Exp $
-
-These macros hide the crypt(3) function.
-
---- tools/mkpasswd.c.orig	Fri Apr  7 16:53:35 2000
-+++ tools/mkpasswd.c	Sat Apr  9 00:53:30 2005
-@@ -2,9 +2,15 @@
-  * copyright 1991, all rights reserved.
-  * You can use this code as long as my name stays with it.
-  */
-+#ifndef __NetBSD__
- #define _XOPEN_SOURCE
- #define _XOPEN_VERSION 4
- #define _XOPEN_SOURCE_EXTENDED
-+#endif
-+
-+#ifdef __NetBSD__
-+#include <pwd.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/chat/ircu/patches/patch-ak b/chat/ircu/patches/patch-ak
deleted file mode 100644
index 7d9766749b7..00000000000
--- a/chat/ircu/patches/patch-ak
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2005/05/12 08:32:51 rillig Exp $
-
-A va_list may be an array type which cannot be copied using plain ISO
-C90.
-
---- ircd/ircd_log.c.orig	Sat Aug 24 18:08:48 2002
-+++ ircd/ircd_log.c	Sat Apr  9 01:00:57 2005
-@@ -395,7 +395,11 @@ log_vwrite(enum LogSys subsys, enum LogL
- 
-   /* Build the basic log string */
-   vd.vd_format = fmt;
-+#ifdef va_copy
-+  va_copy(vd.vd_args, vl);
-+#else
-   vd.vd_args = vl;
-+#endif
- 
-   /* save the length for writev */
-   /* Log format: "SYSTEM [SEVERITY]: log message" */