Re: [MAINTAINER UPDATE] www/honk 0.9.7 -> 0.9.8

2022-07-30 Thread Christoph Roland Winter

Beside of this question, the idea of OCSP is

By turning on OCSP Stapling, you can improve the performance of your 
website, provide better privacy protections for your users, and help 
Let’s Encrypt efficiently serve as many people as possible.


https://letsencrypt.org/docs/integration-guide/

Is it better to update the OCSP file before it expires or update it only 
seldom (in this case the question is, whether it is not better to don't 
use OCSP).


Am 31.07.22 um 00:33 schrieb Horia Racoviceanu:

I've switched the cron job to chaining acme-client && ocspcheck on June 20.
Both the certificate and the OCSP response were last updated on June 20.

# ocspcheck -vNi /etc/ssl/honk.example.com.{ocsp,crt}
ocspcheck: Invalid OCSP reply: this update is too old Mon Jun 20 05:46:59 2022

relayd and Firefox do not complain.

ssllabs.com reports:

OCSP Must Staple No
OCSP stapling  Yes
OCSP STAPLING ERROR: OCSP response expired on Mon Jun 20 20:46:59 UTC 2022

Can the OCSP STAPLING ERROR be ignored?

On 7/30/22, Christoph Roland Winter  wrote:

Welcome.

The question is then, why the OCSP staple file expires after hours or 7
days and the certificate will be renewed after 60 days following man 1
acme-client

   -F  Force certificate renewal, even if it has more than 30 days
   validity.

It can't be the idea to have so long a expired OCSP file (saw Firefox in
the past complain when a outdated OCSP file exists). So, if you replace
the first && with a ; nothing will change as the last && to reload
relayd will only happen if the cert or the OCSP file (or both) was
renewed and if booth are up to date nothing will happen.

Just my 2 cents.

Regards,


Christoph

Am 30.07.22 um 19:07 schrieb Horia Racoviceanu:

Thanks for testing!

As Stuart Henderson mentioned,

You do really want to update OCSP if a cert has been renewed.


On 7/29/22, Christoph Roland Winter  wrote:

Hello,

I have only kept the first message and was some time not subscribed to
the list - lets see, where the message ends.

I tried the latest patch from
https://marc.info/?l=openbsd-ports=165827470732358=p3 and it worked
fine using

OpenBSD 7.2-beta (GENERIC.MP) #654: Wed Jul 27 20:10:05 MDT 2022 and the
-current ports tree using amd64.

Maybe I am wrong but the crontab from the above patch

+~ ~ * * * acme-client honk.example.com && ocspcheck -No
${SYSCONFDIR}/ssl/honk.example.com.{ocsp,crt} && rcctl reload relayd

needs to be modified. The first && must be replaced with ; (or splited
in 2 cron jobs). As it is now, the ocsp file gets only renewed all 60
days, as acme-client renews the certificate only 30 days before it
expires (checked with the -v option and as nothing happened before, &&
stops at this point). BTW my ocsp file with the above command is valid
for 7 days.

ocspcheck -vNo /etc/ssl/the.floof.rocks.{ocsp,crt}
Using http to host r3.o.lencr.org, port 80, path /
OCSP response validated from r3.o.lencr.org
  This Update: Thu Jul 28 15:00:00 2022
  Next Update: Thu Aug  4 14:59:58 2022

The only thing I did was using the /etc/examples/acme-client.conf file,
added my email and added the domain blocks.

Regards,


Christoph


Am 01.06.22 um 23:37 schrieb Horia Racoviceanu:

Upgrade to v0.9.8
- Add MESSAGE
- Update README

changelog

=== 0.9.8 Tentative Tentacle

+ Switch database to WAL mode.

- go version 1.16 required.

+ Specify banner: image in profile.

+ Update activity compatibility with mastodon.

- Signed fetch.

+ Better unicode hashtags.

+ Some more configuration options.

+ Some UI improvements to web interface.

+ Add atme class to mentions

+ Improvements to the mastodon importer.

+ More hydration capable pages.

+ Support for local.js.

+ Better error messages for timeouts.

+ Some improved html and markdown.








[update] fish 3.5.1

2022-07-30 Thread Florian Viehweger
Hi,

this updates to fish 3.5.1. Changes are listed here[1].

portcheck and port-lib-depends-check are happy. Some tests are failing
for example not being able to connect to a TMUX server or a X-Server,
even if it was running in TMUX in a tigervnc session.

Some testing done on amd64 and no errors found.


[1] https://fishshell.com/docs/current/relnotes.html


Index: Makefile
===
RCS file: /daten/openbsdmirror/cvs/mirror/ports/shells/fish/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- Makefile7 Jul 2022 16:23:17 -   1.35
+++ Makefile30 Jul 2022 22:54:39 -
@@ -1,8 +1,7 @@
 COMMENT =  friendly interactive shell
 
-V =3.4.1
+V =3.5.1
 DISTNAME = fish-$V
-REVISION = 3
 
 CATEGORIES =   shells
 
Index: distinfo
===
RCS file: /daten/openbsdmirror/cvs/mirror/ports/shells/fish/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo26 Mar 2022 13:55:15 -  1.12
+++ distinfo30 Jul 2022 22:54:39 -
@@ -1,2 +1,2 @@
-SHA256 (fish-3.4.1.tar.xz) = tvI7OEOwTbawqQ/qH28NDkDMAntKcyCYIAhj8oZKlOo=
-SIZE (fish-3.4.1.tar.xz) = 3293068
+SHA256 (fish-3.5.1.tar.xz) = ptRbPcWkXdMXcuf439/sq8BjmG6PZ9YL18pgzIHbaSg=
+SIZE (fish-3.5.1.tar.xz) = 3329900
Index: pkg/PLIST
===
RCS file: /daten/openbsdmirror/cvs/mirror/ports/shells/fish/pkg/PLIST,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 PLIST
--- pkg/PLIST   7 Jul 2022 16:23:17 -   1.15
+++ pkg/PLIST   30 Jul 2022 22:54:39 -
@@ -97,6 +97,7 @@ share/doc/fish/cmds/nextd.html
 share/doc/fish/cmds/not.html
 share/doc/fish/cmds/open.html
 share/doc/fish/cmds/or.html
+share/doc/fish/cmds/path.html
 share/doc/fish/cmds/popd.html
 share/doc/fish/cmds/prevd.html
 share/doc/fish/cmds/printf.html
@@ -227,6 +228,7 @@ share/fish/completions/apt-zip-list.fish
 share/fish/completions/apt.fish
 share/fish/completions/aptitude.fish
 share/fish/completions/arc.fish
+share/fish/completions/archlinux-java.fish
 share/fish/completions/arepack.fish
 share/fish/completions/argparse.fish
 share/fish/completions/arp.fish
@@ -267,6 +269,7 @@ share/fish/completions/bosh.fish
 share/fish/completions/bower.fish
 share/fish/completions/break.fish
 share/fish/completions/brew.fish
+share/fish/completions/brightnessctl.fish
 share/fish/completions/btdownloadcurses.py.fish
 share/fish/completions/btdownloadheadless.py.fish
 share/fish/completions/btrfs.fish
@@ -295,6 +298,7 @@ share/fish/completions/cf.fish
 share/fish/completions/chgrp.fish
 share/fish/completions/chmod.fish
 share/fish/completions/choice.fish
+share/fish/completions/choose.fish
 share/fish/completions/chown.fish
 share/fish/completions/chronyc.fish
 share/fish/completions/chsh.fish
@@ -385,6 +389,7 @@ share/fish/completions/dvipdf.fish
 share/fish/completions/dvipdfm.fish
 share/fish/completions/ebuild.fish
 share/fish/completions/echo.fish
+share/fish/completions/efibootmgr.fish
 share/fish/completions/egrep.fish
 share/fish/completions/eix-sync.fish
 share/fish/completions/eix.fish
@@ -410,8 +415,10 @@ share/fish/completions/exercism.fish
 share/fish/completions/exif.fish
 share/fish/completions/exit.fish
 share/fish/completions/expand.fish
+share/fish/completions/expect.fish
 share/fish/completions/ezjail-admin.fish
 share/fish/completions/fab.fish
+share/fish/completions/fastboot.fish
 share/fish/completions/feh.fish
 share/fish/completions/ffmpeg.fish
 share/fish/completions/ffplay.fish
