Your message dated Sat, 01 Jun 2013 12:03:27 +0000
with message-id <[email protected]>
and subject line Bug#695815: fixed in t38modem 2.0.0-4
has caused the Debian Bug report #695815,
regarding Patches to port to opal/ptlib in experimental
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
695815: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695815
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: t38modem
Version: 2.0.0-3
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu raring ubuntu-patch
The two patches here should be reasonably self-explanatory, though
this was a "blind" porting effort on my part, based on reading the
API changes in opal 3.10.7 and 3.10.9 and adjusting the t38modem
sources accordingly, so a second set of eyes would be appreciated.
Once you're satisfied with these patches (or have fixed them as
you see fit), an upload to experimental to match the new opal/ptlib
might not be a bad plan.
... Adam
-- System Information:
Debian Release: wheezy/sid
APT prefers raring-updates
APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.7.0-5-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru t38modem-2.0.0/debian/changelog t38modem-2.0.0/debian/changelog
diff -Nru t38modem-2.0.0/debian/patches/opal-3.10.7.patch t38modem-2.0.0/debian/patches/opal-3.10.7.patch
--- t38modem-2.0.0/debian/patches/opal-3.10.7.patch 1969-12-31 17:00:00.000000000 -0700
+++ t38modem-2.0.0/debian/patches/opal-3.10.7.patch 2012-11-07 14:25:18.000000000 -0700
@@ -0,0 +1,104 @@
+Description: Fix FTBS with the new opal 3.10.7 API
+Author: Adam Conrad <[email protected]>
+Forwarded: no
+
+Index: t38modem-2.0.0/opal/modemstrm.h
+===================================================================
+--- t38modem-2.0.0.orig/opal/modemstrm.h 2012-11-07 14:04:57.000000000 -0700
++++ t38modem-2.0.0/opal/modemstrm.h 2012-11-07 14:25:13.652310704 -0700
+@@ -74,7 +74,6 @@
+ /**@name Overrides of OpalRawMediaStream class */
+ //@{
+ virtual PBoolean Open();
+- virtual PBoolean Close();
+
+ virtual PBoolean ReadData(
+ BYTE * data, ///< Data buffer to read to
+@@ -92,6 +91,8 @@
+ //@}
+
+ protected:
++ virtual void InternalClose();
++
+ AudioEngine *audioEngine;
+ };
+ /////////////////////////////////////////////////////////////////////////////
+@@ -118,7 +119,6 @@
+ /**@name Overrides of OpalMediaStream class */
+ //@{
+ virtual PBoolean Open();
+- virtual PBoolean Close();
+ virtual void OnStartMediaPatch();
+
+ virtual PBoolean ReadPacket(
+@@ -133,6 +133,8 @@
+ //@}
+
+ protected:
++ virtual void InternalClose();
++
+ long currentSequenceNumber;
+ #if PTRACING
+ int totallost;
+Index: t38modem-2.0.0/opal/modemstrm.cxx
+===================================================================
+--- t38modem-2.0.0.orig/opal/modemstrm.cxx 2012-11-07 14:04:57.000000000 -0700
++++ t38modem-2.0.0/opal/modemstrm.cxx 2012-11-07 14:23:17.168310353 -0700
+@@ -110,18 +110,16 @@
+ return OpalMediaStream::Open();
+ }
+
+-PBoolean AudioModemMediaStream::Close()
++void AudioModemMediaStream::InternalClose()
+ {
+ if (isOpen) {
+- PTRACE(3, "AudioModemMediaStream::Close " << *this);
++ PTRACE(3, "AudioModemMediaStream::InternalClose " << *this);
+
+ if (IsSink())
+ audioEngine->CloseIn(EngineBase::HOWNERIN(this));
+ else
+ audioEngine->CloseOut(EngineBase::HOWNEROUT(this));
+ }
+-
+- return OpalMediaStream::Close();
+ }
+
+ PBoolean AudioModemMediaStream::ReadData(BYTE * data, PINDEX size, PINDEX & length)
+@@ -188,31 +186,30 @@
+ return OpalMediaStream::Open();
+ }
+
+-PBoolean T38ModemMediaStream::Close()
++void T38ModemMediaStream::InternalClose()
+ {
+ if (isOpen) {
+- PTRACE(3, "T38ModemMediaStream::Close " << *this);
++ PTRACE(3, "T38ModemMediaStream::InternalClose " << *this);
+
+ if (IsSink()) {
+- PTRACE(2, "T38ModemMediaStream::Close Send statistics:"
++ PTRACE(2, "T38ModemMediaStream::InternalClose Send statistics:"
+ " sequence=" << currentSequenceNumber <<
+ " lost=" << totallost);
+
+ t38engine->CloseIn(EngineBase::HOWNERIN(this));
+ } else {
+- PTRACE(2, "T38ModemMediaStream::Close Receive statistics:"
++ PTRACE(2, "T38ModemMediaStream::InternalClose Receive statistics:"
+ " sequence=" << currentSequenceNumber);
+
+ t38engine->CloseOut(EngineBase::HOWNEROUT(this));
+ }
+ }
+-
+- return OpalMediaStream::Close();
+ }
+
+ void T38ModemMediaStream::OnStartMediaPatch()
+ {
+ if (isSource) {
++ PatchPtr mediaPatch = m_mediaPatch;
+ if (mediaPatch != NULL) {
+ OpalMediaStreamPtr sink = mediaPatch->GetSink();
+
diff -Nru t38modem-2.0.0/debian/patches/opal-3.10.9.patch t38modem-2.0.0/debian/patches/opal-3.10.9.patch
--- t38modem-2.0.0/debian/patches/opal-3.10.9.patch 1969-12-31 17:00:00.000000000 -0700
+++ t38modem-2.0.0/debian/patches/opal-3.10.9.patch 2012-12-12 15:07:11.000000000 -0700
@@ -0,0 +1,84 @@
+Description: Fix FTBS with the new opal 3.10.9 API
+Author: Adam Conrad <[email protected]>
+Forwarded: no
+
+Index: t38modem-2.0.0/opal/sipep.cxx
+===================================================================
+--- t38modem-2.0.0.orig/opal/sipep.cxx 2012-12-12 14:59:13.000000000 -0700
++++ t38modem-2.0.0/opal/sipep.cxx 2012-12-12 15:06:56.819887272 -0700
+@@ -167,11 +167,12 @@
+ virtual void OnApplyStringOptions();
+
+ virtual bool SwitchFaxMediaStreams(
+- bool enableFax ///< Enable FAX or return to audio mode
++ bool toT38 ///< Enable FAX or return to audio mode
+ );
+
+ virtual void OnSwitchedFaxMediaStreams(
+- bool enabledFax ///< Enabled FAX or audio mode
++ bool toT38, ///< Enabled FAX or audio mode
++ bool success ///< Switch succeeded or failed
+ );
+
+ virtual PBoolean OnOpenMediaStream(
+@@ -507,15 +508,15 @@
+ return res;
+ }
+
+-void MySIPConnection::OnSwitchedFaxMediaStreams(bool enabledFax)
++void MySIPConnection::OnSwitchedFaxMediaStreams(bool toT38, bool success)
+ {
+ PTRACE(3, "MySIPConnection::OnSwitchedFaxMediaStreams: "
+- << (enabledFax == switchingToFaxMode ? "" : "NOT ") << "switched to "
+- << (switchingToFaxMode ? "fax" : "audio"));
++ << (success ? "succeeded" : "NOT") << "switched to "
++ << (toT38 ? "T.38" : "audio"));
+
+- SIPConnection::OnSwitchedFaxMediaStreams(enabledFax);
++ SIPConnection::OnSwitchedFaxMediaStreams(toT38, success);
+
+- if (switchingToFaxMode && !enabledFax) {
++ if (toT38 && !success) {
+ PTRACE(3, "MySIPConnection::OnSwitchedFaxMediaStreams: fallback to audio");
+ mediaFormatList -= OpalT38;
+ SwitchFaxMediaStreams(false);
+Index: t38modem-2.0.0/opal/h323ep.cxx
+===================================================================
+--- t38modem-2.0.0.orig/opal/h323ep.cxx 2012-12-12 14:59:13.000000000 -0700
++++ t38modem-2.0.0/opal/h323ep.cxx 2012-12-12 15:07:09.307887150 -0700
+@@ -176,11 +176,12 @@
+ );
+
+ virtual bool SwitchFaxMediaStreams(
+- bool enableFax ///< Enable FAX or return to audio mode
++ bool toT38 ///< Enable FAX or return to audio mode
+ );
+
+ virtual void OnSwitchedFaxMediaStreams(
+- bool enabledFax ///< Enabled FAX or audio mode
++ bool toT38, ///< Enabled FAX or audio mode
++ bool success ///< Switch succeeded or failed
+ );
+
+ virtual PBoolean OnOpenMediaStream(
+@@ -567,15 +568,15 @@
+ return false;
+ }
+
+-void MyH323Connection::OnSwitchedFaxMediaStreams(bool enabledFax)
++void MyH323Connection::OnSwitchedFaxMediaStreams(bool toT38, bool success)
+ {
+ PTRACE(3, "MyH323Connection::OnSwitchedFaxMediaStreams: "
+- << (enabledFax == switchingToFaxMode ? "" : "NOT ") << "switched to "
+- << (switchingToFaxMode ? "fax" : "audio"));
++ << (success ? "succeeded" : "NOT") << "switched to "
++ << (toT38 ? "T.38" : "audio"));
+
+- H323Connection::OnSwitchedFaxMediaStreams(enabledFax);
++ H323Connection::OnSwitchedFaxMediaStreams(toT38, success);
+
+- if (switchingToFaxMode && !enabledFax) {
++ if (toT38 && !success) {
+ PTRACE(3, "MyH323Connection::OnSwitchedFaxMediaStreams: fallback to audio");
+ mediaFormatList -= OpalT38;
+ SwitchFaxMediaStreams(false);
diff -Nru t38modem-2.0.0/debian/patches/series t38modem-2.0.0/debian/patches/series
--- t38modem-2.0.0/debian/patches/series 2012-02-08 19:51:46.000000000 -0700
+++ t38modem-2.0.0/debian/patches/series 2012-12-12 14:38:56.000000000 -0700
@@ -1,3 +1,5 @@
simplify-makefile-new
t38modem-opal3.10-patch
spelling-error-fix
+opal-3.10.7.patch
+opal-3.10.9.patch
--- End Message ---
--- Begin Message ---
Source: t38modem
Source-Version: 2.0.0-4
We believe that the bug you reported is fixed in the latest version of
t38modem, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Mark Purcell <[email protected]> (supplier of updated t38modem package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Sat, 01 Jun 2013 21:25:38 +1000
Source: t38modem
Binary: t38modem
Architecture: source i386
Version: 2.0.0-4
Distribution: unstable
Urgency: low
Maintainer: Debian VoIP Team <[email protected]>
Changed-By: Mark Purcell <[email protected]>
Description:
t38modem - T.38 Fax over IP pseudo modem
Closes: 695815
Changes:
t38modem (2.0.0-4) unstable; urgency=low
.
* Sync with Ubuntu - Thanks Adam for API fix (Closes: #695815)
- supports libpt2.10.10 transition
* debian/compat -> 9
* Update Standards Version 3.9.4 - no further changes
Checksums-Sha1:
94a702bf7dfc200b82cf8dbc194a9d17656a7260 1474 t38modem_2.0.0-4.dsc
2f8b8ab46284b0b7609922fd61be509332174630 16142 t38modem_2.0.0-4.debian.tar.gz
835a29f03b0cbdcbebce57268418efcee4db2732 240328 t38modem_2.0.0-4_i386.deb
Checksums-Sha256:
aadbc21d5a3a112a924c47ee549217b08d6c925dc09215c5a5c42ec51aea56ce 1474
t38modem_2.0.0-4.dsc
cb1fab347a75187f4eb8c36dec78dbc45e683ed548c034ded3ed916ec57249e1 16142
t38modem_2.0.0-4.debian.tar.gz
25de6c94e6fb1b1090468e09581822839f47d959cbc349d9e19b0f5c774d9d1a 240328
t38modem_2.0.0-4_i386.deb
Files:
764f942969b13fec5427f612932ce33b 1474 comm optional t38modem_2.0.0-4.dsc
8072c6645a33f2660a58acd6f651d42a 16142 comm optional
t38modem_2.0.0-4.debian.tar.gz
05ad167e76ce1f9937e6310730c10a5c 240328 comm optional t38modem_2.0.0-4_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iEYEARECAAYFAlGp3owACgkQoCzanz0IthLQgACfSOvz/sSH8KGqS2mlIOGR8nAG
ye4An3bqlzgrXR81mtvvyd12wwY5AVTS
=A4Yj
-----END PGP SIGNATURE-----
--- End Message ---
