Date: Mon, 8 Nov 2010 15:29:54 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: lioux@FreeBSD.org Subject: ports/152037: [PATCH] net-p2p/mldonkey: update to 3.0.5 Message-ID: <20101108072954.248572AEC4DC@sunpoet.net> Resent-Message-ID: <201011080730.oA87UAE5049495@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 152037
>Category: ports
>Synopsis: [PATCH] net-p2p/mldonkey: update to 3.0.5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Nov 08 07:30:10 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Sunpoet Po-Chuan Hsieh
>Release: FreeBSD 8.1-STABLE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.1-STABLE FreeBSD 8.1-STABLE #0: Sat Oct 23 16:01:16 CST 2010
>Description:
- Update to 3.0.5
Removed file(s):
- files/patch-src__gtk2__gui__guiHtml.ml
- files/patch-src__gtk2__gui__guiOptions.ml
Port maintainer (lioux@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- mldonkey-core-3.0.5.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net-p2p/mldonkey/Makefile,v
retrieving revision 1.80
diff -u -u -r1.80 Makefile
--- Makefile 16 Oct 2010 11:52:31 -0000 1.80
+++ Makefile 8 Nov 2010 07:18:05 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= mldonkey
-PORTVERSION= 3.0.4
-PORTREVISION= 1
+PORTVERSION= 3.0.5
CATEGORIES+= net-p2p
MASTER_SITES= SF
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net-p2p/mldonkey/distinfo,v
retrieving revision 1.31
diff -u -u -r1.31 distinfo
--- distinfo 6 Sep 2010 12:00:24 -0000 1.31
+++ distinfo 8 Nov 2010 07:18:05 -0000
@@ -1,3 +1,2 @@
-MD5 (mldonkey-3.0.4.tar.bz2) = 06a084874dfd99dbad4dabc21e986354
-SHA256 (mldonkey-3.0.4.tar.bz2) = c60dbb8fa5245de81aeb55e0714167ff7a6be7a317af5fb2c1cd8870aa88de72
-SIZE (mldonkey-3.0.4.tar.bz2) = 2757488
+SHA256 (mldonkey-3.0.5.tar.bz2) = de578283350e084e14db8b45871413c491c1cdff1095ae47929f79f093bf0ded
+SIZE (mldonkey-3.0.5.tar.bz2) = 2780580
Index: files/patch-src__gtk2__gui__guiHtml.ml
===================================================================
RCS file: files/patch-src__gtk2__gui__guiHtml.ml
diff -N files/patch-src__gtk2__gui__guiHtml.ml
--- files/patch-src__gtk2__gui__guiHtml.ml 21 Sep 2010 03:43:22 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
---- src/gtk2/gui/guiHtml.ml.orig 2006-05-19 20:43:31.000000000 -0300
-+++ src/gtk2/gui/guiHtml.ml 2010-09-21 00:37:03.000000000 -0300
-@@ -50,9 +50,13 @@
-
- let make_request url =
- let module H = Http_client in
-+ let auth = match !!O.gtk_connection_http_proxy_login with
-+ | "" -> None
-+ | _ -> Some (!!O.gtk_connection_http_proxy_login, !!O.gtk_connection_http_proxy_password)
-+ in
- let proxy =
- if !!O.gtk_connection_http_use_proxy
-- then Some (!!O.gtk_connection_http_proxy_server, !!O.gtk_connection_http_proxy_port)
-+ then Some (!!O.gtk_connection_http_proxy_server, !!O.gtk_connection_http_proxy_port, auth)
- else None
- in
- let r = {
Index: files/patch-src__gtk2__gui__guiOptions.ml
===================================================================
RCS file: files/patch-src__gtk2__gui__guiOptions.ml
diff -N files/patch-src__gtk2__gui__guiOptions.ml
--- files/patch-src__gtk2__gui__guiOptions.ml 21 Sep 2010 03:43:22 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
---- src/gtk2/gui/guiOptions.ml.orig 2007-07-01 09:59:48.000000000 -0300
-+++ src/gtk2/gui/guiOptions.ml 2010-09-21 00:37:03.000000000 -0300
-@@ -166,6 +166,16 @@
- "Direct TCP connections to HTTP proxy (the proxy should support CONNECT)"
- bool_option false
-
-+let gtk_connection_http_proxy_login = define_option current_section
-+ ["gtk_connection_http_proxy_login"]
-+ "HTTP proxy login (leave empty if proxy doesn't require authentication)"
-+ string_option ""
-+
-+let gtk_connection_http_proxy_password = define_option current_section
-+ ["gtk_connection_http_proxy_password"]
-+ "HTTP proxy password"
-+ string_option ""
-+
- (* {Client} *)
-
- let gtk_client_login = define_option current_section
Index: files/patch-src__utils__lib__stubs_c.c
===================================================================
RCS file: /home/ncvs/ports/net-p2p/mldonkey/files/patch-src__utils__lib__stubs_c.c,v
retrieving revision 1.1
diff -u -u -r1.1 patch-src__utils__lib__stubs_c.c
--- files/patch-src__utils__lib__stubs_c.c 28 Sep 2006 23:11:52 -0000 1.1
+++ files/patch-src__utils__lib__stubs_c.c 8 Nov 2010 07:18:05 -0000
@@ -1,23 +1,15 @@
---- src/utils/lib/stubs_c.c.orig Wed Jan 4 12:23:37 2006
-+++ src/utils/lib/stubs_c.c Mon Jan 16 14:14:38 2006
-@@ -28,6 +28,11 @@
- #include <inttypes.h>
- #endif
-
-+/* For proper FreeBSD version identification */
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
-+
- #define lseek XXXXXXXXX
- #define read XXXXXXXXX
- #define ftruncate XXXXXXXXX
-@@ -683,7 +688,7 @@
+--- src/utils/lib/stubs_c.c.orig 2010-08-07 22:52:34.000000000 +0800
++++ src/utils/lib/stubs_c.c 2010-10-17 02:36:35.000000000 +0800
+@@ -675,10 +675,10 @@
#define NETDB_BUFFER_SIZE 10000
-#ifdef _WIN32
-+#if defined(_WIN32) || ( defined(__FreeBSD_version) && ( ((__FreeBSD_version >= 504102) && (__FreeBSD_version < 600000)) || (__FreeBSD_version >= 600029) ) )
++// #ifdef _WIN32
#define GETHOSTBYADDR_IS_REENTRANT 1
#define GETHOSTBYNAME_IS_REENTRANT 1
- #endif
+-#endif /* _WIN32 */
++// #endif /* _WIN32 */
+
+ static char volatile ip_job_result[256];
+ static int volatile job_naddresses = 0;
--- mldonkey-core-3.0.5.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101108072954.248572AEC4DC>