Fix crash introduced by glibc/libxcrypt change

https://fedoraproject.org/wiki/Changes/Replace_glibc_libcrypt_with_libxcrypt
Resolves: #1538181
This commit is contained in:
Ray Strode 2018-01-24 11:23:56 -05:00
parent 197481d558
commit 6c1950ef41
2 changed files with 95 additions and 2 deletions

View File

@ -0,0 +1,85 @@
From c111873f35f29576d655652a95810bfceb1862ef Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Wed, 24 Jan 2018 11:17:59 -0500
Subject: [PATCH] lib: add crypt.h include
libcrypt is getting cleaved from glibc, and it's definition is
getting moved to crypt.h (along side the crypt_r definition that's
existed for some time)
This commit add #include <crypt.h> to keep things working in old
and new libcs.
https://bugs.freedesktop.org/show_bug.cgi?id=104771
---
src/libaccountsservice/act-user.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/libaccountsservice/act-user.c b/src/libaccountsservice/act-user.c
index 70691a0..da46bc5 100644
--- a/src/libaccountsservice/act-user.c
+++ b/src/libaccountsservice/act-user.c
@@ -1,58 +1,60 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
*
* Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>.
* Copyright (C) 2007-2008 William Jon McCann <mccann@jhu.edu>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <config.h>
#include <float.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
+#include <crypt.h>
+
#include <glib.h>
#include <glib/gi18n.h>
#include <gio/gio.h>
#include "act-user-private.h"
#include "accounts-user-generated.h"
/**
* SECTION:act-user
* @title: ActUser
* @short_description: information about a user account
*
* An ActUser object represents a user account on the system.
*/
/**
* ActUser:
*
* Represents a user account on the system.
*/
/**
* ActUserAccountType:
* @ACT_USER_ACCOUNT_TYPE_STANDARD: Normal non-administrative user
* @ACT_USER_ACCOUNT_TYPE_ADMINISTRATOR: Administrative user
*
* Type of user account
*/
/**
--
2.14.3

View File

@ -2,7 +2,7 @@
Name: accountsservice
Version: 0.6.42
Release: 5%{?dist}
Release: 6%{?dist}
Summary: D-Bus interfaces for querying and manipulating user account information
Group: System Environment/Daemons
@ -11,6 +11,8 @@ URL: http://www.fedoraproject.org/wiki/Features/UserAccountDialog
#VCS: git:git://git.freedesktop.org/accountsservice
Source0: http://www.freedesktop.org/software/accountsservice/accountsservice-%{version}.tar.xz
Patch0: 0001-lib-add-crypt.h-include.patch
BuildRequires: glib2-devel
BuildRequires: polkit-devel
BuildRequires: intltool
@ -18,6 +20,7 @@ BuildRequires: systemd-units
BuildRequires: systemd-devel
BuildRequires: gobject-introspection-devel
BuildRequires: gtk-doc
BuildRequires: git
Requires: polkit
Requires: shadow-utils
@ -54,7 +57,7 @@ of these interfaces, based on the useradd, usermod and userdel commands.
%prep
%setup -q
%autosetup -S git
%build
%configure --enable-user-heuristics
@ -107,6 +110,11 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.a
%{_datadir}/gtk-doc/html/libaccountsservice/*
%changelog
* Wed Jan 24 2018 Ray Strode <rstrode@redhat.com> - 0.6.42-6
- Fix crash introduced by glibc/libxcrypt change
https://fedoraproject.org/wiki/Changes/Replace_glibc_libcrypt_with_libxcrypt
Resolves: #1538181
* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 0.6.42-5
- Rebuilt for switch to libxcrypt