Merge pull request #7608 from poettering/more-news-v236

more v236 news improvements

3 files changed, 26 insertions, 21 deletions

diff --git a/.mailmap b/.mailmap
index 8d8201d96e..55bd44b677 100644
--- a/.mailmap
+++ b/.mailmap
@@ -141,3 +141,4 @@ Patryk Kocielnik <longer44@gmail.com>
 Lukáš Říha <cedel@centrum.cz>
 Alan Robertson <aroberts@zen.iomart.com> <alanjrobertson@gmail.com>
 Martin Steuer <martinsteuer@gmx.de>
+Matthias-Christian Ott <ott@mirix.org> <ott@users.noreply.github.com>
diff --git a/NEWS b/NEWS
index c17c5e4eff..8b713c9643 100644
--- a/NEWS
+++ b/NEWS
@@ -185,29 +185,33 @@ CHANGES WITH 236 in spe:
           continue to send EXTEND_TIMEOUT_USEC within the period specified to
           prevent the service manager from making the service as timedout.
 
+        * systemd-resolved's DNSSEC support gained support for RFC 8080
+          (Ed25519 keys and signatures).
+
         Contributions from: Alan Jenkins, Alan Robertson, Alessandro Ghedini,
         Andrew Jeddeloh, Antonio Rojas, Ari, asavah, bleep_blop, Carsten
         Strotmann, Christian Brauner, Christian Hesse, Clinton Roy, Collin
-        Eggert, Daniel Black, Daniel Lockyer, Daniel Rusek, Dimitri John
-        Ledkov, Dmitry Rozhkov, Edward A. James, Evgeny Vereshchagin, Florian
-        Klink, Franck Bui, Gwendal Grignou, Hans de Goede, Harald Hoyer, Hristo
-        Venev, Ikey Doherty, Jakub Wilk, Jérémy Rosen, Jiahui Xie, John Lin,
-        José Bollo, Josef Andersson, juga0, Krzysztof Nowicki, Lars Karlitski,
-        Lars Kellogg-Stedman, Lauri Tirkkonen, Lennart Poettering, Lubomir
-        Rintel, Lucas Werkmeister, Lukáš Nykrýn, Lukáš Říha, Lukasz
-        Rubaszewski, Maciej S. Szmigiero, Mantas Mikulėnas, Marcus Folkesson,
-        Martin Steuer, Mathieu Trudel-Lapierre, Matija Skala, Max Resch,
-        Michael Biebl, Michael Vogt, Michal Koutný, Michal Sekletar, Mike
-        Gilbert, Muhammet Kara, Neil Brown, Olaf Hering, Ondrej Kozina, Patrik
-        Flykt, Patryk Kocielnik, Peter Hutterer, Piotr Drąg, Razvan Cojocaru,
-        Robin McCorkell, Roland Hieber, Sergey Ptashnick, Shawn Landden, Shuang
+        Eggert, Cong Wang, Daniel Black, Daniel Lockyer, Daniel Rusek, Dimitri
+        John Ledkov, Dmitry Rozhkov, Edward A. James, Evgeny Vereshchagin,
+        Florian Klink, Franck Bui, Gwendal Grignou, Hans de Goede, Harald
+        Hoyer, Hristo Venev, Ikey Doherty, Jakub Wilk, Jérémy Rosen, Jiahui
+        Xie, John Lin, José Bollo, Josef Andersson, juga0, Krzysztof Nowicki,
+        Lars Karlitski, Lars Kellogg-Stedman, Lauri Tirkkonen, Lennart
+        Poettering, Lubomir Rintel, Luca Bruno, Lucas Werkmeister, Lukáš
+        Nykrýn, Lukáš Říha, Lukasz Rubaszewski, Maciej S. Szmigiero, Mantas
+        Mikulėnas, Marcus Folkesson, Martin Steuer, Mathieu Trudel-Lapierre,
+        Matija Skala, Matthias-Christian Ott, Max Resch, Michael Biebl, Michael
+        Vogt, Michal Koutný, Michal Sekletar, Mike Gilbert, Muhammet Kara, Neil
+        Brown, Olaf Hering, Ondrej Kozina, Patrik Flykt, Patryk Kocielnik,
+        Peter Hutterer, Piotr Drąg, Razvan Cojocaru, Robin McCorkell, Roland
+        Hieber, Saran Tunyasuvunakool, Sergey Ptashnick, Shawn Landden, Shuang
         Liu, Simon Arlott, Simon Peeters, Stanislav Angelovič, Stefan Agner,
-        Susant Sahani, Sylvain Plantefève, Thomas Blume, Tinu Weber, Tom
-        Stellard, Topi Miettinen, Torsten Hilbrich, Vito Caputo, Vladislav
-        Vishnyakov, WaLyong Cho, Yu Watanabe, Zbigniew Jędrzejewski-Szmek, Zeal
-        Jagannatha
+        Susant Sahani, Sylvain Plantefève, Thomas Blume, Thomas Haller, Tiago
+        Salem Herrmann, Tinu Weber, Tom Stellard, Topi Miettinen, Torsten
+        Hilbrich, Vito Caputo, Vladislav Vishnyakov, WaLyong Cho, Yu Watanabe,
+        Zbigniew Jędrzejewski-Szmek, Zeal Jagannatha
 
-        — Berlin, 2017-12-XX
+        — Berlin, 2017-12-14
 
 CHANGES WITH 235:
 
diff --git a/meson.build b/meson.build
index 3c57bde5a7..ddc061c126 100644
--- a/meson.build
+++ b/meson.build
@@ -16,7 +16,7 @@
 # along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 project('systemd', 'c',
-        version : '235',
+        version : '236',
         license : 'LGPLv2+',
         default_options: [
                 'c_std=gnu99',
@@ -27,8 +27,8 @@ project('systemd', 'c',
         meson_version : '>= 0.41',
        )
 
-libsystemd_version = '0.19.1'
-libudev_version = '1.6.7'
+libsystemd_version = '0.20.0'
+libudev_version = '1.6.8'
 
 # We need the same data in three different formats, ugh!
 # Also, for hysterical reasons, we use different variable