MFH: r428616

- update from 7.2.6 to 7.2.7
- add LICENSE
- add 'ssl', 'localbase' and 'cpe' to USES
- simplify options handling

PR:		209217
Approved by:	ports-secteam (junovitch)
Security:	CVE-2014-9773
Security:	CVE-2016-4478

3 files changed, 613 insertions, 644 deletions

diff --git a/irc/atheme-services/Makefile b/irc/atheme-services/Makefile
index 9b69708cb6fd..c339c7aafaec 100644
--- a/irc/atheme-services/Makefile
+++ b/irc/atheme-services/Makefile
@@ -2,14 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	atheme-services
-PORTVERSION=	7.2.6
-CATEGORIES=	irc
-MASTER_SITES=	http://atheme.github.io/downloads/
+PORTVERSION=	7.2.7
+CATEGORIES=	irc ipv6 net
+MASTER_SITES=	https://github.com/atheme/atheme/releases/download/v${PORTVERSION}/
+DISTNAME=	atheme-${PORTVERSION}
 
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	Set of services for IRC networks
 
-USES=		tar:bzip2 pkgconfig pathfix gmake
+LICENSE=	ISCL
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libmowgli-2.so:devel/libmowgli2
+
+USES=		cpe gmake localbase pathfix pkgconfig ssl tar:bzip2
 PATHFIX_MAKEFILEIN=	Makefile
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@@ -18,14 +24,12 @@ CONFIGURE_ARGS=	--enable-fhs-paths \
 		--localstatedir=/var \
 		--disable-gtk-doc \
 		--enable-large-net
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+
+CPE_PRODUCT=	atheme
 
 USERS=		ircservices
 GROUPS=		ircservices
 
-LIB_DEPENDS+=	libmowgli-2.so:devel/libmowgli2
-
 USE_RC_SUBR=	atheme-services
 
 OPTIONS_DEFINE=	CONTRIB CRACKLIB DOCS LDAP NLS PCRE PERL
@@ -36,61 +40,16 @@ CRACKLIB_DESC=	Use cracklib for checking password strength
 
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCONTRIB}
-CONFIGURE_ARGS+=	--enable-contrib
-.else
-CONFIGURE_ARGS+=	--disable-contrib
-.endif
-
-.if ${PORT_OPTIONS:MCRACKLIB}
-LIB_DEPENDS+=	libcrack.so:security/cracklib
-CONFIGURE_ARGS+=	--with-cracklib
-.else
-CONFIGURE_ARGS+=	--without-cracklib
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=	--with-ldap
-.else
-CONFIGURE_ARGS+=	--without-ldap
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=	--enable-nls
-.else
-CONFIGURE_ARGS+=	--disable-nls
-.endif
-
-.if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=	libpcre.so:devel/pcre
-CONFIGURE_ARGS+=	--with-pcre
-.else
-CONFIGURE_ARGS+=	--without-pcre
-.endif
-
-.if ${PORT_OPTIONS:MPERL}
-USES+=		perl5
-CONFIGURE_ARGS+=	--with-perl
-.else
-CONFIGURE_ARGS+=	--without-perl
-.endif
-
-post-install:
-# Treat atheme.motd like atheme.conf. So don't install it directly,
-# but instead copy it from atheme.motd.example if it doesn't exist,
-# and only remove it at deinstall time if it's unchanged.
-	@${RM} ${STAGEDIR}${PREFIX}/etc/atheme/atheme.motd
-# These are just to satisfy check-orphans
-	@${RMDIR} ${STAGEDIR}/var/lib/atheme
-	@${RMDIR} ${STAGEDIR}/var/lib
-	@${RMDIR} ${STAGEDIR}/var/log/atheme
-	@${RMDIR} ${STAGEDIR}/var/run/atheme
-.if !${PORT_OPTIONS:MDOCS}
-	@${RM} -Rf ${STAGEDIR}${PREFIX}/share/doc/atheme
-.endif
+CONTRIB_CONFIGURE_ENABLE=	contrib
+CRACKLIB_LIB_DEPENDS=	libcrack.so:security/cracklib
+CRACKLIB_CONFIGURE_WITH=	cracklib
+LDAP_USE=	openldap=yes
+LDAP_CONFIGURE_WITH=	ldap
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
+PCRE_CONFIGURE_WITH=	pcre
+PERL_USES=	perl5
+PERL_CONFIGURE_WITH=	perl
 
 .include <bsd.port.mk>
diff --git a/irc/atheme-services/distinfo b/irc/atheme-services/distinfo
index 490151804633..629c0d99f3ba 100644
--- a/irc/atheme-services/distinfo
+++ b/irc/atheme-services/distinfo
@@ -1,2 +1,3 @@
-SHA256 (atheme-services-7.2.6.tar.bz2) = c2805f50ac8ea05e35ae2cebb67b59dd5f8c2159ee7dea6842a85cab514b3ba2
-SIZE (atheme-services-7.2.6.tar.bz2) = 1215437
+TIMESTAMP = 1481712949
+SHA256 (atheme-7.2.7.tar.bz2) = 64159a5aef905f0a15f35c7dd2bf1b140d918290488e9b6762fd85fd1bfafd94
+SIZE (atheme-7.2.7.tar.bz2) = 1181086
diff --git a/irc/atheme-services/pkg-plist b/irc/atheme-services/pkg-plist
index 3de87c703b53..d239e5f3d192 100644
--- a/irc/atheme-services/pkg-plist
+++ b/irc/atheme-services/pkg-plist
@@ -1,20 +1,586 @@
 bin/atheme-services
 bin/dbverify
 bin/ecdsakeygen
+@dir(ircservices,ircservices,) /var/lib/atheme
+@dir(ircservices,ircservices,) /var/log/atheme
+@dir(ircservices,ircservices,) /var/run/atheme
 @group ircservices
+@dir etc/atheme
 @mode 640
 @sample etc/atheme/atheme.conf.example etc/atheme/atheme.conf
+@sample etc/atheme/atheme.motd.example etc/atheme/atheme.motd
 etc/atheme/atheme.conf.operserv-example
 etc/atheme/atheme.conf.userserv-example
 etc/atheme/atheme.cron.example
-@sample etc/atheme/atheme.motd.example etc/atheme/atheme.motd
-@group
 @mode
