pkg/44324: skey compilation fix on DragonFlyBSD

[zakne0ne%gmail.com@localhost]

>Number:         44324
>Category:       pkg
>Synopsis:       skey compilation fix on DragonFlyBSD
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Jan 03 17:00:00 +0000 2011
>Originator:     Ilia
>Release:        DragonFly 2.9.1
>Organization:
>Environment:
DragonFly 2.9-DEVELOPMENT DragonFly v2.9.1.370.g78775c-DEVELOPMENT #0: Sun Jan 
2 12:34:32 2011    root@:/usr/obj/usr/src/sys/GENERIC i386
>Description:
cc -O2 -DHAVE_CONFIG_H  -DSENDMAIL=\"/usr/sbin/sendmail\" 
-DSKEYKEYS=\"/usr/pkg/etc/skeykeys\"   -c -o skey.o skey.c
cc -o skey skey.o -L. -Wl,-R/usr/pkg/lib -lskey -lcrypt
./libskey.a(skeysubr.o): In function `f_rmd160':
skeysubr.c:(.text+0x1b8): undefined reference to `RMD160Init'
skeysubr.c:(.text+0x1c4): undefined reference to `RMD160Update'
skeysubr.c:(.text+0x1d0): undefined reference to `RMD160Final'
./libskey.a(skeysubr.o): In function `keycrunch_rmd160':
skeysubr.c:(.text+0x267): undefined reference to `RMD160Init'
skeysubr.c:(.text+0x272): undefined reference to `RMD160Update'
skeysubr.c:(.text+0x27e): undefined reference to `RMD160Final'
./libskey.a(skeysubr.o): In function `f_md5':
skeysubr.c:(.text+0x3f8): undefined reference to `MD5Init'
skeysubr.c:(.text+0x404): undefined reference to `MD5Update'
skeysubr.c:(.text+0x410): undefined reference to `MD5Final'
./libskey.a(skeysubr.o): In function `keycrunch_md5':
skeysubr.c:(.text+0x4a3): undefined reference to `MD5Init'
skeysubr.c:(.text+0x4ae): undefined reference to `MD5Update'
skeysubr.c:(.text+0x4ba): undefined reference to `MD5Final'
./libskey.a(skeysubr.o): In function `f_md4':
skeysubr.c:(.text+0x510): undefined reference to `MD4Init'
skeysubr.c:(.text+0x51c): undefined reference to `MD4Update'
skeysubr.c:(.text+0x528): undefined reference to `MD4Final'
./libskey.a(skeysubr.o): In function `keycrunch_md4':
skeysubr.c:(.text+0x5bb): undefined reference to `MD4Init'
skeysubr.c:(.text+0x5c6): undefined reference to `MD4Update'
skeysubr.c:(.text+0x5d2): undefined reference to `MD4Final'
gmake: *** [skey] Error 1

>How-To-Repeat:

>Fix:
--- distinfob   2011-01-03 22:49:05 -0600
+++ distinfo    2011-01-03 22:49:16 -0600
@@ -12,3 +12,5 @@
 SHA1 (patch-ag) = 43db09ab58733b773ed30015984f724ba80d0e11
 SHA1 (patch-ah) = dec25286d50cbe0181b9b4bc99bd92556e573b5e
 SHA1 (patch-ai) = ad90b480047a22b25bc2c6e416a224e892e501c9
+SHA1 (patch-aj) = bd683caf47aba6a32e0b0833052486a1c727dd4e
+SHA1 (patch-ak) = 474c19b8d87f70e05007ed34382e6eb22fa627ed


$NetBSD$

--- Makefile.orig       2011-01-04 04:43:44 +0000
+++ Makefile
@@ -15,7 +15,7 @@ DESTDIR=
 CC=cc
 CFLAGS=  -O2 -DHAVE_CONFIG_H 
 CFLAGS+= -DSENDMAIL=\"/usr/sbin/sendmail\" 
-DSKEYKEYS=\"${sysconfdir}/skeykeys\"
-LIBS= -lcrypt
+LIBS= -lcrypt -lmd
 AR=ar
 RANLIB=ranlib
 INSTALL=/usr/bin/install -c -o root -g wheel

$NetBSD$

--- skeysubr.c.orig     2011-01-04 04:44:17 +0000
+++ skeysubr.c
@@ -223,9 +223,9 @@ keycrunch_rmd160(result, seed, passwd)
 
        /* Crunch the key through RMD-160 */
        sevenbit(buf);
-       RMD160Init(&rmd);
-       RMD160Update(&rmd, (unsigned char *)buf, buflen);
-       RMD160Final((unsigned char *)results, &rmd);
+       RIPEMD160_Init(&rmd);
+       RIPEMD160_Update(&rmd, (unsigned char *)buf, buflen);
+       RIPEMD160_Final((unsigned char *)results, &rmd);
        (void)free(buf);
 
        /* Fold 160 to 64 bits */
@@ -311,9 +311,9 @@ f_rmd160(x)
        RMD160_CTX rmd;
        u_int32_t results[5];
 
-       RMD160Init(&rmd);
-       RMD160Update(&rmd, (unsigned char *)x, SKEY_BINKEY_SIZE);
-       RMD160Final((unsigned char *)results, &rmd);
+       RIPEMD160_Init(&rmd);
+       RIPEMD160_Update(&rmd, (unsigned char *)x, SKEY_BINKEY_SIZE);
+       RIPEMD160_Final((unsigned char *)results, &rmd);
 
        /* Fold 160 to 64 bits */
        results[0] ^= results[2];