diff --git a/irc/inspircd/Makefile b/irc/inspircd/Makefile
index 43f14c7c42ec..5c7aa8c394dd 100644
--- a/irc/inspircd/Makefile
+++ b/irc/inspircd/Makefile
@@ -1,119 +1,118 @@
PORTNAME= inspircd
DISTVERSIONPREFIX= v
-DISTVERSION= 3.17.0
-PORTREVISION= 1
+DISTVERSION= 4.0.1
CATEGORIES= irc
MAINTAINER= driesm@FreeBSD.org
COMMENT= Modular C++ IRC daemon
WWW= https://www.inspircd.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/docs/LICENSE.txt
USES= compiler:c++11-lang cpe gmake localbase:ldflags perl5 pkgconfig
USE_GITHUB= yes
USE_PERL5= build
USE_RC_SUBR= ${PORTNAME}
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --binary-dir=${PREFIX}/bin \
--config-dir=${ETCDIR} \
--data-dir=${_INSPIRCD_DBDIR} \
--disable-auto-extras \
--distribution-label=${OPSYS}-${PORTVERSION} \
--gid=nobody \
--log-dir=${_INSPIRCD_LOGDIR} \
--manual-dir=${PREFIX}/share/man/man1 \
--module-dir=${PREFIX}/libexec/${PORTNAME}/modules \
--prefix=${PREFIX}/libexec/${PORTNAME} \
--runtime-dir=${_INSPIRCD_RUNDIR} \
--uid=nobody
MAKEFILE= GNUmakefile
SUB_FILES= pkg-message
SUB_LIST= INSPIRCD_DBDIR=${_INSPIRCD_DBDIR} \
INSPIRCD_GROUP=${GROUPS} \
INSPIRCD_LOGDIR=${_INSPIRCD_LOGDIR} \
INSPIRCD_RUNDIR=${_INSPIRCD_RUNDIR} \
INSPIRCD_USER=${USERS} \
PORTNAME=${PORTNAME}
USERS= ircd
GROUPS= ircd
PLIST_SUB= INSPIRCD_DBDIR=${_INSPIRCD_DBDIR} \
INSPIRCD_GROUP=${GROUPS} \
INSPIRCD_LOGDIR=${_INSPIRCD_LOGDIR} \
INSPIRCD_RUNDIR=${_INSPIRCD_RUNDIR} \
INSPIRCD_USER=${USERS}
OPTIONS_DEFINE= ARGON GNUTLS JSON LDAP MAXMIND MBEDTLS MYSQL OPENSSL \
PCRE PGSQL POSIX RE2 SQLITE SSLREHASH SYSLOG
OPTIONS_DEFAULT= OPENSSL POSIX
OPTIONS_SUB= yes
ARGON_DESC= Build m_argon2 module
GNUTLS_DESC= Build m_ssl_gnutls module
JSON_DESC= Build m_log_json module
LDAP_DESC= Build m_ldap module
MAXMIND_DESC= Build m_geo_maxmind module
MBEDTLS_DESC= Build m_ssl_mbedtls module
MYSQL_DESC= Build m_mysql module
OPENSSL_DESC= Build m_ssl_openssl module
PCRE_DESC= Build m_regex_pcre module
PGSQL_DESC= Build m_pgsql module
POSIX_DESC= Build m_regex_posix module
RE2_DESC= Build m_regex_re2 module
SQLITE_DESC= Build m_sqlite3 module
SSLREHASH_DESC= Build m_sslrehashsignal module
SYSLOG_DESC= Build m_log_syslog module
ARGON_LIB_DEPENDS= libargon2.so:security/libargon2
ARGON_VARS= EXTRAS+=m_argon2.cpp
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
GNUTLS_VARS= EXTRAS+=m_ssl_gnutls.cpp
JSON_BUILD_DEPENDS= rapidjson>0:devel/rapidjson
JSON_VARS= EXTRAS+=m_log_json.cpp
LDAP_USES= ldap
LDAP_VARS= EXTRAS+=m_ldap.cpp
MAXMIND_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb
MAXMIND_VARS= EXTRAS+=m_geo_maxmind.cpp
MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls
MBEDTLS_VARS= EXTRAS+=m_ssl_mbedtls.cpp
MYSQL_USES= mysql
MYSQL_VARS= EXTRAS+=m_mysql.cpp
OPENSSL_USES= ssl
OPENSSL_VARS= EXTRAS+=m_ssl_openssl.cpp
PCRE_LIB_DEPENDS= libpcre.so:devel/pcre
PCRE_VARS= EXTRAS+=m_regex_pcre.cpp
PGSQL_USES= pgsql
PGSQL_VARS= EXTRAS+=m_pgsql.cpp
POSIX_VARS= EXTRAS+=m_regex_posix.cpp
RE2_LIB_DEPENDS= libre2.so:devel/re2
RE2_VARS= EXTRAS+=m_regex_re2.cpp
SQLITE_USES= sqlite
SQLITE_VARS= EXTRAS+=m_sqlite3.cpp
SSLREHASH_VARS= EXTRAS+=m_sslrehashsignal.cpp
SYSLOG_VARS= EXTRAS+=m_log_syslog.cpp
_INSPIRCD_DBDIR?= /var/db/${PORTNAME}
_INSPIRCD_LOGDIR?= /var/log/${PORTNAME}
_INSPIRCD_RUNDIR?= /var/run/${PORTNAME}
post-patch:
- @${REINPLACE_CMD} -e 's|examples/||g' -e 's|\.example||g' ${WRKSRC}/docs/conf/inspircd.conf.example
- @${REINPLACE_CMD} -e 's|examples/||g' -e 's|\.example||g' ${WRKSRC}/docs/conf/modules.conf.example
+ @${REINPLACE_CMD} -e 's|examples/||g' -e 's|\.example||g' ${WRKSRC}/docs/conf/inspircd.example.conf
+ @${REINPLACE_CMD} -e 's|examples/||g' -e 's|\.example||g' ${WRKSRC}/docs/conf/modules.example.conf
pre-configure:
@(cd ${WRKSRC}/src/modules && for m in ${EXTRAS}; do ${RLN} extra/$$m $$m; done)
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/modules/*.so
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
@${MKDIR} ${STAGEDIR}${_INSPIRCD_DBDIR}
@${MKDIR} ${STAGEDIR}${_INSPIRCD_LOGDIR}
@${MKDIR} ${STAGEDIR}${_INSPIRCD_RUNDIR}
.include <bsd.port.mk>
diff --git a/irc/inspircd/distinfo b/irc/inspircd/distinfo
index 4d9a25ff586e..2abe0ab6bea0 100644
--- a/irc/inspircd/distinfo
+++ b/irc/inspircd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1703347066
-SHA256 (inspircd-inspircd-v3.17.0_GH0.tar.gz) = 181de90130e11a26ec107fcb6b74005cbce3051b89b500347e416054e29c3166
-SIZE (inspircd-inspircd-v3.17.0_GH0.tar.gz) = 881080
+TIMESTAMP = 1720026624
+SHA256 (inspircd-inspircd-v4.0.1_GH0.tar.gz) = 3e00d545593f2f2585792585b58501bfc953dc16ae1f35dc55333ccb57d6ef5d
+SIZE (inspircd-inspircd-v4.0.1_GH0.tar.gz) = 1016514
diff --git a/irc/inspircd/pkg-plist b/irc/inspircd/pkg-plist
index 11f10ad2dbaa..546362f43bc7 100644
--- a/irc/inspircd/pkg-plist
+++ b/irc/inspircd/pkg-plist
@@ -1,238 +1,235 @@
bin/inspircd
-bin/inspircd-genssl
bin/inspircd-testssl
-@sample %%ETCDIR%%/examples/codepages/iso-8859-1.conf.example %%ETCDIR%%/iso-8859-1.conf
-@sample %%ETCDIR%%/examples/codepages/iso-8859-2.conf.example %%ETCDIR%%/iso-8859-2.conf
-@sample %%ETCDIR%%/examples/filter.conf.example %%ETCDIR%%/filter.conf
-@sample %%ETCDIR%%/examples/helpop.conf.example %%ETCDIR%%/helpop.conf
-@sample %%ETCDIR%%/examples/inspircd.conf.example %%ETCDIR%%/inspircd.conf
-@sample %%ETCDIR%%/examples/links.conf.example %%ETCDIR%%/links.conf
-@sample %%ETCDIR%%/examples/modules.conf.example %%ETCDIR%%/modules.conf
-@sample %%ETCDIR%%/examples/motd.txt.example %%ETCDIR%%/motd.txt
-@sample %%ETCDIR%%/examples/opermotd.txt.example %%ETCDIR%%/opermotd.txt
-@sample %%ETCDIR%%/examples/opers.conf.example %%ETCDIR%%/opers.conf
-@sample %%ETCDIR%%/examples/quotes.txt.example %%ETCDIR%%/quotes.txt
-%%ETCDIR%%/examples/codepages/ascii.conf.example
-%%ETCDIR%%/examples/codepages/rfc1459.conf.example
-%%ETCDIR%%/examples/codepages/strict-rfc1459.conf.example
-%%ETCDIR%%/examples/providers/dronebl.conf.example
-%%ETCDIR%%/examples/providers/efnet-rbl.conf.example
-%%ETCDIR%%/examples/providers/irccloud.conf.example
-%%ETCDIR%%/examples/providers/torexit.conf.example
-%%ETCDIR%%/examples/services/anope.conf.example
-%%ETCDIR%%/examples/services/atheme.conf.example
-%%ETCDIR%%/examples/services/generic.conf.example
-%%ETCDIR%%/examples/sql/sqloper.mysql.sql
-%%ETCDIR%%/examples/sql/sqloper.pgsql.sql
-%%ETCDIR%%/examples/sql/sqloper.sqlite3.sql
+@sample %%ETCDIR%%/examples/codepages/iso-8859-1.example.conf %%ETCDIR%%/iso-8859-1.conf
+@sample %%ETCDIR%%/examples/codepages/iso-8859-2.example.conf %%ETCDIR%%/iso-8859-2.conf
+@sample %%ETCDIR%%/examples/filter.example.conf %%ETCDIR%%/filter.conf
+@sample %%ETCDIR%%/examples/help.example.conf %%ETCDIR%%/help.conf
+@sample %%ETCDIR%%/examples/inspircd.example.conf %%ETCDIR%%/inspircd.conf
+@sample %%ETCDIR%%/examples/links.example.conf %%ETCDIR%%/links.conf
+@sample %%ETCDIR%%/examples/modules.example.conf %%ETCDIR%%/modules.conf
+@sample %%ETCDIR%%/examples/motd.example.txt %%ETCDIR%%/motd.txt
+@sample %%ETCDIR%%/examples/opermotd.example.txt %%ETCDIR%%/opermotd.txt
+@sample %%ETCDIR%%/examples/opers.example.conf %%ETCDIR%%/opers.conf
+@sample %%ETCDIR%%/examples/quotes.example.txt %%ETCDIR%%/quotes.txt
+%%ETCDIR%%/examples/codepages/ascii.example.conf
+%%ETCDIR%%/examples/codepages/rfc1459.example.conf
+%%ETCDIR%%/examples/codepages/strict-rfc1459.example.conf
+%%ETCDIR%%/examples/providers/dronebl.example.conf
+%%ETCDIR%%/examples/providers/efnet-rbl.example.conf
+%%ETCDIR%%/examples/providers/irccloud.example.conf
+%%ETCDIR%%/examples/providers/torexit.example.conf
+%%ETCDIR%%/examples/services/anope.example.conf
+%%ETCDIR%%/examples/services/atheme.example.conf
+%%ETCDIR%%/examples/services/generic.example.conf
+%%ETCDIR%%/examples/sql/sqloper/mysql.sql
+%%ETCDIR%%/examples/sql/sqloper/pgsql.sql
+%%ETCDIR%%/examples/sql/sqloper/sqlite3.sql
+%%ETCDIR%%/examples/sql/log_sql/mysql.sql
+%%ETCDIR%%/examples/sql/log_sql/pgsql.sql
+%%ETCDIR%%/examples/sql/log_sql/sqlite3.sql
%%ETCDIR%%/help.txt
libexec/inspircd/deploy-ssl.sh
libexec/inspircd/inspircd
libexec/inspircd/logrotate
libexec/inspircd/modules/core_channel.so
libexec/inspircd/modules/core_dns.so
libexec/inspircd/modules/core_hostname_lookup.so
libexec/inspircd/modules/core_info.so
libexec/inspircd/modules/core_list.so
libexec/inspircd/modules/core_loadmodule.so
libexec/inspircd/modules/core_lusers.so
libexec/inspircd/modules/core_message.so
libexec/inspircd/modules/core_mode.so
libexec/inspircd/modules/core_oper.so
libexec/inspircd/modules/core_reloadmodule.so
libexec/inspircd/modules/core_serialize_rfc.so
libexec/inspircd/modules/core_stats.so
libexec/inspircd/modules/core_stub.so
libexec/inspircd/modules/core_user.so
libexec/inspircd/modules/core_wallops.so
libexec/inspircd/modules/core_who.so
libexec/inspircd/modules/core_whois.so
libexec/inspircd/modules/core_whowas.so
libexec/inspircd/modules/core_xline.so
libexec/inspircd/modules/m_abbreviation.so
libexec/inspircd/modules/m_alias.so
libexec/inspircd/modules/m_allowinvite.so
libexec/inspircd/modules/m_alltime.so
libexec/inspircd/modules/m_anticaps.so
libexec/inspircd/modules/m_auditorium.so
libexec/inspircd/modules/m_autoop.so
libexec/inspircd/modules/m_banexception.so
libexec/inspircd/modules/m_banredirect.so
libexec/inspircd/modules/m_bcrypt.so
libexec/inspircd/modules/m_blockamsg.so
-libexec/inspircd/modules/m_blockcaps.so
libexec/inspircd/modules/m_blockcolor.so
libexec/inspircd/modules/m_botmode.so
libexec/inspircd/modules/m_callerid.so
libexec/inspircd/modules/m_cap.so
libexec/inspircd/modules/m_cban.so
-libexec/inspircd/modules/m_censor.so
-libexec/inspircd/modules/m_cgiirc.so
libexec/inspircd/modules/m_chancreate.so
libexec/inspircd/modules/m_chanfilter.so
libexec/inspircd/modules/m_chanhistory.so
libexec/inspircd/modules/m_chanlog.so
libexec/inspircd/modules/m_channames.so
libexec/inspircd/modules/m_channelban.so
libexec/inspircd/modules/m_check.so
libexec/inspircd/modules/m_chghost.so
libexec/inspircd/modules/m_chgident.so
libexec/inspircd/modules/m_chgname.so
libexec/inspircd/modules/m_classban.so
libexec/inspircd/modules/m_clearchan.so
-libexec/inspircd/modules/m_cloaking.so
-libexec/inspircd/modules/m_clones.so
libexec/inspircd/modules/m_codepage.so
libexec/inspircd/modules/m_commonchans.so
libexec/inspircd/modules/m_conn_join.so
libexec/inspircd/modules/m_conn_umodes.so
libexec/inspircd/modules/m_conn_waitpong.so
libexec/inspircd/modules/m_connectban.so
libexec/inspircd/modules/m_connflood.so
libexec/inspircd/modules/m_customprefix.so
libexec/inspircd/modules/m_customtitle.so
libexec/inspircd/modules/m_cycle.so
libexec/inspircd/modules/m_dccallow.so
libexec/inspircd/modules/m_deaf.so
libexec/inspircd/modules/m_delayjoin.so
libexec/inspircd/modules/m_delaymsg.so
libexec/inspircd/modules/m_denychans.so
libexec/inspircd/modules/m_disable.so
libexec/inspircd/modules/m_dnsbl.so
libexec/inspircd/modules/m_exemptchanops.so
libexec/inspircd/modules/m_filter.so
-libexec/inspircd/modules/m_flashpolicyd.so
-libexec/inspircd/modules/m_gecosban.so
libexec/inspircd/modules/m_geoban.so
libexec/inspircd/modules/m_geoclass.so
libexec/inspircd/modules/m_globalload.so
libexec/inspircd/modules/m_globops.so
libexec/inspircd/modules/m_haproxy.so
-libexec/inspircd/modules/m_helpop.so
libexec/inspircd/modules/m_hidechans.so
libexec/inspircd/modules/m_hidelist.so
libexec/inspircd/modules/m_hidemode.so
libexec/inspircd/modules/m_hideoper.so
-libexec/inspircd/modules/m_hostchange.so
libexec/inspircd/modules/m_hostcycle.so
libexec/inspircd/modules/m_httpd.so
libexec/inspircd/modules/m_httpd_acl.so
libexec/inspircd/modules/m_httpd_config.so
libexec/inspircd/modules/m_httpd_stats.so
libexec/inspircd/modules/m_ident.so
libexec/inspircd/modules/m_inviteexception.so
libexec/inspircd/modules/m_ircv3.so
libexec/inspircd/modules/m_ircv3_accounttag.so
libexec/inspircd/modules/m_ircv3_batch.so
libexec/inspircd/modules/m_ircv3_capnotify.so
libexec/inspircd/modules/m_ircv3_chghost.so
libexec/inspircd/modules/m_ircv3_ctctags.so
libexec/inspircd/modules/m_ircv3_echomessage.so
libexec/inspircd/modules/m_ircv3_invitenotify.so
libexec/inspircd/modules/m_ircv3_labeledresponse.so
libexec/inspircd/modules/m_ircv3_msgid.so
libexec/inspircd/modules/m_ircv3_servertime.so
libexec/inspircd/modules/m_ircv3_sts.so
libexec/inspircd/modules/m_joinflood.so
libexec/inspircd/modules/m_kicknorejoin.so
libexec/inspircd/modules/m_knock.so
-libexec/inspircd/modules/m_lockserv.so
libexec/inspircd/modules/m_maphide.so
libexec/inspircd/modules/m_md5.so
libexec/inspircd/modules/m_messageflood.so
-libexec/inspircd/modules/m_mlock.so
-libexec/inspircd/modules/m_modenotice.so
libexec/inspircd/modules/m_monitor.so
libexec/inspircd/modules/m_muteban.so
libexec/inspircd/modules/m_namedmodes.so
-libexec/inspircd/modules/m_namesx.so
-libexec/inspircd/modules/m_nationalchars.so
libexec/inspircd/modules/m_nickflood.so
libexec/inspircd/modules/m_nicklock.so
libexec/inspircd/modules/m_noctcp.so
libexec/inspircd/modules/m_nokicks.so
libexec/inspircd/modules/m_nonicks.so
libexec/inspircd/modules/m_nonotice.so
-libexec/inspircd/modules/m_nopartmsg.so
libexec/inspircd/modules/m_ojoin.so
libexec/inspircd/modules/m_operchans.so
libexec/inspircd/modules/m_operjoin.so
libexec/inspircd/modules/m_operlevels.so
libexec/inspircd/modules/m_operlog.so
libexec/inspircd/modules/m_opermodes.so
libexec/inspircd/modules/m_opermotd.so
libexec/inspircd/modules/m_operprefix.so
libexec/inspircd/modules/m_override.so
libexec/inspircd/modules/m_passforward.so
libexec/inspircd/modules/m_password_hash.so
libexec/inspircd/modules/m_pbkdf2.so
libexec/inspircd/modules/m_permchannels.so
libexec/inspircd/modules/m_randquote.so
libexec/inspircd/modules/m_redirect.so
libexec/inspircd/modules/m_regex_glob.so
libexec/inspircd/modules/m_remove.so
libexec/inspircd/modules/m_repeat.so
libexec/inspircd/modules/m_restrictchans.so
libexec/inspircd/modules/m_restrictmsg.so
libexec/inspircd/modules/m_rline.so
libexec/inspircd/modules/m_rmode.so
libexec/inspircd/modules/m_sajoin.so
libexec/inspircd/modules/m_sakick.so
libexec/inspircd/modules/m_samode.so
libexec/inspircd/modules/m_sanick.so
libexec/inspircd/modules/m_sapart.so
libexec/inspircd/modules/m_saquit.so
libexec/inspircd/modules/m_sasl.so
libexec/inspircd/modules/m_satopic.so
libexec/inspircd/modules/m_securelist.so
libexec/inspircd/modules/m_seenicks.so
libexec/inspircd/modules/m_serverban.so
-libexec/inspircd/modules/m_services_account.so
-libexec/inspircd/modules/m_servprotect.so
libexec/inspircd/modules/m_sethost.so
libexec/inspircd/modules/m_setident.so
libexec/inspircd/modules/m_setidle.so
libexec/inspircd/modules/m_setname.so
libexec/inspircd/modules/m_sha1.so
-libexec/inspircd/modules/m_sha256.so
+libexec/inspircd/modules/m_sha2.so
libexec/inspircd/modules/m_showfile.so
libexec/inspircd/modules/m_showwhois.so
libexec/inspircd/modules/m_shun.so
libexec/inspircd/modules/m_silence.so
libexec/inspircd/modules/m_spanningtree.so
libexec/inspircd/modules/m_sqlauth.so
libexec/inspircd/modules/m_sqloper.so
libexec/inspircd/modules/m_sslinfo.so
libexec/inspircd/modules/m_sslmodes.so
libexec/inspircd/modules/m_starttls.so
libexec/inspircd/modules/m_stripcolor.so
-libexec/inspircd/modules/m_svshold.so
libexec/inspircd/modules/m_swhois.so
libexec/inspircd/modules/m_timedbans.so
libexec/inspircd/modules/m_tline.so
-libexec/inspircd/modules/m_topiclock.so
libexec/inspircd/modules/m_uhnames.so
libexec/inspircd/modules/m_uninvite.so
-libexec/inspircd/modules/m_userip.so
libexec/inspircd/modules/m_vhost.so
libexec/inspircd/modules/m_watch.so
libexec/inspircd/modules/m_websocket.so
libexec/inspircd/modules/m_xline_db.so
+libexec/inspircd/modules/core_clients.so
+libexec/inspircd/modules/m_account.so
+libexec/inspircd/modules/m_cloak.so
+libexec/inspircd/modules/m_cloak_md5.so
+libexec/inspircd/modules/m_cloak_sha256.so
+libexec/inspircd/modules/m_cloak_static.so
+libexec/inspircd/modules/m_cloak_user.so
+libexec/inspircd/modules/m_gateway.so
+libexec/inspircd/modules/m_help.so
+libexec/inspircd/modules/m_helpmode.so
+libexec/inspircd/modules/m_log_sql.so
+libexec/inspircd/modules/m_multiprefix.so
+libexec/inspircd/modules/m_opmoderated.so
+libexec/inspircd/modules/m_realnameban.so
+libexec/inspircd/modules/m_regex_stdlib.so
+libexec/inspircd/modules/m_services.so
%%GNUTLS%%libexec/inspircd/modules/m_ssl_gnutls.so
%%LDAP%%libexec/inspircd/modules/m_ldap.so
%%LDAP%%libexec/inspircd/modules/m_ldapauth.so
%%LDAP%%libexec/inspircd/modules/m_ldapoper.so
%%MBEDTLS%%libexec/inspircd/modules/m_ssl_mbedtls.so
%%MYSQL%%libexec/inspircd/modules/m_mysql.so
%%OPENSSL%%libexec/inspircd/modules/m_ssl_openssl.so
%%PCRE%%libexec/inspircd/modules/m_regex_pcre.so
%%PGSQL%%libexec/inspircd/modules/m_pgsql.so
%%POSIX%%libexec/inspircd/modules/m_regex_posix.so
%%SQLITE%%libexec/inspircd/modules/m_sqlite3.so
%%SSLREHASH%%libexec/inspircd/modules/m_sslrehashsignal.so
-share/man/man1/inspircd-genssl.1.gz
share/man/man1/inspircd-testssl.1.gz
share/man/man1/inspircd.1.gz
@dir(%%INSPIRCD_USER%%,%%INSPIRCD_GROUP%%,750) %%INSPIRCD_DBDIR%%
@dir(%%INSPIRCD_USER%%,%%INSPIRCD_GROUP%%,755) %%INSPIRCD_LOGDIR%%
@dir(%%INSPIRCD_USER%%,%%INSPIRCD_GROUP%%,755) %%INSPIRCD_RUNDIR%%