10 files changed, 133 insertions, 139 deletions

diff --git a/irc/charybdis/Makefile b/irc/charybdis/Makefile
index f7bba9140a59..0c0ca71d5b26 100644
--- a/irc/charybdis/Makefile
+++ b/irc/charybdis/Makefile
@@ -1,13 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	charybdis
-PORTVERSION=	3.4.2
-PORTREVISION=	6
-CATEGORIES=	irc net
-MASTER_SITES=	http://www.stack.nl/~jilles/irc/ \
-		http://www.bayofrum.net/dist/${PORTNAME}/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-EXTRACT_ONLY=	${DISTFILES:M*tbz2}
+PORTVERSION=	3.5.3
+CATEGORIES=	irc ipv6 net
+MASTER_SITES=	http://distfiles.charybdis.io/
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Powerful IRC daemon, based on ircd-ratbox
@@ -20,17 +16,12 @@ BROKEN_powerpc64=	Does not build
 CONFLICTS=	ircd-ratbox-[0-9]* ircd-ratbox-devel-[0-9]* \
 		nefarious-[0-9]* ircd-hybrid-[0-9]* \
 		ptlink-ircd-[0-9]* bnc-[0-9]* \
-		expect-[0-9]* whois-[0-9]* undernet-ircu-[0-9]* \
+		whois-[0-9]* undernet-ircu-[0-9]* \
 		ru-ircd-hybrid-[0-9]* \
 
-MASTER_SITES:=	${MASTER_SITES} \
-		${MASTER_SITES:S,$,charybdis-stable-oper-guide/:pdf,}
-
-PORTDOCS=	charybdis-oper-guide.pdf
-
-USES=		libtool pathfix tar:tbz2
-USE_OPENSSL=	yes
+USES=		libtool pathfix ssl tar:bz2
 USE_RC_SUBR=	${PORTNAME}
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USERS=		ircd
 GROUPS=		ircd
@@ -39,19 +30,13 @@ CONFIGURE_ARGS=	--sysconfdir=${ETCDIR} \
 		--enable-fhs-paths \
 		--enable-kqueue
 
-OPTIONS_DEFINE=	DOCS
-
-DOCS_DISTFILES=	${PORTDOCS}:pdf
-
 pre-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/ircd.motd \
 		${STAGEDIR}${ETCDIR}/ircd.motd.sample
 
-pre-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/charybdis-oper-guide.pdf \
-		${STAGEDIR}${DOCSDIR}
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libratbox.so
 
 .include <bsd.port.mk>
diff --git a/irc/charybdis/distinfo b/irc/charybdis/distinfo
index e5cad524a72c..b621345af242 100644
--- a/irc/charybdis/distinfo
+++ b/irc/charybdis/distinfo
@@ -1,4 +1,3 @@
-SHA256 (charybdis-3.4.2.tbz2) = 8a38e67072d90147c40202918c82237765e339cbc849456da54994ce6e31b754
-SIZE (charybdis-3.4.2.tbz2) = 1526229
-SHA256 (charybdis-oper-guide.pdf) = 13a0fe5642ed62810e76aed4c95dcd2fcd63f3565af9035fdd7b3874b5951e07
-SIZE (charybdis-oper-guide.pdf) = 553379
+TIMESTAMP = 1481632793
+SHA256 (charybdis-3.5.3.tar.bz2) = 9fb928524acbadeabedef56b0b6446c2d6de365382e256f5c21170c75390e16b
+SIZE (charybdis-3.5.3.tar.bz2) = 1555846
diff --git a/irc/charybdis/files/patch-configure b/irc/charybdis/files/patch-configure
index 1c947bf9ad59..5e91f7b0b049 100644
--- a/irc/charybdis/files/patch-configure
+++ b/irc/charybdis/files/patch-configure
@@ -1,6 +1,23 @@
---- configure.orig	2012-12-31 21:47:31 UTC
+--- configure.orig	2016-09-05 22:33:24 UTC
 +++ configure
-@@ -5411,7 +5411,7 @@ if test "x$enable_fhs_paths" = "xyes"; t
+@@ -677,6 +677,7 @@ MV
+ CP
+ RM
+ INSTALL_DATA
++INSTALL_LIB
+ INSTALL_SCRIPT
+ INSTALL_PROGRAM
+ SET_MAKE
+@@ -4833,6 +4834,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
++test -z "$INSTALL_LIB" && INSTALL_LIB='${INSTALL} -s -m 644'
++
+ # Extract the first word of "rm", so it can be a program name with args.
+ set dummy rm; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+@@ -5424,7 +5427,7 @@ if test "x$enable_fhs_paths" = "xyes"; t
    	pkglibexecdir='${libexecdir}/${PACKAGE_TARNAME}'
  	rundir=${rundir-'${prefix}/run'}
  	pkgrundir='${rundir}/${PACKAGE_TARNAME}'
