main/subversion/APKBUILD

 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=subversion
-pkgver=1.14.1
-pkgrel=8
-_py3c_ver=1.1
+pkgver=1.14.2
+pkgrel=0
+_py3c_ver=1.4
 pkgdesc="Replacement for CVS, another versioning system (svn)"
 url="https://subversion.apache.org/"
 arch="all"
@@ -20,11 +20,13 @@ source="https://archive.apache.org/dist/subversion/subversion-$pkgver.tar.bz2
 	subversion-1.7.0-deplibs.patch
 	subversion-perl-deplibs.patch
 	subversion-1.12.0-linking.patch
-	fix-use-after-free.patch
 	svnserve.confd
 	svnserve.initd"
 
 # secfixes:
+#   1.14.2-r0:
+#     - CVE-2021-28544
+#     - CVE-2022-24070
 #   1.14.1-r0:
 #     - CVE-2020-17525
 #   1.12.2-r0:
@@ -135,12 +137,11 @@ py() {
 }
 
 sha512sums="
-0a70c7152b77cdbcb810a029263e4b3240b6ef41d1c19714e793594088d3cca758d40dfbc05622a806b06463becb73207df249393924ce591026b749b875fcdd  subversion-1.14.1.tar.bz2
-aa95bbe1a80eec9e32d3dab4b0771a35fc467052757077fa17b42ceba78a5fe7fb1fa99079240aeeea5538abff778518b706f3bf16dbce2cd4f7dc1900c61b24  py3c-1.1.tar.gz
+20ada4688ca07d9fb8da4b7d53b5084568652a3b9418c65e688886bae950a16a3ff37710fcfc9c29ef14a89e75b2ceec4e9cf35d5876a7896ebc2b512cfb9ecc  subversion-1.14.2.tar.bz2
+db71db2c19a16ba5a430b676beb357faee5b67b161478932af13dd06be23b5505da85dbaf5b2447f95590fea55b833ee33fa19d3350ba3117f3364a9ab012ee6  py3c-1.4.tar.gz
 fb219c45b80602d919176cc191394df09f90d0f5c7d24e6a36b166bd92777ecae67eeac1e49c0ffbb0e724396b3d2094dbb0bef17d01dc87d418b1cd554bd7c4  subversion-1.7.0-deplibs.patch
 fd6e5f45cff4d3cf0d885a34c822b32141b13b199d99ad8e1b04d641c9c1ee27e73f5c556a4ad54a900b6d39cc14afad17b6738d8af44c76758f1a27b4d49f9a  subversion-perl-deplibs.patch
 7d46f2ee0bbba53b6dc9312b35000b1433a46edb09f61030da1ff66951bc204fc90598e5b07ce2554d46508d5a9e8193152131ae21050901c7b40cb034fb5cc3  subversion-1.12.0-linking.patch
-ded55257f3efeaa6d70ab15ad5082be9d4544e729a907541575dbac024605633eaaf00957850ae7cf63c549ccb6204dd6e00c664765a8fc4e66a8c2f2b2c0c1d  fix-use-after-free.patch
 7fe993443d4d3ef5e1e75f60e85036ee0b2bb2636c2c830210e64f525f95ae4c10ca1dc4504fc36915ec9391815becbe7cbf5f589c28609386d8d079ed02c630  svnserve.confd
 f6392193cc65aaceee9b6e5e66f80af4b095ba4007e8536e8b1c4e8b2c75610d7f5596b83e5edd504672f021c074887fc6464cf4fc1dfe9446741105f11cd855  svnserve.initd
 "

main/subversion/fix-use-after-free.patch

---- subversion-1.14.1/subversion/libsvn_repos/authz.c
-+++ subversion-1.14.1.uaf/subversion/libsvn_repos/authz.c
-@@ -130,6 +130,30 @@
- static svn_object_pool__t *filtered_pool = NULL;
- static svn_atomic_t authz_pool_initialized = FALSE;
- 
-+/*
-+ * Ensure that we will initialize authz again if the pool which
-+ * our authz caches depend on is cleared.
-+ *
-+ * HTTPD may run pre/post config hooks multiple times and clear
-+ * its global configuration pool which our authz pools depend on.
-+ * This happens in a non-threaded context during HTTPD's intialization
-+ * and HTTPD's main loop, so it is safe to reset static variables here.
-+ * (And any applications which cleared this pool while SVN threads
-+ * were running would crash no matter what.)
-+ *
-+ * See issue #4880, "Use-after-free of object-pools in
-+ * subversion/libsvn_repos/authz.c when used as httpd module"
-+ */
-+static apr_status_t
-+deinit_authz(void *data)
-+{
-+  /* The two object pools run their own cleanup handlers. */
-+  authz_pool = NULL;
-+  filtered_pool = NULL;
-+  authz_pool_initialized = FALSE;
-+  return APR_SUCCESS;
-+}
-+
- /* Implements svn_atomic__err_init_func_t. */
- static svn_error_t *
- synchronized_authz_initialize(void *baton, apr_pool_t *pool)
-@@ -143,6 +167,7 @@
-   SVN_ERR(svn_object_pool__create(&authz_pool, multi_threaded, pool));
-   SVN_ERR(svn_object_pool__create(&filtered_pool, multi_threaded, pool));
- 
-+  apr_pool_cleanup_register(pool, NULL, deinit_authz, apr_pool_cleanup_null);
-   return SVN_NO_ERROR;
- }
- 

