From 4026666cf875d1ab6e86def0d8c10dbf25e6d096 Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Sun, 27 Jul 2014 12:58:05 -0500
Subject: Updating openssl to 1.0.1.h-1

---
 core/openssl/PKGBUILD | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index 5a16e550f..2b5249e51 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 203278 2014-01-07 10:02:52Z pierre $
+# $Id: PKGBUILD 214323 2014-06-06 07:30:23Z seblu $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=openssl
-_ver=1.0.1f
+_ver=1.0.1h
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -11,20 +11,18 @@ pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Se
 arch=('i686' 'x86_64' 'mips64el')
 url='https://www.openssl.org'
 license=('custom:BSD')
-depends=('perl')
+depends=('zlib' 'perl')
 optdepends=('ca-certificates')
 options=('!makeflags')
 backup=('etc/ssl/openssl.cnf')
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
         "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc"
         'no-rpath.patch'
-        'ca-dir.patch'
-        'openssl-1.0.1f-perl-5.18.patch')
-md5sums=('f26b09c028a0541cab33da697d522b25'
+        'ca-dir.patch')
+md5sums=('8d6d684a9430d5cc98a62a5d8fbda8cf'
          'SKIP'
          'dc78d3d06baffc16217519242ce92478'
-         '3bf51be3a1bbd262be46dc619f92aa90'
-         'ea2a61c8bd43788d81d98f1ac36c98ac')
+         '3bf51be3a1bbd262be46dc619f92aa90')
 
 prepare() {
 	cd $srcdir/$pkgname-$_ver
@@ -33,28 +31,27 @@ prepare() {
 	patch -p0 -i $srcdir/no-rpath.patch
 	# set ca dir to /etc/ssl by default
 	patch -p0 -i $srcdir/ca-dir.patch
-
-	patch -p1 -i $srcdir/openssl-1.0.1f-perl-5.18.patch
 }
 
 build() {
 	cd $srcdir/$pkgname-$_ver
 
-  case "${CARCH}" in
-	'x86_64')
+	if [ "${CARCH}" == 'x86_64' ]; then
 		openssltarget='linux-x86_64'
-        optflags='enable-ec_nistp_64_gcc_128' ;;
-	'i686')
-		openssltarget='linux-elf' ;;
-	'mips64el')
-		openssltarget='linux-generic32' ;;
-	esac
+		optflags='enable-ec_nistp_64_gcc_128'
+	elif [ "${CARCH}" == 'i686' ]; then
+		openssltarget='linux-elf'
+		optflags=''
+	elif [ "${CARCH}" == 'mips64el' ]; then
+		openssltarget='linux-generic32'
+		optflags=''
+	fi
 
 	# mark stack as non-executable: http://bugs.archlinux.org/task/12434
 	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
 		shared zlib ${optflags} \
 		"${openssltarget}" \
-		-Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}"
+		"-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
 
 	make depend
 	make
-- 
cgit v1.2.3