diff options
| -rw-r--r-- | net-voip/gnugk/ChangeLog | 8 | ||||
| -rw-r--r-- | net-voip/gnugk/Manifest | 5 | ||||
| -rw-r--r-- | net-voip/gnugk/files/gnugk-3.4-ptrace.patch | 414 | ||||
| -rw-r--r-- | net-voip/gnugk/gnugk-3.4.ebuild | 125 |
4 files changed, 550 insertions, 2 deletions
diff --git a/net-voip/gnugk/ChangeLog b/net-voip/gnugk/ChangeLog index bb06c7e50e54..3d661fd7a2f7 100644 --- a/net-voip/gnugk/ChangeLog +++ b/net-voip/gnugk/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-voip/gnugk # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-voip/gnugk/ChangeLog,v 1.11 2013/07/11 23:19:23 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-voip/gnugk/ChangeLog,v 1.12 2013/10/01 15:21:03 chithanh Exp $ + +*gnugk-3.4 (01 Oct 2013) + + 01 Oct 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/gnugk-3.4-ptrace.patch, +gnugk-3.4.ebuild: + Version bump. *gnugk-3.3.4 (11 Jul 2013) diff --git a/net-voip/gnugk/Manifest b/net-voip/gnugk/Manifest index b46e7fcee30e..557193a572b1 100644 --- a/net-voip/gnugk/Manifest +++ b/net-voip/gnugk/Manifest @@ -4,15 +4,18 @@ AUX gnugk-2.2.8-firebird-2.1.patch 2472 SHA256 912fa58d28d6773c7bd5779079c454450 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-3.4-ptrace.patch 12047 SHA256 18696ea7e914835cb96d299297d15364ebb8e4948acdb74b7738884a4e724b1e SHA512 60efdd672f4d13dd12ca5739786da56f71cfc729fbf96035c82a1fc61ff97a9aefff3c7fb20c307addfca59d4f0bf6f9ecc21ef46dc52be3be42c42ad5bdea44 WHIRLPOOL eef65d8ed4ac39a5f5acc44641bc8cb49a5d8e580956c956015c8e2eaf100cfb4223f7c1fc9853d27968926481af3f6a81b9cc8201f8722c59f1fc68b1093363 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 DIST gnugk-3.3-4.tar.gz 1177455 SHA256 08772ffca5729eaf763b53edd6659d2aa613fdba3d2d9066f2bafd7c9720df0a SHA512 bc379111d60665a49ae8c395f5c3f3fec8945875322634c3be90a3cfd652a8458a0d088a954e831a4de818e513f39ad8d3ea7274dcd97ed0070ff547c05c3250 WHIRLPOOL aa461bef58b6e17014b03dc932bbe4049f4380967c438db2722a93cf41551a6f96b31bdac1b4a8eddfc4f16b42a9d8bccbec247788d960387c11f12140de97b6 +DIST gnugk-3.4.tar.gz 1110806 SHA256 7640f338260534b17dbb3fedaa3715b50dac8704f3552f604bd84d723bc71a6b SHA512 ae13bee0d7a69024fae9562919491e47b19bbcc13cc5c5fe74743fa036511bb324d1aac77e9bafce09642d55704ad22d110516b6c4ad8e69d8abfe35c250a628 WHIRLPOOL 218fa010b67de0249ae17b37aa493de38f96c4c53217239786943b832d6cf46c28b15f5d672d666efad5e58a5a838ecf3dc804cfe8da51a39901aba52cc0c05b 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 EBUILD gnugk-3.3.4.ebuild 3057 SHA256 845d674895b77bacb429218a236804d19286072d12ca1dac0d79f3cc7251585d SHA512 ec3997077b16377a6c06c76fb954ff732defb60bf13dd26bc5df0ede43b42182efd1f9171aa70e06dd09fdea8cd20f2064cdc7e6dcd4b63745f4651e2810c0e3 WHIRLPOOL af71fc36b2efbb0a1384a84d4db07d07a58b10e64c7d0f951b9a7f43fbf49a51978bc6cfc84fb8d81f0ff8b4cb16e426db7e6a32c62073e1aa90830a400229c7 -MISC ChangeLog 3404 SHA256 2d432ba053f8c191e09deb18e87d7cc35fbebdf0e83d6b78748a5a8e246660e9 SHA512 e7f2b04df6b0920a82319da2adf5819a080fa30a56112f22776900dc55e4ecf9fc5c06acd9d4b0840b0c6b3cc7338d337c4ae8e7763c7bf561450bf4aae7b347 WHIRLPOOL 0aa81b5fb90c210024ee6f4b3c6cf0887584a02f1c8f150bf6dc53aa94bd462d42f0d598b04bcdfc0e11dce4d82afbbfccd3da631bc553d31be53f14bd683c81 +EBUILD gnugk-3.4.ebuild 3053 SHA256 208082ae78974642aad498e425c20366cce8268c8c70adbe871e1391a3c4bd06 SHA512 0052a5f6e56903f2b509a2fb233f2c7ee709783f524402bc15efb49d9c5873e1c58fe1be774d683c41c72c89071a796618a7fe46feb854d7eca684c08bbb9629 WHIRLPOOL 9741b6a6dde4237745b2af3e5ba607425b2e5dc32f8ce52706a90bffccebcfc0ceeed53c6c2519c8ea1efb66edcd48c7b0d5494a1ee9f579120d55ede63493a8 +MISC ChangeLog 3568 SHA256 6767c3838e6ba5bce1f588b5dafaa928e94df993decace84f19ec77626b8ec3f SHA512 2eb7848777d4b64a10c84b8acb492bcdf8a75ddc6cc4310354cb30f90b630e4ff09ead5ed63cc1ed64ad51fe0088593110facbc6bdb64168df925af8f69b0336 WHIRLPOOL 09d1bb49fd0ac62e14a27c188c4d05fde6ede541c6edc30001e1ac78a6cc52b38794c5ef0321091c6ba96f801571e04fa5ad99099671d37aafcc3fcf471b288e MISC metadata.xml 276 SHA256 bc70b3a516e4900ab8ab8e1ef836b387073a5744662dc4a0abc49970222f19ff SHA512 8319b76cbfb511d22e68a04e50e5ca1e8969733e2435c086afbe25d944ac6bb4f5559e5b36d2383c2c3d9e636944c05e477059689cd52d589496ffc996689c4b WHIRLPOOL 583eab56c7de87452655441c55f682389052e0517bc0070476b4f88d95f8f7e67b72164478db8cf4941ecde5139794bd41509f2fd95d754957a4c1b130f85b19 diff --git a/net-voip/gnugk/files/gnugk-3.4-ptrace.patch b/net-voip/gnugk/files/gnugk-3.4-ptrace.patch new file mode 100644 index 000000000000..872de059d178 --- /dev/null +++ b/net-voip/gnugk/files/gnugk-3.4-ptrace.patch @@ -0,0 +1,414 @@ +diff -ur a/capctrl.cxx b/capctrl.cxx +--- a/capctrl.cxx 2011-11-28 13:33:41.000000000 +0100 ++++ b/capctrl.cxx 2013-10-01 13:20:47.712492425 +0200 +@@ -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 2013-09-02 21:57:18.000000000 +0200 ++++ b/clirw.cxx 2013-10-01 13:20:47.713492425 +0200 +@@ -458,6 +458,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; +@@ -468,8 +469,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; +@@ -482,6 +485,7 @@ + } + PTrace::End(strm); + } ++#endif + + m_processSourceAddress = Toolkit::AsBool(cfg->GetString(CLIRewriteSection, ProcessSourceAddress, "1")); + m_removeH323Id = Toolkit::AsBool(cfg->GetString(CLIRewriteSection, RemoveH323Id, "1")); +diff -ur a/gkacct.cxx b/gkacct.cxx +--- a/gkacct.cxx 2013-07-31 15:03:07.000000000 +0200 ++++ b/gkacct.cxx 2013-10-01 13:20:47.714492425 +0200 +@@ -924,6 +924,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; +@@ -931,9 +932,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; +@@ -942,6 +945,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 +@@ -959,7 +963,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 " +@@ -972,6 +977,7 @@ + SNMP_TRAP(7, SNMPError, Accounting, "Failed to log event " + PString(PString::Unsigned, evt)); + #endif + } ++#endif + return finalResult; + } + +@@ -994,6 +1000,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; +@@ -1001,9 +1008,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; +@@ -1012,6 +1021,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 +@@ -1030,6 +1040,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 " +@@ -1042,6 +1053,7 @@ + SNMP_TRAP(7, SNMPError, Accounting, "Failed to log event " + PString(PString::Unsigned, evt)); + #endif + } ++#endif + return finalResult; + } + +diff -ur a/gk.cxx b/gk.cxx +--- a/gk.cxx 2013-09-19 15:27:22.000000000 +0200 ++++ b/gk.cxx 2013-10-01 13:20:47.715492425 +0200 +@@ -1212,9 +1212,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 \"" +@@ -1717,7 +1719,9 @@ + EnableLogFileRotation(false); + } + ++#if PTRACING + PTrace::SetStream(&cerr); ++#endif + + #ifndef hasDeletingSetStream + delete m_logFile; +@@ -1732,7 +1736,9 @@ + return false; + } + m_logFile->SetPosition(0, PFile::End); ++#if PTRACING + PTrace::SetStream(m_logFile); ++#endif + return true; + } + +@@ -1742,7 +1748,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 +@@ -1779,7 +1787,9 @@ + } + + m_logFile->SetPosition(0, PFile::End); ++#if PTRACING + PTrace::SetStream(m_logFile); ++#endif + PTRACEX(1, "GK\tLogging restarted\n" + Toolkit::GKVersion()); + return true; + } +@@ -1790,7 +1800,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 +@@ -1819,7 +1831,9 @@ + } + } + m_logFile->SetPosition(0, PFile::End); ++#if PTRACING + PTrace::SetStream(m_logFile); ++#endif + PTRACEX(1, "GK\tLogging restarted\n" + Toolkit::GKVersion()); + return true; + } +@@ -1831,7 +1845,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 2013-09-12 12:51:56.000000000 +0200 ++++ b/GkStatus.cxx 2013-10-01 13:20:47.716492425 +0200 +@@ -1327,6 +1327,7 @@ + ); + } else { + if (args[1] *= "trc") { ++#if PTRACING + if(args.GetSize() >= 3) { + if((args[2] == "-") && (PTrace::GetLevel() > 0)) + PTrace::SetLevel(PTrace::GetLevel()-1); +@@ -1335,6 +1336,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 2013-08-03 14:26:19.000000000 +0200 ++++ b/ipauth.cxx 2013-10-01 13:20:47.716492425 +0200 +@@ -230,6 +230,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"; +@@ -242,6 +243,7 @@ + } + PTrace::End(strm); + } ++#endif + + if (dynamicCfg) { + delete cfg; +diff -ur a/ProxyChannel.cxx b/ProxyChannel.cxx +--- a/ProxyChannel.cxx 2013-09-19 18:53:07.000000000 +0200 ++++ b/ProxyChannel.cxx 2013-10-01 13:34:34.499541266 +0200 +@@ -1741,7 +1741,7 @@ + + m_result = Forwarding; + +-#ifdef HAS_H46017 ++#if defined(HAS_H46017) && PTRACING + // only show full decode of H.460.26 RTP when level 7 trace is active + if (m_h46017Enabled && m_maintainConnection && (q931pdu->GetMessageType() == Q931::InformationMsg) && !PTrace::CanTrace(7)) { + // don't print Info message +diff -ur a/RasSrv.cxx b/RasSrv.cxx +--- a/RasSrv.cxx 2013-08-29 11:42:09.000000000 +0200 ++++ b/RasSrv.cxx 2013-10-01 13:20:47.717492425 +0200 +@@ -245,6 +245,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)) +@@ -252,17 +253,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-09-12 12:51:57.000000000 +0200 ++++ b/RasTbl.cxx 2013-10-01 13:20:47.719492425 +0200 +@@ -1950,6 +1950,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: "; +@@ -1960,6 +1961,7 @@ + } + PTrace::End(strm); + } ++#endif + + return true; + } +diff -ur a/Routing.cxx b/Routing.cxx +--- a/Routing.cxx 2013-04-11 07:10:34.000000000 +0200 ++++ b/Routing.cxx 2013-10-01 13:20:47.719492425 +0200 +@@ -1465,6 +1465,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; +@@ -1474,6 +1475,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-09-10 17:49:47.000000000 +0200 ++++ b/Toolkit.cxx 2013-10-01 13:20:47.720492425 +0200 +@@ -1025,6 +1025,7 @@ + return; + } + ++#if PTRACING + if (PTrace::CanTrace(3) && (m_GWRewrite.GetSize() < 100)) { + for (PINDEX i = 0; i < m_GWRewrite.GetSize(); ++i) { + // In +@@ -1038,6 +1039,7 @@ + } + } + } ++#endif + PTRACE(2, "GK\tLoaded " << m_GWRewrite.GetSize() << " GW entries with rewrite info"); + } + +@@ -1727,7 +1729,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 2013-09-04 18:11:57.000000000 +0200 ++++ b/yasocket.cxx 2013-10-01 13:20:47.720492425 +0200 +@@ -1026,10 +1026,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-3.4.ebuild b/net-voip/gnugk/gnugk-3.4.ebuild new file mode 100644 index 000000000000..9eb4a2948948 --- /dev/null +++ b/net-voip/gnugk/gnugk-3.4.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.4.ebuild,v 1.1 2013/10/01 15:21:03 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.4-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} +} |