Hello everyone
Just wanted to check my sanity after so many days. I have ikev2 setup working for windows machine for a long time using the following. So, to repeat this works, it connects fine.
ikev2 passive esp \
from 0.0.0.0/0 to 10.0.5.0/24 \
peer any local 50.247.187.177 \
srcid 50.247.187.177 \
config address 10.0.5.0/24
now I have a second windows client with a different certificate that I also want to connect at the same time but client B will disconnect client A. I need to add a dstid to this config to make specific entries for each machine I believe using ASN1_DN such as this? Or is there better way for clients with no fixed IP or FQDN?
ikev2 passive esp \
from 0.0.0.0/0 to 10.0.5.0/24 \
peer any local 50.247.187.177 \
srcid 50.247.187.177 \
dstid /C=US/ST=Illinois/L=HomeTown/O=OpenBSD/OU=iked/CN=myhostnameA.local/emailAddress=myemail@email.com<mailto:/C=US/ST=Illinois/L=HomeTown/O=OpenBSD/OU=iked/CN=myhostnameA.local/emailAddress=myemail@email.com> \
config address 10.0.5.0/24
ikev2 passive esp \
from 0.0.0.0/0 to 10.0.5.0/24 \
peer any local 50.247.187.177 \
srcid 50.247.187.177 \
dstid /C=US/ST=Illinois/L=HomeTown/O=OpenBSD/OU=iked/CN=myhostnameB.local/emailAddress=myemail@email.com<mailto:/C=US/ST=Illinois/L=HomeTown/O=OpenBSD/OU=iked/CN=myhostnameB.local/emailAddress=myemail@email.com> \
config address 10.0.5.0/24
The problem is that no dstid format I can find will work. Once I add dstid it fails to connect each time. Can someone help me here? Shouldn't this be possible or am I reading the man page wrong. I'm certain the spelling is correct and matches to the cert. The breakdown appears to be around here
Not working : Iked -dvv with ASN1_DN DSTID specified in iked.conf
ca_setauth: using SIG (RFC7427)
ca_setauth: auth length 393
ikev2_ike_auth_recv: unexpected auth method RSA_SIG, was expecting SIG
Working : iked -dvv with no DSTID specified in iked.conf
ca_setauth: switching SIG to RSA_SIG(*)
ca_setauth: auth length 393
ikev2_msg_auth: initiator auth data length 1156
ikev2_msg_authverify: method RSA_SIG keylen 1028 type X509_CERT
ikev2_msg_authverify: authentication successful
J
Wednesday, March 31, 2021
Re: WIP: QEMU 6.0.0-rc1
On Sat, Mar 27, 2021 at 02:31:16PM -0400, Brad Smith wrote:
> Here is a work in progress update to QEMU 6.0.0-rc0.
>
> I was able to fix the library detection for a few dependencies,
> the optimization level being hardcoded and Meson was linking
> libstdc++ when utilizing Clang (proabably due to only testing
> on Linux).
>
> I'm really hating this conversion to Meson. It really does some
> oddball crap.
>
> Testing and feedback welcome.
Updated for rc1.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.206
diff -u -p -u -p -r1.206 Makefile
--- Makefile 28 Feb 2021 18:38:41 -0000 1.206
+++ Makefile 31 Mar 2021 17:04:22 -0000
@@ -6,11 +6,10 @@ DPB_PROPERTIES= parallel
COMMENT-main= multi system emulator
COMMENT-ga= QEMU guest agent
-VERSION= 5.1.0
-DISTNAME= qemu-5.1.0
-PKGNAME-main= qemu-${VERSION}
+VERSION= 6.0.0-rc1
+DISTNAME= qemu-${VERSION}
+PKGNAME-main= ${DISTNAME}
PKGNAME-ga= qemu-ga-${VERSION}
-REVISION-main= 3
CATEGORIES= emulators
MASTER_SITES= https://download.qemu.org/
EXTRACT_SUFX= .tar.xz
@@ -22,12 +21,11 @@ MAINTAINER= Brad Smith <brad@comstyle.co
# GPLv2, LGPLv2 and BSD
PERMIT_PACKAGE= Yes
-WANTLIB= ${COMPILER_LIBCXX} c glib-2.0 gthread-2.0 intl m
-WANTLIB-main= ${WANTLIB} SDL2 X11 atk-1.0 bz2 c cairo cairo-gobject capstone \
- curl curses epoxy fdt gbm gdk-3 gdk_pixbuf-2.0 gio-2.0 gnutls \
- gobject-2.0 gtk-3 harfbuzz iconv iscsi jpeg lzo2 nettle nfs \
- pango-1.0 pangocairo-1.0 pixman-1 png sndio ssh usb-1.0 util \
- vte-2.91 xkbcommon xml2 z zstd
+WANTLIB= c gio-2.0 glib-2.0 pthread
+WANTLIB-main= ${COMPILER_LIBCXX} ${WANTLIB} SDL2 X11 bz2 cairo capstone curl \
+ curses epoxy fdt gbm gdk-3 gdk_pixbuf-2.0 gnutls gobject-2.0 \
+ gthread-2.0 gtk-3 iconv intl iscsi jpeg lzo2 m nettle nfs \
+ pixman-1 png sndio ssh usb-1.0 util vte-2.91 xkbcommon z zstd
WANTLIB-ga= ${WANTLIB}
MULTI_PACKAGES= -main -ga
@@ -39,11 +37,11 @@ MODULES= lang/python
MODPY_RUNDEP= No
BUILD_DEPENDS= devel/gettext,-tools \
+ devel/ninja \
textproc/py-sphinx${MODPY_FLAVOR}>=3.5.1
RUN_DEPENDS-main= ${BUILD_PKGPATH}-ga
-LIB_DEPENDS= devel/gettext,-runtime \
- devel/glib2
+LIB_DEPENDS= devel/glib2
LIB_DEPENDS-main= ${LIB_DEPENDS} \
archivers/bzip2 \
archivers/lzo2 \
@@ -51,6 +49,7 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
converters/libiconv \
devel/capstone/main \
devel/dtc \
+ devel/gettext,-runtime \
devel/libiscsi \
devel/libnfs \
devel/libusb1 \
@@ -70,18 +69,16 @@ LIB_DEPENDS-ga= ${LIB_DEPENDS}
MAKE_ENV= V=1
FAKE_FLAGS= qemu_confdir=${PREFIX}/share/examples/qemu
-EXTRA_CFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include
-EXTRA_LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib
-
-# fix build with ancient ncurses. ncurses needs to be updated to 5.9 or newer.
-EXTRA_CFLAGS+= -D_XOPEN_SOURCE_EXTENDED
+CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
# until the system headers are fixed properly.
-EXTRA_CFLAGS+= -Wno-redundant-decls
+CFLAGS+= -Wno-redundant-decls
SEPARATE_BUILD= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE=simple
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --prefix=${PREFIX} \
--sysconfdir=${SYSCONFDIR} \
--mandir=${PREFIX}/man \
@@ -90,11 +87,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--cc="${CC}" \
--cxx="${CXX}" \
--host-cc="${CC}" \
- --extra-cflags="${EXTRA_CFLAGS}" \
- --extra-ldflags="${EXTRA_LDFLAGS}" \
--disable-bsd-user \
--enable-capstone=system \
- --enable-curses \
--disable-auth-pam \
--disable-gcrypt \
--disable-sdl-image \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.62
diff -u -p -u -p -r1.62 distinfo
--- distinfo 17 Aug 2020 09:58:44 -0000 1.62
+++ distinfo 31 Mar 2021 17:04:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (qemu-5.1.0.tar.xz) = yRdOtZM9nrXmH1Qc1tEYTNMRjf5MXElVvBvcTTkPpOU=
-SIZE (qemu-5.1.0.tar.xz) = 62911540
+SHA256 (qemu-6.0.0-rc1.tar.xz) = BCDFl81zMep5er0jKvBK9HdAyOkJX5+eq/EJRBeF7r8=
+SIZE (qemu-6.0.0-rc1.tar.xz) = 107298356
Index: patches/patch-audio_Makefile_objs
===================================================================
RCS file: patches/patch-audio_Makefile_objs
diff -N patches/patch-audio_Makefile_objs
--- patches/patch-audio_Makefile_objs 17 Aug 2020 09:58:44 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-audio_Makefile_objs,v 1.3 2020/08/17 09:58:44 sthen Exp $
-
-sndio module
-
-Index: audio/Makefile.objs
---- audio/Makefile.objs.orig
-+++ audio/Makefile.objs
-@@ -29,6 +29,11 @@ sdl.mo-objs = sdlaudio.o
- sdl.mo-cflags := $(SDL_CFLAGS)
- sdl.mo-libs := $(SDL_LIBS)
-
-+# sndio module
-+common-obj-$(CONFIG_AUDIO_SNDIO) += sndio.mo
-+sndio.mo-objs = sndioaudio.o
-+sndio.mo-libs := $(SNDIO_LIBS)
-+
- # jack module
- common-obj-$(CONFIG_AUDIO_JACK) += jack.mo
- jack.mo-objs = jackaudio.o
Index: patches/patch-audio_audio_c
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-audio_audio_c,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-audio_audio_c
--- patches/patch-audio_audio_c 17 Aug 2020 09:58:44 -0000 1.8
+++ patches/patch-audio_audio_c 27 Mar 2021 00:12:30 -0000
@@ -3,10 +3,10 @@ $OpenBSD: patch-audio_audio_c,v 1.8 2020
Index: audio/audio.c
--- audio/audio.c.orig
+++ audio/audio.c
-@@ -1973,6 +1973,7 @@ void audio_create_pdos(Audiodev *dev)
+@@ -1994,6 +1994,7 @@ void audio_create_pdos(Audiodev *dev)
CASE(OSS, oss, Oss);
CASE(PA, pa, Pa);
- CASE(SDL, sdl, );
+ CASE(SDL, sdl, Sdl);
+ CASE(SNDIO, sndio, );
CASE(SPICE, spice, );
CASE(WAV, wav, );
Index: patches/patch-audio_audio_template_h
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-audio_audio_template_h,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-audio_audio_template_h
--- patches/patch-audio_audio_template_h 17 Aug 2020 09:58:44 -0000 1.4
+++ patches/patch-audio_audio_template_h 27 Mar 2021 00:12:25 -0000
@@ -3,10 +3,10 @@ $OpenBSD: patch-audio_audio_template_h,v
Index: audio/audio_template.h
--- audio/audio_template.h.orig
+++ audio/audio_template.h
-@@ -338,6 +338,8 @@ AudiodevPerDirectionOptions *glue(audio_get_pdo_, TYPE
+@@ -337,6 +337,8 @@ AudiodevPerDirectionOptions *glue(audio_get_pdo_, TYPE
return qapi_AudiodevPaPerDirectionOptions_base(dev->u.pa.TYPE);
case AUDIODEV_DRIVER_SDL:
- return dev->u.sdl.TYPE;
+ return qapi_AudiodevSdlPerDirectionOptions_base(dev->u.sdl.TYPE);
+ case AUDIODEV_DRIVER_SNDIO:
+ return dev->u.sndio.TYPE;
case AUDIODEV_DRIVER_SPICE:
Index: patches/patch-audio_meson_build
===================================================================
RCS file: patches/patch-audio_meson_build
diff -N patches/patch-audio_meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-audio_meson_build 28 Feb 2021 19:11:41 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+sndio module
+
+Index: audio/meson.build
+--- audio/meson.build.orig
++++ audio/meson.build
+@@ -17,6 +17,7 @@ foreach m : [
+ ['CONFIG_AUDIO_OSS', 'oss', oss, 'ossaudio.c'],
+ ['CONFIG_AUDIO_PA', 'pa', pulse, 'paaudio.c'],
+ ['CONFIG_AUDIO_SDL', 'sdl', sdl, 'sdlaudio.c'],
++ ['CONFIG_AUDIO_SNDIO', 'sndio', sndio, 'sndioaudio.c'],
+ ['CONFIG_AUDIO_JACK', 'jack', jack, 'jackaudio.c'],
+ ['CONFIG_SPICE', 'spice', spice, 'spiceaudio.c']
+ ]
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.66
diff -u -p -u -p -r1.66 patch-configure
--- patches/patch-configure 17 Aug 2020 09:58:44 -0000 1.66
+++ patches/patch-configure 27 Mar 2021 00:12:25 -0000
@@ -5,7 +5,7 @@ sndio module
Index: configure
--- configure.orig
+++ configure
-@@ -857,8 +857,8 @@ NetBSD)
+@@ -763,8 +763,8 @@ NetBSD)
OpenBSD)
bsd="yes"
make="${MAKE-gmake}"
@@ -13,10 +13,10 @@ Index: configure
- audio_possible_drivers="sdl"
+ audio_drv_list="sndio"
+ audio_possible_drivers="sndio"
- HOST_VARIANT_DIR="openbsd"
- supported_os="yes"
;;
-@@ -3690,6 +3690,24 @@ fi
+ Darwin)
+ bsd="yes"
+@@ -3193,6 +3193,24 @@ fi
##########################################
# Sound support libraries probe
@@ -41,7 +41,7 @@ Index: configure
audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/,/ /g')
for drv in $audio_drv_list; do
case $drv in
-@@ -3739,6 +3757,23 @@ for drv in $audio_drv_list; do
+@@ -3246,6 +3264,23 @@ for drv in $audio_drv_list; do
fi
;;
@@ -62,34 +62,22 @@ Index: configure
+ fi
+ ;;
+
- coreaudio)
- coreaudio_libs="-framework CoreAudio"
- ;;
-@@ -6524,10 +6559,6 @@ write_c_skeleton
+ coreaudio | try-coreaudio)
+ if test "$coreaudio" = "no"; then
+ if test "$drv" = "try-coreaudio"; then
+@@ -5299,7 +5334,6 @@ write_c_skeleton
if test "$gcov" = "yes" ; then
- QEMU_CFLAGS="-fprofile-arcs -ftest-coverage -g $QEMU_CFLAGS"
- QEMU_LDFLAGS="-fprofile-arcs -ftest-coverage $QEMU_LDFLAGS"
--elif test "$fortify_source" = "yes" ; then
-- CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
--elif test "$debug" = "no"; then
-- CFLAGS="-O2 $CFLAGS"
+ :
+ elif test "$fortify_source" = "yes" ; then
+- QEMU_CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
+ debug=no
fi
- if test "$have_asan" = "yes"; then
-@@ -7182,7 +7213,7 @@ echo "CONFIG_AUDIO_DRIVERS=$audio_drv_list" >> $config
- for drv in $audio_drv_list; do
- def=CONFIG_AUDIO_$(echo $drv | LC_ALL=C tr '[a-z]' '[A-Z]')
- case "$drv" in
-- alsa | oss | pa | sdl)
-+ alsa | oss | pa | sdl | sndio)
- echo "$def=m" >> $config_host_mak ;;
- *)
- echo "$def=y" >> $config_host_mak ;;
-@@ -7193,6 +7224,7 @@ echo "PULSE_LIBS=$pulse_libs" >> $config_host_mak
+@@ -5562,6 +5596,7 @@ echo "PULSE_CFLAGS=$pulse_cflags" >> $config_host_mak
echo "COREAUDIO_LIBS=$coreaudio_libs" >> $config_host_mak
echo "DSOUND_LIBS=$dsound_libs" >> $config_host_mak
echo "OSS_LIBS=$oss_libs" >> $config_host_mak
+echo "SNDIO_LIBS=$sndio_libs" >> $config_host_mak
- echo "JACK_LIBS=$jack_libs" >> $config_host_mak
- if test "$audio_win_int" = "yes" ; then
- echo "CONFIG_AUDIO_WIN_INT=y" >> $config_host_mak
+ if test "$libjack" = "yes" ; then
+ echo "CONFIG_LIBJACK=y" >> $config_host_mak
+ fi
Index: patches/patch-hw_hppa_lasi_c
===================================================================
RCS file: patches/patch-hw_hppa_lasi_c
diff -N patches/patch-hw_hppa_lasi_c
--- patches/patch-hw_hppa_lasi_c 7 Oct 2020 19:55:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-hw_hppa_lasi_c,v 1.1 2020/10/07 19:55:57 cwen Exp $
-
-From upstream commit b899fe41:
-
-OpenBSD initializes the LASI IMR value with 0xffffffff to disable all LASI
-interrupts. This triggered an assert() and stopped the emulation. By replacing
-the check with a warning in the guest log we now allow OpenBSD to boot again.
-
-Index: hw/hppa/lasi.c
---- hw/hppa/lasi.c.orig
-+++ hw/hppa/lasi.c
-@@ -11,6 +11,7 @@
-
- #include "qemu/osdep.h"
- #include "qemu/units.h"
-+#include "qemu/log.h"
- #include "qapi/error.h"
- #include "cpu.h"
- #include "trace.h"
-@@ -172,8 +173,11 @@ static MemTxResult lasi_chip_write_with_attrs(void *op
- /* read-only. */
- break;
- case LASI_IMR:
-- s->imr = val; /* 0x20 ?? */
-- assert((val & LASI_IRQ_BITS) == val);
-+ s->imr = val;
-+ if (((val & LASI_IRQ_BITS) != val) && (val != 0xffffffff))
-+ qemu_log_mask(LOG_GUEST_ERROR,
-+ "LASI: tried to set invalid %lx IMR value.\n",
-+ (unsigned long) val);
- break;
- case LASI_IPR:
- /* Any write to IPR clears the register. */
Index: patches/patch-meson_build
===================================================================
RCS file: patches/patch-meson_build
diff -N patches/patch-meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-meson_build 27 Mar 2021 04:46:07 -0000
@@ -0,0 +1,41 @@
+$OpenBSD$
+
+- Fix curses build on OpenBSD
+- sndio module
+- Remove hardcoding of optimization
+
+Index: meson.build
+--- meson.build.orig
++++ meson.build
+@@ -590,7 +590,7 @@ if have_system and not get_option('curses').disabled()
+ endif
+ endforeach
+ msg = get_option('curses').enabled() ? 'curses library not found' : ''
+- curses_compile_args = ['-DNCURSES_WIDECHAR']
++ curses_compile_args = ['-D_XOPEN_SOURCE_EXTENDED -DNCURSES_WIDECHAR']
+ if curses.found()
+ if cc.links(curses_test, args: curses_compile_args, dependencies: [curses])
+ curses = declare_dependency(compile_args: curses_compile_args, dependencies: [curses])
+@@ -803,6 +803,10 @@ dsound = not_found
+ if 'CONFIG_AUDIO_DSOUND' in config_host
+ dsound = declare_dependency(link_args: config_host['DSOUND_LIBS'].split())
+ endif
++sndio = not_found
++if 'CONFIG_AUDIO_SNDIO' in config_host
++ sndio = declare_dependency(link_args: config_host['SNDIO_LIBS'].split())
++endif
+ coreaudio = not_found
+ if 'CONFIG_AUDIO_COREAUDIO' in config_host
+ coreaudio = declare_dependency(link_args: config_host['COREAUDIO_LIBS'].split())
+@@ -2510,11 +2514,9 @@ if targetos == 'windows'
+ endif
+ summary_info += {'ARFLAGS': config_host['ARFLAGS']}
+ summary_info += {'CFLAGS': ' '.join(get_option('c_args')
+- + ['-O' + get_option('optimization')]
+ + (get_option('debug') ? ['-g'] : []))}
+ if link_language == 'cpp'
+ summary_info += {'CXXFLAGS': ' '.join(get_option('cpp_args')
+- + ['-O' + get_option('optimization')]
+ + (get_option('debug') ? ['-g'] : []))}
+ endif
+ link_args = get_option(link_language + '_link_args')
Index: patches/patch-meson_mesonbuild_compilers_cpp_py
===================================================================
RCS file: patches/patch-meson_mesonbuild_compilers_cpp_py
diff -N patches/patch-meson_mesonbuild_compilers_cpp_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-meson_mesonbuild_compilers_cpp_py 27 Mar 2021 05:49:15 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: meson/mesonbuild/compilers/cpp.py
+--- meson/mesonbuild/compilers/cpp.py.orig
++++ meson/mesonbuild/compilers/cpp.py
+@@ -210,7 +210,7 @@ class ClangCPPCompiler(ClangCompiler, CPPCompiler):
+ return []
+
+ def language_stdlib_only_link_flags(self):
+- return ['-lstdc++']
++ return ['-lc++']
+
+
+ class AppleClangCPPCompiler(ClangCPPCompiler):
+@@ -346,7 +346,7 @@ class GnuCPPCompiler(GnuCompiler, CPPCompiler):
+ return ['-fpch-preprocess', '-include', os.path.basename(header)]
+
+ def language_stdlib_only_link_flags(self):
+- return ['-lstdc++']
++ return ['-lestdc++']
+
+
+ class PGICPPCompiler(PGICompiler, CPPCompiler):
Index: patches/patch-qapi_audio_json
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-qapi_audio_json,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-qapi_audio_json
--- patches/patch-qapi_audio_json 17 Aug 2020 09:58:44 -0000 1.4
+++ patches/patch-qapi_audio_json 27 Mar 2021 00:12:25 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-qapi_audio_json,v 1.4 20
Index: qapi/audio.json
--- qapi/audio.json.orig
+++ qapi/audio.json
-@@ -102,6 +102,28 @@
+@@ -106,6 +106,28 @@
'*threshold': 'uint32' } }
##
@@ -32,7 +32,7 @@ Index: qapi/audio.json
# @AudiodevCoreaudioPerDirectionOptions:
#
# Options of the Core Audio backend that are used for both playback and
-@@ -352,7 +374,7 @@
+@@ -387,7 +409,7 @@
##
{ 'enum': 'AudiodevDriver',
'data': [ 'none', 'alsa', 'coreaudio', 'dsound', 'jack', 'oss', 'pa',
@@ -41,10 +41,10 @@ Index: qapi/audio.json
##
# @Audiodev:
-@@ -382,5 +404,6 @@
+@@ -417,5 +439,6 @@
'oss': 'AudiodevOssOptions',
'pa': 'AudiodevPaOptions',
- 'sdl': 'AudiodevGenericOptions',
+ 'sdl': 'AudiodevSdlOptions',
+ 'sndio': 'AudiodevSndioOptions',
'spice': 'AudiodevGenericOptions',
'wav': 'AudiodevWavOptions' } }
Index: patches/patch-qemu-options_hx
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-qemu-options_hx,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-qemu-options_hx
--- patches/patch-qemu-options_hx 17 Aug 2020 09:58:44 -0000 1.7
+++ patches/patch-qemu-options_hx 27 Mar 2021 00:12:25 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-qemu-options_hx,v 1.7 20
Index: qemu-options.hx
--- qemu-options.hx.orig
+++ qemu-options.hx
-@@ -590,6 +590,9 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev,
- #ifdef CONFIG_AUDIO_SDL
+@@ -614,6 +614,9 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev,
"-audiodev sdl,id=id[,prop[=value][,...]]\n"
+ " in|out.buffer-count= number of buffers\n"
> Here is a work in progress update to QEMU 6.0.0-rc0.
>
> I was able to fix the library detection for a few dependencies,
> the optimization level being hardcoded and Meson was linking
> libstdc++ when utilizing Clang (proabably due to only testing
> on Linux).
>
> I'm really hating this conversion to Meson. It really does some
> oddball crap.
>
> Testing and feedback welcome.
Updated for rc1.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.206
diff -u -p -u -p -r1.206 Makefile
--- Makefile 28 Feb 2021 18:38:41 -0000 1.206
+++ Makefile 31 Mar 2021 17:04:22 -0000
@@ -6,11 +6,10 @@ DPB_PROPERTIES= parallel
COMMENT-main= multi system emulator
COMMENT-ga= QEMU guest agent
-VERSION= 5.1.0
-DISTNAME= qemu-5.1.0
-PKGNAME-main= qemu-${VERSION}
+VERSION= 6.0.0-rc1
+DISTNAME= qemu-${VERSION}
+PKGNAME-main= ${DISTNAME}
PKGNAME-ga= qemu-ga-${VERSION}
-REVISION-main= 3
CATEGORIES= emulators
MASTER_SITES= https://download.qemu.org/
EXTRACT_SUFX= .tar.xz
@@ -22,12 +21,11 @@ MAINTAINER= Brad Smith <brad@comstyle.co
# GPLv2, LGPLv2 and BSD
PERMIT_PACKAGE= Yes
-WANTLIB= ${COMPILER_LIBCXX} c glib-2.0 gthread-2.0 intl m
-WANTLIB-main= ${WANTLIB} SDL2 X11 atk-1.0 bz2 c cairo cairo-gobject capstone \
- curl curses epoxy fdt gbm gdk-3 gdk_pixbuf-2.0 gio-2.0 gnutls \
- gobject-2.0 gtk-3 harfbuzz iconv iscsi jpeg lzo2 nettle nfs \
- pango-1.0 pangocairo-1.0 pixman-1 png sndio ssh usb-1.0 util \
- vte-2.91 xkbcommon xml2 z zstd
+WANTLIB= c gio-2.0 glib-2.0 pthread
+WANTLIB-main= ${COMPILER_LIBCXX} ${WANTLIB} SDL2 X11 bz2 cairo capstone curl \
+ curses epoxy fdt gbm gdk-3 gdk_pixbuf-2.0 gnutls gobject-2.0 \
+ gthread-2.0 gtk-3 iconv intl iscsi jpeg lzo2 m nettle nfs \
+ pixman-1 png sndio ssh usb-1.0 util vte-2.91 xkbcommon z zstd
WANTLIB-ga= ${WANTLIB}
MULTI_PACKAGES= -main -ga
@@ -39,11 +37,11 @@ MODULES= lang/python
MODPY_RUNDEP= No
BUILD_DEPENDS= devel/gettext,-tools \
+ devel/ninja \
textproc/py-sphinx${MODPY_FLAVOR}>=3.5.1
RUN_DEPENDS-main= ${BUILD_PKGPATH}-ga
-LIB_DEPENDS= devel/gettext,-runtime \
- devel/glib2
+LIB_DEPENDS= devel/glib2
LIB_DEPENDS-main= ${LIB_DEPENDS} \
archivers/bzip2 \
archivers/lzo2 \
@@ -51,6 +49,7 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
converters/libiconv \
devel/capstone/main \
devel/dtc \
+ devel/gettext,-runtime \
devel/libiscsi \
devel/libnfs \
devel/libusb1 \
@@ -70,18 +69,16 @@ LIB_DEPENDS-ga= ${LIB_DEPENDS}
MAKE_ENV= V=1
FAKE_FLAGS= qemu_confdir=${PREFIX}/share/examples/qemu
-EXTRA_CFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include
-EXTRA_LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib
-
-# fix build with ancient ncurses. ncurses needs to be updated to 5.9 or newer.
-EXTRA_CFLAGS+= -D_XOPEN_SOURCE_EXTENDED
+CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
# until the system headers are fixed properly.
-EXTRA_CFLAGS+= -Wno-redundant-decls
+CFLAGS+= -Wno-redundant-decls
SEPARATE_BUILD= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE=simple
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --prefix=${PREFIX} \
--sysconfdir=${SYSCONFDIR} \
--mandir=${PREFIX}/man \
@@ -90,11 +87,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--cc="${CC}" \
--cxx="${CXX}" \
--host-cc="${CC}" \
- --extra-cflags="${EXTRA_CFLAGS}" \
- --extra-ldflags="${EXTRA_LDFLAGS}" \
--disable-bsd-user \
--enable-capstone=system \
- --enable-curses \
--disable-auth-pam \
--disable-gcrypt \
--disable-sdl-image \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.62
diff -u -p -u -p -r1.62 distinfo
--- distinfo 17 Aug 2020 09:58:44 -0000 1.62
+++ distinfo 31 Mar 2021 17:04:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (qemu-5.1.0.tar.xz) = yRdOtZM9nrXmH1Qc1tEYTNMRjf5MXElVvBvcTTkPpOU=
-SIZE (qemu-5.1.0.tar.xz) = 62911540
+SHA256 (qemu-6.0.0-rc1.tar.xz) = BCDFl81zMep5er0jKvBK9HdAyOkJX5+eq/EJRBeF7r8=
+SIZE (qemu-6.0.0-rc1.tar.xz) = 107298356
Index: patches/patch-audio_Makefile_objs
===================================================================
RCS file: patches/patch-audio_Makefile_objs
diff -N patches/patch-audio_Makefile_objs
--- patches/patch-audio_Makefile_objs 17 Aug 2020 09:58:44 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-audio_Makefile_objs,v 1.3 2020/08/17 09:58:44 sthen Exp $
-
-sndio module
-
-Index: audio/Makefile.objs
---- audio/Makefile.objs.orig
-+++ audio/Makefile.objs
-@@ -29,6 +29,11 @@ sdl.mo-objs = sdlaudio.o
- sdl.mo-cflags := $(SDL_CFLAGS)
- sdl.mo-libs := $(SDL_LIBS)
-
-+# sndio module
-+common-obj-$(CONFIG_AUDIO_SNDIO) += sndio.mo
-+sndio.mo-objs = sndioaudio.o
-+sndio.mo-libs := $(SNDIO_LIBS)
-+
- # jack module
- common-obj-$(CONFIG_AUDIO_JACK) += jack.mo
- jack.mo-objs = jackaudio.o
Index: patches/patch-audio_audio_c
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-audio_audio_c,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-audio_audio_c
--- patches/patch-audio_audio_c 17 Aug 2020 09:58:44 -0000 1.8
+++ patches/patch-audio_audio_c 27 Mar 2021 00:12:30 -0000
@@ -3,10 +3,10 @@ $OpenBSD: patch-audio_audio_c,v 1.8 2020
Index: audio/audio.c
--- audio/audio.c.orig
+++ audio/audio.c
-@@ -1973,6 +1973,7 @@ void audio_create_pdos(Audiodev *dev)
+@@ -1994,6 +1994,7 @@ void audio_create_pdos(Audiodev *dev)
CASE(OSS, oss, Oss);
CASE(PA, pa, Pa);
- CASE(SDL, sdl, );
+ CASE(SDL, sdl, Sdl);
+ CASE(SNDIO, sndio, );
CASE(SPICE, spice, );
CASE(WAV, wav, );
Index: patches/patch-audio_audio_template_h
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-audio_audio_template_h,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-audio_audio_template_h
--- patches/patch-audio_audio_template_h 17 Aug 2020 09:58:44 -0000 1.4
+++ patches/patch-audio_audio_template_h 27 Mar 2021 00:12:25 -0000
@@ -3,10 +3,10 @@ $OpenBSD: patch-audio_audio_template_h,v
Index: audio/audio_template.h
--- audio/audio_template.h.orig
+++ audio/audio_template.h
-@@ -338,6 +338,8 @@ AudiodevPerDirectionOptions *glue(audio_get_pdo_, TYPE
+@@ -337,6 +337,8 @@ AudiodevPerDirectionOptions *glue(audio_get_pdo_, TYPE
return qapi_AudiodevPaPerDirectionOptions_base(dev->u.pa.TYPE);
case AUDIODEV_DRIVER_SDL:
- return dev->u.sdl.TYPE;
+ return qapi_AudiodevSdlPerDirectionOptions_base(dev->u.sdl.TYPE);
+ case AUDIODEV_DRIVER_SNDIO:
+ return dev->u.sndio.TYPE;
case AUDIODEV_DRIVER_SPICE:
Index: patches/patch-audio_meson_build
===================================================================
RCS file: patches/patch-audio_meson_build
diff -N patches/patch-audio_meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-audio_meson_build 28 Feb 2021 19:11:41 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+sndio module
+
+Index: audio/meson.build
+--- audio/meson.build.orig
++++ audio/meson.build
+@@ -17,6 +17,7 @@ foreach m : [
+ ['CONFIG_AUDIO_OSS', 'oss', oss, 'ossaudio.c'],
+ ['CONFIG_AUDIO_PA', 'pa', pulse, 'paaudio.c'],
+ ['CONFIG_AUDIO_SDL', 'sdl', sdl, 'sdlaudio.c'],
++ ['CONFIG_AUDIO_SNDIO', 'sndio', sndio, 'sndioaudio.c'],
+ ['CONFIG_AUDIO_JACK', 'jack', jack, 'jackaudio.c'],
+ ['CONFIG_SPICE', 'spice', spice, 'spiceaudio.c']
+ ]
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.66
diff -u -p -u -p -r1.66 patch-configure
--- patches/patch-configure 17 Aug 2020 09:58:44 -0000 1.66
+++ patches/patch-configure 27 Mar 2021 00:12:25 -0000
@@ -5,7 +5,7 @@ sndio module
Index: configure
--- configure.orig
+++ configure
-@@ -857,8 +857,8 @@ NetBSD)
+@@ -763,8 +763,8 @@ NetBSD)
OpenBSD)
bsd="yes"
make="${MAKE-gmake}"
@@ -13,10 +13,10 @@ Index: configure
- audio_possible_drivers="sdl"
+ audio_drv_list="sndio"
+ audio_possible_drivers="sndio"
- HOST_VARIANT_DIR="openbsd"
- supported_os="yes"
;;
-@@ -3690,6 +3690,24 @@ fi
+ Darwin)
+ bsd="yes"
+@@ -3193,6 +3193,24 @@ fi
##########################################
# Sound support libraries probe
@@ -41,7 +41,7 @@ Index: configure
audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/,/ /g')
for drv in $audio_drv_list; do
case $drv in
-@@ -3739,6 +3757,23 @@ for drv in $audio_drv_list; do
+@@ -3246,6 +3264,23 @@ for drv in $audio_drv_list; do
fi
;;
@@ -62,34 +62,22 @@ Index: configure
+ fi
+ ;;
+
- coreaudio)
- coreaudio_libs="-framework CoreAudio"
- ;;
-@@ -6524,10 +6559,6 @@ write_c_skeleton
+ coreaudio | try-coreaudio)
+ if test "$coreaudio" = "no"; then
+ if test "$drv" = "try-coreaudio"; then
+@@ -5299,7 +5334,6 @@ write_c_skeleton
if test "$gcov" = "yes" ; then
- QEMU_CFLAGS="-fprofile-arcs -ftest-coverage -g $QEMU_CFLAGS"
- QEMU_LDFLAGS="-fprofile-arcs -ftest-coverage $QEMU_LDFLAGS"
--elif test "$fortify_source" = "yes" ; then
-- CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
--elif test "$debug" = "no"; then
-- CFLAGS="-O2 $CFLAGS"
+ :
+ elif test "$fortify_source" = "yes" ; then
+- QEMU_CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
+ debug=no
fi
- if test "$have_asan" = "yes"; then
-@@ -7182,7 +7213,7 @@ echo "CONFIG_AUDIO_DRIVERS=$audio_drv_list" >> $config
- for drv in $audio_drv_list; do
- def=CONFIG_AUDIO_$(echo $drv | LC_ALL=C tr '[a-z]' '[A-Z]')
- case "$drv" in
-- alsa | oss | pa | sdl)
-+ alsa | oss | pa | sdl | sndio)
- echo "$def=m" >> $config_host_mak ;;
- *)
- echo "$def=y" >> $config_host_mak ;;
-@@ -7193,6 +7224,7 @@ echo "PULSE_LIBS=$pulse_libs" >> $config_host_mak
+@@ -5562,6 +5596,7 @@ echo "PULSE_CFLAGS=$pulse_cflags" >> $config_host_mak
echo "COREAUDIO_LIBS=$coreaudio_libs" >> $config_host_mak
echo "DSOUND_LIBS=$dsound_libs" >> $config_host_mak
echo "OSS_LIBS=$oss_libs" >> $config_host_mak
+echo "SNDIO_LIBS=$sndio_libs" >> $config_host_mak
- echo "JACK_LIBS=$jack_libs" >> $config_host_mak
- if test "$audio_win_int" = "yes" ; then
- echo "CONFIG_AUDIO_WIN_INT=y" >> $config_host_mak
+ if test "$libjack" = "yes" ; then
+ echo "CONFIG_LIBJACK=y" >> $config_host_mak
+ fi
Index: patches/patch-hw_hppa_lasi_c
===================================================================
RCS file: patches/patch-hw_hppa_lasi_c
diff -N patches/patch-hw_hppa_lasi_c
--- patches/patch-hw_hppa_lasi_c 7 Oct 2020 19:55:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-hw_hppa_lasi_c,v 1.1 2020/10/07 19:55:57 cwen Exp $
-
-From upstream commit b899fe41:
-
-OpenBSD initializes the LASI IMR value with 0xffffffff to disable all LASI
-interrupts. This triggered an assert() and stopped the emulation. By replacing
-the check with a warning in the guest log we now allow OpenBSD to boot again.
-
-Index: hw/hppa/lasi.c
---- hw/hppa/lasi.c.orig
-+++ hw/hppa/lasi.c
-@@ -11,6 +11,7 @@
-
- #include "qemu/osdep.h"
- #include "qemu/units.h"
-+#include "qemu/log.h"
- #include "qapi/error.h"
- #include "cpu.h"
- #include "trace.h"
-@@ -172,8 +173,11 @@ static MemTxResult lasi_chip_write_with_attrs(void *op
- /* read-only. */
- break;
- case LASI_IMR:
-- s->imr = val; /* 0x20 ?? */
-- assert((val & LASI_IRQ_BITS) == val);
-+ s->imr = val;
-+ if (((val & LASI_IRQ_BITS) != val) && (val != 0xffffffff))
-+ qemu_log_mask(LOG_GUEST_ERROR,
-+ "LASI: tried to set invalid %lx IMR value.\n",
-+ (unsigned long) val);
- break;
- case LASI_IPR:
- /* Any write to IPR clears the register. */
Index: patches/patch-meson_build
===================================================================
RCS file: patches/patch-meson_build
diff -N patches/patch-meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-meson_build 27 Mar 2021 04:46:07 -0000
@@ -0,0 +1,41 @@
+$OpenBSD$
+
+- Fix curses build on OpenBSD
+- sndio module
+- Remove hardcoding of optimization
+
+Index: meson.build
+--- meson.build.orig
++++ meson.build
+@@ -590,7 +590,7 @@ if have_system and not get_option('curses').disabled()
+ endif
+ endforeach
+ msg = get_option('curses').enabled() ? 'curses library not found' : ''
+- curses_compile_args = ['-DNCURSES_WIDECHAR']
++ curses_compile_args = ['-D_XOPEN_SOURCE_EXTENDED -DNCURSES_WIDECHAR']
+ if curses.found()
+ if cc.links(curses_test, args: curses_compile_args, dependencies: [curses])
+ curses = declare_dependency(compile_args: curses_compile_args, dependencies: [curses])
+@@ -803,6 +803,10 @@ dsound = not_found
+ if 'CONFIG_AUDIO_DSOUND' in config_host
+ dsound = declare_dependency(link_args: config_host['DSOUND_LIBS'].split())
+ endif
++sndio = not_found
++if 'CONFIG_AUDIO_SNDIO' in config_host
++ sndio = declare_dependency(link_args: config_host['SNDIO_LIBS'].split())
++endif
+ coreaudio = not_found
+ if 'CONFIG_AUDIO_COREAUDIO' in config_host
+ coreaudio = declare_dependency(link_args: config_host['COREAUDIO_LIBS'].split())
+@@ -2510,11 +2514,9 @@ if targetos == 'windows'
+ endif
+ summary_info += {'ARFLAGS': config_host['ARFLAGS']}
+ summary_info += {'CFLAGS': ' '.join(get_option('c_args')
+- + ['-O' + get_option('optimization')]
+ + (get_option('debug') ? ['-g'] : []))}
+ if link_language == 'cpp'
+ summary_info += {'CXXFLAGS': ' '.join(get_option('cpp_args')
+- + ['-O' + get_option('optimization')]
+ + (get_option('debug') ? ['-g'] : []))}
+ endif
+ link_args = get_option(link_language + '_link_args')
Index: patches/patch-meson_mesonbuild_compilers_cpp_py
===================================================================
RCS file: patches/patch-meson_mesonbuild_compilers_cpp_py
diff -N patches/patch-meson_mesonbuild_compilers_cpp_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-meson_mesonbuild_compilers_cpp_py 27 Mar 2021 05:49:15 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: meson/mesonbuild/compilers/cpp.py
+--- meson/mesonbuild/compilers/cpp.py.orig
++++ meson/mesonbuild/compilers/cpp.py
+@@ -210,7 +210,7 @@ class ClangCPPCompiler(ClangCompiler, CPPCompiler):
+ return []
+
+ def language_stdlib_only_link_flags(self):
+- return ['-lstdc++']
++ return ['-lc++']
+
+
+ class AppleClangCPPCompiler(ClangCPPCompiler):
+@@ -346,7 +346,7 @@ class GnuCPPCompiler(GnuCompiler, CPPCompiler):
+ return ['-fpch-preprocess', '-include', os.path.basename(header)]
+
+ def language_stdlib_only_link_flags(self):
+- return ['-lstdc++']
++ return ['-lestdc++']
+
+
+ class PGICPPCompiler(PGICompiler, CPPCompiler):
Index: patches/patch-qapi_audio_json
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-qapi_audio_json,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-qapi_audio_json
--- patches/patch-qapi_audio_json 17 Aug 2020 09:58:44 -0000 1.4
+++ patches/patch-qapi_audio_json 27 Mar 2021 00:12:25 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-qapi_audio_json,v 1.4 20
Index: qapi/audio.json
--- qapi/audio.json.orig
+++ qapi/audio.json
-@@ -102,6 +102,28 @@
+@@ -106,6 +106,28 @@
'*threshold': 'uint32' } }
##
@@ -32,7 +32,7 @@ Index: qapi/audio.json
# @AudiodevCoreaudioPerDirectionOptions:
#
# Options of the Core Audio backend that are used for both playback and
-@@ -352,7 +374,7 @@
+@@ -387,7 +409,7 @@
##
{ 'enum': 'AudiodevDriver',
'data': [ 'none', 'alsa', 'coreaudio', 'dsound', 'jack', 'oss', 'pa',
@@ -41,10 +41,10 @@ Index: qapi/audio.json
##
# @Audiodev:
-@@ -382,5 +404,6 @@
+@@ -417,5 +439,6 @@
'oss': 'AudiodevOssOptions',
'pa': 'AudiodevPaOptions',
- 'sdl': 'AudiodevGenericOptions',
+ 'sdl': 'AudiodevSdlOptions',
+ 'sndio': 'AudiodevSndioOptions',
'spice': 'AudiodevGenericOptions',
'wav': 'AudiodevWavOptions' } }
Index: patches/patch-qemu-options_hx
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-qemu-options_hx,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-qemu-options_hx
--- patches/patch-qemu-options_hx 17 Aug 2020 09:58:44 -0000 1.7
+++ patches/patch-qemu-options_hx 27 Mar 2021 00:12:25 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-qemu-options_hx,v 1.7 20
Index: qemu-options.hx
--- qemu-options.hx.orig
+++ qemu-options.hx
-@@ -590,6 +590,9 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev,
- #ifdef CONFIG_AUDIO_SDL
+@@ -614,6 +614,9 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev,
"-audiodev sdl,id=id[,prop[=value][,...]]\n"
+ " in|out.buffer-count= number of buffers\n"
nsh commands.c diff to clear some compiler warnings
--- commands.c Tue Oct 6 01:59:33 2020
+++ /home/tom/commands.c Thu Apr 1 01:00:16 2021
@@ -451,7 +451,7 @@ flushcmd(int argc, char **argv)
static int
flush_line(char *line)
{
- char *argv[] = { PKILL, "-9", "-t", line, '\0' };
+ char *argv[] = { PKILL, "-9", "-t", line, NULL };
cmdargs(PKILL, argv);
return (1);
}
@@ -1673,7 +1673,7 @@ flush_pf(char *arg)
}
{
- char *argv[] = { x->cmd, x->arg, '\0' };
+ char *argv[] = { x->cmd, x->arg, NULL };
cmdargs(x->cmd, argv);
}
@@ -1720,7 +1720,7 @@ cmdrc(char rcname[FILENAME_MAX])
if (line[0] == ' ' && line[1] == '!' && savec && savec->modh == 2)
continue;
if (line[0] == ' ')
- strlcpy(saveline, line, sizeof(line));
+ strlcpy(saveline, line, sizeof(saveline));
makeargv();
if (margv[0] == 0)
continue;
@@ -1876,7 +1876,7 @@ iprompt(void)
int
wr_startup(void)
{
- char *argv[] = { SAVESCRIPT, NSHRC_TEMP, '\0' };
+ char *argv[] = { SAVESCRIPT, NSHRC_TEMP, NULL };
if (wr_conf(NSHRC_TEMP))
printf("%% Saving configuration\n");
@@ -2072,7 +2072,7 @@ pr_kernel(int argc, char **argv)
void
pf_stats(void)
{
- char *argv[] = { PFCTL, "-sinfo", '\0' };
+ char *argv[] = { PFCTL, "-sinfo", NULL };
printf("%% pf statistics:\n");
@@ -2085,7 +2085,7 @@ pr_prot1(int argc, char **argv)
{
struct prot1 *x;
struct prot *prot;
- char *args[NOPTFILL] = { NULL, NULL, NULL, NULL, NULL, NULL, '\0' };
+ char *args[NOPTFILL] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL };
char **fillargs;
char prefix[64];
@@ -2150,7 +2150,7 @@ step_optreq(char **xargs, char **args, int argc, char
/* copy xargs to args, replace OPT/REQ args with argv past skip */
for (i = 0; i < NOPTFILL - 2; i++) {
if (xargs[i] == NULL) {
- args[i] = '\0';
+ args[i] = NULL;
if (i > 1)
/*
* all **args passed must have at least two arguments
@@ -2169,7 +2169,7 @@ step_optreq(char **xargs, char **args, int argc, char
printf("%% Missing required argument\n");
return NULL;
} else {
- args[i] = '\0';
+ args[i] = NULL;
break;
}
} else {
Hello
below is a diff for commands.c
to clear some of the compiler warnings,
--- commands.c Tue Oct 6 01:59:33 2020
+++ /home/tom/commands.c Thu Apr 1 01:00:16 2021
@@ -451,7 +451,7 @@ flushcmd(int argc, char **argv)
static int
flush_line(char *line)
{
- char *argv[] = { PKILL, "-9", "-t", line, '\0' };
+ char *argv[] = { PKILL, "-9", "-t", line, NULL };
cmdargs(PKILL, argv);
return (1);
}
@@ -1673,7 +1673,7 @@ flush_pf(char *arg)
}
{
- char *argv[] = { x->cmd, x->arg, '\0' };
+ char *argv[] = { x->cmd, x->arg, NULL };
cmdargs(x->cmd, argv);
}
@@ -1720,7 +1720,7 @@ cmdrc(char rcname[FILENAME_MAX])
if (line[0] == ' ' && line[1] == '!' && savec && savec->modh == 2)
continue;
if (line[0] == ' ')
- strlcpy(saveline, line, sizeof(line));
+ strlcpy(saveline, line, sizeof(saveline));
makeargv();
if (margv[0] == 0)
continue;
@@ -1876,7 +1876,7 @@ iprompt(void)
int
wr_startup(void)
{
- char *argv[] = { SAVESCRIPT, NSHRC_TEMP, '\0' };
+ char *argv[] = { SAVESCRIPT, NSHRC_TEMP, NULL };
if (wr_conf(NSHRC_TEMP))
printf("%% Saving configuration\n");
@@ -2072,7 +2072,7 @@ pr_kernel(int argc, char **argv)
void
pf_stats(void)
{
- char *argv[] = { PFCTL, "-sinfo", '\0' };
+ char *argv[] = { PFCTL, "-sinfo", NULL };
printf("%% pf statistics:\n");
@@ -2085,7 +2085,7 @@ pr_prot1(int argc, char **argv)
{
struct prot1 *x;
struct prot *prot;
- char *args[NOPTFILL] = { NULL, NULL, NULL, NULL, NULL, NULL, '\0' };
+ char *args[NOPTFILL] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL };
char **fillargs;
char prefix[64];
@@ -2150,7 +2150,7 @@ step_optreq(char **xargs, char **args, int argc, char
/* copy xargs to args, replace OPT/REQ args with argv past skip */
for (i = 0; i < NOPTFILL - 2; i++) {
if (xargs[i] == NULL) {
- args[i] = '\0';
+ args[i] = NULL;
if (i > 1)
/*
* all **args passed must have at least two arguments
@@ -2169,7 +2169,7 @@ step_optreq(char **xargs, char **args, int argc, char
printf("%% Missing required argument\n");
return NULL;
} else {
- args[i] = '\0';
+ args[i] = NULL;
break;
}
} else {
+++ /home/tom/commands.c Thu Apr 1 01:00:16 2021
@@ -451,7 +451,7 @@ flushcmd(int argc, char **argv)
static int
flush_line(char *line)
{
- char *argv[] = { PKILL, "-9", "-t", line, '\0' };
+ char *argv[] = { PKILL, "-9", "-t", line, NULL };
cmdargs(PKILL, argv);
return (1);
}
@@ -1673,7 +1673,7 @@ flush_pf(char *arg)
}
{
- char *argv[] = { x->cmd, x->arg, '\0' };
+ char *argv[] = { x->cmd, x->arg, NULL };
cmdargs(x->cmd, argv);
}
@@ -1720,7 +1720,7 @@ cmdrc(char rcname[FILENAME_MAX])
if (line[0] == ' ' && line[1] == '!' && savec && savec->modh == 2)
continue;
if (line[0] == ' ')
- strlcpy(saveline, line, sizeof(line));
+ strlcpy(saveline, line, sizeof(saveline));
makeargv();
if (margv[0] == 0)
continue;
@@ -1876,7 +1876,7 @@ iprompt(void)
int
wr_startup(void)
{
- char *argv[] = { SAVESCRIPT, NSHRC_TEMP, '\0' };
+ char *argv[] = { SAVESCRIPT, NSHRC_TEMP, NULL };
if (wr_conf(NSHRC_TEMP))
printf("%% Saving configuration\n");
@@ -2072,7 +2072,7 @@ pr_kernel(int argc, char **argv)
void
pf_stats(void)
{
- char *argv[] = { PFCTL, "-sinfo", '\0' };
+ char *argv[] = { PFCTL, "-sinfo", NULL };
printf("%% pf statistics:\n");
@@ -2085,7 +2085,7 @@ pr_prot1(int argc, char **argv)
{
struct prot1 *x;
struct prot *prot;
- char *args[NOPTFILL] = { NULL, NULL, NULL, NULL, NULL, NULL, '\0' };
+ char *args[NOPTFILL] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL };
char **fillargs;
char prefix[64];
@@ -2150,7 +2150,7 @@ step_optreq(char **xargs, char **args, int argc, char
/* copy xargs to args, replace OPT/REQ args with argv past skip */
for (i = 0; i < NOPTFILL - 2; i++) {
if (xargs[i] == NULL) {
- args[i] = '\0';
+ args[i] = NULL;
if (i > 1)
/*
* all **args passed must have at least two arguments
@@ -2169,7 +2169,7 @@ step_optreq(char **xargs, char **args, int argc, char
printf("%% Missing required argument\n");
return NULL;
} else {
- args[i] = '\0';
+ args[i] = NULL;
break;
}
} else {
Hello
below is a diff for commands.c
to clear some of the compiler warnings,
--- commands.c Tue Oct 6 01:59:33 2020
+++ /home/tom/commands.c Thu Apr 1 01:00:16 2021
@@ -451,7 +451,7 @@ flushcmd(int argc, char **argv)
static int
flush_line(char *line)
{
- char *argv[] = { PKILL, "-9", "-t", line, '\0' };
+ char *argv[] = { PKILL, "-9", "-t", line, NULL };
cmdargs(PKILL, argv);
return (1);
}
@@ -1673,7 +1673,7 @@ flush_pf(char *arg)
}
{
- char *argv[] = { x->cmd, x->arg, '\0' };
+ char *argv[] = { x->cmd, x->arg, NULL };
cmdargs(x->cmd, argv);
}
@@ -1720,7 +1720,7 @@ cmdrc(char rcname[FILENAME_MAX])
if (line[0] == ' ' && line[1] == '!' && savec && savec->modh == 2)
continue;
if (line[0] == ' ')
- strlcpy(saveline, line, sizeof(line));
+ strlcpy(saveline, line, sizeof(saveline));
makeargv();
if (margv[0] == 0)
continue;
@@ -1876,7 +1876,7 @@ iprompt(void)
int
wr_startup(void)
{
- char *argv[] = { SAVESCRIPT, NSHRC_TEMP, '\0' };
+ char *argv[] = { SAVESCRIPT, NSHRC_TEMP, NULL };
if (wr_conf(NSHRC_TEMP))
printf("%% Saving configuration\n");
@@ -2072,7 +2072,7 @@ pr_kernel(int argc, char **argv)
void
pf_stats(void)
{
- char *argv[] = { PFCTL, "-sinfo", '\0' };
+ char *argv[] = { PFCTL, "-sinfo", NULL };
printf("%% pf statistics:\n");
@@ -2085,7 +2085,7 @@ pr_prot1(int argc, char **argv)
{
struct prot1 *x;
struct prot *prot;
- char *args[NOPTFILL] = { NULL, NULL, NULL, NULL, NULL, NULL, '\0' };
+ char *args[NOPTFILL] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL };
char **fillargs;
char prefix[64];
@@ -2150,7 +2150,7 @@ step_optreq(char **xargs, char **args, int argc, char
/* copy xargs to args, replace OPT/REQ args with argv past skip */
for (i = 0; i < NOPTFILL - 2; i++) {
if (xargs[i] == NULL) {
- args[i] = '\0';
+ args[i] = NULL;
if (i > 1)
/*
* all **args passed must have at least two arguments
@@ -2169,7 +2169,7 @@ step_optreq(char **xargs, char **args, int argc, char
printf("%% Missing required argument\n");
return NULL;
} else {
- args[i] = '\0';
+ args[i] = NULL;
break;
}
} else {
Re: shells/nsh
On Mon, 29 Mar 2021 at 02:18, Chris Cappuccio <chris@nmedia.net> wrote:
> Marc Espie [espie@nerim.net] wrote:
> > I've looked a bit at this code.
> >
> > I'm on the fence between marking it as BROKEN and give Chris a chance to
> > fix the code, or downright removing it.
> >
> > Specifically, it's currently broken thanks to recent changes to if.h,
> > but the code warns all over the place. There seems to be a misconception
> > that '\0' would be a NULL pointer (it's not, it's a character constant).
> >
>
> Well it was to mark the end of arguments in constructed argument lists,
> but maybe just NULL would be fine.
>
in commands.c
changing line 454 and swapping '\0' to a NULL got rid of the complier
warning for me
changing 1676 and swapping '\0' to a NULL got rid of the complier
warning for me
Thanks
Tom Smyth
> Marc Espie [espie@nerim.net] wrote:
> > I've looked a bit at this code.
> >
> > I'm on the fence between marking it as BROKEN and give Chris a chance to
> > fix the code, or downright removing it.
> >
> > Specifically, it's currently broken thanks to recent changes to if.h,
> > but the code warns all over the place. There seems to be a misconception
> > that '\0' would be a NULL pointer (it's not, it's a character constant).
> >
>
> Well it was to mark the end of arguments in constructed argument lists,
> but maybe just NULL would be fine.
>
in commands.c
changing line 454 and swapping '\0' to a NULL got rid of the complier
warning for me
changing 1676 and swapping '\0' to a NULL got rid of the complier
warning for me
Thanks
Tom Smyth
periodic network access failure when accessing nextcloud via relayd
# vim: ft=pf syntax=pf
lan_ip="192.168.1.1"
table <acme> { 127.0.0.1 }
table <httpd> { 127.0.0.1 }
table <nextcloud> { 127.0.0.1 }
log state changes
log connection
# HTTP #######################################################################
http protocol "http" {
match header log "Host"
match header log "X-Forwarded-For"
match header log "User-Agent"
match header log "Referer"
match url log
match header set "X-Forwarded-For" value "$REMOTE_ADDR"
match header set "X-Forwarded-By" value "$SERVER_ADDR:$SERVER_PORT"
match header set "Keep-Alive" value "$TIMEOUT"
match response header set "X-Powered-By" value "Powered by OpenBSD"
match request path "/.well-known/acme-challenge/*" forward to <acme>
tcp { nodelay, socket buffer 65536, backlog 100 }
}
relay "http" {
listen on $lan_ip port 80
protocol "http"
forward to <httpd> port 8080 check tcp # HTTP to HTTPS redirection
forward to <acme> port 8081 check tcp # Let's Encrypt renewal
}
# HTTPS ######################################################################
http protocol "https" {
match header log "Host"
match header log "X-Forwarded-For"
match header log "User-Agent"
match header log "Referer"
match url log
match header set "X-Forwarded-For" value "$REMOTE_ADDR"
match header set "X-Forwarded-By" value "$SERVER_ADDR:$SERVER_PORT"
match header set "Keep-Alive" value "$TIMEOUT"
match response header set "X-Powered-by" value "OpenBSD"
tcp { nodelay, socket buffer 65536, backlog 100 }
tls keypair nextcloud.tumfatig.net
# Default block
block request path "/*"
# Allow Let's Encrypt operations
pass request path "/.well-known/acme-challenge/*" forward to <acme>
# Nextcloud
pass request forward to <nextcloud>
}
relay "https_lan" {
listen on $lan_ip port 443 tls
protocol "https"
forward to <acme> port 8081 check tcp # Let's Encrypt renewal
forward to <nextcloud> port 8083 check tcp # Nextcloud
}
Hello,
I have Nextcloud 21 running with php-7.4, httpd(8) and relayd(8).
On my laptop, a script regularly runs nextcloudcmd to synchonize the files
with the nextcloud instance. And quite often, nextcloudcmd returns such error:
03-31 23:28:56:089 [ info nextcloud.sync.networkjob.lscol ]: LSCOL of
QUrl("https://nextcloud.tumfatig.net/remote.php/dav/files/user85419/Uploads") FINISHED
WITH STATUS "UnknownNetworkError Network access is disabled."
Both run OpenBSD 6.8/amd64.
It seems that it only happens when I access nextcloud via relayd. If I access
nextcloud straight via httpd, the error never pops up.
Running relayd in debug mode, I saw the following difference:
* when traffic works ok
relay https_lan, session 2 (1 active), 0, 192.168.1.76 -> :8083, done, [Host:
nextcloud.tumfatig.net] [User-Agent: Mozilla/5.0 (OpenBSD) mirall/3.0.1git
(Nextcloud)] [nextcloud.tumfatig.net/ocs/v1.php/cloud/capabilities: format=json] GET
-> 127.0.0.1:8083; [Host: nextcloud.tumfatig.net] [User-Agent: Mozilla/5.0 (OpenBSD)
mirall/3.0.1git (Nextcloud)]
[nextcloud.tumfatig.net/remote.php/dav/files/user85419/Uploads] PROPFIND;
* when the error occurs
relay https_lan, session 1 (1 active), 0, 192.168.1.76 -> 127.0.0.1:8083, done,
[Host: nextcloud.tumfatig.net] [User-Agent: Mozilla/5.0 (OpenBSD) mirall/3.0.1git
(Nextcloud)] [nextcloud.tumfatig.net/ocs/v1.php/cloud/capabilit
ies: format=json] GET -> 127.0.0.1:8083;
As you may notice, we can see "192.168.1.76 -> :8083" when it's working and
"192.168.1.76 -> 127.0.0.1:8083" when it fails. But I can't see the reason for
it in my relayd configuration. I've attached it to this mail.
Any thoughts on what I'm doing wrong?
Thank you,
Jo
lan_ip="192.168.1.1"
table <acme> { 127.0.0.1 }
table <httpd> { 127.0.0.1 }
table <nextcloud> { 127.0.0.1 }
log state changes
log connection
# HTTP #######################################################################
http protocol "http" {
match header log "Host"
match header log "X-Forwarded-For"
match header log "User-Agent"
match header log "Referer"
match url log
match header set "X-Forwarded-For" value "$REMOTE_ADDR"
match header set "X-Forwarded-By" value "$SERVER_ADDR:$SERVER_PORT"
match header set "Keep-Alive" value "$TIMEOUT"
match response header set "X-Powered-By" value "Powered by OpenBSD"
match request path "/.well-known/acme-challenge/*" forward to <acme>
tcp { nodelay, socket buffer 65536, backlog 100 }
}
relay "http" {
listen on $lan_ip port 80
protocol "http"
forward to <httpd> port 8080 check tcp # HTTP to HTTPS redirection
forward to <acme> port 8081 check tcp # Let's Encrypt renewal
}
# HTTPS ######################################################################
http protocol "https" {
match header log "Host"
match header log "X-Forwarded-For"
match header log "User-Agent"
match header log "Referer"
match url log
match header set "X-Forwarded-For" value "$REMOTE_ADDR"
match header set "X-Forwarded-By" value "$SERVER_ADDR:$SERVER_PORT"
match header set "Keep-Alive" value "$TIMEOUT"
match response header set "X-Powered-by" value "OpenBSD"
tcp { nodelay, socket buffer 65536, backlog 100 }
tls keypair nextcloud.tumfatig.net
# Default block
block request path "/*"
# Allow Let's Encrypt operations
pass request path "/.well-known/acme-challenge/*" forward to <acme>
# Nextcloud
pass request forward to <nextcloud>
}
relay "https_lan" {
listen on $lan_ip port 443 tls
protocol "https"
forward to <acme> port 8081 check tcp # Let's Encrypt renewal
forward to <nextcloud> port 8083 check tcp # Nextcloud
}
Hello,
I have Nextcloud 21 running with php-7.4, httpd(8) and relayd(8).
On my laptop, a script regularly runs nextcloudcmd to synchonize the files
with the nextcloud instance. And quite often, nextcloudcmd returns such error:
03-31 23:28:56:089 [ info nextcloud.sync.networkjob.lscol ]: LSCOL of
QUrl("https://nextcloud.tumfatig.net/remote.php/dav/files/user85419/Uploads") FINISHED
WITH STATUS "UnknownNetworkError Network access is disabled."
Both run OpenBSD 6.8/amd64.
It seems that it only happens when I access nextcloud via relayd. If I access
nextcloud straight via httpd, the error never pops up.
Running relayd in debug mode, I saw the following difference:
* when traffic works ok
relay https_lan, session 2 (1 active), 0, 192.168.1.76 -> :8083, done, [Host:
nextcloud.tumfatig.net] [User-Agent: Mozilla/5.0 (OpenBSD) mirall/3.0.1git
(Nextcloud)] [nextcloud.tumfatig.net/ocs/v1.php/cloud/capabilities: format=json] GET
-> 127.0.0.1:8083; [Host: nextcloud.tumfatig.net] [User-Agent: Mozilla/5.0 (OpenBSD)
mirall/3.0.1git (Nextcloud)]
[nextcloud.tumfatig.net/remote.php/dav/files/user85419/Uploads] PROPFIND;
* when the error occurs
relay https_lan, session 1 (1 active), 0, 192.168.1.76 -> 127.0.0.1:8083, done,
[Host: nextcloud.tumfatig.net] [User-Agent: Mozilla/5.0 (OpenBSD) mirall/3.0.1git
(Nextcloud)] [nextcloud.tumfatig.net/ocs/v1.php/cloud/capabilit
ies: format=json] GET -> 127.0.0.1:8083;
As you may notice, we can see "192.168.1.76 -> :8083" when it's working and
"192.168.1.76 -> 127.0.0.1:8083" when it fails. But I can't see the reason for
it in my relayd configuration. I've attached it to this mail.
Any thoughts on what I'm doing wrong?
Thank you,
Jo
Re: new: games/chiaki
On Wed, Mar 31, 2021 at 09:49:22PM +0200, Stefan Sperling wrote:
> Attached is a port of chiaki's latest 2.1.1 release.
> This port is based on abieber's port of version 1.2.0 in openbsd-wip.
>
> Chiaki is a PS4/PS5 Remote Play client. I need this for WiFi testing.
>
> Tested on amd64 against a playstation 4, which is working well.
> I don't suppose anyone would be able to test PS5 support before
> OpenBSD 6.9 is released.
>
> ok?
Ooops, 'make fetch' didn't work. Sorry about that.
Here is new version with HOMEPAGE and MASTER_SITES fixed.
> Attached is a port of chiaki's latest 2.1.1 release.
> This port is based on abieber's port of version 1.2.0 in openbsd-wip.
>
> Chiaki is a PS4/PS5 Remote Play client. I need this for WiFi testing.
>
> Tested on amd64 against a playstation 4, which is working well.
> I don't suppose anyone would be able to test PS5 support before
> OpenBSD 6.9 is released.
>
> ok?
Ooops, 'make fetch' didn't work. Sorry about that.
Here is new version with HOMEPAGE and MASTER_SITES fixed.
Re: [macppc] Unbreak www/webkitgtk4
Ok.
—
Antoine
> On 31 Mar 2021, at 20:22, Charlene Wendling <julianaito@posteo.jp> wrote:
>
> Hi,
>
> Building webkitgtk4 on macppc since 2.32 fails at the patching stage.
>
> The powerpc specific patch has been upstreamed [0], so it's not needed
> anymore. Also the ENABLE_GRAPHICS_CONTEXT_GL option is now
> USE_OPENGL_OR_ES [1]
>
> I needed an additional patch specific to archs where USE_OPENGL_OR_ES=OFF,
> only powerpc for now, a recent commit breaks the build. See the patch
> comment for more infos.
>
> With the below diff, webkitgtk4 is built [3]. No REVISION bump is
> needed since this version has never been built on powerpc and the
> whole diff only impacts this arch.
>
> As far as runtime goes, javascript runtime is mostly broken like it
> used to be before 2.30. I tried to build it with OpenGL support,
> but colors are still off.
>
> Comments/feedback are welcome.
>
> Charlène.
>
>
> [0] https://trac.webkit.org/changeset/271220/webkit
> [1] https://trac.webkit.org/changeset/273104/webkit
> [2] https://trac.webkit.org/changeset/271171/webkit
> [3] https://bin.charlenew.xyz/webkitgtk4.success.log
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/www/webkitgtk4/Makefile,v
> retrieving revision 1.139
> diff -u -p -u -p -r1.139 Makefile
> --- Makefile 30 Mar 2021 14:52:14 -0000 1.139
> +++ Makefile 31 Mar 2021 13:55:01 -0000
> @@ -124,9 +124,8 @@ LDFLAGS += -Wl,--no-keep-memory
>
> .if ${MACHINE_ARCH} == "powerpc"
> # XXX fix colors being off, it would be nice to fix the code
> -CONFIGURE_ARGS += -DENABLE_GRAPHICS_CONTEXT_GL=OFF
> +CONFIGURE_ARGS += -DUSE_OPENGL_OR_ES=OFF
> LDFLAGS += -Wl,--relax
> -PATCH_LIST = patch-* powerpc-patch-*
> .endif
>
> post-extract:
> Index: patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost_h
> ===================================================================
> RCS file: patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost_h
> diff -N patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost_h 31 Mar 2021 13:55:01 -0000
> @@ -0,0 +1,27 @@
> +$OpenBSD$
> +
> +Fix for:
> +LayerTreeHost.h:216:28: error: out-of-line definition of 'forceRepaintAsync'
> +does not match any declaration in 'WebKit::LayerTreeHost'
> +LayerTreeHost.h:82:28: note: type of 1st parameter of member declaration does
> +not match definition ('CompletionHandler<void ()> &&' vs
> +'CompletionHandler<void ()> &')
> +
> +LayerTreeHost::forceRepaintAsync used to be a bool method, but is now void.
> +It only impacts powerpc where OpenGL is disabled.
> +
> +That error has been introduced by:
> +https://trac.webkit.org/changeset/271171/webkit/trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp
> +
> +Index: Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
> +--- Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h.orig
> ++++ Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
> +@@ -213,7 +213,7 @@ inline void LayerTreeHost::setRootCompositingLayer(Web
> + inline void LayerTreeHost::setViewOverlayRootLayer(WebCore::GraphicsLayer*) { }
> + inline void LayerTreeHost::scrollNonCompositedContents(const WebCore::IntRect&) { }
> + inline void LayerTreeHost::forceRepaint() { }
> +-inline bool LayerTreeHost::forceRepaintAsync(CompletionHandler<void()>&) { return false; }
> ++inline void LayerTreeHost::forceRepaintAsync(CompletionHandler<void()>&&) { }
> + inline void LayerTreeHost::sizeDidChange(const WebCore::IntSize&) { }
> + inline void LayerTreeHost::pauseRendering() { }
> + inline void LayerTreeHost::resumeRendering() { }
> Index: patches/powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm
> ===================================================================
> RCS file: patches/powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm
> diff -N patches/powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm
> --- patches/powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm 11 Nov 2020 21:27:03 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,58 +0,0 @@
> -$OpenBSD: powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm,v 1.1 2020/11/11 21:27:03 cwen Exp $
> -
> -Fix Javascript runtime on powerpc, from
> -https://bugs.webkit.org/show_bug.cgi?id=211592
> -
> -Index: Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
> ---- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.orig
> -+++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
> -@@ -1552,13 +1552,21 @@ llintOpWithMetadata(op_put_by_id, OpPutById, macro (si
> - loadp StructureChain::m_vector[t3], t3
> - assert(macro (ok) btpnz t3, ok end)
> -
> -- loadp Structure::m_prototype[t2], t2
> -+ if JSVALUE64
> -+ loadp Structure::m_prototype[t2], t2
> -+ else
> -+ loadp Structure::m_prototype + PayloadOffset[t2], t2
> -+ end
> - btpz t2, .opPutByIdTransitionChainDone
> - .opPutByIdTransitionChainLoop:
> - loadp [t3], t1
> - bineq t1, JSCell::m_structureID[t2], .opPutByIdSlow
> - addp 4, t3
> -- loadp Structure::m_prototype[t1], t2
> -+ if JSVALUE64
> -+ loadp Structure::m_prototype[t1], t2
> -+ else
> -+ loadp Structure::m_prototype + PayloadOffset[t1], t2
> -+ end
> - btpnz t2, .opPutByIdTransitionChainLoop
> -
> - .opPutByIdTransitionChainDone:
> -@@ -2182,7 +2190,11 @@ end)
> -
> -
> - op(llint_throw_from_slow_path_trampoline, macro()
> -- loadp Callee[cfr], t1
> -+ if JSVALUE64
> -+ loadp Callee[cfr], t1
> -+ else
> -+ loadp Callee + PayloadOffset[cfr], t1
> -+ end
> - convertCalleeToVM(t1)
> - copyCalleeSavesToVMEntryFrameCalleeSavesBuffer(t1, t2)
> -
> -@@ -2191,7 +2203,11 @@ op(llint_throw_from_slow_path_trampoline, macro()
> - # When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so
> - # the throw target is not necessarily interpreted code, we come to here.
> - # This essentially emulates the JIT's throwing protocol.
> -- loadp Callee[cfr], t1
> -+ if JSVALUE64
> -+ loadp Callee[cfr], t1
> -+ else
> -+ loadp Callee + PayloadOffset[cfr], t1
> -+ end
> - convertCalleeToVM(t1)
> - jmp VM::targetMachinePCForThrow[t1]
> - end)
>
>
>
—
Antoine
> On 31 Mar 2021, at 20:22, Charlene Wendling <julianaito@posteo.jp> wrote:
>
> Hi,
>
> Building webkitgtk4 on macppc since 2.32 fails at the patching stage.
>
> The powerpc specific patch has been upstreamed [0], so it's not needed
> anymore. Also the ENABLE_GRAPHICS_CONTEXT_GL option is now
> USE_OPENGL_OR_ES [1]
>
> I needed an additional patch specific to archs where USE_OPENGL_OR_ES=OFF,
> only powerpc for now, a recent commit breaks the build. See the patch
> comment for more infos.
>
> With the below diff, webkitgtk4 is built [3]. No REVISION bump is
> needed since this version has never been built on powerpc and the
> whole diff only impacts this arch.
>
> As far as runtime goes, javascript runtime is mostly broken like it
> used to be before 2.30. I tried to build it with OpenGL support,
> but colors are still off.
>
> Comments/feedback are welcome.
>
> Charlène.
>
>
> [0] https://trac.webkit.org/changeset/271220/webkit
> [1] https://trac.webkit.org/changeset/273104/webkit
> [2] https://trac.webkit.org/changeset/271171/webkit
> [3] https://bin.charlenew.xyz/webkitgtk4.success.log
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/www/webkitgtk4/Makefile,v
> retrieving revision 1.139
> diff -u -p -u -p -r1.139 Makefile
> --- Makefile 30 Mar 2021 14:52:14 -0000 1.139
> +++ Makefile 31 Mar 2021 13:55:01 -0000
> @@ -124,9 +124,8 @@ LDFLAGS += -Wl,--no-keep-memory
>
> .if ${MACHINE_ARCH} == "powerpc"
> # XXX fix colors being off, it would be nice to fix the code
> -CONFIGURE_ARGS += -DENABLE_GRAPHICS_CONTEXT_GL=OFF
> +CONFIGURE_ARGS += -DUSE_OPENGL_OR_ES=OFF
> LDFLAGS += -Wl,--relax
> -PATCH_LIST = patch-* powerpc-patch-*
> .endif
>
> post-extract:
> Index: patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost_h
> ===================================================================
> RCS file: patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost_h
> diff -N patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost_h 31 Mar 2021 13:55:01 -0000
> @@ -0,0 +1,27 @@
> +$OpenBSD$
> +
> +Fix for:
> +LayerTreeHost.h:216:28: error: out-of-line definition of 'forceRepaintAsync'
> +does not match any declaration in 'WebKit::LayerTreeHost'
> +LayerTreeHost.h:82:28: note: type of 1st parameter of member declaration does
> +not match definition ('CompletionHandler<void ()> &&' vs
> +'CompletionHandler<void ()> &')
> +
> +LayerTreeHost::forceRepaintAsync used to be a bool method, but is now void.
> +It only impacts powerpc where OpenGL is disabled.
> +
> +That error has been introduced by:
> +https://trac.webkit.org/changeset/271171/webkit/trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp
> +
> +Index: Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
> +--- Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h.orig
> ++++ Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
> +@@ -213,7 +213,7 @@ inline void LayerTreeHost::setRootCompositingLayer(Web
> + inline void LayerTreeHost::setViewOverlayRootLayer(WebCore::GraphicsLayer*) { }
> + inline void LayerTreeHost::scrollNonCompositedContents(const WebCore::IntRect&) { }
> + inline void LayerTreeHost::forceRepaint() { }
> +-inline bool LayerTreeHost::forceRepaintAsync(CompletionHandler<void()>&) { return false; }
> ++inline void LayerTreeHost::forceRepaintAsync(CompletionHandler<void()>&&) { }
> + inline void LayerTreeHost::sizeDidChange(const WebCore::IntSize&) { }
> + inline void LayerTreeHost::pauseRendering() { }
> + inline void LayerTreeHost::resumeRendering() { }
> Index: patches/powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm
> ===================================================================
> RCS file: patches/powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm
> diff -N patches/powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm
> --- patches/powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm 11 Nov 2020 21:27:03 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,58 +0,0 @@
> -$OpenBSD: powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm,v 1.1 2020/11/11 21:27:03 cwen Exp $
> -
> -Fix Javascript runtime on powerpc, from
> -https://bugs.webkit.org/show_bug.cgi?id=211592
> -
> -Index: Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
> ---- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.orig
> -+++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
> -@@ -1552,13 +1552,21 @@ llintOpWithMetadata(op_put_by_id, OpPutById, macro (si
> - loadp StructureChain::m_vector[t3], t3
> - assert(macro (ok) btpnz t3, ok end)
> -
> -- loadp Structure::m_prototype[t2], t2
> -+ if JSVALUE64
> -+ loadp Structure::m_prototype[t2], t2
> -+ else
> -+ loadp Structure::m_prototype + PayloadOffset[t2], t2
> -+ end
> - btpz t2, .opPutByIdTransitionChainDone
> - .opPutByIdTransitionChainLoop:
> - loadp [t3], t1
> - bineq t1, JSCell::m_structureID[t2], .opPutByIdSlow
> - addp 4, t3
> -- loadp Structure::m_prototype[t1], t2
> -+ if JSVALUE64
> -+ loadp Structure::m_prototype[t1], t2
> -+ else
> -+ loadp Structure::m_prototype + PayloadOffset[t1], t2
> -+ end
> - btpnz t2, .opPutByIdTransitionChainLoop
> -
> - .opPutByIdTransitionChainDone:
> -@@ -2182,7 +2190,11 @@ end)
> -
> -
> - op(llint_throw_from_slow_path_trampoline, macro()
> -- loadp Callee[cfr], t1
> -+ if JSVALUE64
> -+ loadp Callee[cfr], t1
> -+ else
> -+ loadp Callee + PayloadOffset[cfr], t1
> -+ end
> - convertCalleeToVM(t1)
> - copyCalleeSavesToVMEntryFrameCalleeSavesBuffer(t1, t2)
> -
> -@@ -2191,7 +2203,11 @@ op(llint_throw_from_slow_path_trampoline, macro()
> - # When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so
> - # the throw target is not necessarily interpreted code, we come to here.
> - # This essentially emulates the JIT's throwing protocol.
> -- loadp Callee[cfr], t1
> -+ if JSVALUE64
> -+ loadp Callee[cfr], t1
> -+ else
> -+ loadp Callee + PayloadOffset[cfr], t1
> -+ end
> - convertCalleeToVM(t1)
> - jmp VM::targetMachinePCForThrow[t1]
> - end)
>
>
>
new: games/chiaki
Attached is a port of chiaki's latest 2.1.1 release.
This port is based on abieber's port of version 1.2.0 in openbsd-wip.
Chiaki is a PS4/PS5 Remote Play client. I need this for WiFi testing.
Tested on amd64 against a playstation 4, which is working well.
I don't suppose anyone would be able to test PS5 support before
OpenBSD 6.9 is released.
ok?
This port is based on abieber's port of version 1.2.0 in openbsd-wip.
Chiaki is a PS4/PS5 Remote Play client. I need this for WiFi testing.
Tested on amd64 against a playstation 4, which is working well.
I don't suppose anyone would be able to test PS5 support before
OpenBSD 6.9 is released.
ok?
[macppc] Unbreak www/webkitgtk4
Hi,
Building webkitgtk4 on macppc since 2.32 fails at the patching stage.
The powerpc specific patch has been upstreamed [0], so it's not needed
anymore. Also the ENABLE_GRAPHICS_CONTEXT_GL option is now
USE_OPENGL_OR_ES [1]
I needed an additional patch specific to archs where USE_OPENGL_OR_ES=OFF,
only powerpc for now, a recent commit breaks the build. See the patch
comment for more infos.
With the below diff, webkitgtk4 is built [3]. No REVISION bump is
needed since this version has never been built on powerpc and the
whole diff only impacts this arch.
As far as runtime goes, javascript runtime is mostly broken like it
used to be before 2.30. I tried to build it with OpenGL support,
but colors are still off.
Comments/feedback are welcome.
Charlène.
[0] https://trac.webkit.org/changeset/271220/webkit
[1] https://trac.webkit.org/changeset/273104/webkit
[2] https://trac.webkit.org/changeset/271171/webkit
[3] https://bin.charlenew.xyz/webkitgtk4.success.log
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/webkitgtk4/Makefile,v
retrieving revision 1.139
diff -u -p -u -p -r1.139 Makefile
--- Makefile 30 Mar 2021 14:52:14 -0000 1.139
+++ Makefile 31 Mar 2021 13:55:01 -0000
@@ -124,9 +124,8 @@ LDFLAGS += -Wl,--no-keep-memory
.if ${MACHINE_ARCH} == "powerpc"
# XXX fix colors being off, it would be nice to fix the code
-CONFIGURE_ARGS += -DENABLE_GRAPHICS_CONTEXT_GL=OFF
+CONFIGURE_ARGS += -DUSE_OPENGL_OR_ES=OFF
LDFLAGS += -Wl,--relax
-PATCH_LIST = patch-* powerpc-patch-*
.endif
post-extract:
Index: patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost_h
===================================================================
RCS file: patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost_h
diff -N patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost_h 31 Mar 2021 13:55:01 -0000
@@ -0,0 +1,27 @@
+$OpenBSD$
+
+Fix for:
+LayerTreeHost.h:216:28: error: out-of-line definition of 'forceRepaintAsync'
+does not match any declaration in 'WebKit::LayerTreeHost'
+LayerTreeHost.h:82:28: note: type of 1st parameter of member declaration does
+not match definition ('CompletionHandler<void ()> &&' vs
+'CompletionHandler<void ()> &')
+
+LayerTreeHost::forceRepaintAsync used to be a bool method, but is now void.
+It only impacts powerpc where OpenGL is disabled.
+
+That error has been introduced by:
+https://trac.webkit.org/changeset/271171/webkit/trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp
+
+Index: Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
+--- Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h.orig
++++ Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
+@@ -213,7 +213,7 @@ inline void LayerTreeHost::setRootCompositingLayer(Web
+ inline void LayerTreeHost::setViewOverlayRootLayer(WebCore::GraphicsLayer*) { }
+ inline void LayerTreeHost::scrollNonCompositedContents(const WebCore::IntRect&) { }
+ inline void LayerTreeHost::forceRepaint() { }
+-inline bool LayerTreeHost::forceRepaintAsync(CompletionHandler<void()>&) { return false; }
++inline void LayerTreeHost::forceRepaintAsync(CompletionHandler<void()>&&) { }
+ inline void LayerTreeHost::sizeDidChange(const WebCore::IntSize&) { }
+ inline void LayerTreeHost::pauseRendering() { }
+ inline void LayerTreeHost::resumeRendering() { }
Index: patches/powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm
===================================================================
RCS file: patches/powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm
diff -N patches/powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm
--- patches/powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm 11 Nov 2020 21:27:03 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-$OpenBSD: powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm,v 1.1 2020/11/11 21:27:03 cwen Exp $
-
-Fix Javascript runtime on powerpc, from
-https://bugs.webkit.org/show_bug.cgi?id=211592
-
-Index: Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
---- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.orig
-+++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1552,13 +1552,21 @@ llintOpWithMetadata(op_put_by_id, OpPutById, macro (si
- loadp StructureChain::m_vector[t3], t3
- assert(macro (ok) btpnz t3, ok end)
-
-- loadp Structure::m_prototype[t2], t2
-+ if JSVALUE64
-+ loadp Structure::m_prototype[t2], t2
-+ else
-+ loadp Structure::m_prototype + PayloadOffset[t2], t2
-+ end
- btpz t2, .opPutByIdTransitionChainDone
- .opPutByIdTransitionChainLoop:
- loadp [t3], t1
- bineq t1, JSCell::m_structureID[t2], .opPutByIdSlow
- addp 4, t3
-- loadp Structure::m_prototype[t1], t2
-+ if JSVALUE64
-+ loadp Structure::m_prototype[t1], t2
-+ else
-+ loadp Structure::m_prototype + PayloadOffset[t1], t2
-+ end
- btpnz t2, .opPutByIdTransitionChainLoop
-
- .opPutByIdTransitionChainDone:
-@@ -2182,7 +2190,11 @@ end)
-
-
- op(llint_throw_from_slow_path_trampoline, macro()
-- loadp Callee[cfr], t1
-+ if JSVALUE64
-+ loadp Callee[cfr], t1
-+ else
-+ loadp Callee + PayloadOffset[cfr], t1
-+ end
- convertCalleeToVM(t1)
- copyCalleeSavesToVMEntryFrameCalleeSavesBuffer(t1, t2)
-
-@@ -2191,7 +2203,11 @@ op(llint_throw_from_slow_path_trampoline, macro()
- # When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so
- # the throw target is not necessarily interpreted code, we come to here.
- # This essentially emulates the JIT's throwing protocol.
-- loadp Callee[cfr], t1
-+ if JSVALUE64
-+ loadp Callee[cfr], t1
-+ else
-+ loadp Callee + PayloadOffset[cfr], t1
-+ end
- convertCalleeToVM(t1)
- jmp VM::targetMachinePCForThrow[t1]
- end)
Building webkitgtk4 on macppc since 2.32 fails at the patching stage.
The powerpc specific patch has been upstreamed [0], so it's not needed
anymore. Also the ENABLE_GRAPHICS_CONTEXT_GL option is now
USE_OPENGL_OR_ES [1]
I needed an additional patch specific to archs where USE_OPENGL_OR_ES=OFF,
only powerpc for now, a recent commit breaks the build. See the patch
comment for more infos.
With the below diff, webkitgtk4 is built [3]. No REVISION bump is
needed since this version has never been built on powerpc and the
whole diff only impacts this arch.
As far as runtime goes, javascript runtime is mostly broken like it
used to be before 2.30. I tried to build it with OpenGL support,
but colors are still off.
Comments/feedback are welcome.
Charlène.
[0] https://trac.webkit.org/changeset/271220/webkit
[1] https://trac.webkit.org/changeset/273104/webkit
[2] https://trac.webkit.org/changeset/271171/webkit
[3] https://bin.charlenew.xyz/webkitgtk4.success.log
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/webkitgtk4/Makefile,v
retrieving revision 1.139
diff -u -p -u -p -r1.139 Makefile
--- Makefile 30 Mar 2021 14:52:14 -0000 1.139
+++ Makefile 31 Mar 2021 13:55:01 -0000
@@ -124,9 +124,8 @@ LDFLAGS += -Wl,--no-keep-memory
.if ${MACHINE_ARCH} == "powerpc"
# XXX fix colors being off, it would be nice to fix the code
-CONFIGURE_ARGS += -DENABLE_GRAPHICS_CONTEXT_GL=OFF
+CONFIGURE_ARGS += -DUSE_OPENGL_OR_ES=OFF
LDFLAGS += -Wl,--relax
-PATCH_LIST = patch-* powerpc-patch-*
.endif
post-extract:
Index: patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost_h
===================================================================
RCS file: patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost_h
diff -N patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost_h 31 Mar 2021 13:55:01 -0000
@@ -0,0 +1,27 @@
+$OpenBSD$
+
+Fix for:
+LayerTreeHost.h:216:28: error: out-of-line definition of 'forceRepaintAsync'
+does not match any declaration in 'WebKit::LayerTreeHost'
+LayerTreeHost.h:82:28: note: type of 1st parameter of member declaration does
+not match definition ('CompletionHandler<void ()> &&' vs
+'CompletionHandler<void ()> &')
+
+LayerTreeHost::forceRepaintAsync used to be a bool method, but is now void.
+It only impacts powerpc where OpenGL is disabled.
+
+That error has been introduced by:
+https://trac.webkit.org/changeset/271171/webkit/trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp
+
+Index: Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
+--- Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h.orig
++++ Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
+@@ -213,7 +213,7 @@ inline void LayerTreeHost::setRootCompositingLayer(Web
+ inline void LayerTreeHost::setViewOverlayRootLayer(WebCore::GraphicsLayer*) { }
+ inline void LayerTreeHost::scrollNonCompositedContents(const WebCore::IntRect&) { }
+ inline void LayerTreeHost::forceRepaint() { }
+-inline bool LayerTreeHost::forceRepaintAsync(CompletionHandler<void()>&) { return false; }
++inline void LayerTreeHost::forceRepaintAsync(CompletionHandler<void()>&&) { }
+ inline void LayerTreeHost::sizeDidChange(const WebCore::IntSize&) { }
+ inline void LayerTreeHost::pauseRendering() { }
+ inline void LayerTreeHost::resumeRendering() { }
Index: patches/powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm
===================================================================
RCS file: patches/powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm
diff -N patches/powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm
--- patches/powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm 11 Nov 2020 21:27:03 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-$OpenBSD: powerpc-patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm,v 1.1 2020/11/11 21:27:03 cwen Exp $
-
-Fix Javascript runtime on powerpc, from
-https://bugs.webkit.org/show_bug.cgi?id=211592
-
-Index: Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
---- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.orig
-+++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1552,13 +1552,21 @@ llintOpWithMetadata(op_put_by_id, OpPutById, macro (si
- loadp StructureChain::m_vector[t3], t3
- assert(macro (ok) btpnz t3, ok end)
-
-- loadp Structure::m_prototype[t2], t2
-+ if JSVALUE64
-+ loadp Structure::m_prototype[t2], t2
-+ else
-+ loadp Structure::m_prototype + PayloadOffset[t2], t2
-+ end
- btpz t2, .opPutByIdTransitionChainDone
- .opPutByIdTransitionChainLoop:
- loadp [t3], t1
- bineq t1, JSCell::m_structureID[t2], .opPutByIdSlow
- addp 4, t3
-- loadp Structure::m_prototype[t1], t2
-+ if JSVALUE64
-+ loadp Structure::m_prototype[t1], t2
-+ else
-+ loadp Structure::m_prototype + PayloadOffset[t1], t2
-+ end
- btpnz t2, .opPutByIdTransitionChainLoop
-
- .opPutByIdTransitionChainDone:
-@@ -2182,7 +2190,11 @@ end)
-
-
- op(llint_throw_from_slow_path_trampoline, macro()
-- loadp Callee[cfr], t1
-+ if JSVALUE64
-+ loadp Callee[cfr], t1
-+ else
-+ loadp Callee + PayloadOffset[cfr], t1
-+ end
- convertCalleeToVM(t1)
- copyCalleeSavesToVMEntryFrameCalleeSavesBuffer(t1, t2)
-
-@@ -2191,7 +2203,11 @@ op(llint_throw_from_slow_path_trampoline, macro()
- # When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so
- # the throw target is not necessarily interpreted code, we come to here.
- # This essentially emulates the JIT's throwing protocol.
-- loadp Callee[cfr], t1
-+ if JSVALUE64
-+ loadp Callee[cfr], t1
-+ else
-+ loadp Callee + PayloadOffset[cfr], t1
-+ end
- convertCalleeToVM(t1)
- jmp VM::targetMachinePCForThrow[t1]
- end)
Re: Issue with Ubiquiti ERL upgrade from 6.7 to 6.8 via sysupgrade (octeon)
Yes, that was it... The bootcmd was set to 'fatload usb 0 $loadaddr bsd;
bootoctlinux rootdev=/dev/sd0', which I had to change to 'fatload usb 0
$loadaddr boot; bootoctlinux rootdev=/dev/sd0' and then the upgrade went
through fine.
Thanks for the help, Theo.
-Amarendra
erl$ dmesg
[ using 746200 bytes of bsd ELF symbol table ]
Copyright (c) 1982, 1986, 1989, 1991, 1993
The Regents of the University of California. All rights reserved.
Copyright (c) 1995-2020 OpenBSD. All rights reserved.
https://www.OpenBSD.org
OpenBSD 6.8 (GENERIC.MP) #322: Sun Oct 4 21:22:50 MDT 2020
deraadt@octeon.openbsd.org:/usr/src/sys/arch/octeon/compile/GENERIC.MP
real mem = 536870912 (512MB)
avail mem = 521469952 (497MB)
random: good seed from bootblocks
mainbus0 at root: board 20002 rev 2.18, model CN3xxx/CN5xxx
cpu0 at mainbus0: CN50xx CPU rev 0.1 500 MHz, Software FP emulation
cpu0: cache L1-I 32KB 4 way D 16KB 64 way, L2 128KB 8 way
clock0 at mainbus0: int 5
octcrypto0 at mainbus0
iobus0 at mainbus0
simplebus0 at iobus0: "soc"
octciu0 at simplebus0
octsmi0 at simplebus0
octpip0 at simplebus0
octgmx0 at octpip0 interface 0
cnmac0 at octgmx0: port 0 RGMII, address 78:8a:20:46:a8:c0
atphy0 at cnmac0 phy 7: AR8035 10/100/1000 PHY, rev. 2
cnmac1 at octgmx0: port 1 RGMII, address 78:8a:20:46:a8:c1
atphy1 at cnmac1 phy 6: AR8035 10/100/1000 PHY, rev. 2
cnmac2 at octgmx0: port 2 RGMII, address 78:8a:20:46:a8:c2
atphy2 at cnmac2 phy 5: AR8035 10/100/1000 PHY, rev. 2
com0 at simplebus0: ns16550a, 64 byte fifo
com0: console
dwctwo0 at iobus0 base 0x1180068000000 irq 56
usb0 at dwctwo0: USB revision 2.0
uhub0 at usb0 configuration 1 interface 0 "Octeon DWC2 root hub" rev
2.00/1.00 addr 1
octrng0 at iobus0 base 0x1400000000000 irq 0
umass0 at uhub0 port 1 configuration 1 interface 0 "Lexar USB Flash Drive"
rev 2.10/11.00 addr 2
umass0: using SCSI over Bulk-Only
scsibus0 at umass0: 2 targets, initiator 0
sd0 at scsibus0 targ 1 lun 0: <Lexar, USB Flash Drive, 1100> removable
serial.21c40cd1719080003000
sd0: 30526MB, 512 bytes/sector, 62517248 sectors
vscsi0 at root
scsibus1 at vscsi0: 256 targets
softraid0 at root
scsibus2 at softraid0: 256 targets
root on sd0a (2124441bc835a462.a) swap on sd0b dump on sd0b
WARNING: CHECK AND RESET THE DATE!
On Wed, Mar 31, 2021 at 8:14 AM Theo de Raadt <deraadt@openbsd.org> wrote:
> your PROM is likely setup to boot a "bsd" kernel in the msdos partition,
> rather than the "boot" file. The "boot" file will load /bsd from the ffs
> partition.
>
> Amarendra Godbole <amarendra.godbole@gmail.com> wrote:
>
> > So I used sysupgrade to upgrade the ERL from 6.7 to 6.8. It went through
> > everything fine, downloaded the sets, extracts, etc. and reboots.
> However,
> > it boots back into the old 6.7 kernel. I can see /bsd.upgrade created,
> and
> > /home/_sysupgrade is empty. but did not see any option to trigger the
> > upgrade. I thought it should have been automatically handled by
> sysupgrade.
> >
> > What did I miss?
> >
> > Thanks.
> >
> > -Amarendra
> >
> >
> > erl# uname -a
> > OpenBSD erl.lan 6.7 GENERIC.MP#134 octeon
> >
> > erl# ls -l
> > total 79128
> > -rw-r--r-- 1 root wheel 578 May 7 2020 .cshrc
> > -rw-r--r-- 1 root wheel 468 May 7 2020 .profile
> > drwxr-xr-x 2 root wheel 512 May 7 2020 altroot
> > -rw-r--r-- 1 root wheel 160 Mar 31 00:08 auto_upgrade.conf
> > drwxr-xr-x 2 root wheel 1024 May 7 2020 bin
> > -rwx------ 1 root wheel 7626800 Mar 31 00:10 bsd
> > -rwx------ 1 root wheel 7623592 Mar 31 00:01 bsd.booted
> > -rw------- 1 root wheel 8843608 May 7 2020 bsd.rd
> > -rw------- 1 root wheel 7568260 May 7 2020 bsd.sp
> > -rwx------ 1 root wheel 8823044 Mar 31 00:09 bsd.upgrade
> > drwxr-xr-x 4 root wheel 18432 Mar 31 00:10 dev
> > drwxr-xr-x 23 root wheel 2048 Mar 31 00:11 etc
> > drwxr-xr-x 4 root wheel 512 Oct 15 21:09 home
> > drwxr-xr-x 2 root wheel 512 May 7 2020 mnt
> > drwx------ 3 root wheel 512 Mar 31 01:30 root
> > drwxr-xr-x 2 root wheel 1536 May 7 2020 sbin
> > lrwxrwx--- 1 root wheel 11 May 7 2020 sys -> usr/src/sys
> > drwxrwxrwt 6 root wheel 512 Mar 31 07:45 tmp
> > drwxr-xr-x 16 root wheel 512 Sep 7 2020 usr
> > drwxr-xr-x 23 root wheel 512 May 7 2020 var
> > erl#
> >
> > erl# dmesg
> > Copyright (c) 1982, 1986, 1989, 1991, 1993
> > The Regents of the University of California. All rights reserved.
> > Copyright (c) 1995-2020 OpenBSD. All rights reserved.
> > https://www.OpenBSD.org
> >
> > OpenBSD 6.7 (GENERIC.MP) #134: Thu May 7 16:05:06 MDT 2020
> > deraadt@octeon.openbsd.org:/usr/src/sys/arch/octeon/compile/
> GENERIC.MP
> > real mem = 536870912 (512MB)
> > avail mem = 506740736 (483MB)
> > mainbus0 at root: board 20002 rev 2.18
> > cpu0 at mainbus0: CN50xx CPU rev 0.1 500 MHz, Software FP emulation
> > cpu0: cache L1-I 32KB 4 way D 16KB 64 way, L2 128KB 8 way
> > cpu1 at mainbus0: CN50xx CPU rev 0.1 500 MHz, Software FP emulation
> > cpu1: cache L1-I 32KB 4 way D 16KB 64 way, L2 128KB 8 way
> > clock0 at mainbus0: int 5
> > octcrypto0 at mainbus0
> > iobus0 at mainbus0
> > simplebus0 at iobus0: "soc"
> > octciu0 at simplebus0
> > octsmi0 at simplebus0
> > octpip0 at simplebus0
> > octgmx0 at octpip0 interface 0
> > cnmac0 at octgmx0: RGMII, address 78:8a:20:46:a8:c0
> > atphy0 at cnmac0 phy 7: AR8035 10/100/1000 PHY, rev. 2
> > cnmac1 at octgmx0: RGMII, address 78:8a:20:46:a8:c1
> > atphy1 at cnmac1 phy 6: AR8035 10/100/1000 PHY, rev. 2
> > cnmac2 at octgmx0: RGMII, address 78:8a:20:46:a8:c2
> > atphy2 at cnmac2 phy 5: AR8035 10/100/1000 PHY, rev. 2
> > com0 at simplebus0: ns16550a, 64 byte fifo
> > com0: console
> > dwctwo0 at iobus0 base 0x1180068000000 irq 56
> > usb0 at dwctwo0: USB revision 2.0
> > uhub0 at usb0 configuration 1 interface 0 "Octeon DWC2 root hub" rev
> > 2.00/1.00 addr 1
> > octrng0 at iobus0 base 0x1400000000000 irq 0
> > /dev/ksyms: Symbol table not valid.
> > umass0 at uhub0 port 1 configuration 1 interface 0 "Lexar USB Flash
> Drive"
> > rev 2.10/11.00 addr 2
> > umass0: using SCSI over Bulk-Only
> > scsibus0 at umass0: 2 targets, initiator 0
> > sd0 at scsibus0 targ 1 lun 0: <Lexar, USB Flash Drive, 1100> removable
> > serial.21c40cd1719080003000
> > sd0: 30526MB, 512 bytes/sector, 62517248 sectors
> > vscsi0 at root
> > scsibus1 at vscsi0: 256 targets
> > softraid0 at root
> > scsibus2 at softraid0: 256 targets
> > boot device: sd0
> > root on sd0a (2124441bc835a462.a) swap on sd0b dump on sd0b
> > WARNING: No TOD clock, believing file system.
> > WARNING: CHECK AND RESET THE DATE!
>
bootoctlinux rootdev=/dev/sd0', which I had to change to 'fatload usb 0
$loadaddr boot; bootoctlinux rootdev=/dev/sd0' and then the upgrade went
through fine.
Thanks for the help, Theo.
-Amarendra
erl$ dmesg
[ using 746200 bytes of bsd ELF symbol table ]
Copyright (c) 1982, 1986, 1989, 1991, 1993
The Regents of the University of California. All rights reserved.
Copyright (c) 1995-2020 OpenBSD. All rights reserved.
https://www.OpenBSD.org
OpenBSD 6.8 (GENERIC.MP) #322: Sun Oct 4 21:22:50 MDT 2020
deraadt@octeon.openbsd.org:/usr/src/sys/arch/octeon/compile/GENERIC.MP
real mem = 536870912 (512MB)
avail mem = 521469952 (497MB)
random: good seed from bootblocks
mainbus0 at root: board 20002 rev 2.18, model CN3xxx/CN5xxx
cpu0 at mainbus0: CN50xx CPU rev 0.1 500 MHz, Software FP emulation
cpu0: cache L1-I 32KB 4 way D 16KB 64 way, L2 128KB 8 way
clock0 at mainbus0: int 5
octcrypto0 at mainbus0
iobus0 at mainbus0
simplebus0 at iobus0: "soc"
octciu0 at simplebus0
octsmi0 at simplebus0
octpip0 at simplebus0
octgmx0 at octpip0 interface 0
cnmac0 at octgmx0: port 0 RGMII, address 78:8a:20:46:a8:c0
atphy0 at cnmac0 phy 7: AR8035 10/100/1000 PHY, rev. 2
cnmac1 at octgmx0: port 1 RGMII, address 78:8a:20:46:a8:c1
atphy1 at cnmac1 phy 6: AR8035 10/100/1000 PHY, rev. 2
cnmac2 at octgmx0: port 2 RGMII, address 78:8a:20:46:a8:c2
atphy2 at cnmac2 phy 5: AR8035 10/100/1000 PHY, rev. 2
com0 at simplebus0: ns16550a, 64 byte fifo
com0: console
dwctwo0 at iobus0 base 0x1180068000000 irq 56
usb0 at dwctwo0: USB revision 2.0
uhub0 at usb0 configuration 1 interface 0 "Octeon DWC2 root hub" rev
2.00/1.00 addr 1
octrng0 at iobus0 base 0x1400000000000 irq 0
umass0 at uhub0 port 1 configuration 1 interface 0 "Lexar USB Flash Drive"
rev 2.10/11.00 addr 2
umass0: using SCSI over Bulk-Only
scsibus0 at umass0: 2 targets, initiator 0
sd0 at scsibus0 targ 1 lun 0: <Lexar, USB Flash Drive, 1100> removable
serial.21c40cd1719080003000
sd0: 30526MB, 512 bytes/sector, 62517248 sectors
vscsi0 at root
scsibus1 at vscsi0: 256 targets
softraid0 at root
scsibus2 at softraid0: 256 targets
root on sd0a (2124441bc835a462.a) swap on sd0b dump on sd0b
WARNING: CHECK AND RESET THE DATE!
On Wed, Mar 31, 2021 at 8:14 AM Theo de Raadt <deraadt@openbsd.org> wrote:
> your PROM is likely setup to boot a "bsd" kernel in the msdos partition,
> rather than the "boot" file. The "boot" file will load /bsd from the ffs
> partition.
>
> Amarendra Godbole <amarendra.godbole@gmail.com> wrote:
>
> > So I used sysupgrade to upgrade the ERL from 6.7 to 6.8. It went through
> > everything fine, downloaded the sets, extracts, etc. and reboots.
> However,
> > it boots back into the old 6.7 kernel. I can see /bsd.upgrade created,
> and
> > /home/_sysupgrade is empty. but did not see any option to trigger the
> > upgrade. I thought it should have been automatically handled by
> sysupgrade.
> >
> > What did I miss?
> >
> > Thanks.
> >
> > -Amarendra
> >
> >
> > erl# uname -a
> > OpenBSD erl.lan 6.7 GENERIC.MP#134 octeon
> >
> > erl# ls -l
> > total 79128
> > -rw-r--r-- 1 root wheel 578 May 7 2020 .cshrc
> > -rw-r--r-- 1 root wheel 468 May 7 2020 .profile
> > drwxr-xr-x 2 root wheel 512 May 7 2020 altroot
> > -rw-r--r-- 1 root wheel 160 Mar 31 00:08 auto_upgrade.conf
> > drwxr-xr-x 2 root wheel 1024 May 7 2020 bin
> > -rwx------ 1 root wheel 7626800 Mar 31 00:10 bsd
> > -rwx------ 1 root wheel 7623592 Mar 31 00:01 bsd.booted
> > -rw------- 1 root wheel 8843608 May 7 2020 bsd.rd
> > -rw------- 1 root wheel 7568260 May 7 2020 bsd.sp
> > -rwx------ 1 root wheel 8823044 Mar 31 00:09 bsd.upgrade
> > drwxr-xr-x 4 root wheel 18432 Mar 31 00:10 dev
> > drwxr-xr-x 23 root wheel 2048 Mar 31 00:11 etc
> > drwxr-xr-x 4 root wheel 512 Oct 15 21:09 home
> > drwxr-xr-x 2 root wheel 512 May 7 2020 mnt
> > drwx------ 3 root wheel 512 Mar 31 01:30 root
> > drwxr-xr-x 2 root wheel 1536 May 7 2020 sbin
> > lrwxrwx--- 1 root wheel 11 May 7 2020 sys -> usr/src/sys
> > drwxrwxrwt 6 root wheel 512 Mar 31 07:45 tmp
> > drwxr-xr-x 16 root wheel 512 Sep 7 2020 usr
> > drwxr-xr-x 23 root wheel 512 May 7 2020 var
> > erl#
> >
> > erl# dmesg
> > Copyright (c) 1982, 1986, 1989, 1991, 1993
> > The Regents of the University of California. All rights reserved.
> > Copyright (c) 1995-2020 OpenBSD. All rights reserved.
> > https://www.OpenBSD.org
> >
> > OpenBSD 6.7 (GENERIC.MP) #134: Thu May 7 16:05:06 MDT 2020
> > deraadt@octeon.openbsd.org:/usr/src/sys/arch/octeon/compile/
> GENERIC.MP
> > real mem = 536870912 (512MB)
> > avail mem = 506740736 (483MB)
> > mainbus0 at root: board 20002 rev 2.18
> > cpu0 at mainbus0: CN50xx CPU rev 0.1 500 MHz, Software FP emulation
> > cpu0: cache L1-I 32KB 4 way D 16KB 64 way, L2 128KB 8 way
> > cpu1 at mainbus0: CN50xx CPU rev 0.1 500 MHz, Software FP emulation
> > cpu1: cache L1-I 32KB 4 way D 16KB 64 way, L2 128KB 8 way
> > clock0 at mainbus0: int 5
> > octcrypto0 at mainbus0
> > iobus0 at mainbus0
> > simplebus0 at iobus0: "soc"
> > octciu0 at simplebus0
> > octsmi0 at simplebus0
> > octpip0 at simplebus0
> > octgmx0 at octpip0 interface 0
> > cnmac0 at octgmx0: RGMII, address 78:8a:20:46:a8:c0
> > atphy0 at cnmac0 phy 7: AR8035 10/100/1000 PHY, rev. 2
> > cnmac1 at octgmx0: RGMII, address 78:8a:20:46:a8:c1
> > atphy1 at cnmac1 phy 6: AR8035 10/100/1000 PHY, rev. 2
> > cnmac2 at octgmx0: RGMII, address 78:8a:20:46:a8:c2
> > atphy2 at cnmac2 phy 5: AR8035 10/100/1000 PHY, rev. 2
> > com0 at simplebus0: ns16550a, 64 byte fifo
> > com0: console
> > dwctwo0 at iobus0 base 0x1180068000000 irq 56
> > usb0 at dwctwo0: USB revision 2.0
> > uhub0 at usb0 configuration 1 interface 0 "Octeon DWC2 root hub" rev
> > 2.00/1.00 addr 1
> > octrng0 at iobus0 base 0x1400000000000 irq 0
> > /dev/ksyms: Symbol table not valid.
> > umass0 at uhub0 port 1 configuration 1 interface 0 "Lexar USB Flash
> Drive"
> > rev 2.10/11.00 addr 2
> > umass0: using SCSI over Bulk-Only
> > scsibus0 at umass0: 2 targets, initiator 0
> > sd0 at scsibus0 targ 1 lun 0: <Lexar, USB Flash Drive, 1100> removable
> > serial.21c40cd1719080003000
> > sd0: 30526MB, 512 bytes/sector, 62517248 sectors
> > vscsi0 at root
> > scsibus1 at vscsi0: 256 targets
> > softraid0 at root
> > scsibus2 at softraid0: 256 targets
> > boot device: sd0
> > root on sd0a (2124441bc835a462.a) swap on sd0b dump on sd0b
> > WARNING: No TOD clock, believing file system.
> > WARNING: CHECK AND RESET THE DATE!
>
Re: UPDATE security/libgsasl
Am Sonntag, März 21, 2021 22:59 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Hi,
>
> this updates security/libgsasl to 1.10.0. and drop MAINTAINER.
>
> While there, switch from libgcrypt to libressl, because of that, full bump.
> I tried to run net/dico but it complained about a missing libgcrypt.
>
> Tests all pass.
>
> OK?
anyone?
Sebastian
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/libgsasl/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile 11 Feb 2020 15:27:54 -0000 1.16
+++ Makefile 31 Mar 2021 17:22:03 -0000
@@ -2,27 +2,25 @@
COMMENT= GNU implementation of the SASL framework
-DISTNAME= libgsasl-1.8.1
+DISTNAME= libgsasl-1.10.0
CATEGORIES= security
HOMEPAGE= https://www.gnu.org/software/gsasl/
MASTER_SITES= ${MASTER_SITE_GNU:=gsasl/}
-MAINTAINER= Sebastian Reitenbach <sebastia@openbsd.org>
-SHARED_LIBS += gsasl 0.0 # 14.6
+SHARED_LIBS += gsasl 1.0 # 14.6
# LGPLv2.1
PERMIT_PACKAGE= Yes
-WANTLIB+= gcrypt gpg-error iconv idn intl
+WANTLIB+= crypto iconv idn intl
LIB_DEPENDS= devel/gettext,-runtime \
- devel/libidn \
- security/libgcrypt
-
-# non-shared does not inherit LIB_DEPENDS
-LIB_DEPENDS += security/libgpg-error
+ devel/libidn
SEPARATE_BUILD= Yes
CONFIGURE_STYLE=gnu
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
+
+CONFIGURE_ARGS = --without-libgcrypt \
+ --with-openssl
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/libgsasl/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 11 Feb 2020 15:27:54 -0000 1.3
+++ distinfo 31 Mar 2021 17:22:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (libgsasl-1.8.1.tar.gz) = GeL5BSXFMQEJGMULsf6+8NcRXWIBUMxmFTuc5z/4FOY=
-SIZE (libgsasl-1.8.1.tar.gz) = 1791261
+SHA256 (libgsasl-1.10.0.tar.gz) = 8bVTOE3tvYdHhEl3VUajWNb1FAwVzMyPtXQTb9x3Mp8=
+SIZE (libgsasl-1.10.0.tar.gz) = 1854755
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 11 Feb 2020 15:27:55 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2020/02/11 15:27:55 sebastia Exp $
-
-Index: configure
---- configure.orig
-+++ configure
-@@ -31493,7 +31493,7 @@ _ACEOF
-
-
- case "$host_os" in
-- *openbsd* | *mirbsd*)
-+ *mirbsd*)
- NAME_OF_RANDOM_DEVICE="/dev/srandom"
- NAME_OF_PSEUDO_RANDOM_DEVICE="/dev/prandom"
- NAME_OF_NONCE_DEVICE="/dev/urandom"
> Hi,
>
> this updates security/libgsasl to 1.10.0. and drop MAINTAINER.
>
> While there, switch from libgcrypt to libressl, because of that, full bump.
> I tried to run net/dico but it complained about a missing libgcrypt.
>
> Tests all pass.
>
> OK?
anyone?
Sebastian
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/libgsasl/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile 11 Feb 2020 15:27:54 -0000 1.16
+++ Makefile 31 Mar 2021 17:22:03 -0000
@@ -2,27 +2,25 @@
COMMENT= GNU implementation of the SASL framework
-DISTNAME= libgsasl-1.8.1
+DISTNAME= libgsasl-1.10.0
CATEGORIES= security
HOMEPAGE= https://www.gnu.org/software/gsasl/
MASTER_SITES= ${MASTER_SITE_GNU:=gsasl/}
-MAINTAINER= Sebastian Reitenbach <sebastia@openbsd.org>
-SHARED_LIBS += gsasl 0.0 # 14.6
+SHARED_LIBS += gsasl 1.0 # 14.6
# LGPLv2.1
PERMIT_PACKAGE= Yes
-WANTLIB+= gcrypt gpg-error iconv idn intl
+WANTLIB+= crypto iconv idn intl
LIB_DEPENDS= devel/gettext,-runtime \
- devel/libidn \
- security/libgcrypt
-
-# non-shared does not inherit LIB_DEPENDS
-LIB_DEPENDS += security/libgpg-error
+ devel/libidn
SEPARATE_BUILD= Yes
CONFIGURE_STYLE=gnu
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
+
+CONFIGURE_ARGS = --without-libgcrypt \
+ --with-openssl
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/libgsasl/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 11 Feb 2020 15:27:54 -0000 1.3
+++ distinfo 31 Mar 2021 17:22:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (libgsasl-1.8.1.tar.gz) = GeL5BSXFMQEJGMULsf6+8NcRXWIBUMxmFTuc5z/4FOY=
-SIZE (libgsasl-1.8.1.tar.gz) = 1791261
+SHA256 (libgsasl-1.10.0.tar.gz) = 8bVTOE3tvYdHhEl3VUajWNb1FAwVzMyPtXQTb9x3Mp8=
+SIZE (libgsasl-1.10.0.tar.gz) = 1854755
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 11 Feb 2020 15:27:55 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2020/02/11 15:27:55 sebastia Exp $
-
-Index: configure
---- configure.orig
-+++ configure
-@@ -31493,7 +31493,7 @@ _ACEOF
-
-
- case "$host_os" in
-- *openbsd* | *mirbsd*)
-+ *mirbsd*)
- NAME_OF_RANDOM_DEVICE="/dev/srandom"
- NAME_OF_PSEUDO_RANDOM_DEVICE="/dev/prandom"
- NAME_OF_NONCE_DEVICE="/dev/urandom"
Re:=?utf-8?q?_NEW=3A?= security/evil-winrm
Hi,
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 23, 2021 11:28 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Am Donnerstag, März 18, 2021 22:52 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
>
> > Hi,
> >
> > Am Dienstag, März 16, 2021 22:33 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> >
> > > Hi,
> > >
> > > cat DESCR:
> > > WinRM (Windows Remote Management) is the Microsoft implementation of
> > > WS-Management Protocol. A standard SOAP based protocol that allows
> > > hardware and operating systems from different vendors to interoperate.
> > > Microsoft included it in their Operating Systems in order to make life
> > > easier to system administrators.
> > >
> > > This program can be used on any Microsoft Windows Servers with this> > feature enabled (usually at port 5985), of course only if you have
> > > credentials and permissions to use it. So we can say that it could be> used in a post-exploitation hacking/pentesting phase. The purpose of
> > > this program is to provide nice and easy-to-use features for hacking. It
> > > can be used with legitimate purposes by system administrators as well> but the most of its features are focused on hacking/pentesting stuff.>
> > > this needs all the other gems just sent as dependency.
> >
> > as jeremy@ pointed out, stringio is in Ruby itself, and indeed not needed.
> > Updated package without stringio dependency attached.
> >
> this time really attached.
>
> > >
> > > OK to import?
> > this question still holds.
> >
> > cheers,
> > Sebastian
> >
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 23, 2021 11:28 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Am Donnerstag, März 18, 2021 22:52 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
>
> > Hi,
> >
> > Am Dienstag, März 16, 2021 22:33 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> >
> > > Hi,
> > >
> > > cat DESCR:
> > > WinRM (Windows Remote Management) is the Microsoft implementation of
> > > WS-Management Protocol. A standard SOAP based protocol that allows
> > > hardware and operating systems from different vendors to interoperate.
> > > Microsoft included it in their Operating Systems in order to make life
> > > easier to system administrators.
> > >
> > > This program can be used on any Microsoft Windows Servers with this> > feature enabled (usually at port 5985), of course only if you have
> > > credentials and permissions to use it. So we can say that it could be> used in a post-exploitation hacking/pentesting phase. The purpose of
> > > this program is to provide nice and easy-to-use features for hacking. It
> > > can be used with legitimate purposes by system administrators as well> but the most of its features are focused on hacking/pentesting stuff.>
> > > this needs all the other gems just sent as dependency.
> >
> > as jeremy@ pointed out, stringio is in Ruby itself, and indeed not needed.
> > Updated package without stringio dependency attached.
> >
> this time really attached.
>
> > >
> > > OK to import?
> > this question still holds.
> >
> > cheers,
> > Sebastian
> >
Re:=?utf-8?q?_NEW=3A?= devel/ruby-winrm-fs
Hi,
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 22:31 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Hi,
>
> cat DESCR:
> File system operations over Windows Remote Management (WinRM) for Ruby.
> This needs a number of other other gems just sent as dependency, as well
> as it would be a dependency of evil-winrm.
>
> OK to import?
>
> cheers,
> Sebastian
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 22:31 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Hi,
>
> cat DESCR:
> File system operations over Windows Remote Management (WinRM) for Ruby.
> This needs a number of other other gems just sent as dependency, as well
> as it would be a dependency of evil-winrm.
>
> OK to import?
>
> cheers,
> Sebastian
Re:=?utf-8?q?_NEW=3A?= devel/ruby-winrm
Hi,
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 22:29 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Hi,
>
> cat DESCR:
> This is a SOAP library that uses the functionality in Windows Remote
> Management(WinRM) to call native object in Windows. This includes, but
> is not limited to, running batch scripts, powershell scripts and
> fetching WMI variables. For more information on WinRM, please visit
> Microsoft's WinRM site.
>
> As of version 2.0, this gem retains the WinRM name but all powershell
> calls use the more modern Powershell Remoting Protocol (PSRP) for
> initializing runspace pools as well as creating and processing
> powershell pipelines.
>
>
> this gem needs all of the other gems just sent as dependency, and
> itself would be a dependency of evil-winrm.
>
>
> OK to import?
>
> cheers,
> Sebastian
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 22:29 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Hi,
>
> cat DESCR:
> This is a SOAP library that uses the functionality in Windows Remote
> Management(WinRM) to call native object in Windows. This includes, but
> is not limited to, running batch scripts, powershell scripts and
> fetching WMI variables. For more information on WinRM, please visit
> Microsoft's WinRM site.
>
> As of version 2.0, this gem retains the WinRM name but all powershell
> calls use the more modern Powershell Remoting Protocol (PSRP) for
> initializing runspace pools as well as creating and processing
> powershell pipelines.
>
>
> this gem needs all of the other gems just sent as dependency, and
> itself would be a dependency of evil-winrm.
>
>
> OK to import?
>
> cheers,
> Sebastian
Re:=?utf-8?q?_NEW=3A?= devel/ruby-gssapi
Hi,
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 21:51 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Hi,
>
> cat DESCR:
> A FFI wrapper around the system GSSAPI library. Please make sure and
> read the Yard docs or standard GSSAPI documentation if you have any
> questions. There is also a class called GSSAPI::Simple that wraps many
> of the common features used for GSSAPI.
>
> this gem would be a dependency of evil-winrm.
>
> OK to import?
>
> cheers,
> Sebastian
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 21:51 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Hi,
>
> cat DESCR:
> A FFI wrapper around the system GSSAPI library. Please make sure and
> read the Yard docs or standard GSSAPI documentation if you have any
> questions. There is also a class called GSSAPI::Simple that wraps many
> of the common features used for GSSAPI.
>
> this gem would be a dependency of evil-winrm.
>
> OK to import?
>
> cheers,
> Sebastian
Re:=?utf-8?q?_NEW=3A?= archivers/ruby-rubyzip
Hi,
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 21:49 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Hi,
>
> cat DESCR:
> Rubyzip is a ruby library for reading and writing zip files.
>
> this little gem is a dependency for evil-winrm.
>
> OK to import?
>
> cheers,
> Sebastian
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 21:49 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Hi,
>
> cat DESCR:
> Rubyzip is a ruby library for reading and writing zip files.
>
> this little gem is a dependency for evil-winrm.
>
> OK to import?
>
> cheers,
> Sebastian
Re:=?utf-8?q?_NEW=3A?= textproc/ruby-erubi
Hi,
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 21:47 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Hi,
>
> cat DESCR:
> Erubi is a ERB template engine for ruby. It is a simplified fork of
> Erubis, using the same basic algorithm, with a few differences.
>
> this simple gem is a dependency of evil-winrm.
>
> OK to import?
>
> cheers,
> Sebastian
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 21:47 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Hi,
>
> cat DESCR:
> Erubi is a ERB template engine for ruby. It is a simplified fork of
> Erubis, using the same basic algorithm, with a few differences.
>
> this simple gem is a dependency of evil-winrm.
>
> OK to import?
>
> cheers,
> Sebastian
Re:=?utf-8?q?_NEW=3A?= devel/ruby-logging
Hi,
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 21:46 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Hi,
>
> cat DESCR:
> **Logging** is a flexible logging library for use in Ruby programs based
> on the design of Java's log4j library. It features a hierarchical
> logging system, custom level names, multiple output destinations per log
> event, custom formatting, and more.
>
> This port requires the just sent devel/ruby-little-plugger as well as the
> recently updated converters/ruby-multi_json
>
> That would be required as dependency of evil-winrm.
>
> OK to import?
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 21:46 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Hi,
>
> cat DESCR:
> **Logging** is a flexible logging library for use in Ruby programs based
> on the design of Java's log4j library. It features a hierarchical
> logging system, custom level names, multiple output destinations per log
> event, custom formatting, and more.
>
> This port requires the just sent devel/ruby-little-plugger as well as the
> recently updated converters/ruby-multi_json
>
> That would be required as dependency of evil-winrm.
>
> OK to import?
Re:=?utf-8?q?_NEW=3A?= devel/ruby-little-plugger
Hi,
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 21:43 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Hi,
>
> cat DESCR:
> LittlePlugger is a module that provides Gem based plugin management. Byextending your own class or module with LittlePlugger you can easily
> manage the loading and initializing of plugins provided by other gems.
>
> I'd need it as dependency for evil-winrm.
>
> OK to import?
>
> cheers,
> Sebastian
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 21:43 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Hi,
>
> cat DESCR:
> LittlePlugger is a module that provides Gem based plugin management. Byextending your own class or module with LittlePlugger you can easily
> manage the loading and initializing of plugins provided by other gems.
>
> I'd need it as dependency for evil-winrm.
>
> OK to import?
>
> cheers,
> Sebastian
Re:=?utf-8?q?_READD=3A?= textproc/ruby-gyoku
Hi,
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 21:34 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> This simple port was packaged before. I'd need it as dependency for evil-winrm.
> Take MAINTAINER.
>
> OK to re-add?
>
> cheers,
> Sebastian
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 21:34 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> This simple port was packaged before. I'd need it as dependency for evil-winrm.
> Take MAINTAINER.
>
> OK to re-add?
>
> cheers,
> Sebastian
Re:=?utf-8?q?_READD=3A?= textproc/ruby-nori
Hi,
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 21:31 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Hi,
>
> this is a simple port of ruby-nori, that was there before. I'd need it as a dependency for evil-winrm. nori itself doesn't have other dependencies.
> Take MAINTAINER.
>
> OK to re-add?
>
> cheers,
> Sebastian
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 21:31 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Hi,
>
> this is a simple port of ruby-nori, that was there before. I'd need it as a dependency for evil-winrm. nori itself doesn't have other dependencies.
> Take MAINTAINER.
>
> OK to re-add?
>
> cheers,
> Sebastian
Re:=?utf-8?q?_READD=3A?= www/ruby-httpclient
Hi,
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 21:28 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Hi,
>
> this is a simple port of ruby-httpclient. No dependencies. was ported before, I'd need it again, as it is required dependency for evil-winrm.
> take MAINTAINER.
>
> OK to re-add?
>
> cheers,
> Sebastian
resending, reattached for ease of review.
Sebastian
Am Dienstag, März 16, 2021 21:28 CET, schrieb "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>:
> Hi,
>
> this is a simple port of ruby-httpclient. No dependencies. was ported before, I'd need it again, as it is required dependency for evil-winrm.
> take MAINTAINER.
>
> OK to re-add?
>
> cheers,
> Sebastian
Re: Issue with Ubiquiti ERL upgrade from 6.7 to 6.8 via sysupgrade (octeon)
your PROM is likely setup to boot a "bsd" kernel in the msdos partition,
rather than the "boot" file. The "boot" file will load /bsd from the ffs
partition.
Amarendra Godbole <amarendra.godbole@gmail.com> wrote:
> So I used sysupgrade to upgrade the ERL from 6.7 to 6.8. It went through
> everything fine, downloaded the sets, extracts, etc. and reboots. However,
> it boots back into the old 6.7 kernel. I can see /bsd.upgrade created, and
> /home/_sysupgrade is empty. but did not see any option to trigger the
> upgrade. I thought it should have been automatically handled by sysupgrade.
>
> What did I miss?
>
> Thanks.
>
> -Amarendra
>
>
> erl# uname -a
> OpenBSD erl.lan 6.7 GENERIC.MP#134 octeon
>
> erl# ls -l
> total 79128
> -rw-r--r-- 1 root wheel 578 May 7 2020 .cshrc
> -rw-r--r-- 1 root wheel 468 May 7 2020 .profile
> drwxr-xr-x 2 root wheel 512 May 7 2020 altroot
> -rw-r--r-- 1 root wheel 160 Mar 31 00:08 auto_upgrade.conf
> drwxr-xr-x 2 root wheel 1024 May 7 2020 bin
> -rwx------ 1 root wheel 7626800 Mar 31 00:10 bsd
> -rwx------ 1 root wheel 7623592 Mar 31 00:01 bsd.booted
> -rw------- 1 root wheel 8843608 May 7 2020 bsd.rd
> -rw------- 1 root wheel 7568260 May 7 2020 bsd.sp
> -rwx------ 1 root wheel 8823044 Mar 31 00:09 bsd.upgrade
> drwxr-xr-x 4 root wheel 18432 Mar 31 00:10 dev
> drwxr-xr-x 23 root wheel 2048 Mar 31 00:11 etc
> drwxr-xr-x 4 root wheel 512 Oct 15 21:09 home
> drwxr-xr-x 2 root wheel 512 May 7 2020 mnt
> drwx------ 3 root wheel 512 Mar 31 01:30 root
> drwxr-xr-x 2 root wheel 1536 May 7 2020 sbin
> lrwxrwx--- 1 root wheel 11 May 7 2020 sys -> usr/src/sys
> drwxrwxrwt 6 root wheel 512 Mar 31 07:45 tmp
> drwxr-xr-x 16 root wheel 512 Sep 7 2020 usr
> drwxr-xr-x 23 root wheel 512 May 7 2020 var
> erl#
>
> erl# dmesg
> Copyright (c) 1982, 1986, 1989, 1991, 1993
> The Regents of the University of California. All rights reserved.
> Copyright (c) 1995-2020 OpenBSD. All rights reserved.
> https://www.OpenBSD.org
>
> OpenBSD 6.7 (GENERIC.MP) #134: Thu May 7 16:05:06 MDT 2020
> deraadt@octeon.openbsd.org:/usr/src/sys/arch/octeon/compile/GENERIC.MP
> real mem = 536870912 (512MB)
> avail mem = 506740736 (483MB)
> mainbus0 at root: board 20002 rev 2.18
> cpu0 at mainbus0: CN50xx CPU rev 0.1 500 MHz, Software FP emulation
> cpu0: cache L1-I 32KB 4 way D 16KB 64 way, L2 128KB 8 way
> cpu1 at mainbus0: CN50xx CPU rev 0.1 500 MHz, Software FP emulation
> cpu1: cache L1-I 32KB 4 way D 16KB 64 way, L2 128KB 8 way
> clock0 at mainbus0: int 5
> octcrypto0 at mainbus0
> iobus0 at mainbus0
> simplebus0 at iobus0: "soc"
> octciu0 at simplebus0
> octsmi0 at simplebus0
> octpip0 at simplebus0
> octgmx0 at octpip0 interface 0
> cnmac0 at octgmx0: RGMII, address 78:8a:20:46:a8:c0
> atphy0 at cnmac0 phy 7: AR8035 10/100/1000 PHY, rev. 2
> cnmac1 at octgmx0: RGMII, address 78:8a:20:46:a8:c1
> atphy1 at cnmac1 phy 6: AR8035 10/100/1000 PHY, rev. 2
> cnmac2 at octgmx0: RGMII, address 78:8a:20:46:a8:c2
> atphy2 at cnmac2 phy 5: AR8035 10/100/1000 PHY, rev. 2
> com0 at simplebus0: ns16550a, 64 byte fifo
> com0: console
> dwctwo0 at iobus0 base 0x1180068000000 irq 56
> usb0 at dwctwo0: USB revision 2.0
> uhub0 at usb0 configuration 1 interface 0 "Octeon DWC2 root hub" rev
> 2.00/1.00 addr 1
> octrng0 at iobus0 base 0x1400000000000 irq 0
> /dev/ksyms: Symbol table not valid.
> umass0 at uhub0 port 1 configuration 1 interface 0 "Lexar USB Flash Drive"
> rev 2.10/11.00 addr 2
> umass0: using SCSI over Bulk-Only
> scsibus0 at umass0: 2 targets, initiator 0
> sd0 at scsibus0 targ 1 lun 0: <Lexar, USB Flash Drive, 1100> removable
> serial.21c40cd1719080003000
> sd0: 30526MB, 512 bytes/sector, 62517248 sectors
> vscsi0 at root
> scsibus1 at vscsi0: 256 targets
> softraid0 at root
> scsibus2 at softraid0: 256 targets
> boot device: sd0
> root on sd0a (2124441bc835a462.a) swap on sd0b dump on sd0b
> WARNING: No TOD clock, believing file system.
> WARNING: CHECK AND RESET THE DATE!
rather than the "boot" file. The "boot" file will load /bsd from the ffs
partition.
Amarendra Godbole <amarendra.godbole@gmail.com> wrote:
> So I used sysupgrade to upgrade the ERL from 6.7 to 6.8. It went through
> everything fine, downloaded the sets, extracts, etc. and reboots. However,
> it boots back into the old 6.7 kernel. I can see /bsd.upgrade created, and
> /home/_sysupgrade is empty. but did not see any option to trigger the
> upgrade. I thought it should have been automatically handled by sysupgrade.
>
> What did I miss?
>
> Thanks.
>
> -Amarendra
>
>
> erl# uname -a
> OpenBSD erl.lan 6.7 GENERIC.MP#134 octeon
>
> erl# ls -l
> total 79128
> -rw-r--r-- 1 root wheel 578 May 7 2020 .cshrc
> -rw-r--r-- 1 root wheel 468 May 7 2020 .profile
> drwxr-xr-x 2 root wheel 512 May 7 2020 altroot
> -rw-r--r-- 1 root wheel 160 Mar 31 00:08 auto_upgrade.conf
> drwxr-xr-x 2 root wheel 1024 May 7 2020 bin
> -rwx------ 1 root wheel 7626800 Mar 31 00:10 bsd
> -rwx------ 1 root wheel 7623592 Mar 31 00:01 bsd.booted
> -rw------- 1 root wheel 8843608 May 7 2020 bsd.rd
> -rw------- 1 root wheel 7568260 May 7 2020 bsd.sp
> -rwx------ 1 root wheel 8823044 Mar 31 00:09 bsd.upgrade
> drwxr-xr-x 4 root wheel 18432 Mar 31 00:10 dev
> drwxr-xr-x 23 root wheel 2048 Mar 31 00:11 etc
> drwxr-xr-x 4 root wheel 512 Oct 15 21:09 home
> drwxr-xr-x 2 root wheel 512 May 7 2020 mnt
> drwx------ 3 root wheel 512 Mar 31 01:30 root
> drwxr-xr-x 2 root wheel 1536 May 7 2020 sbin
> lrwxrwx--- 1 root wheel 11 May 7 2020 sys -> usr/src/sys
> drwxrwxrwt 6 root wheel 512 Mar 31 07:45 tmp
> drwxr-xr-x 16 root wheel 512 Sep 7 2020 usr
> drwxr-xr-x 23 root wheel 512 May 7 2020 var
> erl#
>
> erl# dmesg
> Copyright (c) 1982, 1986, 1989, 1991, 1993
> The Regents of the University of California. All rights reserved.
> Copyright (c) 1995-2020 OpenBSD. All rights reserved.
> https://www.OpenBSD.org
>
> OpenBSD 6.7 (GENERIC.MP) #134: Thu May 7 16:05:06 MDT 2020
> deraadt@octeon.openbsd.org:/usr/src/sys/arch/octeon/compile/GENERIC.MP
> real mem = 536870912 (512MB)
> avail mem = 506740736 (483MB)
> mainbus0 at root: board 20002 rev 2.18
> cpu0 at mainbus0: CN50xx CPU rev 0.1 500 MHz, Software FP emulation
> cpu0: cache L1-I 32KB 4 way D 16KB 64 way, L2 128KB 8 way
> cpu1 at mainbus0: CN50xx CPU rev 0.1 500 MHz, Software FP emulation
> cpu1: cache L1-I 32KB 4 way D 16KB 64 way, L2 128KB 8 way
> clock0 at mainbus0: int 5
> octcrypto0 at mainbus0
> iobus0 at mainbus0
> simplebus0 at iobus0: "soc"
> octciu0 at simplebus0
> octsmi0 at simplebus0
> octpip0 at simplebus0
> octgmx0 at octpip0 interface 0
> cnmac0 at octgmx0: RGMII, address 78:8a:20:46:a8:c0
> atphy0 at cnmac0 phy 7: AR8035 10/100/1000 PHY, rev. 2
> cnmac1 at octgmx0: RGMII, address 78:8a:20:46:a8:c1
> atphy1 at cnmac1 phy 6: AR8035 10/100/1000 PHY, rev. 2
> cnmac2 at octgmx0: RGMII, address 78:8a:20:46:a8:c2
> atphy2 at cnmac2 phy 5: AR8035 10/100/1000 PHY, rev. 2
> com0 at simplebus0: ns16550a, 64 byte fifo
> com0: console
> dwctwo0 at iobus0 base 0x1180068000000 irq 56
> usb0 at dwctwo0: USB revision 2.0
> uhub0 at usb0 configuration 1 interface 0 "Octeon DWC2 root hub" rev
> 2.00/1.00 addr 1
> octrng0 at iobus0 base 0x1400000000000 irq 0
> /dev/ksyms: Symbol table not valid.
> umass0 at uhub0 port 1 configuration 1 interface 0 "Lexar USB Flash Drive"
> rev 2.10/11.00 addr 2
> umass0: using SCSI over Bulk-Only
> scsibus0 at umass0: 2 targets, initiator 0
> sd0 at scsibus0 targ 1 lun 0: <Lexar, USB Flash Drive, 1100> removable
> serial.21c40cd1719080003000
> sd0: 30526MB, 512 bytes/sector, 62517248 sectors
> vscsi0 at root
> scsibus1 at vscsi0: 256 targets
> softraid0 at root
> scsibus2 at softraid0: 256 targets
> boot device: sd0
> root on sd0a (2124441bc835a462.a) swap on sd0b dump on sd0b
> WARNING: No TOD clock, believing file system.
> WARNING: CHECK AND RESET THE DATE!
Issue with Ubiquiti ERL upgrade from 6.7 to 6.8 via sysupgrade (octeon)
So I used sysupgrade to upgrade the ERL from 6.7 to 6.8. It went through
everything fine, downloaded the sets, extracts, etc. and reboots. However,
it boots back into the old 6.7 kernel. I can see /bsd.upgrade created, and
/home/_sysupgrade is empty. but did not see any option to trigger the
upgrade. I thought it should have been automatically handled by sysupgrade.
What did I miss?
Thanks.
-Amarendra
erl# uname -a
OpenBSD erl.lan 6.7 GENERIC.MP#134 octeon
erl# ls -l
total 79128
-rw-r--r-- 1 root wheel 578 May 7 2020 .cshrc
-rw-r--r-- 1 root wheel 468 May 7 2020 .profile
drwxr-xr-x 2 root wheel 512 May 7 2020 altroot
-rw-r--r-- 1 root wheel 160 Mar 31 00:08 auto_upgrade.conf
drwxr-xr-x 2 root wheel 1024 May 7 2020 bin
-rwx------ 1 root wheel 7626800 Mar 31 00:10 bsd
-rwx------ 1 root wheel 7623592 Mar 31 00:01 bsd.booted
-rw------- 1 root wheel 8843608 May 7 2020 bsd.rd
-rw------- 1 root wheel 7568260 May 7 2020 bsd.sp
-rwx------ 1 root wheel 8823044 Mar 31 00:09 bsd.upgrade
drwxr-xr-x 4 root wheel 18432 Mar 31 00:10 dev
drwxr-xr-x 23 root wheel 2048 Mar 31 00:11 etc
drwxr-xr-x 4 root wheel 512 Oct 15 21:09 home
drwxr-xr-x 2 root wheel 512 May 7 2020 mnt
drwx------ 3 root wheel 512 Mar 31 01:30 root
drwxr-xr-x 2 root wheel 1536 May 7 2020 sbin
lrwxrwx--- 1 root wheel 11 May 7 2020 sys -> usr/src/sys
drwxrwxrwt 6 root wheel 512 Mar 31 07:45 tmp
drwxr-xr-x 16 root wheel 512 Sep 7 2020 usr
drwxr-xr-x 23 root wheel 512 May 7 2020 var
erl#
erl# dmesg
Copyright (c) 1982, 1986, 1989, 1991, 1993
The Regents of the University of California. All rights reserved.
Copyright (c) 1995-2020 OpenBSD. All rights reserved.
https://www.OpenBSD.org
OpenBSD 6.7 (GENERIC.MP) #134: Thu May 7 16:05:06 MDT 2020
deraadt@octeon.openbsd.org:/usr/src/sys/arch/octeon/compile/GENERIC.MP
real mem = 536870912 (512MB)
avail mem = 506740736 (483MB)
mainbus0 at root: board 20002 rev 2.18
cpu0 at mainbus0: CN50xx CPU rev 0.1 500 MHz, Software FP emulation
cpu0: cache L1-I 32KB 4 way D 16KB 64 way, L2 128KB 8 way
cpu1 at mainbus0: CN50xx CPU rev 0.1 500 MHz, Software FP emulation
cpu1: cache L1-I 32KB 4 way D 16KB 64 way, L2 128KB 8 way
clock0 at mainbus0: int 5
octcrypto0 at mainbus0
iobus0 at mainbus0
simplebus0 at iobus0: "soc"
octciu0 at simplebus0
octsmi0 at simplebus0
octpip0 at simplebus0
octgmx0 at octpip0 interface 0
cnmac0 at octgmx0: RGMII, address 78:8a:20:46:a8:c0
atphy0 at cnmac0 phy 7: AR8035 10/100/1000 PHY, rev. 2
cnmac1 at octgmx0: RGMII, address 78:8a:20:46:a8:c1
atphy1 at cnmac1 phy 6: AR8035 10/100/1000 PHY, rev. 2
cnmac2 at octgmx0: RGMII, address 78:8a:20:46:a8:c2
atphy2 at cnmac2 phy 5: AR8035 10/100/1000 PHY, rev. 2
com0 at simplebus0: ns16550a, 64 byte fifo
com0: console
dwctwo0 at iobus0 base 0x1180068000000 irq 56
usb0 at dwctwo0: USB revision 2.0
uhub0 at usb0 configuration 1 interface 0 "Octeon DWC2 root hub" rev
2.00/1.00 addr 1
octrng0 at iobus0 base 0x1400000000000 irq 0
/dev/ksyms: Symbol table not valid.
umass0 at uhub0 port 1 configuration 1 interface 0 "Lexar USB Flash Drive"
rev 2.10/11.00 addr 2
umass0: using SCSI over Bulk-Only
scsibus0 at umass0: 2 targets, initiator 0
sd0 at scsibus0 targ 1 lun 0: <Lexar, USB Flash Drive, 1100> removable
serial.21c40cd1719080003000
sd0: 30526MB, 512 bytes/sector, 62517248 sectors
vscsi0 at root
scsibus1 at vscsi0: 256 targets
softraid0 at root
scsibus2 at softraid0: 256 targets
boot device: sd0
root on sd0a (2124441bc835a462.a) swap on sd0b dump on sd0b
WARNING: No TOD clock, believing file system.
WARNING: CHECK AND RESET THE DATE!
everything fine, downloaded the sets, extracts, etc. and reboots. However,
it boots back into the old 6.7 kernel. I can see /bsd.upgrade created, and
/home/_sysupgrade is empty. but did not see any option to trigger the
upgrade. I thought it should have been automatically handled by sysupgrade.
What did I miss?
Thanks.
-Amarendra
erl# uname -a
OpenBSD erl.lan 6.7 GENERIC.MP#134 octeon
erl# ls -l
total 79128
-rw-r--r-- 1 root wheel 578 May 7 2020 .cshrc
-rw-r--r-- 1 root wheel 468 May 7 2020 .profile
drwxr-xr-x 2 root wheel 512 May 7 2020 altroot
-rw-r--r-- 1 root wheel 160 Mar 31 00:08 auto_upgrade.conf
drwxr-xr-x 2 root wheel 1024 May 7 2020 bin
-rwx------ 1 root wheel 7626800 Mar 31 00:10 bsd
-rwx------ 1 root wheel 7623592 Mar 31 00:01 bsd.booted
-rw------- 1 root wheel 8843608 May 7 2020 bsd.rd
-rw------- 1 root wheel 7568260 May 7 2020 bsd.sp
-rwx------ 1 root wheel 8823044 Mar 31 00:09 bsd.upgrade
drwxr-xr-x 4 root wheel 18432 Mar 31 00:10 dev
drwxr-xr-x 23 root wheel 2048 Mar 31 00:11 etc
drwxr-xr-x 4 root wheel 512 Oct 15 21:09 home
drwxr-xr-x 2 root wheel 512 May 7 2020 mnt
drwx------ 3 root wheel 512 Mar 31 01:30 root
drwxr-xr-x 2 root wheel 1536 May 7 2020 sbin
lrwxrwx--- 1 root wheel 11 May 7 2020 sys -> usr/src/sys
drwxrwxrwt 6 root wheel 512 Mar 31 07:45 tmp
drwxr-xr-x 16 root wheel 512 Sep 7 2020 usr
drwxr-xr-x 23 root wheel 512 May 7 2020 var
erl#
erl# dmesg
Copyright (c) 1982, 1986, 1989, 1991, 1993
The Regents of the University of California. All rights reserved.
Copyright (c) 1995-2020 OpenBSD. All rights reserved.
https://www.OpenBSD.org
OpenBSD 6.7 (GENERIC.MP) #134: Thu May 7 16:05:06 MDT 2020
deraadt@octeon.openbsd.org:/usr/src/sys/arch/octeon/compile/GENERIC.MP
real mem = 536870912 (512MB)
avail mem = 506740736 (483MB)
mainbus0 at root: board 20002 rev 2.18
cpu0 at mainbus0: CN50xx CPU rev 0.1 500 MHz, Software FP emulation
cpu0: cache L1-I 32KB 4 way D 16KB 64 way, L2 128KB 8 way
cpu1 at mainbus0: CN50xx CPU rev 0.1 500 MHz, Software FP emulation
cpu1: cache L1-I 32KB 4 way D 16KB 64 way, L2 128KB 8 way
clock0 at mainbus0: int 5
octcrypto0 at mainbus0
iobus0 at mainbus0
simplebus0 at iobus0: "soc"
octciu0 at simplebus0
octsmi0 at simplebus0
octpip0 at simplebus0
octgmx0 at octpip0 interface 0
cnmac0 at octgmx0: RGMII, address 78:8a:20:46:a8:c0
atphy0 at cnmac0 phy 7: AR8035 10/100/1000 PHY, rev. 2
cnmac1 at octgmx0: RGMII, address 78:8a:20:46:a8:c1
atphy1 at cnmac1 phy 6: AR8035 10/100/1000 PHY, rev. 2
cnmac2 at octgmx0: RGMII, address 78:8a:20:46:a8:c2
atphy2 at cnmac2 phy 5: AR8035 10/100/1000 PHY, rev. 2
com0 at simplebus0: ns16550a, 64 byte fifo
com0: console
dwctwo0 at iobus0 base 0x1180068000000 irq 56
usb0 at dwctwo0: USB revision 2.0
uhub0 at usb0 configuration 1 interface 0 "Octeon DWC2 root hub" rev
2.00/1.00 addr 1
octrng0 at iobus0 base 0x1400000000000 irq 0
/dev/ksyms: Symbol table not valid.
umass0 at uhub0 port 1 configuration 1 interface 0 "Lexar USB Flash Drive"
rev 2.10/11.00 addr 2
umass0: using SCSI over Bulk-Only
scsibus0 at umass0: 2 targets, initiator 0
sd0 at scsibus0 targ 1 lun 0: <Lexar, USB Flash Drive, 1100> removable
serial.21c40cd1719080003000
sd0: 30526MB, 512 bytes/sector, 62517248 sectors
vscsi0 at root
scsibus1 at vscsi0: 256 targets
softraid0 at root
scsibus2 at softraid0: 256 targets
boot device: sd0
root on sd0a (2124441bc835a462.a) swap on sd0b dump on sd0b
WARNING: No TOD clock, believing file system.
WARNING: CHECK AND RESET THE DATE!
UPDATE: Suricata-6.0.2
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/suricata/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile 23 Feb 2021 19:39:39 -0000 1.41
+++ Makefile 31 Mar 2021 09:13:17 -0000
@@ -2,9 +2,8 @@
COMMENT = high performance network IDS, IPS and security monitoring
-SURICATA_V = 6.0.1
-SUPDATE_V = 1.2.0
-REVISION = 0
+SURICATA_V = 6.0.2
+SUPDATE_V = 1.2.1
DISTNAME = suricata-${SURICATA_V}
CATEGORIES = security
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/suricata/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo 2 Feb 2021 20:11:01 -0000 1.14
+++ distinfo 31 Mar 2021 09:13:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (suricata-6.0.1.tar.gz) = 56F5j+WcHSE/dS/u+/i7VBaPn6ViNc8zgDR8aW7Nsa4=
-SIZE (suricata-6.0.1.tar.gz) = 30460439
+SHA256 (suricata-6.0.2.tar.gz) = XkZHoHyzG11tAEmXKkU3XBN96QipZKROLW0jH6OtS1I=
+SIZE (suricata-6.0.2.tar.gz) = 30514801
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/security/suricata/patches/patch-configure_ac,v
retrieving revision 1.5
diff -u -p -r1.5 patch-configure_ac
--- patches/patch-configure_ac 31 Jan 2021 18:03:49 -0000 1.5
+++ patches/patch-configure_ac 31 Mar 2021 09:13:17 -0000
@@ -5,7 +5,7 @@ To remove the pid file, its directory mu
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -2743,7 +2743,7 @@ if test "$WINDOWS_PATH" = "yes"; then
+@@ -2745,7 +2745,7 @@ if test "$WINDOWS_PATH" = "yes"; then
fi
else
EXPAND_VARIABLE(localstatedir, e_logdir, "/log/suricata/")
Index: patches/patch-src_suricata_c
===================================================================
RCS file: /cvs/ports/security/suricata/patches/patch-src_suricata_c,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_suricata_c
--- patches/patch-src_suricata_c 31 Jan 2021 18:03:49 -0000 1.7
+++ patches/patch-src_suricata_c 31 Mar 2021 09:13:17 -0000
@@ -6,7 +6,7 @@ Suricata uses libcap-ng on Linux and run
Index: src/suricata.c
--- src/suricata.c.orig
+++ src/suricata.c
-@@ -2818,6 +2818,7 @@ int SuricataMain(int argc, char **argv)
+@@ -2825,6 +2825,7 @@ int SuricataMain(int argc, char **argv)
PostRunStartedDetectSetup(&suricata);
Index: patches/patch-suricata_yaml_in
===================================================================
RCS file: /cvs/ports/security/suricata/patches/patch-suricata_yaml_in,v
retrieving revision 1.10
diff -u -p -r1.10 patch-suricata_yaml_in
--- patches/patch-suricata_yaml_in 31 Jan 2021 18:03:49 -0000 1.10
+++ patches/patch-suricata_yaml_in 31 Mar 2021 09:13:17 -0000
@@ -98,7 +98,7 @@ Index: suricata.yaml.in
facility: local5
format: "[%i] <%d> -- "
# type: json
-@@ -988,9 +997,9 @@ asn1-max-frames: 256
+@@ -990,9 +999,9 @@ asn1-max-frames: 256
##
# Run Suricata with a specific user-id and group-id:
@@ -111,7 +111,7 @@ Index: suricata.yaml.in
# Some logging modules will use that name in event as identifier. The default
# value is the hostname
-@@ -999,7 +1008,7 @@ asn1-max-frames: 256
+@@ -1001,7 +1010,7 @@ asn1-max-frames: 256
# Default location of the pid file. The pid file is only used in
# daemon mode (start Suricata with -D). If not running in daemon mode
# the --pidfile command line option must be used to create a pid file.
@@ -120,7 +120,7 @@ Index: suricata.yaml.in
# Daemon working directory
# Suricata will change directory to this one if provided
-@@ -1852,14 +1861,38 @@ napatech:
+@@ -1857,14 +1866,38 @@ napatech:
#
hashmode: hash5tuplesorted
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/suricata/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST
--- pkg/PLIST 3 Feb 2021 00:33:47 -0000 1.16
+++ pkg/PLIST 31 Mar 2021 09:13:17 -0000
@@ -154,6 +154,9 @@ lib/python${MODPY_VERSION}/site-packages
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/suricatasc/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/suricatasc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
@man man/man1/suricata.1
+@man man/man1/suricatactl-filestore.1
+@man man/man1/suricatactl.1
+@man man/man1/suricatasc.1
share/doc/pkg-readmes/${PKGSTEM}
share/examples/suricata/
@sample ${SYSCONFDIR}/suricata/
Hello,
Update for Suricata to 6.0.2:
https://github.com/OISF/suricata/releases/tag/suricata-6.0.2
OK? Comments?
Cheers.-
--
%gonzalo
===================================================================
RCS file: /cvs/ports/security/suricata/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile 23 Feb 2021 19:39:39 -0000 1.41
+++ Makefile 31 Mar 2021 09:13:17 -0000
@@ -2,9 +2,8 @@
COMMENT = high performance network IDS, IPS and security monitoring
-SURICATA_V = 6.0.1
-SUPDATE_V = 1.2.0
-REVISION = 0
+SURICATA_V = 6.0.2
+SUPDATE_V = 1.2.1
DISTNAME = suricata-${SURICATA_V}
CATEGORIES = security
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/suricata/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo 2 Feb 2021 20:11:01 -0000 1.14
+++ distinfo 31 Mar 2021 09:13:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (suricata-6.0.1.tar.gz) = 56F5j+WcHSE/dS/u+/i7VBaPn6ViNc8zgDR8aW7Nsa4=
-SIZE (suricata-6.0.1.tar.gz) = 30460439
+SHA256 (suricata-6.0.2.tar.gz) = XkZHoHyzG11tAEmXKkU3XBN96QipZKROLW0jH6OtS1I=
+SIZE (suricata-6.0.2.tar.gz) = 30514801
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/security/suricata/patches/patch-configure_ac,v
retrieving revision 1.5
diff -u -p -r1.5 patch-configure_ac
--- patches/patch-configure_ac 31 Jan 2021 18:03:49 -0000 1.5
+++ patches/patch-configure_ac 31 Mar 2021 09:13:17 -0000
@@ -5,7 +5,7 @@ To remove the pid file, its directory mu
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -2743,7 +2743,7 @@ if test "$WINDOWS_PATH" = "yes"; then
+@@ -2745,7 +2745,7 @@ if test "$WINDOWS_PATH" = "yes"; then
fi
else
EXPAND_VARIABLE(localstatedir, e_logdir, "/log/suricata/")
Index: patches/patch-src_suricata_c
===================================================================
RCS file: /cvs/ports/security/suricata/patches/patch-src_suricata_c,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_suricata_c
--- patches/patch-src_suricata_c 31 Jan 2021 18:03:49 -0000 1.7
+++ patches/patch-src_suricata_c 31 Mar 2021 09:13:17 -0000
@@ -6,7 +6,7 @@ Suricata uses libcap-ng on Linux and run
Index: src/suricata.c
--- src/suricata.c.orig
+++ src/suricata.c
-@@ -2818,6 +2818,7 @@ int SuricataMain(int argc, char **argv)
+@@ -2825,6 +2825,7 @@ int SuricataMain(int argc, char **argv)
PostRunStartedDetectSetup(&suricata);
Index: patches/patch-suricata_yaml_in
===================================================================
RCS file: /cvs/ports/security/suricata/patches/patch-suricata_yaml_in,v
retrieving revision 1.10
diff -u -p -r1.10 patch-suricata_yaml_in
--- patches/patch-suricata_yaml_in 31 Jan 2021 18:03:49 -0000 1.10
+++ patches/patch-suricata_yaml_in 31 Mar 2021 09:13:17 -0000
@@ -98,7 +98,7 @@ Index: suricata.yaml.in
facility: local5
format: "[%i] <%d> -- "
# type: json
-@@ -988,9 +997,9 @@ asn1-max-frames: 256
+@@ -990,9 +999,9 @@ asn1-max-frames: 256
##
# Run Suricata with a specific user-id and group-id:
@@ -111,7 +111,7 @@ Index: suricata.yaml.in
# Some logging modules will use that name in event as identifier. The default
# value is the hostname
-@@ -999,7 +1008,7 @@ asn1-max-frames: 256
+@@ -1001,7 +1010,7 @@ asn1-max-frames: 256
# Default location of the pid file. The pid file is only used in
# daemon mode (start Suricata with -D). If not running in daemon mode
# the --pidfile command line option must be used to create a pid file.
@@ -120,7 +120,7 @@ Index: suricata.yaml.in
# Daemon working directory
# Suricata will change directory to this one if provided
-@@ -1852,14 +1861,38 @@ napatech:
+@@ -1857,14 +1866,38 @@ napatech:
#
hashmode: hash5tuplesorted
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/suricata/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST
--- pkg/PLIST 3 Feb 2021 00:33:47 -0000 1.16
+++ pkg/PLIST 31 Mar 2021 09:13:17 -0000
@@ -154,6 +154,9 @@ lib/python${MODPY_VERSION}/site-packages
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/suricatasc/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/suricatasc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
@man man/man1/suricata.1
+@man man/man1/suricatactl-filestore.1
+@man man/man1/suricatactl.1
+@man man/man1/suricatasc.1
share/doc/pkg-readmes/${PKGSTEM}
share/examples/suricata/
@sample ${SYSCONFDIR}/suricata/
Hello,
Update for Suricata to 6.0.2:
https://github.com/OISF/suricata/releases/tag/suricata-6.0.2
OK? Comments?
Cheers.-
--
%gonzalo
Re: NEW: devel/skalibs and sysutils/execline
Ping
On Thu, Mar 11, 2021 at 03:05:14PM +0100, Alex Raschi wrote:
> Ping
>
> Ports and patch reattached for convenience.
>
> On Mon, Feb 22, 2021 at 09:16:52PM +0100, Alex Raschi wrote:
> > On Mon, Feb 22, 2021 at 01:35:38PM +0000, Stuart Henderson wrote:
> > > On 2021/02/22 14:05, Alex Raschi wrote:
> > > > I attached the new versions of skalibs (2.10.0.2) and execline
> > > > (2.8.0.0), these fixes a few bugs and change backtick(1) options
> > > > slightly.
> > > >
> > > > I also attached a new port of the newly created mdoc(7) ports of the
> > > > execline HTML documentation. With this one i get:
> > > >
> > > > Warning: execline-man-pages-2.8.0.0.1 conflicts with etsh-5.4.0v0 (shells/etsh):/usr/local/man/man1/if.1
> > > >
> > > > However shells/etsh does not seem to provide a real if(1) command, i
> > > > checked the PLIST of etsh and the if command seems to be an internal
> > > > shell command (execline provides an if command but does not conflict
> > > > with etsh). Any suggestion to fix this?
> > >
> > > either register the conflict with @conflict markers (in both ports),
> > > or install docs to a different dir. conflict markers seems ok to me.
> > >
> > > it might be better to just include the manuals in the main package.
> > > you can use multiple DISTFILES.
> > >
> > > > As said in the previous emails i get these with execline too:
> > > >
> > > > in default FLAVOR: the following libraries in WANTLIB look like masked by RUN_DEPENDS: skarnet
> > > > in FLAVOR "static": the following libraries in WANTLIB look like masked by RUN_DEPENDS: skarnet
> > > >
> > > > I have also checked that these ports work with -fno-common.
> > > >
> > > > Any comments and/or OKs?
> > >
> > > SHARED_LIBS = execline 2.8
> > > SHARED_LIBS = skarnet 2.10
> > >
> > > start with 0.0. if the build system doesn't produce a library with the
> > > right name to match this, patch or pass in via make(1) variables until
> > > it does.
> > >
> > > https://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs
> > >
> > > @so lib/libexecline.so
> > > @lib lib/libexecline.so.${LIBexecline_VERSION}
> > > @bin lib/libexecline.so.2.8.0.0
> > >
> > > @so lib/libskarnet.so
> > > @lib lib/libskarnet.so.${LIBskarnet_VERSION}
> > > @bin lib/libskarnet.so.2.10.0.2
> > >
> > > there should just be "@lib lib/libxyz.so.${LIBxyz}" lines, no
> > > symlinks etc.
> > >
> > > these are probably what's responsible for portcheck's "masked by" warning.
> > >
> > > pkg/DESCR says "has no security issues"
> > >
> > > a bold claim! I don't think it's a good idea to include that bit.
> > >
> > > I would drop the static flavours unless there's a really good reason
> > > for it (usually "it's helpful to run in a chroot for a webserver").
> > >
> >
> > The reason for the static flavor is basically the same as for example
> > shells/dash: it can be really useful in a chroot since it acts
> > functionally the same as a shell. Anyway i will remove it in case.
> >
> > I modified the ports to match your suggestions, below there is the diff
> > to add @conflict to etsh. Thanks!
> >
> > Index: shells/etsh/pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/shells/etsh/pkg/PLIST,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 PLIST
> > --- shells/etsh/pkg/PLIST 30 Mar 2019 18:14:32 -0000 1.2
> > +++ shells/etsh/pkg/PLIST 22 Feb 2021 19:55:45 -0000
> > @@ -1,5 +1,6 @@
> > @comment $OpenBSD: PLIST,v 1.2 2019/03/30 18:14:32 bcallah Exp $
> > @conflict osh-*
> > +@conflict execline-*
> > @pkgpath shells/osh
> > @shell bin/etsh
> > @shell bin/tsh
>
>
>
> Index: shells/etsh/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/shells/etsh/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- shells/etsh/pkg/PLIST 30 Mar 2019 18:14:32 -0000 1.2
> +++ shells/etsh/pkg/PLIST 22 Feb 2021 19:55:45 -0000
> @@ -1,5 +1,6 @@
> @comment $OpenBSD: PLIST,v 1.2 2019/03/30 18:14:32 bcallah Exp $
> @conflict osh-*
> +@conflict execline-*
> @pkgpath shells/osh
> @shell bin/etsh
> @shell bin/tsh
On Thu, Mar 11, 2021 at 03:05:14PM +0100, Alex Raschi wrote:
> Ping
>
> Ports and patch reattached for convenience.
>
> On Mon, Feb 22, 2021 at 09:16:52PM +0100, Alex Raschi wrote:
> > On Mon, Feb 22, 2021 at 01:35:38PM +0000, Stuart Henderson wrote:
> > > On 2021/02/22 14:05, Alex Raschi wrote:
> > > > I attached the new versions of skalibs (2.10.0.2) and execline
> > > > (2.8.0.0), these fixes a few bugs and change backtick(1) options
> > > > slightly.
> > > >
> > > > I also attached a new port of the newly created mdoc(7) ports of the
> > > > execline HTML documentation. With this one i get:
> > > >
> > > > Warning: execline-man-pages-2.8.0.0.1 conflicts with etsh-5.4.0v0 (shells/etsh):/usr/local/man/man1/if.1
> > > >
> > > > However shells/etsh does not seem to provide a real if(1) command, i
> > > > checked the PLIST of etsh and the if command seems to be an internal
> > > > shell command (execline provides an if command but does not conflict
> > > > with etsh). Any suggestion to fix this?
> > >
> > > either register the conflict with @conflict markers (in both ports),
> > > or install docs to a different dir. conflict markers seems ok to me.
> > >
> > > it might be better to just include the manuals in the main package.
> > > you can use multiple DISTFILES.
> > >
> > > > As said in the previous emails i get these with execline too:
> > > >
> > > > in default FLAVOR: the following libraries in WANTLIB look like masked by RUN_DEPENDS: skarnet
> > > > in FLAVOR "static": the following libraries in WANTLIB look like masked by RUN_DEPENDS: skarnet
> > > >
> > > > I have also checked that these ports work with -fno-common.
> > > >
> > > > Any comments and/or OKs?
> > >
> > > SHARED_LIBS = execline 2.8
> > > SHARED_LIBS = skarnet 2.10
> > >
> > > start with 0.0. if the build system doesn't produce a library with the
> > > right name to match this, patch or pass in via make(1) variables until
> > > it does.
> > >
> > > https://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs
> > >
> > > @so lib/libexecline.so
> > > @lib lib/libexecline.so.${LIBexecline_VERSION}
> > > @bin lib/libexecline.so.2.8.0.0
> > >
> > > @so lib/libskarnet.so
> > > @lib lib/libskarnet.so.${LIBskarnet_VERSION}
> > > @bin lib/libskarnet.so.2.10.0.2
> > >
> > > there should just be "@lib lib/libxyz.so.${LIBxyz}" lines, no
> > > symlinks etc.
> > >
> > > these are probably what's responsible for portcheck's "masked by" warning.
> > >
> > > pkg/DESCR says "has no security issues"
> > >
> > > a bold claim! I don't think it's a good idea to include that bit.
> > >
> > > I would drop the static flavours unless there's a really good reason
> > > for it (usually "it's helpful to run in a chroot for a webserver").
> > >
> >
> > The reason for the static flavor is basically the same as for example
> > shells/dash: it can be really useful in a chroot since it acts
> > functionally the same as a shell. Anyway i will remove it in case.
> >
> > I modified the ports to match your suggestions, below there is the diff
> > to add @conflict to etsh. Thanks!
> >
> > Index: shells/etsh/pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/shells/etsh/pkg/PLIST,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 PLIST
> > --- shells/etsh/pkg/PLIST 30 Mar 2019 18:14:32 -0000 1.2
> > +++ shells/etsh/pkg/PLIST 22 Feb 2021 19:55:45 -0000
> > @@ -1,5 +1,6 @@
> > @comment $OpenBSD: PLIST,v 1.2 2019/03/30 18:14:32 bcallah Exp $
> > @conflict osh-*
> > +@conflict execline-*
> > @pkgpath shells/osh
> > @shell bin/etsh
> > @shell bin/tsh
>
>
>
> Index: shells/etsh/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/shells/etsh/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- shells/etsh/pkg/PLIST 30 Mar 2019 18:14:32 -0000 1.2
> +++ shells/etsh/pkg/PLIST 22 Feb 2021 19:55:45 -0000
> @@ -1,5 +1,6 @@
> @comment $OpenBSD: PLIST,v 1.2 2019/03/30 18:14:32 bcallah Exp $
> @conflict osh-*
> +@conflict execline-*
> @pkgpath shells/osh
> @shell bin/etsh
> @shell bin/tsh
Re: NEW: lang/lua/5.4
On Sat, Feb 20, 2021 at 12:49:13PM +1100, Jonathan Gray wrote:
> add lua 5.4.2
>
> https://www.lua.org/manual/5.4/readme.html#changes
update for 5.4.3
Index: lang/lua/Makefile
===================================================================
RCS file: /cvs/ports/lang/lua/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- lang/lua/Makefile 14 Jan 2015 20:07:45 -0000 1.47
+++ lang/lua/Makefile 19 Feb 2021 13:26:20 -0000
@@ -4,6 +4,7 @@
SUBDIR += 5.1
SUBDIR += 5.2
SUBDIR += 5.3
+ SUBDIR += 5.4
.include <bsd.port.subdir.mk>
Index: lang/lua/lua.port.mk
===================================================================
RCS file: /cvs/ports/lang/lua/lua.port.mk,v
retrieving revision 1.35
diff -u -p -r1.35 lua.port.mk
--- lang/lua/lua.port.mk 31 Oct 2016 18:46:09 -0000 1.35
+++ lang/lua/lua.port.mk 19 Feb 2021 13:25:59 -0000
@@ -17,6 +17,8 @@ FLAVOR ?= # empty
MODLUA_VERSION = 5.2
.elif ${FLAVOR:Mlua53}
MODLUA_VERSION = 5.3
+.elif ${FLAVOR:Mlua54}
+MODLUA_VERSION = 5.4
.else
MODLUA_VERSION ?= ${MODLUA_DEFAULT_VERSION}
.endif
@@ -30,6 +32,9 @@ MODLUA_FLAVOR = lua52
.elif "${MODLUA_VERSION}" == "5.3"
_MODLUA_PKG_PREFIX = lua53
MODLUA_FLAVOR = lua53
+.elif "${MODLUA_VERSION}" == "5.4"
+_MODLUA_PKG_PREFIX = lua54
+MODLUA_FLAVOR = lua54
.else
ERRORS += "Invalid MODLUA_VERSION set: ${MODLUA_VERSION}."
.endif
> add lua 5.4.2
>
> https://www.lua.org/manual/5.4/readme.html#changes
update for 5.4.3
Index: lang/lua/Makefile
===================================================================
RCS file: /cvs/ports/lang/lua/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- lang/lua/Makefile 14 Jan 2015 20:07:45 -0000 1.47
+++ lang/lua/Makefile 19 Feb 2021 13:26:20 -0000
@@ -4,6 +4,7 @@
SUBDIR += 5.1
SUBDIR += 5.2
SUBDIR += 5.3
+ SUBDIR += 5.4
.include <bsd.port.subdir.mk>
Index: lang/lua/lua.port.mk
===================================================================
RCS file: /cvs/ports/lang/lua/lua.port.mk,v
retrieving revision 1.35
diff -u -p -r1.35 lua.port.mk
--- lang/lua/lua.port.mk 31 Oct 2016 18:46:09 -0000 1.35
+++ lang/lua/lua.port.mk 19 Feb 2021 13:25:59 -0000
@@ -17,6 +17,8 @@ FLAVOR ?= # empty
MODLUA_VERSION = 5.2
.elif ${FLAVOR:Mlua53}
MODLUA_VERSION = 5.3
+.elif ${FLAVOR:Mlua54}
+MODLUA_VERSION = 5.4
.else
MODLUA_VERSION ?= ${MODLUA_DEFAULT_VERSION}
.endif
@@ -30,6 +32,9 @@ MODLUA_FLAVOR = lua52
.elif "${MODLUA_VERSION}" == "5.3"
_MODLUA_PKG_PREFIX = lua53
MODLUA_FLAVOR = lua53
+.elif "${MODLUA_VERSION}" == "5.4"
+_MODLUA_PKG_PREFIX = lua54
+MODLUA_FLAVOR = lua54
.else
ERRORS += "Invalid MODLUA_VERSION set: ${MODLUA_VERSION}."
.endif
Re: [update patch] remind 3.3.5 -> 3.3.6
With the help of Stuart Henderson i have a new diff, which should test
fine on all systems.
Am Wed, Mar 31, 2021 at 01:18:18PM +0100 schrieb Stuart Henderson:
> You can set that in TEST_ENV
> On 2021/03/31 14:15, Martin Ziemer wrote:
> > I found the difference between PASSED and FAILED test:
> > The test passes on systems with LC_ALL set. (My locale is german:
> > de_DE.UTF-8)
> > If i unset LC_ALL, it fails for me too!
> > On Wed, Mar 31, 2021 at 01:34:06PM +0200, Bjorn Ketelaars wrote:
> > > On Wed 31/03/2021 10:12, Martin Ziemer wrote:
> > > > This patch updates remind from 3.3.5 to 3.3.6.
> > > > Tested on two amd64 systems. (One cli only, the other with tkremind)
> > > 'make test' fails for me:
> > > ===> Regression tests for remind-3.3.6
> > > Remind: Acceptance test FAILED
Index: Makefile
===================================================================
RCS file: /cvs/ports/misc/remind/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile 1 Feb 2021 16:20:57 -0000 1.44
+++ Makefile 31 Mar 2021 12:25:50 -0000
@@ -2,8 +2,8 @@
COMMENT= scripting language for reminders, with a Tk front end
-DISTNAME= remind-03.03.05
-PKGNAME= remind-3.3.5
+DISTNAME= remind-03.03.06
+PKGNAME= remind-3.3.6
CATEGORIES= misc
@@ -17,6 +17,8 @@ PERMIT_PACKAGE= Yes
WANTLIB= c m
MASTER_SITES= https://dianne.skoll.ca/projects/remind/download/
+
+TEST_ENV= LC_ALL=en_US.UTF-8
MODULES= x11/tk
MODTK_VERSION = 8.6
Index: distinfo
===================================================================
RCS file: /cvs/ports/misc/remind/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo 1 Feb 2021 16:20:57 -0000 1.16
+++ distinfo 31 Mar 2021 12:25:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (remind-03.03.05.tar.gz) = Ye0X2Gvek/pyaNVxGKL773OWJvC4I6F5nEsRQgzWbsE=
-SIZE (remind-03.03.05.tar.gz) = 402481
+SHA256 (remind-03.03.06.tar.gz) = lpoMAXDJxwODY0/aoo25GRBYWFhE4uf11pR5/ITZX1s=
+SIZE (remind-03.03.06.tar.gz) = 404282
fine on all systems.
Am Wed, Mar 31, 2021 at 01:18:18PM +0100 schrieb Stuart Henderson:
> You can set that in TEST_ENV
> On 2021/03/31 14:15, Martin Ziemer wrote:
> > I found the difference between PASSED and FAILED test:
> > The test passes on systems with LC_ALL set. (My locale is german:
> > de_DE.UTF-8)
> > If i unset LC_ALL, it fails for me too!
> > On Wed, Mar 31, 2021 at 01:34:06PM +0200, Bjorn Ketelaars wrote:
> > > On Wed 31/03/2021 10:12, Martin Ziemer wrote:
> > > > This patch updates remind from 3.3.5 to 3.3.6.
> > > > Tested on two amd64 systems. (One cli only, the other with tkremind)
> > > 'make test' fails for me:
> > > ===> Regression tests for remind-3.3.6
> > > Remind: Acceptance test FAILED
Index: Makefile
===================================================================
RCS file: /cvs/ports/misc/remind/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile 1 Feb 2021 16:20:57 -0000 1.44
+++ Makefile 31 Mar 2021 12:25:50 -0000
@@ -2,8 +2,8 @@
COMMENT= scripting language for reminders, with a Tk front end
-DISTNAME= remind-03.03.05
-PKGNAME= remind-3.3.5
+DISTNAME= remind-03.03.06
+PKGNAME= remind-3.3.6
CATEGORIES= misc
@@ -17,6 +17,8 @@ PERMIT_PACKAGE= Yes
WANTLIB= c m
MASTER_SITES= https://dianne.skoll.ca/projects/remind/download/
+
+TEST_ENV= LC_ALL=en_US.UTF-8
MODULES= x11/tk
MODTK_VERSION = 8.6
Index: distinfo
===================================================================
RCS file: /cvs/ports/misc/remind/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo 1 Feb 2021 16:20:57 -0000 1.16
+++ distinfo 31 Mar 2021 12:25:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (remind-03.03.05.tar.gz) = Ye0X2Gvek/pyaNVxGKL773OWJvC4I6F5nEsRQgzWbsE=
-SIZE (remind-03.03.05.tar.gz) = 402481
+SHA256 (remind-03.03.06.tar.gz) = lpoMAXDJxwODY0/aoo25GRBYWFhE4uf11pR5/ITZX1s=
+SIZE (remind-03.03.06.tar.gz) = 404282
Re: Gigenet Mirror x*69.tgz Failing to Verify Sets
On 2021-03-30, Charlie Burnett <burne251@umn.edu> wrote:
> Hi,
> Currently the gigenet mirror is failing to verify for all four X packages
> on snapshot. They verify fine when I point it towards cdn.openbsd.org, but
> this is the case for both when trying to install from both bsd.rd and an
> install iso. This is in a VM but I wouldn't see how that'd affect it. Oddly
> enough, I just upgraded my personal machine earlier today without any
> issues. Not sure what would need to be done about it, but I figured someone
> oughta be told!
>
> Best Regards,
> Charlie Burnett
>
It happens with snapshots from time to time. Try another mirror or wait a while.
> Hi,
> Currently the gigenet mirror is failing to verify for all four X packages
> on snapshot. They verify fine when I point it towards cdn.openbsd.org, but
> this is the case for both when trying to install from both bsd.rd and an
> install iso. This is in a VM but I wouldn't see how that'd affect it. Oddly
> enough, I just upgraded my personal machine earlier today without any
> issues. Not sure what would need to be done about it, but I figured someone
> oughta be told!
>
> Best Regards,
> Charlie Burnett
>
It happens with snapshots from time to time. Try another mirror or wait a while.
Re: [update patch] remind 3.3.5 -> 3.3.6
You can set that in TEST_ENV
On 2021/03/31 14:15, Martin Ziemer wrote:
> I found the difference between PASSED and FAILED test:
> The test passes on systems with LC_ALL set. (My locale is german:
> de_DE.UTF-8)
> If i unset LC_ALL, it fails for me too!
>
> On Wed, Mar 31, 2021 at 01:34:06PM +0200, Bjorn Ketelaars wrote:
> > On Wed 31/03/2021 10:12, Martin Ziemer wrote:
> > > This patch updates remind from 3.3.5 to 3.3.6.
> > >
> > > Tested on two amd64 systems. (One cli only, the other with tkremind)
> >
> > 'make test' fails for me:
> >
> > ===> Regression tests for remind-3.3.6
> > Remind: Acceptance test FAILED
> >
> > Examine the file test.out to see where it differs from the
> > reference file test.cmp.
> >
> >
> > Does it work for you?
>
On 2021/03/31 14:15, Martin Ziemer wrote:
> I found the difference between PASSED and FAILED test:
> The test passes on systems with LC_ALL set. (My locale is german:
> de_DE.UTF-8)
> If i unset LC_ALL, it fails for me too!
>
> On Wed, Mar 31, 2021 at 01:34:06PM +0200, Bjorn Ketelaars wrote:
> > On Wed 31/03/2021 10:12, Martin Ziemer wrote:
> > > This patch updates remind from 3.3.5 to 3.3.6.
> > >
> > > Tested on two amd64 systems. (One cli only, the other with tkremind)
> >
> > 'make test' fails for me:
> >
> > ===> Regression tests for remind-3.3.6
> > Remind: Acceptance test FAILED
> >
> > Examine the file test.out to see where it differs from the
> > reference file test.cmp.
> >
> >
> > Does it work for you?
>
Re: [update patch] remind 3.3.5 -> 3.3.6
I found the difference between PASSED and FAILED test:
The test passes on systems with LC_ALL set. (My locale is german:
de_DE.UTF-8)
If i unset LC_ALL, it fails for me too!
On Wed, Mar 31, 2021 at 01:34:06PM +0200, Bjorn Ketelaars wrote:
> On Wed 31/03/2021 10:12, Martin Ziemer wrote:
> > This patch updates remind from 3.3.5 to 3.3.6.
> >
> > Tested on two amd64 systems. (One cli only, the other with tkremind)
>
> 'make test' fails for me:
>
> ===> Regression tests for remind-3.3.6
> Remind: Acceptance test FAILED
>
> Examine the file test.out to see where it differs from the
> reference file test.cmp.
>
>
> Does it work for you?
The test passes on systems with LC_ALL set. (My locale is german:
de_DE.UTF-8)
If i unset LC_ALL, it fails for me too!
On Wed, Mar 31, 2021 at 01:34:06PM +0200, Bjorn Ketelaars wrote:
> On Wed 31/03/2021 10:12, Martin Ziemer wrote:
> > This patch updates remind from 3.3.5 to 3.3.6.
> >
> > Tested on two amd64 systems. (One cli only, the other with tkremind)
>
> 'make test' fails for me:
>
> ===> Regression tests for remind-3.3.6
> Remind: Acceptance test FAILED
>
> Examine the file test.out to see where it differs from the
> reference file test.cmp.
>
>
> Does it work for you?
Re: [update patch] remind 3.3.5 -> 3.3.6
On my system the test passes:
(22) horrad@dozer:/usr/obj/ports/remind-3.3.6/remind-03.03.06 $ make test
Remind: Acceptance test PASSED
I updated on Monday to this build:
OpenBSD dozer.tda.lan 6.9 GENERIC.MP#433 amd64
My last pkg_add -ui was just today morning.
On Wed, Mar 31, 2021 at 01:34:06PM +0200, Bjorn Ketelaars wrote:
> On Wed 31/03/2021 10:12, Martin Ziemer wrote:
> > This patch updates remind from 3.3.5 to 3.3.6.
> >
> > Tested on two amd64 systems. (One cli only, the other with tkremind)
>
> 'make test' fails for me:
>
> ===> Regression tests for remind-3.3.6
> Remind: Acceptance test FAILED
>
> Examine the file test.out to see where it differs from the
> reference file test.cmp.
>
>
> Does it work for you?
(22) horrad@dozer:/usr/obj/ports/remind-3.3.6/remind-03.03.06 $ make test
Remind: Acceptance test PASSED
I updated on Monday to this build:
OpenBSD dozer.tda.lan 6.9 GENERIC.MP#433 amd64
My last pkg_add -ui was just today morning.
On Wed, Mar 31, 2021 at 01:34:06PM +0200, Bjorn Ketelaars wrote:
> On Wed 31/03/2021 10:12, Martin Ziemer wrote:
> > This patch updates remind from 3.3.5 to 3.3.6.
> >
> > Tested on two amd64 systems. (One cli only, the other with tkremind)
>
> 'make test' fails for me:
>
> ===> Regression tests for remind-3.3.6
> Remind: Acceptance test FAILED
>
> Examine the file test.out to see where it differs from the
> reference file test.cmp.
>
>
> Does it work for you?
Subscribe to:
Posts (Atom)