From nobody@FreeBSD.org  Tue Jan 29 15:20:09 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0B21516A417
	for <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <skylord@vt.net.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: net-p2p/verlihub port verision update
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         120120
>Category:       ports
>Synopsis:       net-p2p/verlihub port verision update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    tabthorpe
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 29 15:30:01 UTC 2008
>Closed-Date:    Fri Feb 08 16:46:00 UTC 2008
>Last-Modified:  Tue Jul 28 14:50:02 UTC 2009
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->tabthorpe 
Responsible-Changed-By: tabthorpe 
Responsible-Changed-When: Thu Feb 7 21:14:27 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=120120 
State-Changed-From-To: open->closed 
State-Changed-By: tabthorpe 
State-Changed-When: Fri Feb 8 16:45:58 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=120120 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/120120: commit references a PR
Date: Fri,  8 Feb 2008 16:45:32 +0000 (UTC)

 tabthorpe    2008-02-08 16:45:27 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-p2p/verlihub     Makefile distinfo 
     net-p2p/verlihub/files patch-db_charset patch-thublink 
   Log:
   - Update to 0.9.8d-RC2
   
   PR:             ports/120120
   Submitted by:   Mikle Davidkin <skylord vt.net.ru> (maintainer)
   
   Revision  Changes    Path
   1.22      +1 -2      ports/net-p2p/verlihub/Makefile
   1.10      +3 -3      ports/net-p2p/verlihub/distinfo
   1.2       +7 -7      ports/net-p2p/verlihub/files/patch-db_charset
   1.2       +2 -2      ports/net-p2p/verlihub/files/patch-thublink
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: "Mikle Davidkin" <skylord@vt.net.ru>
To: bug-followup@FreeBSD.org,
 skylord@vt.net.ru
Cc:  
Subject: Re: ports/120120: net-p2p/verlihub port verision update
Date: Sat, 18 Jul 2009 18:39:20 +0400 (MSD)

 ------=_20090718183920_45709
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
 Here is a patch fixing (as i think :-) ) prefix bugs and with the lastest
 program version. Tested on 6.3 i386 and 7.1 amd64/
 Notes:
 
 - Version update to 0.9.8e-r1
 - Database charset is utf8 by default now - according to new version
 changes. Message to user after install added.
 - Fix GeoIP prefix handling.
 - This version uses gcc 4.2+
 - Some clean up
 - Mantainer e-mail change
 
 
 
 ------=_20090718183920_45709
 Content-Type: application/x-gzip; name="verlihub.diff.tgz"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="verlihub.diff.tgz"
 
 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
 ------=_20090718183920_45709--
 
 

From: Mikle Davidkin <me@skylord.ru>
To: <bug-followup@FreeBSD.org>
Cc:  
Subject: Re: ports/120120: net-p2p/verlihub port verision update
Date: Mon, 27 Jul 2009 00:34:42 +0400

 --=_539b45dfa90134ad50281abbc7263a15
 Content-Transfer-Encoding: 8bit
 Content-Type: text/plain; charset="UTF-8"
 
 Here is a patch fixing (as i think :-) ) prefix bugs and with the lastest
 program version. Tested on 6.3 i386 and 7.1 amd64/
 Notes:
 
 - Version update to 0.9.8e-r1
 - Database charset is utf8 by default now - according to new version
 changes. Message to user after install added.
 - Fix GeoIP prefix handling.
 - This version uses gcc 4.2+
 - Some clean up
 - Mantainer e-mail change
 --=_539b45dfa90134ad50281abbc7263a15
 Content-Transfer-Encoding: base64
 Content-Type: application/x-gzip; charset="UTF-8";
  name="verlihub.diff.tgz"; 
 Content-Disposition: attachment;
  filename="verlihub.diff.tgz"; 
 
 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
 --=_539b45dfa90134ad50281abbc7263a15--
 

From: "Mikle Davidkin" <skylord@vt.net.ru>
To: bug-followup@FreeBSD.org,
 skylord@vt.net.ru
Cc:  
Subject: Re: ports/120120: net-p2p/verlihub port verision update
Date: Tue, 28 Jul 2009 18:40:50 +0400 (MSD)

 ------=_20090728184050_84766
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
 Here is a patch fixing (as i think :-) ) prefix bugs and with the lastest
 program version. Tested on 6.3 i386 and 7.1 amd64/
 Notes:
 
 - Version update to 0.9.8e-r1
 - Database charset is utf8 by default now - according to new version
 changes. Message to user after install added.
 - Fix GeoIP prefix handling.
 - This version uses gcc 4.2+
 - Some clean up
 - Mantainer e-mail change
 
 
 
 
 ------=_20090728184050_84766
 Content-Type: text/plain; name="verlihub.diff.txt"
 Content-Transfer-Encoding: 8bit
 Content-Disposition: attachment; filename="verlihub.diff.txt"
 
 diff -urN /usr/home/skylord/ports/old/verlihub/Makefile Makefile
 --- /usr/home/skylord/ports/old/verlihub/Makefile	2009-01-12 01:49:26.000000000 +0300
 +++ Makefile	2009-07-18 18:09:25.000000000 +0400
 @@ -6,13 +6,12 @@
  #
  
  PORTNAME=	verlihub
 -DISTVERSION=	0.9.8d-RC2
 -PORTREVISION=	3
 +DISTVERSION=	0.9.8e-r1
  PORTEPOCH=	1
  CATEGORIES=	net-p2p
  MASTER_SITES=	SF
  
 -MAINTAINER=	skylord@vt.net.ru
 +MAINTAINER=	me@skylord.ru
  COMMENT=	A Direct Connect protocol server (Hub)
  
  # XXX: Actually, bash isn't required for building,
 @@ -24,6 +23,7 @@
  
  USE_RC_SUBR=	verlihub
  
 +USE_GCC=	4.2+
  USE_AUTOTOOLS=	libtool:15
  USE_MYSQL=	yes
  GNU_CONFIGURE=	yes
 @@ -31,23 +31,10 @@
  USE_OPENSSL=	yes
  SUB_FILES+=	pkg-message
  
 -DOCS=		configuring.txt using.txt help.html verlihub.html
 -MANUAL_DOCS=	verlihub.css verlihub_manual.html
 -PORTDOCS=	${DOCS} ${MANUAL_DOCS}
 -
 -post-extract:
 -	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
 +post-patch:
 +	@${REINPLACE_CMD} -e 's|for libpath in /|for libpath in ${PREFIX} /|g' ${WRKSRC}/config_geoip
  
  post-install:
 -.if !defined(NOPORTDOCS)
 -	@${MKDIR} ${DOCSDIR}
 -.for i in ${DOCS}
 -	${INSTALL_DATA} ${WRKSRC}/docs/${i} ${DOCSDIR}
 -.endfor
 -.for i in ${MANUAL_DOCS}
 -	${INSTALL_DATA} ${WRKSRC}/docs/html_manual/${i} ${DOCSDIR}
 -.endfor
 -.endif
  	@${CAT} ${PKGMESSAGE}
  
  .include <bsd.port.mk>
 diff -urN /usr/home/skylord/ports/old/verlihub/distinfo distinfo
 --- /usr/home/skylord/ports/old/verlihub/distinfo	2008-02-08 19:45:27.000000000 +0300
 +++ distinfo	2009-07-18 12:02:16.000000000 +0400
 @@ -1,3 +1,3 @@
 -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
 +MD5 (verlihub-0.9.8e-r1.tar.gz) = 663ef7254b79d382c3943e5c0409b640
 +SHA256 (verlihub-0.9.8e-r1.tar.gz) = 1b3e981717f5e0c972778f48918ba54cb1a4b833426854c8e3eb295effc2c01d
 +SIZE (verlihub-0.9.8e-r1.tar.gz) = 729317
 diff -urN /usr/home/skylord/ports/old/verlihub/files/patch-CVE-2008-5706 files/patch-CVE-2008-5706
 --- /usr/home/skylord/ports/old/verlihub/files/patch-CVE-2008-5706	2009-01-11 22:42:13.000000000 +0300
 +++ files/patch-CVE-2008-5706	1970-01-01 03:00:00.000000000 +0300
 @@ -1,82 +0,0 @@
 ---- src/ctrigger.cpp.orig	2005-04-11 19:18:38.000000000 +0400
 -+++ src/ctrigger.cpp	2008-12-27 23:28:14.000000000 +0300
 -@@ -7,6 +7,9 @@
 -  *   the Free Software Foundation; either version 2 of the License, or     *
 -  *   (at your option) any later version.                                   *
 -  ***************************************************************************/
 -+#include <errno.h>
 -+#include <stdio.h>
 -+#include <string.h>
 - #include "cserverdc.h"
 - #include "ctrigger.h"
 - #include "cconndc.h"
 -@@ -44,16 +47,33 @@
 - {
 - 	string buf, filename, sender;
 - 	string par1, end1, parall;
 -+	string cmdl;
 -+
 - 	if (conn && conn->mpUser)
 - 	{
 -+		cmd_line >> cmdl;
 -+		/* Sanitise user input if we're going to exec anything */
 -+		if (mFlags & eTF_EXECUTE && server.mDBConf.allow_exec) {
 -+			string cleaned = string();
 -+			const string toclean = string(";\"'\\`:!${}[]&><|~/");
 -+
 -+			for (string::iterator i = cmdl.begin();
 -+			    i < cmdl.end();
 -+			    i++) {
 -+				if (toclean.find(*i) == string::npos)
 -+					cleaned.append(1, *i);
 -+			}
 -+			cmdl = cleaned;
 -+		}
 -+
 - 		int uclass = conn->mpUser->mClass;
 - 		if ((uclass >= this->mMinClass) &&(uclass <= this->mMaxClass)) {
 - 
 --			if(cmd_line.str().size() > mCommand.size()) {
 --				parall.assign(cmd_line.str(),mCommand.size()+1,string::npos);
 -+			if(cmdl.size() > mCommand.size()) {
 -+				parall.assign(cmdl,mCommand.size()+1,string::npos);
 - 			}
 --			cmd_line >> par1;
 --			end1 = cmd_line.str();
 -+			par1 = cmdl;
 -+			end1 = cmdl;
 - 
 - 			sender = server.mC.hub_security;
 - 			if (mSendAs.size()) sender = mSendAs;
 -@@ -104,14 +124,25 @@
 - 
 - 			if (mFlags & eTF_EXECUTE && server.mDBConf.allow_exec) {
 - 				string command(buf);
 --				filename = server.mConfigBaseDir;
 --				filename.append("/tmp/trigger.tmp");
 --				command.append(" > ");
 --				command.append(filename);
 -+				char buffer[1024];
 -+				FILE *stream;
 -+
 - 				cout << command << endl;
 --				system(command.c_str());
 - 				buf = "";
 --				if (!LoadFileInString(filename,buf)) return 0;
 -+				stream = popen(command.c_str(), "r");
 -+				if (stream == NULL) {
 -+					cout << strerror(errno) << std::endl;
 -+					return 0;
 -+				} else {
 -+					while (fgets(buffer, sizeof(buffer),
 -+					  stream) != NULL)
 -+                				buf.append(buffer);
 -+					if (pclose(stream) == -1) {
 -+						cout << strerror(errno) <<
 -+						  std::endl;
 -+						return 0;
 -+					}
 -+				}
 - 			}
 - 
 - 			// @CHANGED by dReiska +BEGINS+
 diff -urN /usr/home/skylord/ports/old/verlihub/files/patch-db_charset files/patch-db_charset
 --- /usr/home/skylord/ports/old/verlihub/files/patch-db_charset	2008-02-08 19:45:27.000000000 +0300
 +++ files/patch-db_charset	1970-01-01 03:00:00.000000000 +0300
 @@ -1,83 +0,0 @@
 ---- src/cdbconf.cpp	Thu Apr  8 02:16:21 2004
 -+++ src/cdbconf.cpp	Thu Oct 12 16:57:43 2006
 -@@ -18,6 +18,7 @@
 - 	Add("db_user",db_user,string("verlihub"));
 - 	Add("db_pass",db_pass,string(""));
 - 	Add("db_data",db_data,string("verlihub"));
 -+	Add("db_charset",db_charset,string("latin1"));
 - 	Add("config_name",config_name,string("config"));
 - 	Add("lang_name",lang_name,string("lang_en"));
 - 	Load();
 - 
 -diff -Nur verlihub-orig/src/cdbconf.h verlihub/src/cdbconf.h
 ---- src/cdbconf.h	2006-07-15 18:42:52.000000000 +0400
 -+++ src/cdbconf.h	2006-07-15 18:43:50.000000000 +0400
 -@@ -31,6 +31,7 @@
 - 	string db_user;
 - 	string db_pass;
 - 	string db_data;
 -+	string db_charset;
 - 	string config_name;
 - 	string lang_name;
 - 	bool allow_exec;
 -diff -Nur verlihub-orig/src/cmysql.cpp verlihub/src/cmysql.cpp
 ---- 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)
 -  */
 --cMySQL::cMySQL(string&host,string&user,string&pass,string&data) : cObj("cMySQL")
 -+cMySQL::cMySQL(string&host,string&user,string&pass,string&data,string&charset) : cObj("cMySQL")
 - {
 -     Init();
 --    if(!Connect(host,user,pass,data))
 -+    if(!Connect(host,user,pass,data,charset))
 -     {
 -     	throw "Mysql connection error.";
 -     }
 -@@ -40,12 +40,13 @@
 - 	if(!mDBHandle) Error(0, string("Can't init mysql structure :(.: "));	
 - }
 - 
 --bool cMySQL::Connect(string &host, string &user, string &pass, string &data)
 -+bool cMySQL::Connect(string &host, string &user, string &pass, string &data, string &charset)
 - {
 - 	if(Log(1)) LogStream() << "Connecting to mysql server: "
 --			<< user << "@" << host << "/" << data << 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());
 - 	
 - 	if(!mysql_real_connect(
 - 		mDBHandle,
 -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
 -@@ -34,10 +34,10 @@
 - friend class cQuery;
 - public:
 - 	cMySQL();
 --	cMySQL(string&host,string&user,string&pass,string&data);
 -+	cMySQL(string&host,string&user,string&pass,string&data,string&charset);
 - 	~cMySQL();
 - 	void Init();
 --	bool Connect(string &host, string &user, string &passwd, string &db);
 -+	bool Connect(string &host, string &user, string &passwd, string &db, string &charset);
 - 	public: void Error(int level, string text);
 - 
 - private:
 -diff -Nur verlihub-orig/src/cserverdc.cpp verlihub/src/cserverdc.cpp
 ---- src/cserverdc.cpp	2006-07-15 18:42:52.000000000 +0400
 -+++ src/cserverdc.cpp	2006-07-15 18:43:50.000000000 +0400
 -@@ -72,7 +72,8 @@
 - 		mDBConf.db_host,
 - 		mDBConf.db_user,
 - 		mDBConf.db_pass,
 --		mDBConf.db_data), // connect to mysql
 -+		mDBConf.db_data,
 -+		mDBConf.db_charset), // connect to mysql
 - 	mC(*this), // create the config object
 - 	mL(*this),
 - 	mSetupList(mMySQL),
 diff -urN /usr/home/skylord/ports/old/verlihub/files/patch-plugins files/patch-plugins
 --- /usr/home/skylord/ports/old/verlihub/files/patch-plugins	2006-12-11 00:18:10.000000000 +0300
 +++ files/patch-plugins	1970-01-01 03:00:00.000000000 +0300
 @@ -1,45 +0,0 @@
 -diff -ruN src-orig/cpluginloader.cpp src/cpluginloader.cpp
 ---- src-orig/cpluginloader.cpp	Fri Oct  1 15:19:44 2004
 -+++ src/cpluginloader.cpp	Thu Oct 12 17:16:22 2006
 -@@ -40,6 +40,12 @@
 -  */
 - bool nPlugin::cPluginLoader::Open()
 - {
 -+	/*
 -+	* Reset dlerror() since it can contain error from previous
 -+	* call to dlopen()/dlsym().
 -+	*/
 -+	dlerror();
 -+
 - 	mHandle = dlopen(mFileName.c_str(), RTLD_NOW);
 - 	if(!mHandle || IsError()) // NOTE hte OR (||) operator evaluates only the first statement if that one is true
 - 	{
 -@@ -99,6 +105,12 @@
 -  */
 - void * nPlugin::cPluginLoader::LoadSym(const char *name)
 - {
 -+	/*
 -+	* Reset dlerror() since it can contain error from previous
 -+	* call to dlopen()/dlsym().
 -+	*/
 -+	dlerror();
 -+
 - 	void *func = dlsym( mHandle, name);
 - 	if(IsError())
 - 	{
 -diff -ruN src-orig/tpluginbase.cpp src/tpluginbase.cpp
 ---- src-orig/tpluginbase.cpp	Fri Oct  1 15:19:44 2004
 -+++ src/tpluginbase.cpp	Thu Oct 12 17:16:39 2006
 -@@ -34,6 +34,12 @@
 -  */
 - bool nPlugin::tPluginBase::Open()
 - {
 -+	/*
 -+	* Reset dlerror() since it can contain error from previous
 -+	* call to dlopen()/dlsym().
 -+	*/
 -+	dlerror();
 -+
 - 	mHandle = dlopen(mFileName.c_str(), RTLD_NOW);
 - 	if(!mHandle)
 - 	{
 diff -urN /usr/home/skylord/ports/old/verlihub/files/patch-thublink files/patch-thublink
 --- /usr/home/skylord/ports/old/verlihub/files/patch-thublink	2008-02-08 19:45:27.000000000 +0300
 +++ files/patch-thublink	2009-07-18 13:30:29.000000000 +0400
 @@ -100,21 +100,6 @@
   cMessageParser *cAsyncConn::CreateParser()
   {
   	if (this->mxProtocol != NULL)
 -Index: casyncsocketserver.cpp
 -===================================================================
 -RCS file: /cvsroot/verlihub/verlihub/src/casyncsocketserver.cpp,v
 -retrieving revision 1.70
 -diff -u -r1.70 casyncsocketserver.cpp
 ---- src/casyncsocketserver.cpp	27 Mar 2006 13:37:32 -0000	1.70
 -+++ src/casyncsocketserver.cpp	17 Jun 2006 21:27:43 -0000
 -@@ -198,6 +198,7 @@
 - 		return;
 - 	}
 - 	tCLIt it = old_conn->mIterator;//find(mConnList.begin(), mConnList.end(), old_conn);
 -+
 - 	cAsyncConn *found=(*it);
 - 	if( (it ==  mConnList.end()) || (found != old_conn) )
 - 	{
  Index: cconndc.cpp
  ===================================================================
  RCS file: /cvsroot/verlihub/verlihub/src/cconndc.cpp,v
 @@ -164,7 +149,7 @@
  diff -u -r1.235 cserverdc.cpp
  --- src/cserverdc.cpp	8 Nov 2005 07:51:23 -0000	1.235
  +++ src/cserverdc.cpp	17 Jun 2006 21:27:44 -0000
 -@@ -492,7 +492,7 @@
 +@@ -505,7 +505,7 @@
   	}
   
   	int count=0;
 @@ -173,7 +158,7 @@
   	{
   		conn=(cConnDC *)(*i);
   		if(conn && conn->ok && conn->mWritable && conn->mpUser && conn->mpUser->mInList)
 -@@ -516,7 +516,7 @@
 +@@ -529,7 +529,7 @@
   	cConnDC *conn;
   	tCLIt i;
   	int counter = 0;
 @@ -182,16 +167,16 @@
   	{
   		conn=(cConnDC *)(*i);
   		if(
 -@@ -541,7 +541,7 @@
 - 	static string str;
 +@@ -555,7 +555,7 @@
   	cConnDC *conn;
   	tCLIt i;
 + 	int counter = 0;
  -	for(i=mConnList.begin(); i!= mConnList.end(); i++)
  +	for(i=mDCConnList.begin(); i!= mDCConnList.end(); i++)
   	{
   		conn=(cConnDC *)(*i);
   		if(
 -@@ -563,6 +563,9 @@
 +@@ -579,6 +579,9 @@
   /** return negative if conn should be removed */
   int cServerDC::OnNewConn(cAsyncConn *nc)
   {
 @@ -201,7 +186,7 @@
   	cConnDC *conn = (cConnDC *)nc;
   	stringstream errmsg,os;
   	if(!conn) return -1;
 -@@ -909,7 +912,7 @@
 +@@ -925,7 +928,7 @@
   /** return true if accept is allowed - override */
   bool cServerDC::AllowNewConn()
   {
 @@ -210,7 +195,7 @@
   }
   
   int cServerDC::SaveFile(const string &file, const string &text)
 -@@ -1268,6 +1271,7 @@
 +@@ -1280,6 +1283,7 @@
   		delete work;
   		return 0;
   	}
 diff -urN /usr/home/skylord/ports/old/verlihub/files/pkg-message.in files/pkg-message.in
 --- /usr/home/skylord/ports/old/verlihub/files/pkg-message.in	2007-07-03 14:32:36.000000000 +0400
 +++ files/pkg-message.in	2009-07-18 18:07:56.000000000 +0400
 @@ -1,12 +1,15 @@
  --------------------------------------------------------------------
  
 -Documentation has been installed in %%DOCSDIR%%/.
 -
  Scripts and the executable have been installed in %%PREFIX%%/bin/.
  
  This port requires a working MySQL server installation, either
  locally or remotely.
  
 +Visit http://www.verlihub-project.org/ for the project's homepage,
 +manual, forums, scripts and etc.
 +
 +INSTALLATION
 +
  Once you have a properly-running MySQL server, please run install
  script:
  
 @@ -14,8 +17,15 @@
  
  and follow the instructions given.
  
 -Visit http://www.verlihub-project.org/ for the project's homepage
 -or http://www.verlihubforums.com/ for the project's forums.  The
 -verlihub manual is available at http://www.danomac.org/verlihub/.
 +UPGRADE
 +
 +If you upgrade from version prior to 0.9.8e please note the 
 +following:
 +
 +    - Database charset is now set explicitly to UTF8 - velihub
 +      will alter all tables during the first run. So if you have
 +      used custom charset you should deal with it (backup, i.e.)
 +      before the first run!
 +    - You need to rerun vh_install as during the first installation
  
  -------------------------------------------------------------------
 diff -urN /usr/home/skylord/ports/old/verlihub/pkg-plist pkg-plist
 --- /usr/home/skylord/ports/old/verlihub/pkg-plist	2007-07-04 17:07:48.000000000 +0400
 +++ pkg-plist	2009-07-18 12:54:44.000000000 +0400
 @@ -27,6 +27,8 @@
  include/verlihub/cconnpoll.h
  include/verlihub/cconnselect.h
  include/verlihub/cconntypes.h
 +include/verlihub/ccustomredirect.h
 +include/verlihub/ccustomredirects.h
  include/verlihub/cdbconf.h
  include/verlihub/cdcclients.h
  include/verlihub/cdccommand.h
 @@ -85,10 +87,6 @@
  include/verlihub/tmysqlmemorylist.h
  include/verlihub/tmysqlmemoryordlist.h
  include/verlihub/tpluginbase.h
 -lib/libdiakritika_pi.a
 -lib/libdiakritika_pi.la
 -lib/libdiakritika_pi.so
 -lib/libdiakritika_pi.so.0
  lib/libplug_pi.a
  lib/libplug_pi.la
  lib/libplug_pi.so
 ------=_20090728184050_84766--
 
 
>Unformatted:
