CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2021/03/24 23:45:11

Modified files:
devel/jenkins/devel: Makefile distinfo 

Log message:
Update jenkins to 2.285

Re: [PATCH] fix valgrind abort

[Masato Asou]

Hi Andrew,

From: Andrew Hewus Fresh 
Date: Wed, 24 Mar 2021 19:02:54 -0700

> On Thu, Mar 25, 2021 at 09:50:17AM +0900, Masato Asou wrote:
>> Because, Perl 5.32.1 has changed the way hexadecimal string are
>> handled as below:
>> 
>> Perl 5.30.3: "0x1234" + 0x1000 -> 0x2234
>> Perl 5.32.1: "0x1234" + 0x1000 -> 0x1000
> 
> Interestingly, this bug only existed in perl v5.30, so an unfortunate
> accident of timing on the creation of this patch.
> 
> $ perldoc perl5320delta | grep -B4 134230 
>•   Perl no longer treats strings starting with "0x" or "0b" as hex or
>binary numbers respectively when converting a string to a number.
>This reverts a change in behaviour inadvertently introduced in perl
>5.30.0 intended to improve precision when converting a string to a
>floating point number. [perl #134230
>]
> 
> 
>> Perl 5.32.1 does not consider anything after 'x' to be a number, but
>> only the first '0' is consider to be a number.
> 
> Neither does any other perl 5, only perl 5.30 accidentally did.
> 
> Perl simplistically looks for leading ascii digits in in a string to
> "convert" from a string to a number, and an empty string is treated as
> 0.  Just because the unquoted version would be treated differently
> isn't supposed to matter.
> 
> $ perl -E 'say "$_: " . ( "${_}x123" + 0 ) for qw< 0 1 987 a z >'
> 0: 0
> 1: 1
> 987: 987
> a: 0
> z: 0

Thank you for your detailed explanation.

>> I made the following patch.
>> 
>> ok? comments?
>> --
>> ASOU Masato
>> 
>> Index: devel/valgrind/patches/patch-coregrind_link_tool_exe_openbsd_in
>> ===
>> RCS file: 
>> /cvs/ports/devel/valgrind/patches/patch-coregrind_link_tool_exe_openbsd_in,v
>> retrieving revision 1.5
>> diff -u -p -r1.5 patch-coregrind_link_tool_exe_openbsd_in
>> --- devel/valgrind/patches/patch-coregrind_link_tool_exe_openbsd_in 5 
>> Oct 2020 01:45:58 -   1.5
>> +++ devel/valgrind/patches/patch-coregrind_link_tool_exe_openbsd_in 25 
>> Mar 2021 00:27:19 -
>> @@ -10,7 +10,7 @@
>>  +# strip command rewrite offset and align in ELF file. Therefor, when 
>> valgrind
>>  +# launch memcheck-amd64-openbsd, an Abort trap occurs in the execvp() 
>> system
>>  +# call.
>> -+my $cmd = sprintf "$cc -static -nopie -Wl,--strip-all -Wl,-Ttext=0x%x", 
>> "$ala + 0x1000";
>> ++my $cmd = sprintf "$cc -static -nopie -Wl,--strip-all -Wl,-Ttext=0x%x", 
>> hex($ala) + 0x1000;
> 
> This seems to give consistent results on all the perl I have from 5.8
> through 5.33.7.
> 
> perl -e 'my $ala = "0x1234"; print(( $ala + 0x100 ), "\n"); print(( hex($ala) 
> + 0x100 ), "\n")'
> 
> OK afresh1@

commited.
--
ASOU Masato

CVS: cvs.openbsd.org: ports

[ASOU Masato]

CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2021/03/24 23:04:36

Modified files:
devel/valgrind : Makefile 
devel/valgrind/patches: patch-coregrind_link_tool_exe_openbsd_in 

Log message:
Fix abort valgrind caused by the update Perl from 5.30.3 to 5.32.1.

ok afresh1@

Re: update scons to 3.1.1

[Brian Callahan]

Hi Daniel --

On Sunday, March 21st, 2021 at 2:10 PM, Daniel Dickman  
wrote:

> scons is still on python2.

Agreed, moving to python3 would be good.

> Note I did not go to scons version 3.1.2

That matches what I remember from my previous testing.

> This update tested by building all the consumers on amd64.
>
> ok?

I won't be able to get to building all the consumers until this
weekend. Someone else is welcome to beat me to it :)

When you commit this, can you please drop me as maintainer?

Thanks.

~Brian

Re: [PATCH] fix valgrind abort

[Andrew Hewus Fresh]

On Thu, Mar 25, 2021 at 09:50:17AM +0900, Masato Asou wrote:
> Hi ports,
> 
> The valgrind was aborted after updated Pert to 5.32.1 as below:
> 
> $ sysctl -n kern.version
> OpenBSD 6.9-beta (GENERIC.MP) #428: Wed Mar 24 11:12:16 MDT 2021
> dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> 
> $ /usr/bin/perl --version
> 
> This is perl 5, version 32, subversion 1 (v5.32.1) built for amd64-openbsd
> 
> 
> $ cd /usr/ports/devel/valgrind
> $ doas make install
> $ valgrind /bin/ls
> Abort trap
> $ 
> 
> Because, Perl 5.32.1 has changed the way hexadecimal string are
> handled as below:
> 
> Perl 5.30.3: "0x1234" + 0x1000 -> 0x2234
> Perl 5.32.1: "0x1234" + 0x1000 -> 0x1000

Interestingly, this bug only existed in perl v5.30, so an unfortunate
accident of timing on the creation of this patch.

$ perldoc perl5320delta | grep -B4 134230 
   •   Perl no longer treats strings starting with "0x" or "0b" as hex or
   binary numbers respectively when converting a string to a number.
   This reverts a change in behaviour inadvertently introduced in perl
   5.30.0 intended to improve precision when converting a string to a
   floating point number. [perl #134230
   ]


> Perl 5.32.1 does not consider anything after 'x' to be a number, but
> only the first '0' is consider to be a number.

Neither does any other perl 5, only perl 5.30 accidentally did.

Perl simplistically looks for leading ascii digits in in a string to
"convert" from a string to a number, and an empty string is treated as
0.  Just because the unquoted version would be treated differently
isn't supposed to matter.

$ perl -E 'say "$_: " . ( "${_}x123" + 0 ) for qw< 0 1 987 a z >'
0: 0
1: 1
987: 987
a: 0
z: 0



> I made the following patch.
> 
> ok? comments?
> --
> ASOU Masato
> 
> Index: devel/valgrind/patches/patch-coregrind_link_tool_exe_openbsd_in
> ===
> RCS file: 
> /cvs/ports/devel/valgrind/patches/patch-coregrind_link_tool_exe_openbsd_in,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-coregrind_link_tool_exe_openbsd_in
> --- devel/valgrind/patches/patch-coregrind_link_tool_exe_openbsd_in 5 Oct 
> 2020 01:45:58 -   1.5
> +++ devel/valgrind/patches/patch-coregrind_link_tool_exe_openbsd_in 25 
> Mar 2021 00:27:19 -
> @@ -10,7 +10,7 @@
>  +# strip command rewrite offset and align in ELF file. Therefor, when 
> valgrind
>  +# launch memcheck-amd64-openbsd, an Abort trap occurs in the execvp() system
>  +# call.
> -+my $cmd = sprintf "$cc -static -nopie -Wl,--strip-all -Wl,-Ttext=0x%x", 
> "$ala + 0x1000";
> ++my $cmd = sprintf "$cc -static -nopie -Wl,--strip-all -Wl,-Ttext=0x%x", 
> hex($ala) + 0x1000;

This seems to give consistent results on all the perl I have from 5.8
through 5.33.7.

perl -e 'my $ala = "0x1234"; print(( $ala + 0x100 ), "\n"); print(( hex($ala) + 
0x100 ), "\n")'

OK afresh1@


>   
>  -# so, build up the complete command here:
>  -# 'cc' -static -Ttext='ala' 'restargs'
> 

-- 
andrew - http://afresh1.com

Instructions are just another man's opinion of how to do something. 
  -- Weldboy #DPWisdom

[PATCH] fix valgrind abort

[Masato Asou]

Hi ports,

The valgrind was aborted after updated Pert to 5.32.1 as below:

$ sysctl -n kern.version
OpenBSD 6.9-beta (GENERIC.MP) #428: Wed Mar 24 11:12:16 MDT 2021
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP

$ /usr/bin/perl --version

This is perl 5, version 32, subversion 1 (v5.32.1) built for amd64-openbsd


$ cd /usr/ports/devel/valgrind
$ doas make install
$ valgrind /bin/ls
Abort trap
$ 

Because, Perl 5.32.1 has changed the way hexadecimal string are
handled as below:

Perl 5.30.3: "0x1234" + 0x1000 -> 0x2234
Perl 5.32.1: "0x1234" + 0x1000 -> 0x1000

Perl 5.32.1 does not consider anything after 'x' to be a number, but
only the first '0' is consider to be a number.

I made the following patch.

ok? comments?
--
ASOU Masato

Index: devel/valgrind/patches/patch-coregrind_link_tool_exe_openbsd_in
===
RCS file: 
/cvs/ports/devel/valgrind/patches/patch-coregrind_link_tool_exe_openbsd_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-coregrind_link_tool_exe_openbsd_in
--- devel/valgrind/patches/patch-coregrind_link_tool_exe_openbsd_in 5 Oct 
2020 01:45:58 -   1.5
+++ devel/valgrind/patches/patch-coregrind_link_tool_exe_openbsd_in 25 Mar 
2021 00:27:19 -
@@ -10,7 +10,7 @@
 +# strip command rewrite offset and align in ELF file. Therefor, when valgrind
 +# launch memcheck-amd64-openbsd, an Abort trap occurs in the execvp() system
 +# call.
-+my $cmd = sprintf "$cc -static -nopie -Wl,--strip-all -Wl,-Ttext=0x%x", "$ala 
+ 0x1000";
++my $cmd = sprintf "$cc -static -nopie -Wl,--strip-all -Wl,-Ttext=0x%x", 
hex($ala) + 0x1000;
  
 -# so, build up the complete command here:
 -# 'cc' -static -Ttext='ala' 'restargs'

Re: sysutils/u-boot: Ship assorted README files

[Jonathan Gray]

On Tue, Mar 23, 2021 at 11:19:32PM +0100, Klemens Nanni wrote:
> On Tue, Mar 23, 2021 at 09:10:22PM +0100, Klemens Nanni wrote:
> > One thing I'd like to have around is documentation on how certain
> > u-boot commands/subsystems work and/or what needs to be done on
> > certain specific boards.
> > 
> > I'm on a Pinebook Pro here and ${WRKSRC}/doc/README.rockchip
> > (thanks abieber!) for example has the relevant dd(1) commands to flash
> > the various blobs -- with that I don't need to try my luck or search
> > online get a firmware update going and/or prep an SD card.
> > 
> > I know that those README.* files generally also explain how to configure
> > and build stuff from source and we are not interested in those bits, but
> > shipping them unmodified is still of value, especially because I can
> > now work on those boxes while mostly offline.
> > 
> > Besides board specific docs there is general information available
> > regarding serial console and video output, GPT partitioning from within
> > u-boot, etc. so I added a few assorted READMEs as well.
> > 
> > Since those ought be shipped regardless of the flavour but and we must
> > not install the same files via multiple packages I've used PKGSTEM
> > (contains FLAVOR) as part of the file path such that each FLAVOR may
> > ship the same docs but under their own unique path.
> > 
> > I have other improvemens in mind but want to take care of them one by
> > one.
> New diff using PKGSTEM in PFRAG.* and BOARD_READMES not ARCH_READMES.
> 
> Feedback? OK?

I don't see a need to have different vars when the files are all
pulled from the same dir.

I don't see a reason for many of these.  We don't use GPT partitioning
on arm, pxe is really for non-uefi booting and the offsets are
covered in INSTALL.armv7/INSTALL.arm64.

> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/u-boot/Makefile,v
> retrieving revision 1.80
> diff -u -p -r1.80 Makefile
> --- Makefile  23 Feb 2021 22:04:35 -  1.80
> +++ Makefile  23 Mar 2021 19:58:27 -
> @@ -8,7 +8,7 @@ FLAVOR?=  arm
>  
>  COMMENT= U-Boot firmware
>  VERSION= 2021.01
> -REVISION=0
> +REVISION=1
>  DISTNAME=u-boot-${VERSION}
>  PKGNAME= u-boot-${FLAVOR}-${VERSION:S/-//}
>  FULLPKGNAME= ${PKGNAME}
> @@ -82,6 +82,8 @@ BOARDS=\
>   rockpro64-rk3399 \
>   rpi_3 \
>   rpi_4
> +BOARD_READMES=\
> + rockchip
>  .elif "${FLAVOR}" == "arm"
>  OMAP=\
>   omap4_panda \
> @@ -140,6 +142,7 @@ BOARDS=\
>   tinker-rk3288 \
>   turris_omnia \
>   vexpress_ca15_tc2
> +BOARD_READMES=
>  .endif
>  
>  FILES=\
> @@ -156,7 +159,15 @@ FILES=\
>   u-boot.itb \
>   u-boot-rockchip.bin \
>   idbloader.img \
> - spl/sunxi-spl.bin \
> + spl/sunxi-spl.bin
> +
> +CMD_READMES+=\
> + console \
> + gpt \
> + nvme \
> + pxe \
> + usb \
> + video
>  
>  do-build:
>  .for BOARD in ${BOARDS}
> @@ -210,6 +221,11 @@ do-install:
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/u-boot/${BOARD}
>   -cd ${WRKSRC}/build/${BOARD} && \
>   cp ${FILES} ${PREFIX}/share/u-boot/${BOARD}/
> +.endfor
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGSTEM}
> +.for README in ${BOARD_READMES} ${CMD_READMES}
> + ${INSTALL_DATA} ${WRKSRC}/doc/README.${README} \
> + ${PREFIX}/share/doc/${PKGSTEM}/
>  .endfor
>  
>  .include 
> Index: pkg/PFRAG.aarch64
> ===
> RCS file: /cvs/ports/sysutils/u-boot/pkg/PFRAG.aarch64,v
> retrieving revision 1.22
> diff -u -p -r1.22 PFRAG.aarch64
> --- pkg/PFRAG.aarch64 15 Jan 2021 00:01:16 -  1.22
> +++ pkg/PFRAG.aarch64 23 Mar 2021 19:59:37 -
> @@ -1,5 +1,13 @@
>  @comment $OpenBSD: PFRAG.aarch64,v 1.22 2021/01/15 00:01:16 kurt Exp $
>  @pkgpath sysutils/u-boot-pinebook
> +share/doc/${PKGSTEM}/
> +share/doc/${PKGSTEM}/README.console
> +share/doc/${PKGSTEM}/README.gpt
> +share/doc/${PKGSTEM}/README.nvme
> +share/doc/${PKGSTEM}/README.pxe
> +share/doc/${PKGSTEM}/README.rockchip
> +share/doc/${PKGSTEM}/README.usb
> +share/doc/${PKGSTEM}/README.video
>  share/u-boot/
>  share/u-boot/a64-olinuxino/
>  share/u-boot/a64-olinuxino/sunxi-spl.bin
> Index: pkg/PFRAG.arm
> ===
> RCS file: /cvs/ports/sysutils/u-boot/pkg/PFRAG.arm,v
> retrieving revision 1.24
> diff -u -p -r1.24 PFRAG.arm
> --- pkg/PFRAG.arm 14 Jan 2021 00:56:54 -  1.24
> +++ pkg/PFRAG.arm 23 Mar 2021 19:48:37 -
> @@ -1,5 +1,12 @@
>  @comment $OpenBSD: PFRAG.arm,v 1.24 2021/01/14 00:56:54 jsg Exp $
>  @pkgpath sysutils/u-boot,
> +share/doc/${PKGSTEM}/
> +share/doc/${PKGSTEM}/README.console
> +share/doc/${PKGSTEM}/README.gpt
> +share/doc/${PKGSTEM}/README.nvme
> +share/doc/${PKGSTEM}/README.pxe
> +share/doc/${PKGSTEM}/README.usb
> +share/doc/${PKGSTEM}/README.video
>  share/u-boot/
>  share/u-boot/A10-OLinuXino-Lime/
>  

Re: sysutils/arm-trusted-firmware: Set HOMEPAGE, use primary repo

[Stuart Henderson]

On 2021/03/25 00:18, Klemens Nanni wrote:
> On Thu, Mar 25, 2021 at 10:14:18AM +1100, Jonathan Gray wrote:
> > It isn't clear to me how stable the cgit? snapshots on
> > trustedfirmware.org are compared to github.
> Github is known to produce different auto-generated tarballs, I haven't
> heard anything like this about cgit.
> 

github hasn't been too bad recently, I think most I've seen recently have
been attributable to repo owners retagging. smaller sample size with
random people's various cgit installations but I think they've usually
been worse (mostly as people update git/tar/gzip).

Re: sysutils/arm-trusted-firmware: Set HOMEPAGE, use primary repo

[Klemens Nanni]

On Thu, Mar 25, 2021 at 10:14:18AM +1100, Jonathan Gray wrote:
> It isn't clear to me how stable the cgit? snapshots on
> trustedfirmware.org are compared to github.
Github is known to produce different auto-generated tarballs, I haven't
heard anything like this about cgit.

Re: sysutils/arm-trusted-firmware: Set HOMEPAGE, use primary repo

[Jonathan Gray]

On Wed, Mar 24, 2021 at 04:26:51PM +0100, Klemens Nanni wrote:
> GitHub is just a mirror and links to where users want to end up,
> so update the port accordingly.
> 
> Builds and packages fine as before.
> 
> OK?

github was the original repository before they moved to
trustedfirmware.org and made github a mirror.

It isn't clear to me how stable the cgit? snapshots on
trustedfirmware.org are compared to github.

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/arm-trusted-firmware/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile  8 Jan 2021 00:11:17 -   1.15
> +++ Makefile  24 Mar 2021 15:25:10 -
> @@ -4,12 +4,16 @@ PKG_ARCH=   *
>  
>  COMMENT= ARM Trusted Firmware
>  
> -GH_ACCOUNT=  ARM-software
> -GH_PROJECT=  arm-trusted-firmware
> -GH_TAGNAME=  v2.4
> +V=   2.4
> +DISTNAME=trusted-firmware-a-${V}
> +PKGNAME= arm-trusted-firmware-${V}
> +REVISION=0
>  
>  EPOCH=   0
>  
> +HOMEPAGE=https://www.trustedfirmware.org/projects/tf-a/
> +MASTER_SITES=
> https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/
> +
>  CATEGORIES=  sysutils
>  
>  # BSD
> @@ -19,7 +23,7 @@ BUILD_DEPENDS+= devel/arm-none-eabi/gcc-
>  BUILD_DEPENDS+= devel/arm-none-eabi/gcc-linaro,arm
>  
>  MAKE_ENV+= CROSS_COMPILE="aarch64-none-elf-"
> -MAKE_ENV+= BUILD_STRING="${GH_TAGNAME:S/v//}"
> +MAKE_ENV+= BUILD_STRING="${V}"
>  
>  NO_TEST= Yes
>  USE_GMAKE=   Yes
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/arm-trusted-firmware/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo  8 Jan 2021 00:11:17 -   1.9
> +++ distinfo  24 Mar 2021 15:21:35 -
> @@ -1,2 +1,2 @@
> -SHA256 (arm-trusted-firmware-2.4.tar.gz) = 
> S/2p/b5QIvLoitM0QWX304qK5KDi2R1E2aFgNCXMZC0=
> -SIZE (arm-trusted-firmware-2.4.tar.gz) = 4593582
> +SHA256 (trusted-firmware-a-2.4.tar.gz) = 
> vz6zYXp0zd1/sODqy/44wyWO4H1Mjtcw3u96F1zD1Vs=
> +SIZE (trusted-firmware-a-2.4.tar.gz) = 4593556
> 
> 

CVS: cvs.openbsd.org: ports

[Pavel Korovin]

CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2021/03/24 16:35:46

Modified files:
www/gitea  : Makefile distinfo 

Log message:
Update gitea 1.13.5 -> 1.13.6
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.13.6

Re: sysutils/dtb: use EXTRACT_FILES, no need for sed

[Klemens Nanni]

On Wed, Mar 24, 2021 at 10:29:36PM +0100, Klemens Nanni wrote:
> No need to extract the entire linux source when we only want device
> trees.
> 
> While here, use a simple shell idiom to replace file suffix.
> 
> Builds all fine on amd64, no PLIST change.
> OK?

Oops, now without PLIST changes from intermediate testing.


Index: Makefile
===
RCS file: /cvs/ports/sysutils/dtb/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile28 Feb 2021 09:33:30 -  1.26
+++ Makefile24 Mar 2021 21:22:08 -
@@ -25,6 +25,10 @@ NO_TEST= Yes
 
 ARCHS= arm arm64 mips powerpc
 
+# cuts down WRKSRC from ~1G to ~62M
+EXTRACT_FILES= ${ARCHS:=${DISTNAME}/arch/%/boot/dts} \
+   ${DISTNAME}/{include,scripts/dtc/include-prefixes}
+
 do-build:
 .for ARCH in ${ARCHS}
cd ${WRKSRC}/arch/${ARCH}/boot/dts ; \
@@ -34,8 +38,7 @@ do-build:
clang-cpp -nostdinc -I . -I include -I${WRKSRC}/include \
-I ${WRKSRC}/scripts/dtc/include-prefixes \
-undef -D__DTS__ -x assembler-with-cpp $$dts \
-   | dtc -I dts -O dtb -o `echo "$$dts" \
-   | sed -e 's/\.dts$$/\.dtb/'` - ; \
+   | dtc -I dts -O dtb -o $${dts%.dts}.dtb - ; \
done ; \
done
 .endfor

CVS: cvs.openbsd.org: ports

[Klemens Nanni]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2021/03/24 15:37:17

Modified files:
net/catgirl: Makefile distinfo 

Log message:
Update catgirl to 1.7

Pretty much the same as our previous snapshot with some minor fixes
and additions.

sysutils/dtb: use EXTRACT_FILES, no need for sed

[Klemens Nanni]

No need to extract the entire linux source when we only want device
trees.

While here, use a simple shell idiom to replace file suffix.

Builds all fine on amd64, no PLIST change.
OK?

Index: Makefile
===
RCS file: /cvs/ports/sysutils/dtb/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile28 Feb 2021 09:33:30 -  1.26
+++ Makefile24 Mar 2021 21:22:08 -
@@ -25,6 +25,10 @@ NO_TEST= Yes
 
 ARCHS= arm arm64 mips powerpc
 
+# cuts down WRKSRC from ~1G to ~62M
+EXTRACT_FILES= ${ARCHS:=${DISTNAME}/arch/%/boot/dts} \
+   ${DISTNAME}/{include,scripts/dtc/include-prefixes}
+
 do-build:
 .for ARCH in ${ARCHS}
cd ${WRKSRC}/arch/${ARCH}/boot/dts ; \
@@ -34,8 +38,7 @@ do-build:
clang-cpp -nostdinc -I . -I include -I${WRKSRC}/include \
-I ${WRKSRC}/scripts/dtc/include-prefixes \
-undef -D__DTS__ -x assembler-with-cpp $$dts \
-   | dtc -I dts -O dtb -o `echo "$$dts" \
-   | sed -e 's/\.dts$$/\.dtb/'` - ; \
+   | dtc -I dts -O dtb -o $${dts%.dts}.dtb - ; \
done ; \
done
 .endfor
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/dtb/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST
--- pkg/PLIST   28 Feb 2021 09:33:30 -  1.19
+++ pkg/PLIST   24 Mar 2021 21:25:29 -
@@ -1,1790 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.19 2021/02/28 09:33:30 jsg Exp $
 share/dtb/