@@ -647,6 +654,7 @@ share/fish/completions/mysql.fish
 share/fish/completions/mysqldump.fish
 share/fish/completions/namei.fish
 share/fish/completions/native2ascii.fish
+share/fish/completions/navi.fish
 share/fish/completions/nc.fish
 share/fish/completions/nc.openbsd.fish
 share/fish/completions/nc.traditional.fish
@@ -682,6 +690,7 @@ share/fish/completions/open.fish
 share/fish/completions/openocd.fish
 share/fish/completions/openssl.fish
 share/fish/completions/opkg.fish
+share/fish/completions/optimus-manager.fish
 share/fish/completions/optipng.fish
 share/fish/completions/or.fish
 share/fish/completions/p4.fish
@@ -697,6 +706,7 @@ share/fish/completions/pactree.fish
 share/fish/completions/pandoc.fish
 share/fish/completions/passwd.fish
 share/fish/completions/patch.fish
+share/fish/completions/path.fish
 share/fish/completions/patool.fish
 share/fish/completions/pbget.fish
 share/fish/completions/pdfelatex.fish
@@ -761,6 +771,7 @@ share/fish/completions/python.fish
 share/fish/completions/python2.fish
 share/fish/completions/python3.fish
 share/fish/completions/pzstd.fish
+share/fish/completions/qdbus.fish
 share/fish/completions/qmk.fish
 share/fish/completions/qubes-gpg-client.fish
 share/fish/completions/quilt.fish
@@ -772,9 +783,11 @@ share/fish/completions/rc-service.fish
 

[new] net/lstun -- lazy ssh tunnel

2022-07-30 Thread Omar Polo
hello ports,

i wrote this little utility some time ago.  it's a simple program that
binds a local port and lazily spawns an ssh tunnel to the configured
destination when a client attempts to connect to it and forwards the
data remotely.  Optionally, the ssh tunnel is killed after some
configurable time of inactivity.

i'm currently using to send emails.  I have

@reboot /usr/local/bin/lstun -B 2026:localhost:25 -b 2525 example.com

in my crontab and the following in smtpd.conf(5)

action "example"relay host localhost:2525

so then i have lstun listening on localhost:2525 and lazily spawning an
ssh tunnel on localhost:2026 to example.com:25.  smtpd connects to
localhost:2525 and it transparently talks to port 25 on example.com :)

it's narrow use-case, but i needed something like that and i don't think
i've found a tool to accomplished it out of the box; plus, it was fun to
write.



lstun.tar.gz
Description: GNU Zip compressed data


Re: [UPDATE] lang/erlang - erlang.port.mk

2022-07-30 Thread Stuart Henderson
On 2022/07/30 10:47, Volker Schlecht wrote:
> Index: erlang.port.mk
> ===
> RCS file: /cvs/ports/lang/erlang/erlang.port.mk,v
> retrieving revision 1.29
> diff -u -p -r1.29 erlang.port.mk
> --- erlang.port.mk11 Mar 2022 19:28:55 -  1.29
> +++ erlang.port.mk30 Jul 2022 08:44:38 -
> @@ -6,14 +6,14 @@ USE_GMAKE ?=Yes
>  
>  # Default Erlang version to use if MODERL_VERSION is not set.
>  # XXX: Keep in sync with devel/rebar/Makefile
> -MODERL_DEFAULT_VERSION =21
> +MODERL_DEFAULT_VERSION =25

Something needs changing to keep the XXX comment in sync, I think
probably it's the comment itself (s/rebar/rebar3/)

Since this and some of the other diffs are interdependent, can you send
everything that needs to be committed together in one mail please, to make
sure nothing gets forgotten - I've commited the erlang 25 update.



CVS: cvs.openbsd.org: ports

2022-07-30 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/07/30 15:48:39

Modified files:
lang/erlang/25 : Makefile distinfo 

Log message:
update to erlang 25.0.3, from Volker Schlecht



Re: [new] devel/libdispatch (for deadbeef)

2022-07-30 Thread Stuart Henderson
On 2022/07/12 12:13, Rafael Sadowski wrote:
> On Sun Jul 10, 2022 at 09:54:00PM +0200, Omar Polo wrote:
> > I was taking a look at deadbeef for curiosity and it seems that newer
> > versions needs this Grand Central Dispatch thingy.  Fortunately, an
> > impavid user has already done the though work to get this working on
> > OpenBSD [0], so this took just minutes to port.  (thanks!)
> > 
> > [0]: https://github.com/apple/swift-corelibs-libdispatch/pull/559
> > 
> > (I've just added two small patches on top to drop a -O3 and -Werror)
> > 
> > All but one test are passing!
> > 
> > As-is this conflicts with devel/blocksruntime due to
> > /usr/local/include/Block.h.  FWIW the two headers are practically
> > identical.  Maybe this libdispatch will deprecate blocksruntime?  Never
> > used blocks before so I don't know.
> > 
> > With this installed i manage to start compiling deadbeef and get until
> > the linking of the deadbeef executable (which fails for other reasons
> > than libdispatch.)

As long as the telegram-related ports are checked and handled if needed
I'm ok with importing libdispatch and removing BlocksRuntime (I doubt
anyone will have installed it, but just in case, please add @pkgpath)

> This may help us with asterisk? Of course this requires run-time tests. I
> have no chance to test this. Don't shoot the messenger!

I have a different diff for Asterisk that's less likely to break gcc archs.
It does seem to work in initial testing with 19. (I'll do more tests before
committing it).

Index: Makefile.inc
===
RCS file: /cvs/ports/telephony/asterisk/Makefile.inc,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile.inc
--- Makefile.inc12 May 2022 20:51:20 -  1.13
+++ Makefile.inc30 Jul 2022 21:24:19 -
@@ -31,28 +31,12 @@ DEBUG_PACKAGES= ${BUILD_PACKAGES}
 DPB_PROPERTIES=parallel
 
 # Asterisk requires either nested functions (gcc extension), or -fblocks 
(clang).
-# However -fblocks fails:
-#
-# - configure test fails on ld.bfd arches:
-#
-#echo 'int main(){return ^{return 42;}();}' | \
-# clang -o /tmp/blockstest -fblocks -x c -L/usr/local/lib 
-lBlocksRuntime -
-#
-# -> undefined reference to `_NSConcreteGlobalBlock' (also can be tested
-# on ld.lld arches by adding "-fuse-ld=bfd")
-#
-# - runtime fails on ld.lld arches: dlopen()ing the .so modules results in
-# undefined symbols from the BlocksRuntime lib (_NSConcreteStackBlock,
-# _Block_object_dispose, _Block_object_assign, etc); Asterisk appears to
-# start up but without modules loaded it is useless.
-#
-# So, as things stand, this requires building with gcc.
-#
-# If this is fixed and moved to clang, update telephony/asterisk-g729 in sync.
-COMPILER=  ports-gcc
+
+# Keep telephony/asterisk-g729 in sync.
+COMPILER=  base-clang ports-gcc
 # XXX bsd.port.arch.mk is included below, before compiler.port.mk can set
 # ONLY_FOR_ARCHS
-ONLY_FOR_ARCHS=${GCC49_ARCHS}
+ONLY_FOR_ARCHS=${CLANG_ARCHS} ${GCC49_ARCHS}
 
 SHARED_LIBS+=  asteriskssl ${SHLIB_V}
 SHARED_LIBS+=  asteriskpj ${SHLIB_V}
@@ -179,14 +163,14 @@ CFLAGS += -DHAVE_OPENSSL_BIO_METHOD
 
 .include 
 
-#.if ${PROPERTIES:Mclang}
-#BUILD_DEPENDS +=  devel/blocksruntime
-#LDFLAGS +=-lBlocksRuntime
-#WANTLIB-main +=   ${COMPILER_LIBCXX}
-#.else
+.if ${PROPERTIES:Mclang}
+LDFLAGS += -lBlocksRuntime
+BLOCKSLIBDEP = devel/libdispatch 
+BLOCKSWANTLIB =BlocksRuntime
+.else
 CFLAGS +=  -ftrampolines
 WANTLIB-main +=${MODGCC4_CPPWANTLIB}
-#.endif
+.endif
 
 # calendar
 COMMENT-calendar=  calendar support for Asterisk
@@ -312,9 +296,13 @@ EXAMPLEFILES=  cdr.conf extensions.ael e
 
 PKGSPEC-main=  asterisk-${VERSION_SPEC}
 
-.for i in ${MULTI_PACKAGES:N-main}
+.for i in ${MULTI_PACKAGES}
+.  if "$i" != "-main"
 PKGNAME$i ?=   asterisk$i-${VER}
 RUN_DEPENDS$i +=   telephony/asterisk/${SHORTVER}=${VER}
+.  endif
+LIB_DEPENDS$i +=   ${BLOCKSLIBDEP}
+WANTLIB$i +=   ${BLOCKSWANTLIB}
 .endfor
 
 # some of the patches have MS-DOS line endings which patch doesn't like.
Index: 16/Makefile
===
RCS file: /cvs/ports/telephony/asterisk/16/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- 16/Makefile 27 Jun 2022 08:23:06 -  1.17
+++ 16/Makefile 30 Jul 2022 21:24:19 -
@@ -3,6 +3,6 @@ PJ_V=   2.12
 SHLIB_V=   0.0
 VERSION_SPEC=  >=16.0,<17.0
 PORTROACH= limit:^16\.
-REVISION-main= 0
+REVISION=  1
 
 .include 
Index: 18/Makefile
===
RCS file: /cvs/ports/telephony/asterisk/18/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- 18/Makefile 27 Jun 2022 08:23:07 -  1.19
+++ 18/Makefile 30 Jul 

Re: UPDATE x11/herbstluftwm 0.9.5 from MAINTAINER

2022-07-30 Thread Florian Viehweger
After talking with with op@, libz recently got removed from libfreetype

openbsd-ports$ doas pkg-config --libs freetype2
-L/usr/X11R6/lib -lfreetype

Thanks!

> Hi,
> 
> I basically came up with the same diff, but Lucas was a bit faster
> submitting it than me.
> 
> No issues found after some testing on amd64.
> 
> I also wondered about libz. Does somebody have an idea why it is not
> needed anymore?
> 
> Thanks!
> 
> > Hello ports@,
> > 
> > Find an update for herbstluftwm in here. The release notes are:
> > 
> > - Key binds for release events.
> > - The Setting 'smart_frame_surroundings' has been changed to accept
> > the following new values: 'off', 'hide_all', and 'hide_gaps'.
> > Setting it to 'hide_gaps' will only hide frame gaps when applicable,
> > 'hide_all' and 'off' mirror the old behaviour with regards to 'true'
> > and 'false'.
> > - New format '%{ }' for easier attribute access in the sprintf
> > command
> > - New setting 'show_frame_decorations' that controls when frame
> >   decorations are shown. This should be used instead of the old
> >   'always_show_frame'
> > - New frame attribute 'content_geometry'
> > - New tag attribute 'at_end'
> > - New monitor attribute 'content_geometry'
> > - Fix bug in ipc protocol for big-endian systems
> > 
> > `make port-lib-depends-check` say we don't need libz anymore, so zap
> > it. I haven't noticed anything strange since doing it. But I do find
> > it strange we don't need it anymore. It was introduced on 0.9.2,
> > which made Xft and freetype dependencies, so I guess it was required
> > by those libraries back then and now it isn't the case anymore?
> > 
> > Cheers,
> > 
> > -Lucas
> > 
> > diff /usr/ports
> > commit - 86c765e1351ad5f98706285a475245bcd6625fdc
> > path + /usr/ports
> > blob - 094640f8a0e9a4ca1c4a7ba62be34b1169f85faf
> > file + x11/herbstluftwm/Makefile
> > --- x11/herbstluftwm/Makefile
> > +++ x11/herbstluftwm/Makefile
> > @@ -1,5 +1,5 @@
> >  COMMENT =  manual tiling window manager
> > -DISTNAME = herbstluftwm-0.9.4
> > +DISTNAME = herbstluftwm-0.9.5
> >  CATEGORIES =   x11
> >  
> >  HOMEPAGE = https://herbstluftwm.org/
> > @@ -11,7 +11,7 @@ MAINTAINER =  Lucas
> > , \ PERMIT_PACKAGE = Yes
> >  
> >  WANTLIB += ${COMPILER_LIBCXX} X11 Xext Xfixes Xft Xinerama Xrandr
> > -WANTLIB += Xrender c freetype m z
> > +WANTLIB += Xrender c freetype m
> >  
> >  MASTER_SITES = https://herbstluftwm.org/tarballs/
> >  
> > blob - eab46a31b90e3276c476ceeb2cd6ec1069887d0e
> > file + x11/herbstluftwm/distinfo
> > --- x11/herbstluftwm/distinfo
> > +++ x11/herbstluftwm/distinfo
> > @@ -1,2 +1,2 @@
> > -SHA256 (herbstluftwm-0.9.4.tar.gz) =
> > 7vju0HavM68qdZEcD7EhX9s0J2BqA06otE/naHLLA8w= -SIZE
> > (herbstluftwm-0.9.4.tar.gz) = 549029 +SHA256
> > (herbstluftwm-0.9.5.tar.gz) =
> > stRgCQnlvs5a1jgY37MLsZ/SrJ9ShHsaenStQEBxgQU= +SIZE
> > (herbstluftwm-0.9.5.tar.gz) = 556773
> > 
> 
> 
> 



-- 
greetings,

Florian Viehweger



update: wayland/wayland and wayland/wayland-protocols

2022-07-30 Thread Sebastien Marie
Hi,

The following diff updates wayland/wayland to 1.21.0 and 
wayland/wayland-protocols to 1.26.

wayland-protocols is simple.

wayland is more complex.

- I bumped SHARED_LIBS for wayland-client and wayland-server (new symbols 
  added). For the comment with the upstream version, I looked at meson.build 
  file, but I am a bit unsure (wayland-client seems to have switched from 3.0 
to 
  0.21.0 ?!)

- Regarding the code, I sent a MR request to upstream. The current patches 
  permits to build wayland on OpenBSD (and still on Linux), all tests are 
  passing.

  - define _BSD_SOURCE to get SOCK_CLOEXEC and mkostemp (there is a 
_POSIX_C_SOURCE on command-line which hide it else)
  - in tests, use llvm-nm(1) instead of nm(1) (BSD nm has incompatible options 
with GNU)
  - provide a compat layer for waitid()
  - epoll(7) has userspace wrapper around kqueue(2) is upstreamed: use it for 
OpenBSD
  - when using SO_PEERCRED, the struct to use onOpenBSD is `struct sockpeercred`
  - provide a compat layer for count_open_fds() (for tests)

Comments or OK ?
-- 
Sebastien Marie



diff /data/semarie/repos/openbsd/ports
commit - 0150291b1a3b6581d1519c18d130d81b43e52d16
path + /data/semarie/repos/openbsd/ports
blob - 2bf739823fadd261a14b1dae72d53626f6a73983
file + wayland/wayland/Makefile
--- wayland/wayland/Makefile
+++ wayland/wayland/Makefile
@@ -1,16 +1,15 @@
 COMMENT =  Display server protocol
 
-DISTNAME = wayland-1.19.0
-REVISION = 0
+DISTNAME = wayland-1.21.0
 
 CATEGORIES =   wayland
 
 HOMEPAGE = https://wayland.freedesktop.org/
 
-SHARED_LIBS +=  wayland-client  0.0 # 3.0
-SHARED_LIBS +=  wayland-cursor  0.0 # 0.0
+SHARED_LIBS +=  wayland-client  0.1 # 0.21.0
+SHARED_LIBS +=  wayland-cursor  0.0 # 0.21.0
 SHARED_LIBS +=  wayland-egl 0.0 # 1.0
-SHARED_LIBS +=  wayland-server  0.0 # 1.0
+SHARED_LIBS +=  wayland-server  0.1 # 0.21.0
 
 WANTLIB += c epoll-shim expat ffi xml2
 
@@ -30,8 +29,8 @@ LIB_DEPENDS = devel/libffi \
textproc/libxml \
devel/epoll-shim
 
-CFLAGS+=   "-I${LOCALBASE}/include/libepoll-shim"
-
 MODMESON_CONFIGURE_ARGS += -Ddocumentation=false
 
+TEST_DEPENDS = devel/llvm,-main
+
 .include 
blob - c6681ae77df3d933cb641234e3c341b7a979dbc6
file + wayland/wayland/distinfo
--- wayland/wayland/distinfo
+++ wayland/wayland/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wayland-1.19.0.tar.xz) = uszZAjANNUWBzVrTzEnapJIdVftBaliD4hh1D+8WbRU=
-SIZE (wayland-1.19.0.tar.xz) = 456380
+SHA256 (wayland-1.21.0.tar.xz) = bcZNf8FoN6aTpRz9suVo21OL/cn0V9RlYoW7lZTvEaw=
+SIZE (wayland-1.21.0.tar.xz) = 225936
blob - /dev/null
file + wayland/wayland/patches/patch-cursor_os-compatibility_c
--- /dev/null
+++ wayland/wayland/patches/patch-cursor_os-compatibility_c
@@ -0,0 +1,14 @@
+https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/256
+
+Index: cursor/os-compatibility.c
+--- cursor/os-compatibility.c.orig
 cursor/os-compatibility.c
+@@ -23,6 +23,8 @@
+  * SOFTWARE.
+  */
+ 
++#define _BSD_SOURCE
++#define _DEFAULT_SOURCE
+ #define _GNU_SOURCE
+ 
+ #include "config.h"
blob - /dev/null
file + wayland/wayland/patches/patch-egl_meson_build
--- /dev/null
+++ wayland/wayland/patches/patch-egl_meson_build
@@ -0,0 +1,14 @@
+https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/256
+
+Index: egl/meson.build
+--- egl/meson.build.orig
 egl/meson.build
+@@ -11,7 +11,7 @@ wayland_egl = library(
+ 
+ executable('wayland-egl-abi-check', 'wayland-egl-abi-check.c')
+ 
+-nm_path = find_program('nm').full_path()
++nm_path = find_program(['llvm-nm', 'nm']).full_path()
+ 
+ test(
+   'wayland-egl symbols check',
blob - 5dec069d72a7e55f745948e7da377dd53f3ffbd9
file + wayland/wayland/patches/patch-meson_build
--- wayland/wayland/patches/patch-meson_build
+++ wayland/wayland/patches/patch-meson_build
@@ -1,34 +1,36 @@
+https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/256
+
 Index: meson.build
 --- meson.build.orig
 +++ meson.build
-@@ -26,7 +26,14 @@ add_project_arguments(
+@@ -34,7 +34,12 @@ add_project_arguments(
language: 'c'
  )
  
--foreach h: [ 'sys/prctl.h' ]
+-foreach h: [ 'sys/prctl.h', 'sys/procctl.h', 'sys/ucred.h' ]
 +have_headers = [
-+   'signal.h',
-+   'sys/epoll.h',
-+   'sys/prctl.h',
-+   'sys/ucred.h',
-+  ]
-+
++  'sys/prctl.h',
++  'sys/procctl.h',
++  'sys/ucred.h',
++]
 +foreach h: have_headers
config_h.set('HAVE_' + h.underscorify().to_upper(), cc.has_header(h))
  endforeach
  
-@@ -37,12 +44,14 @@ have_funcs = [
-   'prctl',
+@@ -46,6 +51,7 @@ have_funcs = [
'memfd_create',
+   'mremap',
'strndup',
 +  'waitid',
  ]
  foreach f: have_funcs
config_h.set('HAVE_' + f.underscorify().to_upper(), cc.has_function(f))
- endforeach
+@@ -69,7 +75,7 @@ endif
+ config_h.set10('HAVE_BROKEN_MSG_CMSG_CLOEXEC', have_broken_msg_cmsg_cloexec)
  
  if 

Re: [MAINTAINER UPDATE] www/honk 0.9.7 -> 0.9.8

2022-07-30 Thread Christoph Roland Winter

Welcome.

The question is then, why the OCSP staple file expires after hours or 7 
days and the certificate will be renewed after 60 days following man 1 
acme-client


 -F  Force certificate renewal, even if it has more than 30 days
 validity.

It can't be the idea to have so long a expired OCSP file (saw Firefox in 
the past complain when a outdated OCSP file exists). So, if you replace 
the first && with a ; nothing will change as the last && to reload 
relayd will only happen if the cert or the OCSP file (or both) was 
renewed and if booth are up to date nothing will happen.


Just my 2 cents.

Regards,


Christoph

Am 30.07.22 um 19:07 schrieb Horia Racoviceanu:

Thanks for testing!

As Stuart Henderson mentioned,

You do really want to update OCSP if a cert has been renewed.


On 7/29/22, Christoph Roland Winter  wrote:

Hello,

I have only kept the first message and was some time not subscribed to
the list - lets see, where the message ends.

I tried the latest patch from
https://marc.info/?l=openbsd-ports=165827470732358=p3 and it worked
fine using

OpenBSD 7.2-beta (GENERIC.MP) #654: Wed Jul 27 20:10:05 MDT 2022 and the
-current ports tree using amd64.

Maybe I am wrong but the crontab from the above patch

+~ ~ * * * acme-client honk.example.com && ocspcheck -No
${SYSCONFDIR}/ssl/honk.example.com.{ocsp,crt} && rcctl reload relayd

needs to be modified. The first && must be replaced with ; (or splited
in 2 cron jobs). As it is now, the ocsp file gets only renewed all 60
days, as acme-client renews the certificate only 30 days before it
expires (checked with the -v option and as nothing happened before, &&
stops at this point). BTW my ocsp file with the above command is valid
for 7 days.

ocspcheck -vNo /etc/ssl/the.floof.rocks.{ocsp,crt}
Using http to host r3.o.lencr.org, port 80, path /
OCSP response validated from r3.o.lencr.org
 This Update: Thu Jul 28 15:00:00 2022
 Next Update: Thu Aug  4 14:59:58 2022

The only thing I did was using the /etc/examples/acme-client.conf file,
added my email and added the domain blocks.

Regards,


Christoph


Am 01.06.22 um 23:37 schrieb Horia Racoviceanu:

Upgrade to v0.9.8
- Add MESSAGE
- Update README

changelog

=== 0.9.8 Tentative Tentacle

+ Switch database to WAL mode.

- go version 1.16 required.

+ Specify banner: image in profile.

+ Update activity compatibility with mastodon.

- Signed fetch.

+ Better unicode hashtags.

+ Some more configuration options.

+ Some UI improvements to web interface.

+ Add atme class to mentions

+ Improvements to the mastodon importer.

+ More hydration capable pages.

+ Support for local.js.

+ Better error messages for timeouts.

+ Some improved html and markdown.






Re: UPDATE x11/herbstluftwm 0.9.5 from MAINTAINER

2022-07-30 Thread Florian Viehweger
Hi,

I basically came up with the same diff, but Lucas was a bit faster
submitting it than me.

No issues found after some testing on amd64.

I also wondered about libz. Does somebody have an idea why it is not
needed anymore?

Thanks!

> Hello ports@,
> 
> Find an update for herbstluftwm in here. The release notes are:
> 
> - Key binds for release events.
> - The Setting 'smart_frame_surroundings' has been changed to accept
> the following new values: 'off', 'hide_all', and 'hide_gaps'. Setting
> it to 'hide_gaps' will only hide frame gaps when applicable,
> 'hide_all' and 'off' mirror the old behaviour with regards to 'true'
> and 'false'.
> - New format '%{ }' for easier attribute access in the sprintf command
> - New setting 'show_frame_decorations' that controls when frame
>   decorations are shown. This should be used instead of the old
>   'always_show_frame'
> - New frame attribute 'content_geometry'
> - New tag attribute 'at_end'
> - New monitor attribute 'content_geometry'
> - Fix bug in ipc protocol for big-endian systems
> 
> `make port-lib-depends-check` say we don't need libz anymore, so zap
> it. I haven't noticed anything strange since doing it. But I do find
> it strange we don't need it anymore. It was introduced on 0.9.2,
> which made Xft and freetype dependencies, so I guess it was required
> by those libraries back then and now it isn't the case anymore?
> 
> Cheers,
> 
> -Lucas
> 
> diff /usr/ports
> commit - 86c765e1351ad5f98706285a475245bcd6625fdc
> path + /usr/ports
> blob - 094640f8a0e9a4ca1c4a7ba62be34b1169f85faf
> file + x11/herbstluftwm/Makefile
> --- x11/herbstluftwm/Makefile
> +++ x11/herbstluftwm/Makefile
> @@ -1,5 +1,5 @@
>  COMMENT =manual tiling window manager
> -DISTNAME =   herbstluftwm-0.9.4
> +DISTNAME =   herbstluftwm-0.9.5
>  CATEGORIES = x11
>  
>  HOMEPAGE =   https://herbstluftwm.org/
> @@ -11,7 +11,7 @@ MAINTAINER =Lucas , \
>  PERMIT_PACKAGE = Yes
>  
>  WANTLIB += ${COMPILER_LIBCXX} X11 Xext Xfixes Xft Xinerama Xrandr
> -WANTLIB += Xrender c freetype m z
> +WANTLIB += Xrender c freetype m
>  
>  MASTER_SITES =   https://herbstluftwm.org/tarballs/
>  
> blob - eab46a31b90e3276c476ceeb2cd6ec1069887d0e
> file + x11/herbstluftwm/distinfo
> --- x11/herbstluftwm/distinfo
> +++ x11/herbstluftwm/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (herbstluftwm-0.9.4.tar.gz) =
> 7vju0HavM68qdZEcD7EhX9s0J2BqA06otE/naHLLA8w= -SIZE
> (herbstluftwm-0.9.4.tar.gz) = 549029 +SHA256
> (herbstluftwm-0.9.5.tar.gz) =
> stRgCQnlvs5a1jgY37MLsZ/SrJ9ShHsaenStQEBxgQU= +SIZE
> (herbstluftwm-0.9.5.tar.gz) = 556773
> 



-- 
greetings,

Florian Viehweger



UPDATE x11/herbstluftwm 0.9.5 from MAINTAINER

2022-07-30 Thread Lucas
Hello ports@,

Find an update for herbstluftwm in here. The release notes are:

- Key binds for release events.
- The Setting 'smart_frame_surroundings' has been changed to accept the
  following new values: 'off', 'hide_all', and 'hide_gaps'. Setting it
  to 'hide_gaps' will only hide frame gaps when applicable, 'hide_all'
  and 'off' mirror the old behaviour with regards to 'true' and 'false'.
- New format '%{ }' for easier attribute access in the sprintf command
- New setting 'show_frame_decorations' that controls when frame
  decorations are shown. This should be used instead of the old
  'always_show_frame'
- New frame attribute 'content_geometry'
- New tag attribute 'at_end'
- New monitor attribute 'content_geometry'
- Fix bug in ipc protocol for big-endian systems

`make port-lib-depends-check` say we don't need libz anymore, so zap it.
I haven't noticed anything strange since doing it. But I do find it
strange we don't need it anymore. It was introduced on 0.9.2, which made
Xft and freetype dependencies, so I guess it was required by those
libraries back then and now it isn't the case anymore?

Cheers,

-Lucas

diff /usr/ports
commit - 86c765e1351ad5f98706285a475245bcd6625fdc
path + /usr/ports
blob - 094640f8a0e9a4ca1c4a7ba62be34b1169f85faf
file + x11/herbstluftwm/Makefile
--- x11/herbstluftwm/Makefile
+++ x11/herbstluftwm/Makefile
@@ -1,5 +1,5 @@
 COMMENT =  manual tiling window manager
-DISTNAME = herbstluftwm-0.9.4
+DISTNAME = herbstluftwm-0.9.5
 CATEGORIES =   x11
 
 HOMEPAGE = https://herbstluftwm.org/
@@ -11,7 +11,7 @@ MAINTAINER =  Lucas , \
 PERMIT_PACKAGE =   Yes
 
 WANTLIB += ${COMPILER_LIBCXX} X11 Xext Xfixes Xft Xinerama Xrandr
-WANTLIB += Xrender c freetype m z
+WANTLIB += Xrender c freetype m
 
 MASTER_SITES = https://herbstluftwm.org/tarballs/
 
blob - eab46a31b90e3276c476ceeb2cd6ec1069887d0e
file + x11/herbstluftwm/distinfo
--- x11/herbstluftwm/distinfo
+++ x11/herbstluftwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (herbstluftwm-0.9.4.tar.gz) = 
7vju0HavM68qdZEcD7EhX9s0J2BqA06otE/naHLLA8w=
-SIZE (herbstluftwm-0.9.4.tar.gz) = 549029
+SHA256 (herbstluftwm-0.9.5.tar.gz) = 
stRgCQnlvs5a1jgY37MLsZ/SrJ9ShHsaenStQEBxgQU=
+SIZE (herbstluftwm-0.9.5.tar.gz) = 556773



CVS: cvs.openbsd.org: ports

2022-07-30 Thread Benoit Lecocq
CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2022/07/30 08:55:40

Modified files:
devel/p5-Log-Log4perl: Makefile distinfo 

Log message:
Update to p5-Log-Log4perl-1.55.



CVS: cvs.openbsd.org: ports

2022-07-30 Thread Benoit Lecocq
CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2022/07/30 08:47:57

Modified files:
devel/p5-Locale-Codes: Makefile distinfo 

Log message:
Update to p5-Locale-Codes-3.71.



[new] fonts/cursed-font

2022-07-30 Thread Thim Cederlund
Hi ports@,

% pkg_info cursed-font
Information for inst:cursed-font-1.0.0

Comment:
monospaced 9x18 bitmap font for low-DPI screens

Description:
cursed font is a 9x18 bitmapped font designed for low-DPI screens.
It was originally an embiggened and monospace-ified version of Apple's Chicago
font from System 6, but it also takes inspiration from many other fonts such
as bizcat, ttyp0, tamzen, scientifica.

Maintainer: Thim Cederlund 

WWW: https://github.com/kiedtl/cursed


Picture of the font in use: https://tilde.team/~kiedtl/images/cursed/sdemo.png


Best Regards,

Thim Cederlund



cursed-font.tar.gz
Description: application/gzip


Re: [UPDATE] lang/elixir 1.13.4

2022-07-30 Thread Christoph Roland Winter

Hello Stuart,

thanks for the fast answer, Yes, then it works.

Regards,


Christoph


Am 30.07.22 um 15:15 schrieb Stuart Henderson:

The erlang.port.mk diff is also required for this one.

--
   Sent from a phone, apologies for poor formatting.


On 30 July 2022 13:02:18 Christoph Roland Winter  wrote:


Hello,

tried the patch using OpenBSD 7.2-beta (GENERIC.MP) #656: Thu Jul 28
10:05:38 MDT 2022, amd64 and Erlang 25.0.3 from ports and got.

Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
===>  Checking files for elixir-1.13.4
Invalid MODERL_VERSION set: 25. (in lang/elixir)

Fetch

https://github.com/elixir-lang/elixir/archive/v1.13.4/elixir-1.13.4.tar.gz

(SHA256) elixir-1.13.4.tar.gz: OK

===> elixir-1.13.4 depends on: rebar-* - not found
===>  Verifying install for rebar-* in devel/rebar
===>  Checking files for rebar-2.6.4p2

Fetch https://github.com/rebar/rebar/archive/2.6.4/rebar-2.6.4.tar.gz
(SHA256) rebar-2.6.4.tar.gz: OK
Broken dependency: lang/erlang/ ends with / (DEPENDS was

lang/erlang/) in devel/rebar
*** Error 1 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2293
'/usr/ports/pobj/rebar-2.6.4/.dep-lang-erlang-': @unset...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2705
'/usr/ports/pobj/rebar-2.6.4/.extract_done': @cd /usr/p...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2143
'/usr/ports/packages/amd64/all/rebar-2.6.4p2.tgz': @cd ...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2632 '_internal-package':
@case X${_DEPENDS_CACHE} in  X) _D...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2611 'package': @:; cd
/usr/ports/devel/rebar && PKGPATH=dev...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2164
'/var/db/pkg/rebar-2.6.4p2/+CONTENTS': @cd /usr/ports/d...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2611 'install':
@lock=rebar-2.6.4p2;  export _LOCKS_HELD=" e...)
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2293
'/usr/ports/pobj/elixir-1.13.4/.dep-devel-rebar,': @unset
_DEPENDS_TARGET _M...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2705
'/usr/ports/pobj/elixir-1.13.4/.extract_done': @cd
/usr/ports/lang/elixir &&...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2143
'/usr/ports/packages/amd64/all/elixir-1.13.4.tgz': @cd
/usr/ports/lang/elixi...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2632
'_internal-package': @case X${_DEPENDS_CACHE} in  X) _DEPENDS_CACHE=$(
mktem...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2611
'package': @:; cd /usr/ports/lang/elixir && PKGPATH=lang/elixir make
_intern...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2164
'/var/db/pkg/elixir-1.13.4/+CONTENTS': @cd /usr/ports/lang/elixir &&
PKGPATH...)
*** Error 2 in /usr/ports/lang/elixir
(/usr/ports/infrastructure/mk/bsd.port.mk:2611 'install':
@lock=elixir-1.13.4;  export _LOCKS_HELD=" e...)


Regards,


Christoph


Am 30.07.22 um 10:49 schrieb Volker Schlecht:

Another bump.

On 7/23/22 10:55, Volker Schlecht wrote:

bump

On 7/16/22 11:26, Volker Schlecht wrote:

Updates lang/elixir to 1.13.4
Changes MODERL_VERSION to 25 (erlang21 is now unsupported)
Requires rebar3 >= 3.19.0
Requires the patched lang/erlang/erlang.port.mk

Builds and tests fine on amd64








Re: [UPDATE] lang/elixir 1.13.4

2022-07-30 Thread Stuart Henderson

The erlang.port.mk diff is also required for this one.

--
 Sent from a phone, apologies for poor formatting.

On 30 July 2022 13:02:18 Christoph Roland Winter  wrote:


Hello,

tried the patch using OpenBSD 7.2-beta (GENERIC.MP) #656: Thu Jul 28
10:05:38 MDT 2022, amd64 and Erlang 25.0.3 from ports and got.

Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
===>  Checking files for elixir-1.13.4
Invalid MODERL_VERSION set: 25. (in lang/elixir)
>> Fetch
https://github.com/elixir-lang/elixir/archive/v1.13.4/elixir-1.13.4.tar.gz
>> (SHA256) elixir-1.13.4.tar.gz: OK
===> elixir-1.13.4 depends on: rebar-* - not found
===>  Verifying install for rebar-* in devel/rebar
===>  Checking files for rebar-2.6.4p2
>> Fetch https://github.com/rebar/rebar/archive/2.6.4/rebar-2.6.4.tar.gz
>> (SHA256) rebar-2.6.4.tar.gz: OK
>> Broken dependency: lang/erlang/ ends with / (DEPENDS was
lang/erlang/) in devel/rebar
*** Error 1 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2293
'/usr/ports/pobj/rebar-2.6.4/.dep-lang-erlang-': @unset...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2705
'/usr/ports/pobj/rebar-2.6.4/.extract_done': @cd /usr/p...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2143
'/usr/ports/packages/amd64/all/rebar-2.6.4p2.tgz': @cd ...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2632 '_internal-package':
@case X${_DEPENDS_CACHE} in  X) _D...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2611 'package': @:; cd
/usr/ports/devel/rebar && PKGPATH=dev...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2164
'/var/db/pkg/rebar-2.6.4p2/+CONTENTS': @cd /usr/ports/d...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2611 'install':
@lock=rebar-2.6.4p2;  export _LOCKS_HELD=" e...)
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2293
'/usr/ports/pobj/elixir-1.13.4/.dep-devel-rebar,': @unset
_DEPENDS_TARGET _M...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2705
'/usr/ports/pobj/elixir-1.13.4/.extract_done': @cd
/usr/ports/lang/elixir &&...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2143
'/usr/ports/packages/amd64/all/elixir-1.13.4.tgz': @cd
/usr/ports/lang/elixi...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2632
'_internal-package': @case X${_DEPENDS_CACHE} in  X) _DEPENDS_CACHE=$(
mktem...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2611
'package': @:; cd /usr/ports/lang/elixir && PKGPATH=lang/elixir make
_intern...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2164
'/var/db/pkg/elixir-1.13.4/+CONTENTS': @cd /usr/ports/lang/elixir &&
PKGPATH...)
*** Error 2 in /usr/ports/lang/elixir
(/usr/ports/infrastructure/mk/bsd.port.mk:2611 'install':
@lock=elixir-1.13.4;  export _LOCKS_HELD=" e...)


Regards,


Christoph


Am 30.07.22 um 10:49 schrieb Volker Schlecht:

Another bump.

On 7/23/22 10:55, Volker Schlecht wrote:

bump

On 7/16/22 11:26, Volker Schlecht wrote:

Updates lang/elixir to 1.13.4
Changes MODERL_VERSION to 25 (erlang21 is now unsupported)
Requires rebar3 >= 3.19.0
Requires the patched lang/erlang/erlang.port.mk

Builds and tests fine on amd64






Re: [UPDATE] lang/elixir 1.13.4

2022-07-30 Thread Christoph Roland Winter

Hello,

tried the patch using OpenBSD 7.2-beta (GENERIC.MP) #656: Thu Jul 28 
10:05:38 MDT 2022, amd64 and Erlang 25.0.3 from ports and got.


Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
===>  Checking files for elixir-1.13.4
Invalid MODERL_VERSION set: 25. (in lang/elixir)
>> Fetch 
https://github.com/elixir-lang/elixir/archive/v1.13.4/elixir-1.13.4.tar.gz

>> (SHA256) elixir-1.13.4.tar.gz: OK
===> elixir-1.13.4 depends on: rebar-* - not found
===>  Verifying install for rebar-* in devel/rebar
===>  Checking files for rebar-2.6.4p2
>> Fetch https://github.com/rebar/rebar/archive/2.6.4/rebar-2.6.4.tar.gz
>> (SHA256) rebar-2.6.4.tar.gz: OK
>> Broken dependency: lang/erlang/ ends with / (DEPENDS was 
lang/erlang/) in devel/rebar
*** Error 1 in /usr/ports/devel/rebar 
(/usr/ports/infrastructure/mk/bsd.port.mk:2293 
'/usr/ports/pobj/rebar-2.6.4/.dep-lang-erlang-': @unset...)
*** Error 2 in /usr/ports/devel/rebar 
(/usr/ports/infrastructure/mk/bsd.port.mk:2705 
'/usr/ports/pobj/rebar-2.6.4/.extract_done': @cd /usr/p...)
*** Error 2 in /usr/ports/devel/rebar 
(/usr/ports/infrastructure/mk/bsd.port.mk:2143 
'/usr/ports/packages/amd64/all/rebar-2.6.4p2.tgz': @cd ...)
*** Error 2 in /usr/ports/devel/rebar 
(/usr/ports/infrastructure/mk/bsd.port.mk:2632 '_internal-package': 
@case X${_DEPENDS_CACHE} in  X) _D...)
*** Error 2 in /usr/ports/devel/rebar 
(/usr/ports/infrastructure/mk/bsd.port.mk:2611 'package': @:; cd 
/usr/ports/devel/rebar && PKGPATH=dev...)
*** Error 2 in /usr/ports/devel/rebar 
(/usr/ports/infrastructure/mk/bsd.port.mk:2164 
'/var/db/pkg/rebar-2.6.4p2/+CONTENTS': @cd /usr/ports/d...)
*** Error 2 in /usr/ports/devel/rebar 
(/usr/ports/infrastructure/mk/bsd.port.mk:2611 'install': 
@lock=rebar-2.6.4p2;  export _LOCKS_HELD=" e...)
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2293 
'/usr/ports/pobj/elixir-1.13.4/.dep-devel-rebar,': @unset 
_DEPENDS_TARGET _M...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2705 
'/usr/ports/pobj/elixir-1.13.4/.extract_done': @cd 
/usr/ports/lang/elixir &&...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2143 
'/usr/ports/packages/amd64/all/elixir-1.13.4.tgz': @cd 
/usr/ports/lang/elixi...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2632 
'_internal-package': @case X${_DEPENDS_CACHE} in  X) _DEPENDS_CACHE=$( 
mktem...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2611 
'package': @:; cd /usr/ports/lang/elixir && PKGPATH=lang/elixir make 
_intern...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2164 
'/var/db/pkg/elixir-1.13.4/+CONTENTS': @cd /usr/ports/lang/elixir && 
PKGPATH...)
*** Error 2 in /usr/ports/lang/elixir 
(/usr/ports/infrastructure/mk/bsd.port.mk:2611 'install': 
@lock=elixir-1.13.4;  export _LOCKS_HELD=" e...)



Regards,


Christoph


Am 30.07.22 um 10:49 schrieb Volker Schlecht:

Another bump.

On 7/23/22 10:55, Volker Schlecht wrote:

bump

On 7/16/22 11:26, Volker Schlecht wrote:

Updates lang/elixir to 1.13.4
Changes MODERL_VERSION to 25 (erlang21 is now unsupported)
Requires rebar3 >= 3.19.0
Requires the patched lang/erlang/erlang.port.mk

Builds and tests fine on amd64






Re: [UPDATE] lang/erlang/25 25.0.3

2022-07-30 Thread Christoph Roland Winter

Hello,

the build worked using OpenBSD 7.2-beta (GENERIC.MP) #656: Thu Jul 28 
10:05:38 MDT 2022, amd64


Regards,

Christoph


Am 30.07.22 um 10:50 schrieb Volker Schlecht:

And ... bump.

On 7/23/22 10:56, Volker Schlecht wrote:

bump

On 7/16/22 12:33, Volker Schlecht wrote:

Updates lang/erlang/25 to version 25.0.3

https://www.erlang.org/patches/otp-25.0.3

It plays well with the proposed changes to devel/rebar3, lang/elixir 
and erlang.port.mk, but is not a precondition for any of them.






Re: net/swirc (3.3.5): 'WANTLIB' + 'CONFIGURE_ENV'

2022-07-30 Thread Omar Polo
Markus Uhlin  wrote:
> ok markus@
> :-)

