pkg/39953: skey patch-ac is broken

[heas%shrubbery.net@localhost]

>Number:         39953
>Category:       pkg
>Synopsis:       skey patch-ac is broken
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Nov 18 20:35:00 +0000 2008
>Originator:     john heasley
>Release:        NetBSD 4.99.68
>Organization:
        
>Environment:
        
        
System: NetBSD guelah 4.99.68 NetBSD 4.99.68 (guelah) #1: Tue Jul 1 18:16:59 
UTC 2008 root@guelah:/sys/arch/sparc64/compile/guelah sparc64
Architecture: sparc64
Machine: sparc64
>Description:
security/skey patch-ac is broken or half-baked.  It appears this was added
for IRIX, but it uses a '-' in a cpp macro name, which does not work.

Also, the private RMD160File() has a different signature than NetBSD'
rmd160.h.
>How-To-Repeat:
>Fix:
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/security/skey/distinfo,v
retrieving revision 1.6
diff -u -d -u -r1.6 distinfo
--- distinfo    9 Jul 2006 13:39:06 -0000       1.6
+++ distinfo    18 Nov 2008 20:31:38 -0000
@@ -5,4 +5,5 @@
 Size (skey-1.1.5.tar.bz2) = 61911 bytes
 SHA1 (patch-aa) = c9c0cde8f648fae44bbfbffcb7da0d331fad537d
 SHA1 (patch-ab) = 69d8f92968b3ebffc9b05fe7af1cde7e9d116587
-SHA1 (patch-ac) = 7f0b69315ccec66c4c59da142bd919b46d4c8409
+SHA1 (patch-ac) = f3e9a6ebb7ac22116c8d8e6fe8ca0db7f8d37051
+SHA1 (patch-ad) = 550fa498340b1b092c360d2a360aa3b004c88684
Index: hacks.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/skey/hacks.mk,v
retrieving revision 1.3
diff -u -d -u -r1.3 hacks.mk
--- hacks.mk    11 Mar 2008 18:47:41 -0000      1.3
+++ hacks.mk    18 Nov 2008 20:31:38 -0000
@@ -32,7 +32,7 @@
 ###
 .if !empty(MACHINE_PLATFORM:MIRIX-5*)
 PKG_HACKS+=            missing-u_int64_t
-CPPFLAGS+=             -DMISSING-U_INT64_T
+CPPFLAGS+=             -DMISSING_U_INT64_T
 .endif
 
 .endif
cvs diff: Diffing patches
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/security/skey/patches/patch-ac,v
retrieving revision 1.1
diff -u -d -u -r1.1 patch-ac
--- patches/patch-ac    9 Jul 2006 13:39:06 -0000       1.1
+++ patches/patch-ac    18 Nov 2008 20:31:38 -0000
@@ -6,7 +6,7 @@
  # endif
  #endif
  
-+#ifdef MISSING-U_INT64_T
++#ifdef MISSING_U_INT64_T
 +typedef unsigned long long int  u_int64_t;
 +#endif
 +

patches/patch-ad:
$NetBSD$

--- rmd160.h.orig       2001-05-10 16:10:49.000000000 +0000
+++ rmd160.h
@@ -40,7 +40,7 @@ void RMD160Transform __P((u_int32_t stat
 void RMD160Update __P((RMD160_CTX *context, const u_char *data, u_int32_t nbyte
s));
 void RMD160Final __P((u_char digest[20], RMD160_CTX *context));
 char *RMD160End __P((RMD160_CTX *, char *));
-char *RMD160File __P((char *, char *));
+char *RMD160File __P((const char *, char *));
 char *RMD160Data __P((const u_char *, size_t, char *));
 
 #endif  /* _RMD160_H */

--- rmd160hl.c.orig     2001-05-10 16:10:49.000000000 +0000
+++ rmd160hl.c
@@ -50,7 +50,7 @@ RMD160End(ctx, buf)
 
 char *
 RMD160File (filename, buf)
-    char *filename;
+    const char *filename;
     char *buf;
 {
     u_char buffer[BUFSIZ];

>Unformatted: