From 435c2a74a1f3635a9f32a123623e415536668c8c Mon Sep 17 00:00:00 2001
From: Jan Stabenow <moin@jan-stabenow.de>
Date: Mon, 8 May 2023 12:19:42 +0200
Subject: [PATCH] Mod bumps to v2.6.0

---
 .github_build/Build.bundle.cuda.env  |  8 +++---
 .github_build/Build.bundle.env       |  8 +++---
 .github_build/Build.bundle.rpi.env   |  8 +++---
 .github_build/Build.bundle.vaapi.env |  8 +++---
 CHANGELOG.md                         | 43 ++++++++++++++++++++++++++++
 5 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/.github_build/Build.bundle.cuda.env b/.github_build/Build.bundle.cuda.env
index 86b2212e..86f35667 100644
--- a/.github_build/Build.bundle.cuda.env
+++ b/.github_build/Build.bundle.cuda.env
@@ -1,8 +1,8 @@
 # RESTREAMER CUDA BUNDLE
 OS_NAME=ubuntu
 OS_VERSION=20.04
-RESTREAMER_UI_VERSION=1.7.0
-CORE_VERSION=16.12.0
-FFMPEG_VERSION=5.1.2
+RESTREAMER_UI_VERSION=1.8.0
+CORE_VERSION=16.13.0
+FFMPEG_VERSION=5.1.3
 CUDA_VERSION=11.7.1
-RELEASE=2.5.0
+RELEASE=2.6.0
diff --git a/.github_build/Build.bundle.env b/.github_build/Build.bundle.env
index 0067ca44..61532cee 100644
--- a/.github_build/Build.bundle.env
+++ b/.github_build/Build.bundle.env
@@ -1,7 +1,7 @@
 # RESTREAMER BUNDLE
 OS_NAME=alpine
 OS_VERSION=3.16
-RESTREAMER_UI_VERSION=1.7.0
-CORE_VERSION=16.12.0
-FFMPEG_VERSION=5.1.2
-RELEASE=2.5.0
+RESTREAMER_UI_VERSION=1.8.0
+CORE_VERSION=16.13.0
+FFMPEG_VERSION=5.1.3
+RELEASE=2.6.0
diff --git a/.github_build/Build.bundle.rpi.env b/.github_build/Build.bundle.rpi.env
index a6e59310..5c2d77e0 100644
--- a/.github_build/Build.bundle.rpi.env
+++ b/.github_build/Build.bundle.rpi.env
@@ -1,7 +1,7 @@
 # RESTREAMER RPI BUNDLE
 OS_NAME=alpine
 OS_VERSION=3.16
-RESTREAMER_UI_VERSION=1.7.0
-CORE_VERSION=16.12.0
-FFMPEG_VERSION=5.1.2
-RELEASE=2.5.0
+RESTREAMER_UI_VERSION=1.8.0
+CORE_VERSION=16.13.0
+FFMPEG_VERSION=5.1.3
+RELEASE=2.6.0
diff --git a/.github_build/Build.bundle.vaapi.env b/.github_build/Build.bundle.vaapi.env
index 65a85689..1546ae23 100644
--- a/.github_build/Build.bundle.vaapi.env
+++ b/.github_build/Build.bundle.vaapi.env
@@ -1,7 +1,7 @@
 # RESTREAMER VAAPI BUNDLE
 OS_NAME=ubuntu
 OS_VERSION=20.04
-RESTREAMER_UI_VERSION=1.7.0
-CORE_VERSION=16.12.0
-FFMPEG_VERSION=5.1.2
-RELEASE=2.5.0
+RESTREAMER_UI_VERSION=1.8.0
+CORE_VERSION=16.13.0
+FFMPEG_VERSION=5.1.3
+RELEASE=2.6.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ce0e8b1..d67200d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,48 @@
 # Restreamer
 
+## 2.6.0
+
+## v1.7.0 > v1.8.0
+
+-   Add Ukrainian translation (thanks to Yurii Denys)
+-   Add Add stream key field and protocol detection to RTMP publication service
+-   Add Chinese (simplified) translation (thanks to Huyg0180110559)
+-   Fix empty force_key_frames value
+-   Fix Icecast publication service
+-   Fix imprint, terms and credit without share ([#525](https://github.com/datarhei/restreamer/issues/529))
+-   Fix proxy error on the playersite ([#525](https://github.com/datarhei/restreamer/issues/525))
+-   Fix saving RTMP advanced options ([#518](https://github.com/datarhei/restreamer/issues/518))
+-   Fix help buttons for other languages than English and German ([#24](https://github.com/datarhei/restreamer-ui/issues/24))
+-   Fix internal player skin (volume bar)
+-   Fix security hints (npm dep.)
+
+### Core v16.12.0 > v16.13.0
+
+-   Add updated_at field in process infos
+-   Add preserve process log history when updating a process
+-   Add support for input framerate data from jsonstats patch
+-   Add number of keyframes and extradata size to process progress data
+-   Mod bumps FFmpeg to v5.1.3 (datarhei/core:tag bundles)
+-   Fix better naming for storage endpoint documentation
+-   Fix freeing up S3 mounts
+-   Fix URL validation if the path contains FFmpeg specific placeholders
+-   Fix purging default file from HTTP cache
+-   Fix parsing S3 storage definition from environment variable
+-   Fix checking length of CPU time array ([#10](https://github.com/datarhei/core/issues/10))
+-   Fix possible infinite loop with HLS session rewriter
+-   Fix not propagating process limits
+-   Fix URL validation if the path contains FFmpeg specific placeholders
+-   Fix RTMP DoS attack (thx Johannes Frank)
+-   Deprecate ENV names that do not correspond to JSON name
+
+### FFmpeg v5.1.2 > v5.1.3
+
+-   Add alsa support by default
+-   Add min, max, avg of incoming framerates for each input and output (jsonstats patch)
+-   Add keyframe count for each input and output (jsonstats patch) 
+-   Add size in bytes for each input and output (jsonstats patch) 
+-   Mod bumps FFmpeg to v5.1.3
+
 ## 2.5.0
 
 ## Restreamer UI v1.6.0 > v1.7.0