-share/dtb/arm/
-share/dtb/arm/aks-cdu.dtb
-share/dtb/arm/alphascale-asm9260-devkit.dtb
-share/dtb/arm/alpine-db.dtb
-share/dtb/arm/am335x-baltos-ir2110.dtb
-share/dtb/arm/am335x-baltos-ir3220.dtb
-share/dtb/arm/am335x-baltos-ir5221.dtb
-share/dtb/arm/am335x-base0033.dtb
-share/dtb/arm/am335x-bone.dtb
-share/dtb/arm/am335x-boneblack-wireless.dtb
-share/dtb/arm/am335x-boneblack.dtb
-share/dtb/arm/am335x-boneblue.dtb
-share/dtb/arm/am335x-bonegreen-wireless.dtb
-share/dtb/arm/am335x-bonegreen.dtb
-share/dtb/arm/am335x-chiliboard.dtb
-share/dtb/arm/am335x-cm-t335.dtb
-share/dtb/arm/am335x-evm.dtb
-share/dtb/arm/am335x-evmsk.dtb
-share/dtb/arm/am335x-guardian.dtb
-share/dtb/arm/am335x-icev2.dtb
-share/dtb/arm/am335x-lxm.dtb
-share/dtb/arm/am335x-moxa-uc-2101.dtb
-share/dtb/arm/am335x-moxa-uc-8100-me-t.dtb
-share/dtb/arm/am335x-nano.dtb
-share/dtb/arm/am335x-netcan-plus-1xx.dtb
-share/dtb/arm/am335x-netcom-plus-2xx.dtb
-share/dtb/arm/am335x-netcom-plus-8xx.dtb
-share/dtb/arm/am335x-osd3358-sm-red.dtb
-share/dtb/arm/am335x-pdu001.dtb
-share/dtb/arm/am335x-pepper.dtb
-share/dtb/arm/am335x-phycore-rdk.dtb
-share/dtb/arm/am335x-pocketbeagle.dtb
-share/dtb/arm/am335x-regor-rdk.dtb
-share/dtb/arm/am335x-sancloud-bbe.dtb
-share/dtb/arm/am335x-sbc-t335.dtb
-share/dtb/arm/am335x-shc.dtb
-share/dtb/arm/am335x-sl50.dtb
-share/dtb/arm/am335x-wega-rdk.dtb
-share/dtb/arm/am3517-craneboard.dtb
-share/dtb/arm/am3517-evm.dtb
-share/dtb/arm/am3517_mt_ventoux.dtb
-share/dtb/arm/am3874-iceboard.dtb
-share/dtb/arm/am437x-cm-t43.dtb
-share/dtb/arm/am437x-gp-evm.dtb
-share/dtb/arm/am437x-idk-evm.dtb
-share/dtb/arm/am437x-sbc-t43.dtb
-share/dtb/arm/am437x-sk-evm.dtb
-share/dtb/arm/am43x-epos-evm.dtb
-share/dtb/arm/am571x-idk.dtb
-share/dtb/arm/am5729-beagleboneai.dtb
-share/dtb/arm/am572x-idk.dtb
-share/dtb/arm/am574x-idk.dtb
-share/dtb/arm/am57xx-beagle-x15-revb1.dtb
-share/dtb/arm/am57xx-beagle-x15-revc.dtb
-share/dtb/arm/am57xx-beagle-x15.dtb
-share/dtb/arm/am57xx-cl-som-am57x.dtb
-share/dtb/arm/am57xx-sbc-am57x.dtb
-share/dtb/arm/animeo_ip.dtb
-share/dtb/arm/arm-realview-eb-11mp-bbrevd-ctrevb.dtb
-share/dtb/arm/arm-realview-eb-11mp-bbrevd.dtb
-share/dtb/arm/arm-realview-eb-11mp-ctrevb.dtb
-share/dtb/arm/arm-realview-eb-11mp.dtb
-share/dtb/arm/arm-realview-eb-a9mp-bbrevd.dtb
-share/dtb/arm/arm-realview-eb-a9mp.dtb
-share/dtb/arm/arm-realview-eb-bbrevd.dtb
-share/dtb/arm/arm-realview-eb.dtb
-share/dtb/arm/arm-realview-pb1176.dtb
-share/dtb/arm/arm-realview-pb11mp.dtb
-share/dtb/arm/arm-realview-pba8.dtb
-share/dtb/arm/arm-realview-pbx-a9.dtb
-share/dtb/arm/armada-370-db.dtb
-share/dtb/arm/armada-370-dlink-dns327l.dtb
-share/dtb/arm/armada-370-mirabox.dtb
-share/dtb/arm/armada-370-netgear-rn102.dtb
-share/dtb/arm/armada-370-netgear-rn104.dtb
-share/dtb/arm/armada-370-rd.dtb
-share/dtb/arm/armada-370-seagate-nas-2bay.dtb
-share/dtb/arm/armada-370-seagate-nas-4bay.dtb
-share/dtb/arm/armada-370-seagate-personal-cloud-2bay.dtb
-share/dtb/arm/armada-370-seagate-personal-cloud.dtb
-share/dtb/arm/armada-370-synology-ds213j.dtb
-share/dtb/arm/armada-375-db.dtb
-share/dtb/arm/armada-382-rd-ac3x-48g4x2xl.dtb
-share/dtb/arm/armada-385-clearfog-gtr-l8.dtb
-share/dtb/arm/armada-385-clearfog-gtr-s4.dtb
-share/dtb/arm/armada-385-db-88f6820-amc.dtb
-share/dtb/arm/armada-385-db-ap.dtb
-share/dtb/arm/armada-385-linksys-caiman.dtb
-share/dtb/arm/armada-385-linksys-cobra.dtb

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2021/03/24 13:56:13

Modified files:
devel/py-lief  : Makefile distinfo 

Log message:
update to py3-lief-0.11.4

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2021/03/24 13:51:50

Modified files:
security   : Makefile 

Log message:
hook up py-fickling

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2021/03/24 13:50:29

Log message:
import py-fickling

Fickling is a decompiler, static analyzer, and bytecode rewriter for
Python pickle object serializations.

Pickled Python objects are in fact bytecode that is interpreted by a
stack-based virtual machine built into Python called the "Pickle
Machine". Fickling can take pickled data streams and decompile them into
human-readable Python code that, when executed, will deserialize to the
original serialized object.

feedback and OK sthen@

Status:

Vendor Tag: sebastia
Release Tags:   sebastia_20210324

N ports/security/py-fickling/Makefile
N ports/security/py-fickling/distinfo
N ports/security/py-fickling/pkg/DESCR
N ports/security/py-fickling/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2021/03/24 13:49:17

Modified files:
devel  : Makefile 

Log message:
hook up py-astunparse

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2021/03/24 13:48:16

Log message:
import py-astunparse

An AST unparser for Python.

This is a factored out version of unparse found in the Python source
distribution; under Demo/parser in Python 2 and under Tools/parser in
Python 3.

feedback and OK sthen@

Status:

Vendor Tag: sebastia
Release Tags:   sebastia_20210324

N ports/devel/py-astunparse/Makefile
N ports/devel/py-astunparse/distinfo
N ports/devel/py-astunparse/pkg/DESCR
N ports/devel/py-astunparse/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2021/03/24 12:38:35

Modified files:
sysutils/salt  : Makefile distinfo 

Log message:
update to salt-3002.6

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2021/03/24 12:37:39

Modified files:
x11/gnome/eog-plugins: Makefile distinfo 

Log message:
update to eog-plugins-3.26.7

Re: [MAINTAINER UPDATE] net/i2pd -> 2.37.0

[Dimitri Karamazov]

Ping

On Wed, Mar 17, 2021 at 10:55:40AM +, Dimitri Karamazov wrote:
> Simple update for i2pd to 2.37.0
> 
> Changelog:https://github.com/PurpleI2P/i2pd/releases
> 
> Build & Run tested on amd64
> 
> regards,
>   Dimitri
> 

Index: Makefile
===
RCS file: /cvs/ports/net/i2pd/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile18 Feb 2021 17:32:42 -  1.4
+++ Makefile17 Mar 2021 10:51:07 -
@@ -4,7 +4,7 @@ COMMENT =   client for the I2P anonymous n
 
 GH_ACCOUNT =   PurpleI2P
 GH_PROJECT =   i2pd
