From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Sep 22 22:00:26 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 25DFB16A41F for ; Thu, 22 Sep 2005 22:00:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00F6643D53 for ; Thu, 22 Sep 2005 22:00:24 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j8MM0OEW062988 for ; Thu, 22 Sep 2005 22:00:24 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j8MM0Oc5062987; Thu, 22 Sep 2005 22:00:24 GMT (envelope-from gnats) Resent-Date: Thu, 22 Sep 2005 22:00:24 GMT Resent-Message-Id: <200509222200.j8MM0Oc5062987@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Holger Lamm Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F73916A41F for ; Thu, 22 Sep 2005 21:52:37 +0000 (GMT) (envelope-from holger@gruft.de) Received: from obh.snafu.de (obh.snafu.de [213.73.92.34]) by mx1.FreeBSD.org (Postfix) with ESMTP id B3A4043D46 for ; Thu, 22 Sep 2005 21:52:36 +0000 (GMT) (envelope-from holger@gruft.de) Received: from holger by obh.snafu.de with local (Exim 4.52 (FreeBSD)) id 1EIYzb-0003bg-Et for FreeBSD-gnats-submit@freebsd.org; Thu, 22 Sep 2005 23:52:35 +0200 Message-Id: Date: Thu, 22 Sep 2005 23:52:35 +0200 From: Holger Lamm Sender: Holger Lamm To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/86477: Update: net/mldonkey X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Sep 2005 22:00:26 -0000 >Number: 86477 >Category: ports >Synopsis: Update: net/mldonkey >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Sep 22 22:00:24 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Holger Lamm >Release: FreeBSD 5.4-STABLE i386 >Organization: >Environment: System: FreeBSD gruft.de 5.4-STABLE FreeBSD 5.4-STABLE #9: Wed Jul 27 13:17:20 CEST 2005 root@gruft.de:/usr/obj/usr/src/sys/GRUFT i386 >Description: - Update to current version - Use OpenSSL instead of bringing own copy of algorithms (contributed by and thanks to Mikhail Teterin) >How-To-Repeat: >Fix: diff -Nur mldonkey.orig/Makefile mldonkey/Makefile --- mldonkey.orig/Makefile Fri Sep 23 00:19:05 2005 +++ mldonkey/Makefile Tue Sep 6 21:44:51 2005 @@ -6,7 +6,7 @@ # PORTNAME= mldonkey -PORTVERSION= 2.5.28.1 +PORTVERSION= 2.5.30.17 CATEGORIES+= net MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -21,6 +21,7 @@ USE_BZIP2= yes WANT_AUTOCONF_VER= 259 USE_REINPLACE= yes +USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-pthread --enable-ocamlver=3 USE_GMAKE= yes diff -Nur mldonkey.orig/distinfo mldonkey/distinfo --- mldonkey.orig/distinfo Fri Sep 23 00:19:05 2005 +++ mldonkey/distinfo Tue Sep 6 20:01:11 2005 @@ -1,2 +1,2 @@ -MD5 (mldonkey-2.5.28.1.tar.bz2) = 4f24b2e1eeac4b54151ca2473ade45ec -SIZE (mldonkey-2.5.28.1.tar.bz2) = 2791684 +MD5 (mldonkey-2.5.30.17.tar.bz2) = f8db2c502c7ed4f660af124a431af020 +SIZE (mldonkey-2.5.30.17.tar.bz2) = 2654409 diff -Nur mldonkey.orig/files/patch-Makefile mldonkey/files/patch-Makefile --- mldonkey.orig/files/patch-Makefile Fri Sep 23 00:19:05 2005 +++ mldonkey/files/patch-Makefile Tue Sep 6 23:01:51 2005 @@ -1,11 +1,40 @@ ---- Makefile.orig Wed Sep 8 22:54:44 2004 -+++ Makefile Wed Sep 8 22:54:54 2004 -@@ -258,7 +258,7 @@ +--- config/Makefile.in.orig Tue Sep 6 21:51:36 2005 ++++ config/Makefile.in Tue Sep 6 22:00:47 2005 +@@ -144,6 +144,11 @@ + CDK_SRCS += $(CDK)/zlib.ml $(CDK)/zlibstubs.c + endif + ++ifneq ("$(OPENSSLBASE)", "/usr") ++ LIBS_flags += -ccopt -I$(OPENSSLINC) -cclib -L$(OPENSSLLIB) ++endif ++LIBS_flags += -cclib -lcrypto ++ + ifeq ("$(GD)", "yes") + LIBS_flags += -cclib -lgd -cclib -lfreetype -cclib -lm + LIBS_flags += -ccopt -W -ccopt -Wall -ccopt -Wno-unused +@@ -219,8 +224,7 @@ + $(LIB)/misc.ml $(LIB)/unix32.ml $(LIB)/md4.ml \ + $(LIB)/avifile.ml $(LIB)/http_lexer.mll $(LIB)/url.ml \ + $(LIB)/date.ml $(LIB)/fst_hash.c \ +- $(LIB)/md4_comp.c $(LIB)/md4_c.c \ +- $(LIB)/gettext.ml4 $(LIB)/md5_c.c $(LIB)/$(SHA1_VERSION)_c.c \ ++ $(LIB)/md4_c.c $(LIB)/gettext.ml4 \ + $(LIB)/tiger.c \ + $(LIB)/stubs_c.c $(LIB)/queues.ml \ + $(LIB)/charsetstubs.c $(LIB)/charset.ml +@@ -291,7 +295,7 @@ all: Makefile config/Makefile.config $(TARGET_TYPE) config/configure: config/configure.in - cd config; autoconf + cd config; %%AUTOCONF%% - ifeq ("$(MYCONFIG_ARGS_DEFINED)" , "yes") + ifeq ("$(CONFIGURE_RUN)" , "yes") + +@@ -2059,5 +2063,4 @@ + src/utils/lib/sha1new_c.o: src/utils/lib/sha1new_c.h \ + src/utils/lib/sha1_c.h src/utils/lib/os_stubs.h +-src/daemon/common/commonHasher_c.o: src/utils/lib/sha1_c.h +-src/utils/lib/stubs_c.o: src/utils/lib/sha1_c.h ++src/daemon/common/commonHasher_c.o: diff -Nur mldonkey.orig/files/patch-hashes mldonkey/files/patch-hashes --- mldonkey.orig/files/patch-hashes Thu Jan 1 01:00:00 1970 +++ mldonkey/files/patch-hashes Thu Sep 22 23:54:46 2005 @@ -0,0 +1,153 @@ +--- src/utils/lib/stubs_c.c.orig Tue Sep 6 22:03:39 2005 ++++ src/utils/lib/stubs_c.c Tue Sep 6 22:11:04 2005 +@@ -515,11 +515,11 @@ + nread = os_read (fd, hash_buffer, max_nread); \ + \ + if(nread < 0) { \ +- unix_error(errno, "md4_safe_fd: Read", Nothing); \ ++ unix_error(errno, "HASH_NAME##un_safe_fd: Read", Nothing); \ + } \ + \ + if(nread == 0){ \ +- HASH_FINISH (&context, digest); \ ++ HASH_FINISH (digest, &context); \ + \ + return Val_unit; \ + } \ +@@ -527,7 +527,7 @@ + HASH_APPEND (&context, hash_buffer, nread); \ + len -= nread; \ + } \ +- HASH_FINISH (&context, digest); \ ++ HASH_FINISH (digest, &context); \ + \ + return Val_unit; \ + } \ +@@ -541,7 +541,7 @@ + \ + HASH_INIT (&context); \ + HASH_APPEND (&context, string, len); \ +- HASH_FINISH (&context, digest); \ ++ HASH_FINISH (digest, &context); \ + \ + return Val_unit; \ + } \ +@@ -561,7 +561,7 @@ + HASH_INIT (&context); \ + while ((len = fread (hash_buffer, 1, HASH_BUFFER_LEN, file)) >0) \ + HASH_APPEND (&context, hash_buffer, len); \ +- HASH_FINISH (&context, digest); \ ++ HASH_FINISH (digest, &context); \ + \ + fclose (file); \ + } \ +@@ -569,13 +569,13 @@ + } \ + + +-#include "md4.h" +-#include "md5.h" +-#include "sha1_c.h" ++#include ++#include ++#include + +-ML_HASH(sha1,SHA1_CTX,sha1_begin,sha1_hash, sha1_end) +-ML_HASH(md5,md5_state_t,md5_init,md5_append,md5_finish) +-ML_HASH(md4,MD4_CTX,MD4Init,MD4Update,md4_finish) ++ML_HASH(sha1,SHA_CTX,SHA1_Init,SHA1_Update, SHA1_Final) ++ML_HASH(md5, MD5_CTX, MD5_Init, MD5_Update, MD5_Final) ++ML_HASH(md4, MD4_CTX, MD4_Init, MD4_Update, MD4_Final) + + /******************************************************************* + +--- src/daemon/common/commonHasher_c.c.orig Tue Sep 6 22:14:27 2005 ++++ src/daemon/common/commonHasher_c.c Tue Sep 6 22:19:35 2005 +@@ -37,9 +37,9 @@ + #define JOB_HANDLER 5 + #define JOB_ERROR 6 + +-#include "../../utils/lib/md4.h" +-#include "../../utils/lib/md5.h" +-#include "../../utils/lib/sha1_c.h" ++#include ++#include ++#include + #include "../../utils/lib/tiger.h" + + +@@ -68,7 +68,7 @@ + unix_error(errno, "HASH_NAME##unsafe64_fd_direct: Read", Nothing); \ + } \ + if(nread == 0){ \ +- HASH_FINISH (&context, digest); \ ++ HASH_FINISH (digest, &context); \ + \ + return; \ + } \ +@@ -76,12 +76,12 @@ + HASH_APPEND (&context, local_hash_buffer, nread); \ + len -= nread; \ + } \ +- HASH_FINISH (&context, digest); \ ++ HASH_FINISH (digest, &context); \ + } + +-COMPLETE_HASH(sha1,SHA1_CTX,sha1_begin,sha1_hash, sha1_end) +-COMPLETE_HASH(md5,md5_state_t,md5_init,md5_append,md5_finish) +-COMPLETE_HASH(md4,MD4_CTX,MD4Init,MD4Update,md4_finish) ++COMPLETE_HASH(sha1,SHA_CTX,SHA1_Init,SHA1_Update, SHA1_Final) ++COMPLETE_HASH(md5, MD5_CTX, MD5_Init, MD5_Update, MD5_Final) ++COMPLETE_HASH(md4, MD4_CTX, MD4_Init, MD4_Update, MD4_Final) + + static void tiger_tree_fd(OS_FD fd, long len, off_t pos, + int block_size, char *digest) +@@ -160,7 +160,7 @@ + \ + if(nread == 0){ \ + unsigned char *digest = String_val(Field(job_v, JOB_RESULT)); \ +- HASH_FINISH (&context, digest); \ ++ HASH_FINISH (digest, &context); \ + job_finished = 1; \ + timer = 10; \ + return Val_true; \ +@@ -173,7 +173,7 @@ + \ + if(job_len <= 0){ \ + unsigned char *digest = String_val(Field(job_v, JOB_RESULT)); \ +- HASH_FINISH (&context, digest); \ ++ HASH_FINISH (digest, &context); \ + job_finished = 1; \ + timer = 10; \ + return Val_true; \ +--- src/networks/fasttrack/fst_crypt.c.orig Tue Sep 6 22:23:50 2005 ++++ src/networks/fasttrack/fst_crypt.c Tue Sep 6 22:26:34 2005 +@@ -15,7 +15,7 @@ + * General Public License for more details. + */ + +-#include "../../utils/lib/md5.h" ++#include + #include "fst_crypt.h" + + /*****************************************************************************/ +@@ -106,14 +106,14 @@ + + if (enc_type & 0x08) + { +- MD5Context ctx; +- unsigned char md5[MD5_HASH_LEN]; ++ MD5_CTX ctx; ++ unsigned char md5[MD5_DIGEST_LENGTH]; + + FST_HEAVY_DBG ("init_cipher: enc_type & 0x08"); + +- MD5Init (&ctx); +- MD5Update (&ctx, cipher->pad, sizeof(cipher->pad)); +- MD5Final (md5, &ctx); ++ MD5_Init (&ctx); ++ MD5_Update (&ctx, cipher->pad, sizeof(cipher->pad)); ++ MD5_Final (md5, &ctx); + + /* correct md5 byte order on big-endian since it's converted to (unsigned int*) below */ + reverse_bytes ( (unsigned int*)&md5, 4); >Release-Note: >Audit-Trail: >Unformatted: