From nobody Thu Aug 17 18:48:40 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRYtd2gPFz4q1hw; Thu, 17 Aug 2023 18:48:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRYtd0FQhz3VTP; Thu, 17 Aug 2023 18:48:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692298121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=adNqAYEKiwJZ6Bl9xSLx9pP0Xh6QDq99BJwigCojkMM=; b=QEdX4lDez7lwcn+OIRECoQRxuXjNbIX+TYvrZRNlg5ExRizP2hP03VPdRIVn5CT6q7LZPs sobmHYf5Pn9iNfdCGFkMrQhRWzr8x/SCJW7RnUEj2ho8Vm3pdr4cyLjB6GO+Gi7bqCf/Jn gC5cLobZ+BOuwRJOu+xF/4pGR8sLFNm80/DJNH+73tni2dK96c2z6D16eLr9nUJI8EYHW1 e6EZ9enyX9zxrAL3USEbKn4TI9KI4oVqSRVXeXQAX+juY0Yo2AjmRlV/a+2Zta163V9z5B ICuFy1KnixvHOPpfTnJcZf+3wwxoK8ot6kQx9Wk2/wNzfHsRQyeARj6mNQIhDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692298121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=adNqAYEKiwJZ6Bl9xSLx9pP0Xh6QDq99BJwigCojkMM=; b=jTIim2bRKsX1oCIKwUfAtcmaa8ukilKlHid4SJge4EBSSbTsJhHPkApMkrGw+fjZRedsDl FB9ok+ZcKER7MTAFgWOtE0lAyZO+A22SpvnPG2roNw9iZ3PVMwucw46rrIPzHGTMD6V80U vrKKIvS3u9SVvQ8qL1wf3UrjTgzrLFyWpmJJqKwqLq6qa4e54Dsg76h8ior+HYZN2Mdjju +VzGSu720fZ7MUSTzMsGkTNQ75IlwlQ50Z/bTLZzmVJWuW1HpIryvIl/oAD6jUTWJ6eLZK PzV3hGAK8OVQBWzxC1r8TyZ3xW2sV3sfs7JGyAoya5kW/SA1SzSnAOJ/AnkZPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692298121; a=rsa-sha256; cv=none; b=miRtNQhHMlSQlAn8gzus/83n5UOefybdQHHG57jLu3I0Ppz6z4bRkd8OV+OCmqvJHRgxbV NJqyTQqGGR0hbM6uQMKW3ZGmJUIu+n7B7ywXZf2Bmu05mnksogUZHOTYyIDebYDfgwO8wC ZlUUu4pQ3d7voLLFmBf/HReO0JqEpaT51M7XxR4SxoeB+BpcN1cB9qgPSkLnul4q2SPKof ixozJTaZpETvK7eSOz5MWaT4vUZziG/pn0cs3JwBbjm3kjWxcV6j2YRR9j8HjCGDmYQJ/h zfqkRxv5Lbl9oSDlEhNGiS4Iz+CY/j4I07ZChKGHzPwDintstHS4Y/kPdBtiJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRYtc6Qyyzl7f; Thu, 17 Aug 2023 18:48:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HIme58063750; Thu, 17 Aug 2023 18:48:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HImec6063748; Thu, 17 Aug 2023 18:48:40 GMT (envelope-from git) Date: Thu, 17 Aug 2023 18:48:40 GMT Message-Id: <202308171848.37HImec6063748@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: fa08ed068803 - main - sysutils/accountsservice: Fix build in presence of security/libxcrypt List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa08ed068803ea89d2d1b88e2cdc82eedb51aef9 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=fa08ed068803ea89d2d1b88e2cdc82eedb51aef9 commit fa08ed068803ea89d2d1b88e2cdc82eedb51aef9 Author: Gleb Popov AuthorDate: 2023-08-17 18:47:17 +0000 Commit: Gleb Popov CommitDate: 2023-08-17 18:48:37 +0000 sysutils/accountsservice: Fix build in presence of security/libxcrypt PR: 270881 Reported by: John Hein Sponsored by: Serenity Cybersecurity, LLC --- sysutils/accountsservice/Makefile | 3 ++- sysutils/accountsservice/files/patch-meson.build | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile index e4b92dbde119..734b439d2b9a 100644 --- a/sysutils/accountsservice/Makefile +++ b/sysutils/accountsservice/Makefile @@ -1,5 +1,6 @@ PORTNAME= accountsservice PORTVERSION= 23.13.9 +PORTREVISION= 1 CATEGORIES= sysutils devel MASTER_SITES= https://www.freedesktop.org/software/${PORTNAME}/ @@ -14,7 +15,7 @@ BUILD_DEPENDS= dbus>0:devel/dbus LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit \ libconsolekit.so:sysutils/consolekit2 -USES= cpe gettext gnome localbase:ldflags meson pkgconfig tar:xz +USES= cpe gettext gnome meson pkgconfig tar:xz CPE_VENDOR= freedesktop USE_GNOME= glib20 intltool libxslt introspection:build USE_LDCONFIG= yes diff --git a/sysutils/accountsservice/files/patch-meson.build b/sysutils/accountsservice/files/patch-meson.build index 0c44fe80183b..4149f6c07630 100644 --- a/sysutils/accountsservice/files/patch-meson.build +++ b/sysutils/accountsservice/files/patch-meson.build @@ -8,3 +8,16 @@ config_h.set_quoted('PATH_WTMP', path_wtmp) endif +@@ -159,11 +158,7 @@ polkit_gobject_dep = dependency('polkit-gobject-1') + # salt drawn from secure system ressources with at least 128 bits. + # (96 bits for sha512crypt, as more is not supported by this method, since + # the effectively used maximum is 16 base64-encoded characters) +-crypt_dep = dependency('libxcrypt', required: false, version: '>= 4') +-config_h.set('HAVE_CRYPT_GENSALT', crypt_dep.found()) +-if not crypt_dep.found() +- crypt_dep = cc.find_library('crypt') +-endif ++crypt_dep = cc.find_library('crypt') + + dbus_dep = dependency('dbus-1') + if dbus_dep.version().version_compare('>=1.9.18')