Update to 1.1.1.b

3 files changed, 20 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 95c6d7cd7471..53a0320cd350 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,25 @@
 pkgbase = android-armv7a-eabi-openssl
 	pkgdesc = The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (Android, armv7a-eabi)
-	pkgver = 1.1.1.a
+	pkgver = 1.1.1.b
 	pkgrel = 1
 	url = https://www.openssl.org
 	arch = any
 	license = custom:BSD
 	depends = android-sdk
 	depends = android-ndk
-	conflicts = android-openssl-arch-arm
-	replaces = android-openssl-arch-arm
+	conflicts = android-openssl-armeabi-v7a
+	replaces = android-openssl-armeabi-v7a
 	options = !strip
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = https://www.openssl.org/source/openssl-1.1.1a.tar.gz
-	source = https://www.openssl.org/source/openssl-1.1.1a.tar.gz.asc
+	source = https://www.openssl.org/source/openssl-1.1.1b.tar.gz
+	source = https://www.openssl.org/source/openssl-1.1.1b.tar.gz.asc
 	source = setenv-android.sh
 	validpgpkeys = 8657ABB260F056B1E5190839D9C4D26D0E604491
-	sha256sums = fc20130f8b7cbd2fb918b2f14e2f429e109c31ddd0fb38fc5d71d9ffed3f9f41
+	sha256sums = 5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b
+	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 0938c8d68110768db4f350a7ec641070686904f2fe7ba630ac94399d7dc8cc5e
 
 pkgname = android-armv7a-eabi-openssl
 
diff --git a/PKGBUILD b/PKGBUILD
index c3a3d3b420ec..53b578cc26b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,22 @@
 # $Id$
 # Maintainer: Martchus <martchus@gmx.net>
 
-_android_arch=arch-arm
 _pkg_arch=armv7a-eabi
-_android_arch=arch-arm
-_android_toolchain=$_pkg_arch-linux-android
-_android_platform=21
-_android_platform_dir=android-$_android_platform/$_android_arch
+_android_arch=armeabi-v7a
+_android_toolchain=arm-linux-androideabi
+_android_platform=21 # https://developer.android.com/about/dashboards/
+_android_platform_arch=arch-arm
+_android_platform_dir=android-$_android_platform/${_android_platform_arch}
 _pkgname=openssl
-_ver=1.1.1a
+_ver=1.1.1b
 _pref=/opt/android-libs/$_pkg_arch
 
 # export Android configuration
 export ANDROID_MINIMUM_PLATFORM=$_android_platform
 export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT:-/opt/android-ndk}
 export ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT:-/opt/android-sdk}
-export ANDROID_EABI=$_android_toolchain-4.9
-export ANDROID_ARCH=$_android_arch
+export ANDROID_EABI=llvm
+export ANDROID_ARCH=${_android_platform_arch}
 
 pkgname=android-$_pkg_arch-$_pkgname
 # use a pacman compatible version scheme
@@ -33,9 +33,9 @@ replaces=("android-$_pkgname-$_android_arch")
 source=("https://www.openssl.org/source/${_pkgname}-${_ver}.tar.gz"
         "https://www.openssl.org/source/${_pkgname}-${_ver}.tar.gz.asc"
         'setenv-android.sh')
-sha256sums=('fc20130f8b7cbd2fb918b2f14e2f429e109c31ddd0fb38fc5d71d9ffed3f9f41'
+sha256sums=('5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b'
             'SKIP'
-            '0938c8d68110768db4f350a7ec641070686904f2fe7ba630ac94399d7dc8cc5e')
+            'SKIP')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
 
 build() {
diff --git a/setenv-android.sh b/setenv-android.sh
index 620807eb35a1..f1fa41036750 100644
--- a/setenv-android.sh
+++ b/setenv-android.sh
@@ -117,13 +117,13 @@ fi
 
 case $_ANDROID_ARCH in
 	arch-arm)	  
-      ANDROID_TOOLS="arm-linux-androideabi-gcc arm-linux-androideabi-ranlib arm-linux-androideabi-ld"
+      ANDROID_TOOLS="arm-linux-androideabi-clang arm-linux-androideabi-ranlib arm-linux-androideabi-ld"
 	  ;;
 	arch-arm64)
-      ANDROID_TOOLS="aarch64-linux-android-gcc aarch64-linux-android-ranlib aarch64-linux-android-ld"
+      ANDROID_TOOLS="aarch64-linux-android-clang aarch64-linux-android-ranlib aarch64-linux-android-ld"
 	  ;;
 	arch-x86)	  
-      ANDROID_TOOLS="i686-linux-android-gcc i686-linux-android-ranlib i686-linux-android-ld"
+      ANDROID_TOOLS="i686-linux-android-clang i686-linux-android-ranlib i686-linux-android-ld"
 	  ;;	  
 	*)
 	  echo "ERROR ERROR ERROR"