[Pkg-voip-commits] r7834 - in /opensips/trunk/debian: changelog control opensips-console.osipsconsole.8 osipsconsole.8 patches/00list patches/10_no_lib64_on_64_bits.dpatch patches/11_always_smp.dpatch rules

alerios at alioth.debian.org alerios at alioth.debian.org
Mon Nov 30 04:48:39 UTC 2009


Author: alerios
Date: Mon Nov 30 04:48:38 2009
New Revision: 7834

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7834
Log:
  * Some changes from upstream .deb (Bogdan Iancu):
    * Fixed debian/control descriptions and dependencies.
    * Build missing modules on debian/rules
    * lib64 and SMP dpatches replaced by debian/rules variable.

Added:
    opensips/trunk/debian/opensips-console.osipsconsole.8
      - copied unchanged from r7832, opensips/trunk/debian/osipsconsole.8
Removed:
    opensips/trunk/debian/osipsconsole.8
    opensips/trunk/debian/patches/10_no_lib64_on_64_bits.dpatch
    opensips/trunk/debian/patches/11_always_smp.dpatch
Modified:
    opensips/trunk/debian/changelog
    opensips/trunk/debian/control
    opensips/trunk/debian/patches/00list
    opensips/trunk/debian/rules

Modified: opensips/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opensips/trunk/debian/changelog?rev=7834&op=diff
==============================================================================
--- opensips/trunk/debian/changelog (original)
+++ opensips/trunk/debian/changelog Mon Nov 30 04:48:38 2009
@@ -9,12 +9,14 @@
   * Add ${misc:Depends} to binary packages (thanks lintian)
   * Upgrade to Standards-Version 3.8.3 (no change needed)
   * Added README.source
-  * Added 10_no_lib64_on_64_bits.dpatch by <jblache at debian.org>
-  * Added 11_always_smp.dpatch by <jblache at debian.org>
   * Depend on python.
   * Depend on some perl modules to use osipsconsole.
   * Remove INSTALL from package.
   * Added osipsconsole.8 man page.
+  * Some changes from upstream .deb (Bogdan Iancu):
+    * Fixed debian/control descriptions and dependencies.
+    * Build missing modules on debian/rules
+    * lib64 and SMP dpatches replaced by debian/rules variable.
 
   [ Kilian Krause ]
   * debian/control: 

Modified: opensips/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opensips/trunk/debian/control?rev=7834&op=diff
==============================================================================
--- opensips/trunk/debian/control (original)
+++ opensips/trunk/debian/control Mon Nov 30 04:48:38 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Bjoern Boschman <bjoern at boschman.de>, Alejandro Rios P. <alerios at debian.org>
-Build-Depends: debhelper (>= 5), dpatch, libmysqlclient15-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libcurl4-gnutls-dev, python-all-dev, python-support
+Build-Depends: debhelper (>= 5), dpatch, libmysqlclient15-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libcurl4-gnutls-dev, python-all-dev, python-support, libgeoip-dev (>= 1.4.4), libpcre3-dev
 Standards-Version: 3.8.3
 Homepage: http://www.opensips.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/opensips/trunk/
@@ -11,23 +11,24 @@
 
 Package: opensips
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, adduser, python, libfrontier-rpc-perl, libdbi-perl, libterm-readline-gnu-perl, libterm-readline-gnu-perl
-Suggests: opensips-mysql-module, opensips-postgres-module, opensips-unixodbc-module, opensips-jabber-module, opensips-cpl-module, opensips-radius-modules, opensips-presence-modules, opensips-xmlrpc-module, opensips-perl-modules, opensips-snmpstats-module, opensips-xmpp-module, opensips-carrierroute-module, opensips-berkeley-module, opensips-ldap-modules, libdbd-mysql-perl, libdbd-pg-perl
-Description: very fast and configurable SIP proxy
- opensips is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, opensips can handle thousands calls
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, adduser, python
+Suggests: opensips-mysql-module, opensips-postgres-module, opensips-unixodbc-module, opensips-jabber-module, opensips-cpl-module, opensips-radius-modules, opensips-presence-modules, opensips-xmlrpc-module, opensips-perl-modules, opensips-snmpstats-module, opensips-xmpp-module, opensips-carrierroute-module, opensips-berkeley-module, opensips-ldap-modules, opensips-geoip-module, opensips-regex-module, opensips-identity-module, opensips-b2bua-module, opensips-dbhttp-module, opensips-console
+Description: very fast and configurable SIP server
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
  per second even on low-budget hardware.
  .
  C Shell-like scripting language provides full control over the server's
  behaviour. Its modular architecture allows only required functionality to be
  loaded.
  .
- Among others, the following modules are available: digest authentication, CPL
- scripts, instant messaging, MySQL support, presence agent, RADIUS
- authentication, record routing, SMS gateway, Jabber/XMPP gateway, transaction
- module, registrar and user location, XML-RPC interface.
- .
- This package contains the main opensips binary along with the principal modules
+ Among others, the following modules are available: Digest Authentication, CPL
+ scripts, Instant Messaging, MySQL support, Presence Agent, Radius
+ Authentication, Record Routing, SMS Gateway, Jabber/XMPP Gateway, Transaction
+ Module, Registrar and User Location, Load Balaning/Dispatching/LCR, 
+ XMLRPC Interface.
+ .
+ This package contains the main OpenSIPS binary along with the principal modules
  and support binaries.
 
 Package: opensips-dbg
@@ -35,9 +36,9 @@
 Architecture: any
 Section: debug
 Depends: opensips (= ${binary:Version}), ${misc:Depends}
-Description: very fast and configurable SIP proxy [debug symbols]
- opensips is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, opensips can handle thousands calls
+Description: very fast and configurable SIP server [debug symbols]
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
  per second even on low-budget hardware.
  .
  This package contains the debugging symbols for the opensips binaries and
@@ -46,9 +47,11 @@
 Package: opensips-mysql-module
 Architecture: any
 Depends: ${shlibs:Depends}, opensips (= ${binary:Version}), mysql-client, ${misc:Depends}
-Description: MySQL database connectivity module for opensips
+Description: MySQL database connectivity module for OpenSIPS
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
  opensips is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, opensips can handle thousands calls
+ server. Written entirely in C, opensips can handle thousands calls
  per second even on low-budget hardware.
  .
  This package provides the MySQL database driver for opensips.
@@ -56,9 +59,11 @@
 Package: opensips-postgres-module
 Architecture: any
 Depends: ${shlibs:Depends}, opensips (= ${binary:Version}), postgresql-client, ${misc:Depends} 
-Description: PostgreSQL database connectivity module for opensips
+Description: PostgreSQL database connectivity module for OpenSIPS
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
  opensips is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, opensips can handle thousands calls
+ server. Written entirely in C, opensips can handle thousands calls
  per second even on low-budget hardware.
  .
  This package provides the PostgreSQL database driver for opensips.
@@ -66,19 +71,19 @@
 Package: opensips-jabber-module
 Architecture: any
 Depends: ${shlibs:Depends}, opensips (= ${binary:Version}), ${misc:Depends}
-Description: Jabber gateway module for opensips
- opensips is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, opensips can handle thousands calls
- per second even on low-budget hardware.
- .
- This package provides the SIP to Jabber translator module for opensips.
+Description: Jabber gateway module for OpenSIPS
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides the SIP to Jabber translator module for OpenSIPS.
 
 Package: opensips-cpl-module
 Architecture: any
 Depends: ${shlibs:Depends}, opensips (= ${binary:Version}), ${misc:Depends}
 Description: CPL module (CPL interpreter engine) for opensips
- opensips is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, opensips can handle thousands calls
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
  per second even on low-budget hardware.
  .
  This package provides a CPL (Call Processing Language) interpreter for
@@ -88,8 +93,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}, opensips (= ${binary:Version}), ${misc:Depends}
 Description: RADIUS modules for opensips
- opensips is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, opensips can handle thousands calls
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
  per second even on low-budget hardware.
  .
  This package provides a set of RADIUS modules for opensips, for
@@ -99,9 +104,9 @@
 Package: opensips-unixodbc-module
 Architecture: any
 Depends: ${shlibs:Depends}, opensips (= ${binary:Version}), ${misc:Depends}
-Description: unixODBC database connectivity module for opensips
- opensips is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, opensips can handle thousands calls
+Description: unixODBC database connectivity module for OpenSIPS
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
  per second even on low-budget hardware.
  .
  This package provides the unixODBC database driver for opensips.
@@ -110,8 +115,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}, opensips (= ${binary:Version}), ${misc:Depends}
 Description: SIMPLE presence modules for opensips
- opensips is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, opensips can handle thousands calls
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
  per second even on low-budget hardware.
  .
  This package provides several opensips modules for implementing presence
@@ -122,8 +127,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}, opensips (= ${binary:Version}), ${misc:Depends}
 Description: XML-RPC support for opensips's Management Interface
- opensips is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, opensips can handle thousands calls
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
  per second even on low-budget hardware.
  .
  This package provides the XMLRPC transport implementation for opensips's
@@ -135,8 +140,8 @@
 Replaces: opensips-perl-module
 Conflicts: opensips-perl-module
 Description: Perl extensions and database driver for opensips
- opensips is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, opensips can handle thousands calls
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
  per second even on low-budget hardware.
  .
  This package provides an interface for opensips to write Perl extensions and
@@ -145,44 +150,44 @@
 Package: opensips-snmpstats-module
 Architecture: any
 Depends: ${shlibs:Depends}, opensips (= ${binary:Version}), snmpd, ${misc:Depends}
-Description: SNMP AgentX subagent module for opensips
- opensips is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, opensips can handle thousands calls
- per second even on low-budget hardware.
- .
- This package provides the snmpstats module for opensips. This module acts
+Description: SNMP AgentX subagent module for OpenSIPS
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides the snmpstats module for OpenSIPS. This module acts
  as an AgentX subagent which connects to a master agent.
 
 Package: opensips-xmpp-module
 Architecture: any
 Depends: ${shlibs:Depends}, opensips (= ${binary:Version}), ${misc:Depends}
-Description: XMPP gateway module for opensips
- opensips is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, opensips can handle thousands calls
- per second even on low-budget hardware.
- .
- This package provides the SIP to XMPP IM translator module for opensips.
+Description: XMPP gateway module for OpenSIPS
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides the SIP to XMPP IM translator module for OpenSIPS.
 
 Package: opensips-carrierroute-module
 Architecture: any
 Depends: ${shlibs:Depends}, opensips (= ${binary:Version}), ${misc:Depends}
-Description: carrierroute module for opensips
- opensips is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, opensips can handle thousands calls
- per second even on low-budget hardware.
- .
- This package provides the carrierroute module for opensips, an integrated
+Description: carrierroute module for OpenSIPS
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides the carrierroute module for OpenSIPS, an integrated
  solution for routing, balancing and blacklisting.
 
 Package: opensips-berkeley-module
 Architecture: any
 Depends: ${shlibs:Depends}, opensips (= ${binary:Version}), db4.6-util, ${misc:Depends}
-Description: Berkeley database module for opensips
- opensips is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, opensips can handle thousands calls
- per second even on low-budget hardware.
- .
- This package provides the Berkeley database module for opensips, a
+Description: Berkeley database module for OpenSIPS
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides the Berkeley database module for OpenSIPS, a
  high-performance embedded DB kernel. All database tables are stored
  in files, no additional server is necessary.
 
@@ -190,8 +195,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}, opensips (= ${binary:Version}), ${misc:Depends}
 Description: LDAP modules for opensips
