Ravenports generated: 26 Apr 2024 03:31

diff --git a/Mk/Misc/fpc_equivalents b/Mk/Misc/fpc_equivalents
index 4c414df..c64c4c7 100644 (file)
--- a/Mk/Misc/fpc_equivalents
+++ b/Mk/Misc/fpc_equivalents
@@ -418,7 +418,7 @@ perl-enum 1.12 generated
 php82-yaml 2.2.3 textproc/pecl-yaml
 php83-tokenizer 8.3.6 devel/php83-tokenizer
 python-attrs 23.2.0 generated
-python-black 24.4.1 generated
+python-black 24.4.2 generated
 python-netbox-users-and-computers 0.8.5 generated
 R-RColorBrewer 1.1-3 generated
 R-brew 1.0-10 generated
@@ -516,7 +516,7 @@ R-R.utils 2.12.3 generated
 R-cpp11 0.4.7 generated
 libass 0.17.1 multimedia/libass
 libutp 20230213 net/libutp
-mkvtoolnix 82.0 multimedia/mkvtoolnix
+mkvtoolnix 83.0 multimedia/mkvtoolnix
 pciutils 3.12.0 sysutils/pciutils
 perl-CPAN-DistnameInfo 0.12 generated
 perl-EV 4.34 generated
@@ -2974,7 +2974,7 @@ gstreamer1-plugins-ogg 1.24.2 audio/gstreamer1-plugins-ogg
 gstreamer1-plugins-theora 1.24.2 multimedia/gstreamer1-plugins-theora
 gstreamer1-plugins-xvideo 1.24.2 x11/gstreamer1-plugins-x
 libnspsl 0.1.7 dns/libnspsl
-mbedtls 3.5.2 security/mbedtls
+mbedtls 3.6.0 security/mbedtls
 perl-Text-VisualWidth 0.02 generated
 perl-Web-Scraper 0.38 generated
 perl-libwww-perl 6.770 generated

diff --git a/Mk/Misc/port_dates b/Mk/Misc/port_dates
index 6f7acab..de3a42d 100644 (file)
--- a/Mk/Misc/port_dates
+++ b/Mk/Misc/port_dates
@@ -422,7 +422,7 @@ aria2 1534352487 1700293415
 arj 1610256086 1635420406
 asciidoc 1493071605 1683333830
 asdf 1507479741 1662486107
-asio 1672355121 1705174790
+asio 1672355121 1714084163
 aspell 1502060523 1705174790
 aspell-af 1502068773 1588189827
 aspell-am 1502068773 1588189827
@@ -790,7 +790,7 @@ gmrun 1505322911 1675111805
 gn 1584746897 1694476765
 gnatcoll-bindings 1548091991 1714047595
 gnatcoll-core 1531621015 1714047595
-gnatcoll-db 1548091991 1695385067
+gnatcoll-db 1548091991 1714084163
 gnatcross 1507759974 1693458560
 gnatcross-binutils 1507672935 1708901137
 gnatcross-bootstrap 1507905256 1689637212
@@ -884,7 +884,7 @@ gvfs 1540240491 1711418796
 gwenhywfar 1526490198 1697607314
 gzip 1490801860 1692749003
 harfbuzz 1496945521 1713827571
-hdf5 1610242705 1700007141
+hdf5 1610242705 1714084163
 help2man 1491450503 1672368542
 heme 1519243956 1586564682
 hexchat 1548959920 1709842573
@@ -1158,7 +1158,7 @@ libparserutils 1562542473 1704560675
 libpcap 1519243956 1698852221
 libpeas 1556055518 1698852221
 libplacebo 1700693468 1706061119
-libproxy 1512063954 1712791193
+libproxy 1512063954 1714084163
 libpsl 1536167980 1705207951
 libqxp 1516379090 1682043173
 libraqm 1585947938 1698852221
@@ -1372,7 +1372,7 @@ neofetch 1521682155 1596479353
 neon 1598807981 1707024442
 neovim 1498963086 1706974897
 net-snmp 1673208502 1692577240
