diff --git a/main/perl/79e302e6c3f815bf4cb72a5bacc3012595970db9.patch b/main/perl/79e302e6c3f815bf4cb72a5bacc3012595970db9.patch deleted file mode 100644 index bf3b3038955..00000000000 --- a/main/perl/79e302e6c3f815bf4cb72a5bacc3012595970db9.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream: Yes -Fixes h2o's fastcgi due to fixing a group ID setting bug. -From 79e302e6c3f815bf4cb72a5bacc3012595970db9 Mon Sep 17 00:00:00 2001 -From: Manuel Mausz -Date: Tue, 4 Jun 2019 00:29:09 +0200 -Subject: [PATCH] (perl #134169) mg.c reset endptr after use - -Perl_grok_atoUV has been changed so endptr constraints the input. Thus we need to reset the endptr after every use. ---- - mg.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/mg.c b/mg.c -index 26211dd4d05..f235f0ee5a5 100644 ---- a/mg.c -+++ b/mg.c -@@ -3178,7 +3178,8 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg) - { - const char *p = SvPV_const(sv, len); - Groups_t *gary = NULL; -- const char* endptr = p + len; -+ const char* p_end = p + len; -+ const char* endptr = p_end; - UV uv; - #ifdef _SC_NGROUPS_MAX - int maxgrp = sysconf(_SC_NGROUPS_MAX); -@@ -3201,6 +3202,7 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg) - if (endptr == NULL) - break; - p = endptr; -+ endptr = p_end; - while (isSPACE(*p)) - ++p; - if (!*p) diff --git a/main/perl/APKBUILD b/main/perl/APKBUILD index dfd7a2db3ad..3590ed73c58 100644 --- a/main/perl/APKBUILD +++ b/main/perl/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Leonardo Arena # Contributor: Valery Kartel pkgname=perl -pkgver=5.30.0 -pkgrel=2 +pkgver=5.30.1 +pkgrel=0 pkgdesc="Larry Wall's Practical Extraction and Report Language" url="https://www.perl.org/" arch="all" @@ -15,7 +15,6 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-utils::noarch miniperl" source="https://www.cpan.org/src/5.0/perl-$pkgver.tar.gz musl-locale.patch musl-skip-dst-test.patch - 79e302e6c3f815bf4cb72a5bacc3012595970db9.patch skip-test-due-to-busybox-ps.patch " @@ -167,8 +166,7 @@ utils() { done } -sha512sums="b0db58699dfbe1bab10a7b0472cc377ed215668c89d13c7ca693e6b75ab6a6593a9cf137adbd6096063ee8200d83b389e745bb96b7c6bf4cf4588ac587a446ae perl-5.30.0.tar.gz +sha512sums="88dbd5dcd40d334dc9265ed3a4f2524f26d527e81989985cd2b4dbed079b8c10c6f76d589cdc5244b9a8477698d42b6a0a700c676e03329e606d4ce4d6cf28e0 perl-5.30.1.tar.gz a78b5fb1a2b6f60b401329cfd2d8349d4fdcc19628cde0e9b840b82e1a02e705f7d7413fe206aa13ed714ab93a65b62ac3d85dfd526ca8048621d5d89b22f0ef musl-locale.patch 3eaec691bc38e208ba4f34130ae45e50b6c339fa50093d0b0f6d7f24cb5b7c2a3734ca714a279c4b51173f82e46a8e7a3e70bfc7d7471a18c55a2102140e4186 musl-skip-dst-test.patch -caa4a8ff19e56294bc1ff5bebf71802943bf8e82591ec0bfdb895dbbfd45e33d16673b28f938c695e8a2afb494af82e7222621bfb383bcb7d8ac2ba4596252ae 79e302e6c3f815bf4cb72a5bacc3012595970db9.patch 4e7a3be3291a851b41e484daf5b87d5bc6e372a6f1aea7ad0718fec24fda3719286baa97045255d5d7c0a327a533ff6c32e1bf4d8436550f328fb9b5e602d727 skip-test-due-to-busybox-ps.patch"