1 files changed, 16 insertions, 14 deletions
diff --git a/main/perl-encode/APKBUILD b/main/perl-encode/APKBUILD
index 87abb64bf01..53eacfdd33a 100644
--- a/main/perl-encode/APKBUILD
+++ b/main/perl-encode/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-encode
 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Encode
-pkgver=3.11
+pkgver=3.21
 pkgrel=0
 pkgdesc="character encodings in Perl"
 url="https://metacpan.org/release/Encode/"
@@ -16,6 +16,10 @@ subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/D/DA/DANKOGAI/Encode-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
+# secfixes:
+#   3.12-r0:
+#     - CVE-2021-36770
+
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
@@ -37,32 +41,30 @@ utils() {
 	pkgdesc="$pkgdesc (utilities)"
 	depends="$pkgname perl"
 	provides="$pkgname-piconv"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+
+	amove usr/bin
 }
 
 dev() {
 	default_dev
 	replaces="perl-dev"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/enc2xs "$subpkgdir"/usr/bin
-	local file; for file in $(find "$pkgdir" -name "*.e2x"); do
-		file=${file#$pkgdir/}
-		mkdir -p "$subpkgdir"/${file%/*}
-		mv "$pkgdir"/$file "$subpkgdir"/$file
+
+	amove usr/bin/enc2xs
+
+	local file; find "$pkgdir" -name "*.e2x" | while read -r file; do
+		amove "${file#"$pkgdir"}"
 	done
 }
 
 doc() {
 	default_doc
 	replaces="perl-doc"
-	local file; for file in $(find "$pkgdir" -name "*.pod"); do
-		file=${file#$pkgdir/}
-		mkdir -p "$subpkgdir"/${file%/*}
-		mv "$pkgdir"/$file "$subpkgdir"/$file
+
+	local file; find "$pkgdir" -name "*.pod" | while read -r file; do
+		amove "${file#"$pkgdir"}"
 	done
 }
 
 sha512sums="
-a1aeb1061bb36ba27efc0b5db2274937018f8e82823cc39d55058b3dee03b5cc6db62483610b4dd93dc791dfd5ec22b054148d0e741cd50aceb87a4aec1a7ff7  Encode-3.11.tar.gz
+413b22ff4175bc32b1081c9bb2db0b290379bf318de5ef94e86165fa68a197a68c64da538915e50a1d0c5f7db0de058e9c7248a024bca1301bc7b1d5b41f2467  Encode-3.21.tar.gz
 "