+@group
+@dir /var/lib
+%%CONTRIB%%lib/atheme/modules/contrib/backtrace.so
+%%CONTRIB%%lib/atheme/modules/contrib/cs_access_alias.so
+%%CONTRIB%%lib/atheme/modules/contrib/cs_babbler.so
+%%CONTRIB%%lib/atheme/modules/contrib/cs_badwords.so
+%%CONTRIB%%lib/atheme/modules/contrib/cs_fregister.so
+%%CONTRIB%%lib/atheme/modules/contrib/cs_kickdots.so
+%%CONTRIB%%lib/atheme/modules/contrib/cs_modesync.so
+%%CONTRIB%%lib/atheme/modules/contrib/cs_ping.so
+%%CONTRIB%%lib/atheme/modules/contrib/cs_regmode.so
+%%CONTRIB%%lib/atheme/modules/contrib/cs_regnotice.so
+%%CONTRIB%%lib/atheme/modules/contrib/cs_updown.so
+%%CONTRIB%%lib/atheme/modules/contrib/cs_userinfo.so
+%%CONTRIB%%lib/atheme/modules/contrib/dnsbl.so
+%%CONTRIB%%lib/atheme/modules/contrib/gen_echoserver.so
+%%CONTRIB%%lib/atheme/modules/contrib/gen_listenerdemo.so
+%%CONTRIB%%lib/atheme/modules/contrib/gen_vhostonreg.so
+%%CONTRIB%%lib/atheme/modules/contrib/graphtastical.so
+%%CONTRIB%%lib/atheme/modules/contrib/gs_roulette.so
+%%CONTRIB%%lib/atheme/modules/contrib/ircd_announceserv.so
+%%CONTRIB%%lib/atheme/modules/contrib/ircd_catserv.so
+%%CONTRIB%%lib/atheme/modules/contrib/ircd_loveserv.so
+%%CONTRIB%%lib/atheme/modules/contrib/mlocktweaker.so
+%%CONTRIB%%lib/atheme/modules/contrib/ms_fsend.so
+%%CONTRIB%%lib/atheme/modules/contrib/ns_ajoin.so
+%%CONTRIB%%lib/atheme/modules/contrib/ns_cleannick.so
+%%CONTRIB%%lib/atheme/modules/contrib/ns_fenforce.so
+%%CONTRIB%%lib/atheme/modules/contrib/ns_forbid.so
+%%CONTRIB%%lib/atheme/modules/contrib/ns_fregister.so
+%%CONTRIB%%lib/atheme/modules/contrib/ns_generatehash.so
+%%CONTRIB%%lib/atheme/modules/contrib/ns_generatepass.so
+%%CONTRIB%%lib/atheme/modules/contrib/ns_goodmail.so
+%%CONTRIB%%lib/atheme/modules/contrib/ns_guestnoreg.so
+%%CONTRIB%%lib/atheme/modules/contrib/ns_listlogins.so
+%%CONTRIB%%lib/atheme/modules/contrib/ns_mxcheck_async.so
+%%CONTRIB%%lib/atheme/modules/contrib/ns_mxcheck.so
+%%CONTRIB%%lib/atheme/modules/contrib/ns_regnotice.so
+%%CONTRIB%%lib/atheme/modules/contrib/ns_sendpassmail.so
+%%CONTRIB%%lib/atheme/modules/contrib/ns_waitreg.so
+%%CONTRIB%%lib/atheme/modules/contrib/on_db_save.so
+%%CONTRIB%%lib/atheme/modules/contrib/os_akillnicklist.so
+%%CONTRIB%%lib/atheme/modules/contrib/os_defcon.so
+%%CONTRIB%%lib/atheme/modules/contrib/os_helpme.so
+%%CONTRIB%%lib/atheme/modules/contrib/os_joinmon.so
+%%CONTRIB%%lib/atheme/modules/contrib/os_kill.so
+%%CONTRIB%%lib/atheme/modules/contrib/os_klinechan.so
+%%CONTRIB%%lib/atheme/modules/contrib/os_modeall.so
+%%CONTRIB%%lib/atheme/modules/contrib/os_pingspam.so
+%%CONTRIB%%lib/atheme/modules/contrib/os_procwatch.so
+%%CONTRIB%%lib/atheme/modules/contrib/os_resolve.so
+%%CONTRIB%%lib/atheme/modules/contrib/os_savechanmodes.so
+%%CONTRIB%%lib/atheme/modules/contrib/os_tabletest.so
+%%CONTRIB%%lib/atheme/modules/contrib/os_testcmd.so
+%%CONTRIB%%lib/atheme/modules/contrib/os_testproc.so
+%%CONTRIB%%lib/atheme/modules/contrib/os_trace.so
+%%CONTRIB%%lib/atheme/modules/contrib/wumpus.so
+%%CRACKLIB%%lib/atheme/modules/nickserv/cracklib.so
+%%DOCS%%share/doc/atheme/FAQ
+%%DOCS%%share/doc/atheme/IRCD
+%%DOCS%%share/doc/atheme/JSONRPC
+%%DOCS%%share/doc/atheme/LICENSE
+%%DOCS%%share/doc/atheme/PCOMMANDS
+%%DOCS%%share/doc/atheme/perl/Atheme.pod
+%%DOCS%%share/doc/atheme/PRIVILEGES
+%%DOCS%%share/doc/atheme/reference/gtk-doc.make
+%%DOCS%%share/doc/atheme/RELEASE
+%%DOCS%%share/doc/atheme/SASL
+%%DOCS%%share/doc/atheme/SQL
+%%DOCS%%share/doc/atheme/technical/MODES
+%%DOCS%%share/doc/atheme/technical/XMLRPCLIB
+%%DOCS%%share/doc/atheme/TRANSLATION
+%%DOCS%%share/doc/atheme/VERSION_LETTERS
+%%DOCS%%share/doc/atheme/WINDOWS
+%%DOCS%%share/doc/atheme/XMLRPC
+%%LDAP%%lib/atheme/modules/auth/ldap.so
+%%NLS%%share/atheme/help/es/alis/list
+%%NLS%%share/atheme/help/es/botserv/act
+%%NLS%%share/atheme/help/es/botserv/assign
+%%NLS%%share/atheme/help/es/botserv/bot
+%%NLS%%share/atheme/help/es/botserv/botlist
+%%NLS%%share/atheme/help/es/botserv/info
+%%NLS%%share/atheme/help/es/botserv/say
+%%NLS%%share/atheme/help/es/botserv/set_fantasy
+%%NLS%%share/atheme/help/es/botserv/set_nobot
+%%NLS%%share/atheme/help/es/botserv/set_private
+%%NLS%%share/atheme/help/es/botserv/unassign
+%%NLS%%share/atheme/help/es/chanfix/chanfix
+%%NLS%%share/atheme/help/es/chanfix/info
+%%NLS%%share/atheme/help/es/chanfix/scores
+%%NLS%%share/atheme/help/es/contrib/access
+%%NLS%%share/atheme/help/es/contrib/ajoin
+%%NLS%%share/atheme/help/es/contrib/as_activate
+%%NLS%%share/atheme/help/es/contrib/as_cancel
+%%NLS%%share/atheme/help/es/contrib/as_reject
+%%NLS%%share/atheme/help/es/contrib/as_request
+%%NLS%%share/atheme/help/es/contrib/as_waiting
+%%NLS%%share/atheme/help/es/contrib/badwords
+%%NLS%%share/atheme/help/es/contrib/cs_fregister
+%%NLS%%share/atheme/help/es/contrib/cs_ping
+%%NLS%%share/atheme/help/es/contrib/defcon
+%%NLS%%share/atheme/help/es/contrib/down
+%%NLS%%share/atheme/help/es/contrib/fenforce
+%%NLS%%share/atheme/help/es/contrib/forbid
+%%NLS%%share/atheme/help/es/contrib/fregister
+%%NLS%%share/atheme/help/es/contrib/generatehash
+%%NLS%%share/atheme/help/es/contrib/generatepass
+%%NLS%%share/atheme/help/es/contrib/helpme
+%%NLS%%share/atheme/help/es/contrib/kill
+%%NLS%%share/atheme/help/es/contrib/klinechan
+%%NLS%%share/atheme/help/es/contrib/listklinechan
+%%NLS%%share/atheme/help/es/contrib/listlogins
+%%NLS%%share/atheme/help/es/contrib/loadchanmodes
+%%NLS%%share/atheme/help/es/contrib/logstream
+%%NLS%%share/atheme/help/es/contrib/pingspam
+%%NLS%%share/atheme/help/es/contrib/procwatch
+%%NLS%%share/atheme/help/es/contrib/roulette
+%%NLS%%share/atheme/help/es/contrib/savechanmodes
+%%NLS%%share/atheme/help/es/contrib/set_blockbadwords
+%%NLS%%share/atheme/help/es/contrib/trace
+%%NLS%%share/atheme/help/es/contrib/up
+%%NLS%%share/atheme/help/es/contrib/userinfo
+%%NLS%%share/atheme/help/es/cservice/access_add
+%%NLS%%share/atheme/help/es/cservice/access_del
+%%NLS%%share/atheme/help/es/cservice/access_info
+%%NLS%%share/atheme/help/es/cservice/access_list
+%%NLS%%share/atheme/help/es/cservice/akick
+%%NLS%%share/atheme/help/es/cservice/ban
+%%NLS%%share/atheme/help/es/cservice/clear_bans
+%%NLS%%share/atheme/help/es/cservice/clear_flags
+%%NLS%%share/atheme/help/es/cservice/clear_users
+%%NLS%%share/atheme/help/es/cservice/clone
+%%NLS%%share/atheme/help/es/cservice/close
+%%NLS%%share/atheme/help/es/cservice/count
+%%NLS%%share/atheme/help/es/cservice/drop
+%%NLS%%share/atheme/help/es/cservice/fdrop
+%%NLS%%share/atheme/help/es/cservice/fflags
+%%NLS%%share/atheme/help/es/cservice/flags
+%%NLS%%share/atheme/help/es/cservice/forcexop
+%%NLS%%share/atheme/help/es/cservice/ftransfer
+%%NLS%%share/atheme/help/es/cservice/getkey
+%%NLS%%share/atheme/help/es/cservice/halfop
+%%NLS%%share/atheme/help/es/cservice/hold
+%%NLS%%share/atheme/help/es/cservice/info
+%%NLS%%share/atheme/help/es/cservice/invite
+%%NLS%%share/atheme/help/es/cservice/kick
+%%NLS%%share/atheme/help/es/cservice/kickban
+%%NLS%%share/atheme/help/es/cservice/list
+%%NLS%%share/atheme/help/es/cservice/mark
+%%NLS%%share/atheme/help/es/cservice/op_voice
+%%NLS%%share/atheme/help/es/cservice/owner
+%%NLS%%share/atheme/help/es/cservice/protect
+%%NLS%%share/atheme/help/es/cservice/quiet
+%%NLS%%share/atheme/help/es/cservice/recover
+%%NLS%%share/atheme/help/es/cservice/register
+%%NLS%%share/atheme/help/es/cservice/role_add
+%%NLS%%share/atheme/help/es/cservice/role_del
+%%NLS%%share/atheme/help/es/cservice/role_list
+%%NLS%%share/atheme/help/es/cservice/role_set
+%%NLS%%share/atheme/help/es/cservice/set_email
+%%NLS%%share/atheme/help/es/cservice/set_entrymsg
+%%NLS%%share/atheme/help/es/cservice/set_fantasy
+%%NLS%%share/atheme/help/es/cservice/set_founder
+%%NLS%%share/atheme/help/es/cservice/set_gameserv
+%%NLS%%share/atheme/help/es/cservice/set_guard
+%%NLS%%share/atheme/help/es/cservice/set_keeptopic
+%%NLS%%share/atheme/help/es/cservice/set_limitflags
+%%NLS%%share/atheme/help/es/cservice/set_mlock
+%%NLS%%share/atheme/help/es/cservice/set_nosync
+%%NLS%%share/atheme/help/es/cservice/set_prefix
+%%NLS%%share/atheme/help/es/cservice/set_private
+%%NLS%%share/atheme/help/es/cservice/set_property
+%%NLS%%share/atheme/help/es/cservice/set_restricted
+%%NLS%%share/atheme/help/es/cservice/set_secure
+%%NLS%%share/atheme/help/es/cservice/set_topiclock
+%%NLS%%share/atheme/help/es/cservice/set_url
+%%NLS%%share/atheme/help/es/cservice/set_verbose
+%%NLS%%share/atheme/help/es/cservice/status
+%%NLS%%share/atheme/help/es/cservice/sync
+%%NLS%%share/atheme/help/es/cservice/taxonomy
+%%NLS%%share/atheme/help/es/cservice/template
+%%NLS%%share/atheme/help/es/cservice/topic
+%%NLS%%share/atheme/help/es/cservice/topicappend
+%%NLS%%share/atheme/help/es/cservice/topicprepend
+%%NLS%%share/atheme/help/es/cservice/unban
+%%NLS%%share/atheme/help/es/cservice/unban_self
+%%NLS%%share/atheme/help/es/cservice/unquiet
+%%NLS%%share/atheme/help/es/cservice/why
+%%NLS%%share/atheme/help/es/cservice/xop
+%%NLS%%share/atheme/help/es/gameserv/calc
+%%NLS%%share/atheme/help/es/gameserv/eightball
+%%NLS%%share/atheme/help/es/gameserv/lottery
+%%NLS%%share/atheme/help/es/gameserv/namegen
+%%NLS%%share/atheme/help/es/gameserv/roll
+%%NLS%%share/atheme/help/es/groupserv/acsnolimit
+%%NLS%%share/atheme/help/es/groupserv/drop
+%%NLS%%share/atheme/help/es/groupserv/fdrop
+%%NLS%%share/atheme/help/es/groupserv/fflags
+%%NLS%%share/atheme/help/es/groupserv/flags
+%%NLS%%share/atheme/help/es/groupserv/info
+%%NLS%%share/atheme/help/es/groupserv/join
+%%NLS%%share/atheme/help/es/groupserv/list
+%%NLS%%share/atheme/help/es/groupserv/listchans
+%%NLS%%share/atheme/help/es/groupserv/register
+%%NLS%%share/atheme/help/es/groupserv/regnolimit
+%%NLS%%share/atheme/help/es/groupserv/set_channel
+%%NLS%%share/atheme/help/es/groupserv/set_description
+%%NLS%%share/atheme/help/es/groupserv/set_email
+%%NLS%%share/atheme/help/es/groupserv/set_joinflags
+%%NLS%%share/atheme/help/es/groupserv/set_open
+%%NLS%%share/atheme/help/es/groupserv/set_public
+%%NLS%%share/atheme/help/es/groupserv/set_url
+%%NLS%%share/atheme/help/es/gservice/global
+%%NLS%%share/atheme/help/es/help
+%%NLS%%share/atheme/help/es/helpserv/cancel
+%%NLS%%share/atheme/help/es/helpserv/close
+%%NLS%%share/atheme/help/es/helpserv/helpme
+%%NLS%%share/atheme/help/es/helpserv/list
+%%NLS%%share/atheme/help/es/helpserv/request
+%%NLS%%share/atheme/help/es/helpserv/services
+%%NLS%%share/atheme/help/es/hostserv/activate
+%%NLS%%share/atheme/help/es/hostserv/group
+%%NLS%%share/atheme/help/es/hostserv/listvhost
+%%NLS%%share/atheme/help/es/hostserv/off
+%%NLS%%share/atheme/help/es/hostserv/offer
+%%NLS%%share/atheme/help/es/hostserv/offerlist
+%%NLS%%share/atheme/help/es/hostserv/on
+%%NLS%%share/atheme/help/es/hostserv/reject
+%%NLS%%share/atheme/help/es/hostserv/request
+%%NLS%%share/atheme/help/es/hostserv/take
+%%NLS%%share/atheme/help/es/hostserv/unoffer
+%%NLS%%share/atheme/help/es/hostserv/vhost
+%%NLS%%share/atheme/help/es/hostserv/vhostnick
+%%NLS%%share/atheme/help/es/hostserv/waiting
+%%NLS%%share/atheme/help/es/infoserv/del
+%%NLS%%share/atheme/help/es/infoserv/list
+%%NLS%%share/atheme/help/es/infoserv/odel
+%%NLS%%share/atheme/help/es/infoserv/olist
+%%NLS%%share/atheme/help/es/infoserv/post
+%%NLS%%share/atheme/help/es/memoserv/delete
+%%NLS%%share/atheme/help/es/memoserv/forward
+%%NLS%%share/atheme/help/es/memoserv/ignore
+%%NLS%%share/atheme/help/es/memoserv/list
+%%NLS%%share/atheme/help/es/memoserv/read
+%%NLS%%share/atheme/help/es/memoserv/send
+%%NLS%%share/atheme/help/es/memoserv/sendgroup
+%%NLS%%share/atheme/help/es/memoserv/sendops
+%%NLS%%share/atheme/help/es/nickserv/acc
+%%NLS%%share/atheme/help/es/nickserv/access
+%%NLS%%share/atheme/help/es/nickserv/badmail
+%%NLS%%share/atheme/help/es/nickserv/cert
+%%NLS%%share/atheme/help/es/nickserv/drop
+%%NLS%%share/atheme/help/es/nickserv/fdrop
+%%NLS%%share/atheme/help/es/nickserv/freeze
+%%NLS%%share/atheme/help/es/nickserv/fungroup
+%%NLS%%share/atheme/help/es/nickserv/fverify
+%%NLS%%share/atheme/help/es/nickserv/ghost
+%%NLS%%share/atheme/help/es/nickserv/group
+%%NLS%%share/atheme/help/es/nickserv/hold
+%%NLS%%share/atheme/help/es/nickserv/identify
+%%NLS%%share/atheme/help/es/nickserv/info
+%%NLS%%share/atheme/help/es/nickserv/list
+%%NLS%%share/atheme/help/es/nickserv/listchans
+%%NLS%%share/atheme/help/es/nickserv/listgroups
+%%NLS%%share/atheme/help/es/nickserv/listmail
+%%NLS%%share/atheme/help/es/nickserv/listownmail
+%%NLS%%share/atheme/help/es/nickserv/listvhost
+%%NLS%%share/atheme/help/es/nickserv/login
+%%NLS%%share/atheme/help/es/nickserv/logout
+%%NLS%%share/atheme/help/es/nickserv/mark
+%%NLS%%share/atheme/help/es/nickserv/regain
+%%NLS%%share/atheme/help/es/nickserv/register
+%%NLS%%share/atheme/help/es/nickserv/regnolimit
+%%NLS%%share/atheme/help/es/nickserv/release
+%%NLS%%share/atheme/help/es/nickserv/resetpass
+%%NLS%%share/atheme/help/es/nickserv/restrict
+%%NLS%%share/atheme/help/es/nickserv/return
+%%NLS%%share/atheme/help/es/nickserv/sendpass
+%%NLS%%share/atheme/help/es/nickserv/sendpass_user
+%%NLS%%share/atheme/help/es/nickserv/set_accountname
+%%NLS%%share/atheme/help/es/nickserv/set_email
+%%NLS%%share/atheme/help/es/nickserv/set_emailmemos
+%%NLS%%share/atheme/help/es/nickserv/set_enforce
+%%NLS%%share/atheme/help/es/nickserv/set_enforcetime
+%%NLS%%share/atheme/help/es/nickserv/set_hidemail
+%%NLS%%share/atheme/help/es/nickserv/set_language
+%%NLS%%share/atheme/help/es/nickserv/set_nevergroup
+%%NLS%%share/atheme/help/es/nickserv/set_neverop
+%%NLS%%share/atheme/help/es/nickserv/set_nomemo
+%%NLS%%share/atheme/help/es/nickserv/set_noop
+%%NLS%%share/atheme/help/es/nickserv/set_password
+%%NLS%%share/atheme/help/es/nickserv/set_private
+%%NLS%%share/atheme/help/es/nickserv/set_privmsg
+%%NLS%%share/atheme/help/es/nickserv/set_property
+%%NLS%%share/atheme/help/es/nickserv/set_quietchg
+%%NLS%%share/atheme/help/es/nickserv/setpass
+%%NLS%%share/atheme/help/es/nickserv/status
+%%NLS%%share/atheme/help/es/nickserv/taxonomy
+%%NLS%%share/atheme/help/es/nickserv/ungroup
+%%NLS%%share/atheme/help/es/nickserv/vacation
+%%NLS%%share/atheme/help/es/nickserv/verify
+%%NLS%%share/atheme/help/es/nickserv/vhost
+%%NLS%%share/atheme/help/es/oservice/akill
+%%NLS%%share/atheme/help/es/oservice/clearchan
+%%NLS%%share/atheme/help/es/oservice/clones
+%%NLS%%share/atheme/help/es/oservice/compare
+%%NLS%%share/atheme/help/es/oservice/greplog
+%%NLS%%share/atheme/help/es/oservice/identify
+%%NLS%%share/atheme/help/es/oservice/ignore
+%%NLS%%share/atheme/help/es/oservice/info
+%%NLS%%share/atheme/help/es/oservice/inject
+%%NLS%%share/atheme/help/es/oservice/jupe
+%%NLS%%share/atheme/help/es/oservice/mode
+%%NLS%%share/atheme/help/es/oservice/modinspect
+%%NLS%%share/atheme/help/es/oservice/modlist
+%%NLS%%share/atheme/help/es/oservice/modload
+%%NLS%%share/atheme/help/es/oservice/modreload
+%%NLS%%share/atheme/help/es/oservice/modunload
+%%NLS%%share/atheme/help/es/oservice/noop
+%%NLS%%share/atheme/help/es/oservice/override
+%%NLS%%share/atheme/help/es/oservice/rakill
+%%NLS%%share/atheme/help/es/oservice/raw
+%%NLS%%share/atheme/help/es/oservice/readonly
+%%NLS%%share/atheme/help/es/oservice/rehash
+%%NLS%%share/atheme/help/es/oservice/restart
+%%NLS%%share/atheme/help/es/oservice/rmatch
+%%NLS%%share/atheme/help/es/oservice/rnc
+%%NLS%%share/atheme/help/es/oservice/rwatch
+%%NLS%%share/atheme/help/es/oservice/script
+%%NLS%%share/atheme/help/es/oservice/sgline
+%%NLS%%share/atheme/help/es/oservice/shutdown
+%%NLS%%share/atheme/help/es/oservice/soper
+%%NLS%%share/atheme/help/es/oservice/specs
+%%NLS%%share/atheme/help/es/oservice/sqline
+%%NLS%%share/atheme/help/es/oservice/update
+%%NLS%%share/atheme/help/es/oservice/uptime
+%%NLS%%share/atheme/help/es/saslserv/pkey
+%%NLS%%share/atheme/help/es/userserv/cert
+%%NLS%%share/atheme/help/es/userserv/drop
+%%NLS%%share/atheme/help/es/userserv/freeze
+%%NLS%%share/atheme/help/es/userserv/fverify
+%%NLS%%share/atheme/help/es/userserv/hold
+%%NLS%%share/atheme/help/es/userserv/info
+%%NLS%%share/atheme/help/es/userserv/list
+%%NLS%%share/atheme/help/es/userserv/listchans
+%%NLS%%share/atheme/help/es/userserv/listmail
+%%NLS%%share/atheme/help/es/userserv/listvhost
+%%NLS%%share/atheme/help/es/userserv/login
+%%NLS%%share/atheme/help/es/userserv/logout
+%%NLS%%share/atheme/help/es/userserv/mark
+%%NLS%%share/atheme/help/es/userserv/register
+%%NLS%%share/atheme/help/es/userserv/resetpass
+%%NLS%%share/atheme/help/es/userserv/return
+%%NLS%%share/atheme/help/es/userserv/sendpass
+%%NLS%%share/atheme/help/es/userserv/sendpass_user
+%%NLS%%share/atheme/help/es/userserv/set_email
+%%NLS%%share/atheme/help/es/userserv/set_emailmemos
+%%NLS%%share/atheme/help/es/userserv/set_hidemail
+%%NLS%%share/atheme/help/es/userserv/set_neverop
+%%NLS%%share/atheme/help/es/userserv/set_noop
+%%NLS%%share/atheme/help/es/userserv/set_password
+%%NLS%%share/atheme/help/es/userserv/set_private
+%%NLS%%share/atheme/help/es/userserv/set_privmsg
+%%NLS%%share/atheme/help/es/userserv/set_property
+%%NLS%%share/atheme/help/es/userserv/setpass
+%%NLS%%share/atheme/help/es/userserv/status
+%%NLS%%share/atheme/help/es/userserv/taxonomy
+%%NLS%%share/atheme/help/es/userserv/vacation
+%%NLS%%share/atheme/help/es/userserv/verify
+%%NLS%%share/atheme/help/es/userserv/vhost
+%%NLS%%share/atheme/help/ru/charset
+%%NLS%%share/atheme/help/ru/cservice/akick
+%%NLS%%share/atheme/help/ru/cservice/ban
+%%NLS%%share/atheme/help/ru/cservice/clear_bans
+%%NLS%%share/atheme/help/ru/cservice/clear_users
+%%NLS%%share/atheme/help/ru/cservice/close
+%%NLS%%share/atheme/help/ru/cservice/count
+%%NLS%%share/atheme/help/ru/cservice/drop
+%%NLS%%share/atheme/help/ru/cservice/fflags
+%%NLS%%share/atheme/help/ru/cservice/flags
+%%NLS%%share/atheme/help/ru/cservice/forcexop
+%%NLS%%share/atheme/help/ru/cservice/ftransfer
+%%NLS%%share/atheme/help/ru/cservice/getkey
+%%NLS%%share/atheme/help/ru/cservice/halfop
+%%NLS%%share/atheme/help/ru/cservice/hold
+%%NLS%%share/atheme/help/ru/cservice/info
+%%NLS%%share/atheme/help/ru/cservice/invite
+%%NLS%%share/atheme/help/ru/cservice/kick
+%%NLS%%share/atheme/help/ru/cservice/kickban
+%%NLS%%share/atheme/help/ru/cservice/list
+%%NLS%%share/atheme/help/ru/cservice/mark
+%%NLS%%share/atheme/help/ru/cservice/op_voice
+%%NLS%%share/atheme/help/ru/cservice/quiet
+%%NLS%%share/atheme/help/ru/cservice/recover
+%%NLS%%share/atheme/help/ru/cservice/register
+%%NLS%%share/atheme/help/ru/cservice/set_email
+%%NLS%%share/atheme/help/ru/cservice/set_entrymsg
+%%NLS%%share/atheme/help/ru/cservice/set_fantasy
+%%NLS%%share/atheme/help/ru/cservice/set_founder
+%%NLS%%share/atheme/help/ru/cservice/set_guard
+%%NLS%%share/atheme/help/ru/cservice/set_keeptopic
+%%NLS%%share/atheme/help/ru/cservice/set_mlock
+%%NLS%%share/atheme/help/ru/cservice/set_private
+%%NLS%%share/atheme/help/ru/cservice/set_property
+%%NLS%%share/atheme/help/ru/cservice/set_restricted
+%%NLS%%share/atheme/help/ru/cservice/set_secure
+%%NLS%%share/atheme/help/ru/cservice/set_topiclock
+%%NLS%%share/atheme/help/ru/cservice/set_url
+%%NLS%%share/atheme/help/ru/cservice/set_verbose
+%%NLS%%share/atheme/help/ru/cservice/status
+%%NLS%%share/atheme/help/ru/cservice/taxonomy
+%%NLS%%share/atheme/help/ru/cservice/template
+%%NLS%%share/atheme/help/ru/cservice/topic
+%%NLS%%share/atheme/help/ru/cservice/topicappend
+%%NLS%%share/atheme/help/ru/cservice/topicprepend
+%%NLS%%share/atheme/help/ru/cservice/unban
+%%NLS%%share/atheme/help/ru/cservice/unban_self
+%%NLS%%share/atheme/help/ru/cservice/unquiet
+%%NLS%%share/atheme/help/ru/cservice/userinfo
+%%NLS%%share/atheme/help/ru/cservice/why
+%%NLS%%share/atheme/help/ru/cservice/xop
+%%NLS%%share/atheme/help/ru/gameserv/eightball
+%%NLS%%share/atheme/help/ru/gameserv/namegen
+%%NLS%%share/atheme/help/ru/gameserv/roll
+%%NLS%%share/atheme/help/ru/gservice/global
+%%NLS%%share/atheme/help/ru/help
+%%NLS%%share/atheme/help/ru/memoserv/delete
+%%NLS%%share/atheme/help/ru/memoserv/forward
+%%NLS%%share/atheme/help/ru/memoserv/ignore
+%%NLS%%share/atheme/help/ru/memoserv/list
+%%NLS%%share/atheme/help/ru/memoserv/read
+%%NLS%%share/atheme/help/ru/memoserv/send
+%%NLS%%share/atheme/help/ru/memoserv/sendops
+%%NLS%%share/atheme/help/ru/nickserv/acc
+%%NLS%%share/atheme/help/ru/nickserv/access
+%%NLS%%share/atheme/help/ru/nickserv/drop
+%%NLS%%share/atheme/help/ru/nickserv/freeze
+%%NLS%%share/atheme/help/ru/nickserv/fungroup
+%%NLS%%share/atheme/help/ru/nickserv/fverify
+%%NLS%%share/atheme/help/ru/nickserv/ghost
+%%NLS%%share/atheme/help/ru/nickserv/group
+%%NLS%%share/atheme/help/ru/nickserv/hold
+%%NLS%%share/atheme/help/ru/nickserv/identify
+%%NLS%%share/atheme/help/ru/nickserv/info
+%%NLS%%share/atheme/help/ru/nickserv/list
+%%NLS%%share/atheme/help/ru/nickserv/listchans
+%%NLS%%share/atheme/help/ru/nickserv/listmail
+%%NLS%%share/atheme/help/ru/nickserv/listvhost
+%%NLS%%share/atheme/help/ru/nickserv/login
+%%NLS%%share/atheme/help/ru/nickserv/logout
+%%NLS%%share/atheme/help/ru/nickserv/mark
+%%NLS%%share/atheme/help/ru/nickserv/register
+%%NLS%%share/atheme/help/ru/nickserv/release
+%%NLS%%share/atheme/help/ru/nickserv/resetpass
+%%NLS%%share/atheme/help/ru/nickserv/return
+%%NLS%%share/atheme/help/ru/nickserv/sendpass
+%%NLS%%share/atheme/help/ru/nickserv/set_accountname
+%%NLS%%share/atheme/help/ru/nickserv/set_email
+%%NLS%%share/atheme/help/ru/nickserv/set_emailmemos
+%%NLS%%share/atheme/help/ru/nickserv/set_enforce
+%%NLS%%share/atheme/help/ru/nickserv/set_hidemail
+%%NLS%%share/atheme/help/ru/nickserv/set_neverop
+%%NLS%%share/atheme/help/ru/nickserv/set_nomemo
+%%NLS%%share/atheme/help/ru/nickserv/set_noop
+%%NLS%%share/atheme/help/ru/nickserv/set_password
+%%NLS%%share/atheme/help/ru/nickserv/set_private
+%%NLS%%share/atheme/help/ru/nickserv/set_privmsg
+%%NLS%%share/atheme/help/ru/nickserv/set_property
+%%NLS%%share/atheme/help/ru/nickserv/setpass
+%%NLS%%share/atheme/help/ru/nickserv/status
+%%NLS%%share/atheme/help/ru/nickserv/taxonomy
+%%NLS%%share/atheme/help/ru/nickserv/ungroup
+%%NLS%%share/atheme/help/ru/nickserv/vacation
+%%NLS%%share/atheme/help/ru/nickserv/verify
+%%NLS%%share/atheme/help/ru/nickserv/vhost
+%%NLS%%share/atheme/help/ru/oservice/akill
+%%NLS%%share/atheme/help/ru/oservice/clearchan
+%%NLS%%share/atheme/help/ru/oservice/clones
+%%NLS%%share/atheme/help/ru/oservice/compare
+%%NLS%%share/atheme/help/ru/oservice/identify
+%%NLS%%share/atheme/help/ru/oservice/ignore
+%%NLS%%share/atheme/help/ru/oservice/inject
+%%NLS%%share/atheme/help/ru/oservice/jupe
+%%NLS%%share/atheme/help/ru/oservice/mode
+%%NLS%%share/atheme/help/ru/oservice/modinspect
+%%NLS%%share/atheme/help/ru/oservice/modlist
+%%NLS%%share/atheme/help/ru/oservice/modload
+%%NLS%%share/atheme/help/ru/oservice/modrestart
+%%NLS%%share/atheme/help/ru/oservice/modunload
+%%NLS%%share/atheme/help/ru/oservice/noop
+%%NLS%%share/atheme/help/ru/oservice/rakill
+%%NLS%%share/atheme/help/ru/oservice/raw
+%%NLS%%share/atheme/help/ru/oservice/rehash
+%%NLS%%share/atheme/help/ru/oservice/restart
+%%NLS%%share/atheme/help/ru/oservice/rmatch
+%%NLS%%share/atheme/help/ru/oservice/rnc
+%%NLS%%share/atheme/help/ru/oservice/rwatch
+%%NLS%%share/atheme/help/ru/oservice/sgline
+%%NLS%%share/atheme/help/ru/oservice/shutdown
+%%NLS%%share/atheme/help/ru/oservice/soper
+%%NLS%%share/atheme/help/ru/oservice/specs
+%%NLS%%share/atheme/help/ru/oservice/update
+%%NLS%%share/atheme/help/ru/oservice/uptime
+%%NLS%%share/atheme/help/ru/saslserv/pkey
+%%NLS%%share/atheme/help/ru/userserv/drop
+%%NLS%%share/atheme/help/ru/userserv/freeze
+%%NLS%%share/atheme/help/ru/userserv/fverify
+%%NLS%%share/atheme/help/ru/userserv/hold
+%%NLS%%share/atheme/help/ru/userserv/info
+%%NLS%%share/atheme/help/ru/userserv/list
+%%NLS%%share/atheme/help/ru/userserv/listchans
+%%NLS%%share/atheme/help/ru/userserv/listmail
+%%NLS%%share/atheme/help/ru/userserv/listvhost
+%%NLS%%share/atheme/help/ru/userserv/login
+%%NLS%%share/atheme/help/ru/userserv/logout
+%%NLS%%share/atheme/help/ru/userserv/mark
+%%NLS%%share/atheme/help/ru/userserv/register
+%%NLS%%share/atheme/help/ru/userserv/resetpass
+%%NLS%%share/atheme/help/ru/userserv/return
+%%NLS%%share/atheme/help/ru/userserv/sendpass
+%%NLS%%share/atheme/help/ru/userserv/set_email
+%%NLS%%share/atheme/help/ru/userserv/set_emailmemos
+%%NLS%%share/atheme/help/ru/userserv/set_hidemail
+%%NLS%%share/atheme/help/ru/userserv/set_neverop
+%%NLS%%share/atheme/help/ru/userserv/set_noop
+%%NLS%%share/atheme/help/ru/userserv/set_password
+%%NLS%%share/atheme/help/ru/userserv/set_private
+%%NLS%%share/atheme/help/ru/userserv/set_privmsg
+%%NLS%%share/atheme/help/ru/userserv/set_property
+%%NLS%%share/atheme/help/ru/userserv/setpass
+%%NLS%%share/atheme/help/ru/userserv/status
+%%NLS%%share/atheme/help/ru/userserv/taxonomy
+%%NLS%%share/atheme/help/ru/userserv/vacation
+%%NLS%%share/atheme/help/ru/userserv/verify
+%%NLS%%share/atheme/help/ru/userserv/vhost
+%%NLS%%share/locale/cy/LC_MESSAGES/atheme.mo
+%%NLS%%share/locale/da/LC_MESSAGES/atheme.mo
+%%NLS%%share/locale/de/LC_MESSAGES/atheme.mo
+%%NLS%%share/locale/es/LC_MESSAGES/atheme.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/atheme.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/atheme.mo
+%%PERL%%lib/atheme/modules/scripting/examples/catserv.pl
+%%PERL%%lib/atheme/modules/scripting/lib/Atheme.pm
+%%PERL%%lib/atheme/modules/scripting/lib/Atheme.so
+%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Account.pm
+%%PERL%%lib/atheme/modules/scripting/lib/Atheme/ChanAcs.pm
+%%PERL%%lib/atheme/modules/scripting/lib/Atheme/ChanMode.pm
+%%PERL%%lib/atheme/modules/scripting/lib/Atheme/ChannelRegistration.pm
+%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Command.pm
+%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Entity.pm
+%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Fault.pm
+%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Hooks.pm
+%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Internal.pm
+%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Internal/HookHash.pm
+%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Internal/Hooklist.pm
+%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Internal/ServiceHash.pm
+%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Log.pm
+%%PERL%%lib/atheme/modules/scripting/lib/Atheme/NickRegistration.pm
+%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Object.pm
+%%PERL%%lib/atheme/modules/scripting/lib/Atheme/ReadOnlyHashWrapper.pm
+%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Service.pm
+%%PERL%%lib/atheme/modules/scripting/lib/init.pl
+%%PERL%%lib/atheme/modules/scripting/perl.so
 include/atheme/abirev.h
 include/atheme/account.h
