diff options
30 files changed, 2 insertions, 1458 deletions
diff --git a/CVSROOT/modules b/CVSROOT/modules index b20292552bc7..317edee8cad5 100644 --- a/CVSROOT/modules +++ b/CVSROOT/modules @@ -1517,8 +1517,6 @@ dalbum ports/www/dalbum damageext ports/x11/damageext danamics ports/net/danamics dancer ports/irc/dancer -dancer-ircd ports/irc/dancer-ircd -dancer-services ports/irc/dancer-services dangerdeep ports/games/dangerdeep danpei ports/graphics/danpei dansguardian ports/www/dansguardian @@ -2223,3 +2223,5 @@ mail/pgp4pine||2006-03-18|Project is gone games/duke3d||2006-03-20|Remove expired port sysutils/stat||2006-03-20|Remove expired port sysutils/rubygem-switchtower|sysutils/rubygem-capistrano|2006-03-22|Project renamed +irc/dancer-ircd||2006-03-23|Has expired: mastersite disappeared, no longer maintained by author +irc/dancer-services||2006-03-23|Has expired: mastersite disappeared, no longer maintained by author diff --git a/irc/Makefile b/irc/Makefile index b9b9ac8de013..045b2b924031 100644 --- a/irc/Makefile +++ b/irc/Makefile @@ -13,8 +13,6 @@ SUBDIR += cgiirc SUBDIR += ctrlproxy SUBDIR += dancer - SUBDIR += dancer-ircd - SUBDIR += dancer-services SUBDIR += darkbot SUBDIR += dcc SUBDIR += dircproxy diff --git a/irc/dancer-ircd/Makefile b/irc/dancer-ircd/Makefile deleted file mode 100644 index f14517d11052..000000000000 --- a/irc/dancer-ircd/Makefile +++ /dev/null @@ -1,78 +0,0 @@ -# New ports collection makefile for: dancer-ircd -# Date Created: 14 April 2003 -# Whom: Akinori MUSHA aka knu <knu@idaemons.org> -# -# $FreeBSD$ -# - -PORTNAME= dancer-ircd -PORTVERSION= 1.0.35 -PORTREVISION= 1 -CATEGORIES= irc -MASTER_SITES= # -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - dancer-oper-guide.txt \ - dancer-user-guide.txt -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -MAINTAINER= ports@FreeBSD.org -COMMENT= An irc daemon based on hybrid ircd - -DEPRECATED= mastersite disappeared, no longer maintained by author -EXPIRATION_DATE= 2006-03-23 - -IGNOREFILES= dancer-oper-guide.txt \ - dancer-user-guide.txt - -USE_RC_SUBR= yes - -USE_REINPLACE= yes -USE_GMAKE= yes -GNU_CONFIGURE= yes - -.if !defined(PACKAGE_BUILDING) && !defined(BATCH) -IS_INTERACTIVE= yes -.endif - -.include <bsd.port.pre.mk> - -post-patch: - ${REINPLACE_CMD} 's:@@prefix@@:${PREFIX}:g' ${WRKSRC}/src/paths.c - -post-build: - ${SED} -e 's,%%PREFIX%%,${PREFIX},g' -e 's,%%RC_SUBR%%,${RC_SUBR},g' \ - ${FILESDIR}/dancer-ircd.sh > ${WRKDIR}/dancer-ircd.sh - -pre-install: - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -post-install: - ${INSTALL} -d -m 700 -o ircd -g ircd \ - ${PREFIX}/etc/dancer-ircd \ - /var/log/dancer-ircd \ - /var/run/dancer-ircd - ${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${PREFIX}/etc/dancer-ircd/ircd.conf.sample -.for f in kline.conf dline.conf motd ohelp omotd - ${TOUCH} ${PREFIX}/etc/dancer-ircd/${f}.sample -.endfor -.for f in ircd.conf kline.conf dline.conf motd ohelp omotd - if [ ! -f ${PREFIX}/etc/dancer-ircd/${f} ]; then \ - ${CP} ${PREFIX}/etc/dancer-ircd/${f}.sample ${PREFIX}/etc/dancer-ircd/${f}; \ - fi -.endfor - ${FIND} ${PREFIX}/etc/dancer-ircd -type d -print0 | \ - ${XARGS} -0 ${CHMOD} 700 - ${FIND} ${PREFIX}/etc/dancer-ircd -type f -print0 | \ - ${XARGS} -0 ${CHMOD} 600 - ${CHOWN} -R ircd:ircd ${PREFIX}/etc/dancer-ircd - ${INSTALL_SCRIPT} ${WRKDIR}/dancer-ircd.sh ${PREFIX}/etc/rc.d/ - ${SED} -e "s,/usr/local/,${PREFIX}/,g" ${PKGMESSAGE} -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} \ - ${DISTDIR}/${DIST_SUBDIR}/dancer-oper-guide.txt \ - ${DISTDIR}/${DIST_SUBDIR}/dancer-user-guide.txt \ - ${DOCSDIR}/ -.endif - -.include <bsd.port.post.mk> diff --git a/irc/dancer-ircd/distinfo b/irc/dancer-ircd/distinfo deleted file mode 100644 index c6b6f4e9b12e..000000000000 --- a/irc/dancer-ircd/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -MD5 (dancer-ircd-1.0.35.tar.gz) = da7f212ef5e1e9cca72002114727aaab -SHA256 (dancer-ircd-1.0.35.tar.gz) = 5c5de7ca3a7c9c5e0731e9ad8b3b139998dd175d1624965acccd2b882924952a -SIZE (dancer-ircd-1.0.35.tar.gz) = 604367 -MD5 (dancer-oper-guide.txt) = IGNORE -SHA256 (dancer-oper-guide.txt) = IGNORE -MD5 (dancer-user-guide.txt) = IGNORE -SHA256 (dancer-user-guide.txt) = IGNORE diff --git a/irc/dancer-ircd/files/dancer-ircd.sh b/irc/dancer-ircd/files/dancer-ircd.sh deleted file mode 100644 index adb0d2804def..000000000000 --- a/irc/dancer-ircd/files/dancer-ircd.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dancer-ircd -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: shutdown - -. %%RC_SUBR%% - -name=dancer_ircd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/dancer-ircd -pidfile=/var/run/dancer-ircd/dancer-ircd.pid -required_files=%%PREFIX%%/etc/dancer-ircd/ircd.conf - -[ -z "$dancer_ircd_enable" ] && dancer_ircd_enable=NO -[ -z "$dancer_ircd_user" ] && dancer_ircd_user=ircd - -load_rc_config $name - -run_rc_command "$1" diff --git a/irc/dancer-ircd/files/patch-Werror b/irc/dancer-ircd/files/patch-Werror deleted file mode 100644 index ea53855b11f0..000000000000 --- a/irc/dancer-ircd/files/patch-Werror +++ /dev/null @@ -1,358 +0,0 @@ ---- src/channel.c.orig Fri Feb 6 14:33:55 2004 -+++ src/channel.c Tue Apr 20 00:38:54 2004 -@@ -3894,23 +3894,23 @@ - { - sendto_match_servs(chptr, cptr, - ":%s SJOIN %lu %s + :@%s", me.name, -- chptr->channelts, name, sptr->name); -+ (unsigned long)chptr->channelts, name, sptr->name); - } - else - sendto_match_servs(chptr, cptr, - ":%s SJOIN %lu %s + :%s", me.name, -- chptr->channelts, name, sptr->name); -+ (unsigned long)chptr->channelts, name, sptr->name); - #else - sendto_match_servs(chptr, cptr, - ":%s SJOIN %lu %s + :@%s", me.name, -- chptr->channelts, name, sptr->name); -+ (unsigned long)chptr->channelts, name, sptr->name); - #endif - } - else if (MyClient(sptr)) - { - sendto_match_servs(chptr, cptr, - ":%s SJOIN %lu %s + :%s", me.name, -- chptr->channelts, name, sptr->name); -+ (unsigned long)chptr->channelts, name, sptr->name); - } - else - sendto_match_servs(chptr, cptr, ":%s JOIN :%s", sptr->name, -@@ -4652,7 +4652,7 @@ - sendto_one(sptr,":%s NOTICE %s :*** Notice -- Wait %.1ld seconds before another knock", - me.name, - sptr->name, -- KNOCK_DELAY - (CurrentTime - sptr->last_knock)); -+ KNOCK_DELAY - ((unsigned long)CurrentTime - sptr->last_knock)); - return 0; - } - -@@ -4766,9 +4766,9 @@ - strncpy_irc(chptr->topic_nick, sptr->name, NICKLEN + 1); - chptr->topic_time = CurrentTime; - #endif -- sendto_match_servs(chptr, cptr, ":%s STOPIC %s %s %.1ld %.1ld :%s", -+ sendto_match_servs(chptr, cptr, ":%s STOPIC %s %s %.1lu %.1lu :%s", - sptr->name, chptr->chname, sptr->name, -- chptr->topic_time, chptr->channelts, -+ (unsigned long)chptr->topic_time, (unsigned long)chptr->channelts, - chptr->topic); - sendto_channel_butserv(chptr, sptr, ":%s TOPIC %s :%s", - IsServer(sptr) ? NETWORK_NAME : sptr->name, chptr->chname, -@@ -5433,9 +5433,9 @@ - { - sendto_channel_butserv(chptr, &me, - ":%s NOTICE %s :*** Notice -- TS for %s changed from %lu to 0", -- me.name, chptr->chname, chptr->chname, oldts); -+ me.name, chptr->chname, chptr->chname, (unsigned long)oldts); - sendto_ops_flag(UMODE_SERVNOTICE, "Server %s changing TS on %s from %lu to 0", -- sptr->name,parv[2],oldts); -+ sptr->name,parv[2],(unsigned long)oldts); - } - - doesop = (parv[4+args][0] == '@' || parv[4+args][1] == '@'); -@@ -5970,7 +5970,7 @@ - } - sendto_channel_butserv(chptr, &me, - ":%s NOTICE %s :*** Notice -- TS for %s changed from %lu to %lu", -- me.name, chptr->chname, chptr->chname, oldts, newts); -+ me.name, chptr->chname, chptr->chname, (unsigned long)oldts, (unsigned long)newts); - } - if (mbuf != modebuf) - { ---- src/client.c.orig Tue Jul 8 14:41:54 2003 -+++ src/client.c Tue Apr 20 00:40:14 2004 -@@ -604,7 +604,8 @@ - currenttime - cptr->lasttime); - if (IsServer(cptr)) - logprintf(L_NOTICE, "Ping timeout: %.1lu seconds for %s", -- currenttime - cptr->lasttime, cptr->name); -+ (unsigned long)currenttime - (unsigned long)cptr->lasttime, -+ cptr->name); - - /* ugh. this is horrible. - * but I can get away with this hack because of the -@@ -1659,10 +1660,11 @@ - if (sptr->servptr == &me) - { - sendto_ops_flag(UMODE_SEEROUTING, "%s was connected to %s for %.1ld seconds. %d/%d sendK/recvK. (%s)", -- sptr->name, (char*) &me.name, CurrentTime - sptr->firsttime, -+ sptr->name, (char*) &me.name, -+ (unsigned long)CurrentTime - (unsigned long)sptr->firsttime, - sptr->sendK, sptr->receiveK, comment); -- logprintf(L_NOTICE, "%s was connected for %.1ld seconds. %d/%d sendK/recvK. (%s)", -- sptr->name, CurrentTime - sptr->firsttime, -+ logprintf(L_NOTICE, "%s was connected for %.1lu seconds. %d/%d sendK/recvK. (%s)", -+ sptr->name, (unsigned long)CurrentTime - (unsigned long)sptr->firsttime, - sptr->sendK, sptr->receiveK, comment); - - /* Just for paranoia... this shouldn't be necessary if the ---- src/m_kline.c.orig Wed Aug 20 04:45:53 2003 -+++ src/m_kline.c Tue Apr 20 01:03:29 2004 -@@ -818,12 +818,12 @@ - - #ifdef FULL_TIMEOUT_KLINES - if(temporary_kline_time) -- sendto_local_ops_flag(UMODE_SERVNOTICE, "%s added K-Line for [%s@%s] [%s], expiring at %.1ld (%d minutes)", -+ sendto_local_ops_flag(UMODE_SERVNOTICE, "%s added K-Line for [%s@%s] [%s], expiring at %.1lu (%d minutes)", - rcptr ? rcptr->name : sptr->name, - user, - host, - reason ? reason : "No reason", -- aconf->hold, temporary_kline_time); -+ (unsigned long)aconf->hold, temporary_kline_time); - else - #endif - sendto_local_ops_flag(UMODE_SERVNOTICE, "%s added K-Line for [%s@%s] [%s]", ---- src/m_pong.c.orig Tue Jul 8 14:41:55 2003 -+++ src/m_pong.c Tue Apr 20 00:42:21 2004 -@@ -128,7 +128,7 @@ - time_t ping; - sendto_ops_flag_butone(cptr, UMODE_SEEROUTING, - "%s acknowledged end of %s burst (%.1lu sec). %u messages in %u kB", -- sptr->name, me.name, CurrentTime - sptr->firsttime, -+ sptr->name, me.name, (unsigned long)CurrentTime - (unsigned long)sptr->firsttime, - sptr->sendM, sptr->sendK); - sendto_ops_flag_butflag_butone_hidefrom(cptr, UMODE_SERVNOTICE, UMODE_SEEROUTING, - "Burst complete, %s has linked", sptr->name); -@@ -168,8 +168,8 @@ - #if 0 - if (MyConnect(sptr)) /* This should never fail, with all dancer servers */ - { -- sendto_serv_butone(cptr, ":%s SPINGTIME %s %.1ld", me.name, sptr->name, -- (sptr->ping_time.tv_sec * 1000000) + sptr->ping_time.tv_usec); -+ sendto_serv_butone(cptr, ":%s SPINGTIME %s %.1lu", me.name, sptr->name, -+ (unsigned long)(sptr->ping_time.tv_sec * 1000000) + (unsigned long)sptr->ping_time.tv_usec); - } - #endif - } ---- src/m_set.c.orig Tue Jul 8 14:41:55 2003 -+++ src/m_set.c Tue Apr 20 00:42:48 2004 -@@ -466,10 +466,10 @@ - } - else - { -- sendto_one(sptr, ":%s NOTICE %s :SPLITDELAY is currently %.1li", -+ sendto_one(sptr, ":%s NOTICE %s :SPLITDELAY is currently %.1lu", - me.name, - parv[0], -- SPLITDELAY/60); -+ (unsigned long)SPLITDELAY/60); - } - return 0; - break; ---- src/m_snick.c.orig Sun Sep 7 13:49:46 2003 -+++ src/m_snick.c Tue Apr 20 00:43:21 2004 -@@ -93,8 +93,9 @@ - if (parc > 4) - acptr->firsttime = atol(parv[4]); - -- sendto_serv_butone(cptr, "SNICK %s %s %s %.1ld", acptr->name, -- acptr->origname, acptr->spoofhost, acptr->firsttime); -+ sendto_serv_butone(cptr, "SNICK %s %s %s %.1lu", acptr->name, -+ acptr->origname, acptr->spoofhost, -+ (unsigned long)acptr->firsttime); - - return 0; - } ---- src/m_svinfo.c.orig Tue Jul 8 14:41:55 2003 -+++ src/m_svinfo.c Tue Apr 20 00:45:05 2004 -@@ -133,16 +133,22 @@ - if (deltat > TS_MAX_DELTA) - { - sendto_ops_flag(UMODE_SERVNOTICE, -- "Link %s dropped, excessive TS delta (my TS=%.1ld, their TS=%.1ld, delta=%.1ld)", -- get_client_name(sptr, MASK_IP), CurrentTime, theirtime,deltat); -+ "Link %s dropped, excessive TS delta (my TS=%.1lu, their TS=%.1lu, delta=%.1lu)", -+ get_client_name(sptr, MASK_IP), -+ (unsigned long)CurrentTime, -+ (unsigned long)theirtime, -+ (unsigned long)deltat); - return exit_client(sptr, sptr, sptr, "Excessive TS delta"); - } - - if (deltat > TS_WARN_DELTA) - { - sendto_ops_flag(UMODE_SERVNOTICE, -- "Link %s notable TS delta (my TS=%.1ld, their TS=%.1ld, delta=%.1ld)", -- get_client_name(sptr, MASK_IP), CurrentTime, theirtime, deltat); -+ "Link %s notable TS delta (my TS=%.1lu, their TS=%.1lu, delta=%.1lu)", -+ get_client_name(sptr, MASK_IP), -+ (unsigned long)CurrentTime, -+ (unsigned long)theirtime, -+ (unsigned long)deltat); - } - - return 0; ---- src/res.c.orig Tue Jul 8 14:41:55 2003 -+++ src/res.c Tue Apr 20 00:51:00 2004 -@@ -265,8 +265,8 @@ - * From bind 8.3, these aren't in earlier versions of bind - * - */ --extern u_short _getshort(const u_char *); --extern u_int _getlong(const u_char *); -+/*extern u_short _getshort(const u_char *);*/ -+/*extern u_int _getlong(const u_char *);*/ - /* - * int - * res_isourserver(ina) -@@ -503,7 +503,7 @@ - else { - request->sentat = now; - request->timeout += request->timeout / 2; -- logprintf(L_WARN, "DNS lookup timed out, new timeout %lu, retries %d", request->timeout, request->retries); -+ logprintf(L_WARN, "DNS lookup timed out, new timeout %lu, retries %d", (unsigned long)request->timeout, request->retries); - resend_query(request); - #ifdef DEBUG - Debug((DEBUG_INFO,"r %x now %d retry %d c %x", -@@ -1715,8 +1715,8 @@ - if (parv[1] && *parv[1] == 'l') { - for(cp = cacheTop; cp; cp = cp->list_next) { - hp = &cp->he.h; -- sendto_one(sptr, "NOTICE %s :Ex %.1ld ttl %.1ld host %s(%s)", -- parv[0], cp->expireat - CurrentTime, cp->ttl, -+ sendto_one(sptr, "NOTICE %s :Ex %.1lu ttl %.1lu host %s(%s)", -+ parv[0], (unsigned long)(cp->expireat - CurrentTime), (unsigned long)cp->ttl, - hp->h_name, inetntoa(hp->h_addr)); - for (i = 0; hp->h_aliases[i]; i++) - sendto_one(sptr,"NOTICE %s : %s = %s (CN)", ---- src/s_debug.c.orig Tue Jul 8 14:41:56 2003 -+++ src/s_debug.c Tue Apr 20 00:53:00 2004 -@@ -155,10 +155,10 @@ - - - sendto_one(cptr, -- ":%s %d %s :CPU Secs %ld:%ld User %ld:%ld System %ld:%ld", -- me.name, RPL_STATSDEBUG, nick, secs / 60, secs % 60, -- rus.ru_utime.tv_sec / 60, rus.ru_utime.tv_sec % 60, -- rus.ru_stime.tv_sec / 60, rus.ru_stime.tv_sec % 60); -+ ":%s %d %s :CPU Secs %lu:%lu User %lu:%lu System %lu:%lu", -+ me.name, RPL_STATSDEBUG, nick, (unsigned long)secs / 60, (unsigned long)secs % 60, -+ (unsigned long)rus.ru_utime.tv_sec / 60, (unsigned long)rus.ru_utime.tv_sec % 60, -+ (unsigned long)rus.ru_stime.tv_sec / 60, (unsigned long)rus.ru_stime.tv_sec % 60); - sendto_one(cptr, ":%s %d %s :RSS %ld ShMem %ld Data %ld Stack %ld", - me.name, RPL_STATSDEBUG, nick, rus.ru_maxrss, - rus.ru_ixrss / rup, rus.ru_idrss / rup, rus.ru_isrss / rup); ---- src/s_serv.c.orig Thu Dec 4 04:19:47 2003 -+++ src/s_serv.c Tue Apr 20 00:57:25 2004 -@@ -485,7 +485,7 @@ - if (IsPerson(acptr)) - { - sendto_one(cptr, "NICK %s %d %lu +%s %s %s %s %s :%s", acptr->name, -- acptr->hopcount + 1, acptr->tsinfo, umodes_as_string(&acptr->umodes), -+ acptr->hopcount + 1, (unsigned long)acptr->tsinfo, umodes_as_string(&acptr->umodes), - acptr->username, acptr->host, - acptr->user->server, inetntoa((char *)&acptr->ip.s_addr), acptr->info); - { -@@ -495,8 +495,8 @@ - sendto_one(cptr, ":%s OPER %s +%s", me.name, acptr->name, - umodes_as_string(&privs)); - } -- sendto_one(cptr, ":%s SNICK %s %s %s %.1ld", me.name, acptr->name, -- acptr->origname, acptr->spoofhost, acptr->firsttime); -+ sendto_one(cptr, ":%s SNICK %s %s %s %.1lu", me.name, acptr->name, -+ acptr->origname, acptr->spoofhost, (unsigned long)acptr->firsttime); - /* Let's propogate AWAY status in the burst as well */ - if (acptr->user->away) - sendto_one(cptr, ":%s AWAY :%s", acptr->name, acptr->user->away); -@@ -728,7 +728,7 @@ - ClearCap(cptr, CAP_ZIP); - #endif /* ZIP_LINKS */ - -- sendto_one(cptr,"SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN, CurrentTime); -+ sendto_one(cptr,"SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN, (unsigned long)CurrentTime); - - det_confs_butmask(cptr, CONF_LEAF|CONF_HUB|CONF_NOCONNECT_SERVER); - release_client_dns_reply(cptr); -@@ -872,7 +872,7 @@ - } - else - { -- sendto_one(cptr, ":%s UNKLINE %s %.1ld", me.name, ukr2->mask, ukr2->placed); -+ sendto_one(cptr, ":%s UNKLINE %s %.1lu", me.name, ukr2->mask, (unsigned long)ukr2->placed); - sent_unkline = 1; - } - } -@@ -919,9 +919,9 @@ - send_channel_modes(cptr, chptr); - #ifdef TOPIC_INFO - if (chptr->topic_time) -- sendto_one(cptr,":%s STOPIC %s %s %.1ld %.1ld :%s", -+ sendto_one(cptr,":%s STOPIC %s %s %.1lu %.1lu :%s", - me.name, chptr->chname, chptr->topic_nick, -- chptr->topic_time, chptr->channelts, -+ (unsigned long)chptr->topic_time, (unsigned long)chptr->channelts, - chptr->topic); - #endif - } -@@ -1022,7 +1022,7 @@ - sendto_one(cptr, ":%s %d %s :%s (%s!%s@%s) Idle: %.1ld", - me.name, RPL_STATSDEBUG, cptr->name, cptr2->name, - (cptr2->serv->by[0] ? cptr2->serv->by : "Remote."), -- "*", "*", CurrentTime - cptr2->lasttime); -+ "*", "*", (unsigned long)(CurrentTime - cptr2->lasttime)); - - /* - * NOTE: moving the username and host to the client struct ---- src/s_stats.c.orig Tue Jul 8 14:41:56 2003 -+++ src/s_stats.c Tue Apr 20 00:57:41 2004 -@@ -125,7 +125,7 @@ - me.name, RPL_STATSDEBUG, name, - sp->is_ckr, sp->is_cbr, sp->is_skr, sp->is_sbr); - sendto_one(cptr, ":%s %d %s :time connected %.1lu %.1lu", -- me.name, RPL_STATSDEBUG, name, sp->is_cti, sp->is_sti); -+ me.name, RPL_STATSDEBUG, name, (unsigned long)sp->is_cti, (unsigned long)sp->is_sti); - #ifdef FLUD - sendto_one(cptr, ":%s %d %s :CTCP Floods Blocked %u", - me.name, RPL_STATSDEBUG, name, sp->is_flud); ---- src/s_user.c.orig Thu Aug 7 03:36:13 2003 -+++ src/s_user.c Tue Apr 20 00:58:27 2004 -@@ -920,7 +920,7 @@ - if (!IsHoneypot(sptr)) - { - sendto_serv_butone(cptr, "NICK %s %d %lu +%s %s %s %s %s :%s", -- nick, sptr->hopcount+1, sptr->tsinfo, -+ nick, sptr->hopcount+1, (unsigned long)sptr->tsinfo, - umodes_as_string(&sptr->umodes), - sptr->username, sptr->host, user->server, - inetntoa((char *)&sptr->ip.s_addr), -@@ -931,8 +931,8 @@ - * correct value - */ - if (MyConnect(sptr) && strcmp(sptr->spoofhost, SPOOF_LIMIT_HOST) != 0) -- sendto_serv_butone(NULL, "SNICK %s %s %s %.1ld", sptr->name, -- sptr->origname, sptr->spoofhost, sptr->firsttime); -+ sendto_serv_butone(NULL, "SNICK %s %s %s %.1lu", sptr->name, -+ sptr->origname, sptr->spoofhost, (unsigned long)sptr->firsttime); - } - - if (sptr->user) -@@ -1250,7 +1250,7 @@ - add_history(sptr,1); - - sendto_serv_butone(cptr, ":%s NICK %s :%lu", -- parv[0], nick, sptr->tsinfo); -+ parv[0], nick, (unsigned long)sptr->tsinfo); - /* This global message will reset the idle time everywhere, so - * reset the last_sent counter as well - */ -@@ -1281,7 +1281,7 @@ - { - add_history(sptr,1); - sendto_serv_butone(cptr, ":%s NICK %s :%lu", -- parv[0], nick, sptr->tsinfo); -+ parv[0], nick, (unsigned long)sptr->tsinfo); - sptr->user->last_sent = CurrentTime; - - sendto_local_ops_flag(UMODE_NCHANGE, diff --git a/irc/dancer-ircd/files/patch-config.h b/irc/dancer-ircd/files/patch-config.h deleted file mode 100644 index 66c33048ffe6..000000000000 --- a/irc/dancer-ircd/files/patch-config.h +++ /dev/null @@ -1,13 +0,0 @@ ---- include/config.h.orig Sun Feb 15 02:11:26 2004 -+++ include/config.h Tue Apr 20 00:29:14 2004 -@@ -66,8 +66,8 @@ - * system limits. If you know what you are doing, increase them now - */ - --#define HARD_FDLIMIT_ 256 /* was 256 */ --#define INIT_MAXCLIENTS 200 /* was 200 */ -+#define HARD_FDLIMIT_ 512 /* was 256 */ -+#define INIT_MAXCLIENTS 400 /* was 200 */ - - /* - * This is how many 'buffer connections' we allow... diff --git a/irc/dancer-ircd/files/patch-config.h.fn-include b/irc/dancer-ircd/files/patch-config.h.fn-include deleted file mode 100644 index f1d83f5eba72..000000000000 --- a/irc/dancer-ircd/files/patch-config.h.fn-include +++ /dev/null @@ -1,66 +0,0 @@ ---- include/config.h.fn-include.orig Wed Aug 20 05:04:07 2003 -+++ include/config.h.fn-include Fri Nov 14 05:29:23 2003 -@@ -109,17 +109,17 @@ - /* NETWORK_NAME - * Displayed in place of the servername when SERVERHIDE is enabled - */ --#define NETWORK_NAME "irc.freenode.net" -+#define NETWORK_NAME "irc.example.net" - - /* NETWORK_REALNAME - * Displayed in RPL_WELCOME (at least). Don't put punctuation in here. - */ --#define NETWORK_REALNAME "freenode IRC" -+#define NETWORK_REALNAME "Local IRC" - - /* NETWORK_DESC - * Displayed in place of the server info when SERVERHIDE is enabled - */ --#define NETWORK_DESC "http://freenode.net/" -+#define NETWORK_DESC "http://www.example.net/" - - /* USE_SERVICES - * Defines whether or not you're using services on your network -@@ -637,7 +637,7 @@ - * the net. for a leaf, 2 is fine. If the number of servers seen - * on the net gets less than 2, a split is deemed to have happened. - */ --#define SPLIT_SMALLNET_SIZE 10 -+#define SPLIT_SMALLNET_SIZE 0 - - /* - * SPLIT_SMALLNET_USER_SIZE defines how many global users on the -@@ -647,7 +647,7 @@ - * number of users seen on net > SPLIT_SMALLNET_USER_SIZE start - * counting down the SERVER_SPLIT_RECOVERY_TIME - */ --#define SPLIT_SMALLNET_USER_SIZE 500 /* was 10000 */ -+#define SPLIT_SMALLNET_USER_SIZE 0 /* was 10000 */ - - /* - * SPLIT_PONG will send a PING to a server after the connect burst. -@@ -657,13 +657,13 @@ - * you should be able to crank DEFAULT_SERVER_SPLIT_RECOVERY_TIME - * down to 1. - */ --#define SPLIT_PONG -+#undef SPLIT_PONG - - /* - * DEFAULT_SERVER_SPLIT_RECOVERY_TIME - determines how long to delay split - * status after resyncing - */ --#define DEFAULT_SERVER_SPLIT_RECOVERY_TIME 1 -+#define DEFAULT_SERVER_SPLIT_RECOVERY_TIME 0 - - /* LIMIT_UH - * If this is defined, Y line limit is made against the actual -@@ -787,7 +787,7 @@ - * it will show up in /list - */ - --#define MIN_USERS_FOR_LIST 4 -+#define MIN_USERS_FOR_LIST 2 - - /* USE_KNOCK - * KNOCK allows users to send a "knock" to a +i channel. diff --git a/irc/dancer-ircd/files/patch-irc_string.c b/irc/dancer-ircd/files/patch-irc_string.c deleted file mode 100644 index bb43889317b4..000000000000 --- a/irc/dancer-ircd/files/patch-irc_string.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/irc_string.c.orig Tue Jul 8 14:41:54 2003 -+++ src/irc_string.c Tue Apr 20 00:33:19 2004 -@@ -139,6 +139,7 @@ - - char* strip_colour(char* string) - { -+#if 0 - char *c = string; - char *c2 = string; - char *last_non_space = NULL; -@@ -173,6 +174,7 @@ - *c2 = '\0'; - if (last_non_space) - *last_non_space = '\0'; -+#endif - return string; - } - diff --git a/irc/dancer-ircd/files/patch-paths.c b/irc/dancer-ircd/files/patch-paths.c deleted file mode 100644 index aa6de659a542..000000000000 --- a/irc/dancer-ircd/files/patch-paths.c +++ /dev/null @@ -1,37 +0,0 @@ ---- src/paths.c.orig Sat Nov 8 01:28:44 2003 -+++ src/paths.c Tue Apr 20 00:33:19 2004 -@@ -64,20 +64,20 @@ - */ - - #define DPATH PREFIX "/" --#define SPATH "sbin/dancer-ircd" --#define CPATH "etc/dancer-ircd/ircd.conf" --#define MPATH "etc/dancer-ircd/motd" --#define HPATH "etc/dancer-ircd/ohelp" --#define OPATH "etc/dancer-ircd/omotd" --#define LPATH "var/log/dancer-ircd/ircd.log" --#define HLBASE "var/log/dancer-ircd/hash" --#define USERLOG "var/log/dancer-ircd/user.log" --#define OPERLOG "var/log/dancer-ircd/oper.log" --#define PPATH "var/run/dancer-ircd/dancer-ircd.pid" --#define KPATH "var/lib/dancer-ircd/kline.conf" --#define DLPATH "var/lib/dancer-ircd/dline.conf" --#define MXPATH "var/lib/dancer-ircd/ircd.max" --#define DUMPPATH "var/lib/dancer-ircd/dump" -+#define SPATH "/usr/local/sbin/dancer-ircd" -+#define CPATH "/usr/local/etc/dancer-ircd/ircd.conf" -+#define MPATH "/usr/local/etc/dancer-ircd/motd" -+#define HPATH "/usr/local/etc/dancer-ircd/ohelp" -+#define OPATH "/usr/local/etc/dancer-ircd/omotd" -+#define LPATH "/var/log/dancer-ircd/ircd.log" -+#define HLBASE "/var/log/dancer-ircd/hash" -+#define USERLOG "/var/log/dancer-ircd/user.log" -+#define OPERLOG "/var/log/dancer-ircd/oper.log" -+#define PPATH "/var/run/dancer-ircd/dancer-ircd.pid" -+#define KPATH "/usr/local/etc/dancer-ircd/kline.conf" -+#define DLPATH "/usr/local/etc/dancer-ircd/dline.conf" -+#define MXPATH "/usr/local/etc/dancer-ircd/ircd.max" -+#define DUMPPATH "/usr/local/etc/dancer-ircd/dump" - - const char *work_dir = DPATH; - const char *config_file = CPATH; diff --git a/irc/dancer-ircd/pkg-deinstall b/irc/dancer-ircd/pkg-deinstall deleted file mode 100644 index 1e87c9ff95aa..000000000000 --- a/irc/dancer-ircd/pkg-deinstall +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "$BATCH" ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - echo ${answer} -} - -yesno() { - local dflt question answer - - question=$1 - dflt=$2 - while :; do - answer=$(ask "${question}" "${dflt}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - echo "Please answer yes or no." - done -} - -delete_account() { - local u g - - u=$1 - g=$2 - if yesno "Do you want me to remove group \"${g}\"" y; then - pw groupdel -n ${g} - echo "Done." - fi - if yesno "Do you want me to remove user \"${u}\"" y; then - pw userdel -n ${u} - echo "Done." - fi -} - -if [ "$2" != "POST-DEINSTALL" ]; then - exit 0 -fi - -if [ -n "$PACKAGE_BUILDING" ]; then - delete_account ircd ircd -fi diff --git a/irc/dancer-ircd/pkg-descr b/irc/dancer-ircd/pkg-descr deleted file mode 100644 index 842d21da605b..000000000000 --- a/irc/dancer-ircd/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -This is the ircd designed for use on freenode.net, based on the hybrid -ircd used by efnet. - -This port/package is configured for use on a small network or -standalone, and the escape code filter is disabled. To use it on a -large and/or Western language only network, please re-configure -config.h and rebuild. diff --git a/irc/dancer-ircd/pkg-install b/irc/dancer-ircd/pkg-install deleted file mode 100644 index 847e54041e1c..000000000000 --- a/irc/dancer-ircd/pkg-install +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh - -# This script is a modified copy of the pkg-install script from the -# original ircd-hybrid port, by desmo@bandwidth.org. - -if [ "x$2" != "xPRE-INSTALL" ]; then - exit 0; -fi - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${BATCH}" ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - echo ${answer} -} - -yesno() { - local dflt question answer - - question=$1 - dflt=$2 - while :; do - answer=$(ask "${question}" "${dflt}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - echo "Please answer yes or no." - done -} - -if ! which -s pw ; then - cat <<EOF -Your system does not include the "pw" utility. You should upgrade -to a newer version of FreeBSD. Without "pw" this script will not -run. -EOF - exit 1 -fi - -uid=72 -user=ircd -gid=$uid -group=$user -gecos="IRC daemon" -shell=/nonexistent -home=/nonexistent - -echo "" -if pw groupshow $group 2> /dev/null ; then - echo "You already have a group \"$group\", so I will use it." -else - if pw groupshow $gid 2> /dev/null ; then - echo "You already have a gid \"$gid\". Please create a user \"$group\"" - echo "with a default group of \"$group\"." - exit 1 - fi - echo "You need a group \"$group\"." - if which -s pw && yesno "Would you like me to create it" y; then - pw groupadd $group -g $gid || exit - echo "Done." - else - echo "Please create it, and try again." - if ! pw usershow $user 2> /dev/null ; then - echo "While you're at it, please create a user \"$user\"" - echo 'too, with a default group of "$group".' - fi - exit 1 - fi -fi - -if pw usershow $user 2> /dev/null ; then - echo "You already have a user \"$user\", so I will use it." -else - if pw usershow $uid 2> /dev/null ; then - echo "You already have a uid \"$uid\". Please create a user \"irc -d\"" - echo "with a default group of \"$group\"." - exit 1 - fi - echo "You need a user \"$user\"." - if which -s pw && yesno "Would you like me to create it" y; then - pw useradd $user -g $group -u $uid -h - -d $home \ - -s $shell -c "$gecos" || exit - echo "Done." - else - echo "Please create it, and try again." - exit 1 - fi -fi diff --git a/irc/dancer-ircd/pkg-message b/irc/dancer-ircd/pkg-message deleted file mode 100644 index 3b14e79a5dc1..000000000000 --- a/irc/dancer-ircd/pkg-message +++ /dev/null @@ -1,9 +0,0 @@ -dancer-ircd has now been installed. - -Please configure /usr/local/etc/dancer-ircd/ircd.conf to suit your -needs, and you may then start the server by running: - - /usr/local/etc/rc.d/dancer-ircd.sh start - -To make it automatically run on (the next) startup, you must add -``dancer_ircd_enable=YES'' to /etc/rc.conf. diff --git a/irc/dancer-ircd/pkg-plist b/irc/dancer-ircd/pkg-plist deleted file mode 100644 index 5baf7b760250..000000000000 --- a/irc/dancer-ircd/pkg-plist +++ /dev/null @@ -1,25 +0,0 @@ -sbin/dancer-ircd -@unexec if cmp -s %D/etc/dancer-ircd/ircd.conf %D/etc/dancer-ircd/ircd.conf.sample; then rm -f %D/etc/dancer-ircd/ircd.conf; fi -etc/dancer-ircd/ircd.conf.sample -@exec if [ ! -f %B/ircd.conf ]; then cp %B/%f %B/ircd.conf; fi -@unexec if cmp -s %D/etc/dancer-ircd/motd %D/etc/dancer-ircd/motd.sample; then rm -f %D/etc/dancer-ircd/motd; fi -etc/dancer-ircd/motd.sample -@exec if [ ! -f %B/motd ]; then cp %B/%f %B/motd; fi -@unexec if cmp -s %D/etc/dancer-ircd/kline.conf %D/etc/dancer-ircd/kline.conf.sample; then rm -f %D/etc/dancer-ircd/kline.conf; fi -etc/dancer-ircd/kline.conf.sample -@exec if [ ! -f %B/kline.conf ]; then cp %B/%f %B/kline.conf; fi -@unexec if cmp -s %D/etc/dancer-ircd/dline.conf %D/etc/dancer-ircd/dline.conf.sample; then rm -f %D/etc/dancer-ircd/dline.conf; fi -etc/dancer-ircd/dline.conf.sample -@exec if [ ! -f %B/dline.conf ]; then cp %B/%f %B/dline.conf; fi -@unexec if cmp -s %D/etc/dancer-ircd/ohelp %D/etc/dancer-ircd/ohelp.sample; then rm -f %D/etc/dancer-ircd/ohelp; fi -etc/dancer-ircd/ohelp.sample -@exec if [ ! -f %B/ohelp ]; then cp %B/%f %B/ohelp; fi -@unexec if cmp -s %D/etc/dancer-ircd/omotd %D/etc/dancer-ircd/omotd.sample; then rm -f %D/etc/dancer-ircd/omotd; fi -etc/dancer-ircd/omotd.sample -@exec if [ ! -f %B/omotd ]; then cp %B/%f %B/omotd; fi -etc/rc.d/dancer-ircd.sh -@exec install -d -o ircd -g ircd -m 700 /var/log/dancer-ircd /var/run/dancer-ircd -@unexec rmdir %D/etc/dancer-ircd /var/log/dancer-ircd /var/run/dancer-ircd 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/dancer-ircd /var/log/dancer-ircd /var/run/dancer-ircd`` to remove any configuration files and log files left." | fmt -%%PORTDOCS%%%%DOCSDIR%%/dancer-oper-guide.txt -%%PORTDOCS%%%%DOCSDIR%%/dancer-user-guide.txt -%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/irc/dancer-services/Makefile b/irc/dancer-services/Makefile deleted file mode 100644 index 777bf776f431..000000000000 --- a/irc/dancer-services/Makefile +++ /dev/null @@ -1,84 +0,0 @@ -# New ports collection makefile for: dancer-services -# Date Created: 14 April 2003 -# Whom: Akinori MUSHA aka knu <knu@idaemons.org> -# -# $FreeBSD$ -# - -PORTNAME= dancer-services -PORTVERSION= 1.8.0.6.9 -PORTREVISION= 2 -CATEGORIES= irc -MASTER_SITES= # - -MAINTAINER= ports@FreeBSD.org -COMMENT= The IRC services (nickserv, chanserv, etc.) for dancer-ircd - -DEPRECATED= mastersite disappeared, no longer maintained by author -EXPIRATION_DATE= 2006-03-23 - -USE_AUTOTOOLS= automake:15:env autoconf:253:env -USE_RC_SUBR= yes -USE_GMAKE= yes -GNU_CONFIGURE= yes - -MAKE_ARGS= BINDIR=${PREFIX}/sbin \ - CONFDIR=${PREFIX}/etc/dancer-services \ - HELPDIR=${PREFIX}/share/dancer-services/help \ - WHOAMI=root - -.if !defined(PACKAGE_BUILDING) && !defined(BATCH) -IS_INTERACTIVE= yes -.endif - -post-patch: - ${REINPLACE_CMD} 's:@@prefix@@:${PREFIX}:g' \ - ${WRKSRC}/bin/services.conf \ - ${WRKSRC}/bin/settings.conf.in - -pre-configure: - cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./autogen.sh - -pre-build: - cd ${WRKSRC}; ${MAKE} depend - -post-build: - ${SED} -e 's,%%PREFIX%%,${PREFIX},g' -e 's,%%RC_SUBR%%,${RC_SUBR},g' \ - ${FILESDIR}/dancer-services.sh > ${WRKDIR}/dancer-services.sh - -pre-install: - ${MKDIR} ${PREFIX}/share/dancer-services - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -post-install: - ${FIND} ${PREFIX}/share/dancer-services -type d -print0 | \ - ${XARGS} -0 ${CHMOD} 755 - ${FIND} ${PREFIX}/share/dancer-services -type f -print0 | \ - ${XARGS} -0 ${CHMOD} ${SHAREMODE} - ${INSTALL} -d -m 700 -o ircservices -g ircservices \ - /var/log/dancer-services \ - /var/run/dancer-services -.for f in motd.dcc motd.global services.conf settings.conf - ${INSTALL_DATA} ${WRKSRC}/bin/${f} ${PREFIX}/etc/dancer-services/${f}.sample -.endfor -.for f in glines.conf jupes.conf logon.news - ${TOUCH} ${PREFIX}/etc/dancer-services/${f}.sample - if [ ! -f ${PREFIX}/etc/dancer-services/${f} ]; then \ - ${CP} ${PREFIX}/etc/dancer-services/${f}.sample ${PREFIX}/etc/dancer-services/${f}; \ - fi -.endfor - ${FIND} ${PREFIX}/etc/dancer-services -type d -print0 | \ - ${XARGS} -0 ${CHMOD} 700 - ${FIND} ${PREFIX}/etc/dancer-services -type f -print0 | \ - ${XARGS} -0 ${CHMOD} 600 - ${CHOWN} -R ircservices:ircservices ${PREFIX}/etc/dancer-services - ${INSTALL_SCRIPT} ${WRKDIR}/dancer-services.sh ${PREFIX}/etc/rc.d/ - ${SED} -e "s,%%PREFIX%%,${PREFIX}/,g" ${PKGMESSAGE} -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for f in ChangeLog README - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/ -.endfor -.endif - -.include <bsd.port.mk> diff --git a/irc/dancer-services/distinfo b/irc/dancer-services/distinfo deleted file mode 100644 index 2b0e08c7cab0..000000000000 --- a/irc/dancer-services/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (dancer-services-1.8.0.6.9.tar.gz) = 6bae1c044de43598b92f944c57fd5f91 -SHA256 (dancer-services-1.8.0.6.9.tar.gz) = 3bb12771ebd6203ed98b857b61af3f4b132a8c26d72a1f782819f9e10adc763d -SIZE (dancer-services-1.8.0.6.9.tar.gz) = 336842 diff --git a/irc/dancer-services/files/dancer-services.sh b/irc/dancer-services/files/dancer-services.sh deleted file mode 100644 index 82749206d15c..000000000000 --- a/irc/dancer-services/files/dancer-services.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dancer-services - -. %%RC_SUBR%% - -name=dancer_services -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/dancer-services -pidfile=/var/run/dancer-services/dancer-services.pid -required_files=%%PREFIX%%/etc/dancer-services/services.conf - -[ -z "$dancer_services_enable" ] && dancer_services_enable=NO -[ -z "$dancer_services_user" ] && dancer_services_user=ircservices - -load_rc_config $name - -run_rc_command "$1" diff --git a/irc/dancer-services/files/patch-config.h.in b/irc/dancer-services/files/patch-config.h.in deleted file mode 100644 index 953f1718325c..000000000000 --- a/irc/dancer-services/files/patch-config.h.in +++ /dev/null @@ -1,11 +0,0 @@ ---- include/config.h.in.orig Sun May 12 00:46:26 2002 -+++ include/config.h.in Tue Apr 15 19:01:09 2003 -@@ -6,7 +6,7 @@ - * it. -kre - */ - --#define SETPATH "@prefix@/dancer-services/settings.conf" -+#define SETPATH "@prefix@/etc/dancer-services/settings.conf" - - /* - * Define this to enable NickServ (Nickname Services) diff --git a/irc/dancer-services/files/patch-dcc.c b/irc/dancer-services/files/patch-dcc.c deleted file mode 100644 index 993163207bde..000000000000 --- a/irc/dancer-services/files/patch-dcc.c +++ /dev/null @@ -1,11 +0,0 @@ ---- source/dcc.c.orig Wed Nov 14 04:49:45 2001 -+++ source/dcc.c Fri Apr 25 04:07:12 2003 -@@ -1057,7 +1057,7 @@ - - if (ircncmp(msg, "PING", 4) == 0) - { -- notice(target, nick, msg - 1); -+ notice(target, nick, "%s", msg - 1); - SendUmode(OPERUMODE_Y, - "%s: CTCP PING received from %s!%s@%s", - target, diff --git a/irc/dancer-services/files/patch-log.c b/irc/dancer-services/files/patch-log.c deleted file mode 100644 index e9ed377a0528..000000000000 --- a/irc/dancer-services/files/patch-log.c +++ /dev/null @@ -1,14 +0,0 @@ ---- source/log.c.orig Wed Nov 14 04:49:45 2001 -+++ source/log.c Fri Apr 25 04:02:23 2003 -@@ -214,9 +214,8 @@ - va_end(args); - - /* log the command */ -- stripformatsymbols( buffer ); -- putlog(LOG2, buffer); -+ putlog(LOG2, "%s", buffer); - - /* send it to opers with usermode +s */ -- SendUmode(OPERUMODE_S, buffer); -+ SendUmode(OPERUMODE_S, "%s", buffer); - } /* RecordCommand() */ diff --git a/irc/dancer-services/files/patch-server.c b/irc/dancer-services/files/patch-server.c deleted file mode 100644 index a9419f9011c7..000000000000 --- a/irc/dancer-services/files/patch-server.c +++ /dev/null @@ -1,15 +0,0 @@ ---- source/server.c.orig Tue Mar 25 06:09:13 2003 -+++ source/server.c Fri Apr 25 04:09:10 2003 -@@ -1029,12 +1029,6 @@ - I moved this code from below for smoother source tweak -kre */ - command = av[3] + 1; - -- /* Obviously, this code down strips '%'. But what if some valid string -- contains regular '%' and it should _not_ be stripped, ie. passwd -- string? So, I'll add search for IDENTIFY string. -kre */ -- if (ircncmp(command, "IDENTIFY", 8)) -- stripformatsymbols(av[3]); -- - if (RestrictedAccess) - { - /* diff --git a/irc/dancer-services/files/patch-services.conf b/irc/dancer-services/files/patch-services.conf deleted file mode 100644 index 5c23c19d14a0..000000000000 --- a/irc/dancer-services/files/patch-services.conf +++ /dev/null @@ -1,63 +0,0 @@ ---- bin/services.conf.orig Tue Jul 31 21:12:57 2001 -+++ bin/services.conf Tue Apr 15 18:27:34 2003 -@@ -7,14 +7,14 @@ - # This should contain the name(s) and email(s) of the services - # administrator(s) - just to tell users who to contact w/ questions - --A:Open Projects <support@openprojects.net> -+A:Dancer-services admin <support@locahost> - - # The first field is the name you want the services server to be. It - # should match the C/N lines of the hub server. The second field is - # the text info for the services (it corresponds to the third field - # in a server's M line) - --N:services1.openprojects.net:Services -+N:services.:Local services - - # This line should contain three fields. In order, the password for - # the connection, the hostname (or IP address) of the hub server to -@@ -25,7 +25,7 @@ - # and so on. - # (The password must match the C/N lines of the hub server). - --S:password:pratchett.openprojects.net:8007 -+S:password:localhost:6667 - #S:ConnectPassword:irc.hub.net:6667 - #S:DumbPass:irc.althub.net:6666 - #S:Services:irc.anotherhub.net: -@@ -50,25 +50,25 @@ - # is defined in config.h (which is the default) - use - # mkpasswd to generate the password - --O:servadmin@services.com:DifficultPassword:ServAdmin:segj --O:admin@services.com:Password:Nickname:aegj --O:coadmin@services.com:ChangeThis:Charlie:ae --O:cool@neat.com:Neato:CoolGuy:jf --O:oper@oper.com:Oper:OperGuy:ogj -+#O:servadmin@services.com:DifficultPassword:ServAdmin:segj -+#O:admin@services.com:Password:Nickname:aegj -+#O:coadmin@services.com:ChangeThis:Charlie:ae -+#O:cool@neat.com:Neato:CoolGuy:jf -+#O:oper@oper.com:Oper:OperGuy:ogj - - # C: lines specify channels that OperServ will monitor. The first - # field is the name of the channel. - --C:#HybNet --C:#services -+#C:#HybNet -+#C:#services - - # I: lines specify restricted hostmasks. The fields, in order: - # the hostmask, the number of connections allowed from the hostmask. - - # Allows only 3 connections from cloneguy@*.clones.org --I:cloneguy@*.clones.org:3 -+#I:cloneguy@*.clones.org:3 - # Allows a total of 6 users from the .blah.com domain --I:*.blah.com:6 -+#I:*.blah.com:6 - - # B: lines are to specify TCM bots to link to. The fields are, in - # order, the hostname of the box the TCM is running on, the nickname diff --git a/irc/dancer-services/files/patch-settings.conf.in b/irc/dancer-services/files/patch-settings.conf.in deleted file mode 100644 index d2cdc5506d41..000000000000 --- a/irc/dancer-services/files/patch-settings.conf.in +++ /dev/null @@ -1,33 +0,0 @@ ---- bin/settings.conf.in.orig Tue Mar 25 06:09:13 2003 -+++ bin/settings.conf.in Tue Apr 15 18:30:41 2003 -@@ -80,19 +80,19 @@ - # - ################################################################ - --HPath "@prefix@/hybserv" --ConfigFile "hybserv.conf" --LogFile "hybserv.log" --PidFile "hybserv.pid" --PipeFile "hybserv.pipe" --HelpPath "help" --DccMotdFile "motd.dcc" --MotdFile "motd.global" -+HPath "@@prefix@@/etc/dancer-services" -+ConfigFile "@@prefix@@/etc/dancer-services/services.conf" -+LogFile "/var/log/dancer-services/services.log" -+PidFile "/var/run/dancer-services/dancer-services.pid" -+PipeFile "/var/run/dancer-services/dancer-services.pipe" -+HelpPath "/usr/local/share/dancer-services/help" -+DccMotdFile "@@prefix@@/etc/dancer-services/motd.dcc" -+MotdFile "@@prefix@@/etc/dancer-services/motd.global" - --GlineFile "glines.conf" --JupeFile "jupes.conf" -+GlineFile "@@prefix@@/etc/dancer-services/glines.conf" -+JupeFile "@@prefix@@/etc/dancer-services/jupes.conf" - --LogonNews "logon.news" -+LogonNews "@@prefix@@/etc/dancer-services/logon.news" - - ################################################################ - # diff --git a/irc/dancer-services/pkg-deinstall b/irc/dancer-services/pkg-deinstall deleted file mode 100644 index 307194a2da88..000000000000 --- a/irc/dancer-services/pkg-deinstall +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "$BATCH" ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - echo ${answer} -} - -yesno() { - local dflt question answer - - question=$1 - dflt=$2 - while :; do - answer=$(ask "${question}" "${dflt}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - echo "Please answer yes or no." - done -} - -delete_account() { - local u g - - u=$1 - g=$2 - if yesno "Do you want me to remove group \"${g}\"" y; then - pw groupdel -n ${g} - echo "Done." - fi - if yesno "Do you want me to remove user \"${u}\"" y; then - pw userdel -n ${u} - echo "Done." - fi -} - -if [ "$2" != "POST-DEINSTALL" ]; then - exit 0 -fi - -if [ -n "$PACKAGE_BUILDING" ]; then - delete_account ircservices ircservices -fi diff --git a/irc/dancer-services/pkg-descr b/irc/dancer-services/pkg-descr deleted file mode 100644 index 5982e327e524..000000000000 --- a/irc/dancer-services/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -This is the IRC services (nickserv, chanserv, etc.) for dancer-ircd, -based on hybserv. diff --git a/irc/dancer-services/pkg-install b/irc/dancer-services/pkg-install deleted file mode 100644 index 1e5fa254857c..000000000000 --- a/irc/dancer-services/pkg-install +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh - -# This script is a modified copy of the pkg-install script from the -# original ircd-hybrid port, by desmo@bandwidth.org. - -if [ "x$2" != "xPRE-INSTALL" ]; then - exit 0; -fi - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${BATCH}" ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - echo ${answer} -} - -yesno() { - local dflt question answer - - question=$1 - dflt=$2 - while :; do - answer=$(ask "${question}" "${dflt}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - echo "Please answer yes or no." - done -} - -if ! which -s pw ; then - cat <<EOF -Your system does not include the "pw" utility. You should upgrade -to a newer version of FreeBSD. Without "pw" this script will not -run. -EOF - exit 1 -fi - -uid=73 -user=ircservices -gid=$uid -group=$user -gecos="IRC services" -shell=/nonexistent -home=/nonexistent - -echo "" -if pw groupshow $group 2> /dev/null ; then - echo "You already have a group \"$group\", so I will use it." -else - if pw groupshow $gid 2> /dev/null ; then - echo "You already have a gid \"$gid\". Please create a user \"$group\"" - echo "with a default group of \"$group\"." - exit 1 - fi - echo "You need a group \"$group\"." - if which -s pw && yesno "Would you like me to create it" y; then - pw groupadd $group -g $gid || exit - echo "Done." - else - echo "Please create it, and try again." - if ! pw usershow $user 2> /dev/null ; then - echo "While you're at it, please create a user \"$user\"" - echo 'too, with a default group of "$group".' - fi - exit 1 - fi -fi - -if pw usershow $user 2> /dev/null ; then - echo "You already have a user \"$user\", so I will use it." -else - if pw usershow $uid 2> /dev/null ; then - echo "You already have a uid \"$uid\". Please create a user \"irc -d\"" - echo "with a default group of \"$group\"." - exit 1 - fi - echo "You need a user \"$user\"." - if which -s pw && yesno "Would you like me to create it" y; then - pw useradd $user -g $group -u $uid -h - -d $home \ - -s $shell -c "$gecos" || exit - echo "Done." - else - echo "Please create it, and try again." - exit 1 - fi -fi diff --git a/irc/dancer-services/pkg-message b/irc/dancer-services/pkg-message deleted file mode 100644 index bec0f3cf6e96..000000000000 --- a/irc/dancer-services/pkg-message +++ /dev/null @@ -1,21 +0,0 @@ -dancer-services has now been installed. - -You should now edit %%PREFIX%%etc/dancer-services/services.conf and -make sure you have something like the following lines: - -N:services.:Local services -S:<password X>:localhost:6667 -O:*@127.0.0.1:<password hash>:<your nick>:segj - -Then add the following lines to %%PREFIX%%etc/dancer-ircd/ircd.conf: - -C:127.0.0.1:foo:services.::2 -N:127.0.0.1:<hash of password X>:services.::2 - -You may then start the servers by running: - - %%PREFIX%%etc/rc.d/dancer-ircd.sh start - %%PREFIX%%etc/rc.d/dancer-services.sh start - -To make dancer-serives automatically run on (the next) startup, you -must add ``dancer_services_enable=YES'' to /etc/rc.conf. diff --git a/irc/dancer-services/pkg-plist b/irc/dancer-services/pkg-plist deleted file mode 100644 index e5726a1e3792..000000000000 --- a/irc/dancer-services/pkg-plist +++ /dev/null @@ -1,226 +0,0 @@ -sbin/cleandb -sbin/dancer-services -sbin/encryptconf -sbin/encryptdb -sbin/fixlevel -sbin/servchk -sbin/shownicks -sbin/showchans -@unexec if cmp -s %D/etc/dancer-services/glines.conf %D/etc/dancer-services/glines.conf.sample; then rm -f %D/etc/dancer-services/glines.conf; fi -etc/dancer-services/glines.conf.sample -@exec if [ ! -f %B/glines.conf ]; then cp %B/%f %B/glines.conf; fi -@unexec if cmp -s %D/etc/dancer-services/jupes.conf %D/etc/dancer-services/jupes.conf.sample; then rm -f %D/etc/dancer-services/jupes.conf; fi -etc/dancer-services/jupes.conf.sample -@exec if [ ! -f %B/jupes.conf ]; then cp %B/%f %B/jupes.conf; fi -@unexec if cmp -s %D/etc/dancer-services/logon.news %D/etc/dancer-services/logon.news.sample; then rm -f %D/etc/dancer-services/logon.news; fi -etc/dancer-services/logon.news.sample -@exec if [ ! -f %B/logon.news ]; then cp %B/%f %B/logon.news; fi -@unexec if cmp -s %D/etc/dancer-services/motd.dcc %D/etc/dancer-services/motd.dcc.sample; then rm -f %D/etc/dancer-services/motd.dcc; fi -etc/dancer-services/motd.dcc.sample -@exec if [ ! -f %B/motd.dcc ]; then cp %B/%f %B/motd.dcc; fi -@unexec if cmp -s %D/etc/dancer-services/motd.global %D/etc/dancer-services/motd.global.sample; then rm -f %D/etc/dancer-services/motd.global; fi -etc/dancer-services/motd.global.sample -@exec if [ ! -f %B/motd.global ]; then cp %B/%f %B/motd.global; fi -@unexec if cmp -s %D/etc/dancer-services/services.conf %D/etc/dancer-services/services.conf.sample; then rm -f %D/etc/dancer-services/services.conf; fi -etc/dancer-services/services.conf.sample -@exec if [ ! -f %B/services.conf ]; then cp %B/%f %B/services.conf; fi -@unexec if cmp -s %D/etc/dancer-services/settings.conf %D/etc/dancer-services/settings.conf.sample; then rm -f %D/etc/dancer-services/settings.conf; fi -etc/dancer-services/settings.conf.sample -@exec if [ ! -f %B/settings.conf ]; then cp %B/%f %B/settings.conf; fi -etc/rc.d/dancer-services.sh -@exec install -d -o ircd -g ircd -m 700 /var/log/dancer-services /var/run/dancer-services -@unexec rmdir %D/etc/dancer-services /var/log/dancer-services /var/run/dancer-services 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/dancer-services /var/log/dancer-services /var/run/dancer-services`` to remove any configuration files and log files left." | fmt -%%DATADIR%%/help/chanserv/access/add -%%DATADIR%%/help/chanserv/access/del -%%DATADIR%%/help/chanserv/access/index -%%DATADIR%%/help/chanserv/access/list -%%DATADIR%%/help/chanserv/akick/add -%%DATADIR%%/help/chanserv/akick/del -%%DATADIR%%/help/chanserv/akick/index -%%DATADIR%%/help/chanserv/akick/list -%%DATADIR%%/help/chanserv/autorem/add -%%DATADIR%%/help/chanserv/autorem/del -%%DATADIR%%/help/chanserv/autorem/index -%%DATADIR%%/help/chanserv/autorem/list -%%DATADIR%%/help/chanserv/clear -%%DATADIR%%/help/chanserv/clearnoexp -%%DATADIR%%/help/chanserv/drop -%%DATADIR%%/help/chanserv/forbid -%%DATADIR%%/help/chanserv/forget -%%DATADIR%%/help/chanserv/identify -%%DATADIR%%/help/chanserv/index -%%DATADIR%%/help/chanserv/info -%%DATADIR%%/help/chanserv/invite -%%DATADIR%%/help/chanserv/level/index -%%DATADIR%%/help/chanserv/level/list -%%DATADIR%%/help/chanserv/level/reset -%%DATADIR%%/help/chanserv/level/set -%%DATADIR%%/help/chanserv/list -%%DATADIR%%/help/chanserv/noexpire -%%DATADIR%%/help/chanserv/op -%%DATADIR%%/help/chanserv/register -%%DATADIR%%/help/chanserv/resetlevels -%%DATADIR%%/help/chanserv/set/email -%%DATADIR%%/help/chanserv/set/entrymsg -%%DATADIR%%/help/chanserv/set/forget -%%DATADIR%%/help/chanserv/set/founder -%%DATADIR%%/help/chanserv/set/guard -%%DATADIR%%/help/chanserv/set/index -%%DATADIR%%/help/chanserv/set/mlock -%%DATADIR%%/help/chanserv/set/password -%%DATADIR%%/help/chanserv/set/private -%%DATADIR%%/help/chanserv/set/restricted -%%DATADIR%%/help/chanserv/set/secure -%%DATADIR%%/help/chanserv/set/secureops -%%DATADIR%%/help/chanserv/set/splitops -%%DATADIR%%/help/chanserv/set/successor -%%DATADIR%%/help/chanserv/set/topiclock -%%DATADIR%%/help/chanserv/set/url -%%DATADIR%%/help/chanserv/set/verbose -%%DATADIR%%/help/chanserv/setpass -%%DATADIR%%/help/chanserv/status -%%DATADIR%%/help/chanserv/unban -%%DATADIR%%/help/chanserv/unforbid -%%DATADIR%%/help/chanserv/voice -%%DATADIR%%/help/global/gchannote -%%DATADIR%%/help/global/gcmemo -%%DATADIR%%/help/global/gmemo -%%DATADIR%%/help/global/gnote -%%DATADIR%%/help/global/index -%%DATADIR%%/help/global/motd -%%DATADIR%%/help/helpserv/chanserv -%%DATADIR%%/help/helpserv/index -%%DATADIR%%/help/helpserv/memoserv -%%DATADIR%%/help/helpserv/nickserv -%%DATADIR%%/help/helpserv/operserv -%%DATADIR%%/help/helpserv/statserv -%%DATADIR%%/help/memoserv/del -%%DATADIR%%/help/memoserv/forward -%%DATADIR%%/help/memoserv/index -%%DATADIR%%/help/memoserv/list -%%DATADIR%%/help/memoserv/purge -%%DATADIR%%/help/memoserv/read -%%DATADIR%%/help/memoserv/reply -%%DATADIR%%/help/memoserv/send -%%DATADIR%%/help/memoserv/undel -%%DATADIR%%/help/nickserv/access/add -%%DATADIR%%/help/nickserv/access/del -%%DATADIR%%/help/nickserv/access/index -%%DATADIR%%/help/nickserv/access/list -%%DATADIR%%/help/nickserv/collide -%%DATADIR%%/help/nickserv/drop -%%DATADIR%%/help/nickserv/droplink -%%DATADIR%%/help/nickserv/flag -%%DATADIR%%/help/nickserv/forbid -%%DATADIR%%/help/nickserv/ghost -%%DATADIR%%/help/nickserv/identify -%%DATADIR%%/help/nickserv/index -%%DATADIR%%/help/nickserv/info -%%DATADIR%%/help/nickserv/link -%%DATADIR%%/help/nickserv/list -%%DATADIR%%/help/nickserv/noexpire -%%DATADIR%%/help/nickserv/recover -%%DATADIR%%/help/nickserv/register -%%DATADIR%%/help/nickserv/release -%%DATADIR%%/help/nickserv/set/automask -%%DATADIR%%/help/nickserv/set/email -%%DATADIR%%/help/nickserv/set/gsm -%%DATADIR%%/help/nickserv/set/hide -%%DATADIR%%/help/nickserv/set/index -%%DATADIR%%/help/nickserv/set/kill -%%DATADIR%%/help/nickserv/set/master -%%DATADIR%%/help/nickserv/set/memos -%%DATADIR%%/help/nickserv/set/notify -%%DATADIR%%/help/nickserv/set/oper -%%DATADIR%%/help/nickserv/set/password -%%DATADIR%%/help/nickserv/set/phone -%%DATADIR%%/help/nickserv/set/private -%%DATADIR%%/help/nickserv/set/secure -%%DATADIR%%/help/nickserv/set/signon -%%DATADIR%%/help/nickserv/set/uin -%%DATADIR%%/help/nickserv/set/unsecure -%%DATADIR%%/help/nickserv/set/url -%%DATADIR%%/help/nickserv/setpass -%%DATADIR%%/help/nickserv/showlink -%%DATADIR%%/help/nickserv/unforbid -%%DATADIR%%/help/nickserv/unlink -%%DATADIR%%/help/operserv/channel -%%DATADIR%%/help/operserv/clones -%%DATADIR%%/help/operserv/dcc/boot -%%DATADIR%%/help/operserv/dcc/index -%%DATADIR%%/help/operserv/dcc/link -%%DATADIR%%/help/operserv/dcc/motd -%%DATADIR%%/help/operserv/dcc/quit -%%DATADIR%%/help/operserv/dcc/unlink -%%DATADIR%%/help/operserv/dcc/who -%%DATADIR%%/help/operserv/die -%%DATADIR%%/help/operserv/dump -%%DATADIR%%/help/operserv/floodoff -%%DATADIR%%/help/operserv/gline -%%DATADIR%%/help/operserv/help -%%DATADIR%%/help/operserv/htm -%%DATADIR%%/help/operserv/hub -%%DATADIR%%/help/operserv/identify -%%DATADIR%%/help/operserv/ignore -%%DATADIR%%/help/operserv/index -%%DATADIR%%/help/operserv/join -%%DATADIR%%/help/operserv/jump -%%DATADIR%%/help/operserv/jupe -%%DATADIR%%/help/operserv/kill -%%DATADIR%%/help/operserv/killchan -%%DATADIR%%/help/operserv/killhost -%%DATADIR%%/help/operserv/kline -%%DATADIR%%/help/operserv/off -%%DATADIR%%/help/operserv/omode -%%DATADIR%%/help/operserv/on -%%DATADIR%%/help/operserv/part -%%DATADIR%%/help/operserv/rehash -%%DATADIR%%/help/operserv/reload -%%DATADIR%%/help/operserv/restart -%%DATADIR%%/help/operserv/save -%%DATADIR%%/help/operserv/secure -%%DATADIR%%/help/operserv/set -%%DATADIR%%/help/operserv/stats -%%DATADIR%%/help/operserv/status -%%DATADIR%%/help/operserv/trace -%%DATADIR%%/help/operserv/umode -%%DATADIR%%/help/operserv/ungline -%%DATADIR%%/help/operserv/unjupe -%%DATADIR%%/help/seenserv/index -%%DATADIR%%/help/seenserv/seen -%%DATADIR%%/help/seenserv/seennick -%%DATADIR%%/help/seenserv/seenstat -%%DATADIR%%/help/seenserv/unseen -%%DATADIR%%/help/statserv/clearstats -%%DATADIR%%/help/statserv/domain -%%DATADIR%%/help/statserv/greplog -%%DATADIR%%/help/statserv/host -%%DATADIR%%/help/statserv/index -%%DATADIR%%/help/statserv/refresh -%%DATADIR%%/help/statserv/server -%%DATADIR%%/help/statserv/showadmins -%%DATADIR%%/help/statserv/showopers -%%DATADIR%%/help/statserv/showstats -%%DATADIR%%/help/statserv/split -%%DATADIR%%/help/statserv/stats -@dirrm %%DATADIR%%/help/statserv -@dirrm %%DATADIR%%/help/seenserv -@dirrm %%DATADIR%%/help/operserv/dcc -@dirrm %%DATADIR%%/help/operserv -@dirrm %%DATADIR%%/help/nickserv/set -@dirrm %%DATADIR%%/help/nickserv/access -@dirrm %%DATADIR%%/help/nickserv -@dirrm %%DATADIR%%/help/memoserv -@dirrm %%DATADIR%%/help/helpserv -@dirrm %%DATADIR%%/help/global -@dirrm %%DATADIR%%/help/chanserv/set -@dirrm %%DATADIR%%/help/chanserv/level -@dirrm %%DATADIR%%/help/chanserv/autorem -@dirrm %%DATADIR%%/help/chanserv/akick -@dirrm %%DATADIR%%/help/chanserv/access -@dirrm %%DATADIR%%/help/chanserv -@dirrm %%DATADIR%%/help -@dirrm %%DATADIR%% -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%@dirrm %%DOCSDIR%% |