Re: lang/* BTI breakage - lang/sbcl
On Thu, Jun 29, 2023 at 11:19:50PM +0200, Christian Weisgerber wrote: > Since BTI affects any and all compilers that generate executable code, > I tried to build all lang/* ports on amd64 with BTI enabled. Here's the > list of failures: > > [...] > lang/sbcl the 2.3.6 update (already on ports@) adresses it by using USE_NOBTCFI. -- Sebastien Marie
aarch64 bulk build report
bulk build on arm64.ports.openbsd.org started on Tue Jun 27 10:49:45 MDT 2023 finished at Thu Jun 29 20:34:44 MDT 2023 lasted 2D09h44m done with kern.version=OpenBSD 7.3-current (GENERIC.MP) #2176: Tue Jun 27 03:12:23 MDT 2023 built packages:11674 Jun 27:3093 Jun 28:1043 Jun 29:7537 critical path missing pkgs: http://build-failures.rhaalovely.net/aarch64/2023-06-27/summary.log build failures: 2 http://build-failures.rhaalovely.net/aarch64/2023-06-27/games/lwjgl3.log http://build-failures.rhaalovely.net/aarch64/2023-06-27/x11/mate/utils.log recurrent failures failures/games/lwjgl3.log failures/x11/mate/utils.log new failures +++ ls-failures Thu Jun 29 20:34:56 2023 resolved failures --- ../old/aarch64/last//ls-failuresSat Jun 24 00:39:47 2023 -failures/devel/quirks.log
Re: emulators/retroarch breakage
On Tue, Jun 27, 2023 at 02:49:45PM -0700, Nam Nguyen wrote:
> Marc Espie writes:
>
> > I know you're not maintainer, but most of the relevant commits point back
> > to you:
> >
> > retroarch uses some ass-backwards build system making it prefer system
> > includes to its own includes, with ludicrous breakage.
> >
> > Case in point: explodes with bright colors if libchdr is present.
>
> Sorry. I should have pinged more for this since I imported libchdr. I'll
> repaste inline my proposal to turn off libchdr in retroarch.
>
> Nam Nguyen writes:
>
> > Nam Nguyen writes:
> >
> >> While testing consumers for vulkan ports, I found a build failure. To
> >> reproduce, install emulators/libchdr then build emulators/retroarch,
> >> which fails.
> >
> > ping
> >
> >>
> >> build log:
> >> https://namtsui.com/public/retroarch_chdr.txt
> >>
> >> There is a conflict between the bundled libchdr and emulators/libchdr,
> >> which was newly imported. In this diff, I propose setting HAVE_CHD =
> >> 0. Also, resync WANTLIB to remove z.
> >>
> >> There is minimal downside from my investigation. Retroarch relies on
> >> cores. The only core that uses CHD files is
> >> emulators/libretro-pcsx-rearmed. I will send an update for pcsx-rearmed,
> >> which has a new feature of using libchdr. To test, I was able to load
> >> CHD files through updated pcsx-rearmed even with this retroarch where
> >> CHD is toggled off. I also tested opening CHD files in emulators/flycast
> >> (which links against lchdr) and emulators/mame (viable alternative).
> >>
> >> It was a bit tricky to figure out the file structure as I was unfamiliar
> >> with mame. I found that pcsx chd files are standalone whereas in mame it
> >> needs to be structured like game.zip and game/game.chd. I also learned
> >> that CHD stands for "compressed hunks of data" and is a method of
> >> archiving CDs.
> >>
> >> Feedback and tests are welcome. OK?
> >>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/emulators/retroarch/Makefile,v
> retrieving revision 1.25
> diff -u -p -u -p -r1.25 Makefile
> --- Makefile 23 Jun 2022 11:23:19 - 1.25
> +++ Makefile 10 May 2023 19:36:17 -
> @@ -5,7 +5,7 @@ PKGNAME = retroarch-${GH_TAGNAME:S/v//}
> GH_ACCOUNT = libretro
> GH_PROJECT = RetroArch
> GH_TAGNAME = v1.10.3
> -REVISION = 0
> +REVISION = 1
>
> CATEGORIES = emulators
>
> @@ -18,7 +18,7 @@ WANTLIB += ${COMPILER_LIBCXX} EGL GL Qt5
> WANTLIB += Qt5Network Qt5Widgets SDL2 X11 X11-xcb Xext Xinerama
> WANTLIB += Xrandr Xv Xxf86vm ass avcodec avformat avutil c crypto
> WANTLIB += drm fontconfig freetype fribidi gbm m openal ssl swresample
> -WANTLIB += swscale usb-1.0 xcb xkbcommon z
> +WANTLIB += swscale usb-1.0 xcb xkbcommon
> WANTLIB += mbedcrypto mbedtls mbedx509
>
> MODULES =x11/qt5
> @@ -34,6 +34,7 @@ LIB_DEPENDS = audio/openal \
>
> MAKE_FLAGS = V=1 \
> CXX="${CXX}" \
> + HAVE_CHD=0 \
> HAVE_OSS=0 \
> HAVE_OSS_BSD=0 \
> OPTIMIZE_FLAG=
Hi!
This works ok, I got a successful build and things seem to work well.
I never actually used retroarch for MAME things, I have some psx games
but they aren't in CHD. Everything else I quickly tested seems good.
Tested on recent amd64 snapshot.
Attached another diff with the REVISION bump as there was another bump
for turning off FLAC since you originally posted:
https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/emulators/retroarch/Makefile?rev=1.26&content-type=text/plain
Thanks!
-Ryan
Index: Makefile
===
RCS file: /cvs/ports/emulators/retroarch/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile20 May 2023 20:13:12 - 1.26
+++ Makefile29 Jun 2023 22:33:30 -
@@ -5,7 +5,7 @@ PKGNAME = retroarch-${GH_TAGNAME:S/v//}
GH_ACCOUNT = libretro
GH_PROJECT = RetroArch
GH_TAGNAME = v1.10.3
-REVISION = 1
+REVISION = 2
CATEGORIES = emulators
@@ -18,7 +18,7 @@ WANTLIB += ${COMPILER_LIBCXX} EGL GL Qt5
WANTLIB += Qt5Network Qt5Widgets SDL2 X11 X11-xcb Xext Xinerama
WANTLIB += Xrandr Xv Xxf86vm ass avcodec avformat avutil c crypto
WANTLIB += drm fontconfig freetype fribidi gbm m openal ssl swresample
-WANTLIB += swscale usb-1.0 xcb xkbcommon z
+WANTLIB += swscale usb-1.0 xcb xkbcommon
WANTLIB += mbedcrypto mbedtls mbedx509
MODULES = x11/qt5
@@ -34,6 +34,7 @@ LIB_DEPENDS = audio/openal \
MAKE_FLAGS = V=1 \
CXX="${CXX}" \
+ HAVE_CHD=0 \
HAVE_OSS=0 \
HAVE_OSS_BSD=0 \
OPTIMIZE_FLAG=
[update] security/osv-scanner to 1.3.5
Hello,
Here's an update for osv-scanner which has been working fine.
Other tests?
Thanks,
Lucas
diff refs/heads/master refs/heads/osv
commit - 20cf8735fbeddad90caa5253fa7cc06119f78a1e
commit + 19c94d7e61976ab21392163b018b5081557a7220
blob - afe7fd52e81fcf10048eac96797eedb68742f382
blob + 8d963684c86100d69c2a38e10b5952792241f864
--- security/osv-scanner/Makefile
+++ security/osv-scanner/Makefile
@@ -6,7 +6,7 @@ V = 1.3.4
COMMENT = scan your project's dependencies for vulnerabilities
-V =1.3.4
+V =1.3.5
MODGO_MODNAME =github.com/google/osv-scanner
MODGO_VERSION =v${V}
blob - 47d5658a20dd0904121303af1199b07dd7054dd0
blob + c6c5dfd352836e3e4985f7e1cc0c7db2e0b684f6
--- security/osv-scanner/distinfo
+++ security/osv-scanner/distinfo
@@ -1,7 +1,6 @@
SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v0.3.1.mod) =
KAIbQYClnDmTYHqVsY4jDdC8a+pSQv/o6ou/tPT3tNc=
-SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.2.1.mod) =
JnfIL+dPIDdyiJpagBr7Mp2VF1UId92ssXIZFpurPt0=
-SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.3.0.mod) =
JnfIL+dPIDdyiJpagBr7Mp2VF1UId92ssXIZFpurPt0=
-SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.3.0.zip) =
z0XD4hoU47CW1crqHllrzjH+QY0ZeSPzR5H+wnw0AGc=
+SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.3.2.mod) =
JnfIL+dPIDdyiJpagBr7Mp2VF1UId92ssXIZFpurPt0=
+SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.3.2.zip) =
XeJGoMtMJW8/1dDbigihFPWK8MLhk7vwrZASEErbtrI=
SHA256 (go_modules/github.com/!cyclone!d!x/cyclonedx-go/@v/v0.7.1.mod) =
uqvhVbf1hOh1/U4bvuiQTjf0qn4QJl1WfdKYiAY/5oM=
SHA256 (go_modules/github.com/!cyclone!d!x/cyclonedx-go/@v/v0.7.1.zip) =
+D2ExgswC7p36y6FOYnFDHq/mMWWIPtaC24x2gd3aAU=
SHA256 (go_modules/github.com/!microsoft/go-winio/@v/v0.5.2.mod) =
Gbj76dRBkni7Hp0M8v1a7IeeQoKcU7o+/VZWuNGzWuc=
@@ -47,6 +46,10 @@ SHA256 (go_modules/github.com/golang/groupcache/@v/v0.
SHA256
(go_modules/github.com/go-git/go-git-fixtures/v4/@v/v4.3.2-0.20230305113008-0c11038e723f.zip)
= VGUYT34LRmv9QlPdoE+76oPV2/QE59cfT/oUFGM=
SHA256 (go_modules/github.com/go-git/go-git/v5/@v/v5.7.0.mod) =
hiQXhmzSVCgs8EoVW8rKHPV6gygpVO/hjETig3U7q90=
SHA256 (go_modules/github.com/go-git/go-git/v5/@v/v5.7.0.zip) =
ffddu8q13gz+0DHENq4BeKF9l9cS998vbCSVOXPPBfw=
+SHA256 (go_modules/github.com/goark/errs/@v/v1.1.0.mod) =
HdP0dfT4+GCMG+9lWyqNew4gr5jOusFXVZMrCapncEY=
+SHA256 (go_modules/github.com/goark/errs/@v/v1.1.0.zip) =
i43JhykUlVOpgvOs4Xa3KJKpCCY6SiUpGux+Bz2ThBc=
+SHA256 (go_modules/github.com/goark/go-cvss/@v/v1.6.6.mod) =
YOdemKeD2deEmjJAzwBtcCovyubv4HpxBv8bG+zMNn4=
+SHA256 (go_modules/github.com/goark/go-cvss/@v/v1.6.6.zip) =
IkqCKDAhSMFmO5wZpleYQrJtjQD4xAqN24U7fvVpKOs=
SHA256
(go_modules/github.com/golang/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.mod)
= URfiu4bxzHzHSJ+fJYD6F7LvHjoKNGv2TtgGPKe4dmM=
SHA256
(go_modules/github.com/golang/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.zip)
= snA06PwBNidUPhrQmM/GUynyiW3z2lzzJmzJFm+T86U=
SHA256
(go_modules/github.com/google/go-cmdtest/@v/v0.4.1-0.20220921163831-55ab3332a786.mod)
= YBCCwe/4ls1GJ8PCPRVrWD+85CRh5UhHNLZGe5ZOtk0=
@@ -83,8 +86,8 @@ SHA256 (go_modules/github.com/package-url/packageurl-g
SHA256 (go_modules/github.com/mmcloughlin/avo/@v/v0.5.0.zip) =
Yr553IwOXt9NTTmAFiMbtK2jCxnkmd30q5OF9Lb5FCo=
SHA256
(go_modules/github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod)
= jxQBiQgBFlu9PaF1jGyWQ48SqjJIZmrBWBwYqGQkTUc=
SHA256
(go_modules/github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip)
= LctwU/rxHCjK19hPz6Pdf5Pj0jaznYPP8JNPaR+GDXo=
-SHA256 (go_modules/github.com/package-url/packageurl-go/@v/v0.1.0.mod) =
dRewXBS0JZJtI9XFqlk5cMumXf0FYeZSFfUOetMSct8=
-SHA256 (go_modules/github.com/package-url/packageurl-go/@v/v0.1.0.zip) =
jUeNIwh+x3V5lx5eKmWuYNZypreYIFw+CGSJPEzu0G4=
+SHA256 (go_modules/github.com/package-url/packageurl-go/@v/v0.1.1.mod) =
WtMu4++y8MyV5RLpaxj2GWiBXwXLTpBVYacq5IyrWtE=
+SHA256 (go_modules/github.com/package-url/packageurl-go/@v/v0.1.1.zip) =
E4RHGgDw4CbF5F2fzMDaNj6UIyZ875M5jbFvzyS9uGA=
SHA256 (go_modules/github.com/pjbgf/sha1cd/@v/v0.3.0.mod) =
8Qo2tGIntPuz5pD2zHJtlGR18xZp7rxSxK1bLombToA=
SHA256 (go_modules/github.com/pjbgf/sha1cd/@v/v0.3.0.zip) =
rP7pbdL+jmrgiumGRQSDCknSNddMKrk996XfopqQpGE=
SHA256
(go_modules/github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.mod) =
XVuUVOLQIK8MdgNWjoaQS5m+/E1dZ8OoUF9hIVib0R8=
@@ -110,8 +113,8 @@ SHA256 (go_modules/github.com/spdx/tools-golang/@v/v0.
SHA256
(go_modules/github.com/spdx/gordf/@v/v0.0.0-2020095634-7098f93598fb.mod) =
eKUongYQUXmwBVYtvFiYMNLnHrFgrEUV5RiQ5fFMgYk=
SHA256
(go_modules/github.com/spdx/gordf/@v/v0.0.0-20221230105357-b735bd5aac89.mod) =
eKUongYQUXmwBVYtvFiYMNLnHrFgrEUV5RiQ5fFMgYk=
SHA256
(go_modules/github.com/spdx/gordf/@v/v0.0.0-20221230105357-b735bd5aac89.zip) =
XxsMQLKthYlrDa14n8WZRd/FR93bivyiABl27UQYdtw=
-SHA256 (go_modules/github.com/spdx/tools-golang/@v/v0.5.1.mod) =
aSS5w8etG/mpXeTWSCwA/p
Re: lang/sbcl: update to 2.3.6 (latest) and take MAINTAINER
Hello, On 2023/06/29 15:42:00 +0200, Sebastien Marie wrote: > Hi, > > With latest changes on ecl, we are able to update sbcl to latest version > (2.3.6). > > As maintainer systematically timeout since several years now, I am taking > over > the maintainership (and no reply on private mail asking about continuing or > not > to maintain lang/sbcl). > > I have mostly rewritten the port to ease testing building it with several > bootstraps (ecl, clisp, sbcl) on one architecture, and drop some historical > parts. > > Regarding the way to build sbcl, it defaults to using lang/ecl (which is > portable as written in C), and use clisp for some archs only (amd64 and > powerpc, > as currently) as it is more fast. > > > The mail includes: > - a proper tarball (as for a new port) > - a diff (for braves diff readers) > > I tested: > - on amd64, building with clisp (default), ecl and sbcl (2.2.5p0 and 2.3.6) > - on aarch64, building with ecl, and sbcl (2.3.6) > - all dependencies are still building on amd64 I've only tested on amd64 with clisp, but runtime tested a few things, including stumpwm. > The port is buildable on wider architectures range. > > Comments or OK ? ok op@ Thanks for updating sbcl! :)
lang/* BTI breakage
Since BTI affects any and all compilers that generate executable code, I tried to build all lang/* ports on amd64 with BTI enabled. Here's the list of failures: devel/jdk/1.8 # needs new bootstrap lang/crystal lang/fpc lang/gcc/11 lang/ghc lang/go # also fails on CPUs with advanced xsave lang/gprolog lang/ldc lang/mono lang/ocaml lang/sbcl Note that further ports may depend on some of the above. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: ncspot aborts on startup in -current
* Theo Buehler wrote: > On Thu, Jun 29, 2023 at 11:30:10AM +0200, Theo Buehler wrote: > > On Thu, Jun 29, 2023 at 11:25:20AM +0200, Theo Buehler wrote: > > > On Thu, Jun 29, 2023 at 10:54:10AM +0200, Theo Buehler wrote: > > > > On Thu, Jun 29, 2023 at 09:23:53AM +0100, Stuart Henderson wrote: > > > > > Does the same happen if you build your own kernel rather than using a > > > > > snap? > > > > > > > > Someone will have to port the patches that add _CET_ENDBR from > > > > security/boringssl/head to security/rust-ring. > > > > > > Something like this should do the trick. Can't test it. Build and > > > install rust-ring with this patch, then build and install ncspot. > > > > Ugh hold on. I missed something. > > This one at least compiles. Compiling rust code is so much fun. NOT. I can confirm that your patch fixes the SIGILL crash upon startup for ncspot. Cheers and thanks Matthias
Re: [PATCH] www/nginx -- add njs dynamic module
On Thu, Jun 29, 2023 at 09:26:58AM +0100, Stuart Henderson wrote: > I note you didn't cc the port maintainer on your original mail, > was there a reason for that? Thank you, Stuart, missed that point. > I've cc'd and included the original mail. What are you thoughts > on this please Robert? Thanks in advance, Robert. -- Sergey A. Osokin
lang/sbcl: update to 2.3.6 (latest) and take MAINTAINER
Hi,
With latest changes on ecl, we are able to update sbcl to latest version
(2.3.6).
As maintainer systematically timeout since several years now, I am taking over
the maintainership (and no reply on private mail asking about continuing or not
to maintain lang/sbcl).
I have mostly rewritten the port to ease testing building it with several
bootstraps (ecl, clisp, sbcl) on one architecture, and drop some historical
parts.
Regarding the way to build sbcl, it defaults to using lang/ecl (which is
portable as written in C), and use clisp for some archs only (amd64 and
powerpc,
as currently) as it is more fast.
The mail includes:
- a proper tarball (as for a new port)
- a diff (for braves diff readers)
I tested:
- on amd64, building with clisp (default), ecl and sbcl (2.2.5p0 and 2.3.6)
- on aarch64, building with ecl, and sbcl (2.3.6)
- all dependencies are still building on amd64
The port is buildable on wider architectures range.
Comments or OK ?
--
Sebastien Marie
sbcl.tgz
Description: application/tar-gz
diff /home/semarie/repos/openbsd/ports
commit - 24a3e531fc9c9cadff194b5f9fdaf9c0a68c3156
path + /home/semarie/repos/openbsd/ports
blob - 9d85d7514131d6aef49aab9ea5719239bea069bc
file + lang/sbcl/Makefile
--- lang/sbcl/Makefile
+++ lang/sbcl/Makefile
@@ -1,98 +1,125 @@
-# not yet ported to other arches
-ONLY_FOR_ARCHS = amd64 i386 powerpc
-USE_WXNEEDED = Yes
+COMMENT = high performance Common Lisp compiler
-COMMENT= compiler and runtime system for ANSI Common Lisp
+V =2.3.6
+DISTNAME = sbcl-${V}-source
+PKGNAME = sbcl-${V}
-V =2.2.5
-REVISION = 0
-DISTNAME= sbcl-${V}-source
-PKGNAME= sbcl-${V}
-WRKDIST= ${WRKDIR}/sbcl-${V}
-EXTRACT_SUFX= .tar.bz2
+CATEGORIES = lang
-CATEGORIES=lang
-HOMEPAGE= http://www.sbcl.org/
-MAINTAINER = Joshua Elsasser
+HOMEPAGE = https://www.sbcl.org/
+MAINTAINER = Sebastien Marie
+
# Public domain and BSD
-PERMIT_PACKAGE=Yes
+PERMIT_PACKAGE = Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sbcl/}
+WANTLIB += c m util zstd
-WANTLIB= c m util z
+USE_WXNEEDED = Yes
+USE_NOEXECONLY = Yes
+USE_NOBTCFI = Yes
-PSEUDO_FLAVORS=native_bootstrap
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=sbcl/}
+EXTRACT_SUFX = .tar.bz2
+WRKDIST = ${WRKDIR}/sbcl-${V}
-FLAVORS= threads
-FLAVOR?=
+PSEUDO_FLAVORS = native_bootstrap
+FLAVORS = threads
+FLAVOR ?=
-MAKE_PARAMS = --prefix=${PREFIX}
+# Supported bootstrap methods:
+# - "ecl" : default (for portability)
+# - "clisp" : build might be faster than with ecl
+# - "sbcl" : for native bootstrap
+#
+# For testing, it could be manually overrided by passing
+# BOOTSTRAP_METHOD=xxx on make command-line.
-.if ${FLAVOR:Mthreads}
-ONLY_FOR_ARCHS = amd64 powerpc
-MAKE_PARAMS += --with-sb-thread
-WANTLIB+= pthread
-.endif
-# enable features from --fancy other than :sb-thread
-MAKE_PARAMS += --with-sb-core-compression \
- --with-sb-xref-for-internals
+BOOTSTRAP_METHOD-amd64 = clisp
+BOOTSTRAP_METHOD-powerpc = clisp
+BOOTSTRAP_METHOD-${MACHINE_ARCH} ?=ecl
-# contrib/sb-capstone/test.lisp uses it at build-time if present
-BUILD_DEPENDS =devel/capstone/main
+BOOTSTRAP_METHOD ?=${BOOTSTRAP_METHOD-${MACHINE_ARCH}}
.if ${FLAVOR:Mnative_bootstrap}
-BUILD_DEPENDS+=lang/sbcl
-BOOTSTRAP_CMD= ${LOCALBASE}/bin/sbcl \
- --disable-debugger --no-sysinit --no-userinit
-.elif ${MACHINE_ARCH:Mi386}
-# ecl is slower but lang/clisp fails to build sbcl on i386
-BUILD_DEPENDS += lang/ecl
-BOOTSTRAP_CMD =${LOCALBASE}/bin/ecl -q --norc
-.else
+BOOTSTRAP_METHOD = sbcl
+.endif
+
+.if ${BOOTSTRAP_METHOD:Msbcl}
+BUILD_DEPENDS += lang/sbcl
+XCHOST_CMD = ${LOCALBASE}/bin/sbcl \
+ --disable-debugger --no-sysinit --no-userinit
+
+.elif ${BOOTSTRAP_METHOD:Mclisp}
BUILD_DEPENDS += lang/clisp
-BOOTSTRAP_CMD =${LOCALBASE}/bin/clisp -q -norc
+XCHOST_CMD = ${LOCALBASE}/bin/clisp -q -norc
+
+.elif ${BOOTSTRAP_METHOD:Mecl}
+BUILD_DEPENDS += lang/ecl
+XCHOST_CMD = ${LOCALBASE}/bin/ecl -q --norc
+
+.else
+ERRORS += "Fatal: unknown BOOTSTRAP_METHOD"
.endif
-MAKE_PARAMS += --xc-host="${BOOTSTRAP_CMD}" ${EXTRA_PARAMS}
-TEST_DEPENDS = devel/gmp
-# base makeinfo chokes on sbcl texinfo files
+# sb-thread is available only on some architectures and required on others
+.if ${FLAVOR:Mthreads}
+ONLY_FOR_ARCHS += riscv64 powerpc powerpc64 i386 amd64 aarch64
+EXTRA_PARAMS +=--with-sb-thread
+WANTLIB += pthread
+.else
+NOT_FOR_ARCHS +=
UPDATE: net/wormhole-william to v1.0.6 and use go modules
Hi,
Update to version 1.0.6 and use go modules so that we don't have to vendor
tarballs any more.
OK?
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
Index: Makefile
===
RCS file: /cvs/ports/net/wormhole-william/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile11 Mar 2022 19:48:14 - 1.5
+++ Makefile29 Jun 2023 08:45:34 -
@@ -1,23 +1,20 @@
COMMENT = magic wormhole implementation in Go
-V =1.0.4
-DISTNAME = wormhole-william-vendored-${V}
-PKGNAME = wormhole-william-${V}
-REVISION = 0
-
-ALL_TARGET = github.com/psanford/wormhole-william
+MODGO_MODNAME =github.com/psanford/wormhole-william
+MODGO_VERSION = v1.0.6
+DISTNAME = wormhole-william-${MODGO_VERSION}
CATEGORIES = net
HOMEPAGE = https://github.com/psanford/wormhole-william
MAINTAINER = Edd Barrett
+
# MIT
PERMIT_PACKAGE = Yes
WANTLIB += c pthread
-MASTER_SITES = https://theunixzoo.co.uk/distfiles/
-
MODULES = lang/go
+.include "modules.inc"
.include
Index: distinfo
===
RCS file: /cvs/ports/net/wormhole-william/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo21 Aug 2020 18:54:17 - 1.3
+++ distinfo29 Jun 2023 08:41:29 -
@@ -1,2 +1,1030 @@
-SHA256 (wormhole-william-vendored-1.0.4.tar.gz) =
WusfJZqRpocPEQgq8Yr9HhTxIEcfCEWKu10wMSeuIIQ=
-SIZE (wormhole-william-vendored-1.0.4.tar.gz) = 1325656
+SHA256 (go_modules/cloud.google.com/go/@v/v0.26.0.mod) =
IhijTyC5cbwZUhbUGV9XUgoqy9hd5/wxrPxEAmZwTBE=
+SHA256 (go_modules/cloud.google.com/go/@v/v0.34.0.mod) =
IhijTyC5cbwZUhbUGV9XUgoqy9hd5/wxrPxEAmZwTBE=
+SHA256 (go_modules/cloud.google.com/go/@v/v0.38.0.mod) =
IRVe7cPkx6CccZziPHA/vxTDSspC7QDcCHdN5uu+gAc=
+SHA256 (go_modules/cloud.google.com/go/@v/v0.44.1.mod) =
0lFpfc+oXnGvn470xm+euU9mTDCz6WS6EyoXOXtrmXU=
+SHA256 (go_modules/cloud.google.com/go/@v/v0.44.2.mod) =
mrgY5bGZiiX607YbwvI2E/hWzIXnF8Savu81REp166s=
+SHA256 (go_modules/cloud.google.com/go/@v/v0.45.1.mod) =
8o6hRgc0Vf8GZWLxectMcrJa8hhEJt3PO/sa8SR3bdw=
+SHA256 (go_modules/cloud.google.com/go/@v/v0.46.3.mod) =
ZPIDHVZNPVDrh3Pjhmsk4KCRp4biOJbjlHjOcH0lSOA=
+SHA256 (go_modules/cloud.google.com/go/@v/v0.46.3.zip) =
CuZpDufZX5bTneML7FYEfR6Ruf+v0NVVCO9WTh38E7I=
+SHA256 (go_modules/cloud.google.com/go/bigquery/@v/v1.0.1.mod) =
mSISTdoOJp78FTZOomO/maQgsac2OHEAfrHLwtGx3Hw=
+SHA256 (go_modules/cloud.google.com/go/bigquery/@v/v1.0.1.zip) =
c40fcmziT2GO51Y/bJQZ5jB/iBRUj0WtiiJ8/7sUSMA=
+SHA256 (go_modules/cloud.google.com/go/datastore/@v/v1.0.0.mod) =
A0xS+1OSg3+NsnVIX7DpXRDmzSUw3Ty2c9fTUJ4WsuY=
+SHA256 (go_modules/cloud.google.com/go/datastore/@v/v1.0.0.zip) =
Qek+yVJq5YDakDANfkIabTnXnLYRjWKtHTwGQi2Kcb8=
+SHA256 (go_modules/cloud.google.com/go/firestore/@v/v1.1.0.mod) =
nJQs6dfFXQTC1H4wb3ZOtc4RvmDSbI22rdTsoow+4ig=
+SHA256 (go_modules/cloud.google.com/go/firestore/@v/v1.1.0.zip) =
QRVtIpxTxOXghFJPP+y7KnDQ7JrJivejBBPr2ejrSp4=
+SHA256 (go_modules/cloud.google.com/go/pubsub/@v/v1.0.1.mod) =
SB+3lg2As4sxevbIrYOJhyGKfymA2RtC9sfhZohgzEk=
+SHA256 (go_modules/cloud.google.com/go/pubsub/@v/v1.0.1.zip) =
i8pGp8Xw3NV20j+ppfEHlVMW1vDY8wbuHW+qfemcPSk=
+SHA256 (go_modules/cloud.google.com/go/storage/@v/v1.0.0.mod) =
o0tc2WleqzSwH4fy2d46BdD0ffsrwSMJLdRRDJ7HEhU=
+SHA256 (go_modules/cloud.google.com/go/storage/@v/v1.0.0.zip) =
uuxHVsVz7eWPGet65KyuvXrD8MVkE+y70hatRqWJpdo=
+SHA256
(go_modules/dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod)
= +sTF2PaC+eyXchsvyf1TBiqxcLLSt/q4/8EK4YOhlR4=
+SHA256
(go_modules/dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.zip)
= ylMwkB/NqD0JVTrDYldtGWxTEVe8nFAudrI3zKJitAA=
+SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v0.3.1.mod) =
KAIbQYClnDmTYHqVsY4jDdC8a+pSQv/o6ou/tPT3tNc=
+SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v0.3.1.zip) =
gVxuWUdF8tiEL/mksFacZpXmzf1eB+Wz2Y0GtyykHjw=
+SHA256
(go_modules/github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod)
= luveICsJL29NHzkwvAfPGKVpmZjd6lG5T+hYETspqNg=
+SHA256
(go_modules/github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.zip)
= 9Slix/vsqB6op3fR+LHx0lgD3EN/u0kPJTNEIyiEMo4=
+SHA256 (go_modules/github.com/!one!of!one/xxhash/@v/v1.2.2.mod) =
l7ZeMrMlElrr6MN8KHCeMIxaHGZOGnfd98SxsLltdzs=
+SHA256 (go_modules/github.com/!one!of!one/xxhash/@v/v1.2.2.zip) =
tKfU3QM+ljEsBrQ9QqZCXgCDfAJUdBvNVpyaCQmyb50=
+SHA256 (go_modules/github.com/!vivid!cortex/ewma/@v/v1.1.1.mod) =
3qcgZM9b0EmfFqzs1BeItYegnmKl2a1c2NN4mCdhYTo=
+SHA256 (go_modules/github.com/!vivid!cortex/ewma/@v/v1.1.1.zip) =
7r7nwPIOlqu9oWEe0qPSa0wsEDk8qmot/RYFdjpcGhI=
+SHA256
(go_modules/github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod)
= wCGTza/yP3AiRZc5CDL1aCUK84T5jcQ3iutb+P7GkPw=
+SHA256
(go_modules/github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3b
[UPDATE] graphics/geeqie
Hi, Attached diff updates geeqie to 2.1. Changelog: - Additional --selection remote commands - Split view additional 3-image layout - Many bug fixes - Some progress in GTK4 migration - Change source code from c to c++ - Much progress in making source code warning-free - Updated language support Tested on amd64. OKs? Comments? geeqie-2.1.diff Description: Binary data
Re: ncspot aborts on startup in -current
On Thu, Jun 29, 2023 at 11:30:10AM +0200, Theo Buehler wrote:
> On Thu, Jun 29, 2023 at 11:25:20AM +0200, Theo Buehler wrote:
> > On Thu, Jun 29, 2023 at 10:54:10AM +0200, Theo Buehler wrote:
> > > On Thu, Jun 29, 2023 at 09:23:53AM +0100, Stuart Henderson wrote:
> > > > Does the same happen if you build your own kernel rather than using a
> > > > snap?
> > >
> > > Someone will have to port the patches that add _CET_ENDBR from
> > > security/boringssl/head to security/rust-ring.
> >
> > Something like this should do the trick. Can't test it. Build and
> > install rust-ring with this patch, then build and install ncspot.
>
> Ugh hold on. I missed something.
This one at least compiles.
Index: Makefile
===
RCS file: /cvs/ports/security/rust-ring/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile12 Apr 2023 18:43:01 - 1.10
+++ Makefile29 Jun 2023 09:22:34 -
@@ -4,7 +4,7 @@ COMMENT = ring crate source patched for
VERSION = 0.16.20
DISTNAME = ring-${VERSION}
PKGNAME = rust-${DISTNAME}
-REVISION = 6
+REVISION = 7
SUBST_VARS = VERSION
Index: patches/patch-pregenerated_aesni-gcm-x86_64-elf_S
===
RCS file:
/cvs/ports/security/rust-ring/patches/patch-pregenerated_aesni-gcm-x86_64-elf_S,v
retrieving revision 1.2
diff -u -p -r1.2 patch-pregenerated_aesni-gcm-x86_64-elf_S
--- patches/patch-pregenerated_aesni-gcm-x86_64-elf_S 24 Feb 2023 08:09:50
- 1.2
+++ patches/patch-pregenerated_aesni-gcm-x86_64-elf_S 29 Jun 2023 09:36:56
-
@@ -1,7 +1,36 @@
Index: pregenerated/aesni-gcm-x86_64-elf.S
--- pregenerated/aesni-gcm-x86_64-elf.S.orig
+++ pregenerated/aesni-gcm-x86_64-elf.S
-@@ -827,6 +827,7 @@ GFp_aesni_gcm_encrypt:
+@@ -1,6 +1,12 @@
+ # This file is generated from a similarly-named Perl script in the BoringSSL
+ # source tree. Do not edit by hand.
+
++#if defined(__CET__)
++#include
++#else
++#define _CET_ENDBR
++#endif
++
+ #if defined(__has_feature)
+ #if __has_feature(memory_sanitizer) && !defined(OPENSSL_NO_ASM)
+ #define OPENSSL_NO_ASM
+@@ -346,6 +352,7 @@ _aesni_ctr32_ghash_6x:
+ .align32
+ GFp_aesni_gcm_decrypt:
+ .cfi_startproc
++ _CET_ENDBR
+ xorq%r10,%r10
+
+
+@@ -553,6 +560,7 @@ _aesni_ctr32_6x:
+ .align32
+ GFp_aesni_gcm_encrypt:
+ .cfi_startproc
++ _CET_ENDBR
+ xorq%r10,%r10
+
+
+@@ -827,6 +835,7 @@ GFp_aesni_gcm_encrypt:
.byte 0xf3,0xc3
.cfi_endproc
.size GFp_aesni_gcm_encrypt,.-GFp_aesni_gcm_encrypt
@@ -9,7 +38,7 @@ Index: pregenerated/aesni-gcm-x86_64-elf
.align64
.Lbswap_mask:
.byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
-@@ -839,6 +840,7 @@ GFp_aesni_gcm_encrypt:
+@@ -839,6 +848,7 @@ GFp_aesni_gcm_encrypt:
.Lone_lsb:
.byte 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
.byte
65,69,83,45,78,73,32,71,67,77,32,109,111,100,117,108,101,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
Index: patches/patch-pregenerated_aesni-x86_64-elf_S
===
RCS file:
/cvs/ports/security/rust-ring/patches/patch-pregenerated_aesni-x86_64-elf_S,v
retrieving revision 1.2
diff -u -p -r1.2 patch-pregenerated_aesni-x86_64-elf_S
--- patches/patch-pregenerated_aesni-x86_64-elf_S 24 Feb 2023 08:09:50
- 1.2
+++ patches/patch-pregenerated_aesni-x86_64-elf_S 29 Jun 2023 09:36:55
-
@@ -1,7 +1,44 @@
Index: pregenerated/aesni-x86_64-elf.S
--- pregenerated/aesni-x86_64-elf.S.orig
+++ pregenerated/aesni-x86_64-elf.S
-@@ -1157,6 +1157,7 @@ __aesni_set_encrypt_key:
+@@ -1,6 +1,12 @@
+ # This file is generated from a similarly-named Perl script in the BoringSSL
+ # source tree. Do not edit by hand.
+
++#if defined(__CET__)
++#include
++#else
++#define _CET_ENDBR
++#endif
++
+ #if defined(__has_feature)
+ #if __has_feature(memory_sanitizer) && !defined(OPENSSL_NO_ASM)
+ #define OPENSSL_NO_ASM
+@@ -17,6 +23,7 @@
+ .align16
+ GFp_aes_hw_encrypt:
+ .cfi_startproc
++ _CET_ENDBR
+ movups (%rdi),%xmm2
+ movl240(%rdx),%eax
+ movups (%rdx),%xmm0
+@@ -274,6 +281,7 @@ _aesni_encrypt8:
+ .align16
+ GFp_aes_hw_ctr32_encrypt_blocks:
+ .cfi_startproc
++ _CET_ENDBR
+ cmpq$1,%rdx
+ jne .Lctr32_bulk
+
+@@ -856,6 +864,7 @@ GFp_aes_hw_ctr32_encrypt_blocks:
+ GFp_aes_hw_set_encrypt_key:
+ __aesni_set_encrypt_key:
+ .cfi_startproc
++ _CET_ENDBR
+ .byte 0x48,0x83,0xEC,0x08
+ .cfi_adjust_cfa_offset8
+ movq$-1,%rax
+@@ -1157,6 +1166,7 @@ __aesni_set_encrypt_key:
.byte 0xf3,0xc3
.size GFp_aes_hw_set_encrypt_key,.-GFp_aes_hw_set_encrypt_key
.size __aesni_set_encry
Re: ncspot aborts on startup in -current
On Thu, Jun 29, 2023 at 11:25:20AM +0200, Theo Buehler wrote: > On Thu, Jun 29, 2023 at 10:54:10AM +0200, Theo Buehler wrote: > > On Thu, Jun 29, 2023 at 09:23:53AM +0100, Stuart Henderson wrote: > > > Does the same happen if you build your own kernel rather than using a > > > snap? > > > > Someone will have to port the patches that add _CET_ENDBR from > > security/boringssl/head to security/rust-ring. > > Something like this should do the trick. Can't test it. Build and > install rust-ring with this patch, then build and install ncspot. Ugh hold on. I missed something.
Re: ncspot aborts on startup in -current
On Thu, Jun 29, 2023 at 10:54:10AM +0200, Theo Buehler wrote:
> On Thu, Jun 29, 2023 at 09:23:53AM +0100, Stuart Henderson wrote:
> > Does the same happen if you build your own kernel rather than using a
> > snap?
>
> Someone will have to port the patches that add _CET_ENDBR from
> security/boringssl/head to security/rust-ring.
Something like this should do the trick. Can't test it. Build and
install rust-ring with this patch, then build and install ncspot.
Index: Makefile
===
RCS file: /cvs/ports/security/rust-ring/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile12 Apr 2023 18:43:01 - 1.10
+++ Makefile29 Jun 2023 09:22:34 -
@@ -4,7 +4,7 @@ COMMENT = ring crate source patched for
VERSION = 0.16.20
DISTNAME = ring-${VERSION}
PKGNAME = rust-${DISTNAME}
-REVISION = 6
+REVISION = 7
SUBST_VARS = VERSION
Index: patches/patch-pregenerated_aesni-gcm-x86_64-elf_S
===
RCS file:
/cvs/ports/security/rust-ring/patches/patch-pregenerated_aesni-gcm-x86_64-elf_S,v
retrieving revision 1.2
diff -u -p -r1.2 patch-pregenerated_aesni-gcm-x86_64-elf_S
--- patches/patch-pregenerated_aesni-gcm-x86_64-elf_S 24 Feb 2023 08:09:50
- 1.2
+++ patches/patch-pregenerated_aesni-gcm-x86_64-elf_S 29 Jun 2023 09:17:43
-
@@ -1,7 +1,23 @@
Index: pregenerated/aesni-gcm-x86_64-elf.S
--- pregenerated/aesni-gcm-x86_64-elf.S.orig
+++ pregenerated/aesni-gcm-x86_64-elf.S
-@@ -827,6 +827,7 @@ GFp_aesni_gcm_encrypt:
+@@ -346,6 +346,7 @@ _aesni_ctr32_ghash_6x:
+ .align32
+ GFp_aesni_gcm_decrypt:
+ .cfi_startproc
++ _CET_ENDBR
+ xorq%r10,%r10
+
+
+@@ -553,6 +554,7 @@ _aesni_ctr32_6x:
+ .align32
+ GFp_aesni_gcm_encrypt:
+ .cfi_startproc
++ _CET_ENDBR
+ xorq%r10,%r10
+
+
+@@ -827,6 +829,7 @@ GFp_aesni_gcm_encrypt:
.byte 0xf3,0xc3
.cfi_endproc
.size GFp_aesni_gcm_encrypt,.-GFp_aesni_gcm_encrypt
@@ -9,7 +25,7 @@ Index: pregenerated/aesni-gcm-x86_64-elf
.align64
.Lbswap_mask:
.byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
-@@ -839,6 +840,7 @@ GFp_aesni_gcm_encrypt:
+@@ -839,6 +842,7 @@ GFp_aesni_gcm_encrypt:
.Lone_lsb:
.byte 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
.byte
65,69,83,45,78,73,32,71,67,77,32,109,111,100,117,108,101,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
Index: patches/patch-pregenerated_aesni-x86_64-elf_S
===
RCS file:
/cvs/ports/security/rust-ring/patches/patch-pregenerated_aesni-x86_64-elf_S,v
retrieving revision 1.2
diff -u -p -r1.2 patch-pregenerated_aesni-x86_64-elf_S
--- patches/patch-pregenerated_aesni-x86_64-elf_S 24 Feb 2023 08:09:50
- 1.2
+++ patches/patch-pregenerated_aesni-x86_64-elf_S 29 Jun 2023 09:17:43
-
@@ -1,7 +1,31 @@
Index: pregenerated/aesni-x86_64-elf.S
--- pregenerated/aesni-x86_64-elf.S.orig
+++ pregenerated/aesni-x86_64-elf.S
-@@ -1157,6 +1157,7 @@ __aesni_set_encrypt_key:
+@@ -17,6 +17,7 @@
+ .align16
+ GFp_aes_hw_encrypt:
+ .cfi_startproc
++ _CET_ENDBR
+ movups (%rdi),%xmm2
+ movl240(%rdx),%eax
+ movups (%rdx),%xmm0
+@@ -274,6 +275,7 @@ _aesni_encrypt8:
+ .align16
+ GFp_aes_hw_ctr32_encrypt_blocks:
+ .cfi_startproc
++ _CET_ENDBR
+ cmpq$1,%rdx
+ jne .Lctr32_bulk
+
+@@ -856,6 +858,7 @@ GFp_aes_hw_ctr32_encrypt_blocks:
+ GFp_aes_hw_set_encrypt_key:
+ __aesni_set_encrypt_key:
+ .cfi_startproc
++ _CET_ENDBR
+ .byte 0x48,0x83,0xEC,0x08
+ .cfi_adjust_cfa_offset8
+ movq$-1,%rax
+@@ -1157,6 +1160,7 @@ __aesni_set_encrypt_key:
.byte 0xf3,0xc3
.size GFp_aes_hw_set_encrypt_key,.-GFp_aes_hw_set_encrypt_key
.size __aesni_set_encrypt_key,.-__aesni_set_encrypt_key
@@ -9,7 +33,7 @@ Index: pregenerated/aesni-x86_64-elf.S
.align64
.Lbswap_mask:
.byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
-@@ -1177,5 +1178,6 @@ __aesni_set_encrypt_key:
+@@ -1177,5 +1181,6 @@ __aesni_set_encrypt_key:
.byte
65,69,83,32,102,111,114,32,73,110,116,101,108,32,65,69,83,45,78,73,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
.align64
Index: patches/patch-pregenerated_chacha-x86_64-elf_S
===
RCS file:
/cvs/ports/security/rust-ring/patches/patch-pregenerated_chacha-x86_64-elf_S,v
retrieving revision 1.2
diff -u -p -r1.2 patch-pregenerated_chacha-x86_64-elf_S
--- patches/patch-pregenerated_chacha-x86_64-elf_S 24 Feb 2023 08:09:50
- 1.2
+++ patches/patch-pregenerated
Re: ncspot aborts on startup in -current
On Thu, Jun 29, 2023 at 09:23:53AM +0100, Stuart Henderson wrote: > Does the same happen if you build your own kernel rather than using a > snap? Someone will have to port the patches that add _CET_ENDBR from security/boringssl/head to security/rust-ring.
Re: ncspot aborts on startup in -current
* Stuart Henderson wrote: > Does the same happen if you build your own kernel rather than using a > snap? No, it works when running a self-compiled kernel. So it seems it is related to BTCFI. Cheers Matthias
Re: [PATCH] www/nginx -- add njs dynamic module
(oops, resending, i screwed up the mail headers)
On 2023/06/29 00:49, Sergey A. Osokin wrote:
> Hi,
>
> On Mon, Jun 19, 2023 at 03:25:42PM +, Sergey A. Osokin wrote:
> > On Thu, Jun 08, 2023 at 11:30:57PM +, Sergey A. Osokin wrote:
> > > On Wed, May 24, 2023 at 04:14:34PM +, Sergey A. Osokin wrote:
> > > >
> > > > I'd like to extend the nginx functionality with nginx javascript
> > > > module, so here's the patch to add the module to the www/nginx
> > > > port.
> > > > Please let me know your thoughts.
>
> Is there any updates on this?
> Thank you.
>
> --
> Sergey A. Osokin
I note you didn't cc the port maintainer on your original mail,
was there a reason for that?
I've cc'd and included the original mail. What are you thoughts
on this please Robert?
- Forwarded message from "Sergey A. Osokin" -
From: "Sergey A. Osokin"
Date: Wed, 24 May 2023 16:14:34 +
To: ports@openbsd.org
Subject: [PATCH] www/nginx -- add njs dynamic module
Hi,
I'd like to extend the nginx functionality with nginx javascript
module, so here's the patch to add the module to the www/nginx
port.
Please let me know your thoughts.
Thank you.
--
Sergey A. Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.165
diff -u -p -r1.165 Makefile
--- Makefile17 Apr 2023 17:36:58 - 1.165
+++ Makefile24 May 2023 16:07:23 -
@@ -11,6 +11,7 @@ COMMENT-ldap_auth=nginx LDAP authentica
COMMENT-lua= nginx lua scripting module
COMMENT-headers_more= nginx module for setting/adding/clearing headers
COMMENT-perl= nginx perl scripting module
+COMMENT-njs= nginx javascript scripting module
COMMENT-passenger= nginx passenger (ruby/python/nodejs) integration module
COMMENT-rtmp= nginx module for RTMP streaming
COMMENT-securelink=nginx HMAC secure link module
@@ -18,7 +19,9 @@ COMMENT-securelink= nginx HMAC secure li
VERSION= 1.24.0
DISTNAME= nginx-${VERSION}
CATEGORIES=www
+REVISION= 0
+VERSION-njs= 0.7.12
VERSION-rtmp= 1.2.1
PKGNAME-main= ${DISTNAME}
@@ -32,6 +35,7 @@ PKGNAME-ldap_auth=nginx-ldap_auth-${VER
PKGNAME-lua= nginx-lua-${VERSION}
PKGNAME-headers_more= nginx-headers-more-${VERSION}
PKGNAME-perl= nginx-perl-${VERSION}
+PKGNAME-njs= nginx-njs-${VERSION}
PKGNAME-passenger= nginx-passenger-${VERSION}
PKGNAME-rtmp= nginx-rtmp-${VERSION}
PKGNAME-securelink=nginx-securelink-${VERSION}
@@ -51,6 +55,7 @@ _GH_MODS= \
nbs-system naxsi
d714f1636ea49a9a9f4f06dba14aee003e970834 \
kvspb nginx-auth-ldap
83c059b73566c2ee9cbda920d91b66657cf120b7 \
arutnginx-rtmp-module v${VERSION-rtmp} \
+ nginx njs ${VERSION-njs} \
simpl ngx_devel_kit v0.3.0 \
leevngx_http_geoip2_module 3.3 \
nginx-modules ngx_http_hmac_secure_link_module
48c4625fbbf51ed5a95bfec23fa444f6c3702e50
@@ -70,7 +75,7 @@ MULTI_PACKAGES = -main -naxsi -perl ${MO
MODULE_PACKAGES = -image_filter -geoip2 -xslt -mailproxy -stream \
-passenger -headers_more -ldap_auth -lua -rtmp \
- -securelink
+ -securelink -njs
FLAVOR ?=
PSEUDO_FLAVORS = no_lua no_passenger
@@ -85,6 +90,7 @@ WANTLIB-stream=
WANTLIB-image_filter= gd
WANTLIB-geoip2=maxminddb
WANTLIB-rtmp=
+WANTLIB-njs= pcre2-8 crypto ssl xml2 z
WANTLIB-xslt= exslt xml2 xslt
WANTLIB-naxsi=
WANTLIB-ldap_auth= ldap
@@ -103,6 +109,8 @@ LIB_DEPENDS-ldap_auth= databases/openlda
LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
LIB_DEPENDS-rtmp=
LIB_DEPENDS-securelink=
+LIB_DEPENDS-njs= devel/pcre2 \
+ textproc/libxml
MODLUA_RUNDEP= No
RUN_DEPENDS= www/nginx,-main=${VERSION}
@@ -150,6 +158,10 @@ CONFIGURE_ARGS+= --add-dynamic-module=${
CONFIGURE_ARGS+=
--add-dynamic-module=${WRKDIR}/nginx-rtmp-module-${VERSION-rtmp}/
.endif
+.if ${BUILD_PACKAGES:M-njs}
+CONFIGURE_ARGS+= --add-dynamic-module=${WRKSRC}/njs/nginx
+.endif
+
CONFIGURE_ARGS+= --prefix=${NGINX_DIR} \
--conf-path=${SYSCONFDIR}/nginx/nginx.conf \
--sbin-path=${PREFIX}/sbin/nginx \
@@ -193,7 +205,7 @@ NO_TEST=Yes
ALL_TARGET=
pre-patch:
-.for i in headers-more-nginx-module lua-nginx-module naxsi \
+.for i in headers-more-nginx-module lua-nginx-module naxsi njs \
nginx-auth-ldap ngx_devel_kit ngx_http_geoip2_module \
ngx_http_hmac_secure_link_module
cd ${WRKSRC} && mv ../$i-* $i
Index: distinfo
===
RCS file: /cvs/po
Re: ncspot aborts on startup in -current
Does the same happen if you build your own kernel rather than using a
snap?
On 2023/06/29 10:14, Matthias Schmidt wrote:
>
> Hi ports@,
>
> ncspot on -current aborts on startup with SIGILL and complains about a
> missing assembler file in the ring crate. I haven't used it in a while
> so I didn't know exactly when it stopped working. My machine supports
> BTCFI...
>
> Let me know if you need more information.
>
> Cheers
>
> Matthias
>
> $ ncspot
> Connecting to Spotify..
> Illegal instruction (core dumped)
>
> $ sysctl -n kern.version
> OpenBSD 7.3-current (GENERIC.MP) #1265: Tue Jun 27 22:39:43 MDT 2023
> dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
>
> $ pkg_info -v ncspot
> [...]
> Size: 23923626
> Signature:
> ncspot-0.13.3,10,@dbus-1.14.8v0,@portaudio-svn-1970p0,c++abi.6.0,c.97.0,crypto.51.0,curses.14.0,dbus-1.11.3,m.10.1,portaudio.1.2,pthread.27.0,ssl.54.0
> Packing-list:
> @name ncspot-0.13.3
> @url
> https://cdn.openbsd.org/pub/OpenBSD/snapshots/packages/amd64/ncspot-0.13.3.tgz
> @version 10
>
> $ egdb /usr/local/bin/ncspot ncspot.core
> Reading symbols from /usr/local/bin/ncspot...
> [New process 417810]
> [New process 424680]
> [New process 618649]
> [New process 135978]
> [New process 586465]
> [New process 113828]
> [New process 297150]
> [New process 132607]
> Core was generated by `ncspot'.
> Program terminated with signal SIGILL, Illegal instruction.
> #0 GFp_sha512_block_data_order () at
> /usr/obj/ports/ncspot-0.13.3/ncspot-0.13.3/modcargo-crates/ring-0.16.20/pregenerated/sha512-x86_64-elf.S:21
> 21
> /usr/obj/ports/ncspot-0.13.3/ncspot-0.13.3/modcargo-crates/ring-0.16.20/pregenerated/sha512-x86_64-elf.S:
> No such file or directory.
> [Current thread is 1 (process 417810)]
> (gdb) bt
> #0 GFp_sha512_block_data_order () at
> /usr/obj/ports/ncspot-0.13.3/ncspot-0.13.3/modcargo-crates/ring-0.16.20/pregenerated/sha512-x86_64-elf.S:21
> #1 0x0e2388c8b004 in ring::digest::Context::update ()
> #2 0x0e2388c74167 in rustls::hash_hs::HandshakeHashBuffer::start_hash ()
> #3 0x0e2388c7902e in rustls::conn::State>::handle
> ()
> #4 0x0e2388c79c0c in
> rustls::conn::State>::handle
> ()
> #5 0x0e2388c39d36 in rustls::conn::CommonState::process_main_protocol ()
> #6 0x0e2388c3a5d5 in
> rustls::conn::ConnectionCommon::process_new_packets ()
> #7 0x0e2388c39ed1 in rustls::conn::ConnectionCommon::complete_io ()
> #8 0x0e2388c1f8aa in ureq::rtls:: alloc::sync::Arc>::connect ()
> #9 0x0e2388c297ad in ureq::stream::connect_https ()
> #10 0x0e2388c33448 in ureq::unit::connect_socket ()
> #11 0x0e2388c31f3f in ureq::unit::connect_inner ()
> #12 0x0e2388c30d95 in ureq::unit::connect ()
> #13 0x0e2388c3d989 in ureq::request::Request::do_call::{{closure}} ()
> #14 0x0e2388c3d4e2 in ureq::request::Request::do_call ()
> #15 0x0e2388c3cc82 in ureq::request::Request::call ()
> #16 0x0e238865e2b6 in rspotify_http::ureq::UreqClient::request ()
> #17 0x0e23887c9d7a in rspotify::clients::base::BaseClient::api_get ()
> #18 0x0e23888128c9 in
> ncspot::spotify_api::WebApi::current_user::{{closure}} ()
> #19 0x0e23888123f8 in ncspot::spotify_api::WebApi::current_user ()
> #20 0x0e238890bbf6 in ncspot::library::Library::new ()
> #21 0x0e23887ee779 in ncspot::application::Application::new ()
> #22 0x0e2388a2c58e in ncspot::main ()
> #23 0x0e238898edef in
> std::sys_common::backtrace::__rust_begin_short_backtrace ()
> #24 0x0e2388854b39 in std::rt::lang_start::{{closure}} ()
> #25 0x0e238907d498 in std::panicking::try ()
> #26 0x0e2389097ef2 in std::rt::lang_start_internal ()
> #27 0x0e2388a45851 in main ()
> (gdb)
>
>
> OpenBSD 7.3-current (GENERIC.MP) #1265: Tue Jun 27 22:39:43 MDT 2023
> dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> real mem = 34064420864 (32486MB)
> avail mem = 33012355072 (31483MB)
> random: good seed from bootblocks
> mpath0 at root
> scsibus0 at mpath0: 256 targets
> mainbus0 at root
> bios0 at mainbus0: SMBIOS rev. 3.3 @ 0x43ca1000 (119 entries)
> bios0: vendor American Megatrends International, LLC. version "N.1.15A09"
> date 03/24/2022
> bios0: TUXEDO TUXEDO InfinityBook Pro 14 Gen6
> efi0 at bios0: UEFI 2.7
> efi0: American Megatrends rev 0x50013
> acpi0 at bios0: ACPI 6.2
> acpi0: sleep states S0 S3 S4 S5
> acpi0: tables DSDT FACP MCFG SSDT FIDT SSDT SSDT SSDT HPET APIC SSDT SSDT
> NHLT UEFI LPIT SSDT SSDT DBGP DBG2 SSDT DMAR SSDT SSDT BGRT PTDT WSMT FPDT
> acpi0: wakeup devices PEGP(S4) PEGP(S4) PEGP(S4) PEG0(S4) PEGP(S4) RP01(S4)
> PXSX(S4) RP02(S4) PXSX(S4) RP03(S4) PXSX(S4) RP04(S4) PXSX(S4) RP05(S4)
> PXSX(S4) RP06(S4) [...]
> acpitimer0 at acpi0: 3579545 Hz, 24 bits
> acpimcfg0 at acpi0
> acpimcfg0: addr 0xc000, bus 0-255
> acpihpet0 at acpi0: 1920 Hz
> acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
> cpu0 at mainbus0: apid 0 (boot processor)
> cpu0: 11th Gen Intel(R
ncspot aborts on startup in -current
Hi ports@,
ncspot on -current aborts on startup with SIGILL and complains about a
missing assembler file in the ring crate. I haven't used it in a while
so I didn't know exactly when it stopped working. My machine supports
BTCFI...
Let me know if you need more information.
Cheers
Matthias
$ ncspot
Connecting to Spotify..
Illegal instruction (core dumped)
$ sysctl -n kern.version
OpenBSD 7.3-current (GENERIC.MP) #1265: Tue Jun 27 22:39:43 MDT 2023
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
$ pkg_info -v ncspot
[...]
Size: 23923626
Signature:
ncspot-0.13.3,10,@dbus-1.14.8v0,@portaudio-svn-1970p0,c++abi.6.0,c.97.0,crypto.51.0,curses.14.0,dbus-1.11.3,m.10.1,portaudio.1.2,pthread.27.0,ssl.54.0
Packing-list:
@name ncspot-0.13.3
@url
https://cdn.openbsd.org/pub/OpenBSD/snapshots/packages/amd64/ncspot-0.13.3.tgz
@version 10
$ egdb /usr/local/bin/ncspot ncspot.core
Reading symbols from /usr/local/bin/ncspot...
[New process 417810]
[New process 424680]
[New process 618649]
[New process 135978]
[New process 586465]
[New process 113828]
[New process 297150]
[New process 132607]
Core was generated by `ncspot'.
Program terminated with signal SIGILL, Illegal instruction.
#0 GFp_sha512_block_data_order () at
/usr/obj/ports/ncspot-0.13.3/ncspot-0.13.3/modcargo-crates/ring-0.16.20/pregenerated/sha512-x86_64-elf.S:21
21
/usr/obj/ports/ncspot-0.13.3/ncspot-0.13.3/modcargo-crates/ring-0.16.20/pregenerated/sha512-x86_64-elf.S:
No such file or directory.
[Current thread is 1 (process 417810)]
(gdb) bt
#0 GFp_sha512_block_data_order () at
/usr/obj/ports/ncspot-0.13.3/ncspot-0.13.3/modcargo-crates/ring-0.16.20/pregenerated/sha512-x86_64-elf.S:21
#1 0x0e2388c8b004 in ring::digest::Context::update ()
#2 0x0e2388c74167 in rustls::hash_hs::HandshakeHashBuffer::start_hash ()
#3 0x0e2388c7902e in >::handle
()
#4 0x0e2388c79c0c in
>::handle
()
#5 0x0e2388c39d36 in rustls::conn::CommonState::process_main_protocol ()
#6 0x0e2388c3a5d5 in
rustls::conn::ConnectionCommon::process_new_packets ()
#7 0x0e2388c39ed1 in rustls::conn::ConnectionCommon::complete_io ()
#8 0x0e2388c1f8aa in ureq::rtls::>::connect ()
#9 0x0e2388c297ad in ureq::stream::connect_https ()
#10 0x0e2388c33448 in ureq::unit::connect_socket ()
#11 0x0e2388c31f3f in ureq::unit::connect_inner ()
#12 0x0e2388c30d95 in ureq::unit::connect ()
#13 0x0e2388c3d989 in ureq::request::Request::do_call::{{closure}} ()
#14 0x0e2388c3d4e2 in ureq::request::Request::do_call ()
#15 0x0e2388c3cc82 in ureq::request::Request::call ()
#16 0x0e238865e2b6 in rspotify_http::ureq::UreqClient::request ()
#17 0x0e23887c9d7a in rspotify::clients::base::BaseClient::api_get ()
#18 0x0e23888128c9 in
ncspot::spotify_api::WebApi::current_user::{{closure}} ()
#19 0x0e23888123f8 in ncspot::spotify_api::WebApi::current_user ()
#20 0x0e238890bbf6 in ncspot::library::Library::new ()
#21 0x0e23887ee779 in ncspot::application::Application::new ()
#22 0x0e2388a2c58e in ncspot::main ()
#23 0x0e238898edef in
std::sys_common::backtrace::__rust_begin_short_backtrace ()
#24 0x0e2388854b39 in std::rt::lang_start::{{closure}} ()
#25 0x0e238907d498 in std::panicking::try ()
#26 0x0e2389097ef2 in std::rt::lang_start_internal ()
#27 0x0e2388a45851 in main ()
(gdb)
OpenBSD 7.3-current (GENERIC.MP) #1265: Tue Jun 27 22:39:43 MDT 2023
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 34064420864 (32486MB)
avail mem = 33012355072 (31483MB)
random: good seed from bootblocks
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 3.3 @ 0x43ca1000 (119 entries)
bios0: vendor American Megatrends International, LLC. version "N.1.15A09" date
03/24/2022
bios0: TUXEDO TUXEDO InfinityBook Pro 14 Gen6
efi0 at bios0: UEFI 2.7
efi0: American Megatrends rev 0x50013
acpi0 at bios0: ACPI 6.2
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP MCFG SSDT FIDT SSDT SSDT SSDT HPET APIC SSDT SSDT NHLT
UEFI LPIT SSDT SSDT DBGP DBG2 SSDT DMAR SSDT SSDT BGRT PTDT WSMT FPDT
acpi0: wakeup devices PEGP(S4) PEGP(S4) PEGP(S4) PEG0(S4) PEGP(S4) RP01(S4)
PXSX(S4) RP02(S4) PXSX(S4) RP03(S4) PXSX(S4) RP04(S4) PXSX(S4) RP05(S4)
PXSX(S4) RP06(S4) [...]
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimcfg0 at acpi0
acpimcfg0: addr 0xc000, bus 0-255
acpihpet0 at acpi0: 1920 Hz
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: 11th Gen Intel(R) Core(TM) i7-11370H @ 3.30GHz, 4788.96 MHz, 06-8c-01
cpu0:
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,BMI1,AVX2,SMEP
