Re: update x11/fvwm3 to 1.0.9

[Michael]

On Sun, Dec 03, 2023 at 01:28:36PM +0100, Omar Polo wrote:
> freshly released, works for me (stock configuration with just a few
> changes.)
> 
> full changelog: 
> 
> ok?

That was fast! Looks good to me, lightly tested on amd64 but works even 
with my rather extensive configuration. Thanks Omar.


> 
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/x11/fvwm3/Makefile,v
> diff -u -p -r1.12 Makefile
> --- Makefile  30 Sep 2023 10:47:28 -  1.12
> +++ Makefile  3 Dec 2023 12:03:37 -
> @@ -1,8 +1,7 @@
>  COMMENT= multiple virtual desktop window manager
>  
> -VERSION= 1.0.8
> +VERSION= 1.0.9
>  DISTNAME=fvwm3-${VERSION}
> -REVISION=0
>  
>  CATEGORIES= x11
>  
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/x11/fvwm3/distinfo,v
> diff -u -p -r1.5 distinfo
> --- distinfo  7 Sep 2023 09:46:33 -   1.5
> +++ distinfo  3 Dec 2023 12:03:37 -
> @@ -1,2 +1,2 @@
> -SHA256 (fvwm3-1.0.8.tar.gz) = fQF8SCSvyJHvvbI3oyulnizZRUKs76sD4dmO3DHTQOs=
> -SIZE (fvwm3-1.0.8.tar.gz) = 5644021
> +SHA256 (fvwm3-1.0.9.tar.gz) = xtBBGpe2IdjA7tNbxBZ4BBUUgOhH9kaUrcqOVd0ZBkg=
> +SIZE (fvwm3-1.0.9.tar.gz) = 4525552
> Index: patches/patch-fvwm_infostore_c
> ===
> RCS file: /home/cvs/ports/x11/fvwm3/patches/patch-fvwm_infostore_c,v
> diff -u -p -r1.1 patch-fvwm_infostore_c
> --- patches/patch-fvwm_infostore_c30 Sep 2023 10:47:28 -  1.1
> +++ patches/patch-fvwm_infostore_c3 Dec 2023 12:03:37 -
> @@ -1,26 +0,0 @@
> -Avoid use-after-free caused by LoadGlobalState() freeing the key
> -that was just inserted. Fix this by always copying the key and
> -avoiding a leak in the only other caller of insert_metainfo()
> -
> -https://github.com/fvwmorg/fvwm3/commit/9811e73aa9f67706e5d74ba811adeebadc195639
> -
> -Index: fvwm/infostore.c
>  fvwm/infostore.c.orig
> -+++ fvwm/infostore.c
> -@@ -78,7 +78,7 @@ void insert_metainfo(char *key, char *value)
> - 
> - /* It's a new item, add it to the list. */
> - mi_new = new_metainfo();
> --mi_new->key = key;
> -+mi_new->key = fxstrdup(key);
> - CopyString(_new->value, value);
> - 
> - mi_new->next = mi_store;
> -@@ -192,6 +192,7 @@ void CMD_InfoStoreAdd(F_CMD_ARGS)
> - }
> - 
> - insert_metainfo(key, value);
> -+free(key);
> - free(value);
> - 
> - return;
> Index: pkg/PLIST
> ===
> RCS file: /home/cvs/ports/x11/fvwm3/pkg/PLIST,v
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 4 Sep 2023 11:00:35 -   1.4
> +++ pkg/PLIST 3 Dec 2023 12:05:35 -
> @@ -185,3 +185,5 @@ share/fvwm3/perllib/FVWM/Tracker/WindowL
>  share/fvwm3/perllib/General/
>  share/fvwm3/perllib/General/FileSystem.pm
>  share/fvwm3/perllib/General/Parse.pm
> +share/xsessions/
> +share/xsessions/fvwm3.desktop
> 

update x11/fvwm3 to 1.0.9

[Omar Polo]

freshly released, works for me (stock configuration with just a few
changes.)

full changelog: 

ok?

Index: Makefile
===
RCS file: /home/cvs/ports/x11/fvwm3/Makefile,v
diff -u -p -r1.12 Makefile
--- Makefile30 Sep 2023 10:47:28 -  1.12
+++ Makefile3 Dec 2023 12:03:37 -
@@ -1,8 +1,7 @@
 COMMENT=   multiple virtual desktop window manager
 
-VERSION=   1.0.8
+VERSION=   1.0.9
 DISTNAME=  fvwm3-${VERSION}
-REVISION=  0
 
 CATEGORIES= x11
 
Index: distinfo
===
RCS file: /home/cvs/ports/x11/fvwm3/distinfo,v
diff -u -p -r1.5 distinfo
--- distinfo7 Sep 2023 09:46:33 -   1.5
+++ distinfo3 Dec 2023 12:03:37 -
@@ -1,2 +1,2 @@
-SHA256 (fvwm3-1.0.8.tar.gz) = fQF8SCSvyJHvvbI3oyulnizZRUKs76sD4dmO3DHTQOs=
-SIZE (fvwm3-1.0.8.tar.gz) = 5644021
+SHA256 (fvwm3-1.0.9.tar.gz) = xtBBGpe2IdjA7tNbxBZ4BBUUgOhH9kaUrcqOVd0ZBkg=
+SIZE (fvwm3-1.0.9.tar.gz) = 4525552
Index: patches/patch-fvwm_infostore_c
===
RCS file: /home/cvs/ports/x11/fvwm3/patches/patch-fvwm_infostore_c,v
diff -u -p -r1.1 patch-fvwm_infostore_c
--- patches/patch-fvwm_infostore_c  30 Sep 2023 10:47:28 -  1.1
+++ patches/patch-fvwm_infostore_c  3 Dec 2023 12:03:37 -
@@ -1,26 +0,0 @@
-Avoid use-after-free caused by LoadGlobalState() freeing the key
-that was just inserted. Fix this by always copying the key and
-avoiding a leak in the only other caller of insert_metainfo()
-
-https://github.com/fvwmorg/fvwm3/commit/9811e73aa9f67706e5d74ba811adeebadc195639
-
-Index: fvwm/infostore.c
 fvwm/infostore.c.orig
-+++ fvwm/infostore.c
-@@ -78,7 +78,7 @@ void insert_metainfo(char *key, char *value)
- 
-   /* It's a new item, add it to the list. */
-   mi_new = new_metainfo();
--  mi_new->key = key;
-+  mi_new->key = fxstrdup(key);
-   CopyString(_new->value, value);
- 
-   mi_new->next = mi_store;
-@@ -192,6 +192,7 @@ void CMD_InfoStoreAdd(F_CMD_ARGS)
-   }
- 
-   insert_metainfo(key, value);
-+  free(key);
-   free(value);
- 
-   return;
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/x11/fvwm3/pkg/PLIST,v
diff -u -p -r1.4 PLIST
--- pkg/PLIST   4 Sep 2023 11:00:35 -   1.4
+++ pkg/PLIST   3 Dec 2023 12:05:35 -
@@ -185,3 +185,5 @@ share/fvwm3/perllib/FVWM/Tracker/WindowL
 share/fvwm3/perllib/General/
 share/fvwm3/perllib/General/FileSystem.pm
 share/fvwm3/perllib/General/Parse.pm
+share/xsessions/
+share/xsessions/fvwm3.desktop