On 11/12/22 04:37, Ganymede wrote:
> On 12/11/2022 02:25, A Tammy wrote :
>>
>> On 11/11/22 17:04, Ganymede wrote:
>>> Hello,
>>>
>>> Here is an update below for net/obfs4proxy
>>>
>>> I modified the README because the link mentioned in the old one was
>>> outdated, and obfs4proxy won't run on port 443 (or any port <= 1024).
>>>
>>> Regards,
>>>
>>> Ganymede
>>
>> Patch is mangled, doesn't apply for me. Please resend.
>>
>> aisha
>
> Sorry, here's the patch attached.
>
> Ganymede
>
committed with REVISION removed, thanks!
>>>
>>>
>>> Index: Makefile
>>> ===================================================================
>>> RCS file: /cvs/ports/net/obfs4proxy/Makefile,v
>>> retrieving revision 1.9
>>> diff -u -p -r1.9 Makefile
>>> --- Makefile 30 Jun 2022 09:04:04 -0000 1.9
>>> +++ Makefile 11 Nov 2022 21:49:13 -0000
>>> @@ -2,14 +2,14 @@ COMMENT = a "look-like nothing" obfusca
>>>
>>> MODGO_MODNAME = gitlab.com/yawning/obfs4.git
>>>
>>> -# 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
>>> +# https://gitlab.com/yawning/obfs4/-/commit/336a71d6
>>> +# commit 336a71d6e4cfd2d33e9c57797828007ad74975e9
>>> +# build: Do the release ritual for obfs4proxy-0.0.14
>>> +MODGO_VERSION = v0.0.0-20220904064028-336a71d6e4cf
>>>
>>> DISTNAME = obfs4.git-${MODGO_VERSION}
>>>
>>> -PKGNAME = obfs4proxy-0.0.13
>>> +PKGNAME = obfs4proxy-0.0.14
>>> REVISION = 0
>>>
>>> CATEGORIES = net www
>>> Index: distinfo
>>> ===================================================================
>>> RCS file: /cvs/ports/net/obfs4proxy/distinfo,v
>>> retrieving revision 1.2
>>> diff -u -p -r1.2 distinfo
>>> --- distinfo 29 Jun 2022 21:31:17 -0000 1.2
>>> +++ distinfo 11 Nov 2022 21:49:13 -0000
>>> @@ -19,7 +19,7 @@ SHA256 (go_modules/golang.org/x/text/@v/
>>> 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=
>>> +SHA256 (obfs4.git-v0.0.0-20220904064028-336a71d6e4cf.zip) =
>>> /tU10m0oYU9w1nIG73iibey7rs3cE+29RYF8281dPEQ=
>>> 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
>>> @@ -41,4 +41,4 @@ SIZE (go_modules/golang.org/x/text/@v/v0
>>> 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
>>> +SIZE (obfs4.git-v0.0.0-20220904064028-336a71d6e4cf.zip) = 143125
>>> cvs server: Diffing pkg
>>> Index: pkg/README
>>> ===================================================================
>>> RCS file: /cvs/ports/net/obfs4proxy/pkg/README,v
>>> retrieving revision 1.4
>>> diff -u -p -r1.4 README
>>> --- pkg/README 11 Mar 2022 19:46:33 -0000 1.4
>>> +++ pkg/README 11 Nov 2022 21:49:13 -0000
>>> @@ -18,7 +18,7 @@ following configurations in your 'torrc'
>>>
>>> ## (Optional) Listen on the specified IP:PORT for obfs4
>>> connections
>>> ## as opposed to picking a random port automatically
>>> - # ServerTransportListenAddr obfs4 0.0.0.0:443
>>> + # ServerTransportListenAddr obfs4 0.0.0.0:PORT
>>>
>>> obfs4proxy is backwards compatible with obfs2 and obfs3 either in
>>> client or server mode. If you want to use it like this, please adjust
>>> @@ -26,4 +26,4 @@ your 'torrc' config file to fit your nee
>>> ScrambleSuit in client mode.
>>>
>>> For more information, please consult the official wiki page at
>>> -https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy
>>>
>>>
>>> +https://community.torproject.org/relay/setup/bridge/openbsd/
>>>
>>
