remove obsoltes build constraints

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
2026-03-14 14:25:52 +01:00 · 2025-04-20 17:05:42 +02:00 · 2025-04-20 17:05:42 +02:00 · 675de93b41
commit 675de93b41
parent 899c739b82
47 changed files with 47 additions and 76 deletions
--- a/go.mod
+++ b/go.mod
@ -38,9 +38,9 @@ require (
 	github.com/jackc/pgx/v5 v5.7.4
 	github.com/jlaffaye/ftp v0.2.0
 	github.com/klauspost/compress v1.18.0
-	github.com/lestrrat-go/jwx/v2 v2.1.5-0.20250226052408-de7d95fda31a
-	github.com/lithammer/shortuuid/v3 v3.0.7
-	github.com/mattn/go-sqlite3 v1.14.27
+	github.com/lestrrat-go/jwx/v2 v2.1.6-0.20250420095048-a18531964875
+	github.com/lithammer/shortuuid/v4 v4.2.0
+	github.com/mattn/go-sqlite3 v1.14.28
 	github.com/mhale/smtpd v0.8.3
 	github.com/minio/sio v0.4.1
 	github.com/otiai10/copy v1.14.1
@ -117,12 +117,12 @@ require (
 	github.com/fatih/color v1.18.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
-	github.com/go-jose/go-jose/v4 v4.0.5 // indirect
+	github.com/go-jose/go-jose/v4 v4.1.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
-	github.com/goccy/go-json v0.10.4 // indirect
+	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/s2a-go v0.1.9 // indirect
@ -137,7 +137,7 @@ require (
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/kr/fs v0.1.0 // indirect
-	github.com/lestrrat-go/blackmagic v1.0.2 // indirect
+	github.com/lestrrat-go/blackmagic v1.0.3 // indirect
 	github.com/lestrrat-go/httpcc v1.0.1 // indirect
 	github.com/lestrrat-go/httprc v1.0.6 // indirect
 	github.com/lestrrat-go/iter v1.0.2 // indirect
@ -145,7 +145,7 @@ require (
 	github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/miekg/dns v1.1.62 // indirect
+	github.com/miekg/dns v1.1.64 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/oklog/run v1.1.0 // indirect
 	github.com/otiai10/mint v1.6.3 // indirect
@ -177,10 +177,10 @@ require (
 	go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
 	go.opentelemetry.io/otel/trace v1.34.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/mod v0.22.0 // indirect
+	golang.org/x/mod v0.23.0 // indirect
 	golang.org/x/sync v0.13.0 // indirect
 	golang.org/x/text v0.24.0 // indirect
-	golang.org/x/tools v0.28.0 // indirect
+	golang.org/x/tools v0.30.0 // indirect
 	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
 	google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
@ -194,5 +194,5 @@ replace (
 	github.com/fclairamb/ftpserverlib => github.com/drakkan/ftpserverlib v0.0.0-20250204143431-e069fad14727
 	github.com/jlaffaye/ftp => github.com/drakkan/ftp v0.0.0-20240430173938-7ba8270c8e7f
 	github.com/robfig/cron/v3 => github.com/drakkan/cron/v3 v3.0.0-20230222140221-217a1e4d96c0
-	golang.org/x/crypto => github.com/drakkan/crypto v0.0.0-20250412202113-488a7baf0216
+	golang.org/x/crypto => github.com/drakkan/crypto v0.0.0-20250420101914-6ac0129dc1f7
 )
--- a/go.sum
+++ b/go.sum
@ -131,8 +131,8 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvw
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40=
 github.com/drakkan/cron/v3 v3.0.0-20230222140221-217a1e4d96c0 h1:EW9gIJRmt9lzk66Fhh4S8VEtURA6QHZqGeSRE9Nb2/U=
 github.com/drakkan/cron/v3 v3.0.0-20230222140221-217a1e4d96c0/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/drakkan/crypto v0.0.0-20250412202113-488a7baf0216 h1:FHWEBMmmfMNBYGKGUVW0AWhptXXUmu+ft7OgrIm8f3c=
-github.com/drakkan/crypto v0.0.0-20250412202113-488a7baf0216/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
+github.com/drakkan/crypto v0.0.0-20250420101914-6ac0129dc1f7 h1:3q3dRxSzqjl5mA/fL4Vn57Dgt7FYG/l4gk2IogaXwvU=
+github.com/drakkan/crypto v0.0.0-20250420101914-6ac0129dc1f7/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
 github.com/drakkan/ftp v0.0.0-20240430173938-7ba8270c8e7f h1:S9JUlrOzjK58UKoLqqb40YLyVlt0bcIFtYrvnanV3zc=
 github.com/drakkan/ftp v0.0.0-20240430173938-7ba8270c8e7f/go.mod h1:4p8lUl4vQ80L598CygL+3IFtm+3nggvvW/palOlViwE=
 github.com/drakkan/ftpserverlib v0.0.0-20250204143431-e069fad14727 h1:OwxAvQejxuEYFtuXcOxuepEjt6VPLEQ3zK+5k9p4M60=
@ -172,8 +172,8 @@ github.com/go-chi/jwtauth/v5 v5.3.3 h1:50Uzmacu35/ZP9ER2Ht6SazwPsnLQ9LRJy6zTZJpH
 github.com/go-chi/jwtauth/v5 v5.3.3/go.mod h1:O4QvPRuZLZghl9WvfVaON+ARfGzpD2PBX/QY5vUz7aQ=
 github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
 github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
-github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
-github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA=
+github.com/go-jose/go-jose/v4 v4.1.0 h1:cYSYxd3pw5zd2FSXk2vGdn9igQU2PS8MuxrCOCl0FdY=
+github.com/go-jose/go-jose/v4 v4.1.0/go.mod h1:GG/vqmYm3Von2nYiB2vGTXzdoNKE5tix5tuc6iAd+sw=
 github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
 github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
 github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
@ -190,8 +190,8 @@ github.com/go-sql-driver/mysql v1.9.2 h1:4cNKDYQ1I84SXslGddlsrMhc8k4LeDVj6Ad6WRj
 github.com/go-sql-driver/mysql v1.9.2/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
 github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
 github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
-github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM=
-github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
+github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=
 github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0=
@ -229,7 +229,6 @@ github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/wire v0.6.0 h1:HBkoIh4BdSxoyo9PveV8giw7ZsaBOvzWKfcg/6MrVwI=
@ -275,22 +274,22 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/lestrrat-go/blackmagic v1.0.2 h1:Cg2gVSc9h7sz9NOByczrbUvLopQmXrfFx//N+AkAr5k=
-github.com/lestrrat-go/blackmagic v1.0.2/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU=
+github.com/lestrrat-go/blackmagic v1.0.3 h1:94HXkVLxkZO9vJI/w2u1T0DAoprShFd13xtnSINtDWs=
+github.com/lestrrat-go/blackmagic v1.0.3/go.mod h1:6AWFyKNNj0zEXQYfTMPfZrAXUWUfTIZ5ECEUEJaijtw=
 github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE=
 github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
 github.com/lestrrat-go/httprc v1.0.6 h1:qgmgIRhpvBqexMJjA/PmwSvhNk679oqD1RbovdCGW8k=
 github.com/lestrrat-go/httprc v1.0.6/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo=
 github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI=
 github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4=
-github.com/lestrrat-go/jwx/v2 v2.1.5-0.20250226052408-de7d95fda31a h1:go+J0DsYdOT0wAWWwhVNJtMSBmEUX9Y44wN2mVPsKeQ=
-github.com/lestrrat-go/jwx/v2 v2.1.5-0.20250226052408-de7d95fda31a/go.mod h1:nWRbDFR1ALG2Z6GJbBXzfQaYyvn751KuuyySN2yR6is=
+github.com/lestrrat-go/jwx/v2 v2.1.6-0.20250420095048-a18531964875 h1:96mya9rDuzBBnNlzlIjiQBBuUkNxCaysfTb8mU4xFRo=
+github.com/lestrrat-go/jwx/v2 v2.1.6-0.20250420095048-a18531964875/go.mod h1:Y722kU5r/8mV7fYDifjug0r8FK8mZdw0K0GpJw/l8pU=
 github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=
 github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/lithammer/shortuuid/v3 v3.0.7 h1:trX0KTHy4Pbwo/6ia8fscyHoGA+mf1jWbPJVuvyJQQ8=
-github.com/lithammer/shortuuid/v3 v3.0.7/go.mod h1:vMk8ke37EmiewwolSO1NLW8vP4ZaKlRuDIi8tWWmAts=
+github.com/lithammer/shortuuid/v4 v4.2.0 h1:LMFOzVB3996a7b8aBuEXxqOBflbfPQAiVzkIcHO0h8c=
+github.com/lithammer/shortuuid/v4 v4.2.0/go.mod h1:D5noHZ2oFw/YaKCfGy0YxyE7M0wMbezmMjPdhyEFe6Y=
 github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 h1:7UMa6KCCMjZEMDtTVdcGu0B1GmmC7QJKiCCjyTAWQy0=
 github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@ -303,12 +302,12 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-sqlite3 v1.14.27 h1:drZCnuvf37yPfs95E5jd9s3XhdVWLal+6BOK6qrv6IU=
-github.com/mattn/go-sqlite3 v1.14.27/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/mattn/go-sqlite3 v1.14.28 h1:ThEiQrnbtumT+QMknw63Befp/ce/nUPgBPMlRFEum7A=
+github.com/mattn/go-sqlite3 v1.14.28/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/mhale/smtpd v0.8.3 h1:8j8YNXajksoSLZja3HdwvYVZPuJSqAxFsib3adzRRt8=
 github.com/mhale/smtpd v0.8.3/go.mod h1:MQl+y2hwIEQCXtNhe5+55n0GZOjSmeqORDIXbqUL3x4=
-github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
-github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
+github.com/miekg/dns v1.1.64 h1:wuZgD9wwCE6XMT05UU/mlSko71eRSXEAm2EbjQXLKnQ=
+github.com/miekg/dns v1.1.64/go.mod h1:Dzw9769uoKVaLuODMDZz9M6ynFU6Em65csPuoi8G0ck=
 github.com/minio/sio v0.4.1 h1:EMe3YBC1nf+sRQia65Rutxi+Z554XPV0dt8BIBA+a/0=
 github.com/minio/sio v0.4.1/go.mod h1:oBSjJeGbBdRMZZwna07sX9EFzZy+ywu5aofRiV1g79I=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
@ -454,8 +453,8 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
-golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
+golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@ -537,8 +536,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
-golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
-golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
+golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
+golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY=
--- a/internal/bundle/bundle.go
+++ b/internal/bundle/bundle.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build bundle
-// +build bundle

 package bundle

--- a/internal/cmd/awscontainer.go
+++ b/internal/cmd/awscontainer.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build awscontainer
-// +build awscontainer

 package cmd

--- a/internal/cmd/awscontainer_disabled.go
+++ b/internal/cmd/awscontainer_disabled.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !awscontainer
-// +build !awscontainer

 package cmd

--- a/internal/cmd/portable.go
+++ b/internal/cmd/portable.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !noportable
-// +build !noportable

 package cmd

--- a/internal/cmd/portable_disabled.go
+++ b/internal/cmd/portable_disabled.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build noportable
-// +build noportable

 package cmd

--- a/internal/common/actions_test.go
+++ b/internal/common/actions_test.go
@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"

-	"github.com/lithammer/shortuuid/v3"
+	"github.com/lithammer/shortuuid/v4"
 	"github.com/rs/xid"
 	"github.com/sftpgo/sdk"
 	"github.com/sftpgo/sdk/plugin/notifier"
--- a/internal/config/config_darwin.go
+++ b/internal/config/config_darwin.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build darwin
-// +build darwin

 package config

--- a/internal/config/config_fallback.go
+++ b/internal/config/config_fallback.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !linux && !darwin
-// +build !linux,!darwin

 package config

--- a/internal/config/config_linux.go
+++ b/internal/config/config_linux.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build linux
-// +build linux

 package config

--- a/internal/dataprovider/bolt.go
+++ b/internal/dataprovider/bolt.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !nobolt
-// +build !nobolt

 package dataprovider

--- a/internal/dataprovider/bolt_disabled.go
+++ b/internal/dataprovider/bolt_disabled.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build nobolt
-// +build nobolt

 package dataprovider

--- a/internal/dataprovider/mysql.go
+++ b/internal/dataprovider/mysql.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !nomysql
-// +build !nomysql

 package dataprovider

--- a/internal/dataprovider/mysql_disabled.go
+++ b/internal/dataprovider/mysql_disabled.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build nomysql
-// +build nomysql

 package dataprovider

--- a/internal/dataprovider/pgsql.go
+++ b/internal/dataprovider/pgsql.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !nopgsql
-// +build !nopgsql

 package dataprovider

--- a/internal/dataprovider/pgsql_disabled.go
+++ b/internal/dataprovider/pgsql_disabled.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build nopgsql
-// +build nopgsql

 package dataprovider

--- a/internal/dataprovider/sqlite.go
+++ b/internal/dataprovider/sqlite.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !nosqlite
-// +build !nosqlite

 package dataprovider

--- a/internal/dataprovider/sqlite_disabled.go
+++ b/internal/dataprovider/sqlite_disabled.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build nosqlite
-// +build nosqlite

 package dataprovider

--- a/internal/dataprovider/unixcrypt.go
+++ b/internal/dataprovider/unixcrypt.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build unixcrypt
-// +build unixcrypt

 package dataprovider

--- a/internal/dataprovider/unixcrypt_disabled.go
+++ b/internal/dataprovider/unixcrypt_disabled.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !unixcrypt
-// +build !unixcrypt

 package dataprovider

--- a/internal/httpd/httpd_test.go
+++ b/internal/httpd/httpd_test.go
@ -42,7 +42,7 @@ import (
 	"github.com/go-chi/render"
 	_ "github.com/go-sql-driver/mysql"
 	_ "github.com/jackc/pgx/v5/stdlib"
-	"github.com/lithammer/shortuuid/v3"
+	"github.com/lithammer/shortuuid/v4"
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/mhale/smtpd"
 	"github.com/pquerna/otp"
--- a/internal/httpd/resources.go
+++ b/internal/httpd/resources.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !bundle
-// +build !bundle

 package httpd

--- a/internal/httpd/resources_embedded.go
+++ b/internal/httpd/resources_embedded.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build bundle
-// +build bundle

 package httpd

--- a/internal/logger/journald.go
+++ b/internal/logger/journald.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build linux
-// +build linux

 package logger

--- a/internal/logger/journald_nolinux.go
+++ b/internal/logger/journald_nolinux.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !linux
-// +build !linux

 package logger

--- a/internal/metric/metric.go
+++ b/internal/metric/metric.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !nometrics
-// +build !nometrics

 // Package metric provides Prometheus metrics support
 package metric
--- a/internal/metric/metric_disabled.go
+++ b/internal/metric/metric_disabled.go
@ -1,5 +1,18 @@
+// Copyright (C) 2019 Nicola Murino
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, version 3.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
 //go:build nometrics
-// +build nometrics

 package metric

--- a/internal/service/awscontainer.go
+++ b/internal/service/awscontainer.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build awscontainer
-// +build awscontainer

 package service

--- a/internal/service/awscontainer_disabled.go
+++ b/internal/service/awscontainer_disabled.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !awscontainer
-// +build !awscontainer

 package service

--- a/internal/service/service_portable.go
+++ b/internal/service/service_portable.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !noportable
-// +build !noportable

 package service

--- a/internal/service/signals_unix.go
+++ b/internal/service/signals_unix.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !windows
-// +build !windows

 package service

--- a/internal/sftpd/cmd_unix.go
+++ b/internal/sftpd/cmd_unix.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !windows
-// +build !windows

 package sftpd

--- a/internal/sftpd/internal_unix_test.go
+++ b/internal/sftpd/internal_unix_test.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !windows
-// +build !windows

 package sftpd

--- a/internal/util/resources.go
+++ b/internal/util/resources.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !bundle
-// +build !bundle

 package util

--- a/internal/util/resources_embedded.go
+++ b/internal/util/resources_embedded.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build bundle
-// +build bundle

 package util

--- a/internal/util/util.go
+++ b/internal/util/util.go
@ -50,7 +50,7 @@ import (
 	"unsafe"

 	"github.com/google/uuid"
-	"github.com/lithammer/shortuuid/v3"
+	"github.com/lithammer/shortuuid/v4"
 	"golang.org/x/crypto/ssh"

 	"github.com/drakkan/sftpgo/v2/internal/logger"
--- a/internal/vfs/azblobfs.go
+++ b/internal/vfs/azblobfs.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !noazblob
-// +build !noazblob

 package vfs

--- a/internal/vfs/azblobfs_disabled.go
+++ b/internal/vfs/azblobfs_disabled.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build noazblob
-// +build noazblob

 package vfs

--- a/internal/vfs/gcsfs.go
+++ b/internal/vfs/gcsfs.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !nogcs
-// +build !nogcs

 package vfs

--- a/internal/vfs/gcsfs_disabled.go
+++ b/internal/vfs/gcsfs_disabled.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build nogcs
-// +build nogcs

 package vfs

--- a/internal/vfs/s3fs.go
+++ b/internal/vfs/s3fs.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !nos3
-// +build !nos3

 package vfs

--- a/internal/vfs/s3fs_disabled.go
+++ b/internal/vfs/s3fs_disabled.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build nos3
-// +build nos3

 package vfs

--- a/internal/vfs/statvfs_fallback.go
+++ b/internal/vfs/statvfs_fallback.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !darwin && !linux && !freebsd
-// +build !darwin,!linux,!freebsd

 package vfs

--- a/internal/vfs/statvfs_linux.go
+++ b/internal/vfs/statvfs_linux.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build linux
-// +build linux

 package vfs

--- a/internal/vfs/statvfs_unix.go
+++ b/internal/vfs/statvfs_unix.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build freebsd || darwin
-// +build freebsd darwin

 package vfs

--- a/internal/vfs/sys_unix.go
+++ b/internal/vfs/sys_unix.go
@ -13,7 +13,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //go:build !windows
-// +build !windows

 package vfs