Merge branch 'awilfox/bump/2021-09-system-abipreserve' into 'master'

Update system/ packages where ABI can be preserved

See merge request adelie/packages!622

11 files changed, 102 insertions, 39 deletions

diff --git a/system/asciidoctor/APKBUILD b/system/asciidoctor/APKBUILD
index 188751c26..c52a623a8 100644
--- a/system/asciidoctor/APKBUILD
+++ b/system/asciidoctor/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Seung Soo Mun <hamletmun@gmail.com>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=asciidoctor
-pkgver=2.0.10
+pkgver=2.0.16
 pkgrel=0
 pkgdesc="An implementation of AsciiDoc in Ruby"
 url="https://rubygems.org/gems/$pkgname"
@@ -34,4 +34,4 @@ package() {
 	done
 }
 
-sha512sums="41db1947da60be27079eaef99c76ae7a20797f0291313ac82582466774a569130e995c674f7ef884a05d3d3783d70df3d5ef83b42ded1c722dd9ab7b1a3357ab  asciidoctor-2.0.10.gem"
+sha512sums="2e164a0d24374e0c5461926c865c8900d3fb3f27606af5aac1a0a5f53102ca758f6421a113a9bb100fe7dba2e1accec04ca6ca16670e4b85e373f729bdaba6cd  asciidoctor-2.0.16.gem"
diff --git a/system/at/APKBUILD b/system/at/APKBUILD
index d09571f91..667260c66 100644
--- a/system/at/APKBUILD
+++ b/system/at/APKBUILD
@@ -1,20 +1,20 @@
 # Contributor: Alexander Belkov <msun00@yandex.ru>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=at
-pkgver=3.2.1
+pkgver=3.2.2
 pkgrel=0
 pkgdesc="Delayed job execution and batch processing daemon"
-url="http://blog.calhariz.com/tag/at"
+url="http://blog.calhariz.com/index.php/tag/at"
 arch="all"
 options="!check suid"  # No test suite.
 license="GPL-2.0+"
 depends="cmd:sendmail"
 makedepends="byacc flex-dev ssmtp"
-install="${pkgname}.pre-install"
+install="$pkgname.pre-install"
 pkgusers="at"
 pkggroups="at"
 subpackages="$pkgname-doc $pkgname-openrc"
-source="http://software.calhariz.com/at/at_3.2.1.orig.tar.gz
+source="http://software.calhariz.com/at/at_${pkgver}.orig.tar.gz
 	10-parsetime.y-1.patch
 	10-Makefile.in-1.patch
 	at.allow
@@ -53,7 +53,7 @@ package() {
 		"$pkgdir"/etc/init.d/atd
 }
 
-sha512sums="8109b2acf220ffc14ea78e7d5671507e8cad41a163c1d7f96de18aae05c8617071c6306e04446450190f492a65ca31f51ed040fba5719b67625a58f738fc9c9e  at_3.2.1.orig.tar.gz
+sha512sums="e6f5aeddd89438aadff627d654ebc821a0b0e1a600ebaacc8a5fd3ec2c7c716f593757d00501311736d28f6d4276899667d6901d70836af208ff7d181b5b680f  at_3.2.2.orig.tar.gz
 ea663b4ad95761812d31333d0d75b20f7981932e5f2c2144d0aea14753534c240992c647a0d4edb55268f47a8f019da6ab3b9fc53807355a270338e2cd24bbc6  10-parsetime.y-1.patch
 2db77ab2a8e252993f46d3f4f839ec79118008d2adc7daa22faab715f39b002c85284d68d9ad8b6a36f70bfd783a9018d50b5e495908871341444499419ee262  10-Makefile.in-1.patch
 21e1bc024bd76c76b68e04614c6def5b03fd4b658e59bfde065b464b520f463711b795455e3a5c81a8a1946b2bca2f83d6c19300a4d3326ce17959a7cbc0846a  at.allow
