openpkg/beecrypt.patch@4ecfc2416fd8
openpkg/beecrypt.patch
Tue, 29 Mar 2011 19:46:35 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 29 Mar 2011 19:46:35 +0200
- changeset 333
- 4ecfc2416fd8
- child 428
- f880f219c566
- permissions
- -rw-r--r--
Correct and introduce slightly needed logic, leading to better reliability:
Update bash(1) patch logic, correct several buildconf make location
errors, correct failed bash(1) configure invocation, enable perl(1) to
build with unpathed make(1), patch rpm(1) to correctly link with
internal libdb(3), and lastly unsuscessfully try to reorganize rpm patch
hunks.
1 Index: gas/aesopt.x86.m4
2 --- gas/aesopt.x86.m4.orig 2004-06-13 13:37:23 +0200
3 +++ gas/aesopt.x86.m4 2004-07-28 20:02:07 +0200
4 @@ -134,6 +134,9 @@
5 pxor 6144(%esi,%edx,8),s0
6 ')
8 +')
9 +ifdef(`USE_MMX',`
10 +
11 define(`elr',`
12 movd 0(%ebp),s0
13 movd t0,%eax
14 @@ -253,6 +256,9 @@
15 ')
18 +')
19 +ifdef(`USE_MMX',`
20 +
21 C_FUNCTION_BEGIN(aesEncrypt)
22 pushl %edi
23 pushl %esi
24 @@ -364,6 +370,9 @@
25 pxor 6144(%esi,%edx,8),t2
26 ')
28 +')
29 +ifdef(`USE_MMX',`
30 +
31 define(`dsft',`
32 movd $1+ 0(%ebp),s0
33 movd t0,%eax
34 @@ -490,6 +499,9 @@
35 pxor t3,s2
36 ')
38 +')
39 +ifdef(`USE_MMX',`
40 +
41 define(`dblock',`
42 sxrk
44 Index: gnu.h.in
45 --- gnu.h.in.orig 2004-12-19 21:18:48 +0100
46 +++ gnu.h.in 2005-03-08 19:34:03 +0100
47 @@ -48,15 +48,6 @@
48 @TYPEDEF_UINT32_T@
49 @TYPEDEF_UINT64_T@
51 -#if defined(__GNUC__)
52 -# if !defined(__GNUC_PREREQ__)
53 -# define __GNUC_PREREQ__(maj, min) (__GNUC__ > (maj) || __GNUC__ == (maj) && __GNUC_MINOR__ >= (min))
54 -# endif
55 -#else
56 -# define __GNUC__ 0
57 -# define __GNUC_PREREQ__(maj, min) 0
58 -#endif
59 -
60 /* WARNING: overriding this value is dangerous; some assembler routines
61 * make assumptions about the size set by the configure script
62 */
