From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 8823e1f935c0220f1b7bb609a7f889196bddf580 Date: Thu, 10 Sep 2015 20:03:03 +0200 Message-ID: <20150910180304.0500C2239E@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4445330459228198354==" List-Id: --===============4445330459228198354== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 8823e1f935c0220f1b7bb609a7f889196bddf580 (commit) from ba1319f415e5483dc2ba4806b3608e43b49707bc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8823e1f935c0220f1b7bb609a7f889196bddf580 Author: Stefan Schantl Date: Thu Sep 10 19:33:40 2015 +0200 systemd: Update to 221. =20 This is an update to the latest stable version of systemd. I also fixed some problems with a non existing user group (systemd-journal) which have= triggered error messages to the journal in the past. =20 Signed-off-by: Stefan Schantl Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: systemd/systemd.nm | 58 +++++++++++++++++++++++++++++++++++++++++-----------= -- 1 file changed, 44 insertions(+), 14 deletions(-) Difference in files: diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 747983c..7112a3c 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -4,8 +4,8 @@ ############################################################################= ### =20 name =3D systemd -version =3D 215 -release =3D 2 +version =3D 221 +release =3D 1 =20 maintainer =3D Stefan Schantl groups =3D System/Base @@ -18,7 +18,8 @@ description SysV and LSB init scripts. end =20 -source_dl =3D http://cgit.freedesktop.org/systemd/systemd/snapshot/ +source_dl =3D http://www.freedesktop.org/software/systemd/ +sources =3D %{thisapp}.tar.xz =20 build unitdir =3D %{prefix}/lib/systemd/system @@ -26,12 +27,11 @@ build requires attr-devel audit-devel - automake - autoconf cryptsetup-luks-devel >=3D 1.4.2 dbus-devel docbook-utils docbook-xsl + elfutils-devel gettext-devel glib2-devel gobject-introspection-devel >=3D 1.31 @@ -43,28 +43,41 @@ build libblkid-devel libcap-devel libgcrypt-devel + libmount-devel libselinux-devel - libtool libuuid-devel + m4 pam-devel pciutils-devel usbutils vala xz-devel + zlib-devel end =20 configure_options +=3D \ --with-sysvinit-path=3D \ --with-sysvrcnd-path=3D \ - --enable-introspection=3Dyes \ + --enable-introspection \ + --enable-zlib \ + --disable-smack \ + --disable-backlight \ + --disable-firstboot \ + --disable-hibernate \ + --disable-importd \ + --disable-libiptc \ + --disable-machined \ --disable-networkd \ - --disable-resolvd \ + --disable-resolved \ --disable-sysusers \ --disable-timesyncd \ + --disable-timedated \ + --disable-polkit \ + --disable-kdbus \ --disable-static =20 prepare_cmds - ./autogen.sh ac + %{create_groups} end =20 install_cmds @@ -119,6 +132,7 @@ build =20 # Remove unneeded stuff for rpm. rm -rvf %{BUILDROOT}/etc/rpm + rm -rvf %{BUILDROOT}/usr/lib/rpm =20 # Use journald. Enable the import of kernel messages. # Stop forwarding to a syslog daemon. @@ -133,9 +147,27 @@ build # Remove udev rules for "predictable" network device renaming. # http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInter= faceNames/ rm -vf %{BUILDROOT}/usr/lib/udev/rules.d/80-net-name-slot.rules + + # Create journald related folders. + mkdir -pv %{BUILDROOT}/run/log/journal + chown root:systemd-journal %{BUILDROOT}/run/log/journal + + mkdir -pv %{BUILDROOT}/var/log/journal + chown root:systemd-journal %{BUILDROOT}/var/log/journal end end =20 +create_groups + # Create groups for udev. + getent group cdrom >/dev/null || groupadd -g 11 cdrom || : + getent group tape >/dev/null || groupadd -g 33 tape || : + getent group dialout >/dev/null || groupadd -g 18 dialout || : + getent group floppy >/dev/null || groupadd -g 19 floppy || : + + # Create group for journald. + getent group systemd-journal >/dev/null || /usr/sbin/groupadd -r systemd-jo= urnal +end + packages package %{name} groups +=3D Base @@ -189,11 +221,7 @@ packages end =20 script prein - # Create groups for udev. - getent group cdrom >/dev/null || groupadd -g 11 cdrom || : - getent group tape >/dev/null || groupadd -g 33 tape || : - getent group dialout >/dev/null || groupadd -g 18 dialout || : - getent group floppy >/dev/null || groupadd -g 19 floppy || : + %{create_groups} end =20 script postin @@ -223,6 +251,8 @@ packages # Be sure to stop the old udev before updating. /usr/bin/systemctl stop udev.service udev-trigger.service \ udev-control.socket udev-kernel.socket >/dev/null 2>&1 || : + + %{create_groups} end =20 script postup hooks/post-receive -- IPFire 3.x development tree --===============4445330459228198354==--