gentoo auto-resync : 24:04:2024 - 23:59:27

5 files changed, 2 insertions, 21 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 6c3c594e884a..e5747c5a9442 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index d223e2bbc77c..a60e2c892552 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -8,5 +8,5 @@ DIST i2pd-2.49.0.tar.gz 654406 BLAKE2B 93b1bba73d308a7a6163b0b51ea59a3e11ea2d635
 DIST i2pd-2.50.2.tar.gz 663010 BLAKE2B 671a294f1b4de3a71031c071330adad378e8fa418c95dbaeaba824071d38bc579d12113e899f00873e3a9a0a365f7ddc52ec9b728ffb19f254ffd8cacd9c945b SHA512 7df7a578711a959feee4326060829cf87c0d1669e473934549cb59d868a7aef7300ecd2d7a6b92a2295aa7e97964cc16d0e44a334db917e22b0b59573a9052de
 EBUILD i2pd-2.48.0.ebuild 1968 BLAKE2B 61c9f54682583b7009490642b4321dde59402e3647590c33dff7cbf048f2dd0ceb5360894138a540a7fbb01e82ebe33de8b3db21f14b3a9d102e810fa5f12a72 SHA512 c34ce08e21d4451cd7dcb6a219e0fb6d47193981a03f28ebfd90667b63331091e93aa8a93e9599486827d38d273db76c74e539c478c6e4c3c5ba12b04c147e51
 EBUILD i2pd-2.49.0.ebuild 1951 BLAKE2B 1cc165406b9fc798fb0954971781e242d8aa05bd20543f35316a996acbdaaad95ff5d5d3a0185004d765b4d6abfdfe1e23eb0a32d4d47aeef0cf5c429f73c988 SHA512 7c0c8e4933d9a005eb4bf4ac5b17aa82ccf49a898100165464f4e347759f69d5fabd4fad216ae6a5d623312ef1806995a50e11380756e698c01973f046651c83
-EBUILD i2pd-2.50.2.ebuild 1951 BLAKE2B b1e91ce459c30546a424386278ede00e1a6375fb75b69d4223c65896f574f9634e544301b0b7538170f3ada2f2f016c6025dad222968f10d100e3ae7cfb5cff0 SHA512 6011682fdf5ec09d8537a3c6f20cb9951655ae293bb476b0e1f30a14f923627d69def4c86f8a96bceb3156ffa296773fafff01f1308f34029c3c3054aa7636c7
+EBUILD i2pd-2.50.2.ebuild 1950 BLAKE2B e157516f805383504a9f5ef62da27a5fa0e05e5c887e8e3d8425b040236e3636aa6ece75ee33a04f2580a66df4ceb3266c3e0fb1749e48c97f2541f873c511db SHA512 f168aeb061b1a8401e3511b0f530934b2205f01b98ed217743f5e88790decdcae3c0dbc4c83cc6d6044f3092a6a4e25c47cb49371ab3a474116833e0234b13cf
 MISC metadata.xml 588 BLAKE2B a7a342599b07b88c0fc192386a7722eeb864b8f1debc4f30d6825e829b9c684d085edc6ef0b4e7d8e5bf3e04e93629df2925341784b2221d591084098a8a2d3e SHA512 86ca6c50c7eb8f06269a3e0b84f1189f4be57f40ea92b9cae3b9299b02c63d5a89fbb9ca6f16588a682ea1bb193c6395b55f67799c07e4bbf60f046185fb5d0e
diff --git a/net-vpn/i2pd/i2pd-2.50.2.ebuild b/net-vpn/i2pd/i2pd-2.50.2.ebuild
index 0346c80cb527..4e2606cd0d80 100644
--- a/net-vpn/i2pd/i2pd-2.50.2.ebuild
+++ b/net-vpn/i2pd/i2pd-2.50.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cpu_flags_x86_aes i2p-hardening +upnp"
 
 RDEPEND="
diff --git a/net-vpn/riseup-vpn/Manifest b/net-vpn/riseup-vpn/Manifest
index 338a6b4c91e8..1a7dd6744cc5 100644
--- a/net-vpn/riseup-vpn/Manifest
+++ b/net-vpn/riseup-vpn/Manifest
@@ -1,4 +1,3 @@
-AUX riseup-vpn-0.21.11_p20221113-revert-data-cipher-arg-to-cipher.patch 747 BLAKE2B 1a29495b1709e626a9a459dfb839860a5f5c60b37957fc8878f5aa2e4d8cd99f0058bbd5fe678b1a74153f9be3e1be4635661a91f45e7da78cb478e3f40be5da SHA512 a58f786835e484f1fb4dad34dd38b0ae46103551c4b0392ad1ee19f598c213d5759f6590812f0b35c1b7a0cac48ea42023264ff8386b2eeec4d50175fbfb9777
 DIST riseup-vpn-0.24.3-deps.tar.xz 35335684 BLAKE2B 85774c35593e59009b8b8ae3ada8542d2df6206bbd0662f01b6798907246097b847c1fc894e50d912f5a2e66abb74f7fe2e7458762ba09a6ddba8d9f1aa6b2b4 SHA512 febba844bfa5b35e99cce586207320dafc393648904aa543293af941012f17164710b72eb7ca0bc7a7d5025bf67958340606cf6c7ce43ddf4dcf2a59ca98e87e
 DIST riseup-vpn-0.24.3.tar.gz 12270357 BLAKE2B a28d5fe1920614717f7c4a276fbddd24523b7a0a4776bfb7ef49256984e1348b5821854c5547c8a1a72a4c5a07f28c3fd3b5866ed13cb1b3606ec398e4b41478 SHA512 03e916fd3e019b62a09b673aab14f7de9554d2ab5affd793c607f392ed8411c2081db8c223232572fe9b629a4bd68e9994e59c00c4d5ef67b0c8705c11981409
 EBUILD riseup-vpn-0.24.3.ebuild 1787 BLAKE2B d847215657996c4ecd2a32a37af5ec6450f6b5232d7f54a8efd2bda9e4dd43ab2d00f313945a2b4586056b7382c42df75efbc5c57d5959fd02e081b0a0a92f56 SHA512 f616e1ff10503ad7921bb4d138924a7a3a95eb3252ce91fdcd316258acd0c5d14826e24edbd81846345d4139091f3d4e035f144b627fb42e3a5e6894fce9a3f2
diff --git a/net-vpn/riseup-vpn/files/riseup-vpn-0.21.11_p20221113-revert-data-cipher-arg-to-cipher.patch b/net-vpn/riseup-vpn/files/riseup-vpn-0.21.11_p20221113-revert-data-cipher-arg-to-cipher.patch
deleted file mode 100644
index 375250be4127..000000000000
--- a/net-vpn/riseup-vpn/files/riseup-vpn-0.21.11_p20221113-revert-data-cipher-arg-to-cipher.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/pkg/vpn/bonafide/eip_service.go b/pkg/vpn/bonafide/eip_service.go
-index 71c9b82..c6caf37 100644
---- a/pkg/vpn/bonafide/eip_service.go
-+++ b/pkg/vpn/bonafide/eip_service.go
-@@ -238,13 +238,6 @@ func (eip eipService) getOpenvpnArgs() []string {
- 	for arg, value := range cfg {
- 		switch v := value.(type) {
- 		case string:
--			// this is a transitioning hack for the transition to float deployment,
--			// assuming we're using openvpn 2.5. We're treating the "cipher"
--			// string that the platform sends us as the newer data-cipher
--			// which includes colon-separated ciphers.
--			if arg == "cipher" {
--				arg = "data-ciphers"
--			}
- 			args = append(args, "--"+arg)
- 			args = append(args, strings.Split(v, " ")...)
- 		case bool: