Upgrade to 2.9.1p16

5 files changed, 191 insertions, 96 deletions

diff --git a/irc/irc/Makefile b/irc/irc/Makefile
index 11a590e9ccb3..3ed14be3e90e 100644
--- a/irc/irc/Makefile
+++ b/irc/irc/Makefile
@@ -3,11 +3,11 @@
 # Date created:		23 August 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.13 1996/12/08 01:44:58 max Exp $
+# $Id: Makefile,v 1.14 1996/12/30 21:26:52 max Exp $
 #
 
-DISTNAME=	irc2.8.21
-PKGNAME=	irc-2.8.21
+DISTNAME=	irc2.9.1p16
+PKGNAME=	irc-2.9.1.16
 CATEGORIES=	net
 MASTER_SITES=	ftp://cs-ftp.bu.edu/irc/servers/
 
@@ -16,10 +16,24 @@ MAINTAINER=	torstenb@FreeBSD.ORG
 # the NOTE command is disabled by default
 # ENABLE_NOTE=yes
 
-# Restrictive copyright in irc2.8.21/ircd/res.c
-RESTRICTED=	"No redistribution allowed"
+# Syslog-Facility to use for logging
+# default:
+SYSLOG_FACILITY=LOG_LOCAL5
+
+EXTRACT_SUFX=	.tgz
+SCRIPTS_ENV=	SYSLOG_FACILITY="${SYSLOG_FACILITY}"
+
 MAN8=		ircd.8
 
+do-configure:
+	@(cd ${WRKSRC} && make CONFIGARGS=--prefix=${PREFIX})
+
+do-build:
+	@(cd ${WRKSRC}/`${WRKSRC}/support/rev.sh` && make all)
+
+do-install:
+	@(cd ${WRKSRC}/`${WRKSRC}/support/rev.sh` && make install)
+
 pre-install:
 	@${MKDIR} ${PREFIX}/lib/ircd
 
diff --git a/irc/irc/distinfo b/irc/irc/distinfo
index e225526bf1a1..bbb1922d9d02 100644
--- a/irc/irc/distinfo
+++ b/irc/irc/distinfo
@@ -1 +1 @@
-MD5 (irc2.8.21.tar.gz) = f0697bc2f7b10eb46e1e06bc5344c4b3
+MD5 (irc2.9.1p16.tgz) = 85a2c02547218723c50bc0bcf736bbe8
diff --git a/irc/irc/files/patch-ab b/irc/irc/files/patch-ab
index 0e09c2424dd7..2d505e19d32f 100644
--- a/irc/irc/files/patch-ab
+++ b/irc/irc/files/patch-ab
@@ -1,7 +1,7 @@
-*** include/config.h.orig	Wed Jun 15 15:58:12 1994
---- include/config.h	Tue Jun 27 01:18:33 1995
+*** include/config.h.dist.orig	Tue Mar 11 11:24:47 1997
+--- include/config.h.dist	Tue Mar 11 11:49:29 1997
 ***************
-*** 61,67 ****
+*** 60,66 ****
    * If your host supports varargs and has vsprintf(), vprintf() and vscanf()
    * C calls in its library, then you can define USE_VARARGS to use varargs
    * instead of imitation variable arg passing.
@@ -9,7 +9,7 @@
    * NOTE: with current server code, varargs doesn't survive because it can't
    *       be used in a chain of 3 or more funtions which all have a variable
    *       number of params.  If anyone has a solution to this, please notify
---- 61,67 ----
+--- 60,66 ----
    * If your host supports varargs and has vsprintf(), vprintf() and vscanf()
    * C calls in its library, then you can define USE_VARARGS to use varargs
    * instead of imitation variable arg passing.
@@ -18,74 +18,26 @@
    *       be used in a chain of 3 or more funtions which all have a variable
    *       number of params.  If anyone has a solution to this, please notify
 ***************
