diff --git a/net-libs/mbedtls/mbedtls-2.13.1.recipe b/net-libs/mbedtls/mbedtls-2.13.1.recipe deleted file mode 100644 index b13529f43..000000000 --- a/net-libs/mbedtls/mbedtls-2.13.1.recipe +++ /dev/null @@ -1,139 +0,0 @@ -SUMMARY="Open source, portable, easy to use, readable and flexible SSL library" -DESCRIPTION="mbed TLS (formerly known as PolarSSL) makes it trivially easy for \ -developers to include cryptographic and SSL/TLS capabilities in their (embedded) \ -products, facilitating this functionality with a minimal coding footprint." -HOMEPAGE="https://tls.mbed.org/" -COPYRIGHT="2006-2018 ARM Limited" -LICENSE="Apache v2" -REVISION="2" -SOURCE_URI="https://github.com/ARMmbed/mbedtls/archive/mbedtls-$portVersion.tar.gz" -CHECKSUM_SHA256="e62fdea0110d3aa9082b3e1ccdbbaf520161830b1f3a57ae3124a7d5963c2a37" -SOURCE_DIR="mbedtls-mbedtls-$portVersion" -PATCHES="mbedtls-$portVersion.patchset" - -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -libcryptoVersion="3" -libtlsVersion="12" -libx509Version="0" - -PROVIDES=" - mbedtls$secondaryArchSuffix = $portVersion - lib:libmbedcrypto$secondaryArchSuffix = $libcryptoVersion compat >= $libcryptoVersion - lib:libmbedtls$secondaryArchSuffix = $libtlsVersion compat >= $libtlsVersion - lib:libmbedx509$secondaryArchSuffix = $libx509Version compat >= $libx509Version - " -if [ -z "$secondaryArchSuffix" ]; then - PROVIDES="$PROVIDES - cmd:mbedtls_aescrypt2 = $portVersion - cmd:mbedtls_benchmark = $portVersion - cmd:mbedtls_cert_app = $portVersion - cmd:mbedtls_cert_req = $portVersion - cmd:mbedtls_cert_write = $portVersion - cmd:mbedtls_crl_app = $portVersion - cmd:mbedtls_crypt_and_hash = $portVersion - cmd:mbedtls_dh_client = $portVersion - cmd:mbedtls_dh_genprime = $portVersion - cmd:mbedtls_dh_server = $portVersion - cmd:mbedtls_dtls_client = $portVersion - cmd:mbedtls_dtls_server = $portVersion - cmd:mbedtls_ecdh_curve25519 = $portVersion - cmd:mbedtls_ecdsa = $portVersion - cmd:mbedtls_gen_entropy = $portVersion - cmd:mbedtls_gen_key = $portVersion - cmd:mbedtls_gen_random_ctr_drbg = $portVersion - cmd:mbedtls_gen_random_havege = $portVersion - cmd:mbedtls_generic_sum = $portVersion - cmd:mbedtls_hello = $portVersion - cmd:mbedtls_key_app = $portVersion - cmd:mbedtls_key_app_writer = $portVersion - cmd:mbedtls_mini_client = $portVersion - cmd:mbedtls_mpi_demo = $portVersion - cmd:mbedtls_pem2der = $portVersion - cmd:mbedtls_pk_decrypt = $portVersion - cmd:mbedtls_pk_encrypt = $portVersion - cmd:mbedtls_pk_sign = $portVersion - cmd:mbedtls_pk_verify = $portVersion - cmd:mbedtls_req_app = $portVersion - cmd:mbedtls_rsa_decrypt = $portVersion - cmd:mbedtls_rsa_encrypt = $portVersion - cmd:mbedtls_rsa_genkey = $portVersion - cmd:mbedtls_rsa_sign = $portVersion - cmd:mbedtls_rsa_sign_pss = $portVersion - cmd:mbedtls_rsa_verify = $portVersion - cmd:mbedtls_rsa_verify_pss = $portVersion - cmd:mbedtls_selftest = $portVersion - cmd:mbedtls_ssl_cert_test = $portVersion - cmd:mbedtls_ssl_client1 = $portVersion - cmd:mbedtls_ssl_client2 = $portVersion - cmd:mbedtls_ssl_fork_server = $portVersion - cmd:mbedtls_ssl_mail_client = $portVersion - cmd:mbedtls_ssl_server = $portVersion - cmd:mbedtls_ssl_server2 = $portVersion - cmd:mbedtls_strerror = $portVersion - cmd:mbedtls_udp_proxy = $portVersion - cmd:mbedtls_udp_proxy_wrapper.sh = $portVersion - cmd:mbedtls_zeroize = $portVersion - " -fi -REQUIRES=" - haiku$secondaryArchSuffix - " - -PROVIDES_devel=" - mbedtls${secondaryArchSuffix}_devel = $portVersion - devel:libmbedcrypto$secondaryArchSuffix = $libcryptoVersion compat >= $libcryptoVersion - devel:libmbedtls$secondaryArchSuffix = $libtlsVersion compat >= $libtlsVersion - devel:libmbedx509$secondaryArchSuffix = $libx509Version compat >= $libx509Version - " -REQUIRES_devel=" - mbedtls$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - " -BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:make - cmd:perl - cmd:python - cmd:sed - " - -PATCH() -{ - sed -i \ - -e "s|/include/mbedtls|/$relativeIncludeDir|;" \ - -e "s|/include|/$relativeIncludeDir|;" \ - -e "s|/bin/|/$relativeBinDir/|;" \ - -e "s|/bin\$|/$relativeBinDir|;" \ - -e "s|/lib\$|/$relativeLibDir|;" \ - Makefile -} - -BUILD() -{ - # Haiku is unix-like and network functions are in libnetwork - make CFLAGS="-Dunix" LDFLAGS="-lnetwork" SHARED=yes WARNING_CFLAGS="" -} - -INSTALL() -{ - make install SHARED=yes DESTDIR="$prefix" - - prepareInstalledDevelLibs libmbedcrypto libmbedtls libmbedx509 - - packageEntries devel \ - "$developDir" - - if [ -n "$secondaryArchSuffix" ]; then - rm -rf "$binDir" - fi -} - -TEST() -{ - LIBRARY_PATH="$sourceDir/library${LIBRARY_PATH:+:$LIBRARY_PATH}" make check -} diff --git a/net-libs/mbedtls/mbedtls-2.25.0.recipe b/net-libs/mbedtls/mbedtls-2.25.0.recipe new file mode 100644 index 000000000..199d6591c --- /dev/null +++ b/net-libs/mbedtls/mbedtls-2.25.0.recipe @@ -0,0 +1,160 @@ +SUMMARY="Open source, portable, easy to use, readable and flexible SSL library" +DESCRIPTION="mbed TLS (formerly known as PolarSSL) makes it trivially easy for \ +developers to include cryptographic and SSL/TLS capabilities in their (embedded) \ +products, facilitating this functionality with a minimal coding footprint." +HOMEPAGE="https://tls.mbed.org/" +COPYRIGHT="2006-2018 ARM Limited" +LICENSE="Apache v2" +REVISION="1" +SOURCE_URI="https://github.com/ARMmbed/mbedtls/archive/mbedtls-$portVersion.tar.gz" +CHECKSUM_SHA256="ea2049c2dd4868693998d5a9780e198194be5aea1706ff4a9d4f882f18c0a101" +SOURCE_DIR="mbedtls-mbedtls-$portVersion" +PATCHES="mbedtls-$portVersion.patchset" + +ARCHITECTURES="!x86_gcc2 x86_64" +SECONDARY_ARCHITECTURES="x86" + +libVersionmbedCrypto="6.25.0" +libVersionembedTls="13.25.0" +libVersionembedX509="1.25.0" +libVersionembedCryptoCompat="$libVersionmbedCrypto compat >= ${libVersionmbedCrypto%%.*}" +libVersionembedTlsCompat="$libVersionembedTls compat >= ${libVersionembedTls%%.*}" +libVersionembedX509Compat="$libVersionembedX509 compat >= ${libVersionembedX509%%.*}" + +PROVIDES=" + mbedtls$secondaryArchSuffix = $portVersion + lib:libmbedcrypto$secondaryArchSuffix = $libVersionembedCryptoCompat + lib:libmbedtls$secondaryArchSuffix = $libVersionembedTlsCompat + lib:libmbedx509$secondaryArchSuffix = $libVersionembedX509Compat + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +PROVIDES_tools=" + mbedtls${secondaryArchSuffix}_tools + cmd:aescrypt2 = $portVersion + cmd:benchmark = $portVersion + cmd:cert_app = $portVersion + cmd:cert_req = $portVersion + cmd:cert_write = $portVersion + cmd:crl_app = $portVersion + cmd:crypt_and_hash = $portVersion + cmd:crypto_examples = $portVersion + cmd:dh_client = $portVersion + cmd:dh_genprime = $portVersion + cmd:dh_server = $portVersion + cmd:dtls_client = $portVersion + cmd:dtls_server = $portVersion + cmd:ecdh_curve25519 = $portVersion + cmd:ecdsa = $portVersion + cmd:gen_entropy = $portVersion + cmd:gen_key = $portVersion + cmd:gen_random_ctr_drbg = $portVersion + cmd:gen_random_havege = $portVersion + cmd:generic_sum = $portVersion +# cmd:hello = $portVersion + cmd:key_app = $portVersion + cmd:key_app_writer = $portVersion + cmd:key_ladder_demo = $portVersion + cmd:key_ladder_demo.sh = $portVersion + cmd:mini_client = $portVersion + cmd:mpi_demo = $portVersion + cmd:pem2der = $portVersion + cmd:pk_decrypt = $portVersion + cmd:pk_encrypt = $portVersion + cmd:pk_sign = $portVersion + cmd:pk_verify = $portVersion + cmd:psa_constant_names = $portVersion + cmd:query_compile_time_config = $portVersion + cmd:req_app = $portVersion + cmd:rsa_decrypt = $portVersion + cmd:rsa_encrypt = $portVersion + cmd:rsa_genkey = $portVersion + cmd:rsa_sign = $portVersion + cmd:rsa_sign_pss = $portVersion + cmd:rsa_verify = $portVersion + cmd:rsa_verify_pss = $portVersion + cmd:selftest = $portVersion + cmd:ssl_cert_test = $portVersion + cmd:ssl_client1 = $portVersion + cmd:ssl_client2 = $portVersion + cmd:ssl_context_info = $portVersion + cmd:ssl_fork_server = $portVersion + cmd:ssl_mail_client = $portVersion + cmd:ssl_pthread_server = $portVersion + cmd:ssl_server = $portVersion + cmd:ssl_server2 = $portVersion + cmd:strerror = $portVersion + cmd:udp_proxy = $portVersion + cmd:udp_proxy_wrapper.sh = $portVersion + cmd:zeroize = $portVersion + " +REQUIRES_tools=" + mbedtls$secondaryArchSuffix == $portVersion base + haiku$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +PROVIDES_devel=" + mbedtls${secondaryArchSuffix}_devel = $portVersion + devel:libmbedcrypto$secondaryArchSuffix = $libVersionembedCryptoCompat + devel:libmbedtls$secondaryArchSuffix = $libVersionembedTlsCompat + devel:libmbedx509$secondaryArchSuffix = $libVersionembedX509Compat + " +REQUIRES_devel=" + mbedtls$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:ccache + cmd:cmake + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:perl + cmd:python3 + cmd:sed + " + +BUILD() +{ + mkdir -p build && cd build + + export LDFLAGS="-lnetwork" + + cmake .. -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$prefix \ + -DLIB_INSTALL_DIR=$libDir \ + -DINCLUDE_INSTALL_DIR=$includeDir \ + -DUSE_SHARED_MBEDTLS_LIBRARY=ON \ + -DENABLE_ZLIB_SUPPORT=ON \ + -DMBEDTLS_FATAL_WARNINGS=OFF + + make $jobArgs +} + +INSTALL() +{ + make -C build install + + # remove useless binary + rm -r $prefix/bin/hello + + prepareInstalledDevelLibs libmbedcrypto libmbedtls libmbedx509 + + packageEntries devel \ + "$developDir" + + packageEntries tools \ + $prefix/bin +} + +TEST() +{ + LIBRARY_PATH="$sourceDir/library${LIBRARY_PATH:+:$LIBRARY_PATH}" make test +} diff --git a/net-libs/mbedtls/patches/mbedtls-2.13.1.patchset b/net-libs/mbedtls/patches/mbedtls-2.13.1.patchset deleted file mode 100644 index 55355331e..000000000 --- a/net-libs/mbedtls/patches/mbedtls-2.13.1.patchset +++ /dev/null @@ -1,26 +0,0 @@ -From 91a6d0d1fbd5cddf91944957f37a5f2e6aadd94e Mon Sep 17 00:00:00 2001 -From: fbrosson -Date: Fri, 8 Jun 2018 04:47:21 +0000 -Subject: fix relative paths in udp_proxy_wrapper.sh - - -diff --git a/programs/test/udp_proxy_wrapper.sh b/programs/test/udp_proxy_wrapper.sh -index 29033d5..20df981 100755 ---- a/programs/test/udp_proxy_wrapper.sh -+++ b/programs/test/udp_proxy_wrapper.sh -@@ -4,9 +4,9 @@ - - set -u - --MBEDTLS_BASE="$(dirname -- "$0")/../.." --TPXY_BIN="$MBEDTLS_BASE/programs/test/udp_proxy" --SRV_BIN="$MBEDTLS_BASE/programs/ssl/ssl_server2" -+MBEDTLS_BASE="$(dirname -- "$0")" -+TPXY_BIN="$MBEDTLS_BASE/mbedtls_udp_proxy" -+SRV_BIN="$MBEDTLS_BASE/mbedtls_ssl_server2" - - : ${VERBOSE:=0} - --- -2.17.1 - diff --git a/net-libs/mbedtls/patches/mbedtls-2.25.0.patchset b/net-libs/mbedtls/patches/mbedtls-2.25.0.patchset new file mode 100644 index 000000000..bac1012ac --- /dev/null +++ b/net-libs/mbedtls/patches/mbedtls-2.25.0.patchset @@ -0,0 +1,64 @@ +From 476757ef4923fc1cab36d65e3373b2383ad90a5f Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sun, 13 Dec 2020 20:50:16 +0000 +Subject: Use variable to install headers + + +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index 62c0f62..3288afd 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -6,11 +6,11 @@ if(INSTALL_MBEDTLS_HEADERS) + file(GLOB psa_headers "psa/*.h") + + install(FILES ${headers} +- DESTINATION include/mbedtls ++ DESTINATION ${INCLUDE_INSTALL_DIR}/mbedtls + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + + install(FILES ${psa_headers} +- DESTINATION include/psa ++ DESTINATION ${INCLUDE_INSTALL_DIR}/psa + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + + endif(INSTALL_MBEDTLS_HEADERS) +-- +2.28.0 + + +From ca2707ac6d600e690678bb813ea5145d39facb88 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Mon, 14 Dec 2020 22:38:15 +0000 +Subject: Fix reference to python3 + + +diff --git a/tests/Makefile b/tests/Makefile +index 511db9d..8957262 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -42,6 +42,10 @@ ifdef WINDOWS + WINDOWS_BUILD=1 + endif + ++ifdef HAIKU ++HAIKU_BUILD=1 ++endif ++ + ifdef WINDOWS_BUILD + DLEXT=dll + EXEXT=.exe +@@ -55,7 +59,11 @@ DLEXT ?= so + EXEXT= + SHARED_SUFFIX= + # python2 for POSIX since FreeBSD has only python2 as default. ++ifdef !HAIKU_BUILD #we use python3 on Haiku + PYTHON ?= python2 ++else ++PYTHON ?= python3 ++endif + endif + + # Zlib shared library extensions: +-- +2.28.0 +