diff --git a/.SRCINFO b/.SRCINFO index 68d9b1b..bdececa 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -70,11 +70,11 @@ pkgbase = gotosocial sha512sums = 2ff5499a31e12733cb20a9261942ed135fbac327d5a836b8955f3e86c009a603cf965440d9dbe6db64b80d0f652ba56faddb0ef398393b72474d8cf6c438ab80 sha512sums = b89fad3073e140f17167515b38942e5b5e2bc2aee03c484e1bb7cf6444f86cb1e2a13a60b101e04d22633d348be073ca26cd309da4746e5062c12b4f3ce4b38a sha512sums = 87edf6e6acee86a621c838a7db32f1c9aab70bc5640f8eae099c5133a2be77ec2f711261d716a6821e4c0414436592170b1ae7a5f652bc8aeab49c8dbd0fedde - sha512sums = 9eadab35be81f9a4676fa9c623cdb7321e53055a3b7b1b2f8795a8c9f2e9059e6d7088b86dd23a85d2b234f8c938575089e7203dadfbdae486211c7f8f1f3ac1 + sha512sums = 7c3fe90c5aa6712e053e46d2f3a02606c48e57f49531ea7cb855e967f30c562fe7b353fa6666d04481e77196c0581bca98c678e69aafc23abf5522986e548dcf b2sums = fbafcfd2ab39595c5e043ec7d3a17617a77f4007d1837d26fd829c5df27523e7af131e4f0531edb0114364db263f8ec868c6e176b93dac7446d9f3f0852e2002 b2sums = ccf672731b88fc6700b0b81737790365e1eea0066bad1bbf6b13dac1e5b42af69063838efca47a6d9c16ee3f6308e2e23b92cf79d4226cd88f8551fb7361649b b2sums = 4f65af952441c0f54bb32049a149675e207f8993678423d369c4095c57476464614ac720eccc64d7a93a81268ad7ca41cae75ca7211bd7b78f9035f6e5341f04 b2sums = 3671911545d15cc21045b37fbe6983c05499e66b8a6a1e1b3eccbb5c2686914c88b090dec0bfe8e2919d8787e5b4c59bfb1e2c292cad30a8b552ab57e91d5fdf - b2sums = b0331e3fdf107bf072c35849155dd7a03d9c0e815a34182f0f108ec30b9a8d3a18b4ba38e24074a81812896c3cbbb189548591549d97fafcee8aef7a76827512 + b2sums = 42d59322123dbf6a2bf836f155f7d0b2a6221803acd0efc85e82aa3543654e57e15a1225787d2aadba7f96a3c2de24fb078e547e143a867f03c5bef38ecf5d09 pkgname = gotosocial diff --git a/PKGBUILD b/PKGBUILD index 3665d97..68d8cf2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -74,12 +74,12 @@ sha512sums=('99e6c82c5cceaa8d088de5f7ef2114d37b3512343424e8f06464b46d20a06f0c913 '2ff5499a31e12733cb20a9261942ed135fbac327d5a836b8955f3e86c009a603cf965440d9dbe6db64b80d0f652ba56faddb0ef398393b72474d8cf6c438ab80' 'b89fad3073e140f17167515b38942e5b5e2bc2aee03c484e1bb7cf6444f86cb1e2a13a60b101e04d22633d348be073ca26cd309da4746e5062c12b4f3ce4b38a' '87edf6e6acee86a621c838a7db32f1c9aab70bc5640f8eae099c5133a2be77ec2f711261d716a6821e4c0414436592170b1ae7a5f652bc8aeab49c8dbd0fedde' - '9eadab35be81f9a4676fa9c623cdb7321e53055a3b7b1b2f8795a8c9f2e9059e6d7088b86dd23a85d2b234f8c938575089e7203dadfbdae486211c7f8f1f3ac1') + '7c3fe90c5aa6712e053e46d2f3a02606c48e57f49531ea7cb855e967f30c562fe7b353fa6666d04481e77196c0581bca98c678e69aafc23abf5522986e548dcf') b2sums=('fbafcfd2ab39595c5e043ec7d3a17617a77f4007d1837d26fd829c5df27523e7af131e4f0531edb0114364db263f8ec868c6e176b93dac7446d9f3f0852e2002' 'ccf672731b88fc6700b0b81737790365e1eea0066bad1bbf6b13dac1e5b42af69063838efca47a6d9c16ee3f6308e2e23b92cf79d4226cd88f8551fb7361649b' '4f65af952441c0f54bb32049a149675e207f8993678423d369c4095c57476464614ac720eccc64d7a93a81268ad7ca41cae75ca7211bd7b78f9035f6e5341f04' '3671911545d15cc21045b37fbe6983c05499e66b8a6a1e1b3eccbb5c2686914c88b090dec0bfe8e2919d8787e5b4c59bfb1e2c292cad30a8b552ab57e91d5fdf' - 'b0331e3fdf107bf072c35849155dd7a03d9c0e815a34182f0f108ec30b9a8d3a18b4ba38e24074a81812896c3cbbb189548591549d97fafcee8aef7a76827512') + '42d59322123dbf6a2bf836f155f7d0b2a6221803acd0efc85e82aa3543654e57e15a1225787d2aadba7f96a3c2de24fb078e547e143a867f03c5bef38ecf5d09') prepare() { cd "$pkgname" diff --git a/modded.patch b/modded.patch index 7add7a9..1e22ade 100644 --- a/modded.patch +++ b/modded.patch @@ -1,5 +1,5 @@ diff --git a/example/config.yaml b/example/config.yaml -index bf6be2573..a0b11392c 100644 +index a7c679f38..144e7580d 100644 --- a/example/config.yaml +++ b/example/config.yaml @@ -118,7 +118,7 @@ account-domain: "" @@ -44,10 +44,10 @@ index bf6be2573..a0b11392c 100644 db-address: "sqlite.db" diff --git a/go.mod b/go.mod -index baa5d5ad7..3f7374598 100644 +index dfa91d6fe..a096979ec 100644 --- a/go.mod +++ b/go.mod -@@ -73,6 +73,7 @@ require ( +@@ -71,6 +71,7 @@ require ( github.com/uptrace/bun/extra/bunotel v1.2.15 github.com/wagslane/go-password-validator v0.3.0 github.com/yuin/goldmark v1.7.13 @@ -56,20 +56,29 @@ index baa5d5ad7..3f7374598 100644 go.opentelemetry.io/contrib/instrumentation/runtime v0.63.0 go.opentelemetry.io/otel v1.38.0 diff --git a/go.sum b/go.sum -index 49451e55b..136678292 100644 +index ce986407b..4610bf550 100644 --- a/go.sum +++ b/go.sum -@@ -505,6 +505,8 @@ github.com/yuin/goldmark v1.7.13 h1:GPddIs617DnBLFFVJFgpo1aBfe/4xcvMc3SB5t/D0pA= +@@ -44,8 +44,6 @@ codeberg.org/gruf/go-maps v1.0.4 h1:K+Ww4vvR3TZqm5jqrKVirmguZwa3v1VUvmig2SE8uxY= + codeberg.org/gruf/go-maps v1.0.4/go.mod h1:ASX7osM7kFwt5O8GfGflcFjrwYGD8eIuRLl/oMjhEi8= + codeberg.org/gruf/go-mempool v0.0.0-20251003110531-b54adae66253 h1:qPAY72xCWlySVROSNZecfLGAyeV/SiXmPmfhUU+o3Xw= + codeberg.org/gruf/go-mempool v0.0.0-20251003110531-b54adae66253/go.mod h1:761koiXmqfgzvu5mez2Rk7YlwWilpqJ/zv5hIA6NoNI= +-codeberg.org/gruf/go-mmap v0.0.0-20251105200114-34f58283863a h1:b0SZOKBohFBiGDiMBAM7vwHZxwQ6wpL4uaajqtoke+c= +-codeberg.org/gruf/go-mmap v0.0.0-20251105200114-34f58283863a/go.mod h1:kaHx5xHuLNf13iALbHiFpXmLeO33Ll/aW3mGkW8sI40= + codeberg.org/gruf/go-mmap v0.0.0-20251111184116-345a42dab154 h1:2SSyx/7XgOOC9nKdlrgpxenz7oZlvUeLR+YEfjM6iS8= + codeberg.org/gruf/go-mmap v0.0.0-20251111184116-345a42dab154/go.mod h1:kaHx5xHuLNf13iALbHiFpXmLeO33Ll/aW3mGkW8sI40= + codeberg.org/gruf/go-mutexes v1.5.8 h1:HRGnvT4COb3jX9xdeoSUUbjPgmk5kXPuDfld9ksUJKA= +@@ -501,6 +499,8 @@ github.com/yuin/goldmark v1.7.13 h1:GPddIs617DnBLFFVJFgpo1aBfe/4xcvMc3SB5t/D0pA= github.com/yuin/goldmark v1.7.13/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg= - gitlab.com/NyaaaWhatsUpDoc/sqlite v1.39.1-concurrency-workaround h1:ptkkB4Z76pmpmLE7vmp5BVOfO5o5+Kt0eGFhNbvVxjA= - gitlab.com/NyaaaWhatsUpDoc/sqlite v1.39.1-concurrency-workaround/go.mod h1:9fjQZ0mB1LLP0GYrp39oOJXx/I2sxEnZtzCmEQIKvGE= + gitlab.com/NyaaaWhatsUpDoc/sqlite v1.40.0-concurrency-workaround h1:RCxabWH2xbAyFjBsvmX/IC/HVJf48co9QZphvMb93wo= + gitlab.com/NyaaaWhatsUpDoc/sqlite v1.40.0-concurrency-workaround/go.mod h1:9fjQZ0mB1LLP0GYrp39oOJXx/I2sxEnZtzCmEQIKvGE= +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.3 h1:TQyXhnsWfWtgAhMtOgtYHMTkZIfBTpMTsMnd9ZBeHxQ= - go.mongodb.org/mongo-driver v1.17.3/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= + 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.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= diff --git a/internal/config/config.go b/internal/config/config.go -index dfc919f11..b2cca1276 100644 +index 9ee321b56..cee63661b 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -54,13 +54,13 @@ func fieldtag(field, tag string) string { @@ -104,10 +113,10 @@ index dfc919f11..b2cca1276 100644 type HTTPClientConfiguration struct { diff --git a/internal/config/defaults.go b/internal/config/defaults.go -index a4996e5c6..695adbcb4 100644 +index a1b4ec211..48e7fd0e8 100644 --- a/internal/config/defaults.go +++ b/internal/config/defaults.go -@@ -251,4 +251,7 @@ +@@ -263,4 +263,7 @@ RequestIDHeader: "X-Request-Id", LogClientIP: true, @@ -116,10 +125,10 @@ index a4996e5c6..695adbcb4 100644 + KalaclistaTurnOffAuthorizedFetch: true, } diff --git a/internal/config/helpers.gen.go b/internal/config/helpers.gen.go -index 217917bcf..e194e842e 100644 +index 078c67289..73d2f8152 100644 --- a/internal/config/helpers.gen.go +++ b/internal/config/helpers.gen.go -@@ -225,6 +225,7 @@ +@@ -226,6 +226,7 @@ AdminMediaListRemoteOnlyFlag = "remote-only" TestrigSkipDBSetupFlag = "skip-db-setup" TestrigSkipDBTeardownFlag = "skip-db-teardown" @@ -127,7 +136,7 @@ index 217917bcf..e194e842e 100644 ) func (cfg *Configuration) RegisterFlags(flags *pflag.FlagSet) { -@@ -415,6 +416,7 @@ func (cfg *Configuration) RegisterFlags(flags *pflag.FlagSet) { +@@ -417,6 +418,7 @@ func (cfg *Configuration) RegisterFlags(flags *pflag.FlagSet) { flags.Float64("cache-mutes-mem-ratio", cfg.Cache.MutesMemRatio, "") flags.Float64("cache-status-filter-mem-ratio", cfg.Cache.StatusFilterMemRatio, "") flags.Float64("cache-visibility-mem-ratio", cfg.Cache.VisibilityMemRatio, "") @@ -135,7 +144,7 @@ index 217917bcf..e194e842e 100644 } func (cfg *Configuration) MarshalMap() map[string]any { -@@ -615,6 +617,7 @@ func (cfg *Configuration) MarshalMap() map[string]any { +@@ -618,6 +620,7 @@ func (cfg *Configuration) MarshalMap() map[string]any { cfgmap["remote-only"] = cfg.AdminMediaListRemoteOnly cfgmap["skip-db-setup"] = cfg.TestrigSkipDBSetup cfgmap["skip-db-teardown"] = cfg.TestrigSkipDBTeardown @@ -143,7 +152,7 @@ index 217917bcf..e194e842e 100644 return cfgmap } -@@ -2226,6 +2229,14 @@ func (cfg *Configuration) UnmarshalMap(cfgmap map[string]any) error { +@@ -2237,6 +2240,14 @@ func (cfg *Configuration) UnmarshalMap(cfgmap map[string]any) error { } } @@ -158,7 +167,7 @@ index 217917bcf..e194e842e 100644 return nil } -@@ -2559,6 +2570,31 @@ func GetTrustedProxies() []string { return global.GetTrustedProxies() } +@@ -2570,6 +2581,31 @@ func GetTrustedProxies() []string { return global.GetTrustedProxies() } // SetTrustedProxies safely sets the value for global configuration 'TrustedProxies' field func SetTrustedProxies(v []string) { global.SetTrustedProxies(v) } @@ -190,7 +199,7 @@ index 217917bcf..e194e842e 100644 // GetSoftwareVersion safely fetches the Configuration value for state's 'SoftwareVersion' field func (st *ConfigState) GetSoftwareVersion() (v string) { st.mutex.RLock() -@@ -6565,6 +6601,28 @@ func GetTestrigSkipDBTeardown() bool { return global.GetTestrigSkipDBTeardown() +@@ -6598,6 +6634,28 @@ func GetTestrigSkipDBTeardown() bool { return global.GetTestrigSkipDBTeardown() // SetTestrigSkipDBTeardown safely sets the value for global configuration 'TestrigSkipDBTeardown' field func SetTestrigSkipDBTeardown(v bool) { global.SetTestrigSkipDBTeardown(v) } @@ -1207,10 +1216,10 @@ index 000000000..ee3d81ff1 + return i.c +} diff --git a/vendor/modules.txt b/vendor/modules.txt -index 19b2ef773..3d418ee33 100644 +index b959ddc5a..43d951ba8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt -@@ -1002,6 +1002,10 @@ github.com/yuin/goldmark/renderer +@@ -1007,6 +1007,10 @@ github.com/yuin/goldmark/renderer github.com/yuin/goldmark/renderer/html github.com/yuin/goldmark/text github.com/yuin/goldmark/util @@ -1218,6 +1227,6 @@ index 19b2ef773..3d418ee33 100644 +## explicit; go 1.20 +go.balki.me/anyhttp +go.balki.me/anyhttp/idle - # go.mongodb.org/mongo-driver v1.17.3 + # go.mongodb.org/mongo-driver v1.17.4 ## explicit; go 1.18 go.mongodb.org/mongo-driver/bson