[arch-commits] Commit in openssl-1.0/repos (12 files)
Jan de Groot
jgc at archlinux.org
Sat Feb 25 22:33:21 UTC 2017
Date: Saturday, February 25, 2017 @ 22:33:20
Author: jgc
Revision: 289550
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
openssl-1.0/repos/staging-i686/PKGBUILD
(from rev 289549, openssl-1.0/trunk/PKGBUILD)
openssl-1.0/repos/staging-i686/no-rpath.patch
(from rev 289549, openssl-1.0/trunk/no-rpath.patch)
openssl-1.0/repos/staging-i686/ssl3-test-failure.patch
(from rev 289549, openssl-1.0/trunk/ssl3-test-failure.patch)
openssl-1.0/repos/staging-x86_64/PKGBUILD
(from rev 289549, openssl-1.0/trunk/PKGBUILD)
openssl-1.0/repos/staging-x86_64/no-rpath.patch
(from rev 289549, openssl-1.0/trunk/no-rpath.patch)
openssl-1.0/repos/staging-x86_64/ssl3-test-failure.patch
(from rev 289549, openssl-1.0/trunk/ssl3-test-failure.patch)
Deleted:
openssl-1.0/repos/staging-i686/PKGBUILD
openssl-1.0/repos/staging-i686/no-rpath.patch
openssl-1.0/repos/staging-i686/ssl3-test-failure.patch
openssl-1.0/repos/staging-x86_64/PKGBUILD
openssl-1.0/repos/staging-x86_64/no-rpath.patch
openssl-1.0/repos/staging-x86_64/ssl3-test-failure.patch
----------------------------------------+
/PKGBUILD | 166 +++++++++++++++++++++++++++++++
/no-rpath.patch | 22 ++++
/ssl3-test-failure.patch | 52 +++++++++
staging-i686/PKGBUILD | 70 -------------
staging-i686/no-rpath.patch | 11 --
staging-i686/ssl3-test-failure.patch | 26 ----
staging-x86_64/PKGBUILD | 70 -------------
staging-x86_64/no-rpath.patch | 11 --
staging-x86_64/ssl3-test-failure.patch | 26 ----
9 files changed, 240 insertions(+), 214 deletions(-)
Deleted: staging-i686/PKGBUILD
===================================================================
--- staging-i686/PKGBUILD 2017-02-25 22:33:14 UTC (rev 289549)
+++ staging-i686/PKGBUILD 2017-02-25 22:33:20 UTC (rev 289550)
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 287592 2017-01-28 07:20:49Z pierre $
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=openssl-1.0
-_ver=1.0.2k
-# use a pacman compatible version scheme
-pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-#pkgver=$_ver
-pkgrel=1
-pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
-arch=('i686' 'x86_64')
-url='https://www.openssl.org'
-license=('custom:BSD')
-depends=('perl')
-optdepends=('ca-certificates')
-options=('!makeflags')
-source=("https://www.openssl.org/source/openssl-${_ver}.tar.gz"
- "https://www.openssl.org/source/openssl-${_ver}.tar.gz.asc"
- 'no-rpath.patch'
- 'ssl3-test-failure.patch')
-md5sums=('f965fc0bf01bf882b31314b61391ae65'
- 'SKIP'
- 'dc78d3d06baffc16217519242ce92478'
- '62fc492252edd3283871632bb77fadbe')
-validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
-
-prepare() {
- cd $srcdir/openssl-$_ver
-
- # 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
-}
-
-build() {
- cd $srcdir/openssl-$_ver
-
- if [ "${CARCH}" == 'x86_64' ]; then
- openssltarget='linux-x86_64'
- optflags='enable-ec_nistp_64_gcc_128'
- elif [ "${CARCH}" == 'i686' ]; then
- openssltarget='linux-elf'
- optflags=''
- fi
-
- # mark stack as non-executable: http://bugs.archlinux.org/task/12434
- ./Configure --prefix=/usr/lib/$pkgname --openssldir=/etc/ssl --libdir=lib \
- shared no-ssl3-method ${optflags} \
- "${openssltarget}" \
- "-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
-
- make depend
- make
-}
-
-check() {
- cd $srcdir/openssl-$_ver
-
- make test
-}
-
-package() {
- cd $srcdir/openssl-$_ver
-
- make INSTALL_PREFIX=$pkgdir install_sw
- rm -rf $pkgdir/{usr/lib/${pkgname}/{bin,ssl},etc}
- install -D -m644 LICENSE $pkgdir/usr/share/licenses/${pkgname}/LICENSE
-}
Copied: openssl-1.0/repos/staging-i686/PKGBUILD (from rev 289549, openssl-1.0/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2017-02-25 22:33:20 UTC (rev 289550)
@@ -0,0 +1,83 @@
+# $Id: PKGBUILD 287592 2017-01-28 07:20:49Z pierre $
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=openssl-1.0
+_ver=1.0.2k
+# use a pacman compatible version scheme
+pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
+#pkgver=$_ver
+pkgrel=2
+pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
+arch=('i686' 'x86_64')
+url='https://www.openssl.org'
+license=('custom:BSD')
+depends=('perl')
+optdepends=('ca-certificates')
+options=('!makeflags')
+source=("https://www.openssl.org/source/openssl-${_ver}.tar.gz"
+ "https://www.openssl.org/source/openssl-${_ver}.tar.gz.asc"
+ 'no-rpath.patch'
+ 'ssl3-test-failure.patch')
+md5sums=('f965fc0bf01bf882b31314b61391ae65'
+ 'SKIP'
+ 'dc78d3d06baffc16217519242ce92478'
+ '62fc492252edd3283871632bb77fadbe')
+validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
+
+prepare() {
+ cd $srcdir/openssl-$_ver
+
+ # 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
+}
+
+build() {
+ cd "$srcdir/openssl-$_ver"
+
+ if [ "${CARCH}" == 'x86_64' ]; then
+ openssltarget='linux-x86_64'
+ optflags='enable-ec_nistp_64_gcc_128'
+ elif [ "${CARCH}" == 'i686' ]; then
+ openssltarget='linux-elf'
+ optflags=''
+ fi
+
+ # mark stack as non-executable: http://bugs.archlinux.org/task/12434
+ ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib/openssl-1.0 \
+ shared no-ssl3-method ${optflags} \
+ "${openssltarget}" \
+ "-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+
+ make depend
+ make
+}
+
+check() {
+ cd "$srcdir/openssl-$_ver"
+ make test
+}
+
+package() {
+ cd "$srcdir/openssl-$_ver"
+
+ make INSTALL_PREFIX="$pkgdir" install_sw
+
+ # Move some files around
+ install -m755 -d "$pkgdir/usr/include/openssl-1.0"
+ mv "$pkgdir/usr/include/openssl" "$pkgdir/usr/include/openssl-1.0/"
+ mv "$pkgdir/usr/lib/openssl-1.0/libcrypto.so.1.0.0" "$pkgdir/usr/lib/"
+ mv "$pkgdir/usr/lib/openssl-1.0/libssl.so.1.0.0" "$pkgdir/usr/lib/"
+ ln -sf ../libssl.so.1.0.0 "$pkgdir/usr/lib/openssl-1.0/libssl.so"
+ ln -sf ../libcrypto.so.1.0.0 "$pkgdir/usr/lib/openssl-1.0/libcrypto.so"
+ mv "$pkgdir/usr/bin/openssl" "$pkgdir/usr/bin/openssl-1.0"
+
+ # Update includedir in .pc files
+ sed -e 's|/include$|/include/openssl-1.0|' -i "$pkgdir"/usr/lib/openssl-1.0/pkgconfig/*.pc
+
+ rm -rf "$pkgdir"/{etc,usr/bin/c_rehash}
+
+ install -D -m644 LICENSE $pkgdir/usr/share/licenses/${pkgname}/LICENSE
+}
Deleted: staging-i686/no-rpath.patch
===================================================================
--- staging-i686/no-rpath.patch 2017-02-25 22:33:14 UTC (rev 289549)
+++ staging-i686/no-rpath.patch 2017-02-25 22:33:20 UTC (rev 289550)
@@ -1,11 +0,0 @@
---- Makefile.shared.no-rpath 2005-06-23 22:47:54.000000000 +0200
-+++ Makefile.shared 2005-11-16 22:35:37.000000000 +0100
-@@ -153,7 +153,7 @@
- NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
-
--DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(CFLAGS)"
-
- #This is rather special. It's a special target with which one can link
- #applications without bothering with any features that have anything to
Copied: openssl-1.0/repos/staging-i686/no-rpath.patch (from rev 289549, openssl-1.0/trunk/no-rpath.patch)
===================================================================
--- staging-i686/no-rpath.patch (rev 0)
+++ staging-i686/no-rpath.patch 2017-02-25 22:33:20 UTC (rev 289550)
@@ -0,0 +1,11 @@
+--- Makefile.shared.no-rpath 2005-06-23 22:47:54.000000000 +0200
++++ Makefile.shared 2005-11-16 22:35:37.000000000 +0100
+@@ -153,7 +153,7 @@
+ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
+
+-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
++DO_GNU_APP=LDFLAGS="$(CFLAGS)"
+
+ #This is rather special. It's a special target with which one can link
+ #applications without bothering with any features that have anything to
Deleted: staging-i686/ssl3-test-failure.patch
===================================================================
--- staging-i686/ssl3-test-failure.patch 2017-02-25 22:33:14 UTC (rev 289549)
+++ staging-i686/ssl3-test-failure.patch 2017-02-25 22:33:20 UTC (rev 289550)
@@ -1,26 +0,0 @@
-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
Copied: openssl-1.0/repos/staging-i686/ssl3-test-failure.patch (from rev 289549, openssl-1.0/trunk/ssl3-test-failure.patch)
===================================================================
--- staging-i686/ssl3-test-failure.patch (rev 0)
+++ staging-i686/ssl3-test-failure.patch 2017-02-25 22:33:20 UTC (rev 289550)
@@ -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
Deleted: staging-x86_64/PKGBUILD
===================================================================
--- staging-x86_64/PKGBUILD 2017-02-25 22:33:14 UTC (rev 289549)
+++ staging-x86_64/PKGBUILD 2017-02-25 22:33:20 UTC (rev 289550)
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 287592 2017-01-28 07:20:49Z pierre $
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=openssl-1.0
-_ver=1.0.2k
-# use a pacman compatible version scheme
-pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-#pkgver=$_ver
-pkgrel=1
-pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
-arch=('i686' 'x86_64')
-url='https://www.openssl.org'
-license=('custom:BSD')
-depends=('perl')
-optdepends=('ca-certificates')
-options=('!makeflags')
-source=("https://www.openssl.org/source/openssl-${_ver}.tar.gz"
- "https://www.openssl.org/source/openssl-${_ver}.tar.gz.asc"
- 'no-rpath.patch'
- 'ssl3-test-failure.patch')
-md5sums=('f965fc0bf01bf882b31314b61391ae65'
- 'SKIP'
- 'dc78d3d06baffc16217519242ce92478'
- '62fc492252edd3283871632bb77fadbe')
-validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
-
-prepare() {
- cd $srcdir/openssl-$_ver
-
- # 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
-}
-
-build() {
- cd $srcdir/openssl-$_ver
-
- if [ "${CARCH}" == 'x86_64' ]; then
- openssltarget='linux-x86_64'
- optflags='enable-ec_nistp_64_gcc_128'
- elif [ "${CARCH}" == 'i686' ]; then
- openssltarget='linux-elf'
- optflags=''
- fi
-
- # mark stack as non-executable: http://bugs.archlinux.org/task/12434
- ./Configure --prefix=/usr/lib/$pkgname --openssldir=/etc/ssl --libdir=lib \
- shared no-ssl3-method ${optflags} \
- "${openssltarget}" \
- "-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
-
- make depend
- make
-}
-
-check() {
- cd $srcdir/openssl-$_ver
-
- make test
-}
-
-package() {
- cd $srcdir/openssl-$_ver
-
- make INSTALL_PREFIX=$pkgdir install_sw
- rm -rf $pkgdir/{usr/lib/${pkgname}/{bin,ssl},etc}
- install -D -m644 LICENSE $pkgdir/usr/share/licenses/${pkgname}/LICENSE
-}
Copied: openssl-1.0/repos/staging-x86_64/PKGBUILD (from rev 289549, openssl-1.0/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2017-02-25 22:33:20 UTC (rev 289550)
@@ -0,0 +1,83 @@
+# $Id: PKGBUILD 287592 2017-01-28 07:20:49Z pierre $
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=openssl-1.0
+_ver=1.0.2k
+# use a pacman compatible version scheme
+pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
+#pkgver=$_ver
+pkgrel=2
+pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
+arch=('i686' 'x86_64')
+url='https://www.openssl.org'
+license=('custom:BSD')
+depends=('perl')
+optdepends=('ca-certificates')
+options=('!makeflags')
+source=("https://www.openssl.org/source/openssl-${_ver}.tar.gz"
+ "https://www.openssl.org/source/openssl-${_ver}.tar.gz.asc"
+ 'no-rpath.patch'
+ 'ssl3-test-failure.patch')
+md5sums=('f965fc0bf01bf882b31314b61391ae65'
+ 'SKIP'
+ 'dc78d3d06baffc16217519242ce92478'
+ '62fc492252edd3283871632bb77fadbe')
+validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
+
+prepare() {
+ cd $srcdir/openssl-$_ver
+
+ # 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
+}
+
+build() {
+ cd "$srcdir/openssl-$_ver"
+
+ if [ "${CARCH}" == 'x86_64' ]; then
+ openssltarget='linux-x86_64'
+ optflags='enable-ec_nistp_64_gcc_128'
+ elif [ "${CARCH}" == 'i686' ]; then
+ openssltarget='linux-elf'
+ optflags=''
+ fi
+
+ # mark stack as non-executable: http://bugs.archlinux.org/task/12434
+ ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib/openssl-1.0 \
+ shared no-ssl3-method ${optflags} \
+ "${openssltarget}" \
+ "-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+
+ make depend
+ make
+}
+
+check() {
+ cd "$srcdir/openssl-$_ver"
+ make test
+}
+
+package() {
+ cd "$srcdir/openssl-$_ver"
+
+ make INSTALL_PREFIX="$pkgdir" install_sw
+
+ # Move some files around
+ install -m755 -d "$pkgdir/usr/include/openssl-1.0"
+ mv "$pkgdir/usr/include/openssl" "$pkgdir/usr/include/openssl-1.0/"
+ mv "$pkgdir/usr/lib/openssl-1.0/libcrypto.so.1.0.0" "$pkgdir/usr/lib/"
+ mv "$pkgdir/usr/lib/openssl-1.0/libssl.so.1.0.0" "$pkgdir/usr/lib/"
+ ln -sf ../libssl.so.1.0.0 "$pkgdir/usr/lib/openssl-1.0/libssl.so"
+ ln -sf ../libcrypto.so.1.0.0 "$pkgdir/usr/lib/openssl-1.0/libcrypto.so"
+ mv "$pkgdir/usr/bin/openssl" "$pkgdir/usr/bin/openssl-1.0"
+
+ # Update includedir in .pc files
+ sed -e 's|/include$|/include/openssl-1.0|' -i "$pkgdir"/usr/lib/openssl-1.0/pkgconfig/*.pc
+
+ rm -rf "$pkgdir"/{etc,usr/bin/c_rehash}
+
+ install -D -m644 LICENSE $pkgdir/usr/share/licenses/${pkgname}/LICENSE
+}
Deleted: staging-x86_64/no-rpath.patch
===================================================================
--- staging-x86_64/no-rpath.patch 2017-02-25 22:33:14 UTC (rev 289549)
+++ staging-x86_64/no-rpath.patch 2017-02-25 22:33:20 UTC (rev 289550)
@@ -1,11 +0,0 @@
---- Makefile.shared.no-rpath 2005-06-23 22:47:54.000000000 +0200
-+++ Makefile.shared 2005-11-16 22:35:37.000000000 +0100
-@@ -153,7 +153,7 @@
- NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
-
--DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(CFLAGS)"
-
- #This is rather special. It's a special target with which one can link
- #applications without bothering with any features that have anything to
Copied: openssl-1.0/repos/staging-x86_64/no-rpath.patch (from rev 289549, openssl-1.0/trunk/no-rpath.patch)
===================================================================
--- staging-x86_64/no-rpath.patch (rev 0)
+++ staging-x86_64/no-rpath.patch 2017-02-25 22:33:20 UTC (rev 289550)
@@ -0,0 +1,11 @@
+--- Makefile.shared.no-rpath 2005-06-23 22:47:54.000000000 +0200
++++ Makefile.shared 2005-11-16 22:35:37.000000000 +0100
+@@ -153,7 +153,7 @@
+ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
+
+-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
++DO_GNU_APP=LDFLAGS="$(CFLAGS)"
+
+ #This is rather special. It's a special target with which one can link
+ #applications without bothering with any features that have anything to
Deleted: staging-x86_64/ssl3-test-failure.patch
===================================================================
--- staging-x86_64/ssl3-test-failure.patch 2017-02-25 22:33:14 UTC (rev 289549)
+++ staging-x86_64/ssl3-test-failure.patch 2017-02-25 22:33:20 UTC (rev 289550)
@@ -1,26 +0,0 @@
-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
Copied: openssl-1.0/repos/staging-x86_64/ssl3-test-failure.patch (from rev 289549, openssl-1.0/trunk/ssl3-test-failure.patch)
===================================================================
--- staging-x86_64/ssl3-test-failure.patch (rev 0)
+++ staging-x86_64/ssl3-test-failure.patch 2017-02-25 22:33:20 UTC (rev 289550)
@@ -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
More information about the arch-commits
mailing list