On Fri, Aug 25, 2023 at 02:41:25PM +0200, Michael wrote: > Hi ports@, > > this is an update to the latest fvwm3 release [1]. > > Unfortunately there was a bug [2] that caused consistent crashes on > OpenBSD. Reverting the commit in question seems to resolve that issue, > which is also what others [3] seem to be doing for now. Patch for this > is included as 'patch-fvwm_ewmh_names_c'. > > Tested on amd64. > > > [1] https://github.com/fvwmorg/fvwm3/releases/tag/1.0.7 > [2] https://github.com/fvwmorg/fvwm3/issues/873 > [3] > https://github.com/freebsd/freebsd-ports/commit/3e35051e913e46e0132df070d5a718d443bfd0b8
Upstream commited a fix for the mentioned issue so let's use this instead, see 'patch-fvwm_ewmh_c'. Patch below. Tested on amd64. Index: Makefile =================================================================== RCS file: /cvs/ports/x11/fvwm3/Makefile,v retrieving revision 1.8 diff -u -p -r1.8 Makefile --- Makefile 24 Jan 2023 18:05:35 -0000 1.8 +++ Makefile 26 Aug 2023 22:20:01 -0000 @@ -1,6 +1,6 @@ COMMENT= multiple virtual desktop window manager -VERSION= 1.0.6a +VERSION= 1.0.7 DISTNAME= fvwm3-${VERSION} CATEGORIES= x11 Index: distinfo =================================================================== RCS file: /cvs/ports/x11/fvwm3/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 22 Jan 2023 12:11:26 -0000 1.3 +++ distinfo 26 Aug 2023 22:20:01 -0000 @@ -1,2 +1,2 @@ -SHA256 (fvwm3-1.0.6a.tar.gz) = RmWmYTPgcLeRkXsHlMxt9rdUZ56+kTBxhCfbZHm7W2g= -SIZE (fvwm3-1.0.6a.tar.gz) = 4538100 +SHA256 (fvwm3-1.0.7.tar.gz) = OqzXz+/2DbG82cdzMtxXX+dxHS0wbwR5UlN43G2z0x4= +SIZE (fvwm3-1.0.7.tar.gz) = 4512128 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/x11/fvwm3/patches/patch-configure,v retrieving revision 1.3 diff -u -p -r1.3 patch-configure --- patches/patch-configure 13 Oct 2022 16:00:45 -0000 1.3 +++ patches/patch-configure 26 Aug 2023 22:20:01 -0000 @@ -1,7 +1,7 @@ Index: configure --- configure.orig +++ configure -@@ -11779,7 +11779,7 @@ then : +@@ -11726,7 +11726,7 @@ then : else $as_nop with_intl=maybe Index: patches/patch-default-config_Makefile_in =================================================================== RCS file: /cvs/ports/x11/fvwm3/patches/patch-default-config_Makefile_in,v retrieving revision 1.3 diff -u -p -r1.3 patch-default-config_Makefile_in --- patches/patch-default-config_Makefile_in 13 Oct 2022 16:00:45 -0000 1.3 +++ patches/patch-default-config_Makefile_in 26 Aug 2023 22:20:01 -0000 @@ -1,7 +1,7 @@ Index: default-config/Makefile.in --- default-config/Makefile.in.orig +++ default-config/Makefile.in -@@ -593,9 +593,10 @@ uninstall-am: uninstall-configDATA +@@ -574,9 +574,10 @@ uninstall-am: uninstall-configDATA install-data-hook: cp -r $(srcdir)/images $(inst_location)/default-config Index: patches/patch-fvwm_ewmh_c =================================================================== RCS file: patches/patch-fvwm_ewmh_c diff -N patches/patch-fvwm_ewmh_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-fvwm_ewmh_c 26 Aug 2023 22:20:01 -0000 @@ -0,0 +1,24 @@ +https://github.com/fvwmorg/fvwm3/commit/4d5a697fac3282af18cacebb6d061c92db410f1a +Fixes https://github.com/fvwmorg/fvwm3/issues/873 + +Index: fvwm/ewmh.c +--- fvwm/ewmh.c.orig ++++ fvwm/ewmh.c +@@ -458,7 +458,7 @@ void *atom_get(Window win, Atom to_get, Atom type, int + int asize; + + asize = atom_size(format_ret); +- data = fxmalloc(num_ret * asize); ++ data = fxmalloc(num_ret * asize + 1); + if (format_ret == 32 && asize * 8 != format_ret) + { + int i; +@@ -472,7 +472,7 @@ void *atom_get(Window win, Atom to_get, Atom type, int + { + if (data) + { +- memcpy(data, retval, num_ret * asize); ++ memcpy(data, retval, num_ret * asize + 1); + } + } + XFree(retval);