- opensips is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, opensips can handle thousands calls
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
  per second even on low-budget hardware.
  .
  This package provides the ldap and h350 modules for opensips, enabling LDAP
@@ -201,11 +206,81 @@
 Package: opensips-osp-module
 Architecture: any
 Depends: ${shlibs:Depends}, opensips (= ${binary:Version}), osptoolkit, ${misc:Depends}
-Description: Open Settlement Protocol (OSP) module for opensips
- opensips is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, opensips can handle thousands calls
- per second even on low-budget hardware.
- .
- This package contains the Open Settlement Protocol (OSP) module for opensips,
+Description: Open Settlement Protocol (OSP) module for OpenSIPS
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package contains the Open Settlement Protocol (OSP) module for OpenSIPS,
  providing support for secure multi-lateral peering using the Open Settlement
  Protocol.
+
+Package: opensips-geoip-module
+Architecture: any
+Depends: ${shlibs:Depends}, opensips (= ${binary:Version}), ${misc:Depends}
+Description: IP address-to-location looku (MaxMind GeoIP API) for OpenSIPS
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This module is a lightweight wrapper for the MaxMind GeoIP API.
+ It adds IP address-to-location lookup capability to OpenSIPS
+ scripts. Lookups are executed against the freely-available GeoLite City
+ database; and the non-free GeoIP City database is drop-in
+ compatible   Lookups are executed against the freely-available GeoLite City
+ database; and the non-free GeoIP City database is drop-in compatible
+
+Package: opensips-regex-module
+Architecture: any
+Depends: ${shlibs:Depends}, opensips (= ${binary:Version}), ${misc:Depends}
+Description: PCRE regexp modules for OpenSIPS
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides a module for matching operations against regular
+ expressions using the powerful PCRE library. By default, OpenSIPS support
+ sed-like regular expresions; PCRE library brings perl-like regular expresions.
+
+Package: opensips-identity-module
+Architecture: any
+Depends: ${shlibs:Depends}, opensips (= ${binary:Version}), ${misc:Depends}
+Description: SIP Identity module for OpenSIPS
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides support for SIP Identity (see RFC 4474).
+
+Package: opensips-b2bua-module
+Architecture: any
+Depends: ${shlibs:Depends}, opensips (= ${binary:Version}), ${misc:Depends}
+Description: B2B User Agent modules for OpenSIPS
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides modules for B2BUA suppor in OpenSIPS. Both the 
+ implementation and controll (XML based scenario description) are included.
+
+Package: opensips-dbhttp-module
+Architecture: any
+Depends: ${shlibs:Depends}, opensips (= ${binary:Version}), ${misc:Depends}
+Description: HTTP database connectivity module for OpenSIPS
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides the HTTP-based database driver for OpenSIPS
+
+Package: opensips-console
+Architecture: any
+Depends: ${shlibs:Depends}, opensips (= ${binary:Version}),${misc:Depends}, libfrontier-rpc-perl, libnet-ip-perl, libberkeleydb-perl, libdbi-perl, libterm-readline-gnu-perl
+Suggests: opensips-mysql-module, opensips-postgres-module, opensips-unixodbc-module, opensips-xmlrpc-module, opensips-berkeley-module, libdbd-mysql-perl, libdbd-pg-perl 
+Description: Console utility for provisioning OpenSIPS
+ OpenSIPS is a very fast and flexible SIP (RFC3261) server based on
+ OpenSER. Written entirely in C, OpenSIPS can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides an OpenSIPS Console written in Perl for OpenSIPS
+ provisioning.

Modified: opensips/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/opensips/trunk/debian/patches/00list?rev=7834&op=diff
==============================================================================
--- opensips/trunk/debian/patches/00list (original)
+++ opensips/trunk/debian/patches/00list Mon Nov 30 04:48:38 2009
@@ -1,2 +1,0 @@
-10_no_lib64_on_64_bits.dpatch
-11_always_smp.dpatch

