sysutils/accountsservice: Fix build in presence of security/libxcrypt

PR:		270881
Reported by:	 John Hein <jcfyecrayz@liamekaens.com>
Sponsored by:	Serenity Cybersecurity, LLC
This commit is contained in:
Gleb Popov 2023-08-17 21:47:17 +03:00
parent 42758da17e
commit fa08ed0688
2 changed files with 15 additions and 1 deletions

View File

@ -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

View File

@ -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')