irc/inspircd: Update to 3.7.0, drop maintainership

Changes:	https://docs.inspircd.org/3/change-log/#inspircd-370

4 files changed, 19 insertions, 8 deletions

diff --git a/irc/inspircd/Makefile b/irc/inspircd/Makefile
index d07e20aa5d61..7d1547446e3b 100644
--- a/irc/inspircd/Makefile
+++ b/irc/inspircd/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	inspircd
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.6.0
+DISTVERSION=	3.7.0
 CATEGORIES=	irc
 
-MAINTAINER=	dmgk@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modular C++ IRC daemon
 
 LICENSE=	GPLv2
diff --git a/irc/inspircd/distinfo b/irc/inspircd/distinfo
index 210c0ac87070..abcf73ab691b 100644
--- a/irc/inspircd/distinfo
+++ b/irc/inspircd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591531437
-SHA256 (inspircd-inspircd-v3.6.0_GH0.tar.gz) = f9a80ddfd8354163e0935ec65ea2c596c93152560ebb56dbeb5f8b3e1b53eb1e
-SIZE (inspircd-inspircd-v3.6.0_GH0.tar.gz) = 851768
+TIMESTAMP = 1596370724
+SHA256 (inspircd-inspircd-v3.7.0_GH0.tar.gz) = e77df17ed7f774fa0927cfce4412c2b6a3e4d5a9a8acab9753685c2aef22ea3b
+SIZE (inspircd-inspircd-v3.7.0_GH0.tar.gz) = 855041
diff --git a/irc/inspircd/files/patch-make_template_main.mk b/irc/inspircd/files/patch-make_template_main.mk
index 7d8d9baf7792..03dee4abc192 100644
--- a/irc/inspircd/files/patch-make_template_main.mk
+++ b/irc/inspircd/files/patch-make_template_main.mk
@@ -1,6 +1,6 @@
---- make/template/main.mk.orig	2020-01-31 12:49:58 UTC
+--- make/template/main.mk.orig	2020-07-30 16:23:30 UTC
 +++ make/template/main.mk
-@@ -216,36 +216,36 @@ finishmessage: target
+@@ -217,40 +217,40 @@ finishmessage: target
  	@echo "*************************************"
  
  install: target
@@ -19,6 +19,7 @@
 -	-$(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) @CONFIGURE_DIRECTORY@/logrotate $(SCRPATH) 2>/dev/null
 +	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BASE)
 +	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
 +	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)
@@ -34,6 +35,7 @@
 +	-$(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) @CONFIGURE_DIRECTORY@/logrotate $(SCRPATH) 2>/dev/null
  ifeq ($(SYSTEM), darwin)
  	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/org.inspircd.plist $(SCRPATH) 2>/dev/null
  endif
@@ -42,21 +44,27 @@
  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_TXT) @CONFIGURE_DIRECTORY@/inspircd-testssl.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_BIN) tools/testssl $(BINPATH)/inspircd-testssl 2>/dev/null
 -	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
 -	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/*.example $(EXAPATH)/codepages
 -	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers
 -	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
 -	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH)
 -	-$(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_TXT) @CONFIGURE_DIRECTORY@/inspircd-testssl.1 $(MANPATH) 2>/dev/null
 +	-$(INSTALL) -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
++	-$(INSTALL) -m $(INSTMODE_BIN) tools/testssl $(BINPATH)/inspircd-testssl 2>/dev/null
 +	-$(INSTALL) -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
 +	-$(INSTALL) -m $(INSTMODE_TXT) docs/conf/codepages/*.example $(EXAPATH)/codepages
 +	-$(INSTALL) -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers
 +	-$(INSTALL) -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
 +	-$(INSTALL) -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
++	-$(INSTALL) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH)
 +	-$(INSTALL) -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
  	@echo ""
  	@echo "*************************************"
diff --git a/irc/inspircd/pkg-plist b/irc/inspircd/pkg-plist
index e00ddf2f0edd..bd614a8ba16b 100644
--- a/irc/inspircd/pkg-plist
+++ b/irc/inspircd/pkg-plist
@@ -1,5 +1,6 @@
 bin/inspircd
 bin/inspircd-genssl
+bin/inspircd-testssl
 @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
@@ -14,14 +15,15 @@ bin/inspircd-genssl
 %%ETCDIR%%/examples/codepages/rfc1459.conf.example
 %%ETCDIR%%/examples/codepages/strict-rfc1459.conf.example
 %%ETCDIR%%/examples/providers/irccloud.conf.example
-%%ETCDIR%%/examples/providers/kiwiirc-com.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
+%%ETCDIR%%/help.txt
 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
@@ -224,6 +226,7 @@ libexec/inspircd/modules/m_xline_db.so
 %%SQLITE%%libexec/inspircd/modules/m_sqlite3.so
 %%SSLREHASH%%libexec/inspircd/modules/m_sslrehashsignal.so
 man/man1/inspircd-genssl.1.gz
+man/man1/inspircd-testssl.1.gz
 man/man1/inspircd.1.gz
 @dir(%%INSPIRCD_USER%%,%%INSPIRCD_GROUP%%,750) %%INSPIRCD_DBDIR%%
 @dir(%%INSPIRCD_USER%%,%%INSPIRCD_GROUP%%,755) %%INSPIRCD_LOGDIR%%