Attachment 256436 Details for Bug 283857 – git format-patch, x11/openrgb mbedtls2->3

[patch] git format-patch, x11/openrgb mbedtls2->3

0001-x11-openrgb-switch-dep-from-mbedtls2-to-mbedtls3.patch (text/plain), 3.73 KB, created by Vidar Karlsen on 2025-01-05 11:09:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vidar Karlsen

Created: 2025-01-05 11:09:54 UTC

Size: 3.73 KB

patch

obsolete

>From 1f027d3575493a6fff29566ae4a7e5bacbe83d24 Mon Sep 17 00:00:00 2001
>From: Vidar Karlsen <vidar@karlsen.tech>
>Date: Sun, 5 Jan 2025 11:57:19 +0100
>Subject: [PATCH] x11/openrgb: switch dep from mbedtls2 to mbedtls3
>
>Background:
>security/mbedtls2 and those depending on it have been marked as deprecated.
>That includes this port, x11/openrgb.
>
>Changes:
>- Change BUILD_DEPENDS and LIB_DEPENDS to use mbedtls3 instead of 2.
>  This actually works with minor changes.
>- Undeprecate and remove expiration date
>
>QA:
>- Builds fine in poudriere
>- Builds fine from ports tree, and runs on my desktop
>---
> x11/openrgb/Makefile                                | 13 +++++--------
> ...LianLiController_LianLiUniHub__AL10Controller.h} |  0
> x11/openrgb/files/patch-OpenRGB.pro                 |  2 +-
> ...cies_hueplusplus-1.0.0_src_EntertainmentMode.cpp | 10 ++++++++++
> 4 files changed, 16 insertions(+), 9 deletions(-)
> rename x11/openrgb/files/{patch-Controllers-LianLiController-LianLiUniHub_AL10Controller.h => patch-Controllers_LianLiController_LianLiUniHub__AL10Controller.h} (100%)
> create mode 100644 x11/openrgb/files/patch-dependencies_hueplusplus-1.0.0_src_EntertainmentMode.cpp
>
>diff --git a/x11/openrgb/Makefile b/x11/openrgb/Makefile
>index 44a54cf4bd88..6eeb0e704f52 100644
>--- a/x11/openrgb/Makefile
>+++ b/x11/openrgb/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	openrgb
> PORTVERSION=	0.8
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	x11
> 
> MAINTAINER=	vidar@karlsen.tech
>@@ -9,18 +9,15 @@ WWW=		https://openrgb.org
> 
> LICENSE=	GPLv2
> 
>-DEPRECATED=	Depends on expired security/mbedtls2
>-EXPIRATION_DATE=2025-03-31
>-
> BUILD_DEPENDS=	git>0:devel/git \
> 		hidapi>0:comms/hidapi \
>-		mbedtls2>0:security/mbedtls2 \
>+		mbedtls3>0:security/mbedtls3 \
> 		qt5-qmake>0:devel/qt5-qmake
> LIB_DEPENDS=	libGL.so:graphics/libglvnd \
> 		libhidapi.so:comms/hidapi \
>-		libmbedcrypto.so:security/mbedtls2 \
>-		libmbedtls.so:security/mbedtls2 \
>-		libmbedx509.so:security/mbedtls2
>+		libmbedcrypto.so:security/mbedtls3 \
>+		libmbedtls.so:security/mbedtls3 \
>+		libmbedx509.so:security/mbedtls3
> 
> USES=		gmake gl qmake qt:5
> 
>diff --git a/x11/openrgb/files/patch-Controllers-LianLiController-LianLiUniHub_AL10Controller.h b/x11/openrgb/files/patch-Controllers_LianLiController_LianLiUniHub__AL10Controller.h
>similarity index 100%
>rename from x11/openrgb/files/patch-Controllers-LianLiController-LianLiUniHub_AL10Controller.h
>rename to x11/openrgb/files/patch-Controllers_LianLiController_LianLiUniHub__AL10Controller.h
>diff --git a/x11/openrgb/files/patch-OpenRGB.pro b/x11/openrgb/files/patch-OpenRGB.pro
>index 7a3c10f01119..1f09724626e8 100644
>--- a/x11/openrgb/files/patch-OpenRGB.pro
>+++ b/x11/openrgb/files/patch-OpenRGB.pro
>@@ -1,6 +1,6 @@
> --- OpenRGB.pro.orig	2022-11-28 03:44:33 UTC
> +++ OpenRGB.pro
>-@@ -42,7 +42,7 @@ TEMPLATE    = app
>+@@ -42,7 +42,7 @@ win32:BUILDDATE = $$system(date /t)
>  # Automatically generated build information                                                     #
>  #-----------------------------------------------------------------------------------------------#
>  win32:BUILDDATE = $$system(date /t)
>diff --git a/x11/openrgb/files/patch-dependencies_hueplusplus-1.0.0_src_EntertainmentMode.cpp b/x11/openrgb/files/patch-dependencies_hueplusplus-1.0.0_src_EntertainmentMode.cpp
>new file mode 100644
>index 000000000000..b92d4a5c7887
>--- /dev/null
>+++ b/x11/openrgb/files/patch-dependencies_hueplusplus-1.0.0_src_EntertainmentMode.cpp
>@@ -0,0 +1,10 @@
>+--- dependencies/hueplusplus-1.0.0/src/EntertainmentMode.cpp.orig	2022-11-28 03:44:33 UTC
>++++ dependencies/hueplusplus-1.0.0/src/EntertainmentMode.cpp
>+@@ -21,7 +21,6 @@
>+ **/
>+ 
>+ #include "hueplusplus/EntertainmentMode.h"
>+-#include "mbedtls/certs.h"
>+ #include "mbedtls/ctr_drbg.h"
>+ #include "mbedtls/debug.h"
>+ #include "mbedtls/entropy.h"
>-- 
>2.47.1
>

Actions: View | Diff

Attachments on bug 283857: 256436