diff options
author | adrianp <adrianp> | 2005-11-13 22:40:00 +0000 |
---|---|---|
committer | adrianp <adrianp> | 2005-11-13 22:40:00 +0000 |
commit | dba4fe6e8b9f525939661740871ae07c3d635eb6 (patch) | |
tree | 3c0e8bb8fb7c3c54e9b8a90a7797b9e25611b28e /chat | |
parent | b5aa771afdee6fcb7f8a2e4838d1ec40ad3cc3f5 (diff) | |
download | pkgsrc-dba4fe6e8b9f525939661740871ae07c3d635eb6.tar.gz |
Update ircd-hybrid 6.2 => 7.1.3
In brief:
- We now support a completely new platform, Tru64 UNIX
- We have mostly revamped the Windows Cygwin port
- The IRIX port has been brought up to date
- The HPUX port has been retested and minor warnings have been fixed
- The configure script has been massively revamped
- Most noticeable is that we generate make dependencies on the fly now
- We now use our own .lang files to provide translated numeric messages
- IPv6 support is now automatically enabled/disabled
- Cryptlinks now use Nagle's TCP_NODELAY algorithm
- X-line (gecos ban) support has been added
- Nick and channel RESVs are now stored in nresv.conf and cresv.conf
Diffstat (limited to 'chat')
-rw-r--r-- | chat/ircd-hybrid/INSTALL | 21 | ||||
-rw-r--r-- | chat/ircd-hybrid/MESSAGE | 13 | ||||
-rw-r--r-- | chat/ircd-hybrid/Makefile | 228 | ||||
-rw-r--r-- | chat/ircd-hybrid/PLIST | 345 | ||||
-rw-r--r-- | chat/ircd-hybrid/distinfo | 19 | ||||
-rw-r--r-- | chat/ircd-hybrid/files/ircd-hybrid.sh | 62 | ||||
-rw-r--r-- | chat/ircd-hybrid/files/pkg-setup.txt | 18 | ||||
-rw-r--r-- | chat/ircd-hybrid/options.mk | 52 | ||||
-rw-r--r-- | chat/ircd-hybrid/patches/patch-aa | 53 | ||||
-rw-r--r-- | chat/ircd-hybrid/patches/patch-ab | 199 | ||||
-rw-r--r-- | chat/ircd-hybrid/patches/patch-ac | 40 | ||||
-rw-r--r-- | chat/ircd-hybrid/patches/patch-ad | 23 | ||||
-rw-r--r-- | chat/ircd-hybrid/patches/patch-ae | 89 | ||||
-rw-r--r-- | chat/ircd-hybrid/patches/patch-af | 24 | ||||
-rw-r--r-- | chat/ircd-hybrid/patches/patch-ag | 36 |
15 files changed, 605 insertions, 617 deletions
diff --git a/chat/ircd-hybrid/INSTALL b/chat/ircd-hybrid/INSTALL new file mode 100644 index 00000000000..701efed6280 --- /dev/null +++ b/chat/ircd-hybrid/INSTALL @@ -0,0 +1,21 @@ +# $NetBSD: INSTALL,v 1.3 2005/11/13 22:40:00 adrianp Exp $ + +case ${STAGE} in + +POST-INSTALL) + + for f in ${PKG_SYSCONFDIR}/dline.conf ${PKG_SYSCONFDIR}/kline.conf \ + ${PKG_SYSCONFDIR}/xline.conf ${PKG_SYSCONFDIR}/nresv.conf \ + ${PKG_SYSCONFDIR}/cresv.conf ${PKG_SYSCONFDIR}/ircd.motd \ + @VARBASE@/log/ircd-hybrid/logs/userlog \ + @VARBASE@/log/ircd-hybrid/logs/operlog \ + @VARBASE@/log/ircd-hybrid/logs/foperlog + do + ${TOUCH} ${f} + ${CHOWN} @IRCD_HYBRID_IRC_USER@ ${f} + ${CHGRP} @IRCD_HYBRID_IRC_GROUP@ ${f} + ${CHMOD} 0640 ${f} + done + + ;; +esac diff --git a/chat/ircd-hybrid/MESSAGE b/chat/ircd-hybrid/MESSAGE index 2227e81b8da..973e1c8b4d3 100644 --- a/chat/ircd-hybrid/MESSAGE +++ b/chat/ircd-hybrid/MESSAGE @@ -1,7 +1,14 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2003/02/11 13:28:46 grant Exp $ +$NetBSD: MESSAGE,v 1.4 2005/11/13 22:40:00 adrianp Exp $ -See `${PREFIX}/share/doc/ircd-hybrid/pkg-setup.txt' for information -about configuring ${PKGNAME}. +ircd-hybrid is now installed. Do note that three programs have changed +names to more readily reflect their ircd-hybrid function; +make sure to prefix them with "ircd-hybrid": + + convertconf -> ircd-hybrid-convertconf + mkpasswd -> ircd-hybrid-mkpasswd + viconf -> ircd-hybrid-viconf + +The documentation can be found at ${PREFIX}/share/doc/ircd-hybrid. =========================================================================== diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile index 0eb0aa6e0fd..e5b67ce0b59 100644 --- a/chat/ircd-hybrid/Makefile +++ b/chat/ircd-hybrid/Makefile @@ -1,148 +1,124 @@ -# $NetBSD: Makefile,v 1.19 2005/08/23 11:48:47 rillig Exp $ -# +# $NetBSD: Makefile,v 1.20 2005/11/13 22:40:00 adrianp Exp $ -DISTNAME= ircd-hybrid-6.2 -PKGREVISION= 3 +DISTNAME= ircd-hybrid-7.1.3 +EXTRACT_SUFX= .tgz CATEGORIES= chat MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/} -EXTRACT_SUFX= .tgz -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.ircd-hybrid.net/ +MAINTAINER= adrianp@NetBSD.org +HOMEPAGE= http://ircd-hybrid.com/ COMMENT= IRC server with many options GNU_CONFIGURE= YES - -USE_PKGINSTALL= YES - -PKG_SYSCONFSUBDIR= ircd-hybrid -IRCD_HYBRID_DPATH= ${PKG_SYSCONFDIR} +USE_PKGINSTALL= YES +BUILD_DEFS+= IRCD_HYBRID_SYSLOG_FACILITY IRCD_HYBRID_NICLEN \ + IRCD_HYBRID_TOPICLEN IRCD_HYBRID_MAXCONN \ + IRCD_HYBRID_SYSLOG_EVENTS IRCD_HYBRID_IRC_USER \ + IRCD_HYBRID_IRC_GROUP .include "../../mk/bsd.prefs.mk" -.if ${IRCD_HYBRID_SMALL_NET} == "YES" -IRCD_HYBRID_LINK_PREALLOCATE?= 64 -IRCD_HYBRID_CLIENTS_PREALLOCATE?= 64 -IRCD_HYBRID_USERS_PREALLOCATE?= 64 -IRCD_HYBRID_NICKNAMEHISTORYLENGTH?= 1000 -IRCD_HYBRID_MAXSENDQLENGTH?= 500000 -IRCD_HYBRID_INITIAL_DBUFS?= 300 -IRCD_HYBRID_HARD_FDLIMIT_?= 90 -IRCD_HYBRID_INIT_MAXCLIENTS?= 40 -.endif - -# this is not supposed to be changed -IRCD_HYBRID_SPATH= ${PREFIX}/sbin/ircd-hybrid -IRCD_HYBRID_SDIR= ${IRCD_HYBRID_SPATH:C|/[^/]*$||} - -# throw all the settings in _DEFS -.for def in \ - IRCD_HYBRID_LINK_PREALLOCATE IRCD_HYBRID_CLIENTS_PREALLOCATE \ - IRCD_HYBRID_USERS_PREALLOCATE IRCD_HYBRID_NICKNAMEHISTORYLENGTH \ - IRCD_HYBRID_MAXSENDQLENGTH IRCD_HYBRID_INITIAL_DBUFS \ - IRCD_HYBRID_HARD_FDLIMIT_ IRCD_HYBRID_INIT_MAXCLIENTS -. ifdef ${def} -_DEFS+= -D${def:S|^IRCD_HYBRID_||}=${${def}} -. endif -.endfor -.for def in \ - IRCD_HYBRID_NETWORK_NAME IRCD_HYBRID_NETWORK_DESC -. ifdef ${def} -_DEFS+= -D${def:S|^IRCD_HYBRID_||}=\"${${def}:Q}\" -. endif -.endfor -.for def in \ - IRCD_HYBRID_DPATH IRCD_HYBRID_SPATH \ - IRCD_HYBRID_FNAME_USERLOG IRCD_HYBRID_FNAME_OPERLOG IRCD_HYBRID_PPATH \ - IRCD_HYBRID_IRC_USER IRCD_HYBRID_IRC_GROUP -_DEFS+= -D${def:S|^IRCD_HYBRID_||}=\"${${def}}\" -.endfor -.if ${IRCD_HYBRID_USE_SYSLOG} == "YES" -_DEFS+= -DUSE_SYSLOG=1 -_DEFS+= -DLOG_FACILITY=${IRCD_HYBRID_SYSLOG_FACILITY} -.endif -.if ${IRCD_HYBRID_USE_LOGFILE} == "YES" -_DEFS+= -DUSE_LOGFILE=1 -_DEFS+= -DLPATH=\"${IRCD_HYBRID_LPATH}\" -.endif -_DEFS+= -DINIT_LOG_LEVEL=${IRCD_HYBRID_INIT_LOG_LEVEL} - -# and pass then down to make as DEFS -MAKE_FLAGS+= DEFS='${_DEFS}' - -# and few other things for install target -MAKE_FLAGS+= SPATH=${IRCD_HYBRID_SPATH} SDIR=${IRCD_HYBRID_SDIR} -MAKE_FLAGS+= PREFIX=${PREFIX} DESTDIR=${DESTDIR} - -# for the records -.for def in \ - IRCD_HYBRID_LINK_PREALLOCATE IRCD_HYBRID_CLIENTS_PREALLOCATE \ - IRCD_HYBRID_USERS_PREALLOCATE IRCD_HYBRID_NICKNAMEHISTORYLENGTH \ - IRCD_HYBRID_MAXSENDQLENGTH IRCD_HYBRID_INITIAL_DBUFS \ - IRCD_HYBRID_HARD_FDLIMIT_ IRCD_HYBRID_INIT_MAXCLIENTS \ - IRCD_HYBRID_NETWORK_NAME IRCD_HYBRID_NETWORK_DESC \ - IRCD_HYBRID_FNAME_OPERLOG IRCD_HYBRID_PPATH \ - IRCD_HYBRID_IRC_USER IRCD_HYBRID_IRC_GROUP -. ifdef ${def} -BUILD_DEFS+= ${def} -. endif -.endfor -.ifdef ${IRCD_HYBRID_USE_SYSLOG} == "YES" -BUILD_DEFS+= IRCD_HYBRID_USE_SYSLOG -BUILD_DEFS+= IRCD_HYBRID_SYSLOG_FACILITY -.else -BUILD_DEFS+= IRCD_HYBRID_FNAME_USERLOG -.endif -.if ${IRCD_HYBRID_USE_LOGFILE} == "YES" -BUILD_DEFS+= IRCD_HYBRID_USE_LOGFILE -BUILD_DEFS+= IRCD_HYBRID_LPATH -.endif +PKG_SYSCONFSUBDIR= ircd-hybrid +HYBRID_EG= ${PREFIX}/share/examples/ircd-hybrid +HYBRID_DOC= ${PREFIX}/share/doc/ircd-hybrid +INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL +RCD_SCRIPTS= ircd-hybrid -FILES_SUBST+= PPATH=${IRCD_HYBRID_PPATH:Q} -FILES_SUBST+= SPATH=${IRCD_HYBRID_SPATH:Q} -FILES_SUBST+= USER=${IRCD_HYBRID_IRC_USER:Q} -FILES_SUBST+= DPATH=${IRCD_HYBRID_DPATH:Q} -FILES_SUBST+= GROUP=${IRCD_HYBRID_IRC_GROUP} -FILES_SUBST+= SYSLOG_FACILITY=${IRCD_HYBRID_SYSLOG_FACILITY} +CONF_FILES_PERMS= ${HYBRID_EG}/example.conf ${PKG_SYSCONFDIR}/ircd.conf \ + ${IRCD_HYBRID_IRC_USER} ${IRCD_HYBRID_IRC_GROUP} 0640 +OWN_DIRS_PERMS+= ${VARBASE}/log/ircd-hybrid \ + ${IRCD_HYBRID_IRC_USER} ${IRCD_HYBRID_IRC_GROUP} 0770 +OWN_DIRS_PERMS+= ${VARBASE}/log/ircd-hybrid/logs \ + ${IRCD_HYBRID_IRC_USER} ${IRCD_HYBRID_IRC_GROUP} 0770 +OWN_DIRS_PERMS+= ${VARBASE}/run/ircd-hybrid \ + ${IRCD_HYBRID_IRC_USER} ${IRCD_HYBRID_IRC_GROUP} 0770 -RCD_SCRIPTS= ircd-hybrid +FILES_SUBST+= IRCD_HYBRID_IRC_USER=${IRCD_HYBRID_IRC_USER} +FILES_SUBST+= IRCD_HYBRID_IRC_GROUP=${IRCD_HYBRID_IRC_GROUP} +FILES_SUBST+= VARBASE=${VARBASE} -PKG_USERS= ${IRCD_HYBRID_IRC_USER}:${IRCD_HYBRID_IRC_GROUP}::IRC\ User::${NOLOGIN} +PKG_USERS= ${IRCD_HYBRID_IRC_USER}:${IRCD_HYBRID_IRC_GROUP}::ircd-hybrid\ User::${NOLOGIN} PKG_GROUPS= ${IRCD_HYBRID_IRC_GROUP} -CONF_FILES= ${PREFIX}/share/examples/ircd-hybrid/opers.txt \ - ${IRCD_HYBRID_DPATH}/opers.txt -CONF_FILES_PERMS= /dev/null ${IRCD_HYBRID_FNAME_OPERLOG} \ - ${IRCD_HYBRID_IRC_USER} ${IRCD_HYBRID_IRC_GROUP} 600 -CONF_FILES_PERMS+= /dev/null ${IRCD_HYBRID_FNAME_USERLOG} \ - ${IRCD_HYBRID_IRC_USER} ${IRCD_HYBRID_IRC_GROUP} 600 -.if ${IRCD_HYBRID_USE_LOGFILE} == "YES" -CONF_FILES_PERMS+= /dev/null ${IRCD_HYBRID_LPATH} \ - ${IRCD_HYBRID_IRC_USER} ${IRCD_HYBRID_IRC_GROUP} 600 +SUBST_CLASSES+= paths +SUBST_MESSAGE.paths= "Fixing hardcoded paths." +SUBST_STAGE.paths= post-patch +SUBST_FILES.paths= etc/example.conf etc/example.efnet.conf \ + etc/example.conf.quick doc/ircd.8 +SUBST_SED.paths= -e "s|/usr/local/ircd/etc|${PKG_SYSCONFDIR}|g" \ + -e "s|/usr/local/ircd/bin|${PREFIX}/bin|g" \ + -e "s|/usr/local/ircd/modules|${PREFIX}/lib/ircd-hybrid/modules|g" \ + -e "s|/usr/share/ircd|${PKG_SYSCONFDIR}|g" \ + -e "s|/var/log|${VARBASE}/log/ircd-hybrid/logs|g" + +SUBST_CLASSES+= bpaths +SUBST_MESSAGE.bpaths= "Fixing hardcoded build paths." +SUBST_STAGE.bpaths= post-configure +SUBST_FILES.bpaths= include/defaults.h +SUBST_SED.bpaths= -e "s|etc|etc/ircd-hybrid|g" \ + -e "s|modules|lib/ircd-hybrid/modules|g" \ + -e "s|IRCD_PREFIX \"/logs\"|\"${VARBASE}/log/ircd-hybrid/logs\"|g" \ + -e "s|ETCPATH \"/ircd.pid\"|\"${VARBASE}/run/ircd-hybrid/ircd.pid\"|g" \ + -e "s|messages|share/ircd-hybrid/messages|g" + +CONFIGURE_ARGS+= --with-nicklen=${IRCD_HYBRID_NICLEN} +CONFIGURE_ARGS+= --with-topiclen=${IRCD_HYBRID_TOPICLEN} +CONFIGURE_ARGS+= --enable-syslog=${IRCD_HYBRID_SYSLOG_EVENTS} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --localstatedir=${VARBASE}/log/ircd-hybrid +CONFIGURE_ARGS+= --enable-clobber + +.if defined(IRCD_HYBRID_SYSLOG_EVENTS) +CONFIGURE_ARGS+= --enable-syslog-facility=${IRCD_HYBRID_SYSLOG_FACILITY} .endif -post-build: - ${_PKG_SILENT}${_PKG_DEBUG} \ - ${CP} ${FILESDIR}/pkg-setup.txt ${WRKDIR}/pkg-setup.txt -.if ${IRCD_HYBRID_USE_SYSLOG} != "YES" - ${_PKG_SILENT}${_PKG_DEBUG} \ - ${MV} ${WRKDIR}/pkg-setup.txt ${WRKDIR}/.pkg-setup.txt - ${_PKG_SILENT}${_PKG_DEBUG} \ - ${SED} -e '/SYSLOG_FACILITY/d' ${WRKDIR}/.pkg-setup.txt \ - > ${WRKDIR}/pkg-setup.txt +.if defined(IRCD_HYBRID_MAXCONN) +CONFIGURE_ARGS+= --with-maxconn=${IRCD_HYBRID_MAXCONN} .endif - ${_PKG_SILENT}${_PKG_DEBUG} \ - ${MV} ${WRKDIR}/pkg-setup.txt ${WRKDIR}/.pkg-setup.txt - ${_PKG_SILENT}${_PKG_DEBUG} \ - ${SED} ${FILES_SUBST_SED} ${WRKDIR}/.pkg-setup.txt \ - > ${WRKDIR}/pkg-setup.txt + +.include "options.mk" post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ircd-hybrid - ${INSTALL_DATA} ${WRKDIR}/pkg-setup.txt ${PREFIX}/share/doc/ircd-hybrid/pkg-setup.txt - for f in operguide.txt opermyth.txt; do \ - ${INSTALL_DATA} ${WRKDIR}/ircd-hybrid-6.2/doc/$$f ${PREFIX}/share/doc/ircd-hybrid/$$f ; \ - done + ${INSTALL_DATA_DIR} ${HYBRID_EG} + ${INSTALL_DATA_DIR} ${HYBRID_DOC} + ${INSTALL_DATA_DIR} ${HYBRID_DOC}/doc + ${INSTALL_DATA_DIR} ${PREFIX}/share/ircd-hybrid + ${INSTALL_DATA_DIR} ${PREFIX}/share/ircd-hybrid/messages + + ${INSTALL_DATA} ${WRKSRC}/etc/example.conf ${HYBRID_EG} + ${INSTALL_DATA} ${WRKSRC}/etc/example.efnet.conf ${HYBRID_EG} + ${INSTALL_DATA} ${WRKSRC}/etc/example.conf.quick ${HYBRID_EG} + ${INSTALL_DATA} ${WRKSRC}/etc/simple.conf ${HYBRID_EG} + + ${INSTALL_DATA} ${WRKSRC}/BUGS ${HYBRID_DOC} + ${INSTALL_DATA} ${WRKSRC}/INSTALL ${HYBRID_DOC} + ${INSTALL_DATA} ${WRKSRC}/README.FIRST ${HYBRID_DOC} + ${INSTALL_DATA} ${WRKSRC}/README.PLATFORMS ${HYBRID_DOC} + ${INSTALL_DATA} ${WRKSRC}/RELNOTES ${HYBRID_DOC} + ${INSTALL_DATA} ${WRKSRC}/messages/README ${HYBRID_DOC}/README.messages + ${INSTALL_DATA} ${WRKSRC}/tools/README.mkpasswd \ + ${HYBRID_DOC}/README.ircd-hybrid-mkpasswd + + cd ${WRKSRC}/doc && ${PAX} -s /\Makefile.in// -s /\Makefile// \ + -rwppm . ${HYBRID_DOC}/doc + + cd ${WRKSRC}/contrib && \ + ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} install_help + + cd ${WRKSRC}/messages && \ + ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} install + + ${INSTALL_PROGRAM} ${WRKSRC}/tools/convertconf \ + ${PREFIX}/bin/ircd-hybrid-convertconf + ${INSTALL_PROGRAM} ${WRKSRC}/tools/convertilines \ + ${PREFIX}/bin/convertilines + ${INSTALL_PROGRAM} ${WRKSRC}/tools/convertklines \ + ${PREFIX}/bin/convertklines + ${INSTALL_PROGRAM} ${WRKSRC}/tools/encspeed \ + ${PREFIX}/bin/encspeed + ${INSTALL_PROGRAM} ${WRKSRC}/tools/mkpasswd \ + ${PREFIX}/bin/ircd-hybrid-mkpasswd + ${INSTALL_PROGRAM} ${WRKSRC}/tools/viconf \ + ${PREFIX}/bin/ircd-hybrid-viconf -.include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/ircd-hybrid/PLIST b/chat/ircd-hybrid/PLIST index 65797576ce8..7572be84b17 100644 --- a/chat/ircd-hybrid/PLIST +++ b/chat/ircd-hybrid/PLIST @@ -1,17 +1,334 @@ -@comment $NetBSD: PLIST,v 1.3 2005/05/02 20:33:58 reed Exp $ -man/man8/ircd-hybrid.8 -sbin/ircd-hybrid -sbin/ircd-hybrid-fixklines -sbin/ircd-hybrid-mkconf -sbin/ircd-hybrid-mkpasswd -sbin/ircd-hybrid-viconf -sbin/ircd-hybrid-viklines -sbin/ircd-hybrid-vimotd -share/doc/ircd-hybrid/operguide.txt -share/doc/ircd-hybrid/opermyth.txt -share/doc/ircd-hybrid/pkg-setup.txt -share/examples/ircd-hybrid/ircd.conf -share/examples/ircd-hybrid/opers.txt +@comment $NetBSD: PLIST,v 1.4 2005/11/13 22:40:00 adrianp Exp $ +bin/convertilines +bin/convertklines +bin/encspeed +bin/ircd +bin/ircd-hybrid-convertconf +bin/ircd-hybrid-mkpasswd +bin/ircd-hybrid-viconf +bin/servlink +include/ircd-hybrid-7/balloc.h +include/ircd-hybrid-7/channel.h +include/ircd-hybrid-7/channel_mode.h +include/ircd-hybrid-7/client.h +include/ircd-hybrid-7/cluster.h +include/ircd-hybrid-7/common.h +include/ircd-hybrid-7/control.h +include/ircd-hybrid-7/dalloca.h +include/ircd-hybrid-7/dbuf.h +include/ircd-hybrid-7/defaults.h +include/ircd-hybrid-7/event.h +include/ircd-hybrid-7/fdlist.h +include/ircd-hybrid-7/fileio.h +include/ircd-hybrid-7/handlers.h +include/ircd-hybrid-7/hash.h +include/ircd-hybrid-7/hook.h +include/ircd-hybrid-7/hostmask.h +include/ircd-hybrid-7/inet_misc.h +include/ircd-hybrid-7/io.h +include/ircd-hybrid-7/irc_getaddrinfo.h +include/ircd-hybrid-7/irc_getnameinfo.h +include/ircd-hybrid-7/irc_res.h +include/ircd-hybrid-7/irc_reslib.h +include/ircd-hybrid-7/irc_string.h +include/ircd-hybrid-7/ircd.h +include/ircd-hybrid-7/ircd_defs.h +include/ircd-hybrid-7/ircd_getopt.h +include/ircd-hybrid-7/ircd_handler.h +include/ircd-hybrid-7/ircd_signal.h +include/ircd-hybrid-7/ircdauth.h +include/ircd-hybrid-7/list.h +include/ircd-hybrid-7/listener.h +include/ircd-hybrid-7/m_info.h +include/ircd-hybrid-7/memory.h +include/ircd-hybrid-7/modules.h +include/ircd-hybrid-7/motd.h +include/ircd-hybrid-7/msg.h +include/ircd-hybrid-7/numeric.h +include/ircd-hybrid-7/packet.h +include/ircd-hybrid-7/parse.h +include/ircd-hybrid-7/patchlevel.h +include/ircd-hybrid-7/restart.h +include/ircd-hybrid-7/resv.h +include/ircd-hybrid-7/rlimits.h +include/ircd-hybrid-7/rsa.h +include/ircd-hybrid-7/s_auth.h +include/ircd-hybrid-7/s_bsd.h +include/ircd-hybrid-7/s_conf.h +include/ircd-hybrid-7/s_debug.h +include/ircd-hybrid-7/s_gline.h +include/ircd-hybrid-7/s_log.h +include/ircd-hybrid-7/s_misc.h +include/ircd-hybrid-7/s_serv.h +include/ircd-hybrid-7/s_stats.h +include/ircd-hybrid-7/s_user.h +include/ircd-hybrid-7/send.h +include/ircd-hybrid-7/serno.h +include/ircd-hybrid-7/servlink.h +include/ircd-hybrid-7/setup.h +include/ircd-hybrid-7/sprintf_irc.h +include/ircd-hybrid-7/stdinc.h +include/ircd-hybrid-7/supported.h +include/ircd-hybrid-7/tools.h +include/ircd-hybrid-7/userhost.h +include/ircd-hybrid-7/whowas.h +lib/ircd-hybrid/modules/autoload/m_accept.so +lib/ircd-hybrid/modules/autoload/m_admin.so +lib/ircd-hybrid/modules/autoload/m_away.so +lib/ircd-hybrid/modules/autoload/m_capab.so +lib/ircd-hybrid/modules/autoload/m_cburst.so +lib/ircd-hybrid/modules/autoload/m_challenge.so +lib/ircd-hybrid/modules/autoload/m_close.so +lib/ircd-hybrid/modules/autoload/m_connect.so +lib/ircd-hybrid/modules/autoload/m_cryptlink.so +lib/ircd-hybrid/modules/autoload/m_drop.so +lib/ircd-hybrid/modules/autoload/m_encap.so +lib/ircd-hybrid/modules/autoload/m_eob.so +lib/ircd-hybrid/modules/autoload/m_gline.so +lib/ircd-hybrid/modules/autoload/m_info.so +lib/ircd-hybrid/modules/autoload/m_invite.so +lib/ircd-hybrid/modules/autoload/m_ison.so +lib/ircd-hybrid/modules/autoload/m_kline.so +lib/ircd-hybrid/modules/autoload/m_knock.so +lib/ircd-hybrid/modules/autoload/m_links.so +lib/ircd-hybrid/modules/autoload/m_list.so +lib/ircd-hybrid/modules/autoload/m_lljoin.so +lib/ircd-hybrid/modules/autoload/m_llnick.so +lib/ircd-hybrid/modules/autoload/m_locops.so +lib/ircd-hybrid/modules/autoload/m_lusers.so +lib/ircd-hybrid/modules/autoload/m_map.so +lib/ircd-hybrid/modules/autoload/m_motd.so +lib/ircd-hybrid/modules/autoload/m_names.so +lib/ircd-hybrid/modules/autoload/m_nburst.so +lib/ircd-hybrid/modules/autoload/m_oper.so +lib/ircd-hybrid/modules/autoload/m_operwall.so +lib/ircd-hybrid/modules/autoload/m_pass.so +lib/ircd-hybrid/modules/autoload/m_ping.so +lib/ircd-hybrid/modules/autoload/m_pong.so +lib/ircd-hybrid/modules/autoload/m_post.so +lib/ircd-hybrid/modules/autoload/m_rehash.so +lib/ircd-hybrid/modules/autoload/m_restart.so +lib/ircd-hybrid/modules/autoload/m_resv.so +lib/ircd-hybrid/modules/autoload/m_set.so +lib/ircd-hybrid/modules/autoload/m_stats.so +lib/ircd-hybrid/modules/autoload/m_svinfo.so +lib/ircd-hybrid/modules/autoload/m_tb.so +lib/ircd-hybrid/modules/autoload/m_testline.so +lib/ircd-hybrid/modules/autoload/m_testmask.so +lib/ircd-hybrid/modules/autoload/m_time.so +lib/ircd-hybrid/modules/autoload/m_topic.so +lib/ircd-hybrid/modules/autoload/m_trace.so +lib/ircd-hybrid/modules/autoload/m_user.so +lib/ircd-hybrid/modules/autoload/m_userhost.so +lib/ircd-hybrid/modules/autoload/m_users.so +lib/ircd-hybrid/modules/autoload/m_version.so +lib/ircd-hybrid/modules/autoload/m_wallops.so +lib/ircd-hybrid/modules/autoload/m_who.so +lib/ircd-hybrid/modules/autoload/m_whois.so +lib/ircd-hybrid/modules/autoload/m_whowas.so +lib/ircd-hybrid/modules/autoload/m_xline.so +lib/ircd-hybrid/modules/m_die.so +lib/ircd-hybrid/modules/m_join.so +lib/ircd-hybrid/modules/m_kick.so +lib/ircd-hybrid/modules/m_kill.so +lib/ircd-hybrid/modules/m_message.so +lib/ircd-hybrid/modules/m_mode.so +lib/ircd-hybrid/modules/m_nick.so +lib/ircd-hybrid/modules/m_part.so +lib/ircd-hybrid/modules/m_quit.so +lib/ircd-hybrid/modules/m_server.so +lib/ircd-hybrid/modules/m_sjoin.so +lib/ircd-hybrid/modules/m_squit.so +man/man8/ircd.8 +share/doc/ircd-hybrid/BUGS +share/doc/ircd-hybrid/INSTALL +share/doc/ircd-hybrid/README.FIRST +share/doc/ircd-hybrid/README.PLATFORMS +share/doc/ircd-hybrid/README.ircd-hybrid-mkpasswd +share/doc/ircd-hybrid/README.messages +share/doc/ircd-hybrid/RELNOTES +share/doc/ircd-hybrid/doc/CIDR.txt +share/doc/ircd-hybrid/doc/LazyLinks.txt +share/doc/ircd-hybrid/doc/Tao-of-IRC.940110 +share/doc/ircd-hybrid/doc/challenge.txt +share/doc/ircd-hybrid/doc/channels.txt +share/doc/ircd-hybrid/doc/guidelines.txt +share/doc/ircd-hybrid/doc/index.txt +share/doc/ircd-hybrid/doc/ircd.8 +share/doc/ircd-hybrid/doc/kline.txt +share/doc/ircd-hybrid/doc/messages.txt +share/doc/ircd-hybrid/doc/modeg.txt +share/doc/ircd-hybrid/doc/modes.txt +share/doc/ircd-hybrid/doc/operguide.txt +share/doc/ircd-hybrid/doc/opermyth.txt +share/doc/ircd-hybrid/doc/resv.txt +share/doc/ircd-hybrid/doc/server-version-info +share/doc/ircd-hybrid/doc/serverhide.txt +share/doc/ircd-hybrid/doc/technical/Persistent_Clients.txt +share/doc/ircd-hybrid/doc/technical/README.TSora +share/doc/ircd-hybrid/doc/technical/README.openssl +share/doc/ircd-hybrid/doc/technical/cryptlink.txt +share/doc/ircd-hybrid/doc/technical/event.txt +share/doc/ircd-hybrid/doc/technical/fd-management.txt +share/doc/ircd-hybrid/doc/technical/file-management.txt +share/doc/ircd-hybrid/doc/technical/hostmask.txt +share/doc/ircd-hybrid/doc/technical/index.txt +share/doc/ircd-hybrid/doc/technical/network.txt +share/doc/ircd-hybrid/doc/technical/rfc1459.txt +share/doc/ircd-hybrid/doc/technical/send.txt +share/doc/ircd-hybrid/doc/technical/ts5.txt +share/doc/ircd-hybrid/doc/technical/ts6.txt +share/doc/ircd-hybrid/doc/technical/whats-new-code.txt +share/doc/ircd-hybrid/doc/whats-new.txt +share/examples/ircd-hybrid/example.conf +share/examples/ircd-hybrid/example.conf.quick +share/examples/ircd-hybrid/example.efnet.conf +share/examples/ircd-hybrid/simple.conf share/examples/rc.d/ircd-hybrid +share/ircd-hybrid/help/opers/accept +share/ircd-hybrid/help/opers/admin +share/ircd-hybrid/help/opers/away +share/ircd-hybrid/help/opers/capab +share/ircd-hybrid/help/opers/cburst +share/ircd-hybrid/help/opers/challenge +share/ircd-hybrid/help/opers/client +share/ircd-hybrid/help/opers/close +share/ircd-hybrid/help/opers/cmode +share/ircd-hybrid/help/opers/connect +share/ircd-hybrid/help/opers/credits +share/ircd-hybrid/help/opers/cryptlink +share/ircd-hybrid/help/opers/die +share/ircd-hybrid/help/opers/dline +share/ircd-hybrid/help/opers/dmem +share/ircd-hybrid/help/opers/drop +share/ircd-hybrid/help/opers/eob +share/ircd-hybrid/help/opers/error +share/ircd-hybrid/help/opers/gline +share/ircd-hybrid/help/opers/help +share/ircd-hybrid/help/opers/index +share/ircd-hybrid/help/opers/info +share/ircd-hybrid/help/opers/invite +share/ircd-hybrid/help/opers/ison +share/ircd-hybrid/help/opers/join +share/ircd-hybrid/help/opers/kick +share/ircd-hybrid/help/opers/kill +share/ircd-hybrid/help/opers/kline +share/ircd-hybrid/help/opers/knock +share/ircd-hybrid/help/opers/knockll +share/ircd-hybrid/help/opers/links +share/ircd-hybrid/help/opers/list +share/ircd-hybrid/help/opers/lljoin +share/ircd-hybrid/help/opers/llnick +share/ircd-hybrid/help/opers/locops +share/ircd-hybrid/help/opers/lusers +share/ircd-hybrid/help/opers/modlist +share/ircd-hybrid/help/opers/modload +share/ircd-hybrid/help/opers/modrestart +share/ircd-hybrid/help/opers/modunload +share/ircd-hybrid/help/opers/motd +share/ircd-hybrid/help/opers/names +share/ircd-hybrid/help/opers/nburst +share/ircd-hybrid/help/opers/nick +share/ircd-hybrid/help/opers/notice +share/ircd-hybrid/help/opers/oper +share/ircd-hybrid/help/opers/operwall +share/ircd-hybrid/help/opers/part +share/ircd-hybrid/help/opers/pass +share/ircd-hybrid/help/opers/ping +share/ircd-hybrid/help/opers/pong +share/ircd-hybrid/help/opers/post +share/ircd-hybrid/help/opers/privmsg +share/ircd-hybrid/help/opers/quit +share/ircd-hybrid/help/opers/rehash +share/ircd-hybrid/help/opers/restart +share/ircd-hybrid/help/opers/resv +share/ircd-hybrid/help/opers/server +share/ircd-hybrid/help/opers/set +share/ircd-hybrid/help/opers/sjoin +share/ircd-hybrid/help/opers/squit +share/ircd-hybrid/help/opers/stats +share/ircd-hybrid/help/opers/svinfo +share/ircd-hybrid/help/opers/testline +share/ircd-hybrid/help/opers/time +share/ircd-hybrid/help/opers/topic +share/ircd-hybrid/help/opers/trace +share/ircd-hybrid/help/opers/uhelp +share/ircd-hybrid/help/opers/umode +share/ircd-hybrid/help/opers/undline +share/ircd-hybrid/help/opers/ungline +share/ircd-hybrid/help/opers/unkline +share/ircd-hybrid/help/opers/unresv +share/ircd-hybrid/help/opers/unxline +share/ircd-hybrid/help/opers/user +share/ircd-hybrid/help/opers/userhost +share/ircd-hybrid/help/opers/users +share/ircd-hybrid/help/opers/version +share/ircd-hybrid/help/opers/wallops +share/ircd-hybrid/help/opers/who +share/ircd-hybrid/help/opers/whois +share/ircd-hybrid/help/opers/whowas +share/ircd-hybrid/help/opers/xline +share/ircd-hybrid/help/users/accept +share/ircd-hybrid/help/users/admin +share/ircd-hybrid/help/users/away +share/ircd-hybrid/help/users/challenge +share/ircd-hybrid/help/users/cmode +share/ircd-hybrid/help/users/credits +share/ircd-hybrid/help/users/error +share/ircd-hybrid/help/users/help +share/ircd-hybrid/help/users/index +share/ircd-hybrid/help/users/info +share/ircd-hybrid/help/users/invite +share/ircd-hybrid/help/users/ison +share/ircd-hybrid/help/users/join +share/ircd-hybrid/help/users/kick +share/ircd-hybrid/help/users/knock +share/ircd-hybrid/help/users/links +share/ircd-hybrid/help/users/list +share/ircd-hybrid/help/users/lusers +share/ircd-hybrid/help/users/motd +share/ircd-hybrid/help/users/names +share/ircd-hybrid/help/users/nick +share/ircd-hybrid/help/users/notice +share/ircd-hybrid/help/users/oper +share/ircd-hybrid/help/users/part +share/ircd-hybrid/help/users/pass +share/ircd-hybrid/help/users/ping +share/ircd-hybrid/help/users/pong +share/ircd-hybrid/help/users/privmsg +share/ircd-hybrid/help/users/quit +share/ircd-hybrid/help/users/stats +share/ircd-hybrid/help/users/time +share/ircd-hybrid/help/users/topic +share/ircd-hybrid/help/users/umode +share/ircd-hybrid/help/users/user +share/ircd-hybrid/help/users/userhost +share/ircd-hybrid/help/users/users +share/ircd-hybrid/help/users/version +share/ircd-hybrid/help/users/who +share/ircd-hybrid/help/users/whois +share/ircd-hybrid/help/users/whowas +share/ircd-hybrid/messages/ayb.lang +share/ircd-hybrid/messages/ircd-croatian.lang +share/ircd-hybrid/messages/ircd-danish.lang +share/ircd-hybrid/messages/ircd-dutch.lang +share/ircd-hybrid/messages/ircd-french.lang +share/ircd-hybrid/messages/ircd-german.lang +share/ircd-hybrid/messages/ircd-norwegian.lang +share/ircd-hybrid/messages/ircd-polish.lang +share/ircd-hybrid/messages/ircd-russian.lang +share/ircd-hybrid/messages/ircd-spanish.lang +share/ircd-hybrid/messages/ircd-swedish.lang +@dirrm share/ircd-hybrid/messages +@dirrm share/ircd-hybrid/help/users +@dirrm share/ircd-hybrid/help/opers +@dirrm share/ircd-hybrid/help +@dirrm share/ircd-hybrid @dirrm share/examples/ircd-hybrid +@dirrm share/doc/ircd-hybrid/doc/technical +@dirrm share/doc/ircd-hybrid/doc @dirrm share/doc/ircd-hybrid +@dirrm lib/ircd-hybrid/modules/autoload +@dirrm lib/ircd-hybrid/modules +@dirrm lib/ircd-hybrid +@dirrm include/ircd-hybrid-7 diff --git a/chat/ircd-hybrid/distinfo b/chat/ircd-hybrid/distinfo index 246d42eb77d..f1b8be8d50e 100644 --- a/chat/ircd-hybrid/distinfo +++ b/chat/ircd-hybrid/distinfo @@ -1,12 +1,9 @@ -$NetBSD: distinfo,v 1.2 2005/02/23 15:59:12 agc Exp $ +$NetBSD: distinfo,v 1.3 2005/11/13 22:40:00 adrianp Exp $ -SHA1 (ircd-hybrid-6.2.tgz) = 5ca86d7986d43cd3fc63943fc6100041d7d35aaf -RMD160 (ircd-hybrid-6.2.tgz) = 8c02e728a68c065a081391e90ea300154bb8a84a -Size (ircd-hybrid-6.2.tgz) = 638589 bytes -SHA1 (patch-aa) = 7b4ac6f55779fb698569c6d03bd6de00135f8a31 -SHA1 (patch-ab) = 9c1419f74ec617ecf669880613a0053022c0def8 -SHA1 (patch-ac) = 5025c8e5a1892d09cfd7f48ebb46bec33d502327 -SHA1 (patch-ad) = 6377ecb0b803e6eb0d0af4d95cbeaefbb61b3bf5 -SHA1 (patch-ae) = 4853fc2ece303121b12adcb513992e739a8e5d56 -SHA1 (patch-af) = 1d2b125a1e9eabb108aef398d6bd8ff2db2455a1 -SHA1 (patch-ag) = b66c0151713dd268d43f77305bb09ce5390973ec +SHA1 (ircd-hybrid-7.1.3.tgz) = 302b7d82f0a40844fb522f476eb6ba957a36a746 +RMD160 (ircd-hybrid-7.1.3.tgz) = 32684e1e39fc361956d8cc57a82cff857993c877 +Size (ircd-hybrid-7.1.3.tgz) = 1167422 bytes +SHA1 (patch-aa) = 4b1e58cdaca2c6b0f4f1f7a9a81e48dcd54b5613 +SHA1 (patch-ab) = 1f7fbfb91c7ef039c3de26fb36b4c5c036373bc3 +SHA1 (patch-ac) = 5bc7624d7626ecbd5fb0a576cc8538c181fdbd73 +SHA1 (patch-ad) = 7ed782cb6df7586223201847e2cbed56a882154c diff --git a/chat/ircd-hybrid/files/ircd-hybrid.sh b/chat/ircd-hybrid/files/ircd-hybrid.sh index 49f3dbeb0f9..c802e3c098b 100644 --- a/chat/ircd-hybrid/files/ircd-hybrid.sh +++ b/chat/ircd-hybrid/files/ircd-hybrid.sh @@ -1,61 +1,31 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: ircd-hybrid.sh,v 1.2 2003/08/23 10:52:50 seb Exp $ +# $NetBSD: ircd-hybrid.sh,v 1.3 2005/11/13 22:40:00 adrianp Exp $ # # PROVIDE: ircdhybrid # REQUIRE: DAEMON +if [ -f /etc/rc.subr ] +then + . /etc/rc.subr +fi + name="ircdhybrid" rcvar=$name -pidfile="@PPATH@" -command="@SPATH@" -conffile="@DPATH@/ircd.conf" +pidfile="@VARBASE@/run/ircd-hybrid/ircd.pid" +command="@PREFIX@/bin/ircd" +conffile="@PKG_SYSCONFDIR@/ircd.conf" required_files="$conffile" -start_precmd=set_pid_file +ircdhybrid_user="@IRCD_HYBRID_IRC_USER@" +ircdhybrid_group="@IRCD_HYBRID_IRC_GROUP@" +start_precmd="set_pid_file" set_pid_file () { - @TOUCH@ $pidfile && @CHOWN@ @USER@ $pidfile && @CHMOD@ 600 $pidfile + @TOUCH@ $pidfile + @CHOWN@ @IRCD_HYBRID_IRC_USER@ $pidfile + @CHGRP@ @IRCD_HYBRID_IRC_GROUP@ $pidfile + @CHMOD@ 0640 $pidfile } -if [ -d /etc/rc.d ]; then :; else - command=${1:-start} - - case ${command} in - start) - if [ -x @SPATH@ -a -f "$conffile" ] - then - echo "Starting ${name}." - set_pid_file || exit 1 - exec @SPATH@ - fi - ;; - stop) - if [ -f ${pidfile} ]; then - pid=`head -1 ${pidfile}` - echo "Stopping ${name}." - kill -TERM ${pid} - else - echo "${name} not running?" - fi - ;; - restart) - ( $0 stop ) - sleep 1 - $0 start - ;; - status) - if [ -f ${pidfile} ]; then - pid=`head -1 ${pidfile}` - echo "${name} is running as pid ${pid}." - else - echo "${name} is not running." - fi - ;; - esac - exit 0 -fi - -. /etc/rc.subr - load_rc_config $name run_rc_command "$1" diff --git a/chat/ircd-hybrid/files/pkg-setup.txt b/chat/ircd-hybrid/files/pkg-setup.txt deleted file mode 100644 index 056028d8323..00000000000 --- a/chat/ircd-hybrid/files/pkg-setup.txt +++ /dev/null @@ -1,18 +0,0 @@ -====================================================================== -$NetBSD: pkg-setup.txt,v 1.2 2003/07/29 20:21:39 seb Exp $ - -If you want to use Hybrid ircd... -* Create the daemon configuration file: - `@DPATH@/ircd.conf' - To aid you in this see the example file: - `@PREFIX@/share/examples/ircd-hybrid/ircd.conf'. - Or you can use the generator script: - `@PREFIX@/sbin/ircd-hybrid-mkconf'. -* Create an empty file writeable by user `@USER@' group `@GROUP@' named - `@DPATH@/kline.conf'. -* Create MOTD files: - `@DPATH@/ircd.motd', - `@DPATH@/opers.motd'. -* Handle syslog facility @SYSLOG_FACILITY@ as you see fit. - -====================================================================== diff --git a/chat/ircd-hybrid/options.mk b/chat/ircd-hybrid/options.mk new file mode 100644 index 00000000000..db11027d724 --- /dev/null +++ b/chat/ircd-hybrid/options.mk @@ -0,0 +1,52 @@ +# $NetBSD: options.mk,v 1.1 2005/11/13 22:40:00 adrianp Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.ircd-hybrid +PKG_SUPPORTED_OPTIONS= efnet ssl halfops small-net ziplinks + +PKG_SUGGESTED_OPTIONS= ssl ziplinks + +.include "../../mk/bsd.options.mk" + +### +### Tweak some options to be EFNet based +### +.if !empty(PKG_OPTIONS:Mefnet) +CONFIGURE_ARGS+= --enable-efnet +.endif + +### +### Enable OpenSSL support +### +.if !empty(PKG_OPTIONS:Mssl) +. include "../../security/openssl/buildlink3.mk" +CONFIGURE_ARGS+= --enable-openssl=${BUILDLINK_PREFIX.openssl} +.else +CONFIGURE_ARGS+= --disable-openssl +.endif + +### +### Halfops are similar to plain ops, but can't kick/deop plain ops. Halfops +### may or may not kick/deop other halfops depending on if (+p) is set. +### Halfops may not set (+/-p). +### +.if !empty(PKG_OPTIONS:Mhalfops) +CONFIGURE_ARGS+= --enable-halfops +.endif + +### +### Tunes the server for smaller networks by reducing the startup +### memory footprint. +### +.if !empty(PKG_OPTIONS:Msmall-net) +CONFIGURE_ARGS+= --enable-small-net +.endif + +### +### Enable OpenSSL support +### +.if !empty(PKG_OPTIONS:Mziplinks) +. include "../../devel/zlib/buildlink3.mk" +CONFIGURE_ARGS+= --enable-zlib +.else +CONFIGURE_ARGS+= --disable-zlib +.endif diff --git a/chat/ircd-hybrid/patches/patch-aa b/chat/ircd-hybrid/patches/patch-aa index c3740d818b5..ede2163c61d 100644 --- a/chat/ircd-hybrid/patches/patch-aa +++ b/chat/ircd-hybrid/patches/patch-aa @@ -1,44 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/10/21 21:26:52 seb Exp $ +$NetBSD: patch-aa,v 1.2 2005/11/13 22:40:00 adrianp Exp $ ---- Makefile.in.orig Wed Jul 4 22:07:28 2001 +--- Makefile.in.orig 2003-07-18 01:41:39.000000000 +0100 +++ Makefile.in -@@ -76,10 +76,17 @@ - #IRCDLIBS=-lsocket -lnsl -lucb - #IRCLIBS=-lcurses -lresolv -lsocket -lnsl -lucb - -- -+INSTALL_PROGRAM = $(BSD_INSTALL_PROGRAM) -+INSTALL_PROGRAM_DIR = $(BSD_INSTALL_PROGRAM_DIR) -+INSTALL_DATA = $(BSD_INSTALL_DATA) -+INSTALL_DATA_DIR = $(BSD_INSTALL_DATA_DIR) -+INSTALL_MAN_DIR = $(BSD_INSTALL_MAN_DIR) -+INSTALL_MAN = $(BSD_INSTALL_MAN) -+INSTALL_SCRIPT_DIR = $(BSD_INSTALL_SCRIPT_DIR) -+INSTALL_SCRIPT = $(BSD_INSTALL_SCRIPT) - - SHELL=/bin/sh --SUBDIRS=zlib src tools -+SUBDIRS=src tools - # ZSUBDIRS=zlib $(SUBDIRS) - - MAKE = make ${MFLAGS} 'CFLAGS=${CFLAGS}' 'INSTALL=${INSTALL}' 'LDFLAGS=${LDFLAGS}' -@@ -137,5 +144,17 @@ - done - - install: all -- @./tools/install_ircd -- -+ $(INSTALL_PROGRAM_DIR) $(DESTDIR)$(SDIR) -+ $(INSTALL_PROGRAM) src/ircd $(DESTDIR)$(SPATH) -+ $(INSTALL_PROGRAM) tools/mkpasswd $(DESTDIR)$(SDIR)/ircd-hybrid-mkpasswd -+ $(INSTALL_PROGRAM) tools/viconf $(DESTDIR)$(SDIR)/ircd-hybrid-viconf -+ ln $(DESTDIR)$(SDIR)/ircd-hybrid-viconf $(DESTDIR)$(SDIR)/ircd-hybrid-viklines -+ ln $(DESTDIR)$(SDIR)/ircd-hybrid-viconf $(DESTDIR)$(SDIR)/ircd-hybrid-vimotd -+ $(INSTALL_PROGRAM) tools/fixklines $(DESTDIR)$(SDIR)/ircd-hybrid-fixklines -+ $(INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/examples/ircd-hybrid -+ $(INSTALL_DATA) doc/example.conf $(DESTDIR)$(PREFIX)/share/examples/ircd-hybrid/ircd.conf -+ $(INSTALL_MAN_DIR) $(DESTDIR)$(PREFIX)/man/man8 -+ $(INSTALL_MAN) doc/ircd.8 $(DESTDIR)$(PREFIX)/man/man8/ircd-hybrid.8 -+ $(INSTALL_DATA) opers.txt $(DESTDIR)$(PREFIX)/share/examples/ircd-hybrid/opers.txt -+ $(INSTALL_SCRIPT_DIR) $(DESTDIR)$(PREFIX)/sbin -+ $(INSTALL_SCRIPT) tools/mkconf $(DESTDIR)$(PREFIX)/sbin/ircd-hybrid-mkconf +@@ -25,7 +25,7 @@ RM = @RM@ + #MFLAGS = -j 4 + DEPEND_DIRS = modules src servlink + BUILD_DIRS = ${DEPEND_DIRS} tools +-INSTALL_DIRS = ${BUILD_DIRS} etc doc include ++INSTALL_DIRS = ${DEPEND_DIRS} doc include + CLEAN_DIRS = ${BUILD_DIRS} contrib + # Anywhere that we can make install, we obviously can rm -f Makefile + DISTCLEAN_DIRS = ${INSTALL_DIRS} contrib messages diff --git a/chat/ircd-hybrid/patches/patch-ab b/chat/ircd-hybrid/patches/patch-ab index d946d98b664..b19539f3bf1 100644 --- a/chat/ircd-hybrid/patches/patch-ab +++ b/chat/ircd-hybrid/patches/patch-ab @@ -1,171 +1,30 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/10/21 21:26:52 seb Exp $ +$NetBSD: patch-ab,v 1.2 2005/11/13 22:40:00 adrianp Exp $ ---- include/config.h.orig Wed Sep 26 05:04:02 2001 -+++ include/config.h -@@ -51,8 +51,12 @@ - * system limits. If you know what you are doing, increase them now - */ - -+#ifndef HARD_FDLIMIT_ - #define HARD_FDLIMIT_ 256 -+#endif -+#ifndef INIT_MAXCLIENTS - #define INIT_MAXCLIENTS 180 -+#endif - - /* - * This is how many 'buffer connections' we allow... -@@ -77,7 +81,9 @@ - * will be preallocated for the entire whowas array when ircd is started. - * You will want to crank this down if you are on a small net. - */ -+#ifndef NICKNAMEHISTORYLENGTH - #define NICKNAMEHISTORYLENGTH 15000 -+#endif - - /* Don't change this... */ - #define HARD_FDLIMIT (HARD_FDLIMIT_ - 10) -@@ -109,14 +115,22 @@ - * - */ - -+#ifndef DPATH - #define DPATH "/usr/local/ircd/" -+#endif -+#ifndef SPATH - #define SPATH "/usr/local/ircd/ircd" -+#endif - #define CPATH "ircd.conf" - #define KPATH "kline.conf" - #define DLPATH "kline.conf" - #define MPATH "ircd.motd" -+#ifndef LPATH - #define LPATH "ircd.log" -+#endif -+#ifndef PPATH - #define PPATH "ircd.pid" -+#endif - #define HPATH "opers.txt" - #define OPATH "opers.motd" - -@@ -151,12 +165,16 @@ - /* NETWORK_NAME - * Displayed in place of the servername when SERVERHIDE is enabled - */ -+#ifndef NETWORK_NAME - #define NETWORK_NAME "EFnet" -+#endif - - /* NETWORK_DESC - * Displayed in place of the server info when SERVERHIDE is enabled - */ -+#ifndef NETWORK_DESC - #define NETWORK_DESC "Eris Free Network" -+#endif - - - /* TS_MAX_DELTA and TS_WARN_DELTA - allowed delta for TS when another -@@ -208,8 +226,12 @@ - * - * These need to be defined if you want to use SYSLOG logging, too. - */ -+#ifndef FNAME_USERLOG - #define FNAME_USERLOG "/usr/local/ircd/users" -+#endif -+#ifndef FNAME_OPERLOG - #define FNAME_OPERLOG "/usr/local/ircd/opers" -+#endif - - /* RFC1035_ANAL - * Defining this causes ircd to reject hostnames with non-compliant chars. -@@ -487,13 +509,15 @@ - * options are: - * L_CRIT, L_ERROR, L_WARN, L_NOTICE, L_TRACE, L_INFO, L_DEBUG - */ -+#ifndef INIT_LOG_LEVEL - #define INIT_LOG_LEVEL L_NOTICE -+#endif - - /* USE_LOGFILE - log errors and such to LPATH - * If you wish to have the server send 'vital' messages about server - * to a logfile, define USE_LOGFILE. - */ --#define USE_LOGFILE -+/* #define USE_LOGFILE */ - - /* USE_SYSLOG - log errors and such to syslog() - * If you wish to have the server send 'vital' messages about server -@@ -503,25 +527,27 @@ - * 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 -+/* #undef USE_SYSLOG */ - - #ifdef USE_SYSLOG - /* SYSLOG_KILL SYSLOG_SQUIT SYSLOG_CONNECT SYSLOG_USERS SYSLOG_OPER - * If you use syslog above, you may want to turn some (none) of the - * spurious log messages for KILL,SQUIT,etc 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 */ -+#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 */ - #undef SYSLOG_BLOCK_ALLOCATOR /* debug block allocator */ - - /* LOG_FACILITY - facility to use for syslog() - * Define the facility you want to use for syslog(). Ask your - * sysadmin which one you should use. - */ -+#ifndef LOG_FACILITY - #define LOG_FACILITY LOG_LOCAL4 -+#endif - - #endif /* USE_SYSLOG */ - -@@ -549,7 +575,9 @@ - /* MAXSENDQLENGTH - Max amount of internal send buffering - * Max amount of internal send buffering when socket is stuck (bytes) - */ -+#ifndef MAXSENDQLENGTH - #define MAXSENDQLENGTH 9000000 /* Recommended value: 9000000 for EFnet */ -+#endif - - /* BUFFERPOOL - the maximum size of the total of all sendq's. - * Recommended value is 4 times MAXSENDQLENGTH. -@@ -561,8 +589,8 @@ - * define IRC_UID to that UID. This should only be defined if you are running - * as root and even then perhaps not. - */ --#define IRC_UID 1001 --#define IRC_GID 31 -+#undef IRC_UID -+#undef IRC_GID - - /* CLIENT_FLOOD - client excess flood threshold - * this controls the number of bytes the server will allow a client to -@@ -589,7 +617,7 @@ - * if there are no servers presently connected to this server - * opers are not affected. - */ --#undef NO_CHANOPS_ON_SPLIT -+#undef NO_CHANOPS_ON_SPLIT - - /* NO_JOIN_ON_SPLIT - * -@@ -776,7 +804,9 @@ - - /* INITIAL_DBUFS - how many dbufs to preallocate - */ -+#ifndef INITIAL_DBUFS - #define INITIAL_DBUFS 4000 /* preallocate 16 megs of dbufs */ -+#endif - - /* MAXBUFFERS - increase socket buffers - * +--- modules/Makefile.in.orig 2005-07-31 19:03:33.000000000 +0100 ++++ modules/Makefile.in +@@ -23,7 +23,7 @@ IRCDLIBS = @LIBS@ $(SSL_LIBS) + + prefix = $(DESTDIR)@prefix@ + # Change this later! -- adrian +-moduledir = ${prefix}/modules ++moduledir = ${prefix}/lib/ircd-hybrid/modules + automoduledir = ${moduledir}/autoload + + INCLUDES = -I../include $(SSL_INCLUDES) +@@ -127,16 +127,6 @@ libmodules.a: $(S_OBJS) + + install-mkdirs: + mkdir -p $(prefix) +- +- -@if test -d $(moduledir)-old; then \ +- echo "${RM} -rf $(moduledir)-old"; \ +- ${RM} -rf $(moduledir)-old; \ +- fi +- -@if test -d $(moduledir); then \ +- echo "${MV} $(moduledir) $(moduledir)-old"; \ +- ${MV} $(moduledir) $(moduledir)-old; \ +- fi +- + mkdir -p $(moduledir) $(automoduledir) + + install: install_@MOD_TARGET@ diff --git a/chat/ircd-hybrid/patches/patch-ac b/chat/ircd-hybrid/patches/patch-ac index ade678e0a3f..6c678867bc1 100644 --- a/chat/ircd-hybrid/patches/patch-ac +++ b/chat/ircd-hybrid/patches/patch-ac @@ -1,27 +1,15 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/10/21 21:26:52 seb Exp $ +$NetBSD: patch-ac,v 1.2 2005/11/13 22:40:00 adrianp Exp $ ---- src/Makefile.in.orig Thu Aug 30 03:54:46 2001 -+++ src/Makefile.in -@@ -6,10 +6,11 @@ - RM = @RM@ - MKDEP = ${CC} -MM - --IRCDLIBS = @LIBS@ ../zlib/libz.a -+IRCDLIBS = @LIBS@ -lz - --INCLUDES = -I../include -I../zlib --CPPFLAGS = ${INCLUDES} @CPPFLAGS@ -+INCLUDES = -I../include -+CPPFLAGS = ${INCLUDES} @CPPFLAGS@ $(DEFS) -+LDFLAGS= @LDFLAGS@ - - # For developers - # CFLAGS= -g -O2 -Wall -@@ -187,7 +188,6 @@ - - ircd: ${OBJS} version.o - ${CC} ${LDFLAGS} -o $@ ${OBJS} version.o ${IRCDLIBS} -- mv version.c version.c.last - - install: build - @echo "Please do a make install from the top level directory" +--- contrib/Makefile.in.orig 2005-11-13 18:12:26.000000000 +0000 ++++ contrib/Makefile.in +@@ -29,8 +29,8 @@ IRCDLIBS = @LIBS@ $(SSL_LIBS) + INCLUDES = -I../include $(SSL_INCLUDES) + CPPFLAGS = ${INCLUDES} @CPPFLAGS@ + +-uhelpdir = ${prefix}/help/users +-ohelpdir = ${prefix}/help/opers ++uhelpdir = ${prefix}/share/ircd-hybrid/help/users ++ohelpdir = ${prefix}/share/ircd-hybrid/help/opers + + SYMLINKS = topic accept cmode admin names links away whowas \ + version kick who invite quit join list nick oper part \ diff --git a/chat/ircd-hybrid/patches/patch-ad b/chat/ircd-hybrid/patches/patch-ad index a325b858a35..267edbf2966 100644 --- a/chat/ircd-hybrid/patches/patch-ad +++ b/chat/ircd-hybrid/patches/patch-ad @@ -1,14 +1,13 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/10/21 21:26:52 seb Exp $ +$NetBSD: patch-ad,v 1.2 2005/11/13 22:40:00 adrianp Exp $ ---- src/client.c.orig Fri Aug 3 17:12:56 2001 -+++ src/client.c -@@ -64,7 +64,9 @@ - * This means you call MyMalloc 30 some odd times, - * rather than 30k times -Dianora - */ -+#ifndef CLIENTS_PREALLOCATE - #define CLIENTS_PREALLOCATE 1024 -+#endif +--- messages/Makefile.in.orig 2005-11-13 21:47:12.000000000 +0000 ++++ messages/Makefile.in +@@ -5,7 +5,7 @@ MV = @MV@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + prefix = $(DESTDIR)@prefix@ +-messagedir = $(prefix)/messages ++messagedir = $(prefix)/share/ircd-hybrid/messages + + CLOBBER=@CLOBBER@ - /* - * for Wohali's block allocator diff --git a/chat/ircd-hybrid/patches/patch-ae b/chat/ircd-hybrid/patches/patch-ae deleted file mode 100644 index 3a7c1f990c3..00000000000 --- a/chat/ircd-hybrid/patches/patch-ae +++ /dev/null @@ -1,89 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2001/10/21 21:26:52 seb Exp $ - ---- src/ircd.c.orig Wed Jul 18 04:15:26 2001 -+++ src/ircd.c -@@ -58,6 +58,7 @@ - #include <errno.h> - #include <time.h> - #include <pwd.h> -+#include <grp.h> - #include <fcntl.h> - #include <unistd.h> - #include <sys/file.h> -@@ -656,15 +657,16 @@ - int fd; - char buff[20]; - pid_t pidfromfile; -+ ssize_t n; - - if ((fd = open(PPATH, O_RDONLY)) >= 0 ) - { -- if (read(fd, buff, sizeof(buff)) == -1) -+ n = read(fd, buff, sizeof(buff)); -+ if (n == -1) - { - /* printf("NOTICE: problem reading from %s (%s)\n", PPATH, - strerror(errno)); */ -- } -- else -+ } else if ( n != 0 ) - { - pidfromfile = atoi(buff); - if (pidfromfile != (int)getpid() && !kill(pidfromfile, 0)) -@@ -675,10 +677,6 @@ - } - close(fd); - } -- else -- { -- printf("WARNING: problem opening %s: %s\n", PPATH, strerror(errno)); -- } - } - - /* -@@ -835,7 +833,7 @@ - } - #endif - --#if !defined(CHROOTDIR) || (defined(IRC_UID) && defined(IRC_GID)) -+#if !defined(CHROOTDIR) || (defined(IRC_UID) && defined(IRC_GID)) || (defined(IRC_USER) && defined(IRC_GROUP)) - - setuid(euid); - -@@ -862,6 +860,36 @@ - exit(-1); - } - -+#elif defined(IRC_USER) && defined(IRC_GROUP) -+ { -+ struct passwd *pe; -+ struct group *ge; -+ -+ /* run as a specified user and group */ -+ fprintf(stderr,"WARNING: running ircd as user %s\n", IRC_USER); -+ fprintf(stderr," and as group %s.\n",IRC_GROUP); -+ -+ if ((pe = getpwnam(IRC_USER)) == NULL) { -+ fprintf(stderr,"could not get definition of user " IRC_USER "\n"); -+ exit(1); -+ } -+ if ((ge = getgrnam(IRC_GROUP)) == NULL) { -+ fprintf(stderr,"could not get definition of group " IRC_GROUP "\n"); -+ exit(1); -+ } -+ -+ if (setgid(ge->gr_gid) < 0) -+ { -+ fprintf(stderr,"ERROR: can't setgid(%d)\n", ge->gr_gid); -+ exit(-1); -+ } -+ -+ if(setuid(pe->pw_uid) < 0) -+ { -+ fprintf(stderr,"ERROR: can't setuid(%d)\n", pe->pw_uid); -+ exit(-1); -+ } -+ } - #else - /* check for setuid root as usual */ - fprintf(stderr, diff --git a/chat/ircd-hybrid/patches/patch-af b/chat/ircd-hybrid/patches/patch-af deleted file mode 100644 index d9012f78b77..00000000000 --- a/chat/ircd-hybrid/patches/patch-af +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2001/10/21 21:26:52 seb Exp $ - ---- src/list.c.orig Wed Jul 18 04:15:27 2001 -+++ src/list.c -@@ -53,7 +53,9 @@ - for smaller nets who knows? -Dianora - */ - -+#ifndef LINK_PREALLOCATE - #define LINK_PREALLOCATE 1024 -+#endif - - /* Number of aClient structures to preallocate at a time - for Efnet 1024 is reasonable -@@ -64,7 +66,9 @@ - rather than 30k times -Dianora - */ - -+#ifndef USERS_PREALLOCATE - #define USERS_PREALLOCATE 1024 -+#endif - - void outofmemory(void); - diff --git a/chat/ircd-hybrid/patches/patch-ag b/chat/ircd-hybrid/patches/patch-ag deleted file mode 100644 index e1ea63296d9..00000000000 --- a/chat/ircd-hybrid/patches/patch-ag +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2001/10/21 21:26:52 seb Exp $ - ---- tools/Makefile.in.orig Tue Jul 10 14:40:38 2001 -+++ tools/Makefile.in -@@ -3,8 +3,9 @@ - CC=@CC@ - RM=@RM@ - --IRCDLIBS = @LIBS@ --INCLUDEDIR = -I../include -I../zlib -+IRCDLIBS = @LIBS@ -lz -+CPPFLAGS = -I../include @CPPFLAGS@ $(DEFS) -+LDFLAGS = @LDFLAGS@ - - mkpasswd_SOURCES = mkpasswd.c - mkpasswd_OBJECTS = mkpasswd.o -@@ -36,7 +37,7 @@ - $(RM) -f Makefile - - .c.o: -- $(CC) $(CFLAGS) $(INCLUDEDIR) -c $< -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< - - install: build - @echo "Please do a make install from the top level directory" -@@ -46,10 +47,3 @@ - lint: - lint -aacgprxhH $(INCLUDEDIR) $(mkpasswd_SOURCES) $(viconf_SOURCES) $(fixklines_SOURCES) >>../lint.out - @echo done -- --# DO NOT DELETE -- --mkpasswd.o: ../include/setup.h ../zlib/zlib.h --mkpasswd.o: ../zlib/zconf.h --viconf.o: ../include/config.h ../include/setup.h --viconf.o: ../zlib/zlib.h ../zlib/zconf.h |