From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jan 29 15:30:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A03516A496 for ; Tue, 29 Jan 2008 15:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id DCD9313C45D for ; Tue, 29 Jan 2008 15:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m0TFU13H056735 for ; Tue, 29 Jan 2008 15:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m0TFU19J056732; Tue, 29 Jan 2008 15:30:01 GMT (envelope-from gnats) Resent-Date: Tue, 29 Jan 2008 15:30:01 GMT Resent-Message-Id: <200801291530.m0TFU19J056732@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, Mikle Davidkin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B21516A417 for ; Tue, 29 Jan 2008 15:20:09 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id EEE4D13C4EC for ; Tue, 29 Jan 2008 15:20:08 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m0TFIMmQ069697 for ; Tue, 29 Jan 2008 15:18:22 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m0TFILsL069696; Tue, 29 Jan 2008 15:18:21 GMT (envelope-from nobody) Message-Id: <200801291518.m0TFILsL069696@www.freebsd.org> Date: Tue, 29 Jan 2008 15:18:21 GMT From: Mikle Davidkin To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/120120: net-p2p/verlihub port verision update 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: Tue, 29 Jan 2008 15:30:02 -0000 >Number: 120120 >Category: ports >Synopsis: net-p2p/verlihub port verision update >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: Tue Jan 29 15:30:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Mikle Davidkin >Release: 6.2 >Organization: >Environment: FreeBSD www.vt.net.ru 6.2-RELEASE-p2 FreeBSD 6.2-RELEASE-p2 #0: Mon Mar 12 13:48:43 MSK 2007 root@www.vt.net.ru:/usr/obj/usr/src/sys/GENERIC amd64 >Description: >How-To-Repeat: >Fix: Patch attached with submission follows: diff -Nur /home/skylordssh/ports/old_verli/verlihub/Makefile /usr/ports/net-p2p/verlihub/Makefile --- /home/skylordssh/ports/old_verli/verlihub/Makefile Wed Jul 4 17:07:48 2007 +++ /usr/ports/net-p2p/verlihub/Makefile Tue Jan 29 16:30:07 2008 @@ -6,9 +6,8 @@ # PORTNAME= verlihub -DISTVERSION= 0.9.8d-RC1 +DISTVERSION= 0.9.8d-RC2 PORTEPOCH= 1 -PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff -Nur /home/skylordssh/ports/old_verli/verlihub/distinfo /usr/ports/net-p2p/verlihub/distinfo --- /home/skylordssh/ports/old_verli/verlihub/distinfo Wed Jul 4 09:06:51 2007 +++ /usr/ports/net-p2p/verlihub/distinfo Tue Jan 29 16:30:23 2008 @@ -1,3 +1,3 @@ -MD5 (verlihub-0.9.8d-RC1.tar.gz) = 886d0b13a387bf57e226516e73c5fe7a -SHA256 (verlihub-0.9.8d-RC1.tar.gz) = cf064c6ef1e9f2e8ca44f43af855a7baf1b914d4eb941806b19e4fff0bd1a6fc -SIZE (verlihub-0.9.8d-RC1.tar.gz) = 856421 +MD5 (verlihub-0.9.8d-RC2.tar.gz) = 0824be2cf3af08ccda1638c5d5d0bc4e +SHA256 (verlihub-0.9.8d-RC2.tar.gz) = baf64574d0ed89324b6b2da35d32ebb5fd9af164c83b10bdf45a49b8a8f0fc59 +SIZE (verlihub-0.9.8d-RC2.tar.gz) = 1095383 diff -Nur /home/skylordssh/ports/old_verli/verlihub/files/patch-db_charset /usr/ports/net-p2p/verlihub/files/patch-db_charset --- /home/skylordssh/ports/old_verli/verlihub/files/patch-db_charset Mon Dec 11 00:18:10 2006 +++ /usr/ports/net-p2p/verlihub/files/patch-db_charset Tue Jan 29 16:42:11 2008 @@ -21,8 +21,8 @@ string lang_name; bool allow_exec; diff -Nur verlihub-orig/src/cmysql.cpp verlihub/src/cmysql.cpp ---- src/cmysql.cpp 2006-07-15 18:42:52.000000000 +0400 -+++ src/cmysql.cpp 2006-07-15 18:45:25.000000000 +0400 +--- src/cmysql.cpp.orig Sun Jun 24 00:11:33 2007 ++++ src/cmysql.cpp Tue Jan 29 16:39:29 2008 @@ -19,10 +19,10 @@ /*! \fn nMySQL::cMySQL::cMySQL(string&host,string&user,string&pass,string&data) @@ -37,7 +37,7 @@ throw "Mysql connection error."; } @@ -40,12 +40,13 @@ - if(!mDBHandle) Error(0, string("Can't init mysql structure :(.: ")); + if(!mDBHandle) Error(0, string("Can't init mysql structure :(.: ")); } -bool cMySQL::Connect(string &host, string &user, string &pass, string &data) @@ -45,13 +45,13 @@ { if(Log(1)) LogStream() << "Connecting to mysql server: " - << user << "@" << host << "/" << data << endl; -+ << user << "@" << host << "/" << data << "with charset " << charset << endl; - ++ << user << "@" << host << "/" << data << "with charset " << charset << endl; + mysql_options(mDBHandle,MYSQL_OPT_COMPRESS,0); -+ mysql_options(mDBHandle,MYSQL_SET_CHARSET_NAME,charset.c_str()); ++ mysql_options(mDBHandle,MYSQL_SET_CHARSET_NAME,charset.c_str()); + if(!mysql_real_connect( mDBHandle, - host.c_str(), diff -Nur verlihub-orig/src/cmysql.h verlihub/src/cmysql.h --- src/cmysql.h 2006-07-15 18:42:52.000000000 +0400 +++ src/cmysql.h 2006-07-15 18:43:50.000000000 +0400 diff -Nur /home/skylordssh/ports/old_verli/verlihub/files/patch-thublink /usr/ports/net-p2p/verlihub/files/patch-thublink --- /home/skylordssh/ports/old_verli/verlihub/files/patch-thublink Wed Jul 4 17:07:49 2007 +++ /usr/ports/net-p2p/verlihub/files/patch-thublink Tue Jan 29 16:45:26 2008 @@ -205,8 +205,8 @@ /** return true if accept is allowed - override */ bool cServerDC::AllowNewConn() { -- return mConnList.size() <= (unsigned) mC.max_users_total + mC.max_extra_regs + mC.max_extra_vips + mC.max_extra_ops + mC.max_extra_cheefs + mC.max_extra_admins + 200; -+ return mDCConnList.size() <= (unsigned) mC.max_users_total + mC.max_extra_regs + mC.max_extra_vips + mC.max_extra_ops + mC.max_extra_cheefs + mC.max_extra_admins + 200; +- return mConnList.size() <= (unsigned) mC.max_users_total + mC.max_extra_regs + mC.max_extra_vips + mC.max_extra_ops + mC.max_extra_cheefs + mC.max_extra_admins + 300; ++ return mDCConnList.size() <= (unsigned) mC.max_users_total + mC.max_extra_regs + mC.max_extra_vips + mC.max_extra_ops + mC.max_extra_cheefs + mC.max_extra_admins + 300; } int cServerDC::SaveFile(const string &file, const string &text) >Release-Note: >Audit-Trail: >Unformatted: