From 1a029a71e50800803685fb89c523a2d3a60f0b02 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 27 Jul 2020 20:35:12 +0200
Subject: [PATCH 1/2] [ticket/16557] Support piping tracker XML to
 build_changelog.php

PHPBB3-16557
---
 build/build_changelog.php | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/build/build_changelog.php b/build/build_changelog.php
index 2d38480f9f..5967e0a135 100755
--- a/build/build_changelog.php
+++ b/build/build_changelog.php
@@ -18,15 +18,25 @@ if ($_SERVER['argc'] != 2)
 	exit(1);
 }
 
-$fixVersion = $_SERVER['argv'][1];
+if ($_SERVER['argv'][1] == '--stdin')
+{
+	$stdIn = file_get_contents('php://stdin');
+	// XML output from tracker can be directly piped to this script using:
+	// cat tracker_output.xml | php build/build_changelog.php --stdin
+	$xml = simplexml_load_string($stdIn);
+}
+else
+{
+	$fixVersion = $_SERVER['argv'][1];
 
-$query = 'project IN (PHPBB3, SECURITY)
-	AND resolution = Fixed
-	AND fixVersion = "' . $fixVersion . '"
-	AND status IN ("Unverified Fix", Closed)';
+	$query = 'project IN (PHPBB3, SECURITY)
+		AND resolution = Fixed
+		AND fixVersion = "' . $fixVersion . '"
+		AND status IN ("Unverified Fix", Closed)';
 
-$url = 'http://tracker.phpbb.com/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?jqlQuery=' . urlencode($query) . '&tempMax=1000';
-$xml = simplexml_load_string(file_get_contents($url));
+	$url = 'https://tracker.phpbb.com/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?jqlQuery=' . urlencode($query) . '&tempMax=1000';
+	$xml = simplexml_load_string(file_get_contents($url));
+}
 
 foreach ($xml->xpath('//item') as $item)
 {

From 58ef28e9146d901094b6ac4cb85c120f2cf3c737 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 27 Jul 2020 21:12:20 +0200
Subject: [PATCH 2/2] [ticket/16557] Generate https instead of http links to
 tracker

PHPBB3-16557
---
 build/build_changelog.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build_changelog.php b/build/build_changelog.php
index 5967e0a135..5dd3449de3 100755
--- a/build/build_changelog.php
+++ b/build/build_changelog.php
@@ -42,7 +42,7 @@ foreach ($xml->xpath('//item') as $item)
 {
 	$key = (string) $item->key;
 
-	$keyUrl = 'http://tracker.phpbb.com/browse/' . $key;
+	$keyUrl = 'https://tracker.phpbb.com/browse/' . $key;
 	$keyLink = '<a href="' . $keyUrl . '">' . $key . '</a>';
 
 	$value = str_replace($key, $keyLink, htmlspecialchars($item->title));