[update] devel/sbt: update to 1.10.1

ports@,

18 minutes ago sbt had a bugfix release which addressed number of small
issues, changelog: https://github.com/sbt/sbt/releases/tag/v1.10.1

Tested on -current/amd64 by building quite complicated scala project, and a
few small one. No dependand on the port tree.

Here a diff to update it, where I also claim mainterniship for this port.

diff --git devel/sbt/Makefile devel/sbt/Makefile
index 3f597bd06db..c9a02a76be5 100644
--- devel/sbt/Makefile
+++ devel/sbt/Makefile
@@ -1,6 +1,6 @@
COMMENT= interactive build tool, primarily for Scala/Java

-V= 1.10.0
+V= 1.10.1
DISTNAME= sbt-$V
CATEGORIES= devel

@@ -8,6 +8,8 @@ HOMEPAGE= https://scala-sbt.org
SITES = https://github.com/sbt/sbt/releases/download/v$V/
EXTRACT_SUFX= .tgz

+MAINTAINER= Kirill A. Korinsky <kirill@korins.ky>
+
# Apache Software License 2.0
PERMIT_PACKAGE= Yes

diff --git devel/sbt/distinfo devel/sbt/distinfo
index 1898b4b42ef..29e1e15cdd5 100644
--- devel/sbt/distinfo
+++ devel/sbt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sbt-1.10.0.tgz) = FUt95sGSB8c9CjBPkByMS26tmpw6mamKnXKsGUGdJkA=
-SIZE (sbt-1.10.0.tgz) = 48054447
+SHA256 (sbt-1.10.1.tgz) = R/6YzpSY7kbmnyJnLzwSI0y+fnGedkQQoT5YtyXWWfM=
+SIZE (sbt-1.10.1.tgz) = 48056407
diff --git devel/sbt/patches/patch-bin_sbt devel/sbt/patches/patch-bin_sbt
index 2a784377b31..8b809642770 100644
--- devel/sbt/patches/patch-bin_sbt
+++ devel/sbt/patches/patch-bin_sbt
@@ -8,7 +8,7 @@ Index: bin/sbt
-declare java_cmd=java
+declare java_cmd=${JAVA_HOME:-$(javaPathHelper -h sbt)}/bin/java
declare java_version
- declare init_sbt_version=1.10.0
+ declare init_sbt_version=1.10.1
declare sbt_default_mem=1024
@@ -533,7 +533,7 @@ run() {
declare -ra noshare_opts=(-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy)

--
wbr, Kirill

Re: security/py-mitmproxy: new port (version 10.3.0)

On Fri, 28 Jun 2024 22:27:10 +0100,
Daniel Dickman <didickman@gmail.com> wrote:
>
> On Wed, Jun 26, 2024 at 8:21 AM Stuart Henderson <stu@spacehopper.org> wrote:
> >
> > > >
> > > > archivers/py-brotlicffi
>
> ok
>
> > > > archivers/py-lsqpack
>
> license should be BSD not MIT and then ok
>
> > > > archivers/py-zstandard
>
> license should be BSD not MIT
>
> needs BDEP on devel/py-cffi
>
> ok with the above changes.
>
> > > > devel/py-kaitaistruct
>
> ok
>
> > > > net/py-publicsuffix2
>
> license is MIT and MPL-2.0 then ok
>
> > > > www/py-asgiref
>
> ok
>

Here ab updated archive which contains:

- archivers/py-brotlicffi
- archivers/py-zstandard
- net/py-publicsuffix2
- devel/py-kaitaistruct
- archivers/py-lsqpack
- www/py-aioquic
- www/py-asgiref
- security/py-mitmproxy_rs
- security/mitmproxy

Additionally, it contains an update www/py-aioquic to 1.2.0, and heavy
reworked patch which addressed remarks from upstream. Thus, make test is
passed on -current/amd64.

I also addressed all remarks as (diff is quited to avoid applying):

> diff --git archivers/py-lsqpack/Makefile archivers/py-lsqpack/Makefile
> index ad5622b1d49..de70d9bdea2 100644
> --- archivers/py-lsqpack/Makefile
> +++ archivers/py-lsqpack/Makefile
> @@ -6,7 +6,7 @@ PKGNAME = py-lsqpack-${MODPY_EGG_VERSION}
>
> CATEGORIES = archivers devel www
>
> -# MIT
> +# BSD
> PERMIT_PACKAGE = Yes
>
> MODULES = lang/python
> diff --git archivers/py-zstandard/Makefile archivers/py-zstandard/Makefile
> index 91b6e4516c3..714f41c13f4 100644
> --- archivers/py-zstandard/Makefile
> +++ archivers/py-zstandard/Makefile
> @@ -19,6 +19,8 @@ FLAVOR = python3
> MODPY_PYTEST_ARGS = tests/
> MODPY_TEST_DIR = ${WRKDIR}
>
> +RUN_DEPENDS= devel/py-cffi${MODPY_FLAVOR}
> +
> pre-test:
> @rm -rf ${WRKDIR}/tests
> @cp -r ${WRKSRC}/tests ${WRKDIR}/
> diff --git net/py-publicsuffix2/Makefile net/py-publicsuffix2/Makefile
> index 713958195c1..b05ccceee0d 100644
> --- net/py-publicsuffix2/Makefile
> +++ net/py-publicsuffix2/Makefile
> @@ -6,7 +6,7 @@ PKGNAME = py-${DISTNAME}
>
> CATEGORIES = net
>
> -# MIT
> +# MIT and MPL-2.0
> PERMIT_PACKAGE = Yes
>
> MODULES = lang/python

--
wbr, Kirill

Re: update games/recoil-rts

On Sun, Jul 07, 2024 at 06:24:17PM -0400, Thomas Frohwein wrote:
> On Sun, Jul 07, 2024 at 11:17:06PM +0100, Fabien Romano wrote:
> >
> > On 07/07/2024 22:37, Fabien Romano wrote:
> > > same update including two more things.
> > >
> > > use proper IN_ENGINE_V to match BAR servers and be abale to join lobby.
> > > bring bin/byar-chobby to setup and start BAR.
> >
> >
> > > On 16/06/2024 06:55, Fabien ROMANO wrote:
> > >> update to latest version
> > >>
> > >> https://github.com/beyond-all-reason/spring/compare/spring_bar_%7BBAR105%7D105.1.1-2472-ga5aa45c...spring_bar_%7BBAR105%7D105.1.1-2511-g747f18b
> > >>
> > >> https://github.com/rlcevg/CircuitAI/compare/aded4d13fcec74a3416e7055fcfb8275e49061a1...3dee671176bdae7e6b1dd46a3c6c2c0d03c48755
> > >>
> > >> One more patch merged upstream, thx thfr@.
> > >> Use patch -E to drop the file.
> > >>
> > >> While there, I mute portcheck long lines report by removing the space on url.
> > >> I also noticed other long lines and adjusted indentation (portcheck use awk length, looks like it does not handle tabulation size).
> > >> Only two versions changed in DIST_TUPLE, see distinfo.
> > >>
> > >> Tested on BAR, barbarianIA works again.
> > >>
> > on current.
> >
> > note about --isolation, the official launcher use the flag but it doesn't work atm.
> > diff for testing.
>
> I'm getting this error here:
>
> [thread::error::run] duplicate base content detected:
> /home/thfr/.local/state/Beyond All Reason/base/spring/
> /usr/local/share/games/spring/base/spring/
>
> Did you have to work around this?

I ended up deleting ~/.local/state/Beyond\ All\ Reason/base, then it
launched. It was running quite slow, and after I rm -rf'd
~/.local/state/Beyond\ All\ Reason/ and restarted from scratch, I
couldn't launch it because of this confusing error:

Dependent archive "byar chobby test-3306-d61c0a2" (resolved to "BYAR Chobby test-3306-d61c0a2") not found

Maybe I did something wrong, but I feel like something is still amiss
here...

>
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/games/recoil-rts/Makefile,v
> > diff -u -p -r1.7 Makefile
> > --- Makefile 7 Jul 2024 21:27:10 -0000 1.7
> > +++ Makefile 7 Jul 2024 22:10:49 -0000
> > @@ -14,7 +14,7 @@ BLD = 2511
> > HASH = g747f18b
> > V = ${MJ}.${MN}pl${BLD}
> > # ${IN_ENGINE_V} is what recoil uses/displays internally
> > -IN_ENGINE_V = "${MJ}.${MN}-${BLD}-${HASH} BAR${MJ}"
> > +IN_ENGINE_V = "${MJ}.${MN}-${BLD}-${HASH} BAR${MJ}"
> >
> > # Prefix '0.' to avoid future EPOCH. Upstream has indicated future versioning
> > # with YY.MM; once that has happened, remove '0.'
> > @@ -110,5 +110,8 @@ SUBST_VARS += IN_ENGINE_V
> >
> > pre-configure:
> > ${SUBST_CMD} ${WRKSRC}/rts/build/cmake/ConfigureVersion.cmake
> > +
> > +post-install:
> > + ${SUBST_PROGRAM} ${FILESDIR}/byar-chobby ${PREFIX}/bin/
> >
> > .include <bsd.port.mk>
> > Index: files/byar-chobby
> > ===================================================================
> > RCS file: files/byar-chobby
> > diff -N files/byar-chobby
> > --- /dev/null 1 Jan 1970 00:00:00 -0000
> > +++ files/byar-chobby 7 Jul 2024 22:10:49 -0000
> > @@ -0,0 +1,43 @@
> > +#!/bin/sh
> > +
> > +DATASIZE="6291456" # 6g
> > +
> > +xm_log() {
> > + echo -n "$@\nDo you want to run BAR anyway?\n\
> > +(If you don't increase these limits, spring might fail to work properly.)" | \
> > + ${X11BASE}/bin/xmessage -file - -center -buttons yes:0,no:1 -default no
> > +}
> > +
> > +if [ $(ulimit -Sd) -lt ${DATASIZE} ]; then
> > + ulimit -Sd ${DATASIZE} || \
> > + xm_log "Cannot increase datasize-cur to at least ${DATASIZE}"
> > + [ $? -eq 0 ] || exit
> > +fi
> > +
> > +# setup
> > +[[ -d ~/.local/state/Beyond\ All\ Reason ]] || \
> > + mkdir -p ~/.local/state/Beyond\ All\ Reason
> > +cat > ~/.local/state/Beyond\ All\ Reason/chobby_config.json <<EOF
> > +{
> > + "server": {
> > + "address": "server4.beyondallreason.info",
> > + "port": 8200,
> > + "protocol": "spring",
> > + "serverName": "BAR"
> > + },
> > + "game": "byar"
> > +}
> > +EOF
> > +
> > +# update
> > +PRD_HTTP_SEARCH_URL=https://files-cdn.beyondallreason.dev/find
> > +PRD_RAPID_USE_STREAMER=false
> > +PRD_RAPID_REPO_MASTER=https://repos-cdn.beyondallreason.dev/repos.gz
> > +export PRD_HTTP_SEARCH_URL PRD_RAPID_USE_STREAMER PRD_RAPID_REPO_MASTER
> > +pr-downloader --download-game byar:test --download-game byar-chobby:test \
> > + --filesystem-writepath ~/.local/state/Beyond\ All\ Reason
> > +
> > +# start
> > +# XXX without --isolation
> > +spring --write-dir ~/.local/state/Beyond\ All\ Reason \
> > + --menu rapid://byar-chobby:test
> > Index: pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/games/recoil-rts/pkg/PLIST,v
> > diff -u -p -r1.1.1.1 PLIST
> > --- pkg/PLIST 5 May 2024 17:18:13 -0000 1.1.1.1
> > +++ pkg/PLIST 7 Jul 2024 22:10:49 -0000
> > @@ -1,3 +1,4 @@
> > +bin/byar-chobby
> > @bin bin/mapcompile
> > @bin bin/mapdecompile
> > @bin bin/pr-downloader
> >

Re: update games/recoil-rts

On Sun, Jul 07, 2024 at 11:17:06PM +0100, Fabien Romano wrote:
>
> On 07/07/2024 22:37, Fabien Romano wrote:
> > same update including two more things.
> >
> > use proper IN_ENGINE_V to match BAR servers and be abale to join lobby.
> > bring bin/byar-chobby to setup and start BAR.
>
>
> > On 16/06/2024 06:55, Fabien ROMANO wrote:
> >> update to latest version
> >>
> >> https://github.com/beyond-all-reason/spring/compare/spring_bar_%7BBAR105%7D105.1.1-2472-ga5aa45c...spring_bar_%7BBAR105%7D105.1.1-2511-g747f18b
> >>
> >> https://github.com/rlcevg/CircuitAI/compare/aded4d13fcec74a3416e7055fcfb8275e49061a1...3dee671176bdae7e6b1dd46a3c6c2c0d03c48755
> >>
> >> One more patch merged upstream, thx thfr@.
> >> Use patch -E to drop the file.
> >>
> >> While there, I mute portcheck long lines report by removing the space on url.
> >> I also noticed other long lines and adjusted indentation (portcheck use awk length, looks like it does not handle tabulation size).
> >> Only two versions changed in DIST_TUPLE, see distinfo.
> >>
> >> Tested on BAR, barbarianIA works again.
> >>
> on current.
>
> note about --isolation, the official launcher use the flag but it doesn't work atm.
> diff for testing.

I'm getting this error here:

[thread::error::run] duplicate base content detected:
/home/thfr/.local/state/Beyond All Reason/base/spring/
/usr/local/share/games/spring/base/spring/

Did you have to work around this?

>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/recoil-rts/Makefile,v
> diff -u -p -r1.7 Makefile
> --- Makefile 7 Jul 2024 21:27:10 -0000 1.7
> +++ Makefile 7 Jul 2024 22:10:49 -0000
> @@ -14,7 +14,7 @@ BLD = 2511
> HASH = g747f18b
> V = ${MJ}.${MN}pl${BLD}
> # ${IN_ENGINE_V} is what recoil uses/displays internally
> -IN_ENGINE_V = "${MJ}.${MN}-${BLD}-${HASH} BAR${MJ}"
> +IN_ENGINE_V = "${MJ}.${MN}-${BLD}-${HASH} BAR${MJ}"
>
> # Prefix '0.' to avoid future EPOCH. Upstream has indicated future versioning
> # with YY.MM; once that has happened, remove '0.'
> @@ -110,5 +110,8 @@ SUBST_VARS += IN_ENGINE_V
>
> pre-configure:
> ${SUBST_CMD} ${WRKSRC}/rts/build/cmake/ConfigureVersion.cmake
> +
> +post-install:
> + ${SUBST_PROGRAM} ${FILESDIR}/byar-chobby ${PREFIX}/bin/
>
> .include <bsd.port.mk>
> Index: files/byar-chobby
> ===================================================================
> RCS file: files/byar-chobby
> diff -N files/byar-chobby
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ files/byar-chobby 7 Jul 2024 22:10:49 -0000
> @@ -0,0 +1,43 @@
> +#!/bin/sh
> +
> +DATASIZE="6291456" # 6g
> +
> +xm_log() {
> + echo -n "$@\nDo you want to run BAR anyway?\n\
> +(If you don't increase these limits, spring might fail to work properly.)" | \
> + ${X11BASE}/bin/xmessage -file - -center -buttons yes:0,no:1 -default no
> +}
> +
> +if [ $(ulimit -Sd) -lt ${DATASIZE} ]; then
> + ulimit -Sd ${DATASIZE} || \
> + xm_log "Cannot increase datasize-cur to at least ${DATASIZE}"
> + [ $? -eq 0 ] || exit
> +fi
> +
> +# setup
> +[[ -d ~/.local/state/Beyond\ All\ Reason ]] || \
> + mkdir -p ~/.local/state/Beyond\ All\ Reason
> +cat > ~/.local/state/Beyond\ All\ Reason/chobby_config.json <<EOF
> +{
> + "server": {
> + "address": "server4.beyondallreason.info",
> + "port": 8200,
> + "protocol": "spring",
> + "serverName": "BAR"
> + },
> + "game": "byar"
> +}
> +EOF
> +
> +# update
> +PRD_HTTP_SEARCH_URL=https://files-cdn.beyondallreason.dev/find
> +PRD_RAPID_USE_STREAMER=false
> +PRD_RAPID_REPO_MASTER=https://repos-cdn.beyondallreason.dev/repos.gz
> +export PRD_HTTP_SEARCH_URL PRD_RAPID_USE_STREAMER PRD_RAPID_REPO_MASTER
> +pr-downloader --download-game byar:test --download-game byar-chobby:test \
> + --filesystem-writepath ~/.local/state/Beyond\ All\ Reason
> +
> +# start
> +# XXX without --isolation
> +spring --write-dir ~/.local/state/Beyond\ All\ Reason \
> + --menu rapid://byar-chobby:test
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/games/recoil-rts/pkg/PLIST,v
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 5 May 2024 17:18:13 -0000 1.1.1.1
> +++ pkg/PLIST 7 Jul 2024 22:10:49 -0000
> @@ -1,3 +1,4 @@
> +bin/byar-chobby
> @bin bin/mapcompile
> @bin bin/mapdecompile
> @bin bin/pr-downloader
>

Re: update games/recoil-rts

On 07/07/2024 22:37, Fabien Romano wrote:
> same update including two more things.
>
> use proper IN_ENGINE_V to match BAR servers and be abale to join lobby.
> bring bin/byar-chobby to setup and start BAR.


> On 16/06/2024 06:55, Fabien ROMANO wrote:
>> update to latest version
>>
>> https://github.com/beyond-all-reason/spring/compare/spring_bar_%7BBAR105%7D105.1.1-2472-ga5aa45c...spring_bar_%7BBAR105%7D105.1.1-2511-g747f18b
>>
>> https://github.com/rlcevg/CircuitAI/compare/aded4d13fcec74a3416e7055fcfb8275e49061a1...3dee671176bdae7e6b1dd46a3c6c2c0d03c48755
>>
>> One more patch merged upstream, thx thfr@.
>> Use patch -E to drop the file.
>>
>> While there, I mute portcheck long lines report by removing the space on url.
>> I also noticed other long lines and adjusted indentation (portcheck use awk length, looks like it does not handle tabulation size).
>> Only two versions changed in DIST_TUPLE, see distinfo.
>>
>> Tested on BAR, barbarianIA works again.
>>
on current.

note about --isolation, the official launcher use the flag but it doesn't work atm.
diff for testing.

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/recoil-rts/Makefile,v
diff -u -p -r1.7 Makefile
--- Makefile 7 Jul 2024 21:27:10 -0000 1.7
+++ Makefile 7 Jul 2024 22:10:49 -0000
@@ -14,7 +14,7 @@ BLD = 2511
HASH = g747f18b
V = ${MJ}.${MN}pl${BLD}
# ${IN_ENGINE_V} is what recoil uses/displays internally
-IN_ENGINE_V = "${MJ}.${MN}-${BLD}-${HASH} BAR${MJ}"
+IN_ENGINE_V = "${MJ}.${MN}-${BLD}-${HASH} BAR${MJ}"

# Prefix '0.' to avoid future EPOCH. Upstream has indicated future versioning
# with YY.MM; once that has happened, remove '0.'
@@ -110,5 +110,8 @@ SUBST_VARS += IN_ENGINE_V

pre-configure:
${SUBST_CMD} ${WRKSRC}/rts/build/cmake/ConfigureVersion.cmake
+
+post-install:
+ ${SUBST_PROGRAM} ${FILESDIR}/byar-chobby ${PREFIX}/bin/

.include <bsd.port.mk>
Index: files/byar-chobby
===================================================================
RCS file: files/byar-chobby
diff -N files/byar-chobby
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/byar-chobby 7 Jul 2024 22:10:49 -0000
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+DATASIZE="6291456" # 6g
+
+xm_log() {
+ echo -n "$@\nDo you want to run BAR anyway?\n\
+(If you don't increase these limits, spring might fail to work properly.)" | \
+ ${X11BASE}/bin/xmessage -file - -center -buttons yes:0,no:1 -default no
+}
+
+if [ $(ulimit -Sd) -lt ${DATASIZE} ]; then
+ ulimit -Sd ${DATASIZE} || \
+ xm_log "Cannot increase datasize-cur to at least ${DATASIZE}"
+ [ $? -eq 0 ] || exit
+fi
+
+# setup
+[[ -d ~/.local/state/Beyond\ All\ Reason ]] || \
+ mkdir -p ~/.local/state/Beyond\ All\ Reason
+cat > ~/.local/state/Beyond\ All\ Reason/chobby_config.json <<EOF
+{
+ "server": {
+ "address": "server4.beyondallreason.info",
+ "port": 8200,
+ "protocol": "spring",
+ "serverName": "BAR"
+ },
+ "game": "byar"
+}
+EOF
+
+# update
+PRD_HTTP_SEARCH_URL=https://files-cdn.beyondallreason.dev/find
+PRD_RAPID_USE_STREAMER=false
+PRD_RAPID_REPO_MASTER=https://repos-cdn.beyondallreason.dev/repos.gz
+export PRD_HTTP_SEARCH_URL PRD_RAPID_USE_STREAMER PRD_RAPID_REPO_MASTER
+pr-downloader --download-game byar:test --download-game byar-chobby:test \
+ --filesystem-writepath ~/.local/state/Beyond\ All\ Reason
+
+# start
+# XXX without --isolation
+spring --write-dir ~/.local/state/Beyond\ All\ Reason \
+ --menu rapid://byar-chobby:test
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/recoil-rts/pkg/PLIST,v
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 5 May 2024 17:18:13 -0000 1.1.1.1
+++ pkg/PLIST 7 Jul 2024 22:10:49 -0000
@@ -1,3 +1,4 @@
+bin/byar-chobby
@bin bin/mapcompile
@bin bin/mapdecompile
@bin bin/pr-downloader

Re: update games/recoil-rts

same update including two more things.

use proper IN_ENGINE_V to match BAR servers and be abale to join lobby.
bring bin/byar-chobby to setup and start BAR.

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/recoil-rts/Makefile,v
diff -u -p -r1.6 Makefile
--- Makefile 14 May 2024 02:50:23 -0000 1.6
+++ Makefile 2 Jul 2024 19:05:22 -0000
@@ -4,17 +4,17 @@ ONLY_FOR_ARCHS = amd64
COMMENT = real-time strategy game engine for Beyond All Reason

# To keep version in sync with Beyond All Reason: use version information at:
-# https://github.com/beyond-all-reason/BYAR-Chobby/blob/master/dist_cfg/config.json
+#https://github.com/beyond-all-reason/BYAR-Chobby/blob/master/dist_cfg/config.json
# under setups->package->id: "manual-linux", see downloads->resources or
# launch->engine
MJ = 105
# don't reduce ${MN} to just single digit to avoid update-plist going berserk
MN = 1.1
-BLD = 2472
-HASH = ga5aa45c
+BLD = 2511
+HASH = g747f18b
V = ${MJ}.${MN}pl${BLD}
# ${IN_ENGINE_V} is what recoil uses/displays internally
-IN_ENGINE_V = ${MJ}.${MN:C/\..*//}
+IN_ENGINE_V = "${MJ}.${MN}-${BLD}-${HASH} BAR${MJ}"

# Prefix '0.' to avoid future EPOCH. Upstream has indicated future versioning
# with YY.MM; once that has happened, remove '0.'
@@ -23,26 +23,30 @@ PKGNAME = recoil-rts-0.${V}
DIST_STRING = spring_bar_%7BBAR${MJ}%7D${MAJ}.${MN}-${BLD}-${HASH}

DIST_TUPLE += github beyond-all-reason spring ${DIST_STRING} .
-DIST_TUPLE += github USCiLab cereal d1fcec807b372f04e4c1041b3058e11c12853e6e \
+DIST_TUPLE += github USCiLab cereal \
+ d1fcec807b372f04e4c1041b3058e11c12853e6e \
rts/lib/cereal # BSD-3
-DIST_TUPLE += github skypjack entt e4ccb878f47245a319704912435d3c89f34ad6be \
+DIST_TUPLE += github skypjack entt \
+ e4ccb878f47245a319704912435d3c89f34ad6be \
rts/lib/entt # MIT
-DIST_TUPLE += github gflags gflags f8a0efe03aa69b3336d8e228b37d4ccb17324b88 \
+DIST_TUPLE += github gflags gflags \
+ f8a0efe03aa69b3336d8e228b37d4ccb17324b88 \
rts/lib/gflags # BSD-3
-DIST_TUPLE += github wolfpld tracy 5a1f5371b792c12aea324213e1dc738b2923ae21 \
+DIST_TUPLE += github wolfpld tracy \
+ 5a1f5371b792c12aea324213e1dc738b2923ae21 \
rts/lib/tracy # BSD-3
DIST_TUPLE += github rlcevg CircuitAI \
- aded4d13fcec74a3416e7055fcfb8275e49061a1 AI/Skirmish/BARb \
- # GPL-2.0
+ 3dee671176bdae7e6b1dd46a3c6c2c0d03c48755 \
+ AI/Skirmish/BARb # GPL-2.0
DIST_TUPLE += github rlcevg CircuitAI \
- edc74149c281e2140f28c091ed74310c11611cc7 AI/Skirmish/CircuitAI \
- # GPL-2.0
+ edc74149c281e2140f28c091ed74310c11611cc7 \
+ AI/Skirmish/CircuitAI # GPL-2.0
DIST_TUPLE += github spring SpringMapConvNG \
- 0ddd86eaa8871dc0833c69f931f55cd856c5009d tools/mapcompile \
- # GPL-2.0
+ 0ddd86eaa8871dc0833c69f931f55cd856c5009d \
+ tools/mapcompile # GPL-2.0
DIST_TUPLE += github beyond-all-reason pr-downloader \
- bdac30330eccb5ec73da299922491f3f4ee8debe tools/pr-downloader \
- # GPL-2.0
+ bdac30330eccb5ec73da299922491f3f4ee8debe \
+ tools/pr-downloader # GPL-2.0
DIST_TUPLE += github cameron314 readerwriterqueue \
8e7627d18c2108aca178888d88514179899a044f \
tools/pr-downloader/src/lib/readerwriterqueue # BSD-2
@@ -58,7 +62,8 @@ WANTLIB += ${COMPILER_LIBCXX} GL GLEW GL
WANTLIB += c curl execinfo fontconfig freetype jsoncpp m minizip ogg
WANTLIB += openal vorbis vorbisfile z

-FIX_CRLF_FILES =
tools/pr-downloader/src/lib/readerwriterqueue/benchmarks/systemtime.h
+FIX_CRLF_FILES = \
+ tools/pr-downloader/src/lib/readerwriterqueue/benchmarks/systemtime.h

COMPILER = base-clang ports-gcc
MODULES = devel/cmake
@@ -105,5 +110,8 @@ SUBST_VARS += IN_ENGINE_V

pre-configure:
${SUBST_CMD} ${WRKSRC}/rts/build/cmake/ConfigureVersion.cmake
+
+post-install:
+ ${SUBST_PROGRAM} ${FILESDIR}/byar-chobby ${PREFIX}/bin/

.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/recoil-rts/distinfo,v
diff -u -p -r1.3 distinfo
--- distinfo 14 May 2024 02:50:23 -0000 1.3
+++ distinfo 2 Jul 2024 19:05:22 -0000
@@ -1,19 +1,19 @@
SHA256 (USCiLab-cereal-d1fcec807b372f04e4c1041b3058e11c12853e6e.tar.gz) =
1Es3qUX8IoNvYuZiUmm4ZfP8BZu3jSXXWqucH4r/Mmc=
SHA256
(beyond-all-reason-pr-downloader-bdac30330eccb5ec73da299922491f3f4ee8debe.tar.gz)
= gwxe0bl/0tEFJV/f/OWaB5rkQhN1UXomLOccEUFb660=
-SHA256
(beyond-all-reason-spring-spring_bar_%7BBAR105%7D.1.1-2472-ga5aa45c.tar.gz) =
dwWRGvo76Wk+0j8czyojEEUWavYh7PEdo8mgHSE27qE=
+SHA256
(beyond-all-reason-spring-spring_bar_%7BBAR105%7D.1.1-2511-g747f18b.tar.gz) =
B7oJy6E+lzWRTagejmC5QCXP+6JBQpdrZ+3w3yFDgP8=
SHA256
(cameron314-readerwriterqueue-8e7627d18c2108aca178888d88514179899a044f.tar.gz) =
zOGtadLg/b/tn6tvYPYrvR9SExfgr14gUVngVtjPR80=
SHA256 (gflags-gflags-f8a0efe03aa69b3336d8e228b37d4ccb17324b88.tar.gz) =
TSIvq48e3kcJzf9BfRWhM2+GLXM0qBq/dtCcFez5rNE=
-SHA256 (rlcevg-CircuitAI-aded4d13fcec74a3416e7055fcfb8275e49061a1.tar.gz) =
wwZrf2GReh0OPE3ScYA+96QajUcFIbqn6pYynx8eacc=
+SHA256 (rlcevg-CircuitAI-3dee671176bdae7e6b1dd46a3c6c2c0d03c48755.tar.gz) =
anC1SjlVT3uMkIP4JtYPR3W1r/GjAW9XPrviyVOPPJ0=
SHA256 (rlcevg-CircuitAI-edc74149c281e2140f28c091ed74310c11611cc7.tar.gz) =
GYOK6lYFsrtXEutfPc4mDu9zxPLvCeJNW/so3u49q5g=
SHA256 (skypjack-entt-e4ccb878f47245a319704912435d3c89f34ad6be.tar.gz) =
gjepEu03F+8u4ifBNNEHM8Tvo9UeizLvZ5Ni4b4HCdM=
SHA256 (spring-SpringMapConvNG-0ddd86eaa8871dc0833c69f931f55cd856c5009d.tar.gz)
= lYjmnme8KMbYUH8CuQrFvtTdi6rKHmWAaMxb7Cd/ssU=
SHA256 (wolfpld-tracy-5a1f5371b792c12aea324213e1dc738b2923ae21.tar.gz) =
ZJdi2a7Yha8LBWJdrdB0Jrn8/Y/5ASrs8FG2VsBm7NM=
SIZE (USCiLab-cereal-d1fcec807b372f04e4c1041b3058e11c12853e6e.tar.gz) = 386786
SIZE
(beyond-all-reason-pr-downloader-bdac30330eccb5ec73da299922491f3f4ee8debe.tar.gz)
= 342401
-SIZE
(beyond-all-reason-spring-spring_bar_%7BBAR105%7D.1.1-2472-ga5aa45c.tar.gz) =
23003975
+SIZE
(beyond-all-reason-spring-spring_bar_%7BBAR105%7D.1.1-2511-g747f18b.tar.gz) =
23007139
SIZE
(cameron314-readerwriterqueue-8e7627d18c2108aca178888d88514179899a044f.tar.gz) =
41260
SIZE (gflags-gflags-f8a0efe03aa69b3336d8e228b37d4ccb17324b88.tar.gz) = 96474
-SIZE (rlcevg-CircuitAI-aded4d13fcec74a3416e7055fcfb8275e49061a1.tar.gz) = 1564276
+SIZE (rlcevg-CircuitAI-3dee671176bdae7e6b1dd46a3c6c2c0d03c48755.tar.gz) = 1564925
SIZE (rlcevg-CircuitAI-edc74149c281e2140f28c091ed74310c11611cc7.tar.gz) = 1381839
SIZE (skypjack-entt-e4ccb878f47245a319704912435d3c89f34ad6be.tar.gz) = 678128
SIZE (spring-SpringMapConvNG-0ddd86eaa8871dc0833c69f931f55cd856c5009d.tar.gz) =
21487
Index: files/byar-chobby
===================================================================
RCS file: files/byar-chobby
diff -N files/byar-chobby
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/byar-chobby 2 Jul 2024 19:05:22 -0000
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+DATASIZE="5242880" # 5g
+
+xm_log() {
+ echo -n "$@\nDo you want to run BAR anyway?\n\
+(If you don't increase these limits, spring might fail to work properly.)" | \
+ ${X11BASE}/bin/xmessage -file - -center -buttons yes:0,no:1 -default no
+}
+
+if [ $(ulimit -Sd) -lt ${DATASIZE} ]; then
+ ulimit -Sd ${DATASIZE} || \
+ xm_log "Cannot increase datasize-cur to at least ${DATASIZE}"
+ [ $? -eq 0 ] || exit
+fi
+
+# setup
+[[ -d ~/.local/state/Beyond\ All\ Reason ]] || \
+ mkdir -p ~/.local/state/Beyond\ All\ Reason
+cat > ~/.local/state/Beyond\ All\ Reason/chobby_config.json <<EOF
+{
+ "server": {
+ "address": "server4.beyondallreason.info",
+ "port": 8200,
+ "protocol": "spring",
+ "serverName": "BAR"
+ },
+ "game": "byar"
+}
+EOF
+
+# update
+PRD_HTTP_SEARCH_URL=https://files-cdn.beyondallreason.dev/find
+PRD_RAPID_USE_STREAMER=false
+PRD_RAPID_REPO_MASTER=https://repos-cdn.beyondallreason.dev/repos.gz
+export PRD_HTTP_SEARCH_URL PRD_RAPID_USE_STREAMER PRD_RAPID_REPO_MASTER
+pr-downloader --download-game byar:test --download-game byar-chobby:test \
+ --filesystem-writepath ~/.local/state/Beyond\ All\ Reason
+
+# start
+# XXX without --isolation
+spring --write-dir ~/.local/state/Beyond\ All\ Reason \
+ --menu rapid://byar-chobby:test
Index: patches/patch-AI_Skirmish_BARb_src_circuit_module_EconomyManager_cpp
===================================================================
RCS file:
/cvs/ports/games/recoil-rts/patches/patch-AI_Skirmish_BARb_src_circuit_module_EconomyManager_cpp,v
diff -u -p -r1.2 patch-AI_Skirmish_BARb_src_circuit_module_EconomyManager_cpp
--- patches/patch-AI_Skirmish_BARb_src_circuit_module_EconomyManager_cpp 6 May
2024 00:29:29 -0000 1.2
+++ patches/patch-AI_Skirmish_BARb_src_circuit_module_EconomyManager_cpp 2 Jul
2024 19:05:22 -0000
@@ -3,7 +3,7 @@ fix C++17 error when working with sortin
Index: AI/Skirmish/BARb/src/circuit/module/EconomyManager.cpp
--- AI/Skirmish/BARb/src/circuit/module/EconomyManager.cpp.orig
+++ AI/Skirmish/BARb/src/circuit/module/EconomyManager.cpp
-@@ -552,7 +552,9 @@ void CEconomyManager::Init()
+@@ -542,7 +542,9 @@ void CEconomyManager::Init()
? (mspInfoEnd.pull - mspInfoBegin.pull) / (mspInfoEnd.mex - mspInfoBegin.mex)
: 0.f;
}
Index: patches/patch-rts_Lua_LuaUtils_cpp
===================================================================
RCS file: /cvs/ports/games/recoil-rts/patches/patch-rts_Lua_LuaUtils_cpp,v
diff -u -p -r1.1.1.1 patch-rts_Lua_LuaUtils_cpp
--- patches/patch-rts_Lua_LuaUtils_cpp 5 May 2024 17:18:12 -0000 1.1.1.1
+++ patches/patch-rts_Lua_LuaUtils_cpp 2 Jul 2024 19:05:22 -0000
@@ -1,18 +0,0 @@
-avoid collision with ctype.h macro _L
-
-Index: rts/Lua/LuaUtils.cpp
---- rts/Lua/LuaUtils.cpp.orig
-+++ rts/Lua/LuaUtils.cpp
-@@ -1391,9 +1391,9 @@ int LuaUtils::PushDebugTraceback(lua_State* L)
-
-
-
--LuaUtils::ScopedDebugTraceBack::ScopedDebugTraceBack(lua_State* _L)
-- : L(_L)
-- , errFuncIdx(PushDebugTraceback(_L))
-+LuaUtils::ScopedDebugTraceBack::ScopedDebugTraceBack(lua_State* L)
-+ : L(L)
-+ , errFuncIdx(PushDebugTraceback(L))
- {
- assert(errFuncIdx >= 0);
- }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/recoil-rts/pkg/PLIST,v
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 5 May 2024 17:18:13 -0000 1.1.1.1
+++ pkg/PLIST 2 Jul 2024 19:05:22 -0000
@@ -1,3 +1,4 @@
+bin/byar-chobby
@bin bin/mapcompile
@bin bin/mapdecompile
@bin bin/pr-downloader



On 16/06/2024 06:55, Fabien ROMANO wrote:
> update to latest version
>
> https://github.com/beyond-all-reason/spring/compare/spring_bar_%7BBAR105%7D105.1.1-2472-ga5aa45c...spring_bar_%7BBAR105%7D105.1.1-2511-g747f18b
>
> https://github.com/rlcevg/CircuitAI/compare/aded4d13fcec74a3416e7055fcfb8275e49061a1...3dee671176bdae7e6b1dd46a3c6c2c0d03c48755
>
> One more patch merged upstream, thx thfr@.
> Use patch -E to drop the file.
>
> While there, I mute portcheck long lines report by removing the space on url.
> I also noticed other long lines and adjusted indentation (portcheck use awk length, looks like it does not handle tabulation size).
> Only two versions changed in DIST_TUPLE, see distinfo.
>
> Tested on BAR, barbarianIA works again.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/recoil-rts/Makefile,v
> diff -u -p -r1.6 Makefile
> --- Makefile 14 May 2024 02:50:23 -0000 1.6
> +++ Makefile 16 Jun 2024 05:37:37 -0000
> @@ -4,14 +4,14 @@ ONLY_FOR_ARCHS = amd64
> COMMENT = real-time strategy game engine for Beyond All Reason
>
> # To keep version in sync with Beyond All Reason: use version information at:
> -# https://github.com/beyond-all-reason/BYAR-Chobby/blob/master/dist_cfg/config.json
> +#https://github.com/beyond-all-reason/BYAR-Chobby/blob/master/dist_cfg/config.json
> # under setups->package->id: "manual-linux", see downloads->resources or
> # launch->engine
> MJ = 105
> # don't reduce ${MN} to just single digit to avoid update-plist going berserk
> MN = 1.1
> -BLD = 2472
> -HASH = ga5aa45c
> +BLD = 2511
> +HASH = g747f18b
> V = ${MJ}.${MN}pl${BLD}
> # ${IN_ENGINE_V} is what recoil uses/displays internally
> IN_ENGINE_V = ${MJ}.${MN:C/\..*//}
> @@ -23,26 +23,30 @@ PKGNAME = recoil-rts-0.${V}
> DIST_STRING = spring_bar_%7BBAR${MJ}%7D${MAJ}.${MN}-${BLD}-${HASH}
>
> DIST_TUPLE += github beyond-all-reason spring ${DIST_STRING} .
> -DIST_TUPLE += github USCiLab cereal d1fcec807b372f04e4c1041b3058e11c12853e6e \
> +DIST_TUPLE += github USCiLab cereal \
> + d1fcec807b372f04e4c1041b3058e11c12853e6e \
> rts/lib/cereal # BSD-3
> -DIST_TUPLE += github skypjack entt e4ccb878f47245a319704912435d3c89f34ad6be \
> +DIST_TUPLE += github skypjack entt \
> + e4ccb878f47245a319704912435d3c89f34ad6be \
> rts/lib/entt # MIT
> -DIST_TUPLE += github gflags gflags f8a0efe03aa69b3336d8e228b37d4ccb17324b88 \
> +DIST_TUPLE += github gflags gflags \
> + f8a0efe03aa69b3336d8e228b37d4ccb17324b88 \
> rts/lib/gflags # BSD-3
> -DIST_TUPLE += github wolfpld tracy 5a1f5371b792c12aea324213e1dc738b2923ae21 \
> +DIST_TUPLE += github wolfpld tracy \
> + 5a1f5371b792c12aea324213e1dc738b2923ae21 \
> rts/lib/tracy # BSD-3
> DIST_TUPLE += github rlcevg CircuitAI \
> - aded4d13fcec74a3416e7055fcfb8275e49061a1 AI/Skirmish/BARb \
> - # GPL-2.0
> + 3dee671176bdae7e6b1dd46a3c6c2c0d03c48755 \
> + AI/Skirmish/BARb # GPL-2.0
> DIST_TUPLE += github rlcevg CircuitAI \
> - edc74149c281e2140f28c091ed74310c11611cc7 AI/Skirmish/CircuitAI \
> - # GPL-2.0
> + edc74149c281e2140f28c091ed74310c11611cc7 \
> + AI/Skirmish/CircuitAI # GPL-2.0
> DIST_TUPLE += github spring SpringMapConvNG \
> - 0ddd86eaa8871dc0833c69f931f55cd856c5009d tools/mapcompile \
> - # GPL-2.0
> + 0ddd86eaa8871dc0833c69f931f55cd856c5009d \
> + tools/mapcompile # GPL-2.0
> DIST_TUPLE += github beyond-all-reason pr-downloader \
> - bdac30330eccb5ec73da299922491f3f4ee8debe tools/pr-downloader \
> - # GPL-2.0
> + bdac30330eccb5ec73da299922491f3f4ee8debe \
> + tools/pr-downloader # GPL-2.0
> DIST_TUPLE += github cameron314 readerwriterqueue \
> 8e7627d18c2108aca178888d88514179899a044f \
> tools/pr-downloader/src/lib/readerwriterqueue # BSD-2
> @@ -58,7 +62,8 @@ WANTLIB += ${COMPILER_LIBCXX} GL GLEW GL
> WANTLIB += c curl execinfo fontconfig freetype jsoncpp m minizip ogg
> WANTLIB += openal vorbis vorbisfile z
>
> -FIX_CRLF_FILES = tools/pr-downloader/src/lib/readerwriterqueue/benchmarks/systemtime.h
> +FIX_CRLF_FILES = \
> + tools/pr-downloader/src/lib/readerwriterqueue/benchmarks/systemtime.h
>
> COMPILER = base-clang ports-gcc
> MODULES = devel/cmake
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/recoil-rts/distinfo,v
> diff -u -p -r1.3 distinfo
> --- distinfo 14 May 2024 02:50:23 -0000 1.3
> +++ distinfo 16 Jun 2024 05:37:37 -0000
> @@ -1,19 +1,19 @@
> SHA256 (USCiLab-cereal-d1fcec807b372f04e4c1041b3058e11c12853e6e.tar.gz) = 1Es3qUX8IoNvYuZiUmm4ZfP8BZu3jSXXWqucH4r/Mmc=
> SHA256 (beyond-all-reason-pr-downloader-bdac30330eccb5ec73da299922491f3f4ee8debe.tar.gz) = gwxe0bl/0tEFJV/f/OWaB5rkQhN1UXomLOccEUFb660=
> -SHA256 (beyond-all-reason-spring-spring_bar_%7BBAR105%7D.1.1-2472-ga5aa45c.tar.gz) = dwWRGvo76Wk+0j8czyojEEUWavYh7PEdo8mgHSE27qE=
> +SHA256 (beyond-all-reason-spring-spring_bar_%7BBAR105%7D.1.1-2511-g747f18b.tar.gz) = B7oJy6E+lzWRTagejmC5QCXP+6JBQpdrZ+3w3yFDgP8=
> SHA256 (cameron314-readerwriterqueue-8e7627d18c2108aca178888d88514179899a044f.tar.gz) = zOGtadLg/b/tn6tvYPYrvR9SExfgr14gUVngVtjPR80=
> SHA256 (gflags-gflags-f8a0efe03aa69b3336d8e228b37d4ccb17324b88.tar.gz) = TSIvq48e3kcJzf9BfRWhM2+GLXM0qBq/dtCcFez5rNE=
> -SHA256 (rlcevg-CircuitAI-aded4d13fcec74a3416e7055fcfb8275e49061a1.tar.gz) = wwZrf2GReh0OPE3ScYA+96QajUcFIbqn6pYynx8eacc=
> +SHA256 (rlcevg-CircuitAI-3dee671176bdae7e6b1dd46a3c6c2c0d03c48755.tar.gz) = anC1SjlVT3uMkIP4JtYPR3W1r/GjAW9XPrviyVOPPJ0=
> SHA256 (rlcevg-CircuitAI-edc74149c281e2140f28c091ed74310c11611cc7.tar.gz) = GYOK6lYFsrtXEutfPc4mDu9zxPLvCeJNW/so3u49q5g=
> SHA256 (skypjack-entt-e4ccb878f47245a319704912435d3c89f34ad6be.tar.gz) = gjepEu03F+8u4ifBNNEHM8Tvo9UeizLvZ5Ni4b4HCdM=
> SHA256 (spring-SpringMapConvNG-0ddd86eaa8871dc0833c69f931f55cd856c5009d.tar.gz) = lYjmnme8KMbYUH8CuQrFvtTdi6rKHmWAaMxb7Cd/ssU=
> SHA256 (wolfpld-tracy-5a1f5371b792c12aea324213e1dc738b2923ae21.tar.gz) = ZJdi2a7Yha8LBWJdrdB0Jrn8/Y/5ASrs8FG2VsBm7NM=
> SIZE (USCiLab-cereal-d1fcec807b372f04e4c1041b3058e11c12853e6e.tar.gz) = 386786
> SIZE (beyond-all-reason-pr-downloader-bdac30330eccb5ec73da299922491f3f4ee8debe.tar.gz) = 342401
> -SIZE (beyond-all-reason-spring-spring_bar_%7BBAR105%7D.1.1-2472-ga5aa45c.tar.gz) = 23003975
> +SIZE (beyond-all-reason-spring-spring_bar_%7BBAR105%7D.1.1-2511-g747f18b.tar.gz) = 23007139
> SIZE (cameron314-readerwriterqueue-8e7627d18c2108aca178888d88514179899a044f.tar.gz) = 41260
> SIZE (gflags-gflags-f8a0efe03aa69b3336d8e228b37d4ccb17324b88.tar.gz) = 96474
> -SIZE (rlcevg-CircuitAI-aded4d13fcec74a3416e7055fcfb8275e49061a1.tar.gz) = 1564276
> +SIZE (rlcevg-CircuitAI-3dee671176bdae7e6b1dd46a3c6c2c0d03c48755.tar.gz) = 1564925
> SIZE (rlcevg-CircuitAI-edc74149c281e2140f28c091ed74310c11611cc7.tar.gz) = 1381839
> SIZE (skypjack-entt-e4ccb878f47245a319704912435d3c89f34ad6be.tar.gz) = 678128
> SIZE (spring-SpringMapConvNG-0ddd86eaa8871dc0833c69f931f55cd856c5009d.tar.gz) = 21487
> Index: patches/patch-AI_Skirmish_BARb_src_circuit_module_EconomyManager_cpp
> ===================================================================
> RCS file: /cvs/ports/games/recoil-rts/patches/patch-AI_Skirmish_BARb_src_circuit_module_EconomyManager_cpp,v
> diff -u -p -r1.2 patch-AI_Skirmish_BARb_src_circuit_module_EconomyManager_cpp
> --- patches/patch-AI_Skirmish_BARb_src_circuit_module_EconomyManager_cpp 6 May 2024 00:29:29 -0000 1.2
> +++ patches/patch-AI_Skirmish_BARb_src_circuit_module_EconomyManager_cpp 16 Jun 2024 05:37:37 -0000
> @@ -3,7 +3,7 @@ fix C++17 error when working with sortin
> Index: AI/Skirmish/BARb/src/circuit/module/EconomyManager.cpp
> --- AI/Skirmish/BARb/src/circuit/module/EconomyManager.cpp.orig
> +++ AI/Skirmish/BARb/src/circuit/module/EconomyManager.cpp
> -@@ -552,7 +552,9 @@ void CEconomyManager::Init()
> +@@ -542,7 +542,9 @@ void CEconomyManager::Init()
> ? (mspInfoEnd.pull - mspInfoBegin.pull) / (mspInfoEnd.mex - mspInfoBegin.mex)
> : 0.f;
> }
> Index: patches/patch-rts_Lua_LuaUtils_cpp
> ===================================================================
> RCS file: patches/patch-rts_Lua_LuaUtils_cpp
> diff -N patches/patch-rts_Lua_LuaUtils_cpp
> --- patches/patch-rts_Lua_LuaUtils_cpp 5 May 2024 17:18:12 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,18 +0,0 @@
> -avoid collision with ctype.h macro _L
> -
> -Index: rts/Lua/LuaUtils.cpp
> ---- rts/Lua/LuaUtils.cpp.orig
> -+++ rts/Lua/LuaUtils.cpp
> -@@ -1391,9 +1391,9 @@ int LuaUtils::PushDebugTraceback(lua_State* L)
> -
> -
> -
> --LuaUtils::ScopedDebugTraceBack::ScopedDebugTraceBack(lua_State* _L)
> -- : L(_L)
> -- , errFuncIdx(PushDebugTraceback(_L))
> -+LuaUtils::ScopedDebugTraceBack::ScopedDebugTraceBack(lua_State* L)
> -+ : L(L)
> -+ , errFuncIdx(PushDebugTraceback(L))
> - {
> - assert(errFuncIdx >= 0);
> - }

--
Fabien Romano

Re: Update from maintainer: devel/objfw 1.1.5

On Sun, Jul 07, 2024 at 10:52:51PM +0200, Jonathan Schleifer wrote:
>
> > Am 07.07.2024 um 21:39 schrieb Theo Buehler <tb@theobuehler.org>:
> >
> > On Sun, Jul 07, 2024 at 12:33:38PM +0200, Jonathan Schleifer wrote:
> >>> Am 07.07.24 um 11:13 schrieb Theo Buehler:
> >>> Thanks. I see lots of changes in exported symbols that should usually
> >>> result in a major bump for libobjfw and libobjfwrt.
> >>
> >> Thanks for checking!
> >>
> >>> Is there some reason these bumps were left out?
> >>
> >> Yes, these were private symbols that were accidentally visible. Nothing
> >> should have used them.
> >
> > Thanks for the explanations. I don't think intention is good enough to
> > avoid a bump. These are still symbols that were exported and that could
> > (in principle) have been used even if they are in a private header that
> > wasn't installed. I could agree if all the symbols had been in the
> > private namespace, but that's not the case here.
>
> There is no private namespace in ObjC, unfortunately, as it doesn't have any namespaces just like C. The only way to avoid symbols being exported is to add __attribute__((visibility(hidden))) to every declaration of a private function, which is exactly what was added here.

I see.

> > So unless there is a really strong reason not to, I would suggest we
> > bump the major of both libraries.
>
> I'm pretty sure there was no usage of these in the wild, but I'm ok with a bump. Can you just do it on import or should I send another patch?

Let's just play it safe. I added the bump myself.

Re: (boring) why is KEEPKERNELS unset and obj gets cleaned?

On Sun, Jul 07, 2024 at 05:56:24PM +0200, Jan Stary wrote:
> > and started talking about something else entirely.
>
> Right.
>
> > you're wasting my time (and other people's time)
> > Now when it comes to polluting the list,
> > I don't think I'm the one polluting it..
>
> jesus fucking christ, that's _why_ I am sending it offlist;
> unlike you, who takes the extra bullshit back to the list,
> after being told not to.

