From 9057662021b7f1161b71dfae61a2932fb1766aad Mon Sep 17 00:00:00 2001 From: Torsten Blum Date: Sun, 25 Jan 1998 20:37:05 +0000 Subject: [PATCH] Upgrade to ircd 2.9.4 --- irc/irc/Makefile | 18 +++-- irc/irc/distinfo | 2 +- irc/irc/files/patch-ab | 146 +++++++++------------------------- irc/irc/pkg-plist | 8 +- irc/irc/scripts/pre-configure | 15 +--- 5 files changed, 59 insertions(+), 130 deletions(-) diff --git a/irc/irc/Makefile b/irc/irc/Makefile index 65671cf180e6..6d57beccf8de 100644 --- a/irc/irc/Makefile +++ b/irc/irc/Makefile @@ -3,11 +3,11 @@ # Date created: 23 August 1994 # Whom: torstenb # -# $Id: Makefile,v 1.15 1997/03/11 23:47:08 torstenb Exp $ +# $Id: Makefile,v 1.16 1997/07/08 23:02:16 torstenb Exp $ # -DISTNAME= irc2.9.2p3 -PKGNAME= irc-2.9.2.3 +DISTNAME= irc2.9.4 +PKGNAME= irc-2.9.4 CATEGORIES= net MASTER_SITES= ftp://ftp.funet.fi/pub/networking/services/irc/server/ @@ -23,18 +23,20 @@ SYSLOG_FACILITY=LOG_LOCAL5 EXTRACT_SUFX= .tgz SCRIPTS_ENV= SYSLOG_FACILITY="${SYSLOG_FACILITY}" -MAN8= ircd.8 +MAN8= ircd.8 irc.1 -do-configure: - @(cd ${WRKSRC} && make CONFIGARGS=--prefix=${PREFIX}) +GNU_CONFIGURE= YES +CONFIGURE_ARGS= --without-ncurses do-build: - @(cd ${WRKSRC}/`${WRKSRC}/support/rev.sh` && make all) + @(cd ${WRKSRC}/`${WRKSRC}/support/config.guess` && make all) do-install: - @(cd ${WRKSRC}/`${WRKSRC}/support/rev.sh` && make install) + @(cd ${WRKSRC}/`${WRKSRC}/support/config.guess` && make install) pre-install: @${MKDIR} ${PREFIX}/lib/ircd + @${TOUCH} ${PREFIX}/lib/ircd/users ${PREFIX}/lib/ircd/opers \ + ${PREFIX}/lib/ircd/rejects .include diff --git a/irc/irc/distinfo b/irc/irc/distinfo index 27f1064892f4..9e6d13f2f6f6 100644 --- a/irc/irc/distinfo +++ b/irc/irc/distinfo @@ -1 +1 @@ -MD5 (irc2.9.2p3.tgz) = 6141d743c940668409cdd70143f15545 +MD5 (irc2.9.4.tgz) = 58d5c8b3ff67f8ea34bba732c2064f9c diff --git a/irc/irc/files/patch-ab b/irc/irc/files/patch-ab index 2d505e19d32f..5bba7e28b036 100644 --- a/irc/irc/files/patch-ab +++ b/irc/irc/files/patch-ab @@ -1,60 +1,7 @@ -*** include/config.h.dist.orig Tue Mar 11 11:24:47 1997 ---- include/config.h.dist Tue Mar 11 11:49:29 1997 +*** support/config.h.dist.orig Sun Jan 25 16:22:33 1998 +--- support/config.h.dist Sun Jan 25 16:36:00 1998 *************** -*** 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. -! #undef USE_VARARGS - * 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 ---- 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. -! #define USE_VARARGS - * 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 -*************** -*** 96,102 **** - */ - - #undef EPATH /* "/local/gnu/icn/password_mail" */ -! #undef NPATH /* "/local/gnu/icn/.ircdnote" */ - - /* - * Full pathnames and defaults of irc system's support files. Please note that ---- 96,104 ---- - */ - - #undef EPATH /* "/local/gnu/icn/password_mail" */ -! #ifdef ENABLE_NOTE -! #define NPATH ".ircdnote" -! #endif - - /* - * Full pathnames and defaults of irc system's support files. Please note that -*************** -*** 159,165 **** - * mode "i" (i == invisible). Invisibility means people dont showup in - * WHO or NAMES unless they are on the same channel as you. - */ -! #undef NO_DEFAULT_INVISIBLE - - /* OPER_KILL - * ---- 161,167 ---- - * mode "i" (i == invisible). Invisibility means people dont showup in - * WHO or NAMES unless they are on the same channel as you. - */ -! #define NO_DEFAULT_INVISIBLE - - /* OPER_KILL - * -*************** -*** 176,188 **** +*** 129,142 **** * The 'LOCOP_' #defines are for making the respective commands available * to 'local' operators. */ @@ -65,25 +12,27 @@ ! #undef OPER_REMOTE ! #undef LOCOP_REHASH ! #undef LOCOP_RESTART - #undef LOCOP_DIE +! #undef LOCOP_DIE /* ---- 178,190 ---- + * Maximum number of network connections your server will allow. This should +--- 129,142 ---- * The 'LOCOP_' #defines are for making the respective commands available * to 'local' operators. */ -! #define OPER_KILL +! #define OPER_KILL #define OPER_REHASH ! #define OPER_RESTART -! #define OPER_DIE +! #define OPER_DIE ! #define OPER_REMOTE -! #define LOCOP_REHASH -! #undef LOCOP_RESTART - #undef LOCOP_DIE +! #define LOCOP_REHASH +! #define LOCOP_RESTART +! #define LOCOP_DIE /* + * Maximum number of network connections your server will allow. This should *************** -*** 290,321 **** +*** 254,285 **** * this option is used unless you tell the system administrator beforehand * and obtain their permission to send messages to the system log files. */ @@ -116,7 +65,7 @@ /* * If you want to store encrypted passwords in N-lines for server links, ---- 292,323 ---- +--- 254,285 ---- * this option is used unless you tell the system administrator beforehand * and obtain their permission to send messages to the system log files. */ @@ -127,18 +76,18 @@ * 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_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 */ +! #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!! +! #define LOG_FACILITY !!SYSLOG_FACILITY!! #endif /* USE_SYSLOG */ /* @@ -150,41 +99,7 @@ /* * 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 **** +*** 331,337 **** * send to the server without processing before disconnecting the client for * flooding it. Values greater than 8000 make no difference to the server. */ @@ -192,11 +107,28 @@ /* Remote query flood protection. */ #define CHREPLLEN 8192 ---- 369,375 ---- +--- 331,337 ---- * 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 +! #define CLIENT_FLOOD 4000 /* Remote query flood protection. */ #define CHREPLLEN 8192 +*************** +*** 367,373 **** + * Defining this will enable the use of compressed server-server links. + * In order to have it work, you must have the zlib version 1.0 or higher. + */ +! #undef ZIP_LINKS + + /* + * Defining this will add an artificial 2 seconds delay for accepting +--- 367,373 ---- + * Defining this will enable the use of compressed server-server links. + * In order to have it work, you must have the zlib version 1.0 or higher. + */ +! #define ZIP_LINKS + + /* + * Defining this will add an artificial 2 seconds delay for accepting diff --git a/irc/irc/pkg-plist b/irc/irc/pkg-plist index c92058971124..c0ee6e65e0bf 100644 --- a/irc/irc/pkg-plist +++ b/irc/irc/pkg-plist @@ -1,6 +1,10 @@ -lib/ircd/example.conf -lib/ircd/ircd.motd +bin/irc +lib/ircd/users +lib/ircd/opers +lib/ircd/rejects lib/ircd/ircd.m4 +lib/ircd/example.conf +man/man1/irc.1.gz man/man8/ircd.8.gz sbin/ircd sbin/chkconf diff --git a/irc/irc/scripts/pre-configure b/irc/irc/scripts/pre-configure index 6e8cb429a73a..cefca376f45a 100644 --- a/irc/irc/scripts/pre-configure +++ b/irc/irc/scripts/pre-configure @@ -1,16 +1,7 @@ #!/bin/sh # -# $Id: configure,v 1.4 1995/06/27 00:13:24 torstenb Exp $ +# $Id: pre-configure,v 1.1 1997/03/11 23:47:23 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 +mv ${WRKSRC}/support/config.h.dist ${WRKSRC}/support/config.h.dist.bak.2 +sed <${WRKSRC}/support/config.h.dist.bak.2 >${WRKSRC}/support/config.h.dist s+!!SYSLOG_FACILITY!!+$SYSLOG_FACILITY+g