From 62fc4d5cf4a7afbd86e739477be3955fa22d51a0 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Mon, 24 May 2021 09:02:58 +0200
Subject: [PATCH 1/3] increment version number to 0.22.9

---
 NEWS                        | 2 ++
 android/AndroidManifest.xml | 4 ++--
 doc/conf.py                 | 2 +-
 meson.build                 | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 612de9966..a57a408bd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+ver 0.22.9 (not yet released)
+
 ver 0.22.8 (2021/05/22)
 * fix crash bug in "albumart" command (0.22.7 regression)
 
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index ca4591b97..36e636804 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.musicpd"
           android:installLocation="auto"
-          android:versionCode="56"
-          android:versionName="0.22.8">
+          android:versionCode="57"
+          android:versionName="0.22.9">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
 
diff --git a/doc/conf.py b/doc/conf.py
index 347fe99f4..5062830b2 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -38,7 +38,7 @@ author = 'Max Kellermann'
 # built documents.
 #
 # The short X.Y version.
-version = '0.22.8'
+version = '0.22.9'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/meson.build b/meson.build
index 9cf0c7ba3..30374ee00 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
   'mpd',
   ['c', 'cpp'],
-  version: '0.22.8',
+  version: '0.22.9',
   meson_version: '>= 0.49.0',
   default_options: [
     'c_std=c11',

From d3a680cc87ebeea8c54f99a74c521048fdf8e8a9 Mon Sep 17 00:00:00 2001
From: Philippe Antoine <contact@catenacyber.fr>
Date: Sun, 23 May 2021 20:34:39 +0200
Subject: [PATCH 2/3] meson: set only sanitizers for fuzzer when unspecified

That is when meson option b_sanitize is not used
---
 meson.build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 30374ee00..5071384ab 100644
--- a/meson.build
+++ b/meson.build
@@ -118,7 +118,10 @@ if get_option('buildtype') != 'debug'
 endif
 
 if get_option('fuzzer')
-  fuzzer_flags = ['-fsanitize=fuzzer,address,undefined']
+  fuzzer_flags = ['-fsanitize=fuzzer']
+  if get_option('b_sanitize') == 'none'
+    fuzzer_flags += ['-fsanitize=address,undefined']
+  endif
   add_global_arguments(fuzzer_flags, language: 'cpp')
   add_global_arguments(fuzzer_flags, language: 'c')
   add_global_link_arguments(fuzzer_flags, language: 'cpp')

From dbe12a6b9005df084d4fde776e00805cb0b14492 Mon Sep 17 00:00:00 2001
From: Namkhai B <namkhai.n3@protonmail.com>
Date: Sat, 22 May 2021 21:32:23 -0500
Subject: [PATCH 3/3] util/RuntimeError: Disable format-security for gcc

Fixes building under GCC 11
---
 src/util/RuntimeError.hxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/util/RuntimeError.hxx b/src/util/RuntimeError.hxx
index 962bad67b..74cb8a5de 100644
--- a/src/util/RuntimeError.hxx
+++ b/src/util/RuntimeError.hxx
@@ -35,7 +35,7 @@
 
 #include <stdio.h>
 
-#ifdef __clang__
+#if defined(__clang__) || defined(__GNUC__)
 #pragma GCC diagnostic push
 // TODO: fix this warning properly
 #pragma GCC diagnostic ignored "-Wformat-security"
@@ -59,7 +59,7 @@ FormatInvalidArgument(const char *fmt, Args&&... args) noexcept
 	return std::invalid_argument(buffer);
 }
 
-#ifdef __clang__
+#if defined(__clang__) || defined(__GNUC__)
 #pragma GCC diagnostic pop
 #endif