Re: CVS: cvs.openbsd.org: ports

2022-03-09 Thread Thomas Frohwein
On Sat, Mar 05, 2022 at 05:53:19PM -0700, Kurt Mosiejczuk wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   k...@cvs.openbsd.org2022/03/05 17:53:19
> 
> Modified files:
>   games/witchblast: Makefile 
> 
> Log message:
> Mark witchblast BROKEN-sparc64
> 

http://build-failures.rhaalovely.net/mips64/2022-03-02/games/witchblast.log:
/usr/local/lib/libsfml-window.so.2.0: undefined reference to 
`XRRConfigRotations'
/usr/local/lib/libsfml-window.so.2.0: undefined reference to `XRRGetCrtcInfo'
/usr/local/lib/libsfml-window.so.2.0: undefined reference to 
`XRRFreeScreenConfigInfo'
/usr/local/lib/libsfml-window.so.2.0: undefined reference to `XRRConfigSizes'
/usr/local/lib/libsfml-window.so.2.0: undefined reference to `XRRQueryVersion'
/usr/local/lib/libsfml-window.so.2.0: undefined reference to 
`XRRConfigCurrentConfiguration'
/usr/local/lib/libsfml-window.so.2.0: undefined reference to 
`XRRFreeScreenResources'
/usr/local/lib/libsfml-window.so.2.0: undefined reference to 
`XRRGetOutputPrimary'
/usr/local/lib/libsfml-window.so.2.0: undefined reference to `XRRFreeOutputInfo'
/usr/local/lib/libsfml-window.so.2.0: undefined reference to `XRRFreeCrtcInfo'
/usr/local/lib/libsfml-window.so.2.0: undefined reference to 
`XRRGetScreenResources'
/usr/local/lib/libsfml-window.so.2.0: undefined reference to `XRRGetScreenInfo'
/usr/local/lib/libsfml-window.so.2.0: undefined reference to `XRRGetOutputInfo'
/usr/local/lib/libsfml-window.so.2.0: undefined reference to `XRRSetCrtcConfig'

The following diff links libXrandr explicitly in games/witchblast.
Could you test if this fixes the build on sparc64 and/or mips64?

(Bonus: also removes RCS Ids)

Index: Makefile
===
RCS file: /cvs/ports/games/witchblast/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile6 Mar 2022 00:53:19 -   1.6
+++ Makefile10 Mar 2022 03:14:00 -
@@ -1,13 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2022/03/06 00:53:19 kmos Exp $
-
-BROKEN-sparc64 =   undefined reference to XRRConfigRotations, etc.
-
 COMMENT =  roguelite dungeon crawler game
 
 GH_ACCOUNT =   Cirrus-Minor
 GH_PROJECT =   witchblast
 GH_TAGNAME =   v0.7.5
-REVISION = 2
+REVISION = 3
 
 CATEGORIES =   games x11
 
@@ -16,11 +12,11 @@ MAINTAINER =Thomas Frohwein 

meson might fail if dpb junks cmake

2022-03-09 Thread George Koehler
Hello ports,

I want to describe how meson might fail in "make configure" if meson
is looking for a missing optional dependency, but at the same time,
dpb is junking cmake.  I saw devel/pangomm248 fail in this way, but
it might also happen in other ports using meson.

In each of devel/pangomm248, devel/glibmm268, and devel/cairomm16,
WRKSRC/docs/reference/meson.build looks for mm-common-libstdc++
from devel/mm-common.  These ports don't depend on mm-common, which
is probably not installed.  Meson tries to find mm-common-libstdc++
with pkg-config, then with cmake.

Last month, devel/pangomm248 failed "make configure" in the powerpc
bulk.  (I told dpb to retry pangomm248, which worked.)  I attach a
log.  The important part of the log is,

|   File "/usr/local/lib/python3.9/subprocess.py", line 1821, in \
| _execute_child
| raise child_exception_type(errno_num, err_msg, err_filename)
| FileNotFoundError: [Errno 2] No such file or directory: \
| '/usr/local/bin/cmake'
| ...
| Configuring pangomm.rc using configuration
| Found CMake: /usr/local/bin/cmake (3.20.3)
|
| ../../../obj/ports/pangomm248-2.50.0/pangomm-2.50.0/docs/\
| reference/meson.build:18:2: ERROR: Unhandled python exception

I believe that "Found CMake" happened before "FileNotFoundError", but
Meson flushed "FileNotFoundError" before "Found CMake".  I deduce that
dpb had deleted cmake.

A successful "make configure" looks like,

| Configuring pangomm.rc using configuration
| Did not find CMake 'cmake'
| Found CMake: NO
| Run-time dependency mm-common-libstdc++ found: NO (tried pkgconfig and cmake)

These 3 ports have WRKSRC/docs/reference/meson.build calling
dependency('mm-common-libstdc++', required: false).  This will try
pkg-config with mm-common-libstdc++.pc (which would exist in
devel/mm-common), then cmake with Findmm-common-libstdc++.cmake,
says https://mesonbuild.com/Dependencies.html

The project looks for mm-common-libstdc++ though it will never get
used: it is only for building docs with doxygen, but by default,
the project never builds the docs.

I have not proposed a fix to this problem.  I only know to retry the
"make configure" if meson fails.

--George


lost-cmake-pangomm248.log.gz
Description: application/gzip


CVS: cvs.openbsd.org: ports

2022-03-09 Thread Aaron Bieber
CVSROOT:/cvs
Module name:ports
Changes by: abie...@cvs.openbsd.org 2022/03/09 17:26:04

Modified files:
net/tailscale  : Makefile distinfo 
net/tailscale/pkg: PLIST tailscaled.rc 

Log message:
Update tailscale to 1.22.1

- remove RCS bits.



Re: [update] net/dnscontrol to 3.14.0

2022-03-09 Thread Aaron Bieber


portno12  writes:

> ping

Thanks! committed!