diff --git a/irc/charybdis/files/patch-extensions_Makefile.in b/irc/charybdis/files/patch-extensions_Makefile.in
new file mode 100644
index 000000000000..fb5a0b1aafc8
--- /dev/null
+++ b/irc/charybdis/files/patch-extensions_Makefile.in
@@ -0,0 +1,19 @@
+--- extensions/Makefile.in.orig	2016-12-13 14:45:17 UTC
++++ extensions/Makefile.in
+@@ -14,6 +14,7 @@ MKDEP		= @MKDEP@
+ INSTALL		= @INSTALL@
+ INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+ INSTALL_DATA	= @INSTALL_DATA@
++INSTALL_LIB	= @INSTALL_LIB@
+ INSTALL_SUID    = @INSTALL_PROGRAM@ -o root -m 4755
+ SHELL		= /bin/sh
+ 
+@@ -104,7 +105,7 @@ install: all
+         fi
+ 	@echo "Installing modules into $(DESTDIR)$(AUTOMODULEDIR) .."
+ 	@for file in $(OBJS); do \
+-		$(INSTALL_DATA) $$file $(DESTDIR)$(AUTOMODULEDIR); \
++		$(INSTALL_LIB) $$file $(DESTDIR)$(AUTOMODULEDIR); \
+ 	done
+ 
+ .SUFFIXES: .so
diff --git a/irc/charybdis/files/patch-help_Makefile.in b/irc/charybdis/files/patch-help_Makefile.in
new file mode 100644
index 000000000000..6a992fd21d68
--- /dev/null
+++ b/irc/charybdis/files/patch-help_Makefile.in
@@ -0,0 +1,15 @@
+--- help/Makefile.in.orig	2016-12-13 14:45:17 UTC
++++ help/Makefile.in
+@@ -88,9 +88,10 @@ install:
+ 		$(INSTALL_DATA) $$help $(DESTDIR)$(uhelpdir); \
+ 	fi \
+ 	done
+-	@for link in $(SYMLINKS); do \
++	@cd $(DESTDIR)$(uhelpdir); \
++	for link in $(SYMLINKS); do \
+ 		rm -f $(DESTDIR)$(uhelpdir)/$$link; \
+-		ln -s $(ohelpdir)/$$link $(DESTDIR)$(uhelpdir); \
++		ln -s ../opers/$$link $$link; \
+ 	done
+ 
+ 
diff --git a/irc/charybdis/files/patch-modules_Makefile.in b/irc/charybdis/files/patch-modules_Makefile.in
new file mode 100644
index 000000000000..1ea7557778ad
--- /dev/null
+++ b/irc/charybdis/files/patch-modules_Makefile.in
@@ -0,0 +1,23 @@
+--- modules/Makefile.in.orig	2016-12-13 14:45:17 UTC
++++ modules/Makefile.in
+@@ -16,6 +16,7 @@ MKDEP		= @MKDEP@ -DIRCD_PREFIX=\"@prefix
+ INSTALL		= @INSTALL@
+ INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+ INSTALL_DATA	= @INSTALL_DATA@
++INSTALL_LIB	= @INSTALL_LIB@
+ INSTALL_SUID    = @INSTALL_PROGRAM@ -o root -m 4755
+ SEDOBJ		= @SEDOBJ@
+ SHELL		= /bin/sh
+@@ -179,10 +180,10 @@ install_libmodules.a: libmodules.a
+ install_shared_modules: install-mkdirs
+ 	@echo "ircd: installing modules"
+ 	@for file in $(SH_CORE_OBJS); do \
+-		$(INSTALL_DATA) $$file $(DESTDIR)$(moduledir); \
++		$(INSTALL_LIB) $$file $(DESTDIR)$(moduledir); \
+ 	done
+ 	@for file in $(SH_OBJS); do \
+-		$(INSTALL_DATA) $$file $(DESTDIR)$(automoduledir); \
++		$(INSTALL_LIB) $$file $(DESTDIR)$(automoduledir); \
+ 	done
+ 
+ install_hpux_shared: install-mkdirs
diff --git a/irc/charybdis/files/patch-remove-RB_PRNG_EGD b/irc/charybdis/files/patch-remove-RB_PRNG_EGD
deleted file mode 100644
index 754fe0152d0a..000000000000
--- a/irc/charybdis/files/patch-remove-RB_PRNG_EGD
+++ /dev/null
@@ -1,74 +0,0 @@
-From e861902fd9610229bc7327ea057152f66c8b374d Mon Sep 17 00:00:00 2001
-From: William Pitcock <nenolod@dereferenced.org>
-Date: Sun, 1 Mar 2015 01:05:14 -0600
-Subject: [PATCH] libratbox: remove RB_PRNG_EGD in its entirety (closes #85)
-
----
- libratbox/include/rb_commio.h | 1 -
- libratbox/src/openssl.c       | 4 ----
- src/ircd.c                    | 6 +-----
- src/sslproc.c                 | 7 +------
- 4 files changed, 2 insertions(+), 16 deletions(-)
-
-diff --git a/libratbox/include/rb_commio.h b/libratbox/include/rb_commio.h
-index 70eea34..df6110d 100644
---- libratbox/include/rb_commio.h.orig
-+++ libratbox/include/rb_commio.h
-@@ -157,7 +157,6 @@ const char *rb_get_iotype(void);
- 
- typedef enum
- {
--	RB_PRNG_EGD,
- 	RB_PRNG_FILE,
- #ifdef _WIN32
- 	RB_PRNGWIN32,
-diff --git a/libratbox/src/openssl.c b/libratbox/src/openssl.c
-index bd9df62..817f225 100644
---- libratbox/src/openssl.c.orig
-+++ libratbox/src/openssl.c
-@@ -603,10 +603,6 @@ rb_init_prng(const char *path, prng_seed_t seed_type)
- 
- 	switch (seed_type)
- 	{
--	case RB_PRNG_EGD:
--		if(RAND_egd(path) == -1)
--			return -1;
--		break;
- 	case RB_PRNG_FILE:
- 		if(RAND_load_file(path, -1) == -1)
- 			return -1;
-diff --git a/src/ircd.c b/src/ircd.c
-index 253bf13..923180f 100644
---- src/ircd.c.orig
-+++ src/ircd.c
-@@ -630,11 +630,7 @@ main(int argc, char *argv[])
- 	rb_lib_init(ircd_log_cb, ircd_restart_cb, ircd_die_cb, !server_state_foreground, maxconnections, DNODE_HEAP_SIZE, FD_HEAP_SIZE);
- 	rb_linebuf_init(LINEBUF_HEAP_SIZE);
- 
--	if(ConfigFileEntry.use_egd && (ConfigFileEntry.egdpool_path != NULL))
--	{
--		rb_init_prng(ConfigFileEntry.egdpool_path, RB_PRNG_EGD);
--	} else
--		rb_init_prng(NULL, RB_PRNG_DEFAULT);
-+	rb_init_prng(NULL, RB_PRNG_DEFAULT);
- 
- 	seed_random(NULL);
- 
-diff --git a/src/sslproc.c b/src/sslproc.c
-index c62f8e6..9d523e0 100644
---- src/sslproc.c.orig
-+++ src/sslproc.c
-@@ -323,12 +323,7 @@ start_ssldaemon(int count, const char *ssl_cert, const char *ssl_private_key, co
- 		rb_close(P1);
- 		ctl = allocate_ssl_daemon(F1, P2, pid);
- 		if(ssl_ok)
--		{
--			if(ConfigFileEntry.use_egd && (ConfigFileEntry.egdpool_path != NULL))
--				send_init_prng(ctl, RB_PRNG_EGD, ConfigFileEntry.egdpool_path);
--			else
--				send_init_prng(ctl, RB_PRNG_DEFAULT, NULL);
--		}
-+			send_init_prng(ctl, RB_PRNG_DEFAULT, NULL);
- 		if(ssl_ok && ssl_cert != NULL && ssl_private_key != NULL)
- 			send_new_ssl_certs_one(ctl, ssl_cert, ssl_private_key,
- 					       ssl_dh_params != NULL ? ssl_dh_params : "");
diff --git a/irc/charybdis/files/patch-tools-Makefile-in b/irc/charybdis/files/patch-tools-Makefile-in
deleted file mode 100644
index 0c7903280013..000000000000
--- a/irc/charybdis/files/patch-tools-Makefile-in
+++ /dev/null
@@ -1,28 +0,0 @@
---- tools/Makefile.in.orig	2010-10-15 13:29:52.000000000 +0000
-+++ tools/Makefile.in	2011-03-06 12:08:11.834345937 +0000
-@@ -4,6 +4,7 @@
- INSTALL		= @INSTALL@
- INSTALL_BIN	= @INSTALL_PROGRAM@
- INSTALL_DATA	= @INSTALL_DATA@
-+INSTALL_SCRIPT	= @INSTALL_SCRIPT@
- INSTALL_SUID	= @INSTALL_PROGRAM@ -o root -m 4755
- RM		= @RM@
- LEX		= @LEX@
-@@ -27,9 +28,9 @@
- confdir		= @confdir@
- localstatedir	= @localstatedir@
- 
--PROGS		= viconf mkpasswd convertilines convertklines genssl.sh
-+PROGS		= viconf mkpasswd convertilines convertklines
- 
--all: $(PROGS)
-+all: $(PROGS) genssl.sh
- 
- build: all
- 
-@@ -100,6 +101,7 @@
- 		fi; \
-		$(INSTALL_BIN) $$i $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)$$i; \
- 	done; \
-+	$(INSTALL_SCRIPT) genssl.sh $(DESTDIR)$(bindir); \
-	$(RM) -f $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)vimotd
diff --git a/irc/charybdis/files/patch-tools_Makefile.in b/irc/charybdis/files/patch-tools_Makefile.in
new file mode 100644
index 000000000000..82d076948f65
--- /dev/null
+++ b/irc/charybdis/files/patch-tools_Makefile.in
@@ -0,0 +1,30 @@
+--- tools/Makefile.in.orig	2016-12-13 14:45:17 UTC
++++ tools/Makefile.in
+@@ -4,6 +4,7 @@ CC		= @CC@
+ INSTALL		= @INSTALL@
+ INSTALL_BIN	= @INSTALL_PROGRAM@
+ INSTALL_DATA	= @INSTALL_DATA@
++INSTALL_SCRIPT	= @INSTALL_SCRIPT@
+ INSTALL_SUID	= @INSTALL_PROGRAM@ -o root -m 4755
+ RM		= @RM@
+ LEX		= @LEX@
+@@ -29,9 +30,9 @@ libexecdir	= @libexecdir@
+ sysconfdir	= @sysconfdir@
+ localstatedir	= @localstatedir@
+ 
+-PROGS		= viconf mkpasswd genssl
++PROGS		= viconf mkpasswd
+ 
+-all: $(PROGS)
++all: $(PROGS) genssl
+ 
+ build: all
+ 
+@@ -93,6 +94,7 @@ install: install-mkdirs build
+ 		fi; \
+ 		$(INSTALL_BIN) $$i $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)$$i; \
+ 	done; \
++	$(INSTALL_SCRIPT) genssl $(DESTDIR)$(bindir); \
+ 	$(RM) -f $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)vimotd
+ 	$(LN) $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)viconf $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)vimotd
+ 
diff --git a/irc/charybdis/pkg-plist b/irc/charybdis/pkg-plist
index 840998df0432..cf05cc1ed7e5 100644
--- a/irc/charybdis/pkg-plist
+++ b/irc/charybdis/pkg-plist
@@ -1,14 +1,14 @@
 bin/bantool
