From 8cca36c97b57b8d0a7e5521647c02409eb94ade4 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Thu, 8 Sep 2011 16:35:25 +0000
Subject: Thu Sep  8 16:35:25 UTC 2011

---
 core/openssl/PKGBUILD | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'core/openssl')

diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index 756338040..f3ddf3b87 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 109351 2011-02-08 19:05:04Z pierre $
+# $Id: PKGBUILD 137334 2011-09-07 08:58:53Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=openssl
-_ver=1.0.0d
+_ver=1.0.0e
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
@@ -18,7 +18,7 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
         'fix-manpages.patch'
         'no-rpath.patch'
         'ca-dir.patch')
-md5sums=('40b6ea380cc8a5bf9734c2f8bf7e701e'
+md5sums=('7040b89c4c58c7a1016c0dfa6e821c86'
          '5bbc0655bda2af95bc8eb568963ce8ba'
          'dc78d3d06baffc16217519242ce92478'
          '3bf51be3a1bbd262be46dc619f92aa90')
@@ -29,6 +29,12 @@ PKGEXT='.pkg.tar.gz'
 build() {
 	cd $srcdir/$pkgname-$_ver
 
+	if [ "${CARCH}" == 'x86_64' ]; then
+		openssltarget='linux-x86_64'
+	elif [ "${CARCH}" == 'i686' ]; then
+		openssltarget='linux-elf'
+	fi
+
 	# avoid conflicts with other man pages
 	# see http://www.linuxfromscratch.org/patches/downloads/openssl/
 	patch -p1 -i $srcdir/fix-manpages.patch
@@ -37,16 +43,22 @@ build() {
 	# 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 \
+		"${openssltarget}" \
+		-Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}"
 
+	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() {
-- 
cgit v1.2.3-54-g00ecf