this port's update depends on changes made to the Go module (lang/go). if
it's not "elegant" to use many MASTER_SITE vars, one could create the
missing ports (dependencies).
files' names say what each patch does :-)
PS: for the lazy ones (like me):
https://github.com/egypcio/openbsd-ports/commits/obfs4proxy-0.0.11
--
Vinícius Zavam
keybase.io/egypcio
Index: lang/go/go.port.mk
===================================================================
RCS file: /cvs/ports/lang/go/go.port.mk,v
retrieving revision 1.26
diff -u -p -u -a -r1.26 go.port.mk
--- lang/go/go.port.mk 6 Oct 2019 15:37:15 -0000 1.26
+++ lang/go/go.port.mk 19 Oct 2019 20:18:14 -0000
@@ -56,7 +56,7 @@ TEST_TARGET ?= ${ALL_TARGET}
SEPARATE_BUILD ?= Yes
WRKSRC ?= ${MODGO_WORKSPACE}/src/${ALL_TARGET}
-MODGO_SETUP_WORKSPACE = mkdir -p ${WRKSRC:H}; mv ${MODGO_SUBDIR}
${WRKSRC};
+MODGO_SETUP_WORKSPACE ?= mkdir -p ${WRKSRC:H}; mv ${MODGO_SUBDIR}
${WRKSRC};
CATEGORIES += lang/go
@@ -96,7 +96,10 @@ RUN_DEPENDS += ${MODGO_RUN_DEPENDS}
MODGO_TEST_TARGET = ${MODGO_TEST_CMD} ${TEST_TARGET}
.if empty(CONFIGURE_STYLE)
+
+. if !empty(MODGO_SETUP_WORKSPACE)
MODGO_pre-configure += ${MODGO_SETUP_WORKSPACE}
+. endif
. if !target(do-build)
do-build:
@@ -112,4 +115,5 @@ do-install:
do-test:
${MODGO_TEST_TARGET}
. endif
+
.endif
Index: net/obfs4proxy/Makefile
===================================================================
RCS file: /cvs/ports/net/obfs4proxy/Makefile,v
retrieving revision 1.5
diff -u -p -u -a -r1.5 Makefile
--- net/obfs4proxy/Makefile 12 Jul 2019 20:48:34 -0000 1.5
+++ net/obfs4proxy/Makefile 19 Oct 2019 20:18:14 -0000
@@ -2,17 +2,23 @@
COMMENT = a look-like nothing obfuscation protocol for TCP
-DISTNAME = obfs4proxy-0.0.7
+DISTNAME = obfs4proxy-0.0.11
-REVISION = 2
+REVISION = 0
MASTER_SITES = https://people.torproject.org/~yawning/releases/obfs4proxy/
-EXTRACT_SUFX = .tar.xz
+MASTER_SITES0 = https://gitlab.com/yawning/utls/-/archive/v0.0.11-1/
+MASTER_SITES1 =
https://gitlab.com/yawning/bsaes/-/archive/${ALL_TARGET_BSAES_TAG}/
+MASTER_SITES2 = https://github.com/dsnet/compress/archive/
+
+DISTFILES = obfs4proxy-0.0.11.tar.xz \
+ utls-v0.0.11-1.tar.gz:0 \
+ bsaes-${ALL_TARGET_BSAES_TAG}.tar.gz:1 \
+ ${ALL_TARGET_COMPRESS_T}.tar.gz:2 # dsnet/compress
CATEGORIES = net www
-HOMEPAGE = \
-https://gitweb.torproject.org/pluggable-transports/obfs4.git/tree/README.md
+HOMEPAGE = https://gitlab.com/yawning/obfs4/blob/master/README.md
MAINTAINER = Sean Levy <[email protected]>
@@ -22,22 +28,37 @@ 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 \
+ALL_TARGET = gitlab.com/yawning/obfs4.git
+ALL_TARGET_BSAES = git.schwanenlied.me/yawning/bsaes.git
+ALL_TARGET_BSAES_TAG = 0a714cd429ec754482b4001e918db30cd2094405
+ALL_TARGET_COMPRESS = github.com/dsnet/compress
+ALL_TARGET_COMPRESS_T = da652975a8eea9fa0735aba8056747a751db0bd3
+
+BUILD_DEPENDS += devel/go-goptlib \
+ devel/go-sys \
+ net/go-net \
security/go-crypto \
security/go-ed25519 \
security/go-siphash \
- devel/go-goptlib
+ textproc/go-text
-post-install:
- ${INSTALL_MAN} ${WRKSRC}/doc/obfs4proxy.1 \
- ${PREFIX}/man/man1/obfs4proxy.1
+MODGO_SUBDIR = ${WRKDIR}
+MODGO_WORKSPACE = ${WRKDIR}
+MODGO_GOPATH = ${WRKDIR}:${MODGO_PACKAGE_PATH}
+
+MODGO_SETUP_WORKSPACE = mkdir -p ${WRKSRC:H} ; \
+ mkdir -p ${WRKDIR}/src/${ALL_TARGET_BSAES:H} ; \
+ mkdir -p ${WRKDIR}/src/${ALL_TARGET_COMPRESS:H} ; \
+ ln -sf ${WRKDIR}/bsaes-${ALL_TARGET_BSAES_TAG}
${WRKDIR}/src/${ALL_TARGET_BSAES} ; \
+ ln -sf ${WRKDIR}/bsaes-${ALL_TARGET_BSAES_TAG} ${WRKSRC:H}/bsaes.git ; \
+ ln -sf ${WRKDIR}/compress-${ALL_TARGET_COMPRESS_T}
${WRKDIR}/src/${ALL_TARGET_COMPRESS} ; \
+ ln -sf ${WRKDIR}/utls-v0.0.11-1 ${WRKSRC:H}/utls.git ; \
+ ln -sf ${WRKDIR} ${WRKSRC}
+
+do-build:
+ cd ${WRKSRC} ; \
+ ${MODGO_CMD} build ${MODGO_FLAGS} \
+ -o ${WRKDIR}/bin/obfs4proxy ./obfs4proxy
.include <bsd.port.mk>
Index: net/obfs4proxy/distinfo
===================================================================
RCS file: /cvs/ports/net/obfs4proxy/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -a -r1.1.1.1 distinfo
--- net/obfs4proxy/distinfo 29 Aug 2017 17:02:48 -0000 1.1.1.1
+++ net/obfs4proxy/distinfo 19 Oct 2019 20:18:14 -0000
@@ -1,2 +1,8 @@
-SHA256 (obfs4proxy-0.0.7.tar.xz) = wHoaaQ66swV8i1ZuGkkCQ5x30bpcNbv0L83FtGqzymM=
-SIZE (obfs4proxy-0.0.7.tar.xz) = 56184
+SHA256 (bsaes-0a714cd429ec754482b4001e918db30cd2094405.tar.gz) =
bPhBtGbVVK+noPjOpRasDiwBfARa9TFcD+AzE5X0ljE=
+SHA256 (da652975a8eea9fa0735aba8056747a751db0bd3.tar.gz) =
HHumgc0xUVkwN987+xU0o8apYkABm/ULgKTaxQ3/LsQ=
+SHA256 (obfs4proxy-0.0.11.tar.xz) =
iqd3p64XYQ3TAoN5skmq4kqNlkz+n+dIYSDv5tZ2/Ts=
+SHA256 (utls-v0.0.11-1.tar.gz) = V621ggc0RBd0USto06rEs/+3OSTJ3Pz6f4Kp6ZXodGY=
+SIZE (bsaes-0a714cd429ec754482b4001e918db30cd2094405.tar.gz) = 18759
+SIZE (da652975a8eea9fa0735aba8056747a751db0bd3.tar.gz) = 9962509
+SIZE (obfs4proxy-0.0.11.tar.xz) = 70952
+SIZE (utls-v0.0.11-1.tar.gz) = 560445
Index: net/obfs4proxy/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/obfs4proxy/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -a -r1.2 PLIST
--- net/obfs4proxy/pkg/PLIST 4 Sep 2018 12:46:18 -0000 1.2
+++ net/obfs4proxy/pkg/PLIST 19 Oct 2019 20:18:14 -0000
@@ -1,4 +1,3 @@
@comment $OpenBSD: PLIST,v 1.2 2018/09/04 12:46:18 espie Exp $
@bin bin/obfs4proxy
-@man man/man1/obfs4proxy.1
share/doc/pkg-readmes/${PKGSTEM}
Index: lang/go/go.port.mk
===================================================================
RCS file: /cvs/ports/lang/go/go.port.mk,v
retrieving revision 1.26
diff -u -p -u -a -r1.26 go.port.mk
--- lang/go/go.port.mk 6 Oct 2019 15:37:15 -0000 1.26
+++ lang/go/go.port.mk 19 Oct 2019 20:18:56 -0000
@@ -56,7 +56,7 @@ TEST_TARGET ?= ${ALL_TARGET}
SEPARATE_BUILD ?= Yes
WRKSRC ?= ${MODGO_WORKSPACE}/src/${ALL_TARGET}
-MODGO_SETUP_WORKSPACE = mkdir -p ${WRKSRC:H}; mv ${MODGO_SUBDIR}
${WRKSRC};
+MODGO_SETUP_WORKSPACE ?= mkdir -p ${WRKSRC:H}; mv ${MODGO_SUBDIR}
${WRKSRC};
CATEGORIES += lang/go
@@ -96,7 +96,10 @@ RUN_DEPENDS += ${MODGO_RUN_DEPENDS}
MODGO_TEST_TARGET = ${MODGO_TEST_CMD} ${TEST_TARGET}
.if empty(CONFIGURE_STYLE)
+
+. if !empty(MODGO_SETUP_WORKSPACE)
MODGO_pre-configure += ${MODGO_SETUP_WORKSPACE}
+. endif
. if !target(do-build)
do-build:
@@ -112,4 +115,5 @@ do-install:
do-test:
${MODGO_TEST_TARGET}
. endif
+
.endif
Index: net/obfs4proxy/Makefile
===================================================================
RCS file: /cvs/ports/net/obfs4proxy/Makefile,v
retrieving revision 1.5
diff -u -p -u -a -r1.5 Makefile
--- net/obfs4proxy/Makefile 12 Jul 2019 20:48:34 -0000 1.5
+++ net/obfs4proxy/Makefile 19 Oct 2019 20:18:38 -0000
@@ -2,17 +2,23 @@
COMMENT = a look-like nothing obfuscation protocol for TCP
-DISTNAME = obfs4proxy-0.0.7
+DISTNAME = obfs4proxy-0.0.11
-REVISION = 2
+REVISION = 0
MASTER_SITES = https://people.torproject.org/~yawning/releases/obfs4proxy/
-EXTRACT_SUFX = .tar.xz
+MASTER_SITES0 = https://gitlab.com/yawning/utls/-/archive/v0.0.11-1/
+MASTER_SITES1 =
https://gitlab.com/yawning/bsaes/-/archive/${ALL_TARGET_BSAES_TAG}/
+MASTER_SITES2 = https://github.com/dsnet/compress/archive/
+
+DISTFILES = obfs4proxy-0.0.11.tar.xz \
+ utls-v0.0.11-1.tar.gz:0 \
+ bsaes-${ALL_TARGET_BSAES_TAG}.tar.gz:1 \
+ ${ALL_TARGET_COMPRESS_T}.tar.gz:2 # dsnet/compress
CATEGORIES = net www
-HOMEPAGE = \
-https://gitweb.torproject.org/pluggable-transports/obfs4.git/tree/README.md
+HOMEPAGE = https://gitlab.com/yawning/obfs4/blob/master/README.md
MAINTAINER = Sean Levy <[email protected]>
@@ -22,22 +28,37 @@ 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 \
+ALL_TARGET = gitlab.com/yawning/obfs4.git
+ALL_TARGET_BSAES = git.schwanenlied.me/yawning/bsaes.git
+ALL_TARGET_BSAES_TAG = 0a714cd429ec754482b4001e918db30cd2094405
+ALL_TARGET_COMPRESS = github.com/dsnet/compress
+ALL_TARGET_COMPRESS_T = da652975a8eea9fa0735aba8056747a751db0bd3
+
+BUILD_DEPENDS += devel/go-goptlib \
+ devel/go-sys \
+ net/go-net \
security/go-crypto \
security/go-ed25519 \
security/go-siphash \
- devel/go-goptlib
+ textproc/go-text
-post-install:
- ${INSTALL_MAN} ${WRKSRC}/doc/obfs4proxy.1 \
- ${PREFIX}/man/man1/obfs4proxy.1
+MODGO_SUBDIR = ${WRKDIR}
+MODGO_WORKSPACE = ${WRKDIR}
+MODGO_GOPATH = ${WRKDIR}:${MODGO_PACKAGE_PATH}
+
+MODGO_SETUP_WORKSPACE = mkdir -p ${WRKSRC:H} ; \
+ mkdir -p ${WRKDIR}/src/${ALL_TARGET_BSAES:H} ; \
+ mkdir -p ${WRKDIR}/src/${ALL_TARGET_COMPRESS:H} ; \
+ ln -sf ${WRKDIR}/bsaes-${ALL_TARGET_BSAES_TAG}
${WRKDIR}/src/${ALL_TARGET_BSAES} ; \
+ ln -sf ${WRKDIR}/bsaes-${ALL_TARGET_BSAES_TAG} ${WRKSRC:H}/bsaes.git ; \
+ ln -sf ${WRKDIR}/compress-${ALL_TARGET_COMPRESS_T}
${WRKDIR}/src/${ALL_TARGET_COMPRESS} ; \
+ ln -sf ${WRKDIR}/utls-v0.0.11-1 ${WRKSRC:H}/utls.git ; \
+ ln -sf ${WRKDIR} ${WRKSRC}
+
+do-build:
+ cd ${WRKSRC} ; \
+ ${MODGO_CMD} build ${MODGO_FLAGS} \
+ -o ${WRKDIR}/bin/obfs4proxy ./obfs4proxy
.include <bsd.port.mk>
Index: net/obfs4proxy/distinfo
===================================================================
RCS file: /cvs/ports/net/obfs4proxy/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -a -r1.1.1.1 distinfo
--- net/obfs4proxy/distinfo 29 Aug 2017 17:02:48 -0000 1.1.1.1
+++ net/obfs4proxy/distinfo 19 Oct 2019 20:18:38 -0000
@@ -1,2 +1,8 @@
-SHA256 (obfs4proxy-0.0.7.tar.xz) = wHoaaQ66swV8i1ZuGkkCQ5x30bpcNbv0L83FtGqzymM=
-SIZE (obfs4proxy-0.0.7.tar.xz) = 56184
+SHA256 (bsaes-0a714cd429ec754482b4001e918db30cd2094405.tar.gz) =
bPhBtGbVVK+noPjOpRasDiwBfARa9TFcD+AzE5X0ljE=
+SHA256 (da652975a8eea9fa0735aba8056747a751db0bd3.tar.gz) =
HHumgc0xUVkwN987+xU0o8apYkABm/ULgKTaxQ3/LsQ=
+SHA256 (obfs4proxy-0.0.11.tar.xz) =
iqd3p64XYQ3TAoN5skmq4kqNlkz+n+dIYSDv5tZ2/Ts=
+SHA256 (utls-v0.0.11-1.tar.gz) = V621ggc0RBd0USto06rEs/+3OSTJ3Pz6f4Kp6ZXodGY=
+SIZE (bsaes-0a714cd429ec754482b4001e918db30cd2094405.tar.gz) = 18759
+SIZE (da652975a8eea9fa0735aba8056747a751db0bd3.tar.gz) = 9962509
+SIZE (obfs4proxy-0.0.11.tar.xz) = 70952
+SIZE (utls-v0.0.11-1.tar.gz) = 560445
Index: net/obfs4proxy/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/obfs4proxy/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -a -r1.2 PLIST
--- net/obfs4proxy/pkg/PLIST 4 Sep 2018 12:46:18 -0000 1.2
+++ net/obfs4proxy/pkg/PLIST 19 Oct 2019 20:18:38 -0000
@@ -1,4 +1,3 @@
@comment $OpenBSD: PLIST,v 1.2 2018/09/04 12:46:18 espie Exp $
@bin bin/obfs4proxy
-@man man/man1/obfs4proxy.1
share/doc/pkg-readmes/${PKGSTEM}