-netpbm 1539061189 1698614917
+netpbm 1539061189 1714084163
 netsurf-buildsystem 1562435747 1704560675
 nettle 1504927025 1686655340
 nfdump 1578677884 1708286387
@@ -2112,7 +2112,7 @@ perl-Test-Taint 1497500768 1691278081
 perl-Test-Toolbox 1561921684 1691278081
 perl-Test-UseAllModules 1497500768 1691278081
 perl-Test-Warn 1497500768 1691278081
-perl-Test2-Suite 1497500768 1714047595
+perl-Test2-Suite 1497500768 1714084163
 perl-Text-Aligner 1497500768 1691278081
 perl-Text-CSV_XS 1497500768 1713636601
 perl-Text-Diff 1497500768 1691278081
@@ -2452,8 +2452,8 @@ python-bleach 1672593706 1696912821
 python-blinker 1683411852 1699379009
 python-booleanOperations 1578099803 1696912821
 python-borgbackup 1546709443 1711947414
-python-boto3 1685159808 1714047595
-python-botocore 1506630685 1714047595
+python-boto3 1685159808 1714084163
+python-botocore 1506630685 1714084163
 python-bottle 1707691054 1708536699
 python-breathe 1586968094 1696912821
 python-build 1709620248 1711904756
@@ -2532,7 +2532,7 @@ python-drf-spectacular 1685159808 1712099062
 python-drf-spectacular-sidecar 1685159808 1712099062
 python-drf-yasg 1523886665 1696912821
 python-dulwich 1673151504 1714075293
-python-e3-core 1590864648 1696912821
+python-e3-core 1590864648 1714084163
 python-easysnmp 1673151504 1696912821
 python-et-xmlfile 1705198029 1705198029
 python-evdev 1693458560 1708536699
@@ -2780,6 +2780,7 @@ python-regex 1586475549 1713300892
 python-relatorio 1697992620 1714047595
 python-reportlab 1587507764 1713452623
 python-requests 1492751561 1696912821
+python-requests-cache 1714084163 1714084163
 python-requests-oauthlib 1539401434 1711418796
 python-requests-toolbelt 1539401434 1696912821
 python-resolvelib 1624151755 1696912821
@@ -2876,6 +2877,7 @@ python-typogrify 1615604622 1696912821
 python-tzdata 1639337659 1707713783
 python-ufoLib2 1578099803 1696912821
 python-uritemplate 1517585344 1696912821
+python-url-normalize 1714084163 1714084163
 python-urllib3 1496175470 1708286387
 python-uuid 1673151504 1696912821
 python-validate_email 1526859609 1696912821

