Update ircu to ircu-2.10.11.07

- Fix ./configure for changed options
- Move to SUBST_* framework
- Use SPECIAL_PERMS to set the correct permissions on ${PKG_SYSCONFDIR} so
  the user does not have to do it.

There are lots of bugfixes in this release as 2.10.11.04 was first released
around 20+ months ago.  Users should check the package Changelog or website
for further details.

4 files changed, 41 insertions, 48 deletions

diff --git a/chat/ircu/MESSAGE b/chat/ircu/MESSAGE
index 8f2545fb118..61d4147e746 100644
--- a/chat/ircu/MESSAGE
+++ b/chat/ircu/MESSAGE
@@ -1,13 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2003/03/01 05:22:22 grant Exp $
+$NetBSD: MESSAGE,v 1.4 2004/09/28 12:32:17 adrianp Exp $
 
-The ${PKG_SYSCONFDIR} directory where ircd's configuration files live is
-currently owned by root with world-readable permissions.
-
-Before attempting to start the server, you should chown(8) that directory
-to ${IRCD_USER}:${IRCD_GROUP}, and chmod(8) it to 0700.
-
-You should also create an "ircd.motd" MOTD file for local connect users,
+You should create an "ircd.motd" MOTD file for local connect users,
 and an "remote.motd" MOTD file for remote users.
 
 ===========================================================================
diff --git a/chat/ircu/Makefile b/chat/ircu/Makefile
index 8e9983ed0cb..399404ad0b7 100644
--- a/chat/ircu/Makefile
+++ b/chat/ircu/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/04/12 01:01:41 snj Exp $
+# $NetBSD: Makefile,v 1.11 2004/09/28 12:32:17 adrianp Exp $
 #
 
-DISTNAME=	ircu2.10.11.04
-PKGNAME=	ircu-2.10.11.04
+DISTNAME=	ircu2.10.11.07
+PKGNAME=	ircu-2.10.11.07
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=undernet-ircu/}
 
@@ -10,7 +10,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://coder-com.undernet.org/
 COMMENT=	Internet Relay Chat server customized for Undernet
 
-WRKSRC=		${WRKDIR}/ircu2.10
 USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
@@ -20,7 +19,7 @@ CONFIGURE_ARGS+=	--with-cpath=${PKG_SYSCONFDIR}/ircd.conf
 CONFIGURE_ARGS+=	--with-dpath=${DATADIR}
 CONFIGURE_ARGS+=	--with-lpath=${DATADIR}/ircd.log
 CONFIGURE_ARGS+=	--with-mode=555
-CONFIGURE_ARGS+=	--with-user=0
+CONFIGURE_ARGS+=	--with-owner=0
 CONFIGURE_ARGS+=	--with-group=0
 CONFIGURE_ARGS+=	--with-symlink=no
 
@@ -36,6 +35,8 @@ DOCDIR=			${PREFIX}/share/doc/ircd
 CONF_FILES_PERMS+=	${EGDIR}/ircd.conf.sample ${PKG_SYSCONFDIR}/ircd.conf \
 			${IRCD_USER} ${IRCD_GROUP} 0600
 
+SPECIAL_PERMS+=		${PKG_SYSCONFDIR} ${IRCD_USER} ${IRCD_GROUP} 0700
+
 RCD_SCRIPTS=		ircd
 
 FILES_SUBST+=		IRCD_USER=${IRCD_USER}
@@ -44,12 +45,17 @@ MESSAGE_SUBST+=		IRCD_GROUP=${IRCD_GROUP}
 PKG_GROUPS=		${IRCD_GROUP}
 PKG_USERS=		${IRCD_USER}:${IRCD_GROUP}::IRC\\ server\\ user:/nonexistant:${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" \
+			-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_MESSAGE.paths=	"Fixing hardcoded paths."
+
 post-build:
 	@cd ${WRKSRC}/tools && \
 		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
 		-f Makefile.crypt
-	@${SED} -e 's|@PREFIX@|${PREFIX}|g' ${WRKSRC}/doc/ircd.conf.sample \
-		> ${WRKDIR}/ircd.conf.sample
 
 do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
@@ -60,7 +66,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/mkpasswd \
 		${PREFIX}/sbin/ircd-mkpasswd
 	${INSTALL_MAN} ${WRKSRC}/doc/ircd.8 ${PREFIX}/man/man8
-	${INSTALL_DATA} ${WRKDIR}/ircd.conf.sample ${EGDIR}
+	${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
diff --git a/chat/ircu/distinfo b/chat/ircu/distinfo
index 35a655d239d..071d0cc21dd 100644
--- a/chat/ircu/distinfo
+++ b/chat/ircu/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2003/03/01 21:50:45 jmc Exp $
+$NetBSD: distinfo,v 1.5 2004/09/28 12:32:17 adrianp Exp $
 
-SHA1 (ircu2.10.11.04.tar.gz) = a3142419a7ed62d0975513157f35bae1ce6742fe
-Size (ircu2.10.11.04.tar.gz) = 778473 bytes
+SHA1 (ircu2.10.11.07.tar.gz) = 1e1518cbbdf096aaaabf5f56a1ec266769d847ad
+Size (ircu2.10.11.07.tar.gz) = 844971 bytes
 SHA1 (patch-af) = da533f03542c268c9e3502278f51777c3b85824d
-SHA1 (patch-ag) = a0741f288ad7945e64ae12fdcac3deb758721503
+SHA1 (patch-ag) = f34df6342c8e26b4cdf59e56c893b4845f7d3974
diff --git a/chat/ircu/patches/patch-ag b/chat/ircu/patches/patch-ag
index 3c3378a80fe..fa6c3a31f04 100644
--- a/chat/ircu/patches/patch-ag
+++ b/chat/ircu/patches/patch-ag
@@ -1,30 +1,23 @@
-$NetBSD: patch-ag,v 1.1 2003/03/01 05:22:24 grant Exp $
+$NetBSD: patch-ag,v 1.2 2004/09/28 12:32:17 adrianp Exp $
 
---- tools/README.orig	Sat Apr  8 00:53:35 2000
-+++ tools/README
-@@ -35,17 +35,14 @@ security holes, namely server-server pas
- obvious problem.
+--- 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.  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
--the irc.conf file. This should be done only when adding new passwords
--to your irc.conf file. To change over your irc.conf file to use
--encrypted passwords, define CRYPT_OPER_PASSWORD in config.h. You will
--need to recompile your server if you already compiled it with this
--feature disabled. Once compiled, edit the Makefile in this directory
--and chang "IRCDCONF" to your irc.conf file. Then "make install" in this
--directory to replace all the operator passwords in your irc.conf file
--with the encrypted format.
-+There's a simple program called ircd-mkpasswd to do that for you.  
-+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 the ircd.conf file. This should be done only when 
-+adding new passwords to your ircd.conf file. 
-+
-+To change over your ircd.conf file to use encrypted passwords, define 
-+F:CRYPT_OPER_PASSWORD:TRUE in ircd.conf.
- 
- Choose your passwords carefully. Do not choose something in a
- dictionary, make sure its at least 5 characters. Anything past 8
+ 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 =