From a5c858d8e533903cec6b76c56cc9dba186c57a97 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Jul 31 2015 16:50:25 +0000 Subject: New upstream release --- diff --git a/.gitignore b/.gitignore index d44d751..cf44056 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /systemd-*.tar.xz /*.rpm /systemd-65c85ef.tar.gz +/systemd-224.tar.gz diff --git a/sources b/sources index 2834a68..4062846 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3a81827b3b3f1df2d56b6b66db01b438 systemd-65c85ef.tar.gz +28bf2cdb06436d41d5eccf6fef1913ef systemd-224.tar.gz diff --git a/systemd.spec b/systemd.spec index 59d8a71..833b92f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,4 +1,4 @@ -%global gitcommit 65c85ef5118d88bc0d3459b6e8854bf1846190b9 +#global gitcommit 10fa421cd2abdc2ae1a07f7c13bfaa4ee6d6de4f %global gitcommitshort %(c=%{gitcommit}; echo ${c:0:7}) %global _hardened_build 1 @@ -12,8 +12,8 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 223 -Release: 2%{?gitcommit:.git%{gitcommitshort}}%{?dist} +Version: 224 +Release: 1%{?gitcommit:.git%{gitcommitshort}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: A System and Service Manager @@ -433,6 +433,18 @@ if [ -f /etc/nsswitch.conf ] ; then /\/ b s/[[:blank:]]*$/ mymachines/ ' /etc/nsswitch.conf >/dev/null 2>&1 || : + + sed -i.bak -e ' + /^passwd:/ !b + /\/ b + s/[[:blank:]]*$/ mymachines/ + ' /etc/nsswitch.conf >/dev/null 2>&1 || : + + sed -i.bak -e ' + /^group:/ !b + /\/ b + s/[[:blank:]]*$/ mymachines/ + ' /etc/nsswitch.conf >/dev/null 2>&1 || : fi # remove obsolete systemd-readahead file @@ -766,6 +778,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd /usr/lib/firewalld/services/* %changelog +* Fri Jul 31 2015 Kay Sievers - 224-1 +- New upstream release + * Wed Jul 29 2015 Kay Sievers - 223-2 - update to git snapshot