unrealircd: Update to 5.0.2

Upgrade notes (seem like there are very few breaking changes):

     https://www.unrealircd.org/docs/Upgrading_from_4.x

What's new in UnrealIRCd 5:

     * Channel history. You can now see the last couple of lines that have
       been said on channels when you JOIN. For this you need to set channel
       mode +H, eg: eg: /MODE #chan +H 15:1440

     * More IRCv3 features. Additional details are communicated to clients
       which may help with displaying information. Implemented specs are:
       account-tag, message-ids, time, echo-message, labeled-response and
       BATCH.

     * Ban exceptions (/ELINE). You can now exempt users dynamically on IRC
       from *LINES, spamfilter, throttling, blacklist checking, connection
       floods, bypassing antirandom, etc. Just type /ELINE on IRC to see
       details.

     * *LINES and Spamfilters are remembered: All of these are saved to a
       file every few minutes and saved across reboots. This uses the new
       tkldb module (loaded by default). No need for services for that
       anymore.

     * Persistent channels are remembered: For channels which have mode +P
       set we now save all channel settings across reboots (topic, regular
       modes and +beI lists). This via the channeldb module (loaded by
       default).

     * Anti connect-flood measures. In the last few 4.2.x versions we
       introduced Connthrottle and reputation. In 5.x these modules are now
       loaded by default for increased security.

     * Easily restrict commands to fight drones. You can now disable any
       command or impose restrictions, such as: command can only be executed
       after being connected for XX seconds, or if you are identified to
       services, etc. See the example for how to restrict LIST, INVITE and
       messaging.

     * Module manager for managing 3rd party modules easily. Install and
       update modules with a single command.

     * Condition configuration. You can have condition configuration where
       you e.g. @define $IP "203.0.113.1" and can use $IP everywhere in the
       configuration file. Similarly, support for @if-blocks. This is
       especially useful for advanced users who like to use the same
       configuration file on multiple machines, usually with the help of
       remote includes.

     * Improved Channel Mode +L now kicks in for any rejected join, so not
       just for +l but also for +b, +i, +O, +z, +R and +k. If, for example,
       the channel is +L #insecure and also +z then, when an insecure user
       ties to join they will be redirected to #insecure.

     * Ban forwards. New extended ban ~f to forward users to the specified
       channel if the ban matches. Example: MODE #chan +b
       ~f:#badisp:*!*@*.isp.org

     * Improved WebSocket support. We already supported websockets, but now
       we support websocket type 'text', which is compatible with web IRC
       clients such as Kiwi IRC.

     * Code cleanups. The biggest effort of all went into cleaning up old
       code and making the code much more readable. This also means that
       UnrealIRCd 5 will not be able to link with really older servers or
       services, like UnrealIRCd 3.2.x.

     * Windows version is 64-bits. This should allow for increased address
       space and security. This also means UnrealIRCd 5 will not run on
       32-bits Windows (should be rare nowadays, anyway)

7 files changed, 143 insertions, 192 deletions

diff --git a/chat/unrealircd/DESCR b/chat/unrealircd/DESCR
index eda1eda980e..26f41db5ef2 100644
--- a/chat/unrealircd/DESCR
+++ b/chat/unrealircd/DESCR
@@ -1,16 +1,5 @@
-UnrealIRCd is an IRC server based on the branch of IRCu called Dreamforge,
-formerly used by the DALnet IRC Network. Since development started on it
-(around May 1999) many new features has been added, modified, and many bugs
-fixed. Unreal runs both on *nix platforms, Amiga & Windows 95/98/2k/NT.
-Some features to mention: Channel Halfops, No-color channel mode,
-Strip-colors channel mode, channelmode +q & +a - protect modes, Oper and
-Admin only channels, exception bans, Nokicks mode (channel and user), Flood
-limiter, Channel links, Host cloaking, Net* Tech and Co-Admin modes, Whois
-notifies, Foreign connects monitor, Oper suspend, G:Lines, T:Lines, channel
-restriction (people can only go to these channels if enabled), Trojan/DCC
-Deny, RPING/RPONG, Sethost family, Token in server<->server etc.
-FDlists/High Traffic Mode, SOCKS check on connect, Speeded up server
-synchs, limited WebTV Client support, /vhost, and many dreamforge
-optimations. UnrealIRCd is aimed to be an advanced, not an easy IRCd.
+UnrealIRCd is an IRC server based on the branch of IRCu called
+Dreamforge, formerly used by the DALnet IRC Network.
 
