From d8d6fcacdb03769287452b0310404ca621b83e13 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Tue, 10 Jan 2023 15:13:05 -0700
Subject: [PATCH] Update to latest git snapshot for buffer overflow fix.

Drop upstreamed pari patch.
---
 clisp-pari.patch | 31 -------------------------------
 clisp.spec       | 21 +++++++++++----------
 sources          |  2 +-
 3 files changed, 12 insertions(+), 42 deletions(-)
 delete mode 100644 clisp-pari.patch

diff --git a/clisp-pari.patch b/clisp-pari.patch
deleted file mode 100644
index ca8f6f9..0000000
--- a/clisp-pari.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- modules/pari/desc2lisp.lisp.orig	2021-06-28 14:32:42.000000000 -0600
-+++ modules/pari/desc2lisp.lisp	2022-09-19 21:12:06.708459685 -0600
-@@ -166,7 +166,15 @@
-       (setq h (car h)))
-     (if (and h (ext:starts-with-p h f) (setq end (search "):" h)))
-         ;;(parse-arglist-regexp h :start (1+ (position #\( h)) :end end)
--        (parse-arglist-read h :start (position #\( h) :end (1+ end))
-+	(let ((l (parse-arglist-read h :start (position #\( h) :end (1+ end))))
-+	  (and
-+	    (consp l)
-+	    (consp (cdr l))
-+	    (consp (cadr l))
-+	    (symbolp (caadr l))
-+	    (equalp (symbol-name (caadr l)) "T")
-+	    (setf (caadr l) 'T_))
-+	  l)
-         ;; (or (warn "~S: no arglist in ~S" 'desc-arglist desc) ...)
-         :unspecific)))
- 
---- modules/pari/pari.lisp.orig	2021-06-28 14:32:42.000000000 -0600
-+++ modules/pari/pari.lisp	2022-09-19 21:23:25.026083675 -0600
-@@ -218,8 +218,7 @@ t.e., this is the memory size for the re
- ;; extern int factor_add_primes;
- (def-c-var factor_add_primes (:type int))
- 
--;; extern ulong DEBUGFILES, DEBUGLEVEL, DEBUGMEM
--(def-c-var debugfiles (:name "DEBUGFILES") (:type ulong))
-+;; extern ulong DEBUGLEVEL, DEBUGMEM
- (def-c-var debuglevel (:name "DEBUGLEVEL") (:type ulong))
- (def-c-var debugmem (:name "DEBUGMEM") (:type ulong))
- 
diff --git a/clisp.spec b/clisp.spec
index 1f051ca..b8c2478 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  de01f0f47bb44d3a0f9e842464cf2520b238f356
-%global date    20210628
+%global commit  957c79a252bda35e56ca5c64d4af8d7ef9de9037
+%global date    20221228
 %global forgeurl https://gitlab.com/gnu-clisp/clisp
 
 # There is a plus on the end for unreleased versions, not for released versions
@@ -22,7 +22,7 @@ Version:	2.49.93
 # - 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:	28%{?dist}
+Release:	29%{?dist}
 URL:		http://www.clisp.org/
 Source0:	%{forgesource}
 # Upstream dropped this file from the distribution
@@ -34,8 +34,10 @@ Source3:	http://translationproject.org/latest/clisp/de.po
 Patch0:		%{name}-db.patch
 # https://sourceforge.net/p/clisp/patches/32/
 Patch1:		%{name}-format.patch
-# Adapt to changes in pari 2.15.0
-Patch2:		%{name}-pari.patch
+# The ENSURE_6X macro adds 6 'X' characters to a string.  However, it allocates
+# only 6 bytes more than the length of the string, which is not enough for the
+# null terminator.  See https://bugzilla.redhat.com/show_bug.cgi?id=2115476.
+Patch2:         %{name}-ensure-6x.patch
 # The combination of register and volatile is nonsensical
 Patch3:		%{name}-register-volatile.patch
 # A test that writes to /dev/pts/0 succeeds or fails apparently at random.
@@ -46,10 +48,6 @@ Patch4:         %{name}-pts-access.patch
 # Work around a problem inlining a function on ppc64le
 # See https://bugzilla.redhat.com/show_bug.cgi?id=2049371
 Patch5:         %{name}-no-inline.patch
-# The ENSURE_6X macro adds 6 'X' characters to a string.  However, it allocates
-# only 6 bytes more than the length of the string, which is not enough for the
-# null terminator.  See https://bugzilla.redhat.com/show_bug.cgi?id=2115476.
-Patch6:         %{name}-ensure-6x.patch
 
 BuildRequires:	dbus-devel
 BuildRequires:	diffutils
@@ -127,7 +125,6 @@ Files necessary for linking CLISP programs.
 %ifarch %{power64}
 %patch5 -p0
 %endif
-%autopatch -m6 -p0
 cp -p %{SOURCE1} emacs
 cp -p %{SOURCE2} %{SOURCE3} src/po
 
@@ -447,6 +444,10 @@ make -C build base-mod-check
 
 
 %changelog
+* Tue Jan 10 2023 Jerry James <loganjerry@gmail.com> - 2.49.93-29
+- Update to latest git snapshot for buffer overflow fix
+- Drop upstreamed pari patch
+
 * Mon Sep 19 2022 Jerry James <loganjerry@gmail.com> - 2.49.93-28
 - Rebuild for pari 2.15.0
 
diff --git a/sources b/sources
index 188f8e2..c7aae19 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (clisp-de01f0f47bb44d3a0f9e842464cf2520b238f356.tar.bz2) = d135248d22233194c0cb087053c02b72bd24c0bb2c6b23f6ff9a931ef7b09446a55f061626bfa5da55531a11665c615dae0c2a651df5114a019c5188b67e8b5a
+SHA512 (clisp-957c79a252bda35e56ca5c64d4af8d7ef9de9037.tar.bz2) = 533d46ed32d5ce70f9e56cb029b518ef9e2741ae04e054e798316bb40bb69d7c248aaa74e35ae8fcb08c2b1924d7e062c3bb7451698034408d3b3964255a7564