From 4427ff68f653b17c8d086178fe5e5599ab6468d8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 14 Jul 2014 11:47:07 +0200 Subject: [PATCH] openssl: add conflicts with libressl. --- srcpkgs/openssl/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template index 7fcea19427..b3e56d0d50 100644 --- a/srcpkgs/openssl/template +++ b/srcpkgs/openssl/template @@ -2,7 +2,7 @@ pkgname=openssl _openssl_version=1.0.1 version=${_openssl_version}h -revision=1 +revision=2 bootstrap=yes short_desc="Secure Socket Layer and cryptographic library - runtime utilities" maintainer="Juan RP " @@ -17,6 +17,7 @@ fi depends="perl" makedepends="zlib-devel" +conflicts="libressl-openssl>=0" conf_files="/etc/ssl/openssl.cnf" make_dirs=" @@ -70,6 +71,7 @@ do_install() { } openssl-devel_package() { + conflicts="libressl-devel>=0" depends="zlib-devel libssl>=${version}_${revision}" short_desc="Secure Socket Layer and cryptographic library - development files" pkg_install() {