diff --git a/system/attr/APKBUILD b/system/attr/APKBUILD
index 1d4997a5d..395554aa5 100644
--- a/system/attr/APKBUILD
+++ b/system/attr/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=attr
-pkgver=2.4.48
-pkgrel=1
+pkgver=2.5.1
+pkgrel=0
 pkgdesc="Utilities for managing filesystem extended attributes"
 url="https://savannah.nongnu.org/projects/attr"
 arch="all"
@@ -12,7 +12,6 @@ checkdepends="perl"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang libattr"
 source="https://download.savannah.nongnu.org/releases/attr/attr-$pkgver.tar.gz
 	test-runner-musl.patch
-	test-runner-perl.patch
 	"
 
 prepare() {
@@ -49,6 +48,5 @@ libattr() {
 	mv "$pkgdir"/lib/lib*.so.* "$subpkgdir"/lib/
 }
 
-sha512sums="75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923  attr-2.4.48.tar.gz
-da4b903ae0ba1c72bae60405745c1135d1c3c1cefd7525fca296f8dc7dac1e60e48eeba0ba80fddb035b24b847b00c5a9926d0d586c5d7989d0428e458d977d3  test-runner-musl.patch
-d10821cc73751171c6b9cc4172cf4c85be9b6e154782090a262a16fd69172a291c5d5c94587aebcf5b5d1e02c27769245d88f0aa86478193cf1a277ac7f4f18e  test-runner-perl.patch"
+sha512sums="8b4c043d61f8f3e0cd098e701181069f51117b85fd6ba18bfe9af77d894ea671232377d4793ffc822e9259ceee6ac71d75732eb93b2830c6cb5d0d918ba2d21b  attr-2.5.1.tar.gz
+da4b903ae0ba1c72bae60405745c1135d1c3c1cefd7525fca296f8dc7dac1e60e48eeba0ba80fddb035b24b847b00c5a9926d0d586c5d7989d0428e458d977d3  test-runner-musl.patch"
diff --git a/system/attr/test-runner-perl.patch b/system/attr/test-runner-perl.patch
deleted file mode 100644
index 67e117034..000000000
--- a/system/attr/test-runner-perl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- attr-2.4.47/test/run.old	2013-05-19 04:53:54.000000000 +0000
-+++ attr-2.4.47/test/run	2017-07-01 22:43:09.541515814 +0000
-@@ -84,7 +84,7 @@
-   if (defined $line) {
-     # Substitute %VAR and %{VAR} with environment variables.
-     $line =~ s[%(\w+)][$ENV{$1}]eg;
--    $line =~ s[%{(\w+)}][$ENV{$1}]eg;
-+    $line =~ s[%\{(\w+)\}][$ENV{$1}]eg;
-   }
-   if (defined $line) {
-     if ($line =~ s/^\s*< ?//) {
diff --git a/system/bc/APKBUILD b/system/bc/APKBUILD
index cfeabb5a2..0a08ce39a 100644
--- a/system/bc/APKBUILD
+++ b/system/bc/APKBUILD
@@ -1,10 +1,10 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=bc
-pkgver=3.1.6
+pkgver=5.1.1
 pkgrel=0
 pkgdesc="An arbitrary precision numeric processing language (calculator)"
-url="https://github.com/gavinhoward/bc"
+url="https://git.yzena.com/gavin/bc"
 arch="all"
 license="BSD-2-Clause"
 depends=""
@@ -25,4 +25,4 @@ package() {
 	make install
 }
 
-sha512sums="1219a074845b8c66a431ddb78bab643793f5275c26404e92e360e655418d70d1aafa02be2fc4dec25d99a85ae2da1aab7d615de893f85913ca8834448dcade53  bc-3.1.6.tar.xz"
+sha512sums="d8774fb1e654520abdf7d790783d4a3c04fa8f4982fc1cd0d92331e7e4b5889efa022cafb5e1286b6c82a74c9388f47657c7b9d78888b5d8056fa40d3d5e5c69  bc-5.1.1.tar.xz"
diff --git a/system/curl/APKBUILD b/system/curl/APKBUILD
index 41b7f58dd..363b37de1 100644
--- a/system/curl/APKBUILD
+++ b/system/curl/APKBUILD
@@ -16,6 +16,81 @@ makedepends="$makedepends_build $makedepends_host"
 source="https://curl.haxx.se/download/$pkgname-$pkgver.tar.xz"
 subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev libcurl"
 
+# secfixes:
+#   7.79.1-r0:
+#     - CVE-2021-22947
+#     - CVE-2021-22946
+#     - CVE-2021-22945
+#   7.78.0-r0:
+#     - CVE-2021-22925
+#     - CVE-2021-22924
+#     - CVE-2021-22923
+#     - CVE-2021-22922
+#     - CVE-2021-22898
+#     - CVE-2021-22890
+#     - CVE-2021-22876
+#   7.66.0-r0:
+#     - CVE-2019-5481
+#     - CVE-2019-5482
+#   7.65.1-r0:
+#     - CVE-2019-5435
+#     - CVE-2019-5436
+#   7.64.0-r0:
+#     - CVE-2019-3823
+#     - CVE-2019-3822
+#     - CVE-2018-16890
+#     - CVE-2018-16842
+#     - CVE-2018-16840
+#     - CVE-2018-16839
+#   7.60.0-r0:
+#     - CVE-2017-8816
+#     - CVE-2017-8817
+#     - CVE-2017-8818
+#     - CVE-2018-1000005
+#     - CVE-2018-1000007
+#     - CVE-2018-1000120
+#     - CVE-2018-1000121
+#     - CVE-2018-1000122
+#     - CVE-2018-1000300
+#     - CVE-2018-1000301
+#   7.56.1-r0:
+#     - CVE-2017-1000257
+#   7.55.0-r0:
+#     - CVE-2017-1000099
+#     - CVE-2017-1000100
+#     - CVE-2017-1000101
+#   7.54.0-r0:
+#     - CVE-2017-7468
+#   7.53.1-r2:
+#     - CVE-2017-7407
+#   7.53.0:
+#     - CVE-2017-2629
+#   7.52.1:
+#     - CVE-2016-9594
+#   7.51.0:
+#     - CVE-2016-8615
+#     - CVE-2016-8616
+#     - CVE-2016-8617
+#     - CVE-2016-8618
+#     - CVE-2016-8619
+#     - CVE-2016-8620
+#     - CVE-2016-8621
+#     - CVE-2016-8622
+#     - CVE-2016-8623
+#     - CVE-2016-8624
+#     - CVE-2016-8625
+#   7.50.3:
+#     - CVE-2016-7167
+#   7.50.2:
+#     - CVE-2016-7141
+#   7.50.1:
+#     - CVE-2016-5419
+#     - CVE-2016-5420
+#     - CVE-2016-5421
+#   7.36.0:
+#     - CVE-2014-0138
+#     - CVE-2014-0139
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/system/diffutils/APKBUILD b/system/diffutils/APKBUILD
index 4200445ba..3611ab71d 100644
--- a/system/diffutils/APKBUILD
+++ b/system/diffutils/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: 
 pkgname=diffutils
-pkgver=3.7
+pkgver=3.8
 pkgrel=0
 pkgdesc="Utility programs used for creating patch files"
 url="https://www.gnu.org/software/diffutils/"
@@ -35,6 +35,6 @@ package() {
 	rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
 }
 
-sha512sums="7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c  diffutils-3.7.tar.xz
-2602dabf0ac52a273b84160032416613da7ad111541fe25466cf9d4ce1eb2630f0ba0cb0b3013967965d8359a11a5f390f0486b4526b35516d9de1c8975f720d  disable-mbrtowc-test.patch
+sha512sums="279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c  diffutils-3.8.tar.xz
+079d04f48fa5f5fd57eca8ba9ddefcdbb9e42a26dba7ca9b0a6f3f391112aa5ce34f0a32a931432f0ef0cc3345cc97de8310660cd05df9b30c38609440a729ee  disable-mbrtowc-test.patch
 d45ab939e70b8b6e80d8950a8436be81e34e1067741196229edc7fbe33db92aa14532cf7490379741e779ae2cfc6010bec22dda2b2a046a3bc9eb68b94a0ff11  gnulib-tests-dont-require-gpg-passphrase.patch"
diff --git a/system/diffutils/disable-mbrtowc-test.patch b/system/diffutils/disable-mbrtowc-test.patch
index 1461a4093..8e9b94e31 100644
--- a/system/diffutils/disable-mbrtowc-test.patch
+++ b/system/diffutils/disable-mbrtowc-test.patch
@@ -4,7 +4,7 @@
  #!/bin/sh
 -# Test whether the POSIX locale has encoding errors.
 -LC_ALL=C \
--./test-mbrtowc${EXEEXT} 5 || exit
+-${CHECKER} ./test-mbrtowc${EXEEXT} 5 || exit
 -LC_ALL=POSIX \
--./test-mbrtowc${EXEEXT} 5
+-${CHECKER} ./test-mbrtowc${EXEEXT} 5
 +exit 77
diff --git a/system/e2fsprogs/APKBUILD b/system/e2fsprogs/APKBUILD
index 6ecbc37f4..155e44cab 100644
--- a/system/e2fsprogs/APKBUILD
+++ b/system/e2fsprogs/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=e2fsprogs
-pkgver=1.45.6
+pkgver=1.46.4
 pkgrel=0
 pkgdesc="Ext2/3/4 filesystem utilities"
 url="http://e2fsprogs.sourceforge.net"
@@ -59,6 +59,6 @@ libcom_err() {
 	mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/
 }
 
-sha512sums="f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84  e2fsprogs-1.45.6.tar.xz
+sha512sums="7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d  e2fsprogs-1.46.4.tar.xz
 34ca45c64a132bb4b507cd4ffb763c6d1b7979eccfed20f63417e514871b47639d32f2a3ecff090713c21a0f02ac503d5093960c80401d64081c592d01af279d  header-fix.patch
-5f8ff2f096da4b445edff72dfa03f27dd8bf5b6733e724205f5661e32fd0bae92849a1aa53e20c6b60c026dc5ed68567b7866fade1ecd0187718509f03fe9145  time64.patch"
+a3cf5ce222fce3d2655d4cac3cbead1f5eb0f7da5d10f2d9ed3a7f50b5970b74e559af47d50802270c853451e850177772fab3d7c495aa12fbd0aa85d4c34cf2  time64.patch"
diff --git a/system/e2fsprogs/time64.patch b/system/e2fsprogs/time64.patch
index 043b7edd8..dd04671f6 100644
--- a/system/e2fsprogs/time64.patch
+++ b/system/e2fsprogs/time64.patch
@@ -8,12 +8,13 @@
  #include <libgen.h>
  
  #include "e2p/e2p.h"
-@@ -1438,7 +1439,7 @@
+@@ -1451,7 +1452,7 @@
  
  		fputs("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n",
  		      ctx->problem_logf);
 -		fprintf(ctx->problem_logf, "<problem_log time=\"%lu\">\n",
+-			(unsigned long) ctx->now);
 +		fprintf(ctx->problem_logf, "<problem_log time=\"%"PRIu64"\">\n",
- 			ctx->now);
++			(uint64_t) ctx->now);
  		fprintf(ctx->problem_logf, "<invocation prog=\"%s\"",
  			argv[0]);
diff --git a/system/ed/APKBUILD b/system/ed/APKBUILD
index f57513f33..a9d86e4d9 100644
--- a/system/ed/APKBUILD
+++ b/system/ed/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: 
 pkgname=ed
-pkgver=1.16
+pkgver=1.17
 pkgrel=0
 pkgdesc="GNU version of standard text editor"
 url="https://www.gnu.org/software/ed/"
@@ -30,4 +30,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="1ca999edd7007c56bf9aa91436997a813e665910dda19a3307fa5b85adc05667eb120cb54cb6544b919f1c7f631baf3ee03079abe1171b875fb9653f535fa7bd  ed-1.16.tar.lz"
+sha512sums="fbceac0d3c01880a57776aaf3a3c02ce177bcf1e021f237ed7b6fc84f88471dd36cd0385b80b3a2de58640d8ef3ca07b4c5755803854ab52e4e9f636e5544dbf  ed-1.17.tar.lz"