public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Jerry James <loganjerry@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/clisp] rawhide: Update to latest git snapshot for bug fixes
Date: Wed, 24 Jun 2026 17:14:49 GMT	[thread overview]
Message-ID: <178232128912.1.311076777303063754.rpms-clisp-484a270198fd@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/clisp
            Branch : rawhide
            Commit : 484a270198fd72837a57dfd883ea3be3493715f4
            Author : Jerry James <loganjerry@gmail.com>
            Date   : 2026-06-24T11:14:31-06:00
            Stats  : +563/-51 in 6 file(s)
            URL    : https://src.fedoraproject.org/rpms/clisp/c/484a270198fd72837a57dfd883ea3be3493715f4?branch=rawhide

            Log:
            Update to latest git snapshot for bug fixes

- Drop upstreamed siginterrupt patch
- Use zlib-ng instead of zlib

---
diff --git a/clisp-format.patch b/clisp-format.patch
index e029fe1..7a58878 100644
--- a/clisp-format.patch
+++ b/clisp-format.patch
@@ -1,5 +1,5 @@
---- src/spvw_fault.d.orig	2017-10-08 11:45:53.000000000 -0600
-+++ src/spvw_fault.d	2018-02-18 12:41:32.934240135 -0700
+--- src/spvw_fault.d.orig	2026-05-19 18:18:19.000000000 -0600
++++ src/spvw_fault.d	2026-06-24 06:32:51.854454377 -0600
 @@ -289,7 +289,7 @@ modexp bool handle_fault_range (int prot
  
  local void xmprotect (aint addr, uintM len, int prot) {
@@ -9,20 +9,9 @@
      errno_out(OS_errno);
      abort();
    }
---- src/spvw_language.d.orig	2017-05-25 09:49:04.000000000 -0600
-+++ src/spvw_language.d	2018-02-18 12:41:32.934240135 -0700
-@@ -172,7 +172,7 @@ global void init_language
-     { /* Invalidate the gettext internal caches. */
-       char *td = textdomain(NULL);
-       if (NULL == td) {
--        ANSIC_ERROR("textdomain",NULL);
-+        ANSIC_ERROR("textdomain","");
-       }
-       if (NULL == textdomain(td)) {
-         ANSIC_ERROR("textdomain",td);
---- src/spvw_sigsegv.d.orig	2018-01-09 16:04:26.000000000 -0700
-+++ src/spvw_sigsegv.d	2018-03-03 13:52:32.985798284 -0700
-@@ -62,7 +62,7 @@ local void print_mem_stats (void) {
+--- src/spvw_sigsegv.d.orig	2026-05-19 18:18:19.000000000 -0600
++++ src/spvw_sigsegv.d	2026-06-24 06:32:51.854803879 -0600
+@@ -58,7 +58,7 @@ local void print_mem_stats (void) {
  /* Put a breakpoint here if you want to catch CLISP just before it dies. */
  global void sigsegv_handler_failed (void* address) {
    fprint(stderr,"\n");

diff --git a/clisp-siginterrupt.patch b/clisp-siginterrupt.patch
deleted file mode 100644
index 26d0d3b..0000000
--- a/clisp-siginterrupt.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Avoids this warning:
-
-../src/unixaux.d: In function ‘install_signal_handler’:
-../src/unixaux.d:734:3: warning: ‘siginterrupt’ is deprecated: Use sigaction with SA_RESTART instead [-Wdeprecated-declarations]
-  734 |   siginterrupt(sig,0);
-      |   ^~~~~~~~~~~~
-
---- src/unixaux.d.orig	2024-07-12 09:22:07.000000000 -0600
-+++ src/unixaux.d	2024-08-26 15:42:17.202775988 -0600
-@@ -703,7 +703,7 @@ global int wait2 (pid_t child) {
- global signal_handler_t install_signal_handler (int sig,
-                                                 signal_handler_t handler) {
-   var signal_handler_t old_handler;
-- #if defined(USE_SIGACTION)
-+ #if defined(HAVE_SIGACTION)
-   var struct sigaction old_sa;
-   var struct sigaction new_sa;
-   memset(&new_sa,0,sizeof(new_sa));

diff --git a/clisp-undefined-behavior-eval.patch b/clisp-undefined-behavior-eval.patch
index 2e6b8e0..67b55b7 100644
--- a/clisp-undefined-behavior-eval.patch
+++ b/clisp-undefined-behavior-eval.patch
@@ -9,7 +9,7 @@ Fixes this UBSAN error:
      (uintL)(((Codevec)codeptr)->ccv_spdepth_1)
      + jmpbufsize * (uintL)(((Codevec)codeptr)->ccv_spdepth_jmpbufsize);
 -  var DYNAMIC_ARRAY(private_SP_space,SPint,private_SP_length);
-+  var DYNAMIC_ARRAY(private_SP_space,SPint,private_SP_length+1);
++  var DYNAMIC_ARRAY(private_SP_space,SPint,private_SP_length?private_SP_length:1);
    var SPint* private_SP = &private_SP_space[private_SP_length];
    #undef SP_
    #undef _SP_

diff --git a/clisp-zlib-ng.patch b/clisp-zlib-ng.patch
new file mode 100644
index 0000000..09be3e0
--- /dev/null
+++ b/clisp-zlib-ng.patch
@@ -0,0 +1,528 @@
+--- modules/zlib/config.h.in.orig	2026-05-19 18:18:19.000000000 -0600
++++ modules/zlib/config.h.in	2026-06-24 09:25:36.144317570 -0600
+@@ -1,7 +1,7 @@
+ /* config.h.in.  Generated from configure.in by autoheader.  */
+ 
+-/* Define to 1 if you have the 'compressBound' function. */
+-#undef HAVE_COMPRESSBOUND
++/* Define to 1 if you have the 'zng_compressBound' function. */
++#undef HAVE_ZNG_COMPRESSBOUND
+ 
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+--- modules/zlib/configure.in.orig	2026-05-19 18:18:19.000000000 -0600
++++ modules/zlib/configure.in	2026-06-24 09:24:46.080935865 -0600
+@@ -12,22 +12,22 @@ BOLD_MSG([Zlib (Common)])
+ CL_MODULE_COMMON_CHECKS([ffi])
+ 
+ dnl Search for libz and define LIBZ, LTLIBZ and INCZ.
+-AC_LIB_LINKFLAGS([z])
++AC_LIB_LINKFLAGS([z-ng])
+ 
+ BOLD_MSG([Zlib (Headers)])
+-AC_CHECK_HEADERS(zlib.h)
+-if test "$ac_cv_header_zlib_h" = "no" ;
++AC_CHECK_HEADERS(zlib-ng.h)
++if test "$ac_cv_header_zlib_ng_h" = "no" ;
+ then AC_MSG_ERROR([cannot find ZLIB headers])
+ fi
+ 
+ BOLD_MSG([Zlib (Functions)])
+-AC_LIB_APPENDTOVAR([LIBS], [$LIBZ])
+-AC_SEARCH_LIBS(compress2, z)
+-if test "$ac_cv_search_compress2" = "no"; then
++AC_LIB_APPENDTOVAR([LIBS], [$LIBZ_NG])
++AC_SEARCH_LIBS(zng_compress2, z)
++if test "$ac_cv_search_zng_compress2" = "no"; then
+   AC_MSG_ERROR([cannot find ZLIB library])
+ fi
+-AC_CHECK_FUNCS(compressBound)
+-if test "$ac_cv_func_compressBound" = "no"; then
++AC_CHECK_FUNCS(zng_compressBound)
++if test "$ac_cv_func_zng_compressBound" = "no"; then
+   AC_MSG_ERROR([ZLIB version 1.2 or better is required])
+ fi
+ 
+--- modules/zlib/configure.orig	2026-06-24 09:34:29.826741325 -0600
++++ modules/zlib/configure	2026-06-24 09:42:09.750872661 -0600
+@@ -627,9 +627,9 @@ ac_includes_default="\
+ ac_header_c_list=
+ ac_subst_vars='LTLIBOBJS
+ LIBOBJS
+-LIBZ_PREFIX
+-LTLIBZ
+-LIBZ
++LIBZ_NG_PREFIX
++LTLIBZ_NG
++LIBZ_NG
+ host_os
+ host_vendor
+ host_cpu
+@@ -703,7 +703,7 @@ enable_option_checking
+ with_clisp
+ with_gnu_ld
+ enable_rpath
+-with_libz_prefix
++with_libz_ng_prefix
+ '
+       ac_precious_vars='build_alias
+ host_alias
+@@ -1343,8 +1343,8 @@ Optional Packages:
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+   --with-clisp            use a specific CLISP installation
+   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+-  --with-libz-prefix[=DIR]  search for libz in DIR/include and DIR/lib
+-  --without-libz-prefix     don't search for libz in includedir and libdir
++  --with-libz-ng-prefix[=DIR]  search for libz-ng in DIR/include and DIR/lib
++  --without-libz-ng-prefix     don't search for libz-ng in includedir and libdir
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -5152,9 +5152,9 @@ printf '%s\n' "$acl_cv_libdirstems" >&6;
+ 
+ 
+ 
+-  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libz" >&5
+-printf %s "checking how to link with libz... " >&6; }
+-if test ${ac_cv_libz_libs+y}
++  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libz-ng" >&5
++printf %s "checking how to link with libz-ng... " >&6; }
++if test ${ac_cv_libz_ng_libs+y}
+ then :
+   printf %s "(cached) " >&6
+ else case e in #(
+@@ -5181,10 +5181,10 @@ else case e in #(
+   prefix="$acl_saved_prefix"
+ 
+ 
+-# Check whether --with-libz-prefix was given.
+-if test ${with_libz_prefix+y}
++# Check whether --with-libz-ng-prefix was given.
++if test ${with_libz_ng_prefix+y}
+ then :
+-  withval=$with_libz_prefix;
++  withval=$with_libz_ng_prefix;
+     if test "X$withval" = "Xno"; then
+       use_additional=no
+     else
+@@ -5219,15 +5219,15 @@ fi
+   if test "X$additional_libdir3" = "X$additional_libdir"; then
+     additional_libdir3=
+   fi
+-      LIBZ=
+-  LTLIBZ=
+-  INCZ=
+-  LIBZ_PREFIX=
+-      HAVE_LIBZ=
++      LIBZ_NG=
++  LTLIBZ_NG=
++  INCZ_NG=
++  LIBZ_NG_PREFIX=
++      HAVE_LIBZ_NG=
+   rpathdirs=
+   ltrpathdirs=
+   names_already_handled=
+-  names_next_round='z '
++  names_next_round='z-ng '
+   while test -n "$names_next_round"; do
+     names_this_round="$names_next_round"
+     names_next_round=
+@@ -5246,9 +5246,9 @@ fi
+         if test -n "$value"; then
+           if test "$value" = yes; then
+             eval value=\"\$LIB$uppername\"
+-            test -z "$value" || LIBZ="${LIBZ}${LIBZ:+ }$value"
++            test -z "$value" || LIBZ_NG="${LIBZ_NG}${LIBZ_NG:+ }$value"
+             eval value=\"\$LTLIB$uppername\"
+-            test -z "$value" || LTLIBZ="${LTLIBZ}${LTLIBZ:+ }$value"
++            test -z "$value" || LTLIBZ_NG="${LTLIBZ_NG}${LTLIBZ_NG:+ }$value"
+           else
+                                     :
+           fi
+@@ -5311,7 +5311,7 @@ fi
+             done
+           fi
+           if test "X$found_dir" = "X"; then
+-            for x in $LDFLAGS $LTLIBZ; do
++            for x in $LDFLAGS $LTLIBZ_NG; do
+ 
+   acl_saved_prefix="$prefix"
+   prefix="$acl_final_prefix"
+@@ -5370,13 +5370,13 @@ fi
+             done
+           fi
+           if test "X$found_dir" != "X"; then
+-                        LTLIBZ="${LTLIBZ}${LTLIBZ:+ }-L$found_dir -l$name"
++                        LTLIBZ_NG="${LTLIBZ_NG}${LTLIBZ_NG:+ }-L$found_dir -l$name"
+             if test "X$found_so" != "X"; then
+                                                         if test "$enable_rpath" = no \
+                  || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                  || test "X$found_dir" = "X/usr/$acl_libdirstem2" \
+                  || test "X$found_dir" = "X/usr/$acl_libdirstem3"; then
+-                                LIBZ="${LIBZ}${LIBZ:+ }$found_so"
++                                LIBZ_NG="${LIBZ_NG}${LIBZ_NG:+ }$found_so"
+               else
+                                                                                 haveit=
+                 for x in $ltrpathdirs; do
+@@ -5389,10 +5389,10 @@ fi
+                   ltrpathdirs="$ltrpathdirs $found_dir"
+                 fi
+                                 if test "$acl_hardcode_direct" = yes; then
+-                                                      LIBZ="${LIBZ}${LIBZ:+ }$found_so"
++                                                      LIBZ_NG="${LIBZ_NG}${LIBZ_NG:+ }$found_so"
+                 else
+                   if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+-                                                            LIBZ="${LIBZ}${LIBZ:+ }$found_so"
++                                                            LIBZ_NG="${LIBZ_NG}${LIBZ_NG:+ }$found_so"
+                                                             haveit=
+                     for x in $rpathdirs; do
+                       if test "X$x" = "X$found_dir"; then
+@@ -5405,7 +5405,7 @@ fi
+                     fi
+                   else
+                                                                                 haveit=
+-                    for x in $LDFLAGS $LIBZ; do
++                    for x in $LDFLAGS $LIBZ_NG; do
+ 
+   acl_saved_prefix="$prefix"
+   prefix="$acl_final_prefix"
+@@ -5421,43 +5421,43 @@ fi
+                       fi
+                     done
+                     if test -z "$haveit"; then
+-                      LIBZ="${LIBZ}${LIBZ:+ }-L$found_dir"
++                      LIBZ_NG="${LIBZ_NG}${LIBZ_NG:+ }-L$found_dir"
+                     fi
+                     if test "$acl_hardcode_minus_L" != no; then
+-                                                                                        LIBZ="${LIBZ}${LIBZ:+ }$found_so"
++                                                                                        LIBZ_NG="${LIBZ_NG}${LIBZ_NG:+ }$found_so"
+                     else
+-                                                                                                                                                                                LIBZ="${LIBZ}${LIBZ:+ }-l$name"
++                                                                                                                                                                                LIBZ_NG="${LIBZ_NG}${LIBZ_NG:+ }-l$name"
+                     fi
+                   fi
+                 fi
+               fi
+             else
+               if test "X$found_a" != "X"; then
+-                                LIBZ="${LIBZ}${LIBZ:+ }$found_a"
++                                LIBZ_NG="${LIBZ_NG}${LIBZ_NG:+ }$found_a"
+               else
+-                                                LIBZ="${LIBZ}${LIBZ:+ }-L$found_dir -l$name"
++                                                LIBZ_NG="${LIBZ_NG}${LIBZ_NG:+ }-L$found_dir -l$name"
+               fi
+             fi
+                         additional_includedir=
+             case "$found_dir" in
+               */$acl_libdirstem | */$acl_libdirstem/)
+                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+-                if test "$name" = 'z'; then
+-                  LIBZ_PREFIX="$basedir"
++                if test "$name" = 'z-ng'; then
++                  LIBZ_NG_PREFIX="$basedir"
+                 fi
+                 additional_includedir="$basedir/include"
+                 ;;
+               */$acl_libdirstem2 | */$acl_libdirstem2/)
+                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+-                if test "$name" = 'z'; then
+-                  LIBZ_PREFIX="$basedir"
++                if test "$name" = 'z-ng'; then
++                  LIBZ_NG_PREFIX="$basedir"
+                 fi
+                 additional_includedir="$basedir/include"
+                 ;;
+               */$acl_libdirstem3 | */$acl_libdirstem3/)
+                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem3/"'*$,,'`
+-                if test "$name" = 'z'; then
+-                  LIBZ_PREFIX="$basedir"
++                if test "$name" = 'z-ng'; then
++                  LIBZ_NG_PREFIX="$basedir"
+                 fi
+                 additional_includedir="$basedir/include"
+                 ;;
+@@ -5473,7 +5473,7 @@ fi
+                   fi
+                 fi
+                 if test -z "$haveit"; then
+-                  for x in $CPPFLAGS $INCZ; do
++                  for x in $CPPFLAGS $INCZ_NG; do
+ 
+   acl_saved_prefix="$prefix"
+   prefix="$acl_final_prefix"
+@@ -5490,7 +5490,7 @@ fi
+                   done
+                   if test -z "$haveit"; then
+                     if test -d "$additional_includedir"; then
+-                                            INCZ="${INCZ}${INCZ:+ }-I$additional_includedir"
++                                            INCZ_NG="${INCZ_NG}${INCZ_NG:+ }-I$additional_includedir"
+                     fi
+                   fi
+                 fi
+@@ -5522,7 +5522,7 @@ fi
+                       fi
+                       if test -z "$haveit"; then
+                         haveit=
+-                        for x in $LDFLAGS $LIBZ; do
++                        for x in $LDFLAGS $LIBZ_NG; do
+ 
+   acl_saved_prefix="$prefix"
+   prefix="$acl_final_prefix"
+@@ -5539,11 +5539,11 @@ fi
+                         done
+                         if test -z "$haveit"; then
+                           if test -d "$dependency_libdir"; then
+-                                                        LIBZ="${LIBZ}${LIBZ:+ }-L$dependency_libdir"
++                                                        LIBZ_NG="${LIBZ_NG}${LIBZ_NG:+ }-L$dependency_libdir"
+                           fi
+                         fi
+                         haveit=
+-                        for x in $LDFLAGS $LTLIBZ; do
++                        for x in $LDFLAGS $LTLIBZ_NG; do
+ 
+   acl_saved_prefix="$prefix"
+   prefix="$acl_final_prefix"
+@@ -5560,7 +5560,7 @@ fi
+                         done
+                         if test -z "$haveit"; then
+                           if test -d "$dependency_libdir"; then
+-                                                        LTLIBZ="${LTLIBZ}${LTLIBZ:+ }-L$dependency_libdir"
++                                                        LTLIBZ_NG="${LTLIBZ_NG}${LTLIBZ_NG:+ }-L$dependency_libdir"
+                           fi
+                         fi
+                       fi
+@@ -5605,15 +5605,15 @@ fi
+                                                                                 names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                     ;;
+                   *)
+-                                        LIBZ="${LIBZ}${LIBZ:+ }$dep"
+-                    LTLIBZ="${LTLIBZ}${LTLIBZ:+ }$dep"
++                                        LIBZ_NG="${LIBZ_NG}${LIBZ_NG:+ }$dep"
++                    LTLIBZ_NG="${LTLIBZ_NG}${LTLIBZ_NG:+ }$dep"
+                     ;;
+                 esac
+               done
+             fi
+           else
+-                                                            LIBZ="${LIBZ}${LIBZ:+ }-l$name"
+-            LTLIBZ="${LTLIBZ}${LTLIBZ:+ }-l$name"
++                                                            LIBZ_NG="${LIBZ_NG}${LIBZ_NG:+ }-l$name"
++            LTLIBZ_NG="${LTLIBZ_NG}${LTLIBZ_NG:+ }-l$name"
+           fi
+         fi
+       fi
+@@ -5629,20 +5629,20 @@ fi
+       libdir="$alldirs"
+       eval flag=\"$acl_hardcode_libdir_flag_spec\"
+       libdir="$acl_saved_libdir"
+-      LIBZ="${LIBZ}${LIBZ:+ }$flag"
++      LIBZ_NG="${LIBZ_NG}${LIBZ_NG:+ }$flag"
+     else
+             for found_dir in $rpathdirs; do
+         acl_saved_libdir="$libdir"
+         libdir="$found_dir"
+         eval flag=\"$acl_hardcode_libdir_flag_spec\"
+         libdir="$acl_saved_libdir"
+-        LIBZ="${LIBZ}${LIBZ:+ }$flag"
++        LIBZ_NG="${LIBZ_NG}${LIBZ_NG:+ }$flag"
+       done
+     fi
+   fi
+   if test "X$ltrpathdirs" != "X"; then
+             for found_dir in $ltrpathdirs; do
+-      LTLIBZ="${LTLIBZ}${LTLIBZ:+ }-R$found_dir"
++      LTLIBZ_NG="${LTLIBZ_NG}${LTLIBZ_NG:+ }-R$found_dir"
+     done
+   fi
+ 
+@@ -5650,21 +5650,21 @@ fi
+ 
+ 
+ 
+-    ac_cv_libz_libs="$LIBZ"
+-    ac_cv_libz_ltlibs="$LTLIBZ"
+-    ac_cv_libz_cppflags="$INCZ"
+-    ac_cv_libz_prefix="$LIBZ_PREFIX"
++    ac_cv_libz_ng_libs="$LIBZ_NG"
++    ac_cv_libz_ng_ltlibs="$LTLIBZ_NG"
++    ac_cv_libz_ng_cppflags="$INCZ_NG"
++    ac_cv_libz_ng_prefix="$LIBZ_NG_PREFIX"
+    ;;
+ esac
+ fi
+-{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libz_libs" >&5
+-printf '%s\n' "$ac_cv_libz_libs" >&6; }
+-  LIBZ="$ac_cv_libz_libs"
+-  LTLIBZ="$ac_cv_libz_ltlibs"
+-  INCZ="$ac_cv_libz_cppflags"
+-  LIBZ_PREFIX="$ac_cv_libz_prefix"
++{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libz_ng_libs" >&5
++printf '%s\n' "$ac_cv_libz_ng_libs" >&6; }
++  LIBZ_NG="$ac_cv_libz_ng_libs"
++  LTLIBZ_NG="$ac_cv_libz_ng_ltlibs"
++  INCZ_NG="$ac_cv_libz_ng_cppflags"
++  LIBZ_NG_PREFIX="$ac_cv_libz_ng_prefix"
+ 
+-  for element in $INCZ; do
++  for element in $INCZ_NG; do
+     haveit=
+     for x in $CPPFLAGS; do
+ 
+@@ -5689,7 +5689,7 @@ printf '%s\n' "$ac_cv_libz_libs" >&6; }
+ 
+ 
+ 
+-      HAVE_LIBZ=yes
++      HAVE_LIBZ_NG=yes
+ 
+ 
+ 
+@@ -5698,14 +5698,14 @@ printf '%s\n' "$ac_cv_libz_libs" >&6; }
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: ${term_bold}** Zlib (Headers)${term_norm}" >&5
+ printf '%s\n' "$as_me: ${term_bold}** Zlib (Headers)${term_norm}" >&6;}
+ 
+-ac_fn_c_check_header_compile "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+-if test "x$ac_cv_header_zlib_h" = xyes
++ac_fn_c_check_header_compile "$LINENO" "zlib-ng.h" "ac_cv_header_zlib_ng_h" "$ac_includes_default"
++if test "x$ac_cv_header_zlib_ng_h" = xyes
+ then :
+-  printf '%s\n' "#define HAVE_ZLIB_H 1" >>confdefs.h
++  printf '%s\n' "#define HAVE_ZLIB_NG_H 1" >>confdefs.h
+ 
+ fi
+ 
+-if test "$ac_cv_header_zlib_h" = "no" ;
++if test "$ac_cv_header_zlib_ng_h" = "no" ;
+ then as_fn_error $? "cannot find ZLIB headers" "$LINENO" 5
+ fi
+ 
+@@ -5714,7 +5714,7 @@ fi
+ printf '%s\n' "$as_me: ${term_bold}** Zlib (Functions)${term_norm}" >&6;}
+ 
+ 
+-  for element in $LIBZ; do
++  for element in $LIBZ_NG; do
+     haveit=
+     for x in $LIBS; do
+ 
+@@ -5736,9 +5736,9 @@ printf '%s\n' "$as_me: ${term_bold}** Zl
+     fi
+   done
+ 
+-{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing compress2" >&5
+-printf %s "checking for library containing compress2... " >&6; }
+-if test ${ac_cv_search_compress2+y}
++{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing zng_compress2" >&5
++printf %s "checking for library containing zng_compress2... " >&6; }
++if test ${ac_cv_search_zng_compress2+y}
+ then :
+   printf %s "(cached) " >&6
+ else case e in #(
+@@ -5755,11 +5755,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char compress2 (void);
++char zng_compress2 (void);
+ int
+ main (void)
+ {
+-return compress2 ();
++return zng_compress2 ();
+   ;
+   return 0;
+ }
+@@ -5774,46 +5774,46 @@ do
+   fi
+   if ac_fn_c_try_link "$LINENO"
+ then :
+-  ac_cv_search_compress2=$ac_res
++  ac_cv_search_zng_compress2=$ac_res
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.beam \
+     conftest$ac_exeext
+-  if test ${ac_cv_search_compress2+y}
++  if test ${ac_cv_search_zng_compress2+y}
+ then :
+   break
+ fi
+ done
+-if test ${ac_cv_search_compress2+y}
++if test ${ac_cv_search_zng_compress2+y}
+ then :
+ 
+ else case e in #(
+-  e) ac_cv_search_compress2=no ;;
++  e) ac_cv_search_zng_compress2=no ;;
+ esac
+ fi
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS ;;
+ esac
+ fi
+-{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_compress2" >&5
+-printf '%s\n' "$ac_cv_search_compress2" >&6; }
+-ac_res=$ac_cv_search_compress2
++{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_zng_compress2" >&5
++printf '%s\n' "$ac_cv_search_zng_compress2" >&6; }
++ac_res=$ac_cv_search_zng_compress2
+ if test "$ac_res" != no
+ then :
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ 
+ fi
+ 
+-if test "$ac_cv_search_compress2" = "no"; then
++if test "$ac_cv_search_zng_compress2" = "no"; then
+   as_fn_error $? "cannot find ZLIB library" "$LINENO" 5
+ fi
+-ac_fn_c_check_func "$LINENO" "compressBound" "ac_cv_func_compressBound"
+-if test "x$ac_cv_func_compressBound" = xyes
++ac_fn_c_check_func "$LINENO" "zng_compressBound" "ac_cv_func_zng_compressBound"
++if test "x$ac_cv_func_zng_compressBound" = xyes
+ then :
+-  printf '%s\n' "#define HAVE_COMPRESSBOUND 1" >>confdefs.h
++  printf '%s\n' "#define HAVE_ZNG_COMPRESSBOUND 1" >>confdefs.h
+ 
+ fi
+ 
+-if test "$ac_cv_func_compressBound" = "no"; then
++if test "$ac_cv_func_zng_compressBound" = "no"; then
+   as_fn_error $? "ZLIB version 1.2 or better is required" "$LINENO" 5
+ fi
+ 
+--- modules/zlib/zlib.lisp.orig	2026-05-19 18:18:19.000000000 -0600
++++ modules/zlib/zlib.lisp	2026-06-24 09:34:07.770801245 -0600
+@@ -17,18 +17,18 @@
+ ;;; foreign function definitions
+ (default-foreign-language :stdc)
+ 
+-(c-lines "#include <zlib.h>~%")
++(c-lines "#include <zlib-ng.h>~%")
+ 
+-(def-call-out z-version (:name "zlibVersion")
++(def-call-out z-version (:name "zlibng_version")
+   (:arguments) (:return-type c-string))
+ 
+-(def-call-out compress-bound (:name "compressBound")
++(def-call-out compress-bound (:name "zng_compressBound")
+   (:arguments (sourceLen ulong)) (:return-type ulong))
+ 
+-(def-call-out error-string (:name "zError")
++(def-call-out error-string (:name "zng_zError")
+   (:arguments (errno int)) (:return-type c-string))
+ 
+-(def-call-out %compress (:name "compress2")
++(def-call-out %compress (:name "zng_compress2")
+   (:arguments (dest c-pointer :in)
+               (destlen (c-ptr ulong) :in-out)
+               (source (c-array-ptr uint8))
+@@ -36,7 +36,7 @@
+               (level int))
+   (:return-type int))
+ 
+-(def-call-out %uncompress (:name "uncompress")
++(def-call-out %uncompress (:name "zng_uncompress")
+   (:arguments (dest c-pointer :in)
+               (destlen (c-ptr ulong) :in-out)
+               (source (c-array-ptr uint8))

diff --git a/clisp.spec b/clisp.spec
index e5d7293..611942a 100644
--- a/clisp.spec
+++ b/clisp.spec
@@ -1,7 +1,7 @@
 # Upstream has not made a new release since 2010
 %global srcname clisp
-%global commit  1248cdf38eebf2d661eb450be9cb4161289420c3
-%global date    20260221
+%global commit  bc6573d7fcb55bccd5c3120dba68276938fccbe0
+%global date    20260519
 %global forgeurl https://gitlab.com/gnu-clisp/clisp
 
 # There is a plus on the end for unreleased versions, not for released versions
@@ -18,13 +18,21 @@ Version:	2.49.95
 
 %forgemeta
 
-# The project as a whole is GPL-2.0-or-later.  Exceptions:
-# - Some documentation is dual-licensed as GPL-2.0-or-later OR GFDL-1.2-or-later
-# - src/gllib is LGPL-2.1-or-later
-# - src/socket.d and modules/clx/mit-clx/doc.lisp are HPND
-# - src/xthread.d and modules/asdf/asdf.lisp are X11
-License:	GPL-2.0-or-later AND (GPL-2.0-or-later OR GFDL-1.2-or-later) AND LGPL-2.1-or-later AND HPND AND X11
-Release:	8%{?dist}
+# GPL-2.0-or-later WITH CLISP-exception-2.0: the project as a whole
+# (GPL-2.0-or-later WITH CLISP-exception-2.0 OR GFDL-1.2-no-invariants-or-later): doc/impnotes.*
+# LGPL-2.1-or-later: src/gllib
+# HPND: modules/clx/mit-clx/*.lisp, src/socket.d
+# MIT: modules/gtk2/gtk.lisp
+# X11: modules/asdf/asdf.lisp, src/xthread.d
+License:	%{shrink:
+		  GPL-2.0-or-later WITH CLISP-exception-2.0
+		  AND (GPL-2.0-or-later WITH CLISP-exception-2.0 OR GFDL-1.2-no-invariants-or-later)
+		  AND LGPL-2.1-or-later
+		  AND HPND
+		  AND MIT
+		  AND X11
+		}
+Release:	9%{?dist}
 URL:		http://www.clisp.org/
 VCS:		git:%{forgeurl}.git
 Source0:	%{forgesource}
@@ -43,8 +51,8 @@ Patch1:		%{name}-register-volatile.patch
 # Perhaps we are racing with something else that allocates a pty.  Disable
 # the test for now.
 Patch2:		%{name}-pts-access.patch
-# Do not call the deprecated siginterrupt function
-Patch3:		%{name}-siginterrupt.patch
+# Use zlib-ng instead of zlib
+Patch3:		%{name}-zlib-ng.patch
 # Fix an iconv leak in stream.d
 Patch4:		%{name}-iconv-close.patch
 # Fix a memory leak in encoding.d
@@ -70,18 +78,18 @@ Patch100:	%{name}-no-inline.patch
 
 BuildRequires:	dbus-devel
 BuildRequires:	diffutils
-BuildRequires:	emacs
+BuildRequires:	emacs-nw
 BuildRequires:	fcgi-devel
 BuildRequires:	ffcall-devel
 BuildRequires:	gcc
 BuildRequires:	gdbm-devel
-BuildRequires:	gettext-devel
+BuildRequires:	gettext
 BuildRequires:	ghostscript
 BuildRequires:	glibc-langpack-en
 BuildRequires:	glibc-langpack-fr
 BuildRequires:	glibc-langpack-ja
 BuildRequires:	glibc-langpack-zh
-BuildRequires:	groff
+BuildRequires:	groff-base
 %if %{with gtk2}
 BuildRequires:	gtk2-devel
 BuildRequires:	libglade2-devel
@@ -99,7 +107,7 @@ BuildRequires:	pari-gp
 BuildRequires:	libpq-devel
 BuildRequires:	readline-devel
 BuildRequires:	vim-filesystem
-BuildRequires:	zlib-devel
+BuildRequires:	zlib-ng-devel
 
 Requires:	emacs-filesystem
 Requires:	vim-filesystem
@@ -467,6 +475,11 @@ make -C build base-mod-check
 
 
 %changelog
+* Wed Jun 24 2026 Jerry James <loganjerry@gmail.com> - 2.49.95-9
+- Update to latest git snapshot for bug fixes
+- Drop upstreamed siginterrupt patch
+- Use zlib-ng instead of zlib
+
 * Sat Apr 04 2026 Jerry James <loganjerry@gmail.com> - 2.49.95-8
 - Update to latest git snapshot to fix gnulib issue
 - Update the French translation

diff --git a/sources b/sources
index ea0e7fa..e8a27e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (clisp-1248cdf38eebf2d661eb450be9cb4161289420c3.tar.bz2) = 7850a00ae13ed7965c4d0f0eafa033e61062e7a4df4e44b4de7395f5c9b272bbdee251f1b3cbdbfa4af41d04f6427a4a6b66f426537b395beb6f17f4bdab467d
+SHA512 (clisp-bc6573d7fcb55bccd5c3120dba68276938fccbe0.tar.bz2) = f9f3990087d63b6c6545e2f74435ff9a53398e9965e669a5aaf0f0b47646e18109052a1b6bd14fd9b25668832fb7244f037a7a357bf3a46a65d66a097c832134

                 reply	other threads:[~2026-06-24 17:14 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178232128912.1.311076777303063754.rpms-clisp-484a270198fd@fedoraproject.org \
    --to=loganjerry@gmail.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox