CVS: cvs.openbsd.org: ports

2024-02-01 Thread Omar Polo
CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/02/02 00:58:20

Modified files:
games/ottomatic: Makefile 

Log message:
games/ottomatic: use tabs and not spaces for indent



CVS: cvs.openbsd.org: ports

2024-02-01 Thread Omar Polo
CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/02/02 00:56:30

Modified files:
games/ottomatic: Makefile 

Log message:
games/ottomatic: remove audio/libsamplerate from dependencies, not needed

based on a diff by izzy (MAINTAINER); while here remove NO_TEST too.



CVS: cvs.openbsd.org: ports

2024-02-01 Thread Kevin Lo
CVSROOT:/cvs
Module name:ports
Changes by: ke...@cvs.openbsd.org   2024/02/02 00:52:28

Modified files:
chinese/libchewing: Makefile distinfo 
chinese/libchewing/pkg: PLIST 
Added files:
chinese/libchewing/patches: patch-CMakeLists_txt 
Removed files:
chinese/libchewing/patches: patch-configure 

Log message:
Update chinese/libchewing to 0.6.0
Changelog: https://github.com/chewing/libchewing/releases/tag/v0.6.0

ok kn@



CVS: cvs.openbsd.org: ports

2024-02-01 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2024/02/02 00:25:34

Modified files:
sysutils/terraform: Makefile distinfo modules.inc 

Log message:
Update to terraform-1.7.2.



CVS: cvs.openbsd.org: ports

2024-02-01 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2024/02/02 00:10:37

Modified files:
mail/sendmail  : Makefile distinfo 

Log message:
Update to sendmail-8.18.1.



Re: UPDATE: chinese/libchewing 0.6.0

2024-02-01 Thread Kevin Lo
Ping

On Sun, Jan 28, 2024 at 11:20:13PM +0800, Kevin Lo wrote:
> 
> Hi,
> 
> This is an update for libchewing to 0.6.0.
> Tested with fcitx-chewing on amd64.
> 
> OK? Comments?
> 
> Index: chinese/libchewing/Makefile
> ===
> RCS file: /cvs/ports/chinese/libchewing/Makefile,v
> retrieving revision 1.14
> diff -u -p -u -p -r1.14 Makefile
> --- chinese/libchewing/Makefile   20 Sep 2023 06:33:31 -  1.14
> +++ chinese/libchewing/Makefile   28 Jan 2024 15:03:10 -
> @@ -1,11 +1,10 @@
>  COMMENT =intelligent phonetic input method library
>  
> -V =  0.5.1
> +V =  0.6.0
>  DISTNAME =   libchewing-$V
>  PKGNAME =zh-libchewing-$V
> -REVISION =   0
>  
> -SHARED_LIBS =chewing 0.1 # .3.3
> +SHARED_LIBS =chewing 0.2 # .3.3.1
>  
>  CATEGORIES = chinese inputmethods
>  
> @@ -16,19 +15,16 @@ MAINTAINER =  Kevin Lo   # LGPLv2.1 only
>  PERMIT_PACKAGE=  Yes
>  
> -WANTLIB +=   m pthread sqlite3 z
> +WANTLIB +=   c sqlite3
>  
>  SITES =  
> https://github.com/chewing/libchewing/releases/download/v$V/
>  
> -EXTRACT_SUFX=.tar.bz2
> +EXTRACT_SUFX =   .tar.xz
>  
> -BUILD_DEPENDS =  print/texinfo
> +MODULES =devel/cmake
>  LIB_DEPENDS =databases/sqlite3
>  
> -MAKE_FLAGS = MAKEINFO=${LOCALBASE}/bin/gmakeinfo
> -
> -CONFIGURE_STYLE =gnu
> -CONFIGURE_ARGS = CPPFLAGS="-I${LOCALBASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib"
> +CFLAGS +=-I${LOCALBASE}/include
> +MODCMAKE_LDFLAGS =  -L${LOCALBASE}/lib -lc
>  
>  .include 
> Index: chinese/libchewing/distinfo
> ===
> RCS file: /cvs/ports/chinese/libchewing/distinfo,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 distinfo
> --- chinese/libchewing/distinfo   13 Nov 2017 13:21:35 -  1.5
> +++ chinese/libchewing/distinfo   28 Jan 2024 15:03:10 -
> @@ -1,2 +1,2 @@
> -SHA256 (libchewing-0.5.1.tar.bz2) = 
> lwjGNBX6YDRDXA84EA59MNDhuskn9nvsbf6z/vAWFys=
> -SIZE (libchewing-0.5.1.tar.bz2) = 3141084
> +SHA256 (libchewing-0.6.0.tar.xz) = 
> wpE77VW3/bJZQralgywlS8m8ucNl08r6ClabS3y9jwA=
> +SIZE (libchewing-0.6.0.tar.xz) = 3473564
> Index: chinese/libchewing/patches/patch-CMakeLists_txt
> ===
> RCS file: chinese/libchewing/patches/patch-CMakeLists_txt
> diff -N chinese/libchewing/patches/patch-CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ chinese/libchewing/patches/patch-CMakeLists_txt   28 Jan 2024 15:03:10 
> -
> @@ -0,0 +1,19 @@
> +Index: CMakeLists.txt
> +--- CMakeLists.txt.orig
>  CMakeLists.txt
> +@@ -10,7 +10,7 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
> + enable_testing()
> + 
> + if(UNIX)
> +-set(CMAKE_C_FLAGS "-g -O2 -Wall -fPIC ${CMAKE_C_FLAGS}")
> ++set(CMAKE_C_FLAGS "-Wall -fPIC ${CMAKE_C_FLAGS}")
> + add_compile_definitions(UNDER_POSIX PIC)
> + endif()
> + 
> +@@ -338,4 +338,4 @@ set(CPACK_PACKAGE_CHECKSUM SHA256)
> + set(CPACK_SOURCE_IGNORE_FILES "/out" "/..*")
> + set(CPACK_SOURCE_GENERATOR TXZ)
> + set(CPACK_SOURCE_PACKAGE_FILE_NAME libchewing-${CMAKE_PROJECT_VERSION})
> +-include(CPack)
> +\ No newline at end of file
> ++include(CPack)
> Index: chinese/libchewing/patches/patch-configure
> ===
> RCS file: chinese/libchewing/patches/patch-configure
> diff -N chinese/libchewing/patches/patch-configure
> --- chinese/libchewing/patches/patch-configure11 Mar 2022 18:25:21 
> -  1.5
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,12 +0,0 @@
> -Index: configure
>  configure.orig
> -+++ configure
> -@@ -15425,7 +15425,7 @@ fi
> - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_no_undefined" >&5
> - $as_echo "$ac_cv_no_undefined" >&6; }
> - if test x$ac_cv_no_undefined = "xyes"; then :
> --  NO_UNDEFINED_LDFLAGS="-Wl,--no-undefined"
> -+  NO_UNDEFINED_LDFLAGS=""
> - fi
> - 
> - 
> Index: chinese/libchewing/pkg/PLIST
> ===
> RCS file: /cvs/ports/chinese/libchewing/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 PLIST
> --- chinese/libchewing/pkg/PLIST  11 Mar 2022 18:25:21 -  1.5
> +++ chinese/libchewing/pkg/PLIST  28 Jan 2024 15:03:10 -
> @@ -4,9 +4,6 @@ include/chewing/chewing.h
>  include/chewing/chewingio.h
>  include/chewing/global.h
>  include/chewing/mod_aux.h
> -@info info/libchewing.info
> -lib/libchewing.a
> -lib/libchewing.la
>  @lib lib/libchewing.so.${LIBchewing_VERSION}
>  lib/pkgconfig/chewing.pc
>  share/libchewing/
> 



CVS: cvs.openbsd.org: ports

2024-02-01 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2024/02/02 00:06:30

Modified files:
multimedia/pipewire/pipewire: Makefile distinfo 

Log message:
Update to pipewire-1.0.2.



CVS: cvs.openbsd.org: ports

2024-02-01 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2024/02/02 00:05:03

Modified files:
sysutils/google-cloud-sdk: Makefile distinfo 

Log message:
Update to google-cloud-sdk-462.0.1.



CVS: cvs.openbsd.org: ports

2024-02-01 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2024/02/02 00:01:22

Modified files:
sysutils/amazon-ssm-agent: Makefile distinfo 

Log message:
Update to amazon-ssm-agent-3.2..0.



CVS: cvs.openbsd.org: ports

2024-02-01 Thread Kirill Bychkov
CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2024/02/01 23:44:00

Modified files:
www/goaccess   : Makefile distinfo 
www/goaccess/patches: patch-config_goaccess_conf 
  patch-src_browsers_c 

Log message:
upddate to goaccess-1.9



Re: x11/freerdp: default /sound to sndio

2024-02-01 Thread Rafael Sadowski
On Fri Feb 02, 2024 at 06:13:12AM +, Klemens Nanni wrote:
> 'xfreerdp /sound ...' and more importantly remmina configurations with
> the GUI knob set to local sound will both use the "fake" backend by default.
> 
> 'xfreerdp /sound:sys:sndio ...' and "sys:sndio" added as parameter in
> remmina fix sound, but that takes a little digging (remmina's GUi tooltip
> does not mention sndio).
> 
> As per xfreerdp(1):
>  
> /sound[:[sys:sys,][dev:dev,][format:format,][rate:rate,][channel:channel,][latency:latency,][quality:quality]],
>  
> /audio[:[sys:sys,][dev:dev,][format:format,][rate:rate,][channel:channel,][latency:latency,][quality:quality]]
> Audio output (sound)
> 
> The patch only defaults to sndio if exactly "/sound" was used, i.e.
> any "/sound:..." invocation has the same effect as before.
> 
> I'm new to RDP from OpenBSD and thought sndio would be a saner default.
> 
> Feedback? Objection? OK?

I like it, ok rsadowski@

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/freerdp/Makefile,v
> diff -u -p -r1.67 Makefile
> --- Makefile  27 Sep 2023 20:37:05 -  1.67
> +++ Makefile  2 Feb 2024 05:07:24 -
> @@ -2,6 +2,7 @@ COMMENT = client for Microsoft RDP (rem
>  DISTNAME =   freerdp-2.11.2
>  DPB_PROPERTIES = parallel
>  CATEGORIES = x11 net
> +REVISION =   0
>  
>  SHARED_LIBS +=  freerdp-client2   1.1
>  SHARED_LIBS +=  freerdp2  3.0
> Index: patches/patch-channels_rdpsnd_client_rdpsnd_main_c
> ===
> RCS file: patches/patch-channels_rdpsnd_client_rdpsnd_main_c
> diff -N patches/patch-channels_rdpsnd_client_rdpsnd_main_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-channels_rdpsnd_client_rdpsnd_main_c2 Feb 2024 
> 05:57:05 -
> @@ -0,0 +1,15 @@
> +Default /sound (without parameters) to :sys:sndio
> +
> +Index: channels/rdpsnd/client/rdpsnd_main.c
> +--- channels/rdpsnd/client/rdpsnd_main.c.orig
>  channels/rdpsnd/client/rdpsnd_main.c
> +@@ -966,7 +966,8 @@ static UINT rdpsnd_process_addin_args(rdpsndPlugin* rd
> + }
> + CommandLineSwitchEnd(arg)
> + } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL);
> +-}
> ++} else
> ++rdpsnd_set_subsystem(rdpsnd, "sndio");  /* default to sndio(7) 
> not fake backend */
> + 
> + return CHANNEL_RC_OK;
> + }
> 



Re: CVS: cvs.openbsd.org: ports

2024-02-01 Thread Landry Breuil
Le Thu, Feb 01, 2024 at 07:47:32PM +0100, Solène Rapenne a écrit :
> Le jeudi 01 février 2024 à 07:11 -0700, Landry Breuil a écrit :
> 
> > > CVSROOT: /cvs  
> > > Module name: ports  
> > > Changes by: 
> > > [[lan...@cvs.openbsd.org](mailto:lan...@cvs.openbsd.org)](mailto:[lan...@cvs.openbsd.org](mailto:lan...@cvs.openbsd.org))
> > >  2024/02/01 07:11:12  
> > >  
> > > Modified files:  
> > > www/mozilla-firefox: Tag: OPENBSD_7_4 Makefile  
> > > Added files:  
> > > www/mozilla-firefox/patches: Tag: OPENBSD_7_4  
> > >   
> > > patch-third_party_libwebrtc_modules_video_capture_video_capture_facto  
> > > ry_cc  
> > >  
> > > Log message:  
> > > www/mozilla-firefox: MFC fix webcam detection  
> > >  
> > > gypped from 
> > > [[freebsd/freebsd-ports@53a70f1248](mailto:freebsd/freebsd-ports@53a70f1248)](mailto:[freebsd/freebsd-ports@53a70f1248](mailto:freebsd/freebsd-ports@53a70f1248))
> > >   
> > > cf #1878010  
> > >
> 
> 
> this doesn't compile on arm64 (I made sure the whole ports tree is up to date)
> I think this failed one or two commits earlier

then that's probably the update to 122... but afaict it built fine on
-current. You'll need to find the real failure from the logs :)



x11/freerdp: default /sound to sndio

2024-02-01 Thread Klemens Nanni
'xfreerdp /sound ...' and more importantly remmina configurations with
the GUI knob set to local sound will both use the "fake" backend by default.

'xfreerdp /sound:sys:sndio ...' and "sys:sndio" added as parameter in
remmina fix sound, but that takes a little digging (remmina's GUi tooltip
does not mention sndio).

As per xfreerdp(1):
 
/sound[:[sys:sys,][dev:dev,][format:format,][rate:rate,][channel:channel,][latency:latency,][quality:quality]],
 
/audio[:[sys:sys,][dev:dev,][format:format,][rate:rate,][channel:channel,][latency:latency,][quality:quality]]
Audio output (sound)

The patch only defaults to sndio if exactly "/sound" was used, i.e.
any "/sound:..." invocation has the same effect as before.

I'm new to RDP from OpenBSD and thought sndio would be a saner default.

Feedback? Objection? OK?

Index: Makefile
===
RCS file: /cvs/ports/x11/freerdp/Makefile,v
diff -u -p -r1.67 Makefile
--- Makefile27 Sep 2023 20:37:05 -  1.67
+++ Makefile2 Feb 2024 05:07:24 -
@@ -2,6 +2,7 @@ COMMENT =   client for Microsoft RDP (rem
 DISTNAME = freerdp-2.11.2
 DPB_PROPERTIES =   parallel
 CATEGORIES =   x11 net
+REVISION = 0
 
 SHARED_LIBS +=  freerdp-client2   1.1
 SHARED_LIBS +=  freerdp2  3.0
Index: patches/patch-channels_rdpsnd_client_rdpsnd_main_c
===
RCS file: patches/patch-channels_rdpsnd_client_rdpsnd_main_c
diff -N patches/patch-channels_rdpsnd_client_rdpsnd_main_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-channels_rdpsnd_client_rdpsnd_main_c  2 Feb 2024 05:57:05 
-
@@ -0,0 +1,15 @@
+Default /sound (without parameters) to :sys:sndio
+
+Index: channels/rdpsnd/client/rdpsnd_main.c
+--- channels/rdpsnd/client/rdpsnd_main.c.orig
 channels/rdpsnd/client/rdpsnd_main.c
+@@ -966,7 +966,8 @@ static UINT rdpsnd_process_addin_args(rdpsndPlugin* rd
+   }
+   CommandLineSwitchEnd(arg)
+   } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL);
+-  }
++  } else
++  rdpsnd_set_subsystem(rdpsnd, "sndio");  /* default to sndio(7) 
not fake backend */
+ 
+   return CHANNEL_RC_OK;
+ }



Re: UPDATE vaultwarden-1.30.2 and vaultwarden-web-2024.1.2

2024-02-01 Thread Bjorn Ketelaars
On Thu 01/02/2024 23:02, Theo Buehler wrote:
> Two small things:
> 
> > -MODCARGO_CRATES += ring0.17.5  # LICENSE
> > +MODCARGO_CRATES += ring0.17.7  # LICENSE
> 
> crates.inc no longer contains ring 0.16, so the BDEP on rust-ring can
> be dropped and the NOT_FOR_ARCHS should be changed to:
> 
> # ring-v0.17 does not support this arch
> NOT_FOR_ARCHS = sparc64

Thank you for this! I forgot about ring.

In the meantime upstream released 1.30.3, which fixes issues with push
notification device registration. Changes:
https://github.com/dani-garcia/vaultwarden/releases/tag/1.30.2 and
https://github.com/dani-garcia/vaultwarden/releases/tag/1.30.3.

Diff below addresses the comment of tb@, and updates vaultwarden to
1.30.3. Please note that the update of vaultwarden-web to 2024.1.2 is
part of this diff.

OK?


diff --git security/vaultwarden/Makefile security/vaultwarden/Makefile
index 486e3e0c616..c41d70343f6 100644
--- security/vaultwarden/Makefile
+++ security/vaultwarden/Makefile
@@ -1,14 +1,11 @@
-# ring-v0.16.20 does not support those archs
-NOT_FOR_ARCHS =powerpc64 riscv64 sparc64
+# ring-v0.17 does not support this arch
+NOT_FOR_ARCHS =sparc64
 
 BROKEN-i386 =  raw-cpuid-10.2.0/src/lib.rs:80:37 "could not find 
`arch` in `self`"
 
 COMMENT =  unofficial bitwarden compatible server
 
-GH_ACCOUNT =   dani-garcia
-GH_PROJECT =   vaultwarden
-GH_TAGNAME =   1.30.1
-REVISION = 0
+DIST_TUPLE =   github dani-garcia vaultwarden 1.30.3 .
 
 CATEGORIES =   security
 
@@ -17,26 +14,21 @@ MAINTAINER =Aisha Tammy 
 # AGPLv3 only
 PERMIT_PACKAGE =   Yes
 
-FLAVORS =  mysql postgresql
-FLAVOR ?=
-
-WANTLIB += ${MODCARGO_WANTLIB} crypto m ssl
-
-SITES.deps =   https://files.bsd.ac/openbsd-distfiles/
-DISTFILES.deps +=  vaultwarden-deps-${GH_TAGNAME}.tgz
+WANTLIB =  ${MODCARGO_WANTLIB} crypto m ssl
 
 MODULES =  devel/cargo
+MODCARGO_CRATES_KEEP = libsqlite3-sys
+MODCARGO_FEATURES =sqlite
 
-CONFIGURE_STYLE =  cargo
+RUN_DEPENDS =  www/vaultwarden-web
 
 SEPARATE_BUILD =   Yes
 
-BUILD_DEPENDS =security/rust-ring
+CONFIGURE_STYLE =  cargo
 
-RUN_DEPENDS =  www/vaultwarden-web
+FLAVORS =  mysql postgresql
+FLAVOR ?=
 
-MODCARGO_CRATES_KEEP +=libsqlite3-sys
-MODCARGO_FEATURES =sqlite
 .if ${FLAVOR:Mmysql}
 MODCARGO_FEATURES +=   mysql
 WANTLIB += mariadb
@@ -48,13 +40,6 @@ WANTLIB +=   pq
 LIB_DEPENDS += databases/postgresql
 .endif
 
-SUBST_VARS +=  WRKSRC
-
-post-configure:
-   mv ${WRKDIR}/myvendordir ${WRKSRC}
-   ${SUBST_CMD} -m 644 -c ${FILESDIR}/config.vendor ${WRKDIR}/config.vendor
-   cat ${WRKDIR}/config.vendor >> ${WRKDIR}/.cargo/config
-
 do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vaultwarden
${INSTALL_DATA} ${WRKSRC}/.env.template ${PREFIX}/share/doc/vaultwarden
diff --git security/vaultwarden/crates.inc security/vaultwarden/crates.inc
index f1bca2a4e4f..7718075f069 100644
--- security/vaultwarden/crates.inc
+++ security/vaultwarden/crates.inc
@@ -1,77 +1,78 @@
 MODCARGO_CRATES += addr2line   0.21.0  # Apache-2.0 OR MIT
 MODCARGO_CRATES += adler   1.0.2   # 0BSD OR MIT OR Apache-2.0
-MODCARGO_CRATES += ahash   0.8.6   # MIT OR Apache-2.0
+MODCARGO_CRATES += ahash   0.8.7   # MIT OR Apache-2.0
 MODCARGO_CRATES += aho-corasick1.1.2   # Unlicense OR MIT
 MODCARGO_CRATES += alloc-no-stdlib 2.0.4   # BSD-3-Clause
 MODCARGO_CRATES += alloc-stdlib0.2.2   # BSD-3-Clause
 MODCARGO_CRATES += allocator-api2  0.2.16  # MIT OR Apache-2.0
 MODCARGO_CRATES += android-tzdata  0.1.1   # MIT OR Apache-2.0
 MODCARGO_CRATES += android_system_properties   0.1.5   # MIT/Apache-2.0
-MODCARGO_CRATES += argon2  0.5.2   # MIT OR Apache-2.0
+MODCARGO_CRATES += argon2  0.5.3   # MIT OR Apache-2.0
 MODCARGO_CRATES += async-channel   1.9.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-channel   2.1.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-compression   0.4.4   # MIT OR Apache-2.0
-MODCARGO_CRATES += async-executor  1.6.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-global-executor   2.3.1   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-channel   2.1.1   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-compression   0.4.6   # MIT OR Apache-2.0
+MODCARGO_CRATES += async-executor  1.8.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-global-executor   2.4.1   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-io1.13.0  # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-io2.2.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-io2.3.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-lock  2.8.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-lock  

NEW: games/nanosaur

2024-02-01 Thread izder456
Hello ports@.

I just thought it was plain wrong to just have the sequel to nanosaur
but not the original.

Attached is the port tarball for the original.

Comments or OK?

-- 

-iz


nanosaur-1.4.4.tgz
Description: application/compressed-tar


Re: UPDATE: games/ottomatic

2024-02-01 Thread izder456
On Thu, 1 Feb 2024 22:49:03 -0600
izder456  wrote:

> Hey again, unsure how this slipped through the checks, but
> games/ottomatic has libsamplerate in both BUILD_DEPENDS and
> RUN_DEPENDS
> 
> it does not depend on it at all, this diff is a hotfix fix for the
> Makefile.
> 
> --- Makefile.orig   Thu Feb  1 22:41:54 2024
> +++ MakefileThu Feb  1 22:44:27 2024
> @@ -1,6 +1,6 @@
>  COMMENT = family-friendly 3D third person sci-fi action
> arcade
> 
> -V =   4.0.1
> +V =   4.0.1p1
>  PKGNAME = ottomatic-${V}
>  DIST_TUPLE += github jorio OttoMatic ${V} .
>  DIST_TUPLE += github jorio Pomme
> ef94150e2dcec522e3099f4d03a4e8f2639f7232 \ @@ -22,10 +22,8 @@
> 
>  MODULES = devel/cmake
> 
> -BUILD_DEPENDS =   audio/libsamplerate
>  LIB_DEPENDS = devel/sdl2
> -RUN_DEPENDS = audio/libsamplerate \
> -  devel/desktop-file-utils \
> +RUN_DEPENDS = devel/desktop-file-utils \
>x11/gtk+4,-guic
> 
>  NO_TEST = Yes
> 
> 
> OK?
> 

sorry, 

--- Makefile.orig   Thu Feb  1 22:41:54 2024
+++ MakefileThu Feb  1 22:44:27 2024
@@ -1,6 +1,6 @@
 COMMENT = family-friendly 3D third person sci-fi action arcade

 V =   4.0.1
-PKGNAME = ottomatic-${V}
+PKGNAME = ottomatic-${V}p1
 DIST_TUPLE += github jorio OttoMatic ${V} .
 DIST_TUPLE += github jorio Pomme
ef94150e2dcec522e3099f4d03a4e8f2639f7232 \ @@ -22,10 +22,8 @@

 MODULES = devel/cmake

-BUILD_DEPENDS =   audio/libsamplerate
 LIB_DEPENDS = devel/sdl2
-RUN_DEPENDS = audio/libsamplerate \
-  devel/desktop-file-utils \
+RUN_DEPENDS = devel/desktop-file-utils \
   x11/gtk+4,-guic

 NO_TEST = Yes


messed up the package versioning.

OK?
-- 

-iz



UPDATE: games/ottomatic

2024-02-01 Thread izder456
Hey again, unsure how this slipped through the checks, but
games/ottomatic has libsamplerate in both BUILD_DEPENDS and RUN_DEPENDS

it does not depend on it at all, this diff is a hotfix fix for the
Makefile.

--- Makefile.orig   Thu Feb  1 22:41:54 2024
+++ MakefileThu Feb  1 22:44:27 2024
@@ -1,6 +1,6 @@
 COMMENT = family-friendly 3D third person sci-fi action arcade

