[arch-commits] Commit in lib32-openssl/repos/multilib-x86_64 (8 files)
Pierre Schmitz
pierre at archlinux.org
Thu Jan 26 17:09:49 UTC 2017
Date: Thursday, January 26, 2017 @ 17:09:48
Author: pierre
Revision: 209145
archrelease: copy trunk to multilib-x86_64
Added:
lib32-openssl/repos/multilib-x86_64/PKGBUILD
(from rev 209144, lib32-openssl/trunk/PKGBUILD)
lib32-openssl/repos/multilib-x86_64/ca-dir.patch
(from rev 209144, lib32-openssl/trunk/ca-dir.patch)
lib32-openssl/repos/multilib-x86_64/no-rpath.patch
(from rev 209144, lib32-openssl/trunk/no-rpath.patch)
lib32-openssl/repos/multilib-x86_64/ssl3-test-failure.patch
(from rev 209144, lib32-openssl/trunk/ssl3-test-failure.patch)
Deleted:
lib32-openssl/repos/multilib-x86_64/PKGBUILD
lib32-openssl/repos/multilib-x86_64/ca-dir.patch
lib32-openssl/repos/multilib-x86_64/no-rpath.patch
lib32-openssl/repos/multilib-x86_64/ssl3-test-failure.patch
-------------------------+
PKGBUILD | 156 +++++++++++++++++++++++-----------------------
ca-dir.patch | 66 +++++++++----------
no-rpath.patch | 22 +++---
ssl3-test-failure.patch | 52 +++++++--------
4 files changed, 148 insertions(+), 148 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-01-26 17:09:10 UTC (rev 209144)
+++ PKGBUILD 2017-01-26 17:09:48 UTC (rev 209145)
@@ -1,78 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-_pkgbasename=openssl
-pkgname=lib32-$_pkgbasename
-_ver=1.0.2j
-# use a pacman compatible version scheme
-pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-#pkgver=$_ver
-pkgrel=1
-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-glibc' "${_pkgbasename}")
-optdepends=('ca-certificates')
-makedepends=('gcc-multilib')
-options=('!makeflags')
-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=('96322138f0b69e61b7212bc53d5e912b'
- 'SKIP'
- 'dc78d3d06baffc16217519242ce92478'
- '62fc492252edd3283871632bb77fadbe'
- '3bf51be3a1bbd262be46dc619f92aa90')
-
-prepare() {
- cd $srcdir/$_pkgbasename-$_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
-
- # set ca dir to /etc/ssl by default
- patch -p0 -i $srcdir/ca-dir.patch
-}
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- cd $srcdir/$_pkgbasename-$_ver
-
- # mark stack as non-executable: http://bugs.archlinux.org/task/12434
- ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib32 \
- shared no-ssl3-method \
- linux-elf \
- "-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
-
- make MAKEDEPPROG="${CC}" depend
- make
-}
-
-check() {
- cd $srcdir/$_pkgbasename-$_ver
- # 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
- make test
- patch -p0 -i $srcdir/ca-dir.patch
-}
-
-package() {
- cd $srcdir/$_pkgbasename-$_ver
- make INSTALL_PREFIX=$pkgdir install_sw
-
- rm -rf ${pkgdir}/{usr/{include,bin},etc}
- mkdir -p $pkgdir/usr/share/licenses
- ln -s $_pkgbasename $pkgdir/usr/share/licenses/$pkgname
-}
Copied: lib32-openssl/repos/multilib-x86_64/PKGBUILD (from rev 209144, lib32-openssl/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-01-26 17:09:48 UTC (rev 209145)
@@ -0,0 +1,78 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+_pkgbasename=openssl
+pkgname=lib32-$_pkgbasename
+_ver=1.0.2k
+# use a pacman compatible version scheme
+pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
+#pkgver=$_ver
+pkgrel=1
+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-glibc' "${_pkgbasename}")
+optdepends=('ca-certificates')
+makedepends=('gcc-multilib')
+options=('!makeflags')
+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=('f965fc0bf01bf882b31314b61391ae65'
+ 'SKIP'
+ 'dc78d3d06baffc16217519242ce92478'
+ '62fc492252edd3283871632bb77fadbe'
+ '3bf51be3a1bbd262be46dc619f92aa90')
+
+prepare() {
+ cd $srcdir/$_pkgbasename-$_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
+
+ # set ca dir to /etc/ssl by default
+ patch -p0 -i $srcdir/ca-dir.patch
+}
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ cd $srcdir/$_pkgbasename-$_ver
+
+ # mark stack as non-executable: http://bugs.archlinux.org/task/12434
+ ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib32 \
+ shared no-ssl3-method \
+ linux-elf \
+ "-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+
+ make MAKEDEPPROG="${CC}" depend
+ make
+}
+
+check() {
+ cd $srcdir/$_pkgbasename-$_ver
+ # 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
+ make test
+ patch -p0 -i $srcdir/ca-dir.patch
+}
+
+package() {
+ cd $srcdir/$_pkgbasename-$_ver
+ make INSTALL_PREFIX=$pkgdir install_sw
+
+ rm -rf ${pkgdir}/{usr/{include,bin},etc}
+ mkdir -p $pkgdir/usr/share/licenses
+ ln -s $_pkgbasename $pkgdir/usr/share/licenses/$pkgname
+}
Deleted: ca-dir.patch
===================================================================
--- ca-dir.patch 2017-01-26 17:09:10 UTC (rev 209144)
+++ ca-dir.patch 2017-01-26 17:09:48 UTC (rev 209145)
@@ -1,33 +0,0 @@
---- apps/CA.pl.in 2006-04-28 02:30:49.000000000 +0200
-+++ apps/CA.pl.in 2010-04-01 00:35:02.600553509 +0200
-@@ -53,7 +53,7 @@
- $X509="$openssl x509";
- $PKCS12="$openssl pkcs12";
-
--$CATOP="./demoCA";
-+$CATOP="/etc/ssl";
- $CAKEY="cakey.pem";
- $CAREQ="careq.pem";
- $CACERT="cacert.pem";
---- apps/CA.sh 2009-10-15 19:27:47.000000000 +0200
-+++ apps/CA.sh 2010-04-01 00:35:02.600553509 +0200
-@@ -68,7 +68,7 @@
- X509="$OPENSSL x509"
- PKCS12="openssl pkcs12"
-
--if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi
-+if [ -z "$CATOP" ] ; then CATOP=/etc/ssl ; fi
- CAKEY=./cakey.pem
- CAREQ=./careq.pem
- CACERT=./cacert.pem
---- apps/openssl.cnf 2009-04-04 20:09:43.000000000 +0200
-+++ apps/openssl.cnf 2010-04-01 00:35:02.607220681 +0200
-@@ -39,7 +39,7 @@
- ####################################################################
- [ CA_default ]
-
--dir = ./demoCA # Where everything is kept
-+dir = /etc/ssl # Where everything is kept
- certs = $dir/certs # Where the issued certs are kept
- crl_dir = $dir/crl # Where the issued crl are kept
- database = $dir/index.txt # database index file.
Copied: lib32-openssl/repos/multilib-x86_64/ca-dir.patch (from rev 209144, lib32-openssl/trunk/ca-dir.patch)
===================================================================
--- ca-dir.patch (rev 0)
+++ ca-dir.patch 2017-01-26 17:09:48 UTC (rev 209145)
@@ -0,0 +1,33 @@
+--- apps/CA.pl.in 2006-04-28 02:30:49.000000000 +0200
++++ apps/CA.pl.in 2010-04-01 00:35:02.600553509 +0200
+@@ -53,7 +53,7 @@
+ $X509="$openssl x509";
+ $PKCS12="$openssl pkcs12";
+
+-$CATOP="./demoCA";
++$CATOP="/etc/ssl";
+ $CAKEY="cakey.pem";
+ $CAREQ="careq.pem";
+ $CACERT="cacert.pem";
+--- apps/CA.sh 2009-10-15 19:27:47.000000000 +0200
++++ apps/CA.sh 2010-04-01 00:35:02.600553509 +0200
+@@ -68,7 +68,7 @@
+ X509="$OPENSSL x509"
+ PKCS12="openssl pkcs12"
+
+-if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi
++if [ -z "$CATOP" ] ; then CATOP=/etc/ssl ; fi
+ CAKEY=./cakey.pem
+ CAREQ=./careq.pem
+ CACERT=./cacert.pem
+--- apps/openssl.cnf 2009-04-04 20:09:43.000000000 +0200
++++ apps/openssl.cnf 2010-04-01 00:35:02.607220681 +0200
+@@ -39,7 +39,7 @@
+ ####################################################################
+ [ CA_default ]
+
+-dir = ./demoCA # Where everything is kept
++dir = /etc/ssl # Where everything is kept
+ certs = $dir/certs # Where the issued certs are kept
+ crl_dir = $dir/crl # Where the issued crl are kept
+ database = $dir/index.txt # database index file.
Deleted: no-rpath.patch
===================================================================
--- no-rpath.patch 2017-01-26 17:09:10 UTC (rev 209144)
+++ no-rpath.patch 2017-01-26 17:09:48 UTC (rev 209145)
@@ -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: lib32-openssl/repos/multilib-x86_64/no-rpath.patch (from rev 209144, lib32-openssl/trunk/no-rpath.patch)
===================================================================
--- no-rpath.patch (rev 0)
+++ no-rpath.patch 2017-01-26 17:09:48 UTC (rev 209145)
@@ -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: ssl3-test-failure.patch
===================================================================
--- ssl3-test-failure.patch 2017-01-26 17:09:10 UTC (rev 209144)
+++ ssl3-test-failure.patch 2017-01-26 17:09:48 UTC (rev 209145)
@@ -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: lib32-openssl/repos/multilib-x86_64/ssl3-test-failure.patch (from rev 209144, lib32-openssl/trunk/ssl3-test-failure.patch)
===================================================================
--- ssl3-test-failure.patch (rev 0)
+++ ssl3-test-failure.patch 2017-01-26 17:09:48 UTC (rev 209145)
@@ -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