From 2ca05562f3750e5c112a4a99f829ed406bf6d07f Mon Sep 17 00:00:00 2001 From: Celeste <20312-Celeste@users.gitlab.alpinelinux.org> Date: Thu, 22 Aug 2024 05:23:25 +0000 Subject: [PATCH] community/stargazer-gmi: upgrade to 1.3.0, drop maintainership --- community/stargazer-gmi/APKBUILD | 11 +- community/stargazer-gmi/ring-0.17.patch | 218 ------------------------ 2 files changed, 4 insertions(+), 225 deletions(-) delete mode 100644 community/stargazer-gmi/ring-0.17.patch diff --git a/community/stargazer-gmi/APKBUILD b/community/stargazer-gmi/APKBUILD index 7210b612133a..7e536af836d7 100644 --- a/community/stargazer-gmi/APKBUILD +++ b/community/stargazer-gmi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sashanoraa -# Maintainer: Celeste +# Maintainer: pkgname=stargazer-gmi -pkgver=1.1.0 +pkgver=1.3.0 pkgrel=0 pkgdesc="Fast and easy to use Gemini server" url="https://sr.ht/~zethra/stargazer/" @@ -16,9 +16,7 @@ subpackages=" $pkgname-fish-completion $pkgname-zsh-completion " -source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~zethra/stargazer/archive/$pkgver.tar.gz - ring-0.17.patch - " +source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~zethra/stargazer/archive/$pkgver.tar.gz" builddir="$srcdir/stargazer-$pkgver" options="!check" # connection refused to localhost @@ -48,6 +46,5 @@ package() { } sha512sums=" -93b257b794c6f56c382f410d1c11f7d248f04fce60a0e448437b6be663455f50c713d0c518b46948473c3c3eec34f3865186121151fd72493324a2f09f93fdd8 stargazer-gmi-1.1.0.tar.gz -02a92c7f31cc1486850c8431fcbf31dc26e4024e36ca6c422e6c0fca54a696bbf3d7122ccbdc56150cb5eff0e8dfe3c1a1729afc357200bb373e8131bec42eaf ring-0.17.patch +3cb9ba38a258d446ee03892147da1e3982e9a2c2b5090fc3bda1b569b83ebebc49c0373e297c789e79615331a2621cf4ec612e4e2f56170061f50271b5909a32 stargazer-gmi-1.3.0.tar.gz " diff --git a/community/stargazer-gmi/ring-0.17.patch b/community/stargazer-gmi/ring-0.17.patch deleted file mode 100644 index 5fbf42839071..000000000000 --- a/community/stargazer-gmi/ring-0.17.patch +++ /dev/null @@ -1,218 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -243,12 +243,6 @@ - ] - - [[package]] --name = "bumpalo" --version = "3.12.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" -- --[[package]] - name = "cc" - version = "1.0.79" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -597,15 +591,6 @@ - checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - - [[package]] --name = "js-sys" --version = "0.3.61" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" --dependencies = [ -- "wasm-bindgen", --] -- --[[package]] - name = "lazy_static" - version = "1.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -813,11 +798,10 @@ - [[package]] - name = "rcgen" - version = "0.11.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "52c4f3084aa3bc7dfbba4eff4fab2a54db4324965d8872ab933565e6fbd83bc6" -+source = "git+https://github.com/rustls/rcgen?rev=948c3b54eae1db242c7966cfa7338001c3928c2f#948c3b54eae1db242c7966cfa7338001c3928c2f" - dependencies = [ - "pem", -- "ring 0.16.20", -+ "ring", - "time", - "yasna", - ] -@@ -873,21 +857,6 @@ - - [[package]] - name = "ring" --version = "0.16.20" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" --dependencies = [ -- "cc", -- "libc", -- "once_cell", -- "spin 0.5.2", -- "untrusted 0.7.1", -- "web-sys", -- "winapi", --] -- --[[package]] --name = "ring" - version = "0.17.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" -@@ -895,8 +864,8 @@ - "cc", - "getrandom", - "libc", -- "spin 0.9.8", -- "untrusted 0.9.0", -+ "spin", -+ "untrusted", - "windows-sys", - ] - -@@ -940,7 +909,7 @@ - checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" - dependencies = [ - "log", -- "ring 0.17.3", -+ "ring", - "rustls-webpki", - "sct", - ] -@@ -960,18 +929,18 @@ - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" - dependencies = [ -- "ring 0.17.3", -- "untrusted 0.9.0", -+ "ring", -+ "untrusted", - ] - - [[package]] - name = "sct" --version = "0.7.0" -+version = "0.7.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" - dependencies = [ -- "ring 0.16.20", -- "untrusted 0.7.1", -+ "ring", -+ "untrusted", - ] - - [[package]] -@@ -1043,12 +1012,6 @@ - - [[package]] - name = "spin" --version = "0.5.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -- --[[package]] --name = "spin" - version = "0.9.8" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -@@ -1211,12 +1174,6 @@ - - [[package]] - name = "untrusted" --version = "0.7.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" -- --[[package]] --name = "untrusted" - version = "0.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" -@@ -1258,70 +1215,6 @@ - version = "0.11.0+wasi-snapshot-preview1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -- --[[package]] --name = "wasm-bindgen" --version = "0.2.84" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" --dependencies = [ -- "cfg-if", -- "wasm-bindgen-macro", --] -- --[[package]] --name = "wasm-bindgen-backend" --version = "0.2.84" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" --dependencies = [ -- "bumpalo", -- "log", -- "once_cell", -- "proc-macro2", -- "quote", -- "syn 1.0.109", -- "wasm-bindgen-shared", --] -- --[[package]] --name = "wasm-bindgen-macro" --version = "0.2.84" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" --dependencies = [ -- "quote", -- "wasm-bindgen-macro-support", --] -- --[[package]] --name = "wasm-bindgen-macro-support" --version = "0.2.84" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" --dependencies = [ -- "proc-macro2", -- "quote", -- "syn 1.0.109", -- "wasm-bindgen-backend", -- "wasm-bindgen-shared", --] -- --[[package]] --name = "wasm-bindgen-shared" --version = "0.2.84" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" -- --[[package]] --name = "web-sys" --version = "0.3.61" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" --dependencies = [ -- "js-sys", -- "wasm-bindgen", --] - - [[package]] - name = "winapi" ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -84,3 +84,6 @@ - [profile.release] - lto = "fat" - codegen-units = 1 -+ -+[patch.crates-io] -+rcgen = { git = "https://github.com/rustls/rcgen", rev = "948c3b54eae1db242c7966cfa7338001c3928c2f" }