-V =   4.0.1
+V =   4.0.1p1
 PKGNAME = ottomatic-${V}
 DIST_TUPLE += github jorio OttoMatic ${V} .
 DIST_TUPLE += github jorio Pomme
ef94150e2dcec522e3099f4d03a4e8f2639f7232 \ @@ -22,10 +22,8 @@

 MODULES = devel/cmake

-BUILD_DEPENDS =   audio/libsamplerate
 LIB_DEPENDS = devel/sdl2
-RUN_DEPENDS = audio/libsamplerate \
-  devel/desktop-file-utils \
+RUN_DEPENDS = devel/desktop-file-utils \
   x11/gtk+4,-guic

 NO_TEST = Yes


OK?

-- 

-iz



Re: net/i2pd: move login.conf(5) bits from README to i2pd.login

2024-02-01 Thread openbsd
Just to add a facts-based confirmation: my i2pd router[*] is running with 
openfiles-cur=4096, openfiles-max=4096 and kern.maxfiles=8192 (as proposed by 
Klemens) without any problem since more than 3 days.

This is by no means an extensive survey, but these values seem definitely 
sufficient to me for a regular router.

I didn't try to run a floodfill due to my server's constraints.

Cheers.

[*] There's indeed a potential for confusion in the fact that each node of the 
I2P network is called a router...


On Monday, January 29th, 2024 at 10:12 PM, open...@systemfailure.net wrote:

> As far as I understand, a maximum limit of 4096 open file descriptors is 
> sufficient for most users.
> 

> This limit should be raised to 8192 for floodfills, but a router becomes a 
> floodfill only if 2 conditions are met:
> - it has a sufficiently high bandwidth
> - the user has set "floodfill = true" in i2pd.conf (by default it is false)
> 

> So this feature must be enabled explicitly, and AFAIK most routers are not 
> floodfills.
> 

> In your case, even 8192 doesn't seem enough, because you're torrenting. 
> You're certainly not the only one to use the I2P network for anonymous file 
> sharing, but IMHO this is not the most generic use case.
> 

> > why are yo uignoring my reply? 4096 doesn't cover everyone like I said 
> > people
> > can become floodfills automatically and floodfills means 8192
> > 

> > On Sun, January 28, 2024 7:52 pm, Klemens Nanni wrote:
> > 

> > > On Sun, Jan 28, 2024 at 06:15:52PM +, Stuart Henderson wrote:
> > > 

> > > > On 2024/01/27 21:54, open...@systemfailure.net wrote:
> > > > 

> > > > > According to i2pd's online documentation [1], the maximum number of 
> > > > > open
> > > > > file descriptors is 4096 for a regular node, and 8192 for a floodfill
> > > > > [2].
> > > > > 

> > > > > I have never measured how many FDs i2pd is really using, but this
> > > > > software for sure needs a lot of them.
> > > > > 

> > > > > So I guess we can set 4096 as default value, and inform users in the
> > > > > README file that this value should be raised to 8192 for floodfills.
> > > > 

> > > > 4096 doesn't seem too unreasonable, it's below default levels of
> > > > kern.maxfiles, so if that's enough for the software I'd be happy with 
> > > > setting
> > > > that in a login.conf.d file.
> > > 

> > > Thanks for all you feedback.
> > > OK?
> > > 

> > > Index: Makefile
> > > ===
> > > RCS file: /cvs/ports/net/i2pd/Makefile,v
> > > diff -u -p -r1.22 Makefile --- Makefile 13 Jan 2024 16:21:39 - 1.22
> > > +++ Makefile 24 Jan 2024 22:21:26 -
> > > @@ -3,6 +3,7 @@ COMMENT = client for the I2P anonymous n
> > > GH_ACCOUNT = PurpleI2P
> > > GH_PROJECT = i2pd
> > > GH_TAGNAME = 2.50.2
> > > +REVISION = 0
> > > 

> > > CATEGORIES = net
> > > HOMEPAGE = https://i2pd.website
> > > Index: pkg/PLIST
> > > ===
> > > RCS file: /cvs/ports/net/i2pd/pkg/PLIST,v
> > > diff -u -p -r1.12 PLIST --- pkg/PLIST 20 Dec 2023 22:19:44 - 1.12
> > > +++ pkg/PLIST 24 Jan 2024 22:30:37 -
> > > @@ -237,3 +237,7 @@ share/examples/i2pd/tunnels.conf
> > > @owner _i2pd
> > > @group _i2pd
> > > @sample ${SYSCONFDIR}/i2pd/tunnels.conf
> > > +@owner
> > > +@group
> > > +share/examples/login.conf.d/i2pd
> > > +@sample ${SYSCONFDIR}/login.conf.d/i2pd
> > > Index: pkg/README
> > > ===
> > > RCS file: /cvs/ports/net/i2pd/pkg/README,v
> > > diff -u -p -r1.3 README --- pkg/README 8 Nov 2022 12:41:42 - 1.3
> > > +++ pkg/README 28 Jan 2024 19:51:52 -
> > > @@ -5,20 +5,7 @@
> > > Resource Limits: File Descriptors
> > > =
> > > 

> > > -By default, the i2pd process runs in the login(1) class of "daemon".
> > > -The default limits on file descriptors are insufficient to run i2pd; 
> > > instead
> > > you -should put the _i2pd user and process in their own login(1) class 
> > > with
> > > tuned -resources.
> > > -You should also raise the system-wide maxfiles limit.
> > > +You should raise the system-wide maxfiles limit:
> > > 

> > > -1. Configure i2pd login class in the login.conf(5) file:
> > > -
> > > - i2pd:\
> > > - :openfiles-cur=8192:\
> > > - :openfiles-max=8192:\
> > > - :tc=daemon:
> > > -
> > > -2. Adjust kern.maxfiles, if needed:
> > > -
> > > - # sysctl kern.maxfiles=16000
> > > - # echo "kern.maxfiles=16000" >> /etc/sysctl.conf
> > > + # sysctl kern.maxfiles=8192
> > > + # echo "kern.maxfiles=8192" >> /etc/sysctl.conf
> > > Index: pkg/i2pd.login
> > > ===
> > > RCS file: pkg/i2pd.login
> > > diff -N pkg/i2pd.login --- /dev/null 1 Jan 1970 00:00:00 -
> > > +++ pkg/i2pd.login 28 Jan 2024 19:51:32 -
> > > @@ -0,0 +1,4 @@
> > > +i2pd:\
> > > + :openfiles-cur=4096:\
> > > + :openfiles-max=4096:\
> > > + :tc=daemon:

Re: [update] mail/aerc 0.16.0 -> 0.17.0

2024-02-01 Thread Thim Cederlund
Hi Johannes,

"Johannes Thyssen Tishman"  wrote:
> Please find below a diff to update mail/aerc to version 0.17.0.
> There's quite a lot of new features as well as better CVS and OpenBSD
> support.
> 
> Changelog: https://git.sr.ht/~rjarry/aerc/refs/0.17.0
> 
> Cc'd maintainer.
> 
> Kind regards,
> Johannes

Thank you Johannes. Funnily enough I was just about to send a patch
myself but I guess by chance, I just glanced at the inbox and noticed
your mail. Funny how that works sometimes.

Anyways, I have tested it a bit on amd64, without notmuch might I
add, and all seems to be working right, no hiccups of any sorts.

Best Regards,

