diff --git a/debian/compat b/debian/compat index 45a4fb75d..ec635144f 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index bcd3c9275..46e92d544 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,8 @@ Priority: optional Maintainer: Sipwise Team Uploaders: Jon Bonilla , Victor Seva Build-Depends: bison, - debhelper (>= 8), + debhelper (>= 9~), + dpkg-dev (>= 1.16.1.1), docbook-xml, flex, libconfuse-dev, @@ -13,10 +14,12 @@ Build-Depends: bison, libevent-dev, libexpat1-dev, libgeoip-dev (>= 1.4.5), + libhiredis-dev (>= 0.10.0), libjson0-dev, libldap2-dev, liblua5.1-0-dev, libmemcache-dev, + libmono-2.0-dev, libmysqlclient-dev, libncurses5-dev, libpcre3-dev, @@ -28,10 +31,11 @@ Build-Depends: bison, libsnmp-dev, libsqlite3-dev, libssl-dev, + libunistring-dev, libxml2-dev, - libxmlrpc-c3-dev, + libxmlrpc-core-c3-dev, ngcp-libswrate-dev (>= 1.1.2+0~1364315461.svn13284.127), - libunistring-dev, + openssl, python, python-dev, unixodbc-dev, @@ -43,6 +47,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/kamailio/?op=log Package: ngcp-kamailio Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, python, adduser Conflicts: kamailio @@ -86,6 +91,7 @@ Package: ngcp-kamailio-dbg Priority: extra Section: debug Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ngcp-kamailio (= ${binary:Version}) Conflicts: kamailio-dbg @@ -100,6 +106,7 @@ Description: very fast and configurable SIP proxy [debug symbols] Package: ngcp-kamailio-geoip-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) Conflicts: kamailio-geoip-modules @@ -114,6 +121,7 @@ Description: contains the geoip module Package: ngcp-kamailio-sqlite-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) Conflicts: kamailio-sqlite-modules @@ -127,6 +135,7 @@ Description: SQLite database connectivity module for Kamailio Package: ngcp-kamailio-json-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) Conflicts: kamailio-json-modules @@ -141,6 +150,7 @@ Description: Json parser and jsonrpc modules for Kamailio Package: ngcp-kamailio-memcached-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) Conflicts: kamailio-memcached-modules @@ -155,6 +165,7 @@ Description: Provides the memcached module, an interface to the memcached server Package: ngcp-kamailio-lua-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) Conflicts: kamailio-lua-modules @@ -167,8 +178,24 @@ Description: contains the app_lua module This package provides the app_lua module, an extension allowing to execute embedded Lua applications within configuration file. +Package: ngcp-kamailio-mono-modules +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) +Conflicts: kamailio-mono-modules +Replaces: kamailio-mono-modules +Description: contains the app_mono module + Kamailio is a very fast and flexible SIP (RFC3261) + proxy server. Written entirely in C, Kamailio can handle thousands calls + per second even on low-budget hardware. + . + This package provides the app_mono module, an extension allowing to + execute embedded Mono applications within configuration file. + Package: ngcp-kamailio-python-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, python-dev, ngcp-kamailio (= ${binary:Version}) Conflicts: kamailio-python-modules @@ -181,8 +208,23 @@ Description: contains the app_python module This package provides the app_python module, an extension allowing to execute embedded Python applications within configuration file. +Package: ngcp-kamailio-redis-modules +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) +Conflicts: kamailio-redis-modules +Replaces: kamailio-redis-modules +Description: Redis database connectivity module for Kamailio + Kamailio is a very fast and flexible SIP (RFC3261) + proxy server. Written entirely in C, Kamailio can handle thousands calls + per second even on low-budget hardware. + . + This package provides the Redis NOSQL database driver for Kamailio. + Package: ngcp-kamailio-mysql-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}), mysql-client Conflicts: kamailio-mysql-modules @@ -196,6 +238,7 @@ Description: MySQL database connectivity module for Kamailio Package: ngcp-kamailio-postgres-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}), postgresql-client Conflicts: kamailio-postgres-modules @@ -209,6 +252,7 @@ Description: PostgreSQL database connectivity module for Kamailio Package: ngcp-kamailio-cpl-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) Conflicts: kamailio-cpl-modules @@ -223,6 +267,7 @@ Description: CPL module (CPL interpreter engine) for Kamailio Package: ngcp-kamailio-radius-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) Conflicts: kamailio-radius-modules @@ -238,6 +283,7 @@ Description: RADIUS modules for Kamailio Package: ngcp-kamailio-unixodbc-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) Conflicts: kamailio-unixodbc-modules @@ -251,6 +297,7 @@ Description: unixODBC database connectivity module for Kamailio Package: ngcp-kamailio-presence-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) Conflicts: kamailio-presence-modules @@ -266,6 +313,7 @@ Description: SIMPLE presence modules for Kamailio Package: ngcp-kamailio-perl-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) Replaces: kamailio-perl-modules @@ -280,6 +328,7 @@ Description: Perl extensions and database driver for Kamailio Package: ngcp-kamailio-snmpstats-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}), snmpd Conflicts: kamailio-snmpstats-modules @@ -294,6 +343,7 @@ Description: SNMP AgentX subagent module for Kamailio Package: ngcp-kamailio-xmpp-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) Conflicts: kamailio-xmpp-modules @@ -307,6 +357,7 @@ Description: XMPP gateway module for Kamailio Package: ngcp-kamailio-xml-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) Conflicts: kamailio-xml-modules @@ -324,6 +375,7 @@ Description: XML based extensions for Kamailio's Management Interface Package: ngcp-kamailio-carrierroute-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) Conflicts: kamailio-carrierroute-modules @@ -338,6 +390,7 @@ Description: carrierroute module for Kamailio Package: ngcp-kamailio-berkeley-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}), db4.8-util Conflicts: kamailio-berkeley-modules @@ -353,6 +406,7 @@ Description: Berkeley database module for Kamailio Package: ngcp-kamailio-berkeley-bin Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Conflicts: kamailio-berkeley-bin @@ -368,6 +422,7 @@ Description: Berkeley database module for Kamailio - helper program Package: ngcp-kamailio-ldap-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) Conflicts: kamailio-ldap-modules @@ -383,6 +438,7 @@ Description: LDAP modules for Kamailio Package: ngcp-kamailio-outbound-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) Conflicts: kamailio-outbound-modules @@ -396,6 +452,7 @@ Description: Outbound module for Kamailio Package: ngcp-kamailio-ims-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) Conflicts: kamailio-ims-modules @@ -410,6 +467,7 @@ Description: IMS module for Kamailio Package: ngcp-kamailio-websocket-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) Conflicts: kamailio-websocket-modules @@ -423,6 +481,7 @@ Description: Websocket module for kamailio Package: ngcp-kamailio-utils-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) Conflicts: kamailio-utils-modules @@ -452,6 +511,7 @@ Description: contains the TLS kamailio transport module Package: ngcp-kamailio-lcrrate-modules Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, ngcp-kamailio (= ${binary:Version}) Description: Provides a set utility functions for Kamailio diff --git a/debian/rules b/debian/rules index 15d241cc9..b60a6f61f 100755 --- a/debian/rules +++ b/debian/rules @@ -11,10 +11,11 @@ PKG_NAME:=$(shell dpkg-parsechangelog | sed -ne 's/^Source: \(.*\)/\1/p') FILENAME := $(PKG_NAME)_$(UPVERSION).orig.tar.gz URL := http://www.kamailio.org/pub/kamailio/$(UPVERSION)/src/kamailio-$(UPVERSION)_src.tar.gz - +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -25,7 +26,7 @@ EXCLUDED_MODULES= # extra modules to skip, because they are not compilable now # - regardless if they go to the main kamailio package or to some module package, # they will be excluded from compile and install of all -EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy purple mi_xmlrpc redis mono +EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy purple mi_xmlrpc # module groups that are packaged in seperate packages # (with the name kamailio-$(group_name)-modules) @@ -33,11 +34,11 @@ EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy purple mi_xmlrpc redis m # on which other depend first) PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils lua memcached \ - snmpstats carrierroute xmpp cpl python geoip\ - sqlite json ims outbound websocket tls lcrrate + snmpstats carrierroute xmpp cpl redis python geoip\ + sqlite json mono ims outbound websocket tls lcrrate # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b) -LIBDIR ?= lib +LIBDIR ?= lib/$(DEB_HOST_MULTIARCH) # directories with possible duplicate libraries (that should be deleted # from current module* packages) @@ -90,6 +91,7 @@ configure-stamp: cfg_target=/etc/kamailio/ \ basedir=$(CURDIR)/debian/$(PKG_NAME) \ skip_modules="$(EXCLUDED_MODULES) $(EXTRA_EXCLUDED_MODULES)" \ + $(shell dpkg-buildflags --export=configure) \ group_include="kstandard" touch configure-stamp