Update to 4.0.2

4 files changed, 20 insertions, 126 deletions

diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile
index bf83a9fb26f7..bd15991dfd2a 100644
--- a/irc/kvirc/Makefile
+++ b/irc/kvirc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kvirc
-PORTVERSION=	4.0.0
-PORTREVISION=	1
+PORTVERSION=	4.0.2
 CATEGORIES=	irc kde
 MASTER_SITES=	ftp://ftp.kvirc.de/pub/kvirc/%SUBDIR%/ \
 		http://kvirc.gmake.de/pub/kvirc/%SUBDIR%/ \
@@ -76,7 +75,7 @@ PLIST_SUB+=	QT="@comment " KDE=""
 .endif #defined(PKGNAMESUFFIX)
 
 .if defined(WITH_DEBUG)
-CMAKE_ARGS+=	-DWITH_DEBUG -DVERBOSE=yes
+CMAKE_ARGS+=	-DWITH_DEBUG=yes -DVERBOSE=yes
 .endif
 
 #audio support
diff --git a/irc/kvirc/distinfo b/irc/kvirc/distinfo
index aeb702088d20..779e99b1375b 100644
--- a/irc/kvirc/distinfo
+++ b/irc/kvirc/distinfo
@@ -1,3 +1,3 @@
-MD5 (kvirc-4.0.0.tar.bz2) = 8fafe420551c273e684236fd4e396af5
-SHA256 (kvirc-4.0.0.tar.bz2) = 23f79a54dab00b8f2669c1c28eca7169eb10ace06e63a2da90e2b74772249ed6
-SIZE (kvirc-4.0.0.tar.bz2) = 5257838
+MD5 (kvirc-4.0.2.tar.bz2) = d4e94a1aac4dabe253b47d893b97092b
+SHA256 (kvirc-4.0.2.tar.bz2) = ab0850c26761a2afa0c2ecc607d313eae717889a6bc293573020d3a09f3de040
+SIZE (kvirc-4.0.2.tar.bz2) = 5279602
diff --git a/irc/kvirc/files/patch-svn4693 b/irc/kvirc/files/patch-svn4693
deleted file mode 100644
index b791afd12b31..000000000000
--- a/irc/kvirc/files/patch-svn4693
+++ /dev/null
@@ -1,118 +0,0 @@
-Index: ./src/modules/dcc/requests.cpp
-===================================================================
---- ./src/modules/dcc/requests.cpp (revision 4417)
-+++ ./src/modules/dcc/requests.cpp (revision 4693)
-@@ -87,5 +87,6 @@
- 	{
- 		QString szError = QString("Sorry, your DCC %1 request can't be satisfied: %2").arg(dcc->szType.ptr(), errText);
--		dcc_module_reply_errmsg(dcc,szError);
-+		//since szError contains an user-suppplied string, we simplify it to avoid any kind of injection (bug #858)
-+		dcc_module_reply_errmsg(dcc,szError.simplified());
- 	}
- }
-Index: ./src/kvirc/sparser/kvi_sp_ctcp.cpp
-===================================================================
---- ./src/kvirc/sparser/kvi_sp_ctcp.cpp (revision 4350)
-+++ ./src/kvirc/sparser/kvi_sp_ctcp.cpp (revision 4693)
-@@ -627,5 +627,5 @@
- 
- 
--const char * KviServerParser::extractCtcpParameter(const char * msg_ptr,KviStr &buffer,bool bSpaceBreaks)
-+const char * KviServerParser::extractCtcpParameter(const char * msg_ptr,KviStr &buffer,bool bSpaceBreaks, bool bSafeOnly)
- {
- 	//
-@@ -659,15 +659,18 @@
- 			case '\\':
- 				// backslash : escape sequence
--				if(msg_ptr != begin)buffer.append(begin,msg_ptr - begin);
--				msg_ptr++;
--				if(*msg_ptr)
--				{
--					// decode the escape
--					msg_ptr = decodeCtcpEscape(msg_ptr,buffer);
--					begin = msg_ptr;
-+				if(bSafeOnly)msg_ptr++;
-+				else {
-+					if(msg_ptr != begin)buffer.append(begin,msg_ptr - begin);
-+					msg_ptr++;
-+					if(*msg_ptr)
-+					{
-+						// decode the escape
-+						msg_ptr = decodeCtcpEscape(msg_ptr,buffer);
-+						begin = msg_ptr;
-+					}
-+					// else it is a senseless trailing backslash.
-+					// Just ignore and let the function
-+					// return spontaneously.
- 				}
--				// else it is a senseless trailing backslash.
--				// Just ignore and let the function
--				// return spontaneously.
- 			break;
- 			case ' ':
-@@ -684,5 +687,5 @@
- 			break;
- 			case '"':
--				if(bInString)
-+				if(bInString && !bSafeOnly)
- 				{
- 					// A string terminator. We don't return
-@@ -712,5 +715,5 @@
- }
- 
--const char * KviServerParser::extractCtcpParameter(const char * p_msg_ptr,QString &resultBuffer,bool bSpaceBreaks)
-+const char * KviServerParser::extractCtcpParameter(const char * p_msg_ptr,QString &resultBuffer,bool bSpaceBreaks, bool bSafeOnly)
- {
- 	//
-@@ -744,13 +747,16 @@
- 			case '\\':
- 				// backslash : escape sequence
--				msg_ptr++;
--				if(*msg_ptr)
--				{
--					// decode the escape
--					msg_ptr = decodeCtcpEscape(msg_ptr,buffer);
-+				if(bSafeOnly)msg_ptr++;
-+				else {
-+					msg_ptr++;
-+					if(*msg_ptr)
-+					{
-+						// decode the escape
-+						msg_ptr = decodeCtcpEscape(msg_ptr,buffer);
-+					}
-+					// else it is a senseless trailing backslash.
-+					// Just ignore and let the function
-+					// return spontaneously.
- 				}
--				// else it is a senseless trailing backslash.
--				// Just ignore and let the function
--				// return spontaneously.
- 			break;
- 			case ' ':
-@@ -770,5 +776,5 @@
- 			break;
- 			case '"':
--				if(bInString)
-+				if(bInString && !bSafeOnly)
- 				{
- 					// A string terminator. We don't return
-@@ -1708,5 +1714,5 @@
- 	KviDccRequest p;
- 	KviStr aux    = msg->pData;
--	msg->pData    = extractCtcpParameter(msg->pData,p.szType);
-+	msg->pData    = extractCtcpParameter(msg->pData,p.szType, true, true);
- 	msg->pData    = extractCtcpParameter(msg->pData,p.szParam1);
- 	msg->pData    = extractCtcpParameter(msg->pData,p.szParam2);
-Index: ./src/kvirc/sparser/kvi_sparser.h
-===================================================================
---- ./src/kvirc/sparser/kvi_sparser.h (revision 3958)
-+++ ./src/kvirc/sparser/kvi_sparser.h (revision 4693)
-@@ -261,6 +261,6 @@
- 	static const char * decodeCtcpEscape(const char * msg_ptr,KviStr &buffer);
- 	static const char * decodeCtcpEscape(const char * msg_ptr,QByteArray &buffer);
--	static const char * extractCtcpParameter(const char * msg_ptr,KviStr &buffer,bool bSpaceBreaks = true);
--	static const char * extractCtcpParameter(const char * msg_ptr,QString &buffer,bool bSpaceBreaks = true);
-+	static const char * extractCtcpParameter(const char * msg_ptr,KviStr &buffer,bool bSpaceBreaks = true, bool bSafeOnly=false);
-+	static const char * extractCtcpParameter(const char * msg_ptr,QString &buffer,bool bSpaceBreaks = true, bool bSafeOnly=false);
- };
- 
diff --git a/irc/kvirc/pkg-plist b/irc/kvirc/pkg-plist
index 0297337193c5..d08635fbc95d 100644
--- a/irc/kvirc/pkg-plist
+++ b/irc/kvirc/pkg-plist
@@ -70,7 +70,7 @@ lib/kvirc/%%VER%%/modules/libkviurl.so
 lib/kvirc/%%VER%%/modules/libkviwindow.so
 lib/libkvilib.so
 lib/libkvilib.so.4
-lib/libkvilib.so.4.0.0
+lib/libkvilib.so.4.0.2
 share/applications/kvirc.desktop
 share/icons/hicolor/128x128/apps/kvirc.png
 share/icons/hicolor/128x128/mimetypes/application-x-kva.png
@@ -378,6 +378,8 @@ share/icons/hicolor/scalable/mimetypes/text-x-kvs.svgz
 %%DATADIR%%/%%VER%%/help/en/cmd_proxydb.setport.html
 %%DATADIR%%/%%VER%%/help/en/cmd_proxydb.setprotocol.html
 %%DATADIR%%/%%VER%%/help/en/cmd_proxydb.setuser.html
+%%DATADIR%%/%%VER%%/help/en/cmd_python.begin.html
+%%DATADIR%%/%%VER%%/help/en/cmd_python.end.html
 %%DATADIR%%/%%VER%%/help/en/cmd_query.html
 %%DATADIR%%/%%VER%%/help/en/cmd_quit.html
 %%DATADIR%%/%%VER%%/help/en/cmd_quote.html
@@ -776,6 +778,7 @@ share/icons/hicolor/scalable/mimetypes/text-x-kvs.svgz
 %%DATADIR%%/%%VER%%/help/en/doc_objects.html
 %%DATADIR%%/%%VER%%/help/en/doc_operators.html
 %%DATADIR%%/%%VER%%/help/en/doc_perl_and_kvs.html
+%%DATADIR%%/%%VER%%/help/en/doc_python_and_kvs.html
 %%DATADIR%%/%%VER%%/help/en/doc_registered_users.html
 %%DATADIR%%/%%VER%%/help/en/doc_rfc2812.html
 %%DATADIR%%/%%VER%%/help/en/doc_rfc2821wrappers.html
@@ -816,7 +819,7 @@ share/icons/hicolor/scalable/mimetypes/text-x-kvs.svgz
 %%DATADIR%%/%%VER%%/help/en/doc_widget_index_all.html
 %%DATADIR%%/%%VER%%/help/en/doc_window.html
 %%DATADIR%%/%%VER%%/help/en/doc_window_naming_conventions.html
-%%DATADIR%%/%%VER%%/help/en/documentation.%%VER%%.0.4541.tag
+%%DATADIR%%/%%VER%%/help/en/documentation.%%VER%%.2.4740.tag
 %%DATADIR%%/%%VER%%/help/en/event_onaccelkeypressed.html
 %%DATADIR%%/%%VER%%/help/en/event_onaction.html
 %%DATADIR%%/%%VER%%/help/en/event_onban.html
@@ -1079,6 +1082,7 @@ share/icons/hicolor/scalable/mimetypes/text-x-kvs.svgz
 %%DATADIR%%/%%VER%%/help/en/fnc_dcc.transferredbytes.html
 %%DATADIR%%/%%VER%%/help/en/fnc_dcc.transferstatus.html
 %%DATADIR%%/%%VER%%/help/en/fnc_dialog.yesno.html
+%%DATADIR%%/%%VER%%/help/en/fnc_escape.html
 %%DATADIR%%/%%VER%%/help/en/fnc_false.html
 %%DATADIR%%/%%VER%%/help/en/fnc_features.html
 %%DATADIR%%/%%VER%%/help/en/fnc_file.allsizes.html
@@ -1398,6 +1402,7 @@ share/icons/hicolor/scalable/mimetypes/text-x-kvs.svgz
 %%DATADIR%%/%%VER%%/locale/about_hr.mo
 %%DATADIR%%/%%VER%%/locale/about_hu.mo
 %%DATADIR%%/%%VER%%/locale/about_it.mo
+%%DATADIR%%/%%VER%%/locale/about_ja.mo
 %%DATADIR%%/%%VER%%/locale/about_nl.mo
 %%DATADIR%%/%%VER%%/locale/about_pl.mo
 %%DATADIR%%/%%VER%%/locale/about_pt.mo
@@ -1408,6 +1413,7 @@ share/icons/hicolor/scalable/mimetypes/text-x-kvs.svgz
 %%DATADIR%%/%%VER%%/locale/addon_de.mo
 %%DATADIR%%/%%VER%%/locale/addon_es.mo
 %%DATADIR%%/%%VER%%/locale/addon_it.mo
+%%DATADIR%%/%%VER%%/locale/addon_ja.mo
 %%DATADIR%%/%%VER%%/locale/addon_pl.mo
 %%DATADIR%%/%%VER%%/locale/addon_pt.mo
 %%DATADIR%%/%%VER%%/locale/addon_ru.mo
@@ -1431,6 +1437,7 @@ share/icons/hicolor/scalable/mimetypes/text-x-kvs.svgz
 %%DATADIR%%/%%VER%%/locale/defscript_de.mo
 %%DATADIR%%/%%VER%%/locale/defscript_es.mo
 %%DATADIR%%/%%VER%%/locale/defscript_it.mo
+%%DATADIR%%/%%VER%%/locale/defscript_ja.mo
 %%DATADIR%%/%%VER%%/locale/defscript_pl.mo
 %%DATADIR%%/%%VER%%/locale/defscript_pt.mo
 %%DATADIR%%/%%VER%%/locale/editor_bg.mo
@@ -1476,6 +1483,7 @@ share/icons/hicolor/scalable/mimetypes/text-x-kvs.svgz
 %%DATADIR%%/%%VER%%/locale/kvirc_hr.mo
 %%DATADIR%%/%%VER%%/locale/kvirc_hu.mo
 %%DATADIR%%/%%VER%%/locale/kvirc_it.mo
+%%DATADIR%%/%%VER%%/locale/kvirc_ja.mo
 %%DATADIR%%/%%VER%%/locale/kvirc_nl.mo
 %%DATADIR%%/%%VER%%/locale/kvirc_pl.mo
 %%DATADIR%%/%%VER%%/locale/kvirc_pt.mo
@@ -1485,6 +1493,7 @@ share/icons/hicolor/scalable/mimetypes/text-x-kvs.svgz
 %%DATADIR%%/%%VER%%/locale/kvirc_uk.mo
 %%DATADIR%%/%%VER%%/locale/kvs_de.mo
 %%DATADIR%%/%%VER%%/locale/kvs_it.mo
+%%DATADIR%%/%%VER%%/locale/kvs_ja.mo
 %%DATADIR%%/%%VER%%/locale/kvs_pt.mo
 %%DATADIR%%/%%VER%%/locale/kvs_ru.mo
 %%DATADIR%%/%%VER%%/locale/logview_bg.mo
@@ -1497,6 +1506,7 @@ share/icons/hicolor/scalable/mimetypes/text-x-kvs.svgz
 %%DATADIR%%/%%VER%%/locale/logview_hr.mo
 %%DATADIR%%/%%VER%%/locale/logview_hu.mo
 %%DATADIR%%/%%VER%%/locale/logview_it.mo
+%%DATADIR%%/%%VER%%/locale/logview_ja.mo
 %%DATADIR%%/%%VER%%/locale/logview_nl.mo
 %%DATADIR%%/%%VER%%/locale/logview_pl.mo
 %%DATADIR%%/%%VER%%/locale/logview_pt.mo
@@ -1531,6 +1541,7 @@ share/icons/hicolor/scalable/mimetypes/text-x-kvs.svgz
 %%DATADIR%%/%%VER%%/locale/notifier_hr.mo
 %%DATADIR%%/%%VER%%/locale/notifier_hu.mo
 %%DATADIR%%/%%VER%%/locale/notifier_it.mo
+%%DATADIR%%/%%VER%%/locale/notifier_ja.mo
 %%DATADIR%%/%%VER%%/locale/notifier_nl.mo
 %%DATADIR%%/%%VER%%/locale/notifier_pl.mo
 %%DATADIR%%/%%VER%%/locale/notifier_pt.mo
@@ -1553,6 +1564,7 @@ share/icons/hicolor/scalable/mimetypes/text-x-kvs.svgz
 %%DATADIR%%/%%VER%%/locale/options_hr.mo
 %%DATADIR%%/%%VER%%/locale/options_hu.mo
 %%DATADIR%%/%%VER%%/locale/options_it.mo
+%%DATADIR%%/%%VER%%/locale/options_ja.mo
 %%DATADIR%%/%%VER%%/locale/options_nl.mo
 %%DATADIR%%/%%VER%%/locale/options_pl.mo
 %%DATADIR%%/%%VER%%/locale/options_pt.mo
@@ -1598,6 +1610,7 @@ share/icons/hicolor/scalable/mimetypes/text-x-kvs.svgz
 %%DATADIR%%/%%VER%%/locale/serverdb_hr.mo
 %%DATADIR%%/%%VER%%/locale/serverdb_hu.mo
 %%DATADIR%%/%%VER%%/locale/serverdb_it.mo
+%%DATADIR%%/%%VER%%/locale/serverdb_ja.mo
 %%DATADIR%%/%%VER%%/locale/serverdb_nl.mo
 %%DATADIR%%/%%VER%%/locale/serverdb_pl.mo
 %%DATADIR%%/%%VER%%/locale/serverdb_pt.mo