CVS commit: pkgsrc/games/vms-empire

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Mar 24 12:46:06 UTC 2026

Modified Files:
        pkgsrc/games/vms-empire: Makefile distinfo
        pkgsrc/games/vms-empire/patches: patch-aa patch-edit.c

Log Message:
vms-empire: update to 1.19.

       Code hardening with ChatGPT 5.2
       Close off a whole bunch of potential buffer overruns.
       Bail out gracefully on failed memory allocations.
       New versioned, field-wise save format with map dimensions recorded.
       Default save file name is now empire.sav.
       Documentation is fully spellchecked.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/games/vms-empire/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/games/vms-empire/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/games/vms-empire/patches/patch-aa
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/vms-empire/patches/patch-edit.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/vms-empire/Makefile
diff -u pkgsrc/games/vms-empire/Makefile:1.18 pkgsrc/games/vms-empire/Makefile:1.19
--- pkgsrc/games/vms-empire/Makefile:1.18       Sat Feb  8 10:49:45 2025
+++ pkgsrc/games/vms-empire/Makefile    Tue Mar 24 12:46:06 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2025/02/08 10:49:45 triaxx Exp $
-#
+# $NetBSD: Makefile,v 1.19 2026/03/24 12:46:06 wiz Exp $
 
-DISTNAME=      vms-empire-1.18
+DISTNAME=      vms-empire-1.19
 CATEGORIES=    games
 MASTER_SITES=  http://www.catb.org/~esr/vms-empire/
 
@@ -12,6 +11,8 @@ LICENSE=      gnu-gpl-v2
 
 USE_TOOLS+=    gmake
 
+MAKE_FLAGS+=   MANDIR=${PREFIX}/${PKGMANDIR}
+
 SUBST_CLASSES+=                makefile
 SUBST_STAGE.makefile=  pre-configure
 SUBST_MESSAGE.makefile=        Fixing hardcoded paths

Index: pkgsrc/games/vms-empire/distinfo
diff -u pkgsrc/games/vms-empire/distinfo:1.12 pkgsrc/games/vms-empire/distinfo:1.13
--- pkgsrc/games/vms-empire/distinfo:1.12       Sat Feb  8 10:49:45 2025
+++ pkgsrc/games/vms-empire/distinfo    Tue Mar 24 12:46:06 2026
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2025/02/08 10:49:45 triaxx Exp $
+$NetBSD: distinfo,v 1.13 2026/03/24 12:46:06 wiz Exp $
 
-BLAKE2s (vms-empire-1.18.tar.gz) = 907c6b8e672f0e829f77626b51afc5a76a42c525d6d90e510015b8e6c8c697ab
-SHA512 (vms-empire-1.18.tar.gz) = 0e191c1e88d5c144040d7dfd7db81d51ae09feee3a7571e2db940813dafa858ee8f23bfcc1f7796a6ddff82562970d0be5006f9422eb17009c70acc4f467c914
-Size (vms-empire-1.18.tar.gz) = 111335 bytes
-SHA1 (patch-aa) = 7b436863cd3148af5ca720a5ffde052323d2db30
-SHA1 (patch-edit.c) = 1543bd36d879cf06c773010d8b92320d63b41ca7
+BLAKE2s (vms-empire-1.19.tar.gz) = 9d7e6b38f13f7d9f6789929829ac35fd0e60d8a4ad483e6581dd02bfbeb9cdbe
+SHA512 (vms-empire-1.19.tar.gz) = 826197896a1b99c028fd1072370068370816600c0f96e1370eef672ae33102b618eda1d84e16d094e2182c6c4cdb7ba500064f8014824af78fd27ba3d12a9b3c
+Size (vms-empire-1.19.tar.gz) = 113348 bytes
+SHA1 (patch-aa) = ac55b4a22d2b7cde990cdbc193c75e3339d6bab2
+SHA1 (patch-edit.c) = d413719ea09eb8e92facd16be36e95020e3ee1b8
 SHA1 (patch-game.c) = b44f515a9ce4c4fa095af70e424a69afc8c48e6d
 SHA1 (patch-object.c) = ca6b0deb031389dd448100af8192346f0f00b258
 SHA1 (patch-term.c) = 7aaad65ba85040e39352ee7685889be84f9ca105

