Add patch to include <crypt.h> if needed

This commit is contained in:
Björn Esser 2018-01-21 15:35:40 +01:00
parent af29920ddf
commit 3595fb5110
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From 1f9a592cbfd02e9ecea63abb31d6f34d0b85d498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Sun, 21 Jan 2018 14:59:38 +0100
Subject: [PATCH] firstboot: Include <crypt.h> for declaration of crypt() if
needed
---
src/firstboot/firstboot.c | 4 ++++
1 file changed, 4 insertions(+)
Index: systemd-3e14c4c1876b4dfeb8bf511185f70fef8d04a153/src/firstboot/firstboot.c
===================================================================
--- systemd-3e14c4c1876b4dfeb8bf511185f70fef8d04a153.orig/src/firstboot/firstboot.c
+++ systemd-3e14c4c1876b4dfeb8bf511185f70fef8d04a153/src/firstboot/firstboot.c
@@ -23,6 +23,10 @@
#include <shadow.h>
#include <unistd.h>
+#ifndef _XOPEN_CRYPT
+#include <crypt.h>
+#endif
+
#include "alloc-util.h"
#include "ask-password-api.h"
#include "copy.h"

View File

@ -13,7 +13,7 @@
Name: systemd Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 236 Version: 236
Release: 3%{?gitcommit:.git%{gitcommitshort}}%{?dist} Release: 4%{?gitcommit:.git%{gitcommitshort}}%{?dist}
# For a breakdown of the licensing, see README # For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+ License: LGPLv2+ and MIT and GPLv2+
Summary: System and Service Manager Summary: System and Service Manager
@ -48,6 +48,7 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[
%endif %endif
Patch0998: 0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch Patch0998: 0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch
Patch0999: 0999-firstboot-Include-crypt.h-for-declaration-of-crypt-i.patch
%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);} %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
@ -684,6 +685,9 @@ fi
%files tests -f .file-list-tests %files tests -f .file-list-tests
%changelog %changelog
* Sun Jan 21 2018 Björn Esser <besser82@fedoraproject.org> - 236-4.git3e14c4c
- Add patch to include <crypt.h> if needed
* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 236-3.git3e14c4c * Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 236-3.git3e14c4c
- Rebuilt for switch to libxcrypt - Rebuilt for switch to libxcrypt