irc/inspircd: Update to 3.0.1

PR:		237831
Submitted by:	Dmitri Goutnik <dg@syrec.org> (maintainer)

8 files changed, 250 insertions, 152 deletions

diff --git a/irc/inspircd/Makefile b/irc/inspircd/Makefile
index 1af18075fbe1..0f2ffa69e472 100644
--- a/irc/inspircd/Makefile
+++ b/irc/inspircd/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	inspircd
-PORTVERSION=	2.0.27
+PORTVERSION=	3.0.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	irc
 
 MAINTAINER=	dg@syrec.org
@@ -14,7 +13,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/docs/LICENSE.txt
 
 # Configure script is written in perl
-USES=		cpe perl5
+USES=		cpe gmake perl5
 USE_GITHUB=	yes
 USE_PERL5=	build
 
@@ -22,50 +21,48 @@ CPE_VENDOR=	inspire_ircd
 CPE_PRODUCT=	inspircd
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-cc=${CXX} \
+CONFIGURE_ARGS=	--binary-dir=${PREFIX}/bin \
 		--config-dir=${ETCDIR} \
-		--prefix=${PREFIX}/libexec/${PORTNAME} \
-		--binary-dir=${PREFIX}/bin \
-		--module-dir=${PREFIX}/libexec/${PORTNAME}/modules \
-		--log-dir=${INSPIRCD_LOGDIR} \
 		--data-dir=${INSPIRCD_DBDIR} \
-		--uid=${INSPIRCD_UID} \
+		--disable-interactive \
 		--enable-kqueue \
-		--disable-interactive
+		--log-dir=${INSPIRCD_LOGDIR} \
+		--manual-dir=${MANPREFIX}/man/man1 \
+		--module-dir=${PREFIX}/libexec/${PORTNAME}/modules \
+		--prefix=${PREFIX}/libexec/${PORTNAME} \
+		--with-cc=${CXX}
 
 USE_RC_SUBR=	${PORTNAME}
-MAKEFILE=	BSDmakefile
+MAKEFILE=	GNUmakefile
 
 USERS=		ircd
 GROUPS=		ircd
 INSPIRCD_UID=	72
+INSPIRCD_GID=	72
 
 INSPIRCD_DBDIR?=	/var/db/${PORTNAME}
 INSPIRCD_LOGDIR?=	/var/log/${PORTNAME}
 INSPIRCD_RUNDIR?=	/var/run/${PORTNAME}
 
 SUB_FILES=	pkg-deinstall
-SUB_LIST=	PORTNAME=${PORTNAME} \
-		INSPIRCD_DBDIR=${INSPIRCD_DBDIR} \
+SUB_LIST=	INSPIRCD_DBDIR=${INSPIRCD_DBDIR} \
+		INSPIRCD_GROUP=${GROUPS} \
 		INSPIRCD_LOGDIR=${INSPIRCD_LOGDIR} \
 		INSPIRCD_RUNDIR=${INSPIRCD_RUNDIR} \
 		INSPIRCD_USER=${USERS} \
-		INSPIRCD_GROUP=${GROUPS}
+		PORTNAME=${PORTNAME}
 PLIST_SUB=	INSPIRCD_DBDIR=${INSPIRCD_DBDIR} \
+		INSPIRCD_GROUP=${GROUPS} \
 		INSPIRCD_LOGDIR=${INSPIRCD_LOGDIR} \
 		INSPIRCD_RUNDIR=${INSPIRCD_RUNDIR} \
-		INSPIRCD_USER=${USERS} \
-		INSPIRCD_GROUP=${GROUPS}
+		INSPIRCD_USER=${USERS}
 
-CONFLICTS=	inspircd-1.*
-
-OPTIONS_DEFINE=	GNUTLS IPV6 LDAPAUTH LDAPOPER MYSQL OPENSSL PCRE PGSQL POSIX SQLITE
-OPTIONS_DEFAULT=OPENSSL POSIX
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		GNUTLS IPV6 LDAP MYSQL OPENSSL PCRE PGSQL POSIX SQLITE
+OPTIONS_DEFAULT=	OPENSSL POSIX
+OPTIONS_SUB=		yes
 
 GNUTLS_DESC=	Build m_ssl_gnutls module
-LDAPAUTH_DESC=	Build m_ldapauth module
-LDAPOPER_DESC=	Build m_ldapoper module
+LDAP_DESC=	Build m_ldap module
 MYSQL_DESC=	Build m_mysql module
 OPENSSL_DESC=	Build m_ssl_openssl module
 PCRE_DESC=	Build m_regex_pcre module
@@ -73,43 +70,46 @@ PGSQL_DESC=	Build m_pgsql module
 POSIX_DESC=	Build m_regex_posix module
 SQLITE_DESC=	Build m_sqlite3 module
 
-GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
-GNUTLS_USES=		pkgconfig
+GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
+GNUTLS_USES=			pkgconfig
 GNUTLS_CONFIGURE_ENABLE=	gnutls
-GNUTLS_VARS=		extras+=m_ssl_gnutls.cpp
+GNUTLS_VARS=			EXTRAS+=m_ssl_gnutls.cpp
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
-LDAPAUTH_USE=		openldap=yes
-LDAPAUTH_VARS=		extras+=m_ldapauth.cpp
-
-LDAPOPER_USE=		openldap=yes
-LDAPOPER_VARS=		extras+=m_ldapoper.cpp
+LDAP_USE=	OPENLDAP=yes
+LDAP_VARS=	EXTRAS+=m_ldap.cpp
 
-MYSQL_USES=		mysql
-MYSQL_VARS=		extras+=m_mysql.cpp
+MYSQL_USES=	mysql
+MYSQL_VARS=	EXTRAS+=m_mysql.cpp
 
-OPENSSL_USES=		pkgconfig ssl
+OPENSSL_USES=			pkgconfig ssl
 OPENSSL_CONFIGURE_ENABLE=	openssl
-OPENSSL_VARS=		extras+=m_ssl_openssl.cpp
+OPENSSL_VARS=			EXTRAS+=m_ssl_openssl.cpp
 
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
-PCRE_VARS=		extras+=m_regex_pcre.cpp
+PCRE_VARS=		EXTRAS+=m_regex_pcre.cpp
 
-PGSQL_USES=		pgsql
-PGSQL_VARS=		extras+=m_pgsql.cpp
+PGSQL_USES=	pgsql
+PGSQL_VARS=	EXTRAS+=m_pgsql.cpp
 
-POSIX_VARS=		extras+=m_regex_posix.cpp
+POSIX_VARS=	EXTRAS+=m_regex_posix.cpp
 
