diff --git a/.SRCINFO b/.SRCINFO index 6b34733..68809d7 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = gotosocial-balki pkgdesc = ActivityPub social network server written in Golang - pkgver = 0.21.1 + pkgver = 0.21.2 pkgrel = 1 url = https://gotosocial.org arch = x86_64 @@ -63,20 +63,20 @@ pkgbase = gotosocial-balki backup = etc/gotosocial/template/status_poll.tmpl backup = etc/gotosocial/template/tag.tmpl backup = etc/gotosocial/template/thread.tmpl - source = gotosocial::git+https://codeberg.org/superseriousbusiness/gotosocial#tag=v0.21.1 + source = gotosocial::git+https://codeberg.org/superseriousbusiness/gotosocial#tag=v0.21.2 source = sysusers.conf source = tmpfiles.conf source = use-fhs-directories.patch source = modded.patch - sha512sums = 75df2cf6d197f77ede26854353a59e63cd956f6ff2c029b1964ae74f90844cc7faf8ab563ce610623429dea4875cc613d9a60d7a0c434ca26c598badab229ac5 + sha512sums = ec78c9456193ed764a9cc77d006d7b2f76a27f86bc4e448bd14772a668f09023a2f3246aa810c55ef977b9d1867d177ac52153973cac09a06110cd146529f3ae sha512sums = 2ff5499a31e12733cb20a9261942ed135fbac327d5a836b8955f3e86c009a603cf965440d9dbe6db64b80d0f652ba56faddb0ef398393b72474d8cf6c438ab80 sha512sums = b89fad3073e140f17167515b38942e5b5e2bc2aee03c484e1bb7cf6444f86cb1e2a13a60b101e04d22633d348be073ca26cd309da4746e5062c12b4f3ce4b38a sha512sums = 87edf6e6acee86a621c838a7db32f1c9aab70bc5640f8eae099c5133a2be77ec2f711261d716a6821e4c0414436592170b1ae7a5f652bc8aeab49c8dbd0fedde - sha512sums = 54ce7741e0e5e53a5719bb7f396175ad19f63f5714257d6d4b6befd934906ea9515cc1b203688e152dfd0a57315d405c6e6ee92e48069b606768aa5658a2e76a - b2sums = 28e357ce4d63f222b2078cf92d51ca5438db5e9a1427c2f145adafcfc5fa2aa1001547c7c87bd49158de470c7eaf7da2e7f5af7c7808d9656909442de43d7da8 + sha512sums = ca9d02f595691f870322504284d06e94de976e372c7cef13efd8bb0082d77e13d62c569d0dde46202e46aa29fea253d71e66d596480679ed158a8b5e194b2856 + b2sums = 8861be165f1852d44fde73c6b9d5da8e18c40a21501e665f4ec9a7fb37e0a12303afd970b4f3e605def5858ba100b933ba454c17d195a77e2538910574ac911d b2sums = ccf672731b88fc6700b0b81737790365e1eea0066bad1bbf6b13dac1e5b42af69063838efca47a6d9c16ee3f6308e2e23b92cf79d4226cd88f8551fb7361649b b2sums = 4f65af952441c0f54bb32049a149675e207f8993678423d369c4095c57476464614ac720eccc64d7a93a81268ad7ca41cae75ca7211bd7b78f9035f6e5341f04 b2sums = 3671911545d15cc21045b37fbe6983c05499e66b8a6a1e1b3eccbb5c2686914c88b090dec0bfe8e2919d8787e5b4c59bfb1e2c292cad30a8b552ab57e91d5fdf - b2sums = 9b0f65ad56fbdd92b5e827b169d4152609a075bd3d7c90d227e1c8736692fbf58eb672d7138e3bfb04e9308248c25dfe56d9df6a99c86263a96ed38395fd0319 + b2sums = db6f1b8d3719b4f4d32b8aa8f4fd1b4baf0793e10a38f803545b18996a43543ef0f748b48cbe5ba366f9b7471871bd60e5ecdff129c936b4e79b8203db4be4d9 pkgname = gotosocial-balki diff --git a/PKGBUILD b/PKGBUILD index 7a42002..9d6d0e5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ pkgname=gotosocial-balki _pkgname=gotosocial -pkgver=0.21.1 +pkgver=0.21.2 pkgrel=1 pkgdesc='ActivityPub social network server written in Golang' arch=(x86_64) @@ -73,16 +73,16 @@ source=( use-fhs-directories.patch modded.patch ) -sha512sums=('75df2cf6d197f77ede26854353a59e63cd956f6ff2c029b1964ae74f90844cc7faf8ab563ce610623429dea4875cc613d9a60d7a0c434ca26c598badab229ac5' +sha512sums=('ec78c9456193ed764a9cc77d006d7b2f76a27f86bc4e448bd14772a668f09023a2f3246aa810c55ef977b9d1867d177ac52153973cac09a06110cd146529f3ae' '2ff5499a31e12733cb20a9261942ed135fbac327d5a836b8955f3e86c009a603cf965440d9dbe6db64b80d0f652ba56faddb0ef398393b72474d8cf6c438ab80' 'b89fad3073e140f17167515b38942e5b5e2bc2aee03c484e1bb7cf6444f86cb1e2a13a60b101e04d22633d348be073ca26cd309da4746e5062c12b4f3ce4b38a' '87edf6e6acee86a621c838a7db32f1c9aab70bc5640f8eae099c5133a2be77ec2f711261d716a6821e4c0414436592170b1ae7a5f652bc8aeab49c8dbd0fedde' - '54ce7741e0e5e53a5719bb7f396175ad19f63f5714257d6d4b6befd934906ea9515cc1b203688e152dfd0a57315d405c6e6ee92e48069b606768aa5658a2e76a') -b2sums=('28e357ce4d63f222b2078cf92d51ca5438db5e9a1427c2f145adafcfc5fa2aa1001547c7c87bd49158de470c7eaf7da2e7f5af7c7808d9656909442de43d7da8' + 'ca9d02f595691f870322504284d06e94de976e372c7cef13efd8bb0082d77e13d62c569d0dde46202e46aa29fea253d71e66d596480679ed158a8b5e194b2856') +b2sums=('8861be165f1852d44fde73c6b9d5da8e18c40a21501e665f4ec9a7fb37e0a12303afd970b4f3e605def5858ba100b933ba454c17d195a77e2538910574ac911d' 'ccf672731b88fc6700b0b81737790365e1eea0066bad1bbf6b13dac1e5b42af69063838efca47a6d9c16ee3f6308e2e23b92cf79d4226cd88f8551fb7361649b' '4f65af952441c0f54bb32049a149675e207f8993678423d369c4095c57476464614ac720eccc64d7a93a81268ad7ca41cae75ca7211bd7b78f9035f6e5341f04' '3671911545d15cc21045b37fbe6983c05499e66b8a6a1e1b3eccbb5c2686914c88b090dec0bfe8e2919d8787e5b4c59bfb1e2c292cad30a8b552ab57e91d5fdf' - '9b0f65ad56fbdd92b5e827b169d4152609a075bd3d7c90d227e1c8736692fbf58eb672d7138e3bfb04e9308248c25dfe56d9df6a99c86263a96ed38395fd0319') + 'db6f1b8d3719b4f4d32b8aa8f4fd1b4baf0793e10a38f803545b18996a43543ef0f748b48cbe5ba366f9b7471871bd60e5ecdff129c936b4e79b8203db4be4d9') prepare() { cd "$_pkgname" diff --git a/modded.patch b/modded.patch index 992151f..73aa3c9 100644 --- a/modded.patch +++ b/modded.patch @@ -44,30 +44,30 @@ index 5c284b058..0fc7a16d8 100644 db-address: "sqlite.db" diff --git a/go.mod b/go.mod -index ff934c684..81fb8e95a 100644 +index 68a72a4ed..d4256d344 100644 --- a/go.mod +++ b/go.mod @@ -76,6 +76,7 @@ require ( - github.com/uptrace/bun/extra/bunotel v1.2.17 + github.com/uptrace/bun/extra/bunotel v1.2.18 github.com/wagslane/go-password-validator v0.3.0 - github.com/yuin/goldmark v1.7.16 + github.com/yuin/goldmark v1.7.17 + go.balki.me/anyhttp v0.5.2 - go.opentelemetry.io/contrib/exporters/autoexport v0.65.0 - go.opentelemetry.io/contrib/instrumentation/runtime v0.65.0 - go.opentelemetry.io/otel v1.40.0 + go.opentelemetry.io/contrib/exporters/autoexport v0.67.0 + go.opentelemetry.io/contrib/instrumentation/runtime v0.67.0 + go.opentelemetry.io/otel v1.42.0 diff --git a/go.sum b/go.sum -index edd9edd3b..624abebc5 100644 +index 5c129ccf2..bcb2b22e0 100644 --- a/go.sum +++ b/go.sum -@@ -516,6 +516,8 @@ github.com/yuin/goldmark v1.7.16 h1:n+CJdUxaFMiDUNnWC3dMWCIQJSkxH4uz3ZwQBkAlVNE= - github.com/yuin/goldmark v1.7.16/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg= - gitlab.com/NyaaaWhatsUpDoc/sqlite v1.45.0-concurrency-workaround h1:ZUMRkBuH0UYp31yhNt28+Wv5FEBqkEZl0VZyf+skCno= - gitlab.com/NyaaaWhatsUpDoc/sqlite v1.45.0-concurrency-workaround/go.mod h1:CzbrU2lSB1DKUusvwGz7rqEKIq+NUd8GWuBBZDs9/nA= +@@ -541,6 +541,8 @@ github.com/yuin/goldmark v1.7.17 h1:p36OVWwRb246iHxA/U4p8OPEpOTESm4n+g+8t0EE5uA= + github.com/yuin/goldmark v1.7.17/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg= + gitlab.com/NyaaaWhatsUpDoc/sqlite v1.47.0-concurrency-workaround h1:an4ah+Lby20s+qP+9mgbIfWC/0SRoZWV8rhDVU1Qwjc= + gitlab.com/NyaaaWhatsUpDoc/sqlite v1.47.0-concurrency-workaround/go.mod h1:hWjRO6Tj/5Ik8ieqxQybiEOUXy0NJFNp2tpvVpKlvig= +go.balki.me/anyhttp v0.5.2 h1:et4tCDXLeXpWfMNvRKG7ojfrnlr3du7cEaG966MLSpA= +go.balki.me/anyhttp v0.5.2/go.mod h1:JhfekOIjgVODoVqUCficjpIgmB3wwlB7jhN0eN2EZ/s= - go.mongodb.org/mongo-driver v1.17.4 h1:jUorfmVzljjr0FLzYQsGP8cgN/qzzxlY9Vh0C9KFXVw= - go.mongodb.org/mongo-driver v1.17.4/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= + go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= + go.opentelemetry.io/contrib/bridges/prometheus v0.67.0 h1:dkBzNEAIKADEaFnuESzcXvpd09vxvDZsOjx11gjUqLk= diff --git a/internal/api/util/mime.go b/internal/api/util/mime.go index 6159d4b79..280be3445 100644 --- a/internal/api/util/mime.go @@ -1243,10 +1243,10 @@ index 000000000..ee3d81ff1 + return i.c +} diff --git a/vendor/modules.txt b/vendor/modules.txt -index 96cdab2aa..b92f9305e 100644 +index 5e6c27ff6..99acac2c0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt -@@ -1045,6 +1045,10 @@ github.com/yuin/goldmark/renderer +@@ -1074,6 +1074,10 @@ github.com/yuin/goldmark/renderer github.com/yuin/goldmark/renderer/html github.com/yuin/goldmark/text github.com/yuin/goldmark/util @@ -1254,6 +1254,6 @@ index 96cdab2aa..b92f9305e 100644 +## explicit; go 1.20 +go.balki.me/anyhttp +go.balki.me/anyhttp/idle - # go.mongodb.org/mongo-driver v1.17.4 - ## explicit; go 1.18 - go.mongodb.org/mongo-driver/bson + # go.opentelemetry.io/auto/sdk v1.2.1 + ## explicit; go 1.24.0 + go.opentelemetry.io/auto/sdk