[Pkg-voip-commits] r5680 - in /openser/trunk/debian: changelog control openser.README.Debian rules
jblache at alioth.debian.org
jblache at alioth.debian.org
Tue May 6 17:44:24 UTC 2008
Author: jblache
Date: Tue May 6 17:44:24 2008
New Revision: 5680
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5680
Log:
Add support for building the osp module.
Modified:
openser/trunk/debian/changelog
openser/trunk/debian/control
openser/trunk/debian/openser.README.Debian
openser/trunk/debian/rules
Modified: openser/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/openser/trunk/debian/changelog?rev=5680&op=diff
==============================================================================
--- openser/trunk/debian/changelog (original)
+++ openser/trunk/debian/changelog Tue May 6 17:44:24 2008
@@ -2,7 +2,13 @@
* NOT RELEASED YET
- -- Julien BLACHE <jblache at debian.org> Sat, 05 Apr 2008 17:32:17 +0200
+ * debian/control, debian/rules:
+ + Add osp module, disabled by default in Debian due to OpenSSL license
+ issues.
+ * openser.README.Debian:
+ + Add instructions to build the TLS variant and the OSP module.
+
+ -- Julien BLACHE <jblache at debian.org> Tue, 06 May 2008 19:41:37 +0200
openser (1.3.1-3) unstable; urgency=low
Modified: openser/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/openser/trunk/debian/control?rev=5680&op=diff
==============================================================================
--- openser/trunk/debian/control (original)
+++ openser/trunk/debian/control Tue May 6 17:44:24 2008
@@ -197,3 +197,15 @@
This package provides the ldap and h350 modules for OpenSER, enabling LDAP
queries from the OpenSER config and storage of SIP account data in an LDAP
directory.
+
+Package: openser-osp-module
+Architecture: any
+Depends: ${shlibs:Depends}, openser (= ${binary:Version})
+Description: Open Settlement Protocol (OSP) module for OpenSER
+ OpenSER is a very fast and flexible SIP (RFC3261)
+ proxy server. Written entirely in C, OpenSER can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package contains the Open Settlement Protocol (OSP) module for OpenSER,
+ providing support for secure multi-lateral peering using the Open Settlement
+ Protocol.
Modified: openser/trunk/debian/openser.README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/openser/trunk/debian/openser.README.Debian?rev=5680&op=diff
==============================================================================
--- openser/trunk/debian/openser.README.Debian (original)
+++ openser/trunk/debian/openser.README.Debian Tue May 6 17:44:24 2008
@@ -1,5 +1,38 @@
OpenSER for Debian
------------------
+
+* TLS support
+-------------
+
+Due to a license incompatibility between the GPL and the OpenSSL license, we
+cannot ship OpenSER with TLS enabled.
+
+However, if you need OpenSER with TLS, it's easy to get it:
+ - apt-get build-dep openser
+ - apt-get install libssl-dev fakeroot build-essential
+ - apt-get source openser
+ - edit openser-.../debian/rules and set TLS to 1
+ - run dpkg-buildpackage -rfakeroot
+
+The resulting OpenSER packages will have TLS enabled.
+
+
+* OSP module
+------------
+
+Due to the same license incompatibility, it's equally impossible to ship the
+OSP module.
+
+However, once again, if you need the OSP module, it's easy to get it:
+ - apt-get build-dep openser
+ - apt-get install libosptk3-dev fakeroot build-essential
+ - apt-get source openser
+ - edit openser-.../debian/rules and set OSP to 1
+ - run dpkg-buildpackage -rfakeroot
+
+An openser-osp-module package will be built alongside all the other OpenSER
+packages.
+
* init script check for fork=no
-------------------------------
@@ -35,4 +68,5 @@
get a core dump in case OpenSER crashes. The debug symbols for OpenSER are
provided by the openser-dbg package.
--- Julien BLACHE <jblache at debian.org>, Fri, 08 Sep 2006 14:43:21 +0200
+
+ -- Julien BLACHE <jblache at debian.org>, Tue, 06 May 2008 19:20:43 +0200
Modified: openser/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/openser/trunk/debian/rules?rev=5680&op=diff
==============================================================================
--- openser/trunk/debian/rules (original)
+++ openser/trunk/debian/rules Tue May 6 17:44:24 2008
@@ -28,6 +28,18 @@
# Do we want the TLS version ?
# Disabled by default due to license issues, set to non-void to enable
TLS=
+
+# Do we want to build the OSP module ?
+# Disabled by default due to license issues, set to non-void to enable
+OSP=
+
+ifeq (,$(OSP))
+ DH_OPTIONS = -Nopenser-osp-module
+else
+ ALL_PACKAGES += openser-osp-module
+endif
+
+export DH_OPTIONS
# modules depending on mysql
MYSQL_MODULES = mysql
@@ -57,11 +69,13 @@
BERKELEY_MODULES = db_berkeley
# LDAP modules
LDAP_MODULES = ldap h350
-
-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 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)
# modules not in the "main" package or unstable modules
-EXCLUDED_MODULES = $(ALL_MODULES) pa osp
+EXCLUDED_MODULES = $(ALL_MODULES) pa
# the same but with path prepended (needed for modules="...")
MYSQL_MOD_PATH=$(addprefix modules/, $(MYSQL_MODULES))
@@ -78,6 +92,7 @@
CROUTE_MOD_PATH=$(addprefix modules/, $(CROUTE_MODULES))
BERKELEY_MOD_PATH=$(addprefix modules/, $(BERKELEY_MODULES))
LDAP_MOD_PATH=$(addprefix modules/, $(LDAP_MODULES))
+OSP_MOD_PATH=$(addprefix modules/, $(OSP_MODULES))
ifeq (cc, $(CC))
CC = gcc
@@ -123,6 +138,9 @@
CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(CROUTE_MOD_PATH)" cfg-target=/etc/openser/
CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(BERKELEY_MOD_PATH)" cfg-target=/etc/openser/
CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(LDAP_MOD_PATH)" cfg-target=/etc/openser/
+ifneq (,$(OSP))
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(OSP_MOD_PATH)" cfg-target=/etc/openser/
+endif
# generate the db schemas
$(MAKE) dbschema
@@ -278,6 +296,16 @@
cfg-prefix=$(CURDIR)/debian/openser-ldap-modules \
cfg-target=/etc/openser/ \
doc-dir=share/doc/openser-ldap-modules
+
+ifneq (,$(OSP))
+ # install only the OSP module
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(OSP_MOD_PATH)" \
+ basedir=$(CURDIR)/debian/openser-osp-module \
+ prefix=/usr \
+ cfg-prefix=$(CURDIR)/debian/openser-osp-module \
+ cfg-target=/etc/openser/ \
+ doc-dir=share/doc/openser-osp-module
+endif
# the modules packages all ship an empty /usr/sbin directory, let's clean that up
for p in $(ALL_PACKAGES); \
More information about the Pkg-voip-commits
mailing list