Diff attached for net/obfs4proxy-0.0.13 on -stable.
Based on Yifei Zhan's diff, builds fine on 7.1 -stable.
Been running on -stable with Tor since -current diff submitted and it
works fine.
g
? obfs4proxy/modules.inc
Index: obfs4proxy//Makefile
===================================================================
RCS file: /cvs/ports/net/obfs4proxy/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- obfs4proxy//Makefile 11 Mar 2022 19:46:33 -0000 1.7
+++ obfs4proxy//Makefile 29 Jun 2022 21:31:14 -0000
@@ -1,40 +1,34 @@
COMMENT = a look-like nothing obfuscation protocol for TCP
-DISTNAME = obfs4proxy-0.0.7
+MODGO_MODNAME = gitlab.com/yawning/obfs4.git
-REVISION = 3
+# https://gitlab.com/yawning/obfs4/-/commit/77af0cba934d
+# commit 77af0cba934d73c4baeb709560bcfc9a9fbc661c
+# build: Do the release ritual for obfs4proxy-0.0.13
+MODGO_VERSION = v0.0.0-20220204003609-77af0cba934d
-MASTER_SITES = https://people.torproject.org/~yawning/releases/obfs4proxy/
-EXTRACT_SUFX = .tar.xz
+DISTNAME = obfs4.git-${MODGO_VERSION}
+
+PKGNAME = obfs4proxy-0.0.13
CATEGORIES = net www
-HOMEPAGE = \
-https://gitweb.torproject.org/pluggable-transports/obfs4.git/tree/README.md
+HOMEPAGE = https://gitlab.com/yawning/obfs4
MAINTAINER = Sean Levy <att...@stalphonsos.com>
+
# BSD
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
-
-BUILD_DEPENDS += net/go-net \
- security/go-crypto \
- security/go-ed25519 \
- security/go-siphash \
- devel/go-goptlib
+
+ALL_TARGET = ${MODGO_MODNAME}/...
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/obfs4proxy.1 \
${PREFIX}/man/man1/obfs4proxy.1
+.include "modules.inc"
.include <bsd.port.mk>
Index: obfs4proxy//distinfo
===================================================================
RCS file: /cvs/ports/net/obfs4proxy/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- obfs4proxy//distinfo 29 Aug 2017 17:02:48 -0000 1.1.1.1
+++ obfs4proxy//distinfo 29 Jun 2022 21:31:14 -0000
@@ -1,2 +1,44 @@
-SHA256 (obfs4proxy-0.0.7.tar.xz) = wHoaaQ66swV8i1ZuGkkCQ5x30bpcNbv0L83FtGqzymM=
-SIZE (obfs4proxy-0.0.7.tar.xz) = 56184
+SHA256 (go_modules/filippo.io/edwards25519/@v/v1.0.0-rc.1.0.20210721174708-390f27c3be20.mod) = 18MvTgz5F65FgigZwzhreQaHZbYlu+JJdGHuwPjoYpw=
+SHA256 (go_modules/filippo.io/edwards25519/@v/v1.0.0-rc.1.0.20210721174708-390f27c3be20.zip) = sIq5+GovBoimuLSaA6xbUvU/h3R1lq0Q3CDN1mjRW8Q=
+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/gitlab.com/yawning/edwards25519-extra.git/@v/v0.0.0-20211229043746-2f91fcc9fbdb.mod) = qsiLHW7PW6kpjmk8jRnrat7NKDuW6PA5V/AwTdH67ug=
+SHA256 (go_modules/gitlab.com/yawning/edwards25519-extra.git/@v/v0.0.0-20211229043746-2f91fcc9fbdb.zip) = t8cBEMXEjwnopCcvbYRTBvYumwvoq1WgcQHVeblRMiQ=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20210711020723-a769d52b0f97.mod) = zWMRYSoqpNDX4DxBs6ofvC1fiVqz9hCJ+rgL/p+PVIU=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20210711020723-a769d52b0f97.zip) = srKPz0m/OFGD8DaYURRd3ZOYn2jZ5nXbU2o91ILKbXY=
+SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod) = /vWJbRA6C85QVf216W6DCUQzR5JDeGU0dxjtzrYzNIo=
+SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.zip) = F65VXAvscLWD2E7HoJnbP9xbO2iMsoFPjDiNF0562hU=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod) = GBl56L1X0tngZBgtqGyaYRGqaXVeiI8IQx7OR0Kuw0M=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.zip) = DSXBHWWkrISm4sO9Vqav6x2jkj0nUqWqWbfpmpQ1n8s=
+SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod) = TLqxT3cGdxsnHZlaGzzBMf5aJGqtx+5tG6bwvYlHgfo=
+SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip) = R1qG8R3RSLR0zkBcXb3V9ryuBWw+ROUkRaRZJt1ppVI=
+SHA256 (go_modules/golang.org/x/text/@v/v0.3.3.mod) = +7eojtFAUV55Dsp6EP/TGcl4axHGpsfln4D3+ze7RUI=
+SHA256 (go_modules/golang.org/x/text/@v/v0.3.3.zip) = iolto0a6+Uq08ksOOW3wt5OTyTqgXFDvB83dVhof+Nc=
+SHA256 (go_modules/golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod) = oOAvBnj+Ytw8S0vHf6kSybcN4Q+p988veq0DNzkrUq8=
+SHA256 (go_modules/golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.zip) = ZnP+BmYvy+5fJG8Sr47YYDKL8I/QFv1JCYfNdqyxtP4=
+SHA256 (obfs4.git-v0.0.0-20220204003609-77af0cba934d.zip) = Bu+gQaJVx8UwOJLVMZ5k1bit9+8kF/CJpPoaV1DHglU=
+SIZE (go_modules/filippo.io/edwards25519/@v/v1.0.0-rc.1.0.20210721174708-390f27c3be20.mod) = 40
+SIZE (go_modules/filippo.io/edwards25519/@v/v1.0.0-rc.1.0.20210721174708-390f27c3be20.zip) = 50968
+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/gitlab.com/yawning/edwards25519-extra.git/@v/v0.0.0-20211229043746-2f91fcc9fbdb.mod) = 194
+SIZE (go_modules/gitlab.com/yawning/edwards25519-extra.git/@v/v0.0.0-20211229043746-2f91fcc9fbdb.zip) = 52334
+SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20210711020723-a769d52b0f97.mod) = 247
+SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20210711020723-a769d52b0f97.zip) = 1874721
+SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod) = 179
+SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.zip) = 1587056
+SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod) = 33
+SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod) = 33
+SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.zip) = 1644123
+SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod) = 95
+SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip) = 23281
+SIZE (go_modules/golang.org/x/text/@v/v0.3.3.mod) = 97
+SIZE (go_modules/golang.org/x/text/@v/v0.3.3.zip) = 8010747
+SIZE (go_modules/golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod) = 26
+SIZE (go_modules/golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.zip) = 2687668
+SIZE (obfs4.git-v0.0.0-20220204003609-77af0cba934d.zip) = 140867
