Merge pull request #16404 from keszybz/release-246-prep

Prepare v246-rc1

diff --git a/.mailmap b/.mailmap
index 3f3af64d777c4259fb20ec21a663808b58d90bf5..da93126120843365bf55e2b089ee8fc5cdf93fdb 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -206,3 +206,4 @@ 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>
+Jay Burger <jay.burger@fujitsu.com> <root@new-host-3.home>

diff --git a/NEWS b/NEWS
index fe75cc6c3577608808b3625af3ac4431778636ad..cab0f1ee6f60c2f57f3f2e557c1c6475c15f1695 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 systemd System and Service Manager
 
-CHANGES WITH 246 in spe:
+CHANGES WITH 246:
 
         * The service manager gained basic support for cgroup v2 freezer. Units
           can now be suspended or resumed either using new systemctl verbs,
@@ -520,6 +520,43 @@ CHANGES WITH 246 in spe:
           LogControl1 D-Bus API which allows clients to change log level +
           target of the service during runtime.
 
+        Contributions from: 24bisquitz, Adam Nielsen, Alan Perry, Alexander
+        Malafeev, Alin Popa, Amos Bird, Andreas Rammhold, AndreRH, Andrew
+        Doran, Anita Zhang, Ankit Jain, antznin, Arnaud Ferraris, Arthur Moraes
+        do Lago, Arusekk, Balaji Punnuru, Balint Reczey, Bastien Nocera,
+        bemarek, Benjamin Berg, Benjamin Dahlhoff, Benjamin Robin, Chris Down,
+        Chris Kerr, Christian Göttsche, Christian Hesse, Christian Oder,
+        Ciprian Hacman, codicodi, Corey Hinshaw, Daan De Meyer, Dana Olson, Dan
+        Callaghan, Daniel Fullmer, Daniel Rusek, Dan Streetman, Dave Reisner,
+        David Edmundson, David Wood, Denis Pronin, Diego Escalante Urrelo,
+        Dimitri John Ledkov, dolphrundgren, duguxy, Einsler Lee, Elisei Roca,
+        Emmanuel Garette, Eric Anderson, Eric DeVolder, Evgeny Vereshchagin,
+        ExtinctFire, fangxiuning, Ferran Pallarès Roca, Filipe Brandenburger,
+        Finn, Florian Klink, Franck Bui, Frantisek Sumsal, Gaoyi, gaurav, Georg
+        Müller, Gergely Polonkai, Giedrius Statkevičius, Gigadoc2, gogogogi,
+        gzjsgdsb, Hans de Goede, Haochen Tong, ianhi, ignapk, Jakov Smolic,
+        James T. Lee, Jan Janssen, Jan Klötzke, Jan Palus, Jay Burger, Jeremy
+        Cline, Jérémy Rosen, Jian-Hong Pan, Jiri Slaby, Joel Shapiro, Joerg
+        Behrmann, Jörg Thalheim, Jouke Witteveen, Kai-Heng Feng, Kenny
+        Levinsen, Kevin Kuehler, Kumar Kartikeya Dwivedi, layderv, laydervus,
+        Lénaïc Huard, Lennart Poettering, Lidong Zhong, Luca Boccassi, Luca
+        BRUNO, Lucas Werkmeister, Lukas Klingsbo, Lukáš Nykrýn, Łukasz
+        Stelmach, Maciej S. Szmigiero, MadMcCrow, Marc-André Lureau, Marcel
+        Holtmann, Marc Kleine-Budde, Martin Hundebøll, Matthew Leeds, Matt
+        Ranostay, Maxim Fomin, MaxVerevkin, Michael Biebl, Michael Chapman,
+        Michael Gubbels, Michael Marley, Michał Bartoszkiewicz, Michal Koutný,
+        Michal Sekletar, Michal Sekletár, Mike Gilbert, Mike Kazantsev, ml,
+        Motiejus Jakštys, nabijaczleweli, nerdopolis, Niccolò Maggioni, Niklas
+        Hambüchen, Norbert Lange, Paul Cercueil, pelzvieh, Peter Hutterer,
+        Piero La Terza, Pieter Lexis, Piotr Drąg, Rafael Fontenelle, Richard
+        Petri, Ronan Pigott, Ross Lagerwall, Rubens Figueiredo, satmandu,
+        Sean-StarLabs, Sebastian Jennen, sterlinghughes, Susant Sahani, Thomas
+        Haller, Tobias Hunger, Tom, Tomáš Pospíšek, Tomer Shechner, Tom Hughes,
+        Topi Miettinen, Tudor Roman, Uwe Kleine-König, Valery0xff, Vito Caputo,
+        Vladimir Panteleev, Vladyslav Tronko, Wen Yang, Yegor Vialov, Yigal
+        Korman, YmrDtnJu, Yuri Chornoivan, Yu Watanabe, Zbigniew
+        Jędrzejewski-Szmek, Zhu Li, Дамјан Георгиевски, наб
+
 CHANGES WITH 245:
 
         * A new tool "systemd-repart" has been added, that operates as an

diff --git a/meson.build b/meson.build
index fc75fddf6b8184b3801a06c1af42c7c49556371c..0c012b69fe1f81ac15fa1058be8378eba809f308 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1+
 
 project('systemd', 'c',
-        version : '245',
+        version : '246',
         license : 'LGPLv2+',
         default_options: [
                 'c_std=gnu99',
@@ -13,8 +13,8 @@ project('systemd', 'c',
         meson_version : '>= 0.46',
        )
 
-libsystemd_version = '0.28.0'
-libudev_version = '1.6.17'
+libsystemd_version = '0.29.0'
+libudev_version = '1.6.18'
 
 # We need the same data in two different formats, ugh!
 # Also, for hysterical reasons, we use different variable

diff --git a/tools/git-contrib.sh b/tools/git-contrib.sh
index b40e97ba624088b0535bd38e5af28a44b6f8f28e..cc0f99169c9c136c320148cb88fec68367e2c28a 100755 (executable)
--- a/tools/git-contrib.sh
+++ b/tools/git-contrib.sh
@@ -2,8 +2,5 @@
 set -eu
 
 git shortlog -s `git describe --abbrev=0`.. | \
-    cut -c8- | \
-    sed 's/ / /g' | \
-    awk '{ print $$0 "," }' | \
-    sed -e 's/ / /g' | \
+    awk '{ $1=""; print $0 "," }' | \
     sort -u