From 64d8fd0b91b824649275eb2aea1d39dd04746a91 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Aug 24 2020 18:38:00 +0000 Subject: Update to 2.6.13pre92. --- diff --git a/Version_2_6_13pre92.patch b/Version_2_6_13pre92.patch new file mode 100644 index 0000000..39a99da --- /dev/null +++ b/Version_2_6_13pre92.patch @@ -0,0 +1,53 @@ +Description: + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + gcl (2.6.12-95) unstable; urgency=high + . + * Version_2_6_13pre90 + * build under GCL_MEM_MULTIPLE=0.1 + * Bug fix: "FTBFS: Unrecoverable error: Segmentation violation..", + thanks to Lucas Nussbaum (Closes: #952334). +Author: Camm Maguire +Bug-Debian: https://bugs.debian.org/952334 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: 2020-08-23 + +--- gcl-2.6.12.orig/h/elf32_armhf_reloc_special.h ++++ gcl-2.6.12/h/elf32_armhf_reloc_special.h +@@ -6,13 +6,15 @@ static ul tz=sizeof(tramp)/sizeof(ul); + static ul * + next_plt_entry(ul *p,ul *pe) { + +- ul l0=0xe5bef000,/*ldr pc,[ip,#]*/ +- l1=0xe5bcf000;/*ldr pc,[lr,#]*/ ++ /* 4778 bx pc */ /*optional*/ ++ /* e7fd b.n 20dd0 <__fprintf_chk@plt> */ /*optional*/ ++ /* above when stripped becomes undefined instruction*/ ++ /* e28fc601 add ip, pc, #1048576 ; 0x100000 */ ++ /* e28ccab0 add ip, ip, #176, 20 ; 0xb0000 */ ++ /* e5bcf914 ldr pc, [ip, #2324]! ; 0x914 */ + +- for (;p>20)!=0xe28;p++); ++ return p; + + } + diff --git a/gcl.spec b/gcl.spec index 798d298..322d52f 100644 --- a/gcl.spec +++ b/gcl.spec @@ -12,11 +12,11 @@ %global _lto_cflags %{nil} # Upstream prerelease number -%global prerel 90 +%global prerel 92 Name: gcl Version: 2.6.13 -Release: 0.%{prerel}.1%{?dist}.2 +Release: 0.%{prerel}%{?dist} Summary: GNU Common Lisp License: GPL+ and LGPLv2+ @@ -145,6 +145,7 @@ Patch110: Version_2_6_13pre87.patch Patch111: Version_2_6_13pre88.patch Patch112: Version_2_6_13pre89.patch Patch113: Version_2_6_13pre90.patch +Patch114: Version_2_6_13pre92.patch ### Fedora patches @@ -370,6 +371,9 @@ rm -f /tmp/gazonk_* /tmp/gcl_* %changelog +* Mon Aug 24 2020 Jerry James - 2.6.13-0.92 +- Update to 2.6.13pre92 + * Sat Aug 01 2020 Fedora Release Engineering - 2.6.13-0.90.1.2 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild