CVS: cvs.openbsd.org: ports

2022-01-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/01/14 00:43:30

Modified files:
sysutils/awscli: Makefile distinfo 

Log message:
Update to awscli-1.22.35.



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/01/14 00:43:17

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py3-boto3-1.20.35.



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/01/14 00:43:06

Modified files:
net/py-botocore: Makefile distinfo 

Log message:
Update to py3-botocore-1.23.35.



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/01/14 00:40:37

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

Log message:
Update to amazon-ssm-agent-3.1.821.0.



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/01/14 00:37:14

Modified files:
textproc/foliate: Makefile distinfo 
textproc/foliate/pkg: PLIST 

Log message:
Update to foliate-2.6.4.



Update sysutils/kopia to 0.10.0

2022-01-13 Thread Denis Fondras
Changelog : https://github.com/kopia/kopia/releases/tag/v0.10.0

OK ?


Index: Makefile
===
RCS file: /cvs/ports/sysutils/kopia/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile27 Dec 2021 11:47:21 -  1.6
+++ Makefile14 Jan 2022 07:26:06 -
@@ -2,10 +2,11 @@
 
 COMMENT =  simple tool for managing encrypted backups in the cloud
 
+V =0.10.0
 MODGO_MODNAME =github.com/kopia/kopia
-MODGO_VERSION =v0.9.8
+MODGO_VERSION =v${V}
 