Thim Cederlund

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/aerc/Makefile,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile
> --- Makefile  15 Nov 2023 16:13:03 -  1.14
> +++ Makefile  1 Feb 2024 16:22:36 -
> @@ -4,11 +4,10 @@ ONLY_FOR_ARCHS = aarch64 arm amd64 i386 
>  COMMENT =terminal email client
>  
>  MODGO_MODNAME =  git.sr.ht/~rjarry/aerc
> -MODGO_VERSION =  v0.0.0-20230927211642-61bca76423ee
> +MODGO_VERSION =  v0.0.0-20240201001117-6ea74eb30457
>  
> -V =  0.16.0
> +V =  0.17.0
>  DISTNAME =   aerc-$V
> -REVISION =   0
>  
>  CATEGORIES = mail
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/aerc/distinfo,v
> retrieving revision 1.10
> diff -u -p -r1.10 distinfo
> --- distinfo  28 Sep 2023 20:59:23 -  1.10
> +++ distinfo  1 Feb 2024 16:22:36 -
> @@ -1,12 +1,12 @@
> -SHA256 (aerc-0.16.0.zip) = qxB3rG5bd654Wr553+1Cs/yfDXRzXXT17YtwXeqa/Zo=
> +SHA256 (aerc-0.17.0.zip) = kZfFtrQmuiy7+ncgCJviRC+MaFXZR8YvdsQOSgeXRl8=
>  SHA256 (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.0.mod) = 
> ZmAMRI0rXFR3BnNIkO0YGJyCgLII2Gua8qsIENW2HSE=
>  SHA256 (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.0.zip) = 
> v36mmm629lvSsa2TebXRmQQP81Rk3+iLEKPFL30ROq8=
> +SHA256 (go_modules/git.sr.ht/~rjarry/go-opt/@v/v1.3.0.mod) = 
> 4J9cxBhy4n5N/YRcoMwoVBs2K4xVoPWd0HOjF5qtnrE=
> +SHA256 (go_modules/git.sr.ht/~rjarry/go-opt/@v/v1.3.0.zip) = 
> pK/so6R6i1R7BSCG1CAIXLuvJmkEaKx92ADcf9aHPL0=
>  SHA256 (go_modules/git.sr.ht/~rockorager/go-jmap/@v/v0.3.0.mod) = 
> h/nX5diHqfkDrJbpZuGw5gE+IgaclgqZgm7kmVLa2jw=
>  SHA256 (go_modules/git.sr.ht/~rockorager/go-jmap/@v/v0.3.0.zip) = 
> qB6fVqXORSSINci0xvMisPSucvo2ufZLg8O1JGR9wgg=
> -SHA256 (go_modules/git.sr.ht/~rockorager/tcell-term/@v/v0.8.0.mod) = 
> 8kRq6lakDTvyokkg1NpGgMeU8Bp4sR1Cf62IhtKWbaM=
> -SHA256 (go_modules/git.sr.ht/~rockorager/tcell-term/@v/v0.8.0.zip) = 
> dhiTK2f00tfMiBXlpyz8WGHzlJIVhiTkpkY4ZWeMNZU=
> -SHA256 (go_modules/git.sr.ht/~sircmpwn/getopt/@v/v1.0.0.mod) = 
> JKqQcy+IHLONXXl/PBB8RU7ygm2ZbHGoSCP45a2scPI=
> -SHA256 (go_modules/git.sr.ht/~sircmpwn/getopt/@v/v1.0.0.zip) = 
> 4NfbE0Q1547T0PtdB97FPTP6bCB8qYk4lEMNlaaxEck=
> +SHA256 (go_modules/git.sr.ht/~rockorager/tcell-term/@v/v0.10.0.mod) = 
> 8kRq6lakDTvyokkg1NpGgMeU8Bp4sR1Cf62IhtKWbaM=
> +SHA256 (go_modules/git.sr.ht/~rockorager/tcell-term/@v/v0.10.0.zip) = 
> SgWDKQ8e+h0JoFbMtMt4tbOrox/BVVwePeJsp11w4Xg=
>  SHA256 
> (go_modules/github.com/!proton!mail/crypto/@v/v0.0.0-20200420072808-71bec3603bf3.mod)
>  = DMa3izbWgj9dYhfIZi8gZzx06hpm99rTKMmFvQJyhjU=
>  SHA256 
> (go_modules/github.com/!proton!mail/crypto/@v/v0.0.0-20200420072808-71bec3603bf3.zip)
>  = +ctdhKExtFrfAEM5TCDVDtDUKOWMIHMwUwRJD6KzSco=
>  SHA256 
> (go_modules/github.com/!proton!mail/go-crypto/@v/v0.0.0-2022122917-428f8eabeeb3.mod)
>  = YS0PzpOZlNH/uEOMpQbQh04XnAFAh1/Xr65Z65d3ROU=
> @@ -36,8 +36,8 @@ SHA256 (go_modules/github.com/emersion/g
>  SHA256 (go_modules/github.com/emersion/go-imap/@v/v1.0.5.mod) = 
> zTnypeCA7vmr+hUlnboJXXoUvGK52f5DBS1Aw3wGPgg=
>  SHA256 (go_modules/github.com/emersion/go-imap/@v/v1.2.1.mod) = 
> CUokz+EHmJaAQ2go2iC2w8rGTTaPK9cwgoSSd+XYSlY=
>  SHA256 (go_modules/github.com/emersion/go-imap/@v/v1.2.1.zip) = 
> ubZudBptu/WHym+OYYpmsXZQeI+pTuQAz6zGDDSPxJo=
> -SHA256 (go_modules/github.com/emersion/go-maildir/@v/v0.3.0.mod) = 
> VFWPA3hpzllHihNQJH2RumxUFdTrCW+aM3zntHp0sZc=
> -SHA256 (go_modules/github.com/emersion/go-maildir/@v/v0.3.0.zip) = 
> 5mRlTH398xrgF9GEN4ygX+1+Kq74iTD2sKDBcixlz34=
> +SHA256 (go_modules/github.com/emersion/go-maildir/@v/v0.4.1.mod) = 
> FJb3TEH40qSUtZd0v6154aHWYFQrSN53ga7CGRjRcRo=
> +SHA256 (go_modules/github.com/emersion/go-maildir/@v/v0.4.1.zip) = 
> N/ozWlIPaO2Ju99A7xoYJP7KLNaQgkYbz5WrKf86kKg=
>  SHA256 (go_modules/github.com/emersion/go-mbox/@v/v1.0.3.mod) = 
> 4yv9gnZhVZlD1HDmPNzNV5E4WTeTtkmP4m5gcD5cnSI=
>  SHA256 (go_modules/github.com/emersion/go-mbox/@v/v1.0.3.zip) = 
> B5QA+dvLBbwUS0Hr66U2EDNsPA55+nmBlOWP7abW96w=
>  SHA256 (go_modules/github.com/emersion/go-message/@v/v0.11.1.mod) = 
> c6hi3jK0N1pJeLMkBz1iZ6Jq69AU98qcnrXLlNQV88g=
> @@ -91,8 +91,6 @@ SHA256 (go_modules/github.com/golang/sna
>  SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.5.mod) 

Re: CVS: cvs.openbsd.org: ports

2024-02-01 Thread Stuart Henderson

The error message is probably a few pages up.

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

On 1 February 2024 18:48:07 Solène Rapenne  wrote:


Le jeudi 01 février 2024 à 07:11 -0700, Landry Breuil a écrit :


> CVSROOT: /cvs
> Module name: ports
> Changes by: 
[[lan...@cvs.openbsd.org](mailto:lan...@cvs.openbsd.org)](mailto:[lan...@cvs.openbsd.org](mailto:lan...@cvs.openbsd.org)) 
2024/02/01 07:11:12

>
> Modified files:
> www/mozilla-firefox: Tag: OPENBSD_7_4 Makefile
> Added files:
> www/mozilla-firefox/patches: Tag: OPENBSD_7_4
>
> patch-third_party_libwebrtc_modules_video_capture_video_capture_facto
> ry_cc
>
> Log message:
> www/mozilla-firefox: MFC fix webcam detection
>
> gypped from 
[[freebsd/freebsd-ports@53a70f1248](mailto:freebsd/freebsd-ports@53a70f1248)](mailto:[freebsd/freebsd-ports@53a70f1248](mailto:freebsd/freebsd-ports@53a70f1248))

> cf #1878010
>



this doesn't compile on arm64 (I made sure the whole ports tree is up to date)
I think this failed one or two commits earlier

gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/config/external/sqlite'
gmake[3]: Entering directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/third_party/sqlite3/src'

mkdir -p '.deps/'
third_party/sqlite3/src/sqlite3.o
/build/tmp/pobj//firefox-122.0/bin/cc -std=gnu99 -o sqlite3.o -c -flto=thin 
-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong -DNDEBUG=1 
-DTRIMMED=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_THREADSAFE=1 
-DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_ENABLE_DBSTAT_VTAB=1 
-DSQLITE_DEFAULT_PAGE_SIZE=32768 -DSQLITE_MAX_DEFAULT_PAGE_SIZE=32768 
-DSQLITE_OMIT_COMPILEOPTION_DIAGS=1 -DSQLITE_OMIT_DEPRECATED 
-DSQLITE_OMIT_BUILTIN_TEST -DSQLITE_TEMP_STORE=2 
'-DSQLITE_TEMP_FILE_PREFIX="mz_etilqs_"' -DSQLITE_ENABLE_MATH_FUNCTIONS 
-DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1572864 
-I/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src 
-I/build/tmp/pobj/firefox-122.0/build-aarch64/third_party/sqlite3/src 
-I/build/tmp/pobj/firefox-122.0/build-aarch64/dist/include 
-I/usr/local/include/nspr -I/usr/local/include/nss 
-I/usr/local/include/nspr 
-I/build/tmp/pobj/firefox-122.0/build-aarch64/dist/include/nss 
-I/usr/local/include -include 
/build/tmp/pobj/firefox-122.0/build-aarch64/mozilla-config.h 
-DMOZILLA_CLIENT -Wno-backend-plugin -O2 -pipe -g -fPIC -ffunction-sections 
-fdata-sections -fno-math-errno -pthread -pipe -gdwarf-4 -O2 -pipe -g 
-fomit-frame-pointer -funwind-tables -Wall -Wbitfield-enum-conversion 
-Wempty-body -Wformat-type-confusion -Wignored-qualifiers -Wpointer-arith 
-Wshadow-field-in-constructor-modified -Wsign-compare 
-Wtautological-constant-in-range-compare -Wtype-limits 
-Wno-error=tautological-type-limit-compare -Wunreachable-code 
-Wunreachable-code-return -Wunused-but-set-parameter -Wclass-varargs 
-Wfloat-overflow-conversion -Wfloat-zero-conversion -Wloop-analysis 
-Wno-range-loop-analysis -Wenum-compare-conditional -Wenum-float-conversion 
-Wstring-conversion -Wno-error=deprecated-declarations 
-Wno-error=array-bounds -Wno-error=free-nonheap-object 
-Wno-error=atomic-alignment -Wformat -Wformat-security 
-Werror=implicit-function-declaration -Wno-psabi -Wthread-safety 
-Wno-error=builtin-macro-redefined -Wno-unknown-warning-option 
-Wno-sign-compare -Wno-type-limits -fno-strict-aliasing -ffp-contract=off 
-fprofile-use=/build/tmp/pobj//firefox-122.0/merged.profdata 
-Wno-error=backend-plugin -MD -MP -MF .deps/sqlite3.o.pp   
/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src/sqlite3.c
gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/media/libvpx'
gmake[2]: *** 
[/build/tmp/pobj/firefox-122.0/firefox-122.0/config/recurse.mk:72: 
media/libvpx/target-objects] Error 2

gmake[2]: *** Waiting for unfinished jobs
/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src/sqlite3.c:88121:3: 
warning: 'return' will never be executed [-Wunreachable-code-return]

return;
^~
/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src/sqlite3.c:92699:10: 
warning: 'return' will never be executed [-Wunreachable-code-return]

return 0;
^
/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src/sqlite3.c:173973:9: 
warning: code will never be executed [-Wunreachable-code]

YYMINORTYPE yylhsminor;
^~~
3 warnings generated.
gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/third_party/sqlite3/src'

fts5parse.sql:1012:9: warning: code will never be executed [-Wunreachable-code]
fts5YYMINORTYPE fts5yylhsminor;
^~~
1 warning generated.
gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/third_party/sqlite3/ext'
gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/browser/app'

gmake[2]: Leaving directory '/build/tmp/pobj/firefox-122.0/build-aarch64'
gmake[1]: *** 
[/build/tmp/pobj/firefox-122.0/firefox-122.0/config/recurse.mk:34: compile] 
Error 2

gmake[1]: 

CVS: cvs.openbsd.org: ports

2024-02-01 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2024/02/01 16:12:03

Modified files:
security/p5-IO-Socket-SSL: Makefile distinfo 
Removed files:
security/p5-IO-Socket-SSL/patches: 
   patch-t_verify_hostname_standalone_t 

Log message:
update p5-IO-Socket-SSL to 2.085



Re: Using git mirror instead of CVS for working with ports?

2024-02-01 Thread Christian Weisgerber
Johannes Thyssen Tishman:

> Subject says it all. I'm wondering if using the git conversion
> of the ports tree[0] is regarded as a good alternative to CVS for
> working with ports.

If you are more comfortable with Got[1] or Git, by all means use
them.  sthen@ has already explained the limits of the conversion.

> Do any of you porters use it instead of CVS?

I've mostly switched to Got for all of OpenBSD, and treat CVS as
write-only.  From the format of the patches flying around, it's
obvious that there are a number of committers that use Got or Git.

> [0] https://github.com/openbsd/ports

https://codeberg.org/OpenBSD/ports


[1] https://gameoftrees.org/

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de



[update] cad/opencascade 7.7.2 -> 7.8.0

2024-02-01 Thread Johannes Thyssen Tishman
Please find attached a diff to update cad/opencascade to version
7.8.0. Additionally, I've attached patches for both it's consumers
cad/{kicad,prusaslicer} to make them work with this update. 

I've slightly tested both of them, but since I don't use them much,
I'd appreciate feedback from someone who does. Both
'port-lib-depends-check' and 'portcheck' are happy with all three
ports.

-- 
Johannes Thyssen Tishman
https://www.thyssentishman.com

Index: Makefile
===
RCS file: /cvs/ports/cad/kicad/Makefile,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile
--- Makefile	21 Oct 2023 13:47:27 -	1.65
+++ Makefile	1 Feb 2024 21:43:49 -
@@ -21,16 +21,15 @@ HOMEPAGE =		https://www.kicad.org
 PERMIT_PACKAGE =	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} EGL GL GLU TKBO TKBRep TKBin TKBinL
-WANTLIB += TKBinTObj TKBinXCAF TKBool TKCAF TKCDF TKFeat TKFillet
-WANTLIB += TKG2d TKG3d TKGeomAlgo TKGeomBase TKHLR TKIGES TKLCAF
-WANTLIB += TKMath TKMesh TKMeshVS TKOffset TKOpenGl TKPrim TKSTEP
-WANTLIB += TKSTEP209 TKSTEPAttr TKSTEPBase TKSTL TKService TKShHealing
-WANTLIB += TKTObj TKTopAlgo TKV3d TKVRML TKXCAF TKXDEIGES TKXDESTEP
-WANTLIB += TKXMesh TKXSBase TKXml TKXmlL TKXmlTObj TKXmlXCAF TKernel
-WANTLIB += atk-1.0 c cairo cairo-gobject curl gdk-3 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 harfbuzz intl m
-WANTLIB += ngspice pango-1.0 pangocairo-1.0 pixman-1 ${MODPY_WANTLIB}
-WANTLIB += wx_baseu-3.2 wx_baseu_net-3.2 wx_baseu_xml-3.2
+WANTLIB += TKBinTObj TKBinXCAF TKBool TKCAF TKCDF TKDEIGES TKDESTEP
+WANTLIB += TKDESTL TKDEVRML TKFeat TKFillet TKG2d TKG3d TKGeomAlgo
+WANTLIB += TKGeomBase TKHLR TKLCAF TKMath TKMesh TKMeshVS TKOffset
+WANTLIB += TKOpenGl TKPrim TKService TKShHealing TKTObj TKTopAlgo
+WANTLIB += TKV3d TKXCAF TKXMesh TKXSBase TKXml TKXmlL TKXmlTObj
+WANTLIB += TKXmlXCAF TKernel atk-1.0 c cairo cairo-gobject curl
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-3
+WANTLIB += harfbuzz intl m ngspice pango-1.0 pangocairo-1.0 pixman-1
+WANTLIB += python3.10 wx_baseu-3.2 wx_baseu_net-3.2 wx_baseu_xml-3.2
 WANTLIB += wx_gtk3u_aui-3.2 wx_gtk3u_core-3.2 wx_gtk3u_gl-3.2
 WANTLIB += wx_gtk3u_html-3.2 wx_gtk3u_propgrid-3.2 wx_gtk3u_richtext-3.2
 WANTLIB += wx_gtk3u_stc-3.2 z
Index: patches/patch-CMakeModules_FindOCC_cmake
===
RCS file: patches/patch-CMakeModules_FindOCC_cmake
diff -N patches/patch-CMakeModules_FindOCC_cmake
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeModules_FindOCC_cmake	1 Feb 2024 21:43:49 -
@@ -0,0 +1,34 @@
+Index: CMakeModules/FindOCC.cmake
+--- CMakeModules/FindOCC.cmake.orig
 CMakeModules/FindOCC.cmake
+@@ -45,7 +45,7 @@ set( OCC_LIBS
+ TKGeomAlgo
+ TKGeomBase
+ TKHLR
+-TKIGES
++TKDEIGES
+ TKLCAF
+ TKMath
+ TKMesh
+@@ -55,18 +55,13 @@ set( OCC_LIBS
+ TKPrim
+ TKService
+ TKShHealing
+-TKSTEP209
+-TKSTEPAttr
+-TKSTEPBase
+-TKSTEP
+-TKSTL
++TKDESTEP
++TKDESTL
+ TKTObj
+ TKTopAlgo
+ TKV3d
+-TKVRML
++TKDEVRML
+ TKXCAF
+-TKXDEIGES
+-TKXDESTEP
+ TKXMesh
+ TKXmlL
+ TKXml
Index: Makefile
===
RCS file: /cvs/ports/cad/opencascade/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile	30 Oct 2023 13:19:11 -	1.2
+++ Makefile	1 Feb 2024 21:46:00 -
@@ -1,22 +1,22 @@
 COMMENT =		platform for 3D CAD, CAM, and CAE
 DPB_PROPERTIES =	parallel
 
-V =			7.7.2
+V =			7.8.0
 DISTNAME =		opencascade-${V}
-REVISION =		0
 
-.for LIB in TKBO TKBRep TKBin TKBinL TKBinTObj TKBinXCAF TKBool \
-TKCAF TKCDF TKDCAF TKDraw TKExpress TKFeat TKFillet TKG2d \
-TKG3d TKGeomAlgo TKGeomBase TKHLR TKIGES TKLCAF TKMath \
-TKMesh TKMeshVS TKOffset TKOpenGl TKOpenGlTest TKPrim \
-TKQADraw TKRWMesh TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase \
-TKSTL TKService TKShHealing TKStd TKStdL TKTObj TKTObjDRAW \
-TKTopAlgo TKTopTest TKV3d TKVCAF TKVRML TKViewerTest TKXCAF \
-TKXDE TKXDECascade TKXDEDRAW TKXDEIGES TKXDESTEP TKXMesh \
-TKXSBase TKXSDRAW TKXml TKXmlL TKXmlTObj TKXmlXCAF TKernel
-SHARED_LIBS +=		${LIB} 2.0
+.for LIB in TKBO TKBRep TKBin TKBinL TKBinTObj TKBinXCAF TKBool TKCAF TKCDF \
+	TKDCAF TKDE TKDECascade TKDEGLTF TKDEIGES TKDEOBJ TKDEPLY TKDESTEP \
+	TKDESTL TKDEVRML TKDraw TKExpress TKFeat TKFillet TKG2d TKG3d \
+	TKGeomAlgo TKGeomBase TKHLR TKLCAF TKMath TKMesh TKMeshVS TKOffset \
+	TKOpenGl TKOpenGlTest TKPrim TKQADraw TKRWMesh TKService TKShHealing \
+	TKStd TKStdL TKTObj TKTObjDRAW TKTopAlgo TKTopTest TKV3d TKVCAF \
+	TKViewerTest TKXCAF TKXDEDRAW TKXMesh TKXSBase TKXSDRAW TKXSDRAWDE \
+	TKXSDRAWGLTF TKXSDRAWIGES TKXSDRAWOBJ TKXSDRAWPLY TKXSDRAWSTEP \
+	TKXSDRAWSTL TKXSDRAWVRML TKXml TKXmlL TKXmlTObj TKXmlXCAF TKernel
+SHARED_LIBS +=		${LIB} 3.0
 .endfor
 
+
 CATEGORIES =	

Re: [update] mail/aerc 0.16.0 -> 0.17.0

2024-02-01 Thread Johannes Thyssen Tishman
2024-02-01T20:31:35Z "Thim Cederlund" :
> Thank you Johannes. Funnily enough I was just about to send a patch
> myself but I guess by chance, I just glanced at the inbox and noticed
> your mail. Funny how that works sometimes.

I certainly could've been more patient and wait a little longer.
Sorry if I made you work for nothing.

> Anyways, I have tested it a bit on amd64, without notmuch might I
> add, and all seems to be working right, no hiccups of any sorts.

Glad it's working. Thanks for testing :)



Re: UPDATE vaultwarden-1.30.2 and vaultwarden-web-2024.1.2

2024-02-01 Thread Theo Buehler
Two small things:

> -MODCARGO_CRATES +=   ring0.17.5  # LICENSE
> +MODCARGO_CRATES +=   ring0.17.7  # LICENSE

crates.inc no longer contains ring 0.16, so the BDEP on rust-ring can
be dropped and the NOT_FOR_ARCHS should be changed to:

# ring-v0.17 does not support this arch
NOT_FOR_ARCHS = sparc64



CVS: cvs.openbsd.org: ports

2024-02-01 Thread Klemens Nanni
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2024/02/01 14:37:38

Modified files:
net/tdesktop   : Makefile distinfo 

Log message:
update to tdesktop 4.14.12



CVS: cvs.openbsd.org: ports

2024-02-01 Thread Caspar Schutijser
CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/02/01 13:03:32

Modified files:
devel/sccache  : Makefile crates.inc distinfo 

Log message:
devel/sccache: update to 0.7.6



Re: www/nextcloud: possible improvements to provided httpd.conf example

2024-02-01 Thread Clemens Gößnitzer
On Thu, 2024-02-01 at 16:48 +0100, Gonzalo L. Rodriguez wrote:
> On Thu, 01 Feb 2024 at 13:57:35 +0100, Clemens Gößnitzer wrote:
> > I value the amazing work you are doing to keep www/nextcloud in a
> > really good shape.  Thank you for that!
> > 
> > I have three suggestions to possibly improve the provided
> > httpd.conf
> > example:
> > 
> > 1.) block more locations
> > 2.) use block return 403 together with errdocs redirect
> > 3.) only allow needed .php files
> > 
> > 1.)
> > According to
> > https://github.com/nextcloud/server/blob/master/.htaccess#L91,
> > 3rdparty
> > and lib should be blocked as well.  The example already does that
> > for
> > config and data.
> > 
> > 2.)
> > Instead of doing "block drop", one could alternatively use "block
> > return 403".  With an error document similar to the provided
> > index.html
> > from nextcloud, a simple redirect to index.php could be provided,
> > too,
> > when returning 403.  This could also be done for the global server
> > configuration.  Thus, the user would always get redirected to
> > index.php
> > if he requests an invalid URL.
> > 
> > 3.)
> > It seems like index.php, remote.php and status.php (potentially
> > cron.php for web-based cron) are the only php files which need to
> > be
> > parsed by php-fpm socket via fcgi.  Thus, instead of matching all
> > php
> > files in the path (with "*.php*"), one could restrict php fcgi
> > functionality to just these three (four) files.
> > 
> > Change 3.) would even make change 1) unnecessary, since then there
> > is
> > no danger of fetching random php files with the glob, and these
> > block
> > drop could be replaced by a block drop/return 403 in the global
> > server
> > configuration.
> > 
> > If you like these ideas, I will provide a patch.
> > 
> > Thanks.
> > 
> 
> Hi, it was discussed many times about put a super tweaked httpd.conf
> but the
> idea of the example it's just that, an example, if you think your
> version could
> be better or more secure and you tested it, please send a diff and I
> will try
> it.
> 
> Thanks!
> 

Attached you find a diff.  Rationale for the changes:

-) I only need to set max request body to 10M for even very large files
(>500M) to be uploaded successfully in the browser.

-) Only pass needed *.php* files to the fastcgi interpreter.  This
change requires careful testing.  The below setting works for me, but I
don't use all features of nextcloud.

-) In the nextcloud root directory, there is already an index.html
which takes care of the redirect.  Use that instead of a return 301. 
If it ever required to redirect to a different location, the chances
are high that nextcloud takes care of that in index.html, thus,
changing the httpd configuration wouldn't be required.

-) the 'location match "/nextcloud/oc[ms]%-provider/*"' had some issues
and seems to be not necessary anymore, since ocm-provider got deleted
some time ago:
* no root set, thus, no access to the nextcloud directory
* no fastcgi set for php parsing
* no request strip 1 set
 This was not immediately visible due to the "catch-all" "*.php*" glob.

-) according to the documentation for nginx [1], all .well-known except
carddav and caldav should just be handed over to index.php for correct
handling.  This could potentially break setups that also use ACME for
getting TLS certificates if the .well-known/acme-challenge
configuration comes after this one (in httpd first location statement
wins).

Potential further changes, not shown in this diff:
-) change from example.com/nextcloud to cloud.example.com.  This would
simplify some settings.  I don't know how many people run the former
vs. the latter, and it's subject to personal taste.
-) Setting up an err.html with a redirect to /nextcloud/index.php, the
same way index.html in the nextcloud root directory works.  Thus, all
invalid links would be forwarded to index.php.  This wouldn't work if
there are other services than nextcloud in the same server / domain.

[1]
https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html


Index: pkg/README
===
RCS file: /cvs/ports/www/nextcloud/pkg/README,v
retrieving revision 1.23
diff -u -p -u -r1.23 README
--- pkg/README  5 Oct 2023 14:18:07 -   1.23
+++ pkg/README  1 Feb 2024 19:38:49 -
@@ -43,25 +43,54 @@ server "domain.tld" {
key "/etc/ssl/private/domain.tld_private.pem"
}
 
-   # Set max upload size to 513M (in bytes)
-   connection max request body 537919488
+   # Set max upload size to 10M (in bytes)
+   connection max request body 10485760
connection max requests 1000
connection request timeout 3600
connection timeout 3600
 
block drop
 
-   # Ensure that no '*.php*' files can be fetched from these directories
-   location "/nextcloud/config/*" {
-   block drop
+   # only allow well-known and required php 

Re: Update productivity/hledger 1.31->1.32.2

2024-02-01 Thread Matthias Kilian
Hi,

On Sat, Jan 27, 2024 at 11:16:44PM -0800, Greg Steuck wrote:
> Normal development happening:
> https://hackage.haskell.org/package/hledger-1.32.2/changelog
> 
> Completely machine generated update. Seems to be working for me.
> 
> OK?

Ok.

Ciao,
Kili

>  productivity/hledger/Makefile | 132 -
>  productivity/hledger/distinfo | 272 ++
>  2 files changed, 205 insertions(+), 199 deletions(-)
> 
> diff --git a/productivity/hledger/Makefile b/productivity/hledger/Makefile
> index 52b9da1d15a..345bf36f89c 100644
> --- a/productivity/hledger/Makefile
> +++ b/productivity/hledger/Makefile
> @@ -15,136 +15,130 @@ LIB_DEPENDS =   converters/libiconv \
>  
>  MODULES =devel/cabal
>  MODCABAL_STEM =  hledger
> -MODCABAL_VERSION =   1.31
> +MODCABAL_VERSION =   1.32.2
>  
>  post-install:
>   @${INSTALL_MAN} ${WRKSRC}/hledger.1 ${PREFIX}/man/man1
>  
>  MODCABAL_MANIFEST= \
>   Decimal 0.5.2   0   \
> - Diff0.4.1   0   \
> + Diff0.5 1   \
>   Glob0.10.2  3   \
> - OneTuple0.4.1.1 0   \
> + OneTuple0.4.1.1 1   \
>   Only0.1 2   \
>   QuickCheck  2.14.3  0   \
>   StateVar1.2.2   0   \
> - aeson   2.2.0.0 0   \
> + aeson   2.2.1.0 1   \
>   aeson-pretty0.8.10  0   \
> - ansi-terminal   1.0 0   \
> + ansi-terminal   1.0.2   0   \
>   ansi-terminal-types 0.11.5  1   \
> - assoc   1.1 0   \
> - async   2.2.4   3   \
> - attoparsec  0.14.4  4   \
> - base-compat 0.13.0  0   \
> - base-orphans0.9.0   0   \
> - bifunctors  5.6.1   1   \
> + assoc   1.1 1   \
> + async   2.2.5   0   \
> + attoparsec  0.14.4  5   \
> + base-compat 0.13.1  0   \
> + base-orphans0.9.1   0   \
> + bifunctors  5.6.1   2   \
>   bitvec  1.1.5.0 0   \
>   blaze-builder   0.4.2.3 0   \
>   blaze-html  0.9.1.2 4   \
> - blaze-markup0.8.2.8 5   \
> + blaze-markup0.8.3.0 1   \
>   cabal-doctest   1.0.9   3   \
>   call-stack  0.4.0   0   \
>   case-insensitive1.2.1.0 0   \
> - cassava 0.5.3.0 4   \
> + cassava 0.5.3.0 5   \
>   cassava-megaparsec  2.0.4   1   \
>   clock   0.8.4   0   \
>   cmdargs 0.10.22 0   \
>   colour  2.3.6   0   \
> - comonad 5.0.8   1   \
> + comonad 5.0.8   2   \
>   conduit 1.3.5   0   \
>   conduit-extra   1.3.6   0   \
>   contravariant   1.5.5   0   \
>   control-monad-free  0.6.2   0   \
>   csv 0.1.2   0   \
> - data-array-byte 0.1.0.1 1   \
>   data-default0.7.1.1 0   \
>   data-default-class  0.1.2.0 0   \
>   data-default-instances-containers   0.0.1   0   \
>   data-default-instances-dlist0.0.1   0   \
>   data-default-instances-old-locale   0.0.1   0   \
> - data-fix0.3.2   4   \
> - deferred-folds  0.9.18.30   \
> + data-fix0.3.2   5   \
>   distributive0.6.2.1 1   \
>   dlist   1.0 1   \
>   doclayout   0.4.0.1 0   \
>   emojis  0.1.3   0   \
>   extra   1.7.14  0   \
>   file-embed  0.0.15.00   \
> - foldable1-classes-compat0.1 3   \
> - foldl   1.4.15  0   \
> - generically 0.1.1   1   \
> + generically 0.1.1   2   \
>   githash 0.1.7.0 0   \
> - hashable1.4.3.0 0   \
> + hashable1.4.3.0 1   \
>   hashtables  1.3.1   0   \
> - hledger-lib 1.310   \
> - hsc2hs  0.68.9  0   \
> + hledger-lib 1.32.2  0   \
> + hsc2hs  0.68.10 1   \
>   html1.0.1.2 0   \
> - indexed-traversable 0.1.2.1 0   \
> - indexed-traversable-instances   0.1.1.2 1   \
> - integer-conversion  0.1 0   \
> - integer-logarithms  1.0.3.1 4   \
> - isomorphism-class   0.1.0.9 0   \
> - lucid   2.11.20230408   0   \
> - math-functions  0.3.4.2 0   \
> - megaparsec  9.5.0   0   \
> - microlens   0.4.13.10   \
> - microlens-th0.4.3.130   \
> + indexed-traversable 0.1.3   0   \
> + indexed-traversable-instances   0.1.1.2 2   \
> + integer-conversion  0.1.0.1 1   \
> + integer-logarithms  1.0.3.1 5   \
> + lucid   2.11.20230408   1   \
> + math-functions  0.3.4.3 0   \
> + megaparsec  9.6.1   0   \
> + microlens   0.4.13.11   \
> + microlens-th0.4.3.140   \
>   

Re: A couple more lang/ghc fixups

2024-02-01 Thread Matthias Kilian
Hi,

On Sat, Jan 27, 2024 at 10:49:42PM -0800, Greg Steuck wrote:
> Now that we landed ghc-9.6 is a good time to have `make test` fixed. It
> took some doing to have them all fixed upstream and even then some of the
> fixes are still not in 9.6. Anyway, OK?

Ok.

Ciao,
Kili

> ---
>  lang/ghc/Makefile | 20 ++--
>  lang/ghc/distinfo |  2 --
>  2 files changed, 2 insertions(+), 20 deletions(-)
> 
> diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
> index 9aa4f19d65c..1612e816c88 100644
> --- a/lang/ghc/Makefile
> +++ b/lang/ghc/Makefile
> @@ -39,8 +39,8 @@ LIB_DEPENDS =   converters/libiconv \
>   devel/libffi
>  
>  BUILD_DEPENDS =  archivers/bzip2 \
> - archivers/gtar \
> - textproc/py-sphinx${MODPY_FLAVOR}>=4.0.2
> + archivers/gtar
> +
>  RUN_DEPENDS =
>  
>  SITES =  
> https://downloads.haskell.org/ghc/${GHC_VERSION}/
> @@ -61,17 +61,7 @@ DISTFILES.boot =   ${BINDISTFILE-${MACHINE_ARCH}}
>  DISTFILES.noextract =hadrian-sources-${BIN_VER}.tar.gz
>  SITES.noextract =https://openbsd.dead-parrot.de/distfiles/
>  
> -# sphinx-rtd-theme update patch set
> -# mirrored from 
> https://gitlab.haskell.org/ghc/ghc/-/commit/70526f5bd8886126f49833ef20604a2c6477780a.patch
> -# "GIT binary patch" (gpatch doesn't handle it, patch segfaults)
> -# (sorry! -sthen)
> -SITES.p =https://spacehopper.org/mirrors/
> -DISTFILES.p +=   ghc-rtd-update-70526f5bd8.diff
>  EXTRACT_ONLY =   ${DISTFILES} ${DISTFILES.boot}
> -BUILD_DEPENDS += devel/git
> -pre-patch:
> - cd ${WRKSRC}; env -i git apply 
> ${FULLDISTDIR}/ghc-rtd-update-70526f5bd8.diff
> -
>  
>  # Substvars for all libraries, assuming that ghc-boot, ghc-boot-th,
>  # ghc-heap and ghci will always have the same version number as ghc.
> @@ -136,9 +126,6 @@ CONFIGURE_ENV +=  
> CONF_GCC_LINKER_OPTS_STAGE0="${GHC_CC_OPTS}" \
>   CONF_GCC_LINKER_OPTS_STAGE2="${GHC_CC_OPTS}" \
>   CONF_CC_OPTS_STAGE2="${GHC_CC_OPTS}"
>  
> -# Do not pick up gpatch
> -CONFIGURE_ENV += ac_cv_path_PatchCmd=/usr/bin/patch
> -
>  MAKE_FLAGS +=StripLibraries=YES \
>   INSTALL_BIN_OPTS=-s \
>   HSCOLOUR_SRCS=NO \
> @@ -147,9 +134,6 @@ MAKE_FLAGS += StripLibraries=YES \
>  # haddock: ... : commitBuffer: invalid argument (invalid character)
>  MAKE_ENV =   LC_ALL=en_US.UTF-8
>  
> -# For mktexpk (via dvips when building the PostScript documentation):
> -PORTHOME =   ${WRKDIR}
> -
>  TEST_DEPENDS =   print/ghostscript/gnu ${MODPY_RUN_DEPENDS}
>  
>  post-extract:
> diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
> index 2a2065aa251..3c92fd3f3be 100644
> --- a/lang/ghc/distinfo
> +++ b/lang/ghc/distinfo
> @@ -2,11 +2,9 @@ SHA256 (ghc/ghc-9.6.4.20240111-amd64.tar.xz) = 
> CedJ29vBFZyl1e+DgcUqPfjHMDRKmEOsX
>  SHA256 (ghc/ghc-9.6.4.20240111-shlibs-amd64.tar.gz) = 
> Nb3trqnIF8H5kfKEkeGLr+sl4rPeFsbW/gfkelRprrY=
>  SHA256 (ghc/ghc-9.6.4-src.tar.xz) = 
> EL8luLBxdP3ZhotcDFbBfA7x7ctiR7S4ZL6TNlG/1MA=
>  SHA256 (ghc/ghc-9.6.4-testsuite.tar.xz) = 
> bhMoL76//b+gpJiJQ3REyakM/ldgxHlpzUJFhUwzjXM=
> -SHA256 (ghc/ghc-rtd-update-70526f5bd8.diff) = 
> maCALPRglB5J9LJEQxBqMGdVbH4qK2gqVuaU5xmYdNU=
>  SHA256 (ghc/hadrian-sources-9.6.4.20240111.tar.gz) = 
> wMMJfyP7Pr6xjb/tj9Kz5iZugGr6+duMwJ23aGsUWy0=
>  SIZE (ghc/ghc-9.6.4-src.tar.xz) = 29451856
>  SIZE (ghc/ghc-9.6.4-testsuite.tar.xz) = 7075820
>  SIZE (ghc/ghc-9.6.4.20240111-amd64.tar.xz) = 74706384
>  SIZE (ghc/ghc-9.6.4.20240111-shlibs-amd64.tar.gz) = 3544885
> -SIZE (ghc/ghc-rtd-update-70526f5bd8.diff) = 4245853
>  SIZE (ghc/hadrian-sources-9.6.4.20240111.tar.gz) = 2125322
> \ No newline at end of file
> -- 
> 2.43.0
> 
> >From 11e6bf454004e8e60894c7259f8c3a8fbd49525d Mon Sep 17 00:00:00 2001
> From: Greg Steuck 
> Date: Sat, 27 Jan 2024 19:16:24 -0800
> Subject: [PATCH 2/2] Fix `make test` in lang/ghc
> 
> ---
>  lang/ghc/Makefile | 31 ++-
>  .../patches/patch-compiler_GHC_Unit_State_hs  |  2 +-
>  .../patch-libraries_process_tests_all_T   | 12 +++
>  .../patches/patch-testsuite_driver_testlib_py | 10 +++---
>  4 files changed, 33 insertions(+), 22 deletions(-)
>  create mode 100644 lang/ghc/patches/patch-libraries_process_tests_all_T
> 
> diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
> index 1612e816c88..dc02ebab65a 100644
> --- a/lang/ghc/Makefile
> +++ b/lang/ghc/Makefile
> @@ -132,7 +132,7 @@ MAKE_FLAGS += StripLibraries=YES \
>   BUILD_SPHINX_PDF=NO
>  
>  # haddock: ... : commitBuffer: invalid argument (invalid character)
> -MAKE_ENV =   LC_ALL=en_US.UTF-8
> +MAKE_ENV +=  LC_ALL=en_US.UTF-8
>  
>  TEST_DEPENDS =   print/ghostscript/gnu ${MODPY_RUN_DEPENDS}
>  
> @@ -162,17 +162,20 @@ post-patch:
>   cd ${WRKSRC} && \
>   ${MODPY_BIN} 

CVS: cvs.openbsd.org: ports

2024-02-01 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2024/02/01 12:24:32

Modified files:
net/p5-Net-DNS : Makefile distinfo 

Log message:
update p5-Net-DNS to 1.43



Re: CVS: cvs.openbsd.org: ports

2024-02-01 Thread Solène Rapenne
Le jeudi 01 février 2024 à 07:11 -0700, Landry Breuil a écrit :

> > CVSROOT: /cvs  
> > Module name: ports  
> > Changes by: 
> > [[lan...@cvs.openbsd.org](mailto:lan...@cvs.openbsd.org)](mailto:[lan...@cvs.openbsd.org](mailto:lan...@cvs.openbsd.org))
> >  2024/02/01 07:11:12  
> >  
> > Modified files:  
> > www/mozilla-firefox: Tag: OPENBSD_7_4 Makefile  
> > Added files:  
> > www/mozilla-firefox/patches: Tag: OPENBSD_7_4  
> >   
> > patch-third_party_libwebrtc_modules_video_capture_video_capture_facto  
> > ry_cc  
> >  
> > Log message:  
> > www/mozilla-firefox: MFC fix webcam detection  
> >  
> > gypped from 
> > [[freebsd/freebsd-ports@53a70f1248](mailto:freebsd/freebsd-ports@53a70f1248)](mailto:[freebsd/freebsd-ports@53a70f1248](mailto:freebsd/freebsd-ports@53a70f1248))
> >   
> > cf #1878010  
> >


this doesn't compile on arm64 (I made sure the whole ports tree is up to date)
I think this failed one or two commits earlier

gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/config/external/sqlite'  
gmake[3]: Entering directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/third_party/sqlite3/src'  
mkdir -p '.deps/'  
third_party/sqlite3/src/sqlite3.o  
/build/tmp/pobj//firefox-122.0/bin/cc -std=gnu99 -o sqlite3.o -c -flto=thin 
-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong -DNDEBUG=1 
-DTRIMMED=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_THREADSAFE=1 
-DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_ENABLE_DBSTAT_VTAB=1 
-DSQLITE_DEFAULT_PAGE_SIZE=32768 -DSQLITE_MAX_DEFAULT_PAGE_SIZE=32768 
-DSQLITE_OMIT_COMPILEOPTION_DIAGS=1 -DSQLITE_OMIT_DEPRECATED 
-DSQLITE_OMIT_BUILTIN_TEST -DSQLITE_TEMP_STORE=2 
'-DSQLITE_TEMP_FILE_PREFIX="mz_etilqs_"' -DSQLITE_ENABLE_MATH_FUNCTIONS 
-DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1572864 
-I/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src 
-I/build/tmp/pobj/firefox-122.0/build-aarch64/third_party/sqlite3/src 
-I/build/tmp/pobj/firefox-122.0/build-aarch64/dist/include 
-I/usr/local/include/nspr -I/usr/local/include/nss -I/usr/local/include/nspr 
-I/build/tmp/pobj/firefox-122.0/build-aarch64/dist/include/nss 
-I/usr/local/include -include 
/build/tmp/pobj/firefox-122.0/build-aarch64/mozilla-config.h -DMOZILLA_CLIENT 
-Wno-backend-plugin -O2 -pipe -g -fPIC -ffunction-sections -fdata-sections 
-fno-math-errno -pthread -pipe -gdwarf-4 -O2 -pipe -g -fomit-frame-pointer 
-funwind-tables -Wall -Wbitfield-enum-conversion -Wempty-body 
-Wformat-type-confusion -Wignored-qualifiers -Wpointer-arith 
-Wshadow-field-in-constructor-modified -Wsign-compare 
-Wtautological-constant-in-range-compare -Wtype-limits 
-Wno-error=tautological-type-limit-compare -Wunreachable-code 
-Wunreachable-code-return -Wunused-but-set-parameter -Wclass-varargs 
-Wfloat-overflow-conversion -Wfloat-zero-conversion -Wloop-analysis 
-Wno-range-loop-analysis -Wenum-compare-conditional -Wenum-float-conversion 
-Wstring-conversion -Wno-error=deprecated-declarations -Wno-error=array-bounds 
-Wno-error=free-nonheap-object -Wno-error=atomic-alignment -Wformat 
-Wformat-security -Werror=implicit-function-declaration -Wno-psabi 
-Wthread-safety -Wno-error=builtin-macro-redefined -Wno-unknown-warning-option 
-Wno-sign-compare -Wno-type-limits -fno-strict-aliasing -ffp-contract=off 
-fprofile-use=/build/tmp/pobj//firefox-122.0/merged.profdata 
-Wno-error=backend-plugin -MD -MP -MF .deps/sqlite3.o.pp   
/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src/sqlite3.c  
gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/media/libvpx'  
gmake[2]: *** 
[/build/tmp/pobj/firefox-122.0/firefox-122.0/config/recurse.mk:72: 
media/libvpx/target-objects] Error 2  
gmake[2]: *** Waiting for unfinished jobs  
/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src/sqlite3.c:88121:3:
 warning: 'return' will never be executed [-Wunreachable-code-return]  
return;  
^~  
/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src/sqlite3.c:92699:10:
 warning: 'return' will never be executed [-Wunreachable-code-return]  
return 0;  
^  
/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src/sqlite3.c:173973:9:
 warning: code will never be executed [-Wunreachable-code]  
YYMINORTYPE yylhsminor;  
^~~  
3 warnings generated.  
gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/third_party/sqlite3/src'  
fts5parse.sql:1012:9: warning: code will never be executed [-Wunreachable-code] 
 
fts5YYMINORTYPE fts5yylhsminor;  
^~~  
1 warning generated.  
gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/third_party/sqlite3/ext'  
gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/browser/app'  
gmake[2]: Leaving directory '/build/tmp/pobj/firefox-122.0/build-aarch64'  
gmake[1]: *** 
[/build/tmp/pobj/firefox-122.0/firefox-122.0/config/recurse.mk:34: compile] 
Error 2  

[update] mail/aerc 0.16.0 -> 0.17.0

2024-02-01 Thread Johannes Thyssen Tishman
Please find below a diff to update mail/aerc to version 0.17.0.
There's quite a lot of new features as well as better CVS and OpenBSD
support.

Changelog: https://git.sr.ht/~rjarry/aerc/refs/0.17.0

Cc'd maintainer.

Kind regards,
Johannes

Index: Makefile
===
RCS file: /cvs/ports/mail/aerc/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile15 Nov 2023 16:13:03 -  1.14
+++ Makefile1 Feb 2024 16:22:36 -
@@ -4,11 +4,10 @@ ONLY_FOR_ARCHS = aarch64 arm amd64 i386 
 COMMENT =  terminal email client
 
 MODGO_MODNAME =git.sr.ht/~rjarry/aerc
-MODGO_VERSION =v0.0.0-20230927211642-61bca76423ee
+MODGO_VERSION =v0.0.0-20240201001117-6ea74eb30457
 
-V =0.16.0
+V =0.17.0
 DISTNAME = aerc-$V
-REVISION = 0
 
 CATEGORIES =   mail
 
Index: distinfo
===
RCS file: /cvs/ports/mail/aerc/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo28 Sep 2023 20:59:23 -  1.10
+++ distinfo1 Feb 2024 16:22:36 -
@@ -1,12 +1,12 @@
-SHA256 (aerc-0.16.0.zip) = qxB3rG5bd654Wr553+1Cs/yfDXRzXXT17YtwXeqa/Zo=
+SHA256 (aerc-0.17.0.zip) = kZfFtrQmuiy7+ncgCJviRC+MaFXZR8YvdsQOSgeXRl8=
 SHA256 (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.0.mod) = 
ZmAMRI0rXFR3BnNIkO0YGJyCgLII2Gua8qsIENW2HSE=
 SHA256 (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.0.zip) = 
v36mmm629lvSsa2TebXRmQQP81Rk3+iLEKPFL30ROq8=
+SHA256 (go_modules/git.sr.ht/~rjarry/go-opt/@v/v1.3.0.mod) = 
4J9cxBhy4n5N/YRcoMwoVBs2K4xVoPWd0HOjF5qtnrE=
+SHA256 (go_modules/git.sr.ht/~rjarry/go-opt/@v/v1.3.0.zip) = 
pK/so6R6i1R7BSCG1CAIXLuvJmkEaKx92ADcf9aHPL0=
 SHA256 (go_modules/git.sr.ht/~rockorager/go-jmap/@v/v0.3.0.mod) = 
h/nX5diHqfkDrJbpZuGw5gE+IgaclgqZgm7kmVLa2jw=
 SHA256 (go_modules/git.sr.ht/~rockorager/go-jmap/@v/v0.3.0.zip) = 
qB6fVqXORSSINci0xvMisPSucvo2ufZLg8O1JGR9wgg=
-SHA256 (go_modules/git.sr.ht/~rockorager/tcell-term/@v/v0.8.0.mod) = 
8kRq6lakDTvyokkg1NpGgMeU8Bp4sR1Cf62IhtKWbaM=
-SHA256 (go_modules/git.sr.ht/~rockorager/tcell-term/@v/v0.8.0.zip) = 
dhiTK2f00tfMiBXlpyz8WGHzlJIVhiTkpkY4ZWeMNZU=
-SHA256 (go_modules/git.sr.ht/~sircmpwn/getopt/@v/v1.0.0.mod) = 
JKqQcy+IHLONXXl/PBB8RU7ygm2ZbHGoSCP45a2scPI=
-SHA256 (go_modules/git.sr.ht/~sircmpwn/getopt/@v/v1.0.0.zip) = 
4NfbE0Q1547T0PtdB97FPTP6bCB8qYk4lEMNlaaxEck=
+SHA256 (go_modules/git.sr.ht/~rockorager/tcell-term/@v/v0.10.0.mod) = 
8kRq6lakDTvyokkg1NpGgMeU8Bp4sR1Cf62IhtKWbaM=
+SHA256 (go_modules/git.sr.ht/~rockorager/tcell-term/@v/v0.10.0.zip) = 
SgWDKQ8e+h0JoFbMtMt4tbOrox/BVVwePeJsp11w4Xg=
 SHA256 
(go_modules/github.com/!proton!mail/crypto/@v/v0.0.0-20200420072808-71bec3603bf3.mod)
 = DMa3izbWgj9dYhfIZi8gZzx06hpm99rTKMmFvQJyhjU=
 SHA256 
(go_modules/github.com/!proton!mail/crypto/@v/v0.0.0-20200420072808-71bec3603bf3.zip)
 = +ctdhKExtFrfAEM5TCDVDtDUKOWMIHMwUwRJD6KzSco=
 SHA256 
(go_modules/github.com/!proton!mail/go-crypto/@v/v0.0.0-2022122917-428f8eabeeb3.mod)
 = YS0PzpOZlNH/uEOMpQbQh04XnAFAh1/Xr65Z65d3ROU=
@@ -36,8 +36,8 @@ SHA256 (go_modules/github.com/emersion/g
 SHA256 (go_modules/github.com/emersion/go-imap/@v/v1.0.5.mod) = 
zTnypeCA7vmr+hUlnboJXXoUvGK52f5DBS1Aw3wGPgg=
 SHA256 (go_modules/github.com/emersion/go-imap/@v/v1.2.1.mod) = 
CUokz+EHmJaAQ2go2iC2w8rGTTaPK9cwgoSSd+XYSlY=
 SHA256 (go_modules/github.com/emersion/go-imap/@v/v1.2.1.zip) = 
ubZudBptu/WHym+OYYpmsXZQeI+pTuQAz6zGDDSPxJo=
-SHA256 (go_modules/github.com/emersion/go-maildir/@v/v0.3.0.mod) = 
VFWPA3hpzllHihNQJH2RumxUFdTrCW+aM3zntHp0sZc=
-SHA256 (go_modules/github.com/emersion/go-maildir/@v/v0.3.0.zip) = 
5mRlTH398xrgF9GEN4ygX+1+Kq74iTD2sKDBcixlz34=
+SHA256 (go_modules/github.com/emersion/go-maildir/@v/v0.4.1.mod) = 
FJb3TEH40qSUtZd0v6154aHWYFQrSN53ga7CGRjRcRo=
+SHA256 (go_modules/github.com/emersion/go-maildir/@v/v0.4.1.zip) = 
N/ozWlIPaO2Ju99A7xoYJP7KLNaQgkYbz5WrKf86kKg=
 SHA256 (go_modules/github.com/emersion/go-mbox/@v/v1.0.3.mod) = 
4yv9gnZhVZlD1HDmPNzNV5E4WTeTtkmP4m5gcD5cnSI=
 SHA256 (go_modules/github.com/emersion/go-mbox/@v/v1.0.3.zip) = 
B5QA+dvLBbwUS0Hr66U2EDNsPA55+nmBlOWP7abW96w=
 SHA256 (go_modules/github.com/emersion/go-message/@v/v0.11.1.mod) = 
c6hi3jK0N1pJeLMkBz1iZ6Jq69AU98qcnrXLlNQV88g=
@@ -91,8 +91,6 @@ SHA256 (go_modules/github.com/golang/sna
 SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.5.mod) = 
QDarVjaqQr0xMpbNO/y0yIkSdgxWqeZlWuQi2HZ8gNo=
 SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.8.mod) = 
58dmnUod1Ym6PgJLon9D8pPbYR/gdc4g17iENw1j/r0=
 SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.8.zip) = 
