sync from github

5 files changed, 31 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31196e8119fd..73a55f0b05f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xivlauncher-git
 	pkgdesc = Custom Launcher for Final Fantasy XIV Online (Crossplatform rewrite)
-	pkgver = 1.0.2.r10.gfd1efaf
-	pkgrel = 1
+	pkgver = 1.0.6.r15.g9438460
+	pkgrel = 2
 	epoch = 1
 	url = https://github.com/goatcorp/XIVLauncher.Core/
 	arch = x86_64
@@ -46,12 +46,16 @@ pkgbase = xivlauncher-git
 	depends = desktop-file-utils
 	depends = jxrlib
 	optdepends = steam
-	provides = xivlauncher=1.0.2.r10.gfd1efaf
+	provides = xivlauncher=1.0.6.r15.g9438460
 	conflicts = xivlauncher
 	options = !strip
 	source = XIVLauncher.Core::git+https://github.com/goatcorp/XIVLauncher.Core.git
 	source = XIVLauncher.desktop
+	source = openssl_fix.cnf
+	source = xivlauncher-core
 	sha512sums = SKIP
-	sha512sums = 5ac774f858d4015c59e6758e2a706b93e822bca9c046ed87210deabc141ac101020d2654fbcf8314f9409a4cfcf921d1e26ec0a3b0beab02d1bcd045fb6e6f14
+	sha512sums = d94f652f9571598799fcd9bf87cb7d2e54ca924bc100b73024e81efd0fe9fc12d494f7adc500ff34ed1e53c59f94e1d6f3c5ae29a1c33133cc30988197e46389
+	sha512sums = c702d45b607a54716ae3f1c9b0aa548b3226da76b0ae4b8a88e49d16e5117a7ff5164e7dd5b6a2799a16a18d53b2de55a26a87888054c25152df5c4824b38fe0
+	sha512sums = dad16da8e1d2bc772f7e1be1f59fd799c596fa88fb77a7e58a94baf10a1ca2f0ad7e79ad3baa8ba24e35dd0bc748884c74371c447816b1ea61098f58a130313a
 
 pkgname = xivlauncher-git
diff --git a/PKGBUILD b/PKGBUILD
index 40355ec9cc22..241c154a4005 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Vincent Post <cent@spline.de>
 pkgname=xivlauncher-git
-pkgver=1.0.2.r10.gfd1efaf
-pkgrel=1
+pkgver=1.0.6.r15.g9438460
+pkgrel=2
 epoch=1
 pkgdesc="Custom Launcher for Final Fantasy XIV Online (Crossplatform rewrite)"
 arch=('x86_64')
@@ -36,10 +36,14 @@ conflicts=("xivlauncher")
 source=(
     "XIVLauncher.Core::git+https://github.com/goatcorp/XIVLauncher.Core.git"
     "XIVLauncher.desktop"
+    "openssl_fix.cnf"
+    "xivlauncher-core"
 )
 sha512sums=(
     'SKIP'
-    '5ac774f858d4015c59e6758e2a706b93e822bca9c046ed87210deabc141ac101020d2654fbcf8314f9409a4cfcf921d1e26ec0a3b0beab02d1bcd045fb6e6f14'
+    'd94f652f9571598799fcd9bf87cb7d2e54ca924bc100b73024e81efd0fe9fc12d494f7adc500ff34ed1e53c59f94e1d6f3c5ae29a1c33133cc30988197e46389'
+    'c702d45b607a54716ae3f1c9b0aa548b3226da76b0ae4b8a88e49d16e5117a7ff5164e7dd5b6a2799a16a18d53b2de55a26a87888054c25152df5c4824b38fe0'
+    'dad16da8e1d2bc772f7e1be1f59fd799c596fa88fb77a7e58a94baf10a1ca2f0ad7e79ad3baa8ba24e35dd0bc748884c74371c447816b1ea61098f58a130313a'
 )
 
 prepare() {
@@ -63,6 +67,8 @@ package() {
     install -d "${pkgdir}/opt/XIVLauncher/"
     install -D -m644 "${srcdir}/XIVLauncher.desktop" "${pkgdir}/usr/share/applications/XIVLauncher.desktop"
     install -D -m644 "${srcdir}/XIVLauncher.Core/misc/linux_distrib/512.png" "${pkgdir}/usr/share/pixmaps/xivlauncher.png"
+    install -D -m644 "${srcdir}/openssl_fix.cnf" "${pkgdir}/opt/XIVLauncher/openssl_fix.cnf"
     cp -r "${srcdir}/build/." "${pkgdir}/opt/XIVLauncher/"
     ln -s ../../opt/XIVLauncher/XIVLauncher.Core "${pkgdir}/usr/bin/XIVLauncher.Core"
+    install -D -m755  "${srcdir}/xivlauncher-core" "${pkgdir}/usr/bin/xivlauncher-core"
 }
diff --git a/XIVLauncher.desktop b/XIVLauncher.desktop
index a49bf4979b24..26e3c82fdc86 100644
--- a/XIVLauncher.desktop
+++ b/XIVLauncher.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=XIVLauncher.Core
 Comment=Custom launcher for Final Fantasy XIV Online
-Exec=XIVLauncher.Core
+Exec=xivlauncher-core
 Icon=xivlauncher
 Terminal=false
 Type=Application
diff --git a/openssl_fix.cnf b/openssl_fix.cnf
new file mode 100644
index 000000000000..c2c6d8235e48
--- /dev/null
+++ b/openssl_fix.cnf
@@ -0,0 +1,11 @@
+openssl_conf = openssl_init
+
+[openssl_init]
+ssl_conf = ssl_module
+
+[ ssl_module ]
+system_default = crypto_policy
+
+[ crypto_policy ]
+MinProtocol = TLSv1.2
+CipherString = DEFAULT:@SECLEVEL=1
diff --git a/xivlauncher-core b/xivlauncher-core
new file mode 100755
index 000000000000..c35e1d9b0ea9
--- /dev/null
+++ b/xivlauncher-core
@@ -0,0 +1,2 @@
+#!/bin/sh
+OPENSSL_CONF=/opt/XIVLauncher/openssl_fix.cnf exec /opt/XIVLauncher/XIVLauncher.Core