diff --git a/debian/control b/debian/control index 69c85b6..420f1a3 100644 --- a/debian/control +++ b/debian/control @@ -1,106 +1,104 @@ Source: mediaproxy Section: net Priority: optional -Maintainer: Dan Pascu +Maintainer: Adrian Georgescu Uploaders: Tijmen de Mes -Build-Depends: debhelper (>= 11), dh-apache2, dh-python, python-all-dev, python-all-dbg, libnetfilter-conntrack-dev, iptables-dev +Build-Depends: debhelper (>= 11), dh-apache2, dh-python, python3-all-dev, libnetfilter-conntrack-dev Standards-Version: 4.5.0 Package: mediaproxy-common Architecture: any -Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, +Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}, iptables, - python-application (>= 2.8.0), - python-cjson, - python-gnutls (>= 3.0.0), - python-pyrad (>= 2.1), - python-sqlobject, - python-systemd, - python-twisted-core, - python-twisted-names, - python-zope.interface + python3-application, + python3-gnutls, + python3-pyrad, + python3-sqlobject, + python3-systemd, + python3-twisted, + python3-zope.interface Description: MediaProxy common files MediaProxy is a distributed far end NAT traversal solution for media streams of SIP calls. MediaProxy has a dispatcher running on the same host as the OpenSIPS SIP proxy and multiple media relays distributed over the network. The media relays work by manipulating conntrack rules in the Linux kernel to create paths that forward the media streams between the 2 SIP user agents participating in the call. Because it avoids copying stream data between kernel and user space like other implementations, MediaProxy can handle many more media streams at a time, being limited only by the network interface bandwidth and the Linux kernel network layer processing speed. . MediaProxy features secure encrypted communication between the dispatcher and the relays, advanced accounting capabilities using multiple backends, support for any combination of audio and video streams, realtime statistics, T.38 fax support as well as automatic load balancing and redundancy among the active relays. . This package includes files common to all MediaProxy packages. Package: mediaproxy-dispatcher Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, mediaproxy-common (>= ${source:Version}) +Depends: ${python3:Depends}, ${misc:Depends}, mediaproxy-common Description: MediaProxy dispatcher for OpenSIPS MediaProxy is a distributed far end NAT traversal solution for media streams of SIP calls. MediaProxy has a dispatcher running on the same host as the OpenSIPS SIP proxy and multiple media relays distributed over the network. The media relays work by manipulating conntrack rules in the Linux kernel to create paths that forward the media streams between the 2 SIP user agents participating in the call. Because it avoids copying stream data between kernel and user space like other implementations, MediaProxy can handle many more media streams at a time, being limited only by the network interface bandwidth and the Linux kernel network layer processing speed. . MediaProxy features secure encrypted communication between the dispatcher and the relays, advanced accounting capabilities using multiple backends, support for any combination of audio and video streams, realtime statistics, T.38 fax support as well as automatic load balancing and redundancy among the active relays. . This package provides the MediaProxy dispatcher. Package: mediaproxy-relay Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, mediaproxy-common (>= ${source:Version}) +Depends: ${python3:Depends}, ${misc:Depends}, mediaproxy-common Description: MediaProxy relay for OpenSIPS MediaProxy is a distributed far end NAT traversal solution for media streams of SIP calls. MediaProxy has a dispatcher running on the same host as the OpenSIPS SIP proxy and multiple media relays distributed over the network. The media relays work by manipulating conntrack rules in the Linux kernel to create paths that forward the media streams between the 2 SIP user agents participating in the call. Because it avoids copying stream data between kernel and user space like other implementations, MediaProxy can handle many more media streams at a time, being limited only by the network interface bandwidth and the Linux kernel network layer processing speed. . MediaProxy features secure encrypted communication between the dispatcher and the relays, advanced accounting capabilities using multiple backends, support for any combination of audio and video streams, realtime statistics, T.38 fax support as well as automatic load balancing and redundancy among the active relays. . This package provides the MediaProxy relay. Package: mediaproxy-web-sessions Architecture: all Depends: ${misc:Depends}, libapache2-mod-php Description: MediaProxy sessions web view MediaProxy is a distributed far end NAT traversal solution for media streams of SIP calls. MediaProxy has a dispatcher running on the same host as the OpenSIPS SIP proxy and multiple media relays distributed over the network. The media relays work by manipulating conntrack rules in the Linux kernel to create paths that forward the media streams between the 2 SIP user agents participating in the call. Because it avoids copying stream data between kernel and user space like other implementations, MediaProxy can handle many more media streams at a time, being limited only by the network interface bandwidth and the Linux kernel network layer processing speed. . MediaProxy features secure encrypted communication between the dispatcher and the relays, advanced accounting capabilities using multiple backends, support for any combination of audio and video streams, realtime statistics, T.38 fax support as well as automatic load balancing and redundancy among the active relays. . This package provides a simple web page to display active media sessions. diff --git a/debian/rules b/debian/rules index f413209..b29cc71 100755 --- a/debian/rules +++ b/debian/rules @@ -1,24 +1,27 @@ #!/usr/bin/make -f %: - dh $@ --with python2,apache2 --buildsystem=pybuild + dh $@ --with python3,apache2 --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/tmp/etc/mediaproxy/config.ini.sample debian/tmp/etc/mediaproxy/config.ini override_dh_install: dh_install install -D -m 644 web/config/media_sessions.conf.sample debian/mediaproxy-web-sessions/etc/mediaproxy/web/media_sessions.conf override_dh_installsystemd: dh_installsystemd --no-start override_dh_fixperms: dh_fixperms chmod 600 debian/mediaproxy-common/etc/mediaproxy/config.ini diff --git a/setup.py b/setup.py index e6bd61d..2d4a056 100755 --- a/setup.py +++ b/setup.py @@ -1,54 +1,54 @@ #!/usr/bin/python3 import re import sys import mediaproxy from distutils.core import setup, Extension # Get the title and description from README readme = open('README').read() title, description = re.findall(r'^\s*([^\n]+)\s+(.*)$', readme, re.DOTALL)[0] # media-relay is not supported on non-linux platforms # if 'linux' in sys.platform: scripts = ['media-relay', 'media-dispatcher'] ext_modules = [Extension(name='mediaproxy.interfaces.system._conntrack', sources=['mediaproxy/interfaces/system/_conntrack.c'], libraries=['netfilter_conntrack', 'ip4tc'], define_macros=[('MODULE_VERSION', mediaproxy.__version__)])] else: print('WARNING: skipping the media relay component as this is a non-linux platform') scripts = ['media-dispatcher'] ext_modules = [] setup( name='mediaproxy', version=mediaproxy.__version__, description=title, long_description=description, - url='http://www.ag-projects.com/MediaProxy.html', + url='http://mediaproxy.ag-projects.com', author='AG Projects', author_email='support@ag-projects.com', license='GPLv2', platforms=['Linux'], classifiers=[ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Service Providers', 'License :: GNU General Public License (GPLv2)', 'Operating System :: POSIX :: Linux', 'Programming Language :: Python', 'Programming Language :: C' ], packages=['mediaproxy', 'mediaproxy.configuration', 'mediaproxy.interfaces', 'mediaproxy.interfaces.accounting', 'mediaproxy.interfaces.system'], data_files=[('/etc/mediaproxy', ['config.ini.sample']), ('/etc/mediaproxy/radius', ['radius/dictionary']), ('/etc/mediaproxy/tls', ['tls/README'])], scripts=scripts, ext_modules=ext_modules )