Merge pull request #7008 from poettering/sorevision235

bump so revision for 235 and mailmap updates

3 files changed, 30 insertions, 20 deletions

diff --git a/.mailmap b/.mailmap
index 58bcdbdb14..5f021b6b74 100644
--- a/.mailmap
+++ b/.mailmap
@@ -126,3 +126,9 @@ Hendrik Westerberg <hendrik@gestorf.com>
 Stefan Pietsch <mail.ipv4v6@gmail.com>
 Jérémy Rosen <jeremy.rosen@enst-bretagne.fr>
 Vasilis Liaskovitis <vliaskov@gmail.com>
+Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Tomasz Pala <gotar@polanet.pl>
+Dmitriy Geels <dmitriy.geels@gmail.com>
+Beniamino Galvani <bgalvani@redhat.com> <bengal@users.noreply.github.com>
+Justin Capella <justincapella@gmail.com> <b1tninja@users.noreply.github.com>
+Daniel Șerbănescu <dasj19@users.noreply.github.com>
diff --git a/NEWS b/NEWS
index fdd0b88077..3fc52b31bf 100644
--- a/NEWS
+++ b/NEWS
@@ -43,7 +43,10 @@ CHANGES WITH 235:
           unpopulated at boot. Matching these new settings there's also
           StateDirectoryMode=, CacheDirectoryMode=, LogsDirectoryMode=,
           ConfigurationDirectoryMode= for configuring the access mode of these
-          directories.
+          directories. These settings are particularly useful in combination
+          with DynamicUser=yes as they provide secure, properly-owned,
+          writable, and stateful locations for storage, excluded from the
+          sandbox that such services live in otherwise.
 
         * Automake support has been removed from this release. systemd is now
           Meson-only.
@@ -222,23 +225,24 @@ CHANGES WITH 235:
 
         Contributions from: Abdó Roig-Maranges, Alan Jenkins, Alexander
         Kuleshov, Andreas Rammhold, Andrew Jeddeloh, Andrew Soutar, Ansgar
-        Burchardt, b1tninja, bengal, Benjamin Berg, Benjamin Robin, Charles
-        Huber, Christian Hesse, Daniel Berrange, Daniel Mack, Daniel Rusek,
-        dasj19, Davide Cavalca, Dimitri John Ledkov, Diogo Pereira, Djalal
-        Harouni, dkg, dmig, Dmitry Torokhov, ettavolt, Evgeny Vereshchagin,
-        Fabio Kung, Felipe Sateler, Franck Bui, g0tar, Hans de Goede, Harald
-        Hoyer, Insun Pyo, Ivan Kurnosov, Ivan Shapovalov, Jakub Wilk, Jan
-        Synacek, Jason Gunthorpe, Jeremy Bicha, Jérémy Rosen, John Lin,
-        jonasBoss, Jonathan Lebon, Jonathan Teh, Jon Ringle, Jörg Thalheim,
-        Jouke Witteveen, juga0, Justin Michaud, Kai-Heng Feng, Lennart
-        Poettering, Lion Yang, Luca Bruno, Lucas Werkmeister, Lukáš Nykrýn,
-        Marcel Hollerbach, Marcus Lundblad, Martin Pitt, Michael Biebl, Michael
-        Grzeschik, Michal Sekletar, Mike Gilbert, Neil Brown, Nicolas Iooss,
-        Patrik Flykt, pEJipE, Piotr Drąg, Russell Stuart, S. Fan, Shengyao Xue,
-        Stefan Pietsch, Susant Sahani, Tejun Heo, Thomas Miller, Thomas Sailer,
-        Tobias Hunger, Tom Gundersen, Tommi Rantala, Topi Miettinen, Torstein
-        Husebø, userwithuid, Vasilis Liaskovitis, Vito Caputo, WaLyong Cho,
-        William Douglas, Xiang Fan, Yu Watanabe, Zbigniew Jędrzejewski-Szmek
+        Burchardt, Beniamino Galvani, Benjamin Berg, Benjamin Robin, Charles
+        Huber, Christian Hesse, Daniel Berrange, Daniel Kahn Gillmor, Daniel
+        Mack, Daniel Rusek, Daniel Șerbănescu, Davide Cavalca, Dimitri John
+        Ledkov, Diogo Pereira, Djalal Harouni, Dmitriy Geels, Dmitry Torokhov,
+        ettavolt, Evgeny Vereshchagin, Fabio Kung, Felipe Sateler, Franck Bui,
+        Hans de Goede, Harald Hoyer, Insun Pyo, Ivan Kurnosov, Ivan Shapovalov,
+        Jakub Wilk, Jan Synacek, Jason Gunthorpe, Jeremy Bicha, Jérémy Rosen,
+        John Lin, jonasBoss, Jonathan Lebon, Jonathan Teh, Jon Ringle, Jörg
+        Thalheim, Jouke Witteveen, juga0, Justin Capella, Justin Michaud,
+        Kai-Heng Feng, Lennart Poettering, Lion Yang, Luca Bruno, Lucas
+        Werkmeister, Lukáš Nykrýn, Marcel Hollerbach, Marcus Lundblad, Martin
+        Pitt, Michael Biebl, Michael Grzeschik, Michal Sekletar, Mike Gilbert,
+        Neil Brown, Nicolas Iooss, Patrik Flykt, pEJipE, Piotr Drąg, Russell
+        Stuart, S. Fan, Shengyao Xue, Stefan Pietsch, Susant Sahani, Tejun Heo,
+        Thomas Miller, Thomas Sailer, Tobias Hunger, Tomasz Pala, Tom
+        Gundersen, Tommi Rantala, Topi Miettinen, Torstein Husebø, userwithuid,
+        Vasilis Liaskovitis, Vito Caputo, WaLyong Cho, William Douglas, Xiang
+        Fan, Yu Watanabe, Zbigniew Jędrzejewski-Szmek
 
         — Berlin, 2017-10-XX
 
diff --git a/meson.build b/meson.build
index 87a2859034..bf3c323c2d 100644
--- a/meson.build
+++ b/meson.build
@@ -10,8 +10,8 @@ project('systemd', 'c',
         meson_version : '>= 0.40',
        )
 
-libsystemd_version = '0.19.0'
-libudev_version = '1.6.6'
+libsystemd_version = '0.19.1'
+libudev_version = '1.6.7'
 
 # We need the same data in three different formats, ugh!
 # Also, for hysterical reasons, we use different variable