sysutils/accountsservice: Update to 0.6.55

This update also fixes the userdel functionality.

PR:		249445
Reviewed by:	0mp
Approved by:	maintainer timeout
MFH:		2021Q2
Security:	75aae50b-9e3c-11eb-9bc3-8c164582fbac
Security:	CVE-2018-14036

sysutils/accountsservice/Makefile

@@ -1,7 +1,7 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 
 PORTNAME=	accountsservice
-PORTVERSION=	0.6.42
+PORTVERSION=	0.6.55
 CATEGORIES=	sysutils devel
 MASTER_SITES=	http://www.freedesktop.org/software/${PORTNAME}/
 
@@ -11,28 +11,18 @@ COMMENT=	D-Bus interface for user account query and manipulation
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
-		libpolkit-gobject-1.so:sysutils/polkit
+BUILD_DEPENDS=	dbus>0:devel/dbus
+LIB_DEPENDS=	libpolkit-gobject-1.so:sysutils/polkit
 
-USE_GNOME=	glib20 intlhack introspection:build libxslt
-USES=		cpe gettext gmake gnome libtool localbase:ldflags pathfix \
+USE_GNOME=	glib20 intltool introspection:build libxslt
+USES=		cpe gettext gnome localbase:ldflags meson \
 		pkgconfig tar:xz
 CPE_VENDOR=	ray_stode
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-systemd --localstatedir=/var/
-INSTALL_TARGET=	install-strip
-
-# XXX HACK! this file isn't present on the pristine jails of the builders
-# and configure breaks without it. Beter solutions welcome.
-.if defined(PACKAGE_BUILDING)
-CONFIGURE_ENV+=	ac_cv_file__var_log_utx_log=yes
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/gdm/custom.conf|${LOCALBASE}/etc/gdm/custom.conf|g' \
-		${WRKSRC}/src/daemon.c
-	@${REINPLACE_CMD} -e 's|/lib/AccountsService|/db/AccountsService|g' \
-		${WRKSRC}/src/user.c ${WRKSRC}/src/Makefile.in
+MESON_ARGS=	-Dsystemdsystemunitdir=no \
+		-Dgdmconffile=${LOCALBASE}/etc/gdm/custom.conf \
+		-Dsystemd=false \
+		-Delogind=false \
+		-Dlocalstatedir=/var
 
 .include <bsd.port.mk>

sysutils/accountsservice/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1468052689
-SHA256 (accountsservice-0.6.42.tar.xz) = e56494c2f18627900b57234e5628923cc16a37bf8fd16b06c46118d6ae9c007e
-SIZE (accountsservice-0.6.42.tar.xz) = 380500
+TIMESTAMP = 1600462353
+SHA256 (accountsservice-0.6.55.tar.xz) = ff2b2419a7e06bd9cb335ffe391c7409b49a0f0130b890bd54692a3986699c9b
+SIZE (accountsservice-0.6.55.tar.xz) = 97972

sysutils/accountsservice/files/patch-meson.build

@@ -0,0 +1,16 @@
+--- meson.build.orig	2018-09-29 12:54:53 UTC
++++ meson.build
+@@ -82,8 +82,11 @@ if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', p
+ elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
+   config_h.set('PATH_WTMP', '_PATH_WTMPX')
+ else
+-  assert(run_command('test', '-e', '/var/log/utx.log').returncode() == 0, 'Do not know which filename to watch for wtmp changes')
+-  config_h.set_quoted('PATH_WTMP', '/var/log/utx.log')
++  # Ugly hack for jails builders!
++  _system = host_machine.system().to_lower()
++  if _system.contains('freebsd')
++    config_h.set_quoted('PATH_WTMP', '/var/log/utx.log')
++  endif
+ endif
+
+ # compiler flags

sysutils/accountsservice/files/patch-meson__post__install.py

@@ -0,0 +1,13 @@
+--- meson_post_install.py.orig	2019-04-23 15:16:09 UTC
++++ meson_post_install.py
+@@ -9,8 +9,8 @@ localstatedir = os.path.normpath(destdir + os.sep + sy
+ # FIXME: meson will not track the creation of these directories
+ #        https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39
+ dst_dirs = [
+-  (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775),
+-  (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700),
++  (os.path.join(localstatedir, 'db', 'AccountsService', 'icons'), 0o775),
++  (os.path.join(localstatedir, 'db', 'AccountsService', 'users'), 0o700),
+ ]
+
+ for (dst_dir, dst_dir_mode) in dst_dirs: