chat/atheme: Update to 7.2.9

Atheme Services 7.2.9 Release Notes
===================================

This is a security release fixing use after free that could potentially be abused
by an attacker already having the privilege to use SASL impersonation to cause a
denial of service. Users of 7.2.8 should update to version 7.2.9; older releases
are not affected.

Atheme Services 7.2.8 Release Notes
===================================

This is a security release fixing a memory leak that could potentially be abused
by attackers to cause a denial of service. Users of Atheme 7.2.7 should update to
version 7.2.8; older releases are not affected.

Atheme Services 7.2.7 Release Notes
===================================

Since late February 2016, Atheme is being brought back to development (managed and
maintained by a few of the fork maintainers). Atheme 7.2.7 is the first release
since that change. It includes various fixes, some backported from the forks.

security
--------

- [CVE-2014-9773](https://www.cvedetails.com/cve/CVE-2014-9773/): Remote attackers could modify the behavior of the Anope FLAGS compatibility code by registering the keyword nicks LIST, CLEAR, or MODIFY. Reported by ToBeFree.
- [CVE-2016-4478](https://www.cvedetails.com/cve/CVE-2016-4478/): Buffer overflow in XMLRPC code. Reported by hc.

nickserv
--------
- Make `VHOST` set cloak assigner and timestamp the same way HostServ does
- Make `INFO` call the `user_info_noexist` hook for queries that don't match an account
- Make `REGAIN` log you in if successful.
- Allow implementing custom filters for `LIST`
- nickserv/multimark: new module which allows multiple MARK entries per nickname.
- wallops when vhosting a marked account
- nickserv/vhost: update usercloak metadata on vhost removal
- nickserv/{enforce,ghost}: respect frozen accounts
- nickserv/set_accountname: disallow change if RESTRICTed
- nickserv/set_pubkey: new module (keeping backwards compatibility with old syntax)
- nickserv/set_nopassword: new module
- nickserv/{reset,set,send}pass: various fixes
- nickserv/regain: the target user's bannedness shouldn't matter
- nickserv: Verify that the nick being regained is valid.
- nickserv/enforce: prevent regaining reserved nicks
- nickserv/cert: Add CLEAR command
- nickserv/set_email: relax verification requirements so that typo'd email addresses can be fixed (closes #441)
- nickserv/list: new criterion VACATION
- nickserv/info: show "Channels" line if the source user also is the target

chanserv
--------
- Add a `$server:` exttarget accepting server masks
- Add `PUBACL` flag which allows the channel access to be public.
- Don't allow `DEOP` or `KICK` of a services bot.
- Don't try to expand extbans in various commands.
- Allow users with +O or +V flags to op/voice themselves, since they can regain op/voice
  by cycling the channel anyway.
- chanserv/clear_akicks: new module providing a `CLEAR AKICKS` command.
- Always move on to the next nick in case of an error in /cs op etc.
- Tell the user who they failed to op/voice if they don't have enough privs
- +e added to chanserv{} templates and founder_flags
- chanserv: remove set_founder
- chanserv: use myentity_allow_foundership() to control whether or not an entity can take +F (ref #427)
- chanserv/set_*: announce changes via verbose()
- chanserv/flags: make Anope FLAGS compatibility an option (addresses CVE-2014-9773)
- fix an issue where activating a channel in the moderation queue would op the wrong person
- chanserv: move libathemecore component of bouncing mode changes on secure channels to chanserv (closes #449)
- chanserv/clone: do not clone HOLD, and ANTIFLOOD AKILL flags
- MC_SECURE: do not deop services
- help: mention INFO instead of RECOVER

gameserv
--------
- gameserv/dice: make the maximum roll count configurable.

groupserv
---------
- Hook into `sasl_may_impersonate` to support group-membership checks
- groupserv/set_groupname: new module allowing renaming a groupserv group
- Added group_register and group_drop hooks (addresses #428)
- groupserv: Rewrite flags parser to use ga_flags
- groupserv: Fix incorrect behaviour for flags +*
- groupserv: Fix inconsistencies with FLAGS
- groupserv/main: allow groups to take +F (ref #427)
- Add unverified user check

helpserv
--------
- helpserv/ticket: optionally accept a close reason and send a memo to an offline user
- helpserv/ticket: mention possibility of using close reason in the help file, and log it

operserv
--------
- operserv/rwatch: allow creation of RWATCH rules which k-line if 'K' is a modifier on the
  provided regexp.
- some commands now use kline_add instead of kline_sts to allow easier management of automated klines

saslserv
--------
- Add support for SASL authorization identities
- Add a `sasl_may_impersonate` hook
- The DH-AES and DH-BLOWFISH mechanisms were removed in their entirety.
- Add support for IRCv3.2-draft SASL mechanism list caching, implemented by InspIRCd 2.2.
- saslserv/ecdsa-nist256p-challenge: add backwards compatibility for old pubkey syntax
- saslserv: call bad_password on SASL authentication failure
- saslserv: use message source to get the source server
- saslserv: try to include source host in SASL failure message
- SASL: Log mechanism used by authenticated clients

alis
----
- Add a `list ... -showsecret` flag (chan:auspex) to list secret channels

perl api
--------
- Export SaslServ's `sasl_may_impersonate` hook
- Forward compatibility for hooks

ircd protocol
-------------
- Add user flag for tracking external services clients
- inspircd: Hopefully fix ignored account names when linking to the network
- inspircd: Various improvements to InspIRCd 2.0 support
- inspircd: Remove InspIRCd 1.2 and 2.1beta support
- inspircd: Add support for rejoindelay property in InspIRCd 2.2
- inspircd: Change the opertype used from 'Services' to 'Service'
- ircnet: Implement oper-wallops, using individual notices
- ngircd: Enable +qaohv support
- ngircd: Ignore non-# channels for now
- ngircd: Implement oper-wallops, using individual notices
- unreal: Request MLOCK messages when linking to the network
- sporksircd: Nuke obsolete module
- clean up the mix of spaces & tabs
- convert ircd_t to C99 struct syntax
- unreal: fix checking of +f syntax
- ts6-generic: add DLINE/UNDLINE implementation
- ts6-generic: add support for sending mechlists
- unreal: Add support for unreal 4 in a separate module
- hybrid: remove obsolete module
- undernet: remove obsolete module
- ShadowIRCd: remove obsolete module
- inspircd: add ZLINE/UNZLINE implementation
- inspircd: use DELLINE for XLine removal
- inspircd: properly recognize CSTATUS_IMMUNE (+Y)
- inspircd: Only set hideoper mode on oper pseudoclients
- charybdis: Support chm_nonotice.so (Block channel notices) extension
- charybdis: Support cmode +M in charybdis and make it oper-only
- charybdis: Setting CMODE_IMMUNE as .oimmune_mode
- inspircd: Fix atoi logic error preventing maximum rejoindelay value

other
-----
- various: Fix quite a few resource leaks and possible null derefs
- crypto/pbkdf2: Detect malformed (truncated) hashes
- contrib/cap_sasl.pl: Import various fixes from freenode's v1.5
- contrib/cap_sasl.pl: Implement SASL EXTERNAL, ECDSA-NIST256P-CHALLENGE
- contrib/cap_sasl.pl: Fix crash if irssi has ICB or SILC plugins loaded
- contrib/cap_sasl.pl: Fix crash if disconnected while waiting for SASL reply
- transport/jsonrpc: new module implementing JSONRPC transport
- contrib/cap_sasl.pl: various other improvements
- time_format: show the timezone
- exttarget: explicitly disallow foundership for exttargets (closes #427)
- help: various updates to reflect changes
- help: clarify some behavior
- [database] Make services respect an external umask when saving
- transport/xmlrpc: Do not copy more bytes than were allocated (addresses CVE-2016-4478)
- add a user_can_login(si, mu) hook
- Add an option to strip build date for reproducible builds
- botserv/set_saycaller: (optionally) give caller-nick
- chanfix/fix: stay in log channel after fixes
- various: code style fixes, fix some memory leaks and some warnings
- i18n: mark more strings as translatable
- atheme.conf example: updated to reflect changes
- proxyscan/dnsbl: Improve the module and fix multiple crashes
- i18n: update po/POTFILES.in

crypto
------
- argon2d:  New module implementing algorithm that won the Password
            Hashing Competition (2015).
- pbkdf2v2: Newer module implementing PBKDF2-HMAC digest scheme
            with backward compatibility and limited forward compatibility

libathemecore
-------------

- add dline/undline core interface
- user_is_channel_banned(): respect +e if applicable
- user_is_channel_banned(): check for voice/op/etc.
- do not allow entities under restriction to take +F at all (closes #439)
- fix issue where pretty_mask would return host!*@*
- chanacs_user_flags(): do not grant effective flags other than +b to unverified users (closes #416).
- flags: update_chanacs_flags(): do not assume that a protocol module is loaded.
- try_kick(): add support for inspircd-style per-user kick immunity the right way
- entity: add new entity validator for taking +F (ref #427)
- logger: use ISO 8601 in log files

hostserv
--------

- hostserv: Remove group-specific offered vhosts when group dropped
- Add DROP command
- hostserv/request: Ignore request if requested vhost already set

Atheme Services 7.1 Release Notes
=================================
In addition to assorted bugfixes in various subsystems from 7.0, the
following changes have been introduced in 7.1.

ircd protocol
-------------
- ngircd: New protocol module.
- nefarious: Add Nefarious 2 SASL support.
- nefarious: Send account timestamp in svslogin.
- elemental-ircd: New protocol module.
- dreamforge: Remove protocol module.
- inspircd: Add support for server-side MLOCK and TOPICLOCK enforcement
- inspircd: Add support for matching extbans modifying matching logic
- inspircd: Add +H to channel modes
- inspircd: Add +X and +w to list-like mode list
- ircd-seven: Support charybdis extension cmodes on ircd-seven as well.
- ts6-generic: Add support for serverinfo::hidden
- unreal: Add support for extbans.
- unreal: Add cmode +P for permanent channel.

buildsys
--------
- MacOS 10.5 required for OS X builds.
- V=1 option to make for verbose output.
- Allow parallel building, i.e. with -j option.
- Dependencies tracked on a per-sourceunit basis
- Allow --disable-rpath to modify buildsys param LDFLAGS_RPATH
- Install default email templates
- Add --with(out)-libmowgli to force use of internal mowgli

chanserv
--------
- antiflood: New module to react to channel flooding
- quiet: Channel statuses are removed from the target user to ensure
  that the quiet takes effect.
- quiet: Allow unquieting improper masks on the quiet list.
- quiet: Notify target user when anything changes about them.
- quiet: Honor protected mode like with kick/kickban.
- quiet: Support IRCDs with quiet extbans like UnrealIRCd and InspIRCd.
- flags: New exempt flag +e, split from +r. Databases should be upgraded
  automatically.
- flags: Require FORCE argument and chan:auspex to oper override.
- flags: Allow users with +f and +o (+v) to set +-O (+-V) on self.
- access: Do not allow changing +F via ROLE command.
- Support multiple users as arguments for owner, op, halfop, voice,
  and quiet.

nickserv
--------
- sendpass: Accept grouped nicks.
- register: Allow any number of emailexempts.
- Do net send 'spam' notice if chanserv does not exist.
- Add confirmation for badmail:del
- listemail: Match on canonical addresses too
- info: Show setpass to services admins with user:auspex
- info_lastquit: New module to show last quit message in INFO
- resetpass: Allow specifying any grouped nickname.
- drop: Request confirmation when dropping an account.
- access: Allow TLDs
- Log sendpass sender and time
- Show entity ID in 'ACC' and 'INFO' commands.

groupserv
---------
- Restrict +f from +F-ing themselves
- Prevent +f-F from removing founders
- Prevent removing last founder of a group
- Make sure +F always have +f
- Notify users when they are invited to a group.

sasl
----
- Add ecdsa-nist256p-challenge mechanism
- Add dh-aes scheme, intended to replace dh-blowfish.
- Disable reload capability on all modules.

perl api
--------
- Add function to return entity ID
- Allow sending wallops
- Allow setting vhosts
- Allow transferring and dropping channels
- Change myuser_find to myuser_find_ext to allow lookups by UID.
- Add config.xs to retrieve config values from the Perl API
- Add functions to channel.xs to register a channel and to retrieve a
  limit, key, and ts.
- Allow channelregistration.xs to get/set flags and get used time
- Add registration and last seen time in account.xs

email
-----
- Put the network name in the subject field of outgoing emails.
- Add a module canonicalizing gmail addresses.
- Use canonical email addresses when checking for registration limits.

libathemecore
-------------
- Allow different send and receive passwords for uplinks
- Respect founder_flags config setting during channel succession
- Denote default crypt provider in version output.
- Include reason with kline expiration messages.
- Allow customization of the address for email from services.
- Add option to kline user@host instead of *@host
- Add qrcode API

botserv
-------
- Blacklist '/' from various fields.
- Monkeypatch notice() to rewrite source from chanserv to botserv.

crypto
------
- Rename 'fallback' crypt provider to 'plaintext'
- Allow crypto modules to be loaded and the database to be updated to
  the preferred crypto scheme on the fly.
- pbkdf2: New module implementing PBKDF2-HMAC digest scheme.

misc
----
- xmlrpc: Add metadata accessor
- security/cmdperm: New module which dynamically infers virtual
  permissions, such as command:chanserv:register
- alis: Strip mIRC color/control codes from topics.
- operserv/clones: Add option to give a few warning kills before applying
  a k-line
- Codebase is stringref clean (GitHub issue #60)
- memoserv/delete: Only accept numeric indexes.
- chanfix: Allow admins with chan:admin to register regardless of
  chanfix score.
- memoserv: Make inbox size customizable.
- Add dragon, a new, modular, ircd link performance benchmarking toolkit.
- Flood k-lines use IP address where available instead of hostname.
- Add !snotices and !wallops logging targets.
- Record vHost assigner and timestamp, and display in NS INFO output.
- Contrib modules have their own git repo.
- Add a git .mailmap
- gameserv/dice: Ensure loop paramaters are integers limited to 1000

atheme.conf
-----------
Be sure to check atheme.conf.example for more information on what each
of these settings does.
- Add 'registeremail' setting to serverinfo{}, specifying address that
  services emails should originate from.
- Add 'hidden' setting to serverinfo{}, specifying that the services server
  should be hidden in /links output (limited to some ircds).
- Split 'password' setting in uplink{} into 'send_password' and
  'receive_password' (optional).
- Move 'maxnicks' setting from serverinfo{} to nickserv{}
- Move 'maxchans' setting from serverinfo{} to chanserv{}
- Add 'antiflood_enforce_method' to chanserv{} for chanserv/antiflood
- Add 'maxmemos' setting to memoserv{}
- Add !snotices and !wallops logfiles
- Add 'permissive_mode' setting to general{}, specifying manner of
  command denials.
- Add 'kline_with_ident' and 'kline_verified_ident' to general{}
- Add 'binddn' and 'bindauth' conf items to ldap{}
- Document "user" operclass.

Atheme Services 7.0 Release Notes
=================================
All bugfixes from the 6.0 branch of Atheme are also in 7.0.

dbverify
--------
- New utility.  Performs extensive and complicated consistency checks
  on your OpenSEX object store.  It can find things like:
  - corrupt AKICK entries (AKICKs with other flags/metadata that shouldn't be there);
  - duplicate channel ACL entries;
  - entity ID collisions
  It can find other stuff too, and will be expanded upon in the future.
  Think of it like a `fsck(1)` for your object store.

ircd protocol
-------------
- bahamut: add experimental support for bahamut-2.0 NICKIPSTR
  capability.
- charybdis: Add support for locking of modes provided by
  extensions modules.
- unreal: Add support for changets.
- inspircd: Add support for locking the +H channel mode.
- ithildin, bircd, plexus and ptlink protocol modules removed.
- inspircd: Users are now warned when they attempt to link on a client
  port instead of a server port.
- unreal: Add SASL support.
- unreal: Implement full support for mlocking +f.

chanfix
-------
- New service. Similar to EFNet's chanfix service.

chanserv
--------
- sync: New module based on cs_sync from contrib. Adds autosync on
  ACL change (and the ability to turn it off).
- channel entrymsgs are now displayed in INFO.
- akick: Support added for timed AKICKs.
- ban, quiet and akick: Atheme now fills in the parts of a hostmask
  that are missing with these commands.
- access: Various cleanups.
- cs_access_alias: New contrib module. Allows level-style pseudo
  access lists.
- clone: New module allowing you to clone a channel's access list,
  flags and metadata to a new channel.
- cs_badwords: New contrib module. Allows channel staff to specify a
  badwords list for a channel and what action to take when a user
  says one of the words in the channel.
- moderate: New module allowing operators with PRIV_CHAN_ADMIN to moderate
  channel registrations.  This is especially useful in combination with
  chanfix.  It is also useful in maintaining a standard of content correctness
  for specialized chat systems.

exttarget
---------
- exttarget/main: a new framework has been added which extends the
  entity subsystem further, allowing for entities to be dynamically
  constructed with the purpose of matching against any kind of user
  or account attribute in channel access lists.  these targets can
  take optional parameters.
- exttarget/oper: $oper extended target added.  this target allows you
  to match against all opers on the network in channel access lists.
- exttarget/registered: $registered extended target added.  this target
  matches anyone who is logged into services.
- exttarget/channel: $channel extended target added.  this target allows
  you to match anyone who is on a channel.

groupserv
---------
- all groupserv commands are now modules. Your atheme.conf will need
  to be updated for this change if you use groupserv.
- add join_flags config option and SET JOINFLAGS command. These allow
  changing the group flags a new user will get upon JOINing the group.
- add the +b (ban) flag. This prevents accounts matching it from JOINing
  the group.
- fflags: New command. Allows services operators to force a flags change
  on a group they they do not have access to.
- list: Allow refining the list with a pattern.
- listchans: New command. Allows group members with the +c flag to see all
  channels that group has access in.
- honor user:regnolimit permission in relation to the maximum number of groups
  a user may register. (SRV-125)

gameserv
--------
- many refactorings
- calc: new command. Allows doing basic math with GameServ.
- gs_roulette: New contrib module. A game of Russian Roulette.
- lottery: New module that randomly chooses one user out of the channel
  members.
- happyfarm: New (skeleton) module that's a game like FarmVille! But on IRC!

hostserv
--------
- added a new host_request hook to catch and do other things with host requests.
- reject: Add a optional reason parameter that will be memoed to the user with the
  rejection notice.

memoserv
--------
- ms_fsend: new contrib module. Allows sopers to override a target user being
  set NOMEMO or having the source user on ignore.

nickserv
--------
- restrict: New module that allows services opers to stop users from using
  commands that can be abused (hostserv/request, hostserv/take,
  groupserv/register, etc)
- emailexempts: New config option. Lets you specify email addresses that have
  no limit to the number of accounts they can have registered.
- when logging into a new account, users are informed that they will be logged
  out of their old account.
- when doing RELEASE or REGAIN against a user logged into an account, log
  them out of the account.
- old Atheme-1.x-style external logout implemented. Allows logging another user
  logged into your account out remotely.
- listgroups: New module that shows you which groups you have access in.
- nevergroup: New module that prevents anyone giving you access to a group.
- badmail: New module which allows setting email addresses (or glob patterns)
  which are not allowed to register accounts on-the-fly.
- nickserv now allows passwords longer than 32 characters if the database is
  being hashed.
- subscribe: Removed as it had many flaws and no one used it.
- ns_cleannick: new contrib module. Forces a nick change on a user if their nick is
  'lame' using case normalisation.

operserv
--------
- emailexempts and autokline exempts are now shown in INFO.
- modreload now rehashes the config if the module requires it and reloads modules
  that depend on the specified module.
- clones: Many cleanups.
- clones: Added an option to variable increase the clone limit if a users' clones
  are identified.
- soper: Allow adding a new SOPER with a password (optional, of course).
- set: Adds the ability to temporarily modify some config options on-the-fly.
- info: Add a new hooks so modules that add config options can also add lines to
  the operserv/info output.
- os_modeall: New contrib module. Allows setting a given mode on all channels.
- os_joinmon: New contrib module. Facilitates monitoring certain users and when
  a monitored user joins a channel, that information will be sent to the services
  log channel.
- os_resolve: New contrib module for testing the asynchronous DNS resolver.
- the RWATCH database is now serialized as opensex entities.
- specs: add support for groupserv-related permissions and clarify meanings of
  the various 'auspex' privileges. (SRV-125)

proxyscan
---------
- New service. Currently implements only a DNSBL scanning module.

rpgserv
-------
- New service. For finding and joining RP games on an IRC network.

scripting
---------
- Support for scripting Atheme in Perl added. Perl scripts are loaded with
  OperServ MODLOAD just like modules. Still in alpha. Add the --with-perl configure
  switch to enable it. POD-style documentation for the perl API is in doc/perl/.

statserv
--------
- New service. For querying for statistics about the network.

xmlrpc
------
- moved to transport/xmlrpc . Your atheme.conf will need to be updated for this
  change if you use xmlrpc.
- bad_password() is now called on invalid XMLRPC logins.

code
----
- libmowgli-2 is now required instead of libmowgli.
- a bit of the signal code and linker code was converted to use the mowgli
  implementations.
- charybdis' asynchronous DNS resolver added.
- mowgli.global_storage can now be used to make a module's data persistent on
  module reload. It is currently only used in GroupServ.
- many assertions added in various places throughout the code.
- added a new AC_AUTHENTICATED pseudo-priv to replace many identical checks if
  a user is logged in throughout the code.
- irc parse/uplink state has been made modular.
- atheme core has been changed to build as a library.
- all the old SNOOP channel code has been removed. SNOOP has been deprecated since
  5.1 and gone since 5.2.
- MODULE_USE_SYMBOL() was removed in favour of MODULE_TRY_REQUEST_SYMBOL().
- most service-specific (config file) code split out from the core.
- configuration-defined usernames are now truncated at USERLEN (10 characters).
- UID generation split out from the core.
- module_load can now be hooked into. This is particularly useful for scripting
  modules.
- entities now have unique IDs.  unique IDs may be referenced in all XMLRPC and
  IRC commands.
- strlcpy()/strlcat() have been replaced with mowgli implementations.
- atheme.string has been replaced with mowgli.string.
- add new hook_channel_acl_req_t structure for channel_acl_change hook, which is
  intended to describe ACL changes more effectively.
- call shutdown(2) on sockets being closed to help some TCP stacks be more aggressive
  when closing sockets.
- use mowgli_eventloop_pollable instead of old eventloop code.
- Windows is now supported.

other
-----
- ensure buffers passed to strftime() are large enough to fit the entire string.
  strftime() is not really required to behave in any specific way in the event of
  buffer overflow.
- ircd_announceserv: New contrib service. This allows users to request network
  announcements (which sopers must approve before they're sent).
- an access {} config block was added allowing rewriting of command privs.
  If specified, the user must match the original priv and the rewritten priv.
- allow Atheme datadir to be specified on the command-line when starting.
- many improvements to the LDAP authentication module.
- general::immune_level config option added. This allows customising the operlevel
  that gets kick immunity privileges.
- DNS Blacklist scanning module added. This module will scan connecting users
  against a list of DNS blacklists and take action if the users' IP is in one
  of the blacklists. This module is mainly managed through operserv.
- allow SASL authentication for any nick linked to the account, not just the
  accountname.

Atheme Services 6.0 Release Notes
=================================
All bugfixes from the 5.2 branch of Atheme are also in 6.0.

ircd protocol
-------------
- inspircd: Support for owner, halfops and admin are now dynamically
  enabled by what modes exist instead of being enabled by what modules
  you have loaded in inspircd.
- support for InspIRCd 1.1, OfficeIRC and UltimateIRCd 3 has been removed.

opensex
-------
- opensex is now the required database format. All flatfile will do is
  convert your flatfile database to opensex and exit.
- converted many modules that use external databases to using opensex.

chanserv
--------
- new module: chanserv/access.  this adds role-based channel acl via the
  ACCESS and ROLE commands.
- new module: chanserv/successor_acl.  this adds a +S channel acl flag which
  will weight a user as a successor.
- modules may now override the succession process using the new
  channel_pick_successor hook.
- chanserv/list: Enhance by adding many possible criteria to match channels
  against.
- new set_prefix module. This module allows channels to define a channel-specific
  fantasy prefix. The channel-specific prefix is displayed in the INFO for the
  channel. This is particularly useful if the channel uses an external bot that
  conflicts with the services default fantasy prefix.
- new clear_flags module. This allows founders to remove all entries from the
  channel access list except other founders.

groupserv
---------
- new service that allows users to form groups of accounts and apply the
  same ACL entries to them, send memos to them and other features.

helpserv
--------
- new service that allows users to request oper help in different ways.
  Currently either via a ticket system or by "pinging" the opers with a
  request for help.

hostserv
--------
- allow activating or rejecting all waiting vhosts by using '*' instead of
  a nick.
infoserv
--------
- oper-only message support. You can now give messages an importance where
  they will only be sent to opers upon oper-up.
- in infoserv message subjects, underscores will now be replaced with spaces
  so you can have multi-word subjects.
- allow customizing the number of infoserv messages shown to users on connect.

nickserv
--------
- new contrib module, ns_waitreg that allows you to specify how long a user must
  be connected before they can register a nick.
- new regnolimit module. Allows opers to set users as able to be exempt from channel
  registration limits. (how many channels may be registered to one account)
- nickserv/list: Enhance by adding many possible criteria to match users against.

operserv
--------
- new readonly module. This allows changing the readonly state at runtime.

xmlrpc
------
- the legacy xmlrpc/account, xmlrpc/channel and xmlrpc/memo modules have been
  removed. These have been deprecated for over 4 years and you should be
  using xmlrpc/main and atheme.command for all your xmlrpc uses.
- the xmlrpc core has been rewritten a little bit to use mowgli's patricia tree
  code.  this should bring a performance improvement over the hashtable code it
  was using.
- xmlrpc has been completely moved out of core
- a new command, atheme.privset has been added to get the soper privs of a user.

code
----
- default values in config options are now supported. This is particularly
  useful in modules and cleans up the config code a bit.
- many bugfixes and compile warning fixes.
- the flags code has been cleaned up to assume that there is only one flags
  table.
- the flags code is now extendable by modules.
- mychan_pick_candidate() is now in the public API.
- the core now lives in an ipv6 world.  it's 2010 - if your operating system
  doesn't support ipv6 - you suck.
- ctcp handling has been rewritten.
- new easter egg.
- the shrike hash function (shash()) has been removed as there was no longer
  anything using it.
- the "symbolmatrix" code was removed because we went with a different solution
  instead long ago.
- myuser_t is now a child of myentity_t which describes an entity that can have
  channel membership.
- list_t/node_t have been removed in preference of mowgli.list.
- balloc has been removed in preference of mowgli.heap.

other
-----
- added an anope 1.9.2 flatfile DB to OpenSEX DB conversion script.
- mail sending has been changed, likely causing serverinfo::mta scripts to
  break. The command is now passed "-t" rather than the email address and
  the shell is no longer used.
- the SDK hg revision of modules in now shown in MODINSPECT.

Atheme Services 5.2 Release Notes
=================================
Note: We are looking for additional developers to help with maintenance of
Services.  After almost 7 years of development, many of the programmers have
moved on.

ircd protocol
-------------
- inspircd: track channelmodes +D (delayjoin) and +d (delaymsg).

chanserv
--------
- split out SET into seperate modules for each SET command. chanserv/set
  is now a "meta-module" that depends on all the set_* modules.

hostserv
--------
- added OFFER module that allows opers to offer vhosts to users.
- made the request system (specifically the ACTIVATE command) not send
  a memo to the user.

infoserv
--------
- new service. infoserv allows opers to send notices to users when they
  connect or at the time of running the command (like Global).

nickserv
--------
- split out SET into seperate modules for each SET command. nickserv/set
  is now a "meta-module" that depends on all the set_* modules.
- added cracklib module that checks users' passwords on REGISTER and lets
  them know if the password is secure or not. You can have it just warn
  the user or disallow them from registering with a configuration option.
- added ns_generatehash contrib module to generate a password hash for
  a soper if you have crypto enabled.
- removed ns_ratelimitreg contrib modules as its functionality is now in
  core.

operserv
--------
- added expiry time to clone exempt

code
----
- replace the atheme-services build system with the ACBS used by many other
  Atheme projects.
- rework the colour and special character stripping for xmlrpc.
- remove snoop(). any modules still using snoop() will fail to compile on
  atheme 5.2. please replace it in your code with logcommand() or slog().

other
-----
- ircservtoatheme: generally make a bit more robust.
- added ratelimiting support to hostserv/request, chanserv/register and
  nickserv/register.
- add a new database format called opensex.  This is available in 5.2 as a
  "technology preview" and will be mandatory in 6.0.

Atheme Services 5.1.1 Release Notes
===================================

ircd protocol
-------------
- TS6: Rework MLOCK a bit to make it more robust and support more modes.

operserv
--------
- add os_helpme contrib module. Thist module marks a user as a network helper.
  This will only work on ircd's with the helpop (usually +h) user mode.

other
-----
- add extends directive to operclasses so one operclass can inherit privledges
  from another. See the example config for details. Note, you can have two
  operclasses with the same privledges, so extending is not forced.

Atheme Services 5.1 Release Notes
=================================
### [MERGED] indicates items merged to the 5.0 branch

ircd protocol
-------------
- inspircd: common code has been merged into inspircd-aux, this will continue
  in the next version with inspircd 1.1 support.
- inspircd: several unsupported module configurations are now programatically
  marked as such.
- inspircd: permanent channels are now tracked in 1.2 and later. (SRV-29)
- inspircd: add support for receiving SVSNICK (nick collisions)
- inspircd: add support for m_ojoin
- TS6: add support for MLOCK
- shadowircd: updated module to shadowircd6
- hyperion: removed
- Added support for ithildin1. This is still a bit experimental.
- ircnet: support added for server hostmasking.

botserv
-------
- add missing helpfiles
- botserv bots now quit instead of splitting when terminating/restarting
  services (SRV-12)

chanserv
--------
- FLAGS: allow +F* as well as +*F

hostserv
--------
- add missing helpfiles

nickserv
--------
- add support for CERTFP (CERT command)

operserv
--------
- reject jupes with names containing wildcards.
- add os_trace contrib module. This module looks up users by various criteria
  and lets you perform actions on them.
- add os_akillnicklist contrib module. Automatically AKILLs a list of clients,
  given their operating parameters.
- change CLEARCHAN GLINE action to AKILL to be more consistent with the rest
  of Atheme. GLINE still exists as an alias to AKILL.

saslserv
--------
- add AUTHCOOKIE SASL method which allows for integration with Iris

code
----
- add taint subsystem which allows developers to programatically define
  unsupportable conditions.
- constify *line_sts() protocol module functions.
- track deaf umode and set it on services clients if fantasy is disabled.
- allow #else in helpfiles
- startup flag -r (read-only) added.
- enable large file support.
- Add 'force_language' to sourceinfo_t, which forces the locale
  to be reset to the language specified by the sourceinfo structure.
  Useful for forcing XMLRPC responses to be in English.
- force dependency calculation before most targets to fix -j problems; there
  is a new target build-nodeps to skip this for subsequent builds (like the
  old behaviour of build).

other
-----
- logging system entirely reworked.  snoop() is deprecated and will be
  removed in the next version.
- add general::exempts config block, for masks that will never be
  automatically klined.
- add configurable command aliases to the services blocks
- helpfiles added for all contrib modules.
- make the wumpus contrib module compile and work again.
- anope_convert: support newer 1.8.x Anope versions and made anope_convert
  a bit more robust in handling encrypted passwords.

Atheme Services 5.0.1 Release Notes
===================================

botserv
-------
- When kicking users from an otherwise empty channel, set INHABIT, so that
  the bot leaves the channel after a short delay.

code
----
- Remove legacy .disp field from core services structures.

Atheme Services 5.0 Release Notes
=================================
### [MERGED] indicates items merged to the 4.0 branch

ircd protocol
-------------
- inspircd12: fix UID parsing and rejoining services after kicks. **[MERGED]**
- TS6: allow nicer topic setting using charybdis 3.2's ETB.
- hyperion: fix a bug that could cause the hostnames of services clients
  to be overwritten. **[MERGED]**
- plexus: port to ts6-generic, add UF_IMMUNE for +N, add support for
  permanent channels.
- hybrid: fix a crash.
- unreal: use SVSKILL for kills from NickServ. This reduces excessive server
  notices.

nickserv
--------
- Matching a nickname access list entry no longer resets last used time.
- Allow authentication via an LDAP server.
- Add some missing help files.
- Start the enforce timer on /ns set enforce on.
- Add a per-account language setting. This currently does not work very well.
- Prepend "(restored) " to marks restored from previously deleted accounts.
- Change VHOST syntax, adding an ON/OFF keyword and requiring a FORCE keyword
  to set a vhost on a marked account. The old syntax still works for vhosts
  containing a dot, colon or slash.
- Add ns_listlogins contrib module. This allows logged in users to see real
  hosts of their other logins.

chanserv
--------
- Set owner/protect on the founder of a new channel, if appropriate.
- Do not set protect status if the user already has owner.
- Rework successor selection for channels to respect flags more. **[MERGED]**
- Allow users with +V to voice themselves.

botserv
-------
- New service. This allows users to have a "bot" join their channel instead
  of ChanServ.

hostserv
--------
- New service. This adds per-nick vhosts and a request system to what
  /ns vhost provides. As long as per-nick vhosts are not used it interoperates
  with /ns vhost.

alis
----
- Add -maxmatches option which xmlrpc and chan:auspex may set to higher than
  the default.

oper
----
- Fix a possible crash with /os greplog. **[MERGED]**
- Add SGLINE system for bans by realname (TS6 xline).
- Services ignores no longer apply to users with general:admin privilege.
- Add /os listklinechan to the os_klinechan contrib module.
- Add os_kill contrib module. This allows opers to kill users while hiding
  their identity. (This was added earlier, but not linked to the build.)
- Add SQLINE system to disallow nick and channel names (TS6 resv).
- Fix possible crash with /os noop.
- RWATCH now also watches nick changes.

xmlrpc
------
- Remove 4K limitation on length of xmlrpc command output. **[MERGED]**

code
----
- Remove select() support and code to allow multiple "socket engines".
  poll() is sufficient.
- Rework the network connection code to be cleaner and more flexible.
- Close all connection_t fds in child processes.
- Allow using sourceinfo_t.v with IRC sources.
- Some tweaks to the build system.
- Add type checking to the hook system. See src/hooktypes.in. It may be
  necessary to specify --enable-warnings to configure to enable the checks.

other
-----
- Try to detect MacOS X crypt(3) breakage in crypto/posix and generate a DES
  based hash.
- Allow the user_add hook to remove the user from the network safely.
- Add user_nickchange hook for nick changes, which is also allowed to remove
  the user from the network.

Atheme Services 4.0 Release Notes
=================================
[MERGED] indicates items merged to the 3.1 branch

ircd protocol
-------------
- Add support for ShadowIRCd 5 **[MERGED]**. This replaces the support for
  older versions of ShadowIRCd.
- hyperion: improve detection of overwritten I:line spoofs.
- hyperion: Add support for UF_IMMUNE.
- general: Do not enforce AKICKs against users marked UF_IMMUNE; it is
  impossible to ban them effectively.
- inspircd12: various fixes and updates.
- ratbox: make akills work with ircd-ratbox 3.x.
- ratbox: add support for ratbox services shortcuts (ENCAP RSMSG,
  m_rsshortcut.so)
- nefarious: allow /ns vhost (FAKEHOST).
- nefarious: let services joining channels op themselves, avoiding HACK(4)
  notices
- ircd-seven: new protocol module
- Limit the send queue to the ircd to a configurable value, default 1MB.
  Large networks may need to increase this.
- Limit IRC command output to 2000 lines. XMLRPC is unaffected.
- Add tracking for the "server admin" umode in some ircds.
- ptlink: add support for forced nick changes (SVSNICK), fix nickTS.
- Remove some obsolete protocol modules: aurora, sorcery, shadowircd.
  If you do still use one of these, please contact us.
- Add support for P10 account creation times.
- Add support for P10 user IPv6 addresses.

nickserv
--------
- Snoop on freeze on/off.
- Add nickserv/vacation module, allowing to temporarily extend expiry times.
- Make register help text depend on whether email verification is used.
- Refer users to their email if they try to identify again while unverified.
  **[MERGED]**
- In FUNGROUP, allow dropping account names, by specifying a new account name.
- Add optional nickserv/listownmail to allow users to see accounts with
  their email.
- When refusing a login due to maxlogins, tell the user what the logged in
  nicks are.
- Show FREEZE status (but not setter, time or reason) to normal users.
- Show taxonomy (property, metadata) in INFO.
- Show recognized (access list) a bit better in INFO.
- Ignore access lists for frozen accounts. **[MERGED]**
- Add ns_fenforce contrib module. This allows admins to toggle enforce on any
  nickname.
- When a user is recognized but not identified, still tell them to identify,
  but with a shorter message.
- Make nickserv/enforce timings more accurate.

chanserv
--------
- Allow multiple spaces before fantasy commands when ChanServ is addressed
  by nickname.
- QUIET/UNQUIET now notify the target user or channel.
- Show the current successor in /cs info (for +A users and opers).
- FFLAGS now overrides the NEVEROP setting on the target account.
- Set owner/protect if appropriate after xOP ADD.
- Show taxonomy (property, metadata) in INFO.
- Add chanserv/set_limitflags, allows limiting +f's power.

alis
----
- Fix handling of key and limit options.
- Allow alis list on a single +s channel the user is on.

memoserv
--------
- Add DELETE OLD to delete all read memos.

gameserv
--------
- Do not add chanserv commands if fantasy is disabled.
- Allow ROLL, WOD and DF with a channel name to send the results to that
  channel without requiring fantasy commands. This must be specifically
  enabled on a per-channel basis using the new ChanServ command SET GAMESERV
  (module chanserv/set_gameserv).

oper
----
- Allow searching for AKILLs matching a given mask or id in AKILL LIST.
- Allow running an operserv-only services instance, which picks up login
  names from the main instance (currently only for hyperion, TS6 and P10
  ircds).
- Add optional PCRE support. Configure --with-pcre to enable it and add
  the p flag to use it (e.g. /os rmatch /\d\d\d/p). The regex wrapper has
  been changed slightly to make this possible.
- Report other nicks of deleted accounts to snoop and log file.
- Add operserv/greplog module (from freenode modules) to allow searching
  through recent logs from IRC.
- Automatically rehash after loading modules that need a rehash.

xmlrpc
------
- Fix atheme.memo.ignore.list and atheme.memo.ignore.clear to require only
  two arguments (third wasn't ever in use). **[MERGED]**

code
----
- Change kline_delete() to take a kline_t pointer instead of a user and host.
- Allow modules to influence the expiry process.
- Fix a minor memory leak on /os REHASH.
- Fix null pointer dereference with some invalid config files.
- Move the metadata entries to object_t.
- Change some protocol module functions to take object pointers instead of
  names and add some const keywords.
- Modules can now request other modules be loaded. This has been used to
  move some generic TS6 and P10 stuff into common modules.
- Rename CMODE_OP and the like to CSTATUS_*, emphasizing that they are
  separate from simple modes.
- Use C99 booleans (<stdbool.h>, bool, true, false).

other
-----
- Allow arbitrary line lengths in flatfile database loader.
- Synchronized with libmowgli 0.7 framework.
- Remove automatic module loading for modules/ directory; this behaviour
  has been deprecated since version 0.3.
- Fix ircservices conversion for ircservices 5.1.
- Improve flood detection.
- Fix a bug with /os identify introducing enforcers.
- Fix a bug that could cause normal users to be seen as enforcers.
- Allow any service's nick/user/host/realname to be set in the configuration
  file, and update them on a rehash. The service creation code works quite a
  bit differently to make this possible.
- Fix running on MacOS X 10.5.
- Fix compilation sometimes using system include files in place of our own.
- Change the default for gettext (NLS) to disabled in the setup script.
- Add a check against loading incompatible modules. Formerly, trying to load
  incompatible modules often caused a crash.
- Rework the configuration file parser to detect more errors and make it
  easier to add configuration options.
- Add +a to the example configuration's SOP to fit expectations better.
- Update anope_convert for anope 1.8 enc_md5/enc_sha1 passwords.
- Wake up the process less often if it is idling.
- Install an example services MOTD automatically.

Atheme Services 3.1 Release Notes
=================================
### [MERGED] indicates items merged to the 3.0 branch

ircd protocol
-------------
- Fix a crash that could happen with ircd bugs or nick collisions with
  services. **[MERGED]**
- Fix host changes in hyperion. **[MERGED]**
- Do not check the server's password in the hyperion protocol module.
- Do not allow spoofs ending in a slash in the hyperion protocol module.
- Allow nickname enforcers which are clients.
- Fix ping replies in P10.
- Add support for InspIRCd 1.2.
- Some ircds dislike colons in kline reasons, so don't use them for flood
  klines.
- When restoring an akill, send it to all servers on all protocols.
  Formerly, on some protocols it was only sent to the server the banned
  user was on.
- Add ircd-aurora protocol module. ircd-aurora is a patched version of
  charybdis with +qah channel statuses.
- For ircds that do not indicate host change to clients, send a 396 numeric
  instead of a notice from the service. This is easier to parse for clients.

nickserv
--------
- Comment out nickserv/subscribe from the example configuration, because
  it is experimental at this time. **[MERGED]**
- Fix a possible crash in nickserv release (nickserv/enforce module). **[MERGED]**
- Fix RETURN only accepting relatively short email addresses.
- Allow disabling the possibly slow maxusers (accounts/email) check by
  putting 0.
- Show /ns vhost in /ns info. Appears to user self and user:auspex opers.
- Adjust times so nicks cannot appear created before their account or used
  after their account was last seen.
- Add user_verify_register hook, called when a registration is verified.
  This is after a successful VERIFY if email verification is enabled, after
  a successful REGISTER if not.
- Make gen_vhostonreg contrib module only grant vhost once it's verified,
  and also set vhosts on users without vhost as they identify.
- Add clearer log messages for duplicate accounts/nicks/channels in atheme.db.
- Make INFO default to the user's nick (owned nicks) or current account (no
  owned nicks).
- Also introduce an enforcer when FNCing a user via the RELEASE command.
- Allow ignoring enforce on nicks unused for too long (nickserv::enforce_expire
  config option). This does not affect held accounts.
- Add nick_can_register hook and use it to block GROUP on guest nicks also.
  This hook is called on both REGISTER and GROUP (if nickname ownership is
  enabled).
- In SENDPASS, require the new keyword FORCE to override marks and the new
  keyword CLEAR to clear keys that were previously sent but not yet used.
  If these keywords are needed, the oper will be warned.
- Do not allow SENDPASS on unverified accounts.
- Make the enforce delay settable in the config file.
- Make holdnick enforcer time variable, 30s the first time then 1h.
- Add ns_ajoin contrib module to allow services-side autojoin.
- Show a pending email address change in INFO, to user self and user:auspex
  opers.
- Add ns_forbid contrib module. This registers, enforces, holds and freezes
  a nickname.
- Split DROP into DROP (users) and FDROP (admins).
- Send all failed password attempts for SOPER accounts to the snoop channel.
- Make the text in INFO for unverified accounts more conspicuous.

chanserv
--------
- Fix removing non-applicable flags (e.g. +hH) from host channel access.
  **[MERGED]**
- Fix ChanServ not deopping in some cases with guard on and changets off.
  **[MERGED]**
- Fix some ugly output in chanserv/unban_self. **[MERGED]**
- Respect NOOP flag in cs_sync contrib module.
- Allow calling RECOVER via xmlrpc.
- Add channel_can_register hook to allow modules to block channel registrations.
- Add SET QUIETCHG (nickserv setting) which suppresses notices from OP,
  VOICE, and the like by other users.
- Add cs_updown contrib module. This provides UP and DOWN commands that add
  and remove all modes a user is entitled to.
- Change SET STAFFONLY to SET RESTRICTED. This kicks all users except those
  with chan:joinstaffonly priv or any access (except +b) on the channel.
  Also make it handle +i channels more effectively.
- Allow admins to change oper only modes in mlocks even without +s flag.
- Snoop changes to oper only modes in mlocks.
- Split DROP into DROP (users) and FDROP (admins).
- Add a confirmation step against accidental drops to DROP. This only
  applies to commands via IRC.

alis
----
- Move ALIS from contrib to modules. The new atheme.conf line is
  loadmodule "modules/alis/main";

memoserv
--------

gameserv
--------

oper
----
- Fix a possible crash in /stats B. **[MERGED]**
- Fix slight damage to news items when reloading in contrib/os_logonnews.
  **[MERGED]**
- Allow GLOBAL to be used from non-IRC.
- Add CLONES DURATION to allow changing the duration of the network bans
  set by the clones module.
- Add os_klinechan contrib module. This allows setting channels to kline
  any users joining them.

xmlrpc
------
- Some improvements to buffer and character set handling.

code
----
- Disable object_t refcount.
- Fix various format string types, add many const keywords, hide a few
  structs that should be private.

other
-----
- Improve performance with large databases by changing the mowgli_heap
  memory allocator. **[partially MERGED]**
- Improve performance by changing the dictionary to a patricia algorithm.
- Decrease memory usage for large networks.
- Add LOCALEDIR to Makefile.in files, necessary for gettext. **[MERGED]**
- Some improvements to the hybserv/theia conversion tool.
- Some improvements to the ircservices conversion tool.
- Change maximum nick length from 30 to 31.
- Remove redundant expire_check and db_save in several places. This makes
  restart, shutdown and rehash faster without threatening data integrity.
- Add Russian help files from Kein/darkwire. Using these currently requires
  manual copy/rename operations.
- Add Russian translation from Kein/darkwire and fix the build system so it
  is automatically installed if gettext is enabled.
- Allow for crypt() in libc as well as libcrypt (MacOS X).
- Fix nested includes in the configuration file.
- Add child process tracking.
- Make some help files depend on what modules are loaded.
- Fix a bug that caused certain timed events to be executed too late.

7 files changed, 993 insertions, 122 deletions

diff --git a/chat/atheme/Makefile b/chat/atheme/Makefile
index b7b0fc58c84..96c0edc3e20 100644
--- a/chat/atheme/Makefile
+++ b/chat/atheme/Makefile
@@ -1,26 +1,26 @@
-# $NetBSD: Makefile,v 1.15 2017/08/01 17:40:09 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/02/07 14:29:20 nia Exp $
 #
 
-DISTNAME=	atheme-services-3.0.4
-PKGNAME=	${DISTNAME:S/-services//}
-PKGREVISION=	5
+DISTNAME=	atheme-7.2.9
 CATEGORIES=	chat
-# Gives 401
-#MASTER_SITES=	http://distfiles.atheme.org/
-EXTRACT_SUFX=	.tbz2
+MASTER_SITES=	${MASTER_SITE_GITHUB:=atheme/}
+EXTRACT_SUFX=	.tar.bz2
+GITHUB_PROJECT=	atheme
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-#HOMEPAGE=	http://www.atheme.org/
+HOMEPAGE=	https://atheme.github.io/atheme.html
 COMMENT=	Flexible IRC services system with proven scalability
+LICENSE=	isc
 
 .include "../../mk/bsd.prefs.mk"
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		gmake pkg-config msgfmt msgmerge xgettext
 BUILD_DEFS+=		VARBASE
 PKG_SYSCONFSUBDIR=	atheme
 EGDIR=			${PREFIX}/share/examples/atheme
-DOC_FILES=		INSTALL README
+DOC_FILES=		INSTALL README.md
 MAKE_JOBS_SAFE=		NO
 ATHEME_USER?=		atheme
 ATHEME_GROUP?=		atheme
@@ -48,12 +48,12 @@ PLIST.posixcrypt=	yes
 
 CFLAGS.SunOS+=		-Dfaultcode_t=foo_faultcode_t -Dboolean_t=foo_boolean_t
 
+CONFIGURE_ARGS+=	--with-libmowgli=no # use internal libmowgli
+CONFIGURE_ARGS+=	--enable-reproducible-builds
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--enable-fhs-paths
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
-PKGCONFIG_OVERRIDE+=	libmowgli/libmowgli.pc.in
-
 CONF_FILES_PERMS=	${EGDIR}/atheme.conf.example \
 			${PKG_SYSCONFDIR}/atheme.conf \
 			${ATHEME_USER} ${ATHEME_GROUP} 0660
@@ -63,6 +63,9 @@ CONF_FILES_PERMS+=	${EGDIR}/atheme.cron.example \
 CONF_FILES_PERMS+=	${EGDIR}/atheme.motd.example \
 			${PKG_SYSCONFDIR}/atheme.motd \
 			${ATHEME_USER} ${ATHEME_GROUP} 0660
+CONF_FILES_PERMS+=	${EGDIR}/atheme.conf.operserv-example \
+			${PKG_SYSCONFDIR}/atheme.conf.operserv \
+			${ATHEME_USER} ${ATHEME_GROUP} 0660
 CONF_FILES_PERMS+=	${EGDIR}/atheme.conf.userserv-example \
 			${PKG_SYSCONFDIR}/atheme.conf.userserv \
 			${ATHEME_USER} ${ATHEME_GROUP} 0660
@@ -77,17 +80,29 @@ MAKE_DIRS_PERMS+=	${VARBASE}/run/atheme \
 INSTALLATION_DIRS+=	${EGDIR}
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/dist/atheme.conf.example \
+	${MV} ${DESTDIR}${PREFIX}/bin/dbverify \
+	    ${DESTDIR}${PREFIX}/bin/atheme-dbverify
+	${MV} ${DESTDIR}${PREFIX}/bin/ecdsakeygen \
+	    ${DESTDIR}${PREFIX}/bin/atheme-ecdsakeygen
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/atheme.conf.example \
 	    ${DESTDIR}${EGDIR}/atheme.conf.example
-	${INSTALL_DATA} ${WRKSRC}/dist/atheme.conf.userserv-example \
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/atheme.conf.operserv-example \
+	    ${DESTDIR}${EGDIR}/atheme.conf.operserv-example
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/atheme.conf.userserv-example \
 	    ${DESTDIR}${EGDIR}/atheme.conf.userserv-example
-	${INSTALL_DATA} ${WRKSRC}/dist/atheme.cron.example \
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/atheme.cron.example \
 	    ${DESTDIR}${EGDIR}/atheme.cron.example
-	${INSTALL_DATA} ${WRKSRC}/dist/atheme.motd.example \
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/atheme.motd.example \
 	    ${DESTDIR}${EGDIR}/atheme.motd.example
-.	for i in ${DOC_FILES}
-		${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/atheme/
-.	endfor
-
-.include "../../devel/libmowgli/buildlink3.mk"
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/atheme.motd \
+	    ${DESTDIR}${EGDIR}/atheme.motd
+.for i in ${DOC_FILES}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/atheme/
+.endfor
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../converters/qrencode/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/atheme/PLIST b/chat/atheme/PLIST
index 9f43eaa04a5..e10362660cd 100644
--- a/chat/atheme/PLIST
+++ b/chat/atheme/PLIST
@@ -1,11 +1,150 @@
-@comment $NetBSD: PLIST,v 1.4 2015/11/07 20:38:08 dholland Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/02/07 14:29:20 nia Exp $
+bin/atheme-dbverify
+bin/atheme-ecdsakeygen
 bin/atheme-services
+include/atheme/abirev.h
+include/atheme/account.h
+include/atheme/atheme.h
+include/atheme/atheme_memory.h
+include/atheme/atheme_string.h
+include/atheme/auth.h
+include/atheme/authcookie.h
+include/atheme/base64.h
+include/atheme/channels.h
+include/atheme/commandtree.h
+include/atheme/common.h
+include/atheme/conf.h
+include/atheme/confprocess.h
+include/atheme/connection.h
+include/atheme/crypto.h
+include/atheme/culture.h
+include/atheme/database_backend.h
+include/atheme/datastream.h
+include/atheme/entity-validation.h
+include/atheme/entity.h
+include/atheme/flags.h
+include/atheme/global.h
+include/atheme/hook.h
+include/atheme/hooktypes.h
+include/atheme/httpd.h
+include/atheme/i18n.h
+include/atheme/inline/account.h
+include/atheme/inline/channels.h
+include/atheme/inline/connection.h
+include/atheme/libathemecore.h
+include/atheme/linker.h
+include/atheme/match.h
+include/atheme/md5.h
+include/atheme/module.h
+include/atheme/object.h
+include/atheme/phandler.h
+include/atheme/pmodule.h
+include/atheme/privs.h
+include/atheme/protocol/asuka.h
+include/atheme/protocol/bahamut.h
+include/atheme/protocol/charybdis.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/unreal.h
+include/atheme/res.h
+include/atheme/reslib.h
+include/atheme/sasl.h
+include/atheme/serno.h
+include/atheme/servers.h
+include/atheme/services.h
+include/atheme/servtree.h
+include/atheme/sourceinfo.h
+include/atheme/stdinc.h
+include/atheme/sysconf.h
+include/atheme/table.h
+include/atheme/taint.h
+include/atheme/template.h
+include/atheme/tools.h
+include/atheme/uid.h
+include/atheme/uplink.h
+include/atheme/users.h
+include/libmowgli-2/base/argstack.h
+include/libmowgli-2/base/bitvector.h
+include/libmowgli-2/base/formatter.h
+include/libmowgli-2/base/hash.h
+include/libmowgli-2/base/hook.h
+include/libmowgli-2/base/memslice.h
+include/libmowgli-2/base/mowgli_signal.h
+include/libmowgli-2/base/random.h
+include/libmowgli-2/container/dictionary.h
+include/libmowgli-2/container/index.h
+include/libmowgli-2/container/list.h
+include/libmowgli-2/container/patricia.h
+include/libmowgli-2/container/queue.h
+include/libmowgli-2/core/alloc.h
+include/libmowgli-2/core/allocation_policy.h
+include/libmowgli-2/core/allocator.h
+include/libmowgli-2/core/assert.h
+include/libmowgli-2/core/bootstrap.h
+include/libmowgli-2/core/heap.h
+include/libmowgli-2/core/iterator.h
+include/libmowgli-2/core/logger.h
+include/libmowgli-2/core/mowgli_string.h
+include/libmowgli-2/core/process.h
+include/libmowgli-2/core/stdinc.h
+include/libmowgli-2/dns/dns.h
+include/libmowgli-2/dns/evloop_res.h
+include/libmowgli-2/dns/evloop_reslib.h
+include/libmowgli-2/eventloop/eventloop.h
+include/libmowgli-2/ext/confparse.h
+include/libmowgli-2/ext/error_backtrace.h
+include/libmowgli-2/ext/getopt_long.h
+include/libmowgli-2/ext/global_storage.h
+include/libmowgli-2/ext/json-inline.h
+include/libmowgli-2/ext/json.h
+include/libmowgli-2/ext/proctitle.h
+include/libmowgli-2/ext/program_opts.h
+include/libmowgli-2/linebuf/linebuf.h
+include/libmowgli-2/module/module.h
+include/libmowgli-2/mowgli.h
+include/libmowgli-2/object/class.h
+include/libmowgli-2/object/message.h
+include/libmowgli-2/object/metadata.h
+include/libmowgli-2/object/object.h
+include/libmowgli-2/platform/attributes.h
+include/libmowgli-2/platform/cacheline.h
+include/libmowgli-2/platform/constructor.h
+include/libmowgli-2/platform/machine.h
+include/libmowgli-2/platform/win32/win32_stdinc.h
+include/libmowgli-2/thread/mutex.h
+include/libmowgli-2/thread/thread.h
+include/libmowgli-2/vio/vio.h
+lib/atheme/modules/alis/main.so
+lib/atheme/modules/auth/dummy.so
+lib/atheme/modules/auth/ldap.so
+lib/atheme/modules/backend/corestorage.so
 lib/atheme/modules/backend/flatfile.so
+lib/atheme/modules/backend/opensex.so
+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/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/clone.so
 lib/atheme/modules/chanserv/close.so
 lib/atheme/modules/chanserv/count.so
 lib/atheme/modules/chanserv/drop.so
@@ -22,6 +161,7 @@ lib/atheme/modules/chanserv/kick.so
 lib/atheme/modules/chanserv/list.so
 lib/atheme/modules/chanserv/main.so
 lib/atheme/modules/chanserv/mark.so
+lib/atheme/modules/chanserv/moderate.so
 lib/atheme/modules/chanserv/op.so
 lib/atheme/modules/chanserv/owner.so
 lib/atheme/modules/chanserv/protect.so
@@ -29,8 +169,27 @@ 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
+lib/atheme/modules/chanserv/set_fantasy.so
+lib/atheme/modules/chanserv/set_gameserv.so
+lib/atheme/modules/chanserv/set_guard.so
+lib/atheme/modules/chanserv/set_keeptopic.so
+lib/atheme/modules/chanserv/set_limitflags.so
+lib/atheme/modules/chanserv/set_mlock.so
+lib/atheme/modules/chanserv/set_prefix.so
 lib/atheme/modules/chanserv/set_private.so
+lib/atheme/modules/chanserv/set_property.so
+lib/atheme/modules/chanserv/set_pubacl.so
+lib/atheme/modules/chanserv/set_restricted.so
+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/status.so
+lib/atheme/modules/chanserv/successor_acl.so
+lib/atheme/modules/chanserv/sync.so
 lib/atheme/modules/chanserv/taxonomy.so
 lib/atheme/modules/chanserv/template.so
 lib/atheme/modules/chanserv/topic.so
@@ -40,15 +199,64 @@ lib/atheme/modules/chanserv/voice.so
 lib/atheme/modules/chanserv/why.so
 lib/atheme/modules/chanserv/xop.so
 lib/atheme/modules/crypto/ircservices.so
+lib/atheme/modules/crypto/pbkdf2.so
+lib/atheme/modules/crypto/pbkdf2v2.so
 ${PLIST.posixcrypt}lib/atheme/modules/crypto/posix.so
-lib/atheme/modules/crypto/sorservices.so
+lib/atheme/modules/crypto/rawmd5.so
+lib/atheme/modules/crypto/rawsha1.so
+lib/atheme/modules/exttarget/chanacs.so
+lib/atheme/modules/exttarget/channel.so
+lib/atheme/modules/exttarget/main.so
+lib/atheme/modules/exttarget/oper.so
+lib/atheme/modules/exttarget/registered.so
+lib/atheme/modules/exttarget/server.so
 lib/atheme/modules/gameserv/dice.so
 lib/atheme/modules/gameserv/eightball.so
+lib/atheme/modules/gameserv/gamecalc.so
+lib/atheme/modules/gameserv/happyfarm.so
 lib/atheme/modules/gameserv/help.so
+lib/atheme/modules/gameserv/lottery.so
 lib/atheme/modules/gameserv/main.so
 lib/atheme/modules/gameserv/namegen.so
 lib/atheme/modules/gameserv/rps.so
 lib/atheme/modules/global/main.so
+lib/atheme/modules/groupserv/acsnolimit.so
+lib/atheme/modules/groupserv/drop.so
+lib/atheme/modules/groupserv/fdrop.so
+lib/atheme/modules/groupserv/fflags.so
+lib/atheme/modules/groupserv/flags.so
+lib/atheme/modules/groupserv/help.so
+lib/atheme/modules/groupserv/info.so
+lib/atheme/modules/groupserv/invite.so
+lib/atheme/modules/groupserv/join.so
+lib/atheme/modules/groupserv/list.so
+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
+lib/atheme/modules/groupserv/set_groupname.so
+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/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
+lib/atheme/modules/hostserv/offer.so
+lib/atheme/modules/hostserv/onoff.so
+lib/atheme/modules/hostserv/request.so
+lib/atheme/modules/hostserv/vhost.so
+lib/atheme/modules/hostserv/vhostnick.so
+lib/atheme/modules/infoserv/main.so
 lib/atheme/modules/memoserv/delete.so
 lib/atheme/modules/memoserv/forward.so
 lib/atheme/modules/memoserv/help.so
@@ -57,9 +265,14 @@ lib/atheme/modules/memoserv/list.so
 lib/atheme/modules/memoserv/main.so
 lib/atheme/modules/memoserv/read.so
 lib/atheme/modules/memoserv/send.so
+lib/atheme/modules/memoserv/sendall.so
+lib/atheme/modules/memoserv/sendgroup.so
 lib/atheme/modules/memoserv/sendops.so
+lib/atheme/modules/misc/canon_gmail.so
 lib/atheme/modules/misc/httpd.so
 lib/atheme/modules/nickserv/access.so
+lib/atheme/modules/nickserv/badmail.so
+lib/atheme/modules/nickserv/cert.so
 lib/atheme/modules/nickserv/drop.so
 lib/atheme/modules/nickserv/enforce.so
 lib/atheme/modules/nickserv/freeze.so
@@ -69,34 +282,59 @@ 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/list.so
 lib/atheme/modules/nickserv/listchans.so
+lib/atheme/modules/nickserv/listgroups.so
 lib/atheme/modules/nickserv/listmail.so
+lib/atheme/modules/nickserv/listownmail.so
 lib/atheme/modules/nickserv/login.so
 lib/atheme/modules/nickserv/logout.so
 lib/atheme/modules/nickserv/main.so
 lib/atheme/modules/nickserv/mark.so
+lib/atheme/modules/nickserv/multimark.so
 lib/atheme/modules/nickserv/register.so
+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/set_accountname.so
+lib/atheme/modules/nickserv/set_core.so
+lib/atheme/modules/nickserv/set_email.so
+lib/atheme/modules/nickserv/set_emailmemos.so
+lib/atheme/modules/nickserv/set_enforcetime.so
+lib/atheme/modules/nickserv/set_hidemail.so
+lib/atheme/modules/nickserv/set_language.so
+lib/atheme/modules/nickserv/set_nevergroup.so
+lib/atheme/modules/nickserv/set_neverop.so
+lib/atheme/modules/nickserv/set_nogreet.so
+lib/atheme/modules/nickserv/set_nomemo.so
+lib/atheme/modules/nickserv/set_noop.so
+lib/atheme/modules/nickserv/set_nopassword.so
+lib/atheme/modules/nickserv/set_password.so
 lib/atheme/modules/nickserv/set_private.so
 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/setpass.so
 lib/atheme/modules/nickserv/status.so
-lib/atheme/modules/nickserv/subscribe.so
 lib/atheme/modules/nickserv/taxonomy.so
+lib/atheme/modules/nickserv/vacation.so
 lib/atheme/modules/nickserv/verify.so
 lib/atheme/modules/nickserv/vhost.so
 lib/atheme/modules/operserv/akill.so
 lib/atheme/modules/operserv/clearchan.so
 lib/atheme/modules/operserv/clones.so
 lib/atheme/modules/operserv/compare.so
+lib/atheme/modules/operserv/greplog.so
 lib/atheme/modules/operserv/help.so
 lib/atheme/modules/operserv/identify.so
 lib/atheme/modules/operserv/ignore.so
+lib/atheme/modules/operserv/info.so
 lib/atheme/modules/operserv/inject.so
 lib/atheme/modules/operserv/jupe.so
 lib/atheme/modules/operserv/main.so
@@ -104,57 +342,152 @@ lib/atheme/modules/operserv/mode.so
 lib/atheme/modules/operserv/modinspect.so
 lib/atheme/modules/operserv/modlist.so
 lib/atheme/modules/operserv/modload.so
-lib/atheme/modules/operserv/modrestart.so
+lib/atheme/modules/operserv/modreload.so
 lib/atheme/modules/operserv/modunload.so
 lib/atheme/modules/operserv/noop.so
+lib/atheme/modules/operserv/override.so
 lib/atheme/modules/operserv/rakill.so
 lib/atheme/modules/operserv/raw.so
+lib/atheme/modules/operserv/readonly.so
 lib/atheme/modules/operserv/rehash.so
 lib/atheme/modules/operserv/restart.so
 lib/atheme/modules/operserv/rmatch.so
 lib/atheme/modules/operserv/rnc.so
 lib/atheme/modules/operserv/rwatch.so
+lib/atheme/modules/operserv/set.so
+lib/atheme/modules/operserv/sgline.so
 lib/atheme/modules/operserv/shutdown.so
 lib/atheme/modules/operserv/soper.so
 lib/atheme/modules/operserv/specs.so
+lib/atheme/modules/operserv/sqline.so
 lib/atheme/modules/operserv/update.so
 lib/atheme/modules/operserv/uptime.so
 lib/atheme/modules/protocol/asuka.so
 lib/atheme/modules/protocol/bahamut.so
-lib/atheme/modules/protocol/bircd.so
+lib/atheme/modules/protocol/base36uid.so
 lib/atheme/modules/protocol/charybdis.so
-lib/atheme/modules/protocol/dreamforge.so
-lib/atheme/modules/protocol/hybrid.so
-lib/atheme/modules/protocol/hyperion.so
-lib/atheme/modules/protocol/inspircd11.so
-lib/atheme/modules/protocol/inspircd12.so
+lib/atheme/modules/protocol/elemental-ircd.so
+lib/atheme/modules/protocol/inspircd.so
+lib/atheme/modules/protocol/ircd-seven.so
 lib/atheme/modules/protocol/ircnet.so
+lib/atheme/modules/protocol/mixin_nohalfops.so
+lib/atheme/modules/protocol/mixin_noholdnick.so
+lib/atheme/modules/protocol/mixin_noowner.so
+lib/atheme/modules/protocol/mixin_noprotect.so
 lib/atheme/modules/protocol/nefarious.so
-lib/atheme/modules/protocol/officeirc.so
-lib/atheme/modules/protocol/plexus.so
-lib/atheme/modules/protocol/ptlink.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/solidircd.so
-lib/atheme/modules/protocol/sorcery.so
-lib/atheme/modules/protocol/ultimate3.so
-lib/atheme/modules/protocol/undernet.so
+lib/atheme/modules/protocol/ts6-generic.so
 lib/atheme/modules/protocol/unreal.so
-lib/atheme/modules/saslserv/crypt.so
-lib/atheme/modules/saslserv/dh-blowfish.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
+lib/atheme/modules/rpgserv/help.so
+lib/atheme/modules/rpgserv/info.so
+lib/atheme/modules/rpgserv/list.so
+lib/atheme/modules/rpgserv/main.so
+lib/atheme/modules/rpgserv/search.so
+lib/atheme/modules/rpgserv/set.so
+lib/atheme/modules/saslserv/authcookie.so
+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
-lib/atheme/modules/xmlrpc/account.so
-lib/atheme/modules/xmlrpc/channel.so
-lib/atheme/modules/xmlrpc/main.so
-lib/atheme/modules/xmlrpc/memo.so
+lib/atheme/modules/security/cmdperm.so
+lib/atheme/modules/statserv/channel.so
+lib/atheme/modules/statserv/main.so
+lib/atheme/modules/statserv/netsplit.so
+lib/atheme/modules/statserv/server.so
+lib/atheme/modules/transport/jsonrpc.so
+lib/atheme/modules/transport/p10.so
+lib/atheme/modules/transport/rfc1459.so
+lib/atheme/modules/transport/xmlrpc.so
+lib/libathemecore.so
+lib/libathemecore.so.1
+lib/libathemecore.so.1.0.0
+lib/libmowgli-2.so
+lib/libmowgli-2.so.0
+lib/libmowgli-2.so.0.0.0
+lib/pkgconfig/atheme-services.pc
+lib/pkgconfig/libmowgli-2.pc
+share/atheme/email/memo
+share/atheme/email/register
+share/atheme/email/sendpass
+share/atheme/email/setemail
+share/atheme/email/setpass
+share/atheme/help/alis/list
+share/atheme/help/botserv/act
+share/atheme/help/botserv/assign
+share/atheme/help/botserv/bot
+share/atheme/help/botserv/botlist
+share/atheme/help/botserv/info
+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
+share/atheme/help/chanfix/scores
+share/atheme/help/contrib/access
+share/atheme/help/contrib/ajoin
+share/atheme/help/contrib/as_activate
+share/atheme/help/contrib/as_cancel
+share/atheme/help/contrib/as_reject
+share/atheme/help/contrib/as_request
+share/atheme/help/contrib/as_waiting
+share/atheme/help/contrib/badwords
+share/atheme/help/contrib/cs_fregister
+share/atheme/help/contrib/cs_ping
+share/atheme/help/contrib/defcon
+share/atheme/help/contrib/dnsblexempt
+share/atheme/help/contrib/dnsblscan
+share/atheme/help/contrib/down
+share/atheme/help/contrib/fenforce
+share/atheme/help/contrib/forbid
+share/atheme/help/contrib/fregister
+share/atheme/help/contrib/fsend
+share/atheme/help/contrib/generatehash
+share/atheme/help/contrib/generatepass
+share/atheme/help/contrib/helpme
+share/atheme/help/contrib/joinmon
+share/atheme/help/contrib/kill
+share/atheme/help/contrib/klinechan
+share/atheme/help/contrib/listklinechan
+share/atheme/help/contrib/listlogins
+share/atheme/help/contrib/loadchanmodes
+share/atheme/help/contrib/logstream
+share/atheme/help/contrib/os_modeall
+share/atheme/help/contrib/pingspam
+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
+share/atheme/help/contrib/userinfo
+share/atheme/help/cservice/access_add
+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
 share/atheme/help/cservice/clear_bans
+share/atheme/help/cservice/clear_flags
 share/atheme/help/cservice/clear_users
+share/atheme/help/cservice/clone
 share/atheme/help/cservice/close
 share/atheme/help/cservice/count
 share/atheme/help/cservice/drop
+share/atheme/help/cservice/fdrop
 share/atheme/help/cservice/fflags
 share/atheme/help/cservice/flags
 share/atheme/help/cservice/forcexop
@@ -169,50 +502,412 @@ share/atheme/help/cservice/kickban
 share/atheme/help/cservice/list
 share/atheme/help/cservice/mark
 share/atheme/help/cservice/op_voice
+share/atheme/help/cservice/owner
+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
+share/atheme/help/cservice/role_set
+share/atheme/help/cservice/set_antiflood
 share/atheme/help/cservice/set_email
 share/atheme/help/cservice/set_entrymsg
 share/atheme/help/cservice/set_fantasy
 share/atheme/help/cservice/set_founder
+share/atheme/help/cservice/set_gameserv
 share/atheme/help/cservice/set_guard
 share/atheme/help/cservice/set_keeptopic
+share/atheme/help/cservice/set_limitflags
 share/atheme/help/cservice/set_mlock
+share/atheme/help/cservice/set_nosync
+share/atheme/help/cservice/set_prefix
 share/atheme/help/cservice/set_private
 share/atheme/help/cservice/set_property
+share/atheme/help/cservice/set_pubacl
+share/atheme/help/cservice/set_restricted
 share/atheme/help/cservice/set_secure
-share/atheme/help/cservice/set_staffonly
 share/atheme/help/cservice/set_topiclock
 share/atheme/help/cservice/set_url
 share/atheme/help/cservice/set_verbose
 share/atheme/help/cservice/status
+share/atheme/help/cservice/sync
 share/atheme/help/cservice/taxonomy
 share/atheme/help/cservice/template
 share/atheme/help/cservice/topic
 share/atheme/help/cservice/topicappend
 share/atheme/help/cservice/topicprepend
+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/userinfo
+share/atheme/help/cservice/waiting
 share/atheme/help/cservice/why
 share/atheme/help/cservice/xop
+share/atheme/help/es/alis/list
+share/atheme/help/es/botserv/act
+share/atheme/help/es/botserv/assign
+share/atheme/help/es/botserv/bot
+share/atheme/help/es/botserv/botlist
+share/atheme/help/es/botserv/info
+share/atheme/help/es/botserv/say
+share/atheme/help/es/botserv/set_fantasy
+share/atheme/help/es/botserv/set_nobot
+share/atheme/help/es/botserv/set_private
+share/atheme/help/es/botserv/unassign
+share/atheme/help/es/chanfix/chanfix
+share/atheme/help/es/chanfix/info
+share/atheme/help/es/chanfix/scores
+share/atheme/help/es/contrib/access
+share/atheme/help/es/contrib/ajoin
+share/atheme/help/es/contrib/as_activate
+share/atheme/help/es/contrib/as_cancel
+share/atheme/help/es/contrib/as_reject
+share/atheme/help/es/contrib/as_request
+share/atheme/help/es/contrib/as_waiting
+share/atheme/help/es/contrib/badwords
+share/atheme/help/es/contrib/cs_fregister
+share/atheme/help/es/contrib/cs_ping
+share/atheme/help/es/contrib/defcon
+share/atheme/help/es/contrib/down
+share/atheme/help/es/contrib/fenforce
+share/atheme/help/es/contrib/forbid
+share/atheme/help/es/contrib/fregister
+share/atheme/help/es/contrib/generatehash
+share/atheme/help/es/contrib/generatepass
+share/atheme/help/es/contrib/helpme
+share/atheme/help/es/contrib/kill
+share/atheme/help/es/contrib/klinechan
+share/atheme/help/es/contrib/listklinechan
+share/atheme/help/es/contrib/listlogins
+share/atheme/help/es/contrib/loadchanmodes
+share/atheme/help/es/contrib/logstream
+share/atheme/help/es/contrib/pingspam
+share/atheme/help/es/contrib/procwatch
+share/atheme/help/es/contrib/roulette
+share/atheme/help/es/contrib/savechanmodes
+share/atheme/help/es/contrib/set_blockbadwords
+share/atheme/help/es/contrib/trace
+share/atheme/help/es/contrib/up
+share/atheme/help/es/contrib/userinfo
+share/atheme/help/es/cservice/access_add
+share/atheme/help/es/cservice/access_del
+share/atheme/help/es/cservice/access_info
+share/atheme/help/es/cservice/access_list
+share/atheme/help/es/cservice/akick
+share/atheme/help/es/cservice/ban
+share/atheme/help/es/cservice/clear_bans
+share/atheme/help/es/cservice/clear_flags
+share/atheme/help/es/cservice/clear_users
+share/atheme/help/es/cservice/clone
+share/atheme/help/es/cservice/close
+share/atheme/help/es/cservice/count
+share/atheme/help/es/cservice/drop
+share/atheme/help/es/cservice/fdrop
+share/atheme/help/es/cservice/fflags
+share/atheme/help/es/cservice/flags
+share/atheme/help/es/cservice/forcexop
+share/atheme/help/es/cservice/ftransfer
+share/atheme/help/es/cservice/getkey
+share/atheme/help/es/cservice/halfop
+share/atheme/help/es/cservice/hold
+share/atheme/help/es/cservice/info
+share/atheme/help/es/cservice/invite
+share/atheme/help/es/cservice/kick
+share/atheme/help/es/cservice/kickban
+share/atheme/help/es/cservice/list
+share/atheme/help/es/cservice/mark
+share/atheme/help/es/cservice/op_voice
+share/atheme/help/es/cservice/owner
+share/atheme/help/es/cservice/protect
+share/atheme/help/es/cservice/quiet
+share/atheme/help/es/cservice/recover
+share/atheme/help/es/cservice/register
+share/atheme/help/es/cservice/role_add
+share/atheme/help/es/cservice/role_del
+share/atheme/help/es/cservice/role_list
+share/atheme/help/es/cservice/role_set
+share/atheme/help/es/cservice/set_email
+share/atheme/help/es/cservice/set_entrymsg
+share/atheme/help/es/cservice/set_fantasy
+share/atheme/help/es/cservice/set_founder
+share/atheme/help/es/cservice/set_gameserv
+share/atheme/help/es/cservice/set_guard
+share/atheme/help/es/cservice/set_keeptopic
+share/atheme/help/es/cservice/set_limitflags
+share/atheme/help/es/cservice/set_mlock
+share/atheme/help/es/cservice/set_nosync
+share/atheme/help/es/cservice/set_prefix
+share/atheme/help/es/cservice/set_private
+share/atheme/help/es/cservice/set_property
+share/atheme/help/es/cservice/set_restricted
+share/atheme/help/es/cservice/set_secure
+share/atheme/help/es/cservice/set_topiclock
+share/atheme/help/es/cservice/set_url
+share/atheme/help/es/cservice/set_verbose
+share/atheme/help/es/cservice/status
+share/atheme/help/es/cservice/sync
+share/atheme/help/es/cservice/taxonomy
+share/atheme/help/es/cservice/template
+share/atheme/help/es/cservice/topic
+share/atheme/help/es/cservice/topicappend
+share/atheme/help/es/cservice/topicprepend
+share/atheme/help/es/cservice/unban
+share/atheme/help/es/cservice/unban_self
+share/atheme/help/es/cservice/unquiet
+share/atheme/help/es/cservice/why
+share/atheme/help/es/cservice/xop
+share/atheme/help/es/gameserv/calc
+share/atheme/help/es/gameserv/eightball
+share/atheme/help/es/gameserv/lottery
+share/atheme/help/es/gameserv/namegen
+share/atheme/help/es/gameserv/roll
+share/atheme/help/es/groupserv/acsnolimit
+share/atheme/help/es/groupserv/drop
+share/atheme/help/es/groupserv/fdrop
+share/atheme/help/es/groupserv/fflags
+share/atheme/help/es/groupserv/flags
+share/atheme/help/es/groupserv/info
+share/atheme/help/es/groupserv/join
+share/atheme/help/es/groupserv/list
+share/atheme/help/es/groupserv/listchans
+share/atheme/help/es/groupserv/register
+share/atheme/help/es/groupserv/regnolimit
+share/atheme/help/es/groupserv/set_channel
+share/atheme/help/es/groupserv/set_description
+share/atheme/help/es/groupserv/set_email
+share/atheme/help/es/groupserv/set_joinflags
+share/atheme/help/es/groupserv/set_open
+share/atheme/help/es/groupserv/set_public
+share/atheme/help/es/groupserv/set_url
+share/atheme/help/es/gservice/global
+share/atheme/help/es/help
+share/atheme/help/es/helpserv/cancel
+share/atheme/help/es/helpserv/close
+share/atheme/help/es/helpserv/helpme
+share/atheme/help/es/helpserv/list
+share/atheme/help/es/helpserv/request
+share/atheme/help/es/helpserv/services
+share/atheme/help/es/hostserv/activate
+share/atheme/help/es/hostserv/group
+share/atheme/help/es/hostserv/listvhost
+share/atheme/help/es/hostserv/off
+share/atheme/help/es/hostserv/offer
+share/atheme/help/es/hostserv/offerlist
+share/atheme/help/es/hostserv/on
+share/atheme/help/es/hostserv/reject
+share/atheme/help/es/hostserv/request
+share/atheme/help/es/hostserv/take
+share/atheme/help/es/hostserv/unoffer
+share/atheme/help/es/hostserv/vhost
+share/atheme/help/es/hostserv/vhostnick
+share/atheme/help/es/hostserv/waiting
+share/atheme/help/es/infoserv/del
+share/atheme/help/es/infoserv/list
+share/atheme/help/es/infoserv/odel
+share/atheme/help/es/infoserv/olist
+share/atheme/help/es/infoserv/post
+share/atheme/help/es/memoserv/delete
+share/atheme/help/es/memoserv/forward
+share/atheme/help/es/memoserv/ignore
+share/atheme/help/es/memoserv/list
+share/atheme/help/es/memoserv/read
+share/atheme/help/es/memoserv/send
+share/atheme/help/es/memoserv/sendgroup
+share/atheme/help/es/memoserv/sendops
+share/atheme/help/es/nickserv/acc
+share/atheme/help/es/nickserv/access
+share/atheme/help/es/nickserv/badmail
+share/atheme/help/es/nickserv/cert
+share/atheme/help/es/nickserv/drop
+share/atheme/help/es/nickserv/fdrop
+share/atheme/help/es/nickserv/freeze
+share/atheme/help/es/nickserv/fungroup
+share/atheme/help/es/nickserv/fverify
+share/atheme/help/es/nickserv/ghost
+share/atheme/help/es/nickserv/group
+share/atheme/help/es/nickserv/hold
+share/atheme/help/es/nickserv/identify
+share/atheme/help/es/nickserv/info
+share/atheme/help/es/nickserv/list
+share/atheme/help/es/nickserv/listchans
+share/atheme/help/es/nickserv/listgroups
+share/atheme/help/es/nickserv/listmail
+share/atheme/help/es/nickserv/listownmail
+share/atheme/help/es/nickserv/listvhost
+share/atheme/help/es/nickserv/login
+share/atheme/help/es/nickserv/logout
+share/atheme/help/es/nickserv/mark
+share/atheme/help/es/nickserv/regain
+share/atheme/help/es/nickserv/register
+share/atheme/help/es/nickserv/regnolimit
+share/atheme/help/es/nickserv/release
+share/atheme/help/es/nickserv/resetpass
+share/atheme/help/es/nickserv/restrict
+share/atheme/help/es/nickserv/return
+share/atheme/help/es/nickserv/sendpass
+share/atheme/help/es/nickserv/sendpass_user
+share/atheme/help/es/nickserv/set_accountname
+share/atheme/help/es/nickserv/set_email
+share/atheme/help/es/nickserv/set_emailmemos
+share/atheme/help/es/nickserv/set_enforce
+share/atheme/help/es/nickserv/set_enforcetime
+share/atheme/help/es/nickserv/set_hidemail
+share/atheme/help/es/nickserv/set_language
+share/atheme/help/es/nickserv/set_nevergroup
+share/atheme/help/es/nickserv/set_neverop
+share/atheme/help/es/nickserv/set_nomemo
+share/atheme/help/es/nickserv/set_noop
+share/atheme/help/es/nickserv/set_password
+share/atheme/help/es/nickserv/set_private
+share/atheme/help/es/nickserv/set_privmsg
+share/atheme/help/es/nickserv/set_property
+share/atheme/help/es/nickserv/set_quietchg
+share/atheme/help/es/nickserv/setpass
+share/atheme/help/es/nickserv/status
+share/atheme/help/es/nickserv/taxonomy
+share/atheme/help/es/nickserv/ungroup
+share/atheme/help/es/nickserv/vacation
+share/atheme/help/es/nickserv/verify
+share/atheme/help/es/nickserv/vhost
+share/atheme/help/es/oservice/akill
+share/atheme/help/es/oservice/clearchan
+share/atheme/help/es/oservice/clones
+share/atheme/help/es/oservice/compare
+share/atheme/help/es/oservice/greplog
+share/atheme/help/es/oservice/identify
+share/atheme/help/es/oservice/ignore
+share/atheme/help/es/oservice/info
+share/atheme/help/es/oservice/inject
+share/atheme/help/es/oservice/jupe
+share/atheme/help/es/oservice/mode
+share/atheme/help/es/oservice/modinspect
+share/atheme/help/es/oservice/modlist
+share/atheme/help/es/oservice/modload
+share/atheme/help/es/oservice/modreload
+share/atheme/help/es/oservice/modunload
+share/atheme/help/es/oservice/noop
+share/atheme/help/es/oservice/override
+share/atheme/help/es/oservice/rakill
+share/atheme/help/es/oservice/raw
+share/atheme/help/es/oservice/readonly
+share/atheme/help/es/oservice/rehash
+share/atheme/help/es/oservice/restart
+share/atheme/help/es/oservice/rmatch
+share/atheme/help/es/oservice/rnc
+share/atheme/help/es/oservice/rwatch
+share/atheme/help/es/oservice/script
+share/atheme/help/es/oservice/sgline
+share/atheme/help/es/oservice/shutdown
+share/atheme/help/es/oservice/soper
+share/atheme/help/es/oservice/specs
+share/atheme/help/es/oservice/sqline
+share/atheme/help/es/oservice/update
+share/atheme/help/es/oservice/uptime
+share/atheme/help/es/saslserv/pkey
+share/atheme/help/es/userserv/cert
+share/atheme/help/es/userserv/drop
+share/atheme/help/es/userserv/freeze
+share/atheme/help/es/userserv/fverify
+share/atheme/help/es/userserv/hold
+share/atheme/help/es/userserv/info
+share/atheme/help/es/userserv/list
+share/atheme/help/es/userserv/listchans
+share/atheme/help/es/userserv/listmail
+share/atheme/help/es/userserv/listvhost
+share/atheme/help/es/userserv/login
+share/atheme/help/es/userserv/logout
+share/atheme/help/es/userserv/mark
+share/atheme/help/es/userserv/register
+share/atheme/help/es/userserv/resetpass
+share/atheme/help/es/userserv/return
+share/atheme/help/es/userserv/sendpass
+share/atheme/help/es/userserv/sendpass_user
+share/atheme/help/es/userserv/set_email
+share/atheme/help/es/userserv/set_emailmemos
+share/atheme/help/es/userserv/set_hidemail
+share/atheme/help/es/userserv/set_neverop
+share/atheme/help/es/userserv/set_noop
+share/atheme/help/es/userserv/set_password
+share/atheme/help/es/userserv/set_private
+share/atheme/help/es/userserv/set_privmsg
+share/atheme/help/es/userserv/set_property
+share/atheme/help/es/userserv/setpass
+share/atheme/help/es/userserv/status
+share/atheme/help/es/userserv/taxonomy
+share/atheme/help/es/userserv/vacation
+share/atheme/help/es/userserv/verify
+share/atheme/help/es/userserv/vhost
+share/atheme/help/gameserv/calc
 share/atheme/help/gameserv/eightball
+share/atheme/help/gameserv/lottery
 share/atheme/help/gameserv/namegen
 share/atheme/help/gameserv/roll
+share/atheme/help/gameserv/rps
+share/atheme/help/groupserv/acsnolimit
+share/atheme/help/groupserv/drop
+share/atheme/help/groupserv/fdrop
+share/atheme/help/groupserv/fflags
+share/atheme/help/groupserv/flags
+share/atheme/help/groupserv/info
+share/atheme/help/groupserv/invite
+share/atheme/help/groupserv/join
+share/atheme/help/groupserv/list
+share/atheme/help/groupserv/listchans
+share/atheme/help/groupserv/register
+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
+share/atheme/help/groupserv/set_url
 share/atheme/help/gservice/global
 share/atheme/help/help
+share/atheme/help/helpserv/cancel
+share/atheme/help/helpserv/close
+share/atheme/help/helpserv/helpme
+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
+share/atheme/help/hostserv/offer
+share/atheme/help/hostserv/offerlist
+share/atheme/help/hostserv/on
+share/atheme/help/hostserv/reject
+share/atheme/help/hostserv/request
+share/atheme/help/hostserv/take
+share/atheme/help/hostserv/unoffer
+share/atheme/help/hostserv/vhost
+share/atheme/help/hostserv/vhostnick
+share/atheme/help/hostserv/waiting
+share/atheme/help/infoserv/del
+share/atheme/help/infoserv/list
+share/atheme/help/infoserv/odel
+share/atheme/help/infoserv/olist
+share/atheme/help/infoserv/post
 share/atheme/help/memoserv/delete
 share/atheme/help/memoserv/forward
 share/atheme/help/memoserv/ignore
 share/atheme/help/memoserv/list
 share/atheme/help/memoserv/read
 share/atheme/help/memoserv/send
+share/atheme/help/memoserv/sendgroup
 share/atheme/help/memoserv/sendops
 share/atheme/help/nickserv/acc
 share/atheme/help/nickserv/access
+share/atheme/help/nickserv/badmail
+share/atheme/help/nickserv/cert
 share/atheme/help/nickserv/drop
+share/atheme/help/nickserv/fdrop
 share/atheme/help/nickserv/freeze
 share/atheme/help/nickserv/fungroup
 share/atheme/help/nickserv/fverify
@@ -223,61 +918,274 @@ share/atheme/help/nickserv/identify
 share/atheme/help/nickserv/info
 share/atheme/help/nickserv/list
 share/atheme/help/nickserv/listchans
+share/atheme/help/nickserv/listgroups
 share/atheme/help/nickserv/listmail
+share/atheme/help/nickserv/listownmail
 share/atheme/help/nickserv/listvhost
 share/atheme/help/nickserv/login
 share/atheme/help/nickserv/logout
 share/atheme/help/nickserv/mark
+share/atheme/help/nickserv/multimark
+share/atheme/help/nickserv/regain
 share/atheme/help/nickserv/register
+share/atheme/help/nickserv/regnolimit
 share/atheme/help/nickserv/release
 share/atheme/help/nickserv/resetpass
+share/atheme/help/nickserv/restrict
 share/atheme/help/nickserv/return
 share/atheme/help/nickserv/sendpass
+share/atheme/help/nickserv/sendpass_user
+share/atheme/help/nickserv/set_accountname
 share/atheme/help/nickserv/set_email
 share/atheme/help/nickserv/set_emailmemos
 share/atheme/help/nickserv/set_enforce
+share/atheme/help/nickserv/set_enforcetime
 share/atheme/help/nickserv/set_hidemail
+share/atheme/help/nickserv/set_language
+share/atheme/help/nickserv/set_nevergroup
 share/atheme/help/nickserv/set_neverop
+share/atheme/help/nickserv/set_nogreet
 share/atheme/help/nickserv/set_nomemo
 share/atheme/help/nickserv/set_noop
+share/atheme/help/nickserv/set_nopassword
 share/atheme/help/nickserv/set_password
 share/atheme/help/nickserv/set_private
 share/atheme/help/nickserv/set_privmsg
 share/atheme/help/nickserv/set_property
+share/atheme/help/nickserv/set_pubkey
+share/atheme/help/nickserv/set_quietchg
 share/atheme/help/nickserv/setpass
 share/atheme/help/nickserv/status
 share/atheme/help/nickserv/taxonomy
 share/atheme/help/nickserv/ungroup
+share/atheme/help/nickserv/vacation
 share/atheme/help/nickserv/verify
 share/atheme/help/nickserv/vhost
 share/atheme/help/oservice/akill
 share/atheme/help/oservice/clearchan
 share/atheme/help/oservice/clones
 share/atheme/help/oservice/compare
+share/atheme/help/oservice/greplog
 share/atheme/help/oservice/identify
 share/atheme/help/oservice/ignore
+share/atheme/help/oservice/info
 share/atheme/help/oservice/inject
 share/atheme/help/oservice/jupe
 share/atheme/help/oservice/mode
 share/atheme/help/oservice/modinspect
 share/atheme/help/oservice/modlist
 share/atheme/help/oservice/modload
-share/atheme/help/oservice/modrestart
+share/atheme/help/oservice/modreload
 share/atheme/help/oservice/modunload
 share/atheme/help/oservice/noop
+share/atheme/help/oservice/override
+share/atheme/help/oservice/perl
 share/atheme/help/oservice/rakill
 share/atheme/help/oservice/raw
+share/atheme/help/oservice/readonly
 share/atheme/help/oservice/rehash
 share/atheme/help/oservice/restart
 share/atheme/help/oservice/rmatch
 share/atheme/help/oservice/rnc
 share/atheme/help/oservice/rwatch
+share/atheme/help/oservice/set_akicktime
+share/atheme/help/oservice/set_chanexpire
+share/atheme/help/oservice/set_commitinterval
+share/atheme/help/oservice/set_enforceprefix
+share/atheme/help/oservice/set_klinetime
+share/atheme/help/oservice/set_maxchanacs
+share/atheme/help/oservice/set_maxchans
+share/atheme/help/oservice/set_maxfounders
+share/atheme/help/oservice/set_maxlogins
+share/atheme/help/oservice/set_maxnicks
+share/atheme/help/oservice/set_maxusers
+share/atheme/help/oservice/set_mdlimit
+share/atheme/help/oservice/set_nickexpire
+share/atheme/help/oservice/set_recontime
+share/atheme/help/oservice/set_spam
+share/atheme/help/oservice/sgline
 share/atheme/help/oservice/shutdown
 share/atheme/help/oservice/soper
 share/atheme/help/oservice/specs
+share/atheme/help/oservice/sqline
 share/atheme/help/oservice/update
 share/atheme/help/oservice/uptime
+share/atheme/help/rpgserv/disable
+share/atheme/help/rpgserv/enable
+share/atheme/help/rpgserv/info
+share/atheme/help/rpgserv/list
+share/atheme/help/rpgserv/search
+share/atheme/help/rpgserv/set
+share/atheme/help/ru/charset
+share/atheme/help/ru/cservice/akick
+share/atheme/help/ru/cservice/ban
+share/atheme/help/ru/cservice/clear_bans
+share/atheme/help/ru/cservice/clear_users
+share/atheme/help/ru/cservice/close
+share/atheme/help/ru/cservice/count
+share/atheme/help/ru/cservice/drop
+share/atheme/help/ru/cservice/fflags
+share/atheme/help/ru/cservice/flags
+share/atheme/help/ru/cservice/forcexop
+share/atheme/help/ru/cservice/ftransfer
+share/atheme/help/ru/cservice/getkey
+share/atheme/help/ru/cservice/halfop
+share/atheme/help/ru/cservice/hold
+share/atheme/help/ru/cservice/info
+share/atheme/help/ru/cservice/invite
+share/atheme/help/ru/cservice/kick
+share/atheme/help/ru/cservice/kickban
+share/atheme/help/ru/cservice/list
+share/atheme/help/ru/cservice/mark
+share/atheme/help/ru/cservice/op_voice
+share/atheme/help/ru/cservice/quiet
+share/atheme/help/ru/cservice/recover
+share/atheme/help/ru/cservice/register
+share/atheme/help/ru/cservice/set_email
+share/atheme/help/ru/cservice/set_entrymsg
+share/atheme/help/ru/cservice/set_fantasy
+share/atheme/help/ru/cservice/set_founder
+share/atheme/help/ru/cservice/set_guard
+share/atheme/help/ru/cservice/set_keeptopic
+share/atheme/help/ru/cservice/set_mlock
+share/atheme/help/ru/cservice/set_private
+share/atheme/help/ru/cservice/set_property
+share/atheme/help/ru/cservice/set_restricted
+share/atheme/help/ru/cservice/set_secure
+share/atheme/help/ru/cservice/set_topiclock
+share/atheme/help/ru/cservice/set_url
+share/atheme/help/ru/cservice/set_verbose
+share/atheme/help/ru/cservice/status
+share/atheme/help/ru/cservice/taxonomy
+share/atheme/help/ru/cservice/template
+share/atheme/help/ru/cservice/topic
+share/atheme/help/ru/cservice/topicappend
+share/atheme/help/ru/cservice/topicprepend
+share/atheme/help/ru/cservice/unban
+share/atheme/help/ru/cservice/unban_self
+share/atheme/help/ru/cservice/unquiet
+share/atheme/help/ru/cservice/userinfo
+share/atheme/help/ru/cservice/why
+share/atheme/help/ru/cservice/xop
+share/atheme/help/ru/gameserv/eightball
+share/atheme/help/ru/gameserv/namegen
+share/atheme/help/ru/gameserv/roll
+share/atheme/help/ru/gservice/global
+share/atheme/help/ru/help
+share/atheme/help/ru/memoserv/delete
+share/atheme/help/ru/memoserv/forward
+share/atheme/help/ru/memoserv/ignore
+share/atheme/help/ru/memoserv/list
+share/atheme/help/ru/memoserv/read
+share/atheme/help/ru/memoserv/send
+share/atheme/help/ru/memoserv/sendops
+share/atheme/help/ru/nickserv/acc
+share/atheme/help/ru/nickserv/access
+share/atheme/help/ru/nickserv/drop
+share/atheme/help/ru/nickserv/freeze
+share/atheme/help/ru/nickserv/fungroup
+share/atheme/help/ru/nickserv/fverify
+share/atheme/help/ru/nickserv/ghost
+share/atheme/help/ru/nickserv/group
+share/atheme/help/ru/nickserv/hold
+share/atheme/help/ru/nickserv/identify
+share/atheme/help/ru/nickserv/info
+share/atheme/help/ru/nickserv/list
+share/atheme/help/ru/nickserv/listchans
+share/atheme/help/ru/nickserv/listmail
+share/atheme/help/ru/nickserv/listvhost
+share/atheme/help/ru/nickserv/login
+share/atheme/help/ru/nickserv/logout
+share/atheme/help/ru/nickserv/mark
+share/atheme/help/ru/nickserv/register
+share/atheme/help/ru/nickserv/release
+share/atheme/help/ru/nickserv/resetpass
+share/atheme/help/ru/nickserv/return
+share/atheme/help/ru/nickserv/sendpass
+share/atheme/help/ru/nickserv/set_accountname
+share/atheme/help/ru/nickserv/set_email
+share/atheme/help/ru/nickserv/set_emailmemos
+share/atheme/help/ru/nickserv/set_enforce
+share/atheme/help/ru/nickserv/set_hidemail
+share/atheme/help/ru/nickserv/set_neverop
+share/atheme/help/ru/nickserv/set_nomemo
+share/atheme/help/ru/nickserv/set_noop
+share/atheme/help/ru/nickserv/set_password
+share/atheme/help/ru/nickserv/set_private
+share/atheme/help/ru/nickserv/set_privmsg
+share/atheme/help/ru/nickserv/set_property
+share/atheme/help/ru/nickserv/setpass
+share/atheme/help/ru/nickserv/status
+share/atheme/help/ru/nickserv/taxonomy
+share/atheme/help/ru/nickserv/ungroup
+share/atheme/help/ru/nickserv/vacation
+share/atheme/help/ru/nickserv/verify
+share/atheme/help/ru/nickserv/vhost
+share/atheme/help/ru/oservice/akill
+share/atheme/help/ru/oservice/clearchan
+share/atheme/help/ru/oservice/clones
+share/atheme/help/ru/oservice/compare
+share/atheme/help/ru/oservice/identify
+share/atheme/help/ru/oservice/ignore
+share/atheme/help/ru/oservice/inject
+share/atheme/help/ru/oservice/jupe
+share/atheme/help/ru/oservice/mode
+share/atheme/help/ru/oservice/modinspect
+share/atheme/help/ru/oservice/modlist
+share/atheme/help/ru/oservice/modload
+share/atheme/help/ru/oservice/modrestart
+share/atheme/help/ru/oservice/modunload
+share/atheme/help/ru/oservice/noop
+share/atheme/help/ru/oservice/rakill
+share/atheme/help/ru/oservice/raw
+share/atheme/help/ru/oservice/rehash
+share/atheme/help/ru/oservice/restart
+share/atheme/help/ru/oservice/rmatch
+share/atheme/help/ru/oservice/rnc
+share/atheme/help/ru/oservice/rwatch
+share/atheme/help/ru/oservice/sgline
+share/atheme/help/ru/oservice/shutdown
+share/atheme/help/ru/oservice/soper
+share/atheme/help/ru/oservice/specs
+share/atheme/help/ru/oservice/update
+share/atheme/help/ru/oservice/uptime
+share/atheme/help/ru/saslserv/pkey
+share/atheme/help/ru/userserv/drop
+share/atheme/help/ru/userserv/freeze
+share/atheme/help/ru/userserv/fverify
+share/atheme/help/ru/userserv/hold
+share/atheme/help/ru/userserv/info
+share/atheme/help/ru/userserv/list
+share/atheme/help/ru/userserv/listchans
+share/atheme/help/ru/userserv/listmail
+share/atheme/help/ru/userserv/listvhost
+share/atheme/help/ru/userserv/login
+share/atheme/help/ru/userserv/logout
+share/atheme/help/ru/userserv/mark
+share/atheme/help/ru/userserv/register
+share/atheme/help/ru/userserv/resetpass
+share/atheme/help/ru/userserv/return
+share/atheme/help/ru/userserv/sendpass
+share/atheme/help/ru/userserv/set_email
+share/atheme/help/ru/userserv/set_emailmemos
+share/atheme/help/ru/userserv/set_hidemail
+share/atheme/help/ru/userserv/set_neverop
+share/atheme/help/ru/userserv/set_noop
+share/atheme/help/ru/userserv/set_password
+share/atheme/help/ru/userserv/set_private
+share/atheme/help/ru/userserv/set_privmsg
+share/atheme/help/ru/userserv/set_property
+share/atheme/help/ru/userserv/setpass
+share/atheme/help/ru/userserv/status
+share/atheme/help/ru/userserv/taxonomy
+share/atheme/help/ru/userserv/vacation
+share/atheme/help/ru/userserv/verify
+share/atheme/help/ru/userserv/vhost
 share/atheme/help/saslserv/pkey
+share/atheme/help/statserv/channel
+share/atheme/help/statserv/netsplit
+share/atheme/help/statserv/server
+share/atheme/help/userserv/cert
 share/atheme/help/userserv/drop
 share/atheme/help/userserv/freeze
 share/atheme/help/userserv/fverify
@@ -294,6 +1202,7 @@ share/atheme/help/userserv/register
 share/atheme/help/userserv/resetpass
 share/atheme/help/userserv/return
 share/atheme/help/userserv/sendpass
+share/atheme/help/userserv/sendpass_user
 share/atheme/help/userserv/set_email
 share/atheme/help/userserv/set_emailmemos
 share/atheme/help/userserv/set_hidemail
@@ -306,24 +1215,38 @@ share/atheme/help/userserv/set_property
 share/atheme/help/userserv/setpass
 share/atheme/help/userserv/status
 share/atheme/help/userserv/taxonomy
+share/atheme/help/userserv/vacation
 share/atheme/help/userserv/verify
 share/atheme/help/userserv/vhost
+share/doc/atheme/FAQ
 share/doc/atheme/INSTALL
 share/doc/atheme/IRCD
+share/doc/atheme/JSONRPC
 share/doc/atheme/LICENSE
 share/doc/atheme/PCOMMANDS
 share/doc/atheme/PRIVILEGES
-share/doc/atheme/README
+share/doc/atheme/README.md
 share/doc/atheme/RELEASE
 share/doc/atheme/SASL
 share/doc/atheme/SQL
 share/doc/atheme/TRANSLATION
 share/doc/atheme/VERSION_LETTERS
+share/doc/atheme/WINDOWS
 share/doc/atheme/XMLRPC
-share/doc/atheme/technical/HOOKS
+share/doc/atheme/perl/Atheme.pod
+share/doc/atheme/reference/gtk-doc.make
 share/doc/atheme/technical/MODES
 share/doc/atheme/technical/XMLRPCLIB
 share/examples/atheme/atheme.conf.example
+share/examples/atheme/atheme.conf.operserv-example
 share/examples/atheme/atheme.conf.userserv-example
 share/examples/atheme/atheme.cron.example
+share/examples/atheme/atheme.motd
 share/examples/atheme/atheme.motd.example
+share/locale/cy/LC_MESSAGES/atheme.mo
+share/locale/da/LC_MESSAGES/atheme.mo
+share/locale/de/LC_MESSAGES/atheme.mo
+share/locale/es/LC_MESSAGES/atheme.mo
+share/locale/fr/LC_MESSAGES/atheme.mo
+share/locale/ru/LC_MESSAGES/atheme.mo
+@pkgdir etc/atheme
diff --git a/chat/atheme/distinfo b/chat/atheme/distinfo
index 8fc6f95792e..5d4355d8bc3 100644
--- a/chat/atheme/distinfo
+++ b/chat/atheme/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 01:20:17 agc Exp $
+$NetBSD: distinfo,v 1.4 2019/02/07 14:29:20 nia Exp $
 
-SHA1 (atheme-services-3.0.4.tbz2) = 1ba73fa07377f3ec31d03b0ac588141e10ad35b3
-RMD160 (atheme-services-3.0.4.tbz2) = cca06369a1fd6989178b760efdbf745de28c9b60
-SHA512 (atheme-services-3.0.4.tbz2) = 549587f7f47b3911978ae3f231020d7278f5b3274347c4b33a8ed02770d36b9051f4754f405e4c593308e7446a313b37b1bc53cbcf6dffa2e966ba458f37904f
-Size (atheme-services-3.0.4.tbz2) = 580786 bytes
-SHA1 (patch-aa) = ea2122cbe3dc1f7ddbc62aa9bcc695a384dc575e
-SHA1 (patch-ab) = 49c72c026c24f0e2b5054a2297d80256ca37ed1d
-SHA1 (patch-include_common.h) = ee4ab38b65f954d8a545e7f6d58f41b964b301e5
-SHA1 (patch-include_stdinc.h) = a7d2898581addaf7730270003b0f0eb30a455de9
+SHA1 (atheme-7.2.9.tar.bz2) = 629ee6241324722792124a1abddc2e03f28eee30
+RMD160 (atheme-7.2.9.tar.bz2) = 2445974e12aa249d818cb7a34e6669f68740a0ce
+SHA512 (atheme-7.2.9.tar.bz2) = 8852bcf4746ad3b8814e2e7ae8b435c538b442f26f6cf8479087d115c0c4d6877ea864f9e19ccaa9ae93ea8a116cfa53d1f22846fffb783f78bfad8e95fd26f7
+Size (atheme-7.2.9.tar.bz2) = 1179582 bytes
diff --git a/chat/atheme/patches/patch-aa b/chat/atheme/patches/patch-aa
deleted file mode 100644
index e2a738d8bdc..00000000000
--- a/chat/atheme/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/06/16 10:38:27 adrianp Exp $
-
---- src/Makefile.in.orig	2008-02-11 02:58:09.000000000 +0000
-+++ src/Makefile.in
-@@ -131,15 +131,8 @@ install: build
- 	$(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)
- 	$(INSTALL) -m 755 -d $(DESTDIR)$(localstatedir)
- 	$(INSTALL) -m 755 -d $(DESTDIR)$(DOCDIR)
--	$(INSTALL) -m 755 -d $(DESTDIR)$(LOGDIR)
--	$(INSTALL) -m 755 -d $(DESTDIR)$(RUNDIR)
--	$(INSTALL) -m 755 -d $(DESTDIR)$(DATADIR)
- 	$(INSTALL) -m 755 -d $(DESTDIR)$(SHAREDIR)/help
- 	$(INSTALL) -m 755 -c $(BIN) $(DESTDIR)$(bindir)
--	$(INSTALL) -m 640 -c ../dist/atheme.conf.example $(DESTDIR)$(sysconfdir)
--	$(INSTALL) -m 640 -c ../dist/atheme.motd.example $(DESTDIR)$(sysconfdir)
--	$(INSTALL) -m 640 -c ../dist/atheme.conf.userserv-example $(DESTDIR)$(sysconfdir)
--	$(INSTALL) -m 640 -c ../dist/atheme.cron.example $(DESTDIR)$(sysconfdir)
- 	[ -f ${DESTDIR}${bindir}/atheme ] && ${RM} ${DESTDIR}${bindir}/atheme || :
- 	-${RM} -f $(DESTDIR)${DOCDIR}/HOOKS $(DESTDIR)${DOCDIR}/MODES $(DESTDIR)${DOCDIR}/XMLRPCLIB
- 	(cd ../doc; for i in *; do \
diff --git a/chat/atheme/patches/patch-ab b/chat/atheme/patches/patch-ab
deleted file mode 100644
index d284ec8abd4..00000000000
--- a/chat/atheme/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/06/16 10:38:27 adrianp Exp $
-
---- configure.orig	2008-02-11 02:58:20.000000000 +0000
-+++ configure
-@@ -7026,7 +7026,7 @@ if test "${enable_fhs_paths+set}" = set;
-     MODDIR='${libdir}/atheme'
-     SHAREDIR='${datadir}/atheme'
-     LOGDIR='${localstatedir}/log/atheme'
--    DATADIR='${localstatedir}/lib/atheme'
-+    DATADIR='${localstatedir}/atheme'
-     RUNDIR='${localstatedir}/run/atheme'
-     ;;
-   no)
diff --git a/chat/atheme/patches/patch-include_common.h b/chat/atheme/patches/patch-include_common.h
deleted file mode 100644
index 42d3e371b61..00000000000
--- a/chat/atheme/patches/patch-include_common.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-include_common.h,v 1.1 2012/02/16 13:46:52 hans Exp $
-
---- include/common.h.orig	2008-02-11 03:58:08.000000000 +0100
-+++ include/common.h	2012-01-20 00:50:51.945230165 +0100
-@@ -111,6 +111,10 @@ enum faultcode_
- 	fault_unimplemented	= 14
- };
- 
-+#ifdef __sun
-+#undef faultcode_t
-+#endif
-+
- typedef enum faultcode_ faultcode_t;
- 
- #if defined(__GNUC__) || defined(__INTEL_COMPILER)
diff --git a/chat/atheme/patches/patch-include_stdinc.h b/chat/atheme/patches/patch-include_stdinc.h
deleted file mode 100644
index 0451e4b65d0..00000000000
--- a/chat/atheme/patches/patch-include_stdinc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-include_stdinc.h,v 1.1 2012/02/16 13:46:52 hans Exp $
-
---- include/stdinc.h.orig	2008-02-11 03:58:08.000000000 +0100
-+++ include/stdinc.h	2012-01-20 00:50:03.416296368 +0100
-@@ -46,6 +46,10 @@
- #include <libgen.h>
- #include <dirent.h>
- 
-+#ifdef __sun
-+#undef boolean_t
-+#endif
-+
- typedef mowgli_boolean_t boolean_t;
- 
- #endif