Remove useless support for security/libxcrypt.

We have all we need in base, and having this lib around will make other
stuff pick it up while we don't want to.

ok robert@
This commit is contained in:
ajacoutot 2022-11-11 11:57:08 +00:00
parent cfd0dc0d35
commit babde52a86
3 changed files with 30 additions and 6 deletions

View File

@ -6,7 +6,7 @@ COMMENT= D-Bus interface for user account query and manipulation
DISTNAME= accountsservice-22.08.8
EXTRACT_SUFX= .tar.xz
REVISION= 3
REVISION= 4
SHARED_LIBS += accountsservice 0.1 # 0.0.0
@ -19,8 +19,7 @@ MAINTAINER= Robert Nagy <robert@openbsd.org>
# GPLv3
PERMIT_PACKAGE= Yes
WANTLIB += c gio-2.0 glib-2.0 gobject-2.0 intl polkit-gobject-1
WANTLIB += consolekit crypt
WANTLIB += c consolekit gio-2.0 glib-2.0 gobject-2.0 intl polkit-gobject-1
MASTER_SITES= http://www.freedesktop.org/software/accountsservice/
@ -30,8 +29,7 @@ BUILD_DEPENDS= devel/gettext,-tools \
devel/gobject-introspection \
lang/vala
LIB_DEPENDS= security/libxcrypt \
sysutils/consolekit>=1.2.4p4 \
LIB_DEPENDS= sysutils/consolekit>=1.2.4p4 \
sysutils/polkit
# polkit(8) almost always needs to know the "active" session

View File

@ -10,7 +10,20 @@ Index: meson.build
assert(run_command('test', '-e', path_wtmp).returncode() == 0, 'Do not know which filename to watch for wtmp changes')
config_h.set_quoted('PATH_WTMP', path_wtmp)
endif
@@ -207,10 +207,12 @@ config_h.set('MINIMUM_UID', get_option('minimum_uid'))
@@ -159,7 +159,11 @@ polkit_gobject_dep = dependency('polkit-gobject-1')
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')
+ if host_machine.system() == 'linux'
+ crypt_dep = cc.find_library('crypt')
+ else
+ crypt_dep = []
+ endif
endif
dbus_dep = dependency('dbus-1')
@@ -207,10 +211,12 @@ config_h.set('MINIMUM_UID', get_option('minimum_uid'))
gdm_conf_file = get_option('gdmconffile')
config_h.set_quoted('PATH_GDM_CUSTOM', gdm_conf_file)

View File

@ -0,0 +1,13 @@
Index: src/libaccountsservice/act-user.c
--- src/libaccountsservice/act-user.c.orig
+++ src/libaccountsservice/act-user.c
@@ -26,7 +26,9 @@
#include <sys/stat.h>
#include <unistd.h>
+#ifdef __linux__
#include <crypt.h>
+#endif
#include <glib.h>
#include <glib/gi18n.h>