Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32682
Modified Files:
aircrack-ng.info
Added Files:
aircrack-ng.patch
Log Message:
asm fix for 64bit os x, thanks astrange!
Index: aircrack-ng.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/aircrack-ng.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- aircrack-ng.info 30 Sep 2009 19:01:35 -0000 1.3
+++ aircrack-ng.info 1 Oct 2009 01:03:26 -0000 1.4
@@ -3,6 +3,8 @@
Revision: 1
Source: http://download.aircrack-ng.org/%n-1.0.tar.gz
Source-MD5: dafbfaf944ca9d523fde4bae86f0c067
+PatchFile: %n.patch
+PatchFile-MD5: fd0db1bedbe383209841b79443c75888
BuildDepends: system-openssl-dev, sqlite3-dev
Depends: sqlite3-shlibs
--- NEW FILE: aircrack-ng.patch ---
--- aircrack-ng-1.0/src/sha1-sse2.S 2009-07-22 15:01:36.000000000 -0400
+++ aircrack-ng-1.0/src/sha1-new.S 2009-09-30 15:25:45.000000000 -0400
@@ -7,6 +7,11 @@
// sure the last input block is properly padded. Both 64-byte
// input blocks must be (four bytes) interleaved.
+#if defined(__x86_64__)
+#define MANGLE(x) x(%rip)
+#else
+#define MANGLE(x) x
+#endif
#if defined(__i386__) || defined(__x86_64__)
@@ -137,13 +142,13 @@
paddd tmp2, e; \
movdqa b, tmp2; \
pslld $30, b; \
- paddd k, e; \
+ paddd MANGLE(k), e;
\
psrld $2, tmp2; \
por tmp2, b; \
movdqa (data*16)(edx_rsi), tmp1; \
movdqa tmp1, tmp2; \
- pand const_ff00, tmp1; \
- pand const_00ff, tmp2; \
+ pand MANGLE(const_ff00), tmp1; \
+ pand MANGLE(const_00ff), tmp2; \
psrld $8, tmp1; \
pslld $8, tmp2; \
por tmp2, tmp1; \
@@ -176,7 +181,7 @@
paddd tmp2, e; \
movdqa b, tmp2; \
pslld $30, b; \
- paddd k, e; \
+ paddd MANGLE(k), e; \
psrld $2, tmp2; \
por tmp2, b;
@@ -187,11 +192,11 @@
shasse2_init:
_shasse2_init:
- movdqa const_init_a, ctxa
- movdqa const_init_b, ctxb
- movdqa const_init_c, ctxc
- movdqa const_init_d, ctxd
- movdqa const_init_e, ctxe
+ movdqa MANGLE(const_init_a), ctxa
+ movdqa MANGLE(const_init_b), ctxb
+ movdqa MANGLE(const_init_c), ctxc
+ movdqa MANGLE(const_init_d), ctxd
+ movdqa MANGLE(const_init_e), ctxe
movdqa ctxa, 0(eax_rdi)
movdqa ctxb, 16(eax_rdi)
@@ -213,12 +218,12 @@
movdqa 48(eax_rdi), ctxd
movdqa 64(eax_rdi), ctxe
- movdqa const_ff00, tmp3
+ movdqa MANGLE(const_ff00), tmp3
movdqa ctxa, tmp1
movdqa ctxb, tmp2
pand tmp3, ctxa
pand tmp3, ctxb
- movdqa const_00ff, tmp3
+ movdqa MANGLE(const_00ff), tmp3
pand tmp3, tmp1
pand tmp3, tmp2
psrld $8, ctxa
@@ -238,14 +243,14 @@
movdqa ctxa, 0(edx_rsi)
movdqa ctxb, 16(edx_rsi)
- movdqa const_ff00, tmp5
+ movdqa MANGLE(const_ff00), tmp5
movdqa ctxc, tmp1
movdqa ctxd, tmp2
movdqa ctxe, tmp3
pand tmp5, ctxc
pand tmp5, ctxd
pand tmp5, ctxe
- movdqa const_00ff, tmp5
+ movdqa MANGLE(const_00ff), tmp5
pand tmp5, tmp1
pand tmp5, tmp2
pand tmp5, tmp3
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
