summaryrefslogtreecommitdiff
path: root/core/openssl
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-04-30 10:55:42 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-04-30 10:55:42 +0200
commitd9a9508e07a00015e2a2f278719a9665ff565961 (patch)
tree97ddb1c2607a58c2a632da571b281641dfdf9df2 /core/openssl
parent0a2ba65e7cf7d8d0452654b2f25cbb84a89fe7cf (diff)
parentb7cd4b184f75d3d2b54b356e08f296df3a9afb38 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/buoh/PKGBUILD core/openssl/PKGBUILD extra/llvm/PKGBUILD extra/pulseaudio/PKGBUILD extra/pygobject/PKGBUILD extra/pygobject2/PKGBUILD multilib/lib32-util-linux/PKGBUILD testing/consolekit/PKGBUILD testing/gnome-keyring/PKGBUILD testing/lirc/PKGBUILD testing/samba/PKGBUILD testing/systemd/PKGBUILD
Diffstat (limited to 'core/openssl')
-rw-r--r--core/openssl/PKGBUILD5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index 64fc2220d..d34178ed1 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156488 2012-04-19 14:22:45Z bisson $
+# $Id: PKGBUILD 157379 2012-04-28 09:02:47Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=openssl
-_ver=1.0.1a
+_ver=1.0.1b
# use a pacman compatible version scheme
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
#pkgver=$_ver
@@ -51,6 +51,7 @@ build() {
esac
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
+ # workaround for PR#2771: OPENSSL_NO_TLS1_2_CLIENT
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
shared zlib enable-md2 ${optflags} \
"${openssltarget}" \