From 3ad676088b366d2832a9123813141a78417f8735 Mon Sep 17 00:00:00 2001
From: Kel Modderman <kelvmod@gmail.com>
Date: Fri, 31 Jan 2025 23:43:47 +1000
Subject: [PATCH] shairport-sync: update to 4.3.6

Drop patches/100-mbedtls3fix.patch: applied in upstream commit d73b585

Signed-off-by: Kel Modderman <kelvmod@gmail.com>
---
 sound/shairport-sync/Makefile                 |  6 +-
 .../patches/100-mbedtls3fix.patch             | 94 -------------------
 2 files changed, 3 insertions(+), 97 deletions(-)
 delete mode 100644 sound/shairport-sync/patches/100-mbedtls3fix.patch

diff --git a/sound/shairport-sync/Makefile b/sound/shairport-sync/Makefile
index d32672fe43a55..0c227967e2a2b 100644
--- a/sound/shairport-sync/Makefile
+++ b/sound/shairport-sync/Makefile
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shairport-sync
-PKG_VERSION:=4.3.2
-PKG_RELEASE:=6
+PKG_VERSION:=4.3.6
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/mikebrady/shairport-sync/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=dfb485c0603398032a00e51f84b874749bbf155b257adda3d270d5989de08bfd
+PKG_HASH:=f100ed80938ff63d305a260b0f0dd32d012ea9b64884b2802d46d862923439b8
 
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
 		Mike Brady <mikebrady@eircom.net>
diff --git a/sound/shairport-sync/patches/100-mbedtls3fix.patch b/sound/shairport-sync/patches/100-mbedtls3fix.patch
deleted file mode 100644
index d2cf9d9b945c7..0000000000000
--- a/sound/shairport-sync/patches/100-mbedtls3fix.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From d73b585c6f6d9136ae7a04243a54d734fa57d779 Mon Sep 17 00:00:00 2001
-From: Seo Suchan <tjtncks@gmail.com>
-Date: Thu, 9 May 2024 19:10:59 +0900
-Subject: [PATCH] mbedtls: add support to mbedtls3
-
-Signed-off-by: Seo Suchan <tjtncks@gmail.com>
----
- common.c | 30 ++++++++++++++++++++++++++----
- player.c |  1 -
- player.h |  1 -
- 3 files changed, 26 insertions(+), 6 deletions(-)
-
---- a/common.c
-+++ b/common.c
-@@ -100,6 +100,12 @@
- #include <mbedtls/md.h>
- #include <mbedtls/version.h>
- #include <mbedtls/x509.h>
-+
-+#if MBEDTLS_VERSION_MAJOR == 3
-+#define MBEDTLS_PRIVATE_V3_ONLY(_q) MBEDTLS_PRIVATE(_q)
-+#else
-+#define MBEDTLS_PRIVATE_V3_ONLY(_q) _q
-+#endif
- #endif
- 
- #ifdef CONFIG_LIBDAEMON
-@@ -910,8 +916,14 @@ uint8_t *rsa_apply(uint8_t *input, int i
- 
-   mbedtls_pk_init(&pkctx);
- 
-+#if MBEDTLS_VERSION_MAJOR == 3
-+  rc = mbedtls_pk_parse_key(&pkctx, (unsigned char *)super_secret_key, sizeof(super_secret_key),
-+                            NULL, 0, mbedtls_ctr_drbg_random, &ctr_drbg);
-+#else
-   rc = mbedtls_pk_parse_key(&pkctx, (unsigned char *)super_secret_key, sizeof(super_secret_key),
-                             NULL, 0);
-+
-+#endif
-   if (rc != 0)
-     debug(1, "Error %d reading the private key.", rc);
- 
-@@ -921,18 +933,28 @@ uint8_t *rsa_apply(uint8_t *input, int i
-   switch (mode) {
-   case RSA_MODE_AUTH:
-     mbedtls_rsa_set_padding(trsa, MBEDTLS_RSA_PKCS_V15, MBEDTLS_MD_NONE);
--    outbuf = malloc(trsa->len);
-+    outbuf = malloc(trsa->MBEDTLS_PRIVATE_V3_ONLY(len));
-+#if MBEDTLS_VERSION_MAJOR == 3
-+    rc = mbedtls_rsa_pkcs1_encrypt(trsa, mbedtls_ctr_drbg_random, &ctr_drbg,
-+                                   inlen, input, outbuf);
-+#else
-     rc = mbedtls_rsa_pkcs1_encrypt(trsa, mbedtls_ctr_drbg_random, &ctr_drbg, MBEDTLS_RSA_PRIVATE,
-                                    inlen, input, outbuf);
-+#endif
-     if (rc != 0)
-       debug(1, "mbedtls_pk_encrypt error %d.", rc);
--    *outlen = trsa->len;
-+    *outlen = trsa->MBEDTLS_PRIVATE_V3_ONLY(len);
-     break;
-   case RSA_MODE_KEY:
-     mbedtls_rsa_set_padding(trsa, MBEDTLS_RSA_PKCS_V21, MBEDTLS_MD_SHA1);
--    outbuf = malloc(trsa->len);
-+    outbuf = malloc(trsa->MBEDTLS_PRIVATE_V3_ONLY(len));
-+#if MBEDTLS_VERSION_MAJOR == 3
-+    rc = mbedtls_rsa_pkcs1_decrypt(trsa, mbedtls_ctr_drbg_random, &ctr_drbg,
-+                                   &olen, input, outbuf, trsa->MBEDTLS_PRIVATE_V3_ONLY(len));
-+#else
-     rc = mbedtls_rsa_pkcs1_decrypt(trsa, mbedtls_ctr_drbg_random, &ctr_drbg, MBEDTLS_RSA_PRIVATE,
-                                    &olen, input, outbuf, trsa->len);
-+#endif
-     if (rc != 0)
-       debug(1, "mbedtls_pk_decrypt error %d.", rc);
-     *outlen = olen;
---- a/player.c
-+++ b/player.c
-@@ -48,7 +48,6 @@
- 
- #ifdef CONFIG_MBEDTLS
- #include <mbedtls/aes.h>
--#include <mbedtls/havege.h>
- #endif
- 
- #ifdef CONFIG_POLARSSL
---- a/player.h
-+++ b/player.h
-@@ -9,7 +9,6 @@
- 
- #ifdef CONFIG_MBEDTLS
- #include <mbedtls/aes.h>
--#include <mbedtls/havege.h>
- #endif
- 
- #ifdef CONFIG_POLARSSL