Update to 3.6.2, no changelog available.

3 files changed, 16 insertions, 19 deletions

diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index cbd24418bf7..87f7753710a 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2006/02/11 11:12:05 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2006/04/28 16:24:27 wiz Exp $
 
-DISTNAME=	unrarsrc-3.5.4
+DISTNAME=	unrarsrc-3.6.2
 PKGNAME=	${DISTNAME:S/src//}
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.rarlab.com/rar/ \
diff --git a/archivers/unrar/distinfo b/archivers/unrar/distinfo
index 0a675f81798..b7e279fccd8 100644
--- a/archivers/unrar/distinfo
+++ b/archivers/unrar/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2005/10/12 13:59:19 wiz Exp $
+$NetBSD: distinfo,v 1.24 2006/04/28 16:24:27 wiz Exp $
 
-SHA1 (unrarsrc-3.5.4.tar.gz) = e0bf07f8a36b738b1ed033b767155f27b51fc408
-RMD160 (unrarsrc-3.5.4.tar.gz) = f8fd81e1e1b74bfd05eacf23d04b57a80fec3faa
-Size (unrarsrc-3.5.4.tar.gz) = 122801 bytes
+SHA1 (unrarsrc-3.6.2.tar.gz) = de3c5d4edfd9bfe0c63b87aeac387665107b7a87
+RMD160 (unrarsrc-3.6.2.tar.gz) = ba786333d8e8ce749f8470c75e59da1207df672a
+Size (unrarsrc-3.6.2.tar.gz) = 124863 bytes
 SHA1 (patch-aa) = 272060ab4fcaaae0de0d99a8533b268a3aa6d91a
-SHA1 (patch-ab) = fbbb1addd7570ac0e6328113c5d88c8ae931ceb6
+SHA1 (patch-ab) = 6821e8c66a4770e43fd71bf4097db9a8bd44645c
 SHA1 (patch-ac) = ce3b9a618045d7ca7232e1622ac84bd82216e297
diff --git a/archivers/unrar/patches/patch-ab b/archivers/unrar/patches/patch-ab
index d1e9247926a..7a9afba13b2 100644
--- a/archivers/unrar/patches/patch-ab
+++ b/archivers/unrar/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.7 2005/05/21 15:30:06 wiz Exp $
+$NetBSD: patch-ab,v 1.8 2006/04/28 16:24:27 wiz Exp $
 
---- sha1.cpp.orig	2005-05-01 17:08:48.000000000 +0200
+--- sha1.cpp.orig	2006-04-18 12:23:44.000000000 +0000
 +++ sha1.cpp
-@@ -44,17 +44,71 @@ A million repetitions of "a"
+@@ -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 {
-+    u_char c[64];
++    unsigned char c[64];
 +    uint32 l[16];
 +} CHAR64LONG16;
 +
@@ -63,23 +63,20 @@ $NetBSD: patch-ab,v 1.7 2005/05/21 15:30:06 wiz Exp $
 +    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])
+ 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;
-+  CHAR64LONG16 *block;
- #ifdef SHA1HANDSOFF
+ CHAR64LONG16* block;
  static unsigned char workspace[64];
-     block = (CHAR64LONG16*)workspace;
-@@ -101,6 +155,12 @@ 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];
@@ -92,7 +89,7 @@ $NetBSD: patch-ab,v 1.7 2005/05/21 15:30:06 wiz Exp $
      /* 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);
-@@ -122,6 +182,7 @@ static unsigned char workspace[64];
+@@ -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);