Browse Source

cfeinge: switch to openssl102-opt dep; openssl102-opt: add new dep for cfengine

master
Von Random 3 months ago
parent
commit
4b768113db
5 changed files with 4778 additions and 2 deletions
  1. +2
    -2
      cfengine/PKGBUILD
  2. +72
    -0
      openssl102-opt/PKGBUILD
  3. +11
    -0
      openssl102-opt/no-rpath.patch
  4. +4667
    -0
      openssl102-opt/openssl-1.0-versioned-symbols.patch
  5. +26
    -0
      openssl102-opt/ssl3-test-failure.patch

+ 2
- 2
cfengine/PKGBUILD View File

@@ -14,7 +14,7 @@ pkgdesc='Automated suite of programs for configuring and maintaining Unix-like c
url='http://www.cfengine.org'
license=('GPL3')
arch=('i686' 'x86_64')
depends=('lmdb' 'openssl' 'pcre' 'libxml2' 'pam' 'tokyocabinet')
depends=('lmdb' 'openssl102-opt' 'pcre' 'libxml2' 'pam' 'tokyocabinet')
makedepends=('which')
optdepends=('libvirt' 'postgresql-libs' 'libmariadbclient' 'acl')
install=${pkgname}.install
@@ -39,7 +39,7 @@ build() {
./configure \
--prefix=/usr \
--with-workdir=/var/${pkgname} \
--with-openssl \
--with-openssl=/opt/openssl102 \
--with-pcre \
--with-libacl=check \
--with-libxml2 \

+ 72
- 0
openssl102-opt/PKGBUILD View File

@@ -0,0 +1,72 @@
# Original maintainer: Pierre Schmitz <pierre@archlinux.de>

pkgname=openssl102-opt
_ver=1.0.2s
# 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=('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'
'openssl-1.0-versioned-symbols.patch')
sha256sums=('cabd5c9492825ce5bd23f3c3aeed6a97f8142f606d893df216411f07d1abab96'
'SKIP'
'754d6107a306311e15a1db6a1cc031b81691c8b9865e8809ac60ca6f184c957c'
'c54ae87c602eaa1530a336ab7c6e22e12898e1941012349c153e52553df64a13'
'353a84e4c92e36c379ebd9216b8f8fb9c271396583561eb84ac8c825979acaa6')
validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
'7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C')

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

# add symbol versioning to prevent conflicts with openssl 1.1 symbols (Debian)
patch -p1 -i "$srcdir"/openssl-1.0-versioned-symbols.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=/opt/openssl102 \
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
}

+ 11
- 0
openssl102-opt/no-rpath.patch View File

@@ -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

+ 4667
- 0
openssl102-opt/openssl-1.0-versioned-symbols.patch
File diff suppressed because it is too large
View File


+ 26
- 0
openssl102-opt/ssl3-test-failure.patch View File

@@ -0,0 +1,26 @@
From: Kurt Roeckx <kurt@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

Loading…
Cancel
Save