-include/atheme/atheme.h
 include/atheme/atheme_memory.h
 include/atheme/atheme_string.h
+include/atheme/atheme.h
 include/atheme/auth.h
 include/atheme/authcookie.h
 include/atheme/base64.h
@@ -51,14 +617,12 @@ include/atheme/privs.h
 include/atheme/protocol/asuka.h
 include/atheme/protocol/bahamut.h
 include/atheme/protocol/charybdis.h
-include/atheme/protocol/hybrid.h
+include/atheme/protocol/elemental-ircd.h
 include/atheme/protocol/inspircd.h
 include/atheme/protocol/ircd-seven.h
 include/atheme/protocol/ircnet.h
 include/atheme/protocol/nefarious.h
 include/atheme/protocol/ratbox.h
-include/atheme/protocol/shadowircd.h
-include/atheme/protocol/undernet.h
 include/atheme/protocol/unreal.h
 include/atheme/res.h
 include/atheme/reslib.h
@@ -79,7 +643,6 @@ include/atheme/uplink.h
 include/atheme/users.h
 lib/atheme/modules/alis/main.so
 lib/atheme/modules/auth/dummy.so
-%%LDAP%%lib/atheme/modules/auth/ldap.so
 lib/atheme/modules/backend/corestorage.so
 lib/atheme/modules/backend/flatfile.so
 lib/atheme/modules/backend/opensex.so