-GH_TAGNAME =   2.36.0
+GH_TAGNAME =   2.37.0
 
 CATEGORIES =   net
 HOMEPAGE = https://i2pd.website
Index: distinfo
===
RCS file: /cvs/ports/net/i2pd/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo18 Feb 2021 17:32:42 -  1.4
+++ distinfo17 Mar 2021 10:51:07 -
@@ -1,2 +1,2 @@
-SHA256 (i2pd-2.36.0.tar.gz) = F7cwnL7kG5kc+UgDNElcWgSfcJvrGzH7/LR94ZyEYqM=
-SIZE (i2pd-2.36.0.tar.gz) = 550451
+SHA256 (i2pd-2.37.0.tar.gz) = By555V1P6sncPJiAAKIbphPrDFvBURBcvM69+EF23O0=
+SIZE (i2pd-2.37.0.tar.gz) = 551885

CVS: cvs.openbsd.org: ports

[Gonzalo L . Rodriguez]

CVSROOT:/cvs
Module name:ports
Changes by: gonz...@cvs.openbsd.org 2021/03/24 11:22:28

Removed files:
net/ziproxy/patches: patch-src_cfgfile_c 

Log message:
Missing file, spotted by naddy@.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/03/24 11:07:05

Modified files:
sysutils/ansible-lint: Makefile distinfo 
sysutils/ansible-lint/pkg: PLIST 

Log message:
update to ansible-lint-5.0.5

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/03/24 11:01:52

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

Log message:
update to unifi-6.1.71 release candidate

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/03/24 09:58:10

Modified files:
sysutils/sshpass: Makefile distinfo 
Removed files:
sysutils/sshpass/patches: patch-main_c 

Log message:
update to sshpass-1.09, rolling in our TIOCSCTTY patch

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2021/03/24 09:41:20

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

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

See https://www.thunderbird.net/en-US/thunderbird/78.9.0/releasenotes/
Fixes https://www.mozilla.org/en-US/security/advisories/mfsa2021-12/

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2021/03/24 09:39:51

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

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

See https://www.thunderbird.net/en-US/thunderbird/78.9.0/releasenotes/
Fixes https://www.mozilla.org/en-US/security/advisories/mfsa2021-12/

Re: Add hledger-1.21 via devel/cabal module

[Matthias Kilian]

Hi,

On Sun, Mar 21, 2021 at 09:22:30AM -0700, Greg Steuck wrote:
> Evan mentioned hledger port being of interest, less than a year later we
> can have it :)
> 
> I'd like some test reports and OKs before this goes in.

post-install should use ${INSTALL_MAN} instead of ${INSTALL_DATA} to
install the man page. Otherwise ok (but I didn't test it yet).

Ciao,
Kili

sysutils/arm-trusted-firmware: Set HOMEPAGE, use primary repo

[Klemens Nanni]

GitHub is just a mirror and links to where users want to end up,
so update the port accordingly.

Builds and packages fine as before.

OK?

Index: Makefile
===
RCS file: /cvs/ports/sysutils/arm-trusted-firmware/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile8 Jan 2021 00:11:17 -   1.15
+++ Makefile24 Mar 2021 15:25:10 -
@@ -4,12 +4,16 @@ PKG_ARCH= *
 
 COMMENT=   ARM Trusted Firmware
 
-GH_ACCOUNT=ARM-software
-GH_PROJECT=arm-trusted-firmware
-GH_TAGNAME=v2.4
+V= 2.4
+DISTNAME=  trusted-firmware-a-${V}
+PKGNAME=   arm-trusted-firmware-${V}
+REVISION=  0
 
 EPOCH= 0
 
+HOMEPAGE=  https://www.trustedfirmware.org/projects/tf-a/
+MASTER_SITES=  
https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/
+
 CATEGORIES=sysutils
 
 # BSD
@@ -19,7 +23,7 @@ BUILD_DEPENDS+= devel/arm-none-eabi/gcc-
 BUILD_DEPENDS+= devel/arm-none-eabi/gcc-linaro,arm
 
 MAKE_ENV+= CROSS_COMPILE="aarch64-none-elf-"
-MAKE_ENV+= BUILD_STRING="${GH_TAGNAME:S/v//}"
+MAKE_ENV+= BUILD_STRING="${V}"
 
 NO_TEST=   Yes
 USE_GMAKE= Yes
Index: distinfo
===
RCS file: /cvs/ports/sysutils/arm-trusted-firmware/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo8 Jan 2021 00:11:17 -   1.9
+++ distinfo24 Mar 2021 15:21:35 -
@@ -1,2 +1,2 @@
-SHA256 (arm-trusted-firmware-2.4.tar.gz) = 
S/2p/b5QIvLoitM0QWX304qK5KDi2R1E2aFgNCXMZC0=
-SIZE (arm-trusted-firmware-2.4.tar.gz) = 4593582
+SHA256 (trusted-firmware-a-2.4.tar.gz) = 
vz6zYXp0zd1/sODqy/44wyWO4H1Mjtcw3u96F1zD1Vs=
+SIZE (trusted-firmware-a-2.4.tar.gz) = 4593556

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2021/03/24 08:37:05

Modified files:
editors/sigil  : Makefile distinfo 
editors/sigil/patches: 
   
patch-src_Resource_Files_python3lib_updatechecker_py 
editors/sigil/pkg: PLIST 

Log message:
Update to sigil-1.4.3
Usatream switched from qtwebkit to qtwebengine

Changelog:
https://github.com/Sigil-Ebook/Sigil/blob/master/ChangeLog.txt

OK sthen@

Re: NEW: sysutils/xmem

[Michael]

On Tue, Mar 16, 2021 at 11:01:40AM +0100, Omar Polo wrote:
> 
> Michael  writes:
> 
> > On Mon, Mar 08, 2021 at 04:46:27PM +0100, Michael wrote:
> >> Hello ports,
> >> 
> >> there was already an attempt to get this port in in 2017 [1]. After 
> >> talking to the original author of the port (CCed) here is another try 
> >> with a newer version.
> >> 
> >> From pkg/DESCR:
> >> Graphical application that displays memory and swap usage.
> >> 
> >> Tested on amd64.
> >> 
> >> 
> >> Regards,
> >> Michael
> >> 
> >> 
> >> [1] https://marc.info/?l=openbsd-ports=148813642421406=2
> >
> > Ping.
> 
> `make port-lib-depends-check' complains about a missing WANTLIB on kvm;
> otherwise it builds and runs fine here, it's a nice little utility =)

Agreed! :) Thanks for the fix. 

And while we're at it: ping.

> 
> attached a tarball with WANTLIB adjusted
> 
> Cheers!
> 
> Omar Polo
> 

Re: [NEW] net/Vger

[prx]

* Stuart Henderson  le [22-03-2021 09:49:53 +]:
> On 2021/03/21 23:27, Florian Viehweger wrote:
> > Hi ports,
> > 
> > I've attached an updated tarball addressing hopefully all the mentioned
> > issues.
> > 
> > Thank you for your input.
> 
> In the README you have "${SYSCONFDIR}/inetd.conf", this should just be
> /etc not ${SYSCONFDIR} because inetd is a system daemon not a ports one.
> Also some whitespace issues in the relayd config (4 spaces then a tab,
> I think maybe your editor is set to ts=4? the indent is wrong when
> viewed in a normal terminal). That's in this bit:
> 
>   relay "gemini" {
>   listen on hostname.example port 1965 tls
>   protocol "gemini"
>   forward to 127.0.0.1 port 11965
>   }
> 
> Please also add a "uses pledge()" marker near WANTLIB.
> 
> > > inetd, really, in 2021?!
> > 
> > What is wrong with inetd in this use case?
> 
> Executing a new process is relatively resource intensive, most network
> daemons handling short-lived requests moved away from this model in
> the 80's-90's. Even the original UM gopher daemon served directly
> (inetd support wasn't even present in the earlier releases, I would
> speculate that maybe it was added later so people could run it under
> the radar without appearing in a typical ps listing ;-)
> 
> Also explained in the old NCSA httpd docs (which eventually morphed into
> Apache but this long pre-dates that change), though I suppose the bit
> about parsing config isn't relevant for vger:
> http://cfpm.org/docs/setup/httpd/WhyNotInetd.html
> 
> It's not a blocking thing for adding a port but still it's a bit of
> a surprise since being lightweight seems to be a key point of
> gemini.
> 

Hi,
just tested the port.

make {fetch,checksum,extract,patch,build,test,fake,port-lib-depends-check} 
works fine.

However, "make package" and "make install" fail with : 

```
===>  Building package for vger-1.06
Create /usr/ports/packages/amd64/all/vger-1.06.tgz
Creating package vger-1.06
Error: newgroup _vger: not registered in /usr/ports/infrastructure/db/user.list
Error: newuser _vger: not registered in /usr/ports/infrastructure/db/user.list
pkg_create: can't continue
```

Find attached a diff as suggested by @solene to add "_vger" in 
infrastructure/db/user.list.

Also, find attached an updated tarball according to previous comments.

Regards.

prx
Index: infrastructure/db/user.list
===
RCS file: /cvs/ports/infrastructure/db/user.list,v
retrieving revision 1.385
diff -r1.385 user.list
375a376
> 865 _vger _vger net/vger


vger.tgz
Description: application/tar-gz

Re: NEW: x11/qt6

[Rafael Sadowski]

On Wed Mar 24, 2021 at 01:18:12PM +0100, Matthias Kilian wrote:
> Hi,

Thank you for looking at it. Your CVS tree is outdated. You need my
assimp fix form Sun, 21 Mar 2021 10:03:51 -0600 (MDT).

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/03/24 06:49:53

Modified files:
net/icinga/web2: Makefile 
net/icinga/web2/pkg: PLIST README 
Added files:
net/icinga/web2/patches: 
 patch-packages_files_apache_icingaweb2_conf 
 
patch-packages_files_apache_icingaweb2_fpm_conf 

Log message:
patch icingaweb2's sample config for Apache httpd for our paths/chroot
and mention it in the pkg-readme, based on a diff from / ok kirby@

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/03/24 06:31:44

Modified files:
net/libvncserver: Makefile distinfo 
net/libvncserver/patches: patch-rfb_rfbproto_h 
net/libvncserver/pkg: PLIST 
Added files:
net/libvncserver/patches: patch-libvncserver_main_c 
Removed files:
net/libvncserver/patches: patch-CMakeLists_txt 
  patch-libvncclient_sasl_c 

Log message:
SECURITY update to libvncserver-0.9.13.

Re: NEW: x11/qt6

[Matthias Kilian]

Hi,

On Tue, Mar 23, 2021 at 06:45:28AM +0100, Rafael Sadowski wrote:
> please find a attached Qt 6.0.2 as tarball. Qt6 is at an early point.
> There are just a handful applications and none of them are ported to
> OpenBSD. The following modules are currently available:

qtquick3d fails for me (building with dpb on amd64):

>>> Building on localhost under x11/qt6/qtquick3d
 BDEPENDS = 
[devel/ninja;x11/qt5/qttools,-main;x11/qt6/qtbase,-main;multimedia/assimp;x11/qt6/qtshadertools;x11/qt6/qtdeclarative;devel/dwz;archivers/xz;devel/cmake]
 DIST = [x11/qt6/qtquick3d:qt/qtquick3d-everywhere-src-6.0.2.tar.xz]
 FULLPKGNAME = qt6-qtquick3d-6.0.2
 RDEPENDS = 
[x11/qt6/qtbase,-main;multimedia/assimp;x11/qt6/qtshadertools;x11/qt6/qtdeclarative]
>>> Running signature in x11/qt6/qtquick3d at 1616587211.50
qt6-qtquick3d-6.0.2: absent
(Junk lock obtained for localhost at 1616587212.44)
>>> Running depends in x11/qt6/qtquick3d at 1616587212.46
/usr/sbin/pkg_add -aI -rqU -Dupdate -Dupdatedepends -Drepair assimp-5.0.0 
qt6-qtshadertools-6.0.2
was: /usr/sbin/pkg_add -aI -rqU -Dupdate -Dupdatedepends -Drepair assimp-5.0.0 
cmake-3.19.4p0v0 dwz-0.14 ninja-1.10.2p0 qt6-qtbase-6.0.2 
qt6-qtdeclarative-6.0.2 qt6-qtshadertools-6.0.2 qttools-5.15.2 xz-5.2.5
/usr/sbin/pkg_add -aI -rqU -Dupdate -Dupdatedepends -Drepair assimp-5.0.0 
qt6-qtshadertools-6.0.2
>>> Running show-prepare-results in x11/qt6/qtquick3d at 1616587220.28
===> x11/qt6/qtquick3d
===> qt6-qtquick3d-6.0.2 depends on: cmake-* -> cmake-3.19.4p0v0
===> qt6-qtquick3d-6.0.2 depends on: ninja->=1.5.1 -> ninja-1.10.2p0
===> qt6-qtquick3d-6.0.2 depends on: qttools-* -> qttools-5.15.2
===> qt6-qtquick3d-6.0.2 depends on: dwz-* -> dwz-0.14
===> qt6-qtquick3d-6.0.2 depends on: xz-* -> xz-5.2.5
===> qt6-qtquick3d-6.0.2 depends on: assimp-* -> assimp-5.0.0
===> qt6-qtquick3d-6.0.2 depends on: qt6-qtshadertools->=6.0.2,<6.1 -> 
qt6-qtshadertools-6.0.2
===> qt6-qtquick3d-6.0.2 depends on: qt6-qtdeclarative->=6.0.2,<6.1 -> 
qt6-qtdeclarative-6.0.2
===> qt6-qtquick3d-6.0.2 depends on: qt6-qtbase-* -> qt6-qtbase-6.0.2
===>  Verifying specs:  c++ c++abi pthread GL Qt6Core Qt6Gui Qt6Network 
Qt6OpenGL Qt6Qml Qt6QmlModels Qt6Quick Qt6ShaderTools assimp c m
===>  found c++.7.0 c++abi.5.0 pthread.26.1 GL.17.1 Qt6Core.0.0 Qt6Gui.0.0 
Qt6Network.0.0 Qt6OpenGL.0.0 Qt6Qml.0.0 Qt6QmlModels.0.0 Qt6Quick.0.0 
Qt6ShaderTools.0.0 assimp.1.0 c.96.0 m.10.1
assimp-5.0.0
cmake-3.19.4p0v0
dwz-0.14
ninja-1.10.2p0
qt6-qtbase-6.0.2
qt6-qtdeclarative-6.0.2
qt6-qtshadertools-6.0.2
qttools-5.15.2
xz-5.2.5
(Junk lock released for localhost at 1616587224.23)
distfiles size=47219840
>>> Running extract in x11/qt6/qtquick3d at 1616587224.25
===> x11/qt6/qtquick3d
===>  Checking files for qt6-qtquick3d-6.0.2
`/home/ports/distfiles/qt/qtquick3d-everywhere-src-6.0.2.tar.xz' is up to date.
>> (SHA256) qt/qtquick3d-everywhere-src-6.0.2.tar.xz: OK
===>  Extracting for qt6-qtquick3d-6.0.2
>>> Running patch in x11/qt6/qtquick3d at 1616587233.61
===> x11/qt6/qtquick3d
===>  Patching for qt6-qtquick3d-6.0.2
===>  Compiler link: clang -> /usr/bin/clang
===>  Compiler link: clang++ -> /usr/bin/clang++
===>  Compiler link: cc -> /usr/bin/cc
===>  Compiler link: c++ -> /usr/bin/c++
>>> Running configure in x11/qt6/qtquick3d at 1616587233.84
===> x11/qt6/qtquick3d
===>  Generating configure for qt6-qtquick3d-6.0.2
===>  Configuring for qt6-qtquick3d-6.0.2
-- The CXX compiler identification is Clang 10.0.1
-- The C compiler identification is Clang 10.0.1
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: 
/home/ports/pobj/p2/qt6-qtquick3d-6.0.2/bin/c++ - skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: /home/ports/pobj/p2/qt6-qtquick3d-6.0.2/bin/cc 
- skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- Looking for pthread.h
-- Looking for pthread.h - found
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Failed
-- Check if compiler accepts -pthread
-- Check if compiler accepts -pthread - yes
-- Found Threads: TRUE  
-- Performing Test HAVE_STDATOMIC
-- Performing Test HAVE_STDATOMIC - Success
-- Found WrapAtomic: TRUE  
-- Found OpenGL: /usr/X11R6/lib/libGL.so.17.1   
-- Found WrapOpenGL: TRUE  
-- Found Vulkan: /usr/local/lib/libvulkan.so.0.1  
-- Found OpenSSL: /usr/lib/libcrypto.so.46.1 (found version "2.0.0")  
-- Found WrapOpenSSLHeaders: TRUE  
-- Found WrapOpenSSL: TRUE  
CMake Warning at /usr/local/lib/cmake/Qt6/QtSetup.cmake:223 (message):
  Ccache use was requested, but the program was not found.
Call Stack (most recent call first):
  /usr/local/lib/cmake/Qt6BuildInternals/Qt6BuildInternalsConfig.cmake:173 
(include)
  /usr/local/lib/cmake/Qt6BuildInternals/Qt6BuildInternalsConfig.cmake:271 

sparc64 bulk build report

[kmos]

Bulk build on sparc64-0a.ports.openbsd.org

Started : Sun Mar 21 13:31:09 MDT 2021
Finished: Wed Mar 24 05:41:13 MDT 2021
Duration: 2 Days 16 hours 10 minutes

Built using OpenBSD 6.9-beta (GENERIC.MP) #749: Sat Mar 20 22:29:53 MDT 2021

Built 9715 packages

Number of packages built each day:
Mar 21: 6733
Mar 22: 2189
Mar 23: 786
Mar 24: 7


Critical path missing pkgs:
http://build-failures.rhaalovely.net/sparc64/2021-03-21/summary.log

Build failures: 39
http://build-failures.rhaalovely.net/sparc64/2021-03-21/audio/ncmpcpp.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/cad/dxf2gcode.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/comms/sigrok/pulseview.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/comms/sigrok/sigrok-cli.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/comms/syncterm.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/devel/keystone/python,python3.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/emulators/emulationstation.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/emulators/libretro-genesis-plus-gx.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/games/egoboo.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/games/frotz.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/games/odamex.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/games/openxcom.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/games/stepmania.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/games/gcompris:gcompris-qt-1.1.tar.xz.log
cp: paths/games/gcompris:gcompris-qt-1.1.tar.xz.log: No such file or directory
http://build-failures.rhaalovely.net/sparc64/2021-03-21/geo/spatialite/gui.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/graphics/asymptote.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/graphics/birdfont.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/graphics/makehuman.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/graphics/mypaint.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/mail/evolution-rss.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/math/gnumeric.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/math/mlpack,-main.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/math/veusz.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/multimedia/mkvtoolnix,no_x11.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/net/barrier.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/net/pmacct,postgresql.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/net/sniproxy.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/print/cups-bjnp.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/print/gutenprint.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/productivity/gnucash.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/security/opendnssec.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/shells/nsh,static.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/sysutils/libvirt.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/sysutils/opam.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/www/py-genshi,python3.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/x11/gnome/mutter.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/x11/kde-applications/kmix.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/x11/roxterm.log
http://build-failures.rhaalovely.net/sparc64/2021-03-21/x11/xmenu.log

Recurrent failures:
 failures/audio/ncmpcpp.log
 failures/comms/syncterm.log
 failures/devel/keystone/python,python3.log
 failures/emulators/emulationstation.log
 failures/emulators/libretro-genesis-plus-gx.log
 failures/games/egoboo.log
 failures/games/frotz.log
 failures/games/openxcom.log
 failures/games/stepmania.log
 failures/graphics/asymptote.log
 failures/math/mlpack,-main.log
 failures/net/pmacct,postgresql.log
 failures/net/sniproxy.log
 failures/print/cups-bjnp.log
 failures/print/gutenprint.log
 failures/security/opendnssec.log
 failures/shells/nsh,static.log
 failures/sysutils/libvirt.log
 failures/www/py-genshi,python3.log
 failures/x11/xmenu.log

New failures:
+failures/cad/dxf2gcode.log
+failures/comms/sigrok/pulseview.log
+failures/comms/sigrok/sigrok-cli.log
+failures/games/odamex.log
+failures/geo/spatialite/gui.log
+failures/graphics/birdfont.log
+failures/graphics/makehuman.log
+failures/graphics/mypaint.log
+failures/mail/evolution-rss.log
+failures/math/gnumeric.log
+failures/math/veusz.log
+failures/multimedia/mkvtoolnix,no_x11.log
+failures/net/barrier.log
+failures/productivity/gnucash.log
+failures/sysutils/opam.log
+failures/x11/gnome/mutter.log
+failures/x11/kde-applications/kmix.log
+failures/x11/roxterm.log

Resolved failures:
-failures/www/ruby-rainbows.log
-failures/x11/gnome/librsvg.log

Packages newly built:

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2021/03/24 04:59:47

Modified files:
devel/proj : Makefile distinfo 
devel/proj/pkg : PLIST 

Log message:
devel/proj: update to 8.0.0

See https://proj.org/news.html#release-notes
finally removes the proj.4 API and proj_api.h header, after two years of
being deprecated, the ecosystem has mostly adapted (but merkaartor &
qmapshack)

went in a bulk build by ajacoutot@, no other fallout

UPDATE: SQLMap-1.5.3

[Gonzalo L. Rodriguez]

Hello,

Update for SQLMap to 1.5.3:

https://github.com/sqlmapproject/sqlmap/releases/tag/1.5.3

OK? Comments?

Cheers.-

-- 

 %gonzalo
Index: Makefile
===
RCS file: /cvs/ports/security/sqlmap/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile23 Feb 2021 19:39:39 -  1.36
+++ Makefile22 Mar 2021 11:46:05 -
@@ -4,7 +4,7 @@ COMMENT =   penetration testing tool to d
 
 GH_ACCOUNT =   sqlmapproject
 GH_PROJECT =   sqlmap
-GH_TAGNAME =   1.5
+GH_TAGNAME =   1.5.3
 
 CATEGORIES =   security
 
Index: distinfo
===
RCS file: /cvs/ports/security/sqlmap/distinfo,v
retrieving revision 1.29
diff -u -p -r1.29 distinfo
--- distinfo14 Jan 2021 10:49:01 -  1.29
+++ distinfo22 Mar 2021 11:46:05 -
@@ -1,2 +1,2 @@
-SHA256 (sqlmap-1.5.tar.gz) = GMOMTM8E6B5UBSerxjEw7O1ysVfaHXBeOvJrHUdoZx0=
-SIZE (sqlmap-1.5.tar.gz) = 6794876
+SHA256 (sqlmap-1.5.3.tar.gz) = XN0ptKhpE5Yqse7MH1m9MqA40Vc/cO2xdgv4jwE0dSY=
+SIZE (sqlmap-1.5.3.tar.gz) = 6766578
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/sqlmap/pkg/PLIST,v
retrieving revision 1.25
diff -u -p -r1.25 PLIST
--- pkg/PLIST   14 Jan 2021 10:49:01 -  1.25
+++ pkg/PLIST   22 Mar 2021 11:46:05 -
@@ -102,6 +102,8 @@ share/sqlmap/data/udf/postgresql/linux/6
 share/sqlmap/data/udf/postgresql/linux/64/10/lib_postgresqludf_sys.so_
 share/sqlmap/data/udf/postgresql/linux/64/11/
 share/sqlmap/data/udf/postgresql/linux/64/11/lib_postgresqludf_sys.so_
+share/sqlmap/data/udf/postgresql/linux/64/12/
+share/sqlmap/data/udf/postgresql/linux/64/12/lib_postgresqludf_sys.so_
 share/sqlmap/data/udf/postgresql/linux/64/8.2/
 share/sqlmap/data/udf/postgresql/linux/64/8.2/lib_postgresqludf_sys.so_
 share/sqlmap/data/udf/postgresql/linux/64/8.3/
@@ -823,6 +825,22 @@ share/sqlmap/plugins/dbms/presto/filesys
 share/sqlmap/plugins/dbms/presto/fingerprint.py
 share/sqlmap/plugins/dbms/presto/syntax.py
 share/sqlmap/plugins/dbms/presto/takeover.py
+share/sqlmap/plugins/dbms/raima/
+share/sqlmap/plugins/dbms/raima/__init__.py
+${MODPY_COMMENT}share/sqlmap/plugins/dbms/raima/${MODPY_PYCACHE}/
+share/sqlmap/plugins/dbms/raima/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+share/sqlmap/plugins/dbms/raima/${MODPY_PYCACHE}connector.${MODPY_PYC_MAGIC_TAG}pyc
+share/sqlmap/plugins/dbms/raima/${MODPY_PYCACHE}enumeration.${MODPY_PYC_MAGIC_TAG}pyc
+share/sqlmap/plugins/dbms/raima/${MODPY_PYCACHE}filesystem.${MODPY_PYC_MAGIC_TAG}pyc
+share/sqlmap/plugins/dbms/raima/${MODPY_PYCACHE}fingerprint.${MODPY_PYC_MAGIC_TAG}pyc
+share/sqlmap/plugins/dbms/raima/${MODPY_PYCACHE}syntax.${MODPY_PYC_MAGIC_TAG}pyc
+share/sqlmap/plugins/dbms/raima/${MODPY_PYCACHE}takeover.${MODPY_PYC_MAGIC_TAG}pyc
+share/sqlmap/plugins/dbms/raima/connector.py
+share/sqlmap/plugins/dbms/raima/enumeration.py
+share/sqlmap/plugins/dbms/raima/filesystem.py
+share/sqlmap/plugins/dbms/raima/fingerprint.py
+share/sqlmap/plugins/dbms/raima/syntax.py
+share/sqlmap/plugins/dbms/raima/takeover.py
 share/sqlmap/plugins/dbms/sqlite/
 share/sqlmap/plugins/dbms/sqlite/__init__.py
 ${MODPY_COMMENT}share/sqlmap/plugins/dbms/sqlite/${MODPY_PYCACHE}/
@@ -871,6 +889,22 @@ share/sqlmap/plugins/dbms/vertica/filesy
 share/sqlmap/plugins/dbms/vertica/fingerprint.py
 share/sqlmap/plugins/dbms/vertica/syntax.py
 share/sqlmap/plugins/dbms/vertica/takeover.py
+share/sqlmap/plugins/dbms/virtuoso/
+share/sqlmap/plugins/dbms/virtuoso/__init__.py
+${MODPY_COMMENT}share/sqlmap/plugins/dbms/virtuoso/${MODPY_PYCACHE}/
+share/sqlmap/plugins/dbms/virtuoso/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+share/sqlmap/plugins/dbms/virtuoso/${MODPY_PYCACHE}connector.${MODPY_PYC_MAGIC_TAG}pyc
+share/sqlmap/plugins/dbms/virtuoso/${MODPY_PYCACHE}enumeration.${MODPY_PYC_MAGIC_TAG}pyc
+share/sqlmap/plugins/dbms/virtuoso/${MODPY_PYCACHE}filesystem.${MODPY_PYC_MAGIC_TAG}pyc
+share/sqlmap/plugins/dbms/virtuoso/${MODPY_PYCACHE}fingerprint.${MODPY_PYC_MAGIC_TAG}pyc
+share/sqlmap/plugins/dbms/virtuoso/${MODPY_PYCACHE}syntax.${MODPY_PYC_MAGIC_TAG}pyc
+share/sqlmap/plugins/dbms/virtuoso/${MODPY_PYCACHE}takeover.${MODPY_PYC_MAGIC_TAG}pyc
+share/sqlmap/plugins/dbms/virtuoso/connector.py
+share/sqlmap/plugins/dbms/virtuoso/enumeration.py
+share/sqlmap/plugins/dbms/virtuoso/filesystem.py
+share/sqlmap/plugins/dbms/virtuoso/fingerprint.py
+share/sqlmap/plugins/dbms/virtuoso/syntax.py
+share/sqlmap/plugins/dbms/virtuoso/takeover.py
 share/sqlmap/plugins/generic/
 share/sqlmap/plugins/generic/__init__.py
 ${MODPY_COMMENT}share/sqlmap/plugins/generic/${MODPY_PYCACHE}/
@@ -1160,12 +1194,6 @@ ${MODPY_COMMENT}share/sqlmap/thirdparty/
 
share/sqlmap/thirdparty/fcrypt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2021/03/24 04:57:43

Modified files:
geo/qmapshack  : Makefile 

Log message:
geo/qmapshack: mark as BROKEN, doesnt build against proj 8

See https://github.com/Maproom/qmapshack/issues/333. The proj.4 API has
been deprecated two years ago, and removed in proj8.

CVS: cvs.openbsd.org: ports

[Gonzalo L . Rodriguez]

CVSROOT:/cvs
Module name:ports
Changes by: gonz...@cvs.openbsd.org 2021/03/24 04:55:55

Modified files:
net/ziproxy: Makefile distinfo 
net/ziproxy/pkg: PLIST 
Removed files:
net/ziproxy/patches: patch-src_image_c patch-src_tosmarking_c 

Log message:
Update for Ziproxy to 3.3.2

OK sthen@

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2021/03/24 04:55:42

Modified files:
geo/merkaartor : Makefile 

Log message:
geo/merkaartor: mark as BROKEN, doesnt build with proj8 yet

cf https://github.com/openstreetmap/merkaartor/issues/193, the proj.4
API has been deprecated two years ago (and removed in proj 8)

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2021/03/24 04:53:30

Modified files:
geo/geos   : Makefile 
geo/geos/pkg   : PLIST 

Log message:
geo/geos: switch to cmake build

upstream plans to deprecate autotools in the next version, per
https://trac.osgeo.org/geos/wiki/RFC7

went in a bulk build without issues, thanks ajacoutot@

CVS: cvs.openbsd.org: ports

[Frederic Cambus]

CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2021/03/24 04:20:47

Modified files:
textproc/miller: Makefile distinfo 

Log message:
Update miller to 5.10.2.

Re: [UPDATE] editors/sigil

[Kirill Bychkov]

On Sun, March 14, 2021 21:07, Kirill Bychkov wrote:
> Hi!
> The diff attached updates sigil to the latest version.
> The main change is that upstream switched from qtwebkit to
> qtwebengine.
> Changelog:
> https://github.com/Sigil-Ebook/Sigil/blob/master/ChangeLog.txt
>
> Slightly tested with random epub file.
> OK? Comments?

ping

sigil-1.4.3.diff
Description: Binary data

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/03/24 01:45:27

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

Log message:
Update to foliate-2.6.1.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/03/24 01:43:37

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

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

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/03/24 01:39:18

Modified files:
security/libgpg-error: Makefile distinfo 

Log message:
Update to libgpg-error-1.42.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/03/24 01:34:57

Modified files:
x11/gnome/dconf-editor: Makefile distinfo 
Removed files:
x11/gnome/dconf-editor/patches: 
patch-editor_bookmarks-headerbar_vala 
patch-editor_bookmarks-list_vala 
patch-editor_bookmarks_vala 
patch-editor_delayed-setting-view_vala 
patch-editor_overlayed-list_vala 
patch-editor_pathentry_vala 
patch-editor_registry-list_vala 
patch-editor_registry-search_vala 
patch-editor_registry-view_vala 

Log message:
Update to dconf-editor-3.38.3.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/03/24 01:31:13

Modified files:
meta/gnome : Makefile 

Log message:
Welcome GNOME 3.38.5!

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/03/24 01:30:45

Modified files:
x11/gnome/desktop: Makefile distinfo 

Log message:
Update to gnome-desktop-3.38.5.

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2021/03/24 01:17:36

Modified files:
net/bitcoin: Makefile 

Log message:
Fix CVS tag