committed with the REVISION bump i forgot in the diff :)



CVS: cvs.openbsd.org: ports

2022-07-30 Thread Omar Polo
CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2022/07/30 05:14:47

Modified files:
net/swirc  : Makefile 
Added files:
net/swirc/patches: patch-posixshell_os_BSD_sh 

Log message:
net/swirc: enable libiconv

while here tweak the port so it prints the executed commands and picks
up our CFLAGS/CXXFLAGS.

initial diff and ok Markus Uhlin (MAINTAINER)



Re: net/swirc (3.3.5): 'WANTLIB' + 'CONFIGURE_ENV'

2022-07-30 Thread Markus Uhlin
ok markus@
:-)

On Sat, Jul 30, 2022 at 11:03:48AM +0200, Omar Polo wrote:
> Markus Uhlin  wrote:
> > Hi ports@
> > 
> > Starting from version 3.3.5 libiconv can be used so I added 'iconv' to
> > 'WANTLIB'.
> > 
> > Further in order for the configure script to find/recognize support
> > for libiconv and libintl setting 'CONFIGURE_ENV' seems to be
> > necessary.
> > 
> > I attach a diff.
> 
> your diff works for me, the configure manages to correctly pick up
> libiconv and use it.  However, while testing this i've noticed that:
> 
>  1. the build doesn't show the commands being executed and
>  2. the build ignores our CFLAGS
> 
> diff below builds on top of yours and fixes the these points too, ok?
> 
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/net/swirc/Makefile,v
> retrieving revision 1.17
> diff -u -p -r1.17 Makefile
> --- Makefile  29 Jul 2022 16:44:06 -  1.17
> +++ Makefile  30 Jul 2022 08:55:51 -
> @@ -9,16 +9,26 @@ MAINTAINER =Markus Uhlin   PERMIT_PACKAGE = Yes
>  
>  # uses pledge()
> -WANTLIB =${COMPILER_LIBCXX} c crypto curl curses idn intl m 
> panel pthread ssl
> +WANTLIB =${COMPILER_LIBCXX} c crypto curl curses iconv idn intl \
> + m panel pthread ssl
>  
>  MASTER_SITES =   https://www.nifty-networks.net/swirc/releases/
>  EXTRACT_SUFX =   .tgz
> +
> +# C++17
>  COMPILER =   base-clang ports-gcc
> +
>  BUILD_DEPENDS =  devel/gettext,-tools
>  LIB_DEPENDS =devel/gettext,-runtime \
>   devel/libidn \
>   net/curl
> +
> +CFLAGS +=-I${LOCALBASE}/include
> +LDFLAGS +=   -L${LOCALBASE}/lib
> +
>  CONFIGURE_STYLE =simple
> +CONFIGURE_ENV += CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
> + LDFLAGS="${LDFLAGS}"
>  
>  TEST_DEPENDS =   devel/cmocka
>  TEST_TARGET =check
> @@ -27,5 +37,8 @@ MAKE_FLAGS =DEST_CONFMAN=${WRKINST}${P
>   DEST_MANUAL=${WRKINST}${PREFIX}/man/man1 \
>   INSTALL_DEPS=swirc src/swirc.1 swirc.conf.5 \
>   PREFIX="${PREFIX}" CC="${CC}" CXX="${CXX}"
> +
> +# show the commands being executed
> +MAKE_FLAGS +=E=@true Q=''
>  
>  .include 
> Index: patches/patch-posixshell_os_BSD_sh
> ===
> RCS file: patches/patch-posixshell_os_BSD_sh
> diff -N patches/patch-posixshell_os_BSD_sh
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-posixshell_os_BSD_sh30 Jul 2022 08:57:35 -
> @@ -0,0 +1,22 @@
> +propagate cflags and neuter hardcoded optimizations
> +
> +Index: posixshell/os_BSD.sh
> +--- posixshell/os_BSD.sh.orig
>  posixshell/os_BSD.sh
> +@@ -9,13 +9,11 @@ SHARED_FLAGS=-DBSD=1\\
> + -DUNIX=1\\
> + -D_XOPEN_SOURCE_EXTENDED=1\\
> + -I/usr/local/include\\
> +--O2\\
> +--Wall\\
> +--pipe
> ++-Wall
> + CC=cc
> +-CFLAGS=\$(SHARED_FLAGS) -std=c17
> ++CFLAGS=\$(SHARED_FLAGS) -std=c17 ${CFLAGS}
> + CXX=c++
> +-CXXFLAGS=\$(SHARED_FLAGS) -std=c++17
> ++CXXFLAGS=\$(SHARED_FLAGS) -std=c++17 ${CXXFLAGS}
> + LDFLAGS=-L/usr/local/lib
> + LDLIBS=-lcrypto\\
> + -lcurl\\
> 



Re: graphics/arcan: enable wayland + avoid picking some libraries

2022-07-30 Thread Stuart Henderson
On 2022/07/29 19:28, Sebastien Marie wrote:
> - mupdf: I explicitly disabled it: it failed to build with it (jbig2dec 
> symbol 
>   missing, maybe wrong version ? unsure)

To link against libmupdf, you need to figure out the libraries to add,
upstream doesn't provide a shared library or pkg-config files etc to allow
doing this easily (and change the build system often enough that patching
to provide .so is annoying). Also they break API frequently, so overall
disabling is usually the best option if possible.



Re: net/swirc (3.3.5): 'WANTLIB' + 'CONFIGURE_ENV'

2022-07-30 Thread Omar Polo
Markus Uhlin  wrote:
> Hi ports@
> 
> Starting from version 3.3.5 libiconv can be used so I added 'iconv' to
> 'WANTLIB'.
> 
> Further in order for the configure script to find/recognize support
> for libiconv and libintl setting 'CONFIGURE_ENV' seems to be
> necessary.
> 
> I attach a diff.

your diff works for me, the configure manages to correctly pick up
libiconv and use it.  However, while testing this i've noticed that:

 1. the build doesn't show the commands being executed and
 2. the build ignores our CFLAGS

diff below builds on top of yours and fixes the these points too, ok?

Index: Makefile
===
RCS file: /home/cvs/ports/net/swirc/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile29 Jul 2022 16:44:06 -  1.17
+++ Makefile30 Jul 2022 08:55:51 -
@@ -9,16 +9,26 @@ MAINTAINER =  Markus Uhlin https://www.nifty-networks.net/swirc/releases/
 EXTRACT_SUFX = .tgz
+
+# C++17
 COMPILER = base-clang ports-gcc
+
 BUILD_DEPENDS =devel/gettext,-tools
 LIB_DEPENDS =  devel/gettext,-runtime \
devel/libidn \
net/curl
+
+CFLAGS +=  -I${LOCALBASE}/include
+LDFLAGS += -L${LOCALBASE}/lib
+
 CONFIGURE_STYLE =  simple
+CONFIGURE_ENV +=   CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+   LDFLAGS="${LDFLAGS}"
 
 TEST_DEPENDS = devel/cmocka
 TEST_TARGET =  check
@@ -27,5 +37,8 @@ MAKE_FLAGS =  DEST_CONFMAN=${WRKINST}${P
DEST_MANUAL=${WRKINST}${PREFIX}/man/man1 \
INSTALL_DEPS=swirc src/swirc.1 swirc.conf.5 \
PREFIX="${PREFIX}" CC="${CC}" CXX="${CXX}"
+
+# show the commands being executed
+MAKE_FLAGS +=  E=@true Q=''
 
 .include 
Index: patches/patch-posixshell_os_BSD_sh
===
RCS file: patches/patch-posixshell_os_BSD_sh
diff -N patches/patch-posixshell_os_BSD_sh
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-posixshell_os_BSD_sh  30 Jul 2022 08:57:35 -
@@ -0,0 +1,22 @@
+propagate cflags and neuter hardcoded optimizations
+
+Index: posixshell/os_BSD.sh
+--- posixshell/os_BSD.sh.orig
 posixshell/os_BSD.sh
+@@ -9,13 +9,11 @@ SHARED_FLAGS=-DBSD=1\\
+   -DUNIX=1\\
+   -D_XOPEN_SOURCE_EXTENDED=1\\
+   -I/usr/local/include\\
+-  -O2\\
+-  -Wall\\
+-  -pipe
++  -Wall
+ CC=cc
+-CFLAGS=\$(SHARED_FLAGS) -std=c17
++CFLAGS=\$(SHARED_FLAGS) -std=c17 ${CFLAGS}
+ CXX=c++
+-CXXFLAGS=\$(SHARED_FLAGS) -std=c++17
++CXXFLAGS=\$(SHARED_FLAGS) -std=c++17 ${CXXFLAGS}
+ LDFLAGS=-L/usr/local/lib
+ LDLIBS=-lcrypto\\
+   -lcurl\\



CVS: cvs.openbsd.org: ports

2022-07-30 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/07/30 02:41:03

Modified files:
sysutils/awscli: Makefile distinfo 

Log message:
Update to awscli-1.25.41.



CVS: cvs.openbsd.org: ports

2022-07-30 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/07/30 02:40:50

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py3-boto3-1.24.41.



CVS: cvs.openbsd.org: ports

2022-07-30 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/07/30 02:40:38

Modified files:
net/py-botocore: Makefile distinfo 
net/py-botocore/pkg: PLIST 

Log message:
Update to py3-botocore-1.27.41.



CVS: cvs.openbsd.org: ports

2022-07-30 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/07/30 02:26:34

Modified files:
x11/gnome/browser-connector: Makefile 
x11/gnome/browser-connector/pkg: PLIST 

Log message:
Match @sample directory with pkgname.



Re: UPDATE: Tor Browser 11.5.1 for -stable

2022-07-30 Thread Caspar Schutijser
And here is the diff for -stable. Still building and I will do some
testing afterwards; OK provided that works out?

Caspar


Index: meta/tor-browser//Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.53.2.3
diff -u -p -r1.53.2.3 Makefile
--- meta/tor-browser//Makefile  9 Jun 2022 19:23:19 -   1.53.2.3
+++ meta/tor-browser//Makefile  30 Jul 2022 07:39:57 -
@@ -2,11 +2,11 @@ COMMENT=  Tor Browser meta package
 
 MAINTAINER=Caspar Schutijser 
 
-PKGNAME=   tor-browser-11.0.14
+PKGNAME=   tor-browser-11.5.1
 ONLY_FOR_ARCHS =   amd64
 
-RUN_DEPENDS=   www/tor-browser/browser>=11.0.14 \
+RUN_DEPENDS=   www/tor-browser/browser>=11.5.1 \
www/tor-browser/noscript>=11.4.6 \
-   net/tor>=0.4.7.7
+   net/tor>=0.4.7.8
 
 .include 
Index: meta/tor-browser//pkg/DESCR
===
RCS file: /cvs/ports/meta/tor-browser/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- meta/tor-browser//pkg/DESCR 13 Jan 2022 20:02:29 -  1.2
+++ meta/tor-browser//pkg/DESCR 30 Jul 2022 07:39:57 -
@@ -4,14 +4,8 @@ network. In addition to obscuring the cl
 mitigates browser fingerprinting attacks and patches the Mozilla code
 in other ways to prevent privacy leaks.
 
-Tor Browser includes the patched version of Firefox ESR and these
-Firefox add-ons:
-
-* noscript: a well-known add-on for Firefox that allows flexible blocking
-  of JS.  The version in the Tor Browser ports is specifically configured
-  for use in Tor Browser by the Tor project and is not for use with other
-  Mozilla-based browsers;
-* https-everywhere: an add-on for Firefox from EFF that attempts to turn
-  http:// requests into https:// requests wherever possible.  Like noscript,
-  the verison in the Tor Browser ports is specifically configured for use
-  in Tor Browser.
+Tor Browser includes the patched version of Firefox ESR and the NoScript
+Firefox add-on, a well-known add-on that allows flexible blocking
+of JS.  The version in the Tor Browser ports is specifically configured
+for use in Tor Browser by the Tor project and is not for use with other
+Mozilla-based browsers.
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.51.2.3
diff -u -p -r1.51.2.3 Makefile.inc
--- www/tor-browser/Makefile.inc9 Jun 2022 19:23:19 -   1.51.2.3
+++ www/tor-browser/Makefile.inc30 Jul 2022 07:39:57 -
@@ -3,7 +3,7 @@ HOMEPAGE ?= https://www.torproject.org
 PERMIT_PACKAGE ?=  Yes
 CATEGORIES =   www
 BROWSER_NAME = tor-browser
-TB_VERSION =   11.0.14
+TB_VERSION =   11.5.1
 TB_PREFIX =tb
 
 SUBST_VARS +=  BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.78.2.3
diff -u -p -r1.78.2.3 Makefile
--- www/tor-browser/browser/Makefile9 Jun 2022 19:23:19 -   1.78.2.3
+++ www/tor-browser/browser/Makefile30 Jul 2022 07:39:57 -
@@ -8,21 +8,18 @@ ONLY_FOR_ARCHS =  amd64
 MOZILLA_VERSION =  ${TB_VERSION}
 MOZILLA_PROJECT =  ${BROWSER_NAME}
 MOZILLA_CODENAME = browser
-TL_VERSION =   0.2.33
-HE_VERSION =   2021.4.15
+TL_VERSION =   0.2.37
 
 EXTRACT_SUFX = .tar.xz
 PATCHORIG =.pat.orig
 
 PKGNAME =  ${TB_PREFIX}-browser-${TB_VERSION}
-DISTNAME = src-firefox-tor-browser-91.10.0esr-11.0-1-build1
+DISTNAME = src-firefox-tor-browser-91.12.0esr-11.5-1-build1
 
 FIX_EXTRACT_PERMISSIONS= Yes
-EXTRACT_ONLY +=${DISTNAME}.tar.xz \
+DISTFILES +=   ${DISTNAME}.tar.xz \
src-tor-launcher-${TL_VERSION}.tar.xz \
tor-browser-linux64-${TB_VERSION}_en-US.tar.xz
-DISTFILES =${EXTRACT_ONLY} \
-   https-everywhere-${HE_VERSION}-eff.xpi:0
 
 SO_VERSION =   7.0
 MOZILLA_LIBS = xul clearkey lgpllibs mozavcodec mozavutil mozgtk
@@ -30,12 +27,11 @@ MOZILLA_LIBS += freebl3 nss3 nssckbi
 MOZILLA_LIBS +=nssutil3 smime3 softokn3 ssl3
 MOZILLA_LIBS +=nspr4 mozsqlite3 plc4 plds4
 
-# mozilla public license for the browser; GPLv2+ for HTTPS Everywhere
+# mozilla public license for the browser
 PERMIT_PACKAGE=Yes
 
 MASTER_SITES = https://dist.torproject.org/torbrowser/${TB_VERSION}/ \

https://archive.torproject.org/tor-package-archive/torbrowser/${TB_VERSION}/
-MASTER_SITES0 =https://www.eff.org/files/
 
 MODULES =  www/mozilla lang/python
 
@@ -73,7 +69,7 @@ 

CVS: cvs.openbsd.org: ports

2022-07-30 Thread Martin Reindl
CVSROOT:/cvs
Module name:ports
Changes by: mar...@cvs.openbsd.org  2022/07/30 01:40:26

Modified files:
geo/py-rasterio: Makefile 

Log message:
py-rasterio now requires cython as BDEP, pointed out by naddy@