-MODGO_LDFLAGS += -X github.com/kopia/kopia/repo.BuildVersion=${MODGO_VERSION} \
+MODGO_LDFLAGS += -X github.com/kopia/kopia/repo.BuildVersion=${V} \
-X github.com/kopia/kopia/repo.BuildInfo="`date +%Y%m%d`" \
-X github.com/kopia/kopia/repo.BuildGitHubRepo="OpenBSD/ports"
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/kopia/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo27 Dec 2021 11:47:21 -  1.6
+++ distinfo14 Jan 2022 07:26:07 -
@@ -98,8 +98,8 @@ SHA256 (go_modules/github.com/alecthomas
 SHA256 
(go_modules/github.com/alecthomas/units/@v/v0.0.0-20210927113745-59d0afb8317a.zip)
 = ce8xcXS4IOOK8SCFbDMTZgL07VSkbL5fjQNTvSByUVs=
 SHA256 (go_modules/github.com/antihax/optional/@v/v1.0.0.mod) = 
0sIhN/ViECf4dLEiVGzxWHIp34YY+WFbqf5OYw4oC+s=
 SHA256 (go_modules/github.com/antihax/optional/@v/v1.0.0.zip) = 
FatNQb27cu4Kxj22Fs3vx2cceeE9D3O1g1WmqIIZyX8=
-SHA256 (go_modules/github.com/aws/aws-sdk-go/@v/v1.42.23.mod) = 
Mca6Ubo0iUzAXi19lEzdXDcfOuIxbdnwd1ZDFqkywbU=
-SHA256 (go_modules/github.com/aws/aws-sdk-go/@v/v1.42.23.zip) = 
/5qMjoR3QBrRKBzgtiNzca3DC573QnXOJfji4DrEeKY=
+SHA256 (go_modules/github.com/aws/aws-sdk-go/@v/v1.42.25.mod) = 
Mca6Ubo0iUzAXi19lEzdXDcfOuIxbdnwd1ZDFqkywbU=
+SHA256 (go_modules/github.com/aws/aws-sdk-go/@v/v1.42.25.zip) = 
cZvEFePwK8zYzpXPg/Gl/yknBzoSzbwZpWQSx6brwXY=
 SHA256 (go_modules/github.com/benbjohnson/clock/@v/v1.1.0.mod) = 
G1p4mwlRuF91r2zJmyS44pM1CaTj+T8FSDGBkgWIvjE=
 SHA256 (go_modules/github.com/benbjohnson/clock/@v/v1.1.0.zip) = 
0E5EHX9Xf3hh23IwVHgQXcdf1wMDB6D6Ml4yhQAoNEU=
 SHA256 
(go_modules/github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod) 
= zE0fqtdZZfpp6xMSC/lWgncZAF/z7NxwSzb7WPsf0W4=
@@ -295,8 +295,6 @@ SHA256 (go_modules/github.com/googleapis
 SHA256 (go_modules/github.com/googleapis/gax-go/v2/@v/v2.1.0.mod) = 
e/PuUTqoxg8L9YOFt13kwRuVCDegYE6/XaomSmLSs7U=
 SHA256 (go_modules/github.com/googleapis/gax-go/v2/@v/v2.1.1.mod) = 
GHSwVT4NuKjyuzVoB4tC+4yNmcDFEB26/w1HKghAzyc=
 SHA256 (go_modules/github.com/googleapis/gax-go/v2/@v/v2.1.1.zip) = 
uPeg/TjOFnVR4hoMKcm7PrtMzxeezr5sWyUEzn8brd0=
-SHA256 
(go_modules/github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-077cb4d1.mod)
 = lE+xOLxXrk6MpSw0dTJI/dLvvgYO0eCYYsWdWfsLT+s=
-SHA256 
(go_modules/github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-077cb4d1.zip)
 = m5zMlgbf6uL7Uz92i0NwJXl9xKpZrD+PCRtk3BS/Xbc=
 SHA256 (go_modules/github.com/gorilla/mux/@v/v1.8.0.mod) = 
R/lPOCkTbcy7qn88QRD3QNs3/5Dd555rM2xzLh/ajZw=
 SHA256 (go_modules/github.com/gorilla/mux/@v/v1.8.0.zip) = 
dkGRHgCvnJHwiYaDMwZ8nLmlhwLSyeqCHuN0lACRw4U=
 SHA256 (go_modules/github.com/grpc-ecosystem/grpc-gateway/@v/v1.16.0.mod) = 
mSpR1cTPiId0CD0jqOHIf/2bBFWFq3eFcuUe4xi6oKo=
@@ -325,8 +323,6 @@ SHA256 (go_modules/github.com/json-itera
 SHA256 
(go_modules/github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod)
 = +E886tahBRiWNVMSLbn+L9MvIaiy7iEDfwPF0+eT7LY=
 SHA256 (go_modules/github.com/jstemmer/go-junit-report/@v/v0.9.1.mod) = 
qVsAI+NBppIF01BpfuGMtRGPloGZ0ssGr1yD7XP5e9Q=
 SHA256 (go_modules/github.com/jstemmer/go-junit-report/@v/v0.9.1.zip) = 
+9IZbkpQqI+MNS92Ml9LpyM47Ox7bLdTUxfOnjqkAoQ=
-SHA256 (go_modules/github.com/jtolds/gls/@v/v4.20.0+incompatible.mod) = 
NtWo9+iF/Eqa/IUmT0YBGGwmuiOWd31SNSRFes6fCTY=
-SHA256 (go_modules/github.com/jtolds/gls/@v/v4.20.0+incompatible.zip) = 
L1H4y2EOhG3EvZs8D79r66skuwbYZtt4BOEjphsL2ew=
 SHA256 (go_modules/github.com/julienschmidt/httprouter/@v/v1.2.0.mod) = 
kUGdftg66O11TybbFXDwW5f/amFfvJHLf+gUivVn+yU=
 SHA256 (go_modules/github.com/julienschmidt/httprouter/@v/v1.3.0.mod) = 
an1sxZcYSgyz/a/is1XYRMeHmjdRt/gd7I/wIWzHu30=
 SHA256 (go_modules/github.com/julienschmidt/httprouter/@v/v1.3.0.zip) = 
5FfczXAV80BmTjuM/UGZdHE4LaL0p0PuVb5Tmrxsofk=
@@ -335,7 +331,6 @@ SHA256 (go_modules/github.com/kisielk/go
 SHA256 (go_modules/github.com/klauspost/compress/@v/v1.13.5.mod) = 
hzMbvVb5EFUKSEj77nhRzEOqVpvKMdlECSZU8IrPby4=
 SHA256 (go_modules/github.com/klauspost/compress/@v/v1.13.6.mod) = 
hzMbvVb5EFUKSEj77nhRzEOqVpvKMdlECSZU8IrPby4=
 SHA256 (go_modules/github.com/klauspost/compress/@v/v1.13.6.zip) = 
6vb7oU+s8aBPDw2fMZiOq2OL2P93mXNWPQvAuQpXwtQ=
-SHA256 (go_modules/github.com/klauspost/cpuid/@v/v1.2.3.mod) = 
m0Q7WwY1XsqR9OdzpN99ijvwyautX/Ry1pc+aI5qk5I=
 SHA256 

CVS: cvs.openbsd.org: ports

2022-01-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/01/14 00:30:49

Removed files:
x11/gnome/session/patches: patch-data_meson_build 

Log message:
Forgot to cvs rm in previous.



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/01/14 00:28:50

Modified files:
x11/gnome/shell/patches: patch-data_meson_build 
 patch-src_calendar-server_meson_build 
 
patch-subprojects_extensions-app_data_meson_build 
 
patch-subprojects_extensions-app_data_metainfo_meson_build 
 
patch-subprojects_extensions-tool_src_templates_meson_build 

Log message:
Merged upstream.



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/01/14 00:25:36

Added files:
x11/gnome/terminal/patches: patch-src_meson_build 

Log message:
Unbreak build with meson >=0.61.0



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Sebastien Marie
CVSROOT:/cvs
Module name:ports
Changes by: sema...@cvs.openbsd.org 2022/01/14 00:18:46

Modified files:
lang/rust  : Makefile distinfo 
lang/rust/patches: patch-src_bootstrap_bootstrap_py 
   patch-src_bootstrap_builder_rs 
   patch-src_bootstrap_lib_rs 
   patch-src_bootstrap_test_rs 
Added files:
lang/rust/patches: patch-src_test_ui_runtime_out-of-stack_rs 
Removed files:
lang/rust/patches: patch-src_test_ui_out-of-stack_rs 
   patch-vendor_backtrace_src_symbolize_gimli_rs 

Log message:
update lang/rust to 1.58.0

Announce: https://blog.rust-lang.org/2022/01/13/Rust-1.58.0.html
ChangeLog: 
https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1580-2022-01-13

ok landry@



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Benoit Lecocq
CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2022/01/14 00:15:26

Modified files:
games/rocksndiamonds: Makefile distinfo 

Log message:
Update to rocksndiamonds-4.3.0.3.



Re: update editors/TeXmacs 2.1

2022-01-13 Thread Nam Nguyen
Omar Polo writes:

> Nam Nguyen  writes:
>> Unresolved bug with graphviz that can wait:
>>
>> Help > Plug-ins > Graphviz
>> New window
>> Insert > Session > Graphviz
>> %dot -width 400
>> Error: gs_to_png failed for ramdisc://image.ps
>> TeXmacs] convert-error, gs_to_png failed for ramdisc://image.ps
>
> this bug exists upstream too or is due to our port?  if the latter maybe
> adding a note to pkg/README would be nice.

I see this bug on windows, as well, so I'll report it upstream.

> It misses a LDEP on x11/qt5/qtsvg,-main, I'm attaching an updated diff
> with it added plus the regen of WANTLIBs.

Thanks. I committed this with `make update-patches' that I had missed
previously to update patch line numbers.

>
> Cheers
>
> Omar Polo



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Nam Nguyen
CVSROOT:/cvs
Module name:ports
Changes by: n...@cvs.openbsd.org2022/01/13 21:30:11

Modified files:
editors/TeXmacs: Makefile distinfo 
editors/TeXmacs/patches: patch-CMakeLists_txt 
 patch-src_Plugins_Qt_qt_gui_cpp 
editors/TeXmacs/pkg: PLIST 

Log message:
update editors/TeXmacs 2.1.1

Update to 2.1.1, released on Dec 18, 2021.

- add x11/qt5/qtsvg to LIB_DEPENDS and regen WANTLIB
- remove unused -Wno-deprecated-register
- NO_TEST because tests require Xorg access
- add -DUSE_STACK_TRACE=ON for execinfo

feedback and tweaks from op@



Re: Add support for PINE H64 model B

2022-01-13 Thread Kevin Lo
On Fri, Jan 14, 2022 at 10:50:23AM +1100, Jonathan Gray wrote:
> 
> On Thu, Jan 13, 2022 at 05:02:05PM +0800, Kevin Lo wrote:
> > The PINE H64 ver. B is a minor revision of the original H64.
> > I copied the device tree from the Linux kernel.
> > 
> > dmesg: http://ix.io/3M3r
> > 
> > ok?
> 
> ok on the atf change

Thanks.

> To make u-boot less of a mess the model b device tree selection
> should be done with the existing h64 target not a new one.
> 
> A related patch series to yours
> https://lists.denx.de/pipermail/u-boot/2021-December/469475.html
> though this was not merged upstream

That series is very similar to mine...

> In case you missed it I am no longer maintainer on the u-boot port.

I didn't know :(  Sorry for the noise.



Re: Add support for PINE H64 model B

2022-01-13 Thread Kevin Lo
On Thu, Jan 13, 2022 at 09:18:15AM +, Klemens Nanni wrote:
> 
> On Thu, Jan 13, 2022 at 05:02:05PM +0800, Kevin Lo wrote:
> > The PINE H64 ver. B is a minor revision of the original H64.
> > I copied the device tree from the Linux kernel.
> > 
> > dmesg: http://ix.io/3M3r
> > 
> > ok?
> 
> With one fix.
> 
> > Index: sysutils/arm-trusted-firmware/Makefile
> > ===
> > RCS file: /cvs/ports/sysutils/arm-trusted-firmware/Makefile,v
> > retrieving revision 1.16
> > diff -u -p -u -p -r1.16 Makefile
> > --- sysutils/arm-trusted-firmware/Makefile  18 Jun 2021 09:17:28 -  
> > 1.16
> > +++ sysutils/arm-trusted-firmware/Makefile  13 Jan 2022 08:54:30 -
> > @@ -9,6 +9,7 @@ GH_PROJECT= arm-trusted-firmware
> >  GH_TAGNAME=v2.5
> >  
> >  EPOCH= 0
> > +REVISION=  0
> >  
> >  CATEGORIES=sysutils
> >  
> > @@ -32,7 +33,8 @@ CFLAGS=
> >  PLATFORMS=\
> > rk3328 \
> > rk3399 \
> > -   sun50i_a64
> > +   sun50i_a64 \
> > +   sun50i_h6
> >  
> >  do-build:
> >  .for P in ${PLATFORMS}
> > @@ -49,5 +51,7 @@ do-install:
> > ${PREFIX}/share/arm-trusted-firmware/rk3399-bl31.elf
> > ${INSTALL_DATA} ${WRKBUILD}/build/sun50i_a64/debug/bl31.bin \
> > ${PREFIX}/share/arm-trusted-firmware/sun50i_a64-bl31.bin
> > +   ${INSTALL_DATA} ${WRKBUILD}/build/sun50i_h6/debug/bl31.bin \
> > +   ${PREFIX}/share/arm-trusted-firmware/sun50i_h6-bl31.bin
> >  
> >  .include 
> > Index: sysutils/arm-trusted-firmware/pkg/PLIST
> > ===
> > RCS file: /cvs/ports/sysutils/arm-trusted-firmware/pkg/PLIST,v
> > retrieving revision 1.4
> > diff -u -p -u -p -r1.4 PLIST
> > --- sysutils/arm-trusted-firmware/pkg/PLIST 27 Sep 2019 15:43:29 -  
> > 1.4
> > +++ sysutils/arm-trusted-firmware/pkg/PLIST 13 Jan 2022 08:54:30 -
> > @@ -4,3 +4,4 @@ share/arm-trusted-firmware/
> >  share/arm-trusted-firmware/rk3328-bl31.elf
> >  share/arm-trusted-firmware/rk3399-bl31.elf
> >  share/arm-trusted-firmware/sun50i_a64-bl31.bin
> > +share/arm-trusted-firmware/sun50i_h6-bl31.bin
> > Index: sysutils/u-boot/Makefile
> > ===
> > RCS file: /cvs/ports/sysutils/u-boot/Makefile,v
> > retrieving revision 1.89
> > diff -u -p -u -p -r1.89 Makefile
> > --- sysutils/u-boot/Makefile17 Dec 2021 23:00:41 -  1.89
> > +++ sysutils/u-boot/Makefile13 Jan 2022 08:54:31 -
> > @@ -8,7 +8,7 @@ FLAVOR?=arm
> >  
> >  COMMENT=   U-Boot firmware
> >  VERSION=   2021.10
> > -REVISION=  2
> > +REVISION=  3
> 
> You also need to bump the build dependency to
>   sysutils/arm-trusted-firmware>=2.2p0v0
> 
> Otherwise new u-boot old atf will fail.

Fixed, thanks.

> >  DISTNAME=  u-boot-${VERSION}
> >  PKGNAME=   u-boot-${FLAVOR}-${VERSION:S/-//}
> >  FULLPKGNAME=   ${PKGNAME}
> > @@ -44,6 +44,7 @@ MAKE_ENV+=CROSS_COMPILE="aarch64-none-e
> >  RK3328_BL31=   
> > "${LOCALBASE}/share/arm-trusted-firmware/rk3328-bl31.elf"
> >  RK3399_BL31=   
> > "${LOCALBASE}/share/arm-trusted-firmware/rk3399-bl31.elf"
> >  SUNXI_BL31=
> > "${LOCALBASE}/share/arm-trusted-firmware/sun50i_a64-bl31.bin"
> > +SUNXI_H6_BL31= 
> > "${LOCALBASE}/share/arm-trusted-firmware/sun50i_h6-bl31.bin"
> >  .elif "${FLAVOR}" == "arm"
> >  BUILD_DEPENDS+=devel/arm-none-eabi/gcc-linaro>=7.4.2019.02
> >  MAKE_ENV+= CROSS_COMPILE="arm-none-eabi-"
> > @@ -69,6 +70,7 @@ SUNXI64=\
> > orangepi_zero_plus \
> > pine64-lts \
> > pine64_plus \
> > +   pine_h64-model-b \
> > pinebook \
> > sopine_baseboard
> >  BOARDS=\
> > @@ -203,6 +205,16 @@ do-build:
> >  .endif
> >  .endfor
> >  .for BOARD in ${SUNXI64}
> > +.if "${BOARD:M*_h64*}"
> > +   cd ${WRKSRC} && \
> > +   mkdir -p build/${BOARD} && \
> > +   ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
> > +   ${MAKE_FLAGS} O="build/${BOARD}" \
> > +   -f ${MAKE_FILE} "${BOARD}"_defconfig && \
> > +   ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
> > +   ${MAKE_FLAGS} O="build/${BOARD}" \
> > +   -f ${MAKE_FILE} ${ALL_TARGET}
> > +.else
> > cd ${WRKSRC} && \
> > mkdir -p build/${BOARD} && \
> > ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
> > @@ -211,6 +223,7 @@ do-build:
> > ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
> > ${MAKE_FLAGS} O="build/${BOARD}" \
> > -f ${MAKE_FILE} ${ALL_TARGET}
> > +.endif
> > if [[ -f ${WRKSRC}/build/${BOARD}/spl/sunxi-spl.bin && \
> >   -f ${WRKSRC}/build/${BOARD}/u-boot.itb ]]; then \
> > cd ${WRKSRC}/build/${BOARD} && \
> > Index: sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
> > ===
> > RCS file: sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
> > diff -N 

pta(1)

2022-01-13 Thread Ed Ahlsen-Girard
Has it been removed from ports? I reinstalled a machine from scratch
and it seems unavailable now.

-- 

Edward Ahlsen-Girard
Ft Walton Beach, FL




CVS: cvs.openbsd.org: ports

2022-01-13 Thread Daniel Jakots
CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2022/01/13 18:25:25

Modified files:
sysutils/node_exporter: Makefile distinfo 
Added files:
sysutils/node_exporter: modules.inc 

Log message:
Update to node_exporter-1.3.1

While there, switch to modules.inc.

ok claudio (maintainer), denis



Re: Add support for PINE H64 model B

2022-01-13 Thread Jonathan Gray
On Thu, Jan 13, 2022 at 05:02:05PM +0800, Kevin Lo wrote:
> The PINE H64 ver. B is a minor revision of the original H64.
> I copied the device tree from the Linux kernel.
> 
> dmesg: http://ix.io/3M3r
> 
> ok?

ok on the atf change

To make u-boot less of a mess the model b device tree selection
should be done with the existing h64 target not a new one.

A related patch series to yours
https://lists.denx.de/pipermail/u-boot/2021-December/469475.html
though this was not merged upstream

In case you missed it I am no longer maintainer on the u-boot port.

> 
> Index: sysutils/arm-trusted-firmware/Makefile
> ===
> RCS file: /cvs/ports/sysutils/arm-trusted-firmware/Makefile,v
> retrieving revision 1.16
> diff -u -p -u -p -r1.16 Makefile
> --- sysutils/arm-trusted-firmware/Makefile18 Jun 2021 09:17:28 -  
> 1.16
> +++ sysutils/arm-trusted-firmware/Makefile13 Jan 2022 08:54:30 -
> @@ -9,6 +9,7 @@ GH_PROJECT=   arm-trusted-firmware
>  GH_TAGNAME=  v2.5
>  
>  EPOCH=   0
> +REVISION=0
>  
>  CATEGORIES=  sysutils
>  
> @@ -32,7 +33,8 @@ CFLAGS=
>  PLATFORMS=\
>   rk3328 \
>   rk3399 \
> - sun50i_a64
> + sun50i_a64 \
> + sun50i_h6
>  
>  do-build:
>  .for P in ${PLATFORMS}
> @@ -49,5 +51,7 @@ do-install:
>   ${PREFIX}/share/arm-trusted-firmware/rk3399-bl31.elf
>   ${INSTALL_DATA} ${WRKBUILD}/build/sun50i_a64/debug/bl31.bin \
>   ${PREFIX}/share/arm-trusted-firmware/sun50i_a64-bl31.bin
> + ${INSTALL_DATA} ${WRKBUILD}/build/sun50i_h6/debug/bl31.bin \
> + ${PREFIX}/share/arm-trusted-firmware/sun50i_h6-bl31.bin
>  
>  .include 
> Index: sysutils/arm-trusted-firmware/pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/arm-trusted-firmware/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 PLIST
> --- sysutils/arm-trusted-firmware/pkg/PLIST   27 Sep 2019 15:43:29 -  
> 1.4
> +++ sysutils/arm-trusted-firmware/pkg/PLIST   13 Jan 2022 08:54:30 -
> @@ -4,3 +4,4 @@ share/arm-trusted-firmware/
>  share/arm-trusted-firmware/rk3328-bl31.elf
>  share/arm-trusted-firmware/rk3399-bl31.elf
>  share/arm-trusted-firmware/sun50i_a64-bl31.bin
> +share/arm-trusted-firmware/sun50i_h6-bl31.bin
> Index: sysutils/u-boot/Makefile
> ===
> RCS file: /cvs/ports/sysutils/u-boot/Makefile,v
> retrieving revision 1.89
> diff -u -p -u -p -r1.89 Makefile
> --- sysutils/u-boot/Makefile  17 Dec 2021 23:00:41 -  1.89
> +++ sysutils/u-boot/Makefile  13 Jan 2022 08:54:31 -
> @@ -8,7 +8,7 @@ FLAVOR?=  arm
>  
>  COMMENT= U-Boot firmware
>  VERSION= 2021.10
> -REVISION=2
> +REVISION=3
>  DISTNAME=u-boot-${VERSION}
>  PKGNAME= u-boot-${FLAVOR}-${VERSION:S/-//}
>  FULLPKGNAME= ${PKGNAME}
> @@ -44,6 +44,7 @@ MAKE_ENV+=  CROSS_COMPILE="aarch64-none-e
>  RK3328_BL31= "${LOCALBASE}/share/arm-trusted-firmware/rk3328-bl31.elf"
>  RK3399_BL31= "${LOCALBASE}/share/arm-trusted-firmware/rk3399-bl31.elf"
>  SUNXI_BL31=  "${LOCALBASE}/share/arm-trusted-firmware/sun50i_a64-bl31.bin"
> +SUNXI_H6_BL31=   
> "${LOCALBASE}/share/arm-trusted-firmware/sun50i_h6-bl31.bin"
>  .elif "${FLAVOR}" == "arm"
>  BUILD_DEPENDS+=  devel/arm-none-eabi/gcc-linaro>=7.4.2019.02
>  MAKE_ENV+=   CROSS_COMPILE="arm-none-eabi-"
> @@ -69,6 +70,7 @@ SUNXI64=\
>   orangepi_zero_plus \
>   pine64-lts \
>   pine64_plus \
> + pine_h64-model-b \
>   pinebook \
>   sopine_baseboard
>  BOARDS=\
> @@ -203,6 +205,16 @@ do-build:
>  .endif
>  .endfor
>  .for BOARD in ${SUNXI64}
> +.if "${BOARD:M*_h64*}"
> + cd ${WRKSRC} && \
> + mkdir -p build/${BOARD} && \
> + ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
> + ${MAKE_FLAGS} O="build/${BOARD}" \
> + -f ${MAKE_FILE} "${BOARD}"_defconfig && \
> + ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
> + ${MAKE_FLAGS} O="build/${BOARD}" \
> + -f ${MAKE_FILE} ${ALL_TARGET}
> +.else
>   cd ${WRKSRC} && \
>   mkdir -p build/${BOARD} && \
>   ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
> @@ -211,6 +223,7 @@ do-build:
>   ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
>   ${MAKE_FLAGS} O="build/${BOARD}" \
>   -f ${MAKE_FILE} ${ALL_TARGET}
> +.endif
>   if [[ -f ${WRKSRC}/build/${BOARD}/spl/sunxi-spl.bin && \
> -f ${WRKSRC}/build/${BOARD}/u-boot.itb ]]; then \
>   cd ${WRKSRC}/build/${BOARD} && \
> Index: sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
> ===
> RCS file: sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
> diff -N sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ 

Re: pkg_add new issue

2022-01-13 Thread Marc Espie
On Thu, Jan 13, 2022 at 11:49:09PM +0200, Mihai Popescu wrote:
> This time I got this message:
> 
> # pkg_add -vV julius
> Update candidates: quirks-4.93 -> quirks-4.93 (0/0)
> quirks-4.93 signed on 2022-01-12T20:27:40Z
> Ustar [
> https://ftp2.eu.openbsd.org/pub/OpenBSD/snapshots/packages/amd64/libmikmod-3.3.11.1p0.tgz][lib/libmikmod.so.4.0]:
> Premature end of archive
> Adjusting sha for /usr/local/lib/pkg.0rfqHXGd32 from
> +w7pyixijnEQUh4wwLcf5XM7PtiYf6F0i4cxmzyiGSs= to
> 47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=

Well... your network connection to ftp2.eu.openbsd.org hung up.
Not much pkg_add can do about that.

Did you try again, at least ?...



Re: [new] x11/zutty - a terminal using opengl es shader

2022-01-13 Thread Aaron Bieber


Stefan Hagen  writes:

> Hello,
>
> cat DESCR:
> Zutty is a terminal emulator for the X Window System, functionally
> similar to several other X terminal emulators such as xterm, rxvt and
> countless others. It is also similar to other, much more modern,
> GPU-accelerated terminal emulators such as Alacritty and Kitty. What
> really sets Zutty apart is its radically simple, yet extremely efficient
> rendering implementation, coupled with a sufficiently complete feature
> set to make it useful for a wide range of users. Zutty offers high
> throughput with low latency, and strives to conform to relevant
> (published or de-facto) standards.
>
> Homepage: https://tomscii.sig7.se/zutty
>
> Recommended read:
> https://tomscii.sig7.se/2020/11/How-Zutty-works
>
> I'm running zutty for about a week with no issues except some missing 
> UTF8 characters. It's the first "gpu-terminal", which doesn't feel heavy
> for me.
>
> Font selection is a bit strange as you need to give it the font path. 
> From this path on, it searches recursive. This works for me:
>
> zutty -fontpath /usr/local/share/fonts -font Cousine -dwfont NotoEmoji 
> -fontsize 24
>
> Anyone interested? Ok?

Extra file in there: .tgz :D

Also portcheck complains about:
C++ libraries in WANTLIB with default COMPILER (most ports need
'COMPILER=base-clang ports-gcc' or 'COMPILER=base-clang ports-gcc
base-gcc')

but I am not smart enough to know if that's real or not!

OK abieber@ with the .tgz removed.

>
> Best Regards,
> Stefan
>
> [2. application/x-tar-gz; zutty.tgz]...



pkg_add new issue

2022-01-13 Thread Mihai Popescu
This time I got this message:

# pkg_add -vV julius
Update candidates: quirks-4.93 -> quirks-4.93 (0/0)
quirks-4.93 signed on 2022-01-12T20:27:40Z
Ustar [
https://ftp2.eu.openbsd.org/pub/OpenBSD/snapshots/packages/amd64/libmikmod-3.3.11.1p0.tgz][lib/libmikmod.so.4.0]:
Premature end of archive
Adjusting sha for /usr/local/lib/pkg.0rfqHXGd32 from
+w7pyixijnEQUh4wwLcf5XM7PtiYf6F0i4cxmzyiGSs= to
47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=
pkg_add: Installation of libmikmod-3.3.11.1p0 failed, partial installation
recorded as partial-libmikmod-3.3.11.1p0
# pkg_add -vV julius
Update candidates: quirks-4.93 -> quirks-4.93 (0/0)
quirks-4.93 signed on 2022-01-12T20:27:40Z
julius-1.7.0:libmodplug-0.8.9.0p0: 2/7
julius-1.7.0:mpg123-1.29.2: 3/7
julius-1.7.0:opusfile-0.12: 4/7
info/dir: could not read (No such file or directory) and could not create
(No such file or directory)
system(/usr/bin/install-info, --delete, --info-dir=info, --, info/
mikmod.info) failed: exit(1)
julius-1.7.0:partial-libmikmod-3.3.11.1p0->libmikmod-3.3.11.1p0: 5/7
julius-1.7.0:sdl2-mixer-2.0.4: 6/7
julius-1.7.0: 7/7
Running tags: ok
New and changed readme(s):
/usr/local/share/doc/pkg-readmes/julius
Extracted 9859567 from 9862115

It was after a fresh start of computer, while new kernel compile was
ongoing and I started firefox ( all of this was doing a lot of disk usage ).
It looks like some out of sync like some others behaviors I reported in the
past.
I am using amd64 snapshots.

OpenBSD 7.0-current (GENERIC.MP) #248: Tue Jan 11 10:12:07 MST 2022
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 8029429760 (7657MB)
avail mem = 7770083328 (7410MB)
random: good seed from bootblocks
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.6 @ 0xeebc0 (57 entries)
bios0: vendor LENOVO version "9VKT33AUS" date 09/11/2013
bios0: LENOVO 1990RZ2
acpi0 at bios0: ACPI 4.0
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP APIC TCPA MCFG SLIC MCFG HPET SSDT
acpi0: wakeup devices PCE2(S4) PCE3(S4) PCE4(S4) PCE5(S4) PCE6(S4) PCE7(S4)
PCE9(S4) PCEA(S4) PCEB(S4) PCEC(S4) SBAZ(S4) P0PC(S4) PE20(S4) PE21(S4)
PE22(S4) PE23(S4) [...]
acpitimer0 at acpi0: 3579545 Hz, 32 bits
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: AMD Athlon(tm) II X2 B26 Processor, 3194.57 MHz, 10-06-03
cpu0:
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,3DNOW2,3DNOW,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,NODEID,ITSC
cpu0: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 1MB
64b/line 16-way L2 cache
cpu0: ITLB 32 4KB entries fully associative, 16 4MB entries fully
associative
cpu0: DTLB 48 4KB entries fully associative, 48 4MB entries fully
associative
cpu0: AMD erratum 721 detected and fixed
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
cpu0: apic clock running at 199MHz
cpu0: mwait min=64, max=64, IBE
cpu1 at mainbus0: apid 1 (application processor)
cpu1: AMD Athlon(tm) II X2 B26 Processor, 3192.05 MHz, 10-06-03
cpu1:
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,3DNOW2,3DNOW,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,NODEID,ITSC
cpu1: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 1MB
64b/line 16-way L2 cache
cpu1: ITLB 32 4KB entries fully associative, 16 4MB entries fully
associative
cpu1: DTLB 48 4KB entries fully associative, 48 4MB entries fully
associative
cpu1: AMD erratum 721 detected and fixed
cpu1: smt 0, core 1, package 0
ioapic0 at mainbus0: apid 3 pa 0xfec0, version 21, 24 pins
acpimcfg0 at acpi0
acpimcfg0: addr 0xe000, bus 0-255
acpimcfg1 at acpi0
acpimcfg1: addr 0xe000, bus 0-255
acpihpet0 at acpi0: 14318180 Hz
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus 1 (P0P1)
acpiprt2 at acpi0: bus -1 (PCE2)
acpiprt3 at acpi0: bus -1 (PCE3)
acpiprt4 at acpi0: bus -1 (PCE4)
acpiprt5 at acpi0: bus -1 (PCE5)
acpiprt6 at acpi0: bus -1 (PCE6)
acpiprt7 at acpi0: bus -1 (PCE7)
acpiprt8 at acpi0: bus -1 (PCE9)
acpiprt9 at acpi0: bus -1 (PCEA)
acpiprt10 at acpi0: bus 2 (P0PC)
acpiprt11 at acpi0: bus 3 (PE20)
acpiprt12 at acpi0: bus -1 (PE21)
acpiprt13 at acpi0: bus -1 (PE22)
acpiprt14 at acpi0: bus 4 (PE23)
acpipci0 at acpi0 PCI0
com0 at acpi0 UAR1 addr 0x3f8/0x8 irq 4: ns16550a, 16 byte fifo
acpicmos0 at acpi0
tpm0 at acpi0 TPM_ 1.2 (TIS) addr 0xfed4/0x5000, device 0x104a rev
0x4e
acpibtn0 at acpi0: PWRB
acpicpu0 at acpi0: C1(@1 halt!), PSS
acpicpu1 at acpi0: C1(@1 halt!), PSS
cpu0: 3194 MHz: speeds: 3200 2500 1900 800 MHz
pci0 at mainbus0 bus 0
pchb0 at pci0 dev 0 function 0 "AMD RS880 Host" rev 0x00
ppb0 at pci0 dev 1 function 0 vendor "Lenovo", unknown product 0x9602 rev
0x00

Re: UPDATE: Sn0int-0.24.1

2022-01-13 Thread Brian Callahan
Hi Gonzalo --

On 1/13/2022 11:53 AM, Gonzalo Rodriguez wrote:
> Anyone? :)
> 
> On 12/20/21 18:23, Gonzalo L. Rodriguez wrote:
>> Hello,
>>
>> Update for Sn0int to 0.24.1
>>
>> https://github.com/kpcyrd/sn0int/releases/tag/v0.24.1
>>
>> OK? Comments?
>>
>> Cheers.-
>>
> 

I get this from make test:
test result: FAILED. 125 passed; 73 failed; 31 ignored; 0 measured; 0
filtered out; finished in 0.04s

I'm not sure how that compares from the current version.

I'm not a Rust expert, but everything checks out and the resulting
sn0int binary runs on my amd64 machine.

ok bcallah@

~Brian



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Stefan Hagen
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2022/01/13 14:06:25

Modified files:
meta/tor-browser/pkg: README 

Log message:
Fix typo: integrate => integrated



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Stefan Hagen
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2022/01/13 13:26:17

Modified files:
devel/fnc  : Makefile distinfo 
Removed files:
devel/fnc/patches: patch-Makefile 

Log message:
Update fnc 0.6 => 0.8

Sofware changes:
fnc 0.8 2022-01-10
* fix vertical split view init regression from 0.7 when terminal < 120 cols wide
* fix DB lock when opening horizontal split that signals the timeline thread

fnc 0.7 2022-01-09
* factor out common make(1) and gmake build bits
* make build depend on make file
* make all commands compatible with -R|--repository (i.e., no checkout needed)
* implement Vim-like smartcase for commands that filter repository results
* improve timeline arg parsing for more informative output upon invalid input
* plug small memory leak when the timeline command fails to initialise a view
* fix database locking issue when opening multiple tree views from the timeline
* add pledge(2) and unveil(2) support on OpenBSD builds
* add (s)ort keymap (i.e., --sort CLI option counterpart) to the branch view
* add (d)ate keymap to toggle display of last modified timestamp in tree view
* allow blame of empty files rather than erroring out
* fix NULL dereference UB when the ".." parent dir is selected in tree view
* merge upstream fix when annotating files with shallow history
* add support for configurable horizontal split view mode (timeline -> diff)
* keep the last/first line in view when paging down/up to stay oriented
* expand horizontal splitscreen support to include tree -> blame views
* improve handling of cached commit builder statements
* plug small memleak of file labels when traversing commits from the diff view
* display message rather than error out when binary files are blamed
* expand horizontal split coverage to include timeline -> tree views
* implement '#' keymap to display line numbers in blame view
* implement (L)ine keymap to navigate directly to the entered line in blame view
* convert diff code to use upstream v2 API
* keep lines on screen in view when using keymaps that modify diff content
* reset diff search state when traversing commits from the diff view
* apply upstream diff fix to render consecutive edited lines as one block
* implement '#' keymap to display line numbers in diff view
* improve C-f/C-b paging in the in-app help window
* add user-defined option to configure search highlight colours
* implement navigate to (L)ine keymap in diff view
* enhance timeline and diff view headers
* implement user-defined option to configure line selection cursor in diff view
* implement Vim-like C-e/C-y keymaps to scroll down/up one line in diff view
* implement horizontal scrolling in diff and blame views
* improve view request handling and optimise new view initialisation
* implement C-n/C-p keymap to navigate to the next/previous file in the diff
* implement (F)ile keymap to navigate directly to a file in the diff
* apply upstream diff v2 fix for rendering untouched lines as changed
* implement Vim-like C-d/C-u keymaps to scroll the view down/up half a page
* enhance search behaviour in all views

Port changes:
* dropped NO_TEST=Yes because we don't set this when no test is present
* dropped patch as it has been merged upstream



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Stefan Hagen
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2022/01/13 13:02:29

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

Log message:
Update tor-browser 11.0.3 => 11.0.4 by Caspar Schutijser (MAINTAINER)

Software changes since 11.0.3:
* Update Firefox to 91.5.0esr
* Update NoScript to 11.2.14
* Bug tor-browser-build#40405: Rotate deusexmachina IP address
* Bug tor-browser#40756: Fix up wrong observer removals
* Bug torbutton#40758: Remove YEC takeover from about:tor
* Bug tor-browser-build#40399: Bring back Noto Sans Gurmukhi and Sinhala fonts

Port changes:
* tweaked various DESCR files to match reality (torbutton and
tor-launcher are not separate Firefox add-ons anymore, for example).

Committed with tweak: Changed workding in README to match the port changes.



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/01/13 12:52:05

Modified files:
net/gupnp/core : Makefile distinfo 

Log message:
Update to gupnp-1.4.3.



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Bjorn Ketelaars
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2022/01/13 12:05:04

Modified files:
databases/py-influxdb: Makefile 
devel/ipython  : Makefile 
devel/py-prompt_toolkit: Makefile 
graphics/py-seaborn: Makefile 
textproc/py-sphinx_guzzle_theme: Makefile 

Log message:
Drop maintainership



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/01/13 10:58:01

Modified files:
audio/picard   : Makefile distinfo 
audio/picard/pkg: PLIST 

Log message:
update to picard-2.7.3



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/01/13 10:57:18

Modified files:
security/py-josepy: Makefile distinfo 

Log message:
update to py3-josepy-1.12.0



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/01/13 10:50:15

Modified files:
x11/freerdp: Makefile distinfo 
Removed files:
x11/freerdp/patches: patch-libfreerdp_crypto_tls_c 

Log message:
update to freerdp-2.5.0



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/01/13 10:48:29

Modified files:
security/clamav: Tag: OPENBSD_7_0 Makefile distinfo 

Log message:
update to clamav-0.103.5



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/01/13 10:47:59

Modified files:
security/clamav: Makefile distinfo 

Log message:
update to clamav-0.104.2



Re: [UPDATE] ImageMagick 6.9.12-34

2022-01-13 Thread Stuart Henderson
On 2022/01/13 18:13, Volker Schlecht wrote:
> Updates ImageMagick to 6.9.12-34, fixing among others

Thanks, committed with a few tweaks

Could you send plain diffs rather than tarring them up please?



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/01/13 10:45:36

Modified files:
graphics/ImageMagick: Makefile distinfo 
graphics/ImageMagick/patches: patch-configure_ac 
graphics/ImageMagick/pkg: PLIST 

Log message:
update to ImageMagick-6.9.12-34
from Volker Schlecht with some tweaks



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2022/01/13 10:16:58

Modified files:
security/botan2: Makefile 
Added files:
security/botan2/patches: patch-src_lib_utils_cpuid_cpuid_x86_cpp 

Log message:
On OpenBSD i386 Botan dies with illegal instruction when using AVX2
extensions.  Our kernel does not set the OSXSAVE flag, so Botan
must not use them.  Cherry-pick fix from upstream.



[UPDATE] ImageMagick 6.9.12-34

2022-01-13 Thread Volker Schlecht

Updates ImageMagick to 6.9.12-34, fixing among others

* Fix integer overflow (reference 
https://github.com/ImageMagick/ImageMagick6/issues/168).


* Fix stack overflow when parsing malicious PS image file (report from 
Muhammad Aldo Firmansyah).


* fix connected component abort trap (reference 
https://github.com/ImageMagick/ImageMagick/issues/4372).


* fix stack overflow when parsing malicious tiff image file (report from 
Muhammad Aldo Firmansyah).


* Heap-based buffer overflow in TIFF coder (alert from Hunter Mitchell).

Reference: https://legacy.imagemagick.org/script/changelog.php

OK?

patch-ImageMagick-6.9.12-34.tar.gz
Description: application/gzip


Re: UPDATE: Sn0int-0.24.1

2022-01-13 Thread Gonzalo Rodriguez

Anyone? :)

On 12/20/21 18:23, Gonzalo L. Rodriguez wrote:

Hello,

Update for Sn0int to 0.24.1

https://github.com/kpcyrd/sn0int/releases/tag/v0.24.1

OK? Comments?

Cheers.-





CVS: cvs.openbsd.org: ports

2022-01-13 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/01/13 09:35:00

Modified files:
graphics/py-Pillow: Makefile distinfo 

Log message:
update to py3-Pillow-9.0.0



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2022/01/13 09:03:04

Modified files:
www/kore   : Makefile 
Added files:
www/kore/patches: patch-src_pgsql_c 

Log message:
Add patch to allow pgsql FLAVOR to build with PostgreSQL 14

OK pea@, sthen@



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2022/01/13 09:02:25

Modified files:
databases/postgresql-pllua: Makefile distinfo 
databases/postgresql-pllua/patches: patch-Makefile 

Log message:
Update to postgresql-pllua 2.0.10 to work with PostgreSQL 14

OK pea@, sthen@



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2022/01/13 09:02:00

Added files:
databases/pgadmin3/patches: patch-pgadmin_db_keywords_c 

Log message:
Add patch to work with PostgreSQL 14

OK pea@, sthen@



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2022/01/13 09:01:29

Modified files:
databases/pg_statsinfo: Makefile distinfo 
databases/pg_statsinfo/patches: 
patch-agent_lib_last_xact_activity_c 
patch-agent_lib_libstatsinfo_c 
databases/pg_statsinfo/pkg: PLIST 
Added files:
databases/pg_statsinfo/patches: patch-agent_bin_maintenance_c 
patch-agent_bin_pgut_pgut_c 
patch-agent_bin_pgut_pgut_h 
patch-reporter_pgut_pgut_c 
patch-reporter_pgut_pgut_h 

Log message:
Update to pg_statsinfo 13.0, and add patches to build with PostgreSQL 14

OK pea@, sthen@



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2022/01/13 09:00:52

Modified files:
databases/citus: Makefile distinfo 
databases/citus/pkg: PLIST 
Added files:
databases/citus/patches: 
 
patch-src_backend_distributed_commands_multi_copy_c 

Log message:
Update to citus 10.2.1, to work with PostgreSQL 14

OK pea@, sthen@



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2022/01/13 09:00:15

Modified files:
databases/postgresql-previous: Makefile distinfo 
databases/postgresql-previous/pkg: PLIST 

Log message:
Update to PostgreSQL 13.5

Take MAINTAINER.

OK pea@ (previous MAINTAINER), sthen@



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/01/13 09:00:06

Modified files:
x11/remmina: Makefile distinfo 
x11/remmina/patches: patch-CMakeLists_txt 
 patch-plugins_vnc_vnc_plugin_c 
x11/remmina/pkg: PLIST 

Log message:
Update to remmina-1.4.23.



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2022/01/13 08:59:34

Modified files:
databases/postgresql: Makefile distinfo 
databases/postgresql/pkg: PLIST-contrib PLIST-docs PLIST-main 
  PLIST-server 

Log message:
Update to PostgreSQL 14.1

Take MAINTAINER.

OK pea@ (previous MAINTAINER), sthen@



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/01/13 08:12:55

Modified files:
net: Makefile 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 
Removed files:
net/ssvnc  : Makefile distinfo 
net/ssvnc/patches: patch-scripts_ssvnc 
   patch-scripts_util_ss_vncviewer 
   patch-scripts_util_ssvnc_tcl 
   patch-vnc_unixsrc_vncviewer_Imakefile 
   patch-vnc_unixsrc_vncviewer_vncviewer_h 
   patch-vnc_unixsrc_vncviewer_vncviewer_man 
   patch-vncstorepw_Makefile 
   patch-vncstorepw_ultravnc_dsm_helper_c 
net/ssvnc/pkg  : DESCR-gui DESCR-main PLIST-gui PLIST-main 

Log message:
remove net/ssvnc, the upstream maintainer hasn't been seen in some years
and has various security issues (most libvncclient security fixes from the
past are relevant to this too; see e.g. patches in debian's ssvnc package).

suggest using either tigervnc's vncviewer, or something using
libvncclient (e.g. remmina) instead, both of which are better maintained.

ok tb@



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/01/13 07:43:49

Modified files:
security/pinentry: Makefile 

Log message:
Add a no_qt5 PSEUDO_FLAVOR (suggested by sthen@).
Add support for caps-lock warning in the -qt5 subpackage while here.



Re: PostgreSQL 14.1 (plus dependencies)

2022-01-13 Thread Pierre-Emmanuel André
Sorry for the late answer. Update ok for me too
ok pea@
On Thu, Jan 13, 2022 at 02:09:00PM +, Stuart Henderson wrote:
> OK.
> 
> There were no other problems, the PostgreSQL update is OK sthen@
> 
> 
> On 2022/01/12 15:30, Jeremy Evans wrote:
> > On 01/12 09:58, Stuart Henderson wrote:
> > > www/kore,pgsql:
> > > 
> > > cc -O2 -pipe -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes 
> > > -Wmissing-declarations -Wshadow -Wpointer-arith -Wcast-qual 
> > > -Wsign-compare -Iinclude/kore -Iobj -std=c99 -pedantic 
> > > -DPREFIX='"/usr/local"' -fstack-protector-all 
> > > -I/usr/local/include/postgresql -DKORE_USE_PGSQL 
> > > -DPGSQL_INCLUDE_PATH="\"/usr/local/include/postgresql\"" -DKORE_USE_TASKS 
> > > -c src/pgsql.c -o obj/pgsql.o
> > > src/pgsql.c:774:10: error: enumeration values 'PGRES_PIPELINE_SYNC' and 
> > > 'PGRES_PIPELINE_ABORTED' not handled in switch [-Werror,-Wswitch]
> > > switch (PQresultStatus(pgsql->result)) {
> > > ^
> > > 1 error generated.
> > > gmake: *** [Makefile:251: obj/pgsql.o] Error 1
> > > 
> > 
> > This patch should allow kore,pgsql to build (taken from a couple
> > different upstream patches).
> > 
> > Thanks,
> > Jeremy
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/www/kore/Makefile,v
> > retrieving revision 1.29
> > diff -u -p -r1.29 Makefile
> > --- Makefile2 Nov 2021 00:02:51 -   1.29
> > +++ Makefile12 Jan 2022 15:28:34 -
> > @@ -3,7 +3,7 @@
> >  COMMENT =  web application framework for writing scalable web APIs in C
> >  
> >  DISTNAME = kore-4.1.0
> > -REVISION = 1
> > +REVISION = 2
> >  
> >  CATEGORIES =   www
> >  
> > Index: patches/patch-src_pgsql_c
> > ===
> > RCS file: patches/patch-src_pgsql_c
> > diff -N patches/patch-src_pgsql_c
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ patches/patch-src_pgsql_c   12 Jan 2022 15:25:47 -
> > @@ -0,0 +1,18 @@
> > +$OpenBSD$
> > +
> > +Work with PostgreSQL 14.
> > +
> > +Index: src/pgsql.c
> > +--- src/pgsql.c.orig
> >  src/pgsql.c
> > +@@ -772,6 +772,10 @@ pgsql_read_result(struct kore_pgsql *pgsql)
> > +   }
> > + 
> > +   switch (PQresultStatus(pgsql->result)) {
> > ++#if PG_VERSION_NUM >= 14
> > ++  case PGRES_PIPELINE_SYNC:
> > ++  case PGRES_PIPELINE_ABORTED:
> > ++#endif
> > +   case PGRES_COPY_OUT:
> > +   case PGRES_COPY_IN:
> > +   case PGRES_NONFATAL_ERROR:
> > 



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/01/13 07:13:00

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
'pinentry-gtk2' => 'pinentry-gnome3'

ok sthen@ pea@



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/01/13 07:12:37

Modified files:
security/pinentry: Makefile distinfo 
security/pinentry/pkg: PLIST-gnome3 
Added files:
security/pinentry/pkg: DESCR-qt5 PLIST-qt5 
Removed files:
security/pinentry/pkg: DESCR-gtk2 PLIST-gtk2 

Log message:
Update to pinentry-1.2.0.
Drop -gtk2 subpackage and add a -qt5 one.

ok sthen@ pea@ (maintainer)



Re: PostgreSQL 14.1 (plus dependencies)

2022-01-13 Thread Stuart Henderson
OK.

There were no other problems, the PostgreSQL update is OK sthen@


On 2022/01/12 15:30, Jeremy Evans wrote:
> On 01/12 09:58, Stuart Henderson wrote:
> > www/kore,pgsql:
> > 
> > cc -O2 -pipe -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes 
> > -Wmissing-declarations -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare 
> > -Iinclude/kore -Iobj -std=c99 -pedantic -DPREFIX='"/usr/local"' 
> > -fstack-protector-all -I/usr/local/include/postgresql -DKORE_USE_PGSQL 
> > -DPGSQL_INCLUDE_PATH="\"/usr/local/include/postgresql\"" -DKORE_USE_TASKS 
> > -c src/pgsql.c -o obj/pgsql.o
> > src/pgsql.c:774:10: error: enumeration values 'PGRES_PIPELINE_SYNC' and 
> > 'PGRES_PIPELINE_ABORTED' not handled in switch [-Werror,-Wswitch]
> > switch (PQresultStatus(pgsql->result)) {
> > ^
> > 1 error generated.
> > gmake: *** [Makefile:251: obj/pgsql.o] Error 1
> > 
> 
> This patch should allow kore,pgsql to build (taken from a couple
> different upstream patches).
> 
> Thanks,
> Jeremy
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/kore/Makefile,v
> retrieving revision 1.29
> diff -u -p -r1.29 Makefile
> --- Makefile  2 Nov 2021 00:02:51 -   1.29
> +++ Makefile  12 Jan 2022 15:28:34 -
> @@ -3,7 +3,7 @@
>  COMMENT =web application framework for writing scalable web APIs in C
>  
>  DISTNAME =   kore-4.1.0
> -REVISION =   1
> +REVISION =   2
>  
>  CATEGORIES = www
>  
> Index: patches/patch-src_pgsql_c
> ===
> RCS file: patches/patch-src_pgsql_c
> diff -N patches/patch-src_pgsql_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_pgsql_c 12 Jan 2022 15:25:47 -
> @@ -0,0 +1,18 @@
> +$OpenBSD$
> +
> +Work with PostgreSQL 14.
> +
> +Index: src/pgsql.c
> +--- src/pgsql.c.orig
>  src/pgsql.c
> +@@ -772,6 +772,10 @@ pgsql_read_result(struct kore_pgsql *pgsql)
> + }
> + 
> + switch (PQresultStatus(pgsql->result)) {
> ++#if PG_VERSION_NUM >= 14
> ++case PGRES_PIPELINE_SYNC:
> ++case PGRES_PIPELINE_ABORTED:
> ++#endif
> + case PGRES_COPY_OUT:
> + case PGRES_COPY_IN:
> + case PGRES_NONFATAL_ERROR:
> 



Re: update pinentry to 1.2.0

2022-01-13 Thread Pierre-Emmanuel André
Ok pea@
Thanks.

On January 13, 2022 1:06:49 PM GMT+01:00, Antoine Jacoutot 
 wrote:
>Hi.
>
>This updates pinentry to the latest stable release (1.2.0).
>While here, drop the gtk2 subpackage and add a qt5 one.
>
>OK?
>
>
>Index: devel/quirks/Makefile
>===
>RCS file: /cvs/ports/devel/quirks/Makefile,v
>retrieving revision 1.1340
>diff -u -p -r1.1340 Makefile
>--- devel/quirks/Makefile  8 Jan 2022 17:33:18 -   1.1340
>+++ devel/quirks/Makefile  13 Jan 2022 12:00:48 -
>@@ -5,7 +5,7 @@ CATEGORIES =   devel databases
> DISTFILES =
> 
> # API.rev
>-PKGNAME = quirks-4.93
>+PKGNAME = quirks-4.94
> PKG_ARCH =*
> MAINTAINER =  Marc Espie 
> 
>Index: devel/quirks/files/Quirks.pm
>===
>RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
>retrieving revision 1.1357
>diff -u -p -r1.1357 Quirks.pm
>--- devel/quirks/files/Quirks.pm   8 Jan 2022 17:33:18 -   1.1357
>+++ devel/quirks/files/Quirks.pm   13 Jan 2022 12:00:48 -
>@@ -694,6 +694,7 @@ my $stem_extensions = {
>   'apertium-mk-bg' => 'apertium-mkd-bul',
>   'apertium-mk-en' => 'apertium-mkd-eng',
>   'apertium-pt-ca' => 'apertium-por-cat',
>+  'pinentry-gtk2' => 'pinentry-gnome3',
> };
> 
> my $obsolete_reason = {};
>Index: security/pinentry/Makefile
>===
>RCS file: /cvs/ports/security/pinentry/Makefile,v
>retrieving revision 1.27
>diff -u -p -r1.27 Makefile
>--- security/pinentry/Makefile 7 Jul 2021 07:53:30 -   1.27
>+++ security/pinentry/Makefile 13 Jan 2022 12:00:48 -
>@@ -1,18 +1,14 @@
> # $OpenBSD: Makefile,v 1.27 2021/07/07 07:53:30 edd Exp $
> 
> COMMENT-main =PIN or passphrase entry dialog (ncurses interface)
>-COMMENT-gtk2 =PIN or passphrase entry dialog (gtk2 interface)
> COMMENT-gnome3 =PIN or passphrase entry dialog (GNOME 3 interface)
>+COMMENT-qt5 = PIN or passphrase entry dialog (Qt5 interface)
> 
>-VERSION = 1.1.1
>+VERSION = 1.2.0
> DISTNAME =pinentry-${VERSION}
> CATEGORIES =  security
> EXTRACT_SUFX =.tar.bz2
> 
>-PKGNAME-main =${DISTNAME}
>-PKGNAME-gtk2 =pinentry-gtk2-${VERSION}
>-PKGNAME-gnome3 =pinentry-gnome3-${VERSION}
>-
> MASTER_SITES =${MASTER_SITE_GNUPG:=pinentry/}
> 
> HOMEPAGE =https://www.gnupg.org/related_software/pinentry/index.en.html
>@@ -28,39 +24,37 @@ WANTLIB += curses secret-1
> LIB_DEPENDS = security/libassuan \
>   x11/gnome/libsecret
> 
>-WANTLIB-gtk2 += ${WANTLIB}
>-WANTLIB-gtk2 += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
>-WANTLIB-gtk2 += Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0
>-WANTLIB-gtk2 += gdk_pixbuf-2.0 gtk-x11-2.0 pango-1.0 pangocairo-1.0
>-WANTLIB-gtk2 += pangoft2-1.0 z
>-
>-LIB_DEPENDS-gtk2 =${LIB_DEPENDS} \
>-  x11/gtk+2
>-
> WANTLIB-gnome3 += ${WANTLIB}
> WANTLIB-gnome3 += atk-1.0 cairo cairo-gobject gck-1 gcr-base-3 gcr-ui-3
>-WANTLIB-gnome3 += gdk-3 gdk_pixbuf-2.0 gtk-3 p11-kit pango-1.0 pangocairo-1.0
>+WANTLIB-gnome3 += gdk-3 gdk_pixbuf-2.0 gtk-3 harfbuzz p11-kit pango-1.0
>+WANTLIB-gnome3 += pangocairo-1.0
> 
> LIB_DEPENDS-gnome3 =  ${LIB_DEPENDS} \
>   x11/gnome/gcr
> 
>+WANTLIB-qt5 += ${WANTLIB}
>+WANTLIB-qt5 += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets m
>+
>+LIB_DEPENDS-qt5 = ${LIB_DEPENDS} \
>+  x11/qt5/qtbase
>+
> CONFIGURE_STYLE = gnu
> CONFIGURE_ENV =   CPPFLAGS="-I${LOCALBASE}/include 
> -D_XOPEN_SOURCE_EXTENDED" \
>   LDFLAGS="-L${LOCALBASE}/lib"
> CONFIGURE_ARGS =  --enable-pinentry-curses \
>-  --disable-pinentry-qt \
>+  --disable-pinentry-tty \
>+  --disable-pinentry-emacs \
>+  --disable-pinentry-gtk2 \
>+  --disable-pinentry-efl \
>+  --disable-pinentry-tqt \
>   --disable-pinentry-fltk
> 
>-MULTI_PACKAGES =  -main -gtk2 -gnome3
>+MULTI_PACKAGES =  -main -gnome3 -qt5
> 
>-PSEUDO_FLAVORS=   no_gtk2 no_gnome3 bootstrap
>-FLAVOR?=  no_gtk2 no_gnome3 bootstrap
>+PSEUDO_FLAVORS=   no_gnome3 bootstrap
>+FLAVOR?=  no_gnome3 bootstrap
> 
> .include 
>-
>-.if !${BUILD_PACKAGES:M-gtk2}
>-CONFIGURE_ARGS += --disable-pinentry-gtk2
>-.endif
> 
> .if !${BUILD_PACKAGES:M-gnome3}
> CONFIGURE_ARGS += --disable-pinentry-gnome3
>Index: security/pinentry/distinfo
>===
>RCS file: /cvs/ports/security/pinentry/distinfo,v
>retrieving revision 1.8
>diff -u -p -r1.8 distinfo
>--- security/pinentry/distinfo 7 Jul 2021 07:53:30 -   1.8
>+++ security/pinentry/distinfo 13 Jan 2022 12:00:48 -
>@@ -1,2 +1,2 @@
>-SHA256 (pinentry-1.1.1.tar.bz2) = 

Re: update pinentry to 1.2.0

2022-01-13 Thread Stuart Henderson
On 2022/01/13 13:06, Antoine Jacoutot wrote:
> Hi.
> 
> This updates pinentry to the latest stable release (1.2.0).
> While here, drop the gtk2 subpackage and add a qt5 one.
> 
> OK?

OK. (I have the update in my tree too but didn't change subpackages.)



Re: ansible run dep on netaddr python module

2022-01-13 Thread Daniel Jakots
On Thu, 13 Jan 2022 13:04:40 +0300, Pavel Korovin  wrote:

> The same is about py-netaddr.

FWIW, it used to be a rdep:
https://github.com/openbsd/ports/commit/9495f5f3e34eb8d36ca49d2e03753f6c8fc02806
until the update to 4.1.0:
https://github.com/openbsd/ports/commit/a6d6a5de1a11fee7863c5db69a291e103a263cd0
and it didn't make it into ansible-core.

Cheers,
Daniel



update pinentry to 1.2.0

2022-01-13 Thread Antoine Jacoutot
Hi.

This updates pinentry to the latest stable release (1.2.0).
While here, drop the gtk2 subpackage and add a qt5 one.

OK?


Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1340
diff -u -p -r1.1340 Makefile
--- devel/quirks/Makefile   8 Jan 2022 17:33:18 -   1.1340
+++ devel/quirks/Makefile   13 Jan 2022 12:00:48 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-4.93
+PKGNAME =  quirks-4.94
 PKG_ARCH = *
 MAINTAINER =   Marc Espie 
 
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1357
diff -u -p -r1.1357 Quirks.pm
--- devel/quirks/files/Quirks.pm8 Jan 2022 17:33:18 -   1.1357
+++ devel/quirks/files/Quirks.pm13 Jan 2022 12:00:48 -
@@ -694,6 +694,7 @@ my $stem_extensions = {
'apertium-mk-bg' => 'apertium-mkd-bul',
'apertium-mk-en' => 'apertium-mkd-eng',
'apertium-pt-ca' => 'apertium-por-cat',
+   'pinentry-gtk2' => 'pinentry-gnome3',
 };
 
 my $obsolete_reason = {};
Index: security/pinentry/Makefile
===
RCS file: /cvs/ports/security/pinentry/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- security/pinentry/Makefile  7 Jul 2021 07:53:30 -   1.27
+++ security/pinentry/Makefile  13 Jan 2022 12:00:48 -
@@ -1,18 +1,14 @@
 # $OpenBSD: Makefile,v 1.27 2021/07/07 07:53:30 edd Exp $
 
 COMMENT-main = PIN or passphrase entry dialog (ncurses interface)
-COMMENT-gtk2 = PIN or passphrase entry dialog (gtk2 interface)
 COMMENT-gnome3 =PIN or passphrase entry dialog (GNOME 3 interface)
+COMMENT-qt5 =  PIN or passphrase entry dialog (Qt5 interface)
 
-VERSION =  1.1.1
+VERSION =  1.2.0
 DISTNAME = pinentry-${VERSION}
 CATEGORIES =   security
 EXTRACT_SUFX = .tar.bz2
 
-PKGNAME-main = ${DISTNAME}
-PKGNAME-gtk2 = pinentry-gtk2-${VERSION}
-PKGNAME-gnome3 =pinentry-gnome3-${VERSION}
-
 MASTER_SITES = ${MASTER_SITE_GNUPG:=pinentry/}
 
 HOMEPAGE = https://www.gnupg.org/related_software/pinentry/index.en.html
@@ -28,39 +24,37 @@ WANTLIB += curses secret-1
 LIB_DEPENDS =  security/libassuan \
x11/gnome/libsecret
 
-WANTLIB-gtk2 += ${WANTLIB}
-WANTLIB-gtk2 += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB-gtk2 += Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0
-WANTLIB-gtk2 += gdk_pixbuf-2.0 gtk-x11-2.0 pango-1.0 pangocairo-1.0
-WANTLIB-gtk2 += pangoft2-1.0 z
-
-LIB_DEPENDS-gtk2 = ${LIB_DEPENDS} \
-   x11/gtk+2
-
 WANTLIB-gnome3 += ${WANTLIB}
 WANTLIB-gnome3 += atk-1.0 cairo cairo-gobject gck-1 gcr-base-3 gcr-ui-3
-WANTLIB-gnome3 += gdk-3 gdk_pixbuf-2.0 gtk-3 p11-kit pango-1.0 pangocairo-1.0
+WANTLIB-gnome3 += gdk-3 gdk_pixbuf-2.0 gtk-3 harfbuzz p11-kit pango-1.0
+WANTLIB-gnome3 += pangocairo-1.0
 
 LIB_DEPENDS-gnome3 =   ${LIB_DEPENDS} \
x11/gnome/gcr
 
+WANTLIB-qt5 += ${WANTLIB}
+WANTLIB-qt5 += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets m
+
+LIB_DEPENDS-qt5 =  ${LIB_DEPENDS} \
+   x11/qt5/qtbase
+
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include 
-D_XOPEN_SOURCE_EXTENDED" \
LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS =   --enable-pinentry-curses \
-   --disable-pinentry-qt \
+   --disable-pinentry-tty \
+   --disable-pinentry-emacs \
+   --disable-pinentry-gtk2 \
+   --disable-pinentry-efl \
+   --disable-pinentry-tqt \
--disable-pinentry-fltk
 
-MULTI_PACKAGES =   -main -gtk2 -gnome3
+MULTI_PACKAGES =   -main -gnome3 -qt5
 
-PSEUDO_FLAVORS=no_gtk2 no_gnome3 bootstrap
-FLAVOR?=   no_gtk2 no_gnome3 bootstrap
+PSEUDO_FLAVORS=no_gnome3 bootstrap
+FLAVOR?=   no_gnome3 bootstrap
 
 .include 
-
-.if !${BUILD_PACKAGES:M-gtk2}
-CONFIGURE_ARGS +=  --disable-pinentry-gtk2
-.endif
 
 .if !${BUILD_PACKAGES:M-gnome3}
 CONFIGURE_ARGS +=  --disable-pinentry-gnome3
Index: security/pinentry/distinfo
===
RCS file: /cvs/ports/security/pinentry/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- security/pinentry/distinfo  7 Jul 2021 07:53:30 -   1.8
+++ security/pinentry/distinfo  13 Jan 2022 12:00:48 -
@@ -1,2 +1,2 @@
-SHA256 (pinentry-1.1.1.tar.bz2) = zRKgZAE+0Y4u6EdeZpufWNsbIloBRN69uFpozs3bpX8=
-SIZE (pinentry-1.1.1.tar.bz2) = 515723
+SHA256 (pinentry-1.2.0.tar.bz2) = EAcgRaPgQ9BYH5HNVnb8rH/+6VehZjat7apPWDphZHA=
+SIZE 

Re: ansible run dep on netaddr python module

2022-01-13 Thread Mikolaj Kucharski
Hi Pavel,

On Thu, Jan 13, 2022 at 01:04:40PM +0300, Pavel Korovin wrote:
> On 01/12, Mikolaj Kucharski wrote:
> > Hi,
> > 
> > I had fresh install of OpenBSD-current with ansible added via packages:
> > 
> >   pkg_add -i ansible
> > 
> > Running it on some of my playbooks failed with AnsibleFilterError:
> > 
> >   The reduce_on_network filter requires python's netaddr be installed 
> > on the ansible controller
> > 
> > Via pkg_add py3-netaddr problem was fixed. I was wondering, could
> > net/py-netaddr be added to ansible/ansible-core package?
> 
> 
> Hi Mikolaj,
> 
> There are lots of modules which provide additional functionality for specific
> use cases, e.g. py-jmespath for JSON parsing or py-napalm for managing
> network devices, but these are not required for basic ansible functionality 
> and
> should be added by the user. The same is about py-netaddr.
> 

I am very aware of that. I asked about netaddr because it doesn't feel
to me as a heavy dependency, but I guess not everyone has the same
level of heaviness.

-- 
Regards,
 Mikolaj



Re: Update to node_exporter-1.3.1

2022-01-13 Thread Claudio Jeker
On Wed, Jan 12, 2022 at 09:47:00PM -0500, Daniel Jakots wrote:
> Heya,
> 
> I recently setup prometheus + node_exporter on my infra. I noticed our
> node_exporter is quite old so I thought I would try to update it.
> 
> Here's a diff to do so. I switched the port to use modules.inc as we now
> do in ports land.
> 
> I tested with running both current version and the one from my update
> at the same time and checked both /metrics. I hoped we may get some new
> metrics but it seems we only get this new thing:
> 
> +# HELP node_time_zone_offset_seconds System time zone offset in seconds.
> +# TYPE node_time_zone_offset_seconds gauge
> +node_time_zone_offset_seconds{time_zone="UTC"} 0
> 
> "yay"
> 
> Comments? OK?

I did not test it but I'm fine with the update. There is no gain apart
from being a newer version.

-- 
:wq Claudio



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/01/13 04:00:17

Modified files:
net/ssvnc  : Makefile 
net/ssvnc/patches: patch-vncstorepw_ultravnc_dsm_helper_c 

Log message:
net/ssvnc: Fix build with opaque EVP_* in LibreSSL 3.5.

Based on https://sources.debian.org/patches/ssvnc/1.0.29-5/openssl1.1.patch/



Re: Update to node_exporter-1.3.1

2022-01-13 Thread Denis Fondras
Le Wed, Jan 12, 2022 at 09:47:00PM -0500, Daniel Jakots a écrit :
> Heya,
> 
> I recently setup prometheus + node_exporter on my infra. I noticed our
> node_exporter is quite old so I thought I would try to update it.
> 
> Here's a diff to do so. I switched the port to use modules.inc as we now
> do in ports land.
> 
> I tested with running both current version and the one from my update
> at the same time and checked both /metrics. I hoped we may get some new
> metrics but it seems we only get this new thing:
> 
> +# HELP node_time_zone_offset_seconds System time zone offset in seconds.
> +# TYPE node_time_zone_offset_seconds gauge
> +node_time_zone_offset_seconds{time_zone="UTC"} 0
> 
> "yay"
> 
> Comments? OK?
> 

Thanks for working on it.

OK denis@



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/01/13 03:40:10

Modified files:
net/znc: Makefile 
Added files:
net/znc/patches: patch-modules_crypt_cpp 

Log message:
net/znc: fix build with opaque DH in LibreSSL 3.5.



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/01/13 03:15:54

Modified files:
telephony/coturn: Makefile 
Added files:
telephony/coturn/patches: patch-src_apps_relay_mainrelay_c 

Log message:
telephony/coturn: fix build with opaque DH in LibreSSL 3.5.



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/01/13 03:15:21

Modified files:
sysutils/terragrunt: Makefile distinfo 
Added files:
sysutils/terragrunt: modules.inc 

Log message:
Update to terragrunt-0.35.18.



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/01/13 03:10:52

Modified files:
net/megatools  : Makefile 
Added files:
net/megatools/patches: patch-lib_mega_c 

Log message:
net/megatools: fix upcoming build breakage due to opaque RSA in
LibreSSL 3.5.



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/01/13 03:05:03

Modified files:
devel/cjose: Makefile 
Added files:
devel/cjose/patches: patch-src_util_c 

Log message:
devel/cjose: fix upcoming build failure by switching to the OpenSSL 1.1
code path. Silence a harmless compiler warning.



Re: ansible run dep on netaddr python module

2022-01-13 Thread Pavel Korovin
On 01/12, Mikolaj Kucharski wrote:
> Hi,
> 
> I had fresh install of OpenBSD-current with ansible added via packages:
> 
>   pkg_add -i ansible
> 
> Running it on some of my playbooks failed with AnsibleFilterError:
> 
>   The reduce_on_network filter requires python's netaddr be installed on 
> the ansible controller
> 
> Via pkg_add py3-netaddr problem was fixed. I was wondering, could
> net/py-netaddr be added to ansible/ansible-core package?


Hi Mikolaj,

There are lots of modules which provide additional functionality for specific
use cases, e.g. py-jmespath for JSON parsing or py-napalm for managing
network devices, but these are not required for basic ansible functionality and
should be added by the user. The same is about py-netaddr.

-- 
With best regards,
Pavel Korovin



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/01/13 03:01:24

Modified files:
databases/pgbouncer/patches: patch-lib_usual_tls_tls_ocsp_c 

Log message:
pgbouncer: forgot to add a patch description



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/01/13 02:57:47

Modified files:
databases/pgbouncer: Makefile 
Added files:
databases/pgbouncer/patches: patch-lib_usual_tls_tls_ocsp_c 

Log message:
databases/pgbouncer: Fix an upcoming build failure due to opaque OCSP
structures by disabling a workaround for an ancient verifier bug.

discussed with beck a while back



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/01/13 02:49:55

Modified files:
security/ssh-ldap-helper: Makefile distinfo 
security/ssh-ldap-helper/patches: patch-log_h 
Removed files:
security/ssh-ldap-helper/patches: patch-Makefile_in 

Log message:
Update ssh-ldap-helper to 8.0p1

This is the latest version of this tool, based on what Rocky Linux ships.
Red Hat have deprecated this, but their proposed alternative, SSSD is not
currently viable.

The update is ncessary since the previous version (which wasn't updated
since import in 2012) is based on an ancient SSH version that isn't ready
for opaque libcrypto structs.

Untested, but this has a better chance at working than a package that
doesn't build.

ok landry



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/01/13 02:43:36

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py3-boto3-1.20.34.



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/01/13 02:43:25

Modified files:
net/py-botocore: Makefile distinfo 

Log message:
Update to py3-botocore-1.23.34.



Re: Add support for PINE H64 model B

2022-01-13 Thread Klemens Nanni
On Thu, Jan 13, 2022 at 05:02:05PM +0800, Kevin Lo wrote:
> The PINE H64 ver. B is a minor revision of the original H64.
> I copied the device tree from the Linux kernel.
> 
> dmesg: http://ix.io/3M3r
> 
> ok?

With one fix.

> Index: sysutils/arm-trusted-firmware/Makefile
> ===
> RCS file: /cvs/ports/sysutils/arm-trusted-firmware/Makefile,v
> retrieving revision 1.16
> diff -u -p -u -p -r1.16 Makefile
> --- sysutils/arm-trusted-firmware/Makefile18 Jun 2021 09:17:28 -  
> 1.16
> +++ sysutils/arm-trusted-firmware/Makefile13 Jan 2022 08:54:30 -
> @@ -9,6 +9,7 @@ GH_PROJECT=   arm-trusted-firmware
>  GH_TAGNAME=  v2.5
>  
>  EPOCH=   0
> +REVISION=0
>  
>  CATEGORIES=  sysutils
>  
> @@ -32,7 +33,8 @@ CFLAGS=
>  PLATFORMS=\
>   rk3328 \
>   rk3399 \
> - sun50i_a64
> + sun50i_a64 \
> + sun50i_h6
>  
>  do-build:
>  .for P in ${PLATFORMS}
> @@ -49,5 +51,7 @@ do-install:
>   ${PREFIX}/share/arm-trusted-firmware/rk3399-bl31.elf
>   ${INSTALL_DATA} ${WRKBUILD}/build/sun50i_a64/debug/bl31.bin \
>   ${PREFIX}/share/arm-trusted-firmware/sun50i_a64-bl31.bin
> + ${INSTALL_DATA} ${WRKBUILD}/build/sun50i_h6/debug/bl31.bin \
> + ${PREFIX}/share/arm-trusted-firmware/sun50i_h6-bl31.bin
>  
>  .include 
> Index: sysutils/arm-trusted-firmware/pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/arm-trusted-firmware/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 PLIST
> --- sysutils/arm-trusted-firmware/pkg/PLIST   27 Sep 2019 15:43:29 -  
> 1.4
> +++ sysutils/arm-trusted-firmware/pkg/PLIST   13 Jan 2022 08:54:30 -
> @@ -4,3 +4,4 @@ share/arm-trusted-firmware/
>  share/arm-trusted-firmware/rk3328-bl31.elf
>  share/arm-trusted-firmware/rk3399-bl31.elf
>  share/arm-trusted-firmware/sun50i_a64-bl31.bin
> +share/arm-trusted-firmware/sun50i_h6-bl31.bin
> Index: sysutils/u-boot/Makefile
> ===
> RCS file: /cvs/ports/sysutils/u-boot/Makefile,v
> retrieving revision 1.89
> diff -u -p -u -p -r1.89 Makefile
> --- sysutils/u-boot/Makefile  17 Dec 2021 23:00:41 -  1.89
> +++ sysutils/u-boot/Makefile  13 Jan 2022 08:54:31 -
> @@ -8,7 +8,7 @@ FLAVOR?=  arm
>  
>  COMMENT= U-Boot firmware
>  VERSION= 2021.10
> -REVISION=2
> +REVISION=3

You also need to bump the build dependency to
sysutils/arm-trusted-firmware>=2.2p0v0

Otherwise new u-boot old atf will fail.

>  DISTNAME=u-boot-${VERSION}
>  PKGNAME= u-boot-${FLAVOR}-${VERSION:S/-//}
>  FULLPKGNAME= ${PKGNAME}
> @@ -44,6 +44,7 @@ MAKE_ENV+=  CROSS_COMPILE="aarch64-none-e
>  RK3328_BL31= "${LOCALBASE}/share/arm-trusted-firmware/rk3328-bl31.elf"
>  RK3399_BL31= "${LOCALBASE}/share/arm-trusted-firmware/rk3399-bl31.elf"
>  SUNXI_BL31=  "${LOCALBASE}/share/arm-trusted-firmware/sun50i_a64-bl31.bin"
> +SUNXI_H6_BL31=   
> "${LOCALBASE}/share/arm-trusted-firmware/sun50i_h6-bl31.bin"
>  .elif "${FLAVOR}" == "arm"
>  BUILD_DEPENDS+=  devel/arm-none-eabi/gcc-linaro>=7.4.2019.02
>  MAKE_ENV+=   CROSS_COMPILE="arm-none-eabi-"
> @@ -69,6 +70,7 @@ SUNXI64=\
>   orangepi_zero_plus \
>   pine64-lts \
>   pine64_plus \
> + pine_h64-model-b \
>   pinebook \
>   sopine_baseboard
>  BOARDS=\
> @@ -203,6 +205,16 @@ do-build:
>  .endif
>  .endfor
>  .for BOARD in ${SUNXI64}
> +.if "${BOARD:M*_h64*}"
> + cd ${WRKSRC} && \
> + mkdir -p build/${BOARD} && \
> + ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
> + ${MAKE_FLAGS} O="build/${BOARD}" \
> + -f ${MAKE_FILE} "${BOARD}"_defconfig && \
> + ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
> + ${MAKE_FLAGS} O="build/${BOARD}" \
> + -f ${MAKE_FILE} ${ALL_TARGET}
> +.else
>   cd ${WRKSRC} && \
>   mkdir -p build/${BOARD} && \
>   ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
> @@ -211,6 +223,7 @@ do-build:
>   ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
>   ${MAKE_FLAGS} O="build/${BOARD}" \
>   -f ${MAKE_FILE} ${ALL_TARGET}
> +.endif
>   if [[ -f ${WRKSRC}/build/${BOARD}/spl/sunxi-spl.bin && \
> -f ${WRKSRC}/build/${BOARD}/u-boot.itb ]]; then \
>   cd ${WRKSRC}/build/${BOARD} && \
> Index: sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
> ===
> RCS file: sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
> diff -N sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ sysutils/u-boot/patches/patch-arch_arm_dts_Makefile   13 Jan 2022 
> 08:54:31 -
> @@ -0,0 +1,13 @@
> +$OpenBSD$

I always like to see descriptive comments in our patch files so fellow
porters can 

Add support for PINE H64 model B

2022-01-13 Thread Kevin Lo
The PINE H64 ver. B is a minor revision of the original H64.
I copied the device tree from the Linux kernel.

dmesg: http://ix.io/3M3r

ok?

Index: sysutils/arm-trusted-firmware/Makefile
===
RCS file: /cvs/ports/sysutils/arm-trusted-firmware/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- sysutils/arm-trusted-firmware/Makefile  18 Jun 2021 09:17:28 -  
1.16
+++ sysutils/arm-trusted-firmware/Makefile  13 Jan 2022 08:54:30 -
@@ -9,6 +9,7 @@ GH_PROJECT= arm-trusted-firmware
 GH_TAGNAME=v2.5
 
 EPOCH= 0
+REVISION=  0
 
 CATEGORIES=sysutils
 
@@ -32,7 +33,8 @@ CFLAGS=
 PLATFORMS=\
rk3328 \
rk3399 \
-   sun50i_a64
+   sun50i_a64 \
+   sun50i_h6
 
 do-build:
 .for P in ${PLATFORMS}
@@ -49,5 +51,7 @@ do-install:
${PREFIX}/share/arm-trusted-firmware/rk3399-bl31.elf
${INSTALL_DATA} ${WRKBUILD}/build/sun50i_a64/debug/bl31.bin \
${PREFIX}/share/arm-trusted-firmware/sun50i_a64-bl31.bin
+   ${INSTALL_DATA} ${WRKBUILD}/build/sun50i_h6/debug/bl31.bin \
+   ${PREFIX}/share/arm-trusted-firmware/sun50i_h6-bl31.bin
 
 .include 
Index: sysutils/arm-trusted-firmware/pkg/PLIST
===
RCS file: /cvs/ports/sysutils/arm-trusted-firmware/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- sysutils/arm-trusted-firmware/pkg/PLIST 27 Sep 2019 15:43:29 -  
1.4
+++ sysutils/arm-trusted-firmware/pkg/PLIST 13 Jan 2022 08:54:30 -
@@ -4,3 +4,4 @@ share/arm-trusted-firmware/
 share/arm-trusted-firmware/rk3328-bl31.elf
 share/arm-trusted-firmware/rk3399-bl31.elf
 share/arm-trusted-firmware/sun50i_a64-bl31.bin
+share/arm-trusted-firmware/sun50i_h6-bl31.bin
Index: sysutils/u-boot/Makefile
===
RCS file: /cvs/ports/sysutils/u-boot/Makefile,v
retrieving revision 1.89
diff -u -p -u -p -r1.89 Makefile
--- sysutils/u-boot/Makefile17 Dec 2021 23:00:41 -  1.89
+++ sysutils/u-boot/Makefile13 Jan 2022 08:54:31 -
@@ -8,7 +8,7 @@ FLAVOR?=arm
 
 COMMENT=   U-Boot firmware
 VERSION=   2021.10
-REVISION=  2
+REVISION=  3
 DISTNAME=  u-boot-${VERSION}
 PKGNAME=   u-boot-${FLAVOR}-${VERSION:S/-//}
 FULLPKGNAME=   ${PKGNAME}
@@ -44,6 +44,7 @@ MAKE_ENV+=CROSS_COMPILE="aarch64-none-e
 RK3328_BL31=   "${LOCALBASE}/share/arm-trusted-firmware/rk3328-bl31.elf"
 RK3399_BL31=   "${LOCALBASE}/share/arm-trusted-firmware/rk3399-bl31.elf"
 SUNXI_BL31="${LOCALBASE}/share/arm-trusted-firmware/sun50i_a64-bl31.bin"
+SUNXI_H6_BL31= "${LOCALBASE}/share/arm-trusted-firmware/sun50i_h6-bl31.bin"
 .elif "${FLAVOR}" == "arm"
 BUILD_DEPENDS+=devel/arm-none-eabi/gcc-linaro>=7.4.2019.02
 MAKE_ENV+= CROSS_COMPILE="arm-none-eabi-"
@@ -69,6 +70,7 @@ SUNXI64=\
orangepi_zero_plus \
pine64-lts \
pine64_plus \
+   pine_h64-model-b \
pinebook \
sopine_baseboard
 BOARDS=\
@@ -203,6 +205,16 @@ do-build:
 .endif
 .endfor
 .for BOARD in ${SUNXI64}
+.if "${BOARD:M*_h64*}"
+   cd ${WRKSRC} && \
+   mkdir -p build/${BOARD} && \
+   ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
+   ${MAKE_FLAGS} O="build/${BOARD}" \
+   -f ${MAKE_FILE} "${BOARD}"_defconfig && \
+   ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
+   ${MAKE_FLAGS} O="build/${BOARD}" \
+   -f ${MAKE_FILE} ${ALL_TARGET}
+.else
cd ${WRKSRC} && \
mkdir -p build/${BOARD} && \
${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
@@ -211,6 +223,7 @@ do-build:
${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
${MAKE_FLAGS} O="build/${BOARD}" \
-f ${MAKE_FILE} ${ALL_TARGET}
+.endif
if [[ -f ${WRKSRC}/build/${BOARD}/spl/sunxi-spl.bin && \
  -f ${WRKSRC}/build/${BOARD}/u-boot.itb ]]; then \
cd ${WRKSRC}/build/${BOARD} && \
Index: sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
===
RCS file: sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
diff -N sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ sysutils/u-boot/patches/patch-arch_arm_dts_Makefile 13 Jan 2022 08:54:31 
-
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: arch/arm/dts/Makefile
+--- arch/arm/dts/Makefile.orig
 arch/arm/dts/Makefile
+@@ -642,6 +642,7 @@ dtb-$(CONFIG_MACH_SUN50I_H6) += \
+   sun50i-h6-orangepi-lite2.dtb \
+   sun50i-h6-orangepi-one-plus.dtb \
+   sun50i-h6-pine-h64.dtb \
++  sun50i-h6-pine-h64-model-b.dtb \
+   sun50i-h6-tanix-tx6.dtb
+ dtb-$(CONFIG_MACH_SUN50I_H616) += \
+   sun50i-h616-orangepi-zero2.dtb
Index: 

Re: textproc/lowdown: update to 0.10.0

2022-01-13 Thread Justin Berthault
Ok, thanks for feedbacks.

Here is the new diff:

Index: Makefile
===
RCS file: /cvs/ports/textproc/lowdown/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile27 Oct 2021 21:55:07 -  1.27
+++ Makefile13 Jan 2022 08:22:42 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.27 2021/10/27 21:55:07 fcambus Exp $

 COMMENT =  simple markdown translator
-DISTNAME = lowdown-0.9.2
+DISTNAME = lowdown-0.10.0
 CATEGORIES =   textproc

 HOMEPAGE = https://kristaps.bsd.lv/lowdown/
Index: distinfo
===
RCS file: /cvs/ports/textproc/lowdown/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- distinfo27 Oct 2021 21:55:07 -  1.24
+++ distinfo13 Jan 2022 08:22:42 -
@@ -1,2 +1,2 @@
-SHA256 (lowdown-0.9.2.tar.gz) = XDVdHbIHGRaxrW54kgjeZkvjeBvRfdi2sJsXB6KDqYg=
-SIZE (lowdown-0.9.2.tar.gz) = 217279
+SHA256 (lowdown-0.10.0.tar.gz) = t1ytJbEPpy0sRzACDq31Y0WGCWT0Jmu8sYNj58icYpc=
+SIZE (lowdown-0.10.0.tar.gz) = 229928
cvs server: Diffing pkg
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/lowdown/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST   19 Mar 2021 15:48:29 -  1.12
+++ pkg/PLIST   13 Jan 2022 08:22:42 -
@@ -31,6 +31,9 @@ lib/pkgconfig/lowdown.pc
 @man man/man3/lowdown_nroff_free.3
 @man man/man3/lowdown_nroff_new.3
 @man man/man3/lowdown_nroff_rndr.3
+@man man/man3/lowdown_odt_free.3
+@man man/man3/lowdown_odt_new.3
+@man man/man3/lowdown_odt_rndr.3
 @man man/man3/lowdown_term_free.3
 @man man/man3/lowdown_term_new.3
 @man man/man3/lowdown_term_rndr.3

Le jeu. 13 janv. 2022 à 01:09, Stuart Henderson  a écrit :
>
> On 2022/01/12 21:31, Justin Berthault wrote:
> > Hello ports@,
> >
> >
> > Here is a diff to update lowdown to 0.10.0
> >
> >
> > First submission here. Hope I did it the right way.
>
> CC'ing the port maintainer for other comments,
>
> >
> > Index: Makefile
> >
> > ===
> >
> > RCS file: /cvs/ports/textproc/lowdown/Makefile,v
> > retrieving revision 1.27
> > diff -u -p -r1.27 Makefile
> > --- Makefile27 Oct 2021 21:55:07 -  1.27
> > +++ Makefile12 Jan 2022 20:18:27 -
> > @@ -1,7 +1,7 @@
> > -# $OpenBSD: Makefile,v 1.27 2021/10/27 21:55:07 fcambus Exp $
> > +# $OpenBSD: Makefile,v 1.28 2022/01/09 10:40:32 jbz Exp $
>
> Please leave that line alone, it is managed by cvs.
>
> >  COMMENT =  simple markdown translator
> > -DISTNAME = lowdown-0.9.2
> > +DISTNAME = lowdown-0.10.0
> >  CATEGORIES =   textproc
> >
> >  HOMEPAGE = https://kristaps.bsd.lv/lowdown/
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/textproc/lowdown/distinfo,v
> > retrieving revision 1.24
> > diff -u -p -r1.24 distinfo
> > --- distinfo27 Oct 2021 21:55:07 -  1.24
> > +++ distinfo12 Jan 2022 20:18:27 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (lowdown-0.9.2.tar.gz) =
> > XDVdHbIHGRaxrW54kgjeZkvjeBvRfdi2sJsXB6KDqYg=
> > -SIZE (lowdown-0.9.2.tar.gz) = 217279
> > +SHA256 (lowdown-0.10.0.tar.gz) =
> > t1ytJbEPpy0sRzACDq31Y0WGCWT0Jmu8sYNj58icYpc=
> > +SIZE (lowdown-0.10.0.tar.gz) = 229928
>
> PLIST needs updating as well, there are additional manpages.
> Run "make plist".
>



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/01/13 01:07:53

Modified files:
graphics/evince: Makefile 
graphics/shotwell: Makefile 
graphics/simple-scan: Makefile 
mail/geary : Makefile 
sysutils/d-feet: Makefile 
sysutils/deja-dup: Makefile 
textproc/gtk-doc: Makefile 
textproc/gtranslator: Makefile 
www/epiphany   : Makefile 
x11/gnome/aisleriot: Makefile 
x11/gnome/baobab: Makefile 
x11/gnome/calculator: Makefile 
x11/gnome/clocks: Makefile 
x11/gnome/connections: Makefile 
x11/gnome/desktop: Makefile 
x11/gnome/devhelp: Makefile 
x11/gnome/dictionary: Makefile 
x11/gnome/documents: Makefile 
x11/gnome/eog  : Makefile 
x11/gnome/file-roller: Makefile 
x11/gnome/gdm  : Makefile 
x11/gnome/gedit: Makefile 
x11/gnome/gedit-plugins: Makefile 
x11/gnome/ghex : Makefile 
x11/gnome/grilo-plugins: Makefile 
x11/gnome/mahjongg: Makefile 
x11/gnome/music: Makefile 
x11/gnome/notes: Makefile 
x11/gnome/photos: Makefile 
x11/gnome/quadrapassel: Makefile 
x11/gnome/seahorse: Makefile 
x11/gnome/system-monitor: Makefile 
x11/gnome/terminal: Makefile 
x11/gnome/todo : Makefile 
x11/gnome/totem: Makefile 

Log message:
Bump after meson update to 0.61.0.
Symlinks have changed in the PLIST.



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/01/13 01:06:39

Modified files:
devel/gobject-introspection: Makefile 
devel/gobject-introspection/pkg: PLIST 
devel/glade: Makefile 
devel/glade/pkg: PLIST 
x11/gnome/gitg : Makefile 
x11/gnome/gitg/pkg: PLIST 
textproc/meld  : Makefile 
graphics/gthumb: Makefile 
Added files:
x11/gnome/gcr/patches: patch-gck_meson_build 
   patch-gcr_meson_build 
   patch-ui_meson_build 
devel/gobject-introspection/patches: patch-giscanner_docmain_py 
 
patch-giscanner_doctemplates_devdocs_meson_build 
 
patch-giscanner_doctemplates_mallard_meson_build 
 patch-giscanner_docwriter_py 
 patch-giscanner_meson_build 
 patch-tests_scanner_meson_build 
devel/glade/patches: patch-help_LINGUAS 
x11/gnome/gitg/patches: patch-data_meson_build 
textproc/meld/patches: patch-data_meson_build 
graphics/gthumb/patches: patch-help_LINGUAS 

Log message:
Fix for meson >= 0.61.0



CVS: cvs.openbsd.org: ports

2022-01-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/01/13 01:05:58

Modified files:
devel/meson: Makefile distinfo meson.port.mk 
devel/meson/patches: patch-mesonbuild_build_py 
devel/meson/pkg: PLIST 
Added files:
devel/meson/patches: patch-mesonbuild_modules_gnome_py 

Log message:
Update to meson-0.61.0.