try to add versioned symbols

2 files changed, 11 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 79eb74e0db66..d5a0e4b711ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,10 @@
+# Generated by mksrcinfo v8
+# Mon Dec 11 11:39:34 UTC 2017
 pkgbase = openssl-1.0-chacha20
 	pkgdesc = The Open Source toolkit for Secure Sockets Layer and Transport Layer Security with Chacha20 cipher
 	pkgver = 1.0.2.l
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.openssl.org
-	arch = i686
 	arch = x86_64
 	license = custom:BSD
 	depends = perl
@@ -17,13 +18,14 @@ pkgbase = openssl-1.0-chacha20
 	source = no-rpath.patch
 	source = ssl3-test-failure.patch
 	source = ca-dir.patch
+	source = openssl-1.0-versioned-symbols.patch
 	source = openssl__chacha20_poly1305_draft_and_rfc_ossl102j.patch
-	validpgpkeys = 8657ABB260F056B1E5190839D9C4D26D0E604491
 	sha256sums = ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c
 	sha256sums = SKIP
 	sha256sums = 754d6107a306311e15a1db6a1cc031b81691c8b9865e8809ac60ca6f184c957c
 	sha256sums = c54ae87c602eaa1530a336ab7c6e22e12898e1941012349c153e52553df64a13
 	sha256sums = 9e8126f3a748f4c1d6fe34d4436de72b16a40e97a6d18234d2e88caa179d50c4
+	sha256sums = d4299fa99405b875106ada34ce303237e7a55286d755e4daeb646a493ed98db3
 	sha256sums = d6f9427d5cb63c7299563c201cd8708c7166e0f8c98b57a1fee69767362bf0f7
 
 pkgname = openssl-1.0-chacha20
diff --git a/PKGBUILD b/PKGBUILD
index 4d8d0ed80e96..5c8042e96bb7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id$
 # Maintainer: Allen Zhong <moeallenz@gmail.com>
-# Contributor: Yishen Miao <mys721tx@gmail.com>
+# Maintainer: Yishen Miao <mys721tx@gmail.com>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 _pkgname=openssl-1.0
@@ -9,9 +9,9 @@ _ver=1.0.2l
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
-pkgrel=1
+pkgrel=2
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security with Chacha20 cipher'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='https://www.openssl.org'
 license=('custom:BSD')
 depends=('perl')
@@ -25,12 +25,14 @@ source=("https://www.openssl.org/source/openssl-${_ver}.tar.gz"
         'no-rpath.patch'
         'ssl3-test-failure.patch'
         'ca-dir.patch'
+	'openssl-1.0-versioned-symbols.patch'
         'openssl__chacha20_poly1305_draft_and_rfc_ossl102j.patch')
 sha256sums=('ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c'
             'SKIP'
             '754d6107a306311e15a1db6a1cc031b81691c8b9865e8809ac60ca6f184c957c'
             'c54ae87c602eaa1530a336ab7c6e22e12898e1941012349c153e52553df64a13'
             '9e8126f3a748f4c1d6fe34d4436de72b16a40e97a6d18234d2e88caa179d50c4'
+            'd4299fa99405b875106ada34ce303237e7a55286d755e4daeb646a493ed98db3'
             'd6f9427d5cb63c7299563c201cd8708c7166e0f8c98b57a1fee69767362bf0f7')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
 
@@ -44,7 +46,7 @@ prepare() {
     patch -p1 -i $srcdir/ssl3-test-failure.patch
 
     # add symbol versioning to prevent conflicts with openssl 1.1 symbols (Debian)
-    #patch -p1 -i "$srcdir"/openssl-1.0-versioned-symbols.patch
+    patch -p1 -i "$srcdir"/openssl-1.0-versioned-symbols.patch
 
     # set ca dir to /etc/ssl by default
     patch -p0 -i $srcdir/ca-dir.patch