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

[Jan Steffens]

    Date: Tuesday, March 1, 2016 @ 21:00:13
  Author: heftig
Revision: 260494

Let's try without SSLv3, too

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

-------------------------+
 PKGBUILD                |   10 ++++++++--
 ssl3-test-failure.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-01 18:45:42 UTC (rev 260493)
+++ PKGBUILD	2016-03-01 20:00:13 UTC (rev 260494)
@@ -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'
@@ -18,10 +18,12 @@
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
         "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc"
         'no-rpath.patch'
+        'ssl3-test-failure.patch'
         'ca-dir.patch')
 md5sums=('f3c710c045cdee5fd114feb69feba7aa'
          'SKIP'
          'dc78d3d06baffc16217519242ce92478'
+         '62fc492252edd3283871632bb77fadbe'
          '3bf51be3a1bbd262be46dc619f92aa90')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
 
@@ -30,6 +32,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
 }
@@ -47,7 +53,7 @@
 
 	# mark stack as non-executable: http://bugs.archlinux.org/task/12434
 	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
-		shared zlib ${optflags} \
+		shared zlib no-ssl3 no-ssl3-method ${optflags} \
 		"${openssltarget}" \
 		"-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
 

Added: ssl3-test-failure.patch
===================================================================
--- ssl3-test-failure.patch	                        (rev 0)
+++ ssl3-test-failure.patch	2016-03-01 20:00:13 UTC (rev 260494)
@@ -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