From ebf550b7c13504e6324796a7fcd726975fdb1483 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Mon, 15 Jan 2024 21:54:32 +0100 Subject: [PATCH] [chore] Move to codeberg's exif-terminator (#2536) --- README.md | 2 +- go.mod | 2 +- go.sum | 4 ++-- internal/media/processingmedia.go | 2 +- .../superseriousbusiness/exif-terminator/LICENSE | 0 .../superseriousbusiness/exif-terminator/README.md | 4 ++-- .../superseriousbusiness/exif-terminator/jpeg.go | 0 .../superseriousbusiness/exif-terminator/png.go | 0 .../superseriousbusiness/exif-terminator/terminator.go | 0 .../superseriousbusiness/exif-terminator/webp.go | 0 vendor/modules.txt | 6 +++--- 11 files changed, 10 insertions(+), 10 deletions(-) rename vendor/{github.com => codeberg.org}/superseriousbusiness/exif-terminator/LICENSE (100%) rename vendor/{github.com => codeberg.org}/superseriousbusiness/exif-terminator/README.md (98%) rename vendor/{github.com => codeberg.org}/superseriousbusiness/exif-terminator/jpeg.go (100%) rename vendor/{github.com => codeberg.org}/superseriousbusiness/exif-terminator/png.go (100%) rename vendor/{github.com => codeberg.org}/superseriousbusiness/exif-terminator/terminator.go (100%) rename vendor/{github.com => codeberg.org}/superseriousbusiness/exif-terminator/webp.go (100%) diff --git a/README.md b/README.md index 4d5f87dca..d6a891657 100644 --- a/README.md +++ b/README.md @@ -304,7 +304,7 @@ The following open source libraries, frameworks, and tools are used by GoToSocia - [stretchr/testify](https://github.com/stretchr/testify); test framework. [MIT License](https://spdx.org/licenses/MIT.html). - superseriousbusiness: - [superseriousbusiness/activity](https://github.com/superseriousbusiness/activity) forked from [go-fed/activity](https://github.com/go-fed/activity); Golang ActivityPub/ActivityStreams library. [BSD-3-Clause License](https://spdx.org/licenses/BSD-3-Clause.html). - - [superseriousbusiness/exif-terminator](https://github.com/superseriousbusiness/exif-terminator); EXIF data removal. [GNU AGPL v3 LICENSE](https://spdx.org/licenses/AGPL-3.0-or-later.html). + - [superseriousbusiness/exif-terminator](https://codeberg.org/superseriousbusiness/exif-terminator); EXIF data removal. [GNU AGPL v3 LICENSE](https://spdx.org/licenses/AGPL-3.0-or-later.html). - [superseriousbusiness/oauth2](https://github.com/superseriousbusiness/oauth2) forked from [go-oauth2/oauth2](https://github.com/go-oauth2/oauth2); OAuth server framework and token handling. [MIT License](https://spdx.org/licenses/MIT.html). - [tdewolff/minify](https://github.com/tdewolff/minify); HTML minification for Markdown-submitted posts. [MIT License](https://spdx.org/licenses/MIT.html). - [uber-go/automaxprocs](https://github.com/uber-go/automaxprocs); GOMAXPROCS automation. [MIT License](https://spdx.org/licenses/MIT.html). diff --git a/go.mod b/go.mod index 8c2952c1e..f7869cee2 100644 --- a/go.mod +++ b/go.mod @@ -18,6 +18,7 @@ require ( codeberg.org/gruf/go-runners v1.6.2 codeberg.org/gruf/go-sched v1.2.3 codeberg.org/gruf/go-store/v2 v2.2.4 + codeberg.org/superseriousbusiness/exif-terminator v0.7.0 github.com/DmitriyVTitov/size v1.5.0 github.com/KimMachineGun/automemlimit v0.4.0 github.com/abema/go-mp4 v1.1.1 @@ -45,7 +46,6 @@ require ( github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 github.com/superseriousbusiness/activity v1.4.0-gts - github.com/superseriousbusiness/exif-terminator v0.6.0 github.com/superseriousbusiness/oauth2/v4 v4.3.2-SSB.0.20230227143000-f4900831d6c8 github.com/tdewolff/minify/v2 v2.20.14 github.com/technologize/otel-go-contrib v1.1.0 diff --git a/go.sum b/go.sum index 8331366f5..3a7a462f5 100644 --- a/go.sum +++ b/go.sum @@ -75,6 +75,8 @@ codeberg.org/gruf/go-sched v1.2.3 h1:H5ViDxxzOBR3uIyGBCf0eH8b1L8wMybOXcdtUUTXZHk codeberg.org/gruf/go-sched v1.2.3/go.mod h1:vT9uB6KWFIIwnG9vcPY2a0alYNoqdL1mSzRM8I+PK7A= codeberg.org/gruf/go-store/v2 v2.2.4 h1:8HO1Jh2gg7boQKA3hsDAIXd9zwieu5uXwDXEcTOD9js= codeberg.org/gruf/go-store/v2 v2.2.4/go.mod h1:zI4VWe5CpXAktYMtaBMrgA5QmO0sQH53LBRvfn1huys= +codeberg.org/superseriousbusiness/exif-terminator v0.7.0 h1:Y6VApSXhKqExG0H2hZ2JelRK4xmWdjDQjn13CpEfzko= +codeberg.org/superseriousbusiness/exif-terminator v0.7.0/go.mod h1:gCWKduudUWFzsnixoMzu0FYVdxHWG+AbXnZ50DqxsUE= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= @@ -503,8 +505,6 @@ github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNG github.com/sunfish-shogi/bufseekio v0.0.0-20210207115823-a4185644b365/go.mod h1:dEzdXgvImkQ3WLI+0KQpmEx8T/C/ma9KeS3AfmU899I= github.com/superseriousbusiness/activity v1.4.0-gts h1:9r95sYy80tuGWWpDDNlLwa/k6dKZdyP/k+rhVA+VjdQ= github.com/superseriousbusiness/activity v1.4.0-gts/go.mod h1:AZw0Xb4Oju8rmaJCZ21gc5CPg47MmNgyac+Hx5jo8VM= -github.com/superseriousbusiness/exif-terminator v0.6.0 h1:f8FM4R/Au7iB0PGfSKjKAEYMGvM2HHbd1qLxrfmuNFk= -github.com/superseriousbusiness/exif-terminator v0.6.0/go.mod h1:HjbpsIyuK6PguA/Rla+Hz0+A9pF6iWf9qGLhqpAN68k= github.com/superseriousbusiness/go-jpeg-image-structure/v2 v2.0.0-20220321154430-d89a106fdabe h1:ksl2oCx/Qo8sNDc3Grb8WGKBM9nkvhCm25uvlT86azE= github.com/superseriousbusiness/go-jpeg-image-structure/v2 v2.0.0-20220321154430-d89a106fdabe/go.mod h1:gH4P6gN1V+wmIw5o97KGaa1RgXB/tVpC2UNzijhg3E4= github.com/superseriousbusiness/go-png-image-structure/v2 v2.0.1-SSB h1:8psprYSK1KdOSH7yQ4PbJq0YYaGQY+gzdW/B0ExDb/8= diff --git a/internal/media/processingmedia.go b/internal/media/processingmedia.go index dd021f3cf..ffedc3208 100644 --- a/internal/media/processingmedia.go +++ b/internal/media/processingmedia.go @@ -27,9 +27,9 @@ import ( errorsv2 "codeberg.org/gruf/go-errors/v2" "codeberg.org/gruf/go-runners" + "codeberg.org/superseriousbusiness/exif-terminator" "github.com/disintegration/imaging" "github.com/h2non/filetype" - "github.com/superseriousbusiness/exif-terminator" "github.com/superseriousbusiness/gotosocial/internal/gtserror" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/log" diff --git a/vendor/github.com/superseriousbusiness/exif-terminator/LICENSE b/vendor/codeberg.org/superseriousbusiness/exif-terminator/LICENSE similarity index 100% rename from vendor/github.com/superseriousbusiness/exif-terminator/LICENSE rename to vendor/codeberg.org/superseriousbusiness/exif-terminator/LICENSE diff --git a/vendor/github.com/superseriousbusiness/exif-terminator/README.md b/vendor/codeberg.org/superseriousbusiness/exif-terminator/README.md similarity index 98% rename from vendor/github.com/superseriousbusiness/exif-terminator/README.md rename to vendor/codeberg.org/superseriousbusiness/exif-terminator/README.md index 7f7209259..ddb97fbb6 100644 --- a/vendor/github.com/superseriousbusiness/exif-terminator/README.md +++ b/vendor/codeberg.org/superseriousbusiness/exif-terminator/README.md @@ -66,7 +66,7 @@ import ( "io" "os" - terminator "github.com/superseriousbusiness/exif-terminator" + terminator "codeberg.org/superseriousbusiness/exif-terminator" ) func main() { @@ -119,4 +119,4 @@ func main() { `exif-terminator` is free software, licensed under the [GNU AGPL v3 LICENSE](LICENSE). -Copyright (C) 2022 SuperSeriousBusiness. +Copyright (C) 2022-2024 SuperSeriousBusiness. diff --git a/vendor/github.com/superseriousbusiness/exif-terminator/jpeg.go b/vendor/codeberg.org/superseriousbusiness/exif-terminator/jpeg.go similarity index 100% rename from vendor/github.com/superseriousbusiness/exif-terminator/jpeg.go rename to vendor/codeberg.org/superseriousbusiness/exif-terminator/jpeg.go diff --git a/vendor/github.com/superseriousbusiness/exif-terminator/png.go b/vendor/codeberg.org/superseriousbusiness/exif-terminator/png.go similarity index 100% rename from vendor/github.com/superseriousbusiness/exif-terminator/png.go rename to vendor/codeberg.org/superseriousbusiness/exif-terminator/png.go diff --git a/vendor/github.com/superseriousbusiness/exif-terminator/terminator.go b/vendor/codeberg.org/superseriousbusiness/exif-terminator/terminator.go similarity index 100% rename from vendor/github.com/superseriousbusiness/exif-terminator/terminator.go rename to vendor/codeberg.org/superseriousbusiness/exif-terminator/terminator.go diff --git a/vendor/github.com/superseriousbusiness/exif-terminator/webp.go b/vendor/codeberg.org/superseriousbusiness/exif-terminator/webp.go similarity index 100% rename from vendor/github.com/superseriousbusiness/exif-terminator/webp.go rename to vendor/codeberg.org/superseriousbusiness/exif-terminator/webp.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 8594417a1..06d5b3f77 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -60,6 +60,9 @@ codeberg.org/gruf/go-sched ## explicit; go 1.19 codeberg.org/gruf/go-store/v2/storage codeberg.org/gruf/go-store/v2/util +# codeberg.org/superseriousbusiness/exif-terminator v0.7.0 +## explicit; go 1.21 +codeberg.org/superseriousbusiness/exif-terminator # github.com/DmitriyVTitov/size v1.5.0 ## explicit; go 1.14 github.com/DmitriyVTitov/size @@ -655,9 +658,6 @@ github.com/superseriousbusiness/activity/streams/values/rfc2045 github.com/superseriousbusiness/activity/streams/values/rfc5988 github.com/superseriousbusiness/activity/streams/values/string github.com/superseriousbusiness/activity/streams/vocab -# github.com/superseriousbusiness/exif-terminator v0.6.0 -## explicit; go 1.21 -github.com/superseriousbusiness/exif-terminator # github.com/superseriousbusiness/go-jpeg-image-structure/v2 v2.0.0-20220321154430-d89a106fdabe ## explicit; go 1.17 github.com/superseriousbusiness/go-jpeg-image-structure/v2