@@ -87,21 +650,22 @@ lib/atheme/modules/botserv/bottalk.so
 lib/atheme/modules/botserv/help.so
 lib/atheme/modules/botserv/info.so
 lib/atheme/modules/botserv/main.so
-lib/atheme/modules/botserv/set.so
 lib/atheme/modules/botserv/set_core.so
 lib/atheme/modules/botserv/set_fantasy.so
 lib/atheme/modules/botserv/set_nobot.so
 lib/atheme/modules/botserv/set_private.so
+lib/atheme/modules/botserv/set_saycaller.so
+lib/atheme/modules/botserv/set.so
 lib/atheme/modules/chanfix/main.so
 lib/atheme/modules/chanserv/access.so
 lib/atheme/modules/chanserv/akick.so
 lib/atheme/modules/chanserv/antiflood.so
 lib/atheme/modules/chanserv/ban.so
-lib/atheme/modules/chanserv/clear.so
 lib/atheme/modules/chanserv/clear_akicks.so
 lib/atheme/modules/chanserv/clear_bans.so
 lib/atheme/modules/chanserv/clear_flags.so
 lib/atheme/modules/chanserv/clear_users.so
+lib/atheme/modules/chanserv/clear.so
 lib/atheme/modules/chanserv/clone.so
 lib/atheme/modules/chanserv/close.so
 lib/atheme/modules/chanserv/count.so
@@ -126,7 +690,6 @@ lib/atheme/modules/chanserv/protect.so
 lib/atheme/modules/chanserv/quiet.so
 lib/atheme/modules/chanserv/recover.so
 lib/atheme/modules/chanserv/register.so
-lib/atheme/modules/chanserv/set.so
 lib/atheme/modules/chanserv/set_core.so
 lib/atheme/modules/chanserv/set_email.so
 lib/atheme/modules/chanserv/set_entrymsg.so