testing/bsd-games/APKBUILD

 # Contributor: Maxim Karasev <begs@disroot.org>
 # Maintainer: Maxim Karasev <begs@disroot.org>
 pkgname=bsd-games
-pkgver=3.1
+pkgver=3.2
 pkgrel=0
 pkgdesc="traditional text mode games from BSD"
 url="https://github.com/msharov/bsd-games"
@@ -29,5 +29,5 @@ package() {
 }
 
 sha512sums="
-3f311e89481913b734a21fc7d0765628637af8251228d5a38349c27cc702c307240e81711785bbd7428e208a142bd07597630d29e97e2c7bf5bd9cac1ebc6ada  bsd-games-3.1.tar.gz
+cf5f5a9e5d215ee553486580f9a7dfc9801d254a2806172df201dfc42ecbb05326db7bc25b7624eb8a8e541ad61ec319d258687609bddae2bc07edcbade2291a  bsd-games-3.2.tar.gz
 "

testing/got/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: omni <omni+alpine@hack.org>
 pkgname=got
 _pkgname=got-portable
-pkgver=0.66
+pkgver=0.68.1
 pkgrel=0
 pkgdesc="A VCS which prioritizes ease of use and simplicity over flexibility"
 url="http://gameoftrees.org/"
@@ -11,7 +11,9 @@ license="ISC"
 makedepends="libbsd-dev util-linux-dev libressl-dev zlib-dev ncurses-dev"
 options="!check"
 subpackages="$pkgname-doc"
-source="https://gameoftrees.org/releases/portable/got-portable-$pkgver.tar.gz"
+source="https://gameoftrees.org/releases/portable/got-portable-$pkgver.tar.gz
+	dont-include-linux-prctl.patch
+	"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
@@ -28,4 +30,7 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="801c39276e806114ebecb5c386ef68cdbd8083fa3a2e7cd3fcf10dbea118a19a1545b80909c94c988bf803c829dae039625addd51f08f53fe1cb7cccbce0ba17  got-portable-0.66.tar.gz"
+sha512sums="
+6a7a66dc95d8b8e94de67f091b7871ba1b1a2c55c640a8b12a2f6cde376c8a7f6a8c8967d6b50fb8fab76bd324fad896145bdfee954936b21685f3a5e66184da  got-portable-0.68.1.tar.gz
+5e7b1dae2023a18389a2640acf8a5341449996096b833756a96ed15bb541b412538b8d252d3615b028eb6304a747f510f8d0de6bd83e39c91a9ffc4b8cb48b03  dont-include-linux-prctl.patch
+"

testing/got/dont-include-linux-prctl.patch

+diff --git a/compat/landlock.c b/compat/landlock.c
+index aef7fe25..1bae9a36 100644
+--- a/compat/landlock.c
++++ b/compat/landlock.c
+@@ -15,7 +15,6 @@
+  */
+ 
+ #include <linux/landlock.h>
+-#include <linux/prctl.h>
+ 
+ #include <sys/prctl.h>
+ #include <sys/syscall.h>

testing/winetricks/APKBUILD

 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer:
 pkgname=winetricks
-pkgver=20220328
+pkgver=20220411
 pkgrel=0
 pkgdesc="Winetricks is an easy way to work around problems in Wine"
 url="https://github.com/Winetricks/winetricks"
@@ -17,5 +17,5 @@ package() {
 }
 
 sha512sums="
-be114d6c924fc0b2acacfa6e8b2bf2457a8f959bb215818b00fb013f9e8b23c4665d58e4d303b94974ad1b4790d4c7a1f5e8abfa273c80d3729d0b25a8fa45db  winetricks-20220328.tar.gz
+c4e77c5e62d2df56db6aa75979cc775f26472917108b0498c975458fd6f7ecbef52c329b7b6f33c12510176e105190bc538447b39348a42b7f1a8e07e5d92d09  winetricks-20220411.tar.gz
 "