-Also includes SSL and IPv6 support.
+Key features include SSL, cloaking, its advanced anti-flood and
+anti-spam systems, swear filtering and module support.
diff --git a/chat/unrealircd/Makefile b/chat/unrealircd/Makefile
index 3a9e041bae9..f7a0bc73745 100644
--- a/chat/unrealircd/Makefile
+++ b/chat/unrealircd/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2020/01/18 21:48:53 jperkin Exp $
+# $NetBSD: Makefile,v 1.69 2020/01/28 13:03:36 nia Exp $
 
-DISTNAME=	unrealircd-4.2.4.1
-PKGREVISION=	4
+DISTNAME=	unrealircd-5.0.2
 CATEGORIES=	chat
-MASTER_SITES=	https://www.unrealircd.org/unrealircd4/
+MASTER_SITES=	https://www.unrealircd.org/downloads/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.unrealircd.org/
@@ -35,9 +34,6 @@ CONFIGURE_ARGS+=	--enable-ssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=	--with-system-cares
 CONFIGURE_ARGS+=	--with-system-pcre2
 
-# Deprecated
-CONFIGURE_ARGS+=	--without-tre
-
 CONFIGURE_ARGS+=	--with-permissions=0660
 CONFIGURE_ARGS+=	--with-datadir=${PREFIX}/unrealircd/data
 CONFIGURE_ARGS+=	--with-cachedir=${PREFIX}/unrealircd/cache
@@ -56,7 +52,6 @@ OWN_DIRS_PERMS+=	${PREFIX}/unrealircd/cache ${UIRCD_USER} ${UIRCD_GROUP} 0700
 OWN_DIRS_PERMS+=	${PREFIX}/unrealircd/logs ${UIRCD_USER} ${UIRCD_GROUP} 0700
 OWN_DIRS_PERMS+=	${PREFIX}/unrealircd/tmp ${UIRCD_USER} ${UIRCD_GROUP} 0700
 
-CONFIGURE_ARGS+=	--with-sendq=${UIRCD_SENDQ:Q}
 CONFIGURE_ARGS+=	--with-nick-history=${UIRCD_NICKHIST:Q}
 
 CONFIGURE_ENV.SunOS+=	ac_cv_func_epoll_create=no
@@ -65,7 +60,7 @@ CONFIGURE_ENV.SunOS+=	ac_cv_func_epoll_wait=no
 
 IRCD_EG=	${PREFIX}/share/examples/unrealircd
 
-BUILD_DEFS+=	UIRCD_SENDQ UIRCD_NICKHIST VARBASE
+BUILD_DEFS+=	UIRCD_NICKHIST VARBASE
 
 PTHREAD_OPTS+=	require
 
@@ -74,7 +69,6 @@ PTHREAD_OPTS+=	require
 # The defaults for most of these here are from the standard Conf
 # script supplied with the UnrealIRCd package.
 #
-UIRCD_SENDQ?=		3000000
 UIRCD_NICKHIST?=	2000
 UIRCD_USER?=		uircd
 UIRCD_GROUP?=		uircd
@@ -102,13 +96,12 @@ INSTALLATION_DIRS+=	lib/unrealircd/modules/usermodes
 INSTALLATION_DIRS+=	lib/unrealircd/modules/chanmodes
 INSTALLATION_DIRS+=	lib/unrealircd/modules/snomasks
 INSTALLATION_DIRS+=	lib/unrealircd/modules/extbans
-INSTALLATION_DIRS+=	lib/unrealircd/modules/cap
 INSTALLATION_DIRS+=	lib/unrealircd/modules/third
 INSTALLATION_DIRS+=	share/doc/unrealircd
 INSTALLATION_DIRS+=	${IRCD_EG}
 INSTALLATION_DIRS+=	${IRCD_EG}/aliases
 INSTALLATION_DIRS+=	${IRCD_EG}/help