@@ -145,6 +708,7 @@ lib/atheme/modules/chanserv/set_secure.so
 lib/atheme/modules/chanserv/set_topiclock.so
 lib/atheme/modules/chanserv/set_url.so
 lib/atheme/modules/chanserv/set_verbose.so
+lib/atheme/modules/chanserv/set.so
 lib/atheme/modules/chanserv/status.so
 lib/atheme/modules/chanserv/successor_acl.so
 lib/atheme/modules/chanserv/sync.so
@@ -156,61 +720,6 @@ lib/atheme/modules/chanserv/version.so
 lib/atheme/modules/chanserv/voice.so
 lib/atheme/modules/chanserv/why.so
 lib/atheme/modules/chanserv/xop.so
-%%CONTRIB%%lib/atheme/modules/contrib/backtrace.so
-%%CONTRIB%%lib/atheme/modules/contrib/cs_access_alias.so
-%%CONTRIB%%lib/atheme/modules/contrib/cs_babbler.so
-%%CONTRIB%%lib/atheme/modules/contrib/cs_badwords.so
-%%CONTRIB%%lib/atheme/modules/contrib/cs_fregister.so
-%%CONTRIB%%lib/atheme/modules/contrib/cs_kickdots.so
-%%CONTRIB%%lib/atheme/modules/contrib/cs_modesync.so
-%%CONTRIB%%lib/atheme/modules/contrib/cs_ping.so
-%%CONTRIB%%lib/atheme/modules/contrib/cs_regmode.so
-%%CONTRIB%%lib/atheme/modules/contrib/cs_regnotice.so
-%%CONTRIB%%lib/atheme/modules/contrib/cs_updown.so
-%%CONTRIB%%lib/atheme/modules/contrib/cs_userinfo.so
-%%CONTRIB%%lib/atheme/modules/contrib/dnsbl.so
-%%CONTRIB%%lib/atheme/modules/contrib/gen_echoserver.so
-%%CONTRIB%%lib/atheme/modules/contrib/gen_listenerdemo.so
-%%CONTRIB%%lib/atheme/modules/contrib/gen_vhostonreg.so
-%%CONTRIB%%lib/atheme/modules/contrib/graphtastical.so
-%%CONTRIB%%lib/atheme/modules/contrib/gs_roulette.so
-%%CONTRIB%%lib/atheme/modules/contrib/ircd_announceserv.so
-%%CONTRIB%%lib/atheme/modules/contrib/ircd_catserv.so
-%%CONTRIB%%lib/atheme/modules/contrib/ircd_loveserv.so
-%%CONTRIB%%lib/atheme/modules/contrib/mlocktweaker.so
-%%CONTRIB%%lib/atheme/modules/contrib/ms_fsend.so
-%%CONTRIB%%lib/atheme/modules/contrib/ns_ajoin.so
-%%CONTRIB%%lib/atheme/modules/contrib/ns_cleannick.so
-%%CONTRIB%%lib/atheme/modules/contrib/ns_fenforce.so
-%%CONTRIB%%lib/atheme/modules/contrib/ns_forbid.so
-%%CONTRIB%%lib/atheme/modules/contrib/ns_fregister.so
-%%CONTRIB%%lib/atheme/modules/contrib/ns_generatehash.so
-%%CONTRIB%%lib/atheme/modules/contrib/ns_generatepass.so
-%%CONTRIB%%lib/atheme/modules/contrib/ns_goodmail.so
-%%CONTRIB%%lib/atheme/modules/contrib/ns_guestnoreg.so
-%%CONTRIB%%lib/atheme/modules/contrib/ns_listlogins.so
-%%CONTRIB%%lib/atheme/modules/contrib/ns_mxcheck.so
-%%CONTRIB%%lib/atheme/modules/contrib/ns_mxcheck_async.so
-%%CONTRIB%%lib/atheme/modules/contrib/ns_regnotice.so
-%%CONTRIB%%lib/atheme/modules/contrib/ns_sendpassmail.so
-%%CONTRIB%%lib/atheme/modules/contrib/ns_waitreg.so
-%%CONTRIB%%lib/atheme/modules/contrib/on_db_save.so
-%%CONTRIB%%lib/atheme/modules/contrib/os_akillnicklist.so
-%%CONTRIB%%lib/atheme/modules/contrib/os_defcon.so
-%%CONTRIB%%lib/atheme/modules/contrib/os_helpme.so
-%%CONTRIB%%lib/atheme/modules/contrib/os_joinmon.so
-%%CONTRIB%%lib/atheme/modules/contrib/os_kill.so
-%%CONTRIB%%lib/atheme/modules/contrib/os_klinechan.so
-%%CONTRIB%%lib/atheme/modules/contrib/os_modeall.so
-%%CONTRIB%%lib/atheme/modules/contrib/os_pingspam.so
-%%CONTRIB%%lib/atheme/modules/contrib/os_procwatch.so
-%%CONTRIB%%lib/atheme/modules/contrib/os_resolve.so
-%%CONTRIB%%lib/atheme/modules/contrib/os_savechanmodes.so
-%%CONTRIB%%lib/atheme/modules/contrib/os_tabletest.so
-%%CONTRIB%%lib/atheme/modules/contrib/os_testcmd.so
-%%CONTRIB%%lib/atheme/modules/contrib/os_testproc.so
-%%CONTRIB%%lib/atheme/modules/contrib/os_trace.so
-%%CONTRIB%%lib/atheme/modules/contrib/wumpus.so
 lib/atheme/modules/crypto/ircservices.so
 lib/atheme/modules/crypto/pbkdf2.so
 lib/atheme/modules/crypto/pbkdf2v2.so
@@ -247,7 +756,6 @@ lib/atheme/modules/groupserv/listchans.so
 lib/atheme/modules/groupserv/main.so
 lib/atheme/modules/groupserv/register.so
 lib/atheme/modules/groupserv/regnolimit.so
-lib/atheme/modules/groupserv/set.so
 lib/atheme/modules/groupserv/set_channel.so
 lib/atheme/modules/groupserv/set_description.so
 lib/atheme/modules/groupserv/set_email.so
@@ -256,10 +764,12 @@ lib/atheme/modules/groupserv/set_joinflags.so
 lib/atheme/modules/groupserv/set_open.so
 lib/atheme/modules/groupserv/set_public.so
 lib/atheme/modules/groupserv/set_url.so
+lib/atheme/modules/groupserv/set.so
 lib/atheme/modules/helpserv/helpme.so
 lib/atheme/modules/helpserv/main.so
 lib/atheme/modules/helpserv/services.so
 lib/atheme/modules/helpserv/ticket.so
+lib/atheme/modules/hostserv/drop.so
 lib/atheme/modules/hostserv/group.so
 lib/atheme/modules/hostserv/help.so
 lib/atheme/modules/hostserv/main.so
@@ -285,7 +795,6 @@ lib/atheme/modules/misc/httpd.so
 lib/atheme/modules/nickserv/access.so
 lib/atheme/modules/nickserv/badmail.so
 lib/atheme/modules/nickserv/cert.so
-%%CRACKLIB%%lib/atheme/modules/nickserv/cracklib.so
 lib/atheme/modules/nickserv/drop.so
 lib/atheme/modules/nickserv/enforce.so
 lib/atheme/modules/nickserv/freeze.so
@@ -294,8 +803,8 @@ lib/atheme/modules/nickserv/group.so
 lib/atheme/modules/nickserv/help.so
 lib/atheme/modules/nickserv/hold.so
 lib/atheme/modules/nickserv/identify.so
-lib/atheme/modules/nickserv/info.so
 lib/atheme/modules/nickserv/info_lastquit.so
+lib/atheme/modules/nickserv/info.so
 lib/atheme/modules/nickserv/list.so
 lib/atheme/modules/nickserv/listchans.so
 lib/atheme/modules/nickserv/listgroups.so
@@ -311,9 +820,8 @@ lib/atheme/modules/nickserv/regnolimit.so
 lib/atheme/modules/nickserv/resetpass.so
 lib/atheme/modules/nickserv/restrict.so
 lib/atheme/modules/nickserv/return.so
-lib/atheme/modules/nickserv/sendpass.so
 lib/atheme/modules/nickserv/sendpass_user.so
-lib/atheme/modules/nickserv/set.so
+lib/atheme/modules/nickserv/sendpass.so
 lib/atheme/modules/nickserv/set_accountname.so
 lib/atheme/modules/nickserv/set_core.so
 lib/atheme/modules/nickserv/set_email.so
@@ -333,6 +841,7 @@ lib/atheme/modules/nickserv/set_privmsg.so
 lib/atheme/modules/nickserv/set_property.so
 lib/atheme/modules/nickserv/set_pubkey.so
 lib/atheme/modules/nickserv/set_quietchg.so
+lib/atheme/modules/nickserv/set.so
 lib/atheme/modules/nickserv/setpass.so
 lib/atheme/modules/nickserv/status.so
 lib/atheme/modules/nickserv/taxonomy.so
@@ -380,7 +889,6 @@ lib/atheme/modules/protocol/bahamut.so
 lib/atheme/modules/protocol/base36uid.so
 lib/atheme/modules/protocol/charybdis.so
 lib/atheme/modules/protocol/elemental-ircd.so
-lib/atheme/modules/protocol/hybrid.so
 lib/atheme/modules/protocol/inspircd.so
 lib/atheme/modules/protocol/ircd-seven.so
 lib/atheme/modules/protocol/ircnet.so
@@ -392,10 +900,9 @@ lib/atheme/modules/protocol/nefarious.so
 lib/atheme/modules/protocol/ngircd.so
 lib/atheme/modules/protocol/p10-generic.so
 lib/atheme/modules/protocol/ratbox.so
-lib/atheme/modules/protocol/shadowircd.so
 lib/atheme/modules/protocol/ts6-generic.so
-lib/atheme/modules/protocol/undernet.so
 lib/atheme/modules/protocol/unreal.so
+lib/atheme/modules/protocol/unreal4.so
 lib/atheme/modules/proxyscan/dnsbl.so
 lib/atheme/modules/proxyscan/main.so
 lib/atheme/modules/rpgserv/enable.so
@@ -410,28 +917,6 @@ lib/atheme/modules/saslserv/ecdsa-nist256p-challenge.so
 lib/atheme/modules/saslserv/external.so
 lib/atheme/modules/saslserv/main.so
 lib/atheme/modules/saslserv/plain.so
-%%PERL%%lib/atheme/modules/scripting/examples/catserv.pl
-%%PERL%%lib/atheme/modules/scripting/lib/Atheme.pm
-%%PERL%%lib/atheme/modules/scripting/lib/Atheme.so
-%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Account.pm
-%%PERL%%lib/atheme/modules/scripting/lib/Atheme/ChanAcs.pm
-%%PERL%%lib/atheme/modules/scripting/lib/Atheme/ChannelRegistration.pm
-%%PERL%%lib/atheme/modules/scripting/lib/Atheme/ChanMode.pm
-%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Command.pm
-%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Entity.pm
-%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Fault.pm
-%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Hooks.pm
-%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Internal.pm
-%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Internal/HookHash.pm
-%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Internal/Hooklist.pm
-%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Internal/ServiceHash.pm
-%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Log.pm
-%%PERL%%lib/atheme/modules/scripting/lib/Atheme/NickRegistration.pm
-%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Object.pm
-%%PERL%%lib/atheme/modules/scripting/lib/Atheme/ReadOnlyHashWrapper.pm
-%%PERL%%lib/atheme/modules/scripting/lib/Atheme/Service.pm
-%%PERL%%lib/atheme/modules/scripting/lib/init.pl
-%%PERL%%lib/atheme/modules/scripting/perl.so
 lib/atheme/modules/security/cmdperm.so
 lib/atheme/modules/statserv/channel.so
 lib/atheme/modules/statserv/main.so
