diff --git a/debian/changelog b/debian/changelog index 467bada..473d2c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,288 +1,294 @@ +callcontrol (4.0.0) UNRELEASED; urgency=medium + + * Migrated to Python 3 + + -- Adrian Georgescu Thu, 15 Oct 2020 16:11:54 +0200 + callcontrol (3.0.1) unstable; urgency=medium * Fixed connection failure exception * Added call-id to all logs -- Adrian Georgescu Wed, 24 Jun 2020 16:45:28 +0200 callcontrol (3.0.0) unstable; urgency=medium * Updated opensips interface to use json * Renamed configuration_filename to configuration_file * Streamlined error logging for the OpenSIPS MI interface * Use new runtime directory * Removed unnecessary variable * Removed some superfluous comments * Fixed comment style * Fixed octal constants to use new syntax * Set boring file to .boring and updated its content * Simplified class definition * Fixed some PEP-8 violations * Updated logging to the API changes in python-application 2.8.0 * Adapted to process API changes in python-application 2.8.0 * Removed unnecessary list creation with dict instantiation * Refactored setup.py * Refactored the call-control script - Split call-control into call-control and call-control-cli - Redesigned the command line options for call-control-cli - Use the argparse module for parsing command line arguments - Replaced --pid with --config-dir and --runtime-dir options - Added --debug and --debug-memory options for call-control - Added --systemd command line option for call-control * Removed no longer needed pycompat and pyversions files * Updated debian uploaders * Increased debian compatibility level to 11 * Split debian package dependencies one per line * Install config.ini.sample from setup.py * Updated debian build procedure * Fixed permissions for the debian installed configuration file * Renamed debian file to remove unnecessary package name prefix * Removed no longer needed debian file * Switched from init script to systemd service file * Updated license and copyright years * Removed duplicate changelog file * Fixed default runtime directory path * Removed no longer available configuration option from INSTALL * Added code to wait for the network to become available on start * Use the unlink wrapper from python-application * Removed duplicated arguments from the CallControlServer instantiation * Removed outdated termination detection mechanism * Fixed pidfile argument to process.daemonize() * Reworded some sections in the manual pages * Improved call-control-cli help message * Reworded help message * Use single quotes in help message * Fixed the program name in man pages * Fixed manual pages * Made MANIFEST.in more explicit and avoid unnecessary prune commands * Removed package name prefix from the systemd service filename * Removed commented out variable in debian rules * Explicitly use python2 in shebang lines * Increased debian standards version to 4.5.0 -- Dan Pascu Fri, 14 Feb 2020 13:39:24 +0200 callcontrol (2.2.3) unstable; urgency=medium * Added dependency on python-gnutls * Increased debian standards version * Increased debian compatibility level to 9 * Added dependency on lsb-base -- Dan Pascu Thu, 26 Jan 2017 11:27:55 +0200 callcontrol (2.2.2) unstable; urgency=medium * Fixed version comparison * Updated maintainer -- Dan Pascu Wed, 18 Jan 2017 23:46:33 +0200 callcontrol (2.2.1) unstable; urgency=medium * Fix use of potentially unbound variable * Adapt to changes in SIPThor API * Reduce try-except block to the needed section * Improved Debian init file -- Saul Ibarra Thu, 10 Mar 2016 12:26:46 +0100 callcontrol (2.2.0) unstable; urgency=medium * Only buold Debiacn package for Python >= 2.7 << 3 * Removed runtime dependency check -- Saul Ibarra Wed, 06 Jan 2016 14:26:44 +0100 callcontrol (2.1.0) unstable; urgency=low * Refactored rating enigine connection and skip lookup on postpaid * Fixed sip_application subtype when it is not set * Fixed removing chosen rating engine for each billing party * Refactored rating to support multiple backends -- Tijmen de Mes Thu, 21 Aug 2014 15:40:24 +0200 callcontrol (2.0.16) unstable; urgency=low * Fixed checking call limit in certain cases * Fixed calling function in the module instead of the object * Added sip-application type to rating engine calls * Bumped Standards-Version to 3.9.5 -- Tijmen de Mes Tue, 18 Feb 2014 10:45:23 +0100 callcontrol (2.0.15) unstable; urgency=low * Added support for limiting number of simultaneous calls per user * Also call end() method for calls with no credit * Properly fix duplicated CallID detection -- Saul Ibarra Fri, 09 Sep 2011 16:42:08 +0200 callcontrol (2.0.14) unstable; urgency=low * Avoid handling requests with a duplicated CallID -- Saul Ibarra Wed, 10 Aug 2011 09:21:56 +0200 callcontrol (2.0.12) unstable; urgency=low * Adapted to latest changes in python-application * Reworked Debian packaging -- Saul Ibarra Fri, 10 Jun 2011 12:07:07 +0200 callcontrol (2.0.11) unstable; urgency=low * Improved response handling from rating engine to give clearer errors * Fixed RadiusDatabase.table setting for python-application >= 1.1.2 * Fixed except clause missing parentheses * Bumped Standards-Version to 3.9.1 -- Lucian Stanescu Tue, 31 Aug 2010 17:57:50 +0300 callcontrol (2.0.10) unstable; urgency=low * Fixed handling of free prepaid calls when a global limit is in place -- Lucian Stanescu Wed, 19 May 2010 15:38:42 +0100 callcontrol (2.0.9) unstable; urgency=low * Improved prepaid call handling by also checking OpenSIPS's prepaid flag * Removed unused exceptions * Updated copyright years * Added $remote_fs to Required-Start and Required-Stop in init script * Bumped Standards-Version to 3.8.4 -- Lucian Stanescu Tue, 09 Feb 2010 17:48:34 +0000 callcontrol (2.0.8) unstable; urgency=low * Fixed issue with pending calls after startup when dialog detection is used * Improved resilience to calls which are not terminated by OpenSIPS * Fixed handling of MaxSessionTime response from CDRTool * Added dependency on python (>= 2.5) * Fixed radius query generation -- Lucian Stanescu Thu, 10 Dec 2009 19:37:42 +0000 callcontrol (2.0.7) unstable; urgency=low * Fixed typos and variable references by wrong name * Removed unused imports * Fixed handling of diverted calls * Bumped Standards-Version to 3.8.3 -- Lucian Stanescu Tue, 01 Dec 2009 19:18:06 +0000 callcontrol (2.0.6) unstable; urgency=low * Replaced python-all-dev build dependency with python * Replaced use of deprecated __configfile__ with __cfgfile__ * Added dependency checking using application.dependency * Replaced use of deprecated mode argument of listenUNIX with chmod * Modified config.ini.sample to reflect the need for doubling percent signs -- Lucian Stanescu Thu, 30 Jul 2009 15:40:24 +0300 callcontrol (2.0.5) unstable; urgency=low * Replaced use of deprecated _datatypes attribute with ConfigSetting * Replaced use of print statement with log.error * Fixed handling of debug option of daemon * Fixed use of process.system_config_directory * Replaced use of read_settings with ConfigSection attributes * Updated dependency on python-application to >= 1.1.2 -- Lucian Stanescu Wed, 15 Jul 2009 23:02:31 +0300 callcontrol (2.0.4) unstable; urgency=low * Removed postinst script since cdbs executes dh programs in correct order * Removed deprecated python-application attributes in configuration types * Fixed debian package to not create /var/run/callcontrol * Fixed debian/copyright to point to GPLv2 * Replaced reference to LGPL with GPL in debian/copyright * Removed Lock=1 from rating engine MaxSessionTime request * Fixed typo in loading of calls data * Replaced use of deprecated startSyslog function with start_syslog * Bumped Standards-Version to 3.8.2 -- Lucian Stanescu Wed, 01 Jul 2009 10:55:33 +0300 callcontrol (2.0.3) unstable; urgency=low * Fixed call restore when radius database is not in use * Made prepaid_limit default to limit option rather than None. * Removed provider determination code -- Lucian Stanescu Wed, 17 Dec 2008 15:28:47 +0000 callcontrol (2.0.2) unstable; urgency=low [ Lucian Stanescu ] * Fixed error handling in response from rating engine [ Adrian Georgescu ] * Update install documentation and sample opensips configuration * Added authors and home page * Added help about control commands * Added help for init.d script about terminating a session -- Lucian Stanescu Tue, 16 Dec 2008 15:37:14 +0000 callcontrol (2.0.1) unstable; urgency=low * Set supported python version to minimum 2.4 * Fixed result from debug command when there is no output * Added option for not using the radius database to detect timedout sessions -- Lucian Stanescu Sat, 13 Dec 2008 16:51:28 +0000 callcontrol (2.0.0) unstable; urgency=low [ Lucian Stanescu ] * Adapt the application to using the dialog module for sending BYEs * Add setting to limit the session time of prepaid calls * Change logging output to show destination * Do not lose requests sent to the rating engine * Do not retransmit the first MaxSessionTime as this will cause openser to wait * Fixed bugs related to exceptions getting thrown in connectionLost and RatingEngineProtocol._respond * Made debug answer's format consistent: \r\n terminated lines with message ending in a blank line * Only check for 'timeout' value in mediaInfo database field [ Adrian Georgescu ] * Added INSTALL and LICENSE files * Updated documentation -- Lucian Stanescu Thu, 06 Nov 2008 15:48:29 +0100 callcontrol (1.5.2) unstable; urgency=low * Send BYEs for timed-out calls -- Adrian Georgescu Mon, 21 Jul 2008 17:59:13 +0200 callcontrol (1.5.1) unstable; urgency=low * Fixed missing import statement -- Lucian Stanescu Fri, 16 May 2008 15:42:24 +0200 callcontrol (1.5.0) unstable; urgency=low * Migrating the entire application to python twisted. * Changed protocol between opensips call control module and call control application to use a persistent connection. Module sends a multiple CRLF-terminated line message, with a single empty CRLF-terminated line signaling end of message; the application responds with a single CRLF-terminated line. * Added commands to the call control opensips module - call control application which are used by the init script to show a list of sessions and session details. -- Lucian Stanescu Thu, 15 May 2008 11:36:37 +0200 diff --git a/debian/control b/debian/control index 0be1664..892c4ac 100644 --- a/debian/control +++ b/debian/control @@ -1,27 +1,27 @@ Source: callcontrol Section: net Priority: optional -Maintainer: Dan Pascu +Maintainer: Adrian Georgescu Uploaders: Tijmen de Mes -Build-Depends: debhelper (>= 11), dh-python, python +Build-Depends: debhelper (>= 11), dh-python, python3-all-dev Standards-Version: 4.5.0 Package: callcontrol Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, - python-application (>= 2.8.0), - python-gnutls (>= 3.0.0), - python-twisted-core, - python-sqlobject, - python-systemd +Depends: ${python3:Depends}, ${misc:Depends}, + python3-application (>= 3.0.0), + python3-gnutls (>= 3.0.0), + python3-twisted, + python3-sqlobject, + python3-systemd Description: Call Control prepaid application for OpenSIPS Call Control is a prepaid application that can be used together with OpenSIPS call_control module and CDRTool rating engine to limit the duration of SIP sessions based on a prepaid balance. It can also be used to limit the duration of any session to a predefined maximum value without debiting a balance. . Call Control achieves this by maintaining a timer for each session and sending BYE messages to both SIP end-points, if the session exceeds its maximum session limit or if the Call Control receives a command to forcefully close the call from outside. diff --git a/debian/rules b/debian/rules index 4c81f18..dcf8275 100755 --- a/debian/rules +++ b/debian/rules @@ -1,20 +1,23 @@ #!/usr/bin/make -f %: - dh $@ --with python2 --buildsystem=pybuild + dh $@ --with python3 --buildsystem=pybuild + +override_dh_python3: + dh_python3 --shebang=/usr/bin/python3 override_dh_clean: dh_clean rm -rf build dist MANIFEST override_dh_auto_install: dh_auto_install mv debian/callcontrol/etc/callcontrol/config.ini.sample debian/callcontrol/etc/callcontrol/config.ini override_dh_installsystemd: dh_installsystemd --no-start override_dh_fixperms: dh_fixperms chmod 600 debian/callcontrol/etc/callcontrol/config.ini