commit:     6744ef24a44e427fc6ec0c7bebe05fddf4eedf6a
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 25 15:04:00 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 15:14:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6744ef24

net-proxy/obfs4proxy: migrate to go-module

Bulk of work done by williamh, with my own additional changes
to src_compile() and the long-overdue switch from dodoc to DOCS
for documentation.

Closes: https://bugs.gentoo.org/714066
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-proxy/obfs4proxy/Manifest                    | 26 +++++++++++
 net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild | 58 ++++++++++++++++++++++++
 2 files changed, 84 insertions(+)

diff --git a/net-proxy/obfs4proxy/Manifest b/net-proxy/obfs4proxy/Manifest
index b3da01fd6a8..d0c68d02c3f 100644
--- a/net-proxy/obfs4proxy/Manifest
+++ b/net-proxy/obfs4proxy/Manifest
@@ -1,8 +1,34 @@
+DIST 
git.schwanenlied.me%2Fyawning%2Fbsaes.git%2F@v%2Fv0.0.0-20190320102049-26d1add596b6.mod
 45 BLAKE2B 
2eaf520004fc4a4a3283bba8b12bca561c042fa9ac35be8d152f232b71f8431b099f452edaa2ecdfc54e56d8de989eaa46f1d21428fbd1431d6e52fe353aaed4
 SHA512 
7f919bb78329c34c2e2c667fd4621885fe8ef3ed7b916de65ceaf4d6fa739fb540c2f453a16cf6f5add0f0540d06e0c7cf1eb92a2d3751bba2cc26ea285756a7
+DIST 
git.schwanenlied.me%2Fyawning%2Fbsaes.git%2F@v%2Fv0.0.0-20190320102049-26d1add596b6.zip
 39367 BLAKE2B 
451710920a0fb77caa7cc1a22284faced216d54eb0fe77d70e375ac063c91d7c5dde17a85bacecd06092f1dce7d28e19ddaa28408a95954e76c6c4d4fb4a2bf2
 SHA512 
6b0f5ab0b9d99f2bd1acf140a8d16ad247743a3989b1a69ef9377aefb860f6d73cae911aaf5c21a251aa668b45da946d6a82321bff9918efb8044794c69d5697
 DIST 
git.schwanenlied.me-yawning-bsaes-26d1add596b6d800bdeeb3bc3b2c7b316c056b6d.tar.gz
 18848 BLAKE2B 
35458f0f2f674564813ea8f65246c8463fe1a89bd0e171c7d7ecda16e79fac4a7976d7c28e8b791e11afd61052538be00bb4f5a8601366fd5f638f78f4b9c03d
 SHA512 
0bb32ea0a0a246406428786287701418d2b620a14de06828cd9a88de06ef61973fd01a42f9aabf396e74db94157cccdcb15afbf73f00a3d97ed224f7a86c4d39
+DIST git.torproject.org%2Fpluggable-transports%2Fgoptlib.git%2F@v%2Fv1.0.0.mod 
59 BLAKE2B 
c741382a34677abe777f42d88210a2da3ba6dfaebc557e28d1a49a5f46822d94838469b7d7b72476b45b55b0c557ec132cbee805173c5607a6cfcd2b2e090c1c
 SHA512 
15340017e0579bd8d102bda61ea62c5b894fcaca9f320efabacd7a2158fc2beb28b686302a3002b53765004e9a0be08deee8618f8ad662ddc2430d0b2d78d91e
+DIST git.torproject.org%2Fpluggable-transports%2Fgoptlib.git%2F@v%2Fv1.0.0.zip 
32116 BLAKE2B 
c9d113cc09a7da3e8c6cb56001633dd31b793f275596d1fb46608929b4475a7787b68239f7044096ee9301fe7be3e55db61d42d88e870227ef2a8c37e294077f
 SHA512 
81a1ea071d7561a631c55844395f8d8d8773f4d8a5ea25e2c66ee2bb17bde8f79ff29d5d87f2bfd7ba42a31907c923f8f8616cd8fdaf21d99217ba1bb4c117e7
+DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20170116200512-5312a6153412.mod 
30 BLAKE2B 
e89977c245471f14f3e2e9434d08e9683a9d4ad350dfde2055098d913fa41ca92c4cd8f26345f3c5b07ffea825b4a87d5d06f1ca99105456aa63091f00cba1ac
 SHA512 
