head 1.9; access; symbols pkgsrc-2013Q2:1.9.0.14 pkgsrc-2013Q2-base:1.9 pkgsrc-2012Q4:1.9.0.12 pkgsrc-2012Q4-base:1.9 pkgsrc-2011Q4:1.9.0.10 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q2:1.9.0.8 pkgsrc-2011Q2-base:1.9 pkgsrc-2009Q4:1.9.0.6 pkgsrc-2009Q4-base:1.9 pkgsrc-2008Q4:1.9.0.4 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.2 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.8.0.22 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.20 pkgsrc-2008Q2-base:1.8 cwrapper:1.8.0.18 pkgsrc-2008Q1:1.8.0.16 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.14 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.12 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.10 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.8 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.6 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.4 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.2 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.7.0.8 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.6 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.4 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.2 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.6.0.8 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.6 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.4 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.2 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.5.0.4 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 buildlink2-base:1.3 netbsd-1-4-RELEASE:1.2 netbsd-1-3-PATCH003:1.2 netbsd-1-3-PATCH002:1.1.1.1 FreeBSD-current-1997-09-25:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.9 date 2008.09.21.10.45.34; author wiz; state dead; branches; next 1.8; 1.8 date 2006.04.28.16.24.27; author wiz; state Exp; branches; next 1.7; 1.7 date 2005.05.21.15.30.06; author wiz; state Exp; branches; next 1.6; 1.6 date 2004.03.30.23.36.46; author snj; state Exp; branches; next 1.5; 1.5 date 2003.10.09.00.07.27; author fredb; state dead; branches; next 1.4; 1.4 date 2003.07.17.20.28.32; author jmmv; state Exp; branches; next 1.3; 1.3 date 99.05.22.21.41.44; author tv; state dead; branches; next 1.2; 1.2 date 98.08.07.10.35.51; author agc; state Exp; branches; next 1.1; 1.1 date 97.10.27.02.19.05; author hubertf; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 97.10.27.02.19.05; author hubertf; state Exp; branches; next ; desc @@ 1.9 log @Remove workaround patch for old compiler problem, snj (who added it) thinks it's not necessary any longer. Bump PKGREVISION. @ text @$NetBSD: patch-ab,v 1.8 2006/04/28 16:24:27 wiz Exp $ --- sha1.cpp.orig 2006-04-18 12:23:44.000000000 +0000 +++ sha1.cpp @@@@ -44,16 +44,69 @@@@ A million repetitions of "a" #define R3(v,w,x,y,z,i) {z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);} #define R4(v,w,x,y,z,i) {z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);} +typedef union { + unsigned char c[64]; + uint32 l[16]; +} CHAR64LONG16; + +#ifdef __sparc_v9__ +void do_R01(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *); +void do_R2(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *); +void do_R3(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *); +void do_R4(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *); + +#define nR0(v,w,x,y,z,i) R0(*v,*w,*x,*y,*z,i) +#define nR1(v,w,x,y,z,i) R1(*v,*w,*x,*y,*z,i) +#define nR2(v,w,x,y,z,i) R2(*v,*w,*x,*y,*z,i) +#define nR3(v,w,x,y,z,i) R3(*v,*w,*x,*y,*z,i) +#define nR4(v,w,x,y,z,i) R4(*v,*w,*x,*y,*z,i) + +void +do_R01(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *block) +{ + nR0(a,b,c,d,e, 0); nR0(e,a,b,c,d, 1); nR0(d,e,a,b,c, 2); nR0(c,d,e,a,b, 3); + nR0(b,c,d,e,a, 4); nR0(a,b,c,d,e, 5); nR0(e,a,b,c,d, 6); nR0(d,e,a,b,c, 7); + nR0(c,d,e,a,b, 8); nR0(b,c,d,e,a, 9); nR0(a,b,c,d,e,10); nR0(e,a,b,c,d,11); + nR0(d,e,a,b,c,12); nR0(c,d,e,a,b,13); nR0(b,c,d,e,a,14); nR0(a,b,c,d,e,15); + nR1(e,a,b,c,d,16); nR1(d,e,a,b,c,17); nR1(c,d,e,a,b,18); nR1(b,c,d,e,a,19); +} + +void +do_R2(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *block) +{ + nR2(a,b,c,d,e,20); nR2(e,a,b,c,d,21); nR2(d,e,a,b,c,22); nR2(c,d,e,a,b,23); + nR2(b,c,d,e,a,24); nR2(a,b,c,d,e,25); nR2(e,a,b,c,d,26); nR2(d,e,a,b,c,27); + nR2(c,d,e,a,b,28); nR2(b,c,d,e,a,29); nR2(a,b,c,d,e,30); nR2(e,a,b,c,d,31); + nR2(d,e,a,b,c,32); nR2(c,d,e,a,b,33); nR2(b,c,d,e,a,34); nR2(a,b,c,d,e,35); + nR2(e,a,b,c,d,36); nR2(d,e,a,b,c,37); nR2(c,d,e,a,b,38); nR2(b,c,d,e,a,39); +} + +void +do_R3(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *block) +{ + nR3(a,b,c,d,e,40); nR3(e,a,b,c,d,41); nR3(d,e,a,b,c,42); nR3(c,d,e,a,b,43); + nR3(b,c,d,e,a,44); nR3(a,b,c,d,e,45); nR3(e,a,b,c,d,46); nR3(d,e,a,b,c,47); + nR3(c,d,e,a,b,48); nR3(b,c,d,e,a,49); nR3(a,b,c,d,e,50); nR3(e,a,b,c,d,51); + nR3(d,e,a,b,c,52); nR3(c,d,e,a,b,53); nR3(b,c,d,e,a,54); nR3(a,b,c,d,e,55); + nR3(e,a,b,c,d,56); nR3(d,e,a,b,c,57); nR3(c,d,e,a,b,58); nR3(b,c,d,e,a,59); +} + +void +do_R4(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *block) +{ + nR4(a,b,c,d,e,60); nR4(e,a,b,c,d,61); nR4(d,e,a,b,c,62); nR4(c,d,e,a,b,63); + nR4(b,c,d,e,a,64); nR4(a,b,c,d,e,65); nR4(e,a,b,c,d,66); nR4(d,e,a,b,c,67); + nR4(c,d,e,a,b,68); nR4(b,c,d,e,a,69); nR4(a,b,c,d,e,70); nR4(e,a,b,c,d,71); + nR4(d,e,a,b,c,72); nR4(c,d,e,a,b,73); nR4(b,c,d,e,a,74); nR4(a,b,c,d,e,75); + nR4(e,a,b,c,d,76); nR4(d,e,a,b,c,77); nR4(c,d,e,a,b,78); nR4(b,c,d,e,a,79); +} +#endif /* Hash a single 512-bit block. This is the core of the algorithm. */ void SHA1Transform(uint32 state[5], unsigned char buffer[64], bool handsoff) { uint32 a, b, c, d, e; - typedef union { - unsigned char c[64]; - uint32 l[16]; -} CHAR64LONG16; CHAR64LONG16* block; static unsigned char workspace[64]; if (handsoff) @@@@ -102,6 +155,12 @@@@ static unsigned char workspace[64]; c = state[2]; d = state[3]; e = state[4]; +#ifdef __sparc_v9__ + do_R01(&a, &b, &c, &d, &e, block); + do_R2(&a, &b, &c, &d, &e, block); + do_R3(&a, &b, &c, &d, &e, block); + do_R4(&a, &b, &c, &d, &e, block); +#else /* 4 rounds of 20 operations each. Loop unrolled. */ R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3); R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7); @@@@ -123,6 +182,7 @@@@ static unsigned char workspace[64]; R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71); R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75); R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79); +#endif /* Add the working vars back into context.state[] */ state[0] += a; state[1] += b; @ 1.8 log @Update to 3.6.2, no changelog available. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.7 2005/05/21 15:30:06 wiz Exp $ @ 1.7 log @Update to 3.5.2, changes unknown. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 2004/03/30 23:36:46 snj Exp $ d3 1 a3 1 --- sha1.cpp.orig 2005-05-01 17:08:48.000000000 +0200 d5 1 a5 1 @@@@ -44,17 +44,71 @@@@ A million repetitions of "a" d10 1 a10 1 + u_char c[64]; a65 1 + d69 1 a69 1 void SHA1Transform(uint32 state[5], unsigned char buffer[64]) d76 1 a76 3 -CHAR64LONG16* block; + CHAR64LONG16 *block; #ifdef SHA1HANDSOFF d78 2 a79 2 block = (CHAR64LONG16*)workspace; @@@@ -101,6 +155,12 @@@@ static unsigned char workspace[64]; d92 1 a92 1 @@@@ -122,6 +182,7 @@@@ static unsigned char workspace[64]; @ 1.6 log @Fix compilation of the SHA1 code on sparc64 by giving each round its own function. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- sha1.cpp.orig 2004-03-30 13:47:36.000000000 -0800 +++ sha1.cpp 2004-03-30 13:53:59.000000000 -0800 @ 1.5 log @Update to unrar-3.2.3. The only change, is that it fixes the build under gcc-3* a slightly different way than patch-ab did. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.4 2003/07/17 20:28:32 jmmv Exp $ d3 5 a7 13 --- rar.hpp.orig 2003-05-15 10:38:00.000000000 +0200 +++ rar.hpp @@@@ -18,6 +18,7 @@@@ #include "errhnd.hpp" #include "array.hpp" #include "timefn.hpp" +#include "global.hpp" #include "headers.hpp" #include "rarfn.hpp" #include "pathfn.hpp" @@@@ -71,7 +72,6 @@@@ #include "smallfn.hpp" #include "ulinks.hpp" d9 58 a66 1 -#include "global.hpp" d68 1 d70 33 a102 1 #endif @ 1.4 log @Fix build when using gcc3. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Update to 2.50, clean up a bit. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 1998/08/07 10:35:51 agc Exp $ d3 18 a20 23 *** os.c.bak Mon May 19 23:58:11 1997 --- os.c Tue May 20 00:22:57 1997 *************** *** 67,73 **** void GetPswStr(char *Str) { ! gets(Str); } --- 67,77 ---- void GetPswStr(char *Str) { ! char *s; ! *Str = '\0'; ! fgets(Str, 128, stdin); ! if ((s = strchr(Str, '\n')) != NULL) ! *s = '\0'; } @ 1.2 log @Add NetBSD RCS Ids. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d1 2 @ 1.1.1.1 log @File archivers, ports from FreeBSD @ text @@