atheme: Update to 7.2.10.r2

Changes since v7.2.9:

    Bugfixes and better logic in verify_password()
    Fix potential NULL dereference in modules/crypto/posix
    Backport some modules/crypto/pbkdf2v2 improvements from master
    Backport modules/crypto/argon2d from master
    Backport Base-64 codec from master
    Backport some build/configuration system improvements from master
    Bump E-Mail address maximum length to 254 characters
    Use flags setter information in modules/chanserv/access & modules/chanserv/flags
    Fix issue where modules/misc/httpd wasn't closing its listening socket on deinit
    Fix GroupServ data loss issue when a group was the founder of another group

3 files changed, 27 insertions, 74 deletions

diff --git a/chat/atheme/Makefile b/chat/atheme/Makefile
index 1d0b0a129a8..0ea21202459 100644
--- a/chat/atheme/Makefile
+++ b/chat/atheme/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.17 2019/02/13 15:20:27 tnn Exp $
-#
+# $NetBSD: Makefile,v 1.18 2019/12/10 13:21:36 nia Exp $
 
-DISTNAME=	atheme-7.2.9
-PKGREVISION=	1
+DISTNAME=	atheme-v7.2.10-r2
+PKGNAME=	${DISTNAME:S/-v/-/1:S/-r/.r/1}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GITHUB:=atheme/}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 GITHUB_PROJECT=	atheme
-GITHUB_RELEASE=	v${PKGVERSION_NOREV}
+GITHUB_RELEASE=	v${PKGVERSION_NOREV:S/.r/-r/1}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://atheme.github.io/atheme.html
@@ -16,13 +15,18 @@ LICENSE=	isc
 
 .include "../../mk/bsd.prefs.mk"
 
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake pkg-config msgfmt msgmerge xgettext
-BUILD_DEFS+=		VARBASE
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	gmake pkg-config
+USE_TOOLS+=	msgfmt msgmerge xgettext
+MAKE_JOBS_SAFE=	NO
+
+BUILD_DEFS+=	VARBASE
+
 PKG_SYSCONFSUBDIR=	atheme
+
 EGDIR=			${PREFIX}/share/examples/atheme
 DOC_FILES=		INSTALL README.md
-MAKE_JOBS_SAFE=		NO
+
 ATHEME_USER?=		atheme
 ATHEME_GROUP?=		atheme
 
@@ -47,12 +51,12 @@ PLIST_VARS+=		posixcrypt
 PLIST.posixcrypt=	yes
 .endif
 
-CFLAGS.SunOS+=		-Dfaultcode_t=foo_faultcode_t -Dboolean_t=foo_boolean_t
+CFLAGS.SunOS+=		-Dfaultcode_t=foo_faultcode_t
+CFLAGS.SunOS+=		-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+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 CONF_FILES_PERMS=	${EGDIR}/atheme.conf.example \
@@ -80,6 +84,8 @@ MAKE_DIRS_PERMS+=	${VARBASE}/run/atheme \
 
 INSTALLATION_DIRS+=	${EGDIR}
 
+PKGCONFIG_OVERRIDE+=	atheme-services.pc.in
+
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/dbverify \
 	    ${DESTDIR}${PREFIX}/bin/atheme-dbverify
@@ -102,6 +108,7 @@ post-install:
 .endfor
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libmowgli/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../converters/qrencode/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/chat/atheme/PLIST b/chat/atheme/PLIST
index 067f6fe5ebb..9f08b1c8b52 100644
--- a/chat/atheme/PLIST
+++ b/chat/atheme/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2019/02/09 20:13:02 nia Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/12/10 13:21:36 nia Exp $
 bin/atheme-dbverify
 bin/atheme-ecdsakeygen
 bin/atheme-services
@@ -67,57 +67,6 @@ 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
 ${PLIST.ldap}lib/atheme/modules/auth/ldap.so
@@ -198,6 +147,7 @@ lib/atheme/modules/chanserv/version.so
 lib/atheme/modules/chanserv/voice.so
 lib/atheme/modules/chanserv/why.so
 lib/atheme/modules/chanserv/xop.so
+lib/atheme/modules/crypto/argon2d.so
 lib/atheme/modules/crypto/ircservices.so
 lib/atheme/modules/crypto/pbkdf2.so
 lib/atheme/modules/crypto/pbkdf2v2.so
@@ -407,11 +357,7 @@ 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
diff --git a/chat/atheme/distinfo b/chat/atheme/distinfo
index 5d4355d8bc3..692b41573bb 100644
--- a/chat/atheme/distinfo
+++ b/chat/atheme/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2019/02/07 14:29:20 nia Exp $
+$NetBSD: distinfo,v 1.5 2019/12/10 13:21:36 nia Exp $
 
-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
+SHA1 (atheme-v7.2.10-r2.tar.xz) = f0ddd1623df545de76e910a8462b3a496f582624
+RMD160 (atheme-v7.2.10-r2.tar.xz) = 0da39746c743ac4b9e1bfaf2094221883a3b3b0e
+SHA512 (atheme-v7.2.10-r2.tar.xz) = c7e6654ddbf515b1565b77f0659cd9a77787d004fb532ecdee638189e823ec65afc283cbeafc6d7625ed6c210835e5546c5e33718e08ad0b280ccc7a2df7be48
+Size (atheme-v7.2.10-r2.tar.xz) = 21061364 bytes