Update version and method to fixing build errors.

1 files changed, 9 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 04968de67c44..c097aeebb90f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 validpgpkeys=('33ED753E14757D79FA17E57DC4C1F715B2B66B95')
 
 pkgname=gost-engine
-pkgver=1.1.1r496.9b492b3
+pkgver=1.1.1.r496.9b492b3
 pkgrel=1
 pkgdesc='Russian GOST R 34.10 and GOST R 34.11-2012 crypto algorithms for OpenSSL'
 arch=('i686' 'x86_64')
@@ -19,17 +19,14 @@ source=(
   'gost-engine::git+https://github.com/gost-engine/engine.git'
   'gost.cnf'
   "${pkgname}.install"
-  '0001-fix_err.patch'
 )
 
 sha256sums=('SKIP'
             '04c3483d758e393d9831d2be4cee1eafd806eea15055438be7c7b4caeeccbfe6'
-            'b568af932ea9bbc42b24b487280f480467be399c5e40908f6122f0ed3d6edcd6'
-            'c4165b22a9db180932c6442ee26e04e73bb68a2af5ceb23cabf0c89db3a9b31e')
+            'b568af932ea9bbc42b24b487280f480467be399c5e40908f6122f0ed3d6edcd6')
 sha512sums=('SKIP'
             '431f810f822a347135d10c99f98ed2516e6afe310def77fc9aa0b41dc0578b05e2684f77e1062ea934961720f6d11f73f27e38548bccfe61709e81f8d53c484e'
-            '071f716440e8e54dc46b9205853125591dd857f99d0b6f2614aac0d97e1a44b3048ae58798cc80a70200ce567be2cdbb5eb00b5c2c2f3fa471e39e8ff07e8f65'
-            'd4fb5f9637554b0883b911234696924ece563ed73e2e48e329e4b4173402d98036df38f36b7cfa238cfbf66826d2f547815cfc3483d18723778aeb1fff5aab38')
+            '071f716440e8e54dc46b9205853125591dd857f99d0b6f2614aac0d97e1a44b3048ae58798cc80a70200ce567be2cdbb5eb00b5c2c2f3fa471e39e8ff07e8f65')
 
 install=${pkgname}.install
 
@@ -40,7 +37,7 @@ pkgver() {
     exit 1
   )
 
-  echo "1.1.1r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+  echo "1.1.1.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 
 }
 
@@ -63,14 +60,17 @@ prepare() {
 
   git checkout openssl_1_1_1
 
-  patch --forward --strip=1 --input="${srcdir}/0001-fix_err.patch"
+  # Fix Error test_tls.c:94:3: error: implicit declaration of function 'err' [-Werror=implicit-function-declaration]
+  # err(1, "corruption from client");
+  sed -i "/\#define\s*KTRANSFER\s*(1\s*\*\s*1024\s*)/I a\ \nstatic void err(const int i, const char* msg){printf(msg);}" \
+    "${srcdir}/${pkgname}/test_tls.c"
 
   # Fix ==> WARNING: Package contains reference to $srcdir
   # gost.so.1.1 contain path to source files
   # strings gost.so.1.1 | grep "src\/gost-engine"
   # Show containing strings
   sed -i "$ a\ \nset(CMAKE_C_FLAGS \"\${CMAKE_C_FLAGS} -fdebug-prefix-map=\\\\\"\${CMAKE_SOURCE_DIR}\\\\\"=. -Wno-builtin-macro-redefined -D'__FILE__=\\\\\"\$(subst \$(realpath \${CMAKE_SOURCE_DIR})/,,\$(abspath \$<))\\\\\"'\")" \
-  "${srcdir}/${pkgname}/CMakeLists.txt"
+    "${srcdir}/${pkgname}/CMakeLists.txt"
 
 }