From 803f92acf93741b306498d6fa009cab6ae51cd57 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Thu, 7 Mar 2019 21:48:17 +0100 Subject: [PATCH] openssl: declare that it breaks openssl-tool << 1.1.1b-1 To not get errors on apt update && apt upgrade --- packages/openssl/build.sh | 4 +++- packages/openssl/openssl-tool.subpackage.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/openssl/build.sh b/packages/openssl/build.sh index de340f488..7aa6ed974 100644 --- a/packages/openssl/build.sh +++ b/packages/openssl/build.sh @@ -3,13 +3,15 @@ TERMUX_PKG_DESCRIPTION="Library implementing the SSL and TLS protocols as well a TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_DEPENDS="ca-certificates" TERMUX_PKG_VERSION=1.1.1b -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b TERMUX_PKG_SRCURL=https://www.openssl.org/source/openssl-${TERMUX_PKG_VERSION/\~/-}.tar.gz TERMUX_PKG_CONFFILES="etc/tls/openssl.cnf" TERMUX_PKG_RM_AFTER_INSTALL="bin/c_rehash etc/ssl/misc" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_CONFLICTS="libcurl (<< 7.61.0-1)" +TERMUX_PKG_BREAKS="openssl-tool (<< 1.1.1b-1)" +TERMUX_PKG_REPLACES="openssl-tool (<< 1.1.1b-1)" termux_step_configure() { CFLAGS+=" -DNO_SYSLOG" diff --git a/packages/openssl/openssl-tool.subpackage.sh b/packages/openssl/openssl-tool.subpackage.sh index 62ede318f..fe8c9b50a 100644 --- a/packages/openssl/openssl-tool.subpackage.sh +++ b/packages/openssl/openssl-tool.subpackage.sh @@ -1,3 +1,3 @@ TERMUX_SUBPKG_INCLUDE="bin" TERMUX_SUBPKG_DESCRIPTION="The openssl command line cryptographic tool" -TERMUX_SUBPKG_DEPENDS="openssl" +TERMUX_SUBPKG_DEPENDS="openssl (>= 1.1.1b-1)"