@@ -460,6 +945,7 @@ share/atheme/help/botserv/say
 share/atheme/help/botserv/set_fantasy
 share/atheme/help/botserv/set_nobot
 share/atheme/help/botserv/set_private
+share/atheme/help/botserv/set_saycaller
 share/atheme/help/botserv/unassign
 share/atheme/help/chanfix/chanfix
 share/atheme/help/chanfix/info
@@ -498,6 +984,7 @@ share/atheme/help/contrib/procwatch
 share/atheme/help/contrib/roulette
 share/atheme/help/contrib/savechanmodes
 share/atheme/help/contrib/set_blockbadwords
+share/atheme/help/contrib/set_blockbadwordsops
 share/atheme/help/contrib/set_dnsblaction
 share/atheme/help/contrib/trace
 share/atheme/help/contrib/up
@@ -507,6 +994,7 @@ share/atheme/help/cservice/access_del
 share/atheme/help/cservice/access_info
 share/atheme/help/cservice/access_list
 share/atheme/help/cservice/access_set
+share/atheme/help/cservice/activate
 share/atheme/help/cservice/akick
 share/atheme/help/cservice/ban
 share/atheme/help/cservice/clear_akicks
@@ -537,6 +1025,7 @@ share/atheme/help/cservice/protect
 share/atheme/help/cservice/quiet
 share/atheme/help/cservice/recover
 share/atheme/help/cservice/register
+share/atheme/help/cservice/reject
 share/atheme/help/cservice/role_add
 share/atheme/help/cservice/role_del
 share/atheme/help/cservice/role_list
@@ -572,302 +1061,9 @@ share/atheme/help/cservice/topicswap
 share/atheme/help/cservice/unban
 share/atheme/help/cservice/unban_self
 share/atheme/help/cservice/unquiet
+share/atheme/help/cservice/waiting
 share/atheme/help/cservice/why
 share/atheme/help/cservice/xop
-%%NLS%%share/atheme/help/es/alis/list
-%%NLS%%share/atheme/help/es/botserv/act
-%%NLS%%share/atheme/help/es/botserv/assign
-%%NLS%%share/atheme/help/es/botserv/bot
-%%NLS%%share/atheme/help/es/botserv/botlist
-%%NLS%%share/atheme/help/es/botserv/info
-%%NLS%%share/atheme/help/es/botserv/say
-%%NLS%%share/atheme/help/es/botserv/set_fantasy
-%%NLS%%share/atheme/help/es/botserv/set_nobot
-%%NLS%%share/atheme/help/es/botserv/set_private
-%%NLS%%share/atheme/help/es/botserv/unassign
-%%NLS%%share/atheme/help/es/chanfix/chanfix
-%%NLS%%share/atheme/help/es/chanfix/info
-%%NLS%%share/atheme/help/es/chanfix/scores
-%%NLS%%share/atheme/help/es/contrib/access
-%%NLS%%share/atheme/help/es/contrib/ajoin
-%%NLS%%share/atheme/help/es/contrib/as_activate
-%%NLS%%share/atheme/help/es/contrib/as_cancel
-%%NLS%%share/atheme/help/es/contrib/as_reject
-%%NLS%%share/atheme/help/es/contrib/as_request
-%%NLS%%share/atheme/help/es/contrib/as_waiting
-%%NLS%%share/atheme/help/es/contrib/badwords
-%%NLS%%share/atheme/help/es/contrib/cs_fregister
-%%NLS%%share/atheme/help/es/contrib/cs_ping
-%%NLS%%share/atheme/help/es/contrib/defcon
-%%NLS%%share/atheme/help/es/contrib/down
-%%NLS%%share/atheme/help/es/contrib/fenforce
-%%NLS%%share/atheme/help/es/contrib/forbid
-%%NLS%%share/atheme/help/es/contrib/fregister
-%%NLS%%share/atheme/help/es/contrib/generatehash
-%%NLS%%share/atheme/help/es/contrib/generatepass
-%%NLS%%share/atheme/help/es/contrib/helpme
-%%NLS%%share/atheme/help/es/contrib/kill
-%%NLS%%share/atheme/help/es/contrib/klinechan
-%%NLS%%share/atheme/help/es/contrib/listklinechan
-%%NLS%%share/atheme/help/es/contrib/listlogins
-%%NLS%%share/atheme/help/es/contrib/loadchanmodes
-%%NLS%%share/atheme/help/es/contrib/logstream
-%%NLS%%share/atheme/help/es/contrib/pingspam
-%%NLS%%share/atheme/help/es/contrib/procwatch
-%%NLS%%share/atheme/help/es/contrib/roulette
-%%NLS%%share/atheme/help/es/contrib/savechanmodes
-%%NLS%%share/atheme/help/es/contrib/set_blockbadwords
-%%NLS%%share/atheme/help/es/contrib/trace
-%%NLS%%share/atheme/help/es/contrib/up
-%%NLS%%share/atheme/help/es/contrib/userinfo
-%%NLS%%share/atheme/help/es/cservice/access_add
-%%NLS%%share/atheme/help/es/cservice/access_del
-%%NLS%%share/atheme/help/es/cservice/access_info
-%%NLS%%share/atheme/help/es/cservice/access_list
-%%NLS%%share/atheme/help/es/cservice/akick
-%%NLS%%share/atheme/help/es/cservice/ban
-%%NLS%%share/atheme/help/es/cservice/clear_bans
-%%NLS%%share/atheme/help/es/cservice/clear_flags
-%%NLS%%share/atheme/help/es/cservice/clear_users
-%%NLS%%share/atheme/help/es/cservice/clone
-%%NLS%%share/atheme/help/es/cservice/close
-%%NLS%%share/atheme/help/es/cservice/count
-%%NLS%%share/atheme/help/es/cservice/drop
-%%NLS%%share/atheme/help/es/cservice/fdrop
-%%NLS%%share/atheme/help/es/cservice/fflags
-%%NLS%%share/atheme/help/es/cservice/flags
-%%NLS%%share/atheme/help/es/cservice/forcexop
-%%NLS%%share/atheme/help/es/cservice/ftransfer
-%%NLS%%share/atheme/help/es/cservice/getkey
-%%NLS%%share/atheme/help/es/cservice/halfop
-%%NLS%%share/atheme/help/es/cservice/hold
-%%NLS%%share/atheme/help/es/cservice/info
-%%NLS%%share/atheme/help/es/cservice/invite
-%%NLS%%share/atheme/help/es/cservice/kick
-%%NLS%%share/atheme/help/es/cservice/kickban
-%%NLS%%share/atheme/help/es/cservice/list
-%%NLS%%share/atheme/help/es/cservice/mark
-%%NLS%%share/atheme/help/es/cservice/op_voice
-%%NLS%%share/atheme/help/es/cservice/owner
-%%NLS%%share/atheme/help/es/cservice/protect
-%%NLS%%share/atheme/help/es/cservice/quiet
-%%NLS%%share/atheme/help/es/cservice/recover
-%%NLS%%share/atheme/help/es/cservice/register
-%%NLS%%share/atheme/help/es/cservice/role_add
-%%NLS%%share/atheme/help/es/cservice/role_del
-%%NLS%%share/atheme/help/es/cservice/role_list
-%%NLS%%share/atheme/help/es/cservice/role_set
-%%NLS%%share/atheme/help/es/cservice/set_email
-%%NLS%%share/atheme/help/es/cservice/set_entrymsg
-%%NLS%%share/atheme/help/es/cservice/set_fantasy
-%%NLS%%share/atheme/help/es/cservice/set_founder
-%%NLS%%share/atheme/help/es/cservice/set_gameserv
-%%NLS%%share/atheme/help/es/cservice/set_guard
-%%NLS%%share/atheme/help/es/cservice/set_keeptopic
-%%NLS%%share/atheme/help/es/cservice/set_limitflags
-%%NLS%%share/atheme/help/es/cservice/set_mlock
-%%NLS%%share/atheme/help/es/cservice/set_nosync
-%%NLS%%share/atheme/help/es/cservice/set_prefix
-%%NLS%%share/atheme/help/es/cservice/set_private
-%%NLS%%share/atheme/help/es/cservice/set_property
-%%NLS%%share/atheme/help/es/cservice/set_restricted
-%%NLS%%share/atheme/help/es/cservice/set_secure
-%%NLS%%share/atheme/help/es/cservice/set_topiclock
-%%NLS%%share/atheme/help/es/cservice/set_url
-%%NLS%%share/atheme/help/es/cservice/set_verbose
-%%NLS%%share/atheme/help/es/cservice/status
-%%NLS%%share/atheme/help/es/cservice/sync
-%%NLS%%share/atheme/help/es/cservice/taxonomy
-%%NLS%%share/atheme/help/es/cservice/template
-%%NLS%%share/atheme/help/es/cservice/topic
-%%NLS%%share/atheme/help/es/cservice/topicappend
-%%NLS%%share/atheme/help/es/cservice/topicprepend
-%%NLS%%share/atheme/help/es/cservice/unban
-%%NLS%%share/atheme/help/es/cservice/unban_self
-%%NLS%%share/atheme/help/es/cservice/unquiet
-%%NLS%%share/atheme/help/es/cservice/why
-%%NLS%%share/atheme/help/es/cservice/xop
-%%NLS%%share/atheme/help/es/gameserv/calc
-%%NLS%%share/atheme/help/es/gameserv/eightball
-%%NLS%%share/atheme/help/es/gameserv/lottery
-%%NLS%%share/atheme/help/es/gameserv/namegen
-%%NLS%%share/atheme/help/es/gameserv/roll
-%%NLS%%share/atheme/help/es/groupserv/acsnolimit
-%%NLS%%share/atheme/help/es/groupserv/drop
-%%NLS%%share/atheme/help/es/groupserv/fdrop
-%%NLS%%share/atheme/help/es/groupserv/fflags
-%%NLS%%share/atheme/help/es/groupserv/flags
-%%NLS%%share/atheme/help/es/groupserv/info
-%%NLS%%share/atheme/help/es/groupserv/join
-%%NLS%%share/atheme/help/es/groupserv/list
-%%NLS%%share/atheme/help/es/groupserv/listchans
-%%NLS%%share/atheme/help/es/groupserv/register
-%%NLS%%share/atheme/help/es/groupserv/regnolimit
-%%NLS%%share/atheme/help/es/groupserv/set_channel
-%%NLS%%share/atheme/help/es/groupserv/set_description
-%%NLS%%share/atheme/help/es/groupserv/set_email
-%%NLS%%share/atheme/help/es/groupserv/set_joinflags
-%%NLS%%share/atheme/help/es/groupserv/set_open
-%%NLS%%share/atheme/help/es/groupserv/set_public
-%%NLS%%share/atheme/help/es/groupserv/set_url
-%%NLS%%share/atheme/help/es/gservice/global
-%%NLS%%share/atheme/help/es/help
-%%NLS%%share/atheme/help/es/helpserv/cancel
-%%NLS%%share/atheme/help/es/helpserv/close
-%%NLS%%share/atheme/help/es/helpserv/helpme
-%%NLS%%share/atheme/help/es/helpserv/list
-%%NLS%%share/atheme/help/es/helpserv/request
-%%NLS%%share/atheme/help/es/helpserv/services
-%%NLS%%share/atheme/help/es/hostserv/activate
-%%NLS%%share/atheme/help/es/hostserv/group
-%%NLS%%share/atheme/help/es/hostserv/listvhost
-%%NLS%%share/atheme/help/es/hostserv/off
-%%NLS%%share/atheme/help/es/hostserv/offer
-%%NLS%%share/atheme/help/es/hostserv/offerlist
-%%NLS%%share/atheme/help/es/hostserv/on
-%%NLS%%share/atheme/help/es/hostserv/reject
-%%NLS%%share/atheme/help/es/hostserv/request
-%%NLS%%share/atheme/help/es/hostserv/take
-%%NLS%%share/atheme/help/es/hostserv/unoffer
-%%NLS%%share/atheme/help/es/hostserv/vhost
-%%NLS%%share/atheme/help/es/hostserv/vhostnick
-%%NLS%%share/atheme/help/es/hostserv/waiting
-%%NLS%%share/atheme/help/es/infoserv/del
-%%NLS%%share/atheme/help/es/infoserv/list
-%%NLS%%share/atheme/help/es/infoserv/odel
-%%NLS%%share/atheme/help/es/infoserv/olist
-%%NLS%%share/atheme/help/es/infoserv/post
-%%NLS%%share/atheme/help/es/memoserv/delete
-%%NLS%%share/atheme/help/es/memoserv/forward
-%%NLS%%share/atheme/help/es/memoserv/ignore
-%%NLS%%share/atheme/help/es/memoserv/list
-%%NLS%%share/atheme/help/es/memoserv/read
-%%NLS%%share/atheme/help/es/memoserv/send
-%%NLS%%share/atheme/help/es/memoserv/sendgroup
-%%NLS%%share/atheme/help/es/memoserv/sendops
-%%NLS%%share/atheme/help/es/nickserv/acc
-%%NLS%%share/atheme/help/es/nickserv/access
-%%NLS%%share/atheme/help/es/nickserv/badmail
-%%NLS%%share/atheme/help/es/nickserv/cert
-%%NLS%%share/atheme/help/es/nickserv/drop
-%%NLS%%share/atheme/help/es/nickserv/fdrop
-%%NLS%%share/atheme/help/es/nickserv/freeze
-%%NLS%%share/atheme/help/es/nickserv/fungroup
-%%NLS%%share/atheme/help/es/nickserv/fverify
-%%NLS%%share/atheme/help/es/nickserv/ghost
-%%NLS%%share/atheme/help/es/nickserv/group
-%%NLS%%share/atheme/help/es/nickserv/hold
-%%NLS%%share/atheme/help/es/nickserv/identify
-%%NLS%%share/atheme/help/es/nickserv/info
-%%NLS%%share/atheme/help/es/nickserv/list
-%%NLS%%share/atheme/help/es/nickserv/listchans
-%%NLS%%share/atheme/help/es/nickserv/listgroups
-%%NLS%%share/atheme/help/es/nickserv/listmail
-%%NLS%%share/atheme/help/es/nickserv/listownmail
-%%NLS%%share/atheme/help/es/nickserv/listvhost
-%%NLS%%share/atheme/help/es/nickserv/login
-%%NLS%%share/atheme/help/es/nickserv/logout
-%%NLS%%share/atheme/help/es/nickserv/mark
-%%NLS%%share/atheme/help/es/nickserv/regain
-%%NLS%%share/atheme/help/es/nickserv/register
-%%NLS%%share/atheme/help/es/nickserv/regnolimit
-%%NLS%%share/atheme/help/es/nickserv/release
-%%NLS%%share/atheme/help/es/nickserv/resetpass
-%%NLS%%share/atheme/help/es/nickserv/restrict
-%%NLS%%share/atheme/help/es/nickserv/return
-%%NLS%%share/atheme/help/es/nickserv/sendpass
-%%NLS%%share/atheme/help/es/nickserv/sendpass_user
-%%NLS%%share/atheme/help/es/nickserv/set_accountname
-%%NLS%%share/atheme/help/es/nickserv/set_email
-%%NLS%%share/atheme/help/es/nickserv/set_emailmemos
-%%NLS%%share/atheme/help/es/nickserv/set_enforce
-%%NLS%%share/atheme/help/es/nickserv/set_enforcetime
-%%NLS%%share/atheme/help/es/nickserv/set_hidemail
-%%NLS%%share/atheme/help/es/nickserv/set_language
-%%NLS%%share/atheme/help/es/nickserv/set_nevergroup
-%%NLS%%share/atheme/help/es/nickserv/set_neverop
-%%NLS%%share/atheme/help/es/nickserv/set_nomemo
-%%NLS%%share/atheme/help/es/nickserv/set_noop
-%%NLS%%share/atheme/help/es/nickserv/set_password
-%%NLS%%share/atheme/help/es/nickserv/set_private
-%%NLS%%share/atheme/help/es/nickserv/set_privmsg
-%%NLS%%share/atheme/help/es/nickserv/set_property
-%%NLS%%share/atheme/help/es/nickserv/set_quietchg
-%%NLS%%share/atheme/help/es/nickserv/setpass
-%%NLS%%share/atheme/help/es/nickserv/status
-%%NLS%%share/atheme/help/es/nickserv/taxonomy
-%%NLS%%share/atheme/help/es/nickserv/ungroup
-%%NLS%%share/atheme/help/es/nickserv/vacation
-%%NLS%%share/atheme/help/es/nickserv/verify
-%%NLS%%share/atheme/help/es/nickserv/vhost
-%%NLS%%share/atheme/help/es/oservice/akill
-%%NLS%%share/atheme/help/es/oservice/clearchan
-%%NLS%%share/atheme/help/es/oservice/clones
-%%NLS%%share/atheme/help/es/oservice/compare
-%%NLS%%share/atheme/help/es/oservice/greplog
-%%NLS%%share/atheme/help/es/oservice/identify
-%%NLS%%share/atheme/help/es/oservice/ignore
-%%NLS%%share/atheme/help/es/oservice/info
-%%NLS%%share/atheme/help/es/oservice/inject
-%%NLS%%share/atheme/help/es/oservice/jupe
-%%NLS%%share/atheme/help/es/oservice/mode
-%%NLS%%share/atheme/help/es/oservice/modinspect
-%%NLS%%share/atheme/help/es/oservice/modlist
-%%NLS%%share/atheme/help/es/oservice/modload
-%%NLS%%share/atheme/help/es/oservice/modreload
-%%NLS%%share/atheme/help/es/oservice/modunload
-%%NLS%%share/atheme/help/es/oservice/noop
-%%NLS%%share/atheme/help/es/oservice/override
-%%NLS%%share/atheme/help/es/oservice/rakill
-%%NLS%%share/atheme/help/es/oservice/raw
-%%NLS%%share/atheme/help/es/oservice/readonly
-%%NLS%%share/atheme/help/es/oservice/rehash
-%%NLS%%share/atheme/help/es/oservice/restart
-%%NLS%%share/atheme/help/es/oservice/rmatch
-%%NLS%%share/atheme/help/es/oservice/rnc
-%%NLS%%share/atheme/help/es/oservice/rwatch
-%%NLS%%share/atheme/help/es/oservice/script
-%%NLS%%share/atheme/help/es/oservice/sgline
-%%NLS%%share/atheme/help/es/oservice/shutdown
-%%NLS%%share/atheme/help/es/oservice/soper
-%%NLS%%share/atheme/help/es/oservice/specs
-%%NLS%%share/atheme/help/es/oservice/sqline
-%%NLS%%share/atheme/help/es/oservice/update
-%%NLS%%share/atheme/help/es/oservice/uptime
-%%NLS%%share/atheme/help/es/saslserv/pkey
-%%NLS%%share/atheme/help/es/userserv/cert
-%%NLS%%share/atheme/help/es/userserv/drop
-%%NLS%%share/atheme/help/es/userserv/freeze
-%%NLS%%share/atheme/help/es/userserv/fverify
-%%NLS%%share/atheme/help/es/userserv/hold
-%%NLS%%share/atheme/help/es/userserv/info
-%%NLS%%share/atheme/help/es/userserv/list
-%%NLS%%share/atheme/help/es/userserv/listchans
-%%NLS%%share/atheme/help/es/userserv/listmail
-%%NLS%%share/atheme/help/es/userserv/listvhost
-%%NLS%%share/atheme/help/es/userserv/login
-%%NLS%%share/atheme/help/es/userserv/logout
-%%NLS%%share/atheme/help/es/userserv/mark
-%%NLS%%share/atheme/help/es/userserv/register
-%%NLS%%share/atheme/help/es/userserv/resetpass
-%%NLS%%share/atheme/help/es/userserv/return
-%%NLS%%share/atheme/help/es/userserv/sendpass
-%%NLS%%share/atheme/help/es/userserv/sendpass_user
-%%NLS%%share/atheme/help/es/userserv/set_email
-%%NLS%%share/atheme/help/es/userserv/set_emailmemos
-%%NLS%%share/atheme/help/es/userserv/set_hidemail
-%%NLS%%share/atheme/help/es/userserv/set_neverop
-%%NLS%%share/atheme/help/es/userserv/set_noop
-%%NLS%%share/atheme/help/es/userserv/set_password
-%%NLS%%share/atheme/help/es/userserv/set_private
-%%NLS%%share/atheme/help/es/userserv/set_privmsg
-%%NLS%%share/atheme/help/es/userserv/set_property
-%%NLS%%share/atheme/help/es/userserv/setpass
-%%NLS%%share/atheme/help/es/userserv/status
-%%NLS%%share/atheme/help/es/userserv/taxonomy
-%%NLS%%share/atheme/help/es/userserv/vacation
-%%NLS%%share/atheme/help/es/userserv/verify
-%%NLS%%share/atheme/help/es/userserv/vhost
 share/atheme/help/gameserv/calc
 share/atheme/help/gameserv/eightball
 share/atheme/help/gameserv/lottery
