From ab59b113bccaa78c14707455c5ce934d5e711d24 Mon Sep 17 00:00:00 2001
From: kas <exactly-one-kas@users.noreply.github.com>
Date: Wed, 27 Jul 2022 21:44:56 +0200
Subject: [PATCH 1/5] Downgrade to OpenSSL 1.1.1 for QT compatibility

This fixes TLS support for QT on platforms without OpenSSL 1.1.1 installed globally
(Mainly Windows)
---
 dep/openssl/openssl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dep/openssl/openssl b/dep/openssl/openssl
index 1bf649b59..29708a562 160000
--- a/dep/openssl/openssl
+++ b/dep/openssl/openssl
@@ -1 +1 @@
-Subproject commit 1bf649b5998ac98511203f54ce954eccfaf75467
+Subproject commit 29708a562a1887a91de0fa6ca668c71871accde9

From af886051cf0611e36a7c9204337c697ca230e678 Mon Sep 17 00:00:00 2001
From: kas <exactly-one-kas@users.noreply.github.com>
Date: Wed, 27 Jul 2022 21:50:01 +0200
Subject: [PATCH 2/5] Revert "Fix packaging for windows deploying old OpenSSL
 DLLs"

This reverts commit 4cd4d08bf3747306b3b417744e4970e6ae3c6606.
---
 pack/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pack/CMakeLists.txt b/pack/CMakeLists.txt
index a107a0c79..62f1b8fff 100644
--- a/pack/CMakeLists.txt
+++ b/pack/CMakeLists.txt
@@ -149,12 +149,12 @@ if(NOT FLATPAK)
   if(NOT APPLE)
     if(WIN32)
       if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-        set(SSL_LIB_SUFFIX "-3-x64.dll")
+        set(SSL_LIB_SUFFIX "-1_1-x64.dll")
       else()
-        set(SSL_LIB_SUFFIX "-3.dll")
+        set(SSL_LIB_SUFFIX "-1_1.dll")
       endif()
     else()
-      set(SSL_LIB_SUFFIX ".so.3")
+      set(SSL_LIB_SUFFIX ".so.1.1")
     endif()
 
     foreach(SSL_LIB_NAME ssl crypto)

From 9c0db69c610ef799431868ffc6cf41cfa87e949a Mon Sep 17 00:00:00 2001
From: kas <exactly-one-kas@users.noreply.github.com>
Date: Wed, 27 Jul 2022 23:50:17 +0200
Subject: [PATCH 3/5] Fix macOS build error

---
 .github/workflows/build.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0e951ce6c..22896009c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -243,6 +243,11 @@ jobs:
         if: matrix.env.ninja_platform == 'mac'
         run: |
           cd dep/openssl/openssl
+
+          # this is necessary until https://github.com/openssl/openssl/issues/18720
+          # is fixed in OpenSSL 1.1.1r
+          export CFLAGS=-Wno-error=implicit-function-declaration
+
           ./Configure ${{ matrix.env.openssl_arch }} no-shared
           make
 

From 82be7a34d12d4f8034ff8e9aa415d1ddb09f9bd6 Mon Sep 17 00:00:00 2001
From: kas <exactly-one-kas@users.noreply.github.com>
Date: Fri, 12 Aug 2022 07:54:56 +0200
Subject: [PATCH 4/5] Update version to 1.1.2

---
 CMakeLists.txt    | 2 +-
 docs/changelog.md | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a8a0aea9..ee4573f82 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ project(Gittyup)
 set(GITTYUP_NAME "Gittyup")
 set(GITTYUP_VERSION_MAJOR 1)
 set(GITTYUP_VERSION_MINOR 1)
-set(GITTYUP_VERSION_PATCH 1)
+set(GITTYUP_VERSION_PATCH 2)
 set(GITTYUP_VERSION
     "${GITTYUP_VERSION_MAJOR}.${GITTYUP_VERSION_MINOR}.${GITTYUP_VERSION_PATCH}"
 )
diff --git a/docs/changelog.md b/docs/changelog.md
index cc122bb6b..28336a555 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,3 +1,11 @@
+### v1.1.2 - 2022-08-12
+
+Bug fix release
+
+#### Changed
+
+* Fix bundled OpenSSL version incompatibility
+
 ### v1.1.1 - 2022-06-09
 
 Bug fix release

From 5334978a0b7e016be95ab5489d4ec3e43efc4f88 Mon Sep 17 00:00:00 2001
From: Martin Marmsoler <martin.marmsoler@gmail.com>
Date: Fri, 12 Aug 2022 09:06:58 +0200
Subject: [PATCH 5/5] add missing end document line

---
 docs/changelog.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.md b/docs/changelog.md
index 28336a555..68538d186 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -6,6 +6,8 @@ Bug fix release
 
 * Fix bundled OpenSSL version incompatibility
 
+----
+
 ### v1.1.1 - 2022-06-09
 
 Bug fix release