0XV01abqn2Bu1zURcXDgKu/C8R+K4V44mO2Z0lW0bwY=
-SHA256 
(go_modules/github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod) 
= hMaYCNIbxoSOGteNa2SWVDO1uqumZVSDOLfao5+qcL4=
-SHA256 
(go_modules/github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip) 
= G/cL20yIm0exl2Nwgy2nkGDDbK0oLyePJ5YDIAYjd1w=
 SHA256 

CVS: cvs.openbsd.org: ports

2024-02-01 Thread Gonzalo L . Rodriguez
CVSROOT:/cvs
Module name:ports
Changes by: gonz...@cvs.openbsd.org 2024/02/01 08:49:38

Modified files:
net/dendrite   : Makefile distinfo modules.inc 

Log message:
Update for Dendrite to 0.13.5



Re: www/nextcloud: possible improvements to provided httpd.conf example

2024-02-01 Thread Gonzalo L. Rodriguez
On Thu, 01 Feb 2024 at 13:57:35 +0100, Clemens Gößnitzer wrote:
> I value the amazing work you are doing to keep www/nextcloud in a
> really good shape.  Thank you for that!
> 
> I have three suggestions to possibly improve the provided httpd.conf
> example:
> 
> 1.) block more locations
> 2.) use block return 403 together with errdocs redirect
> 3.) only allow needed .php files
> 
> 1.)
> According to
> https://github.com/nextcloud/server/blob/master/.htaccess#L91, 3rdparty
> and lib should be blocked as well.  The example already does that for
> config and data.
> 
> 2.)
> Instead of doing "block drop", one could alternatively use "block
> return 403".  With an error document similar to the provided index.html
> from nextcloud, a simple redirect to index.php could be provided, too,
> when returning 403.  This could also be done for the global server
> configuration.  Thus, the user would always get redirected to index.php
> if he requests an invalid URL.
> 
> 3.)
> It seems like index.php, remote.php and status.php (potentially
> cron.php for web-based cron) are the only php files which need to be
> parsed by php-fpm socket via fcgi.  Thus, instead of matching all php
> files in the path (with "*.php*"), one could restrict php fcgi
> functionality to just these three (four) files.
> 
> Change 3.) would even make change 1) unnecessary, since then there is
> no danger of fetching random php files with the glob, and these block
> drop could be replaced by a block drop/return 403 in the global server
> configuration.
> 
> If you like these ideas, I will provide a patch.
> 
> Thanks.
> 

