Merge pull request #12121 from poettering/contribv242-rc1

3 files changed, 45 insertions, 4 deletions

diff --git a/.mailmap b/.mailmap
index abde31e48c..4764ad670a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -198,3 +198,5 @@ David Santamaría Rogado <howl.nsp@gmail.com>
 Mike Auty <mike.auty@gmail.com>
 Roger James <roger@beardandsandals.co.uk>
 Stephan Edel <se@se-it.eu>
+Andrey Yashkin <38919268+AndreyYashkin@users.noreply.github.com>
+Ronald Tschalär <ronald@innovation.ch>
diff --git a/NEWS b/NEWS
index 603aa63550..a2fdec08c6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 systemd System and Service Manager
 
-CHANGES WITH 242 in spe:
+CHANGES WITH 242:
 
         * In .link files, MACAddressPolicy=persistent (the default) is changed
           to cover more devices. For devices like bridges, tun, tap, bond, and
@@ -60,6 +60,25 @@ CHANGES WITH 242 in spe:
           in which case environment variable substitution is
           disabled. (Supported for the other ExecXYZ= settings, too.)
 
+        * .timer units gained two new boolean settings OnClockChange= and
+          OnTimezoneChange= which may be used to also trigger a unit when the
+          system clock is changed or the local timezone is
+          modified. systemd-run has been updated to make these options easily
+          accessible from the command line for transient timers.
+
+        * Two new conditions for units have been added: ConditionMemory= may be
+          used to conditionalize a unit based on installed system
+          RAM. ConditionCPUs= may be used to conditionalize a unit based on
+          install CPU cores.
+
+        * The @default system call filter group understood by SystemCallFilter=
+          has been updated to include the new rseq() system call introduced in
+          kernel 4.15.
+
+        * "systemctl start" (and related commands) learnt a new
+          --show-transaction option. If specified brief information about all
+          jobs queued because of the requested operation is shown.
+
         * systemd-networkd recognizes a new operation state 'enslaved', used
           (instead of 'degraded' or 'carrier') for interfaces which form a
           bridge, bond, or similar, and an new 'degraded-carrier' operational
@@ -76,6 +95,9 @@ CHANGES WITH 242 in spe:
           to configure the same, and its --interface= option was updated to
           optionally also take an operational state specific for an interface.
 
+        * systemd-networkd-wait-online gained a new setting --any for waiting
+          for only one of the requested interfaces instead of all of them.
+
         * systemd-networkd now implements L2TP tunnels.
 
         * Two new .network settings UseAutonomousPrefix= and UseOnLinkPrefix=
@@ -214,7 +236,24 @@ CHANGES WITH 242 in spe:
           substantial, and the setting is still relatively new, hence we opted
           to make it mandatory for services with dynamic users.
 
-        …
+        Contributions from: Adam Jackson, Alexander Tsoy, Andrey Yashkin,
+        Andrzej Pietrasiewicz, Anita Zhang, Balint Reczey, Beniamino Galvani,
+        Ben Iofel, Benjamin Berg, Benjamin Dahlhoff, Chris, Chris Morin,
+        Christopher Wong, Claudius Ellsel, Clemens Gruber, dana, Daniel Black,
+        Davide Cavalca, David Michael, David Rheinsberg, emersion, Evgeny
+        Vereshchagin, Filipe Brandenburger, Franck Bui, Frantisek Sumsal,
+        Giacinto Cifelli, Hans de Goede, Hugo Kindel, Ignat Korchagin, Insun
+        Pyo, Jan Engelhardt, Jonathan Lebon, Jonathon Kowalski, Jörg Sommer,
+        Jörg Thalheim, Kai-Heng Feng, Lennart Poettering, Lubomir Rintel,
+        Martin Pitt, Matthias Klumpp, Michael Biebl, Michael Niewöhner, Michael
+        Olbrich, Michal Sekletar, Mike Lothian, Piotr Drąg, Riccardo Schirone,
+        Robin Elvedi, Roman Kulikov, Ronald Tschalär, Ross Burton, Ryan
+        Gonzalez, Stephane Chazelas, StKob, Susant Sahani, Sylvain Plantefève,
+        Szabolcs Fruhwald, Taro Yamada, Theo Ouzhinski, Thomas Haller, Tobias
+        Jungel, Tom Yan, Tony Asleson, Topi Miettinen, unixsysadmin, Van Laser,
+        Vesa Jääskeläinen, Yu, Li-Yu, Yu Watanabe, Zbigniew Jędrzejewski-Szmek
+
+        — Warsaw, 2019-04-03
 
 CHANGES WITH 241:
 
diff --git a/meson.build b/meson.build
index e446fe7370..3c022315da 100644
--- a/meson.build
+++ b/meson.build
@@ -12,8 +12,8 @@ project('systemd', 'c',
         meson_version : '>= 0.46',
        )
 
-libsystemd_version = '0.25.0'
-libudev_version = '1.6.13'
+libsystemd_version = '0.26.0'
+libudev_version = '1.6.14'
 
 # We need the same data in two different formats, ugh!
 # Also, for hysterical reasons, we use different variable