commit lib32-openssl098 0.9.8.zh-2

2 files changed, 14 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 89c55e5690db..ff399e7d15d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Jun 19 18:14:36 UTC 2017
+# Tue Jun 20 08:38:30 UTC 2017
 pkgbase = lib32-openssl098
 	pkgdesc = The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (32-bit, 0.9.8 branch)
 	pkgver = 0.9.8.zh
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.openssl.org
 	arch = x86_64
 	license = custom:BSD
diff --git a/PKGBUILD b/PKGBUILD
index ea4bf6ddec13..bbb2d9caf344 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=lib32-openssl098
 _ver=0.9.8zh
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]*/.${_ver//[0-9.]/}}
-pkgrel=1
+pkgrel=2
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (32-bit, 0.9.8 branch)'
 arch=('x86_64')
 url='https://www.openssl.org'
@@ -28,11 +28,7 @@ sha256sums=('f1d9f3ed1b85a82ecf80d0e2d389e1fda3fca9a4dba0bf07adbf231e1a5e2fd6'
             '754d6107a306311e15a1db6a1cc031b81691c8b9865e8809ac60ca6f184c957c'
             '9e8126f3a748f4c1d6fe34d4436de72b16a40e97a6d18234d2e88caa179d50c4')
 
-build() {
-	export CC="gcc -m32"
-	export CXX="g++ -m32"
-	export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
+prepare() {
 	cd "${srcdir}/${_pkgbasename}-${_ver}"
 
 	# remove rpath: http://bugs.archlinux.org/task/14367
@@ -40,6 +36,16 @@ build() {
 	# set ca dir to /etc/ssl by default
 	patch -p0 -i "${srcdir}/ca-dir.patch"
 
+	sed -i '/^push(@INC/s|)|,".")|' crypto/des/asm/des-586.pl
+}
+
+build() {
+	export CC="gcc -m32"
+	export CXX="g++ -m32"
+	export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+	cd "${srcdir}/${_pkgbasename}-${_ver}"
+
 	# mark stack as non-executable: http://bugs.archlinux.org/task/12434
 	./Configure linux-elf --prefix=/usr --openssldir=/etc/ssl --libdir=lib32 \
 		shared zlib enable-md2 -Wa,--noexecstack