Update to v237

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-01-28 17:16:42 +01:00
parent d13ecfd07d
commit e3edeed65d
3 changed files with 7 additions and 30 deletions

View File

@ -1,25 +0,0 @@
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

@ -1 +1 @@
SHA512 (systemd-3e14c4c.tar.gz) = 3e01d14e858ca638ebccd50b8a1f183686f099a4e33dc17172a95d47e4b0b7d661f0413a1a77be75febe2e32724287a5af93dd579ff2c214f8e5fa2b079f6d3e SHA512 (systemd-237.tar.gz) = 15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b

View File

@ -1,4 +1,4 @@
%global gitcommit 3e14c4c1876b4dfeb8bf511185f70fef8d04a153 #global gitcommit 3e14c4c1876b4dfeb8bf511185f70fef8d04a153
%{?gitcommit:%global gitcommitshort %(c=%{gitcommit}; echo ${c:0:7})} %{?gitcommit:%global gitcommitshort %(c=%{gitcommit}; echo ${c:0:7})}
# We ship a .pc file but don't want to have a dep on pkg-config. We # We ship a .pc file but don't want to have a dep on pkg-config. We
@ -12,8 +12,8 @@
Name: systemd Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 236 Version: 237
Release: 4%{?gitcommit:.git%{gitcommitshort}}%{?dist} Release: 1%{?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,7 +48,6 @@ 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);}
@ -685,6 +684,9 @@ fi
%files tests -f .file-list-tests %files tests -f .file-list-tests
%changelog %changelog
* Sun Jan 28 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 237-1
- Update to latest version
* Sun Jan 21 2018 Björn Esser <besser82@fedoraproject.org> - 236-4.git3e14c4c * Sun Jan 21 2018 Björn Esser <besser82@fedoraproject.org> - 236-4.git3e14c4c
- Add patch to include <crypt.h> if needed - Add patch to include <crypt.h> if needed