Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 doc/lout/BUILD                                                              
|    2 
 doc/lout/DEPENDS                                                            
|    1 
 doc/lout/DETAILS                                                            
|   13 +---
 doc/lout/HISTORY                                                            
|    6 ++
 doc/lout/INSTALL                                                            
|    4 +
 doc/lout/PRE_BUILD                                                          
|   22 +------
 doc/lout/patches/0001-Avoid-calling-catclose-with-an-invalid-argument.patch 
|   30 ++++++++++
 7 files changed, 50 insertions(+), 28 deletions(-)

New commits:
commit b145a51757c14ae8c3a6333b75910c9ca879ba73
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    lout 3.42.2

diff --git a/doc/lout/BUILD b/doc/lout/BUILD
index 8f58e6d..88ea6b3 100755
--- a/doc/lout/BUILD
+++ b/doc/lout/BUILD
@@ -1 +1 @@
-make
+${MAKE:-make} $OPTS
diff --git a/doc/lout/DEPENDS b/doc/lout/DEPENDS
new file mode 100755
index 0000000..de86c4f
--- /dev/null
+++ b/doc/lout/DEPENDS
@@ -0,0 +1 @@
+depends zlib ZLIB=-lz
diff --git a/doc/lout/DETAILS b/doc/lout/DETAILS
index 6963dd5..4f3e029 100755
--- a/doc/lout/DETAILS
+++ b/doc/lout/DETAILS
@@ -1,14 +1,11 @@
            SPELL=lout
-         VERSION=3.25
+         VERSION=3.42.2
+  SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=ftp://ftp.cs.usyd.edu.au/jeff/lout/$SOURCE
-   SOURCE_URL[1]=ftp://ftp.ptc.spbu.ru/pub/textproc/lout/$SOURCE
-   SOURCE_URL[2]=ftp://ftp.sunet.se/pub/text-processing/lout/lout/$SOURCE
-   SOURCE_URL[3]=ftp://sunsite.dk/mirrors/lout/lout/$SOURCE
-   SOURCE_URL[4]=ftp://ftp.wu-wien.ac.at/pub/Netizens/jeff/lout/$SOURCE
-     
SOURCE_HASH=sha512:fac1d40d55c5f55d1488a2242cc4eab31a4f05e68e815ee01f97addfd3e26f3c4951a39c123907912ba13c6b3e83e5faf86ef02ccf7b253d2dbdd9bb6ff5ce0d
-        WEB_SITE=http://snark.ptc.spbu.ru/~uwe/lout/
+   
SOURCE_URL[0]=https://github.com/william8000/lout/archive/refs/tags/$VERSION.tar.gz
+     
SOURCE_HASH=sha512:1e3b419f03232a55c8d6b2d904e8a4fed4a601b4bc93f9e85bdfc78a56b6f93837d4751ae1d877e2ef19215cd9ec2ad76d83ec75cd7d74d668c89b14014304d9
+        WEB_SITE=https://github.com/william8000/lout
          ENTERED=20020507
          LICENSE=GLP
         KEYWORDS="doc"
diff --git a/doc/lout/HISTORY b/doc/lout/HISTORY
index c2cc31b..b72a12e 100644
--- a/doc/lout/HISTORY
+++ b/doc/lout/HISTORY
@@ -1,3 +1,9 @@
+2024-01-25 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS, INSTALL, PRE_BUILD: updated spell to 3.42.2
+         SECURITY_PATCH++
+         updated WEB_SITE
+       * BUILD, DEPENDS: added zlib
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/doc/lout/INSTALL b/doc/lout/INSTALL
new file mode 100755
index 0000000..3dce3c4
--- /dev/null
+++ b/doc/lout/INSTALL
@@ -0,0 +1,4 @@
+${MAKE:-make} install \
+       PREFIX="$INSTALL_ROOT"/usr \
+       $OPTS \
+       install
diff --git a/doc/lout/PRE_BUILD b/doc/lout/PRE_BUILD
index e4c72a7..c230ad1 100755
--- a/doc/lout/PRE_BUILD
+++ b/doc/lout/PRE_BUILD
@@ -1,19 +1,3 @@
-mk_source_dir  $SOURCE_DIRECTORY                                &&
-unpack_file                                 &&
-
-mv $SOURCE_DIRECTORY/makefile                                   \
-   $SOURCE_DIRECTORY/makefile.bak                               &&
-
-     # What lout calls lib files IMO belong in a share 
-     # directory as they appear to be platform independant.
-
-sed -e 's/staff\/jeff\///g'                                     \
-    -e 's/lout.doc/doc\/lout/g'                                \
-    -e 's/lout.man/man\/man1/g'                                 \
-    -e 's/lout.lib/share\/lout/g'                               \
-    -e 's/PDF_COMPRESSION      = 0/PDF_COMPRESSION = 1/g'      \
-    -e 's/ZLIB         =/ZLIB = \/usr\/lib\/libz.a/g'          \
-    -e 's/ZLIBPATH     =/ZLIBPATH = -I\/usr\/lib/g'            \
-    -e 's/mkdir/mkdir -p/g'                                     \
-< $SOURCE_DIRECTORY/makefile.bak >                              \
-  $SOURCE_DIRECTORY/makefile
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git 
a/doc/lout/patches/0001-Avoid-calling-catclose-with-an-invalid-argument.patch 
b/doc/lout/patches/0001-Avoid-calling-catclose-with-an-invalid-argument.patch
new file mode 100644
index 0000000..f561864
--- /dev/null
+++ 
b/doc/lout/patches/0001-Avoid-calling-catclose-with-an-invalid-argument.patch
@@ -0,0 +1,30 @@
+From d6e2fe49e5499cf92a357a3ff90b16252daf6163 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Thu, 25 Jan 2024 07:56:58 +0100
+Subject: [PATCH] Avoid calling catclose with an invalid argument
+
+Causes a segfault with musl 1.2.4 and earlier.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ z01.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/z01.c b/z01.c
+index 474c88b4704a..58464e834fc1 100644
+--- a/z01.c
++++ b/z01.c
+@@ -974,7 +974,8 @@ int main(int argc, char *argv[])
+   while( run_num <= runs_to_do );
+ 
+ #if LOCALE_ON
+-  catclose(MsgCat);
++  if (MsgCat != (nl_catd)-1)
++    catclose(MsgCat);
+ #endif
+ 
+   exit(0);
+-- 
+2.43.0
+