Hi, it was discussed many times about put a super tweaked httpd.conf but the
idea of the example it's just that, an example, if you think your version could
be better or more secure and you tested it, please send a diff and I will try
it.

Thanks!

-- 

 %gonzalo



CVS: cvs.openbsd.org: ports

2024-02-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/02/01 08:48:39

Modified files:
mail/neomutt   : Makefile distinfo 
mail/neomutt/patches: patch-main_c 
mail/neomutt/pkg: PLIST 
Removed files:
mail/neomutt/patches: patch-conn_sasl_c patch-conn_sasl_h 

Log message:
update to neomutt-20240201



CVS: cvs.openbsd.org: ports

2024-02-01 Thread Gonzalo L . Rodriguez
CVSROOT:/cvs
Module name:ports
Changes by: gonz...@cvs.openbsd.org 2024/02/01 08:44:42

Modified files:
www/azorius: Makefile distinfo 
www/azorius/pkg: PLIST README 
Added files:
www/azorius/pkg: MESSAGE 
Removed files:
www/azorius: modules.inc 

Log message:
Update for Azorius to 0.3.2

from Horia mantainer.



CVS: cvs.openbsd.org: ports

2024-02-01 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2024/02/01 07:34:58

Modified files:
security/py-cryptography: Makefile 

Log message:
py-cryptography: link libcrypto and libssl dynamically, ok sthen

Setting OPENSSL_STATIC=0 short circuits the logic that assumes that
there are "libcrypto.so" and "libssl.so" files in /usr/lib and therefore
decides that we need to link statically.



CVS: cvs.openbsd.org: ports

2024-02-01 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2024/02/01 07:11:12

Modified files:
www/mozilla-firefox: Tag: OPENBSD_7_4 Makefile 
Added files:
www/mozilla-firefox/patches: Tag: OPENBSD_7_4 
 
patch-third_party_libwebrtc_modules_video_capture_video_capture_factory_cc 

Log message:
www/mozilla-firefox: MFC fix webcam detection

gypped from freebsd/freebsd-ports@53a70f1248
cf #1878010



CVS: cvs.openbsd.org: ports

2024-02-01 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2024/02/01 07:09:09

Modified files:
www/mozilla-firefox: Makefile 
Added files:
www/mozilla-firefox/patches: 
 
patch-third_party_libwebrtc_modules_video_capture_video_capture_factory_cc 

Log message:
www/mozilla-firefox: fix webcam detection

gypped from freebsd/freebsd-ports@53a70f1248
cf #1878010



py-cryptography: link openssl libs dynamically

2024-02-01 Thread Theo Buehler
Lost a couple of hours debugging something last night because I failed
to notice that _rust.cpython-310.so linked statically against libssl.
The diff below fixes this.

I wonder if we should also do this in cargo.port.mk next to setting
OPENSSL_NO_VENDOR=1, although my build logs don't seem to show any
'-l static=ssl' or '-l static=crypto' outside py-cryptography.

without diff:

/usr/local/lib/python3.10/site-packages/cryptography/hazmat/bindings/_rust.cpython-310.so:
StartEnd  Type  Open Ref GrpRef Name
0fead9a39000 0fead9ee9000 dlib  10   0  
/usr/local/lib/python3.10/site-packages/cryptography/hazmat/bindings/_rust.cpython-310.so
0feb93ba6000 0feb93bee000 rlib  01   0  
/usr/lib/libc++abi.so.7.0

with diff:

/usr/local/lib/python3.10/site-packages/cryptography/hazmat/bindings/_rust.cpython-310.so:
StartEnd  Type  Open Ref GrpRef Name
0886bb818000 0886bbae3000 dlib  10   0  
/usr/local/lib/python3.10/site-packages/cryptography/hazmat/bindings/_rust.cpython-310.so
0885dc0f9000 0885dc16c000 rlib  01   0  
/usr/lib/libssl.so.55.0
0886bf99c000 0886bfbd2000 rlib  02   0  
/usr/lib/libcrypto.so.52.0
0886c2504000 0886c254c000 rlib  01   0  
/usr/lib/libc++abi.so.7.0

Index: Makefile
===
RCS file: /cvs/ports/security/py-cryptography/Makefile,v
diff -u -p -r1.80 Makefile
--- Makefile31 Jan 2024 17:03:18 -  1.80
+++ Makefile1 Feb 2024 12:51:18 -
@@ -4,6 +4,7 @@ MODPY_EGG_VERSION=  42.0.2
 DISTNAME=  cryptography-${MODPY_EGG_VERSION}
 DISTFILES= cryptography-${MODPY_EGG_VERSION}${EXTRACT_SUFX}
 PKGNAME=   ${MODPY_PY_PREFIX}${DISTNAME}
+REVISION=  0
 
 .include "crates.inc"
 
@@ -35,7 +36,7 @@ MODCARGO_CARGOTOML= ${WRKSRC}/src/rust/C
 MODCARGO_INSTALL= No
 MODCARGO_TEST= No
 
-MAKE_ENV=  OPENSSL_DIR="/usr"
+MAKE_ENV=  OPENSSL_DIR="/usr" OPENSSL_STATIC=0
 
 BUILD_DEPENDS= ${RUN_DEPENDS} \
devel/py-setuptools-rust${MODPY_FLAVOR}



www/nextcloud: possible improvements to provided httpd.conf example

2024-02-01 Thread Clemens Gößnitzer
I value the amazing work you are doing to keep www/nextcloud in a
really good shape.  Thank you for that!

I have three suggestions to possibly improve the provided httpd.conf
example:

1.) block more locations
2.) use block return 403 together with errdocs redirect
3.) only allow needed .php files

1.)
According to
https://github.com/nextcloud/server/blob/master/.htaccess#L91, 3rdparty
and lib should be blocked as well.  The example already does that for
config and data.

2.)
Instead of doing "block drop", one could alternatively use "block
return 403".  With an error document similar to the provided index.html
from nextcloud, a simple redirect to index.php could be provided, too,
when returning 403.  This could also be done for the global server
configuration.  Thus, the user would always get redirected to index.php
if he requests an invalid URL.

3.)
It seems like index.php, remote.php and status.php (potentially
cron.php for web-based cron) are the only php files which need to be
parsed by php-fpm socket via fcgi.  Thus, instead of matching all php
files in the path (with "*.php*"), one could restrict php fcgi
functionality to just these three (four) files.

Change 3.) would even make change 1) unnecessary, since then there is
no danger of fetching random php files with the glob, and these block
drop could be replaced by a block drop/return 403 in the global server
configuration.

If you like these ideas, I will provide a patch.

Thanks.



Re: [NEW] emulators/dosbox-x-2023.10.06

2024-02-01 Thread SASANO Takayoshi
Hi,

I was busy for other stuff and I did nothing for working this port.
You said ok but long time has passed, please check again.

> I think you should consider adding yourself as maintainer. Any
>objections?

no problem.

> You also need to add fluidsynth to WANTLIB:

added.

best regards,
-- 
SASANO Takayoshi (JG1UAA) 



dosbox-x.tgz
Description: Binary data


CVS: cvs.openbsd.org: ports

2024-02-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/02/01 04:40:22

Modified files:
security/lego  : Makefile distinfo modules.inc 

Log message:
update to lego-4.15.0, from Horia Racoviceanu (maintainer)



Re: Ping: [maintainer update] ddrescue 1.27 -> 1.28

2024-02-01 Thread Stuart Henderson
thanks, committed with a tweak to fix CONFIGURE_STYLE which I noticed is
not really an autoconf script.

On 2024/02/01 12:02, Martin Ziemer wrote:
> Am Wed, Jan 24, 2024 at 01:47:05PM +0100 schrieb Martin Ziemer:
> > This patch updates ddrescue from 1.27 to 1.28.
> > 
> > Tested on amd64.
> > 
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/ddrescue/Makefile,v
> retrieving revision 1.26
> diff -u -p -r1.26 Makefile
> --- Makefile  27 Sep 2023 17:16:24 -  1.26
> +++ Makefile  24 Jan 2024 12:17:35 -
> @@ -1,6 +1,6 @@
>  COMMENT =data recovery tool
>  
> -DISTNAME =   ddrescue-1.27
> +DISTNAME =   ddrescue-1.28
>  
>  CATEGORIES = sysutils
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/ddrescue/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo  27 Jan 2023 11:37:08 -  1.13
> +++ distinfo  24 Jan 2024 12:17:35 -
> @@ -1,2 +1,2 @@
> -SHA256 (ddrescue-1.27.tar.lz) = OMgMmMWkTxXlNmPkUQCX/WjW7CB1jv3zqSUDfBgyMus=
> -SIZE (ddrescue-1.27.tar.lz) = 93496
> +SHA256 (ddrescue-1.28.tar.lz) = ZibAenyhzB0DytCVhSLFJ5sVYiLTLDQugRF8/vrrEME=
> +SIZE (ddrescue-1.28.tar.lz) = 93823
> 



CVS: cvs.openbsd.org: ports

2024-02-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/02/01 04:18:02

Modified files:
sysutils/ddrescue: Makefile distinfo 

Log message:
update to ddrescue-1.28, from Martin Ziemer (maintainer)

while there, fix CONFIGURE_STYLE, it is not an autoconf-generated
script so should use 'simple' not 'gnu'.



Ping: [maintainer update] ddrescue 1.27 -> 1.28

2024-02-01 Thread Martin Ziemer
Am Wed, Jan 24, 2024 at 01:47:05PM +0100 schrieb Martin Ziemer:
> This patch updates ddrescue from 1.27 to 1.28.
> 
> Tested on amd64.
> 
Index: Makefile
===
RCS file: /cvs/ports/sysutils/ddrescue/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile27 Sep 2023 17:16:24 -  1.26
+++ Makefile24 Jan 2024 12:17:35 -
@@ -1,6 +1,6 @@
 COMMENT =  data recovery tool
 
-DISTNAME = ddrescue-1.27
+DISTNAME = ddrescue-1.28
 
 CATEGORIES =   sysutils
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/ddrescue/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo27 Jan 2023 11:37:08 -  1.13
+++ distinfo24 Jan 2024 12:17:35 -
@@ -1,2 +1,2 @@
-SHA256 (ddrescue-1.27.tar.lz) = OMgMmMWkTxXlNmPkUQCX/WjW7CB1jv3zqSUDfBgyMus=
-SIZE (ddrescue-1.27.tar.lz) = 93496
+SHA256 (ddrescue-1.28.tar.lz) = ZibAenyhzB0DytCVhSLFJ5sVYiLTLDQugRF8/vrrEME=
+SIZE (ddrescue-1.28.tar.lz) = 93823



CVS: cvs.openbsd.org: ports

2024-02-01 Thread Robert Nagy
CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2024/02/01 03:28:18

Modified files:
devel/llvm/17  : Makefile 
devel/llvm/17/patches: 
   patch-clang_lib_Driver_ToolChains_Clang_cpp 

Log message:
temporary disable ret-protector on arm64 because it produces some weird code

this allows me to move ahead with other things until this gets fixed



CVS: cvs.openbsd.org: ports

2024-02-01 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2024/02/01 02:08:11

Modified files:
security/py-openssl: Makefile 

Log message:
py-openssl: enable the shutdown test again

This was broken in tls13_legacy.c r1.43 and fixed again in r1.44.
The worrying bit here is that py-cryptography doesn't seem to pick
up some changes in shared libraries without recompiling.



CVS: cvs.openbsd.org: ports

2024-02-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/02/01 01:25:33

Modified files:
mail/grommunio/gromox: Makefile 

Log message:
-main needed a bump for MODPHP_VERSION as well due to
"@comment lib/php-${MODPHP_VERSION}/"