From e3edeed65d28e20c5c813bb06cc7027f171a7875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 28 Jan 2018 17:16:42 +0100 Subject: [PATCH] Update to v237 --- ...e-crypt.h-for-declaration-of-crypt-i.patch | 25 ------------------- sources | 2 +- systemd.spec | 10 +++++--- 3 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 0999-firstboot-Include-crypt.h-for-declaration-of-crypt-i.patch diff --git a/0999-firstboot-Include-crypt.h-for-declaration-of-crypt-i.patch b/0999-firstboot-Include-crypt.h-for-declaration-of-crypt-i.patch deleted file mode 100644 index 9810a6c..0000000 --- a/0999-firstboot-Include-crypt.h-for-declaration-of-crypt-i.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1f9a592cbfd02e9ecea63abb31d6f34d0b85d498 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Sun, 21 Jan 2018 14:59:38 +0100 -Subject: [PATCH] firstboot: Include 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 - #include - -+#ifndef _XOPEN_CRYPT -+#include -+#endif -+ - #include "alloc-util.h" - #include "ask-password-api.h" - #include "copy.h" diff --git a/sources b/sources index f2f1d1c..60b02fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-3e14c4c.tar.gz) = 3e01d14e858ca638ebccd50b8a1f183686f099a4e33dc17172a95d47e4b0b7d661f0413a1a77be75febe2e32724287a5af93dd579ff2c214f8e5fa2b079f6d3e +SHA512 (systemd-237.tar.gz) = 15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b diff --git a/systemd.spec b/systemd.spec index 085db56..88bb5d1 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,4 +1,4 @@ -%global gitcommit 3e14c4c1876b4dfeb8bf511185f70fef8d04a153 +#global gitcommit 3e14c4c1876b4dfeb8bf511185f70fef8d04a153 %{?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 @@ -12,8 +12,8 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 236 -Release: 4%{?gitcommit:.git%{gitcommitshort}}%{?dist} +Version: 237 +Release: 1%{?gitcommit:.git%{gitcommitshort}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: System and Service Manager @@ -48,7 +48,6 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[ %endif 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);} @@ -685,6 +684,9 @@ fi %files tests -f .file-list-tests %changelog +* Sun Jan 28 2018 Zbigniew Jędrzejewski-Szmek - 237-1 +- Update to latest version + * Sun Jan 21 2018 Björn Esser - 236-4.git3e14c4c - Add patch to include if needed