Yeah, because I was correcting my own double-mistake (1st mistake was I
accidentally replied to your offlist email and 2nd was that I had to correct my
reply which was already on the list so ohwell)


> > I want to become a tester for an audio bug which
> > has been in OpenBSD for years for one of my motherboards.
>
> That, for a change, would have value.
> Have you described the bug somewhere?
>

I Agree!

https://marc.info/?l=openbsd-bugs&m=171258729026792&w=2
https://marc.info/?l=openbsd-tech&m=167800286026964&w=2

I'm re-opening the tread in a minute and am applying as a tester if possible :)

Re: (boring) why is KEEPKERNELS unset and obj gets cleaned?

On Sun, Jul 07, 2024 at 07:27:32PM +0100, chohag@jtan.com wrote:
> Anon Loli writes:
> > If you were to read all of the emails in the thread for 1st to last, you
> > would've seen that I mentioned that I not only read but also followed
> > that link as well as release(8).
>
> If you followed the instructions correctly you would not have wiped
> your precious imagery by your own hand nor would you have ended up
> with a /usr/sys, but you did both of these things. So either your
> ability to process a list in order is at fault or your memory is.
>
> You would be better off with more asking and less telling. Patiently
> listen to how a project with nearly 50 years of history is already
> firmly established rather than informing its developers how they
> are doing it wrong.
>
> Matthew
>

Oh, I followed those instructions well, and you would know the real problem if
you read the entire thread (assuming you're talking about the DD issue), I used
DD dozens if not hundreds of times, I was just not being careful, that's all..
It was the right drive before I unplug it and plugged a different drive, then
plugged back in the original drive (the one I fucked up)..

What do you mean with a /usr/sys? Nothing is wrong there, I just didn't expect
src.tar.gz and CVS's src/ to be different... no one would unless they've read
the most relatable of man pages (probably file sets related) and remember
everything perfectly.. all I had to do is move my /usr/sys to /usr/src/sys, no
big issue there.
A lot of things in OpenBSD work on assumption that the user knows a few too
many things, it's not nobrain-friendly, it requires mediocre brain usage,
compared to some other OS manual pages (not in their entirety, every OS has
it's own flaw)

Well if the 50 years of history still can't explain me how they can't handle
the differential between datetime of object files, and thus verify the object
file is/isn't outdated and thus wether or not the source file needs a
recompile, then I don't know what to tell you...
Someone mentioned /usr/lib or something like that, but I don't think that
really changes anything, as long as the machine isn't SERIOUSLY fucked up when
it comes to datetime, it should work even if shit is on another fucking
continent on someone else's computer
Am I missing something? Then tell me
Am I onto something? Then stop being butthurt about it xD
Am I a little annoying? Cmon it would be boring without that, just admit it,
why be so serious all the time

For example CVS repository don't get verified because "that's how it worked for
decades and from the start it wasn't made to be verifiable because no one
thought anyone would ever do anything malicious" (as far as someone on the
mailing list told me and that's how I understood it), you're telling me that
it's okay to have that?
Hello? Are we just assuming that mirrors are trust-worthy?
I trusted my own fucking family and they ruined my life, I'm not trusting
fucking mirrors, and no one should, do you understand me?
I'm only trusting openbsd.org and that's it (which also shouldn't be trusted,
but oh well)
There are many things that your "50 years of history firmly established"
project is missing, and you aren't seeing it because as far as I see, the
following goes for you:

Like I said, I consider most of you normal people until proven wrong, and
normal people even if they have 50 years of programming experience are still
missing an important factor which is critical thinking, in other to become
superoir and be a standalone responsible developer
Programmers have superior critical thinking than non-programmers, but normal
programmers are inferior to programmers which excell in critical thinking
and/or have autism.

Re: Update from maintainer: devel/objfw 1.1.5

> Am 07.07.2024 um 21:39 schrieb Theo Buehler <tb@theobuehler.org>:
>
> On Sun, Jul 07, 2024 at 12:33:38PM +0200, Jonathan Schleifer wrote:
>>> Am 07.07.24 um 11:13 schrieb Theo Buehler:
>>> Thanks. I see lots of changes in exported symbols that should usually
>>> result in a major bump for libobjfw and libobjfwrt.
>>
>> Thanks for checking!
>>
>>> Is there some reason these bumps were left out?
>>
>> Yes, these were private symbols that were accidentally visible. Nothing
>> should have used them.
>
> Thanks for the explanations. I don't think intention is good enough to
> avoid a bump. These are still symbols that were exported and that could
> (in principle) have been used even if they are in a private header that
> wasn't installed. I could agree if all the symbols had been in the
> private namespace, but that's not the case here.

There is no private namespace in ObjC, unfortunately, as it doesn't have any namespaces just like C. The only way to avoid symbols being exported is to add __attribute__((visibility(hidden))) to every declaration of a private function, which is exactly what was added here.

> So unless there is a really strong reason not to, I would suggest we
> bump the major of both libraries.

I'm pretty sure there was no usage of these in the wild, but I'm ok with a bump. Can you just do it on import or should I send another patch?

--
Jonathan

Re: [Maintainer Update] archivers/zpaqfranz-60.3

On 7/7/24 16:11, tux0r wrote:
> New in this version: "a few microfixes for compilability on various
> systems".
>
> Patch attached.
>

Committed, thanks!

[Maintainer Update] archivers/zpaqfranz-60.3

diff --git a/archivers/zpaqfranz/Makefile b/archivers/zpaqfranz/Makefile
index 1d6a54bf8be..c4709b505b5 100644
--- a/archivers/zpaqfranz/Makefile
+++ b/archivers/zpaqfranz/Makefile
@@ -1,7 +1,7 @@
BROKEN-sparc64 = SIGBUS due to unaligned access when running tests

COMMENT = journaling archiver for incremental backup, fork of ZPAQ
-DIST_TUPLE = github fcorbelli zpaqfranz 59.5 .
+DIST_TUPLE = github fcorbelli zpaqfranz 60.3 .
CATEGORIES = archivers
MAINTAINER = tux0r <tux0r@rosaelefanten.org>

diff --git a/archivers/zpaqfranz/distinfo b/archivers/zpaqfranz/distinfo
index 2ca695afeeb..236bccd7e03 100644
--- a/archivers/zpaqfranz/distinfo
+++ b/archivers/zpaqfranz/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcorbelli-zpaqfranz-59.5.tar.gz) = 2uDv8BuHLw9YCE0vlONUbodSMOH77YjvqoGaXBeSVD8=
-SIZE (fcorbelli-zpaqfranz-59.5.tar.gz) = 1940033
+SHA256 (fcorbelli-zpaqfranz-60.3.tar.gz) = M3gL6tYCLwXGlFtxGbATQoCerNqkw2a3SS33EriB4vk=
+SIZE (fcorbelli-zpaqfranz-60.3.tar.gz) = 1955650
New in this version: "a few microfixes for compilability on various
systems".

Patch attached.

Re: Update from maintainer: devel/objfw 1.1.5

On Sun, Jul 07, 2024 at 12:33:38PM +0200, Jonathan Schleifer wrote:
> Am 07.07.24 um 11:13 schrieb Theo Buehler:
> > Thanks. I see lots of changes in exported symbols that should usually
> > result in a major bump for libobjfw and libobjfwrt.
>
> Thanks for checking!
>
> > Is there some reason these bumps were left out?
>
> Yes, these were private symbols that were accidentally visible. Nothing
> should have used them.

Thanks for the explanations. I don't think intention is good enough to
avoid a bump. These are still symbols that were exported and that could
(in principle) have been used even if they are in a private header that
wasn't installed. I could agree if all the symbols had been in the
private namespace, but that's not the case here.

So unless there is a really strong reason not to, I would suggest we
bump the major of both libraries.

Re: [NEW] x11/contour (work-in-progress)

On Sun, Jul 07, 2024 at 03:01:56PM +0900, SASANO Takayoshi wrote:
> Hello,

Thanks, I got this all to build and was able to spawn a contour
terminal, but I think this needs some more work. The prerequisites
first:

> https://marc.info/?l=openbsd-ports&m=171961710727187&w=2 (libunicode)

- can leave out HOMEPAGE (automatically set by GH_*)
- can scratch first line of DESCR
- BUILD_DEPENDS on python - add lang/python to MODULES?:
[0/24] cd /usr/ports/pobj/libunicode-0.4.0/build-amd64 && /usr/local/bin/python3.11 /usr/ports/pobj/libunicode-0.4.0/libunicode-0.4.0/src/libunicode/mktables.py /usr/local/share/unicode/ucd
- take MAINTAINER?

> https://marc.info/?l=openbsd-ports&m=171961232324802&w=2 (boxed-cpp)

- use NO_BUILD = Yes and remove COMPILER line
- probably also PKG_ARCH=* as only a header file
- can scratch first line of DESCR
- take MAINTAINER?
- remove HOMEPAGE (automatically set by GH_*)

With DESCR adjusted, HOMEPAGE removed, python build dependency honored,
and NO_BUILD addressed, the ports libunicode and boxed-cpp are ok thfr@

> I am working x11/contour, contour-terminal (http://contour-terminal.org/).
> Here is the commit-4c71d0cce2e63a23859a1cf7b389dc9e872384a1 based ports,
> work-in-progress version.

I think this needs more work, especially addressing the issues with
port-lib-depends-check, portcheck, and make install, as well as picking
a clearer version number IMO. Here my notes on the contour port draft:

- superfluous '\' at the end of BUILD_DEPENDS
- take MAINTAINER?
- can leave out CONFIGURE_STYLE = cmake (set by module)
- last sentence in DESCR is more written like marketing than a description
- make port-lib-depends-check:
Missing: crypto.54 (/usr/local/bin/contour) (system lib)
Missing lib: ssh2.10 (/usr/local/bin/contour) (NOT REACHABLE)
Missing: ssl.57 (/usr/local/bin/contour) (system lib)
WANTLIB += crypto ssl
=> also LIB_DEPENDS on security/libssh2
- portcheck:
no leading articles in COMMENT, please
missing RUN_DEPENDS+=x11/gtk+4,-guic
missing RUN_DEPENDS+=devel/desktop-file-utils
- I suggest: COMMENT=modern & fast terminal emulator
- make install:
Error in file "/usr/local/share/applications/org.contourterminal.Contour.desktop": "" is an invalid MIME type ("" does not contain a subtype)

Re: Python numpy Floating point exception in latest snapshot

On 2024/07/07 16:57, Ali Farzanrad wrote:
> I'm really sorry, my files were broken.
> I didn't have any unexpected power outage, so I never expected that my
> files might be broken.
>
> I fixed my files using this command:
>
> # pkg_add -uDsnap -Dinstalled -Dchecksum

Hmm, that's unexpected! I suggest a run of pkg_check as w3ll, then.
Amongst other things, it verifies hashes for files of all installed
packages.

> > It seems that lldb is working, so I included my lldb output at the end
> > of this email.

Amongst porters we're mostly more familiar with gdb output/formatting
etc so I think that's generally easier for most of us. Also, there's
specific Python support in gdb (which IIRC is setup in the ports version
automatically), so on occasion it can give a bit better info than lldb.

Re: (boring) why is KEEPKERNELS unset and obj gets cleaned?

Anon Loli writes:
> If you were to read all of the emails in the thread for 1st to last, you
> would've seen that I mentioned that I not only read but also followed
> that link as well as release(8).

If you followed the instructions correctly you would not have wiped
your precious imagery by your own hand nor would you have ended up
with a /usr/sys, but you did both of these things. So either your
ability to process a list in order is at fault or your memory is.

You would be better off with more asking and less telling. Patiently
listen to how a project with nearly 50 years of history is already
firmly established rather than informing its developers how they
are doing it wrong.

Matthew

Re: Python numpy Floating point exception in latest snapshot

I'm really sorry, my files were broken.
I didn't have any unexpected power outage, so I never expected that my
files might be broken.

I fixed my files using this command:

# pkg_add -uDsnap -Dinstalled -Dchecksum


Ali Farzanrad <ali_farzanrad@riseup.net> wrote:
> Hi Stuart,
>
> Stuart Henderson <stu@spacehopper.org> wrote:
> > I don't see that here.
> >
> > Firstly, did you run pkg_add -u after updating?
>
> Yes. I also ran this command to ensure everything is up to date:
> # pkg_add -uDsnap -Dinstalled
>
> However I couldn't reproduce this error on a clean install on same
> computer (Minisforum UM790 with Ryzen 9 7940HS).
>
> > Install the gdb and debug-py3-numpy packages (as well as the
> > debug-python you already have) and use the 'egdb' binary. The version
> > of gdb in base is barely useful.
>
> It seems that lldb is working, so I included my lldb output at the end
> of this email.
>
> > Which cpu architecture? amd64, arm64, sparc64, [...]?
>
> amd64
>
>
> $ lldb /usr/local/bin/python3.11
> (lldb) target create "/usr/local/bin/python3.11"
> Current executable set to '/usr/local/bin/python3.11' (x86_64).
> (lldb) run -c "import numpy"
> Process 48416 launched: '/usr/local/bin/python3.11' (x86_64)
> Process 48416 stopped
> * thread #1, stop reason = signal SIGFPE
> frame #0: 0x0000069e436d7ea5 ld.so`_dl_find_symbol_obj(obj=0x0000069e12186000, sl=0x0000784c8e3b7198) at resolve.c:626:46
> 623 } else {
> 624 Elf_Word si;
> 625
> -> 626 for (si = obj->buckets_elf[sl->sl_elf_hash % obj->nbuckets];
> ^
> 627 si != STN_UNDEF; si = obj->chains_elf[si]) {
> 628 const Elf_Sym *sym = symt + si;
> 629
> (lldb) list
> 630 int r = matched_symbol(obj, sym, sl);
> 631 if (r)
> 632 return r > 0;
> 633 }
> 634 }
> 635 return 0;
> 636 }
> (lldb) print obj
> (elf_object_t *) $0 = 0x0000069e12186000
> (lldb) print obj->nbuckets
> (u_int32_t) $1 = 0
> (lldb) bt
> * thread #1, stop reason = signal SIGFPE
> * frame #0: 0x0000069e436d7ea5 ld.so`_dl_find_symbol_obj(obj=0x0000069e12186000, sl=0x0000784c8e3b7198) at resolve.c:626:46
> frame #1: 0x0000069e436d7b80 ld.so`_dl_find_symbol(name="PyInit__multiarray_umath", flags=96, ref_sym=0x0000000000000000, req_obj=0x0000069e12186000) at resolve.c:669:7
> frame #2: 0x0000069e436d3a82 ld.so`dlsym(handle=<unavailable>, name="PyInit__multiarray_umath") at dlfcn.c:206:7
> frame #3: 0x0000069eeb781e9e libpython3.11.so.0.0`_PyImport_FindSharedFuncptr(prefix="PyInit", shortname="_multiarray_umath", pathname="/usr/local/lib/python3.11/site-packages/numpy/core/_multiarray_umath.cpython-311.so", fp=0x0000000000000000) at dynload_shlib.c:109:22
> frame #4: 0x0000069eeb73621f libpython3.11.so.0.0`_imp_create_dynamic at importdl.c:139:18
> frame #5: 0x0000069eeb63da1e libpython3.11.so.0.0`cfunction_vectorcall_FASTCALL at methodobject.c:427:24
> frame #6: 0x0000069eeb6fcaec libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:0
> frame #7: 0x0000069eeb6ff24b libpython3.11.so.0.0`_PyEval_Vector at pycore_ceval.h:73:16
> frame #8: 0x0000069eeb5e3261 libpython3.11.so.0.0`object_vacall at pycore_call.h:92:11
> frame #9: 0x0000069eeb5e3043 libpython3.11.so.0.0`PyObject_CallMethodObjArgs at call.c:879:24
> frame #10: 0x0000069eeb730fec libpython3.11.so.0.0`PyImport_ImportModuleLevelObject at import.c:1748:11
> frame #11: 0x0000069eeb6f5236 libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:7422:15
> frame #12: 0x0000069eeb6e985e libpython3.11.so.0.0`PyEval_EvalCode at pycore_ceval.h:73:16
> frame #13: 0x0000069eeb6e4e9f libpython3.11.so.0.0`builtin_exec at bltinmodule.c:1077:17
> frame #14: 0x0000069eeb63db39 libpython3.11.so.0.0`cfunction_vectorcall_FASTCALL_KEYWORDS at methodobject.c:443:24
> frame #15: 0x0000069eeb6fcaec libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:0
> frame #16: 0x0000069eeb6ff24b libpython3.11.so.0.0`_PyEval_Vector at pycore_ceval.h:73:16
> frame #17: 0x0000069eeb5e3261 libpython3.11.so.0.0`object_vacall at pycore_call.h:92:11
> frame #18: 0x0000069eeb5e3043 libpython3.11.so.0.0`PyObject_CallMethodObjArgs at call.c:879:24
> frame #19: 0x0000069eeb730fec libpython3.11.so.0.0`PyImport_ImportModuleLevelObject at import.c:1748:11
> frame #20: 0x0000069eeb6e3609 libpython3.11.so.0.0`builtin___import__ at bltinmodule.c:277:12
> frame #21: 0x0000069eeb63db39 libpython3.11.so.0.0`cfunction_vectorcall_FASTCALL_KEYWORDS at methodobject.c:443:24
> frame #22: 0x0000069eeb6fcaec libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:0
> frame #23: 0x0000069eeb6ff24b libpython3.11.so.0.0`_PyEval_Vector at pycore_ceval.h:73:16
> frame #24: 0x0000069eeb5e3261 libpython3.11.so.0.0`object_vacall at pycore_call.h:92:11
> frame #25: 0x0000069eeb5e3043 libpython3.11.so.0.0`PyObject_CallMethodObjArgs at call.c:879:24
> frame #26: 0x0000069eeb7311e2 libpython3.11.so.0.0`PyImport_ImportModuleLevelObject at import.c:1918:25
> frame #27: 0x0000069eeb6f5236 libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:7422:15
> frame #28: 0x0000069eeb6e985e libpython3.11.so.0.0`PyEval_EvalCode at pycore_ceval.h:73:16
> frame #29: 0x0000069eeb6e4e9f libpython3.11.so.0.0`builtin_exec at bltinmodule.c:1077:17
> frame #30: 0x0000069eeb63db39 libpython3.11.so.0.0`cfunction_vectorcall_FASTCALL_KEYWORDS at methodobject.c:443:24
> frame #31: 0x0000069eeb6fcaec libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:0
> frame #32: 0x0000069eeb6ff24b libpython3.11.so.0.0`_PyEval_Vector at pycore_ceval.h:73:16
> frame #33: 0x0000069eeb5e3261 libpython3.11.so.0.0`object_vacall at pycore_call.h:92:11
> frame #34: 0x0000069eeb5e3043 libpython3.11.so.0.0`PyObject_CallMethodObjArgs at call.c:879:24
> frame #35: 0x0000069eeb730fec libpython3.11.so.0.0`PyImport_ImportModuleLevelObject at import.c:1748:11
> frame #36: 0x0000069eeb6e3609 libpython3.11.so.0.0`builtin___import__ at bltinmodule.c:277:12
> frame #37: 0x0000069eeb63db39 libpython3.11.so.0.0`cfunction_vectorcall_FASTCALL_KEYWORDS at methodobject.c:443:24
> frame #38: 0x0000069eeb6fcaec libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:0
> frame #39: 0x0000069eeb6ff24b libpython3.11.so.0.0`_PyEval_Vector at pycore_ceval.h:73:16
> frame #40: 0x0000069eeb5e3261 libpython3.11.so.0.0`object_vacall at pycore_call.h:92:11
> frame #41: 0x0000069eeb5e3043 libpython3.11.so.0.0`PyObject_CallMethodObjArgs at call.c:879:24
> frame #42: 0x0000069eeb7311e2 libpython3.11.so.0.0`PyImport_ImportModuleLevelObject at import.c:1918:25
> frame #43: 0x0000069eeb6f5236 libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:7422:15
> frame #44: 0x0000069eeb6e985e libpython3.11.so.0.0`PyEval_EvalCode at pycore_ceval.h:73:16
> frame #45: 0x0000069eeb6e4e9f libpython3.11.so.0.0`builtin_exec at bltinmodule.c:1077:17
> frame #46: 0x0000069eeb63db39 libpython3.11.so.0.0`cfunction_vectorcall_FASTCALL_KEYWORDS at methodobject.c:443:24
> frame #47: 0x0000069eeb6fcaec libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:0
> frame #48: 0x0000069eeb6ff24b libpython3.11.so.0.0`_PyEval_Vector at pycore_ceval.h:73:16
> frame #49: 0x0000069eeb5e3261 libpython3.11.so.0.0`object_vacall at pycore_call.h:92:11
> frame #50: 0x0000069eeb5e3043 libpython3.11.so.0.0`PyObject_CallMethodObjArgs at call.c:879:24
> frame #51: 0x0000069eeb730fec libpython3.11.so.0.0`PyImport_ImportModuleLevelObject at import.c:1748:11
> frame #52: 0x0000069eeb6e3609 libpython3.11.so.0.0`builtin___import__ at bltinmodule.c:277:12
> frame #53: 0x0000069eeb63db39 libpython3.11.so.0.0`cfunction_vectorcall_FASTCALL_KEYWORDS at methodobject.c:443:24
> frame #54: 0x0000069eeb6fcaec libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:0
> frame #55: 0x0000069eeb6ff24b libpython3.11.so.0.0`_PyEval_Vector at pycore_ceval.h:73:16
> frame #56: 0x0000069eeb5e3261 libpython3.11.so.0.0`object_vacall at pycore_call.h:92:11
> frame #57: 0x0000069eeb5e3043 libpython3.11.so.0.0`PyObject_CallMethodObjArgs at call.c:879:24
> frame #58: 0x0000069eeb7311e2 libpython3.11.so.0.0`PyImport_ImportModuleLevelObject at import.c:1918:25
> frame #59: 0x0000069eeb6f5236 libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:7422:15
> frame #60: 0x0000069eeb6e985e libpython3.11.so.0.0`PyEval_EvalCode at pycore_ceval.h:73:16
> frame #61: 0x0000069eeb6e4e9f libpython3.11.so.0.0`builtin_exec at bltinmodule.c:1077:17
> frame #62: 0x0000069eeb63db39 libpython3.11.so.0.0`cfunction_vectorcall_FASTCALL_KEYWORDS at methodobject.c:443:24
> frame #63: 0x0000069eeb6fcaec libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:0
> frame #64: 0x0000069eeb6ff24b libpython3.11.so.0.0`_PyEval_Vector at pycore_ceval.h:73:16
> frame #65: 0x0000069eeb5e3261 libpython3.11.so.0.0`object_vacall at pycore_call.h:92:11
> frame #66: 0x0000069eeb5e3043 libpython3.11.so.0.0`PyObject_CallMethodObjArgs at call.c:879:24
> frame #67: 0x0000069eeb730fec libpython3.11.so.0.0`PyImport_ImportModuleLevelObject at import.c:1748:11
> frame #68: 0x0000069eeb6f5236 libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:7422:15
> frame #69: 0x0000069eeb6e985e libpython3.11.so.0.0`PyEval_EvalCode at pycore_ceval.h:73:16
> frame #70: 0x0000069eeb75a429 libpython3.11.so.0.0`run_mod [inlined] run_eval_code_obj(tstate=0x0000069eeb93d760, co=0x0000069e3475b5d0, globals=0x0000069e3482c2c0, locals=0x0000069e3482c2c0) at pythonrun.c:1741:9
> frame #71: 0x0000069eeb75a3f5 libpython3.11.so.0.0`run_mod(mod=<unavailable>, filename=<unavailable>, globals=0x0000069e3482c2c0, locals=0x0000069e3482c2c0, flags=<unavailable>, arena=<unavailable>) at pythonrun.c:1762:19
> frame #72: 0x0000069eeb75df30 libpython3.11.so.0.0`PyRun_SimpleStringFlags [inlined] PyRun_StringFlags(str="import numpy\n", start=257, globals=0x0000069e3482c2c0, locals=0x0000069e3482c2c0, flags=0x0000784c8e3ba400) at pythonrun.c:1632:15
> frame #73: 0x0000069eeb75dedc libpython3.11.so.0.0`PyRun_SimpleStringFlags(command="import numpy\n", flags=0x0000784c8e3ba400) at pythonrun.c:487:9
> frame #74: 0x0000069eeb782722 libpython3.11.so.0.0`Py_RunMain [inlined] pymain_run_command(command=<unavailable>) at main.c:255:11
> frame #75: 0x0000069eeb782693 libpython3.11.so.0.0`Py_RunMain [inlined] pymain_run_python(exitcode=<unavailable>) at main.c:592:21
> frame #76: 0x0000069eeb7825b0 libpython3.11.so.0.0`Py_RunMain at main.c:680:5
> frame #77: 0x0000069eeb783e45 libpython3.11.so.0.0`pymain_main(args=0x0000784c8e3ba7a8) at main.c:710:12
> frame #78: 0x0000069eeb78426c libpython3.11.so.0.0`Py_BytesMain(argc=<unavailable>, argv=0x0000784c8e3b7198) at main.c:734:12
> frame #79: 0x0000069c102f694b python3.11`__start + 299
> (lldb) down
> error: Already at the bottom of the stack.
> (lldb) up
> frame #1: 0x0000069e436d7b80 ld.so`_dl_find_symbol(name="PyInit__multiarray_umath", flags=96, ref_sym=0x0000000000000000, req_obj=0x0000069e12186000) at resolve.c:669:7
> 666 struct object_vector vec;
> 667 int i;
> 668
> -> 669 if (_dl_find_symbol_obj(req_obj, &sl))
> ^
> 670 goto found;
> 671
> 672 /* weak definition in the specified object is good enough */
> (lldb) print sl
> (symlookup) $2 = {
> sl_name = 0x0000784c8e3b7370 "PyInit__multiarray_umath"
> sl_out = {
> sym = NULL
> obj = NULL
> }
> sl_weak_out = {
> sym = NULL
> obj = NULL
> }
> sl_elf_hash = 182513432
> sl_gnu_hash = 3258556712
> sl_flags = 96
> }
> (lldb) print obj
> error: expression failed to parse:
> error: <user expression 3>:1:1: use of undeclared identifier 'obj'
> obj
> ^
> (lldb) print req_obj
> (elf_object_t *) $3 = 0x0000069e12186000
> (lldb) print *req_obj
> (elf_object_t) $4 = {
> obj_base = 7278442606592
> load_name = 0x0000069e12187500 "/usr/local/lib/python3.11/site-packages/numpy/core/_multiarray_umath.cpython-311.so"
> load_dyn = 0x0000069ea53f88f0
> next = NULL
> prev = 0x0000069e12188000
> load_base = 7278442606592
> load_list = 0x0000069ec896e700
> load_size = 4677632
> Dyn = {
> info = {
> [0] = 0
> [...]
> [36] = 0
> }
> u = {
> null = 0
> needed = 0
> pltrelsz = 0
> pltgot = 0x0000000000000000
> hash = 0x0000000000000000
> strtab = 0x0000000000000000
> symtab = NULL
> rela = NULL
> relasz = 0
> relaent = 0
> strsz = 0
> syment = 0
> init = 0x0000000000000000
> fini = 0x0000000000000000
> soname = 0x0000000000000000
> rpath = 0x0000000000000000
> symbolic = 0
> rel = NULL
> relsz = 0
> relent = 0
> pltrel = 0
> debug = 0
> textrel = 0
> jmprel = 0
> bind_now = 0
> init_array = 0x0000000000000000
> fini_array = 0x0000000000000000
> init_arraysz = 0
> fini_arraysz = 0
> runpath = 0x0000000000000000
> flags = 0
> encoding = 0
> preinit_array = 0x0000000000000000
> preinit_arraysz = 0
> unassigned = 0
> relrsz = 0
> relr = 0x0000000000000000
> }
> }
> relacount = 0
> relcount = 0
> status = 773
> phdrp = 0x0000069ea4fc7040
> phdrc = 11
> obj_type = 4
> obj_flags = 1
> nodelete = 0
> nbuckets = 0
> nchains = 0
> hash_u = {
> u_elf = {
> buckets = 0x0000000000000000
> chains = 0x0000000000000000
> }
> u_gnu = {
> buckets = 0x0000000000000000
> chains = 0x0000000000000000
> bloom = 0x0000000000000000
> mask_bm = 0
> shift2 = 0
> symndx = 0
> }
> }
> child_vec = {
> len = 0
> alloc = 0
> vec = NULL
> }
> grpsym_vec = {
> len = 1
> alloc = 11
> vec = 0x0000069e12185900
> }
> grpref_list = {
> tqh_first = NULL
> tqh_last = 0x0000069e121861e8
> }
> refcount = 0
> opencount = 1
> grprefcount = 0
> load_object = 0x0000069e12186000
> sod = {
> sod_name = 7277002003136
> sod_library = 0
> sod_reserved = 0
> sod_major = 0
> sod_minor = 0
> sod_next = 0
> }
> dev = 1044
> inode = 959044
> tls_fsize = 0
> tls_msize = 0
> tls_align = 0
> tls_static_data = 0x0000000000000000
> tls_offset = 0
> relro_addr = 7278446992144
> relro_size = 21744
> grpsym_gen = 3
> rpath = 0x0000000000000000
> runpath = 0x0000000000000000
> traced = 0
> imut = {
> slice = {
> [0] = (start = 7278442606592, end = 7278447284224)
> [1] = (start = 0, end = 0)
> [...]
> [39] = (start = 0, end = 0)
> }
> count = 1
> }
> mut = {
> slice = {
> [0] = (start = 7278446992144, end = 7278447013888)
> [1] = (start = 0, end = 0)
> [...]
> [39] = (start = 0, end = 0)
> }
> count = 1
> }
> islibc = 0
> }
> (lldb) up
> frame #2: 0x0000069e436d3a82 ld.so`dlsym(handle=<unavailable>, name="PyInit__multiarray_umath") at dlfcn.c:206:7
> 203 }
> 204 }
> 205
> -> 206 sr = _dl_find_symbol(name, flags|SYM_NOWARNNOTFOUND, NULL, object);
> ^
> 207 if (sr.sym == NULL) {
> 208 DL_DEB(("dlsym: failed to find symbol %s\n", name));
> 209 _dl_errno = DL_NO_SYMBOL;
> (lldb) print object
> (elf_object_t *) $5 = 0x0000069e12186000
> (lldb) up
> frame #3: 0x0000069eeb781e9e libpython3.11.so.0.0`_PyImport_FindSharedFuncptr(prefix="PyInit", shortname="_multiarray_umath", pathname="/usr/local/lib/python3.11/site-packages/numpy/core/_multiarray_umath.cpython-311.so", fp=0x0000000000000000) at dynload_shlib.c:109:22

Re: [update] security/rbw to 1.11.1

On Fri 05/07/2024 13:29, Lucas Raab wrote:
> Hello,
>
> Here's an update for rbw that's been working fine here. Other tests?
>
> changelogs:
> https://github.com/doy/rbw/releases/tag/1.11.0
> https://github.com/doy/rbw/releases/tag/1.11.1
>
> Thanks,
> Lucas

Works for me. OK bket@

Make ucc(4) pass audio cookie to wskbd(4)

Index: dev/hid/hidcc.c
===================================================================
RCS file: /cvs/src/sys/dev/hid/hidcc.c,v
diff -u -r1.5 hidcc.c
--- dev/hid/hidcc.c 14 Nov 2022 00:16:44 -0000 1.5
+++ dev/hid/hidcc.c 7 Jul 2024 15:42:13 -0000
@@ -593,7 +593,7 @@
#undef N
};

-void hidcc_attach_wskbd(struct hidcc *);
+void hidcc_attach_wskbd(struct hidcc *, void *);
int hidcc_enable(void *, int);
void hidcc_set_leds(void *, int);
int hidcc_ioctl(void *, u_long, caddr_t, int, struct proc *);
@@ -667,7 +667,7 @@

/* Cannot load an empty map. */
if (sc->sc_maplen > 0)
- hidcc_attach_wskbd(sc);
+ hidcc_attach_wskbd(sc, hca->audio_cookie);

return sc;
}
@@ -755,7 +755,7 @@
}

void
-hidcc_attach_wskbd(struct hidcc *sc)
+hidcc_attach_wskbd(struct hidcc *sc, void *audio_cookie)
{
static const struct wskbd_accessops accessops = {
.enable = hidcc_enable,
@@ -767,7 +767,7 @@
.keymap = &sc->sc_keymap,
.accessops = &accessops,
.accesscookie = sc,
- .audiocookie = NULL, /* XXX audio_cookie */
+ .audiocookie = audio_cookie
};

sc->sc_keydesc[0].name = KB_US;
Hi,

I recently bought a JBL USB-C wired headphones for my 2020 Apple MacBook
Air to enjoy audio without disturbing my family. The headphones is
exposed via uaudio(4) as audio1 to the system. The headphones come with
a simple consumer control keyboard supported by ucc(4) and wskbd(4). The
keyboard exposes 2 volume control keys and an unmapped key. The relevant
dmesg(8) lines are:

uaudio0 at uhub1 port 1 configuration 1 interface 1 "KTMICRO JBL TUNE
310C USB-C" rev 2.00/0.03 addr 2
uaudio0: class v1, full-speed, sync, channels: 2 play, 1 rec, 5 ctls
audio1 at uaudio0
uhidev0 at uhub1 port 1 configuration 1 interface 3 "KTMICRO JBL TUNE
310C USB-C" rev 2.00/0.03 addr 2
uhidev0: iclass 3/0, 84 report ids
ucc0 at uhidev0 reportid 1: 4 usages, 3 keys, enum
wskbd1 at ucc0 mux 1
wskbd1: connecting to wsdisplay0
uhid0 at uhidev0 reportid 75: input=10, output=10, feature=0
uhid1 at uhidev0 reportid 84: input=10, output=10, feature=0

The volume control keys unfortunately can only control audio0 in an
OpenBSD 7.5-stable system as sys/dev/hid/hidcc.c does not currently pass
the audio cookie it receives from ucc(4) on to wskbd(4). The attached
hidcc_c.patch is a (simple) attempt at fixing this issue. It allows me
to control the volume on my headphones using the consumer control
keyboard, a good quality of life improvement.

Cheers,

Mark

Re: Python numpy Floating point exception in latest snapshot

Hi Stuart,

Stuart Henderson <stu@spacehopper.org> wrote:
> I don't see that here.
>
> Firstly, did you run pkg_add -u after updating?

Yes. I also ran this command to ensure everything is up to date:
# pkg_add -uDsnap -Dinstalled

However I couldn't reproduce this error on a clean install on same
computer (Minisforum UM790 with Ryzen 9 7940HS).

> Install the gdb and debug-py3-numpy packages (as well as the
> debug-python you already have) and use the 'egdb' binary. The version
> of gdb in base is barely useful.

It seems that lldb is working, so I included my lldb output at the end
of this email.

> Which cpu architecture? amd64, arm64, sparc64, [...]?

amd64


$ lldb /usr/local/bin/python3.11
(lldb) target create "/usr/local/bin/python3.11"
Current executable set to '/usr/local/bin/python3.11' (x86_64).
(lldb) run -c "import numpy"
Process 48416 launched: '/usr/local/bin/python3.11' (x86_64)
Process 48416 stopped
* thread #1, stop reason = signal SIGFPE
frame #0: 0x0000069e436d7ea5 ld.so`_dl_find_symbol_obj(obj=0x0000069e12186000, sl=0x0000784c8e3b7198) at resolve.c:626:46
623 } else {
624 Elf_Word si;
625
-> 626 for (si = obj->buckets_elf[sl->sl_elf_hash % obj->nbuckets];
^
627 si != STN_UNDEF; si = obj->chains_elf[si]) {
628 const Elf_Sym *sym = symt + si;
629
(lldb) list
630 int r = matched_symbol(obj, sym, sl);
631 if (r)
632 return r > 0;
633 }
634 }
635 return 0;
636 }
(lldb) print obj
(elf_object_t *) $0 = 0x0000069e12186000
(lldb) print obj->nbuckets
(u_int32_t) $1 = 0
(lldb) bt
* thread #1, stop reason = signal SIGFPE
* frame #0: 0x0000069e436d7ea5 ld.so`_dl_find_symbol_obj(obj=0x0000069e12186000, sl=0x0000784c8e3b7198) at resolve.c:626:46
frame #1: 0x0000069e436d7b80 ld.so`_dl_find_symbol(name="PyInit__multiarray_umath", flags=96, ref_sym=0x0000000000000000, req_obj=0x0000069e12186000) at resolve.c:669:7
frame #2: 0x0000069e436d3a82 ld.so`dlsym(handle=<unavailable>, name="PyInit__multiarray_umath") at dlfcn.c:206:7
frame #3: 0x0000069eeb781e9e libpython3.11.so.0.0`_PyImport_FindSharedFuncptr(prefix="PyInit", shortname="_multiarray_umath", pathname="/usr/local/lib/python3.11/site-packages/numpy/core/_multiarray_umath.cpython-311.so", fp=0x0000000000000000) at dynload_shlib.c:109:22
frame #4: 0x0000069eeb73621f libpython3.11.so.0.0`_imp_create_dynamic at importdl.c:139:18
frame #5: 0x0000069eeb63da1e libpython3.11.so.0.0`cfunction_vectorcall_FASTCALL at methodobject.c:427:24
frame #6: 0x0000069eeb6fcaec libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:0
frame #7: 0x0000069eeb6ff24b libpython3.11.so.0.0`_PyEval_Vector at pycore_ceval.h:73:16
frame #8: 0x0000069eeb5e3261 libpython3.11.so.0.0`object_vacall at pycore_call.h:92:11
frame #9: 0x0000069eeb5e3043 libpython3.11.so.0.0`PyObject_CallMethodObjArgs at call.c:879:24
frame #10: 0x0000069eeb730fec libpython3.11.so.0.0`PyImport_ImportModuleLevelObject at import.c:1748:11
frame #11: 0x0000069eeb6f5236 libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:7422:15
frame #12: 0x0000069eeb6e985e libpython3.11.so.0.0`PyEval_EvalCode at pycore_ceval.h:73:16
frame #13: 0x0000069eeb6e4e9f libpython3.11.so.0.0`builtin_exec at bltinmodule.c:1077:17
frame #14: 0x0000069eeb63db39 libpython3.11.so.0.0`cfunction_vectorcall_FASTCALL_KEYWORDS at methodobject.c:443:24
frame #15: 0x0000069eeb6fcaec libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:0
frame #16: 0x0000069eeb6ff24b libpython3.11.so.0.0`_PyEval_Vector at pycore_ceval.h:73:16
frame #17: 0x0000069eeb5e3261 libpython3.11.so.0.0`object_vacall at pycore_call.h:92:11
frame #18: 0x0000069eeb5e3043 libpython3.11.so.0.0`PyObject_CallMethodObjArgs at call.c:879:24
frame #19: 0x0000069eeb730fec libpython3.11.so.0.0`PyImport_ImportModuleLevelObject at import.c:1748:11
frame #20: 0x0000069eeb6e3609 libpython3.11.so.0.0`builtin___import__ at bltinmodule.c:277:12
frame #21: 0x0000069eeb63db39 libpython3.11.so.0.0`cfunction_vectorcall_FASTCALL_KEYWORDS at methodobject.c:443:24
frame #22: 0x0000069eeb6fcaec libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:0
frame #23: 0x0000069eeb6ff24b libpython3.11.so.0.0`_PyEval_Vector at pycore_ceval.h:73:16
frame #24: 0x0000069eeb5e3261 libpython3.11.so.0.0`object_vacall at pycore_call.h:92:11
frame #25: 0x0000069eeb5e3043 libpython3.11.so.0.0`PyObject_CallMethodObjArgs at call.c:879:24
frame #26: 0x0000069eeb7311e2 libpython3.11.so.0.0`PyImport_ImportModuleLevelObject at import.c:1918:25
frame #27: 0x0000069eeb6f5236 libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:7422:15
frame #28: 0x0000069eeb6e985e libpython3.11.so.0.0`PyEval_EvalCode at pycore_ceval.h:73:16
frame #29: 0x0000069eeb6e4e9f libpython3.11.so.0.0`builtin_exec at bltinmodule.c:1077:17
frame #30: 0x0000069eeb63db39 libpython3.11.so.0.0`cfunction_vectorcall_FASTCALL_KEYWORDS at methodobject.c:443:24
frame #31: 0x0000069eeb6fcaec libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:0
frame #32: 0x0000069eeb6ff24b libpython3.11.so.0.0`_PyEval_Vector at pycore_ceval.h:73:16
frame #33: 0x0000069eeb5e3261 libpython3.11.so.0.0`object_vacall at pycore_call.h:92:11
frame #34: 0x0000069eeb5e3043 libpython3.11.so.0.0`PyObject_CallMethodObjArgs at call.c:879:24
frame #35: 0x0000069eeb730fec libpython3.11.so.0.0`PyImport_ImportModuleLevelObject at import.c:1748:11
frame #36: 0x0000069eeb6e3609 libpython3.11.so.0.0`builtin___import__ at bltinmodule.c:277:12
frame #37: 0x0000069eeb63db39 libpython3.11.so.0.0`cfunction_vectorcall_FASTCALL_KEYWORDS at methodobject.c:443:24
frame #38: 0x0000069eeb6fcaec libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:0
frame #39: 0x0000069eeb6ff24b libpython3.11.so.0.0`_PyEval_Vector at pycore_ceval.h:73:16
frame #40: 0x0000069eeb5e3261 libpython3.11.so.0.0`object_vacall at pycore_call.h:92:11
frame #41: 0x0000069eeb5e3043 libpython3.11.so.0.0`PyObject_CallMethodObjArgs at call.c:879:24
frame #42: 0x0000069eeb7311e2 libpython3.11.so.0.0`PyImport_ImportModuleLevelObject at import.c:1918:25
frame #43: 0x0000069eeb6f5236 libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:7422:15
frame #44: 0x0000069eeb6e985e libpython3.11.so.0.0`PyEval_EvalCode at pycore_ceval.h:73:16
frame #45: 0x0000069eeb6e4e9f libpython3.11.so.0.0`builtin_exec at bltinmodule.c:1077:17
frame #46: 0x0000069eeb63db39 libpython3.11.so.0.0`cfunction_vectorcall_FASTCALL_KEYWORDS at methodobject.c:443:24
frame #47: 0x0000069eeb6fcaec libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:0
frame #48: 0x0000069eeb6ff24b libpython3.11.so.0.0`_PyEval_Vector at pycore_ceval.h:73:16
frame #49: 0x0000069eeb5e3261 libpython3.11.so.0.0`object_vacall at pycore_call.h:92:11
frame #50: 0x0000069eeb5e3043 libpython3.11.so.0.0`PyObject_CallMethodObjArgs at call.c:879:24
frame #51: 0x0000069eeb730fec libpython3.11.so.0.0`PyImport_ImportModuleLevelObject at import.c:1748:11
frame #52: 0x0000069eeb6e3609 libpython3.11.so.0.0`builtin___import__ at bltinmodule.c:277:12
frame #53: 0x0000069eeb63db39 libpython3.11.so.0.0`cfunction_vectorcall_FASTCALL_KEYWORDS at methodobject.c:443:24
frame #54: 0x0000069eeb6fcaec libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:0
frame #55: 0x0000069eeb6ff24b libpython3.11.so.0.0`_PyEval_Vector at pycore_ceval.h:73:16
frame #56: 0x0000069eeb5e3261 libpython3.11.so.0.0`object_vacall at pycore_call.h:92:11
frame #57: 0x0000069eeb5e3043 libpython3.11.so.0.0`PyObject_CallMethodObjArgs at call.c:879:24
frame #58: 0x0000069eeb7311e2 libpython3.11.so.0.0`PyImport_ImportModuleLevelObject at import.c:1918:25
frame #59: 0x0000069eeb6f5236 libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:7422:15
frame #60: 0x0000069eeb6e985e libpython3.11.so.0.0`PyEval_EvalCode at pycore_ceval.h:73:16
frame #61: 0x0000069eeb6e4e9f libpython3.11.so.0.0`builtin_exec at bltinmodule.c:1077:17
frame #62: 0x0000069eeb63db39 libpython3.11.so.0.0`cfunction_vectorcall_FASTCALL_KEYWORDS at methodobject.c:443:24
frame #63: 0x0000069eeb6fcaec libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:0
frame #64: 0x0000069eeb6ff24b libpython3.11.so.0.0`_PyEval_Vector at pycore_ceval.h:73:16
frame #65: 0x0000069eeb5e3261 libpython3.11.so.0.0`object_vacall at pycore_call.h:92:11
frame #66: 0x0000069eeb5e3043 libpython3.11.so.0.0`PyObject_CallMethodObjArgs at call.c:879:24
frame #67: 0x0000069eeb730fec libpython3.11.so.0.0`PyImport_ImportModuleLevelObject at import.c:1748:11
frame #68: 0x0000069eeb6f5236 libpython3.11.so.0.0`_PyEval_EvalFrameDefault at ceval.c:7422:15
frame #69: 0x0000069eeb6e985e libpython3.11.so.0.0`PyEval_EvalCode at pycore_ceval.h:73:16
frame #70: 0x0000069eeb75a429 libpython3.11.so.0.0`run_mod [inlined] run_eval_code_obj(tstate=0x0000069eeb93d760, co=0x0000069e3475b5d0, globals=0x0000069e3482c2c0, locals=0x0000069e3482c2c0) at pythonrun.c:1741:9
frame #71: 0x0000069eeb75a3f5 libpython3.11.so.0.0`run_mod(mod=<unavailable>, filename=<unavailable>, globals=0x0000069e3482c2c0, locals=0x0000069e3482c2c0, flags=<unavailable>, arena=<unavailable>) at pythonrun.c:1762:19
frame #72: 0x0000069eeb75df30 libpython3.11.so.0.0`PyRun_SimpleStringFlags [inlined] PyRun_StringFlags(str="import numpy\n", start=257, globals=0x0000069e3482c2c0, locals=0x0000069e3482c2c0, flags=0x0000784c8e3ba400) at pythonrun.c:1632:15
frame #73: 0x0000069eeb75dedc libpython3.11.so.0.0`PyRun_SimpleStringFlags(command="import numpy\n", flags=0x0000784c8e3ba400) at pythonrun.c:487:9
frame #74: 0x0000069eeb782722 libpython3.11.so.0.0`Py_RunMain [inlined] pymain_run_command(command=<unavailable>) at main.c:255:11
frame #75: 0x0000069eeb782693 libpython3.11.so.0.0`Py_RunMain [inlined] pymain_run_python(exitcode=<unavailable>) at main.c:592:21
frame #76: 0x0000069eeb7825b0 libpython3.11.so.0.0`Py_RunMain at main.c:680:5
frame #77: 0x0000069eeb783e45 libpython3.11.so.0.0`pymain_main(args=0x0000784c8e3ba7a8) at main.c:710:12
frame #78: 0x0000069eeb78426c libpython3.11.so.0.0`Py_BytesMain(argc=<unavailable>, argv=0x0000784c8e3b7198) at main.c:734:12
frame #79: 0x0000069c102f694b python3.11`__start + 299
(lldb) down
error: Already at the bottom of the stack.
(lldb) up
frame #1: 0x0000069e436d7b80 ld.so`_dl_find_symbol(name="PyInit__multiarray_umath", flags=96, ref_sym=0x0000000000000000, req_obj=0x0000069e12186000) at resolve.c:669:7
666 struct object_vector vec;
667 int i;
668
-> 669 if (_dl_find_symbol_obj(req_obj, &sl))
^
670 goto found;
671
672 /* weak definition in the specified object is good enough */
(lldb) print sl
(symlookup) $2 = {
sl_name = 0x0000784c8e3b7370 "PyInit__multiarray_umath"
sl_out = {
sym = NULL
obj = NULL
}
sl_weak_out = {
sym = NULL
obj = NULL
}
sl_elf_hash = 182513432
sl_gnu_hash = 3258556712
sl_flags = 96
}
(lldb) print obj
error: expression failed to parse:
error: <user expression 3>:1:1: use of undeclared identifier 'obj'
obj
^
(lldb) print req_obj
(elf_object_t *) $3 = 0x0000069e12186000
(lldb) print *req_obj
(elf_object_t) $4 = {
obj_base = 7278442606592
load_name = 0x0000069e12187500 "/usr/local/lib/python3.11/site-packages/numpy/core/_multiarray_umath.cpython-311.so"
load_dyn = 0x0000069ea53f88f0
next = NULL
prev = 0x0000069e12188000
load_base = 7278442606592
load_list = 0x0000069ec896e700
load_size = 4677632
Dyn = {
info = {
[0] = 0
[...]
[36] = 0
}
u = {
null = 0
needed = 0
pltrelsz = 0
pltgot = 0x0000000000000000
hash = 0x0000000000000000
strtab = 0x0000000000000000
symtab = NULL
rela = NULL
relasz = 0
relaent = 0
strsz = 0
syment = 0
init = 0x0000000000000000
fini = 0x0000000000000000
soname = 0x0000000000000000
rpath = 0x0000000000000000
symbolic = 0
rel = NULL
relsz = 0
relent = 0
pltrel = 0
debug = 0
textrel = 0
jmprel = 0
bind_now = 0
init_array = 0x0000000000000000
fini_array = 0x0000000000000000
init_arraysz = 0
fini_arraysz = 0
runpath = 0x0000000000000000
flags = 0
encoding = 0
preinit_array = 0x0000000000000000
preinit_arraysz = 0
unassigned = 0
relrsz = 0
relr = 0x0000000000000000
}
}
relacount = 0
relcount = 0
status = 773
phdrp = 0x0000069ea4fc7040
phdrc = 11
obj_type = 4
obj_flags = 1
nodelete = 0
nbuckets = 0
nchains = 0
hash_u = {
u_elf = {
buckets = 0x0000000000000000
chains = 0x0000000000000000
}
u_gnu = {
buckets = 0x0000000000000000
chains = 0x0000000000000000
bloom = 0x0000000000000000
mask_bm = 0
shift2 = 0
symndx = 0
}
}
child_vec = {
len = 0
alloc = 0
vec = NULL
}
grpsym_vec = {
len = 1
alloc = 11
vec = 0x0000069e12185900
}
grpref_list = {
tqh_first = NULL
tqh_last = 0x0000069e121861e8
}
refcount = 0
opencount = 1
grprefcount = 0
load_object = 0x0000069e12186000
sod = {
sod_name = 7277002003136
sod_library = 0
sod_reserved = 0
sod_major = 0
sod_minor = 0
sod_next = 0
}
dev = 1044
inode = 959044
tls_fsize = 0
tls_msize = 0
tls_align = 0
tls_static_data = 0x0000000000000000
tls_offset = 0
relro_addr = 7278446992144
relro_size = 21744
grpsym_gen = 3
rpath = 0x0000000000000000
runpath = 0x0000000000000000
traced = 0
imut = {
slice = {
[0] = (start = 7278442606592, end = 7278447284224)
[1] = (start = 0, end = 0)
[...]
[39] = (start = 0, end = 0)
}
count = 1
}
mut = {
slice = {
[0] = (start = 7278446992144, end = 7278447013888)
[1] = (start = 0, end = 0)
[...]
[39] = (start = 0, end = 0)
}
count = 1
}
islibc = 0
}
(lldb) up
frame #2: 0x0000069e436d3a82 ld.so`dlsym(handle=<unavailable>, name="PyInit__multiarray_umath") at dlfcn.c:206:7
203 }
204 }
205
-> 206 sr = _dl_find_symbol(name, flags|SYM_NOWARNNOTFOUND, NULL, object);
^
207 if (sr.sym == NULL) {
208 DL_DEB(("dlsym: failed to find symbol %s\n", name));
209 _dl_errno = DL_NO_SYMBOL;
(lldb) print object
(elf_object_t *) $5 = 0x0000069e12186000
(lldb) up
frame #3: 0x0000069eeb781e9e libpython3.11.so.0.0`_PyImport_FindSharedFuncptr(prefix="PyInit", shortname="_multiarray_umath", pathname="/usr/local/lib/python3.11/site-packages/numpy/core/_multiarray_umath.cpython-311.so", fp=0x0000000000000000) at dynload_shlib.c:109:22