diff --git a/common/shlibs b/common/shlibs index ffddffdc9e3..cff714ae96e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1656,9 +1656,9 @@ libid3.so id3lib-3.8.3_1 libid3-3.8.so.3 id3lib-3.8.3_1 libgirara-gtk3.so.1 girara-0.2.2_1 libjq.so.1 jq-devel-1.4_1 -libcrypto.so.30 libressl-2.0.1_1 -libssl.so.29 libressl-2.1.2_1 -libtls.so.1 libressl-2.1.2_1 +libcrypto.so.30 libcrypto30-2.1.2_3 +libssl.so.29 libssl29-2.1.2_3 +libtls.so.1 libtls1-2.1.2_3 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6 libportmidi.so portmidi-217_1 libsox.so.2 sox-14.4.1_1 diff --git a/srcpkgs/libcrypto30 b/srcpkgs/libcrypto30 new file mode 120000 index 00000000000..cab5b6fcb51 --- /dev/null +++ b/srcpkgs/libcrypto30 @@ -0,0 +1 @@ +libressl \ No newline at end of file diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template index 262007079d7..87e4ea3d7c6 100644 --- a/srcpkgs/libressl/template +++ b/srcpkgs/libressl/template @@ -1,17 +1,20 @@ # Template file for 'libressl' pkgname=libressl version=2.1.2 -revision=2 +revision=3 bootstrap=yes build_style=gnu-configure configure_args="--enable-libtls" -short_desc="FREE version of the SSL/TLS protocol forked from OpenSSL" +short_desc="Version of the TLS/crypto stack forked from OpenSSL" maintainer="Juan RP " license="OpenSSL-License, SSLeay-License, ISC" homepage="http://www.libressl.org/" distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz" checksum=07c05f12e5d49dbfcf82dd23b6b4877b7cdb1c8e4c8dd27cb4d9e5758a6caf52 +# Compat pkg that depends on the real pkgs. +depends="libcrypto30-${version}_${revision} libssl29-${version}_${revision} libtls1-${version}_${revision}" + post_build() { $CC -Wall $CFLAGS -DHAVE_STRNDUP -Iinclude -Lcrypto/.libs \ $LDFLAGS ${FILESDIR}/c_rehash.c -o ${wrksrc}/c_rehash -lcrypto @@ -21,9 +24,30 @@ post_install() { find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete } +libcrypto30_package() { + short_desc+=" - crypto library" + replaces="libressl<2.1.2_3" + pkg_install() { + vmove usr/lib/libcrypto.so.* + } +} +libssl29_package() { + short_desc+=" - SSL/TLS library" + replaces="libressl<2.1.2_3" + pkg_install() { + vmove usr/lib/libssl.so.* + } +} +libtls1_package() { + short_desc+=" - new TLS library" + replaces="libressl<2.1.2_3" + pkg_install() { + vmove usr/lib/libtls.so.* + } +} libressl-devel_package() { short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" + depends="libcrypto30-${version}_${revision} libssl29-${version}_${revision} libtls1-${version}_${revision}" conflicts="openssl-devel>=0" pkg_install() { vmove usr/include @@ -36,7 +60,7 @@ libressl-devel_package() { libressl-openssl_package() { short_desc+=" - utilities" provides="openssl-${version}_${revision}" - replaces="libressl<2.0.1_2 openssl>=0" + replaces="openssl>=0" conf_files="/etc/ssl/openssl.cnf" pkg_install() { vinstall ${FILESDIR}/openssl.cnf 644 etc/ssl diff --git a/srcpkgs/libssl29 b/srcpkgs/libssl29 new file mode 120000 index 00000000000..cab5b6fcb51 --- /dev/null +++ b/srcpkgs/libssl29 @@ -0,0 +1 @@ +libressl \ No newline at end of file diff --git a/srcpkgs/libtls1 b/srcpkgs/libtls1 new file mode 120000 index 00000000000..cab5b6fcb51 --- /dev/null +++ b/srcpkgs/libtls1 @@ -0,0 +1 @@ +libressl \ No newline at end of file