gentoo resync : 19.07.2019

3 files changed, 9 insertions, 59 deletions

diff --git a/net-proxy/obfs4proxy/Manifest b/net-proxy/obfs4proxy/Manifest
index 3727a7be448d..aa8e61b3093b 100644
--- a/net-proxy/obfs4proxy/Manifest
+++ b/net-proxy/obfs4proxy/Manifest
@@ -1,16 +1,13 @@
 DIST git.schwanenlied.me-yawning-bsaes-26d1add596b6d800bdeeb3bc3b2c7b316c056b6d.tar.gz 18848 BLAKE2B 35458f0f2f674564813ea8f65246c8463fe1a89bd0e171c7d7ecda16e79fac4a7976d7c28e8b791e11afd61052538be00bb4f5a8601366fd5f638f78f4b9c03d SHA512 0bb32ea0a0a246406428786287701418d2b620a14de06828cd9a88de06ef61973fd01a42f9aabf396e74db94157cccdcb15afbf73f00a3d97ed224f7a86c4d39
 DIST github.com-dsnet-compress-v0.0.1.tar.gz 9962544 BLAKE2B 58e5bd8eb7a50071da2764e90051f18fb3e4237b684a2584daf6ef7f74d4509525f09678feba3d6e8b0233cfd7a995ddd01374b138dbd2beaa2eab76218220dc SHA512 24b545fdfa6e5dcd942c9fc09614f755db341a16734f95dead2d344f06c74ca1c14e0b2674977066dee6094fd4d3bd7581ed9fe0285aeb1c62d2c68e0a3a095b
 DIST github.com-golang-crypto-a5d413f7728c81fb97d96a2b722368945f651e78.tar.gz 1656797 BLAKE2B 6b7e3f776b396786125582332fcf90e6b2452a06856a8b13cb2d84a882c5c563af79b8c37232f15410ae90b309e93044dcb6e0a5948d4e25b9730cc541534d16 SHA512 57a9606845a27459703d3757e001303d2f67c88efa4d021d4aa09314ddcc85fe95c9db2ff4aa08639b6be49cc751d82c35134a587987a896f64bb103af89adee
-DIST github.com-golang-crypto-b8fe1690c61389d7d2a8074a507d1d40c5d30448.tar.gz 1645371 BLAKE2B 31d89c31fbe42df036b548e8b43245b385faa72f8c1a35331540d874bf4e99be60dcd24c2e3b969c96f489c33e138c45229cf5e5179ffa5cb48dcd809020b74e SHA512 5475b27a5e2413ead25b1405e979bdd9c7e853cfea46b17b2957ec08960a0727312442985eeee2186d04cc3de592ddf65145d54bc7c3e3c626fb14c9bebc6441
 DIST github.com-golang-net-74de082e2cca95839e88aa0aeee5aadf6ce7710f.tar.gz 976643 BLAKE2B 6a64e95b90379cc72f93391ebc46d064c22e980dffd788c438b87ed9bb7da4a6dbdbdb6865722bb274a03359ca745165adf73b24b50c3038dc7347abf873043c SHA512 afd0169a4de53a36ed87c4510e4bf02147bc10b2fb3de22b3608a05feb72b571e8a560ea1ce4b3953385b6627ba012e5da54dc8c264194e01ea9d83745c5e9da
-DIST github.com-golang-net-ed066c81e75eba56dd9bd2139ade88125b855585.tar.gz 968328 BLAKE2B 14d5542bd808b9571a8305a5d2054df3205419249724851e976e354dab653de2266b0b9d7b46b4fd846a7d810bbd510be54d0d98e6d6c5cfea5d19e8df5ae528 SHA512 f63654665e7221b089f1dd9b9603670481b1a59137cf0b5c4cbe7c77a6a66b7537dc03b7c412328d9186edb8a661e66a82ee9839b594d176bee6e7377f13cca4
+DIST github.com-golang-sys-9eb1bfa1ce65ae8a6ff3114b0aaf9a41a6cf3560.tar.gz 1262620 BLAKE2B ffa03ba8cb0fbdb9d2b68bf00920dd7695a0dcbfc190f26cff2045b0612103dee8fa1ede2b64ed384d59889b0af11088c6e7586d1314ec2265a028e63d0641a3 SHA512 eee9be21a6be3c84127e1bb0c90f6c872aec2b3dc88d1dffd9421b8ff18e1e517b3d1f39f06f47339a21aa78a9570884c64a37d31b1816ac67ba0dc0b3f15cce
 DIST github.com-golang-sys-afcc84fd7533758f95a6e93ae710aa945a0b7e73.tar.gz 1244035 BLAKE2B 5e32e26aca844d6d21b17b60546f908b0f881283d59357d1891417b8f221af42182f0a767e01a806e0d81f4283511e12028f654e505db7522f04c84f5546baac SHA512 87e4333e7ba519fe6e222c15ac8185151af3dc9be902112ae3e06e2a64d0ae05dfd37055c9493e9698a4f5fafed3ed45c44d18c4ebf6821d35bff351b2741f2b
 DIST gitlab.com-yawning-utls---v0.0.10-1.tar.gz 533464 BLAKE2B 0f07d30768fb92ec274a98477be087b6c1724458641c63571ff2b46a217ed0611a902e45cc0ae9626a47c2572b7a785465bc808c8208005110a262739b7b0daf SHA512 e286f1b2007852ad8a4ef006be528fc6c885beba841509cc8a88ca08b8c2c8a608098ef1a39bb563d7a3dd0b402d12e1fb8b00095e706e5e2193348e02cafc6d
-DIST gitlab.com-yawning-utls---v0.0.9-2.tar.gz 523515 BLAKE2B a56a95be268c094d9498f88c8e68d16403f26108db7b00dc8a4c8ab113654e47f2cae61f5d6d49ebd86e3057be293d3c9ba88d31ed91ef97a41901e5feaa61cb SHA512 1d9bdd0f27938e4a4cbb1a8ecc8f0aa5bb46270a267437e356a9fafceed36e0e28932ddac1a3807cecfddbe36b2c3190e7ca1d4edb02bda539560b506807281c
+DIST gitlab.com-yawning-utls---v0.0.11-1.tar.gz 560616 BLAKE2B 68fa15c07bccbf58ca7666453d53cb892777160ea2843095024d4811891803d0a1a4f876247ca2fe5ff08cac24e96d50ada838bde9afbaf34a7208f8b30b8f01 SHA512 debea4bfe2b2686d181fa0f6a583833728d154b4262c6a7fe9354d3d953739355aade92c927fa3a10d5b78efe37d9707ab4c59beaa765c64b6fe99dbc54f1722
 DIST obfs4proxy-0.0.10.tar.gz 85538 BLAKE2B 37ffb9805f64a10c4cfb8cc0e95ee5ee341d63dc116c93487802f02f11919acf44dea96207c49a2d17a87a8c78fc35ec13cba24511fd205cf9196754566c1ae7 SHA512 ee8a0a4cce1d4cf21427f91af73b6ff50c83c03cf42587600135c8540edde20343c226c68d38725d53a69e4cc69bb3a7310d9f81ff76a67d9602148f10f3634a
-DIST obfs4proxy-0.0.7.tar.gz 67479 BLAKE2B 00a9df9e004b4b18ac4703504f5f246fdece0b70ad85de9eeca6d814d78a8653d26b4c51867e361ef03e0f2cd23bc775b6117d7e46be4547ae6e0fa003b05d55 SHA512 57b71138a139b1821cf58c8e1965f207a6164a046bbfc8d6da828351d4f5bf4ecfb63ca5c69dba834c4e3a72362089d2a7fd296278115c0cae1c53c51d1b124d
-DIST obfs4proxy-0.0.9.tar.gz 84896 BLAKE2B 39a81fc7a9f7701f5b8aa09d78fea48c3bf9b81febabd7aa9634b5e86bfa063479053f00b3a3f48fd3661ad3e4dee7e5165567acc06952e20d3d397c633a08a6 SHA512 a3c80f72519a39947a3ebf36c029eeed2fbc652e0d825b25510f1817ebde505d65c83e1248e38912553e84c7e73b0d733a32b625f501a53f74be12711eba0009
+DIST obfs4proxy-0.0.11.tar.gz 85557 BLAKE2B 9b56433fa4a1023ce2c2b75cec598a1f55fb8229659ee66604b636d2269b243d347e34eb1b539b71db5ac0cb45c868d249844a82e04b20faa6dc1785fe4b78dc SHA512 3eb50bc8067802f8260e0926999a659919e55cb34247f443f66a4852c9ceceacae361602a57ad1fd28a84e4ed54f3800c3258e67266eb23d45b1d09e31c5d869
 EBUILD obfs4proxy-0.0.10.ebuild 1551 BLAKE2B cb342f5e7c5922756cc0997a11a4fd1536588dfc83a6a2dd9c4a33a79810f57c341816d99f69fe159a78ffbc8a5607ec1df19963085465e66a5311ef74c979cb SHA512 3375c6ee64ab0b7c9c6b1e70e0650bc0578682e5c66a0b868694491eb891b73ec7a7901a7f2a8045f8825286c950ca26dcdb96f8c4c428c9bda6251739c9e28f
-EBUILD obfs4proxy-0.0.7.ebuild 1069 BLAKE2B 06179fa004c2f75123b8e3feb2d92b92698333b6819c4f10527e2d3b9a3ded7d36be54d4d57f19ee181910498e3b261daa602d1e9455605e7de1e7a6d5e3f25f SHA512 fa8d46550b22999d19bc32e1edcc5818af539524d4db196822c4f6e3f50386ee6b7769d8fe680ab3403ba46cc037ed153e63e2b559a22b5887457fb15a3e4481
-EBUILD obfs4proxy-0.0.9.ebuild 1434 BLAKE2B 2b1195fea772ed23736d8336c437c3141fb1687cfd38a2e94d8ef565a484712a5437f56753bd83842777fa89a3c1fe76329775125fc08d77664efb4132e8e504 SHA512 36cdec692fae6b9618eb09efba8be6c10e73b27d0e34a00cbecedd895cdfd8a440691447ed816cdbc8a750b9e4eaa49972118580afea560ed112260acdd861f4
+EBUILD obfs4proxy-0.0.11.ebuild 1551 BLAKE2B 5fa0ad9335e558ba56133c6e56728dd22d96b70517d5d1d75faf50cdb1ed68c4c333906bc92854d1aa46fa42be7aa4ba6d7dc528c458dfc7f1287f6df5d4a6a0 SHA512 419314ebc843ee2d51cfc2cab39ac7f49cbcf6b675be33e820fe273e7ce114662bf52ce805a6c3cfd95229d5f847acad0830f95f55761cc7f72fab3242cfdf96
 MISC metadata.xml 436 BLAKE2B a31742b53be9467a5b916219f3d76ce32f4c59d6d72c867f0d8cec5669b1fba84453efea7fa886ac4dc5d0528c3763188fe6736c5b76b4475a31ecd44d78a1a3 SHA512 0077fbce7545acc98c3964643cc51be782d7aa0fe82fc1b3b44b89a6611e9b95bd579ae143c57a5c16f58c16c406f7fcbdd79e8b4e50f433092903ba6e2d3989
diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.9.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild
index 57404950600c..32e2050e9221 100644
--- a/net-proxy/obfs4proxy/obfs4proxy-0.0.9.ebuild
+++ b/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild
@@ -8,11 +8,12 @@ EGO_PN=${EGO_SRC}/...
 
 EGO_VENDOR=(
 	"github.com/dsnet/compress v0.0.1"
-	"gitlab.com/yawning/utls.git v0.0.9-2 gitlab.com/yawning/utls/-"
+	"gitlab.com/yawning/utls.git v0.0.11-1 gitlab.com/yawning/utls/-"
+	"git.schwanenlied.me/yawning/bsaes.git 26d1add596b6d800bdeeb3bc3b2c7b316c056b6d git.schwanenlied.me/yawning/bsaes"
 	# Newer versions of packages which are in the tree
-	"golang.org/x/crypto b8fe1690c61389d7d2a8074a507d1d40c5d30448 github.com/golang/crypto"
-	"golang.org/x/net ed066c81e75eba56dd9bd2139ade88125b855585 github.com/golang/net"
-	"golang.org/x/sys afcc84fd7533758f95a6e93ae710aa945a0b7e73 github.com/golang/sys"
+	"golang.org/x/crypto a5d413f7728c81fb97d96a2b722368945f651e78 github.com/golang/crypto"
+	"golang.org/x/net 74de082e2cca95839e88aa0aeee5aadf6ce7710f github.com/golang/net"
+	"golang.org/x/sys 9eb1bfa1ce65ae8a6ff3114b0aaf9a41a6cf3560 github.com/golang/sys"
 )
 
 inherit golang-build golang-vcs-snapshot
diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.7.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.7.ebuild
deleted file mode 100644
index bc277f9039df..000000000000
--- a/net-proxy/obfs4proxy/obfs4proxy-0.0.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_SRC=git.torproject.org/pluggable-transports/obfs4.git
-EGO_PN=${EGO_SRC}/...
-
-if [[ ${PV} == "9999" ]];
-then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64 ~arm ~x86"
-	EGIT_COMMIT="${P}"
-	SRC_URI="https://github.com/Yawning/obfs4/archive/${P}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="An obfuscating proxy supporting Tor's pluggable transport protocol obfs4"
-HOMEPAGE="https://github.com/Yawning/obfs4"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/ed25519
-	dev-go/go-crypto
-	dev-go/go-net
-	dev-go/goptlib
-	dev-go/siphash"
-RDEPEND=""
-
-src_compile() {
-	golang-build_src_compile
-	local binfile=$(find "${T}" -name a.out)
-	[[ -x ${binfile} ]] || die "a.out not found"
-	cp -a ${binfile} obfs4proxy
-}
-
-src_install() {
-	default
-	dobin obfs4proxy || die "install failed"
-	cd src/${EGO_SRC}
-	doman doc/obfs4proxy.1 || die "install failed"
-	dodoc README.md ChangeLog doc/obfs4-spec.txt || die "install failed"
-}