Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Patrick Lauer (patrick)" <patrick@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-crypt/johntheripper/files: johntheripper-1.7.3.1-all-5-stackdef.S.patch johntheripper-1.7.3.1-stackdef.S.patch johntheripper-1.7.3.1-cflags.patch
Date: Thu, 03 Sep 2009 07:28:12
Message-Id: E1MjBYV-00073M-Co@stork.gentoo.org
1 patrick 09/09/03 12:36:47
2
3 Modified: johntheripper-1.7.3.1-stackdef.S.patch
4 Added: johntheripper-1.7.3.1-all-5-stackdef.S.patch
5 johntheripper-1.7.3.1-cflags.patch
6 Log:
7 Small set of fixes, thanks to RB. Closes #277811
8 (Portage version: 2.2_rc40/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.2 app-crypt/johntheripper/files/johntheripper-1.7.3.1-stackdef.S.patch
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/johntheripper/files/johntheripper-1.7.3.1-stackdef.S.patch?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/johntheripper/files/johntheripper-1.7.3.1-stackdef.S.patch?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/johntheripper/files/johntheripper-1.7.3.1-stackdef.S.patch?r1=1.1&r2=1.2
16
17 Index: johntheripper-1.7.3.1-stackdef.S.patch
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/files/johntheripper-1.7.3.1-stackdef.S.patch,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- johntheripper-1.7.3.1-stackdef.S.patch 4 Nov 2008 08:06:55 -0000 1.1
24 +++ johntheripper-1.7.3.1-stackdef.S.patch 3 Sep 2009 12:36:47 -0000 1.2
25 @@ -1,18 +1,17 @@
26 -Index: john-1.7.3.1/src/sha1-mmx.S
27 -===================================================================
28 ---- john-1.7.3.1.orig/src/sha1-mmx.S
29 -+++ john-1.7.3.1/src/sha1-mmx.S
30 -@@ -558,3 +558,6 @@ endianity:
31 - por tmp2, ctxd
32 - por tmp4, ctxe
33 - */
34 -+#if defined(__linux__) && defined(__ELF__)
35 -+.section .note.GNU-stack,"",%progbits
36 -+#endif
37 -Index: john-1.7.3.1/src/sparc.S
38 -===================================================================
39 ---- john-1.7.3.1.orig/src/sparc.S
40 -+++ john-1.7.3.1/src/sparc.S
41 +diff -urpN john-1.7.3.1.orig/src/alpha.S john-1.7.3.1/src/alpha.S
42 +--- john-1.7.3.1.orig/src/alpha.S 2002-04-10 08:13:25.000000000 -0600
43 ++++ john-1.7.3.1/src/alpha.S 2009-06-26 13:56:10.635952569 -0600
44 +@@ -318,3 +318,7 @@ DES_KS_current:
45 + .space 128
46 +
47 + .comm DES_KS_table, (8 * 128 * 16 * 8), 128
48 ++
49 ++#ifdef __ELF__
50 ++.section .note.GNU-stack,"",@progbits
51 ++#endif
52 +diff -urpN john-1.7.3.1.orig/src/sparc.S john-1.7.3.1/src/sparc.S
53 +--- john-1.7.3.1.orig/src/sparc.S 2002-04-10 08:13:25.000000000 -0600
54 ++++ john-1.7.3.1/src/sparc.S 2009-06-26 13:54:31.388950767 -0600
55 @@ -410,3 +410,7 @@ DES_count:
56 .common DES_KS_table, (8 * 128 * 16 * 8), 32
57
58 @@ -21,11 +20,10 @@
59 +#ifdef __ELF__
60 +.section .note.GNU-stack,"",@progbits
61 +#endif
62 -Index: john-1.7.3.1/src/x86-64.S
63 -===================================================================
64 ---- john-1.7.3.1.orig/src/x86-64.S
65 -+++ john-1.7.3.1/src/x86-64.S
66 -@@ -1040,3 +1040,7 @@ DES_bs_crypt_LM_loop:
67 +diff -urpN john-1.7.3.1.orig/src/x86-64.S john-1.7.3.1/src/x86-64.S
68 +--- john-1.7.3.1.orig/src/x86-64.S 2008-07-13 15:35:12.000000000 -0600
69 ++++ john-1.7.3.1/src/x86-64.S 2009-06-26 13:54:31.392950649 -0600
70 +@@ -1052,3 +1052,7 @@ DES_bs_crypt_LM_loop:
71 subl $1,rounds
72 jnz DES_bs_crypt_LM_loop
73 ret
74 @@ -33,11 +31,10 @@
75 +#ifdef __ELF__
76 +.section .note.GNU-stack,"",@progbits
77 +#endif
78 -Index: john-1.7.3.1/src/x86-mmx.S
79 -===================================================================
80 ---- john-1.7.3.1.orig/src/x86-mmx.S
81 -+++ john-1.7.3.1/src/x86-mmx.S
82 -@@ -1302,3 +1302,7 @@ DES_bs_crypt_LM_loop:
83 +diff -urpN john-1.7.3.1.orig/src/x86-mmx.S john-1.7.3.1/src/x86-mmx.S
84 +--- john-1.7.3.1.orig/src/x86-mmx.S 2008-07-13 15:45:55.000000000 -0600
85 ++++ john-1.7.3.1/src/x86-mmx.S 2009-06-26 13:54:31.396971552 -0600
86 +@@ -1314,3 +1314,7 @@ DES_bs_crypt_LM_loop:
87 emms
88 #endif
89 ret
90 @@ -45,25 +42,23 @@
91 +#ifdef __ELF__
92 +.section .note.GNU-stack,"",@progbits
93 +#endif
94 -Index: john-1.7.3.1/src/x86-sse.S
95 -===================================================================
96 ---- john-1.7.3.1.orig/src/x86-sse.S
97 -+++ john-1.7.3.1/src/x86-sse.S
98 -@@ -1289,3 +1289,7 @@ DES_bs_crypt_LM_loop:
99 - jnz DES_bs_crypt_LM_loop
100 - popl %esi
101 +diff -urpN john-1.7.3.1.orig/src/x86.S john-1.7.3.1/src/x86.S
102 +--- john-1.7.3.1.orig/src/x86.S 2008-07-07 12:30:36.000000000 -0600
103 ++++ john-1.7.3.1/src/x86.S 2009-06-26 13:54:31.404961468 -0600
104 +@@ -1366,3 +1366,7 @@ CPU_detect_ret:
105 + movzbl %al,%eax
106 + popl %ebx
107 ret
108 +
109 +#ifdef __ELF__
110 +.section .note.GNU-stack,"",@progbits
111 +#endif
112 -Index: john-1.7.3.1/src/x86.S
113 -===================================================================
114 ---- john-1.7.3.1.orig/src/x86.S
115 -+++ john-1.7.3.1/src/x86.S
116 -@@ -1362,3 +1362,7 @@ CPU_detect_ret:
117 - movzbl %al,%eax
118 - popl %ebx
119 +diff -urpN john-1.7.3.1.orig/src/x86-sse.S john-1.7.3.1/src/x86-sse.S
120 +--- john-1.7.3.1.orig/src/x86-sse.S 2008-07-13 15:44:58.000000000 -0600
121 ++++ john-1.7.3.1/src/x86-sse.S 2009-06-26 13:54:31.399949655 -0600
122 +@@ -1301,3 +1301,7 @@ DES_bs_crypt_LM_loop:
123 + jnz DES_bs_crypt_LM_loop
124 + popl %esi
125 ret
126 +
127 +#ifdef __ELF__
128
129
130
131 1.1 app-crypt/johntheripper/files/johntheripper-1.7.3.1-all-5-stackdef.S.patch
132
133 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/johntheripper/files/johntheripper-1.7.3.1-all-5-stackdef.S.patch?rev=1.1&view=markup
134 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/johntheripper/files/johntheripper-1.7.3.1-all-5-stackdef.S.patch?rev=1.1&content-type=text/plain
135
136 Index: johntheripper-1.7.3.1-all-5-stackdef.S.patch
137 ===================================================================
138 diff -urpN john-1.7.3.1.orig/src/md5-mmx.S john-1.7.3.1/src/md5-mmx.S
139 --- john-1.7.3.1.orig/src/md5-mmx.S 2009-06-26 14:03:21.073960144 -0600
140 +++ john-1.7.3.1/src/md5-mmx.S 2009-06-26 14:01:28.889959256 -0600
141 @@ -306,3 +306,6 @@ mdfivemmx_noinit:
142
143 ret
144
145 +#ifdef __ELF__
146 +.section .note.GNU-stack,"",@progbits
147 +#endif
148 diff -urpN john-1.7.3.1.orig/src/sha1-mmx.S john-1.7.3.1/src/sha1-mmx.S
149 --- john-1.7.3.1.orig/src/sha1-mmx.S 2009-06-26 14:03:21.093949076 -0600
150 +++ john-1.7.3.1/src/sha1-mmx.S 2009-06-26 14:01:36.706958726 -0600
151 @@ -558,3 +558,7 @@ endianity:
152 por tmp2, ctxd
153 por tmp4, ctxe
154 */
155 +
156 +#ifdef __ELF__
157 +.section .note.GNU-stack,"",@progbits
158 +#endif
159
160
161
162 1.1 app-crypt/johntheripper/files/johntheripper-1.7.3.1-cflags.patch
163
164 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/johntheripper/files/johntheripper-1.7.3.1-cflags.patch?rev=1.1&view=markup
165 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/johntheripper/files/johntheripper-1.7.3.1-cflags.patch?rev=1.1&content-type=text/plain
166
167 Index: johntheripper-1.7.3.1-cflags.patch
168 ===================================================================
169 * this is an incomplete patch, adding CFLAGS to some targets that we use
170 without this patch, one can't configure john via defines
171
172 --- src/Makefile
173 +++ src/Makefile
174 @@ -597,7 +597,7 @@
175 $(LN) ppc32.h arch.h
176 $(MAKE) $(PROJ) \
177 CC=cc \
178 - CFLAGS="-c -qunroll=2 -qarch=ppc -qchars=signed" \
179 + CFLAGS="$(CFLAGS) -c -qunroll=2 -qarch=ppc -qchars=signed" \
180 LDFLAGS="-s -lbsd" \
181 OPT_NORMAL="-O2" \
182 OPT_INLINE="-O3 -Q=99 -w"
183 @@ -626,7 +626,7 @@
184 $(LN) ppc32alt.h arch.h
185 $(MAKE) $(PROJ) \
186 JOHN_OBJS="$(JOHN_OBJS) ppc-alti-macosx.o" \
187 - CFLAGS="-c -Wall -fomit-frame-pointer" \
188 + CFLAGS="$(CFLAGS) -c -Wall -fomit-frame-pointer" \
189 OPT_NORMAL="-fast -mcpu=7450" \
190 OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000"
191
192 @@ -637,7 +637,7 @@
193 $(LN) ppc32.h arch.h
194 $(MAKE) $(PROJ) \
195 CC=cc \
196 - CFLAGS="-c -traditional-cpp" \
197 + CFLAGS="$(CFLAGS) -c -traditional-cpp" \
198 OPT_NORMAL="-O2" \
199 OPT_INLINE="-O3"
200
201 @@ -646,7 +646,7 @@
202 $(LN) ppc32.h arch.h
203 $(MAKE) $(PROJ) \
204 ASFLAGS="$(ASFLAGS) -arch ppc" \
205 - CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
206 + CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
207 LDFLAGS="$(LDFLAGS) -arch ppc" \
208 OPT_NORMAL="-O2" \
209 OPT_INLINE="-O3 -finline-limit=4000"
210 @@ -656,7 +656,7 @@
211 $(LN) ppc64alt.h arch.h
212 $(MAKE) $(PROJ) \
213 JOHN_OBJS="$(JOHN_OBJS) ppc-alti-macosx.o" \
214 - CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \
215 + CFLAGS="$(CFLAGS) -c -m64 -Wall -fomit-frame-pointer" \
216 LDFLAGS="$(LDFLAGS) -m64" \
217 OPT_NORMAL="-fast" \
218 OPT_INLINE="-fast -finline-limit=4000"
219 @@ -664,7 +664,7 @@
220 macosx-ppc64:
221 $(LN) ppc64.h arch.h
222 $(MAKE) $(PROJ) \
223 - CFLAGS="-c -Wall -fomit-frame-pointer -m64" \
224 + CFLAGS="$(CFLAGS) -c -Wall -fomit-frame-pointer -m64" \
225 LDFLAGS="$(LDFLAGS) -m64" \
226 OPT_NORMAL="-fast" \
227 OPT_INLINE="-fast -finline-limit=4000"
228 @@ -698,7 +698,7 @@
229 $(MAKE) $(PROJ) \
230 JOHN_OBJS="$(JOHN_OBJS) ppc-alti-macosx.o" \
231 ASFLAGS="$(ASFLAGS) -arch ppc" \
232 - CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
233 + CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
234 LDFLAGS="$(LDFLAGS) -arch ppc" \
235 OPT_NORMAL="-fast -mcpu=7450" \
236 OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000"
Report Message
Find on MARC Find on Google Groups