-*** 84,96 ****
-  #define	HAVECURSES		/* If you have curses, and want to use it.  */
-  #undef	HAVETERMCAP		/* If you have termcap, and want to use it. */
-  
-! #ifdef notdef
-  /* Define NPATH if you want to run NOTE system. Be sure that this file is
-   * either not present or non empty (result of previous size). If it is empty,
-   * then remove it before starting the server.
-   * The file is for request save/backup.
+*** 96,102 ****
    */
-! #define NPATH "/usr/lib/irc/.ircdnote"
-  #endif
   
-  /*
---- 84,96 ----
-  #define	HAVECURSES		/* If you have curses, and want to use it.  */
-  #undef	HAVETERMCAP		/* If you have termcap, and want to use it. */
-  
-! #ifdef ENABLE_NOTE
-  /* Define NPATH if you want to run NOTE system. Be sure that this file is
-   * either not present or non empty (result of previous size). If it is empty,
-   * then remove it before starting the server.
-   * The file is for request save/backup.
-   */
-! #define NPATH "!!PREFIX!!/lib/ircd/.ircdnote"
-  #endif
+  #undef	EPATH /* "/local/gnu/icn/password_mail" */
+! #undef	NPATH /* "/local/gnu/icn/.ircdnote" */
   
   /*
-***************
-*** 98,105 ****
-   * these are only the recommened names and paths. Change as needed.
-   * You must define these to something, even if you don't really want them.
-   */
-! #define	DPATH	"/scratch/avalon/ircd"	/* dir where all ircd stuff is */
-! #define	SPATH	"/scratch/avalon/ircd/bin/ircd"
-  #define	CPATH	"ircd.conf"	/* server configuration file */
-  #define	MPATH	"ircd.motd"	/* server MOTD file */
-  #define	LPATH	"/tmp/ircd.log" /* Where the debug file lives, if DEBUGMODE */
---- 98,105 ----
-   * these are only the recommened names and paths. Change as needed.
-   * You must define these to something, even if you don't really want them.
-   */
-! #define	DPATH	"!!PREFIX!!/lib/ircd"	/* dir where all ircd stuff is */
-! #define	SPATH	"!!PREFIX!!/bin/ircd"
-  #define	CPATH	"ircd.conf"	/* server configuration file */
-  #define	MPATH	"ircd.motd"	/* server MOTD file */
-  #define	LPATH	"/tmp/ircd.log" /* Where the debug file lives, if DEBUGMODE */
-***************
-*** 112,119 ****
-   * FNAME_USERLOG just logs user connections, FNAME_OPERLOG logs every
-   * successful use of /oper.  These are either full paths or files within DPATH.
+   * Full pathnames and defaults of irc system's support files. Please note that
+--- 96,104 ----
    */
-! #define FNAME_USERLOG "/usr/local/lib/ircd/users" /* */
-! #define FNAME_OPERLOG "/usr/local/lib/ircd/opers" /* */
   
-  /* CHROOTDIR
-   *
---- 112,119 ----
-   * FNAME_USERLOG just logs user connections, FNAME_OPERLOG logs every
-   * successful use of /oper.  These are either full paths or files within DPATH.
-   */
-! #define FNAME_USERLOG "!!PREFIX!!/lib/ircd/users" /* */
-! #define FNAME_OPERLOG "!!PREFIX!!/lib/ircd/opers" /* */
+  #undef	EPATH /* "/local/gnu/icn/password_mail" */
+! #ifdef ENABLE_NOTE
+! #define	NPATH ".ircdnote"
+! #endif
   
-  /* CHROOTDIR
-   *
+  /*
+   * Full pathnames and defaults of irc system's support files. Please note that
 ***************
-*** 150,156 ****
+*** 159,165 ****
    * mode "i" (i == invisible). Invisibility means people dont showup in
    * WHO or NAMES unless they are on the same channel as you.
    */
@@ -93,7 +45,7 @@
   
   /* OPER_KILL
    *
---- 150,156 ----
+--- 161,167 ----
    * mode "i" (i == invisible). Invisibility means people dont showup in
    * WHO or NAMES unless they are on the same channel as you.
    */
@@ -102,36 +54,149 @@
   /* OPER_KILL
    *
 ***************
-*** 211,217 ****
-   * to a leaf which just has 1 server (typically the uplink). Define this
-   * correctly for performance reasons.
+*** 176,188 ****
+   * The 'LOCOP_' #defines are for making the respective commands available
+   * to 'local' operators.
    */
-! #define	HUB
+! #undef	OPER_KILL
+  #define	OPER_REHASH
+! #undef	OPER_RESTART
+! #undef	OPER_DIE
+! #undef	OPER_REMOTE
+! #undef	LOCOP_REHASH
+! #undef	LOCOP_RESTART
+  #undef	LOCOP_DIE
   
-  /* R_LINES:  The conf file now allows the existence of R lines, or
-   * restrict lines.  These allow more freedom in the ability to restrict
---- 211,217 ----
-   * to a leaf which just has 1 server (typically the uplink). Define this
-   * correctly for performance reasons.
+  /*
+--- 178,190 ----
+   * The 'LOCOP_' #defines are for making the respective commands available
+   * to 'local' operators.
    */
-! #undef	HUB
+! #define	OPER_KILL
+  #define	OPER_REHASH
+! #define	OPER_RESTART
+! #define	OPER_DIE
+! #define	OPER_REMOTE
+! #define LOCOP_REHASH
+! #undef 	LOCOP_RESTART
+  #undef	LOCOP_DIE
   
-  /* R_LINES:  The conf file now allows the existence of R lines, or
-   * restrict lines.  These allow more freedom in the ability to restrict
+  /*
 ***************
-*** 252,258 ****
-   * The server will then call m4 each time it reads the ircd.conf file,
-   * reading m4 output as the server's ircd.conf file.
+*** 290,321 ****
+   * this option is used unless you tell the system administrator beforehand
+   * and obtain their permission to send messages to the system log files.
    */
-! #define	M4_PREPROC
+! #undef	USE_SYSLOG
   
+  #ifdef	USE_SYSLOG
   /*
-   * If you wish to have the server send 'vital' messages about server
---- 252,258 ----
-   * The server will then call m4 each time it reads the ircd.conf file,
-   * reading m4 output as the server's ircd.conf file.
+   * If you use syslog above, you may want to turn some (none) of the
+   * spurious log messages for KILL/SQUIT off.
    */
-! #undef	M4_PREPROC
+! #undef	SYSLOG_KILL	/* log all operator kills to syslog */
+! #undef	SYSLOG_SQUIT	/* log all remote squits for all servers to syslog */
+! #undef	SYSLOG_CONNECT	/* log remote connect messages for other all servs */
+! #undef	SYSLOG_USERS	/* send userlog stuff to syslog */
+! #undef	SYSLOG_OPER	/* log all users who successfully become an Op */
+! #undef	SYSLOG_CONN	/* log all uncomplete/rejected connections */
   
   /*
-   * If you wish to have the server send 'vital' messages about server
+   * If you want to log to a different facility than DAEMON, change
+   * this define.
+   */
+! #define LOG_FACILITY LOG_DAEMON
+  #endif /* USE_SYSLOG */
+  
+  /*
+   * define this if you want to use crypted passwords for operators in your
+   * ircd.conf file. See ircd/crypt/README for more details on this.
+   */
+! #undef	CRYPT_OPER_PASSWORD
+  
+  /*
+   * If you want to store encrypted passwords in N-lines for server links,
+--- 292,323 ----
+   * this option is used unless you tell the system administrator beforehand
+   * and obtain their permission to send messages to the system log files.
+   */
+! #define	USE_SYSLOG
+  
+  #ifdef	USE_SYSLOG
+  /*
+   * If you use syslog above, you may want to turn some (none) of the
+   * spurious log messages for KILL/SQUIT off.
+   */
+! #define	SYSLOG_KILL	/* log all operator kills to syslog */
+! #define	SYSLOG_SQUIT	/* log all remote squits for all servers to syslog */
+! #define	SYSLOG_CONNECT	/* log remote connect messages for other all servs */
+! #define	SYSLOG_USERS	/* send userlog stuff to syslog */
+! #define	SYSLOG_OPER	/* log all users who successfully become an Op */
+! #define	SYSLOG_CONN	/* log all uncomplete/rejected connections */
+  
+  /*
+   * If you want to log to a different facility than DAEMON, change
+   * this define.
+   */
+! #define LOG_FACILITY !!SYSLOGFACILITY!!
+  #endif /* USE_SYSLOG */
+  
+  /*
+   * define this if you want to use crypted passwords for operators in your
+   * ircd.conf file. See ircd/crypt/README for more details on this.
+   */
+! #define	CRYPT_OPER_PASSWORD
+  
+  /*
+   * If you want to store encrypted passwords in N-lines for server links,
+***************
+*** 323,329 ****
+   * need not be the same for both, as long as hte opposite end has the
+   * right password in the opposite line.  See INSTALL doc for more details.
+   */
+! #undef	CRYPT_LINK_PASSWORD
+  
+  /*
+   * define this if you enable summon and if you want summon to look for the
+--- 325,331 ----
+   * need not be the same for both, as long as hte opposite end has the
+   * right password in the opposite line.  See INSTALL doc for more details.
+   */
+! #undef	CRYPT_LINK_PASSWORD	/* CHANGE ME */
+  
+  /*
+   * define this if you enable summon and if you want summon to look for the
+***************
+*** 343,349 ****
+  /*
+   * use these to setup a Unix domain socket to connect clients/servers to.
+   */
+! #undef	UNIXPORT
+  
+  /*
+   * IRC_UID
+--- 345,351 ----
+  /*
+   * use these to setup a Unix domain socket to connect clients/servers to.
+   */
+! #define	UNIXPORT
+  
+  /*
+   * IRC_UID
+***************
+*** 367,373 ****
+   * send to the server without processing before disconnecting the client for
+   * flooding it.  Values greater than 8000 make no difference to the server.
+   */
+! #define	CLIENT_FLOOD	1000
+  
+  /* Remote query flood protection. */
+  #define	CHREPLLEN	8192
+--- 369,375 ----
+   * send to the server without processing before disconnecting the client for
+   * flooding it.  Values greater than 8000 make no difference to the server.
+   */
+! #define	CLIENT_FLOOD	8000
+  
+  /* Remote query flood protection. */
+  #define	CHREPLLEN	8192
diff --git a/irc/irc/pkg-plist b/irc/irc/pkg-plist
index 677ca71c758f..c92058971124 100644
--- a/irc/irc/pkg-plist
+++ b/irc/irc/pkg-plist
@@ -1,6 +1,6 @@
-bin/chkconf
-bin/ircd
 lib/ircd/example.conf
-lib/ircd/ircd.m4
 lib/ircd/ircd.motd
+lib/ircd/ircd.m4
 man/man8/ircd.8.gz
+sbin/ircd
+sbin/chkconf
diff --git a/irc/irc/scripts/pre-configure b/irc/irc/scripts/pre-configure
new file mode 100644
index 000000000000..6e8cb429a73a
--- /dev/null
+++ b/irc/irc/scripts/pre-configure
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# $Id: configure,v 1.4 1995/06/27 00:13:24 torstenb Exp $
+#
+
+set >/tmp/footest
+
+if [ $ENABLE_NOTE ];
+then
+	mv ${WRKSRC}/include/config.h.dist ${WRKSRC}/include/config.h.dist.bak
+	sed <${WRKSRC}/include/config.h.dist.bak s/\#ifdef\ ENABLE_NOTE/\#ifdef\ DISABLE_NOTE/g >${WRKSRC}/include/config.h.dist
+
+fi
+
+mv ${WRKSRC}/include/config.h.dist ${WRKSRC}/include/config.h.dist.bak.2
+sed <${WRKSRC}/include/config.h.dist.bak.2 >${WRKSRC}/include/config.h.dist s+!!SYSLOGFACILITY!!+$SYSLOG_FACILITY+g