-INSTALLATION_DIRS+=	${IRCD_EG}/ssl
+INSTALLATION_DIRS+=	${IRCD_EG}/tls
 
 OWN_DIRS_PERMS+=	unrealircd/tmp ${UIRCD_USER} ${UIRCD_GROUP} 0755
 OWN_DIRS_PERMS+=	unrealircd/logs ${UIRCD_USER} ${UIRCD_GROUP} 0755
@@ -121,22 +114,17 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/Authors ${DESTDIR}${PREFIX}/share/doc/unrealircd
 	${INSTALL_DATA} ${WRKSRC}/doc/coding-guidelines ${DESTDIR}${PREFIX}/share/doc/unrealircd
 	${INSTALL_DATA} ${WRKSRC}/doc/tao.of.irc ${DESTDIR}${PREFIX}/share/doc/unrealircd
-	${INSTALL_DATA} ${WRKSRC}/doc/conf/*.default.conf ${DESTDIR}${IRCD_EG}
-	${INSTALL_DATA} ${WRKSRC}/doc/conf/*.optional.conf ${DESTDIR}${IRCD_EG}
+	${INSTALL_DATA} ${WRKSRC}/doc/conf/*.conf ${DESTDIR}${IRCD_EG}
 	${INSTALL_DATA} ${WRKSRC}/doc/conf/examples/*.conf ${DESTDIR}${IRCD_EG}
-	${INSTALL_DATA} ${WRKSRC}/doc/conf/spamfilter.conf ${DESTDIR}${IRCD_EG}
-	${INSTALL_DATA} ${WRKSRC}/doc/conf/badwords.conf ${DESTDIR}${IRCD_EG}
-	${INSTALL_DATA} ${WRKSRC}/doc/conf/dccallow.conf ${DESTDIR}${IRCD_EG}
 	${INSTALL_DATA} ${WRKSRC}/doc/conf/aliases/*.conf ${DESTDIR}${IRCD_EG}/aliases
 	${INSTALL_DATA} ${WRKSRC}/doc/conf/help/*.conf ${DESTDIR}${IRCD_EG}/help
-	${INSTALL_DATA} ${WRKSRC}/doc/conf/ssl/curl-ca-bundle.crt ${DESTDIR}${IRCD_EG}/ssl
+	${INSTALL_DATA} ${WRKSRC}/doc/conf/tls/curl-ca-bundle.crt ${DESTDIR}${IRCD_EG}/tls
 	${INSTALL_SCRIPT} ${WRKSRC}/unrealircd ${DESTDIR}${PREFIX}/unrealircd/scripts
 	${INSTALL_LIB} ${WRKSRC}/src/modules/*.so ${DESTDIR}${PREFIX}/lib/unrealircd/modules
 	${INSTALL_LIB} ${WRKSRC}/src/modules/usermodes/*.so ${DESTDIR}${PREFIX}/lib/unrealircd/modules/usermodes
 	${INSTALL_LIB} ${WRKSRC}/src/modules/chanmodes/*.so ${DESTDIR}${PREFIX}/lib/unrealircd/modules/chanmodes
 	${INSTALL_LIB} ${WRKSRC}/src/modules/snomasks/*.so ${DESTDIR}${PREFIX}/lib/unrealircd/modules/snomasks
 	${INSTALL_LIB} ${WRKSRC}/src/modules/extbans/*.so ${DESTDIR}${PREFIX}/lib/unrealircd/modules/extbans
-	${INSTALL_LIB} ${WRKSRC}/src/modules/cap/*.so ${DESTDIR}${PREFIX}/lib/unrealircd/modules/cap
 
 .include "../../net/libcares/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/chat/unrealircd/PLIST b/chat/unrealircd/PLIST
index 76fd47f9c69..7850a34003e 100644
--- a/chat/unrealircd/PLIST
+++ b/chat/unrealircd/PLIST
@@ -1,16 +1,22 @@
-@comment $NetBSD: PLIST,v 1.14 2019/08/07 13:30:37 nia Exp $
+@comment $NetBSD: PLIST,v 1.15 2020/01/28 13:03:36 nia Exp $
 bin/unrealircd
+lib/unrealircd/modules/account-tag.so
+lib/unrealircd/modules/addmotd.so
+lib/unrealircd/modules/addomotd.so
+lib/unrealircd/modules/admin.so
 lib/unrealircd/modules/antimixedutf8.so
 lib/unrealircd/modules/antirandom.so
 lib/unrealircd/modules/authprompt.so
+lib/unrealircd/modules/away.so
+lib/unrealircd/modules/batch.so
 lib/unrealircd/modules/blacklist.so
-lib/unrealircd/modules/cap/link-security.so
-lib/unrealircd/modules/cap/plaintext-policy.so
-lib/unrealircd/modules/cap/sts.so
+lib/unrealircd/modules/botmotd.so
+lib/unrealircd/modules/cap.so
 lib/unrealircd/modules/certfp.so
 lib/unrealircd/modules/chanmodes/censor.so
 lib/unrealircd/modules/chanmodes/delayjoin.so
 lib/unrealircd/modules/chanmodes/floodprot.so
+lib/unrealircd/modules/chanmodes/history.so
 lib/unrealircd/modules/chanmodes/issecure.so
 lib/unrealircd/modules/chanmodes/link.so
 lib/unrealircd/modules/chanmodes/nocolor.so
@@ -26,9 +32,20 @@ lib/unrealircd/modules/chanmodes/regonly.so
 lib/unrealircd/modules/chanmodes/regonlyspeak.so
 lib/unrealircd/modules/chanmodes/secureonly.so
 lib/unrealircd/modules/chanmodes/stripcolor.so
+lib/unrealircd/modules/channeldb.so
 lib/unrealircd/modules/charsys.so
+lib/unrealircd/modules/chghost.so
+lib/unrealircd/modules/chgident.so
+lib/unrealircd/modules/chgname.so
 lib/unrealircd/modules/cloak.so
+lib/unrealircd/modules/close.so
+lib/unrealircd/modules/connect.so
 lib/unrealircd/modules/connthrottle.so
+lib/unrealircd/modules/cycle.so
+lib/unrealircd/modules/dccallow.so
+lib/unrealircd/modules/dccdeny.so
+lib/unrealircd/modules/echo-message.so
+lib/unrealircd/modules/eos.so
 lib/unrealircd/modules/extbans/account.so
 lib/unrealircd/modules/extbans/certfp.so
 lib/unrealircd/modules/extbans/inchannel.so
@@ -36,117 +53,106 @@ lib/unrealircd/modules/extbans/join.so
 lib/unrealircd/modules/extbans/msgbypass.so
 lib/unrealircd/modules/extbans/nickchange.so
 lib/unrealircd/modules/extbans/operclass.so
+lib/unrealircd/modules/extbans/partmsg.so
 lib/unrealircd/modules/extbans/quiet.so
 lib/unrealircd/modules/extbans/realname.so
-lib/unrealircd/modules/extbans/regnick.so
 lib/unrealircd/modules/extbans/textban.so
 lib/unrealircd/modules/extbans/timedban.so
+lib/unrealircd/modules/globops.so
+lib/unrealircd/modules/help.so
 lib/unrealircd/modules/hideserver.so
+lib/unrealircd/modules/history_backend_mem.so
+lib/unrealircd/modules/history_backend_null.so
+lib/unrealircd/modules/ident_lookup.so
+lib/unrealircd/modules/invite.so
+lib/unrealircd/modules/ircops.so
+lib/unrealircd/modules/ison.so
+lib/unrealircd/modules/join.so
 lib/unrealircd/modules/jointhrottle.so
 lib/unrealircd/modules/jumpserver.so
-lib/unrealircd/modules/m_addmotd.so
-lib/unrealircd/modules/m_addomotd.so
-lib/unrealircd/modules/m_admin.so
-lib/unrealircd/modules/m_away.so
-lib/unrealircd/modules/m_botmotd.so
-lib/unrealircd/modules/m_cap.so
-lib/unrealircd/modules/m_chghost.so
-lib/unrealircd/modules/m_chgident.so
-lib/unrealircd/modules/m_chgname.so
-lib/unrealircd/modules/m_close.so
-lib/unrealircd/modules/m_connect.so
-lib/unrealircd/modules/m_cycle.so
-lib/unrealircd/modules/m_dccallow.so
-lib/unrealircd/modules/m_dccdeny.so
-lib/unrealircd/modules/m_eos.so
-lib/unrealircd/modules/m_globops.so
-lib/unrealircd/modules/m_help.so
-lib/unrealircd/modules/m_invite.so
-lib/unrealircd/modules/m_ircops.so
-lib/unrealircd/modules/m_ison.so
-lib/unrealircd/modules/m_join.so
-lib/unrealircd/modules/m_kick.so
-lib/unrealircd/modules/m_kill.so
-lib/unrealircd/modules/m_knock.so
-lib/unrealircd/modules/m_lag.so
-lib/unrealircd/modules/m_links.so
-lib/unrealircd/modules/m_list.so
-lib/unrealircd/modules/m_locops.so
-lib/unrealircd/modules/m_lusers.so
-lib/unrealircd/modules/m_map.so
-lib/unrealircd/modules/m_md.so
-lib/unrealircd/modules/m_message.so
-lib/unrealircd/modules/m_mkpasswd.so
-lib/unrealircd/modules/m_mode.so
-lib/unrealircd/modules/m_motd.so
-lib/unrealircd/modules/m_names.so
-lib/unrealircd/modules/m_netinfo.so
-lib/unrealircd/modules/m_nick.so
-lib/unrealircd/modules/m_nopost.so
-lib/unrealircd/modules/m_oper.so
-lib/unrealircd/modules/m_opermotd.so
-lib/unrealircd/modules/m_part.so
-lib/unrealircd/modules/m_pass.so
-lib/unrealircd/modules/m_pingpong.so
-lib/unrealircd/modules/m_protoctl.so
-lib/unrealircd/modules/m_quit.so
-lib/unrealircd/modules/m_rules.so
-lib/unrealircd/modules/m_sajoin.so
-lib/unrealircd/modules/m_samode.so
-lib/unrealircd/modules/m_sapart.so
-lib/unrealircd/modules/m_sasl.so
-lib/unrealircd/modules/m_sdesc.so
-lib/unrealircd/modules/m_sendsno.so
-lib/unrealircd/modules/m_sendumode.so
-lib/unrealircd/modules/m_server.so
-lib/unrealircd/modules/m_sethost.so
-lib/unrealircd/modules/m_setident.so
-lib/unrealircd/modules/m_setname.so
-lib/unrealircd/modules/m_silence.so
-lib/unrealircd/modules/m_sinfo.so
-lib/unrealircd/modules/m_sjoin.so
-lib/unrealircd/modules/m_sqline.so
-lib/unrealircd/modules/m_squit.so
-lib/unrealircd/modules/m_staff.so
-lib/unrealircd/modules/m_starttls.so
-lib/unrealircd/modules/m_stats.so
-lib/unrealircd/modules/m_svsfline.so
-lib/unrealircd/modules/m_svsjoin.so
-lib/unrealircd/modules/m_svskill.so
-lib/unrealircd/modules/m_svslusers.so
-lib/unrealircd/modules/m_svsmode.so
-lib/unrealircd/modules/m_svsmotd.so
-lib/unrealircd/modules/m_svsnick.so
-lib/unrealircd/modules/m_svsnline.so
-lib/unrealircd/modules/m_svsnolag.so
-lib/unrealircd/modules/m_svsnoop.so
-lib/unrealircd/modules/m_svspart.so
-lib/unrealircd/modules/m_svssilence.so
-lib/unrealircd/modules/m_svssno.so
-lib/unrealircd/modules/m_svswatch.so
-lib/unrealircd/modules/m_swhois.so
-lib/unrealircd/modules/m_time.so
-lib/unrealircd/modules/m_tkl.so
-lib/unrealircd/modules/m_topic.so
-lib/unrealircd/modules/m_trace.so
-lib/unrealircd/modules/m_tsctl.so
-lib/unrealircd/modules/m_umode2.so
-lib/unrealircd/modules/m_undccdeny.so
-lib/unrealircd/modules/m_unsqline.so
-lib/unrealircd/modules/m_user.so
-lib/unrealircd/modules/m_userhost.so
-lib/unrealircd/modules/m_userip.so
-lib/unrealircd/modules/m_vhost.so
-lib/unrealircd/modules/m_wallops.so
-lib/unrealircd/modules/m_watch.so
-lib/unrealircd/modules/m_who.so
-lib/unrealircd/modules/m_whois.so
-lib/unrealircd/modules/m_whowas.so
-lib/unrealircd/modules/m_whox.so
+lib/unrealircd/modules/kick.so
+lib/unrealircd/modules/kill.so
+lib/unrealircd/modules/knock.so
+lib/unrealircd/modules/labeled-response.so
+lib/unrealircd/modules/lag.so
+lib/unrealircd/modules/link-security.so
+lib/unrealircd/modules/links.so
+lib/unrealircd/modules/list.so
+lib/unrealircd/modules/locops.so
+lib/unrealircd/modules/lusers.so
+lib/unrealircd/modules/map.so
+lib/unrealircd/modules/md.so
+lib/unrealircd/modules/message-ids.so
+lib/unrealircd/modules/message-tags.so
+lib/unrealircd/modules/message.so
+lib/unrealircd/modules/mkpasswd.so
+lib/unrealircd/modules/mode.so
+lib/unrealircd/modules/motd.so
+lib/unrealircd/modules/names.so
+lib/unrealircd/modules/netinfo.so
+lib/unrealircd/modules/nick.so
 lib/unrealircd/modules/nocodes.so
+lib/unrealircd/modules/oper.so
+lib/unrealircd/modules/opermotd.so
+lib/unrealircd/modules/part.so
+lib/unrealircd/modules/pass.so
+lib/unrealircd/modules/pingpong.so
+lib/unrealircd/modules/plaintext-policy.so
+lib/unrealircd/modules/protoctl.so
+lib/unrealircd/modules/quit.so
 lib/unrealircd/modules/reputation.so
+lib/unrealircd/modules/require-module.so
+lib/unrealircd/modules/restrict-commands.so
+lib/unrealircd/modules/rmtkl.so
+lib/unrealircd/modules/rules.so
+lib/unrealircd/modules/sajoin.so
+lib/unrealircd/modules/samode.so
+lib/unrealircd/modules/sapart.so
+lib/unrealircd/modules/sasl.so
+lib/unrealircd/modules/sdesc.so
+lib/unrealircd/modules/sendsno.so
+lib/unrealircd/modules/sendumode.so
+lib/unrealircd/modules/server-time.so
+lib/unrealircd/modules/server.so
+lib/unrealircd/modules/sethost.so
+lib/unrealircd/modules/setident.so
+lib/unrealircd/modules/setname.so
+lib/unrealircd/modules/silence.so
+lib/unrealircd/modules/sinfo.so
+lib/unrealircd/modules/sjoin.so
 lib/unrealircd/modules/snomasks/dccreject.so
-lib/unrealircd/modules/ssl_antidos.so
+lib/unrealircd/modules/sqline.so
+lib/unrealircd/modules/squit.so
+lib/unrealircd/modules/staff.so
+lib/unrealircd/modules/starttls.so
+lib/unrealircd/modules/stats.so
+lib/unrealircd/modules/sts.so
+lib/unrealircd/modules/svsjoin.so
+lib/unrealircd/modules/svskill.so
+lib/unrealircd/modules/svslusers.so
+lib/unrealircd/modules/svsmode.so
+lib/unrealircd/modules/svsmotd.so
+lib/unrealircd/modules/svsnick.so
+lib/unrealircd/modules/svsnline.so
+lib/unrealircd/modules/svsnolag.so
+lib/unrealircd/modules/svsnoop.so
+lib/unrealircd/modules/svspart.so
+lib/unrealircd/modules/svssilence.so
+lib/unrealircd/modules/svssno.so
+lib/unrealircd/modules/svswatch.so
+lib/unrealircd/modules/swhois.so
+lib/unrealircd/modules/time.so
+lib/unrealircd/modules/tkl.so
+lib/unrealircd/modules/tkldb.so
+lib/unrealircd/modules/tls_antidos.so
+lib/unrealircd/modules/topic.so
+lib/unrealircd/modules/trace.so
+lib/unrealircd/modules/tsctl.so
+lib/unrealircd/modules/umode2.so
+lib/unrealircd/modules/unsqline.so
+lib/unrealircd/modules/user.so
+lib/unrealircd/modules/userhost.so
+lib/unrealircd/modules/userip.so
 lib/unrealircd/modules/usermodes/bot.so
 lib/unrealircd/modules/usermodes/censor.so
 lib/unrealircd/modules/usermodes/noctcp.so
@@ -157,8 +163,16 @@ lib/unrealircd/modules/usermodes/regonlymsg.so
 lib/unrealircd/modules/usermodes/secureonlymsg.so
 lib/unrealircd/modules/usermodes/servicebot.so
 lib/unrealircd/modules/usermodes/showwhois.so
+lib/unrealircd/modules/vhost.so
+lib/unrealircd/modules/wallops.so
+lib/unrealircd/modules/watch.so
 lib/unrealircd/modules/webirc.so
+lib/unrealircd/modules/webredir.so
 lib/unrealircd/modules/websocket.so
+lib/unrealircd/modules/who_old.so
+lib/unrealircd/modules/whois.so
+lib/unrealircd/modules/whowas.so
+lib/unrealircd/modules/whox.so
 share/doc/unrealircd/Authors
 share/doc/unrealircd/coding-guidelines
 share/doc/unrealircd/tao.of.irc
@@ -187,6 +201,6 @@ share/examples/unrealircd/modules.default.conf
 share/examples/unrealircd/modules.optional.conf
 share/examples/unrealircd/operclass.default.conf
 share/examples/unrealircd/spamfilter.conf
-share/examples/unrealircd/ssl/curl-ca-bundle.crt
+share/examples/unrealircd/tls/curl-ca-bundle.crt
 unrealircd/scripts/unrealircd
 @pkgdir lib/unrealircd/modules/third
diff --git a/chat/unrealircd/distinfo b/chat/unrealircd/distinfo
index b660584b189..0bad5b09649 100644
--- a/chat/unrealircd/distinfo
+++ b/chat/unrealircd/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.24 2019/08/07 13:14:16 nia Exp $
+$NetBSD: distinfo,v 1.25 2020/01/28 13:03:36 nia Exp $
 
-SHA1 (unrealircd-4.2.4.1.tar.gz) = cf9ac43cff3f69c77852e1b0526b84662acb66fd
-RMD160 (unrealircd-4.2.4.1.tar.gz) = 8202b2059811a7da1c1c9fc831492784ef196979
-SHA512 (unrealircd-4.2.4.1.tar.gz) = 752573c4af1f92a10739bb2b0cdaade1948207b46d28ae5177e1dfd6b0663044bc22dce5ffe8549882cd70325e3ef7e3296182fffbb84e08d59dbbdd6551a686
-Size (unrealircd-4.2.4.1.tar.gz) = 6090725 bytes
-SHA1 (patch-ac) = 644990fd93c6754778d4c0a8b3a2aab34a1bcbb3
-SHA1 (patch-ae) = 14499974009921e55fbf2c1719f7588b17f1315c
+SHA1 (unrealircd-5.0.2.tar.gz) = d5918618fd2a9351e1c4ed82c06de3f3ddf01c23
+RMD160 (unrealircd-5.0.2.tar.gz) = 1049aee7ef5bddad3d19d44277666ee4ef6fe4c2
+SHA512 (unrealircd-5.0.2.tar.gz) = c12ae15083a3bc00747552b89d6778f1f19d645f147cf2d89625dadcd0a536a2bb78da7d68d75e890bf7e1a9809e07afaa4524bd9d48b8bd8906d3b9adb4e604
+Size (unrealircd-5.0.2.tar.gz) = 4898820 bytes
+SHA1 (patch-include_h.h) = 3fa85b08f1d9e317a45cb8f54a61e0560617e72d
diff --git a/chat/unrealircd/options.mk b/chat/unrealircd/options.mk
index ead8528fd51..bedc85630d8 100644
--- a/chat/unrealircd/options.mk
+++ b/chat/unrealircd/options.mk
@@ -1,12 +1,11 @@
-# $NetBSD: options.mk,v 1.17 2019/02/09 15:23:15 nia Exp $
+# $NetBSD: options.mk,v 1.18 2020/01/28 13:03:36 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.unrealircd
 
 PKG_SUPPORTED_OPTIONS+=	unrealircd-remoteinc
 PKG_SUPPORTED_OPTIONS+=	unrealircd-showlistmodes
-PKG_SUPPORTED_OPTIONS+=	unrealircd-topicisnuhost unrealircd-shunnotices
 PKG_SUPPORTED_OPTIONS+=	unrealircd-operoverride-verify
-PKG_SUPPORTED_OPTIONS+=	unrealircd-no-operoverride unrealircd-disableusermod
+PKG_SUPPORTED_OPTIONS+=	unrealircd-no-operoverride
 PKG_SUGGESTED_OPTIONS=	unrealircd-showlistmodes
 
 .include "../../mk/bsd.options.mk"
@@ -27,21 +26,6 @@ CONFIGURE_ARGS+=		--with-showlistmodes
 .endif
 
 ###
-### /topic command to show the nick!user@host of the person
-### who set the topic, rather than just the nickname.
-###
-.if !empty(PKG_OPTIONS:Munrealircd-topicisnuhost)
-CONFIGURE_ARGS+=		--with-topicisnuhost
-.endif
-
-###
-### Notify a user when they are no longer shunned.
-###
-.if !empty(PKG_OPTIONS:Munrealircd-shunnotices)
-CONFIGURE_ARGS+=		--with-shunnotices
-.endif
-
-###
 ### Disable oper override.
 ###
 .if !empty(PKG_OPTIONS:Munrealircd-no-operoverride)
@@ -49,13 +33,6 @@ CONFIGURE_ARGS+=		--with-no-operoverride
 .endif
 
 ###
-### Disable /sethost, /setident, /chgname, /chghost, and /chgident.
-###
-.if !empty(PKG_OPTIONS:Munrealircd-disableusermod)
-CONFIGURE_ARGS+=		--with-disableusermod
-.endif
-
-###
 ### Require opers to /invite themselves into a +s or +p channel.
 ###
 .if !empty(PKG_OPTIONS:Munrealircd-operoverride-verify)
diff --git a/chat/unrealircd/patches/patch-ae b/chat/unrealircd/patches/patch-ae
deleted file mode 100644
index 84cd7fe33a0..00000000000
--- a/chat/unrealircd/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2019/02/09 15:23:16 nia Exp $
-
-Don't declare own errno.
-
---- src/socket.c.orig	2019-01-03 08:00:11.000000000 +0000
-+++ src/socket.c
-@@ -25,9 +25,6 @@
- #include <signal.h>
- #include <string.h>
- #include "inet.h"
--#ifndef _WIN32
--extern int errno;		/* ...seems that errno.h doesn't define this everywhere */
--#endif
- #include <sys/types.h>
- #ifndef _WIN32
- #include <sys/socket.h>
diff --git a/chat/unrealircd/patches/patch-ac b/chat/unrealircd/patches/patch-include_h.h
index 92ce223e6f9..71a9e3e1958 100644
--- a/chat/unrealircd/patches/patch-ac
+++ b/chat/unrealircd/patches/patch-include_h.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.4 2019/02/09 15:23:16 nia Exp $
+$NetBSD: patch-include_h.h,v 1.1 2020/01/28 13:03:36 nia Exp $
 
-Don't declare own errno.
+Do not declare own errno.
 
---- include/h.h.orig	2019-01-03 08:00:11.000000000 +0000
+--- include/h.h.orig	2020-01-22 06:30:42.000000000 +0000
 +++ include/h.h
-@@ -218,7 +218,7 @@ extern int vsnprintf (char *str, size_t 
+@@ -209,7 +209,7 @@ extern int dgets(int, char *, int);
  #ifdef _WIN32
  extern MODVAR int debuglevel;
  #else