ae14432db61f891b7a8d6d8e51c47675deba7a13f0bd392536cecb625f6f9eab5b253d6744957dd0cca3464f84bbbcc3a41fd0f2bc25fe47e6d6b4ce51858930
+DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20170116200512-5312a6153412.zip 
104690 BLAKE2B 
7c52d737b8bf2f9a4b4ad4a7b2a843b715cd991dc18d61b0c2c68ec25ef8f8bc00ee0b5cdc95b91a1c64715d1990597dafe29c070a090227b2b7d1244a8b80a0
 SHA512 
8d15276c2a6e82ae72d903946fbcb2adc6446b964492d8c5653fee885e4c1b1d75f119a3fdcb0a35044929810d31420ac218b7ec077d1d07acaf2f586d869854
+DIST github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.mod 33 BLAKE2B 
8a7ad09e58eb232d947fee3583f03948dda02432dc94ae8916330347dbce328b9e1e445aa96b9ce00cb770583eda50344d160662eaee8f2d8290fe1c63511bdb
 SHA512 
e9671d1c7e7aa422e139098e1977bdcd61f48b382d75a7234cdb3849eec4232b0cf7528ed37d534430317f7b2649b3c5b3476a23c0aca735279940f89fae11ef
+DIST github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.zip 17069 BLAKE2B 
e70bcfb611691e43750b11f6e4e655ead44526d3c72a5bcbbb18732e0f23dd891da22b7f5961baae4cfb9d3d0e07af60f5a6afe48e3241bafef76333ef901f0f
 SHA512 
fb9f43083ab6c28d26cf729ab56ca3e85a876fa50bd445f714da5de404578f35ae094b7619a6f10011f98b442137ebbc016b639138679fffff28bcc944e05e55
+DIST github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.mod 230 BLAKE2B 
26d8e2a5e9603273dd84ed9aae1bcf49e1fece530a5dc41cae3b5d2ca8bb4288023ac8eeedd0ecc76fa355bc9dd808d06196db03ccda186df5184fc6134e121b
 SHA512 
132067629eb47d7ba22dcedd81467693f7abda7b050244bac8b8ddc9f8dec5d1ff4fd64a6ed0ed1537f400c516594df0f3a2aa392258dfc817176e4030f81cac
+DIST github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.zip 10103918 BLAKE2B 
d484c7a50585a27d9910c4f9c4c0f179346bea4f373c0fec5b6af24205f69ca6afc4dda6f9b069f23617487f8edd7422379478d88a5a1e113104098fb2476cf3
 SHA512 
5c16e51cd71051795ca20e338b3eb4fe17e423fa26c4e188d966761ee7d23cf5b21d37a6cca7faf8f31c3110289d2da4e18e6777b8b26cc69563b244d94fc17d
+DIST github.com%2Fdsnet%2Fgolib%2F@v%2Fv0.0.0-20171103203638-1ea166775780.mod 
30 BLAKE2B 
3601cf72262d9c828eff3520a9375eb981b2a9193aee46e93406d491cb8db7b864c3eb32f65f02b75284170856b2264a1a24cc63196695e58365210b216cedbc
 SHA512 
36ff5f52bec7fbf395cce04f20bc61cbe4e5f77ed550a5a869967d1e145e2dcd8e7bca23c3cf81882d8f7053e566dd95e78e97cdcf06c1556b78a5b9b51662d1
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod 37 BLAKE2B 
aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233
 SHA512 
18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod 34 BLAKE2B 
1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6
 SHA512 
c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
+DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod 31 BLAKE2B 
f8ed4b103891625af3043d86905f693014b245198a180911efb7e33480d81b93babd35912c5768df62cd26199e3a742f94365a82de619a97385d7407baa22424
 SHA512 
33639405743ddf22f19ca03d348c47d9cf963aa151fdab9e7303679ccd5cec373ceebce456eb96ef52dcf933f96e4ef7d4a8099822dfc183996d8cd4f09cba2e
 DIST github.com-agl-ed25519-5312a61534124124185d41f09206b9fef1d88403.tar.gz 
107312 BLAKE2B 
80f073417f9bc09249e58d724c0396bd79824f1921aed427bcaefca2f8108a490c2a566ae45053ef226f708ab7a8f6185de40323fe746b51e8795f8e3c8ee256
 SHA512 
b801d205d6ed9aaf07a567b4919ca072e34e1872388cccd1f5ece30c6cbd5d4907eff167e24fe5b4f8fe46c5746dbb0d1ef2a4ce4f1082682a022fbc652c0e78
 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-net-74de082e2cca95839e88aa0aeee5aadf6ce7710f.tar.gz 
976643 BLAKE2B 
6a64e95b90379cc72f93391ebc46d064c22e980dffd788c438b87ed9bb7da4a6dbdbdb6865722bb274a03359ca745165adf73b24b50c3038dc7347abf873043c
 SHA512 
afd0169a4de53a36ed87c4510e4bf02147bc10b2fb3de22b3608a05feb72b571e8a560ea1ce4b3953385b6627ba012e5da54dc8c264194e01ea9d83745c5e9da
 DIST github.com-golang-sys-9eb1bfa1ce65ae8a6ff3114b0aaf9a41a6cf3560.tar.gz 
1262620 BLAKE2B 
ffa03ba8cb0fbdb9d2b68bf00920dd7695a0dcbfc190f26cff2045b0612103dee8fa1ede2b64ed384d59889b0af11088c6e7586d1314ec2265a028e63d0641a3
 SHA512 
eee9be21a6be3c84127e1bb0c90f6c872aec2b3dc88d1dffd9421b8ff18e1e517b3d1f39f06f47339a21aa78a9570884c64a37d31b1816ac67ba0dc0b3f15cce
+DIST gitlab.com%2Fyawning%2Futls.git%2F@v%2Fv0.0.11-1.mod 330 BLAKE2B 
12d6ca5517b27cb05da57741c8bde2601c14a0fea76a8df627681038e03095cd3f9a6cc0975837271deaf469715b510ea8d04d943f8ded8a9b36198bdfcd5b1a
 SHA512 
db40c5be3fa8f7320ec134b3b801022dbc1b5d80cc9eeeb9366724bcd0df479e702d72a42f28cd2c9353e35b2e78a2ad95c0b575bbb5cad0ed04fd1cb629c84c
+DIST gitlab.com%2Fyawning%2Futls.git%2F@v%2Fv0.0.11-1.zip 818363 BLAKE2B 
ae79d47071ecded190c34851f4e82786d7db51cdd8cacf664fac543b95a77a55e7d1a308b2b9b09eb40ae0dfe8d55e00d4c8928ded0ec798e5a52ddd3f777f53
 SHA512 
dcb0ef6aa71b7d88fc2a5ee2b197e46c33d490dabb84a0a8cead68bbecb5b8bc36928eeae691754a7771f84c9a48975b0971c335d5b5086a013549b42cd87f44
 DIST gitlab.com-yawning-utls---v0.0.11-1.tar.gz 560616 BLAKE2B 
68fa15c07bccbf58ca7666453d53cb892777160ea2843095024d4811891803d0a1a4f876247ca2fe5ff08cac24e96d50ada838bde9afbaf34a7208f8b30b8f01
 SHA512 
debea4bfe2b2686d181fa0f6a583833728d154b4262c6a7fe9354d3d953739355aade92c927fa3a10d5b78efe37d9707ab4c59beaa765c64b6fe99dbc54f1722
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 
BLAKE2B 
aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a
 SHA512 
2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod 88 
BLAKE2B 
aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a
 SHA512 
2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.zip 
1781592 BLAKE2B 
13d91c26bc1b3f13d8deb7ce2572853fae269db0f8384f94a8b59436d3351cb79f2e2b3ce3664b5c38e696be8ee67a7860aaedacf3019aa94079c160fb991fbd
 SHA512 
42da234a20b3c6a8cfc83b3dce98d3fd11c07912e79d7943bfe6fd8baefae4756cadf5ec1688d4227d7151653fab29fc4a27fd562766f9fb10c758602d5b6f57
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.mod 119 
BLAKE2B 
e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97
 SHA512 
