[arch-commits] Commit in openssl/trunk (PKGBUILD)

[Pierre Schmitz]

    Date: Saturday, February 16, 2013 @ 21:31:04
  Author: pierre
Revision: 178117

Apparently the TLS1.2 workarounds are not exclusive; so enable both

Modified:
  openssl/trunk/PKGBUILD

----------+
 PKGBUILD |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-16 16:58:25 UTC (rev 178116)
+++ PKGBUILD	2013-02-16 20:31:04 UTC (rev 178117)
@@ -6,7 +6,7 @@
 # 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'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
@@ -41,11 +41,13 @@
 	patch -p0 -i $srcdir/ca-dir.patch
 
 	# mark stack as non-executable: http://bugs.archlinux.org/task/12434
-	# workaround for https://rt.openssl.org/Ticket/Display.html?id=2771: OPENSSL_MAX_TLS1_2_CIPHER_LENGTH=50
+	# workaround for https://rt.openssl.org/Ticket/Display.html?id=2771
+	# See Changes file "Changes between 1.0.1 and 1.0.1a [19 Apr 2012]"
 	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
 		shared zlib enable-md2 ${optflags} \
 		"${openssltarget}" \
 		-Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" \
+		-DOPENSSL_NO_TLS1_2_CLIENT \
 		-DOPENSSL_MAX_TLS1_2_CIPHER_LENGTH=50
 
 	make depend
@@ -57,6 +59,8 @@
 	# 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
+	# Do not test TLS1.2 as we disabled it above using OPENSSL_NO_TLS1_2_CLIENT
+	sed 's/TLSv1.2 //g' -i test/testssl
 	make test
 	patch -p0 -i $srcdir/ca-dir.patch
 }