From 2df0c74170d95d027e6773d3a9afb1fab5917558 Mon Sep 17 00:00:00 2001
From: Arnaud Le Blanc <arnaud.lb@gmail.com>
Date: Mon, 4 Nov 2024 13:11:36 +0100
Subject: [PATCH] release/6.0.5 (#569)

---
 package.xml                   | 45 +++++++++++++++++++++++++----------
 php_rdkafka.h                 |  2 +-
 tools/new-package-release.php |  3 ++-
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/package.xml b/package.xml
index c4ebc420..cf03069e 100644
--- a/package.xml
+++ b/package.xml
@@ -10,10 +10,10 @@
   <email>arnaud.lb@gmail.com</email>
   <active>yes</active>
  </lead>
- <date>2024-10-24</date>
- <time>14:56:47</time>
+ <date>2024-11-04</date>
+ <time>11:24:15</time>
  <version>
-  <release>6.0.4</release>
+  <release>6.0.5</release>
   <api>6.0.0</api>
  </version>
  <stability>
@@ -22,16 +22,10 @@
  </stability>
  <license uri="http://opensource.org/licenses/mit-license.php">MIT License</license>
  <notes>
-  ## Improvements
-  - Added OAUTHBEARER support. New methods: RdKafka\Conf::setOauthbearerTokenRefreshCb(), RdKafka::oauthbearerSetToken(), RdKafka::oauthbearerSetTokenFailure() (#546, #547, @cb-freddysart, @scorgn)
-  - Added incremental rebalance support. New methods: RdKafka\KafkaConsumer::incrementalAssign(), RdKafka\KafkaConsumer::incrementalUnassign() (#541, @ikeberlein)
-  - Added RdKafka::getControllerId() (#554, @qkdreyer)
-
-  ## Bugfixes
-  - Add private constructor on Metadata classes (#531, @arnaud-lb)
-
-  ## Other Changes
-  - Improve KafkaErrorException message (#555, @arnaud-lb)
+  ## Bug fixes
+  - Fix php 7.0 build (#563, @arnaud-lb)
+  - Fix x32 build (#565, @arnaud-lb)
+  - Fix segmentation fault in setOauthbearerTokenRefreshCb when sasl.oauthbearer.config is unset (#568, @scorgn)
  </notes>
  <contents>
   <dir name="/">
@@ -178,6 +172,31 @@
    <configureoption name="with-rdkafka" default="autodetect" prompt="librdkafka installation path?"/>
  </extsrcrelease>
  <changelog>
+  <release>
+   <date>2024-10-24</date>
+   <time>14:56:47</time>
+   <version>
+    <release>6.0.4</release>
+    <api>6.0.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/mit-license.php">MIT License</license>
+   <notes>
+    ## Improvements
+    - Added OAUTHBEARER support. New methods: RdKafka\Conf::setOauthbearerTokenRefreshCb(), RdKafka::oauthbearerSetToken(), RdKafka::oauthbearerSetTokenFailure() (#546, #547, @cb-freddysart, @scorgn)
+    - Added incremental rebalance support. New methods: RdKafka\KafkaConsumer::incrementalAssign(), RdKafka\KafkaConsumer::incrementalUnassign() (#541, @ikeberlein)
+    - Added RdKafka::getControllerId() (#554, @qkdreyer)
+  
+    ## Bugfixes
+    - Add private constructor on Metadata classes (#531, @arnaud-lb)
+  
+    ## Other Changes
+    - Improve KafkaErrorException message (#555, @arnaud-lb)
+   </notes>
+  </release>
   <release>
    <date>2022-07-02</date>
    <time>12:26:56</time>
diff --git a/php_rdkafka.h b/php_rdkafka.h
index 58cc8731..08585ecc 100644
--- a/php_rdkafka.h
+++ b/php_rdkafka.h
@@ -43,7 +43,7 @@ PHP_METHOD(RdKafka, __construct);
 extern zend_module_entry rdkafka_module_entry;
 #define phpext_rdkafka_ptr &rdkafka_module_entry
 
-#define PHP_RDKAFKA_VERSION "6.0.4"
+#define PHP_RDKAFKA_VERSION "6.0.5"
 
 extern zend_object_handlers kafka_default_object_handlers;
 extern zend_class_entry * ce_kafka_exception;
diff --git a/tools/new-package-release.php b/tools/new-package-release.php
index 7d4a082d..286dcff9 100755
--- a/tools/new-package-release.php
+++ b/tools/new-package-release.php
@@ -31,8 +31,9 @@ function printUsage(): void
 function generateReleaseNotes(string $newVersion): string
 {
     $cmd = sprintf(
-        'gh api repos/arnaud-lb/php-rdkafka/releases/generate-notes -f  tag_name=%s',
+        'gh api repos/arnaud-lb/php-rdkafka/releases/generate-notes -f tag_name=%s -f target_commitish=%s',
         escapeshellcmd($newVersion),
+        escapeshellcmd(exec("git rev-parse HEAD")),
     );
 
     $result = exec($cmd);