summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED3
-rw-r--r--archivers/libarchive/Makefile3
-rw-r--r--audio/umurmur/Makefile5
-rw-r--r--devel/libevent-devel/Makefile3
-rw-r--r--devel/objfw/Makefile3
-rw-r--r--dns/kadnode/Makefile6
-rw-r--r--emulators/dolphin-emu/Makefile6
-rw-r--r--irc/inspircd/Makefile3
-rw-r--r--lang/gauche/Makefile5
-rw-r--r--lang/julia/Makefile6
-rw-r--r--lang/neko/Makefile6
-rw-r--r--multimedia/ffmpeg/Makefile4
-rw-r--r--multimedia/ffmpeg4/Makefile4
-rw-r--r--multimedia/librist/Makefile5
-rw-r--r--multimedia/obs-studio/Makefile5
-rw-r--r--net-im/sayaka/Makefile6
-rw-r--r--net-p2p/btcheck/Makefile4
-rw-r--r--net/bctoolbox/Makefile7
-rw-r--r--net/libwebsockets/Makefile3
-rw-r--r--net/pichi/Makefile12
-rw-r--r--security/Makefile2
-rw-r--r--security/mbedtls2/Makefile (renamed from security/mbedtls/Makefile)3
-rw-r--r--security/mbedtls2/distinfo (renamed from security/mbedtls/distinfo)0
-rw-r--r--security/mbedtls2/pkg-descr (renamed from security/mbedtls/pkg-descr)0
-rw-r--r--security/mbedtls2/pkg-plist (renamed from security/mbedtls/pkg-plist)0
-rw-r--r--security/openvpn-devel/Makefile4
-rw-r--r--security/uacme/Makefile5
-rw-r--r--www/hiawatha/Makefile6
-rw-r--r--www/lighttpd/Makefile3
-rw-r--r--x11/openrgb/Makefile11
30 files changed, 74 insertions, 59 deletions
diff --git a/MOVED b/MOVED
index e93d2301e3b1..09df8ab278ff 100644
--- a/MOVED
+++ b/MOVED
@@ -3854,6 +3854,7 @@ comms/libconcord||2025-01-01|Has expired: Logitech Harmony were officially disco
japanese/onew||2025-01-01|Has expired: Unfetchabled and listed BROKEN for over year
lang/twelf||2025-01-01|Has expired: Dead upstream and fails to build
devel/py-codecov||2025-01-01|Has expired: Deprecated by upstream. On February 1, 2022 this uploader will be completely deprecated and will no longer be able to upload coverage to Codecov
-editors/imhex-current||2025-01-02||Replaced with editors/imhex
+editors/imhex-current||2025-01-02|Replaced with editors/imhex
graphics/yacreader@qt5|graphics/yacreader|2025-01-02|Flavorization has been removed. Qt 5.x has been long deprecated upstream. Please use the unflavored graphics/yacreader port based on Qt 6.x instead
graphics/yacreader@qt6|graphics/yacreader|2025-01-02|Flavorization has been removed. Continue to enjoy graphics/yacreader based on Qt 6.x as usual
+security/mbedtls|security/mbedtls2|2025-01-02|Legacy version
diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile
index 61e9b1c3661d..71329de4dac9 100644
--- a/archivers/libarchive/Makefile
+++ b/archivers/libarchive/Makefile
@@ -1,5 +1,6 @@
PORTNAME= libarchive
DISTVERSION= 3.7.7
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= archivers
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \
@@ -50,7 +51,7 @@ OPENSSL_USES= ssl
OPENSSL_CONFIGURE_WITH= openssl
OPENSSL_CONFIGURE_OFF= --without-openssl
-MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls
+MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls2
MBEDTLS_CONFIGURE_WITH= mbedtls
.include <bsd.port.pre.mk>
diff --git a/audio/umurmur/Makefile b/audio/umurmur/Makefile
index 6d9b4e25cae1..af2ce596b854 100644
--- a/audio/umurmur/Makefile
+++ b/audio/umurmur/Makefile
@@ -1,5 +1,6 @@
PORTNAME= umurmur
DISTVERSION= 0.2.20
+PORTREVISION= 1
CATEGORIES= audio net
MAINTAINER= bofh@FreeBSD.org
@@ -21,9 +22,9 @@ GNU_CONFIGURE= yes
.include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092
-LIB_DEPENDS+= libmbedtls.so:security/mbedtls
+LIB_DEPENDS+= libmbedtls.so:security/mbedtls2
CONFIGURE_ARGS= --with-ssl=mbedtls
-DEPRECATED= Depends on expired security/mbedtls
+DEPRECATED= Depends on expired security/mbedtls2
EXPIRATION_DATE=2025-03-31
.else
USES+= ssl
diff --git a/devel/libevent-devel/Makefile b/devel/libevent-devel/Makefile
index c08faccbe0d6..adc270af3ce3 100644
--- a/devel/libevent-devel/Makefile
+++ b/devel/libevent-devel/Makefile
@@ -1,6 +1,7 @@
PORTNAME= libevent
DISTVERSION= 2.2.1
DISTVERSIONSUFFIX= -alpha-dev
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/release-${DISTVERSION}-alpha/
PKGNAMESUFFIX= -devel
@@ -26,7 +27,7 @@ OPTIONS_DEFINE= OPENSSL THREADS MBEDTLS
OPTIONS_DEFAULT= OPENSSL THREADS
OPTIONS_SUB= yes
-MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls
+MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls2
MBEDTLS_USES= localbase:ldflags
MBEDTLS_CONFIGURE_OFF= --disable-mbedtls
diff --git a/devel/objfw/Makefile b/devel/objfw/Makefile
index 4c238e911e18..c0d4145a71de 100644
--- a/devel/objfw/Makefile
+++ b/devel/objfw/Makefile
@@ -1,5 +1,6 @@
PORTNAME= objfw
DISTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= devel lang
MASTER_SITES= https://objfw.nil.im/downloads/
@@ -30,7 +31,7 @@ GNUTLS_USES= pkgconfig
GNUTLS_CONFIGURE_ON= --with-tls=gnutls
GNUTLS_PLIST_SUB= TLS=""
-MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls
+MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls2
MBEDTLS_CONFIGURE_ON= --with-tls=mbedtls
MBEDTLS_CPPFLAGS= -I${PREFIX}/include
MBEDTLS_LDFLAGS= -L${PREFIX}/lib
diff --git a/dns/kadnode/Makefile b/dns/kadnode/Makefile
index e615d952f029..bbd1e33da61c 100644
--- a/dns/kadnode/Makefile
+++ b/dns/kadnode/Makefile
@@ -1,7 +1,7 @@
PORTNAME= kadnode
DISTVERSIONPREFIX= v
DISTVERSION= 2.3.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= dns
MAINTAINER= moritzwarning@web.de
@@ -34,7 +34,7 @@ NATPMP_DESC= NAT-PMP support (remote port forwarding on the router)
NSS_DESC= Name Service Switch support to intercept host queries
UPNP_DESC= UPnP support (remote port forwarding on the router)
-AUTH_LIB_DEPENDS= libmbedtls.so:security/mbedtls
+AUTH_LIB_DEPENDS= libmbedtls.so:security/mbedtls2
AUTH_VARS= FEATURES+="bob tls"
CMD_VARS= FEATURES+="cmd"
@@ -73,7 +73,7 @@ do-install-NSS-on:
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MAUTH}
-DEPRECATED= Depends on expired security/mbedtls
+DEPRECATED= Depends on expired security/mbedtls2
EXPIRATION_DATE=2025-03-31
.endif
diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile
index 68615458711a..28d938477695 100644
--- a/emulators/dolphin-emu/Makefile
+++ b/emulators/dolphin-emu/Makefile
@@ -1,6 +1,6 @@
PORTNAME= dolphin-emu
PORTVERSION= 5.0.21264
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= emulators
MAINTAINER= martymac@FreeBSD.org
@@ -10,7 +10,7 @@ WWW= https://www.dolphin-emu.org
LICENSE= BSD3CLAUSE CC0-1.0 GPLv2+ MIT
LICENSE_COMB= multi
-DEPRECATED= Depends on expired security/mbedtls
+DEPRECATED= Depends on expired security/mbedtls2
EXPIRATION_DATE=2025-03-31
BUILD_DEPENDS= libfmt>=10.1:devel/libfmt \
@@ -44,7 +44,7 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \
libsndio.so:audio/sndio \
libsfml-system.so:devel/sfml \
libminiupnpc.so:net/miniupnpc \
- libmbedtls.so:security/mbedtls \
+ libmbedtls.so:security/mbedtls2 \
libcurl.so:ftp/curl \
libhidapi.so:comms/hidapi \
libxkbcommon.so:x11/libxkbcommon
diff --git a/irc/inspircd/Makefile b/irc/inspircd/Makefile
index 58848c28e57b..963c570f2f42 100644
--- a/irc/inspircd/Makefile
+++ b/irc/inspircd/Makefile
@@ -1,6 +1,7 @@
PORTNAME= inspircd
DISTVERSIONPREFIX= v
DISTVERSION= 4.4.0
+PORTREVISION= 1
CATEGORIES= irc
MAINTAINER= driesm@FreeBSD.org
@@ -79,7 +80,7 @@ LDAP_USES= ldap
LDAP_VARS= EXTRAS+=m_ldap.cpp
MAXMIND_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb
MAXMIND_VARS= EXTRAS+=m_geo_maxmind.cpp
-MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls
+MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls2
MBEDTLS_VARS= EXTRAS+=m_ssl_mbedtls.cpp
MYSQL_USES= mysql
MYSQL_VARS= EXTRAS+=m_mysql.cpp
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index 22ac01e2d91e..b4e7a638acac 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gauche
PORTVERSION= 0.9.15
+PORTREVISION= 1
CATEGORIES= lang scheme
MASTER_SITES= https://github.com/shirok/Gauche/releases/download/release${PORTVERSION:S/./_/g}/
DISTNAME= Gauche-${PORTVERSION}
@@ -40,7 +41,7 @@ GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm
GDBM_CONFIGURE_ON= --with-dbm=gdbm,ndbm
GDBM_CONFIGURE_OFF= --with-dbm=ndbm
-TLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls
+TLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls2
TLS_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
TLS_CONFIGURE_ON= --with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
TLS_CONFIGURE_OFF= --with-tls=no
@@ -84,7 +85,7 @@ post-install:
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MTLS}
-DEPRECATED= Depends on expired security/mbedtls
+DEPRECATED= Depends on expired security/mbedtls2
EXPIRATION_DATE=2025-03-31
.endif
diff --git a/lang/julia/Makefile b/lang/julia/Makefile
index e0fb8b0e61e4..34600c1fd6bd 100644
--- a/lang/julia/Makefile
+++ b/lang/julia/Makefile
@@ -1,6 +1,6 @@
PORTNAME= julia
DISTVERSION= 1.10.3
-PORTREVISION= 3
+PORTREVISION= 4
DISTVERSIONSUFFIX= -full
CATEGORIES= lang math
MASTER_SITES= https://github.com/JuliaLang/${PORTNAME}/releases/download/v${DISTVERSION}/
@@ -27,7 +27,7 @@ WWW= https://julialang.org/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-DEPRECATED= Depends on expired security/mbedtls
+DEPRECATED= Depends on expired security/mbedtls2
EXPIRATION_DATE=2025-03-31
ONLY_FOR_ARCHS= amd64
@@ -45,7 +45,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \
libgit2.so:devel/libgit2 \
libgmp.so:math/gmp \
libnghttp2.so:www/libnghttp2 \
- libmbedtls.so:security/mbedtls \
+ libmbedtls.so:security/mbedtls2 \
libmpfr.so:math/mpfr \
libopenlibm.so:math/openlibm \
libpcre2-8.so:devel/pcre2 \
diff --git a/lang/neko/Makefile b/lang/neko/Makefile
index bc89a57c8201..8ff33922c733 100644
--- a/lang/neko/Makefile
+++ b/lang/neko/Makefile
@@ -1,7 +1,7 @@
PORTNAME= neko
DISTVERSIONPREFIX= v
DISTVERSION= 2-2-0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= lang
MAINTAINER= penzin.dev@gmail.com
@@ -11,14 +11,14 @@ WWW= https://nekovm.org/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-DEPRECATED= Depends on expired security/mbedtls
+DEPRECATED= Depends on expired security/mbedtls2
EXPIRATION_DATE=2025-03-31
BUILD_DEPENDS= git:devel/git
LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded \
libapr-1.so:devel/apr1 libaprutil-1.so:devel/apr1 \
libpcre.so:devel/pcre libpcreposix.so:devel/pcre \
- libmbedtls.so:security/mbedtls libmbedcrypto.so:security/mbedtls libmbedx509.so:security/mbedtls \
+ libmbedtls.so:security/mbedtls2 libmbedcrypto.so:security/mbedtls2 libmbedx509.so:security/mbedtls2 \
libfontconfig.so:x11-fonts/fontconfig libfreetype.so:print/freetype2
USES= cmake mysql pkgconfig sqlite:3
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 5d2f5ad3e451..c4d967ca3f0a 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ffmpeg
PORTVERSION= 6.1.2
-PORTREVISION= 6
+PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES= multimedia audio net
MASTER_SITES= https://ffmpeg.org/releases/
@@ -365,7 +365,7 @@ V4L_CONFIGURE_OFF= --disable-indev=v4l2 \
--disable-outdev=v4l2
# mbedtls
-MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls
+MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls2
MBEDTLS_CONFIGURE_ENABLE= mbedtls
# mfx
diff --git a/multimedia/ffmpeg4/Makefile b/multimedia/ffmpeg4/Makefile
index a2b40548fd80..5cc259015f4d 100644
--- a/multimedia/ffmpeg4/Makefile
+++ b/multimedia/ffmpeg4/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ffmpeg
PORTVERSION= 4.4.4
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= multimedia audio net
MASTER_SITES= https://ffmpeg.org/releases/
PKGNAMESUFFIX= 4
@@ -336,7 +336,7 @@ V4L_CONFIGURE_OFF= --disable-indev=v4l2 \
--disable-outdev=v4l2
# mbedtls
-MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls
+MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls2
MBEDTLS_CONFIGURE_ENABLE= mbedtls
# mfx
diff --git a/multimedia/librist/Makefile b/multimedia/librist/Makefile
index be6e9d8a2ecc..d4e41362b384 100644
--- a/multimedia/librist/Makefile
+++ b/multimedia/librist/Makefile
@@ -1,5 +1,6 @@
PORTNAME= librist
DISTVERSION= 0.2.11
+PORTREVISION= 1
CATEGORIES= multimedia
MAINTAINER= yuri@FreeBSD.org
@@ -9,11 +10,11 @@ WWW= https://code.videolan.org/rist/librist
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-DEPRECATED= Depends on expired security/mbedtls
+DEPRECATED= Depends on expired security/mbedtls2
EXPIRATION_DATE=2025-03-31
LIB_DEPENDS= libcjson.so:devel/libcjson \
- libmbedcrypto.so:security/mbedtls \
+ libmbedcrypto.so:security/mbedtls2 \
libmicrohttpd.so:www/libmicrohttpd
USES= localbase:ldflags meson pkgconfig
diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile
index 5b230a014e07..d58d25e14147 100644
--- a/multimedia/obs-studio/Makefile
+++ b/multimedia/obs-studio/Makefile
@@ -1,5 +1,6 @@
PORTNAME= obs-studio
DISTVERSION= 31.0.0
+PORTREVISION= 1
CATEGORIES= multimedia
MAINTAINER= yuri@FreeBSD.org
@@ -10,7 +11,7 @@ WWW= https://obsproject.com/ \
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-DEPRECATED= Depends on expired security/mbedtls
+DEPRECATED= Depends on expired security/mbedtls2
EXPIRATION_DATE=2025-03-31 # removal pending https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283782
BROKEN_i386= link fails: relocation R_386_PC32 cannot be used against symbol 'strlist_split'; recompile with -fPIC, see https://github.com/obsproject/obs-studio/issues/10481
@@ -31,7 +32,7 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libjansson.so:devel/jansson \
- libmbedtls.so:security/mbedtls \
+ libmbedtls.so:security/mbedtls2 \
libpci.so:devel/libpci \
libqrcodegencpp.so:graphics/qr-code-generator \
librist.so:multimedia/librist \
diff --git a/net-im/sayaka/Makefile b/net-im/sayaka/Makefile
index 43c777ef13fb..9d0089a52a48 100644
--- a/net-im/sayaka/Makefile
+++ b/net-im/sayaka/Makefile
@@ -1,6 +1,6 @@
PORTNAME= sayaka
PORTVERSION= 3.5.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-im
MAINTAINER= sue@iwmt.org
@@ -9,11 +9,11 @@ WWW= https://github.com/isaki68k/sayaka
LICENSE= BSD2CLAUSE
-DEPRECATED= Depends on expired security/mbedtls
+DEPRECATED= Depends on expired security/mbedtls2
EXPIRATION_DATE=2025-03-31
LIB_DEPENDS= libpng.so:graphics/png \
- libmbedtls.so:security/mbedtls
+ libmbedtls.so:security/mbedtls2
USES= compiler:c++17-lang iconv jpeg pkgconfig
GNU_CONFIGURE= yes
diff --git a/net-p2p/btcheck/Makefile b/net-p2p/btcheck/Makefile
index 3bdf9ca6a6b9..fc3d40592a13 100644
--- a/net-p2p/btcheck/Makefile
+++ b/net-p2p/btcheck/Makefile
@@ -1,6 +1,6 @@
PORTNAME= btcheck
PORTVERSION= 2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p
MASTER_SITES= SF/${PORTNAME}
@@ -40,7 +40,7 @@ GNUTLS_USES= localbase
GNUTLS_CONFIGURE_ON= --with-gnutls
MBEDTLS_DESC= Use SHA-1 implementation from mbedTLS/PolarSSL
-MBEDTLS_LIB_DEPENDS= libmbedcrypto.so:security/mbedtls
+MBEDTLS_LIB_DEPENDS= libmbedcrypto.so:security/mbedtls2
MBEDTLS_USES= localbase
MBEDTLS_CONFIGURE_ON= --with-polarssl
diff --git a/net/bctoolbox/Makefile b/net/bctoolbox/Makefile
index ee8b63d969c9..847c7fb2583f 100644
--- a/net/bctoolbox/Makefile
+++ b/net/bctoolbox/Makefile
@@ -1,5 +1,6 @@
PORTNAME= bctoolbox
DISTVERSION= 5.2.94
+PORTREVISION= 1
CATEGORIES= net
MAINTAINER= bofh@FreeBSD.org
@@ -9,12 +10,12 @@ WWW= https://gitlab.linphone.org/BC/public/bctoolbox
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-DEPRECATED= Depends on expired security/mbedtls
+DEPRECATED= Depends on expired security/mbedtls2
EXPIRATION_DATE=2025-03-31
-BUILD_DEPENDS= mbedtls>=2.3.0_2:security/mbedtls
+BUILD_DEPENDS= mbedtls2>=2.3.0_2:security/mbedtls2
LIB_DEPENDS= libbcunit.so:devel/bcunit \
- libmbedtls.so:security/mbedtls
+ libmbedtls.so:security/mbedtls2
USES= cmake compiler:c++17-lang
USE_GITLAB= yes
diff --git a/net/libwebsockets/Makefile b/net/libwebsockets/Makefile
index 21f35a7f8907..6d332b4b3b1c 100644
--- a/net/libwebsockets/Makefile
+++ b/net/libwebsockets/Makefile
@@ -1,6 +1,7 @@
PORTNAME= libwebsockets
DISTVERSIONPREFIX= v
DISTVERSION= 4.3.3
+PORTREVISION= 1
CATEGORIES= net devel
MASTER_SITES= https://libwebsockets.org/git/libwebsockets/snapshot/
@@ -61,7 +62,7 @@ SQLITE_CMAKE_BOOL= LWS_WITH_SQLITE3
WEBSERVER_CMAKE_BOOL= LWS_WITH_LWSWS
WEBSERVER_IMPLIES= PEERLIMITS PLUGINS LIBUV
-MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls
+MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls2
MBEDTLS_CMAKE_BOOL= LWS_WITH_MBEDTLS
OPENSSL_USES= ssl
OPENSSL_CMAKE_BOOL= LWS_WITHOUT_BUILTIN_SHA1
diff --git a/net/pichi/Makefile b/net/pichi/Makefile
index 6ebb44ea2ab8..e332a2b3f4e0 100644
--- a/net/pichi/Makefile
+++ b/net/pichi/Makefile
@@ -1,6 +1,6 @@
PORTNAME= pichi
DISTVERSION= 1.5.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MAINTAINER= pichi@elude.in
@@ -36,15 +36,15 @@ STATIC_CMAKE_BOOL_OFF= BUILD_SHARED_LIBS
STATIC_BUILD_DEPENDS= boost-libs>=1.67.0:devel/boost-libs \
libmaxminddb>=1.3.0:net/libmaxminddb \
libsodium>=1.0.12:security/libsodium \
- mbedtls>=2.7.0:security/mbedtls
+ mbedtls2>=2.7.0:security/mbedtls2
STATIC_LIB_DEPENDS_OFF= libboost_context.so:devel/boost-libs \
libboost_filesystem.so:devel/boost-libs \
libboost_program_options.so:devel/boost-libs \
libboost_system.so:devel/boost-libs \
libmaxminddb.so:net/libmaxminddb \
- libmbedcrypto.so:security/mbedtls \
- libmbedtls.so:security/mbedtls \
- libmbedx509.so:security/mbedtls \
+ libmbedcrypto.so:security/mbedtls2 \
+ libmbedtls.so:security/mbedtls2 \
+ libmbedx509.so:security/mbedtls2 \
libsodium.so:security/libsodium
STATIC_USE_OFF= LDCONFIG=yes
@@ -63,7 +63,7 @@ TRANSPARENT_CMAKE_BOOL= TRANSPARENT_PF
.if ${PORT_OPTIONS:MSTATIC}
BUILD_DEPENDS+= brotli>=1.0.0:archivers/brotli \
boringssl>=0.0.0.0.2022.12.22.01:security/boringssl
-DEPRECATED= Depends on expired security/mbedtls
+DEPRECATED= Depends on expired security/mbedtls2
EXPIRATION_DATE=2025-03-31
.else
LIB_DEPENDS+= libbrotlicommon.so:archivers/brotli \
diff --git a/security/Makefile b/security/Makefile
index e5129fa1219e..5b4e83c4d4cd 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -379,7 +379,7 @@
SUBDIR += maltrail
SUBDIR += masscan
SUBDIR += mate-pam-helper
- SUBDIR += mbedtls
+ SUBDIR += mbedtls2
SUBDIR += mbedtls3
SUBDIR += mcrypt
SUBDIR += md5deep
diff --git a/security/mbedtls/Makefile b/security/mbedtls2/Makefile
index 3fdd43f9d37f..4f198194a9e6 100644
--- a/security/mbedtls/Makefile
+++ b/security/mbedtls2/Makefile
@@ -2,6 +2,7 @@ PORTNAME= mbedtls
DISTVERSION= 2.28.9
CATEGORIES= security devel
MASTER_SITES= https://github.com/Mbed-TLS/${PORTNAME}/releases/download/${DISTNAME}/
+PKGNAMESUFFIX= 2
MAINTAINER= tijl@FreeBSD.org
COMMENT= SSL/TLS and cryptography library
@@ -12,7 +13,7 @@ LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
DEPRECATED= Upstream support ends at the end of 2024
-EXPIRATION_DATE= 2025-03-31 # not until issues in security/mbedtls3 are fixed: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283782
+EXPIRATION_DATE= 2024-12-31
USES= cmake:testing pathfix python:build,test shebangfix tar:bz2
USE_LDCONFIG= yes
diff --git a/security/mbedtls/distinfo b/security/mbedtls2/distinfo
index c5b03210ec41..c5b03210ec41 100644
--- a/security/mbedtls/distinfo
+++ b/security/mbedtls2/distinfo
diff --git a/security/mbedtls/pkg-descr b/security/mbedtls2/pkg-descr
index 582aeb9f84d1..582aeb9f84d1 100644
--- a/security/mbedtls/pkg-descr
+++ b/security/mbedtls2/pkg-descr
diff --git a/security/mbedtls/pkg-plist b/security/mbedtls2/pkg-plist
index c6f5d15fd541..c6f5d15fd541 100644
--- a/security/mbedtls/pkg-plist
+++ b/security/mbedtls2/pkg-plist
diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile
index 534735bc8c9b..ed1a71670067 100644
--- a/security/openvpn-devel/Makefile
+++ b/security/openvpn-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME= openvpn
DISTVERSION= g20240211
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= security net net-vpn
PKGNAMESUFFIX= -devel
@@ -82,7 +82,7 @@ EASYRSA_RUN_DEPENDS= easy-rsa>=0:security/easy-rsa
LZ4_LIB_DEPENDS+= liblz4.so:archivers/liblz4
LZ4_CONFIGURE_OFF= --disable-lz4
-MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls
+MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls2
MBEDTLS_CONFIGURE_ON= --with-crypto-library=mbedtls
OPENSSL_USES= ssl
diff --git a/security/uacme/Makefile b/security/uacme/Makefile
index a3a89837e941..050920589a52 100644
--- a/security/uacme/Makefile
+++ b/security/uacme/Makefile
@@ -1,6 +1,7 @@
PORTNAME= uacme
DISTVERSIONPREFIX= upstream/
DISTVERSION= 1.7.6
+PORTREVISION= 1
CATEGORIES= security www
MAINTAINER= eduardo@FreeBSD.org
@@ -36,8 +37,8 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
GNUTLS_CONFIGURE_WITH= gnutls
MANPAGES_BUILD_DEPENDS= asciidoc:textproc/asciidoc
MANPAGES_CONFIGURE_ENABLE= docs
-MBEDTLS_BUILD_DEPENDS= mbedtls>=2.28.0:security/mbedtls
-MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls
+MBEDTLS_BUILD_DEPENDS= mbedtls2>=2.28.0:security/mbedtls2
+MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls2
MBEDTLS_CONFIGURE_WITH= mbedtls=${LOCALBASE}
OPENSSL_USES= ssl
OPENSSL_CONFIGURE_WITH= openssl=${OPENSSLBASE}
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index 52a7f19d32ea..33f138280129 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -1,6 +1,6 @@
PORTNAME= hiawatha
PORTVERSION= 11.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= https://www.hiawatha-webserver.org/files/
@@ -11,10 +11,10 @@ WWW= https://www.hiawatha-webserver.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-DEPRECATED= Depends on expired security/mbedtls
+DEPRECATED= Depends on expired security/mbedtls2
EXPIRATION_DATE=2025-03-31
-LIB_DEPENDS= libmbedtls.so:security/mbedtls
+LIB_DEPENDS= libmbedtls.so:security/mbedtls2
USES= cmake:insource compiler:c11 cpe localbase:ldflags shebangfix
CPE_VENDOR= ${PORTNAME}-webserver
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index cb7da4b35d8d..aff4ab3dfeef 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -1,5 +1,6 @@
PORTNAME= lighttpd
PORTVERSION= 1.4.76
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://download.lighttpd.net/lighttpd/releases-1.4.x/
@@ -64,7 +65,7 @@ LUA_CMAKE_ON= -DWITH_LUA_VERSION:STRING="lua-${LUA_VER}"
MAXMINDDB_CMAKE_BOOL= WITH_MAXMINDDB
MAXMINDDB_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb
MBEDTLS_CMAKE_BOOL= WITH_MBEDTLS
-MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls
+MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls2
NETTLE_CMAKE_BOOL= WITH_NETTLE
NETTLE_LIB_DEPENDS= libnettle.so:security/nettle
NSS_CMAKE_BOOL= WITH_NSS
diff --git a/x11/openrgb/Makefile b/x11/openrgb/Makefile
index 316f9cee5f2c..44a54cf4bd88 100644
--- a/x11/openrgb/Makefile
+++ b/x11/openrgb/Makefile
@@ -1,5 +1,6 @@
PORTNAME= openrgb
PORTVERSION= 0.8
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= vidar@karlsen.tech
@@ -8,18 +9,18 @@ WWW= https://openrgb.org
LICENSE= GPLv2
-DEPRECATED= Depends on expired security/mbedtls
+DEPRECATED= Depends on expired security/mbedtls2
EXPIRATION_DATE=2025-03-31
BUILD_DEPENDS= git>0:devel/git \
hidapi>0:comms/hidapi \
- mbedtls>0:security/mbedtls \
+ mbedtls2>0:security/mbedtls2 \
qt5-qmake>0:devel/qt5-qmake
LIB_DEPENDS= libGL.so:graphics/libglvnd \
libhidapi.so:comms/hidapi \
- libmbedcrypto.so:security/mbedtls \
- libmbedtls.so:security/mbedtls \
- libmbedx509.so:security/mbedtls
+ libmbedcrypto.so:security/mbedtls2 \
+ libmbedtls.so:security/mbedtls2 \
+ libmbedx509.so:security/mbedtls2
USES= gmake gl qmake qt:5