diff --git a/net/irc/Makefile b/net/irc/Makefile index c6648ccf55a..298736802ea 100644 --- a/net/irc/Makefile +++ b/net/irc/Makefile @@ -1,21 +1,38 @@ -# OpenBSD makefile for: Irc Server -# Version required: 2.8.21 -# Date created: 10 Nov 1997 -# Whom: ejovi -# -# $OpenBSD: Makefile,v 1.4 1998/07/18 19:18:55 marc Exp $ -# +# $OpenBSD: Makefile,v 1.5 1999/03/10 02:37:44 brad Exp $ +# $FreeBSD: Makefile,v 1.19 1998/12/09 20:15:29 billf Exp $ -DISTNAME= irc2.9.5 +DISTNAME= irc2.10.1 +PKGNAME= irc-2.10.1 CATEGORIES= net MAINTAINER= marc@OpenBSD.ORG -MASTER_SITES= ftp://ftp.funet.fi/pub/networking/services/irc/server/ +MASTER_SITES= ftp://ftp.funet.fi/pub/networking/services/irc/server/ \ + ftp://ftp.irc.org/irc/server/ \ + ftp://tau.ac.il/pub/unix/irc/server/ \ + ftp://ftp.ut.ee/pub/unix/irc/server/ \ + ftp://ftp.ntua.gr/pub/net/irc/server/ + +# the NOTE command is disabled by default +# ENABLE_NOTE=yes + +# Syslog-Facility to use for logging +# default: +SYSLOG_FACILITY=LOG_LOCAL5 + EXTRACT_SUFX= .tgz +SCRIPTS_ENV= SYSLOG_FACILITY="${SYSLOG_FACILITY}" + +MAN1= irc.1 +MAN5= iauth.conf.5 +MAN8= ircd.8 iauth.8 ircdwatch.8 GNU_CONFIGURE= yes +post-patch: + ${SED} -e s,!!SYSLOG_FACILITY!!,$(SYSLOG_FACILITY), $(WRKSRC)/support/config.h.dist > $(WRKSRC)/support/config.h.dist.new + ${MV} $(WRKSRC)/support/config.h.dist.new $(WRKSRC)/support/config.h.dist + do-build: @(cd ${WRKSRC}/`${WRKSRC}/support/config.guess` && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) @@ -24,4 +41,9 @@ do-install: @(cd ${WRKSRC}/`${WRKSRC}/support/config.guess` && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) +pre-install: + @${MKDIR} ${PREFIX}/lib/ircd + @${TOUCH} ${PREFIX}/lib/ircd/users ${PREFIX}/lib/ircd/opers \ + ${PREFIX}/lib/ircd/rejects + .include diff --git a/net/irc/files/md5 b/net/irc/files/md5 index 73ce49c9b6b..e0ca8d1903c 100644 --- a/net/irc/files/md5 +++ b/net/irc/files/md5 @@ -1,3 +1,3 @@ -MD5 (irc2.9.5.tgz) = ac4b709113013364e5e9ca214862e18f -RMD160 (irc2.9.5.tgz) = 77f7f52f06dc2ab39410616518b4ab24d0e2eda6 -SHA1 (irc2.9.5.tgz) = 5888cc74e6b9da2d9366108fa2a331da32fa74ab +MD5 (irc2.10.1.tgz) = d663db71bb1dba4c81b25bf3133a33e2 +RMD160 (irc2.10.1.tgz) = 1a34eb85d8e89328d314147a8c56379ee2536180 +SHA1 (irc2.10.1.tgz) = 0e09d9f268ffe476fe11357c826d56bbf0cdc0b0 diff --git a/net/irc/patches/patch-ab b/net/irc/patches/patch-ab new file mode 100644 index 00000000000..97e51531a63 --- /dev/null +++ b/net/irc/patches/patch-ab @@ -0,0 +1,80 @@ +--- support/config.h.dist.old Wed Dec 9 15:05:45 1998 ++++ support/config.h.dist Wed Dec 9 15:09:34 1998 +@@ -168,13 +168,13 @@ + * if 'OPER_x' is undefined so you can't give local operators more rights + * than global ones. + */ +-#undef OPER_KILL ++#define OPER_KILL + #define OPER_REHASH + #undef OPER_RESTART +-#define OPER_DIE ++#undef OPER_DIE + #undef OPER_REMOTE +-#undef LOCOP_REHASH +-#undef LOCOP_RESTART ++#define LOCOP_REHASH ++#define LOCOP_RESTART + #undef LOCOP_DIE + + /* +@@ -299,32 +299,32 @@ + * this option is used unless you tell the system administrator beforehand + * and obtain their permission to send messages to the system log files. + */ +-#undef USE_SYSLOG ++#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. + */ +-#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 */ ++#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 LOG_DAEMON ++#define LOG_FACILITY !!SYSLOG_FACILITY!! + #endif /* USE_SYSLOG */ + + /* + * define this if you want to use crypted passwords for operators in your + * ircd.conf file. See contrib/mkpasswd/README for more details on this. + */ +-#undef CRYPT_OPER_PASSWORD ++#define CRYPT_OPER_PASSWORD + + /* + * If you want to store encrypted passwords in N-lines for server links, +@@ -376,7 +376,7 @@ + * 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 ++#define CLIENT_FLOOD 4000 + + /* Remote query flood protection. */ + #define CHREPLLEN 8192 +@@ -414,7 +414,7 @@ + * The library and the include files must have been found by configure, + * if you have installed the zlib after running configure, run it again. + */ +-#undef ZIP_LINKS ++#define ZIP_LINKS + + /* + * Defining this will add an artificial 2 seconds delay for accepting diff --git a/net/irc/pkg/PLIST b/net/irc/pkg/PLIST index ba3975035ce..e61a429aea5 100644 --- a/net/irc/pkg/PLIST +++ b/net/irc/pkg/PLIST @@ -1,10 +1,11 @@ -@cwd /usr/local -@name irc2.9.5 bin/irc +lib/ircd/users +lib/ircd/opers +lib/ircd/rejects lib/ircd/ircd.m4 lib/ircd/example.conf -man/man1/irc.1 -man/man8/ircd.8 sbin/ircd sbin/chkconf +sbin/iauth +sbin/ircd-mkpasswd @dirrm lib/ircd