ports/64604: Update port: chinese/mldonkey-core for upgrading to 2.5.14

Hung-Te Lin piaip at csie.ntu.edu.tw
Tue Mar 23 04:10:17 UTC 2004


>Number:         64604
>Category:       ports
>Synopsis:       Update port: chinese/mldonkey-core for upgrading to 2.5.14
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 22 20:10:17 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Charlie &
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
Communication & Multimedia Lab, NTU, Taiwan
>Environment:
System: FreeBSD cml4.csie.ntu.edu.tw 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Fri Mar 12 04:59:55 CST 2004 root at cml4.csie.ntu.edu.tw:/usr/obj/usr/src/sys/cml4 i386
>Description:
Update port: chinese/mldonkey-core for upgrading to 2.5.14
which has changed HTTP header parts so old patch will not work.
>How-To-Repeat:
>Fix:
diff -Nur mldonkey-core.orig/Makefile mldonkey-core/Makefile
--- mldonkey-core.orig/Makefile	Thu Mar 11 11:34:44 2004
+++ mldonkey-core/Makefile	Tue Mar 23 11:39:49 2004
@@ -10,7 +10,6 @@
 PORTNAME=	mldonkey-core
 CATEGORIES=	chinese
 
-MAINTAINER=	piaip at csie.ntu.edu.tw
 COMMENT=	Client 'core' for MLDonkey with Traditional Chinese (Big5) support
 
 WITHOUT_GUI=	yes
@@ -20,3 +19,4 @@
 .include "${MASTERDIR}/Makefile"
 
 PKGNAMEPREFIX:= ${PKGNAMEPREFIX}tw-
+MAINTAINER=	piaip at csie.ntu.edu.tw
diff -Nur mldonkey-core.orig/files/patch-driverControlers.ml mldonkey-core/files/patch-driverControlers.ml
--- mldonkey-core.orig/files/patch-driverControlers.ml	Thu Mar 11 11:34:44 2004
+++ mldonkey-core/files/patch-driverControlers.ml	Tue Mar 23 11:37:30 2004
@@ -1,6 +1,6 @@
---- src/daemon/driver/driverControlers.ml.orig	Mon Oct 13 02:41:30 2003
-+++ src/daemon/driver/driverControlers.ml	Wed Mar 10 19:11:04 2004
-@@ -291,6 +291,7 @@
+--- src/daemon/driver/driverControlers.ml.orig	Sun Mar  7 17:44:13 2004
++++ src/daemon/driver/driverControlers.ml	Tue Mar 23 11:31:09 2004
+@@ -319,6 +319,7 @@
    }
  
  
@@ -8,7 +8,7 @@
  let iac_will_naws = "\255\253\031"  
    
  let user_reader o telnet sock nread  = 
-@@ -320,7 +321,7 @@
+@@ -348,7 +349,7 @@
        
        let i = int_of_char c in
        telnet.telnet_iac <- false;
@@ -17,7 +17,7 @@
        
        if telnet.telnet_wait = 1 then begin
            Buffer.add_char telnet.telnet_buffer c;
-@@ -439,6 +440,7 @@
+@@ -469,6 +470,7 @@
          TcpBufferedSocket.set_closer sock user_closed;
          user_socks := sock :: !user_socks;
  
@@ -25,24 +25,22 @@
          TcpBufferedSocket.write_string sock iac_will_naws;
  
          before_telnet_output o sock;
-@@ -573,17 +575,17 @@
- let http_add_html_header buf = 
-   http_add_gen_header buf;
-   Buffer.add_string  buf "Pragma: no-cache\r\n";
--  Buffer.add_string  buf "Content-Type: text/html; charset=iso-8859-1\r\n";
-+  Buffer.add_string  buf "Content-Type: text/html; charset=big5\r\n";
-   Buffer.add_string  buf "\r\n"
- 
- let http_add_css_header buf = 
-   http_add_gen_header buf;
--  Buffer.add_string  buf "Content-Type: text/css; charset=iso-8859-1\r\n";
-+  Buffer.add_string  buf "Content-Type: text/css; charset=big5\r\n";
-   Buffer.add_string  buf "\r\n"
- 
- let http_add_js_header buf =
-   http_add_gen_header buf;
--  Buffer.add_string  buf "Content-Type: text/javascript; charset=iso-8859-1\r\n";
-+  Buffer.add_string  buf "Content-Type: text/javascript; charset=big5\r\n";
-   Buffer.add_string  buf "\r\n"
- 
+@@ -602,15 +604,15 @@
+ let http_add_html_header r = 
+   http_add_gen_header r;
+   add_reply_header r "Pragma" "no-cache";
+-  add_reply_header r "Content-Type" "text/html; charset=iso-8859-1"
++  add_reply_header r "Content-Type" "text/html; charset=big5"
+ 
+ let http_add_css_header r = 
+   http_add_gen_header r;
+-  add_reply_header r "Content-Type" "text/css; charset=iso-8859-1"
++  add_reply_header r "Content-Type" "text/css; charset=big5"
+ 
+ let http_add_js_header r =
+   http_add_gen_header r;
+-  add_reply_header  r "Content-Type" "text/javascript; charset=iso-8859-1"
++  add_reply_header  r "Content-Type" "text/javascript; charset=big5"
+   
  let any_ip = Ip.of_inet_addr Unix.inet_addr_any
+   
>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list