Index: head/net-p2p/ed2k/Makefile =================================================================== --- head/net-p2p/ed2k/Makefile (revision 432721) +++ head/net-p2p/ed2k/Makefile (revision 432722) @@ -1,46 +1,48 @@ # $FreeBSD$ PORTNAME= ed2k PORTVERSION= 1.4 CATEGORIES= net-p2p MASTER_SITES= http://www.sdalu.com/download/software/tools/ PKGNAMESUFFIX= -hash${OPENSSLSUFFIX}${PKGNAMESUFFIX2} DISTNAME= ed2k.c EXTRACT_SUFX= EXTRACT_ONLY= MAINTAINER= dinoex@FreeBSD.org COMMENT= Calculates 'eMule' hashes or producing ed2k:// file links +LICENSE= PD BSD3CLAUSE + CONFLICTS= amule-* NO_WRKSUBDIR= yes MAKEFILE= /dev/null ALL_TARGET= ed2k PLIST_FILES= bin/ed2k OPTIONS_DEFINE= OPENSSL OPTIONS_DEFAULT=OPENSSL OPENSSL_DESC= use faster hash libs from OpenSSL +OPENSSL_USES= ssl .include .if ${PORT_OPTIONS:MOPENSSL} OPENSSLSUFFIX= -openssl -USE_OPENSSL= yes LDLIBS+= -lmd .else OPENSSLSUFFIX= -rsa CFLAGS+= -DWITH_RSA .endif MAKE_ARGS+= CFLAGS="${CFLAGS}" MAKE_ENV+= LDLIBS="${LDLIBS}" post-extract: ${CP} -p ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${WRKSRC}/ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ed2k ${STAGEDIR}${PREFIX}/bin/ .include Index: head/net-p2p/ed2k/files/patch-ed2k.c =================================================================== --- head/net-p2p/ed2k/files/patch-ed2k.c (revision 432721) +++ head/net-p2p/ed2k/files/patch-ed2k.c (revision 432722) @@ -1,76 +1,76 @@ ---- ed2k.c.orig Sun Jun 13 19:47:20 2004 -+++ ed2k.c Thu Dec 14 10:40:21 2006 +--- ed2k.c.orig 2004-06-13 17:47:20 UTC ++++ ed2k.c @@ -32,7 +32,7 @@ #include /* #define OFF_CONV "%ld" /* off_t is long (Linux) */ -/* #define OFF_CONF "%lld" /* off_t is long long (FreeBSD) */ +#define OFF_CONV "%lld" /* off_t is long long (FreeBSD) */ #ifndef OFF_CONV # warning "You should define OFF_CONV (see the file)" @@ -47,16 +47,27 @@ typedef unsigned char md4_t[16]; +#if defined(WITH_RSA) + typedef struct { - u_int32_t state[4]; - u_int32_t count[2]; - unsigned char buffer[64]; + u_int32_t state[4]; + u_int32_t count[2]; + unsigned char buffer[64]; } md4_ctx_t; void md4_init(md4_ctx_t *); void md4_update(md4_ctx_t *, unsigned char *, unsigned int); void md4_finish(md4_ctx_t *, md4_t); +#else + +#include +#define md4_ctx_t MD4_CTX +#define md4_init MD4Init +#define md4_update MD4Update +#define md4_finish(a,b) MD4Final(b,a) + +#endif static char *progname; -@@ -86,16 +97,16 @@ +@@ -86,16 +97,16 @@ void hash_fd(int fd, md4_t digest) { } -static __inline__ char hdigit(q) { +static __inline__ char hdigit(unsigned char q) { return ((q >= 10) ? 'W' : '0') + q; } -char *digest_str(void *digest) { +char *digest_str(unsigned char *digest) { static char internal_str[sizeof(md4_t)*2 + 1]; char *str = internal_str; int dsize = sizeof(md4_t); while (dsize--) { - unsigned char d = *((unsigned char *)digest)++; + unsigned char d = *(digest++); *(str++) = hdigit(d >> 4 ); *(str++) = hdigit(d & 0xf); } -@@ -181,6 +192,7 @@ +@@ -181,6 +192,7 @@ int main(int argc, char *argv[]) { } +#if defined(WITH_RSA) /*==> RSA Data Security, Inc. MD4 Message-Digest Algorithm =============*/ -@@ -323,3 +335,5 @@ +@@ -323,3 +335,5 @@ void md4_finish (md4_ctx_t *context, md4 md4_update (context, bits, 8); md4_encode (digest, context->state, 16); } + +#endif