@@ -889,6 +1085,7 @@ share/atheme/help/groupserv/regnolimit
 share/atheme/help/groupserv/set_channel
 share/atheme/help/groupserv/set_description
 share/atheme/help/groupserv/set_email
+share/atheme/help/groupserv/set_groupname
 share/atheme/help/groupserv/set_joinflags
 share/atheme/help/groupserv/set_open
 share/atheme/help/groupserv/set_public
@@ -902,6 +1099,7 @@ share/atheme/help/helpserv/list
 share/atheme/help/helpserv/request
 share/atheme/help/helpserv/services
 share/atheme/help/hostserv/activate
+share/atheme/help/hostserv/drop
 share/atheme/help/hostserv/group
 share/atheme/help/hostserv/listvhost
 share/atheme/help/hostserv/off
@@ -1042,171 +1240,6 @@ share/atheme/help/rpgserv/info
 share/atheme/help/rpgserv/list
 share/atheme/help/rpgserv/search
 share/atheme/help/rpgserv/set
-%%NLS%%share/atheme/help/ru/charset
-%%NLS%%share/atheme/help/ru/cservice/akick
-%%NLS%%share/atheme/help/ru/cservice/ban
-%%NLS%%share/atheme/help/ru/cservice/clear_bans
-%%NLS%%share/atheme/help/ru/cservice/clear_users
-%%NLS%%share/atheme/help/ru/cservice/close
-%%NLS%%share/atheme/help/ru/cservice/count
-%%NLS%%share/atheme/help/ru/cservice/drop
-%%NLS%%share/atheme/help/ru/cservice/fflags
-%%NLS%%share/atheme/help/ru/cservice/flags
-%%NLS%%share/atheme/help/ru/cservice/forcexop
-%%NLS%%share/atheme/help/ru/cservice/ftransfer
-%%NLS%%share/atheme/help/ru/cservice/getkey
-%%NLS%%share/atheme/help/ru/cservice/halfop
-%%NLS%%share/atheme/help/ru/cservice/hold
-%%NLS%%share/atheme/help/ru/cservice/info
-%%NLS%%share/atheme/help/ru/cservice/invite
-%%NLS%%share/atheme/help/ru/cservice/kick
-%%NLS%%share/atheme/help/ru/cservice/kickban
-%%NLS%%share/atheme/help/ru/cservice/list
-%%NLS%%share/atheme/help/ru/cservice/mark
-%%NLS%%share/atheme/help/ru/cservice/op_voice
-%%NLS%%share/atheme/help/ru/cservice/quiet
-%%NLS%%share/atheme/help/ru/cservice/recover
-%%NLS%%share/atheme/help/ru/cservice/register
-%%NLS%%share/atheme/help/ru/cservice/set_email
-%%NLS%%share/atheme/help/ru/cservice/set_entrymsg
-%%NLS%%share/atheme/help/ru/cservice/set_fantasy
-%%NLS%%share/atheme/help/ru/cservice/set_founder
-%%NLS%%share/atheme/help/ru/cservice/set_guard
-%%NLS%%share/atheme/help/ru/cservice/set_keeptopic
-%%NLS%%share/atheme/help/ru/cservice/set_mlock
-%%NLS%%share/atheme/help/ru/cservice/set_private
-%%NLS%%share/atheme/help/ru/cservice/set_property
-%%NLS%%share/atheme/help/ru/cservice/set_restricted
-%%NLS%%share/atheme/help/ru/cservice/set_secure
-%%NLS%%share/atheme/help/ru/cservice/set_topiclock
-%%NLS%%share/atheme/help/ru/cservice/set_url
-%%NLS%%share/atheme/help/ru/cservice/set_verbose
-%%NLS%%share/atheme/help/ru/cservice/status
-%%NLS%%share/atheme/help/ru/cservice/taxonomy
-%%NLS%%share/atheme/help/ru/cservice/template
-%%NLS%%share/atheme/help/ru/cservice/topic
-%%NLS%%share/atheme/help/ru/cservice/topicappend
-%%NLS%%share/atheme/help/ru/cservice/topicprepend
-%%NLS%%share/atheme/help/ru/cservice/unban
-%%NLS%%share/atheme/help/ru/cservice/unban_self
-%%NLS%%share/atheme/help/ru/cservice/unquiet
-%%NLS%%share/atheme/help/ru/cservice/userinfo
-%%NLS%%share/atheme/help/ru/cservice/why
-%%NLS%%share/atheme/help/ru/cservice/xop
-%%NLS%%share/atheme/help/ru/gameserv/eightball
-%%NLS%%share/atheme/help/ru/gameserv/namegen
-%%NLS%%share/atheme/help/ru/gameserv/roll
-%%NLS%%share/atheme/help/ru/gservice/global
-%%NLS%%share/atheme/help/ru/help
-%%NLS%%share/atheme/help/ru/memoserv/delete
-%%NLS%%share/atheme/help/ru/memoserv/forward
-%%NLS%%share/atheme/help/ru/memoserv/ignore
-%%NLS%%share/atheme/help/ru/memoserv/list
-%%NLS%%share/atheme/help/ru/memoserv/read
-%%NLS%%share/atheme/help/ru/memoserv/send
-%%NLS%%share/atheme/help/ru/memoserv/sendops
-%%NLS%%share/atheme/help/ru/nickserv/acc
-%%NLS%%share/atheme/help/ru/nickserv/access
-%%NLS%%share/atheme/help/ru/nickserv/drop
-%%NLS%%share/atheme/help/ru/nickserv/freeze
-%%NLS%%share/atheme/help/ru/nickserv/fungroup
-%%NLS%%share/atheme/help/ru/nickserv/fverify
-%%NLS%%share/atheme/help/ru/nickserv/ghost
-%%NLS%%share/atheme/help/ru/nickserv/group
-%%NLS%%share/atheme/help/ru/nickserv/hold
-%%NLS%%share/atheme/help/ru/nickserv/identify
-%%NLS%%share/atheme/help/ru/nickserv/info
-%%NLS%%share/atheme/help/ru/nickserv/list
-%%NLS%%share/atheme/help/ru/nickserv/listchans
-%%NLS%%share/atheme/help/ru/nickserv/listmail
-%%NLS%%share/atheme/help/ru/nickserv/listvhost
-%%NLS%%share/atheme/help/ru/nickserv/login
-%%NLS%%share/atheme/help/ru/nickserv/logout
-%%NLS%%share/atheme/help/ru/nickserv/mark
-%%NLS%%share/atheme/help/ru/nickserv/register
-%%NLS%%share/atheme/help/ru/nickserv/release
-%%NLS%%share/atheme/help/ru/nickserv/resetpass
-%%NLS%%share/atheme/help/ru/nickserv/return
-%%NLS%%share/atheme/help/ru/nickserv/sendpass
-%%NLS%%share/atheme/help/ru/nickserv/set_accountname
-%%NLS%%share/atheme/help/ru/nickserv/set_email
-%%NLS%%share/atheme/help/ru/nickserv/set_emailmemos
-%%NLS%%share/atheme/help/ru/nickserv/set_enforce
-%%NLS%%share/atheme/help/ru/nickserv/set_hidemail
-%%NLS%%share/atheme/help/ru/nickserv/set_neverop
-%%NLS%%share/atheme/help/ru/nickserv/set_nomemo
-%%NLS%%share/atheme/help/ru/nickserv/set_noop
-%%NLS%%share/atheme/help/ru/nickserv/set_password
-%%NLS%%share/atheme/help/ru/nickserv/set_private
-%%NLS%%share/atheme/help/ru/nickserv/set_privmsg
-%%NLS%%share/atheme/help/ru/nickserv/set_property
-%%NLS%%share/atheme/help/ru/nickserv/setpass
-%%NLS%%share/atheme/help/ru/nickserv/status
-%%NLS%%share/atheme/help/ru/nickserv/taxonomy
-%%NLS%%share/atheme/help/ru/nickserv/ungroup
-%%NLS%%share/atheme/help/ru/nickserv/vacation
-%%NLS%%share/atheme/help/ru/nickserv/verify
-%%NLS%%share/atheme/help/ru/nickserv/vhost
-%%NLS%%share/atheme/help/ru/oservice/akill
-%%NLS%%share/atheme/help/ru/oservice/clearchan
-%%NLS%%share/atheme/help/ru/oservice/clones
-%%NLS%%share/atheme/help/ru/oservice/compare
-%%NLS%%share/atheme/help/ru/oservice/identify
-%%NLS%%share/atheme/help/ru/oservice/ignore
-%%NLS%%share/atheme/help/ru/oservice/inject
-%%NLS%%share/atheme/help/ru/oservice/jupe
-%%NLS%%share/atheme/help/ru/oservice/mode
-%%NLS%%share/atheme/help/ru/oservice/modinspect
-%%NLS%%share/atheme/help/ru/oservice/modlist
-%%NLS%%share/atheme/help/ru/oservice/modload
-%%NLS%%share/atheme/help/ru/oservice/modrestart
-%%NLS%%share/atheme/help/ru/oservice/modunload
-%%NLS%%share/atheme/help/ru/oservice/noop
-%%NLS%%share/atheme/help/ru/oservice/rakill
-%%NLS%%share/atheme/help/ru/oservice/raw
-%%NLS%%share/atheme/help/ru/oservice/rehash
-%%NLS%%share/atheme/help/ru/oservice/restart
-%%NLS%%share/atheme/help/ru/oservice/rmatch
-%%NLS%%share/atheme/help/ru/oservice/rnc
-%%NLS%%share/atheme/help/ru/oservice/rwatch
-%%NLS%%share/atheme/help/ru/oservice/sgline
-%%NLS%%share/atheme/help/ru/oservice/shutdown
-%%NLS%%share/atheme/help/ru/oservice/soper
-%%NLS%%share/atheme/help/ru/oservice/specs
-%%NLS%%share/atheme/help/ru/oservice/update
-%%NLS%%share/atheme/help/ru/oservice/uptime
-%%NLS%%share/atheme/help/ru/saslserv/pkey
-%%NLS%%share/atheme/help/ru/userserv/drop
-%%NLS%%share/atheme/help/ru/userserv/freeze
-%%NLS%%share/atheme/help/ru/userserv/fverify
-%%NLS%%share/atheme/help/ru/userserv/hold
-%%NLS%%share/atheme/help/ru/userserv/info
-%%NLS%%share/atheme/help/ru/userserv/list
-%%NLS%%share/atheme/help/ru/userserv/listchans
-%%NLS%%share/atheme/help/ru/userserv/listmail
-%%NLS%%share/atheme/help/ru/userserv/listvhost
-%%NLS%%share/atheme/help/ru/userserv/login
-%%NLS%%share/atheme/help/ru/userserv/logout
-%%NLS%%share/atheme/help/ru/userserv/mark
-%%NLS%%share/atheme/help/ru/userserv/register
-%%NLS%%share/atheme/help/ru/userserv/resetpass
-%%NLS%%share/atheme/help/ru/userserv/return
-%%NLS%%share/atheme/help/ru/userserv/sendpass
-%%NLS%%share/atheme/help/ru/userserv/set_email
-%%NLS%%share/atheme/help/ru/userserv/set_emailmemos
-%%NLS%%share/atheme/help/ru/userserv/set_hidemail
-%%NLS%%share/atheme/help/ru/userserv/set_neverop
-%%NLS%%share/atheme/help/ru/userserv/set_noop
-%%NLS%%share/atheme/help/ru/userserv/set_password
-%%NLS%%share/atheme/help/ru/userserv/set_private
-%%NLS%%share/atheme/help/ru/userserv/set_privmsg
-%%NLS%%share/atheme/help/ru/userserv/set_property
-%%NLS%%share/atheme/help/ru/userserv/setpass
-%%NLS%%share/atheme/help/ru/userserv/status
-%%NLS%%share/atheme/help/ru/userserv/taxonomy
-%%NLS%%share/atheme/help/ru/userserv/vacation
-%%NLS%%share/atheme/help/ru/userserv/verify
-%%NLS%%share/atheme/help/ru/userserv/vhost
 share/atheme/help/saslserv/pkey
 share/atheme/help/statserv/channel
 share/atheme/help/statserv/netsplit
