remove GLIBC 2.35 patch, thanks @gamezelda

3 files changed, 4 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8990c32f3a17..9213d93fdc72 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = moc-pulse
 	pkgdesc = An ncurses console audio player with support for pulseaudio
 	pkgver = 2.5.2
-	pkgrel = 10
+	pkgrel = 11
 	url = https://moc.daper.net/
 	arch = x86_64
 	license = GPL
@@ -33,11 +33,9 @@ pkgbase = moc-pulse
 	source = pulseaudio.patch
 	source = moc-ffmpeg4.patch
 	source = moc-https.patch
-	source = 0001-Workaround-mbsrtowcs-fortify-crash-in-GLIBC-2.35.patch
 	sha1sums = 9d27a929b63099416263471c16367997c0ae6dba
 	sha1sums = 5c6385760ba40ee8a330d28d520c44eac2cbbae1
 	sha1sums = 007a0580ac754e1c318a0d0b6f0d403883797eaf
 	sha1sums = e3362ddd41126e2be874cd372a053fdaccf0f616
-	sha1sums = d3673707b2d96c34287042dc26698b2c5a00952a
 
 pkgname = moc-pulse
diff --git a/0001-Workaround-mbsrtowcs-fortify-crash-in-GLIBC-2.35.patch b/0001-Workaround-mbsrtowcs-fortify-crash-in-GLIBC-2.35.patch
deleted file mode 100644
index c3515c4475fe..000000000000
--- a/0001-Workaround-mbsrtowcs-fortify-crash-in-GLIBC-2.35.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 78556fc13026220f800384accf04e139f11e099a Mon Sep 17 00:00:00 2001
-From: Joan Bruguera <joanbrugueram@gmail.com>
-Date: Thu, 17 Feb 2022 22:27:34 +0100
-Subject: [PATCH] Workaround mbsrtowcs fortify crash in GLIBC 2.35
-
-Reproduces with:
-    gcc -O2 -Wp,-D_FORTIFY_SOURCE=2 test.c -o test && ./test
-
-And test.c:
-    #include <stdio.h>
-    #include <stdlib.h>
-    #include <wchar.h>
-
-    int main (void)
-    {
-        const char *hw = "HelloWorld";
-        mbstate_t ps = {0};
-        mbsrtowcs (NULL, &hw, (size_t)-1, &ps);
-        return 0;
-    }
-
-Output:
-    *** buffer overflow detected ***: terminated
----
- utf8.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/utf8.c b/utf8.c
-index 2db18f2..806d528 100644
---- a/utf8.c
-+++ b/utf8.c
-@@ -167,7 +167,7 @@ static size_t xmbstowcs (wchar_t *dest, const char *src, size_t len,
- 	while (src && (len || !dest)) {
- 		size_t res;
- 
--		res = mbsrtowcs (dest, &src, len, &ps);
-+		res = mbsrtowcs (dest, &src, dest ? len : 0, &ps);
- 		if (res != (size_t)-1) {
- 			count += res;
- 			src = NULL;
--- 
-2.35.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 68cc9b005020..d69d1bf3b9b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname='moc-pulse'
 _pkgname='moc'
 pkgver=2.5.2
-pkgrel=10
+pkgrel=11
 pkgdesc='An ncurses console audio player with support for pulseaudio'
 arch=('x86_64')
 url="https://moc.daper.net/"
@@ -24,13 +24,11 @@ conflicts=('moc')
 source=("https://ftp.daper.net/pub/soft/${_pkgname}/stable/${_pkgname}-${pkgver}.tar.bz2"
         'pulseaudio.patch'
         'moc-ffmpeg4.patch'
-        'moc-https.patch'
-        '0001-Workaround-mbsrtowcs-fortify-crash-in-GLIBC-2.35.patch')
+        'moc-https.patch')
 sha1sums=('9d27a929b63099416263471c16367997c0ae6dba'
           '5c6385760ba40ee8a330d28d520c44eac2cbbae1'
           '007a0580ac754e1c318a0d0b6f0d403883797eaf'
-          'e3362ddd41126e2be874cd372a053fdaccf0f616'
-          'd3673707b2d96c34287042dc26698b2c5a00952a')
+          'e3362ddd41126e2be874cd372a053fdaccf0f616')
 # validpgpkeys=('59359B80406D9E73E80599BEF3121E4F2885A7AA')
 
 prepare() {
@@ -43,9 +41,6 @@ prepare() {
   # Add pulseaudio backend
   patch -p1 -i ../pulseaudio.patch
 
-  # HOTFIX for GLIBC 2.35 buffer overflow error
-  patch -p1 -i ../0001-Workaround-mbsrtowcs-fortify-crash-in-GLIBC-2.35.patch
-
   # reconfigure the build system
   autoreconf -i -f
 }