[arch-commits] Commit in lib32-openssl/trunk (PKGBUILD ssl3-test-failure.patch)

[Pierre Schmitz]

    Date: Wednesday, March 2, 2016 @ 18:55:33
  Author: pierre
Revision: 164162

upgpkg: lib32-openssl 1:1.0.2.g-3

Added:
  lib32-openssl/trunk/ssl3-test-failure.patch
Modified:
  lib32-openssl/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   16 +++++++++++-----
 ssl3-test-failure.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-02 17:44:02 UTC (rev 164161)
+++ PKGBUILD	2016-03-02 17:55:33 UTC (rev 164162)
@@ -3,17 +3,17 @@
 
 _pkgbasename=openssl
 pkgname=lib32-$_pkgbasename
-_ver=1.0.2f
+_ver=1.0.2g
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
-pkgrel=1
+pkgrel=3
 epoch=1
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (32-bit)'
 arch=('x86_64')
 url='https://www.openssl.org'
 license=('custom:BSD')
-depends=('lib32-zlib' "${_pkgbasename}")
+depends=('lib32-glibc' "${_pkgbasename}")
 optdepends=('ca-certificates')
 makedepends=('gcc-multilib')
 options=('!makeflags')
@@ -20,11 +20,13 @@
 source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz"
         "https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz.asc"
         'no-rpath.patch'
+        'ssl3-test-failure.patch'
         'ca-dir.patch')
 validpgpkeys=(8657ABB260F056B1E5190839D9C4D26D0E604491)
-md5sums=('b3bf73f507172be9292ea2a8c28b659d'
+md5sums=('f3c710c045cdee5fd114feb69feba7aa'
          'SKIP'
          'dc78d3d06baffc16217519242ce92478'
+         '62fc492252edd3283871632bb77fadbe'
          '3bf51be3a1bbd262be46dc619f92aa90')
 
 prepare() {
@@ -32,6 +34,10 @@
 
 	# remove rpath: http://bugs.archlinux.org/task/14367
 	patch -p0 -i $srcdir/no-rpath.patch
+
+	# disable a test that fails when ssl3 is disabled
+	patch -p1 -i $srcdir/ssl3-test-failure.patch
+
 	# set ca dir to /etc/ssl by default
 	patch -p0 -i $srcdir/ca-dir.patch
 }
@@ -45,7 +51,7 @@
 
 	# mark stack as non-executable: http://bugs.archlinux.org/task/12434
 	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib32 \
-		shared zlib \
+		shared no-ssl3-method \
 		linux-elf \
 		"-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
 

Added: ssl3-test-failure.patch
===================================================================
--- ssl3-test-failure.patch	                        (rev 0)
+++ ssl3-test-failure.patch	2016-03-02 17:55:33 UTC (rev 164162)
@@ -0,0 +1,26 @@
+From: Kurt Roeckx <kurt at roeckx.be>
+Date: Sun, 6 Sep 2015 16:04:11 +0200
+Subject: Disable SSLv3 test in test suite
+
+When testing SSLv3 the test program returns 0 for skip.  The test for weak DH
+expects a failure, but gets success.
+
+It should probably be changed to return something other than 0 for a skipped
+test.
+---
+ test/testssl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/testssl b/test/testssl
+index 747e4ba..1e4370b 100644
+--- a/test/testssl
++++ b/test/testssl
+@@ -160,7 +160,7 @@ test_cipher() {
+ }
+ 
+ echo "Testing ciphersuites"
+-for protocol in TLSv1.2 SSLv3; do
++for protocol in TLSv1.2; do
+   echo "Testing ciphersuites for $protocol"
+   for cipher in `../util/shlib_wrap.sh ../apps/openssl ciphers "RSA+$protocol" | tr ':' ' '`; do
+     test_cipher $cipher $protocol