From 02c58ad36e679370360bd9a1cfdf652d0944fd43 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 23 Feb 2024 05:22:07 +0100 Subject: mbedtls: update to 2.28.7 --- package/mbedtls/Makefile | 12 +++++------- package/mbedtls/patches/patch-Makefile | 35 ++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 package/mbedtls/patches/patch-Makefile diff --git a/package/mbedtls/Makefile b/package/mbedtls/Makefile index 9771ffc96..9ce0d5468 100644 --- a/package/mbedtls/Makefile +++ b/package/mbedtls/Makefile @@ -4,17 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mbedtls -PKG_VERSION:= 2.3.0 +PKG_VERSION:= 2.28.7 PKG_RELEASE:= 1 -PKG_HASH:= 590734c8bc8b3ac48e9123d44bf03562e91f8dce0d1ac2615c318c077f3215b2 +PKG_HASH:= 1df6073f0cf6a4e1953890bf5e0de2a8c7e6be50d6d6c69fa9fefcb1d14e981a PKG_DESCR:= embedded ssl/tls library PKG_SECTION:= libs/crypto PKG_URL:= https://tls.mbed.org -PKG_SITES:= https://tls.mbed.org/download/ +PKG_SITES:= https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/ PKG_LIBNAME:= libmbedtls PKG_OPTS:= dev -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-apache.tgz +DISTFILES:= v$(PKG_VERSION).tar.gz include $(ADK_TOPDIR)/mk/package.mk @@ -24,9 +24,7 @@ CONFIG_STYLE:= manual ALL_TARGET:= lib TARGET_CFLAGS+= -DSHARED -libpolarssl-install: +libmbedtls-install: $(INSTALL_DIR) $(IDIR_LIBMBEDTLS)/usr/lib - $(CP) $(WRKINST)/usr/lib/libpolarssl.so* \ - $(IDIR_LIBMBEDTLS)/usr/lib include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/mbedtls/patches/patch-Makefile b/package/mbedtls/patches/patch-Makefile new file mode 100644 index 000000000..95c3340e1 --- /dev/null +++ b/package/mbedtls/patches/patch-Makefile @@ -0,0 +1,35 @@ +--- mbedtls-3.5.2.orig/Makefile 2024-01-24 10:49:11.000000000 +0100 ++++ mbedtls-3.5.2/Makefile 2024-02-22 19:10:23.460591189 +0100 +@@ -79,22 +79,22 @@ $(VISUALC_FILES): + + ifndef WINDOWS + install: no_test +- mkdir -p $(DESTDIR)/include/mbedtls +- cp -rp include/mbedtls $(DESTDIR)/include +- mkdir -p $(DESTDIR)/include/psa +- cp -rp include/psa $(DESTDIR)/include ++ mkdir -p $(DESTDIR)/usr/include/mbedtls ++ cp -rp include/mbedtls $(DESTDIR)/usr/include ++ mkdir -p $(DESTDIR)/usr/include/psa ++ cp -rp include/psa $(DESTDIR)/usr/include + +- mkdir -p $(DESTDIR)/lib +- cp -RP library/libmbedtls.* $(DESTDIR)/lib +- cp -RP library/libmbedx509.* $(DESTDIR)/lib +- cp -RP library/libmbedcrypto.* $(DESTDIR)/lib ++ mkdir -p $(DESTDIR)/usr/lib ++ cp -RP library/libmbedtls.* $(DESTDIR)/usr/lib ++ cp -RP library/libmbedx509.* $(DESTDIR)/usr/lib ++ cp -RP library/libmbedcrypto.* $(DESTDIR)/usr/lib + +- mkdir -p $(DESTDIR)/bin ++ mkdir -p $(DESTDIR)/usr/bin + for p in programs/*/* ; do \ + if [ -x $$p ] && [ ! -d $$p ] ; \ + then \ + f=$(PREFIX)`basename $$p` ; \ +- cp $$p $(DESTDIR)/bin/$$f ; \ ++ cp $$p $(DESTDIR)/usr/bin/$$f ; \ + fi \ + done + -- cgit v1.2.3