Add -ensure-6x patch (rhbz#2115476).

This commit is contained in:
Jerry James 2022-08-08 13:07:28 -06:00
commit 4be1418d14
2 changed files with 20 additions and 1 deletions

11
clisp-ensure-6x.patch Normal file
View file

@ -0,0 +1,11 @@
--- modules/syscalls/calls.c.orig 2021-06-28 14:32:42.000000000 -0600
+++ modules/syscalls/calls.c 2022-08-04 13:21:10.461997402 -0600
@@ -677,7 +677,7 @@ DEFUN(OS:VERSION>=, string1 string2){VAL
&& name[name##_bytelen-6]=='X') { \
c_template = name; \
} else { \
- c_template = (char*)alloca(name##_bytelen+6); \
+ c_template = (char*)alloca(name##_bytelen+7); \
strcpy(c_template,name); \
strcat(c_template,"XXXXXX"); \
}

View file

@ -16,7 +16,7 @@ Version: 2.49.93
%forgemeta
Release: 24%{?dist}
Release: 25%{?dist}
License: GPLv2+
URL: http://www.clisp.org/
Source0: %{forgesource}
@ -41,6 +41,10 @@ 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
@ -122,6 +126,7 @@ Files necessary for linking CLISP programs.
%ifarch %{power64}
%patch5 -p0
%endif
%patch6 -p0
cp -p %{SOURCE1} emacs
cp -p %{SOURCE2} %{SOURCE3} src/po
@ -430,6 +435,9 @@ make -C build base-mod-check
%changelog
* Mon Aug 8 2022 Jerry James <loganjerry@gmail.com> - 2.49.93-25
- Add -ensure-6x patch (rhbz#2115476)
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.49.93-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild