CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2022/12/23 00:11:11 Modified files: security/openssl-ruby-tests: Makefile distinfo security/openssl-ruby-tests/pkg: PLIST Log message: Update to openssl-ruby-tests 20221223
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/23 00:08:11 Modified files: net/snowflake_proxy: Makefile net/snowflake_proxy/pkg: DESCR PLIST Log message: snowflake_proxy: also build the pluggable transports for Tor based on a suggestion from caspar@ and diff from Yifei Zhan, but avoiding nukti-packages, the complexity isn't really needed similar diff ok caspar@ but I tweaked COMMENT a bit more
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/22 23:59:36 Modified files: security/yubico/yubikey-manager: Makefile Log message: yubikey-manager: update version spec for py-cryptography dep, drop unneeded dep on py-openssl
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lr...@cvs.openbsd.org 2022/12/22 20:51:09 Modified files: security/yubico/yubikey-manager: Makefile Log message: security/yubico/yubikey-manager: add py3-keyring as RDEP with feedback and ok sthen@
aarch64 bulk build report
bulk build on arm64.ports.openbsd.org started on Tue Dec 20 14:13:17 MST 2022 finished at Thu Dec 22 20:10:17 MST 2022 lasted 2D05h57m done with kern.version=OpenBSD 7.2-current (GENERIC.MP) #1936: Mon Dec 19 17:55:43 MST 2022 built packages:11519 Dec 20:2668 Dec 21:1305 Dec 22:7545 critical path missing pkgs: http://build-failures.rhaalovely.net/aarch64/2022-12-20/summary.log build failures: 1 http://build-failures.rhaalovely.net/aarch64/2022-12-20/textproc/catfish.log recurrent failures new failures +++ ls-failures Thu Dec 22 20:10:28 2022 +failures/textproc/catfish.log resolved failures --- ../old/aarch64/last//ls-failuresMon Dec 19 07:24:33 2022
Re: [maintainer update] lang/erlang 25.2
"make update" doesn't always work with multi packages ports, the best way
to test updates in that case is to generate packages in a directory and
point pkg_add -u at them
--
Sent from a phone, apologies for poor formatting.
On 22 December 2022 15:21:28 Volker Schlecht
wrote:
Builds, installs, works fine on amd64 and rebuilds all dependent ports.
I'm not too sure about this bit:
: --- pkg/PLIST-main 7 Nov 2022 22:24:03 - 1.2
: +++ pkg/PLIST-main 21 Dec 2022 10:51:25 -
: @@ -1,6 +1,6 @@
: @option no-default-conflict
: -@conflict erlang-wx->=25,<25.1.2
: -@option is-branch
: +@conflict erlang-wx->=25,<25.2
: +@conflict erlang->=25,<25.2
: bin/ct_run25
The @option is-branch should remain and I'm not sure about bumping the
version for the @conflict erlang-wx. why adding a new @conflict on
erlang->=25,<25.2?
I'm not too sure about it either, but it's what I had to do so that
'make update' works with erlang 25.1.2 present ... if there's a cleaner
way, I'm happy to learn.
I built the erlang-wx PLIST manually, so it's possible that I didn't get
the alphabetic order exactly right. Is that a big deal?
Otherwise it's OK for me (make test is happy, rebar3,erlang and
rabbitmq are building fine and their test suite are happy too.)
lang/elixir with your update diff builds.
for some reasons, make update-plist moves one line in PLIST-wx down a
few entries:
--- pkg/PLIST-wx.orig Wed Dec 21 11:51:25 2022
+++ pkg/PLIST-wxThu Dec 22 15:04:07 2022
@@ -416,7 +416,6 @@
lib/${ERLANG_V}/lib/${ERL_WX}/doc/chunks/wxe_master.chunk
lib/${ERLANG_V}/lib/${ERL_WX}/doc/chunks/wxe_server.chunk
lib/${ERLANG_V}/lib/${ERL_WX}/doc/chunks/wxe_util.chunk
-lib/${ERLANG_V}/lib/${ERL_WX}/info
lib/${ERLANG_V}/lib/${ERL_WX}/ebin/
lib/${ERLANG_V}/lib/${ERL_WX}/ebin/gl.beam
lib/${ERLANG_V}/lib/${ERL_WX}/ebin/glu.beam
@@ -743,6 +742,7 @@
lib/${ERLANG_V}/lib/${ERL_WX}/include/gl.hrl
lib/${ERLANG_V}/lib/${ERL_WX}/include/glu.hrl
lib/${ERLANG_V}/lib/${ERL_WX}/include/wx.hrl
+lib/${ERLANG_V}/lib/${ERL_WX}/info
lib/${ERLANG_V}/lib/${ERL_WX}/priv/
@so lib/${ERLANG_V}/lib/${ERL_WX}/priv/erl_gl.so
lib/${ERLANG_V}/lib/${ERL_WX}/priv/erlang-logo128.png
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2022/12/22 14:40:27 Modified files: devel/kf5/purpose: Makefile Log message: Special case, KAccounts depends on intltool-merge at build time Spotted by naddy, thanks
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2022/12/22 13:30:30 Modified files: security/openssl-ruby-tests: Makefile distinfo Removed files: security/openssl-ruby-tests/patches: patch-test_openssl_test_asn1_rb Log message: Update to openssl-ruby-tests 20221222
Re: meta/xfce: remove calendar (orage) from DESCR-main
Le Thu, Dec 22, 2022 at 05:12:39PM +, Klemens Nanni a écrit : > The dependency was removed in the 4.14 update and nothing depends on > x11/xfce4/orage these days. > > I wouldn't miss it in neither the main meta/xfce nor the -extras meta > package: the tray plugin provides a drop-down calendar version on click > which looks just like the standalone GUI provided by orage. > > Then again, if it isn't installed by any of the meta packages, I wonder > how discoverable it is... orage already skipped a few releases, so > maybe it just isn't that important/used these days? Nope, orage recently got a new developer and iirc was upgraded in master. I'd eventually like it to get revived and reenabled in the meta package.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/12/22 11:21:51 Modified files: meta/xfce : Makefile meta/xfce/pkg : README-main Log message: unmention slim, the port is no more
Re: [new] lang/fennel - Lisp dialect that runs on Lua
On 2022/12/22 10:47:39 -0700, "Aaron Bieber" wrote: > > > On Thu, Dec 22, 2022, at 6:46 AM, Omar Polo wrote: > > ping > > > > (i've tested it with with love2d and with a locally-built lua 5.4) > > Trailing space in DESCR. ops, thank you for spotting it > Is PKG_ARCH required? Seems like defaulting to > what MODLUA defaults to would be a sufficient approach? as far as i can see lua.ports.mk doesn't set PKG_ARCH. it's not a big deal, but since it only contains a script, the lua library and the manpage I thought it made sense to set PKG_ARCH=*
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/12/22 11:08:00 Modified files: x11/xfce4/xfce4-wavelan: Makefile distinfo Log message: Update to latest HEAD incl. the following two changes - Default "Wifi Manager Command" to NetWorkManager only on Linux (PR #11) - Limit list of interfaces to IEEE 802.11 on OpenBSD and NetBSD (PR #12) OK landry
Re: WIP/Help wanted: use MULTI_PACKAGES for net/snowflake_proxy
On Thu, Dec 22, 2022 at 08:17:46AM +, Stuart Henderson wrote:
> Don't overthink things though, there's really no need to split this
> up, a single package is fine (and maybe preferable in this case, as it
> stops a passive observer from figuring out whether you downloaded
> the proxy or server or client parts).
Thanks for your diff.
I like it and it works fine here after one tweak (see below). Perhaps a
bit silly that the package is still called snowflake_*proxy* but I
don't think that's too big of a deal.
When building the package, I did run into this:
> ===> Building package for snowflake_proxy-2.3.1p0
> Create /usr/ports/packages/amd64/all/snowflake_proxy-2.3.1p0.tgz
> Creating package snowflake_proxy-2.3.1p0
> Fatal error: can't parse comment is too long
> proxy daemon and pluggable transports for Tor access with censored net
> ^^
>
> at /usr/libdata/perl5/OpenBSD/PkgCreate.pm line 1318.
So below is a diff with a slightly tweaked COMMENT. How about this?
This is OK caspar@
Caspar
Index: Makefile
===
RCS file: /cvs/ports/net/snowflake_proxy/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile6 Oct 2022 17:05:25 - 1.7
+++ Makefile22 Dec 2022 18:01:19 -
@@ -1,7 +1,8 @@
-COMMENT= proxy providing Tor access to others with censored net
+COMMENT= proxy, pluggable transport for Tor access with censored net
MODGO_MODNAME= git.torproject.org/pluggable-transports/snowflake.git/v2
V= 2.3.1
+REVISION= 0
MODGO_VERSION= v$V
DISTNAME= snowflake.git-${MODGO_VERSION}
@@ -17,7 +18,7 @@ PERMIT_PACKAGE= Yes
WANTLIB += c pthread
MODULES= lang/go
-ALL_TARGET= ./proxy/
+ALL_TARGET= ./proxy/ ./client/ ./server/
# done as a sed instead of patch because the path includes the version number
post-extract:
@@ -25,7 +26,9 @@ post-extract:
${WRKSRC}/proxy/lib/pt_event_logger.go
post-install:
- cd ${PREFIX}/bin && mv proxy snowflake_proxy
+.for i in proxy client server
+ mv ${PREFIX}/bin/$i ${PREFIX}/bin/snowflake_$i
+.endfor
.include "modules.inc"
.include
Index: pkg/DESCR
===
RCS file: /cvs/ports/net/snowflake_proxy/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 28 Feb 2022 16:54:13 - 1.1.1.1
+++ pkg/DESCR 22 Dec 2022 18:01:19 -
@@ -12,5 +12,6 @@ e.g. by configuring it in Tor Browser.
Technical information is in
https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/wikis/Technical%20Overview
-This package provides a proxy, for those who would like to use their
-internet connection to provide access to others via this protocol.
+This package provides a standalone proxy, for those who would like to use
+their internet connection to provide access to others via this protocol,
+and pluggable transports for Tor to allow using snowflake proxies.
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/snowflake_proxy/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 4 Mar 2022 10:46:34 - 1.3
+++ pkg/PLIST 22 Dec 2022 18:01:19 -
@@ -1,6 +1,8 @@
@newgroup _snowflakeproxy:874
@newuser _snowflakeproxy:874:_snowflakeproxy::snowflake_proxy
user:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/snowflake_proxy
+@bin bin/snowflake_client
@bin bin/snowflake_proxy
+@bin bin/snowflake_server
share/examples/login.conf.d/snowflake_proxy
@sample ${SYSCONFDIR}/login.conf.d/snowflake_proxy
Re: [maintainer update] lang/erlang 25.2
On 2022/12/22 18:00:45 +0100, Landry Breuil wrote:
> Le Thu, Dec 22, 2022 at 04:20:48PM +0100, Volker Schlecht a écrit :
> > > > Builds, installs, works fine on amd64 and rebuilds all dependent ports.
> > >
> > > I'm not too sure about this bit:
> > >
> > > : --- pkg/PLIST-main 7 Nov 2022 22:24:03 - 1.2
> > > : +++ pkg/PLIST-main 21 Dec 2022 10:51:25 -
> > > : @@ -1,6 +1,6 @@
> > > : @option no-default-conflict
> > > : -@conflict erlang-wx->=25,<25.1.2
> > > : -@option is-branch
> > > : +@conflict erlang-wx->=25,<25.2
> > > : +@conflict erlang->=25,<25.2
> > > : bin/ct_run25
> > >
> > > The @option is-branch should remain and I'm not sure about bumping the
> > > version for the @conflict erlang-wx. why adding a new @conflict on
> > > erlang->=25,<25.2?
> >
> > I'm not too sure about it either, but it's what I had to do so that 'make
> > update' works with erlang 25.1.2 present ... if there's a cleaner way, I'm
> > happy to learn.
I should have tried before asking...
> > I built the erlang-wx PLIST manually, so it's possible that I didn't get the
> > alphabetic order exactly right. Is that a big deal?
i don't think so, but don't quote me on that :D
also...
> why, you so much enjoy self-inflicted pain ? :) make update-plist will
> do the sorting for you.. and its generally better to use generated
> plists rather than manually edited ones...
this ^
Apparently
-@conflict erlang-wx->=25,<25.1.2
+@conflict erlang-wx->=25,<25.2
+@conflict erlang->=25,<25.2
seems to be enough, but I'd like this to be re-checked by someone that
understands these options better than me. As-is it fails during `make
update' because of conflicting files between erlang 25.1.2 and 25.2.
On the other hand, you need to keep the @option is-branch and the
no-default-conflict.
attaching your diff with that tweak to the pkg/PLIST-main
Index: Makefile
===
RCS file: /home/cvs/ports/lang/erlang/25/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile7 Nov 2022 22:24:03 - 1.5
+++ Makefile21 Dec 2022 10:51:25 -
@@ -3,7 +3,7 @@ BROKEN-alpha= beam/erl_process.c:6692: i
COMMENT-main= ${COMMENT}
COMMENT-wx=WxWidgets bindings for Erlang
-V= 25.1.2
+V= 25.2
PORTROACH= limit:^OTP-25\.
DISTNAME= otp_src_$V
PKGNAME= erlang-$V
@@ -28,6 +28,10 @@ CONFIGURE_ARGS+=--disable-silent-rules
--enable-kernel-poll\
--disable-hipe
+MAKE_ENV+= DOC_TARGETS=chunks
+ALL_TARGET=all docs
+INSTALL_TARGET=install install-docs
+
MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/erts/autoconf
MULTI_PACKAGES = -main -wx
@@ -60,11 +64,11 @@ AUTOCONF_VERSION = 2.69
# Use the target 'gen-versions' to update this list
ERL_VERSIONS= \
ASN1_VSN5.0.21 \
-COMMON_TEST_VSN 1.23.1 \
-COMPILER_VSN8.2.1 \
+COMMON_TEST_VSN 1.23.2 \
+COMPILER_VSN8.2.2 \
CRYPTO_VSN 5.1.2 \
DEBUGGER_VSN5.3 \
-DIALYZER_VSN5.0.3 \
+DIALYZER_VSN5.0.4 \
DIAMETER_VSN2.2.7 \
EDOC_VSN1.2 \
EI_VSN 5.3 \
@@ -74,29 +78,29 @@ ERL_DOCGEN_VSN 1.4 \
ERL_INTERFACE_VSN 5.3 \
ET_VSN 1.6.5 \
EUNIT_VSN 2.8.1 \
-FTP_VSN 1.1.1 \
-INETS_VSN 8.1 \
+FTP_VSN 1.1.2 \
+INETS_VSN 8.2 \
JINTERFACE_VSN 1.13.1 \
-KERNEL_VSN 8.5.1 \
-MEGACO_VSN 4.4.1 \
-MNESIA_VSN 4.21.2 \
-OBSERVER_VSN2.13 \
+KERNEL_VSN 8.5.2 \
+MEGACO_VSN 4.4.2 \
+MNESIA_VSN 4.21.3 \
+OBSERVER_VSN2.14 \
ODBC_VSN2.14 \
-OS_MON_VSN 2.7.1 \
+OS_MON_VSN 2.8 \
PARSETOOLS_VSN 2.4.1 \
-PUBLIC_KEY_VSN 1.13.1 \
+PUBLIC_KEY_VSN 1.13.2 \
RELTOOL_VSN 0.9 \
RUNTIME_TOOLS_VSN 1.19 \
SASL_VSN4.2 \
-SNMP_VSN5.13.1 \
-SSH_VSN 4.15 \
-SSL_VSN 10.8.5 \
-STDLIB_VSN 4.1.1 \
+SNMP_VSN5.13.2 \
+SSH_VSN 4.15.1 \
+SSL_VSN 10.8.6 \
+STDLIB_VSN 4.2 \
SYNTAX_TOOLS_VSN3.0 \
TFTP_VSN1.0.3 \
TOOLS_VSN 3.5.3 \
-WX_VSN 2.2 \
+WX_VSN 2.2.1 \
XMERL_VSN 1.3.30 \
-ERTS_VSN13.1.2
+ERTS_VSN13.1.3
.include
Index: distinfo
===
RCS file: /home/cvs/ports/lang/erlang/25/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo7 Nov 2022 22:24:03 - 1.5
+++ distinfo21 Dec 2022 10:51:25 -
@@ -1,4 +1,4 @@
-SHA256 (otp_doc_man_25.1.2.tar.gz) =
IUmbAkGCWGDksfDGrlchNttIBdwaTt8f4fxfiB4RAsk=
-SHA256 (otp_src_25.1.2.tar.gz) = VELeppTnVV1HnYC8gfFCgCBjnCWPjkCyBScy0cyVzKU=
-SIZE (otp_doc_man_25.1.2.tar.gz) = 1713415
-SIZE (otp_src_25.1.2.tar.gz) = 103608131
+SHA256 (otp_doc_man_25.2.tar.gz) = TZCOqPIt0zxSk7db4GIeT2tmELrhMQKkORoY1LqDvc4=
+SHA256 (otp_src_25.2.tar.gz) = ruHvKU7gSMl21qEmpDA2cHY1T0hPVX6srwi/CGyxMU0=
+SIZE (otp_doc_man_25.2.tar.gz) = 1717206
+SIZE (otp_src_25.2.tar.gz) = 103746686
Index:
Re: [new] lang/fennel - Lisp dialect that runs on Lua
On Thu, Dec 22, 2022, at 6:46 AM, Omar Polo wrote: > ping > > (i've tested it with with love2d and with a locally-built lua 5.4) Trailing space in DESCR. Is PKG_ARCH required? Seems like defaulting to what MODLUA defaults to would be a sufficient approach? otherwise OK abieber@! > > On 2022/12/13 15:18:56 +0100, Omar Polo wrote: >> Hello ports, >> >> please find attached a port for fennel, a lisp dialect that compiles >> to lua. The package comes with three flavor for the various lua >> versions. >> >> % pkg_info fennel-lua51 >> Information for inst:fennel-lua51-1.2.1 >> >> Comment: >> Lisp dialect that runs on Lua 5.1 >> >> Description: >> Fennel is a programming language that brings together the speed, >> simplicity, and reach of Lua with the flexibility of a lisp syntax and >> macro system. >> >> - Full Lua compatibility: Easily call any Lua function or library from >>Fennel and vice-versa. >> >> - Zero overhead: Compiled code should be just as efficient as >>hand-written Lua. >> >> - Compile-time macros: Ship compiled code with no runtime dependency on >>Fennel. >> >> - Embeddable: Fennel is a one-file library as well as an executable. >>Embed it in other programs to support runtime extensibility and >>interactive development. >> >> Maintainer: Omar Polo >> >> WWW: https://fennel-lang.org/ > > > > Attachments: > * fennel.tar.gz
Re: x11/xfce4/xfce4-wavelan: apply pending fixes
12/22/22 21:36, Landry Breuil пишет: > Le Thu, Dec 22, 2022 at 04:35:08PM +, Klemens Nanni a écrit : >> Two things annoyed me in this otherwise useful plugin: >> - clicking it yields a cannot-execute-NetworkManager message (ENOPORT) >> - it allow using every interface, even though only atn0 is a wifi one >> >> The command now defaults to the empty string and does nothing. >> The list of interfaces is now reduced to those with an IEEE80211 ifmedia(4) >> type, i.e. only proper wifi interfaces -- others make no sense in a WLAN >> tray plugin. >> >> Both have pending PRs upstream now which I'd like to apply. >> >> Feedback? OK? > > Thanks, i've tested & merged the PR in the upstream repo, you should be > able to use XFCE_COMMIT=32b7a4a3e31677a2dbefa1a6a2566a8161947c92 instead > of dist-patches then make makesum - the port module should handle the rest. > > -REVISION=2 > +XFCE_COMMIT=32b7a4a3e31677a2dbefa1a6a2566a8161947c92 > +REVISION=3 Great, will do. > > we should also be able to remove patch-panel-plugin_wi_bsd_c too since it > was merged. Pretty sure it wasn't, otherwise my suggestion to do so wouldn't work: https://gitlab.xfce.org/panel-plugins/xfce4-wavelan-plugin/-/merge_requests/13
Re: x11/xfce4/xfce4-wavelan: apply pending fixes
Le Thu, Dec 22, 2022 at 04:35:08PM +, Klemens Nanni a écrit : > Two things annoyed me in this otherwise useful plugin: > - clicking it yields a cannot-execute-NetworkManager message (ENOPORT) > - it allow using every interface, even though only atn0 is a wifi one > > The command now defaults to the empty string and does nothing. > The list of interfaces is now reduced to those with an IEEE80211 ifmedia(4) > type, i.e. only proper wifi interfaces -- others make no sense in a WLAN > tray plugin. > > Both have pending PRs upstream now which I'd like to apply. > > Feedback? OK? Thanks, i've tested & merged the PR in the upstream repo, you should be able to use XFCE_COMMIT=32b7a4a3e31677a2dbefa1a6a2566a8161947c92 instead of dist-patches then make makesum - the port module should handle the rest. -REVISION= 2 +XFCE_COMMIT=32b7a4a3e31677a2dbefa1a6a2566a8161947c92 +REVISION= 3 we should also be able to remove patch-panel-plugin_wi_bsd_c too since it was merged.
meta/xfce: remove calendar (orage) from DESCR-main
The dependency was removed in the 4.14 update and nothing depends on
x11/xfce4/orage these days.
I wouldn't miss it in neither the main meta/xfce nor the -extras meta
package: the tray plugin provides a drop-down calendar version on click
which looks just like the standalone GUI provided by orage.
Then again, if it isn't installed by any of the meta packages, I wonder
how discoverable it is... orage already skipped a few releases, so
maybe it just isn't that important/used these days?
Index: Makefile
===
RCS file: /cvs/ports/meta/xfce/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile17 Dec 2022 10:51:05 - 1.25
+++ Makefile22 Dec 2022 17:08:14 -
@@ -7,7 +7,7 @@ PKGNAME=xfce-${V}
PKGNAME-main = xfce-${V}
PKGNAME-extras = xfce-extras-${V}
REVISION-extras = 0
-REVISION-main =0
+REVISION-main =1
MAINTAINER = Landry Breuil
Index: pkg/DESCR-main
===
RCS file: /cvs/ports/meta/xfce/pkg/DESCR-main,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR-main
--- pkg/DESCR-main 10 Aug 2013 23:17:42 - 1.2
+++ pkg/DESCR-main 22 Dec 2022 17:08:13 -
@@ -1,7 +1,6 @@
The Xfce Desktop Environment, base installation. Contains core Xfce plus:
* theme packages
* a terminal (xfce4-terminal)
- * a calendar (orage)
* an image viewer (ristretto)
* a text editor (mousepad)
* a sound mixer (xfce4-mixer)
Re: [maintainer update] lang/erlang 25.2
Le Thu, Dec 22, 2022 at 04:20:48PM +0100, Volker Schlecht a écrit : > > > Builds, installs, works fine on amd64 and rebuilds all dependent ports. > > > > I'm not too sure about this bit: > > > > : --- pkg/PLIST-main 7 Nov 2022 22:24:03 - 1.2 > > : +++ pkg/PLIST-main 21 Dec 2022 10:51:25 - > > : @@ -1,6 +1,6 @@ > > : @option no-default-conflict > > : -@conflict erlang-wx->=25,<25.1.2 > > : -@option is-branch > > : +@conflict erlang-wx->=25,<25.2 > > : +@conflict erlang->=25,<25.2 > > : bin/ct_run25 > > > > The @option is-branch should remain and I'm not sure about bumping the > > version for the @conflict erlang-wx. why adding a new @conflict on > > erlang->=25,<25.2? > > I'm not too sure about it either, but it's what I had to do so that 'make > update' works with erlang 25.1.2 present ... if there's a cleaner way, I'm > happy to learn. > > I built the erlang-wx PLIST manually, so it's possible that I didn't get the > alphabetic order exactly right. Is that a big deal? why, you so much enjoy self-inflicted pain ? :) make update-plist will do the sorting for you.. and its generally better to use generated plists rather than manually edited ones...
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2022/12/22 09:39:51 Modified files: x11/xfce4/xfce4-settings: Makefile distinfo Log message: x11/xfce4/xfce4-settings: update to 4.18.1. see https://mail.xfce.org/pipermail/xfce-announce/2022-December/001214.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2022/12/22 09:39:13 Modified files: x11/xfce4/thunar: Makefile distinfo Log message: x11/xfce4/thunar: update to 4.18.1 see https://mail.xfce.org/pipermail/xfce-announce/2022-December/001213.html
x11/xfce4/xfce4-wavelan: apply pending fixes
Two things annoyed me in this otherwise useful plugin:
- clicking it yields a cannot-execute-NetworkManager message (ENOPORT)
- it allow using every interface, even though only atn0 is a wifi one
The command now defaults to the empty string and does nothing.
The list of interfaces is now reduced to those with an IEEE80211 ifmedia(4)
type, i.e. only proper wifi interfaces -- others make no sense in a WLAN
tray plugin.
Both have pending PRs upstream now which I'd like to apply.
Feedback? OK?
Index: Makefile
===
RCS file: /cvs/ports/x11/xfce4/xfce4-wavelan/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- Makefile15 Dec 2022 14:51:03 - 1.51
+++ Makefile22 Dec 2022 16:15:57 -
@@ -2,12 +2,23 @@ COMMENT= Xfce4 wireless interface monito
XFCE_VERSION= 0.6.3
XFCE_PLUGIN= wavelan
-REVISION= 2
+REVISION= 3
# BSD
PERMIT_PACKAGE=Yes
MODULES= x11/xfce4
+
+MASTER_SITES0= https://gitlab.xfce.org/panel-plugins/xfce4-wavelan-plugin/-/
+# pending 'Default "Wifi Manager Command" to NetWorkManager only on Linux'
+#
https://gitlab.xfce.org/panel-plugins/xfce4-wavelan-plugin/-/merge_requests/11
+PATCHFILES+= wavelan-no-networkmanager-{commit/}cb806842.patch:0
+# pending 'Limit list of interfaces to IEEE 802.11 on OpenBSD and NetBSD'
+#
https://gitlab.xfce.org/panel-plugins/xfce4-wavelan-plugin/-/merge_requests/12
+PATCHFILES+= wavelan-ethernet-interfaces-only-{commit/}921b588c.patch:0
+PATCHFILES+= wavelan-ieee80211-interfaces-only-{commit/}c32e0b15.patch:0
+
+PATCH_DIST_STRIP= -p1
WANTLIB += ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0
Index: distinfo
===
RCS file: /cvs/ports/x11/xfce4/xfce4-wavelan/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo15 Jun 2022 06:25:25 - 1.13
+++ distinfo22 Dec 2022 16:16:03 -
@@ -1,2 +1,8 @@
+SHA256 (xfce4/wavelan-ethernet-interfaces-only-921b588c.patch) =
GC2UXJE8Mq8tiJmvwlbAFKv2HqtwV4sNuaSbKyJjH6c=
+SHA256 (xfce4/wavelan-ieee80211-interfaces-only-c32e0b15.patch) =
8Kf9drumKC45kH5xZOAJxBsBrJ/QK4Lk1GTyPw+1h20=
+SHA256 (xfce4/wavelan-no-networkmanager-cb806842.patch) =
MUf8cPHQd9FT8Q6O/fpCNuvCjHAnstI3q+OhqAefBMI=
SHA256 (xfce4/xfce4-wavelan-plugin-0.6.3.tar.bz2) =
YcDC9Wy3CHLUA7dw3XY0nfn/JMDb6QXuG0+RPDTY9ys=
+SIZE (xfce4/wavelan-ethernet-interfaces-only-921b588c.patch) = 1614
+SIZE (xfce4/wavelan-ieee80211-interfaces-only-c32e0b15.patch) = 2676
+SIZE (xfce4/wavelan-no-networkmanager-cb806842.patch) = 964
SIZE (xfce4/xfce4-wavelan-plugin-0.6.3.tar.bz2) = 364789
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/12/22 09:22:39 Modified files: archivers/py-zopfli: Makefile distinfo Log message: Update py-zopfli to 0.2.2 Added pyproject.toml to source distribution Published precompiled wheels for Python 3.11 ok sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2022/12/22 08:32:10 Modified files: net/bitcoin: Makefile distinfo net/bitcoin/patches: patch-configure_ac patch-src_wallet_bdb_cpp net/bitcoin/pkg: PLIST Log message: Update bitcoin to 24.0.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2022/12/22 08:30:50 Modified files: x11/kde-applications/kaccounts-integration: Makefile Log message: Add missing build dependency on kcmutils
Re: [maintainer update] lang/erlang 25.2
Builds, installs, works fine on amd64 and rebuilds all dependent ports.
I'm not too sure about this bit:
: --- pkg/PLIST-main 7 Nov 2022 22:24:03 - 1.2
: +++ pkg/PLIST-main 21 Dec 2022 10:51:25 -
: @@ -1,6 +1,6 @@
: @option no-default-conflict
: -@conflict erlang-wx->=25,<25.1.2
: -@option is-branch
: +@conflict erlang-wx->=25,<25.2
: +@conflict erlang->=25,<25.2
: bin/ct_run25
The @option is-branch should remain and I'm not sure about bumping the
version for the @conflict erlang-wx. why adding a new @conflict on
erlang->=25,<25.2?
I'm not too sure about it either, but it's what I had to do so that
'make update' works with erlang 25.1.2 present ... if there's a cleaner
way, I'm happy to learn.
I built the erlang-wx PLIST manually, so it's possible that I didn't get
the alphabetic order exactly right. Is that a big deal?
Otherwise it's OK for me (make test is happy, rebar3,erlang and
rabbitmq are building fine and their test suite are happy too.)
lang/elixir with your update diff builds.
for some reasons, make update-plist moves one line in PLIST-wx down a
few entries:
--- pkg/PLIST-wx.orig Wed Dec 21 11:51:25 2022
+++ pkg/PLIST-wxThu Dec 22 15:04:07 2022
@@ -416,7 +416,6 @@
lib/${ERLANG_V}/lib/${ERL_WX}/doc/chunks/wxe_master.chunk
lib/${ERLANG_V}/lib/${ERL_WX}/doc/chunks/wxe_server.chunk
lib/${ERLANG_V}/lib/${ERL_WX}/doc/chunks/wxe_util.chunk
-lib/${ERLANG_V}/lib/${ERL_WX}/info
lib/${ERLANG_V}/lib/${ERL_WX}/ebin/
lib/${ERLANG_V}/lib/${ERL_WX}/ebin/gl.beam
lib/${ERLANG_V}/lib/${ERL_WX}/ebin/glu.beam
@@ -743,6 +742,7 @@
lib/${ERLANG_V}/lib/${ERL_WX}/include/gl.hrl
lib/${ERLANG_V}/lib/${ERL_WX}/include/glu.hrl
lib/${ERLANG_V}/lib/${ERL_WX}/include/wx.hrl
+lib/${ERLANG_V}/lib/${ERL_WX}/info
lib/${ERLANG_V}/lib/${ERL_WX}/priv/
@so lib/${ERLANG_V}/lib/${ERL_WX}/priv/erl_gl.so
lib/${ERLANG_V}/lib/${ERL_WX}/priv/erlang-logo128.png
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/12/22 07:57:22 Modified files: sysutils/firmware/iwx: Makefile distinfo sysutils/firmware/iwx/pkg: PLIST Log message: Add new -77 iwx(4) firmware images and remove unused -63 images. Driver-side changes will be required for making use of the new firmware images. The existing images we currently use do not change, and no change in behaviour is expected for now. The .pnvm files do change. They are still being parsed the same way in Linux, which implies that these new files should just work. I have verified that my AX210 device is still happy with new pnvm. ok sthen@
Re: Python access to Berkeley DB
You could try rebuilding databases/db/v4 with MODTCL_VERSION=8.6 added to
the Makefile and see if that helps at all..
--
Sent from a phone, apologies for poor formatting.
On 21 December 2022 20:52:06 Roger Marsh wrote:
On Tue, 20 Dec 2022 12:18:59 - (UTC)
Stuart Henderson wrote:
["Followup-To:" header set to gmane.os.openbsd.misc.]
On 2022-12-19, Stuart Cassoff <3...@bell.net> wrote:
> -- Original Message --
> From: stu.li...@spacehopper.org
> To: ports@openbsd.org
> Cc: m...@openbsd.org
> Sent: Monday, December 19, 2022 7:53 AM
> Subject: Re: Python access to Berkeley DB
>
> [ moving to ports@, hopefully reply-to will be set correctly
> if
> I got the gmane/nntp bits right :) ]
>
> You might possibly be able to kludge around it with some LD_PRELOAD,
> though tkinter is now built against Tcl 8.6 and the db-tcl package is
> built against Tcl 8.5 and I don't know if extensions are compatible
> cross-version.
>
>
> Extensions built against 8.5 should load into 8.6 no problem.
Thanks. I wasn't sure and the tclsh import didn't work for either 8.5 or 8.6
for me.
Thanks for LD_PRELOAD, about which I knew nothing.
The kludge got rid of all but one undefined symbols:
Script started on Tue Dec 20 09:20:33 2022
d630amd64$ ls /usr/local/lib/db4
libdb.a libdb_cxx.a libdb_tcl.a pkgIndex.tcl
libdb.lalibdb_cxx.lalibdb_tcl.la
libdb.so.5.0libdb_cxx.so.6.0libdb_tcl.so.6.0
d630amd64$ export LD_PRELOAD=/usr/local/lib/db4/libdb_tcl.so.6.0
d630amd64$ python3.9
Python 3.9.15 (main, Oct 21 2022, 14:01:40)
[Clang 13.0.0 ] on openbsd7
Type "help", "copyright", "credits" or "license" for more information.
import tkinter
tcl = tkinter.Tk(useTk=False)
tcl.tk.call("lappend", "auto_path", "/usr/local/lib/db4")
(, '/usr/local/lib/tcl',
'/usr/local/lib/db4')
tcl.tk.call("package", "require", "Db_tcl")
python3.9:/usr/local/lib/db4/libdb_tcl.so.6.0: undefined symbol
'Tcl_PkgProvideEx'
ld.so: python3.9: lazy binding failed!
Killed
d630amd64$ exit
Script done on Tue Dec 20 09:24:01 2022
so I tried building from ports, building Python against Tcl/Tk 8.5 because
I could see what to change in Makefile.inc with some confidence I was
guessing right (8.6 > 8.5 about line 100). Same result, first with package
command:
Script started on Tue Dec 20 20:25:17 2022
rack$ export LD_PRELOAD=/usr/local/lib/db4/libdb_tcl.so.6.0
rack$ python3.9
Python 3.9.14 (main, Dec 20 2022, 16:12:25)
[Clang 13.0.0 ] on openbsd7
Type "help", "copyright", "credits" or "license" for more information.
import tkinter
tkinter.TclVersion
8.5
tcl = tkinter.Tk(useTk=False)
tcl.tk.call("lappend", "auto_path", "/usr/local/lib/db4")
(, '/usr/local/lib/tcl',
'/usr/local/lib/db4')
tcl.tk.call("package", "require", "Db_tcl")
python3.9:/usr/local/lib/db4/libdb_tcl.so.6.0: undefined symbol
'Tcl_PkgProvideEx'
ld.so: python3.9: lazy binding failed!
Killed
rack$ tclsh8.5
% lappend auto_path /usr/local/lib/db4
/usr/local/lib/tcl/tcl8.5 /usr/local/lib/tcl /usr/local/lib/db4
% package require Db_tcl
4.6
% exit
rack$ exit
Script done on Tue Dec 20 20:33:19 2022
And with the load command:
Script started on Wed Dec 21 20:25:22 2022
rack$ tclsh8.5
% load /usr/local/lib/db4/libdb_tcl.so.6.0
% berkdb version -string
Berkeley DB 4.6.21: (September 27, 2007)
% exit
rack$ export LD_PRELOAD=/usr/local/lib/db4/libdb_tcl.so.6.0
rack$ python3.9
Python 3.9.14 (main, Dec 20 2022, 16:12:25)
[Clang 13.0.0 ] on openbsd7
Type "help", "copyright", "credits" or "license" for more information.
import tkinter
tkinter.TclVersion
8.5
tcl = tkinter.Tk(useTk=False)
tcl.tk.call("load", "/usr/local/lib/db4/libdb_tcl.so.6.0")
python3.9:/usr/local/lib/db4/libdb_tcl.so.6.0: undefined symbol
'Tcl_PkgProvideEx'
ld.so: python3.9: lazy binding failed!
Killed
rack$ exit
Script done on Wed Dec 21 20:30:35 2022
Give up on kludge I think.
Roger
Re: [maintainer update] lang/erlang 25.2
On 2022/12/20 19:03:08 +0100, Volker Schlecht
wrote:
> * Updates lang/erlang to 25.2
> * Builds and installs eep48 doc chunks
>These can be helpful in combination with erlang/elixir language servers
>
> Builds, installs, works fine on amd64 and rebuilds all dependent ports.
I'm not too sure about this bit:
: --- pkg/PLIST-main 7 Nov 2022 22:24:03 - 1.2
: +++ pkg/PLIST-main 21 Dec 2022 10:51:25 -
: @@ -1,6 +1,6 @@
: @option no-default-conflict
: -@conflict erlang-wx->=25,<25.1.2
: -@option is-branch
: +@conflict erlang-wx->=25,<25.2
: +@conflict erlang->=25,<25.2
: bin/ct_run25
The @option is-branch should remain and I'm not sure about bumping the
version for the @conflict erlang-wx. why adding a new @conflict on
erlang->=25,<25.2?
Otherwise it's OK for me (make test is happy, rebar3,erlang and
rabbitmq are building fine and their test suite are happy too.)
lang/elixir with your update diff builds.
for some reasons, make update-plist moves one line in PLIST-wx down a
few entries:
--- pkg/PLIST-wx.orig Wed Dec 21 11:51:25 2022
+++ pkg/PLIST-wxThu Dec 22 15:04:07 2022
@@ -416,7 +416,6 @@
lib/${ERLANG_V}/lib/${ERL_WX}/doc/chunks/wxe_master.chunk
lib/${ERLANG_V}/lib/${ERL_WX}/doc/chunks/wxe_server.chunk
lib/${ERLANG_V}/lib/${ERL_WX}/doc/chunks/wxe_util.chunk
-lib/${ERLANG_V}/lib/${ERL_WX}/info
lib/${ERLANG_V}/lib/${ERL_WX}/ebin/
lib/${ERLANG_V}/lib/${ERL_WX}/ebin/gl.beam
lib/${ERLANG_V}/lib/${ERL_WX}/ebin/glu.beam
@@ -743,6 +742,7 @@
lib/${ERLANG_V}/lib/${ERL_WX}/include/gl.hrl
lib/${ERLANG_V}/lib/${ERL_WX}/include/glu.hrl
lib/${ERLANG_V}/lib/${ERL_WX}/include/wx.hrl
+lib/${ERLANG_V}/lib/${ERL_WX}/info
lib/${ERLANG_V}/lib/${ERL_WX}/priv/
@so lib/${ERLANG_V}/lib/${ERL_WX}/priv/erl_gl.so
lib/${ERLANG_V}/lib/${ERL_WX}/priv/erlang-logo128.png
Re: [new] lang/fennel - Lisp dialect that runs on Lua
ping (i've tested it with with love2d and with a locally-built lua 5.4) On 2022/12/13 15:18:56 +0100, Omar Polo wrote: > Hello ports, > > please find attached a port for fennel, a lisp dialect that compiles > to lua. The package comes with three flavor for the various lua > versions. > > % pkg_info fennel-lua51 > Information for inst:fennel-lua51-1.2.1 > > Comment: > Lisp dialect that runs on Lua 5.1 > > Description: > Fennel is a programming language that brings together the speed, > simplicity, and reach of Lua with the flexibility of a lisp syntax and > macro system. > > - Full Lua compatibility: Easily call any Lua function or library from >Fennel and vice-versa. > > - Zero overhead: Compiled code should be just as efficient as >hand-written Lua. > > - Compile-time macros: Ship compiled code with no runtime dependency on >Fennel. > > - Embeddable: Fennel is a one-file library as well as an executable. >Embed it in other programs to support runtime extensibility and >interactive development. > > Maintainer: Omar Polo > > WWW: https://fennel-lang.org/ fennel.tar.gz Description: GNU Zip compressed data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/12/22 03:38:45 Modified files: security/qdigidoc4: Makefile distinfo Added files: security/qdigidoc4/patches: patch-CMakeLists_txt Log message: Update to qdigidoc 4.12.14 - Code, Text and translation improvements and updates Remove newly added -Wl,-object_path_lto,lto.o to unbreak the build for now, but this needs a better fix.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/12/22 03:35:01 Modified files: security/libdigidocpp: Makefile distinfo Log message: Update to libdigidocpp 3.14.11 - Update libraries (#472, #495, #490, #500) - TSL parsing improvementsa (#492, #495, #499) - Fix memory leaks (#488) - Prefer PSS padding with RSA key (#437) - Code fixes and improvements (#478, #487, #513) Bundled minizip was NOT updated, so pull a PR doing that.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/12/22 03:07:39 Modified files: devel/glib2: Tag: OPENBSD_7_2 Makefile distinfo Log message: Merge SECURITY fix from upstream: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3164
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/12/22 03:03:28 Modified files: devel/glib2: Makefile Added files: devel/glib2/patches: patch-glib_gthreadprivate_h Log message: Merge from upstream: gthread-posix: need to #include
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2022/12/22 02:36:56 Modified files: x11/xfce4/xfce4-screenshooter: Makefile distinfo Log message: x11/xfce4/xfce4-screenshooter: update to 1.10.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/12/22 02:06:21 Modified files: sysutils/exoscale-cli: Makefile distinfo Log message: Update to exoscale-cli-1.63.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/12/22 01:58:33 Modified files: devel/glib2: Makefile distinfo devel/glib2/patches: patch-meson_build devel/glib2/pkg: PLIST Log message: SECURITY update to glib2-2.74.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2022/12/22 01:58:18 Modified files: databases/pspg : Makefile distinfo Log message: update databases/pspg to 5.7.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/22 01:39:19 Modified files: databases/libhiredis: Makefile distinfo databases/libhiredis/patches: patch-Makefile databases/libhiredis/pkg: PLIST Log message: update to libhiredis-1.1.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/22 01:39:16 Modified files: net/p5-Zonemaster/ldns: Makefile distinfo Log message: update to p5-Zonemaster-LDNS-3.0.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/22 01:39:13 Modified files: net/isc-bind : Tag: OPENBSD_7_2 Makefile distinfo net/isc-bind/patches: Tag: OPENBSD_7_2 patch-bin_dig_dig_c patch-bin_dig_host_c patch-bin_dig_nslookup_c patch-lib_isc_net_c patch-lib_isc_netmgr_netmgr_c net/isc-bind/pkg: Tag: OPENBSD_7_2 PLIST Log message: update to isc-bind-9.18.10
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/22 01:36:41 Modified files: net/isc-bind : Makefile distinfo net/isc-bind/patches: patch-bin_dig_dig_c patch-bin_dig_host_c patch-bin_dig_nslookup_c patch-lib_isc_netmgr_netmgr_c Log message: update to isc-bind-9.18.10
Re: WIP/Help wanted: use MULTI_PACKAGES for net/snowflake_proxy
On 2022/12/22 09:03, Omar Polo wrote:
> On 2022/12/22 00:27:59 +, Yifei Zhan wrote:
> > MULTI_PACKAGES= -main -server -client
> >
> > ...cut...
> >
> > .if ${BUILD_PACKAGES:M-main}
> > ALL_TARGET= ./proxy/
> > .endif
> >
> > .if ${BUILD_PACKAGES:M-client}
> > ALL_TARGET= ./client/
> > .endif
> >
> > .if ${BUILD_PACKAGES:M-server}
> > ALL_TARGET= ./server/
> > .endif
>
> I've not looked at the tarball but glancing at this it looks wrong.
>
> MULTI_PACKAGES is a way to do a *single* build and generate multiple
> packages. So, what you are doing here is just setting ALL_TARGET to
> ./proxy/, you're just building the -main subpackage. (this due to how
> make handles multiple definition of the same variable)
Exactly.
> `ALL_TARGET+= ./foo/' *may* work (again, i haven't downloaded the
> tarball), but it gives the idea.
>
> Also, I'm not sure how much it buys to have all these
>
> .if ${BUILD_PACKAGES:M-XXX}
>
> if all the three packages are always built. It may be useful to do
> that when you need to disable the building of some parts for reasons
> (for e.g. look at x11/wxWidgets where one subpackage can't be built on
> all architectures -- but then you'll likely need to use PSEUDO_FLAVORS
> as well.)
Also where there's a port providing a main package plus many plugins,
some with heavy dependencies (and especially in cases where you might
actually need to build it from ports rather than packages).
> (at the cost of being annoying) remember:
>
> - flavors => multiple builds, one per combination
> - multipackage- => one build split in sub packages
and having separate ports using the same distfile is totally ok too -
either fully separate, or a ports/category/basename/{server,client} type
of arrangement with shared parts.
Don't overthink things though, there's really no need to split this
up, a single package is fine (and maybe preferable in this case, as it
stops a passive observer from figuring out whether you downloaded
the proxy or server or client parts).
Index: Makefile
===
RCS file: /cvs/ports/net/snowflake_proxy/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile6 Oct 2022 17:05:25 - 1.7
+++ Makefile22 Dec 2022 08:15:38 -
@@ -1,7 +1,8 @@
-COMMENT= proxy providing Tor access to others with censored net
+COMMENT= proxy daemon and pluggable transports for Tor access with
censored net
MODGO_MODNAME= git.torproject.org/pluggable-transports/snowflake.git/v2
V= 2.3.1
+REVISION= 0
MODGO_VERSION= v$V
DISTNAME= snowflake.git-${MODGO_VERSION}
@@ -17,7 +18,7 @@ PERMIT_PACKAGE= Yes
WANTLIB += c pthread
MODULES= lang/go
-ALL_TARGET= ./proxy/
+ALL_TARGET= ./proxy/ ./client/ ./server/
# done as a sed instead of patch because the path includes the version number
post-extract:
@@ -25,7 +26,9 @@ post-extract:
${WRKSRC}/proxy/lib/pt_event_logger.go
post-install:
- cd ${PREFIX}/bin && mv proxy snowflake_proxy
+.for i in proxy client server
+ mv ${PREFIX}/bin/$i ${PREFIX}/bin/snowflake_$i
+.endfor
.include "modules.inc"
.include
Index: pkg/DESCR
===
RCS file: /cvs/ports/net/snowflake_proxy/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 28 Feb 2022 16:54:13 - 1.1.1.1
+++ pkg/DESCR 22 Dec 2022 08:15:38 -
@@ -12,5 +12,6 @@ e.g. by configuring it in Tor Browser.
Technical information is in
https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/wikis/Technical%20Overview
-This package provides a proxy, for those who would like to use their
-internet connection to provide access to others via this protocol.
+This package provides a standalone proxy, for those who would like to use
+their internet connection to provide access to others via this protocol,
+and pluggable transports for Tor to allow using snowflake proxies.
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/snowflake_proxy/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 4 Mar 2022 10:46:34 - 1.3
+++ pkg/PLIST 22 Dec 2022 08:15:38 -
@@ -1,6 +1,8 @@
@newgroup _snowflakeproxy:874
@newuser _snowflakeproxy:874:_snowflakeproxy::snowflake_proxy
user:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/snowflake_proxy
+@bin bin/snowflake_client
@bin bin/snowflake_proxy
+@bin bin/snowflake_server
share/examples/login.conf.d/snowflake_proxy
@sample ${SYSCONFDIR}/login.conf.d/snowflake_proxy
Re: WIP/Help wanted: use MULTI_PACKAGES for net/snowflake_proxy
On 2022/12/22 00:27:59 +, Yifei Zhan wrote:
> Here is an attempt to convert net/snowflake_proxy into subpackages.
>
> snowflake_proxy has 3 components, correspond to 3 subpackages:
>
> - standalone server, tor not required (The only currently packaged components)
> - serverside managed pluggable transport for Tor
> - clientside managed pluggable transport for Tor (Required for Tor Browser's
> built in snowflake bridges)
>
> The attached port does not work yet, all packages seem to be resolved to
> -main
> when building, despite setting SUBPACKAGE="-client" or SUBPACKAGE="-server",
> I'm
> out of ideas on what I did wrong, can someone more experienced with
> subpackage
> give me a pointer?
>
> My current Makefile for subpackages looks like this:
>
> COMMENT-main= standalone proxy providing Tor access to others with censored
> net
> COMMENT-server= serverside managed pluggable transport for Tor
> COMMENT-client= clientside managed pluggable transport for Tor
>
> ...cut...
>
> PKGNAME-main= snowflake_proxy-standalone-$V
> PKGNAME-server= snowflake_proxy-server-$V
> PKGNAME-client= snowflake_proxy-client-$V
>
> ...cut...
>
> MULTI_PACKAGES= -main -server -client
>
> ...cut...
>
> .if ${BUILD_PACKAGES:M-main}
> ALL_TARGET= ./proxy/
> .endif
>
> .if ${BUILD_PACKAGES:M-client}
> ALL_TARGET= ./client/
> .endif
>
> .if ${BUILD_PACKAGES:M-server}
> ALL_TARGET= ./server/
> .endif
I've not looked at the tarball but glancing at this it looks wrong.
MULTI_PACKAGES is a way to do a *single* build and generate multiple
packages. So, what you are doing here is just setting ALL_TARGET to
./proxy/, you're just building the -main subpackage. (this due to how
make handles multiple definition of the same variable)
`ALL_TARGET+= ./foo/' *may* work (again, i haven't downloaded the
tarball), but it gives the idea.
Also, I'm not sure how much it buys to have all these
.if ${BUILD_PACKAGES:M-XXX}
if all the three packages are always built. It may be useful to do
that when you need to disable the building of some parts for reasons
(for e.g. look at x11/wxWidgets where one subpackage can't be built on
all architectures -- but then you'll likely need to use PSEUDO_FLAVORS
as well.)
(at the cost of being annoying) remember:
- flavors => multiple builds, one per combination
- multipackage- => one build split in sub packages
> ...cut...
>
> post-install:
>
> .if ${BUILD_PACKAGES:M-main}
> cd ${PREFIX}/bin && mv proxy snowflake_proxy
> .endif
> .if ${BUILD_PACKAGES:M-server}
> cd ${PREFIX}/bin && mv server snowflake_server
> .endif
> .if ${BUILD_PACKAGES:M-client}
> cd ${PREFIX}/bin && mv client snowflake_client
> .endif
>
> ...cut...