>
> --- Original Message ---
>
> On Wednesday, February 23rd, 2022 at 3:09 PM, portno12 
>  wrote:
>
>> ping on import while the make target is worked out independently?
>>
>> --- Original Message ---
>>
>> On Tuesday, February 15th, 2022 at 2:50 PM, Aaron Bieber 
>> aa...@bolddaemon.com wrote:
>>
>> > Daniel Jakots d...@chown.me writes:
>> >
>> > > On Mon, 14 Feb 2022 17:30:19 +, Klemens Nanni k...@openbsd.org
>> > >
>> > > wrote:
>> > >
>> > > > > MODGO_VERSION shouldn't be in modules.inc, only in Makefile
>> > > >
>> > > > It comes out of `modgo-gen-modules' like this, should we fix that?
>> > >
>> > > yes please!
>> >
>> > Originally the version was spit out there to ensure that the porter was
>> >
>> > aware of what version the list was for.
>> >
>> > This is specifically useful if upstream produces release candidates as
>> >
>> > "latest" will point to that version.
>> >
>> > If we remove it from there, we should explicitly pass MODGO_VERSION to
>> >
>> > the helper.. but i don't know what we would do in cases where the
>> >
>> > MODGO_VERSION is not set.
>
> [2. text/x-patch; dnscontrol.diff]...



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Aaron Bieber
CVSROOT:/cvs
Module name:ports
Changes by: abie...@cvs.openbsd.org 2022/03/09 17:18:19

Modified files:
net/dnscontrol : Makefile distinfo modules.inc 
net/dnscontrol/pkg: PLIST 

Log message:
Update dnscontrol to 3.14.0

LGTM sthen@, diff from portno12. Thanks!



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2022/03/09 17:12:56

Modified files:
mail/rmail : Makefile 

Log message:
Drop maintainership, I don't use UUCP anymore.



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2022/03/09 17:06:27

Modified files:
net/samba  : Makefile 
net/samba/pkg  : PLIST-main 
Removed files:
net/samba/pkg  : samba.rc 

Log message:
Zap samba.rc, useless since we don't ship AD DC support anymore



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2022/03/09 17:04:08

Modified files:
databases/lmdb : Makefile 
databases/lmdb/patches: patch-Makefile patch-mdb_c 
databases/lmdb/pkg: PLIST 
devel/libtalloc: Makefile 
devel/libtalloc/patches: patch-Makefile 
 patch-buildtools_wafsamba_samba_install_py 
 patch-buildtools_wafsamba_wafsamba_py 
devel/libtalloc/pkg: PLIST-main PLIST-python 
devel/liburcu  : Makefile 
devel/liburcu/patches: patch-include_urcu_syscall-compat_h 
   patch-tests_benchmark_common_sh 
   patch-tests_common_thread-id_h 
devel/liburcu/pkg: PLIST 
devel/llvm : Makefile 
devel/llvm/patches: patch-cmake_modules_GetLibraryName_cmake 
patch-cmake_modules_LLVMProcessSources_cmake 
patch-include_llvm_CodeGen_AsmPrinter_h 
patch-include_llvm_CodeGen_MachineFrameInfo_h 
patch-include_llvm_CodeGen_Passes_h 

patch-include_llvm_CodeGen_ReturnProtectorLowering_h 
patch-include_llvm_CodeGen_TargetFrameLowering_h 
patch-include_llvm_InitializePasses_h 
patch-lib_CodeGen_AsmPrinter_AsmPrinter_cpp 
patch-lib_CodeGen_CMakeLists_txt 
patch-lib_CodeGen_PrologEpilogInserter_cpp 
patch-lib_CodeGen_ReturnProtectorLowering_cpp 
patch-lib_CodeGen_ReturnProtectorPass_cpp 
patch-lib_CodeGen_TargetPassConfig_cpp 
patch-lib_MC_MCAsmInfoELF_cpp 
patch-lib_MC_MCELFStreamer_cpp 
patch-lib_MC_MCParser_AsmParser_cpp 
patch-lib_Target_AArch64_AArch64AsmPrinter_cpp 
patch-lib_Target_AArch64_AArch64FrameLowering_cpp 
patch-lib_Target_AArch64_AArch64FrameLowering_h 
patch-lib_Target_AArch64_AArch64ISelLowering_cpp 
patch-lib_Target_AArch64_AArch64InstrInfo_cpp 
patch-lib_Target_AArch64_AArch64InstrInfo_td 

patch-lib_Target_AArch64_AArch64ReturnProtectorLowering_cpp 

patch-lib_Target_AArch64_AArch64ReturnProtectorLowering_h 
patch-lib_Target_AArch64_AArch64Subtarget_h 
patch-lib_Target_AArch64_AArch64TargetMachine_cpp 
patch-lib_Target_AArch64_CMakeLists_txt 
patch-lib_Target_Mips_AsmParser_MipsAsmParser_cpp 
patch-lib_Target_Mips_CMakeLists_txt 
patch-lib_Target_Mips_MCTargetDesc_MipsABIInfo_cpp 
patch-lib_Target_Mips_MipsAsmPrinter_cpp 
patch-lib_Target_Mips_MipsFrameLowering_cpp 
patch-lib_Target_Mips_MipsFrameLowering_h 
patch-lib_Target_Mips_MipsISelLowering_cpp 
patch-lib_Target_Mips_MipsInstrInfo_td 
patch-lib_Target_Mips_MipsLoongson2FBTBFix_cpp 

patch-lib_Target_Mips_MipsReturnProtectorLowering_cpp 
patch-lib_Target_Mips_MipsReturnProtectorLowering_h 
patch-lib_Target_Mips_MipsTargetMachine_cpp 
patch-lib_Target_Mips_Mips_h 
patch-lib_Target_PowerPC_CMakeLists_txt 
patch-lib_Target_PowerPC_PPCAsmPrinter_cpp 
patch-lib_Target_PowerPC_PPCFrameLowering_cpp 
patch-lib_Target_PowerPC_PPCFrameLowering_h 
patch-lib_Target_PowerPC_PPCInstrInfo_td 

patch-lib_Target_PowerPC_PPCReturnProtectorLowering_cpp 

patch-lib_Target_PowerPC_PPCReturnProtectorLowering_h 
patch-lib_Target_PowerPC_PPCTargetMachine_cpp 
patch-lib_Target_RISCV_RISCVISelLowering_cpp 
patch-lib_Target_Sparc_SparcISelLowering_cpp 
patch-lib_Target_Sparc_SparcInstr64Bit_td 
patch-lib_Target_Sparc_SparcInstrInfo_td 
patch-lib_Target_X86_CMakeLists_txt 
patch-lib_Target_X86_X86AsmPrinter_h 
patch-lib_Target_X86_X86FixupGadgets_cpp 
patch-lib_Target_X86_X86FrameLowering_cpp 
   

CVS: cvs.openbsd.org: ports

2022-03-09 Thread Marc Espie
CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2022/03/09 16:17:31

Modified files:
infrastructure/bin: build-debug-info 

Log message:
this actually broke only @option no-default-conflict
somewhat obviously.

sorry, didn't test on a port with this active.



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2022/03/09 15:59:09

Modified files:
net/p5-Net-Radius: Makefile 
net/p5-Net-Radius/pkg: PLIST 
Added files:
net/p5-Net-Radius/patches: patch-Radius_Dictionary_pm 
   patch-Radius_Packet_pm 

Log message:
Put encoding utf8 into documentation to fix pod tests.
Sort makefile according to template.



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2022/03/09 15:53:53

ports/net/p5-Net-Radius/patches

Update of /cvs/ports/net/p5-Net-Radius/patches
In directory cvs.openbsd.org:/tmp/cvs-serv42549/patches

Log Message:
Directory /cvs/ports/net/p5-Net-Radius/patches added to the repository



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2022/03/09 15:28:38

Modified files:
devel/p5-Net-Server: Makefile distinfo 
devel/p5-Net-Server/patches: patch-lib_Net_Server_Proto_pm 
devel/p5-Net-Server/pkg: PLIST 
Added files:
devel/p5-Net-Server/patches: 
 patch-lib_Net_Server_Proto_SSLEAY_pm 

Log message:
Update p5-Net-Server to 2.010.
Sort makefile according to template.
This NetSSLey implementation is full of races.  Prevent TLS 1.3.
With TLS 1.2 the test passes as the protocol is less aggessive.



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Christian Weisgerber
CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2022/03/09 14:05:31

Modified files:
mail/courier-imap: Makefile 

Log message:
mail/courier-imap: fix typo that broke Makefile syntax



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/03/09 13:48:33

Modified files:
www/tor-browser: Makefile Makefile.inc 
www/tor-browser/browser: Makefile 
www/tor-browser/browser/files: pledge.content pledge.gpu 
   pledge.main pledge.rdd 
   pledge.socket unveil.content 
   unveil.gpu unveil.main unveil.rdd 
   unveil.socket 
www/tor-browser/browser/patches: patch-_mozconfig 
 
patch-browser_extensions_tor-launcher_src_components_tl-process_js 
 
patch-browser_extensions_tor-launcher_src_defaults_preferences_torlauncher-prefs_js
 
 
patch-browser_extensions_tor-launcher_src_modules_tl-util_jsm 
 patch-config_makefiles_rust_mk 
 
patch-js_src_jit_ProcessExecutableMemory_h 
 patch-security_nss_Makefile 
 patch-security_nss_coreconf_OpenBSD_mk 
 patch-security_nss_coreconf_UNIX_mk 
 patch-security_nss_lib_freebl_blapi_h 
 
patch-toolkit_components_downloads_DownloadIntegration_jsm 
 
patch-toolkit_components_downloads_DownloadUIHelper_jsm 
 patch-toolkit_moz_configure 
 
patch-toolkit_system_gnome_nsGIOService_cpp 
 
patch-tor-browser_en-US_Browser_TorBrowser_Data_fontconfig_fonts_conf 
 patch-xpcom_io_TorFileUtils_cpp 
www/tor-browser/noscript: Makefile 
meta/tor-browser: Makefile 
meta/tor-browser/pkg: PLIST README 

Log message:
drop rcs ids



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/03/09 13:46:02

Modified files:
meta/tor-browser: Makefile 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile distinfo 
www/tor-browser/browser/pkg: PLIST 
www/tor-browser/noscript: Makefile distinfo 
www/tor-browser/noscript/pkg: PLIST 

Log message:
update to Tor Browser 11.0.7, from Caspar Schutijser (maintainer)



Re: Dropping RCS tags from the repo

2022-03-09 Thread Stuart Henderson
On 2022/03/09 20:06, Mikolaj Kucharski wrote:
> Hi,
> 
> In recent years I don't have that much time to follow OpenBSD that
> closely, but was wondering what is the background of dropping the
> RCS IDs from the repo.
> 
> Does that mean all files under ports repo should have RCS tags to
> be removed or only specific files?

If you are updating ports you can drop the RCS IDs as part of the update

Otherwise please do not send diffs to just drop them, we will do a bulk
sweep (at least of standard ports files) at some point, hopefully quite
soon - it is not helpful to do that unless it's going to be committed
soon after as it will get out of sync very quickly

Background is that they have been causing more trouble than good for
people doing wider work across the tree (CVS likes to generate conflicts
out of nowhere, and this is one of the main places it does it),
also there are some other smaller issues



Re: fix vncserver script in x11/tigervnc

2022-03-09 Thread Florian Viehweger
> committed along with some other changes, also I mentioned this in the
> comment in patch-vncserver to avoid confusion

Thank you for committing it so fast!
 
> btw: REVISION must be bumped for anything which changes the package

I'll realized that just after posting the message, but didn't want to
make unnecessary noise on the mailinglist. Thanks for the reminder.

-- 
greetings,

Florian Viehweger



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/03/09 13:31:18

Modified files:
net/unifi/main : Makefile distinfo 
net/unifi/main/pkg: PLIST 

Log message:
update to unifi-7.0.23



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Christian Weisgerber
CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2022/03/09 13:19:23

Modified files:
infrastructure/bin: build-debug-info 

Log message:
build-debug-info: revert "no need to special-case copy CVSTags"

This broke building debug packages, which in effect breaks the whole
ports tree.



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2022/03/09 13:15:32

Modified files:
www/p5-HTTP-Daemon: Makefile distinfo 
www/p5-HTTP-Daemon/pkg: PLIST 

Log message:
update p5-HTTP-Daemon to 6.14



Dropping RCS tags from the repo

2022-03-09 Thread Mikolaj Kucharski
Hi,

In recent years I don't have that much time to follow OpenBSD that
closely, but was wondering what is the background of dropping the
RCS IDs from the repo.

Does that mean all files under ports repo should have RCS tags to
be removed or only specific files?

-- 
Regards,
 Mikolaj



UPDATE: lang/dmd 2.098.0 => 2.099.0

2022-03-09 Thread Brian Callahan
Hi ports --

DMD 2.099.0 was released earlier today. Here is a diff to update our
package. I am happy to report that as of DMD 2.099.0, OpenBSD is at zero
diff to upstream DMD.

All my usual suspects pass muster; Dub also builds and tests OK with
this update. Included in this update is some build streamlining for me
to make future updates little more than crank ${V} and generate a new
distinfo.

OK?

~BrianIndex: Makefile
===
RCS file: /cvs/ports/lang/dmd/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile29 Nov 2021 01:23:22 -  1.4
+++ Makefile9 Mar 2022 18:36:16 -
@@ -1,16 +1,13 @@
-# $OpenBSD: Makefile,v 1.4 2021/11/29 01:23:22 bcallah Exp $
-
 # i386 forthcoming
 ONLY_FOR_ARCHS =   amd64
 
-V =2.098.0
+V =2.099.0
 COMMENT =  reference compiler for the D programming language
-DISTFILES =dmd-${V}.tar.gz \
-   dmd-${V}-bootstrap-p0.tar.gz \
-   druntime-${V}.tar.gz \
-   phobos-${V}.tar.gz
+DISTFILES =dmd-${V}{v${V}}.tar.gz:1 \
+   dmd-${V}-bootstrap.tar.gz:0 \
+   druntime-${V}{v${V}}.tar.gz:2 \
+   phobos-${V}{v${V}}.tar.gz:3
 PKGNAME =  dmd-${V}
-REVISION = 0
 CATEGORIES =   lang
 
 HOMEPAGE = https://dlang.org/
@@ -21,12 +18,15 @@ PERMIT_PACKAGE =Yes
 
 WANTLIB += c c++abi execinfo m pthread
 
-MASTER_SITES = https://github.com/ibara/dmd/releases/download/bootstrap-${V}/
+MASTER_SITES0 =
https://github.com/ibara/dmd/releases/download/bootstrap-${V}/
+MASTER_SITES1 =https://github.com/dlang/dmd/archive/refs/tags/
+MASTER_SITES2 =https://github.com/dlang/druntime/archive/refs/tags/
+MASTER_SITES3 =https://github.com/dlang/phobos/archive/refs/tags/
 
 USE_GMAKE =Yes
 MAKE_ENV = HOST_CXX="${CXX}" \
-   HOST_DMD="${WRKDIR}/dmd-${V}-bootstrap/openbsd/bin${MODEL}/dmd" 
\
-   
LD_LIBRARY_PATH="${WRKSRC}/dmd-${V}-bootstrap/openbsd/bin${MODEL}"
+   HOST_DMD="${WRKDIR}/dmd-bootstrap/openbsd/bin${MODEL}/dmd" \
+   LD_LIBRARY_PATH="${WRKSRC}/dmd-bootstrap/openbsd/bin${MODEL}"
 MAKE_FILE =posix.mak
 
 NO_TEST =  Yes
@@ -38,23 +38,23 @@ MODEL = 64
 MODEL = 32
 .endif
 
-# Fix up the build system.
-do-gen:
-   sed -i "s,TOPDIR,${WRKDIR},g" \
-   ${WRKDIR}/druntime-${V}/posix.mak \
-   ${WRKDIR}/phobos-${V}/posix.mak
+# Prevent some churn. Revisit for dmd-2.100.0
+post-extract:
+   mv ${WRKSRC}/dmd-${V} ${WRKSRC}/dmd
+   mv ${WRKSRC}/druntime-${V} ${WRKSRC}/druntime
+   mv ${WRKSRC}/phobos-${V} ${WRKSRC}/phobos
 
 # We need to do this manually.
 # Yes, this is all really correct.
 do-build:
-   cd ${WRKDIR}/phobos-${V} && \
+   cd ${WRKDIR}/phobos && \
${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} && \
${SETENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} install
-   cd ${WRKDIR}/druntime-${V} && \
+   cd ${WRKDIR}/druntime && \
${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} && \
${SETENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} install
mkdir ${WRKDIR}/install/openbsd/bin${MODEL}
-   cp ${WRKDIR}/dmd-${V}/generated/openbsd/release/${MODEL}/dmd \
+   cp ${WRKDIR}/dmd/generated/openbsd/release/${MODEL}/dmd \
${WRKDIR}/install/openbsd/bin${MODEL}
 
 # We need to do this manually too.
@@ -63,8 +63,8 @@ do-install:
${PREFIX}/bin
${INSTALL_DATA} ${WRKDIR}/install/openbsd/lib${MODEL}/libphobos2.a \
${PREFIX}/lib
-   ${INSTALL_MAN} ${WRKDIR}/dmd-${V}/dmd.1 ${PREFIX}/man/man1
-   ${INSTALL_MAN} ${WRKDIR}/dmd-${V}/docs/man/man5/dmd.conf.5 \
+   ${INSTALL_MAN} ${WRKDIR}/dmd-bootstrap/dmd.1 ${PREFIX}/man/man1
+   ${INSTALL_MAN} ${WRKDIR}/dmd/docs/man/man5/dmd.conf.5 \
${PREFIX}/man/man5
${INSTALL_DATA_DIR} ${PREFIX}/include/dmd
cp -R ${WRKDIR}/install/src/{druntime,phobos} ${PREFIX}/include/dmd
@@ -72,7 +72,7 @@ do-install:
${INSTALL_DATA} ${WRKDIR}/install/phobos-LICENSE.txt \
${PREFIX}/share/doc/dmd/LICENSE.txt
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dmd
-   cp -R ${WRKDIR}/dmd-${V}/samples/* ${PREFIX}/share/examples/dmd
+   cp -R ${WRKDIR}/dmd/samples/* ${PREFIX}/share/examples/dmd
${INSTALL_DATA_DIR} ${PREFIX}/share/dmd
${SUBST_CMD} -c -m 444 ${FILESDIR}/dmd.conf \
${PREFIX}/share/dmd/dmd.conf
Index: distinfo
===
RCS file: /cvs/ports/lang/dmd/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo29 Nov 2021 01:23:22 -  1.3
+++ distinfo9 Mar 2022 18:36:16 -
@@ -1,8 +1,8 @@
-SHA256 (dmd-2.098.0-bootstrap-p0.tar.gz) = 
wjPmbUtDh6UBPMphduS4pr8LVLb99E0NfpIJpjw5M20=
-SHA256 

UPDATE: Tor Browser 11.0.7

2022-03-09 Thread Caspar Schutijser
Hi,

Here is an update to Tor Browser 11.0.7. Tested on amd64, as usual.
More information here:
https://blog.torproject.org/new-release-tor-browser-1107/

Caspar Schutijser


Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- meta/tor-browser/Makefile   10 Feb 2022 21:17:03 -  1.50
+++ meta/tor-browser/Makefile   9 Mar 2022 18:32:07 -
@@ -4,11 +4,11 @@ COMMENT=  Tor Browser meta package
 
 MAINTAINER=Caspar Schutijser 
 
-PKGNAME=   tor-browser-11.0.6
+PKGNAME=   tor-browser-11.0.7
 ONLY_FOR_ARCHS =   amd64
 
-RUN_DEPENDS=   www/tor-browser/browser>=11.0.6 \
-   www/tor-browser/noscript>=11.2.16 \
-   net/tor>=0.4.6.9
+RUN_DEPENDS=   www/tor-browser/browser>=11.0.7 \
+   www/tor-browser/noscript>=11.3.7 \
+   net/tor>=0.4.6.10
 
 .include 
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile.inc
--- www/tor-browser/Makefile.inc10 Feb 2022 21:17:03 -  1.48
+++ www/tor-browser/Makefile.inc9 Mar 2022 18:32:07 -
@@ -5,7 +5,7 @@ HOMEPAGE ?= https://www.torproject.org
 PERMIT_PACKAGE ?=  Yes
 CATEGORIES =   www
 BROWSER_NAME = tor-browser
-TB_VERSION =   11.0.6
+TB_VERSION =   11.0.7
 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.75
diff -u -p -r1.75 Makefile
--- www/tor-browser/browser/Makefile10 Feb 2022 21:17:03 -  1.75
+++ www/tor-browser/browser/Makefile9 Mar 2022 18:32:07 -
@@ -16,7 +16,7 @@ EXTRACT_SUFX =.tar.xz
 PATCHORIG =.pat.orig
 
 PKGNAME =  ${TB_PREFIX}-browser-${TB_VERSION}
-DISTNAME = src-firefox-tor-browser-91.6.0esr-11.0-1-build1
+DISTNAME = src-firefox-tor-browser-91.7.0esr-11.0-1-build2
 
 FIX_EXTRACT_PERMISSIONS= Yes
 EXTRACT_ONLY +=${DISTNAME}.tar.xz \
@@ -85,7 +85,7 @@ BUILD_DEPENDS +=  devel/py-virtualenv
 
 BUILD_DEPENDS +=   archivers/unzip archivers/zip
 
-RUN_DEPENDS += net/tor>=0.4.6.9
+RUN_DEPENDS += net/tor>=0.4.6.10
 
 CONFIGURE_ARGS +=  --enable-release #1386371
 CONFIGURE_ARGS +=  --enable-sandbox
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.47
diff -u -p -r1.47 distinfo
--- www/tor-browser/browser/distinfo10 Feb 2022 21:17:03 -  1.47
+++ www/tor-browser/browser/distinfo9 Mar 2022 18:32:07 -
@@ -1,8 +1,8 @@
 SHA256 (mozilla/https-everywhere-2021.4.15-eff.xpi) = 
fl9ygI6hSL7M1BbsvfM+oevEOkMuTnhbXl4TObeitwg=
-SHA256 (mozilla/src-firefox-tor-browser-91.6.0esr-11.0-1-build1.tar.xz) = 
zdUEyHStut/jfGvo7YKcV5SLu4mYXVusWESnlh9+pwo=
+SHA256 (mozilla/src-firefox-tor-browser-91.7.0esr-11.0-1-build2.tar.xz) = 
Gxbh4ql+HehWF1jbvhwLWQCTgoWmMi2ZXFdm3V0Jn7k=
 SHA256 (mozilla/src-tor-launcher-0.2.33.tar.xz) = 
ZG7lH5mBhkCRA26AEdCo52HP0iNlHKbRKl/BKyP0C9U=
-SHA256 (mozilla/tor-browser-linux64-11.0.6_en-US.tar.xz) = 
37HSOOK/GQAvLxQReMOvgHdd2NXYO1Owq4aRDsShgw0=
+SHA256 (mozilla/tor-browser-linux64-11.0.7_en-US.tar.xz) = 
nxHEoKoP+WMzrB8l1r7/kGZRFohzd6AbnigtthRw/qQ=
 SIZE (mozilla/https-everywhere-2021.4.15-eff.xpi) = 1746434
-SIZE (mozilla/src-firefox-tor-browser-91.6.0esr-11.0-1-build1.tar.xz) = 
413291536
+SIZE (mozilla/src-firefox-tor-browser-91.7.0esr-11.0-1-build2.tar.xz) = 
413138764
 SIZE (mozilla/src-tor-launcher-0.2.33.tar.xz) = 229992
-SIZE (mozilla/tor-browser-linux64-11.0.6_en-US.tar.xz) = 86327220
+SIZE (mozilla/tor-browser-linux64-11.0.7_en-US.tar.xz) = 86617412
Index: www/tor-browser/browser/pkg/PLIST
===
RCS file: /cvs/ports/www/tor-browser/browser/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- www/tor-browser/browser/pkg/PLIST   13 Jan 2022 20:02:29 -  1.14
+++ www/tor-browser/browser/pkg/PLIST   9 Mar 2022 18:32:07 -
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.14 2022/01/13 20:02:29 sdk Exp $
 @conflict tor-launcher-*
 @conflict torbutton-*
 @pkgpath www/tor-browser/https-everywhere
Index: www/tor-browser/noscript/Makefile
===
RCS file: /cvs/ports/www/tor-browser/noscript/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- www/tor-browser/noscript/Makefile   10 Feb 2022 21:17:03 -  1.39
+++ www/tor-browser/noscript/Makefile   9 Mar 

CVS: cvs.openbsd.org: ports

2022-03-09 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/03/09 11:24:43

Modified files:
mail/mozilla-thunderbird: Tag: OPENBSD_7_0 Makefile distinfo 

Log message:
mail/mozilla-thunderbird: MFC update to 91.7.0.

see https://www.thunderbird.net/en-US/thunderbird/91.7.0/releasenotes/
fixes the same issues as
https://www.mozilla.org/en-US/security/advisories/mfsa2022-11/



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/03/09 11:23:06

Modified files:
mail/mozilla-thunderbird: Makefile distinfo 
mail/thunderbird-i18n: Makefile.inc distinfo 

Log message:
mail/mozilla-thunderbird: update to 91.7.0.

see https://www.thunderbird.net/en-US/thunderbird/91.7.0/releasenotes/
fixes the same issues as
https://www.mozilla.org/en-US/security/advisories/mfsa2022-11/



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/03/09 11:20:39

Modified files:
security/letsencrypt: Makefile Makefile.inc 
security/letsencrypt/client: Makefile distinfo 
security/letsencrypt/client/patches: patch-examples_cli_ini 
 patch-examples_generate-csr_sh 
security/letsencrypt/client/pkg: PLIST 
security/letsencrypt/py-acme: Makefile distinfo 
security/letsencrypt/py-acme/pkg: PLIST 

Log message:
update certbot/py-acme to 1.24.0, drop rcs ids



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/03/09 11:20:03

Modified files:
security/letsencrypt/acme-tiny: Makefile 
security/letsencrypt/acme-tiny/pkg: PLIST 

Log message:
remove rcs ids



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/03/09 11:09:53

Modified files:
net/isc-dhcp   : Makefile distinfo 
net/isc-dhcp/files: dhclient-script 
net/isc-dhcp/patches: patch-bind_Makefile_in 
  patch-client_Makefile_in 
  patch-keama_data_c patch-keama_keama_h 
net/isc-dhcp/pkg: PLIST-client PLIST-main PLIST-omapi 
  isc_dhcpd.rc isc_dhcrelay.rc 
Removed files:
net/isc-dhcp/patches: patch-client_dhclient_c 
  patch-common_discover_c 
  patch-keama_confparse_c patch-keama_eval_c 
  patch-keama_keama_c patch-relay_dhcrelay_c 
  patch-server_mdb6_c patch-server_mdb_c 

Log message:
update to isc-dhcp-4.4.3

NOTE: The client and relay components are now End-Of-Life.
This is the final release that contains those components.



mips64 bulk build report

2022-03-09 Thread visa
bulk build on octeon.ports.openbsd.org
started on  Wed Mar 2 16:47:19 UTC 2022
finished at Wed Mar 9 16:21:10 UTC 2022
lasted 07D23h33m
done with kern.version=OpenBSD 7.1-beta (GENERIC.MP) #870: Tue Mar  1 18:30:28 
MST 2022

built packages:8747
Mar 2:1912
Mar 3:1183
Mar 4:503
Mar 5:544
Mar 6:772
Mar 7:876
Mar 8:654
Mar 9:2302


build failures: 71
http://build-failures.rhaalovely.net/mips64/2022-03-02/chinese/libpinyin.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/databases/postgresql-pllua.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/devel/clang-tools-extra.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/devel/coccinelle.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/devel/go-sys.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/devel/promu.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/devel/protobuf.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/devel/py-unicorn,python3.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/devel/sdcc.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/editors/micro.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/emulators/openmsx.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/emulators/spike.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/games/astromenace.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/games/hyperrogue.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/games/irrlamb.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/games/wesnoth.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/games/witchblast.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/geo/gpstk.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/graphics/asymptote.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/graphics/enblend-enfuse.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/graphics/openvdb.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/lang/STk.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/lang/gambit.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/lang/gforth.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/lang/librep.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/lang/pfe.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/lang/php/8.1.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/mail/opensmtpd-filters/rspamd.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/math/gbc.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/math/lean.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/math/lrs.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/math/mlpack,-main.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/math/ntl.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/multimedia/assimp.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/net/amule,-daemon.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/net/gortr.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/net/gtk-gnutella.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/net/icinga/core2.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/net/minio/client.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/net/minio/server.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/net/powerdns_recursor.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/net/syncthing.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/net/utox.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/plan9/drawterm.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/print/ghostscript/gnu,no_x11.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/security/botan2.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/security/go-siphash.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/security/gobuster.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/security/vault.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/shells/elvish.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/sysutils/amazon-ecs-cli.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/sysutils/beats/filebeat.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/sysutils/beats/heartbeat.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/sysutils/beats/metricbeat.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/sysutils/beats/packetbeat.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/sysutils/dep.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/sysutils/direnv.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/sysutils/gitlab-runner.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/sysutils/kubectl.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/sysutils/libvirt.log
http://build-failures.rhaalovely.net/mips64/2022-03-02/sysutils/nomad.log

CVS: cvs.openbsd.org: ports

2022-03-09 Thread Klemens Nanni
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2022/03/09 09:48:18

Modified files:
net/tdesktop   : Makefile distinfo 
net/tdesktop/patches: patch-Telegram_CMakeLists_txt 
  patch-Telegram_SourceFiles_calls_calls_call_cpp 
  patch-Telegram_cmake_lib_tgcalls_cmake 
net/tdesktop/pkg: PLIST 

Log message:
Update to tdesktop 3.5.6 beta

Use updated restart fix, zap RCSIDs



Re: devel/cmake: fix LIBxxx_VERSION/SHARED_LIBS processing (fix net/dino)

2022-03-09 Thread Stuart Henderson
On 2022/03/09 11:15, Rafael Sadowski wrote:
> With the results from Stuart's bulk build and Klemens analyses, I end up
> with a new diff.
> 
> - Handle target names like libXXX with PREFIX set to "".
>   With this, all reported errors are happy. Afterwards, we can delete
>   all patches. For example, I can remove all x11/kde-application cmake
>   hackish patches.
> - Use cmSystemTools::GetEnv instead getenv(3)
> - More shorter C++ code

Makes sense.

> Thank you to all. A final bulk build would be advisable, wouldn't it?

Definitely needed. I can't run one right now though.



Re: devel/abseil-cpp: fix cordz_sample_token shared lib version

2022-03-09 Thread Andrew Krasavin

On Wed, Mar 09, 2022 at 12:30:51PM +0100, Theo Buehler wrote:

On Wed, Mar 09, 2022 at 11:24:51AM +, Klemens Nanni wrote:

On Wed, Mar 09, 2022 at 03:10:25AM +0300, Andrew Krasavin wrote:
> Hello.
>
> A trivial fix for the wrong version of the libabsl_cordz_sample_token
> shared library.
>
> I will be glad to receive your comments, criticism and objections.

The patch didn't apply for except for the @comment hunk, so I just redid
it manually and committed it, thanks.


Most likely this:

Content-Type: text/plain; charset=utf-8; format=flowed

thunderbird has that on by default

https://kb.mozillazine.org/Plain_text_e-mail_%28Thunderbird%29#Flowed_format


Thank you.
I don't understand why my patches keep getting screwed up when they
are sent. It really frustrates me and I will definitely look into it.

Thank you all and I apologize.

--
wbr, Krasavin Andrew



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/03/09 09:18:06

Modified files:
archivers  : Makefile 
astro  : Makefile 
audio  : Makefile 
benchmarks : Makefile 
biology: Makefile 
books  : Makefile 
cad: Makefile 
chinese: Makefile 
comms  : Makefile 
converters : Makefile 
databases  : Makefile 
devel  : Makefile 
editors: Makefile 
education  : Makefile 
emulators  : Makefile 
fonts  : Makefile 
games  : Makefile 
geo: Makefile 
graphics   : Makefile 
inputmethods   : Makefile 
japanese   : Makefile 
java   : Makefile 
korean : Makefile 
lang   : Makefile 
mail   : Makefile 
math   : Makefile 
meta   : Makefile 
misc   : Makefile 
multimedia : Makefile 
net: Makefile 
news   : Makefile 
plan9  : Makefile 
print  : Makefile 
productivity   : Makefile 
security   : Makefile 
shells : Makefile 
sysutils   : Makefile 
telephony  : Makefile 
tests  : Makefile 
textproc   : Makefile 
wayland: Makefile 
www: Makefile 
x11: Makefile 

Log message:
drop rcs id in category Makefiles



Re: Fwd: [SECURITY] [UPDATE] lang/node to

2022-03-09 Thread Stuart Henderson
On 2022/02/10 21:18, Volker Schlecht wrote:
> I integrated the patch for src/env.cc, dropped one for the bundled uv and
> upgraded to 12.22.10 ... what do you think?

Sorry it took a while to test this. I would like to get this in but it's
not working properly for me, sockets now only listen to IPv6 by default,
presumably from the change to the non-bundled libuv.

I just updated another machine as well, in that case the software it was
running is OK with node 16, but that also hits the v6-only problem.



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/03/09 07:00:43

Modified files:
infrastructure/mk: bsd.port.mk 

Log message:
Similar to what's done for asciidoc, write a "poison" script in
${WRKDIR}/bin/asciidoctor unless textproc/asciidoctor is present as a
build dependency (hidden build dependencies are a pain for bulk builds).
OK aja@



Re: bsd.port.mk: poison script for asciidoctor

2022-03-09 Thread Antoine Jacoutot
On Wed, Mar 09, 2022 at 12:59:35PM +, Stuart Henderson wrote:
> Various projects have switched to asciidoctor in recent times,
> either completely, or in preference to asciidoc if it's available at
> build time, so I think it makes sense to extend the poison scripts.
> 
> OK? (It has been in my bulks for ages and has found problems which
> I've fixed).

OK

> 
> 
> Index: bsd.port.mk
> ===
> RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
> retrieving revision 1.1569
> diff -u -p -r1.1569 bsd.port.mk
> --- bsd.port.mk   11 Feb 2022 17:17:27 -  1.1569
> +++ bsd.port.mk   9 Mar 2022 12:57:54 -
> @@ -2689,6 +2689,12 @@ ${_WRKDIR_COOKIE}:
>   @${_PBUILD} ln -sf asciidoc ${WRKDIR}/bin/${name}
>  .  endfor
>  .endif
> +.if empty(_BUILD_DEP:Mtextproc/asciidoctor)
> + @printf '#!/bin/sh\n\
> + echo "*** $$0 was called without textproc/asciidoctor 
> dependency ***" >&2\n\
> + exit 1\n' ${_PREDIR} ${WRKDIR}/bin/asciidoctor
> + @${_PBUILD} chmod 555 ${WRKDIR}/bin/asciidoctor
> +.endif
>   @${_PMAKE_COOKIE} $@
>  
>  ${_EXTRACT_COOKIE}: ${_WRKDIR_COOKIE}
> 

-- 
Antoine



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/03/09 06:17:48

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py3-boto3-1.21.15.



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/03/09 06:17:38

Modified files:
net/py-botocore: Makefile distinfo 

Log message:
Update to py3-botocore-1.24.15.



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/03/09 06:17:29

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

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



bsd.port.mk: poison script for asciidoctor

2022-03-09 Thread Stuart Henderson
Various projects have switched to asciidoctor in recent times,
either completely, or in preference to asciidoc if it's available at
build time, so I think it makes sense to extend the poison scripts.

OK? (It has been in my bulks for ages and has found problems which
I've fixed).


Index: bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1569
diff -u -p -r1.1569 bsd.port.mk
--- bsd.port.mk 11 Feb 2022 17:17:27 -  1.1569
+++ bsd.port.mk 9 Mar 2022 12:57:54 -
@@ -2689,6 +2689,12 @@ ${_WRKDIR_COOKIE}:
@${_PBUILD} ln -sf asciidoc ${WRKDIR}/bin/${name}
 .  endfor
 .endif
+.if empty(_BUILD_DEP:Mtextproc/asciidoctor)
+   @printf '#!/bin/sh\n\
+   echo "*** $$0 was called without textproc/asciidoctor 
dependency ***" >&2\n\
+   exit 1\n' ${_PREDIR} ${WRKDIR}/bin/asciidoctor
+   @${_PBUILD} chmod 555 ${WRKDIR}/bin/asciidoctor
+.endif
@${_PMAKE_COOKIE} $@
 
 ${_EXTRACT_COOKIE}: ${_WRKDIR_COOKIE}



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Marc Espie
CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2022/03/09 05:52:38

Modified files:
infrastructure/bin: build-debug-info 

Log message:
no need to special-case copy CVSTags, since they're no longer here



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Giovanni Bechis
CVSROOT:/cvs
Module name:ports
Changes by: giova...@cvs.openbsd.org2022/03/09 04:43:43

Modified files:
mail/courier-imap: Makefile 
mail/courier-imap/pkg: PLIST-main 

Log message:
do not install maildirkw(1), it's part of maildrop pkg



Re: devel/abseil-cpp: fix cordz_sample_token shared lib version

2022-03-09 Thread Klemens Nanni
On Wed, Mar 09, 2022 at 03:10:25AM +0300, Andrew Krasavin wrote:
> Hello.
> 
> A trivial fix for the wrong version of the libabsl_cordz_sample_token
> shared library.
> 
> I will be glad to receive your comments, criticism and objections.

The patch didn't apply for except for the @comment hunk, so I just redid
it manually and committed it, thanks.

> -- 
> Wbr, Andrew Krasavin
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/abseil-cpp/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile  2 Mar 2022 21:42:10 -   1.3
> +++ Makefile  8 Mar 2022 22:58:37 -
> @@ -1,7 +1,7 @@
>  # $OpenBSD: Makefile,v 1.3 2022/03/02 21:42:10 kn Exp $
>  COMMENT =abseil common libraries (c++)
> -REVISION =   0
> +REVISION =   1
>  CATEGORIES = devel
>  GH_ACCOUNT = abseil
> @@ -27,6 +27,7 @@ SHARED_LIBS +=  absl_cord_internal  
> 0.0
>  SHARED_LIBS +=   absl_cordz_functions0.0 # 
> 2103.0.1
>  SHARED_LIBS +=   absl_cordz_handle   0.0 # 
> 2103.0.1
>  SHARED_LIBS +=   absl_cordz_info 0.0 # 
> 2103.0.1
> +SHARED_LIBS +=   absl_cordz_sample_token 0.0 # 
> 2103.0.1
>  SHARED_LIBS +=   absl_debugging_internal 0.0 # 
> 2103.0.1
>  SHARED_LIBS +=   absl_demangle_internal  0.0 # 
> 2103.0.1
>  SHARED_LIBS +=   absl_examine_stack  0.0 # 
> 2103.0.1
> cvs server: Diffing patches
> cvs server: Diffing pkg
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/abseil-cpp/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 18 Dec 2021 19:38:17 -  1.1.1.1
> +++ pkg/PLIST 8 Mar 2022 22:58:37 -
> @@ -1,4 +1,3 @@
> -@comment $OpenBSD: PLIST,v 1.1.1.1 2021/12/18 19:38:17 kn Exp $
>  include/absl/
>  include/absl/algorithm/
>  include/absl/algorithm/algorithm.h
> @@ -364,7 +363,7 @@ lib/cmake/absl/abslTargets.cmake
>  @lib lib/libabsl_cordz_functions.so.${LIBabsl_cordz_functions_VERSION}
>  @lib lib/libabsl_cordz_handle.so.${LIBabsl_cordz_handle_VERSION}
>  @lib lib/libabsl_cordz_info.so.${LIBabsl_cordz_info_VERSION}
> -lib/libabsl_cordz_sample_token.so.2111.0.0
> +@lib lib/libabsl_cordz_sample_token.so.${LIBabsl_cordz_sample_token_VERSION}
>  @lib lib/libabsl_debugging_internal.so.${LIBabsl_debugging_internal_VERSION}
>  @lib lib/libabsl_demangle_internal.so.${LIBabsl_demangle_internal_VERSION}
>  @lib lib/libabsl_examine_stack.so.${LIBabsl_examine_stack_VERSION}
> 



CVS: cvs.openbsd.org: ports

2022-03-09 Thread Klemens Nanni
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2022/03/09 04:23:52

Modified files:
devel/abseil-cpp: Makefile 
devel/abseil-cpp/pkg: PLIST 

Log message:
Fix absl_cordz_sample_token shared library version

Simply overlooked in SHARED_LIBS so it ended up with abseil's own version.

spotted by sthen
diff from Andrew Krasavin



Re: audio/libsndfile patch bugs

2022-03-09 Thread Klemens Nanni
On Wed, Mar 09, 2022 at 09:54:44AM +0100, Moritz Buhl wrote:
> Dear ports@,
> 
> I noticed that two unfixed heap overflow bugs in audio/libsndfile
> exist for about a year now and there is still no new release available.
> 
> I attached the diffs from upstream.

OK kn without RCSIDs.
Alterntively, you can also just pull the patches like this

MASTER_SITES0 = https://github.com/libsndfile/libsndfile/commit/
# https://github.com/libsndfile/libsndfile/issues/731
# https://security-tracker.debian.org/tracker/CVE-2021-3246
PATCHFILES =libsndfile-fix-heap-overflow-{}ced91d7b.patch:0 \
libsndfile-cve-2021-4346-1-{}deb669ee.patch:0 \
libsndfile-cve-2021-4346-2-{}a9815b3f.patch:0
PATCH_DIST_ARGS =   -p1

or simply update to a GH_COMMIT that contains them in case there isn't
much else you'd pull in doing that.

> mbuhl
> 
> Index: audio/libsndfile/Makefile
> ===
> RCS file: /cvs/ports/audio/libsndfile/Makefile,v
> retrieving revision 1.37
> diff -u -p -r1.37 Makefile
> --- audio/libsndfile/Makefile 24 Apr 2021 06:17:13 -  1.37
> +++ audio/libsndfile/Makefile 9 Mar 2022 08:28:54 -
> @@ -8,6 +8,7 @@ CATEGORIES=   audio
>  GH_ACCOUNT=  libsndfile
>  GH_PROJECT=  libsndfile
>  GH_TAGNAME=  ${VER}
> +REVISION=0
>  
>  HOMEPAGE=https://github.com/libsndfile/libsndfile/
>  
> Index: audio/libsndfile/patches/patch-src_flac_c
> ===
> RCS file: audio/libsndfile/patches/patch-src_flac_c
> diff -N audio/libsndfile/patches/patch-src_flac_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ audio/libsndfile/patches/patch-src_flac_c 9 Mar 2022 08:28:54 -
> @@ -0,0 +1,21 @@
> +$OpenBSD$
> +

The RCSIDs must go.

> +Fix heap overflow:
> +https://github.com/libsndfile/libsndfile/commit/971be6173b604154c39279ce90ad87cc
> +https://github.com/libsndfile/libsndfile/issues/731
> +
> +Index: src/flac.c
> +--- src/flac.c.orig
>  src/flac.c
> +@@ -948,7 +948,11 @@ flac_read_loop (SF_PRIVATE *psf, unsigned len)
> + /* Decode some more. */
> + while (pflac->pos < pflac->len)
> + {   if (FLAC__stream_decoder_process_single (pflac->fsd) == 0)
> ++{   psf_log_printf (psf, 
> "FLAC__stream_decoder_process_single returned false\n") ;
> ++/* Current frame is busted, so NULL the pointer. */
> ++pflac->frame = NULL ;
> + break ;
> ++} ;
> + state = FLAC__stream_decoder_get_state (pflac->fsd) ;
> + if (state >= FLAC__STREAM_DECODER_END_OF_STREAM)
> + {   psf_log_printf (psf, "FLAC__stream_decoder_get_state 
> returned %s\n", FLAC__StreamDecoderStateString [state]) ;
> Index: audio/libsndfile/patches/patch-src_ms_adpcm_c
> ===
> RCS file: audio/libsndfile/patches/patch-src_ms_adpcm_c
> diff -N audio/libsndfile/patches/patch-src_ms_adpcm_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ audio/libsndfile/patches/patch-src_ms_adpcm_c 9 Mar 2022 08:28:54 
> -
> @@ -0,0 +1,26 @@
> +$OpenBSD$
> +
> +CVE-2021-3246:
> +https://security-tracker.debian.org/tracker/CVE-2021-3246
> +https://github.com/libsndfile/libsndfile/commit/8be55a94565f6f8a6b60890c2e7c6f32
> +
> +Index: src/ms_adpcm.c
> +--- src/ms_adpcm.c.orig
>  src/ms_adpcm.c
> +@@ -128,8 +128,14 @@ wavlike_msadpcm_init(SF_PRIVATE *psf, int 
> blockalign,
> + if (psf->file.mode == SFM_WRITE)
> + samplesperblock = 2 + 2 * (blockalign - 7 * psf->sf.channels) / 
> psf->sf.channels ;
> + 
> +-if (blockalign < 7 * psf->sf.channels)
> +-{   psf_log_printf (psf, "*** Error blockalign (%d) should be > 
> %d.\n", blockalign, 7 * psf->sf.channels) ;
> ++/* There's 7 samples per channel in the preamble of each block */
> ++if (samplesperblock < 7 * psf->sf.channels)
> ++{   psf_log_printf (psf, "*** Error samplesperblock (%d) should be 
> >= %d.\n", samplesperblock, 7 * psf->sf.channels) ;
> ++return SFE_INTERNAL ;
> ++} ;
> ++
> ++if (2 * blockalign < samplesperblock * psf->sf.channels)
> ++{   psf_log_printf (psf, "*** Error blockalign (%d) should be >= 
> %d.\n", blockalign, samplesperblock * psf->sf.channels / 2) ;
> + return SFE_INTERNAL ;
> + } ;
> + 
> Index: audio/libsndfile/patches/patch-src_wavlike_c
> ===
> RCS file: audio/libsndfile/patches/patch-src_wavlike_c
> diff -N audio/libsndfile/patches/patch-src_wavlike_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ audio/libsndfile/patches/patch-src_wavlike_c  9 Mar 2022 08:28:54 
> -
> @@ -0,0 +1,22 @@
> +$OpenBSD$
> +
> +CVE-2021-3246:
> +https://security-tracker.debian.org/tracker/CVE-2021-3246
> 

Re: devel/cmake: fix LIBxxx_VERSION/SHARED_LIBS processing (fix net/dino)

2022-03-09 Thread Rafael Sadowski
On Wed Mar 09, 2022 at 08:28:15AM +0100, Rafael Sadowski wrote:
> On Tue Mar 08, 2022 at 07:43:04PM +, Klemens Nanni wrote:
> > On Mon, Mar 07, 2022 at 07:53:49PM +, Stuart Henderson wrote:
> > > On 2022/03/06 18:21, Rafael Sadowski wrote:
> > > > > Yet another cmake patch, which needs a full bulk test. Many of you 
> > > > > will
> > > > > certainly know it, our cmake's SHARED_LIBS handling is broken for new
> > > > > shared libs.
> > > > > 
> > > > > The default "0.0" version has been broken for several months/years.
> > > > > Here is a attempt to fix this. With the following patch you get back 
> > > > > the
> > > > > following lines, if (a) LIBxxx_VERSION is not set and (b) SOVERSION 
> > > > > for
> > > > > the shared lib is set by cmake. (a) is clear but (b) helps us to 
> > > > > handle
> > > > > shared libs and not plugins (dlopen) aka shared libs without version.
> > > > > 
> > > > > ...
> > > > > Warning: unregistered shared lib(s)
> > > > > SHARED_LIBS +=  fmt   0.0 # 0.0
> > > > > /usr/ports/devel/fmt/pkg/PLIST is new
> > > > > 
> > > > > 
> > > > > Patch changes:
> > > > > 
> > > > > - Remove MODULE_LIBRARY processing.
> > > > >   "MODULE libraries are plugins that are not linked into other targets
> > > > >   but may be loaded dynamically at runtime using dlopen-like
> > > > >   functionality." --
> > > > >   https://cmake.org/cmake/help/latest/command/add_library.html
> > > > > 
> > > > > - Add default "0.0" version:
> > > > >   if type SHARED_LIBRARY AND empty LIBxxx_VERSION BUT SOVERSION is 
> > > > > set.
> > > > > 
> > > > > I would appreciate a bulk test, unfortunately I can't do one.
> > > 
> > > Not finished yet, but this one looks a bit odd so I'm sending it early.
> > > net/dino fails; despite having
> > > 
> > > SHARED_LIBS +=  dino  1.0 # 0.0
> > > 
> > > the actual file produced is
> > > 
> > > -rw-r--r--   1 _pbuild  _pbuild  3085740 Mar  7 12:32 libdino.so.0.0
> > 
> > Their main lib's target is called "libdino" but they install it with
> > `PREFIX ""'... maybe to avoid conflicts with the main project "Dino"?
> 
> Hi Klemens,
> 
> yes to distinguish two targets we have to define tow different
> target-names in cmake. I see this in mariadb/libmariadb ledger/libledger...
> 
> I think it's better to handle this in the cmake openbsd patch by
> evaluating PREFIX. Other Opinions?
> 

With the results from Stuart's bulk build and Klemens analyses, I end up
with a new diff.

- Handle target names like libXXX with PREFIX set to "".
With this, all reported errors are happy. Afterwards, we can delete
all patches. For example, I can remove all x11/kde-application cmake
hackish patches.
- Use cmSystemTools::GetEnv instead getenv(3)
- More shorter C++ code

Thank you to all. A final bulk build would be advisable, wouldn't it?

Rafael


diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 013bf49411c..204bde44ce2 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -8,7 +8,7 @@ VER =   3.20.3
 EPOCH =0
 DISTNAME = cmake-${VER}
 CATEGORIES =   devel
-REVISION = 4
+REVISION = 5
 
 HOMEPAGE = https://www.cmake.org/
 
diff --git a/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx 
b/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx
index 14a878c0d42..33c42b31af8 100644
--- a/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx
+++ b/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx
@@ -1,57 +1,48 @@
-$OpenBSD: patch-Source_cmGeneratorTarget_cxx,v 1.16 2021/05/09 14:46:15 
rsadowski Exp $
-
 Index: Source/cmGeneratorTarget.cxx
 --- Source/cmGeneratorTarget.cxx.orig
 +++ Source/cmGeneratorTarget.cxx
-@@ -4810,9 +4810,14 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
-   // Check for library version properties.
-   cmProp version = this->GetProperty("VERSION");
-   cmProp soversion = this->GetProperty("SOVERSION");
-+#if defined(__OpenBSD__)
-+  if (this->GetType() != cmStateEnums::SHARED_LIBRARY &&
-+  this->GetType() != cmStateEnums::MODULE_LIBRARY) {
-+#else
-   if (!this->HasSOName(config) ||
-   this->Makefile->IsOn("CMAKE_PLATFORM_NO_VERSIONED_SONAME") ||
-   this->IsFrameworkOnApple()) {
-+#endif
- // Versioning is supported only for shared libraries and modules,
- // and then only when the platform supports an soname flag.
- version = nullptr;
-@@ -4836,6 +4841,36 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
- 
+@@ -4837,6 +4837,44 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
// The library name.
targetNames.Output = prefix + targetNames.Base + suffix;
-+
+ 
 +#if defined(__OpenBSD__)
 +  // Override shared library version using LIBxxx_VERSION
 +  // environment variable. Needed for OpenBSD ports system.
-+  if (this->GetType() == cmStateEnums::SHARED_LIBRARY ||
-+  this->GetType() == cmStateEnums::MODULE_LIBRARY) {
++  if (this->GetType() == cmStateEnums::SHARED_LIBRARY) 

CVS: cvs.openbsd.org: ports

2022-03-09 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/03/09 02:52:23

Modified files:
audio/mpd  : Makefile distinfo 
audio/mpd/patches: patch-doc_meson_build 
   patch-doc_mpdconf_example 
audio/mpd/pkg  : PLIST 

Log message:
audio/mpd: update to 0.23.5.

cf https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.5/NEWS

ok ajacoutot@



audio/libsndfile patch bugs

2022-03-09 Thread Moritz Buhl
Dear ports@,

I noticed that two unfixed heap overflow bugs in audio/libsndfile
exist for about a year now and there is still no new release available.

I attached the diffs from upstream.

mbuhl

Index: audio/libsndfile/Makefile
===
RCS file: /cvs/ports/audio/libsndfile/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- audio/libsndfile/Makefile   24 Apr 2021 06:17:13 -  1.37
+++ audio/libsndfile/Makefile   9 Mar 2022 08:28:54 -
@@ -8,6 +8,7 @@ CATEGORIES= audio
 GH_ACCOUNT=libsndfile
 GH_PROJECT=libsndfile
 GH_TAGNAME=${VER}
+REVISION=  0
 
 HOMEPAGE=  https://github.com/libsndfile/libsndfile/
 
Index: audio/libsndfile/patches/patch-src_flac_c
===
RCS file: audio/libsndfile/patches/patch-src_flac_c
diff -N audio/libsndfile/patches/patch-src_flac_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ audio/libsndfile/patches/patch-src_flac_c   9 Mar 2022 08:28:54 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+Fix heap overflow:
+https://github.com/libsndfile/libsndfile/commit/ced91d7b971be6173b604154c39279ce90ad87cc
+https://github.com/libsndfile/libsndfile/issues/731
+
+Index: src/flac.c
+--- src/flac.c.orig
 src/flac.c
+@@ -948,7 +948,11 @@ flac_read_loop (SF_PRIVATE *psf, unsigned len)
+   /* Decode some more. */
+   while (pflac->pos < pflac->len)
+   {   if (FLAC__stream_decoder_process_single (pflac->fsd) == 0)
++  {   psf_log_printf (psf, 
"FLAC__stream_decoder_process_single returned false\n") ;
++  /* Current frame is busted, so NULL the pointer. */
++  pflac->frame = NULL ;
+   break ;
++  } ;
+   state = FLAC__stream_decoder_get_state (pflac->fsd) ;
+   if (state >= FLAC__STREAM_DECODER_END_OF_STREAM)
+   {   psf_log_printf (psf, "FLAC__stream_decoder_get_state 
returned %s\n", FLAC__StreamDecoderStateString [state]) ;
Index: audio/libsndfile/patches/patch-src_ms_adpcm_c
===
RCS file: audio/libsndfile/patches/patch-src_ms_adpcm_c
diff -N audio/libsndfile/patches/patch-src_ms_adpcm_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ audio/libsndfile/patches/patch-src_ms_adpcm_c   9 Mar 2022 08:28:54 
-
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+CVE-2021-3246:
+https://security-tracker.debian.org/tracker/CVE-2021-3246
+https://github.com/libsndfile/libsndfile/commit/deb669ee8be55a94565f6f8a6b60890c2e7c6f32
+
+Index: src/ms_adpcm.c
+--- src/ms_adpcm.c.orig
 src/ms_adpcm.c
+@@ -128,8 +128,14 @@ wavlike_msadpcm_init  (SF_PRIVATE *psf, int 
blockalign,
+   if (psf->file.mode == SFM_WRITE)
+   samplesperblock = 2 + 2 * (blockalign - 7 * psf->sf.channels) / 
psf->sf.channels ;
+ 
+-  if (blockalign < 7 * psf->sf.channels)
+-  {   psf_log_printf (psf, "*** Error blockalign (%d) should be > 
%d.\n", blockalign, 7 * psf->sf.channels) ;
++  /* There's 7 samples per channel in the preamble of each block */
++  if (samplesperblock < 7 * psf->sf.channels)
++  {   psf_log_printf (psf, "*** Error samplesperblock (%d) should be 
>= %d.\n", samplesperblock, 7 * psf->sf.channels) ;
++  return SFE_INTERNAL ;
++  } ;
++
++  if (2 * blockalign < samplesperblock * psf->sf.channels)
++  {   psf_log_printf (psf, "*** Error blockalign (%d) should be >= 
%d.\n", blockalign, samplesperblock * psf->sf.channels / 2) ;
+   return SFE_INTERNAL ;
+   } ;
+ 
Index: audio/libsndfile/patches/patch-src_wavlike_c
===
RCS file: audio/libsndfile/patches/patch-src_wavlike_c
diff -N audio/libsndfile/patches/patch-src_wavlike_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ audio/libsndfile/patches/patch-src_wavlike_c9 Mar 2022 08:28:54 
-
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+CVE-2021-3246:
+https://security-tracker.debian.org/tracker/CVE-2021-3246
+https://github.com/libsndfile/libsndfile/commit/a9815b3f228df00086e0a40bcc43162fc19896a1
+
+Index: src/wavlike.c
+--- src/wavlike.c.orig
 src/wavlike.c
+@@ -830,7 +830,11 @@ wavlike_read_cart_chunk (SF_PRIVATE *psf, uint32_t chu
+   return 0 ;
+   } ;
+ 
+-  if (chunksize >= sizeof (SF_CART_INFO_16K))
++  /*
++  **  SF_CART_INFO_16K has an extra field 'tag_text_size' that isn't 
part
++  **  of the chunk, so don't include it in the size check.
++  */
++  if (chunksize >= sizeof (SF_CART_INFO_16K) - 4)
+   {   psf_log_printf (psf, "cart : %u too big to be handled\n", 
chunksize) ;
+   psf_binheader_readf (psf, "j", chunksize) ;
+   return 0 ;



[update] www/yt-dlp-2022.03.08.1

2022-03-09 Thread Ricardo Mestre
Hi,

New update to 2022.03.08.1, changelog below[0] which also includes release notes
for previous version 2022.03.08.

Comments? OK?

[0] https://github.com/yt-dlp/yt-dlp/releases

Index: Makefile
===
RCS file: /cvs/ports/www/yt-dlp/Makefile,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile
--- Makefile4 Feb 2022 11:31:49 -   1.6
+++ Makefile9 Mar 2022 08:40:48 -
@@ -2,7 +2,7 @@
 
 COMMENT =  CLI program to download videos from YouTube and other sites
 
-VERSION =  2022.02.04
+VERSION =  2022.03.08.1
 MODPY_EGG_VERSION =${VERSION:S/.0/./g}
 
 DISTNAME = yt-dlp-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/www/yt-dlp/distinfo,v
retrieving revision 1.6
diff -u -p -u -r1.6 distinfo
--- distinfo4 Feb 2022 11:31:49 -   1.6
+++ distinfo9 Mar 2022 08:40:48 -
@@ -1,2 +1,2 @@
-SHA256 (yt-dlp-2022.02.04.tar.gz) = 
yN0RnCil0lYyLds6L/9yvAKs5D/FiAwAZdl/ekjXqOM=
-SIZE (yt-dlp-2022.02.04.tar.gz) = 4369611
+SHA256 (yt-dlp-2022.03.08.1.tar.gz) = 
E1/Xu/gcJjlBmxkdjlq7gM2KmAG37Y6SozGkEH6CCrI=
+SIZE (yt-dlp-2022.03.08.1.tar.gz) = 4455336
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/yt-dlp/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -r1.5 PLIST
--- pkg/PLIST   4 Feb 2022 10:45:32 -   1.5
+++ pkg/PLIST   9 Mar 2022 08:40:49 -
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.5 2022/02/04 10:45:32 sthen Exp $
 bin/yt-dlp
 lib/python${MODPY_VERSION}/site-packages/yt_dlp/
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
@@ -39,6 +38,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/downloader/${MODPY_PYCACHE}dash.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/downloader/${MODPY_PYCACHE}external.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/downloader/${MODPY_PYCACHE}f4m.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yt_dlp/downloader/${MODPY_PYCACHE}fc2.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/downloader/${MODPY_PYCACHE}fragment.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/downloader/${MODPY_PYCACHE}hls.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/downloader/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
@@ -53,6 +53,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/yt_dlp/downloader/dash.py
 lib/python${MODPY_VERSION}/site-packages/yt_dlp/downloader/external.py
 lib/python${MODPY_VERSION}/site-packages/yt_dlp/downloader/f4m.py
+lib/python${MODPY_VERSION}/site-packages/yt_dlp/downloader/fc2.py
 lib/python${MODPY_VERSION}/site-packages/yt_dlp/downloader/fragment.py
 lib/python${MODPY_VERSION}/site-packages/yt_dlp/downloader/hls.py
 lib/python${MODPY_VERSION}/site-packages/yt_dlp/downloader/http.py
@@ -70,6 +71,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}abc.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}abcnews.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}abcotvs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}abematv.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}academicearth.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}acast.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}adn.${MODPY_PYC_MAGIC_TAG}pyc
@@ -84,6 +86,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}aljazeera.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}allocine.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}alphaporno.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}alsace20tv.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}alura.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}amara.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}amazon.${MODPY_PYC_MAGIC_TAG}pyc
@@ -92,6 +95,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}amp.${MODPY_PYC_MAGIC_TAG}pyc
 

CVS: cvs.openbsd.org: ports

2022-03-09 Thread Benoit Lecocq
CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2022/03/09 01:38:04

Modified files:
math/matio : Makefile distinfo 
math/matio/pkg : PLIST 

Log message:
Update to matio-1.5.21 from wen heping with tweaks by me.