-SQLITE_USES=		pkgconfig sqlite
-SQLITE_VARS=		extras+=m_sqlite3.cpp
+SQLITE_USES=	pkgconfig sqlite
+SQLITE_VARS=	EXTRAS+=m_sqlite3.cpp
 
 pre-configure:
 	@(cd ${WRKSRC}/src/modules && for m in ${EXTRAS}; do ${RLN} extra/$$m $$m; done)
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|%%INSPIRCD_USER%%|${USERS}|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|%%INSPIRCD_UID%%|${INSPIRCD_UID}|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|%%INSPIRCD_GROUP%%|${GROUPS}|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|%%INSPIRCD_GID%%|${INSPIRCD_GID}|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|DATA_PATH "/inspircd.pid"|"${INSPIRCD_RUNDIR}/inspircd.pid"|' ${WRKSRC}/src/inspircd.cpp
-	@${REINPLACE_CMD} -e 's|conf/examples|examples|g' ${WRKSRC}/docs/conf/inspircd.conf.example
+	@${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
+	@${RM} ${WRKSRC}/make/template/main.mk.orig
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/modules/*.so
diff --git a/irc/inspircd/distinfo b/irc/inspircd/distinfo
index dd05e8517325..c94ea93f9edb 100644
--- a/irc/inspircd/distinfo
+++ b/irc/inspircd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547999328
-SHA256 (inspircd-inspircd-v2.0.27_GH0.tar.gz) = 6bc1956bd6a7d2d463c646f1563c99cb507f2f214e51d6ac9c70906ac27aae73
-SIZE (inspircd-inspircd-v2.0.27_GH0.tar.gz) = 735970
+TIMESTAMP = 1557496304
+SHA256 (inspircd-inspircd-v3.0.1_GH0.tar.gz) = e8668da4c8a183e86a42e9a825311b8280687481f8dc14c49f188f97d1aceef0
+SIZE (inspircd-inspircd-v3.0.1_GH0.tar.gz) = 794215
diff --git a/irc/inspircd/files/inspircd.in b/irc/inspircd/files/inspircd.in
index d2e5f97792e7..a1128bcfca50 100644
--- a/irc/inspircd/files/inspircd.in
+++ b/irc/inspircd/files/inspircd.in
@@ -40,7 +40,7 @@ load_rc_config ${name}
 : ${inspircd_chdir="%%ETCDIR%%"}
 
 command=/usr/sbin/daemon
-command_args="-f %%PREFIX%%/bin/inspircd --nofork --config ${inspircd_config} --logfile ${inspircd_logfile} ${inspircd_flags}"
+command_args="-S -p ${inspircd_pidfile} %%PREFIX%%/bin/inspircd --nofork --config ${inspircd_config} ${inspircd_flags}"
 procname=%%PREFIX%%/bin/inspircd
 pidfile=${inspircd_pidfile}
 required_files=${inspircd_config}
diff --git a/irc/inspircd/files/patch-configure b/irc/inspircd/files/patch-configure
new file mode 100644
index 000000000000..3615046f139b
--- /dev/null
+++ b/irc/inspircd/files/patch-configure
@@ -0,0 +1,64 @@
+--- configure.orig	2019-05-10 20:05:04 UTC
++++ configure
+@@ -199,57 +199,10 @@ if (defined $opt_system) {
+ 	$config{SCRIPT_DIR} = $opt_script_dir // $config{SCRIPT_DIR} // $config{BASE_DIR};
+ }
+ 
+-# Parse --gid=123 or --gid=foo and extract the group id.
+-my @group;
+-if (defined $opt_gid) {
+-	@group = $opt_gid =~ /^\d+$/ ? getgrgid($opt_gid) : getgrnam($opt_gid);
+-	print_error "there is no '$opt_gid' group on this system!" unless @group;
+-} else {
+-	@group = $opt_system ? getgrnam('irc') : getgrgid($config{GID} // getgid());
+-	print_error "you need to specify a group to run as using '--gid [id|name]'!" unless @group;
+-	unless ($group[2]) {
+-		print_warning <<"EOW";
+-You are building as the privileged $group[0] group and have not specified
+-an unprivileged group to run InspIRCd as.
+-
+-This is almost never what you should do. You should probably either create a new
+-unprivileged user/group to build and run as or pass the '--gid [id|name]' flag
+-to specify an unprivileged group to run as.
+-EOW
+-		if (!prompt_bool $interactive, "Are you sure you want to build as the $group[0] group?", 0) {
+-			say STDERR "If you are sure you want to build as the $group[0] group pass the --gid $group[2] flag." unless $interactive;
+-			exit 1;
+-		}
+-	}
+-}
+-$config{GROUP} = $group[0];
+-$config{GID}   = $group[2];
+-
+-# Parse --uid=123 or --uid=foo and extract the user id.
+-my @user;
+-if (defined $opt_uid) {
+-	@user = $opt_uid =~ /^\d+$/ ? getpwuid($opt_uid) : getpwnam($opt_uid);
+-	print_error "there is no '$opt_uid' user on this system!" unless @user;
+-} else {
+-	@user = $opt_system ? getpwnam('irc') : getpwuid($config{UID} // getuid());
+-	print_error "you need to specify a user to run as using '--uid [id|name]'!" unless @user;
+-	unless ($user[2]) {
+-		print_warning <<"EOW";
+-You are building as the privileged $user[0] user and have not specified
+-an unprivileged user to run InspIRCd as.
+-
+-This is almost never what you should do. You should probably either create a new
+-unprivileged user/group to build and run as or pass the '--uid [id|name]' flag
+-to specify an unprivileged user to run as.
+-EOW
+-		if (!prompt_bool $interactive, "Are you sure you want to build as the $user[0] user?", 0) {
+-			say STDERR "If you are sure you want to build as the $user[0] user pass the --uid $user[2] flag." unless $interactive;
+-			exit 1;
+-		}
+-	}
+-}
+-$config{USER} = $user[0];
+-$config{UID}  = $user[2];
++$config{GROUP} = "%%INSPIRCD_GROUP%%";
++$config{GID}   = %%INSPIRCD_GID%%;
++$config{USER} = "%%INSPIRCD_USER%%";
++$config{UID}  = %%INSPIRCD_UID%%;
+ 
+ # Warn the user about clock drifting when running on OpenVZ.
+ if (-e '/proc/user_beancounters' || -e '/proc/vz/vzaquota') {
diff --git a/irc/inspircd/files/patch-make_template_main.mk b/irc/inspircd/files/patch-make_template_main.mk
index 706969bd908a..d2b788fecb50 100644
--- a/irc/inspircd/files/patch-make_template_main.mk
+++ b/irc/inspircd/files/patch-make_template_main.mk
@@ -1,31 +1,55 @@
---- make/template/main.mk.orig	2016-09-03 14:51:50 UTC
+--- make/template/main.mk.orig	2019-05-10 08:54:28 UTC
 +++ make/template/main.mk
-@@ -61,6 +61,10 @@ INSTMODE_LIB = 0644
- @IFEQ $(SYSTEM) linux
-   LDLIBS += -ldl -lrt
- @ENDIF
-+@IFEQ $(SYSTEM) freebsd
-+  CXXFLAGS += -I/usr/local/include
-+  LDFLAGS += -L/usr/local/lib
-+@ENDIF
- @IFEQ $(SYSTEM) gnukfreebsd
-   LDLIBS += -ldl -lrt
- @ENDIF
-@@ -138,7 +142,7 @@ CXXFLAGS += -Iinclude
-   CXXFLAGS += -DPURE_STATIC
- @ENDIF
+@@ -203,32 +203,32 @@ finishmessage: target
+ 	@echo "*************************************"
  
--@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
-+@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS LDFLAGS
- @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC
- 
- # Default target
-@@ -226,8 +230,6 @@ install: target
- 		exit 1; \
- 	fi
- 	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)
--	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(DATPATH)
--	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(LOGPATH)
- 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
- 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
- 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
+ install: target
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BASE)
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH)
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/services
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/sql
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(SCRPATH)
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH)
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) "$(BUILDPATH)/modules/"*.so $(MODPATH)
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(SCRPATH) 2>/dev/null
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) .gdbargs $(SCRPATH)/.gdbargs 2>/dev/null
++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BASE)
++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(DATPATH)
++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(LOGPATH)
++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/services
++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/sql
++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MANPATH)
++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(SCRPATH)
++	-$(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH)
++	-$(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/modules/"*.so $(MODPATH)
++	-$(INSTALL) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(SCRPATH) 2>/dev/null
++	-$(INSTALL) -m $(INSTMODE_TXT) .gdbargs $(SCRPATH)/.gdbargs 2>/dev/null
+ ifeq ($(SYSTEM), darwin)
+ 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/org.inspircd.plist $(SCRPATH) 2>/dev/null
+ endif
+ ifeq ($(SYSTEM), linux)
+ 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.service $(SCRPATH) 2>/dev/null
+ endif
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(CONPATH)/examples
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(CONPATH)/examples/services
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/examples/sql
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
++	-$(INSTALL) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null
++	-$(INSTALL) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null
++	-$(INSTALL) -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
++	-$(INSTALL) -m $(INSTMODE_TXT) docs/conf/*.example $(CONPATH)/examples
++	-$(INSTALL) -m $(INSTMODE_TXT) docs/conf/services/*.example $(CONPATH)/examples/services
++	-$(INSTALL) -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/examples/sql
++	-$(INSTALL) -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
+ 	@echo ""
+ 	@echo "*************************************"
+ 	@echo "*        INSTALL COMPLETE!          *"
diff --git a/irc/inspircd/files/patch-src_modules_extra_m__ssl__openssl.cpp b/irc/inspircd/files/patch-src_modules_extra_m__ssl__openssl.cpp
new file mode 100644
index 000000000000..e2ee8fc277de
--- /dev/null
+++ b/irc/inspircd/files/patch-src_modules_extra_m__ssl__openssl.cpp
@@ -0,0 +1,11 @@
+--- src/modules/extra/m_ssl_openssl.cpp.orig	2019-05-08 13:19:20 UTC
++++ src/modules/extra/m_ssl_openssl.cpp
+@@ -21,7 +21,7 @@
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+-/// $CompilerFlags: find_compiler_flags("openssl")
++/// $CompilerFlags: find_compiler_flags("openssl" "")
+ /// $LinkerFlags: find_linker_flags("openssl" "-lssl -lcrypto")
+ 
+ /// $PackageInfo: require_system("centos") openssl-devel pkgconfig
diff --git a/irc/inspircd/pkg-message b/irc/inspircd/pkg-message
new file mode 100644
index 000000000000..4d1504bfb700
--- /dev/null
+++ b/irc/inspircd/pkg-message
@@ -0,0 +1,6 @@
+========================================================================
+InspIRCd v3 has many configuration changes that are not backwards
+compatible with InspIRCd v2. If you are upgrading from v2, please review
+https://docs.inspircd.org/3/configuration-changes/ and update your
+configuration files accrdingly.
+========================================================================
diff --git a/irc/inspircd/pkg-plist b/irc/inspircd/pkg-plist
index c253f3f2155a..67ab46211d9d 100644
--- a/irc/inspircd/pkg-plist
+++ b/irc/inspircd/pkg-plist
@@ -1,83 +1,52 @@
 bin/inspircd
-%%ETCDIR%%/examples/aliases/anope.conf.example
-%%ETCDIR%%/examples/aliases/atheme.conf.example
-@sample %%ETCDIR%%/examples/censor.conf.example %%ETCDIR%%/censor.conf
+bin/inspircd-genssl
 @sample %%ETCDIR%%/examples/filter.conf.example %%ETCDIR%%/filter.conf
-@sample %%ETCDIR%%/examples/helpop-full.conf.example %%ETCDIR%%/helpop-full.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
-%%ETCDIR%%/examples/modules/charybdis.conf.example
-%%ETCDIR%%/examples/modules/unrealircd.conf.example
 @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
-@sample %%ETCDIR%%/examples/rules.txt.example %%ETCDIR%%/rules.txt
+%%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
 libexec/inspircd/.gdbargs
 libexec/inspircd/inspircd
-libexec/inspircd/modules/cmd_admin.so
-libexec/inspircd/modules/cmd_away.so
-libexec/inspircd/modules/cmd_clearcache.so
-libexec/inspircd/modules/cmd_commands.so
-libexec/inspircd/modules/cmd_connect.so
-libexec/inspircd/modules/cmd_die.so
-libexec/inspircd/modules/cmd_eline.so
-libexec/inspircd/modules/cmd_gline.so
-libexec/inspircd/modules/cmd_info.so
-libexec/inspircd/modules/cmd_invite.so
-libexec/inspircd/modules/cmd_ison.so
-libexec/inspircd/modules/cmd_join.so
-libexec/inspircd/modules/cmd_kick.so
-libexec/inspircd/modules/cmd_kill.so
-libexec/inspircd/modules/cmd_kline.so
-libexec/inspircd/modules/cmd_links.so
-libexec/inspircd/modules/cmd_list.so
-libexec/inspircd/modules/cmd_loadmodule.so
-libexec/inspircd/modules/cmd_lusers.so
-libexec/inspircd/modules/cmd_map.so
-libexec/inspircd/modules/cmd_mode.so
-libexec/inspircd/modules/cmd_modenotice.so
-libexec/inspircd/modules/cmd_modules.so
-libexec/inspircd/modules/cmd_motd.so
-libexec/inspircd/modules/cmd_names.so
-libexec/inspircd/modules/cmd_nick.so
-libexec/inspircd/modules/cmd_notice.so
-libexec/inspircd/modules/cmd_oper.so
-libexec/inspircd/modules/cmd_part.so
-libexec/inspircd/modules/cmd_pass.so
-libexec/inspircd/modules/cmd_ping.so
-libexec/inspircd/modules/cmd_pong.so
-libexec/inspircd/modules/cmd_privmsg.so
-libexec/inspircd/modules/cmd_qline.so
-libexec/inspircd/modules/cmd_quit.so
-libexec/inspircd/modules/cmd_rehash.so
-libexec/inspircd/modules/cmd_reloadmodule.so
-libexec/inspircd/modules/cmd_restart.so
-libexec/inspircd/modules/cmd_rules.so
-libexec/inspircd/modules/cmd_server.so
-libexec/inspircd/modules/cmd_squit.so
-libexec/inspircd/modules/cmd_stats.so
-libexec/inspircd/modules/cmd_time.so
-libexec/inspircd/modules/cmd_topic.so
-libexec/inspircd/modules/cmd_unloadmodule.so
-libexec/inspircd/modules/cmd_user.so
-libexec/inspircd/modules/cmd_userhost.so
-libexec/inspircd/modules/cmd_version.so
-libexec/inspircd/modules/cmd_wallops.so
-libexec/inspircd/modules/cmd_who.so
-libexec/inspircd/modules/cmd_whois.so
-libexec/inspircd/modules/cmd_whowas.so
-libexec/inspircd/modules/cmd_zline.so
+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
@@ -93,14 +62,14 @@ 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_chanprotect.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_close.so
 libexec/inspircd/modules/m_commonchans.so
 libexec/inspircd/modules/m_conn_join.so
 libexec/inspircd/modules/m_conn_umodes.so
@@ -115,18 +84,24 @@ 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_devoice.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_halfop.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
@@ -134,8 +109,16 @@ 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_servertime.so
+libexec/inspircd/modules/m_ircv3_sts.so
 libexec/inspircd/modules/m_joinflood.so
-libexec/inspircd/modules/m_jumpserver.so
 libexec/inspircd/modules/m_kicknorejoin.so
 libexec/inspircd/modules/m_knock.so
 libexec/inspircd/modules/m_lockserv.so
@@ -143,6 +126,8 @@ 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
@@ -165,16 +150,17 @@ 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_regonlycreate.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_ripemd160.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
@@ -192,28 +178,22 @@ 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_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
-%%GNUTLS%%libexec/inspircd/modules/m_ssl_gnutls.so
-%%LDAPAUTH%%libexec/inspircd/modules/m_ldapauth.so
-%%LDAPOPER%%libexec/inspircd/modules/m_ldapoper.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
 libexec/inspircd/modules/m_sslinfo.so
 libexec/inspircd/modules/m_sslmodes.so
+libexec/inspircd/modules/m_sslrehashsignal.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_testnet.so
 libexec/inspircd/modules/m_timedbans.so
 libexec/inspircd/modules/m_tline.so
 libexec/inspircd/modules/m_topiclock.so
@@ -222,7 +202,20 @@ 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
+%%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
+%%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
+man/man1/inspircd-genssl.1.gz
+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%%