diff --git a/Mk/Misc/repology.json b/Mk/Misc/repology.json
index 25ab3df..314be73 100644 (file)
--- a/Mk/Misc/repology.json
+++ b/Mk/Misc/repology.json
@@ -8032,10 +8032,10 @@
   ,{
      "bucket": "1E"
     ,"namebase": "python-black"
-    ,"version": "24.4.1"
+    ,"version": "24.4.2"
     ,"homepage": "https://github.com/psf/black"
     ,"keywords": [ "python" ]
-    ,"distfile": [ "mirror://PYPIWHL/2e/9f/1756108178a57fd3202ee1d2d3552dc1fe6f0097cc77faf34f053c77bf71/black-24.4.1-py3-none-any.whl" ]
+    ,"distfile": [ "mirror://PYPIWHL/0f/89/294c9a6b6c75a08da55e9d05321d0707e9418735e3062b12ef0f54c33474/black-24.4.2-py3-none-any.whl" ]
     ,"contacts": [ { "name": "Python Automaton", "email": "python@ironwolf.systems" } ]
     ,"variants":
      [
@@ -9908,10 +9908,10 @@
   ,{
      "bucket": "26"
     ,"namebase": "mkvtoolnix"
-    ,"version": "82.0"
+    ,"version": "83.0"
     ,"homepage": "https://mkvtoolnix.download/"
     ,"keywords": [ "multimedia", "graphics" ]
-    ,"distfile": [ "https://mkvtoolnix.download/sources/mkvtoolnix-82.0.tar.xz" ]
+    ,"distfile": [ "https://mkvtoolnix.download/sources/mkvtoolnix-83.0.tar.xz" ]
     ,"variants":
      [
       {
@@ -51780,7 +51780,7 @@
     ,"keywords": [ "python" ]
     ,"distfile": [ "mirror://PYPIWHL/ac/40/a2c6f948559339e15f6c6fe4b793fb741a50f5ca6c9ba63b5d961029e269/ansible-9.5.1-py3-none-any.whl" ]
     ,"contacts": [ { "name": "Python Automaton", "email": "python@ironwolf.systems" } ]
-    ,"cpe": { "product": "python-ansible", "vendor": "redhat" }
+    ,"cpe": { "product": "ansible", "vendor": "redhat" }
     ,"variants":
      [
       {
@@ -56719,10 +56719,10 @@
   ,{
      "bucket": "D6"
     ,"namebase": "mbedtls"
-    ,"version": "3.5.2"
+    ,"version": "3.6.0"
     ,"homepage": "https://www.trustedfirmware.org/projects/mbed-tls/"
     ,"keywords": [ "security", "devel" ]
-    ,"distfile": [ "mirror://GITHUB/ARMmbed:mbedtls:v3.5.2/ARMmbed-mbedtls-3.5.2.tar.gz" ]
+    ,"distfile": [ "mirror://GITHUB/ARMmbed:mbedtls:v3.6.0/ARMmbed-mbedtls-3.6.0.tar.gz", "mirror://GITHUB/Mbed-TLS:mbedtls-framework:750634d:framework/Mbed-TLS-mbedtls-framework-750634d.tar.gz" ]
     ,"cpe": { "product": "mbed_tls", "vendor": "arm" }
     ,"variants":
      [

diff --git a/Mk/Misc/rvnindex.txt b/Mk/Misc/rvnindex.txt
index 6d3a367..a359aae 100644 (file)
--- a/Mk/Misc/rvnindex.txt
+++ b/Mk/Misc/rvnindex.txt
@@ -995,8 +995,8 @@ php82-yaml-single-standard 2.2.3
 php83-tokenizer-single-standard 8.3.6
 python-attrs-single-v11 23.2.0
 python-attrs-single-v12 23.2.0
-python-black-single-v11 24.4.1
-python-black-single-v12 24.4.1
+python-black-single-v11 24.4.2
+python-black-single-v12 24.4.2
 python-netbox-users-and-computers-single-v11 0.8.5
 python-netbox-users-and-computers-single-v12 0.8.5
 R-RColorBrewer-single-standard 1.1-3
@@ -1250,10 +1250,10 @@ libutp-complete-standard 20230213
 libutp-primary-standard 20230213
 libutp-dev-standard 20230213
 libutp-docs-standard 20230213
-mkvtoolnix-complete-standard 82.0
-mkvtoolnix-primary-standard 82.0
-mkvtoolnix-man-standard 82.0
-mkvtoolnix-nls-standard 82.0
+mkvtoolnix-complete-standard 83.0
+mkvtoolnix-primary-standard 83.0
+mkvtoolnix-man-standard 83.0
+mkvtoolnix-nls-standard 83.0
 pciutils-complete-standard 3.12.0
 pciutils-primary-standard 3.12.0
 pciutils-tools-standard 3.12.0
@@ -6900,10 +6900,10 @@ gstreamer1-plugins-ogg-single-standard 1.24.2
 gstreamer1-plugins-theora-single-standard 1.24.2
 gstreamer1-plugins-xvideo-single-standard 1.24.2
 libnspsl-single-standard 0.1.7
-mbedtls-complete-standard 3.5.2
-mbedtls-primary-standard 3.5.2
-mbedtls-tools-standard 3.5.2
-mbedtls-dev-standard 3.5.2
+mbedtls-complete-standard 3.6.0
+mbedtls-primary-standard 3.6.0
+mbedtls-tools-standard 3.6.0
+mbedtls-dev-standard 3.6.0
 perl-Text-VisualWidth-single-536 0.02
 perl-Text-VisualWidth-single-538 0.02
 perl-Web-Scraper-single-536 0.38

diff --git a/bucket_1E/python-black b/bucket_1E/python-black
index 50cfb3f..ffa5d70 100644 (file)
--- a/bucket_1E/python-black
+++ b/bucket_1E/python-black
@@ -1,7 +1,7 @@
 # Buildsheet autogenerated by ravenadm tool -- Do not edit.
 
 NAMEBASE=              python-black
-VERSION=               24.4.1
+VERSION=               24.4.2
 KEYWORDS=              python
 VARIANTS=              v11 v12
 SDESC[v11]=            Uncompromising code formatter (3.11)
@@ -10,8 +10,8 @@ HOMEPAGE=             https://github.com/psf/black
 CONTACT=               Python_Automaton[python@ironwolf.systems]
 
 DOWNLOAD_GROUPS=       main
-SITES[main]=           PYPIWHL/2e/9f/1756108178a57fd3202ee1d2d3552dc1fe6f0097cc77faf34f053c77bf71
-DISTFILE[1]=           black-24.4.1-py3-none-any.whl:main
+SITES[main]=           PYPIWHL/0f/89/294c9a6b6c75a08da55e9d05321d0707e9418735e3062b12ef0f54c33474
+DISTFILE[1]=           black-24.4.2-py3-none-any.whl:main
 DF_INDEX=              1
 SPKGS[v11]=            single
 SPKGS[v12]=            single
@@ -21,7 +21,7 @@ OPTIONS_STANDARD=     none
 VOPTS[v11]=            PY311=ON PY312=OFF
 VOPTS[v12]=            PY311=OFF PY312=ON
 
-DISTNAME=              black-24.4.1.dist-info
+DISTNAME=              black-24.4.2.dist-info
 
 GENERATED=             yes
 
@@ -143,5 +143,5 @@ take previous formatting into account (see
 
 
 [FILE:108:distinfo]
-ecbab810604fe02c70b3a08afd39beb599f7cc9afd13e81f5336014133b4fe35       205086 black-24.4.1-py3-none-any.whl
+d36ed1124bb81b32f8614555b34cc4259c3fbc7eec17870e8ff8ded335b58d8c       205925 black-24.4.2-py3-none-any.whl
 

diff --git a/bucket_26/mkvtoolnix b/bucket_26/mkvtoolnix
index 6d5f91e..0d4d0f5 100644 (file)
--- a/bucket_26/mkvtoolnix
+++ b/bucket_26/mkvtoolnix
@@ -1,7 +1,7 @@
 # Buildsheet autogenerated by ravenadm tool -- Do not edit.
 
 NAMEBASE=              mkvtoolnix
-VERSION=               82.0
+VERSION=               83.0
 KEYWORDS=              multimedia graphics
 VARIANTS=              standard
 SDESC[standard]=       Matroska media files manipulation tools
@@ -10,7 +10,7 @@ CONTACT=              nobody
 
 DOWNLOAD_GROUPS=       main
 SITES[main]=           https://mkvtoolnix.download/sources/
-DISTFILE[1]=           mkvtoolnix-82.0.tar.xz:main
+DISTFILE[1]=           mkvtoolnix-83.0.tar.xz:main
 DF_INDEX=              1
 SPKGS[standard]=       complete
                        primary
@@ -84,7 +84,7 @@ under Linux, other Unices and Windows.
 
 
 [FILE:101:distinfo]
-635f1dcdc6c42852ea8fe621b50f68c224dda970fd8086944685111368d9c50c     11067168 mkvtoolnix-82.0.tar.xz
+6a8615436406c7fa45bfb2b6270da1bf06ea54cfcd13c3699643833e1d73ecbc     11278152 mkvtoolnix-83.0.tar.xz
 
 
 [FILE:1231:manifests/plist.primary]
@@ -152,7 +152,13 @@ share/mkvtoolnix/sounds/
  finished-3.webm
 
 
-[FILE:1563:manifests/plist.man]
+[FILE:1667:manifests/plist.man]
+share/man/be/man1/
+ mkvextract.1.gz
+ mkvinfo.1.gz
+ mkvmerge.1.gz
+ mkvpropedit.1.gz
+ mkvtoolnix-gui.1.gz
 share/man/bg/man1/
  mkvextract.1.gz
  mkvinfo.1.gz
@@ -245,7 +251,8 @@ share/man/zh_TW/man1/
  mkvtoolnix-gui.1.gz
 
 
-[FILE:1074:manifests/plist.nls]
+[FILE:1116:manifests/plist.nls]
+share/locale/be/LC_MESSAGES/mkvtoolnix.mo
 share/locale/bg/LC_MESSAGES/mkvtoolnix.mo
 share/locale/ca/LC_MESSAGES/mkvtoolnix.mo
 share/locale/cs/LC_MESSAGES/mkvtoolnix.mo
@@ -274,7 +281,7 @@ share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
 
 
 [FILE:389:patches/patch-Rakefile]
---- Rakefile.orig      2024-01-02 13:40:54 UTC
+--- Rakefile.orig      2024-03-10 18:17:35 UTC
 +++ Rakefile
 @@ -247,8 +247,6 @@ def determine_optimization_cflags
  end
@@ -288,9 +295,9 @@ share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
 
 
 [FILE:3314:patches/patch-configure]
---- configure.orig     2024-01-02 13:52:59 UTC
+--- configure.orig     2024-03-10 18:17:39 UTC
 +++ configure
-@@ -8913,14 +8913,10 @@ fi
+@@ -9131,14 +9131,10 @@ fi
  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fmt" >&5
  printf "%s\n" "$ac_cv_fmt" >&6; }
  
@@ -306,7 +313,7 @@ share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
  
  if test $ac_cv_fmt_v8 = yes; then
  
-@@ -9356,9 +9352,9 @@ printf "%s\n" "$qmake6_ver" >&6; }
+@@ -9576,9 +9572,9 @@ printf "%s\n" "$qmake6_ver" >&6; }
  
    qt_searchpath="$qt_libexecdir:$qt_bindir:$PATH"
  
@@ -319,7 +326,7 @@ share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
  
    # If under MinGW/MSYS2, fix relative include paths
    if ! test -z "${MINGW_PREFIX}"; then
-@@ -9368,11 +9364,11 @@ printf "%s\n" "$qmake6_ver" >&6; }
+@@ -9588,11 +9584,11 @@ printf "%s\n" "$qmake6_ver" >&6; }
    QT_INCFLAGS="`echo $QT_INCFLAGS | sed -e 's:-I[^/][^ ]*::g'`"
    QT_CFLAGS="$QT_CFLAGS $QT_INCFLAGS"
    QT_CFLAGS="`echo $QT_CFLAGS | sed -e 's/\$(EXPORT_ARCH_ARGS)//'`"
@@ -337,22 +344,22 @@ share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
    rm -rf "$qmake_dir"
 
 
-[FILE:359:patches/patch-lib_fmt_include_fmt_os.h]
---- lib/fmt/include/fmt/os.h.orig      2024-01-02 13:52:58 UTC
+[FILE:354:patches/patch-lib_fmt_include_fmt_os.h]
+--- lib/fmt/include/fmt/os.h.orig      2024-03-10 18:17:39 UTC
 +++ lib/fmt/include/fmt/os.h
-@@ -13,7 +13,7 @@
- #include <cstdio>
- #include <system_error>  // std::system_error
+@@ -15,7 +15,7 @@
+ 
+ #include "format.h"
  
 -#if defined __APPLE__ || defined(__FreeBSD__)
 +#if defined __APPLE__ || defined(__FreeBSD__) || defined(__DragonFly__)
- #  include <xlocale.h>  // for LC_NUMERIC_MASK on OS X
- #endif
- 
+ #  if FMT_HAS_INCLUDE(<xlocale.h>)
+ #    include <xlocale.h>  // for LC_NUMERIC_MASK on OS X
+ #  endif
 
 
 [FILE:368:patches/patch-lib_fmt_src_fmt.cc]
---- lib/fmt/src/fmt.cc.orig    2024-01-02 13:52:58 UTC
+--- lib/fmt/src/fmt.cc.orig    2024-03-10 18:17:39 UTC
 +++ lib/fmt/src/fmt.cc
 @@ -41,7 +41,7 @@ module;
  #if defined(_MSC_VER) || defined(__MINGW32__)
@@ -371,7 +378,7 @@ $NetBSD: patch-src_common_locale.cpp,v 1.2 2020/05/31 11:34:15 adam Exp $
 Remove broken SunOS section that is no longer needed.
 https://gitlab.com/mbunkus/mkvtoolnix/issues/2450
 
---- src/common/locale.cpp.orig 2024-01-02 13:40:55 UTC
+--- src/common/locale.cpp.orig 2024-03-10 18:17:35 UTC
 +++ src/common/locale.cpp
 @@ -286,12 +286,6 @@ get_local_charset() {
  
@@ -389,7 +396,7 @@ https://gitlab.com/mbunkus/mkvtoolnix/issues/2450
 
 
 [FILE:362:patches/patch-src_common_os.h]
---- src/common/os.h.orig       2024-01-02 13:40:55 UTC
+--- src/common/os.h.orig       2024-03-10 18:17:35 UTC
 +++ src/common/os.h
 @@ -21,7 +21,7 @@
  #else
@@ -403,7 +410,7 @@ https://gitlab.com/mbunkus/mkvtoolnix/issues/2450
 
 
 [FILE:761:patches/patch-src_mkvtoolnix-gui_util_sleep__inhibitor.cpp]
---- src/mkvtoolnix-gui/util/sleep_inhibitor.cpp.orig   2024-01-02 13:40:55 UTC
+--- src/mkvtoolnix-gui/util/sleep_inhibitor.cpp.orig   2024-03-10 18:17:35 UTC
 +++ src/mkvtoolnix-gui/util/sleep_inhibitor.cpp
 @@ -6,7 +6,7 @@
  # include "mkvtoolnix-gui/util/sleep_inhibitor/windows.h"
@@ -426,7 +433,7 @@ https://gitlab.com/mbunkus/mkvtoolnix/issues/2450
 
 
 [FILE:308:patches/patch-src_mkvtoolnix-gui_util_sleep__inhibitor_linux__logind.cpp]
---- src/mkvtoolnix-gui/util/sleep_inhibitor/linux_logind.cpp.orig      2024-01-02 13:40:55 UTC
+--- src/mkvtoolnix-gui/util/sleep_inhibitor/linux_logind.cpp.orig      2024-03-10 18:17:35 UTC
 +++ src/mkvtoolnix-gui/util/sleep_inhibitor/linux_logind.cpp
 @@ -1,6 +1,6 @@
  #include "common/common_pch.h"

diff --git a/bucket_B7/python-Sphinx b/bucket_B7/python-Sphinx
index 3c30e01..a127ee4 100644 (file)
--- a/bucket_B7/python-Sphinx
+++ b/bucket_B7/python-Sphinx
@@ -40,7 +40,6 @@ GENERATED=            yes
                                        python-imagesize:single:v11
                                        python-requests:single:v11
                                        python-packaging:single:v11
-                                       python-colorama:single:v11
 [PY311].USES_ON=                       python:v11,wheel
 
 [PY312].RUN_DEPENDS_ON=                        python-sphinxcontrib-applehelp:single:v12
@@ -58,7 +57,6 @@ GENERATED=            yes
                                        python-imagesize:single:v12
                                        python-requests:single:v12
                                        python-packaging:single:v12
-                                       python-colorama:single:v12
 [PY312].USES_ON=                       python:v12,wheel
 
 [FILE:1818:descriptions/desc.single]

diff --git a/bucket_C2/python-ansible b/bucket_C2/python-ansible
index e8a87b1..b3d400d 100644 (file)
--- a/bucket_C2/python-ansible
+++ b/bucket_C2/python-ansible
@@ -25,6 +25,7 @@ USES=                 cpe
 
 DISTNAME=              ansible-9.5.1.dist-info
 
+CPE_PRODUCT=           ansible
 CPE_VENDOR=            redhat
 GENERATED=             yes
 

diff --git a/bucket_D6/mbedtls b/bucket_D6/mbedtls
index a8847cc..4751c86 100644 (file)
--- a/bucket_D6/mbedtls
+++ b/bucket_D6/mbedtls
@@ -1,17 +1,19 @@
 # Buildsheet autogenerated by ravenadm tool -- Do not edit.
 
 NAMEBASE=              mbedtls
-VERSION=               3.5.2
+VERSION=               3.6.0
 KEYWORDS=              security devel
 VARIANTS=              standard
 SDESC[standard]=       Light-weight cryptographic and SSL/TLS library
 HOMEPAGE=              https://www.trustedfirmware.org/projects/mbed-tls/
 CONTACT=               nobody
 
-DOWNLOAD_GROUPS=       main
-SITES[main]=           GITHUB/ARMmbed:mbedtls:v3.5.2
+DOWNLOAD_GROUPS=       main framework
+SITES[main]=           GITHUB/ARMmbed:mbedtls:v3.6.0
+SITES[framework]=      GITHUB/Mbed-TLS:mbedtls-framework:750634d:framework
 DISTFILE[1]=           generated:main
-DF_INDEX=              1
+DISTFILE[2]=           generated:framework
+DF_INDEX=              1 2
 SPKGS[standard]=       complete
                        primary
                        tools
@@ -39,6 +41,10 @@ FPC_EQUIVALENT=              security/mbedtls
 BUILD_TARGET=          no_test
 MAKE_ENV=              SHARED=1
 
+PLIST_SUB=             SO_TLS=21
+                       SO_509=7
+                       SO_CRYPTO=16
+
 pre-build:
        ${FIND} ${WRKSRC} -name "*.orig" -delete
        ${REINPLACE_CMD} \
@@ -68,19 +74,23 @@ Mbed TLS includes a reference implementation of the PSA Cryptography API.
 This packages contains tools powered by Mbed TLS library.
 
 
-[FILE:107:distinfo]
-35890edf1a2c7a7e29eac3118d43302c3e1173e0df0ebaf5db56126dabe5bb05      5583904 ARMmbed-mbedtls-3.5.2.tar.gz
+[FILE:227:distinfo]
+32c500e73ee878e193e7d66bf5e4c34fb42bb968a6c9f9488aa466b16f6f3bff      5891466 ARMmbed-mbedtls-3.6.0.tar.gz
+ab2541a6ba432dec85b9248fcd1304242e89fe6defe74f86c1251f9084baec02        11514 Mbed-TLS-mbedtls-framework-750634d.tar.gz
 
 
-[FILE:62:manifests/plist.primary]
+[FILE:90:manifests/plist.primary]
 lib/
- libmbedcrypto.so.15
- libmbedtls.so.20
- libmbedx509.so.6
+ libmbedcrypto.so.%%SO_CRYPTO%%
+ libmbedtls.so.%%SO_TLS%%
+ libmbedx509.so.%%SO_509%%
 
 
-[FILE:1539:manifests/plist.tools]
+[FILE:1601:manifests/plist.tools]
 bin/
+ mbedtls_psa_hash
+ mbedtls_psa_hash_demo.sh
+ mbedtls_metatest
  mbedtls_aead_demo
  mbedtls_benchmark
  mbedtls_cert_app
@@ -154,8 +164,9 @@ bin/
  mbedtls_zeroize
 
 
-[FILE:1572:manifests/plist.dev]
+[FILE:1588:manifests/plist.dev]
 include/mbedtls/
+ block_cipher.h
  aes.h
  aria.h
  asn1.h