Fix upload to server. Use openssl098.

3 files changed, 24 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7bb93854e6d3..42809ae4577f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by makepkg 4.2.1
-# Sat Aug  1 21:15:46 UTC 2015
 pkgbase = joxi
 	pkgdesc = Easy to use screenshot sharing application (Russian)
 	pkgver = 2.4.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://joxi.ru/
 	arch = i386
 	arch = x86_64
@@ -12,11 +10,14 @@ pkgbase = joxi
 	depends = libpng12
 	depends = quazip
 	depends = opencv
+	depends = openssl098
 	options = emptydirs
 	source = http://bc.cdn.joxi.ru/download/joxi_amd64.deb
 	source = joxi.desktop
+	source = joxi.sh
 	md5sums = 9be5f0051b4d2c8ae0669115ccb74d17
-	md5sums = 66ef866e3fe32bbfd9eb72fe5ce02b7e
+	md5sums = 81f6ecd94e39bff6fd71034b9ff180c7
+	md5sums = 93274063806e203654b13884b6e6871c
 
 pkgname = joxi
 
diff --git a/PKGBUILD b/PKGBUILD
index 4d6c4d2328ab..c9404c120459 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,19 +2,20 @@
 
 pkgname=joxi
 pkgver=2.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Easy to use screenshot sharing application (Russian)"
 arch=('i386' 'x86_64')
 url="http://joxi.ru/"
 license=('unknown')
 options=('emptydirs')
-depends=('qt4' 'libpng12' 'quazip' 'opencv')
+depends=('qt4' 'libpng12' 'quazip' 'opencv' 'openssl098')
 
 if [ "${CARCH}" = 'x86_64' ]; then
   ARCH='amd64'
   md5sums=(
 			'9be5f0051b4d2c8ae0669115ccb74d17'
 			'66ef866e3fe32bbfd9eb72fe5ce02b7e'
+			'93274063806e203654b13884b6e6871c'
 		  )
 
 elif [ "${CARCH}" = 'i686' ]; then
@@ -22,15 +23,24 @@ elif [ "${CARCH}" = 'i686' ]; then
   md5sums=(
             '3606c1987b4707499ece7cf5d915358d'
 			'66ef866e3fe32bbfd9eb72fe5ce02b7e'
+			'93274063806e203654b13884b6e6871c'
           )
 fi
 
-source=("http://bc.cdn.joxi.ru/download/${pkgname}_${ARCH}.deb" "${pkgname}.desktop")
+source=("http://bc.cdn.joxi.ru/download/${pkgname}_${ARCH}.deb" "${pkgname}.desktop" "${pkgname}.sh")
 package(){
    ar -x "${srcdir}/${pkgname}_${ARCH}.deb"
    tar -zxf "${srcdir}/data.tar.gz"
-   
-   install -D -m755 "${srcdir}/usr/bin/joxi" "${pkgdir}/usr/bin/joxi"
+   mkdir -p ${srcdir}/usr/lib/joxi
+   ln -s /usr/lib/libcrypto.so.0.9.8 ${srcdir}/usr/lib/joxi/libcrypto.so.1.0.0 
+   ln -s /usr/lib/libssl.so.0.9.8 ${srcdir}/usr/lib/joxi/libssl.so.1.0.0 
+
+   install -D -m755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/joxi"
+   install -d "${pkgdir}/usr/lib/joxi"
+   install -D -m755 "${srcdir}/usr/bin/joxi" "${pkgdir}/usr/lib/joxi/joxi"
+
+   ln -s /usr/lib/libcrypto.so.0.9.8 ${pkgdir}/usr/lib/joxi/libcrypto.so.1.0.0 
+   ln -s /usr/lib/libssl.so.0.9.8 ${pkgdir}/usr/lib/joxi/libssl.so.1.0.0 
 
    install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
    install -D -m644 "${srcdir}/opt/joxi/icon_64.png" "${pkgdir}/usr/share/pixmaps/joxi.png"
diff --git a/joxi.sh b/joxi.sh
new file mode 100644
index 000000000000..766fe84fb685
--- /dev/null
+++ b/joxi.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+export LD_LIBRARY_PATH=LD_LIBRARY_PATH:/usr/lib/joxi
+exec /usr/lib/joxi/joxi