From 09d95e44fc3d1a9f900b7305b10dc241a12d6f37 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 14 Apr 2018 14:33:46 +0200 Subject: [PATCH] mbedtls: change libmbedcrypto.so soversion back to 0 mbedtls changed in version 2.7.0 and 2.7.2 the soversion of the libmbedcrypto.so library, use the old version again to be able to use the new library with binaries compiled against the old mbedtls library. Some binaries got rebuild to for the 2.7.0 release and are now using libmbedcrypto.so.1, the older ones are still using libmbedcrypto.so.0. Go back to libmbedcrypto.so.0 and make the system rebuild the binaries which were rebuild for 2.7.0 again. This should make the libmbedcrypto.so library be compatible with the old version shipped with 17.01. Fixes: 3ca1438ae0 ("mbedtls: update to version 2.7.2") Fixes: f609913b5c ("mbedtls: update to version 2.7.0") Signed-off-by: Hauke Mehrtens --- package/libs/mbedtls/Makefile | 2 +- .../patches/300-soversion-compatibility.patch | 26 +++++++++++++++++++ package/libs/ustream-ssl/Makefile | 2 +- package/network/services/openvpn/Makefile | 2 +- package/network/utils/curl/Makefile | 2 +- package/utils/px5g/Makefile | 2 +- 6 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 package/libs/mbedtls/patches/300-soversion-compatibility.patch diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile index 619bbcfef1..caa2405ce9 100644 --- a/package/libs/mbedtls/Makefile +++ b/package/libs/mbedtls/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mbedtls PKG_VERSION:=2.7.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_USE_MIPS16:=0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz diff --git a/package/libs/mbedtls/patches/300-soversion-compatibility.patch b/package/libs/mbedtls/patches/300-soversion-compatibility.patch new file mode 100644 index 0000000000..4d33be2686 --- /dev/null +++ b/package/libs/mbedtls/patches/300-soversion-compatibility.patch @@ -0,0 +1,26 @@ +mbedtls changed in version 2.7.0 and 2.7.2 the soversion of the +libmbedcrypto.so library, use the old version again to be able to use +the new library with binaries compiled against the old library. + +--- a/library/CMakeLists.txt ++++ b/library/CMakeLists.txt +@@ -141,7 +141,7 @@ endif(USE_STATIC_MBEDTLS_LIBRARY) + + if(USE_SHARED_MBEDTLS_LIBRARY) + add_library(mbedcrypto SHARED ${src_crypto}) +- set_target_properties(mbedcrypto PROPERTIES VERSION 2.7.2 SOVERSION 2) ++ set_target_properties(mbedcrypto PROPERTIES VERSION 2.7.2 SOVERSION 0) + target_link_libraries(mbedcrypto ${libs}) + + add_library(mbedx509 SHARED ${src_x509}) +--- a/library/Makefile ++++ b/library/Makefile +@@ -33,7 +33,7 @@ endif + + SOEXT_TLS=so.10 + SOEXT_X509=so.0 +-SOEXT_CRYPTO=so.2 ++SOEXT_CRYPTO=so.0 + + DLEXT=so + # OSX shared library extension: diff --git a/package/libs/ustream-ssl/Makefile b/package/libs/ustream-ssl/Makefile index b9b9e19dfb..95dd0e8e55 100644 --- a/package/libs/ustream-ssl/Makefile +++ b/package/libs/ustream-ssl/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ustream-ssl -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/ustream-ssl.git diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile index 7e0677baa3..288a354b0e 100644 --- a/package/network/services/openvpn/Makefile +++ b/package/network/services/openvpn/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openvpn PKG_VERSION:=2.4.4 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_URL:=\ https://build.openvpn.net/downloads/releases/ \ diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile index 07056a2cd0..a0abf2a85d 100644 --- a/package/network/utils/curl/Makefile +++ b/package/network/utils/curl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=curl PKG_VERSION:=7.52.1 -PKG_RELEASE:=8 +PKG_RELEASE:=9 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://curl.haxx.se/download/ \ diff --git a/package/utils/px5g/Makefile b/package/utils/px5g/Makefile index 4ea495867c..da8d56dcc0 100644 --- a/package/utils/px5g/Makefile +++ b/package/utils/px5g/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=px5g -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_LICENSE:=LGPL-2.1 PKG_BUILD_DIR:=$(BUILD_DIR)/px5g-$(BUILD_VARIANT) -- 2.25.1