@@ -1244,27 +1277,3 @@ share/atheme/help/userserv/taxonomy
 share/atheme/help/userserv/vacation
 share/atheme/help/userserv/verify
 share/atheme/help/userserv/vhost
-%%PORTDOCS%%share/doc/atheme/FAQ
-%%PORTDOCS%%share/doc/atheme/IRCD
-%%PORTDOCS%%share/doc/atheme/JSONRPC
-%%PORTDOCS%%share/doc/atheme/LICENSE
-%%PORTDOCS%%share/doc/atheme/PCOMMANDS
-%%PORTDOCS%%share/doc/atheme/PRIVILEGES
-%%PORTDOCS%%share/doc/atheme/RELEASE
-%%PORTDOCS%%share/doc/atheme/SASL
-%%PORTDOCS%%share/doc/atheme/SQL
-%%PORTDOCS%%share/doc/atheme/TRANSLATION
-%%PORTDOCS%%share/doc/atheme/VERSION_LETTERS
-%%PORTDOCS%%share/doc/atheme/WINDOWS
-%%PORTDOCS%%share/doc/atheme/XMLRPC
-%%PORTDOCS%%share/doc/atheme/perl/Atheme.pod
-%%PORTDOCS%%share/doc/atheme/reference/gtk-doc.make
-%%PORTDOCS%%share/doc/atheme/technical/MODES
-%%PORTDOCS%%share/doc/atheme/technical/XMLRPCLIB
-%%NLS%%share/locale/cy/LC_MESSAGES/atheme.mo
-%%NLS%%share/locale/da/LC_MESSAGES/atheme.mo
-%%NLS%%share/locale/de/LC_MESSAGES/atheme.mo
-%%NLS%%share/locale/es/LC_MESSAGES/atheme.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/atheme.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/atheme.mo
-@dir(,ircservices,) etc/atheme