community/ostree: upgrade to 2024.8 and drop patch

community/ostree/3307.patch

@@ -1,60 +0,0 @@
-From 4d755a85225ea0a02d4580d088bb8a97138cb040 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Wed, 18 Sep 2024 13:41:59 -0400
-Subject: [PATCH] curl: Make socket callback during cleanup into no-op
-
-Because curl_multi_cleanup may invoke callbacks, we effectively have
-some circular references going on here. See discussion in
-
-https://github.com/curl/curl/issues/14860
-
-Basically what we do is the socket callback libcurl may invoke into a no-op when
-we detect we're finalizing. The data structures are owned by this object and
-not by the callbacks, and will be destroyed below. Note that
-e.g. g_hash_table_unref() may itself invoke callbacks, which is where
-some data is cleaned up.
-
-Signed-off-by: Colin Walters <walters@verbum.org>
----
- src/libostree/ostree-fetcher-curl.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/src/libostree/ostree-fetcher-curl.c b/src/libostree/ostree-fetcher-curl.c
-index d6902893ff..8054812f57 100644
---- a/src/libostree/ostree-fetcher-curl.c
-+++ b/src/libostree/ostree-fetcher-curl.c
-@@ -78,6 +78,7 @@ struct OstreeFetcher
-   struct curl_slist *extra_headers;
-   int tmpdir_dfd;
-   bool force_anonymous;
-+  bool finalizing; // Set if we're in the process of teardown
-   char *custom_user_agent;
-   guint32 opt_low_speed_limit;
-   guint32 opt_low_speed_time;
-@@ -180,6 +181,15 @@ _ostree_fetcher_finalize (GObject *object)
- {
-   OstreeFetcher *self = OSTREE_FETCHER (object);
- 
-+  // Because curl_multi_cleanup may invoke callbacks, we effectively have
-+  // some circular references going on here. See discussion in
-+  // https://github.com/curl/curl/issues/14860
-+  // Basically what we do is make most callbacks libcurl may invoke into no-ops when
-+  // we detect we're finalizing. The data structures are owned by this object and
-+  // not by the callbacks, and will be destroyed below. Note that
-+  // e.g. g_hash_table_unref() may itself invoke callbacks, which is where
-+  // some data is cleaned up.
-+  self->finalizing = true;
-   curl_multi_cleanup (self->multi);
-   g_free (self->remote_name);
-   g_free (self->tls_ca_db_path);
-@@ -528,6 +538,10 @@ sock_cb (CURL *easy, curl_socket_t s, int what, void *cbp, void *sockp)
-   OstreeFetcher *fetcher = cbp;
-   SockInfo *fdp = (SockInfo *)sockp;
- 
-+  // We do nothing if we're in the process of teardown; see below.
-+  if (fetcher->finalizing)
-+    return 0;
-+
-   if (what == CURL_POLL_REMOVE)
-     {
-       if (!g_hash_table_remove (fetcher->sockets, fdp))

community/ostree/APKBUILD

@@ -1,8 +1,8 @@
 # Contributor: André Klitzing <aklitzing@gmail.com>
 # Maintainer: André Klitzing <aklitzing@gmail.com>
 pkgname=ostree
-pkgver=2024.7
-pkgrel=1
+pkgver=2024.8
+pkgrel=0
 pkgdesc="Operating system and container binary deployment and upgrades"
 url="https://github.com/ostreedev/ostree"
 arch="all"
@@ -32,10 +32,7 @@ subpackages="
 	$pkgname-grub:grub:noarch
 	$pkgname-bash-completion:bashcomp:noarch
 	"
-source="
-	https://github.com/ostreedev/ostree/releases/download/v$pkgver/libostree-$pkgver.tar.xz
-	3307.patch
-"
+source="https://github.com/ostreedev/ostree/releases/download/v$pkgver/libostree-$pkgver.tar.xz"
 builddir="$srcdir/lib$pkgname-$pkgver"
 # todo: fails to make stuff in var/tmp in root
 options="!check"
@@ -102,6 +99,5 @@ bashcomp() {
 }
 
 sha512sums="
-bb5a9895d3061fbb91d6eb3761e7b90821a49390544dc153f0041a254cdbc80bd9695b11879936f7760fa0d308daecdc0f91d5c357ec01f98df6b67acba49651  libostree-2024.7.tar.xz
-92f019b856a17cf688611fb613af445a159062597d3e6feb3f88f3abba63418f71dd204f059107c10f5f4c8e45106d66e56742bb395ab6e9417f4c8868b0e649  3307.patch
+6faed3daebce443134141bbf98add459c6f0c8239cc0e050cf2517d1127f3fd6aededd4af5d8400f869683b96aea2abb93bab8869dbf2f9a4ba02324c3005e5d  libostree-2024.8.tar.xz
 "