Date: Thu, 13 Nov 2025 13:24:42 GMT From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1e23df854ae8 - main - net/spoofdpi: Update 1.0.1 => 1.0.2 Message-ID: <202511131324.5ADDOgkO014136@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=1e23df854ae8494d16a00f6d0577bc0820cb97a5 commit 1e23df854ae8494d16a00f6d0577bc0820cb97a5 Author: Yusuf Yaman <nxjoseph@protonmail.com> AuthorDate: 2025-11-13 13:23:29 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-11-13 13:23:29 +0000 net/spoofdpi: Update 1.0.1 => 1.0.2 This release brings toml configuration support. It will be used when no command-line arguments are given. Changelog: https://github.com/xvzc/SpoofDPI/releases/tag/v1.0.2 PR: 290983 --- net/spoofdpi/Makefile | 19 ++++++++++++++++--- net/spoofdpi/distinfo | 10 +++++++--- net/spoofdpi/files/modules.txt | 9 ++++++++- net/spoofdpi/files/pkg-message.in | 37 +++++++++++++++++++++++++++++++++++++ net/spoofdpi/pkg-message | 30 ------------------------------ 5 files changed, 68 insertions(+), 37 deletions(-) diff --git a/net/spoofdpi/Makefile b/net/spoofdpi/Makefile index b1462e1bae03..4a06d5c2596f 100644 --- a/net/spoofdpi/Makefile +++ b/net/spoofdpi/Makefile @@ -1,6 +1,6 @@ PORTNAME= spoofdpi DISTVERSIONPREFIX= v -DISTVERSION= 1.0.1 +DISTVERSION= 1.0.2 CATEGORIES= net MAINTAINER= nxjoseph@protonmail.com @@ -14,7 +14,8 @@ USES= go:modules USE_GITHUB= yes GH_ACCOUNT= xvzc GH_PROJECT= SpoofDPI -GH_TUPLE= atomicgo:cursor:v0.2.0:atomicgo_cursor/vendor/atomicgo.dev/cursor \ +GH_TUPLE= BurntSushi:toml:v1.5.0:burntsushi_toml/vendor/github.com/BurntSushi/toml \ + atomicgo:cursor:v0.2.0:atomicgo_cursor/vendor/atomicgo.dev/cursor \ atomicgo:keyboard:v0.2.9:atomicgo_keyboard/vendor/atomicgo.dev/keyboard \ atomicgo:schedule:v0.1.0:atomicgo_schedule/vendor/atomicgo.dev/schedule \ containerd:console:v1.0.3:containerd_console/vendor/github.com/containerd/console \ @@ -43,6 +44,7 @@ GH_TUPLE= atomicgo:cursor:v0.2.0:atomicgo_cursor/vendor/atomicgo.dev/cursor \ russross:blackfriday:v2.1.0:russross_blackfriday_v2/vendor/github.com/russross/blackfriday/v2 \ stretchr:objx:v0.5.2:stretchr_objx/vendor/github.com/stretchr/objx \ stretchr:testify:v1.11.1:stretchr_testify/vendor/github.com/stretchr/testify \ + urfave:cli-altsrc:v3.1.0:urfave_cli_altsrc_v3/vendor/github.com/urfave/cli-altsrc/v3 \ urfave:cli:v1.22.17:urfave_cli/vendor/github.com/urfave/cli \ urfave:cli:v3.5.0:urfave_cli_v3/vendor/github.com/urfave/cli/v3 \ xo:terminfo:abceb7e1c41e:xo_terminfo/vendor/github.com/xo/terminfo @@ -52,13 +54,24 @@ GO_TARGET= ./cmd/${PORTNAME} GO_BUILDFLAGS= -ldflags="-s -w" CGO_CFLAGS+= -I/usr/include CGO_LDFLAGS+= -L/usr/lib +SUB_FILES= pkg-message SUB_LIST= USER=${USERS} USERS= ${PORTNAME} GROUPS= ${PORTNAME} -PLIST_FILES= bin/${PORTNAME} +PLIST_FILES= "@dir(${USERS},${GROUPS},0770) ${ETCDIR}" \ + "@sample(${USERS},${GROUPS},0770) ${ETCDIR}/${PORTNAME}.toml.sample" \ + bin/${PORTNAME} post-patch: ${CP} ${FILESDIR}/modules.txt ${WRKSRC}/vendor + @${REINPLACE_CMD} -e '67s#/etc#${ETCDIR}#g' \ + -e '233s#"etc"#"${ETCDIR}"#g' \ + ${WRKSRC}/internal/config/cli.go + +post-install: + @${MKDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/example_config.toml \ + ${STAGEDIR}${ETCDIR}/${PORTNAME}.toml.sample .include <bsd.port.mk> diff --git a/net/spoofdpi/distinfo b/net/spoofdpi/distinfo index 3486392cd019..4003ea3247f0 100644 --- a/net/spoofdpi/distinfo +++ b/net/spoofdpi/distinfo @@ -1,6 +1,8 @@ -TIMESTAMP = 1762465094 -SHA256 (xvzc-SpoofDPI-v1.0.1_GH0.tar.gz) = d1f38e25bbd9c9481e8d45c4734e3b13249fa2e3898f1203c8049f08bd007ab1 -SIZE (xvzc-SpoofDPI-v1.0.1_GH0.tar.gz) = 49233 +TIMESTAMP = 1762972888 +SHA256 (xvzc-SpoofDPI-v1.0.2_GH0.tar.gz) = ce784f8d00ef139659df2388a37604bb50c4008c6c957e43f647c2837a9da9d1 +SIZE (xvzc-SpoofDPI-v1.0.2_GH0.tar.gz) = 52399 +SHA256 (BurntSushi-toml-v1.5.0_GH0.tar.gz) = 723ede1a61ca8311046f840020e485dec3ceb2e614d1a539cd154375bdd7b8cb +SIZE (BurntSushi-toml-v1.5.0_GH0.tar.gz) = 118644 SHA256 (atomicgo-cursor-v0.2.0_GH0.tar.gz) = 61760aaf6b2a0b51adcea56913104aa070b844426063a21dac60551f239e5044 SIZE (atomicgo-cursor-v0.2.0_GH0.tar.gz) = 11330 SHA256 (atomicgo-keyboard-v0.2.9_GH0.tar.gz) = 6855b6e6e6837de6e9cfb98e0f49f6224eb599c688bdd4ce3a0c96b2f409bd07 @@ -59,6 +61,8 @@ SHA256 (stretchr-objx-v0.5.2_GH0.tar.gz) = c21c81a2e619fe8194c9cfafd577a72fe163d SIZE (stretchr-objx-v0.5.2_GH0.tar.gz) = 33222 SHA256 (stretchr-testify-v1.11.1_GH0.tar.gz) = 4b51fbc0f19e42841013748e6d527314e1d0e7255122766b5fca1d35b4630c69 SIZE (stretchr-testify-v1.11.1_GH0.tar.gz) = 116832 +SHA256 (urfave-cli-altsrc-v3.1.0_GH0.tar.gz) = df76476f76680af4f26142ee675857a9e0c684b4f7e183bf9ba089ebe54b1302 +SIZE (urfave-cli-altsrc-v3.1.0_GH0.tar.gz) = 9968 SHA256 (urfave-cli-v1.22.17_GH0.tar.gz) = 44e20f78e0d399014591e1d0bd3c520dfff65a27ec2ad1310649eca5e56521e4 SIZE (urfave-cli-v1.22.17_GH0.tar.gz) = 80511 SHA256 (urfave-cli-v3.5.0_GH0.tar.gz) = bb5987d7ba2c59721496e01a246732955051140126df5f1e6da6d9c9c20ad5e2 diff --git a/net/spoofdpi/files/modules.txt b/net/spoofdpi/files/modules.txt index e8e4eaad2c0f..6aa37b42e937 100644 --- a/net/spoofdpi/files/modules.txt +++ b/net/spoofdpi/files/modules.txt @@ -4,6 +4,10 @@ ## explicit; go 1.15 # atomicgo.dev/schedule v0.1.0 ## explicit; go 1.18 +# github.com/BurntSushi/toml v1.5.0 +## explicit; go 1.18 +github.com/BurntSushi/toml +github.com/BurntSushi/toml/internal # github.com/containerd/console v1.0.3 ## explicit; go 1.13 # github.com/cpuguy83/go-md2man/v2 v2.0.7 @@ -46,6 +50,7 @@ github.com/pmezard/go-difflib/difflib github.com/rs/zerolog github.com/rs/zerolog/internal/cbor github.com/rs/zerolog/internal/json +github.com/rs/zerolog/log # github.com/russross/blackfriday/v2 v2.1.0 ## explicit # github.com/stretchr/objx v0.5.2 @@ -58,8 +63,11 @@ github.com/stretchr/testify/assert/yaml github.com/stretchr/testify/mock # github.com/urfave/cli v1.22.17 ## explicit; go 1.11 +# github.com/urfave/cli-altsrc/v3 v3.1.0 +## explicit; go 1.23.2 # github.com/urfave/cli/v3 v3.5.0 ## explicit; go 1.22 +github.com/urfave/cli/v3 # github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e ## explicit; go 1.19 # golang.org/x/mod v0.18.0 @@ -80,7 +88,6 @@ golang.org/x/sync/errgroup ## explicit; go 1.23.0 golang.org/x/sys/unix golang.org/x/sys/windows -golang.org/x/sys/windows/registry # golang.org/x/term v0.30.0 ## explicit; go 1.23.0 # golang.org/x/text v0.23.0 diff --git a/net/spoofdpi/files/pkg-message.in b/net/spoofdpi/files/pkg-message.in new file mode 100644 index 000000000000..2c70f131080e --- /dev/null +++ b/net/spoofdpi/files/pkg-message.in @@ -0,0 +1,37 @@ +[ +{ type: install + message: <<EOM +You can use ${PORTNAME} rc.d service and specify arguments for ${PORTNAME} program in rc.conf file like this below or you can use the configuration file located in '%%ETCDIR%%': +To enable/start ${PORTNAME} service: + # service ${PORTNAME} enable + # service ${PORTNAME} start +Now, you can configure your web browser to use this proxy. +${PORTNAME} listens on port 8080 by default and uses DNS as 8.8.8.8. +EOM +} +{ type: upgrade + maximum_version: "0.12.2" + message: << EOM +Some command-line arguments of ${PORTNAME} has been refactored, a few examples: + # -addr => -listen-addr, -port => -listen-port and etc. +See the commit link below or project page for the new documentation. + # https://github.com/xvzc/${PORTNAME}/commit/a2993ac68d87a0525a93bc23984d21e341214199 +EOM +} +{ type: upgrade + maximum_version: "1.0.1" + message: << EOM +A new feature (-fake-https-packets) has been added that adds up a dependency on ${PORTNAME}: libpcap. This feature requires the daemon to be run as root if it is enabled with an argument, it will fail with the default '${PORTNAME}' user, to be able to use it, switch the daemon user to root. + # sysrc ${PORTNAME}_user="root" +EOM +} +{ type: upgrade + maximum_version: "1.0.2" + message: << EOM +${PORTNAME} now supports configuration files written in TOML, installed in ${ETCDIR} directory with a sample config file. +Options given through the command-line flags (via rc.conf or as user) will override the options set by the config file. +You can edit the config via being as root or adding your user to the ${PORTNAME} group (default group). +Config locations are: $SPOOFDPI_CONFIG environment variable, ${ETCDIR}/${PORTNAME}.toml, $XDG_CONFIG_HOME/${PORTNAME}/${PORTNAME}.toml and $HOME/.config/${PORTNAME}/${PORTNAME}.toml +EOM +} +] diff --git a/net/spoofdpi/pkg-message b/net/spoofdpi/pkg-message deleted file mode 100644 index a852b9519b62..000000000000 --- a/net/spoofdpi/pkg-message +++ /dev/null @@ -1,30 +0,0 @@ -[ -{ type: install - message: <<EOM -You can use SpoofDPI rc.d service and specify arguments -for SpoofDPI program in rc.conf file like this below: - # sysrc spoofdpi_args="-listen-port 8181 -dns-addr 1.1.1.1 -enable-doh" -To enable/start spoofdpi service: - # service spoofdpi enable - # service spoofdpi start -Now, you can configure your web browser to use this proxy. -SpoofDPI listens on port 8080 by default and uses DNS as 8.8.8.8. -EOM -} -{ type: upgrade - maximum_version: "0.12.2" - message: << EOM -Some command-line arguments of SpoofDPI has been refactored, a few examples: - # -addr => -listen-addr, -port => -listen-port and etc. -See the commit link below or project page for new changes in arguments usage. - # https://github.com/xvzc/SpoofDPI/commit/a2993ac68d87a0525a93bc23984d21e341214199 -EOM -} -{ type: upgrade - maximum_version: "1.0.1" - message: << EOM -A new feature (-fake-https-packets) has been added that adds up a dependency on SpoofDPI: libpcap. This feature requires the daemon to be run as root if it is enabled with an argument, it will fail with the default 'spoofdpi' user, to be able to use it, switch the daemon user to root. - # sysrc spoofdpi_user="root" -EOM -} -]home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202511131324.5ADDOgkO014136>