Debian Codegraph @

debian/patches/Version_2_6_15pre1

raw
1 Description: <short summary of the patch>
2 TODO: Put a short summary on the line above and replace this paragraph
3 with a longer explanation of this change. Complete the meta-information
4 with other relevant fields (see below for details). To make it easier, the
5 information below has been extracted from the changelog. Adjust it or drop
6 it.
7 .
8 gcl (2.6.14-2) unstable; urgency=medium
9 .
10 * Version_2_6_15pre1
11 Author: Camm Maguire <[email protected]>
12
13 ---
14 The information above should follow the Patch Tagging Guidelines, please
15 checkout https://dep.debian.net/deps/dep3/ to learn about the format. Here
16 are templates for supplementary fields that you might want to add:
17
18 Origin: (upstream|backport|vendor|other), (<patch-url>|commit:<commit-id>)
19 Bug: <upstream-bugtracker-url>
20 Bug-Debian: https://bugs.debian.org/<bugnumber>
21 Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
22 Forwarded: (no|not-needed|<patch-forwarded-url>)
23 Applied-Upstream: <version>, (<commit-url>|commit:<commid-id>)
24 Reviewed-By: <name and email of someone who approved/reviewed the patch>
25 Last-Update: 2023-02-12
26
27 --- gcl-2.6.14.orig/cmpnew/gcl_cmpfun.lsp
28 +++ gcl-2.6.14/cmpnew/gcl_cmpfun.lsp
29 @@ -419,7 +419,7 @@
30 (t (error "should not get here")))
31 )))
32 (c1expr (cons fun args))))
33 -(defun shift>> (a b) (ash a b))
34 +(defun shift>> (a b) (ash a (- b)))
35 (defun shift<< (a b) (ash a b))
36 (si:putprop 'ash '(c1ash-condition . c1ash) 'c1conditional)
37 (si:putprop 'shift>> "Lash" 'lfun)
38 --- gcl-2.6.14.orig/cmpnew/gcl_cmpopt.lsp
39 +++ gcl-2.6.14/cmpnew/gcl_cmpopt.lsp
40 @@ -1280,11 +1280,6 @@
41 ;; type_of(#0)==t_bitvector")
42 ;; (get 'vectorp 'inline-always))
43
44 -;;WRITE-CHAR
45 - (push '((t) t #.(flags set)
46 - "@0;(writec_stream(char_code(#0),Vstandard_output->s.s_dbind),(#0))")
47 - (get 'write-char 'inline-unsafe))
48 -
49 ;;EVENP
50 (push '((t) boolean #.(compiler::flags) "immnum_evenp(#0)") (get 'evenp 'compiler::inline-always))
51 ;;ODDP
52 --- gcl-2.6.14.orig/configure
53 +++ gcl-2.6.14/configure
54 @@ -7091,8 +7091,7 @@ else $as_nop
55 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
56 /* end confdefs.h. */
57
58 - #include <stdio.h>
59 - #include <stdlib.h>
60 + #include "h/unrandomize_headers.h"
61 int main(int argc,char *argv[],char *envp[]) {
62 #include "h/unrandomize.h"
63 return 0;
64 @@ -7128,8 +7127,7 @@ else $as_nop
65 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
66 /* end confdefs.h. */
67
68 - #include <stdio.h>
69 - #include <stdlib.h>
70 + #include "h/unrandomize_headers.h"
71 int main(int argc,char * argv[],char * envp[]) {
72 FILE *f;
73 #ifdef CAN_UNRANDOMIZE_SBRK
74 @@ -7165,8 +7163,7 @@ else $as_nop
75 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
76 /* end confdefs.h. */
77
78 - #include <stdio.h>
79 - #include <stdlib.h>
80 + #include "h/unrandomize_headers.h"
81 int main(int argc,char * argv[],char * envp[]) {
82 FILE *f;
83 #ifdef CAN_UNRANDOMIZE_SBRK
84 @@ -7215,8 +7212,7 @@ else $as_nop
85 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
86 /* end confdefs.h. */
87
88 - #include <stdio.h>
89 - #include <stdlib.h>
90 + #include "h/unrandomize_headers.h"
91 int main(int argc,char **argv,char **envp) {
92 FILE *fp = fopen("conftest1","w");
93 #ifdef CAN_UNRANDOMIZE_SBRK
94 @@ -7255,8 +7251,7 @@ else $as_nop
95 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
96 /* end confdefs.h. */
97
98 - #include <stdio.h>
99 - #include <stdlib.h>
100 + #include "h/unrandomize_headers.h"
101 int main(int argc,char **argv,char **envp) {
102 void *b,*c;
103 FILE *fp = fopen("conftest1","w");
104 @@ -7311,8 +7306,7 @@ else $as_nop
105 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
106 /* end confdefs.h. */
107
108 - #include <stdio.h>
109 - #include <stdlib.h>
110 + #include "h/unrandomize_headers.h"
111 int
112 main(int argc,char **argv,char **envp) {
113 FILE *fp = fopen("conftest1","w");
114 @@ -7362,8 +7356,7 @@ else $as_nop
115 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
116 /* end confdefs.h. */
117
118 - #include <stdio.h>
119 - #include <stdlib.h>
120 + #include "h/unrandomize_headers.h"
121 int
122 main(int argc,char **argv,char **envp) {
123 void *v ;
124 @@ -7415,8 +7408,7 @@ else $as_nop
125 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
126 /* end confdefs.h. */
127
128 - #include <stdio.h>
129 - #include <stdlib.h>
130 + #include "h/unrandomize_headers.h"
131 int
132 main(int argc,char **argv,char **envp) {
133 #ifdef CAN_UNRANDOMIZE_SBRK
134 --- gcl-2.6.14.orig/configure.in
135 +++ gcl-2.6.14/configure.in
136 @@ -1181,8 +1181,7 @@ if test "$HAVE_SBRK" = "1" ; then
137 AC_RUN_IFELSE(
138 [AC_LANG_SOURCE(
139 [[
140 - #include <stdio.h>
141 - #include <stdlib.h>
142 + #include "h/unrandomize_headers.h"
143 int main(int argc,char *argv[],char *envp[]) {
144 #include "h/unrandomize.h"
145 return 0;
146 @@ -1197,8 +1196,7 @@ if test "$HAVE_SBRK" = "1" ; then
147 AC_RUN_IFELSE(
148 [AC_LANG_SOURCE(
149 [[
150 - #include <stdio.h>
151 - #include <stdlib.h>
152 + #include "h/unrandomize_headers.h"
153 int main(int argc,char * argv[],char * envp[]) {
154 FILE *f;
155 #ifdef CAN_UNRANDOMIZE_SBRK
156 @@ -1218,8 +1216,7 @@ if test "$HAVE_SBRK" = "1" ; then
157 AC_RUN_IFELSE(
158 [AC_LANG_SOURCE(
159 [[
160 - #include <stdio.h>
161 - #include <stdlib.h>
162 + #include "h/unrandomize_headers.h"
163 int main(int argc,char * argv[],char * envp[]) {
164 FILE *f;
165 #ifdef CAN_UNRANDOMIZE_SBRK
166 @@ -1249,8 +1246,7 @@ AC_MSG_CHECKING(CSTACK_DIRECTION)
167 AC_RUN_IFELSE(
168 [AC_LANG_SOURCE(
169 [[
170 - #include <stdio.h>
171 - #include <stdlib.h>
172 + #include "h/unrandomize_headers.h"
173 int main(int argc,char **argv,char **envp) {
174 FILE *fp = fopen("conftest1","w");
175 #ifdef CAN_UNRANDOMIZE_SBRK
176 @@ -1268,8 +1264,7 @@ AC_MSG_CHECKING([finding CSTACK_ALIGNMEN
177 AC_RUN_IFELSE(
178 [AC_LANG_SOURCE(
179 [[
180 - #include <stdio.h>
181 - #include <stdlib.h>
182 + #include "h/unrandomize_headers.h"
183 int main(int argc,char **argv,char **envp) {
184 void *b,*c;
185 FILE *fp = fopen("conftest1","w");
186 @@ -1297,8 +1292,7 @@ AC_MSG_CHECKING(CSTACK_ADDRESS)
187 AC_RUN_IFELSE(
188 [AC_LANG_SOURCE(
189 [[
190 - #include <stdio.h>
191 - #include <stdlib.h>
192 + #include "h/unrandomize_headers.h"
193 int
194 main(int argc,char **argv,char **envp) {
195 FILE *fp = fopen("conftest1","w");
196 @@ -1327,8 +1321,7 @@ AC_MSG_CHECKING([cstack bits])
197 AC_RUN_IFELSE(
198 [AC_LANG_SOURCE(
199 [[
200 - #include <stdio.h>
201 - #include <stdlib.h>
202 + #include "h/unrandomize_headers.h"
203 int
204 main(int argc,char **argv,char **envp) {
205 void *v ;
206 @@ -1359,8 +1352,7 @@ AC_MSG_CHECKING(NEG_CSTACK_ADDRESS)
207 AC_RUN_IFELSE(
208 [AC_LANG_SOURCE(
209 [[
210 - #include <stdio.h>
211 - #include <stdlib.h>
212 + #include "h/unrandomize_headers.h"
213 int
214 main(int argc,char **argv,char **envp) {
215 #ifdef CAN_UNRANDOMIZE_SBRK
216 --- gcl-2.6.14.orig/git.tag
217 +++ gcl-2.6.14/git.tag
218 @@ -1,2 +1 @@
219 -"Version_2_6_14"
220 -
221 +"Version_2_6_15pre1"
222 --- gcl-2.6.14.orig/h/unrandomize.h
223 +++ gcl-2.6.14/h/unrandomize.h
224 @@ -1,11 +1,3 @@
225 -#include <sys/personality.h>
226 -#include <sys/mman.h>
227 -#include <syscall.h>
228 -#include <unistd.h>
229 -#include <string.h>
230 -#include <alloca.h>
231 -#include <errno.h>
232 -
233 {
234 errno=0;
235
236 --- /dev/null
237 +++ gcl-2.6.14/h/unrandomize_headers.h
238 @@ -0,0 +1,10 @@
239 +#include <stdio.h>
240 +#include <stdlib.h>
241 +#include <sys/personality.h>
242 +#include <sys/mman.h>
243 +#include <syscall.h>
244 +#include <unistd.h>
245 +#include <string.h>
246 +#include <alloca.h>
247 +#include <errno.h>
248 +
249 --- gcl-2.6.14.orig/lsp/gcl_top.lsp
250 +++ gcl-2.6.14/lsp/gcl_top.lsp
251 @@ -130,6 +130,7 @@
252 (cond ((equal x "-load") (load (pop args)))
253 ((equal x "-eval") (eval (read-from-string (pop args))))
254 ((equal x "-batch") (setq *top-level-hook* 'bye))
255 + ((or (equal x "-v") (equal x "--version")) (format t "~a~%" (lisp-implementation-version)) (setq *top-level-hook* 'bye))
256 ((equal x "-o-file") (unless (read-from-string (car args))
257 (push (cons :o-file nil) compile)
258 (pop args)))
259 --- gcl-2.6.14.orig/o/gcl_readline.d
260 +++ gcl-2.6.14/o/gcl_readline.d
261 @@ -109,7 +109,7 @@ rl_completion_words(const char *text, in
262 }
263 }
264
265 - package=package ? package : user_package;
266 + package=(package!=OBJNULL && package!=Cnil) ? package : user_package;
267 use=package->p.p_uselist;
268 internal=temp && temp[1]==':' ? 1 : 0;
269 ftext=text;
270 --- gcl-2.6.14.orig/o/main.c
271 +++ gcl-2.6.14/o/main.c
272 @@ -516,6 +516,8 @@ which(const char *n,char *o) {
273 static int ARGC;
274 static char **ARGV;
275
276 +#include "unrandomize_headers.h"
277 +
278 int
279 main(int argc, char **argv, char **envp) {
280