From 14ef7ec66ba9f2a2a4b82ec92e4789c234cadb6e Mon Sep 17 00:00:00 2001 From: abveritas Date: Wed, 28 Nov 2012 00:14:07 +0000 Subject: [PATCH] work on bug #473, opnessl update --- openssl/PKGBUILD | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/openssl/PKGBUILD b/openssl/PKGBUILD index 20152ab36..e316e7cfc 100644 --- a/openssl/PKGBUILD +++ b/openssl/PKGBUILD @@ -1,16 +1,15 @@ # # Chakra Packages for Chakra, part of chakra-project.org # -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa +# maintainer abveritas[at]chakra-project[dot]org> pkgname=openssl -_ver=1.0.0d +_ver=1.0.1c # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgrel=2 +pkgrel=1 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' -arch=('i686' 'x86_64') +arch=('x86_64') url='https://www.openssl.org' license=('custom:BSD') depends=('perl') @@ -21,13 +20,16 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" 'fix-manpages.patch' 'no-rpath.patch' 'ca-dir.patch') -md5sums=('40b6ea380cc8a5bf9734c2f8bf7e701e' +md5sums=('ae412727c8c15b67880aef7bd2999b2e' '5bbc0655bda2af95bc8eb568963ce8ba' 'dc78d3d06baffc16217519242ce92478' '3bf51be3a1bbd262be46dc619f92aa90') build() { cd $srcdir/$pkgname-$_ver + + openssltarget='linux-x86_64' + optflags='enable-ec_nistp_64_gcc_128' # avoid conflicts with other man pages # see http://www.linuxfromscratch.org/patches/downloads/openssl/ @@ -36,17 +38,24 @@ build() { patch -p0 -i $srcdir/no-rpath.patch # set ca dir to /etc/ssl by default patch -p0 -i $srcdir/ca-dir.patch - # mark stack as non-executable: http://bugs.archlinux.org/task/12434 - ./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ - shared zlib enable-md2 -Wa,--noexecstack + + ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ + shared zlib enable-md2 ${optflags} \ + "${openssltarget}" \ + -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" \ + -DOPENSSL_NO_TLS1_2_CLIENT + make depend make +} +check() { + cd $srcdir/$pkgname-$_ver # the test fails due to missing write permissions in /etc/ssl # revert this patch for make test - #patch -p0 -R -i $srcdir/ca-dir.patch - #make test - #patch -p0 -i $srcdir/ca-dir.patch + patch -p0 -R -i $srcdir/ca-dir.patch + make test + patch -p0 -i $srcdir/ca-dir.patch } package() {