summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrant <grant>2003-03-01 05:22:22 +0000
committergrant <grant>2003-03-01 05:22:22 +0000
commit1032a35724291747ca86a738651ae90a353951d1 (patch)
treeb2dc226f339d4b8e1d7d01299b24062c79b41d48
parenta03b355f30d1244cdc997dc6216e6bfdfd237c30 (diff)
downloadpkgsrc-1032a35724291747ca86a738651ae90a353951d1.tar.gz
Updated ircu to 2.10.11.04.
List of changes since 2.10.04 is very large and code-oriented. The authors seem to not maintain a user digestable list of changes. See the ChangeLog for the full list of changes if you insist :) Updated provided by Adrian Portelli in PR pkg/20531, with some changes by me.
-rw-r--r--chat/ircu/MESSAGE8
-rw-r--r--chat/ircu/Makefile76
-rw-r--r--chat/ircu/PLIST21
-rw-r--r--chat/ircu/distinfo13
-rw-r--r--chat/ircu/files/config79
-rw-r--r--chat/ircu/files/ircd.sh31
-rw-r--r--chat/ircu/patches/patch-aa28
-rw-r--r--chat/ircu/patches/patch-ab52
-rw-r--r--chat/ircu/patches/patch-ac13
-rw-r--r--chat/ircu/patches/patch-ad13
-rw-r--r--chat/ircu/patches/patch-ae28
-rw-r--r--chat/ircu/patches/patch-af14
-rw-r--r--chat/ircu/patches/patch-ag30
13 files changed, 158 insertions, 248 deletions
diff --git a/chat/ircu/MESSAGE b/chat/ircu/MESSAGE
index 96939d5ff70..8f2545fb118 100644
--- a/chat/ircu/MESSAGE
+++ b/chat/ircu/MESSAGE
@@ -1,11 +1,11 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/12 17:12:38 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2003/03/01 05:22:22 grant Exp $
-The ${PREFIX}/etc/ircd directory where ircd's configuration files live is
+The ${PKG_SYSCONFDIR} directory where ircd's configuration files live is
currently owned by root with world-readable permissions.
-Before creating your ircd.conf, you should chown(8) that directory to the
-user ID that will be running ircd, and chmod(8) the directory to 0700.
+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,
and an "remote.motd" MOTD file for remote users.
diff --git a/chat/ircu/Makefile b/chat/ircu/Makefile
index 5200d8a3ee8..86ea1757cf9 100644
--- a/chat/ircu/Makefile
+++ b/chat/ircu/Makefile
@@ -1,33 +1,69 @@
-# $NetBSD: Makefile,v 1.4 2002/08/01 02:37:45 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/01 05:22:22 grant Exp $
#
-DISTNAME= ircu2.10.04
-PKGNAME= ircu-2.10.04
+DISTNAME= ircu2.10.11.04
+PKGNAME= ircu-2.10.11.04
CATEGORIES= chat
-MASTER_SITES= ftp://ftp.undernet.org/pub/irc/servers/current/ \
- ftp://ftp.asu.net/pub/irc/servers/undernet/
-EXTRACT_SUFX= .tgz
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=undernet-ircu/}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://coder-com.undernet.org/
COMMENT= Internet Relay Chat server customized for Undernet
-GNU_CONFIGURE= yes
-INTERACTIVE_STAGE= configure
+USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
+GNU_CONFIGURE= YES
-post-configure:
- @${CP} ${FILESDIR}/config ${WRKSRC}/config/.config
- @cd ${WRKSRC} && \
- ${MAKE} PREFIX="${PREFIX}" CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" config
+CONFIGURE_ARGS+= --bindir=${PREFIX}/sbin
+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-group=0
+CONFIGURE_ARGS+= --with-symlink=no
+
+WRKSRC= ${WRKDIR}/ircu2.10
+PKG_SYSCONFSUBDIR= ircd
+
+IRCD_USER?= ircd
+IRCD_GROUP?= ircd
+DATADIR= /var/ircd
+OWN_DIRS_PERMS= ${DATADIR} ${IRCD_USER} ${IRCD_GROUP} 0700
+EGDIR= ${PREFIX}/share/examples/ircd
+DOCDIR= ${PREFIX}/share/doc/ircd
+
+CONF_FILES_PERMS+= ${EGDIR}/ircd.conf.sample ${PKG_SYSCONFDIR}/ircd.conf \
+ ${IRCD_USER} ${IRCD_GROUP} 0600
+
+RCD_SCRIPTS= ircd
+
+FILES_SUBST+= IRCD_USER=${IRCD_USER}
+MESSAGE_SUBST+= IRCD_USER=${IRCD_USER}
+MESSAGE_SUBST+= IRCD_GROUP=${IRCD_GROUP}
+PKG_GROUPS= ${IRCD_GROUP}
+PKG_USERS= ${IRCD_USER}:${IRCD_GROUP}::IRC\\ server\\ user:/nonexistant:${SH}
+
+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} ${PREFIX}/etc/ircd ${PREFIX}/share/doc/ircd
- ${INSTALL_PROGRAM} ${WRKSRC}/ircd/ircd ${PREFIX}/sbin/
- ${INSTALL_PROGRAM} ${WRKSRC}/ircd/chkconf ${PREFIX}/sbin/ircd-chkconf
- ${INSTALL_MAN} ${WRKSRC}/doc/ircd.8 ${PREFIX}/man/man8/
- ${INSTALL_DATA} ${WRKSRC}/doc/example.conf \
- ${PREFIX}/etc/ircd/ircd.conf.example
- cd ${WRKSRC}/doc && ${INSTALL_DATA} readme.crules readme.who \
- ${PREFIX}/share/doc/ircd/
+ ${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}/man/man8
+ ${INSTALL_DATA} ${WRKDIR}/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}
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/ircu/PLIST b/chat/ircu/PLIST
index b3498b775a0..7a323084ca3 100644
--- a/chat/ircu/PLIST
+++ b/chat/ircu/PLIST
@@ -1,9 +1,24 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 19:47:10 zuntum Exp $
-etc/ircd/ircd.conf.example
+@comment $NetBSD: PLIST,v 1.2 2003/03/01 05:22:22 grant Exp $
+etc/rc.d/ircd
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/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.indent
+share/doc/ircd/readme.jupe
+share/doc/ircd/readme.log
share/doc/ircd/readme.who
-@dirrm etc/ircd
+share/doc/ircd/readme.www
+share/examples/ircd/example.conf
+share/examples/ircd/ircd.conf.sample
+@dirrm share/examples/ircd
@dirrm share/doc/ircd
diff --git a/chat/ircu/distinfo b/chat/ircu/distinfo
index 19b0289076a..359c3251293 100644
--- a/chat/ircu/distinfo
+++ b/chat/ircu/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 11:07:18 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/03/01 05:22:22 grant Exp $
-SHA1 (ircu2.10.04.tgz) = 5569131ab9e24e4148f851229102d9b18ed52499
-Size (ircu2.10.04.tgz) = 367512 bytes
-SHA1 (patch-aa) = c2b09bde44f577dea348bfd2695e8e8e73698401
-SHA1 (patch-ab) = 2397c832880dcf0a069cbccfbe2dfd277a292568
-SHA1 (patch-ac) = 7bb16e5969fd1082dc2736e6c3a5c013eb391cd7
-SHA1 (patch-ad) = 64e6ea9bf26e88e25287370033b231613b4ecd7b
-SHA1 (patch-ae) = ee5d913737bddbfeddc656ad3362aff81e25ca3d
+SHA1 (ircu2.10.11.04.tar.gz) = a3142419a7ed62d0975513157f35bae1ce6742fe
+Size (ircu2.10.11.04.tar.gz) = 778473 bytes
+SHA1 (patch-af) = e4b47c1d855602a2ef0e62c55ade412d6fef3a81
+SHA1 (patch-ag) = 5bf0b8cc0655b99bbaa2a7a5cb5463be216ee199
diff --git a/chat/ircu/files/config b/chat/ircu/files/config
deleted file mode 100644
index 71c8cbf62f3..00000000000
--- a/chat/ircu/files/config
+++ /dev/null
@@ -1,79 +0,0 @@
-# $NetBSD: config,v 1.1.1.1 2000/12/15 00:36:31 wiz Exp $
-
-EXTRA_INCLUDEDIRS="none"
-IRCDLIBS="-lcrypt"
-BINDIR="$PREFIX/sbin"
-SYMLINK="ircd"
-IRCDMODE="555"
-IRCDOWN="root"
-IRCDGRP="wheel"
-MANDIR="$PREFIX/man"
-EXTRA_CPPFLAGS=""
-CPPFLAGS="-I../include"
-USE_POLL=y
-RELIABLE_CLOCK=n
-CHROOTDIR=n
-CONFIG_SETUGID=n
-IRC_UID=
-IRC_GID=
-CMDLINE_CONFIG=n
-UNIXPORT=n
-VIRTUAL_HOST=y
-HUB=y
-DEBUGMODE=n
-DEBUGMALLOC=n
-DPATH="$PREFIX/etc/ircd"
-SPATH="$PREFIX/bin/ircd"
-CPATH="ircd.conf"
-MPATH="ircd.motd"
-RPATH="remote.motd"
-PPATH="none"
-CONFIG_LOG_WHOX=n
-MAXSENDQLENGTH=300000
-INT_BUFFERPOOL=3
-BUFFERPOOL="(3 * MAXSENDQLENGTH)"
-CLIENT_FLOOD=1024
-MAXCONNECTIONS=252
-PORTNUM=6667
-NICKNAMEHISTORYLENGTH=100
-ALLOW_SNO_CONNEXIT=y
-R_LINES=n
-SHOW_INVISIBLE_USERS=y
-SHOW_ALL_INVISIBLE_USERS=y
-OPERS_SEE_IN_SECRET_CHANNELS=y
-LOCOP_SEE_IN_SECRET_CHANNELS=n
-UNLIMIT_OPER_QUERY=n
-OPER_KILL=y
-OPER_REHASH=y
-OPER_RESTART=y
-OPER_DIE=y
-OPER_LGLINE=y
-OPER_REMOTE=y
-LOCOP_REHASH=y
-LOCOP_RESTART=n
-LOCOP_DIE=n
-LOCOP_LGLINE=y
-CONFIG_LIST=y
-DEFAULT_LIST="T<10"
-DEFAULT_LIST_PARAM="T<10"
-COMMENT_IS_FILE=n
-IDLE_FROM_MSG=y
-CHECK_CLONE=y
-CHECK_CLONE_LIMIT=2
-CHECK_CLONE_PERIOD=20
-CHECK_CLONE_DELAY=600
-MAXIMUM_LINKS=1
-MSGLOG_ENABLED=n
-LOCAL_KILL_ONLY=n
-TIMESEC=60
-PINGFREQUENCY=120
-CONNECTFREQUENCY=600
-HANGONGOODLINK=300
-HANGONRETRYDELAY=10
-CONNECTTIMEOUT=90
-KILLCHASETIMELIMIT=30
-MAXCHANNELSPERUSER=10
-MAXSILES=15
-AVBANLEN=40
-MAXSILELENGTH="(40 * MAXSILES)"
-CONFIG_NEW=y
diff --git a/chat/ircu/files/ircd.sh b/chat/ircu/files/ircd.sh
new file mode 100644
index 00000000000..5f1adf9ed30
--- /dev/null
+++ b/chat/ircu/files/ircd.sh
@@ -0,0 +1,31 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: ircd.sh,v 1.1 2003/03/01 05:22:23 grant Exp $
+#
+
+# PROVIDE: ircd
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+
+if [ -f /etc/rc.subr ]
+then
+ . /etc/rc.subr
+fi
+
+name="ircd"
+rcvar=$name
+command="@PREFIX@/sbin/${name}"
+required_files="@PKG_SYSCONFDIR@/ircd.conf"
+pidfile="/var/ircd/${name}.pid"
+command_args="-d /var/ircd -f ${required_files}"
+ircd_user="@IRCD_USER@"
+
+if [ -f /etc/rc.subr ]
+then
+ load_rc_config $name
+ eval [ -z "\$${rcvar}" ] && eval ${rcvar}=NO
+ run_rc_command "$1"
+else
+ @ECHO@ -n " ${name}"
+ ${command} ${ircd_flags} ${command_args}
+fi
diff --git a/chat/ircu/patches/patch-aa b/chat/ircu/patches/patch-aa
deleted file mode 100644
index 1e663e9b4e4..00000000000
--- a/chat/ircu/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/15 00:36:31 wiz Exp $
-
---- config/Configure.in.orig Wed Nov 12 11:25:08 1997
-+++ config/Configure.in Tue Nov 24 13:54:44 1998
-@@ -189,7 +189,6 @@
- #
- readln () {
- if [ "$USE_DEFAULT" = "y" -a -n "$3" ]; then
-- echo "$1"
- ans=$2
- else
- echo $n "$1$c"
-@@ -209,7 +208,6 @@
- # comment 'xxx'
- #
- comment () {
-- echo "*"; echo "* $1" ; echo "*"
- (echo "" ; echo "#"; echo "# $1" ; echo "#") >>$CONFIG
- (echo "" ; echo "/*"; echo " * $1" ; echo " */") >>$CONFIG_H
- }
-@@ -485,7 +483,6 @@
- if [ -r $DEFAULTS ]; then
- echo "*"
- echo "* Using defaults found in" $DEFAULTS
-- echo "* If you type a 'c' the script will finish using all defaults."
- echo "*"
- . $DEFAULTS
- else
diff --git a/chat/ircu/patches/patch-ab b/chat/ircu/patches/patch-ab
deleted file mode 100644
index c0c0abc7c4b..00000000000
--- a/chat/ircu/patches/patch-ab
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/15 00:36:31 wiz Exp $
-
---- config/config-sh.in.orig Fri May 1 19:30:04 1998
-+++ config/config-sh.in Tue Nov 24 13:31:51 1998
-@@ -44,7 +44,6 @@
- if [ "$DEFAULTS" != "none" ]; then
- bool 'Do you want to change your previous configuration' CHANGE_CONFIG
- if [ "$CHANGE_CONFIG" = "n" ]; then
-- echo "Ok, I will only prompt you for NEW parameters."
- USE_DEFAULT=y
- else
- USE_DEFAULT=n
-@@ -63,13 +62,10 @@
- eval exec_prefix="$prefix"
- fi
- string 'Which compiler do you want to use' CC "$CC_DEFAULT"
-- echo "* For the following four questions, specify 'none' when you want it to be empty."
- eval string "'What flags should I pass to $CC [none]'" CFLAGS "'$CFLAGS_DEFAULT'"
- string 'Do you need extra include directories [none]' EXTRA_INCLUDEDIRS none
- if [ -z "$LDFLAGS_DEFAULT" ]; then
- LDFLAGS_DEFAULT=none
-- else
-- eval LDFLAGS_DEFAULT="$LDFLAGS_DEFAULT"
- fi
- string 'Which linker flags do you need [none]' LDFLAGS "$LDFLAGS_DEFAULT"
- if [ -z "$LIBS" ]; then
-@@ -78,9 +74,6 @@
- string 'Which extra libraries do you need [none]' IRCDLIBS "$LIBS"
- eval bindir="$bindir"
- string 'In which directory should I install the ircd binary' BINDIR $bindir
-- if [ ! -d "$BINDIR" ]; then
-- echo "$BINDIR : No such directory"
-- fi
- string 'What should the name of the installed symbolic link to the exectuable be' SYMLINK ircd
- string 'Which permissions do you want the binary to have' IRCDMODE 711
- string 'Which owner do you want the binary to have' IRCDOWN "`id | sed -e 's/.*uid=[0-9]*(//' -e 's/).*//' 2> /dev/null`"
-@@ -192,7 +185,6 @@
- eval DPATH_DEFAULT="${prefix}/lib/ircd"
- string 'Directory where all ircd stuff resides' DPATH $DPATH_DEFAULT
- define_string SPATH "$BINDIR/ircd"
-- echo "The following filenames are either full paths or files within DPATH"
- string 'Server configuration file' CPATH 'ircd.conf'
- string 'Server MOTD file' MPATH 'ircd.motd'
- string 'Server remote MOTD file (3 lines max)' RPATH 'remote.motd'
-@@ -338,7 +330,6 @@
- int 'Check clone delay (600!)' CHECK_CLONE_DELAY 600
- fi
- int 'Max auto connects per class (1!)' MAXIMUM_LINKS 1
-- echo '* Never define this on a production server:'
- bool 'Enable message logging' MSGLOG_ENABLED
- if [ "$MSGLOG_ENABLED" = "y" ]; then
- int 'Message log size' MSGLOG_SIZE 128
diff --git a/chat/ircu/patches/patch-ac b/chat/ircu/patches/patch-ac
deleted file mode 100644
index 1567a218d34..00000000000
--- a/chat/ircu/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/12/15 00:36:31 wiz Exp $
-
---- config/Makefile.in.orig Tue Nov 24 13:41:41 1998
-+++ config/Makefile.in Tue Nov 24 13:42:08 1998
-@@ -47,7 +47,7 @@
- autoconf
-
- config: configure setup.h.in config.status Configure FORCE
-- @CONFIG_BATCH=n ${SHELL} ./Configure || exit 1
-+ @CONFIG_BATCH=y ${SHELL} ./Configure || exit 1
- @# Allow the use of non-GNU make with 'make config':
- @cd ../ircd; ${MAKE} Makefile
- @cd ../doc; ${MAKE} Makefile
diff --git a/chat/ircu/patches/patch-ad b/chat/ircu/patches/patch-ad
deleted file mode 100644
index 9bb970ffaed..00000000000
--- a/chat/ircu/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/12/15 00:36:31 wiz Exp $
-
---- ircd/s_user.c.orig Tue Nov 24 14:02:15 1998
-+++ ircd/s_user.c Tue Nov 24 14:04:17 1998
-@@ -326,7 +326,7 @@
- time_t last;
- struct abacklog *next;
- char *connected;
-- char count;
-+ int count;
- };
-
- static struct abacklog *backlog[256]; /* hash table */
diff --git a/chat/ircu/patches/patch-ae b/chat/ircu/patches/patch-ae
deleted file mode 100644
index d3b026dd690..00000000000
--- a/chat/ircu/patches/patch-ae
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/12/15 00:36:31 wiz Exp $
-
---- doc/example.conf.orig Tue Nov 24 15:57:46 1998
-+++ doc/example.conf Tue Nov 24 15:59:33 1998
-@@ -302,8 +302,7 @@
- #
- # When your server gets fuller, you will notice delays when trying to
- # connect to your server's primary listening port. Via the Port lines
--# it is possible to specify additional ports (both AF_UNIX and AF_INET)
--# for ircd to listen to.
-+# it is possible to specify additional ports for ircd to listen to.
- # De facto ports are: 6667 - standard; 6660-6669 - additional client
- # ports; 7000 - original Undernet port; 4400, 7777 - used mainly for
- # server-to-server connections.
-@@ -312,12 +311,11 @@
- # On a side note, the /UPING command uses port 7007/udp. If your server
- # is located behind a firewall, you may want to make another hole in it
- # for this port.
--# P:<hostmask, or path>:::<port number>
-+# P:<hostmask>:::<port number>
-
- P::::4400
- P::::7000
- P:*.nl:::6666
--P:/tmp/.ircd:::6667
-
- #
- # Well, you have now reached the end of this sample configuration file
diff --git a/chat/ircu/patches/patch-af b/chat/ircu/patches/patch-af
new file mode 100644
index 00000000000..a70d376c7d9
--- /dev/null
+++ b/chat/ircu/patches/patch-af
@@ -0,0 +1,14 @@
+$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
new file mode 100644
index 00000000000..3c3378a80fe
--- /dev/null
+++ b/chat/ircu/patches/patch-ag
@@ -0,0 +1,30 @@
+$NetBSD: patch-ag,v 1.1 2003/03/01 05:22:24 grant 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.
+
+ 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