Re: [NEW] devel/difftastic
Bump. On 11/1/22 21:28, Laurent Cheylus wrote: On Tue, 1 Nov 2022 13:57:37 +0100, Volker Schlecht wrote: Here's an updated difftastic port: * Update to 0.37.0 This should among other things improve memory usage significantly * Add a MESSAGE concerning the possible need to raise datasize-max to reasonably use difftastic. I didn't benchmark it myself, but I don't think that the optimizations in 0.37.0 make it universally usable with a 4GB datasize * Include generation of html docs as proposed by Laurent Cheylus Anyone to review and import? OK, build on current/amd64 and works fine. In my opinion, you should change category for textproc instead of devel, like textproc/delta. Laurent
Re: [UPDATE] lang/erlang 25.1.2 was: lang/erlang: observer_backend missing in -main?
Bump.
On 11/3/22 18:01, Volker Schlecht wrote:
The attached patch fixes the problem with observer_backend in
lang/erlang/21 and lang/erlang/25. It also updates lang/erlang to the
most recent release 25.1.2
rebar3, elixir and rabbitmq build without problems on amd64.
On 10/26/22 20:46, Volker Schlecht wrote:
Yes, the observer backend slipped through with my patch to update
erlang/21 to 21.3.8.24, I dragged it from there into 25.x.
Thanks for pointing it out!
OK for Stuart's patch from my side.
NB: I also found that alongside observer-backend, the following files
that used to be in -main moved to -wx:
lib/erlang21/lib/${ERL_OBSERVER}/ebin/cdv_persistent_cb.beam
lib/erlang21/lib/${ERL_OBSERVER}/src/cdv_persistent_cb.erl
Those include wx, though so that one wasn't a mistake:
https://github.com/erlang/otp/blob/2735ffc3d883afa727569fa5becba3d32e262ace/lib/observer/src/cdv_persistent_cb.erl#L24
On 10/25/22 21:20, Stuart Henderson wrote:
+CC maintainer
On 2022/10/22 12:51, la ninpre wrote:
I was updating my Pleroma instance two days ago after upgrading to
OpenBSD
7.2.
Pleroma is written in Elixir, so I updated both Elixir/Erlang to
corresponding latest versions.
Then I rebuilt all the dependencies (before they were built with/for
Erlang-21).
When I tried to start Pleroma, it failed. The error was:
12:42:37.892 [notice] Application runtime_tools exited:
:runtime_tools.start(:normal, []) returned an error: shutdown:
failed to start child: :ttb_autostart
** (EXIT) an exception was raised:
** (UndefinedFunctionError) function
:observer_backend.ttb_resume_trace/0 is undefined (module
:observer_backend is not available)
(runtime_tools 1.19) :observer_backend.ttb_resume_trace()
(runtime_tools 1.19) ttb_autostart.erl:47:
:ttb_autostart.init/1
(stdlib 4.0.1) gen_server.erl:848: :gen_server.init_it/2
(stdlib 4.0.1) gen_server.erl:811: :gen_server.init_it/6
(stdlib 4.0.1) proc_lib.erl:240:
:proc_lib.init_p_do_apply/3
Then I found that, indeed, observer_backend.beam is missing from
/usr/local/lib/erlang25/lib/runtime_tools-1.19.
I then checked the ports tree to see what is in PLIST for lang/erlang.
The file is missing there too, but it is available in -wx subpackage.
So my question is, shouldn't observer_backend.beam (and hrl and erl in
respective directories too)
be included in -main subpackage too? I'm no expert in Erlang, but I
know
that Observer is a graphical
tool (so it's OK for it to be in -wx subpackage). But the
observer_backend
module doesn't contain
any graphics and can be used in non-graphical environment (such as in
Pleroma above).
---
best regards,
la-ninpre.
I don't know Erlang at all, but if that is the case, then this diff
should do the trick.
Index: 21/Makefile
===
RCS file: /cvs/ports/lang/erlang/21/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- 21/Makefile 1 Sep 2022 20:03:37 - 1.13
+++ 21/Makefile 25 Oct 2022 19:18:05 -
@@ -6,13 +6,14 @@ COMMENT-wx= WxWidgets bindings for Erlan
PORTROACH= limit:^OTP-21\.
V= 21.3.8.24
-REVISION-main= 1
-REVISION-wx= 0
DISTNAME= otp_src_$V
PKGNAME= erlang-$V
PKGNAME-main= erlang-$V
PKGNAME-wx= erlang-wx-$V
EPOCH= 0
+
+REVISION-main= 2
+REVISION-wx= 1
VERSION_SPEC= >=21v0,<22v0
PKGSPEC-main= erlang-${VERSION_SPEC}
Index: 21/pkg/PLIST-main
===
RCS file: /cvs/ports/lang/erlang/21/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-main
--- 21/pkg/PLIST-main 11 Jul 2022 22:29:08 - 1.5
+++ 21/pkg/PLIST-main 25 Oct 2022 19:18:05 -
@@ -1,5 +1,6 @@
@option no-default-conflict
@pkgpath lang/erlang/21
+@conflict erlang-wx->=21v0,<=21.3.8.24p0v0
bin/ct_run21
bin/dialyzer21
bin/epmd21
@@ -2183,6 +2184,7 @@ lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/dyntrace.beam
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/erts_alloc_config.beam
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/msacc.beam
+lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/observer_backend.beam
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/runtime_tools.app
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/runtime_tools.appup
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/runtime_tools.beam
@@ -2214,6 +2216,7 @@ lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/examples/user-probe.d
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/examples/user-probe.systemtap
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/include/
+lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/include/observer_backend.hrl
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/priv/
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/priv/lib/
@so lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/priv/lib/dyntrace.so
@@ -2225,6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2022/11/07 23:56:20 Modified files: security/keepassxc: Makefile Log message: Re-add a deleted WANTLIB entry in a previous commit Spotted by "Johann" @misc
Re: [new] jitsi/meta,prosody-plugins,srtp - addons and README for jitsi
and now with the actual attachments :o jitsi-prosody-plugins-2.0.7882.tgz Description: GNU Zip compressed data jitsi-srtp-1.1pl20220605.tgz Description: GNU Zip compressed data
Re: [new] jitsi/meta,prosody-plugins,srtp - addons and README for jitsi
Only attached two new ports, still working on the meta README.
- net/jitsi/srtp: openssl bindings for encryption
- net/jitsi/prosody-plugins: additional plugins for prosody to be used for jitsi
The srtp library is automatically loaded by videobridge, so I've just added a
RUN_DEPENDS in net/jitsi/videobridge on net/jitsi/srtp.
The prosody-plugins are nice to have, as currently double-p's instructions need
the plugins to be fetched from the online repo.
ok?
Aisha
diff --git a/net/jitsi/Makefile b/net/jitsi/Makefile
index 1528296e6ff..03f889597a5 100644
--- a/net/jitsi/Makefile
+++ b/net/jitsi/Makefile
@@ -1,6 +1,8 @@
SUBDIR =
SUBDIR += jicofo
SUBDIR += meet
+SUBDIR += prosody-plugins
+SUBDIR += srtp
SUBDIR += videobridge
.include
diff --git a/net/jitsi/videobridge/Makefile b/net/jitsi/videobridge/Makefile
index 6544cc3650f..e9416859694 100644
--- a/net/jitsi/videobridge/Makefile
+++ b/net/jitsi/videobridge/Makefile
@@ -27,7 +27,8 @@ MODJAVA_VER = 11
BUILD_DEPENDS =devel/maven
-RUN_DEPENDS = java/javaPathHelper
+RUN_DEPENDS = java/javaPathHelper \
+ net/jitsi/srtp
MAVEN_ARGS=--offline -PbuildFatJar -DskipTests
-Dassembly.skipAssembly=false
MAVEN_REPO=-Dmaven.repo.local=${WRKDIR}/m2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2022/11/07 15:43:03 Modified files: sysutils/obsdfreqd: Makefile distinfo Log message: Update to obsdfreqd-1.1.1 with inputs from maintainer ok from maintainer Florian Viehweger
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 15:34:04 Modified files: sysutils/awscli: Makefile distinfo sysutils/awscli/pkg: PLIST Log message: Update to awscli-1.27.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 15:33:47 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py3-boto3-1.26.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 15:33:35 Modified files: net/py-botocore: Makefile distinfo Log message: Update to py3-botocore-1.29.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/11/07 15:24:47 Modified files: lang/erlang/21 : Makefile lang/erlang/21/pkg: PLIST-main PLIST-wx Log message: move some files from erlang/21's wx->main, from Volker Schlect
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/11/07 15:24:03 Modified files: lang/erlang/25 : Makefile distinfo lang/erlang/25/pkg: PLIST-main PLIST-wx Log message: update to erlang 25.1.2 and move some files from wx->main, from Volker Schlect add @conflict, from me
Re: x11/openbox diff for py3-xdg
On 2022/11/04 12:45, Heppler, J. Scott wrote:
> Attached is a diff that upgrades py-xdg to py3-xdg in openbox.
> Tested on amd64.
>
> Thanks to Stuart Henderson for the python 2to3 magic.
re-CC'ing maintainer (who was CC'd when I sent my diff earlier).
> Index: x11/openbox/Makefile
> ===
> RCS file: /cvs/ports/x11/openbox/Makefile,v
> retrieving revision 1.88
> diff -u -p -u -r1.88 Makefile
> --- x11/openbox/Makefile 1 Apr 2022 19:09:43 - 1.88
> +++ x11/openbox/Makefile 4 Nov 2022 19:11:05 -
> @@ -1,7 +1,7 @@
> COMMENT =small, fast & usable window manager
>
> V = 3.6.1
> -REVISION = 9
> +REVISION = 10
> DISTNAME = openbox-${V}
> SHARED_LIBS += obrender12.0# 32.0
> SHARED_LIBS += obt 1.1 # 2.2
> @@ -27,9 +27,8 @@ WANTLIB += ${COMPILER_LIBCXX} Xdmcp jpeg
> MASTER_SITES = ${HOMEPAGE}dist/openbox/
>
> MODULES =lang/python
> -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
>
> -RUN_DEPENDS =devel/py-xdg \
> +RUN_DEPENDS =devel/py-xdg${MODPY_FLAVOR} \
> devel/desktop-file-utils
> LIB_DEPENDS += devel/gettext,-runtime \
> devel/pango \
> @@ -50,10 +49,11 @@ MODPY_ADJ_FILES =data/autostart/openbox-
>
> CONFIGURE_STYLE = gnu
> CONFIGURE_ARGS = --docdir=${PREFIX}/share/examples/openbox
> -CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
> +CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}"
Why change CONFIGURE_ENV? (There's no reason to remove it, and there's
a chance that doing so will break the port on some archs).
Otherwise it's basically the same as my diff.
I don't use this, but if $MAINTAINER is ok then it would be nice to
get rid of py2 from x11/openbox and devel/py-xdg. (x11/obmenu will be more
tricky).
Index: Makefile
===
RCS file: /cvs/ports/x11/openbox/Makefile,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile
--- Makefile1 Apr 2022 19:09:43 - 1.88
+++ Makefile7 Nov 2022 22:12:54 -
@@ -1,7 +1,7 @@
COMMENT = small, fast & usable window manager
V =3.6.1
-REVISION = 9
+REVISION = 10
DISTNAME = openbox-${V}
SHARED_LIBS += obrender12.0# 32.0
SHARED_LIBS += obt 1.1 # 2.2
@@ -27,9 +27,8 @@ WANTLIB += ${COMPILER_LIBCXX} Xdmcp jpeg
MASTER_SITES = ${HOMEPAGE}dist/openbox/
MODULES = lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
-RUN_DEPENDS = devel/py-xdg \
+RUN_DEPENDS = devel/py-xdg${MODPY_FLAVOR} \
devel/desktop-file-utils
LIB_DEPENDS += devel/gettext,-runtime \
devel/pango \
@@ -55,5 +54,7 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
pre-configure:
${SUBST_CMD} ${WRKSRC}/data/autostart/autostart.in
+ 2to3 --fix=all --no-diffs --nobackups --verbose --write \
+ ${WRKSRC}/data/autostart/openbox-xdg-autostart
.include
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/openbox/pkg/PLIST,v
retrieving revision 1.31
diff -u -p -r1.31 PLIST
--- pkg/PLIST 11 Mar 2022 20:16:51 - 1.31
+++ pkg/PLIST 7 Nov 2022 22:12:54 -
@@ -29,10 +29,10 @@ include/openbox/${API_V}/obt/util.h
include/openbox/${API_V}/obt/version.h
include/openbox/${API_V}/obt/xml.h
include/openbox/${API_V}/obt/xqueue.h
-lib/libobrender.a
+@static-lib lib/libobrender.a
lib/libobrender.la
@lib lib/libobrender.so.${LIBobrender_VERSION}
-lib/libobt.a
+@static-lib lib/libobt.a
lib/libobt.la
@lib lib/libobt.so.${LIBobt_VERSION}
lib/pkgconfig/obrender-3.5.pc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 15:09:43 Modified files: x11/gnome/seahorse: Makefile distinfo x11/gnome/seahorse/pkg: PLIST Added files: x11/gnome/seahorse/patches: patch-ssh_operation_vala Log message: Update to seahorse-43.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 15:07:33 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Register removal of seahorse-sharing.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 15:06:45 Modified files: x11/gnome : Makefile Removed files: x11/gnome/seahorse-sharing: Makefile distinfo x11/gnome/seahorse-sharing/patches: patch-configure x11/gnome/seahorse-sharing/pkg: DESCR PLIST Log message: Remove seahorse-sharing; it's been archived upstream.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 15:01:53 Modified files: sysutils/terragrunt: Makefile distinfo Log message: Update to terragrunt-0.40.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 14:54:40 Modified files: x11/gnome/polari: Makefile distinfo x11/gnome/polari/pkg: PLIST Log message: Update to polari-43.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 14:51:06 Modified files: devel/iso-codes: Makefile distinfo devel/iso-codes/pkg: PLIST Log message: Update to iso-codes-4.12.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 14:47:43 Modified files: sysutils/p5-Sys-Virt: Makefile distinfo Log message: Update to p5-Sys-Virt-8.9.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/07 14:45:15 Modified files: devel/sdl2 : Makefile devel/sdl2/patches: patch-src_joystick_SDL_gamecontrollerdb_h Log message: Add a patch from SDL upstream to support a SNES/NES-mini controller USB adapter I use. ok thfr@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 14:41:49 Modified files: mail/sendmail : Tag: OPENBSD_7_2 Makefile distinfo Log message: Maintenance update to sendmail-8.17.1.22 which fixes a couple of regressions.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 14:38:13 Modified files: x11/gnome/control-center: Tag: OPENBSD_7_2 Makefile distinfo Log message: Maintenane update to gnome-control-center-42.4: fix primary display selection.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 14:18:15 Modified files: meta/gnome : Makefile Log message: Add x11/gnome/terminal,-nautilus to -extras.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 14:17:22 Modified files: x11/gnome/terminal: Makefile Added files: x11/gnome/terminal/pkg: DESCR-main DESCR-nautilus PLIST-main PLIST-nautilus Removed files: x11/gnome/terminal/pkg: DESCR PLIST Log message: Split nautilus extension into its own subpackage.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 14:08:49 Modified files: graphics/gimp/snapshot: Makefile graphics/gimp/snapshot/pkg: PLIST Added files: graphics/gimp/snapshot/patches: patch-desktop_gimp_desktop_in_in Log message: Rename and install conflicting files with gimp-2 so that gimp-3 can is registered as an image editor in desktop environments. looks good to landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 13:56:09 Modified files: x11/gnome/file-roller: Makefile x11/gnome/file-roller/pkg: DESCR-nautilus Log message: Move LDEP to RDEP.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 13:50:12 Modified files: meta/gnome : Makefile Log message: Add x11/gnome/file-roller,-nautilus to -extras.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 13:48:19 Modified files: x11/gnome/file-roller: Makefile Added files: x11/gnome/file-roller/pkg: DESCR-main DESCR-nautilus PLIST-main PLIST-nautilus Removed files: x11/gnome/file-roller/pkg: DESCR PLIST Log message: Split nautilus extension into its own subpackage so file-roller can be used standalone.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2022/11/07 13:43:03 Modified files: x11/xfce4/xfce4-settings: Tag: OPENBSD_7_2 Makefile distinfo Log message: x11/xfce4/xfce4-settings: MFC update to 4.16.4. Fixes an argument injection vulnerability in xfce4-mime-helper
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2022/11/07 13:42:54 Modified files: x11/xfce4/xfce4-settings: Makefile distinfo Log message: x11/xfce4/xfce4-settings: update to 4.16.4. Fixes an argument injection vulnerability in xfce4-mime-helper
FIX: x11/fvwm3 unbreak FvwmIconMan
Hi ports@,
FvwmIconMan crashes on start; know issue upstream [1].
[1] https://github.com/fvwmorg/fvwm3/issues/659
Patch below.
Index: Makefile
===
RCS file: /cvs/ports/x11/fvwm3/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile13 Oct 2022 16:16:49 - 1.5
+++ Makefile7 Nov 2022 17:41:52 -
@@ -2,7 +2,7 @@ COMMENT=multiple virtual desktop window
VERSION= 1.0.5
DISTNAME= fvwm3-${VERSION}
-REVISION= 0
+REVISION= 1
CATEGORIES= x11
Index: patches/patch-modules_FvwmIconMan_x_c
===
RCS file: patches/patch-modules_FvwmIconMan_x_c
diff -N patches/patch-modules_FvwmIconMan_x_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-modules_FvwmIconMan_x_c 7 Nov 2022 17:41:52 -
@@ -0,0 +1,11 @@
+Index: modules/FvwmIconMan/x.c
+--- modules/FvwmIconMan/x.c.orig
modules/FvwmIconMan/x.c
+@@ -741,6 +741,7 @@ void X_init_manager (int man_id)
+ if (man->geometry_str) {
+ fscreen_scr_arg arg;
+ arg.mouse_ev = NULL;
++arg.name = NULL;
+
+ geometry_mask = FScreenParseGeometryWithScreen(
+ man->geometry_str, >geometry.x, >geometry.y,
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 11:41:16 Modified files: sysutils/serf : Makefile distinfo Added files: sysutils/serf : modules.inc Log message: Update to (hashicorp-)serf-0.10.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 11:15:54 Modified files: graphics/sane-backends: Makefile graphics/sane-backends/patches: patch-tools_umax_pp_c Log message: No need for _XOPEN_SOURCE_EXTENDED, just define _XOPEN_SOURCE properly.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2022/11/07 11:14:09 Modified files: x11/motif : Makefile Added files: x11/motif/patches: patch-lib_Xm_VirtKeys_c Log message: x11/motif: avoid a bad out-of-bounds array access that crashes xpdf when searching for non-UTF-7. Reported and tested by Walter Alejandro Iglesias ok matthieu
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 11:12:10 Modified files: graphics/shotwell: Makefile Log message: Needs explicit dependency on www/webkitgtk4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/11/07 11:08:38 Modified files: devel/py-wheel : Makefile distinfo devel/py-wheel/pkg: PLIST Log message: update to py3-wheel-0.38.2 (slightly special dep handling because it uses setuptools but now no longer needs a RUN_DEPENDS on setuptools which MODPY_SETUPTOOLS wants to add; this port can't use MODPY_PYBUILD because it's part of the py-build scaffolding itself).
UPDATE net/unison-2.53.0
Diff below brings net/unison to 2.53.0. Changes are listed on
https://github.com/bcpierce00/unison/releases/tag/v2.53.0. Noticeable
change is the switch to GTK3.
While here:
- The Unison project is now hosted on GitHub. Old HOMEPAGE is archival.
New HOMEPAGE is set by GH_*
- Update DEPS and WANTLIB to reflect switch to GTK3
'make test' passes all tests. Run tested on ams64 against unison-2.52.1
and unison-2.53.0.
Comments/OK?
diff --git Makefile Makefile
index 4920e392b7e..8856a3c2bd8 100644
--- Makefile
+++ Makefile
@@ -2,12 +2,10 @@ COMMENT = multi-platform file synchronization tool
GH_ACCOUNT = bcpierce00
GH_PROJECT = unison
-GH_TAGNAME =v2.52.1
+GH_TAGNAME = v2.53.0
CATEGORIES = net
-HOMEPAGE = https://www.cis.upenn.edu/~bcpierce/unison/
-
MAINTAINER = Bjorn Ketelaars
# GPLv3
@@ -18,8 +16,6 @@ WANTLIB = c m util
MODULES = lang/ocaml
MODOCAML_RUNDEP = if-not-native
-TEST_DEPENDS = emacs->=24:editors/emacs
-
USE_GMAKE =Yes
# CFLAGS _must_ be empty. This is an OCaml compiler.
@@ -33,37 +29,26 @@ FLAVOR ?=
.if ${FLAVOR:Mno_x11}
MAKE_FLAGS += UISTYLE=text
.else
-WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0
-WANTLIB += harfbuzz intl pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += z
-BUILD_DEPENDS += sysutils/findlib \
- x11/lablgtk2
-LIB_DEPENDS += x11/gtk+2
-MAKE_FLAGS += UISTYLE=gtk2
+WANTLIB += atk-1.0 cairo cairo-gobject fontconfig freetype gdk-3
+WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-3 harfbuzz
+WANTLIB += intl pango-1.0 pangocairo-1.0
+BUILD_DEPENDS += x11/lablgtk3
+LIB_DEPENDS += x11/gtk+3
+MAKE_FLAGS += UISTYLE=gtk3
.endif
-FLAVOR_COMMA = ${FLAVOR_EXT:S/-/,/g}
-SUBST_VARS = FLAVOR_COMMA
-
-# Avoid multiple all:: entries and use the real target entry.
-ALL_TARGET = unison
-TEST_TARGET = selftest
+FLAVOR_COMMA = ${FLAVOR_EXT:S/-/,/g}
+SUBST_VARS = FLAVOR_COMMA
PORTHOME = ${WRKDIR}
-WRKDIST = ${WRKDIR}/${DISTNAME}/src
DOCS = NEWS.md README.md
-post-build:
- @cd ${WRKSRC}/../man && ${MAKE}
-
# Avoid the nightmare of their Makefile install target.
# Do not use INSTALL_PROGRAM, as the bytecode version must not be stripped!
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/unison ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/../man/unison.1 ${PREFIX}/man/man1
+ ${INSTALL_SCRIPT} ${WRKSRC}/src/unison ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/man/unison.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unison
- @cd ${WRKSRC}/.. && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/unison
+ @cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/unison
.include
diff --git distinfo distinfo
index e2feb9efb53..1052cc9f1d1 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (unison-2.52.1.tar.gz) = /32SDhtOwIct92QTC4KlFfbyGjYfMaZ7OcPj6hK/2oA=
-SIZE (unison-2.52.1.tar.gz) = 1360920
+SHA256 (unison-2.53.0.tar.gz) = k2RHffRQG5xzd+LKGnxLRMHxb6fLwSt/W1Q9CMPwdAo=
+SIZE (unison-2.53.0.tar.gz) = 1387266
diff --git pkg/PLIST pkg/PLIST
index 9a848ccc1a2..c8a7e9ab292 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -3,6 +3,8 @@
@pkgpath net/unison/snapshot${FLAVOR_COMMA}
@pkgpath net/unison/stable${FLAVOR_COMMA}
@bin bin/unison
+lib/ocaml/
+lib/ocaml/stublibs/
@man man/man1/unison.1
share/doc/pkg-readmes/${PKGSTEM}
share/doc/unison/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 11:06:39 Modified files: graphics/rawstudio: Makefile graphics/rawstudio/patches: patch-src_rs-utils_c Log message: Properly define _XOPEN_SOURCE, no need for _XOPEN_SOURCE_EXTENDED. Regen WANTLIB while here.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 11:00:40 Removed files: graphics/rawstudio: patch-librawstudio_rs-exif_cc Log message: Drop unused file.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 10:59:46 Modified files: graphics/gphoto2: Makefile graphics/gphoto2/patches: patch-gphoto2_actions_c Log message: Properly defined _XOPEN_SOURCE instead of using _XOPEN_SOURCE_EXTENDED. Fix for 64bit time_t while here.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 10:50:10 Modified files: www/snownews : Makefile Added files: www/snownews/patches: patch-feedio_c Log message: Fix for 64bit time_t.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 10:43:47 Modified files: comms/syncterm : Makefile Added files: comms/syncterm/patches: patch-src_xpdev_ini_file_c Log message: Fix for 64bit time_t and no need for _XOPEN_SOURCE_EXTENDED
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/11/07 10:41:06 Modified files: comms/sigrok/libsigrok: Makefile comms/sigrok/libsigrok/patches: patch-configure Log message: fix copy-and-pasto, thanks aja@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 10:27:36 Modified files: x11/gnome/cheese: Makefile Added files: x11/gnome/cheese/patches: patch-src_thumbview_cheese-thumb-view_c Log message: thumb-view: update for new gnome-desktop API (from upstream).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 10:14:40 Modified files: comms/amtterm : Makefile devel/giggle : Makefile emulators/qemu : Makefile x11/elementary/code: Makefile x11/gnome/builder: Makefile x11/gnome/terminal: Makefile x11/gnome/console: Makefile x11/lxterminal : Makefile x11/mate/terminal: Makefile x11/remmina: Makefile x11/roxterm: Makefile x11/sakura : Makefile x11/tilda : Makefile x11/virt-viewer: Makefile x11/xfce4/terminal: Makefile Log message: Bump and fix LDEP after vte3 split.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 10:14:10 Modified files: devel/vte3 : Makefile Added files: devel/vte3/pkg : DESCR-common DESCR-gtk4 DESCR-main PLIST-common PLIST-gtk4 PLIST-main Removed files: devel/vte3/pkg : DESCR PLIST Log message: Split vte3 so gtk4 dependency is only enforced when needed. Hoefully I got the conflict/pkgpath right.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/11/07 09:33:55 Modified files: lang/ocaml : Makefile Added files: lang/ocaml/patches: patch-configure_ac Log message: reinstate patch which should not have been removed
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2022/11/07 08:37:21 Modified files: plan9/sam : Makefile distinfo plan9/sam/pkg : PLIST Log message: update plan9/sam to the latest commit in the deadpixi fork This brings in ssam(1) (streaming sam; unfortunately without a manpage), fixes the dot after the `<' command (finally!) and some small tweaks to the manpage. While here also add "editors" to CATEGORY and tweak a bit the post-install hook. ok abieber@
Re: update plan9/sam to latest commit
Omar Polo writes:
> woops, forgot to fill the subject. inlining the diff again.
>
> On 2022/11/06 23:11:36 +0100, Omar Polo wrote:
>> Hello,
>>
>> This updates sam to the latest commit. The changelog is just:
>>
>> - set dot correctly after applying the < command
>> - add ssam (streaming sam); no man page :(
>> - clean up the manpage
>>
>> Works fine here. I've only briefily played with ssam, but as it just
>> run sam on a temp file I assume it's fine.
>>
>> While here also adds it to the editors category and tweak a bit the
>> post-install target.
>>
>> ok?
OK abieber@
>
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/plan9/sam/Makefile,v
> retrieving revision 1.34
> diff -u -p -r1.34 Makefile
> --- Makefile 11 Mar 2022 19:49:08 - 1.34
> +++ Makefile 6 Nov 2022 22:01:47 -
> @@ -1,12 +1,11 @@
> COMMENT= X11 version of Rob Pike's editor, sam
>
> -DISTNAME=sam-4.3.20190427
> +DISTNAME=sam-4.3.20200714
> GH_ACCOUNT= deadpixi
> GH_PROJECT= sam
> -GH_COMMIT= 5893679bbbab2f50ceb6ef0805e4bb63f5f51df8
> -REVISION=0
> +GH_COMMIT= 5d8acb35d78c327d76f00a54857cbd566ed9bc11
>
> -CATEGORIES= plan9
> +CATEGORIES= plan9 editors
>
> PERMIT_PACKAGE= Yes
> WANTLIB= X11 Xft Xi Xt c
> @@ -15,16 +14,12 @@ RUN_DEPENDS+= devel/desktop-file-utils
>
> NO_TEST= Yes
>
> -SAMDOCDIR= ${PREFIX}/share/doc/sam
> -SAMDOCFILES= README.rst doc/sam.ps doc/sam.tut.ms doc/se.ps
> -EXAMPLEDIR= ${PREFIX}/share/examples/sam
> -
> post-install:
> - ${INSTALL_DATA_DIR} ${SAMDOCDIR}
> - ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
> - ${INSTALL_DATA} ${WRKSRC}/doc/samrc ${EXAMPLEDIR}
> - @set -e; for f in ${SAMDOCFILES}; do \
> - ${INSTALL_DATA} ${WRKSRC}/$${f} ${SAMDOCDIR}; \
> - done
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sam
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sam
> + ${INSTALL_DATA} ${WRKSRC}/doc/samrc ${PREFIX}/share/examples/sam
> +.for f in README.rst doc/sam.ps doc/sam.tut.ms doc/se.ps
> + ${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/sam
> +.endfor
>
> .include
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/plan9/sam/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 12 Nov 2019 02:45:32 - 1.5
> +++ distinfo 6 Nov 2022 19:27:08 -
> @@ -1,2 +1,2 @@
> -SHA256 (sam-4.3.20190427-5893679b.tar.gz) =
> 17k1wL+Rv5Z43t79sLyj0Vn9UYzSVfpVxOYZNiAfB0E=
> -SIZE (sam-4.3.20190427-5893679b.tar.gz) = 311827
> +SHA256 (sam-4.3.20200714-5d8acb35.tar.gz) =
> hlWbfWSzWijxfBUOvrhO4HZp3mtO1ct4Bfj6zVRyRlo=
> +SIZE (sam-4.3.20200714-5d8acb35.tar.gz) = 312453
> Index: pkg/PLIST
> ===
> RCS file: /home/cvs/ports/plan9/sam/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -r1.7 PLIST
> --- pkg/PLIST 11 Mar 2022 19:49:08 - 1.7
> +++ pkg/PLIST 6 Nov 2022 19:40:00 -
> @@ -1,6 +1,7 @@
> @bin bin/B
> @bin bin/sam
> @bin bin/samterm
> +bin/ssam
> @man man/man1/sam.1
> @man man/man5/samrc.5
> share/applications/deadpixi-sam.desktop
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 08:23:48 Modified files: x11/gnome/maps : Makefile Log message: Fix dependencies.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 08:20:27 Modified files: x11/gnome/maps : Makefile Log message: No need for graphics/clutter/clutter-gtk.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 08:17:37 Modified files: x11/gtk+3 : Makefile x11/gtk+4 : Makefile Log message: Remove comment; we will not add libcloudproviders support because it links against the main library and not as a dlopen so file.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2022/11/07 08:17:03 Modified files: net/curl : Tag: OPENBSD_7_2 Makefile net/curl/patches: Tag: OPENBSD_7_2 patch-m4_curl-compilers_m4 Added files: net/curl/patches: Tag: OPENBSD_7_2 patch-lib_noproxy_c Log message: net/curl: fix regressions in the noproxy filter functionality from upstream; ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: tra...@cvs.openbsd.org 2022/11/07 07:53:32 Modified files: cad/kicad : Makefile distinfo cad/kicad/patches: patch-pcbnew_CMakeLists_txt cad/kicad-share: Makefile.inc cad/kicad-share/footprints: distinfo cad/kicad-share/footprints/pkg: PLIST cad/kicad-share/packages3D: distinfo cad/kicad-share/packages3D/pkg: PLIST cad/kicad-share/symbols: distinfo cad/kicad-share/templates: distinfo Log message: Update cad/kicad and cad/kicad-share from 6.0.7 to 6.0.9. Updated patch by sdk@. Thanks!! ok sdk@ benoit@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/11/07 07:39:47 Modified files: security/py-paramiko: Makefile distinfo security/py-paramiko/patches: patch-tests_test_client_py security/py-paramiko/pkg: PLIST Log message: update to py3-paramiko-2.12.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2022/11/07 07:37:00 Modified files: net/curl : Makefile net/curl/patches: patch-m4_curl-compilers_m4 Added files: net/curl/patches: patch-lib_noproxy_c Log message: net/curl: fix regressions in the noproxy filter functionality from upstream; ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 07:04:43 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Register librest removal.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 07:04:07 Modified files: net: Makefile Removed files: net/librest: Makefile distinfo net/librest/pkg: DESCR PLIST Log message: Remove librest; replaced by librest1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 07:01:22 Modified files: x11/gnome/notes: Makefile Log message: Add explicit LDEP on www/webkitgtk4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 07:00:20 Modified files: x11/gnome/maps : Makefile Log message: librest -> librest1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 06:52:36 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Register removal of libzapojit.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 06:51:58 Modified files: x11/gnome : Makefile Removed files: x11/gnome/libzapojit: Makefile distinfo x11/gnome/libzapojit/pkg: DESCR PLIST Log message: Remove libzapojit; nothing depends on it anymore.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 06:50:42 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Register removal of libgfbgraph and gnome-online-miners.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 06:49:27 Modified files: x11/gnome : Makefile Removed files: x11/gnome/online-miners: Makefile distinfo x11/gnome/online-miners/pkg: DESCR PLIST x11/gnome/gfbgraph: Makefile distinfo x11/gnome/gfbgraph/pkg: DESCR PLIST Log message: Remove gnome-online-miners and libgfbgraph; nothing else depends on these.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 06:48:14 Modified files: meta/gnome : Makefile Log message: Remove RDEP on x11/gnome/online-miners; it's been archives upstream.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 06:47:25 Modified files: x11/gnome/photos: Makefile Log message: Drop dependency x11/gnome/online-miners; it's been archived upstream.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 06:45:47 Modified files: x11/gnome/contacts: Makefile distinfo x11/gnome/contacts/pkg: PLIST Removed files: x11/gnome/contacts/patches: patch-meson_build patch-src_contacts-avatar-selector_vala Log message: Update to gnome-contacts-43.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 06:44:54 Modified files: x11/gnome/photos: Makefile Log message: Missing BDEP+RDEP on devel/gsettings-desktop-schemas.
Re: unbreak curl no_proxy
On 2022/11/06 16:20, Christian Weisgerber wrote:
> Christian Weisgerber:
>
> > > I've added https://github.com/curl/curl/issues/9842
> >
> > So we wait?
>
> Here's a diff with the accumulated noproxy fixes, including the
> lastest suggested "tailmatch like in 7.85.0 and earlier".
Thanks. OK
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/curl/Makefile,v
> retrieving revision 1.174
> diff -u -p -r1.174 Makefile
> --- Makefile 28 Oct 2022 17:59:06 - 1.174
> +++ Makefile 6 Nov 2022 15:18:15 -
> @@ -1,6 +1,7 @@
> COMMENT= transfer files with FTP, HTTP, HTTPS, etc.
>
> DISTNAME=curl-7.86.0
> +REVISION=0
> SHARED_LIBS= curl 26.17# 12.0
> CATEGORIES= net
> HOMEPAGE=https://curl.se/
> Index: patches/patch-lib_noproxy_c
> ===
> RCS file: patches/patch-lib_noproxy_c
> diff -N patches/patch-lib_noproxy_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-lib_noproxy_c 6 Nov 2022 15:18:15 -
> @@ -0,0 +1,95 @@
> +noproxy: also match with adjacent comma
> +https://github.com/curl/curl/commit/efc286b7a62af0568fdcbf3c68791c9955182128
> +
> +noproxy: fix tail-matching
> +https://github.com/curl/curl/commit/b830f9ba9e94acf672cd191993ff679fa38b
> +
> +noproxy: tailmatch like in 7.85.0 and earlier
> +
> +Index: lib/noproxy.c
> +--- lib/noproxy.c.orig
> lib/noproxy.c
> +@@ -149,9 +149,14 @@ bool Curl_check_noproxy(const char *name, const char *
> + }
> + else {
> + unsigned int address;
> ++ namelen = strlen(name);
> + if(1 == Curl_inet_pton(AF_INET, name, ))
> + type = TYPE_IPV4;
> +- namelen = strlen(name);
> ++ else {
> ++/* ignore trailing dots in the host name */
> ++if(name[namelen - 1] == '.')
> ++ namelen--;
> ++ }
> + }
> +
> + while(*p) {
> +@@ -173,33 +178,50 @@ bool Curl_check_noproxy(const char *name, const char *
> + if(tokenlen) {
> + switch(type) {
> + case TYPE_HOST:
> +- if(*token == '.') {
> +-++token;
> +---tokenlen;
> +-/* tailmatch */
> +-match = (tokenlen <= namelen) &&
> +- strncasecompare(token, name + (namelen - tokenlen), namelen);
> ++ /* ignore trailing dots in the token to check */
> ++ if(token[tokenlen - 1] == '.')
> ++tokenlen--;
> ++
> ++ if(tokenlen && (*token == '.')) {
> ++/* ignore leading token dot as well */
> ++token++;
> ++tokenlen--;
> + }
> +- else
> +-match = (tokenlen == namelen) &&
> +- strncasecompare(token, name, namelen);
> ++ /* A: example.com matches 'example.com'
> ++ B: www.example.com matches 'example.com'
> ++ C: nonexample.com DOES NOT match 'example.com'
> ++ */
> ++ if(tokenlen == namelen)
> ++/* case A, exact match */
> ++match = strncasecompare(token, name, namelen);
> ++ else if(tokenlen < namelen) {
> ++/* case B, tailmatch domain */
> ++match = (name[namelen - tokenlen - 1] == '.') &&
> ++ strncasecompare(token, name + (namelen - tokenlen),
> ++ tokenlen);
> ++ }
> ++ /* case C passes through, not a match */
> + break;
> + case TYPE_IPV4:
> + /* FALLTHROUGH */
> + case TYPE_IPV6: {
> + const char *check = token;
> +- char *slash = strchr(check, '/');
> ++ char *slash;
> + unsigned int bits = 0;
> + char checkip[128];
> ++ if(tokenlen >= sizeof(checkip))
> ++/* this cannot match */
> ++break;
> ++ /* copy the check name to a temp buffer */
> ++ memcpy(checkip, check, tokenlen);
> ++ checkip[tokenlen] = 0;
> ++ check = checkip;
> ++
> ++ slash = strchr(check, '/');
> + /* if the slash is part of this token, use it */
> +- if(slash && (slash < [tokenlen])) {
> ++ if(slash) {
> + bits = atoi(slash + 1);
> +-/* copy the check name to a temp buffer */
> +-if(tokenlen >= sizeof(checkip))
> +- break;
> +-memcpy(checkip, check, tokenlen);
> +-checkip[ slash - check ] = 0;
> +-check = checkip;
> ++*slash = 0; /* null terminate there */
> + }
> + if(type == TYPE_IPV6)
> + match = Curl_cidr6_match(name, check, bits);
> Index: patches/patch-m4_curl-compilers_m4
> ===
> RCS file: /cvs/ports/net/curl/patches/patch-m4_curl-compilers_m4,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-m4_curl-compilers_m4
> ---
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 06:09:07 Modified files: productivity/glabels: Makefile Log message: Regen WANTLIB to unbreak.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 05:50:43 Modified files: x11/gnome/mutter: Makefile Added files: x11/gnome/mutter/patches: patch-clutter_clutter_clutter-frame-clock_c Log message: 64bit time_t fixes.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 05:45:12 Modified files: x11/gnome/initial-setup: Makefile distinfo x11/gnome/initial-setup/patches: patch-gnome-initial-setup_gnome-initial-setup_c patch-gnome-initial-setup_meson_build x11/gnome/initial-setup/pkg: PLIST Log message: Update to gnome-initial-setup-43.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 05:43:25 Modified files: x11/gnome/builder: Makefile distinfo x11/gnome/builder/patches: patch-meson_build patch-src_libide_io_ide-path_c patch-src_plugins_todo_gbp-todo-model_c x11/gnome/builder/pkg: PLIST Log message: Update to gnome-builder-43.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/11/07 05:17:38 Modified files: devel/py-flit : Makefile distinfo Log message: update to py3-flit-3.8.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/11/07 05:17:37 Modified files: devel/py-flit_core: Makefile distinfo devel/py-flit_core/pkg: PLIST Log message: update to py3-flit_core-3.8.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 05:14:31 Modified files: devel/libgit2/libgit2-glib: Makefile distinfo devel/libgit2/libgit2-glib/pkg: PLIST Log message: Update to libgit2-glib-1.1.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 05:05:11 Modified files: devel/libgit2/py-git2: Makefile distinfo Log message: Update to py3-git2-1.11.0.
Re: update: sysutils/bupstash to 0.12.0
Sebastien Marie wrote (2022-11-07 11:51 CET):
> Hi,
>
> The following diff updates bupstash to 0.12.0 (released today).
>
> While here, use MODCARGO_WANTLIB in WANTLIB to properly track rust-std usage
> (which is different across archs).
>
> Others libraries in WANTLIB are still need:
> - m : rust libc usage
> - sodium : bupstash itself
>
> Tested on amd64. All tests are passing.
>
> Comments or OK ?
> --
> Sebastien Marie
OK sdk@
> diff /data/semarie/repos/openbsd/ports
> commit - ec68a50a503667234d64a20f8fdd92b06f887b74
> path + /data/semarie/repos/openbsd/ports
> blob - b6fc1768376a27b9432ef8471323c413c009f3e4
> file + sysutils/bupstash/Makefile
> --- sysutils/bupstash/Makefile
> +++ sysutils/bupstash/Makefile
> @@ -1,9 +1,8 @@
> COMMENT =encrypted and deduplicated backup tool
>
> -V = 0.11.1
> +V = 0.12.0
> DISTNAME = bupstash-v${V}
> PKGNAME =bupstash-${V}
> -REVISION = 1
>
> CATEGORIES = sysutils
>
> @@ -14,7 +13,7 @@ WANTLIB = c c++abi m pthread sodium
> # MIT
> PERMIT_PACKAGE = Yes
>
> -WANTLIB =c c++abi m pthread sodium
> +WANTLIB =${MODCARGO_WANTLIB} m sodium
>
> MASTER_SITES =
> https://github.com/andrewchambers/bupstash/releases/download/v${V}/
> DISTFILES = ${DISTNAME}-man${EXTRACT_SUFX} \
> blob - 173cb7791d0e8458dc4c91e334720c64c721a263
> file + sysutils/bupstash/distinfo
> --- sysutils/bupstash/distinfo
> +++ sysutils/bupstash/distinfo
> @@ -1,4 +1,4 @@
> -SHA256 (bupstash-v0.11.1-man.tar.gz) =
> q795Qg4V4mGd6zedlm4LEYrWf81BHlKx5kLYuoC3ML8=
> -SHA256 (bupstash-v0.11.1-src+deps.tar.gz) =
> lDM3lJHnVSAyYgeJoPinAhWaB0RITj/Z/nPrnrHXE1E=
> -SIZE (bupstash-v0.11.1-man.tar.gz) = 21057
> -SIZE (bupstash-v0.11.1-src+deps.tar.gz) = 15959036
> +SHA256 (bupstash-v0.12.0-man.tar.gz) =
> v/5Knnx58DrwJVY4rPoT+5907V1viYeVTbHTFk9DFik=
> +SHA256 (bupstash-v0.12.0-src+deps.tar.gz) =
> 4wVMA7DVe6cYvSyrjCTfExUzad6jEeWlldWGrSSGV5M=
> +SIZE (bupstash-v0.12.0-man.tar.gz) = 21237
> +SIZE (bupstash-v0.12.0-src+deps.tar.gz) = 15987395
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: to...@cvs.openbsd.org 2022/11/07 04:53:36 Modified files: sysutils/u-boot-asahi: Makefile sysutils/u-boot-asahi/pkg: PLIST Log message: Install device trees for u-boot-asahi. We are going to need those to update the booloader binary from the installer. ok kettenis@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 04:51:08 Modified files: mail/geary : Makefile distinfo mail/geary/pkg : PLIST Removed files: mail/geary/patches: patch-src_client_application_application-client_vala patch-src_client_util_util-cache_vala Log message: Update to geary-43.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 04:49:23 Modified files: x11/gnome/totem: Makefile distinfo x11/gnome/totem/pkg: PLIST Removed files: x11/gnome/totem/patches: patch-src_plugins_open-directory_totem-open-directory_c Log message: Update to totem-43.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 04:20:17 Modified files: x11/gnome/shell-extensions: Makefile distinfo Log message: Update to gnome-shell-extensions-43.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 04:16:01 Modified files: meta/gnome : Makefile Log message: New major GNOME release: 43.1 \o/ Expect some runtime breakage for the next couple of days until the dust settles and the full upgrade is in.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 04:14:39 Modified files: x11/gnome/shell: Makefile distinfo x11/gnome/shell/patches: patch-js_misc_loginManager_js patch-js_ui_endSessionDialog_js patch-js_ui_status_keyboard_js patch-src_main_c x11/gnome/shell/pkg: PLIST Log message: Update to gnome-shell-43.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 04:14:11 Modified files: meta/gnome : Makefile Log message: Add RDEP on x11/gnome/zenity to -extras.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 04:12:30 Modified files: x11/gnome/mutter: Makefile distinfo x11/gnome/mutter/patches: patch-clutter_clutter_clutter-stage-view_c patch-meson_build patch-src_backends_meta-stage-impl_c patch-src_backends_x11_meta-seat-x11_c x11/gnome/mutter/pkg: PLIST Added files: x11/gnome/mutter/patches: patch-src_backends_x11_meta-backend-x11_c patch-src_meson_build patch-src_tests_meson_build Log message: Update to mutter-43.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/11/07 04:07:12 Modified files: x11/gnome/gedit-plugins: Makefile distinfo x11/gnome/gedit-plugins/pkg: PLIST Log message: Update to gedit-plugins-43.1.
NEW: Reader-0.3.0
Hello, This is a port for "reader": https://github.com/mrusme/reader "reader is for your command line what the “readability” view is for modern browsers: A lightweight tool offering better readability of web pages on the CLI." OK? Comments? Cheers.- -- %gonzalo reader.tgz Description: Binary data
update: sysutils/bupstash to 0.12.0
Hi,
The following diff updates bupstash to 0.12.0 (released today).
While here, use MODCARGO_WANTLIB in WANTLIB to properly track rust-std usage
(which is different across archs).
Others libraries in WANTLIB are still need:
- m : rust libc usage
- sodium : bupstash itself
Tested on amd64. All tests are passing.
Comments or OK ?
--
Sebastien Marie
diff /data/semarie/repos/openbsd/ports
commit - ec68a50a503667234d64a20f8fdd92b06f887b74
path + /data/semarie/repos/openbsd/ports
blob - b6fc1768376a27b9432ef8471323c413c009f3e4
file + sysutils/bupstash/Makefile
--- sysutils/bupstash/Makefile
+++ sysutils/bupstash/Makefile
@@ -1,9 +1,8 @@
COMMENT = encrypted and deduplicated backup tool
-V =0.11.1
+V =0.12.0
DISTNAME = bupstash-v${V}
PKGNAME = bupstash-${V}
-REVISION = 1
CATEGORIES = sysutils
@@ -14,7 +13,7 @@ WANTLIB = c c++abi m pthread sodium
# MIT
PERMIT_PACKAGE = Yes
-WANTLIB = c c++abi m pthread sodium
+WANTLIB = ${MODCARGO_WANTLIB} m sodium
MASTER_SITES =
https://github.com/andrewchambers/bupstash/releases/download/v${V}/
DISTFILES =${DISTNAME}-man${EXTRACT_SUFX} \
blob - 173cb7791d0e8458dc4c91e334720c64c721a263
file + sysutils/bupstash/distinfo
--- sysutils/bupstash/distinfo
+++ sysutils/bupstash/distinfo
@@ -1,4 +1,4 @@
-SHA256 (bupstash-v0.11.1-man.tar.gz) =
q795Qg4V4mGd6zedlm4LEYrWf81BHlKx5kLYuoC3ML8=
-SHA256 (bupstash-v0.11.1-src+deps.tar.gz) =
lDM3lJHnVSAyYgeJoPinAhWaB0RITj/Z/nPrnrHXE1E=
-SIZE (bupstash-v0.11.1-man.tar.gz) = 21057
-SIZE (bupstash-v0.11.1-src+deps.tar.gz) = 15959036
+SHA256 (bupstash-v0.12.0-man.tar.gz) =
v/5Knnx58DrwJVY4rPoT+5907V1viYeVTbHTFk9DFik=
+SHA256 (bupstash-v0.12.0-src+deps.tar.gz) =
4wVMA7DVe6cYvSyrjCTfExUzad6jEeWlldWGrSSGV5M=
+SIZE (bupstash-v0.12.0-man.tar.gz) = 21237
+SIZE (bupstash-v0.12.0-src+deps.tar.gz) = 15987395
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2022/11/07 03:03:51 Modified files: textproc : Makefile Log message: +terraform-docs
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2022/11/07 03:03:27 Log message: Import terraform-docs, documentation generator for Terraform Status: Vendor Tag: pvk Release Tags: pvk_20221107 N ports/textproc/terraform-docs/Makefile N ports/textproc/terraform-docs/distinfo N ports/textproc/terraform-docs/modules.inc N ports/textproc/terraform-docs/pkg/DESCR N ports/textproc/terraform-docs/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/11/07 02:56:44 Modified files: security/py-cryptography: Makefile crates.inc distinfo Log message: update to py3-cryptography-38.0.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/11/07 02:56:42 Modified files: security/py-cryptography_vectors: Makefile distinfo security/py-cryptography_vectors/pkg: PLIST Log message: update to py3-cryptography_vectors-38.0.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/11/07 02:56:16 Modified files: devel/py-pybind11: Makefile distinfo devel/py-pybind11/pkg: PLIST Log message: update to py3-pybind11-2.10.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/11/07 02:56:09 Modified files: devel/ccache : Makefile distinfo Log message: update to ccache-4.7.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/11/07 02:56:06 Modified files: mail/mutt : Makefile distinfo mail/mutt/patches: patch-main_c mail/mutt/pkg : PLIST Log message: update to mutt-2.2.8
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/11/07 02:56:00 Modified files: devel/py-pip : Makefile distinfo devel/py-pip/pkg: PLIST Log message: update to py3-pip-22.3.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/11/07 02:55:56 Modified files: devel/py-pbr : Makefile distinfo devel/py-pbr/pkg: PLIST Log message: update to py3-pbr-5.11.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2022/11/07 02:39:15 Modified files: emulators/nono : Makefile distinfo Log message: Update for Nono to 0.4.4 OK benoit@
update plan9/sam to latest commit
woops, forgot to fill the subject. inlining the diff again.
On 2022/11/06 23:11:36 +0100, Omar Polo wrote:
> Hello,
>
> This updates sam to the latest commit. The changelog is just:
>
> - set dot correctly after applying the < command
> - add ssam (streaming sam); no man page :(
> - clean up the manpage
>
> Works fine here. I've only briefily played with ssam, but as it just
> run sam on a temp file I assume it's fine.
>
> While here also adds it to the editors category and tweak a bit the
> post-install target.
>
> ok?
Index: Makefile
===
RCS file: /home/cvs/ports/plan9/sam/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile11 Mar 2022 19:49:08 - 1.34
+++ Makefile6 Nov 2022 22:01:47 -
@@ -1,12 +1,11 @@
COMMENT= X11 version of Rob Pike's editor, sam
-DISTNAME= sam-4.3.20190427
+DISTNAME= sam-4.3.20200714
GH_ACCOUNT=deadpixi
GH_PROJECT=sam
-GH_COMMIT= 5893679bbbab2f50ceb6ef0805e4bb63f5f51df8
-REVISION= 0
+GH_COMMIT= 5d8acb35d78c327d76f00a54857cbd566ed9bc11
-CATEGORIES=plan9
+CATEGORIES=plan9 editors
PERMIT_PACKAGE=Yes
WANTLIB= X11 Xft Xi Xt c
@@ -15,16 +14,12 @@ RUN_DEPENDS+= devel/desktop-file-utils
NO_TEST= Yes
-SAMDOCDIR= ${PREFIX}/share/doc/sam
-SAMDOCFILES= README.rst doc/sam.ps doc/sam.tut.ms doc/se.ps
-EXAMPLEDIR=${PREFIX}/share/examples/sam
-
post-install:
- ${INSTALL_DATA_DIR} ${SAMDOCDIR}
- ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/samrc ${EXAMPLEDIR}
- @set -e; for f in ${SAMDOCFILES}; do \
-${INSTALL_DATA} ${WRKSRC}/$${f} ${SAMDOCDIR}; \
- done
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sam
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sam
+ ${INSTALL_DATA} ${WRKSRC}/doc/samrc ${PREFIX}/share/examples/sam
+.for f in README.rst doc/sam.ps doc/sam.tut.ms doc/se.ps
+ ${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/sam
+.endfor
.include
Index: distinfo
===
RCS file: /home/cvs/ports/plan9/sam/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo12 Nov 2019 02:45:32 - 1.5
+++ distinfo6 Nov 2022 19:27:08 -
@@ -1,2 +1,2 @@
-SHA256 (sam-4.3.20190427-5893679b.tar.gz) =
17k1wL+Rv5Z43t79sLyj0Vn9UYzSVfpVxOYZNiAfB0E=
-SIZE (sam-4.3.20190427-5893679b.tar.gz) = 311827
+SHA256 (sam-4.3.20200714-5d8acb35.tar.gz) =
hlWbfWSzWijxfBUOvrhO4HZp3mtO1ct4Bfj6zVRyRlo=
+SIZE (sam-4.3.20200714-5d8acb35.tar.gz) = 312453
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/plan9/sam/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 11 Mar 2022 19:49:08 - 1.7
+++ pkg/PLIST 6 Nov 2022 19:40:00 -
@@ -1,6 +1,7 @@
@bin bin/B
@bin bin/sam
@bin bin/samterm
+bin/ssam
@man man/man1/sam.1
@man man/man5/samrc.5
share/applications/deadpixi-sam.desktop
