Version bump. Fixes bug #290067 and security bug #432756.

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64

8 files changed, 639 insertions, 65 deletions

diff --git a/net-voip/gnugk/ChangeLog b/net-voip/gnugk/ChangeLog
index 8e32ab777c6b..bd7383b5bd1b 100644
--- a/net-voip/gnugk/ChangeLog
+++ b/net-voip/gnugk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-voip/gnugk
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/gnugk/ChangeLog,v 1.9 2010/06/17 20:58:55 patrick Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/gnugk/ChangeLog,v 1.10 2013/03/06 02:09:40 chithanh Exp $
+
+*gnugk-3.2.2 (06 Mar 2013)
+
+  06 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/gnugk-3.2.2-h323plus-buildopts.patch,
+  +files/gnugk-3.2.2-lua.cxx-toolkit_h.patch, +files/gnugk-3.2.2-ptrace.patch,
+  +gnugk-3.2.2.ebuild, -gnugk-2.2.5.ebuild, metadata.xml:
+  Version bump. Fixes bug #290067 and security bug #432756.
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> gnugk-2.2.5.ebuild,
   gnugk-2.2.7.ebuild, gnugk-2.2.8.ebuild:
@@ -85,4 +93,3 @@
   metadata.xml, files/gnugk-2.0.6-gentoo.diff, files/gnugk.confd,
   files/gnugk.rc6:
   initial import.
-
diff --git a/net-voip/gnugk/Manifest b/net-voip/gnugk/Manifest
index bda70bc2858d..5c5b85fc0c27 100644
--- a/net-voip/gnugk/Manifest
+++ b/net-voip/gnugk/Manifest
@@ -1,13 +1,16 @@
-AUX gnugk-2.2.7-configure.patch 829 RMD160 d46e83e5cb71f208aa99c176d4f56041a2d50ec2 SHA1 2899cfdee53082c147940b5b91cd8d9569008856 SHA256 da72007bc2d61ba89eca1313888d8a1a0f76d982a44b33331a51bc61c7e8ac9e
-AUX gnugk-2.2.7-firebird-2.1.patch 2619 RMD160 be1b5db79cb77c944c519641b5905b7a4e6443f2 SHA1 6d913245f0cacb6fb5a40d2ce64f8d411b4dfe4c SHA256 cb0cad48bae59b9efb6642939d203c8fd32798271e0db61c22742966665be637
-AUX gnugk-2.2.8-firebird-2.1.patch 2472 RMD160 2164a51578f012e939ad485de361a2a9bc7b2c09 SHA1 c2d150fa09963713f9584caafa674c0ef0c968e9 SHA256 912fa58d28d6773c7bd5779079c45445083406362a819950e553b86ba0b02394
-AUX gnugk.confd 381 RMD160 4069a0b1a972a49b13e613b99659c2c784b24888 SHA1 4bff9f084bc4870368061a0dea0ce07241f7a7c2 SHA256 14f7edc893d5453446afcd46d744711ebab017f1c0caac0e25151beb347ab831
-AUX gnugk.rc6 522 RMD160 cb202253b9d5a97879ed4cbe44d678c688ac6433 SHA1 93913dafd8bf1456c72f3a5e2aee300281f7daa0 SHA256 d2fef2854aeef665f3f84eb62411ac5e5e3a0581dfd873ca61f2942b67443db9
-DIST gnugk-2.2.5.tar.gz 1126814 RMD160 dcddaeea50bfa388ddceaf4651161a5e8fdaa83b SHA1 f52890d83767fe1c06e1d893ada1791d96b98448 SHA256 f7ad113b1979bd0b2a15eff3b3e28e47c62026552d2c926767ad8a8aff44af81
-DIST gnugk-2.2.7.tar.gz 1160654 RMD160 b59183c067124b931eb4a79debbadb4fbe053154 SHA1 edf4548702a053ea042db91ff3085853c10ad426 SHA256 4cdace4970977c69d0cdf88841f025eb0e96578bfe9b3ecc45b33ccb6efb2073
-DIST gnugk-2.2.8.tar.gz 1282055 RMD160 a305090c7228a35cc4210111eb71a4a1e6e2cf57 SHA1 e21fbbec2818045c7ec47ea0b78af2a6c0bc0396 SHA256 7b1fbc33bdde8c8aa5f427011a3b5acc7804a7c47070c3873365712bdcfe23e3
-EBUILD gnugk-2.2.5.ebuild 1131 RMD160 76a13c7a2470281e02d1a961969b2da6dfa8dd43 SHA1 d26ea3f6c1c6824316365f55d4020d270a69112f SHA256 606346c10b7e140682ce4b936ae8f3191ece1e643b9e6128981be1924ee12f7d
-EBUILD gnugk-2.2.7.ebuild 3143 RMD160 2f3c6102c49dd8dcf4344fd6bac927960e81b181 SHA1 cb4cb542a01ddbb24206e0177958a4bf2b4e8e72 SHA256 2aa67155c97c3af3d520a17c0b4862cb412e5afe1c3ddc866a3ddd5e436b6cee
-EBUILD gnugk-2.2.8.ebuild 3237 RMD160 197ece926a88eb8474d8e06f750320609b949c28 SHA1 d758ebb862fb55ea4971b35e1b97025abfd6ab3b SHA256 1afe32db28eff056ec1959401b81e76037d66796d2f215b8219109e7e9ec7313
-MISC ChangeLog 2924 RMD160 5619a3cab31b01f6085bf812ca1de9429a351ecf SHA1 e64bf153fd3875eb7857dd5c208e4ab04fc5d1d3 SHA256 8842a7ee2e8708c5a9a1b70e5f62b584001da9cfd37973238b211708cd8ba806
-MISC metadata.xml 159 RMD160 1cb780cd4240aaeb1b22a09a786b8ed4b0803823 SHA1 c96c65dcb37a559953bf3446b6719b0cac3585a8 SHA256 6831e631b05a25ddae6c3e148d49b98877ee1dd318185a0c95f3cad8a89bf34d
+AUX gnugk-2.2.7-configure.patch 829 SHA256 da72007bc2d61ba89eca1313888d8a1a0f76d982a44b33331a51bc61c7e8ac9e SHA512 dd40db681f862f9ca8b7e46098a235c890fe475480a3d7338391fbbf4fb80d552ff059eff3202004340270bd837b56c8d6cdaa076875886d2189b12ad2eee83a WHIRLPOOL f7de12c0c748ac78e0a48d984f3668e6e499b5ab23e813bb60487e132153e730876399d5cce7ff292996b92e8c00527de88c5f8ca5e6e68f56473657ba52e4c3
+AUX gnugk-2.2.7-firebird-2.1.patch 2619 SHA256 cb0cad48bae59b9efb6642939d203c8fd32798271e0db61c22742966665be637 SHA512 f9c13140362f9d4b4d4c17a257aaf1d70120afbb937b8ad5d7cb9254d7a28597adfcf2a2806c91862b1ddb88cb6dfa02c477302497c2350930da0b8fcb76f190 WHIRLPOOL 1ca5b8d4e960af9ea58d4abd5266d468af4cd8e3fc9413def371ecb1c53553ed4bac4e63ffb43b540a1fb8419a0cc12c6c007e39e6ed2862e9220ba4d61cb24f
+AUX gnugk-2.2.8-firebird-2.1.patch 2472 SHA256 912fa58d28d6773c7bd5779079c45445083406362a819950e553b86ba0b02394 SHA512 0a2b5215d2f0e77419b4b9b82ab1ca65e4c27ea9a2f229d327d6841a9ac589c8f6e6a990ab4e1eadc45b3936afaf568645a6fc7f8ad98fa792440415e27c0d5d WHIRLPOOL b317d33d64ddb1caaca2be495200d89a623195abfa6c0357e7556559233d653ec485e986da75f6e075dd65d8087a8be3cffb4e9c51ac485711b0fd622cd8030d
+AUX gnugk-3.2.2-h323plus-buildopts.patch 3114 SHA256 03cdeedc3140081ddab24e6534d0f306cdef88835d3ce80afc6d6535a7df8b67 SHA512 f70d2f59271524216c85170c4ffc558b2b0ca83bd387d5e981f1e048b4fac7b59ac010fdd92a34fc30b78b788401460e61c774450ee37cb29d44ce6cb38722f9 WHIRLPOOL b53e7b24e3b66b56b03b61b7e4692b5429ef5a6fa908c192f0227fa6fd9afe1dd459ab0cf2b11e97cf21a4ce7cca464cdc4374291ab1df345f6a8a47fbb5c39b
+AUX gnugk-3.2.2-lua.cxx-toolkit_h.patch 257 SHA256 b568e367d8e2bd28579db69aefca4faedc32dd5d650b2198a116b9701b13e063 SHA512 e6bf6deedc28b045931711937da4c1179c066388249ce1ea4f6311fe3cd725e13dba72f9384593b4a06d54f8c37f0527c22ebece35670f0ee6a654bb51458881 WHIRLPOOL d6bb33ad9b9c5a2b969da5ab2244453aa0c0b9a4f1fac8f8a30259de79428ac57c52db4299a61a1c4b4a3e17e43bb2b2ffa349d23359f2fc533dce2f2b5d59d8
+AUX gnugk-3.2.2-ptrace.patch 11953 SHA256 94558fbc0a7001dc4925cbb14049dadced6ec85c64df7cbdbfb734b442ae1d4c SHA512 fadd307dfa66a0021787a2bd2a4d8c523d4fcdf549918c9a72d4ab509fb2e9544a8bb8a012da73eb44738987fcf04cf1034353b98a2746dceb99ad5660415435 WHIRLPOOL ded60ececb03e876830ef375b2c1f520073dcbee3e447fbb3aa1fd8d8d004fe66d2f73a65dabdce72f5f9225331f6d84939fead7fae05ce2f0462c062ae05e93
+AUX gnugk.confd 381 SHA256 14f7edc893d5453446afcd46d744711ebab017f1c0caac0e25151beb347ab831 SHA512 315fd50372042064dc63e0a6d6290b9ee60ee4aada512cee5cfd320b907ed931ea869ec87a83a007c75b5cdc48822e46c07ba112dd5d1e4dbc1ae7a234f076ee WHIRLPOOL 9a932c346260cbc62e9f70dbd0c8beedfc78c8c9603739e0ba767b5dca82970b02251c51641904fb3cb1fef6f2241e51ca2139d77ac1d45fd307aded72b92fb4
+AUX gnugk.rc6 522 SHA256 d2fef2854aeef665f3f84eb62411ac5e5e3a0581dfd873ca61f2942b67443db9 SHA512 dbfe3f584e3e92740ee220fa9c386062ee9b589c9d53af4cc0b00f86a8ba10d77b2a7d2f70919e47a3f89a4b67359a12aec6ef04e790bd2355795ec87f09ff5c WHIRLPOOL 1139e4243e47034db5b81dafc284356ef40f1eddfa2650329e1221ac1720c165b741eea8fbba457ba7b94f1b69a4b460577b768fc220876690597949f4756bda
+DIST gnugk-2.2.7.tar.gz 1160654 SHA256 4cdace4970977c69d0cdf88841f025eb0e96578bfe9b3ecc45b33ccb6efb2073
+DIST gnugk-2.2.8.tar.gz 1282055 SHA256 7b1fbc33bdde8c8aa5f427011a3b5acc7804a7c47070c3873365712bdcfe23e3 SHA512 3363165d7adb90689c1472adf2cd01e0dbdb25968a2d00eba7a6901acd01b1df1376822dc4c9d2e061693d3764940557605e65a6ea84a734135b5c2b2f146795 WHIRLPOOL 3fc3f5bfd3ed971009f317d85fa0712cb255cfee0c3088e8c77f404728916f24dd46d0fef49a413fccd09a0c781edccd168cd94ab8a3307fb958233bad987e06
+DIST gnugk-3.2-2.tar.gz 1151584 SHA256 e2f235b46a7e9bebf5d5817780675d0f71c8c79d973fa4ef83c25c156086f49c SHA512 26a9bd700db7ac356010be6dcf7b583dcdbd138d401218ffb102d5be3bf3b7990787c0e2bd16a47ac071e199d3865c9664b627f47dcaa58ebb82d98196a32df1 WHIRLPOOL af59a5f7e33cdfcc5665356687548fdcab7d36bc69e35fdb1927f3be2b0cb7c0421fb6e6d54ed3e17ed6d2e4673a671b3a84a2f9b3828887c80dc1a336af73cd
+EBUILD gnugk-2.2.7.ebuild 3143 SHA256 2aa67155c97c3af3d520a17c0b4862cb412e5afe1c3ddc866a3ddd5e436b6cee SHA512 118cf384eb0a65a36abb44de25d1fca20ddc5611b117357d886decb32ee792ffe532ad81763ae928c6ce1b270a00e419820cc2e4189e0ad8a58ba30231628f1f WHIRLPOOL abc728e113880f04151d6dc906e170174fd52ac14d9907d339ba0bd2bff4bafb2f9b08f29e8205d912b5ae3c22f7a8051be2427b2e1e2972080a28b5ac6de46f
+EBUILD gnugk-2.2.8.ebuild 3237 SHA256 1afe32db28eff056ec1959401b81e76037d66796d2f215b8219109e7e9ec7313 SHA512 1b31bd103feb86e2a9763cf3c2f0653c193378fa2b799ac839f6076085cf902a416af4f64cda74c6018ab52bb4639dd3b63895552d6fb1e1d3495e794f2af5e3 WHIRLPOOL 48d6bb1a1de5b85d9bbdf63643f13e515ca20670b1e4dfa071ccd024eac0a877abd239c27d70b4c7c63fbc5783a31b1d7a1e7c4a49a6ddd4789eecd49ded6b29
+EBUILD gnugk-3.2.2.ebuild 3057 SHA256 92dbfe16a8c304e5d0cc930377703254d050247a5236f0b87e0fe994dc470a6b SHA512 9d9271939a10a9bdb3fa5d5b62d3ecac398479e65aca61176131b076579b20820bc7bc12b819f86db175ec2086f92d5824d8405965d8ee032f4fad91f966cc13 WHIRLPOOL 30fe2fa5ae186143bc0549b01e4bd7bd3b521d02f14d4d2299c2aa87cbdba76385951d5f6cf10547ef95c1911c2dbb0ef8c677e1315d3132804b73a5537049f5
+MISC ChangeLog 3267 SHA256 f89773af5bfcf0f8ab539adfb182b33e10ce79c42c2c4f7d565386ee00bd6108 SHA512 4eef5507371c2a9861f28f944405dc1c04278521625e0b869d9cffda3bf8b37c96a1e6222a5952202e3ae12bceb02868fa1dd16ca48ec02f7fe6166280e1993a WHIRLPOOL 287cd9c17aa6ebfb390b48acdc56f30a4c4c58abcc1d39f24cb9b919d4cf03682df73cf645390d5a8eba302d486b5b58bb6611547cce278588ec8cdf44454606
+MISC metadata.xml 276 SHA256 bc70b3a516e4900ab8ab8e1ef836b387073a5744662dc4a0abc49970222f19ff SHA512 8319b76cbfb511d22e68a04e50e5ca1e8969733e2435c086afbe25d944ac6bb4f5559e5b36d2383c2c3d9e636944c05e477059689cd52d589496ffc996689c4b WHIRLPOOL 583eab56c7de87452655441c55f682389052e0517bc0070476b4f88d95f8f7e67b72164478db8cf4941ecde5139794bd41509f2fd95d754957a4c1b130f85b19
diff --git a/net-voip/gnugk/files/gnugk-3.2.2-h323plus-buildopts.patch b/net-voip/gnugk/files/gnugk-3.2.2-h323plus-buildopts.patch
new file mode 100644
index 000000000000..3a3088e47a07
--- /dev/null
+++ b/net-voip/gnugk/files/gnugk-3.2.2-h323plus-buildopts.patch
@@ -0,0 +1,53 @@
+diff -ur a/configure.in b/configure.in
+--- a/configure.in	2013-01-14 23:56:02.000000000 +0100
++++ b/configure.in	2013-03-05 21:24:02.639204755 +0100
+@@ -203,16 +203,16 @@
+     AC_CHECK_FILE(${OPENH323MAKEDIR}/openh323buildopts.h, HAS_OPENH323_VERSIONFILE=1)
+     if test "${HAS_OPENH323_VERSIONFILE:-unset}" != "unset"; then
+       OPENH323_VERSION_FILE=${OPENH323MAKEDIR}/openh323buildopts.h
+-      OPENH323_MAJOR_VERSION=`cat ${OPENH323_VERSION_FILE} | grep OPENH323_MAJOR | cut -f3 -d' '`
+-      OPENH323_MINOR_VERSION=`cat ${OPENH323_VERSION_FILE} | grep OPENH323_MINOR | cut -f3 -d' '`
+-      OPENH323_BUILD_NUMBER=`cat ${OPENH323_VERSION_FILE} | grep OPENH323_BUILD | cut -f3 -d' '`
++      OPENH323_MAJOR_VERSION=`cat ${OPENH323_VERSION_FILE} | grep -m1 OPENH323_MAJOR | cut -f3 -d' '`
++      OPENH323_MINOR_VERSION=`cat ${OPENH323_VERSION_FILE} | grep -m1 OPENH323_MINOR | cut -f3 -d' '`
++      OPENH323_BUILD_NUMBER=`cat ${OPENH323_VERSION_FILE} | grep -m1 OPENH323_BUILD | cut -f3 -d' '`
+     else
+       AC_CHECK_FILE(${OPENH323MAKEDIR}/../../include/openh323/openh323buildopts.h, HAS_OPENH323_VERSIONFILE=1)
+       if test "${HAS_OPENH323_VERSIONFILE:-unset}" != "unset"; then
+         OPENH323_VERSION_FILE=${OPENH323MAKEDIR}/../../include/openh323/openh323buildopts.h
+-        OPENH323_MAJOR_VERSION=`cat ${OPENH323_VERSION_FILE} | grep OPENH323_MAJOR | cut -f2 -d' '`
+-        OPENH323_MINOR_VERSION=`cat ${OPENH323_VERSION_FILE} | grep OPENH323_MINOR | cut -f2 -d' '`
+-        OPENH323_BUILD_NUMBER=`cat ${OPENH323_VERSION_FILE} | grep "OPENH323_BUILD " | cut -f2 -d' '`
++        OPENH323_MAJOR_VERSION=`cat ${OPENH323_VERSION_FILE} | grep -m1 OPENH323_MAJOR | cut -f3 -d' '`
++        OPENH323_MINOR_VERSION=`cat ${OPENH323_VERSION_FILE} | grep -m1 OPENH323_MINOR | cut -f3 -d' '`
++        OPENH323_BUILD_NUMBER=`cat ${OPENH323_VERSION_FILE} | grep -m1 "OPENH323_BUILD " | cut -f3 -d' '`
+       fi
+     fi
+   fi
+@@ -269,7 +269,7 @@
+ [ h46017="${enableval}" ], [h46017="yes"] 
+ )
+ 
+-H460SUPPORT=`cat ${OPENH323DIR}/include/openh323buildopts.h | grep 'define H323_H460'`
++H460SUPPORT=`cat ${OPENH323DIR}/include/{,openh323/}openh323buildopts.h | grep 'define H323_H460'`
+ if test "${H460SUPPORT:-unset}" = "unset" ; then
+ 	if test "x${h46017}" != "xno" ; then     
+ 		AC_MSG_RESULT(No H.460 support available)
+@@ -301,7 +301,7 @@
+ [ h46018="${enableval}" ], [h46018="no"] 
+ )
+ 
+-H460SUPPORT=`cat ${OPENH323DIR}/include/openh323buildopts.h | grep 'define H323_H460'`
++H460SUPPORT=`cat ${OPENH323DIR}/include/{,openh323/}openh323buildopts.h | grep 'define H323_H460'`
+ if test "${H460SUPPORT:-unset}" = "unset" ; then
+ 	if test "x${h46018}" != "xno" ; then     
+ 		AC_MSG_RESULT(No H.460 support available)
+@@ -332,7 +332,7 @@
+ [ h46023="${enableval}" ], [h46023="yes"] 
+ )
+ 
+-H460SUPPORT=`cat ${OPENH323DIR}/include/openh323buildopts.h | grep 'define H323_H460'`
++H460SUPPORT=`cat ${OPENH323DIR}/include/{,openh323/}openh323buildopts.h | grep 'define H323_H460'`
+ if test "${H460SUPPORT:-unset}" = "unset" ; then
+ 	if test "x${h46023}" != "xno" ; then     
+ 		AC_MSG_RESULT(No H.460 support available)
diff --git a/net-voip/gnugk/files/gnugk-3.2.2-lua.cxx-toolkit_h.patch b/net-voip/gnugk/files/gnugk-3.2.2-lua.cxx-toolkit_h.patch
new file mode 100644
index 000000000000..e803ef09a933
--- /dev/null
+++ b/net-voip/gnugk/files/gnugk-3.2.2-lua.cxx-toolkit_h.patch
@@ -0,0 +1,11 @@
+diff -ur a/lua.cxx b/lua.cxx
+--- a/lua.cxx	2012-12-28 21:35:42.000000000 +0100
++++ b/lua.cxx	2013-03-05 22:08:21.823141158 +0100
+@@ -20,6 +20,7 @@
+ #include "Routing.h"
+ #include "gk_const.h"
+ #include "snmp.h"
++#include "Toolkit.h"
+ 
+ #include <lua.hpp>
+ 
diff --git a/net-voip/gnugk/files/gnugk-3.2.2-ptrace.patch b/net-voip/gnugk/files/gnugk-3.2.2-ptrace.patch
new file mode 100644
index 000000000000..897f99f007f8
--- /dev/null
+++ b/net-voip/gnugk/files/gnugk-3.2.2-ptrace.patch
@@ -0,0 +1,421 @@
+diff -ur a/capctrl.cxx b/capctrl.cxx
+--- a/capctrl.cxx	2011-11-28 13:33:41.000000000 +0100
++++ b/capctrl.cxx	2013-03-06 02:53:41.038731734 +0100
+@@ -255,6 +255,7 @@
+ 	m_cliCallVolumes = cliCallVolumes;
+ 
+ 	PTRACE(5, "CAPCTRL\t" << ipRules << " IP rules loaded");
++#if PTRACING
+ 	if (PTrace::CanTrace(6)) {
+ 		ostream &strm = PTrace::Begin(6, __FILE__, __LINE__);
+ 		strm << "Per IP call volume rules:" << endl;
+@@ -264,8 +265,10 @@
+ 		}
+ 		PTrace::End(strm);
+ 	}
++#endif
+ 
+ 	PTRACE(5, "CAPCTRL\t" << h323IdRules << " H.323 ID rules loaded");
++#if PTRACING
+ 	if (PTrace::CanTrace(6)) {
+ 		ostream &strm = PTrace::Begin(6, __FILE__, __LINE__);
+ 		strm << "Per H.323 ID call volume rules:" << endl;
+@@ -275,8 +278,10 @@
+ 		}
+ 		PTrace::End(strm);
+ 	}
++#endif
+ 
+ 	PTRACE(5, "CAPCTRL\t" << cliRules << " CLI rules loaded");
++#if PTRACING
+ 	if (PTrace::CanTrace(6)) {
+ 		ostream &strm = PTrace::Begin(6, __FILE__, __LINE__);
+ 		strm << "Per CLI call volume rules:" << endl;
+@@ -286,6 +291,7 @@
+ 		}
+ 		PTrace::End(strm);
+ 	}
++#endif
+ }
+ 
+ PString CapacityControl::PrintRules()
+diff -ur a/clirw.cxx b/clirw.cxx
+--- a/clirw.cxx	2012-05-07 16:18:04.000000000 +0200
++++ b/clirw.cxx	2013-03-06 02:53:41.038731734 +0100
+@@ -456,6 +456,7 @@
+ 	}
+ 	
+ 	PTRACE(5, "CLIRW\t" << inboundRules << " inbound rules loaded");
++#if PTRACING
+ 	if (PTrace::CanTrace(6)) {
+ 		ostream &strm = PTrace::Begin(6, __FILE__, __LINE__);
+ 		strm << "Inbound CLI rewrite rules:" << endl;
+@@ -466,8 +467,10 @@
+ 		}
+ 		PTrace::End(strm);
+ 	}
++#endif
+ 
+ 	PTRACE(5, "CLIRW\t" << outboundRules << " outbound rules loaded");
++#if PTRACING
+ 	if (PTrace::CanTrace(6)) {
+ 		ostream &strm = PTrace::Begin(6, __FILE__, __LINE__);
+ 		strm << "Outbound CLI rewrite rules:" << endl;
+@@ -480,6 +483,7 @@
+ 			}
+ 		PTrace::End(strm);
+ 	}
++#endif
+ 
+ 	m_processSourceAddress = Toolkit::AsBool(
+ 		cfg->GetString(CLIRewriteSection, ProcessSourceAddress, "1")
+diff -ur a/gkacct.cxx b/gkacct.cxx
+--- a/gkacct.cxx	2012-12-10 20:32:52.000000000 +0100
++++ b/gkacct.cxx	2013-03-06 02:53:41.038731734 +0100
+@@ -919,6 +919,7 @@
+ 		switch (status)
+ 		{
+ 		case GkAcctLogger::Ok:
++#if PTRACING
+ 			if (PTrace::CanTrace(3)) {
+ 				ostream& strm = PTrace::Begin(3,__FILE__,__LINE__);
+ 				strm << "GKACCT\t" << logger->GetName() << " logged event " << evt;
+@@ -926,9 +927,11 @@
+ 					strm << " for call no. " << call->GetCallNumber();
+ 				PTrace::End(strm);
+ 			}
++#endif
+ 			break;
+ 			
+ 		default:
++#if PTRACING
+ 			if (PTrace::CanTrace(3)) {
+ 				ostream& strm = PTrace::Begin(3, __FILE__, __LINE__);
+ 				strm << "GKACCT\t" << logger->GetName() << " failed to log event " << evt;
+@@ -937,6 +940,7 @@
+ 					strm << " for call no. " << call->GetCallNumber();
+ 				PTrace::End(strm);
+ 			}
++#endif
+ 			// required and sufficient rules always determine 
+ 			// status of the request
+ 			if (logger->GetControlFlag() == GkAcctLogger::Required
+@@ -954,7 +958,8 @@
+ 	// a last rule determine status of the the request
+ 	if (finalResult && status != GkAcctLogger::Ok)
+ 		finalResult = false;
+-		
++
++#if PTRACING		
+ 	if (PTrace::CanTrace(2)) {
+ 		ostream& strm = PTrace::Begin(2, __FILE__, __LINE__);
+ 		strm << "GKACCT\t" << (finalResult ? "Successfully logged event " 
+@@ -965,6 +970,7 @@
+ 		if (!finalResult)
+ 			SNMP_TRAP(7, SNMPError, Accounting, "Failed to log event " + evt);
+ 	}
++#endif
+ 	return finalResult;
+ }
+ 
+@@ -987,6 +993,7 @@
+ 		switch (status)
+ 		{
+ 		case GkAcctLogger::Ok:
++#if PTRACING
+ 			if (PTrace::CanTrace(3)) {
+ 				ostream& strm = PTrace::Begin(3,__FILE__,__LINE__);
+ 				strm << "GKACCT\t" << logger->GetName() << " logged event " << evt;
+@@ -994,9 +1001,11 @@
+ 					strm << " for endpoint " << ep->GetEndpointIdentifier().GetValue();
+ 				PTrace::End(strm);
+ 			}
++#endif
+ 			break;
+ 			
+ 		default:
++#if PTRACING
+ 			if (PTrace::CanTrace(3)) {
+ 				ostream& strm = PTrace::Begin(3, __FILE__, __LINE__);
+ 				strm << "GKACCT\t" << logger->GetName() << " failed to log event " << evt;
+@@ -1005,6 +1014,7 @@
+ 				PTrace::End(strm);
+ 				SNMP_TRAP(7, SNMPError, Accounting, logger->GetName() + " failed to log event " + PString(evt));
+ 			}
++#endif
+ 			// required and sufficient rules always determine 
+ 			// status of the request
+ 			if (logger->GetControlFlag() == GkAcctLogger::Required
+@@ -1023,6 +1033,7 @@
+ 	if (finalResult && status != GkAcctLogger::Ok)
+ 		finalResult = false;
+ 		
++#if PTRACING
+ 	if (PTrace::CanTrace(2)) {
+ 		ostream& strm = PTrace::Begin(2, __FILE__, __LINE__);
+ 		strm << "GKACCT\t" << (finalResult ? "Successfully logged event " 
+@@ -1033,6 +1044,7 @@
+ 		if (!finalResult)
+ 			SNMP_TRAP(7, SNMPError, Accounting, "Failed to log event " + evt);
+ 	}
++#endif
+ 	return finalResult;
+ }
+ 
+diff -ur a/gkauth.cxx b/gkauth.cxx
+--- a/gkauth.cxx	2012-12-03 10:29:52.000000000 +0100
++++ b/gkauth.cxx	2013-03-06 02:53:38.494731795 +0100
+@@ -834,6 +834,7 @@
+ 	}
+ 
+ 	if (mechanisms.GetSize() > 0 && algorithmOIDs.GetSize() > 0) {
++#if PTRACING
+ 		if (PTrace::CanTrace(4)) {
+ 			ostream& strm = PTrace::Begin(4,__FILE__,__LINE__);
+ 			strm <<"GkAuth\tH.235 capabilities selected for GCF:\n";
+@@ -845,6 +846,7 @@
+ 				strm << "\t\t" << algorithmOIDs[i] << '\n';
+ 			PTrace::End(strm);
+ 		}
++#endif
+ #ifdef OpenH323Factory
+ 	}
+ #else
+diff -ur a/gk.cxx b/gk.cxx
+--- a/gk.cxx	2013-01-04 13:20:20.000000000 +0100
++++ b/gk.cxx	2013-03-06 02:53:38.494731795 +0100
+@@ -1076,9 +1076,11 @@
+ bool Gatekeeper::InitLogging(const PArgList & args)
+ {
+ 	// Syslog is the default when compiled as service, but we don't want that
++#if PTRACING
+ 	PTrace::ClearOptions(PTrace::SystemLogStream);
+ 	PTrace::SetOptions(PTrace::DateAndTime | PTrace::TraceLevel | PTrace::FileAndLine);
+ 	PTrace::SetLevel(args.GetOptionCount('t'));
++#endif
+ 	if (args.HasOption('o')) {
+ 		if (!SetLogFilename(args.GetOptionString('o'))) {
+ 			cerr << "Warning: could not open the log file \""
+@@ -1563,7 +1565,9 @@
+ 		EnableLogFileRotation(false);
+ 	}
+ 
++#if PTRACING
+ 	PTrace::SetStream(&cerr);
++#endif
+ 
+ #ifndef hasDeletingSetStream
+ 	delete m_logFile;
+@@ -1578,7 +1582,9 @@
+ 		return false;
+ 	}
+ 	m_logFile->SetPosition(0, PFile::End);
++#if PTRACING
+ 	PTrace::SetStream(m_logFile);
++#endif
+ 	return true;
+ }
+ 
+@@ -1588,7 +1594,9 @@
+ 
+ 	if (m_logFile) {
+ 		PTRACEX(1, "GK\tLogging closed (log file rotation)");
++#if PTRACING
+ 		PTrace::SetStream(&cerr); // redirect to cerr
++#endif
+ #ifndef hasDeletingSetStream
+ 		delete m_logFile;
+ #endif
+@@ -1625,7 +1633,9 @@
+ 	}
+ 
+ 	m_logFile->SetPosition(0, PFile::End);
++#if PTRACING
+ 	PTrace::SetStream(m_logFile);
++#endif
+ 	PTRACEX(1, "GK\tLogging restarted\n" + Toolkit::GKVersion());
+ 	return true;
+ }
+@@ -1636,7 +1646,9 @@
+ 
+ 	if (m_logFile) {
+ 		PTRACEX(1, "GK\tLogging closed (reopen log file)");
++#if PTRACING
+ 		PTrace::SetStream(&cerr); // redirect to cerr
++#endif
+ #ifndef hasDeletingSetStream
+ 		delete m_logFile;
+ #endif
+@@ -1665,7 +1677,9 @@
+ 		}
+ 	}
+ 	m_logFile->SetPosition(0, PFile::End);
++#if PTRACING
+ 	PTrace::SetStream(m_logFile);
++#endif
+ 	PTRACEX(1, "GK\tLogging restarted\n" + Toolkit::GKVersion());
+ 	return true;
+ }
+@@ -1677,7 +1691,9 @@
+ 	if (m_logFile) {
+ 		PTRACEX(1, "GK\tLogging closed");
+ 	}
++#if PTRACING
+ 	PTrace::SetStream(&cerr);
++#endif
+ #ifndef hasDeletingSetStream
+ 	delete m_logFile;
+ #endif
+diff -ur a/GkStatus.cxx b/GkStatus.cxx
+--- a/GkStatus.cxx	2012-12-18 16:16:18.000000000 +0100
++++ b/GkStatus.cxx	2013-03-06 02:53:38.494731795 +0100
+@@ -1314,6 +1314,7 @@
+ 			);
+ 	} else {
+ 		if (args[1] *= "trc") {
++#if PTRACING
+ 			if(args.GetSize() >= 3) {
+ 				if((args[2] == "-") && (PTrace::GetLevel() > 0)) 
+ 					PTrace::SetLevel(PTrace::GetLevel()-1);
+@@ -1322,6 +1323,7 @@
+ 				else PTrace::SetLevel(args[2].AsInteger());
+ 			}
+ 			WriteString(PString(PString::Printf, "Trace Level is now %d\r\n", PTrace::GetLevel()));
++#endif
+ 		} else if (args[1] *= "cfg") {
+ 			if (args.GetSize()>=4)
+ 				WriteString(GkConfig()->GetString(args[2],args[3],"") + "\r\n;\r\n");
+diff -ur a/ipauth.cxx b/ipauth.cxx
+--- a/ipauth.cxx	2011-11-28 13:33:41.000000000 +0100
++++ b/ipauth.cxx	2013-03-06 02:53:41.038731734 +0100
+@@ -226,6 +226,7 @@
+ 	
+ 	PTRACE(5, GetName() << "\t" << m_authList.size() << " entries loaded");
+ 
++#if PTRACING
+ 	if (PTrace::CanTrace(6)) {
+ 		ostream &strm = PTrace::Begin(6, __FILE__, __LINE__);
+ 		strm << GetName() << " entries:\n";
+@@ -238,6 +239,7 @@
+ 		}
+ 		PTrace::End(strm);
+ 	}
++#endif
+ 
+ 	if (dynamicCfg) {
+ 		delete cfg;
+diff -ur a/RasSrv.cxx b/RasSrv.cxx
+--- a/RasSrv.cxx	2012-12-28 16:21:55.000000000 +0100
++++ b/RasSrv.cxx	2013-03-06 02:53:38.494731795 +0100
+@@ -244,6 +244,7 @@
+ 		delete msg;
+ 		return NULL;
+ 	}
++#if PTRACING
+ 	if ((msg->GetTag() != H225_RasMessage::e_serviceControlIndication && msg->GetTag() != H225_RasMessage::e_serviceControlResponse)
+ 		||  PTrace::CanTrace(5)) {
+ 	if (PTrace::CanTrace(3))
+@@ -251,17 +252,20 @@
+ 	else
+ 		PTRACE(2, "RAS\tReceived " << msg->GetTagName() << " from " << AsString(msg->m_peerAddr, msg->m_peerPort));
+ 	}
++#endif
+ 	msg->m_localAddr = GetLocalAddr(msg->m_peerAddr);
+ 	return msg;
+ }
+ 
+ bool RasListener::SendRas(const H225_RasMessage & rasobj, const Address & addr, WORD pt)
+ {
++#if PTRACING
+ 	if ( ((rasobj.GetTag() != H225_RasMessage::e_serviceControlIndication && rasobj.GetTag() != H225_RasMessage::e_serviceControlResponse) && PTrace::CanTrace(3))
+ 		|| PTrace::CanTrace(5))
+ 		PTRACE(3, "RAS\tSend to " << AsString(addr, pt) << '\n' << setprecision(2) << rasobj);
+ 	else
+ 		PTRACE(2, "RAS\tSend " << RasName[rasobj.GetTag()] << " to " << AsString(addr, pt));
++#endif
+ 
+ 	PPER_Stream wtstrm;
+ 	rasobj.Encode(wtstrm);
+diff -ur a/RasTbl.cxx b/RasTbl.cxx
+--- a/RasTbl.cxx	2013-01-04 13:20:20.000000000 +0100
++++ b/RasTbl.cxx	2013-03-06 02:53:38.498731794 +0100
+@@ -1870,6 +1870,7 @@
+ 		endpoints->push_back(routes.front().m_destEndpoint.operator->());
+ 	}
+ 
++#if PTRACING
+ 	if (PTrace::CanTrace(4)) {
+ 		ostream &strm = PTrace::Begin(4, __FILE__, __LINE__);
+ 		strm << "RASTBL\tPrefix match for gateways: ";
+@@ -1880,6 +1881,7 @@
+ 		}
+ 		PTrace::End(strm);
+ 	}
++#endif
+ 
+ 	return true;
+ }
+diff -ur a/Routing.cxx b/Routing.cxx
+--- a/Routing.cxx	2012-12-28 21:35:42.000000000 +0100
++++ b/Routing.cxx	2013-03-06 02:53:38.498731794 +0100
+@@ -1452,6 +1452,7 @@
+ 	PTRACE(5, "ROUTING\t" << m_name << " policy loaded with " << m_prefixes.size()
+ 		<< " prefix entries");
+ 
++#if PTRACING
+ 	if (PTrace::CanTrace(6)) {
+ 		ostream &strm = PTrace::Begin(6, __FILE__, __LINE__);
+ 		strm << "ROUTING\t" << m_name << " policy prefixes:" << endl;
+@@ -1461,6 +1462,7 @@
+ 				<< m_prefixes[i].m_maxLength << endl;
+ 		PTrace::End(strm);
+ 	}
++#endif
+ }
+ 
+ bool NumberAnalysisPolicy::OnRequest(AdmissionRequest & request)
+diff -ur a/Toolkit.cxx b/Toolkit.cxx
+--- a/Toolkit.cxx	2013-01-10 10:23:01.000000000 +0100
++++ b/Toolkit.cxx	2013-03-06 02:53:38.498731794 +0100
+@@ -960,6 +960,7 @@
+ 		return;
+ 	}
+ 
++#if PTRACING
+ 	if (PTrace::CanTrace(3) && (m_GWRewrite.GetSize() < 100)) {
+ 		for (PINDEX i = 0; i < m_GWRewrite.GetSize(); ++i) {
+ 			// In
+@@ -973,6 +974,7 @@
+ 			}
+ 		}
+ 	}
++#endif
+ 	PTRACE(2, "GK\tLoaded " << m_GWRewrite.GetSize() << " GW entries with rewrite info");
+ }
+ 
+@@ -1581,7 +1583,9 @@
+ 	// read the gatekeeper name from the config file, because it might be used as a key into the SQL config
+ 	m_GKName = Config()->GetString("Name", "OpenH323GK");
+ 
++#if PTRACING
+ 	PTrace::SetLevel(GkConfig()->GetInteger("TraceLevel", PTrace::GetLevel()));
++#endif
+ 
+ 	// set the max size of an array in an ASN encoded message (eg. max length of alias list)
+ 	PINDEX maxArraySize = GkConfig()->GetInteger("MaxASNArraySize", 0);
+diff -ur a/yasocket.cxx b/yasocket.cxx
+--- a/yasocket.cxx	2012-12-10 20:32:52.000000000 +0100
++++ b/yasocket.cxx	2013-03-06 02:53:38.498731794 +0100
+@@ -1018,10 +1018,12 @@
+ 		return false;
+ 	}
+ 	ConfigReloadMutex.StartRead();
++#if PTRACING
+ 	if (PTrace::CanTrace(6)) {
+ 		PString msg(PString::Printf, "\t%u sockets selected from %u, total %u/%u", slist.GetSize(), ss, m_socksize, m_rmsize);
+ 		PTRACE(6, GetName() << msg);
+ 	}
++#endif
+ 	return true;
+ }
+ 
diff --git a/net-voip/gnugk/gnugk-2.2.5.ebuild b/net-voip/gnugk/gnugk-2.2.5.ebuild
deleted file mode 100644
index 0f5d94385a88..000000000000
--- a/net-voip/gnugk/gnugk-2.2.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/gnugk/gnugk-2.2.5.ebuild,v 1.4 2010/06/17 20:58:55 patrick Exp $
-
-IUSE="mysql postgres radius"
-
-DESCRIPTION="GNU H.323 gatekeeper"
-HOMEPAGE="http://www.gnugk.org/"
-SRC_URI="mirror://sourceforge/openh323gk/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-LICENSE="GPL-2"
-
-DEPEND="
-	>=dev-libs/pwlib-1.8.4
-	>=net-libs/openh323-1.15.3
-	mysql? ( dev-db/mysql++ )
-	postgres? ( dev-db/postgresql-server )"
-
-src_compile() {
-	econf \
-		--with-large-fdset=4096 \
-		`use_enable mysql` \
-		`use_enable postgres sql` \
-		`use_enable radius` || die
-
-	emake optdepend opt addpasswd || die
-}
-
-src_install() {
-	dosbin obj_*_*_*/gnugk
-	dosbin obj_*_*_*/addpasswd
-
-	insinto /etc/gnugk
-	doins etc/*
-
-	dodoc changes.txt readme.txt copying docs/*.txt
-	mv ${D}/etc/gnugk/*.pl ${D}/usr/share/doc/${PF}
-
-	docinto old
-	dodoc docs/old/*
-
-	dodir /usr/share/doc/${PF}/contrib
-	cp -r contrib/sqlbill ${D}/usr/share/doc/${PF}/contrib
-
-	newinitd ${FILESDIR}/gnugk.rc6 gnugk
-	newconfd ${FILESDIR}/gnugk.confd gnugk
-}
diff --git a/net-voip/gnugk/gnugk-3.2.2.ebuild b/net-voip/gnugk/gnugk-3.2.2.ebuild
new file mode 100644
index 000000000000..1e599a44047d
--- /dev/null
+++ b/net-voip/gnugk/gnugk-3.2.2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/gnugk/gnugk-3.2.2.ebuild,v 1.1 2013/03/06 02:09:40 chithanh Exp $
+
+EAPI="5"
+
+inherit eutils versionator
+
+MY_P1=${PN}-$(replace_version_separator 2 -)
+MY_P2=${PN}-$(get_version_component_range 1-2)
+
+DESCRIPTION="GNU H.323 gatekeeper"
+HOMEPAGE="http://www.gnugk.org/"
+SRC_URI="mirror://sourceforge/openh323gk/${MY_P1}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# dev-db/firebird isn't keyworded for ppc but firebird IUSE is masked for ppc
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc firebird lua mysql odbc postgres radius snmp sqlite ssh linguas_en linguas_es linguas_fr"
+REQUIRED_USE="doc? (
+	|| ( linguas_en linguas_es linguas_fr )
+	)
+"
+
+RDEPEND="net-libs/ptlib:=
+	net-libs/h323plus:=
+	dev-libs/openssl
+	firebird? ( dev-db/firebird )
+	lua? ( dev-lang/lua )
+	mysql? ( virtual/mysql )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( dev-db/postgresql-base )
+	snmp? ( net-analyzer/net-snmp )
+	ssh? ( net-libs/libssh )
+	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}
+	doc? ( app-text/linuxdoc-tools )"
+
+S=${WORKDIR}/${MY_P2}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.2.2-ptrace.patch
+	epatch "${FILESDIR}"/${PN}-3.2.2-h323plus-buildopts.patch
+	epatch "${FILESDIR}"/${PN}-3.2.2-lua.cxx-toolkit_h.patch
+}
+
+# TODO: investigate possible ebuild conversion to use cmake
+src_configure() {
+	# --with-large-fdset=4096 is added because of bug #128102
+	# and it is recommended in the online manual
+	econf \
+		$(use_enable firebird) \
+		$(use_enable lua) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable odbc unixodbc) \
+		$(use_enable radius) \
+		$(use_enable snmp netsnmp) \
+		$(use_enable sqlite) \
+		$(use_enable ssh libssh) \
+		--with-large-fdset=4096
+}
+
+src_compile() {
+	# PASN_NOPRINT should be set for -debug but it's buggy
+	# better to prevent issues and keep default settings
+	# `make debugdepend debugshared` and `make debug` failed (so no debug)
+	# `make optdepend optnoshared` also failed (so no static)
+
+	# splitting emake calls fixes parallel build issue
+	emake optdepend
+	emake \
+		PT_LIBDIR="$(ptlib-config --libdir)" \
+		OH323_LIBDIR="${EPREFIX}"/usr/lib \
+		optshared
+	# build tool addpasswd
+	emake -C addpasswd PTLIBDIR="$(ptlib-config --ptlibdir)"
+
+	if use doc; then
+		cd docs/manual
+
+		if use linguas_en; then
+			emake html
+		fi
+
+		if use linguas_es; then
+			emake html-es
+		fi
+
+		if use linguas_fr; then
+			emake html-fr
+		fi
+		cd ../..
+	fi
+}
+
+src_install() {
+	dosbin obj_*_*_*/${PN}
+	dosbin addpasswd/obj_*_*_*/addpasswd
+
+	dodir /etc/${PN}
+	insinto /etc/${PN}
+	doins etc/*
+
+	dodoc changes.txt readme.txt
+	dodoc docs/*.txt docs/*.pdf
+
+	if use doc; then
+		if use linguas_en; then
+			dohtml docs/manual/manual*.html
+		fi
+		if use linguas_fr; then
+			dohtml docs/manual/fr/manual-fr*.html
+		fi
+		if use linguas_es; then
+			dohtml docs/manual/es/manual-es*.html
+		fi
+	fi
+
+	doman docs/${PN}.1 docs/addpasswd.1
+
+	newinitd "${FILESDIR}"/${PN}.rc6 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-voip/gnugk/metadata.xml b/net-voip/gnugk/metadata.xml
index 8d1e4dd4a5b8..e9bc69280db6 100644
--- a/net-voip/gnugk/metadata.xml
+++ b/net-voip/gnugk/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>voip</herd>
+  <use>
+    <flag name="ssh">Enable support for SSH port forwarding using <pkg>net-libs/libssh</pkg></flag>
+  </use>
 </pkgmetadata>