26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.zip 
1276380 BLAKE2B 
95b24bac24917089c0140ff02154cdf170b1d459cf77b0ca11b15c778040d58e1b4369d7f7c5e913cb3b19b8cbedf202eca28b8045df054317a8a3bfdd14759e
 SHA512 
ee4d522713f90dd3bd7942655b0b2e9a64b0f6b8cfa491be7f22216c9e016b3b1131da5dee2ff0eefbdef000ab041e64e0a9385239db20135cf6101e8d2c23fc
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 
BLAKE2B 
64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a
 SHA512 
ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190329044733-9eb1bfa1ce65.mod 33 
BLAKE2B 
8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148
 SHA512 
0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190329044733-9eb1bfa1ce65.zip 
1605582 BLAKE2B 
35ea8cfc90f9986ee687b6f4d644d7af2ec786740e427534aefcbe8e5b7c725b4fec2d8323d09193aa4fdc98c8baa0ae42503164f6920e5de05bdb551e33bf35
 SHA512 
160668e809021d409e7447d83235b127275edd1601ed61f9975c585ea4b9900b2c3fb70c98d1a8addd0e5cae27840da3276caecd77bf168f1625641b03ed689f
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 
31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0
 SHA512 
ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 
0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0
 SHA512 
982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
 DIST obfs4proxy-0.0.11.tar.gz 85557 BLAKE2B 
9b56433fa4a1023ce2c2b75cec598a1f55fb8229659ee66604b636d2269b243d347e34eb1b539b71db5ac0cb45c868d249844a82e04b20faa6dc1785fe4b78dc
 SHA512 
3eb50bc8067802f8260e0926999a659919e55cb34247f443f66a4852c9ceceacae361602a57ad1fd28a84e4ed54f3800c3258e67266eb23d45b1d09e31c5d869

diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild 
b/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild
new file mode 100644
index 00000000000..1c40f48bade
--- /dev/null
+++ b/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="An obfuscating proxy supporting Tor's pluggable transport 
protocol obfs4"
+HOMEPAGE="https://gitlab.com/yawning/obfs4";
+
+EGO_SUM=(
+       "git.schwanenlied.me/yawning/bsaes.git 
v0.0.0-20190320102049-26d1add596b6"
+       "git.schwanenlied.me/yawning/bsaes.git 
v0.0.0-20190320102049-26d1add596b6/go.mod"
+       "git.torproject.org/pluggable-transports/goptlib.git v1.0.0"
+       "git.torproject.org/pluggable-transports/goptlib.git v1.0.0/go.mod"
+       "github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412"
+       "github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod"
+       "github.com/dchest/siphash v1.2.1"
+       "github.com/dchest/siphash v1.2.1/go.mod"
+       "github.com/dsnet/compress v0.0.1"
+       "github.com/dsnet/compress v0.0.1/go.mod"
+       "github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod"
+       "github.com/klauspost/compress v1.4.1/go.mod"
+       "github.com/klauspost/cpuid v1.2.0/go.mod"
+       "github.com/ulikunitz/xz v0.5.6/go.mod"
+       "gitlab.com/yawning/utls.git v0.0.11-1"
+       "gitlab.com/yawning/utls.git v0.0.11-1/go.mod"
+       "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+       "golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c"
+       "golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
+       "golang.org/x/net v0.0.0-20190328230028-74de082e2cca"
+       "golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod"
+       "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+       "golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65"
+       "golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65/go.mod"
+       "golang.org/x/text v0.3.0"
+       "golang.org/x/text v0.3.0/go.mod"
+       )
+go-module_set_globals
+SRC_URI="https://gitlab.com/yawning/obfs4/-/archive/${P}/obfs4-${P}.tar.gz -> 
${P}.tar.gz
+       ${EGO_SUM_SRC_URI}"
+
+LICENSE="BSD BSD-2 CC0-1.0 BZIP2 GPL-3+ MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+S="${WORKDIR}/obfs4-${P}"
+
+DOCS=( README.md ChangeLog doc/obfs4-spec.txt )
+
+src_compile() {
+       go build -o ${PN}/${PN} ./${PN} || die
+}
+
+src_install() {
+       default
+       dobin ${PN}/${PN}
+       doman doc/"${PN}.1"
+}

Reply via email to