Hi,
Here is an update to obfs4proxy. It removes the go-* libs as dependencies and
switches do the MODGO_ stuff.
I don't use this, so I would appreciate some feedback from people that do.
Once this is in, we can remove devel/go-goptlib, security/go-ed25519 and
security/go-siphash.
OK?
Cheers,
Aaron
diff 153991bc6b78adf9a0c92129de6b6920cfb6600c /usr/ports
blob - 20fd79e9917d37c1f6987a8a07bd0e887c45ab53
file + net/obfs4proxy/Makefile
--- net/obfs4proxy/Makefile
+++ net/obfs4proxy/Makefile
@@ -1,16 +1,15 @@
-# $OpenBSD: Makefile,v 1.5 2019/07/12 20:48:34 sthen Exp $
+# $OpenBSD$
-COMMENT = a look-like nothing obfuscation protocol for TCP
+COMMENT = a look-like nothing obfuscation protocol for TCP
-DISTNAME = obfs4proxy-0.0.7
+MODGO_MODNAME = gitlab.com/yawning/obfs4.git
+MODGO_VERSION = v0.0.0-20200410113629-2d8f3c8bbfd7
-REVISION = 2
+DISTNAME = obfs4.git-${MODGO_VERSION}
+PKGNAME = obfs4proxy-0.0.12.20200410
-MASTER_SITES = https://people.torproject.org/~yawning/releases/obfs4proxy/
-EXTRACT_SUFX = .tar.xz
+CATEGORIES = net www
-CATEGORIES = net www
-
HOMEPAGE = \
https://gitweb.torproject.org/pluggable-transports/obfs4.git/tree/README.md
@@ -21,23 +20,30 @@ PERMIT_PACKAGE = Yes
WANTLIB += c pthread
-MODULES += lang/go
-ALL_TARGET_BASE = git.torproject.org/pluggable-transports/obfs4.git
-WRKSRC = ${MODGO_WORKSPACE}/src/${ALL_TARGET_BASE}
-ALL_TARGET = ${ALL_TARGET_BASE}/obfs4proxy \
- ${ALL_TARGET_BASE}/common/log \
- ${ALL_TARGET_BASE}/common/socks5 \
- ${ALL_TARGET_BASE}/transports \
- ${ALL_TARGET_BASE}/transports/base
+MODULES = lang/go
-BUILD_DEPENDS += net/go-net \
- security/go-crypto \
- security/go-ed25519 \
- security/go-siphash \
- devel/go-goptlib
+ALL_TARGET = gitlab.com/yawning/obfs4.git/...
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/obfs4proxy.1 \
${PREFIX}/man/man1/obfs4proxy.1
+
+MODGO_MODULES = \
+ git.schwanenlied.me/yawning/bsaes.git
v0.0.0-20190320102049-26d1add596b6 \
+ git.torproject.org/pluggable-transports/goptlib.git v1.0.0 \
+ github.com/dchest/siphash v1.2.1 \
+ github.com/dsnet/compress v0.0.1 \
+ github.com/dsnet/golib
v0.0.0-20171103203638-1ea166775780 \
+ github.com/klauspost/compress v1.4.1 \
+ github.com/klauspost/cpuid v1.2.0 \
+ github.com/ulikunitz/xz v0.5.6 \
+ gitlab.com/yawning/utls.git v0.0.11-1 \
+ golang.org/x/crypto
v0.0.0-20190325154230-a5d413f7728c \
+ golang.org/x/net
v0.0.0-20190328230028-74de082e2cca \
+ golang.org/x/sys
v0.0.0-20190329044733-9eb1bfa1ce65 \
+ golang.org/x/text v0.3.0
+MODGO_MODFILES = \
+ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 \
+ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a
.include <bsd.port.mk>
blob - 3d9e4b7db02274f9e7e3731615e8cd4ea220b15f
file + net/obfs4proxy/distinfo
--- net/obfs4proxy/distinfo
+++ net/obfs4proxy/distinfo
@@ -1,2 +1,58 @@
-SHA256 (obfs4proxy-0.0.7.tar.xz) = wHoaaQ66swV8i1ZuGkkCQ5x30bpcNbv0L83FtGqzymM=
-SIZE (obfs4proxy-0.0.7.tar.xz) = 56184
+SHA256
(go_modules/git.schwanenlied.me/yawning/bsaes.git/@v/v0.0.0-20190320102049-26d1add596b6.mod)
= UkoxCnqX0BoXL21k6BAoJZfaUdlqE65yj4cyVvyiFeo=
+SHA256
(go_modules/git.schwanenlied.me/yawning/bsaes.git/@v/v0.0.0-20190320102049-26d1add596b6.zip)
= jOCRjDd4WTV/kwS4Q4HYRpq3vTtrGtFggspE0vdukdA=
+SHA256
(go_modules/git.torproject.org/pluggable-transports/goptlib.git/@v/v1.0.0.mod)
= 4VeRlxXkofNSQKCtePAzCRC5YQphtfc/YPz2Up0SHNU=
+SHA256
(go_modules/git.torproject.org/pluggable-transports/goptlib.git/@v/v1.0.0.zip)
= R7HlbvgMWmlm6yYPlbxHKczqlYNJJoZrzPyXHXjvuFU=
+SHA256 (go_modules/github.com/dchest/siphash/@v/v1.2.1.mod) =
DFKYQLWCJy3NJD5vrv27iDtvqSc9a/0eO4GC5ykVqGU=
+SHA256 (go_modules/github.com/dchest/siphash/@v/v1.2.1.zip) =
h3pGjlM+KMd3xZs9/qF1s4ofC8H4VR46nhc5sYIcfj4=
+SHA256 (go_modules/github.com/dsnet/compress/@v/v0.0.1.mod) =
52BQKKoivkLzH6AIjryYw7TcFJX9lKZyrQAA1qL07Sw=
+SHA256 (go_modules/github.com/dsnet/compress/@v/v0.0.1.zip) =
a56FB8VW1ftUmNa9yX2Hs4OeUw8eVb/FtTGV3yt0wCg=
+SHA256
(go_modules/github.com/dsnet/golib/@v/v0.0.0-20171103203638-1ea166775780.mod) =
O1Jm9pllpxXyfeXV402g/4CetUoq5tf1RT0GTVo91d8=
+SHA256
(go_modules/github.com/dsnet/golib/@v/v0.0.0-20171103203638-1ea166775780.zip) =
4lnKhWtl4/iTxfyDc59wAfkeCCsOD3fkcBSSc/npQdU=
+SHA256 (go_modules/github.com/klauspost/compress/@v/v1.4.1.mod) =
KKIJ0xmE/VC2ckCF7aBCX117QN47aSvZiylurCn9HtA=
+SHA256 (go_modules/github.com/klauspost/compress/@v/v1.4.1.zip) =
3cyCGn81QkVPwW9b4kk9Hk1VerxWPMHgOsFbmy04Vfs=
+SHA256 (go_modules/github.com/klauspost/cpuid/@v/v1.2.0.mod) =
m0Q7WwY1XsqR9OdzpN99ijvwyautX/Ry1pc+aI5qk5I=
+SHA256 (go_modules/github.com/klauspost/cpuid/@v/v1.2.0.zip) =
Vs5jJiRVZRBjZHYAaBr+O/UMk6CiJ0uBFdaIapoN9Pw=
+SHA256 (go_modules/github.com/ulikunitz/xz/@v/v0.5.6.mod) =
10N/TA8REMegB+u90zFHaMYSEPONLMX0H+GHCJKltpg=
+SHA256 (go_modules/github.com/ulikunitz/xz/@v/v0.5.6.zip) =
GeuzMeeuelQu1YWX0Tq3A/xCOs+ToePE24ZHawMiBJo=
+SHA256 (go_modules/gitlab.com/yawning/utls.git/@v/v0.0.11-1.mod) =
Os54cJ1N+ZIk8ObXETncRigcIcGzlwBBAaNlZAAeBUo=
+SHA256 (go_modules/gitlab.com/yawning/utls.git/@v/v0.0.11-1.zip) =
3QW5liqwwvSKA6x3vQgajS2VMMuWnoemXyuWAS8DxGQ=
+SHA256
(go_modules/golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod) =
M+0HClpm4JYGhaxThkQOG1mJnnTYo4oRgGhecqIZXe0=
+SHA256
(go_modules/golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.mod) =
M+0HClpm4JYGhaxThkQOG1mJnnTYo4oRgGhecqIZXe0=
+SHA256
(go_modules/golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.zip) =
us552sSWCUrsVotrtZ4j0yFRf68Y1obYvYNp5m6HQKM=
+SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190328230028-74de082e2cca.mod)
= 9wRnadqsAr61fLzEgSgN9Z+0A8lv6CYigquoWMf3+k0=
+SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190328230028-74de082e2cca.zip)
= fQHDnhscWI4Tns/cmf98Nl4Qx910qxJHyx2EXYCjBKQ=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod)
= iWkRXko5EIhIMk55ob2KhEUjDm46rMvp+AV/tQ//yME=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20190329044733-9eb1bfa1ce65.mod)
= GBl56L1X0tngZBgtqGyaYRGqaXVeiI8IQx7OR0Kuw0M=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20190329044733-9eb1bfa1ce65.zip)
= iikbdXJTKsTZD0QRiP0yX5M3AzVBQOvdtLMSpktHFaY=
+SHA256 (go_modules/golang.org/x/text/@v/v0.3.0.mod) =
NoedWG/YAB6E2oeHGQoR5PeHSeKoHf6Lm2kxiZ//Mc8=
+SHA256 (go_modules/golang.org/x/text/@v/v0.3.0.zip) =
6jBoOVUD08fvjOFqKG91yMk4gsJaZsKqbI4q1Np6muA=
+SHA256 (obfs4.git-v0.0.0-20200410113629-2d8f3c8bbfd7.zip) =
jug2+zdLJYEU+ndIJSADDTSzTxRFBoT3o3K84jtZ2is=
+SIZE
(go_modules/git.schwanenlied.me/yawning/bsaes.git/@v/v0.0.0-20190320102049-26d1add596b6.mod)
= 45
+SIZE
(go_modules/git.schwanenlied.me/yawning/bsaes.git/@v/v0.0.0-20190320102049-26d1add596b6.zip)
= 39367
+SIZE
(go_modules/git.torproject.org/pluggable-transports/goptlib.git/@v/v1.0.0.mod)
= 59
+SIZE
(go_modules/git.torproject.org/pluggable-transports/goptlib.git/@v/v1.0.0.zip)
= 32116
+SIZE (go_modules/github.com/dchest/siphash/@v/v1.2.1.mod) = 33
+SIZE (go_modules/github.com/dchest/siphash/@v/v1.2.1.zip) = 17069
+SIZE (go_modules/github.com/dsnet/compress/@v/v0.0.1.mod) = 230
+SIZE (go_modules/github.com/dsnet/compress/@v/v0.0.1.zip) = 10103918
+SIZE
(go_modules/github.com/dsnet/golib/@v/v0.0.0-20171103203638-1ea166775780.mod) =
30
+SIZE
(go_modules/github.com/dsnet/golib/@v/v0.0.0-20171103203638-1ea166775780.zip) =
46392
+SIZE (go_modules/github.com/klauspost/compress/@v/v1.4.1.mod) = 37
+SIZE (go_modules/github.com/klauspost/compress/@v/v1.4.1.zip) = 3670017
+SIZE (go_modules/github.com/klauspost/cpuid/@v/v1.2.0.mod) = 34
+SIZE (go_modules/github.com/klauspost/cpuid/@v/v1.2.0.zip) = 286652
+SIZE (go_modules/github.com/ulikunitz/xz/@v/v0.5.6.mod) = 31
+SIZE (go_modules/github.com/ulikunitz/xz/@v/v0.5.6.zip) = 509178
+SIZE (go_modules/gitlab.com/yawning/utls.git/@v/v0.0.11-1.mod) = 330
+SIZE (go_modules/gitlab.com/yawning/utls.git/@v/v0.0.11-1.zip) = 818363
+SIZE
(go_modules/golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod) = 88
+SIZE
(go_modules/golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.mod) = 88
+SIZE
(go_modules/golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.zip) =
1781592
+SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190328230028-74de082e2cca.mod) =
119
+SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190328230028-74de082e2cca.zip) =
1276380
+SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod) =
24
+SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20190329044733-9eb1bfa1ce65.mod) =
33
+SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20190329044733-9eb1bfa1ce65.zip) =
1605582
+SIZE (go_modules/golang.org/x/text/@v/v0.3.0.mod) = 25
+SIZE (go_modules/golang.org/x/text/@v/v0.3.0.zip) = 6349244
+SIZE (obfs4.git-v0.0.0-20200410113629-2d8f3c8bbfd7.zip) = 190314