-bin/convertilines
-bin/convertklines
-bin/genssl.sh
+bin/genssl
 bin/ircd
 bin/mkpasswd
 bin/viconf
 bin/vimotd
-%%ETCDIR%%/example.conf
+@sample %%ETCDIR%%/ircd.conf.example %%ETCDIR%%/ircd.conf
 @sample %%ETCDIR%%/ircd.motd.sample
 %%ETCDIR%%/reference.conf
+lib/charybdis/modules/autoload/chm_nocolour.so
+lib/charybdis/modules/autoload/chm_noctcp.so
 lib/charybdis/modules/autoload/m_accept.so
 lib/charybdis/modules/autoload/m_admin.so
 lib/charybdis/modules/autoload/m_away.so
@@ -53,6 +53,7 @@ lib/charybdis/modules/autoload/m_services.so
 lib/charybdis/modules/autoload/m_set.so
 lib/charybdis/modules/autoload/m_signon.so
 lib/charybdis/modules/autoload/m_snote.so
+lib/charybdis/modules/autoload/m_starttls.so
 lib/charybdis/modules/autoload/m_stats.so
 lib/charybdis/modules/autoload/m_svinfo.so
 lib/charybdis/modules/autoload/m_tb.so
@@ -74,29 +75,33 @@ lib/charybdis/modules/autoload/m_whowas.so
 lib/charybdis/modules/autoload/m_xline.so
 lib/charybdis/modules/autoload/sno_routing.so
 lib/charybdis/modules/extensions/chm_adminonly.so
-lib/charybdis/modules/extensions/chm_operonly.so
+lib/charybdis/modules/extensions/chm_nonotice.so
 lib/charybdis/modules/extensions/chm_operonly_compat.so
+lib/charybdis/modules/extensions/chm_operonly.so
 lib/charybdis/modules/extensions/chm_quietunreg_compat.so
-lib/charybdis/modules/extensions/chm_sslonly.so
 lib/charybdis/modules/extensions/chm_sslonly_compat.so
+lib/charybdis/modules/extensions/chm_sslonly.so
 lib/charybdis/modules/extensions/createauthonly.so
 lib/charybdis/modules/extensions/createoperonly.so
 lib/charybdis/modules/extensions/example_module.so
 lib/charybdis/modules/extensions/extb_account.so
 lib/charybdis/modules/extensions/extb_canjoin.so
 lib/charybdis/modules/extensions/extb_channel.so
+lib/charybdis/modules/extensions/extb_combi.so
 lib/charybdis/modules/extensions/extb_extgecos.so
+lib/charybdis/modules/extensions/extb_hostmask.so
 lib/charybdis/modules/extensions/extb_oper.so
 lib/charybdis/modules/extensions/extb_realname.so
 lib/charybdis/modules/extensions/extb_server.so
 lib/charybdis/modules/extensions/extb_ssl.so
 lib/charybdis/modules/extensions/extb_usermode.so
 lib/charybdis/modules/extensions/force_user_invis.so
+lib/charybdis/modules/extensions/hide_uncommon_channels.so
 lib/charybdis/modules/extensions/hurt.so
-lib/charybdis/modules/extensions/ip_cloaking.so
 lib/charybdis/modules/extensions/ip_cloaking_3.0.so
 lib/charybdis/modules/extensions/ip_cloaking_4.0.so
 lib/charybdis/modules/extensions/ip_cloaking_old.so
+lib/charybdis/modules/extensions/ip_cloaking.so
 lib/charybdis/modules/extensions/m_42.so
 lib/charybdis/modules/extensions/m_adminwall.so
 lib/charybdis/modules/extensions/m_findforwards.so
@@ -104,16 +109,17 @@ lib/charybdis/modules/extensions/m_identify.so
 lib/charybdis/modules/extensions/m_mkpasswd.so
 lib/charybdis/modules/extensions/m_ojoin.so
 lib/charybdis/modules/extensions/m_okick.so
-lib/charybdis/modules/extensions/m_olist.so
 lib/charybdis/modules/extensions/m_omode.so
 lib/charybdis/modules/extensions/m_opme.so
 lib/charybdis/modules/extensions/m_remove.so
 lib/charybdis/modules/extensions/m_roleplay.so
 lib/charybdis/modules/extensions/m_sendbans.so
 lib/charybdis/modules/extensions/m_webirc.so
+lib/charybdis/modules/extensions/no_kill_services.so
 lib/charybdis/modules/extensions/no_locops.so
 lib/charybdis/modules/extensions/no_oper_invis.so
 lib/charybdis/modules/extensions/override.so
+lib/charybdis/modules/extensions/restrict-unauthenticated.so
 lib/charybdis/modules/extensions/sno_farconnect.so
 lib/charybdis/modules/extensions/sno_globalkline.so
 lib/charybdis/modules/extensions/sno_globaloper.so
@@ -181,6 +187,7 @@ man/man8/ircd.8.gz
 %%DATADIR%%/help/opers/modreload
 %%DATADIR%%/help/opers/modrestart
 %%DATADIR%%/help/opers/modunload
+%%DATADIR%%/help/opers/monitor
 %%DATADIR%%/help/opers/motd
 %%DATADIR%%/help/opers/names
 %%DATADIR%%/help/opers/nick
@@ -252,6 +259,7 @@ man/man8/ircd.8.gz
 %%DATADIR%%/help/users/list
 %%DATADIR%%/help/users/lusers
 %%DATADIR%%/help/users/map
+%%DATADIR%%/help/users/monitor
 %%DATADIR%%/help/users/motd
 %%DATADIR%%/help/users/names
 %%DATADIR%%/help/users/nick