Modified: opensips/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opensips/trunk/debian/rules?rev=7834&op=diff
==============================================================================
--- opensips/trunk/debian/rules (original)
+++ opensips/trunk/debian/rules Mon Nov 30 04:48:38 2009
@@ -8,7 +8,10 @@
 	opensips-jabber-module opensips-cpl-module opensips-radius-modules \
 	opensips-unixodbc-module opensips-presence-modules opensips-xmlrpc-module \
 	opensips-perl-modules opensips-snmpstats-module opensips-xmpp-module \
-	opensips-carrierroute-module opensips-berkeley-module opensips-ldap-modules
+	opensips-carrierroute-module opensips-berkeley-module \
+	opensips-ldap-modules opensips-geoip-module opensips-regex-module \
+	opensips-identity-module opensips-b2bua-module opensips-dbhttp-module \
+	opensips-console
 
 DEBVERSION:=$(shell head -n 1 debian/changelog \
                     | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
@@ -52,9 +55,9 @@
 # cpl related modules
 CPL_MODULES = cpl-c
 # module depending on radiusclient
-RADIUS_MODULES = avp_radius auth_radius group_radius uri_radius
+RADIUS_MODULES = aaa_radius peering
 # presence related modules
-PRESENCE_MODULES = presence presence_xml presence_mwi pua pua_bla pua_mi pua_usrloc pua_xmpp xcap_client
+PRESENCE_MODULES = presence presence_dialoginfo presence_xml presence_mwi presence_xcapdiff pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp rls xcap_client
 # XMLRPC module
 XMLRPC_MODULES = mi_xmlrpc
 # Perl module
@@ -71,8 +74,18 @@
 LDAP_MODULES = ldap h350
 # OSP module
 OSP_MODULES = osp
-
-ALL_MODULES = $(MYSQL_MODULES) $(POSTGRES_MODULES) $(UNIXODBC_MODULES) $(JABBER_MODULES) $(CPL_MODULES) $(RADIUS_MODULES) $(PRESENCE_MODULES) $(XMLRPC_MODULES) $(PERL_MODULES) $(SNMPSTATS_MODULES) $(XMPP_MODULES) $(CROUTE_MODULES) $(BERKELEY_MODULES) $(LDAP_MODULES) $(OSP_MODULES)
+# GEOIP module
+GEOIP_MODULES = mmgeoip
+# REGEX module
+REGEX_MODULES = regex
+# IDENTITY module
+IDENTITY_MODULES = identity
+# B2BUA module
+B2BUA_MODULES = b2b_entities b2b_logic
+# DBHTTP module
+DBHTTP_MODULES = db_http
+
+ALL_MODULES = $(MYSQL_MODULES) $(POSTGRES_MODULES) $(UNIXODBC_MODULES) $(JABBER_MODULES) $(CPL_MODULES) $(RADIUS_MODULES) $(PRESENCE_MODULES) $(XMLRPC_MODULES) $(PERL_MODULES) $(SNMPSTATS_MODULES) $(XMPP_MODULES) $(CROUTE_MODULES) $(BERKELEY_MODULES) $(LDAP_MODULES) $(OSP_MODULES) $(GEOIP_MODULES) $(REGEX_MODULES) $(IDENTITY_MODULES) $(B2BUA_MODULES) $(DBHTTP_MODULES)
 
 # modules not in the "main" package or unstable modules
 EXCLUDED_MODULES = $(ALL_MODULES) pa
@@ -93,6 +106,12 @@
 BERKELEY_MOD_PATH=$(addprefix modules/, $(BERKELEY_MODULES))
 LDAP_MOD_PATH=$(addprefix modules/, $(LDAP_MODULES))
 OSP_MOD_PATH=$(addprefix modules/, $(OSP_MODULES))
+GEOIP_MOD_PATH=$(addprefix modules/, $(GEOIP_MODULES))
+REGEX_MOD_PATH=$(addprefix modules/, $(REGEX_MODULES))
+IDENTITY_MOD_PATH=$(addprefix modules/, $(IDENTITY_MODULES))
+B2BUA_MOD_PATH=$(addprefix modules/, $(B2BUA_MODULES))
+DBHTTP_MOD_PATH=$(addprefix modules/, $(DBHTTP_MODULES))
+
 
 ifeq (cc, $(CC))
 	CC = gcc
@@ -106,6 +125,9 @@
 	CFLAGS += -O2
 endif
 
+# force lib (versus lib64) and SMP support all the time
+VARS = LIBDIR=lib ISSMP=yes TLS=$(TLS)
+
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
@@ -123,30 +145,32 @@
 	dh_testdir
 
 	# Add here commands to compile the package.
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) all skip_modules="$(EXCLUDED_MODULES)" cfg-target=/etc/opensips/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(MYSQL_MOD_PATH)" cfg-target=/etc/opensips/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(POSTGRES_MOD_PATH)" cfg-target=/etc/opensips/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(UNIXODBC_MOD_PATH)" cfg-target=/etc/opensips/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(JABBER_MOD_PATH)" cfg-target=/etc/opensips/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(CPL_MOD_PATH)" cfg-target=/etc/opensips/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(RADIUS_MOD_PATH)" cfg-target=/etc/opensips/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(PRESENCE_MOD_PATH)" cfg-target=/etc/opensips/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(XMLRPC_MOD_PATH)" cfg-target=/etc/opensips/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(PERL_MOD_PATH)" cfg-target=/etc/opensips/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(SNMPSTATS_MOD_PATH)" cfg-target=/etc/opensips/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(XMPP_MOD_PATH)" cfg-target=/etc/opensips/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(CROUTE_MOD_PATH)" cfg-target=/etc/opensips/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(BERKELEY_MOD_PATH)" cfg-target=/etc/opensips/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(LDAP_MOD_PATH)" cfg-target=/etc/opensips/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) all skip_modules="$(EXCLUDED_MODULES)" cfg-target=/etc/opensips/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(MYSQL_MOD_PATH)" cfg-target=/etc/opensips/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(POSTGRES_MOD_PATH)" cfg-target=/etc/opensips/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(UNIXODBC_MOD_PATH)" cfg-target=/etc/opensips/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(JABBER_MOD_PATH)" cfg-target=/etc/opensips/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(CPL_MOD_PATH)" cfg-target=/etc/opensips/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(RADIUS_MOD_PATH)" cfg-target=/etc/opensips/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(PRESENCE_MOD_PATH)" cfg-target=/etc/opensips/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(XMLRPC_MOD_PATH)" cfg-target=/etc/opensips/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(PERL_MOD_PATH)" cfg-target=/etc/opensips/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(SNMPSTATS_MOD_PATH)" cfg-target=/etc/opensips/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(XMPP_MOD_PATH)" cfg-target=/etc/opensips/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(CROUTE_MOD_PATH)" cfg-target=/etc/opensips/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(BERKELEY_MOD_PATH)" cfg-target=/etc/opensips/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(LDAP_MOD_PATH)" cfg-target=/etc/opensips/
 ifneq (,$(OSP))
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(OSP_MOD_PATH)" cfg-target=/etc/opensips/
-endif
-
-	# generate the db schemas
-	$(MAKE) dbschema
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(OSP_MOD_PATH)" cfg-target=/etc/opensips/
+endif
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(GEOIP_MOD_PATH)" cfg-target=/etc/opensips/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(REGEX_MOD_PATH)" cfg-target=/etc/opensips/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(IDENTITY_MOD_PATH)" cfg-target=/etc/opensips/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(B2BUA_MOD_PATH)" cfg-target=/etc/opensips/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(DBHTTP_MOD_PATH)" cfg-target=/etc/opensips/
 
 	# generate the utils db_berkeley
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) utils include_modules="db_berkeley"
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) utils include_modules="db_berkeley"
 
 	touch build-stamp
 
@@ -158,7 +182,7 @@
 
 	# Add here commands to clean up after the build process.
 	if [ -r Makefile ]; then \
-		$(MAKE) TLS=$(TLS) include_modules="$(ALL_MODULES)" clean; \
+		$(MAKE) $(VARS) include_modules="$(ALL_MODULES)" proper; \
 	fi
 	rm -f cfg.tab.h
 	rm -f utils/opensipsunix/opensipsunix.o utils/opensipsunix/opensipsunix
@@ -174,7 +198,7 @@
 
 	# Add here commands to install the package into debian/opensips
 	# opensips base package
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install skip_modules="$(EXCLUDED_MODULES)" \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install skip_modules="$(EXCLUDED_MODULES)" \
 		basedir=$(CURDIR)/debian/opensips \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/opensips \
@@ -183,9 +207,10 @@
 
 	find $(CURDIR)/debian/opensips/etc/opensips -type f -exec chmod -x {} \;
 	sed -i -e "s/^PATH.*//" $(CURDIR)/debian/opensips/usr/sbin/opensipsctl
+	rm -f  $(CURDIR)/debian/opensips/usr/sbin/osipsconsole
 
 	# install only the mysql module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(MYSQL_MOD_PATH)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(MYSQL_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/opensips-mysql-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/opensips-mysql-module \
@@ -193,7 +218,7 @@
 		doc-dir=share/doc/opensips-mysql-module
 
 	# install only the postgres module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(POSTGRES_MOD_PATH)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(POSTGRES_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/opensips-postgres-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/opensips-postgres-module \
@@ -201,7 +226,7 @@
 		doc-dir=share/doc/opensips-postgres-module
 
 	# install only the unixodbc module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(UNIXODBC_MOD_PATH)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(UNIXODBC_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/opensips-unixodbc-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/opensips-unixodbc-module \
@@ -209,7 +234,7 @@
 		doc-dir=share/doc/opensips-unixodbc-module
 
 	# install only the jabber module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(JABBER_MOD_PATH)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(JABBER_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/opensips-jabber-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/opensips-jabber-module \
@@ -217,7 +242,7 @@
 		doc-dir=share/doc/opensips-jabber-module
 
 	# install only the cpl module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(CPL_MOD_PATH)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(CPL_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/opensips-cpl-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/opensips-cpl-module \
@@ -225,7 +250,7 @@
 		doc-dir=share/doc/opensips-cpl-module
 
 	# install only the radius modules
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(RADIUS_MOD_PATH)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(RADIUS_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/opensips-radius-modules \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/opensips-radius-modules \
@@ -236,7 +261,7 @@
 	# mv $(CURDIR)/debian/opensips/etc/opensips/dictionary.radius $(CURDIR)/debian/opensips-radius-modules/etc/opensips/
 
 	# install only the presence modules
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(PRESENCE_MOD_PATH)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(PRESENCE_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/opensips-presence-modules \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/opensips-presence-modules \
@@ -244,7 +269,7 @@
 		doc-dir=share/doc/opensips-presence-modules
 
 	# install only the xmlrpc module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(XMLRPC_MOD_PATH)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(XMLRPC_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/opensips-xmlrpc-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/opensips-xmlrpc-module \
@@ -252,7 +277,7 @@
 		doc-dir=share/doc/opensips-xmlrpc-module
 
 	# install only the perl modules
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(PERL_MOD_PATH)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(PERL_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/opensips-perl-modules \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/opensips-perl-modules \
@@ -260,7 +285,7 @@
 		doc-dir=share/doc/opensips-perl-modules
 
 	# install only the snmpstats module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(SNMPSTATS_MOD_PATH)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(SNMPSTATS_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/opensips-snmpstats-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/opensips-snmpstats-module \
@@ -268,7 +293,7 @@
 		doc-dir=share/doc/opensips-snmpstats-module
 
 	# install only the xmpp module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(XMPP_MOD_PATH)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(XMPP_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/opensips-xmpp-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/opensips-xmpp-module \
@@ -276,7 +301,7 @@
 		doc-dir=share/doc/opensips-xmpp-module
 
 	# install only the carrierroute module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(CROUTE_MOD_PATH)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(CROUTE_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/opensips-carrierroute-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/opensips-carrierroute-module \
@@ -284,7 +309,7 @@
 		doc-dir=share/doc/opensips-carrierroute-module
 
 	# install only the db_berkeley module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(BERKELEY_MOD_PATH)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(BERKELEY_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/opensips-berkeley-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/opensips-berkeley-module \
@@ -292,7 +317,7 @@
 		doc-dir=share/doc/opensips-berkeley-module
 
 	# install only the ldap modules
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(LDAP_MOD_PATH)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(LDAP_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/opensips-ldap-modules \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/opensips-ldap-modules \
@@ -301,7 +326,7 @@
 
 ifneq (,$(OSP))
 	# install only the OSP module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(OSP_MOD_PATH)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(OSP_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/opensips-osp-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/opensips-osp-module \
@@ -309,7 +334,53 @@
 		doc-dir=share/doc/opensips-osp-module
 endif
 
-	# the modules packages all ship an empty /usr/sbin directory, let's clean that up
+	# install only the geoip modules
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(GEOIP_MOD_PATH)"  \
+		basedir=$(CURDIR)/debian/opensips-geoip-module \
+		prefix=/usr \
+		cfg-prefix=$(CURDIR)/debian/opensips-geoip-module \
+		cfg-target=/etc/opensips/ \
+		doc-dir=share/doc/opensips-geoip-module
+
+	# install only the regex modules
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(REGEX_MOD_PATH)"  \
+		basedir=$(CURDIR)/debian/opensips-regex-module \
+		prefix=/usr \
+		cfg-prefix=$(CURDIR)/debian/opensips-regex-module \
+		cfg-target=/etc/opensips/ \
+		doc-dir=share/doc/opensips-regex-module
+
+	# install only the identity modules
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(IDENTITY_MOD_PATH)"  \
+		basedir=$(CURDIR)/debian/opensips-identity-module \
+		prefix=/usr \
+		cfg-prefix=$(CURDIR)/debian/opensips-identity-module \
+		cfg-target=/etc/opensips/ \
+		doc-dir=share/doc/opensips-identity-module
+
+	# install only the b2bua modules
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(B2BUA_MOD_PATH)"  \
+		basedir=$(CURDIR)/debian/opensips-identity-module \
+		prefix=/usr \
+		cfg-prefix=$(CURDIR)/debian/opensips-identity-module \
+		cfg-target=/etc/opensips/ \
+		doc-dir=share/doc/opensips-identity-module
+
+	# install only the db_http modules
+	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(DBHTTP_MOD_PATH)"  \
+		basedir=$(CURDIR)/debian/opensips-identity-module \
+		prefix=/usr \
+		cfg-prefix=$(CURDIR)/debian/opensips-identity-module \
+		cfg-target=/etc/opensips/ \
+		doc-dir=share/doc/opensips-identity-module
+
+	# install only the opensips console tool
+	$(MAKE) install-console \
+		basedir=$(CURDIR)/debian/opensips-console \
+		prefix=/usr
+
+	# the modules packages all ship an empty /usr/sbin directory, 
+	# let's clean that up
 	for p in $(ALL_PACKAGES); \
 		do rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/$$p/usr/sbin; done
 	rm $(CURDIR)/debian/opensips/usr/share/doc/opensips/INSTALL
@@ -326,7 +397,7 @@
 #	dh_installlogrotate
 	dh_installinit -popensips -- defaults 23
 	dh_installcron
-	dh_installman debian/osipsconsole.8
+	dh_installman debian/opensips-console.osipsconsole.8
 	dh_installinfo
 	dh_installchangelogs
 	dh_link




More information about the Pkg-voip-commits mailing list