Index: pkgsrc/games/vms-empire/patches/patch-aa
diff -u pkgsrc/games/vms-empire/patches/patch-aa:1.6 pkgsrc/games/vms-empire/patches/patch-aa:1.7
--- pkgsrc/games/vms-empire/patches/patch-aa:1.6        Sat Feb  8 10:49:45 2025
+++ pkgsrc/games/vms-empire/patches/patch-aa    Tue Mar 24 12:46:06 2026
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.6 2025/02/08 10:49:45 triaxx Exp $
+$NetBSD: patch-aa,v 1.7 2026/03/24 12:46:06 wiz Exp $
 
 o Turn off optimizations present in DEBUG
 o Link against (generic) curses
 o Honors user's CFLAGS and LDFLAGS
 
---- Makefile.orig      2016-01-11 18:19:51.000000000 +0000
+--- Makefile.orig      2026-03-24 12:40:47.000000000 +0000
 +++ Makefile
-@@ -9,18 +9,18 @@ VERS=1.14
+@@ -14,18 +14,18 @@ VERSION=$(shell sed -n <NEWS '/^[0-9]/s/:.*//p' | head
  
  # Use -g to compile the program for debugging.
  #DEBUG = -g -DDEBUG
@@ -23,12 +23,12 @@ o Honors user's CFLAGS and LDFLAGS
  # You shouldn't have to modify anything below this line.
  
  # There's a dynamic format in the object-display routines; suppress the warning
--CFLAGS = $(DEBUG) $(PROFILE) -Wall -Wno-format-security
-+CFLAGS += $(DEBUG) $(PROFILE) -Wall -Wno-format-security
+-CFLAGS = $(DEBUG) $(PROFILE) -Wall -Wextra -Werror -Wno-format-security -Wno-unused-parameter
++CFLAGS += $(DEBUG) $(PROFILE) -Wall -Wextra -Wno-format-security -Wno-unused-parameter
  
  FILES = \
        attack.c \
-@@ -59,7 +59,7 @@ OFILES = \
+@@ -66,7 +66,7 @@ vms-empire: $(OFILES)
  all: vms-empire
  
  vms-empire: $(OFILES)

Index: pkgsrc/games/vms-empire/patches/patch-edit.c
diff -u pkgsrc/games/vms-empire/patches/patch-edit.c:1.2 pkgsrc/games/vms-empire/patches/patch-edit.c:1.3
--- pkgsrc/games/vms-empire/patches/patch-edit.c:1.2    Sat Feb  8 10:49:45 2025
+++ pkgsrc/games/vms-empire/patches/patch-edit.c        Tue Mar 24 12:46:06 2026
@@ -1,10 +1,19 @@
-$NetBSD: patch-edit.c,v 1.2 2025/02/08 10:49:45 triaxx Exp $
+$NetBSD: patch-edit.c,v 1.3 2026/03/24 12:46:06 wiz Exp $
 
 Fix ctype(3) functions usage.
 
---- edit.c.orig        2024-02-11 16:53:28.000000000 +0000
+--- edit.c.orig        2026-03-24 12:40:47.000000000 +0000
 +++ edit.c
-@@ -305,7 +305,7 @@ Set object to move in a direction.
+@@ -148,7 +148,7 @@ char e_cursor(loc_t *edit_cursor) {
+               e = getch();
+       }
+       (void)nocrmode(); /* reset terminal */
+-      return toupper(e);
++      return toupper((unsigned char)e);
+ }
+ 
+ /*
+@@ -306,7 +306,7 @@ void e_stasis(loc_t loc) {
  static char dirs[] = "WEDCXZAQ";
  
  void e_stasis(loc_t loc) {
@@ -13,7 +22,7 @@ Fix ctype(3) functions usage.
                huh(); /* no object here */
        } else if (game.user_map[loc].contents == 'X') {
                huh();
-@@ -421,7 +421,7 @@ Beginning of move to location.
+@@ -422,7 +422,7 @@ void e_move(loc_t *path_start, loc_t loc) {
  */
  
  void e_move(loc_t *path_start, loc_t loc) {
@@ -22,12 +31,3 @@ Fix ctype(3) functions usage.
                huh(); /* nothing there? */
        } else if (game.user_map[loc].contents == 'X') {
                huh(); /* enemy city? */
-@@ -493,7 +493,7 @@ void e_piece_info(loc_t edit_cursor, cha
-       int type;
-       char *p;
- 
--      ab = toupper(ab);
-+      ab = toupper((unsigned char)ab);
-       p = strchr(type_chars, ab);
-       type = p - type_chars;
-