[Pkg-voip-commits] r7206 - in /kamailio/trunk/debian: changelog control copyright kamailio.README.Debian kamailio.default kamailio.init patches/00list patches/12_acc_enable_radius.dpatch patches/13_Makefile_radius.dpatch rules

henningw-guest at alioth.debian.org henningw-guest at alioth.debian.org
Mon May 11 14:35:54 UTC 2009 

Author: henningw-guest
Date: Mon May 11 14:35:54 2009
New Revision: 7206

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7206
Log:
* new release from upstream
* finish renaming from openser to kamailio started from Julien Blache
* merge upstream changes in packaging scripts
* debian/control:
  + add new modules with dependencies
  + fix description for radius package
  + add python to kamailio dependencies to fix lintian error
* debian/kamailio.default:
  + extend description in kamailio.default
* debian/kamailio.init:
  + add example core dump directory setting to init file
  + small reformatting in init file, mostly whitespace changes
* debian/patches/13_Makefile_radius.dpatch:
  + fix upstream change in build system, they don't install the
    dictionary.radius in the normal build anymore
* debian/rules:
  + add new modules
  + remove not needed dictionary.radius copying
* debian/kamailio.README.Debian:
  + add a note about upgrades from a previous OpenSER version
  + provide links to the upstream upgrade guide
* debian/copyright:
  + fix lintian warning with explicit specifying GPL-2 or later
  + add myself as additional copyright holder for the code

Added:
    kamailio/trunk/debian/patches/13_Makefile_radius.dpatch
Modified:
    kamailio/trunk/debian/changelog
    kamailio/trunk/debian/control
    kamailio/trunk/debian/copyright
    kamailio/trunk/debian/kamailio.README.Debian
    kamailio/trunk/debian/kamailio.default
    kamailio/trunk/debian/kamailio.init
    kamailio/trunk/debian/patches/00list
    kamailio/trunk/debian/patches/12_acc_enable_radius.dpatch
    kamailio/trunk/debian/rules

Modified: kamailio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/changelog?rev=7206&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Mon May 11 14:35:54 2009
@@ -1,3 +1,32 @@
+kamailio (1.5.1-1) unstable; urgency=low
+
+  * new release from upstream
+  * finish renaming from openser to kamailio started from Julien Blache
+  * merge upstream changes in packaging scripts
+  * debian/control:
+    + add new modules with dependencies
+    + fix description for radius package
+    + add python to kamailio dependencies to fix lintian error
+  * debian/kamailio.default:
+    + extend description in kamailio.default
+  * debian/kamailio.init:
+    + add example core dump directory setting to init file
+    + small reformatting in init file, mostly whitespace changes
+  * debian/patches/13_Makefile_radius.dpatch:
+    + fix upstream change in build system, they don't install the
+      dictionary.radius in the normal build anymore
+  * debian/rules:
+    + add new modules
+    + remove not needed dictionary.radius copying
+  * debian/kamailio.README.Debian:
+    + add a note about upgrades from a previous OpenSER version
+    + provide links to the upstream upgrade guide
+  * debian/copyright:
+    + fix lintian warning with explicit specifying GPL-2 or later
+    + add myself as additional copyright holder for the code
+
+ -- Henning Westerholt <henning.westerholt at 1und1.de>  Thu, 07 May 2009 19:17:46 +0200
+
 kamailio (1.4.0~svn20080728-1) UNRELEASED; urgency=low
 
   [ Julien BLACHE ]

Modified: kamailio/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/control?rev=7206&op=diff
==============================================================================
--- kamailio/trunk/debian/control (original)
+++ kamailio/trunk/debian/control Mon May 11 14:35:54 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian 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
+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, libpcre3-dev, docbook-xml, libpurple-dev
 Standards-Version: 3.8.0
 Homepage: http://www.kamailio.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/kamailio/trunk/
@@ -11,9 +11,9 @@
 
 Package: kamailio
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, python, adduser
 Replaces: openser
-Suggests: kamailio-mysql-module, kamailio-postgres-module, kamailio-unixodbc-module, kamailio-jabber-module, kamailio-cpl-module, kamailio-radius-modules, kamailio-presence-modules, kamailio-xmlrpc-module, kamailio-perl-modules, kamailio-snmpstats-module, kamailio-xmpp-module, kamailio-carrierroute-module, kamailio-berkeley-module, kamailio-ldap-modules
+Suggests: kamailio-mysql-module, kamailio-postgres-module, kamailio-unixodbc-module, kamailio-jabber-module, kamailio-cpl-module, kamailio-radius-modules, kamailio-presence-modules, kamailio-xmlrpc-module, kamailio-perl-modules, kamailio-snmpstats-module, kamailio-xmpp-module, kamailio-carrierroute-module, kamailio-berkeley-module, kamailio-ldap-modules, kamailio-utils-module, kamailio-regex-modules, kamailio-purple-module
 Description: very fast and configurable SIP proxy
  Kamailio is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, Kamailio can handle thousands calls
@@ -99,7 +99,7 @@
  per second even on low-budget hardware.
  .
  This package provides a set of RADIUS modules for Kamailio, for
- authentication, group membership and messages URIs checking against a
+ authentication, peering, group membership and messages URIs checking against a
  RADIUS server.
 
 Package: kamailio-unixodbc-module
@@ -211,6 +211,38 @@
  This package provides the ldap and h350 modules for Kamailio, enabling LDAP
  queries from the Kamailio config and storage of SIP account data in an LDAP
  directory.
+
+Package: kamailio-utils-module
+Architecture: any
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Description: Provides a set utility functions 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.
+ .
+ Provides a set of utility functions for Kamailio, which are not related
+ to the server configuration.
+
+Package: kamailio-regex-modules
+Architecture: any
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Description: Provides the lcr, diaplan and regex modules
+ 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.
+ .
+ Contains the lcr, diaplan and regex modules that depends on the pcre library.
+
+Package: kamailio-purple-module
+Architecture: any
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Description: Provides the purple module, a multi-protocol IM gateway
+ 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 purple module, a multi-protocol instant
+ messaging gateway module.
 
 Package: kamailio-osp-module
 Architecture: any

Modified: kamailio/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/copyright?rev=7206&op=diff
==============================================================================
--- kamailio/trunk/debian/copyright (original)
+++ kamailio/trunk/debian/copyright Mon May 11 14:35:54 2009
@@ -9,6 +9,7 @@
        Andrei Pelinescu-Onciul <pelinescu-onciul at fokus.fraunhofer.de>
        Bogdan-Andrei Iancu <bogdan at voice-system.ro>
        Daniel-Constantin Mierla <daniel at voice-system.ro>
+       Henning Westerholt <henning.westerholt at 1und1.de>
        Jan Janak <jan at iptel.org>
        Jiri Kuthan <jiri at iptel.org>
        Juha Heinanen
@@ -21,7 +22,7 @@
        Part of this software is Copyright (c) 2002-2003 by FhG Fokus
 
 You are free to distribute this software under the terms of
-the GNU General Public License.
+the GNU General Public License version 2 or later.
 
 On Debian systems, the complete text of the GNU General Public
-License can be found in the file `/usr/share/common-licenses/GPL.
+License can be found in the file `/usr/share/common-licenses/GPL-2.

Modified: kamailio/trunk/debian/kamailio.README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/kamailio.README.Debian?rev=7206&op=diff
==============================================================================
--- kamailio/trunk/debian/kamailio.README.Debian (original)
+++ kamailio/trunk/debian/kamailio.README.Debian Mon May 11 14:35:54 2009
@@ -69,4 +69,18 @@
 provided by the kamailio-dbg package.
 
 
+* Upgrades from OpenSER
+-----------------------
+
+If you upgraded from a previous OpenSER installation, you'll most probably
+need to do some changes to your configuration script. If you use the
+provided setup and/ or control scripts from some custom scripts you need
+to additionally fix their names. Detailed informations about the porting
+from the last OpenSER version can be found here:
+
+ - http://www.kamailio.org/dokuwiki/doku.php/install:1.3.x-to-1.4.0
+ - http://www.kamailio.org/dokuwiki/doku.php/install:1.4.x-to-1.5.0
+
+
  -- Julien BLACHE <jblache at debian.org>, Mon, 28 Jul 2008 19:16:21 +0200
+ -- Henning Westerholt <henning.westerholt at 1und1.de>  Thu, 07 May 2009 19:17:46 +0200 

Modified: kamailio/trunk/debian/kamailio.default
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/kamailio.default?rev=7206&op=diff
==============================================================================
--- kamailio/trunk/debian/kamailio.default (original)
+++ kamailio/trunk/debian/kamailio.default Mon May 11 14:35:54 2009
@@ -18,4 +18,6 @@
 # Set this to 'yes' to enable Kamailio to leave a core file when it crashes
 # or 'no' to disable this feature. This option is case sensitive and only
 # accepts 'yes' and 'no' and only in lowercase letters.
+# On some systems it is necessary to specify a directory for the core files
+# to get a dump. Look into the kamailio init file for an example configuration.
 DUMP_CORE=no

Modified: kamailio/trunk/debian/kamailio.init
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/kamailio.init?rev=7206&op=diff
==============================================================================
--- kamailio/trunk/debian/kamailio.init (original)
+++ kamailio/trunk/debian/kamailio.init Mon May 11 14:35:54 2009
@@ -51,11 +51,11 @@
 {
     # Create a radius sequence file to be used by the radius client if
     # radius accounting is enabled. This is needed to avoid any issue
-    # with the file not being writable if kamailio first starts as
-    # root because DUMP_CORE is enabled and creates this file as
-    # root, then later cannot write to the file once it switched to
-    # the kamailio user. If the file exists before kamailio starts, it
-    # won't change its ownership and it will be writable for both root
+    # with the file not being writable if kamailio first starts as user
+    # root because DUMP_CORE is enabled and creates this file as user
+    # root and then later it switches back to user kamailio and cannot
+    # write to the file. If the file exists before kamailio starts, it
+    # won't change it's ownership and will be writable for both root
     # and kamailio, no matter what options are chosen at install time
     RADIUS_SEQ_FILE=/var/run/kamailio/kamailio_radius.seq
     if [ -d /var/run/kamailio ]; then
@@ -92,6 +92,12 @@
 if test "$DUMP_CORE" = "yes" ; then
     # set proper ulimit
     ulimit -c unlimited
+    
+    # directory for the core dump files
+    # COREDIR=/home/corefiles
+    # [ -d $COREDIR ] || mkdir $COREDIR
+    # chmod 777 $COREDIR
+    # echo "$COREDIR/core.%e.sig%s.%p" > /proc/sys/kernel/core_pattern
 fi
 
 # /var/run can be a tmpfs
@@ -134,21 +140,21 @@
 	echo "."
 	;;
   status)
-       echo -n "Status of $DESC: "
-
-       if [ ! -r "$PIDFILE" ]; then
-	   echo "$NAME is not running."
-	   exit 3
-       fi
-
-       if read pid < "$PIDFILE" && ps -p "$pid" > /dev/null 2>&1; then
-	   echo "$NAME is running."
-	   exit 0
-       else
-	   echo "$NAME is not running but $PIDFILE exists."
-	   exit 1
-       fi
-       ;;
+	echo -n "Status of $DESC: "
+	
+	if [ ! -r "$PIDFILE" ]; then
+		echo "$NAME is not running."
+		exit 3
+	fi
+	
+	if read pid < "$PIDFILE" && ps -p "$pid" > /dev/null 2>&1; then
+		echo "$NAME is running."
+		exit 0
+	else
+		echo "$NAME is not running but $PIDFILE exists."
+		exit 1
+	fi
+	;;
   *)
 	N=/etc/init.d/$NAME
 	echo "Usage: $N {start|stop|restart|force-reload|status|debug}" >&2

Modified: kamailio/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/00list?rev=7206&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/00list (original)
+++ kamailio/trunk/debian/patches/00list Mon May 11 14:35:54 2009
@@ -1,4 +1,4 @@
 10_no_lib64_on_64_bits
 11_always_smp
 12_acc_enable_radius
-
+13_Makefile_radius

Modified: kamailio/trunk/debian/patches/12_acc_enable_radius.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/12_acc_enable_radius.dpatch?rev=7206&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/12_acc_enable_radius.dpatch (original)
+++ kamailio/trunk/debian/patches/12_acc_enable_radius.dpatch Mon May 11 14:35:54 2009
@@ -5,10 +5,10 @@
 ## DP: Enable RADIUS in the acc module.
 
 @DPATCH@
-diff -urNad openser-1.3.2~/etc/openser.cfg openser-1.3.2/etc/openser.cfg
---- openser-1.3.2~/etc/openser.cfg	2008-05-08 17:30:18.000000000 +0200
-+++ openser-1.3.2/etc/openser.cfg	2008-07-21 22:30:00.749339246 +0200
-@@ -124,6 +124,8 @@
+diff -urNad kamailio-1.5.1~/etc/kamailio.cfg kamailio-1.5.1/etc/kamailio.cfg
+--- kamailio-1.5.1~/etc/kamailio.cfg	2008-05-08 17:30:18.000000000 +0200
++++ kamailio-1.5.1/etc/kamailio.cfg	2008-07-21 22:30:00.749339246 +0200
+@@ -171,6 +171,8 @@
  
  
  # ----- acc params -----
@@ -17,9 +17,9 @@
  /* what sepcial events should be accounted ? */
  modparam("acc", "early_media", 1)
  modparam("acc", "report_ack", 1)
-diff -urNad openser-1.3.2~/modules/acc/Makefile openser-1.3.2/modules/acc/Makefile
---- openser-1.3.2~/modules/acc/Makefile	2007-12-13 14:38:41.000000000 +0100
-+++ openser-1.3.2/modules/acc/Makefile	2008-07-21 22:28:58.652339555 +0200
+diff -urNad kamailio-1.5.1~/modules/acc/Makefile kamailio-1.5.1/modules/acc/Makefile
+--- kamailio-1.5.1~/modules/acc/Makefile	2007-12-13 14:38:41.000000000 +0100
++++ kamailio-1.5.1/modules/acc/Makefile		2008-07-21 22:28:58.652339555 +0200
 @@ -15,7 +15,7 @@
  
  # set ENABLE_RADIUS_ACC to true if you wish to enable RADIUS accounting

Added: kamailio/trunk/debian/patches/13_Makefile_radius.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/13_Makefile_radius.dpatch?rev=7206&op=file
==============================================================================
--- kamailio/trunk/debian/patches/13_Makefile_radius.dpatch (added)
+++ kamailio/trunk/debian/patches/13_Makefile_radius.dpatch Mon May 11 14:35:54 2009
@@ -1,0 +1,47 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_Makefile_radius.dpatch by  <henning.westerholt at 1und1.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix installation of radius example configuration
+
+ at DPATCH@
+diff -urNad kamailio-1.5.1~/Makefile kamailio-1.5.1/Makefile
+--- kamailio-1.5.1~/Makefile		2008-05-08 17:30:18.000000000 +0200
++++ kamailio-1.5.1/Makefile		2008-07-21 22:30:00.749339246 +0200
+@@ -505,17 +505,6 @@
+ 			mv -f $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample \
+ 				$(cfg-prefix)/$(cfg-dir)$(NAME).cfg; \
+ 		fi
+-		# radius dictionary
+-		if [ "$(RADIUSDEPON)" = "yes" ]; then \
+-			$(INSTALL_TOUCH) \
+-				$(cfg-prefix)/$(cfg-dir)/dictionary.radius.sample ; \
+-			$(INSTALL_CFG) etc/dictionary.radius \
+-				$(cfg-prefix)/$(cfg-dir)/dictionary.radius.sample ; \
+-			if [ ! -f $(cfg-prefix)/$(cfg-dir)/dictionary.radius ]; then \
+-				mv -f $(cfg-prefix)/$(cfg-dir)/dictionary.radius.sample \
+-					$(cfg-prefix)/$(cfg-dir)/dictionary.radius; \
+-			fi; \
+-		fi
+ 		# kamctl config
+ 		$(INSTALL_TOUCH)   $(cfg-prefix)/$(cfg-dir)/kamctlrc.sample
+ 		$(INSTALL_CFG) scripts/kamctlrc \
+@@ -767,6 +756,18 @@
+ 				fi ;\
+ 			done ;\
+ 		fi
++		# radius dictionary
++		if [ "$(RADIUSDEPON)" = "yes" ]; then \
++			mkdir -p $(cfg-prefix)/$(cfg-dir)/ ; \
++			$(INSTALL_TOUCH) \
++				$(cfg-prefix)/$(cfg-dir)/dictionary.radius.sample ; \
++			$(INSTALL_CFG) etc/dictionary.radius \
++				$(cfg-prefix)/$(cfg-dir)/dictionary.radius.sample ; \
++			if [ ! -f $(cfg-prefix)/$(cfg-dir)/dictionary.radius ]; then \
++				mv -f $(cfg-prefix)/$(cfg-dir)/dictionary.radius.sample \
++					$(cfg-prefix)/$(cfg-dir)/dictionary.radius; \
++			fi; \
++		fi
+ 
+ 
+ install-doc: $(doc-prefix)/$(doc-dir) install-modules-doc

Modified: kamailio/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/rules?rev=7206&op=diff
==============================================================================
--- kamailio/trunk/debian/rules (original)
+++ kamailio/trunk/debian/rules Mon May 11 14:35:54 2009
@@ -8,7 +8,8 @@
 	kamailio-jabber-module kamailio-cpl-module kamailio-radius-modules \
 	kamailio-unixodbc-module kamailio-presence-modules kamailio-xmlrpc-module \
 	kamailio-perl-modules kamailio-snmpstats-module kamailio-xmpp-module \
-	kamailio-carrierroute-module kamailio-berkeley-module kamailio-ldap-modules
+	kamailio-carrierroute-module kamailio-berkeley-module kamailio-ldap-modules \
+	kamailio-utils-module kamailio-regex-modules kamailio-purple-module
 
 DEBVERSION:=$(shell head -n 1 debian/changelog \
                     | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
@@ -42,19 +43,19 @@
 export DH_OPTIONS
 
 # modules depending on mysql
-MYSQL_MODULES = mysql
+MYSQL_MODULES = db_mysql
 # modules depending on postgres
-POSTGRES_MODULES = postgres
+POSTGRES_MODULES = db_postgres
 # modules depending on unixODBC
-UNIXODBC_MODULES = unixodbc
+UNIXODBC_MODULES = db_unixodbc
 # jabber module
 JABBER_MODULES = jabber
 # cpl related modules
 CPL_MODULES = cpl-c
 # module depending on radiusclient
-RADIUS_MODULES = avp_radius auth_radius group_radius uri_radius
+RADIUS_MODULES = auth_radius misc_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_xml presence_mwi presence_dialoginfo pua pua_bla pua_mi pua_usrloc pua_xmpp pua_dialoginfo xcap_client rls
 # XMLRPC module
 XMLRPC_MODULES = mi_xmlrpc
 # Perl module
@@ -69,10 +70,16 @@
 BERKELEY_MODULES = db_berkeley
 # LDAP modules
 LDAP_MODULES = ldap h350
+# utils module
+UTILS_MODULES = utils
+# modules depending on libpcre
+REGEX_MODULES = dialplan regex lcr
+# purple module
+PURPLE_MODULES = purple
 # 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)
+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) $(UTILS_MODULES) $(REGEX_MODULES) $(PURPLE_MODULES) $(OSP_MODULES)
 
 # modules not in the "main" package or unstable modules
 EXCLUDED_MODULES = $(ALL_MODULES) pa
@@ -92,6 +99,9 @@
 CROUTE_MOD_PATH=$(addprefix modules/, $(CROUTE_MODULES))
 BERKELEY_MOD_PATH=$(addprefix modules/, $(BERKELEY_MODULES))
 LDAP_MOD_PATH=$(addprefix modules/, $(LDAP_MODULES))
+UTILS_MOD_PATH=$(addprefix modules/, $(UTILS_MODULES))
+REGEX_MOD_PATH=$(addprefix modules/, $(REGEX_MODULES))
+PURPLE_MOD_PATH=$(addprefix modules/, $(PURPLE_MODULES))
 OSP_MOD_PATH=$(addprefix modules/, $(OSP_MODULES))
 
 ifeq (cc, $(CC))
@@ -138,6 +148,9 @@
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(CROUTE_MOD_PATH)" cfg-target=/etc/kamailio/
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(BERKELEY_MOD_PATH)" cfg-target=/etc/kamailio/
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(LDAP_MOD_PATH)" cfg-target=/etc/kamailio/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(UTILS_MOD_PATH)" cfg-target=/etc/kamailio/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(REGEX_MOD_PATH)" cfg-target=/etc/kamailio/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(PURPLE_MOD_PATH)" cfg-target=/etc/kamailio/
 ifneq (,$(OSP))
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(OSP_MOD_PATH)" cfg-target=/etc/kamailio/
 endif
@@ -147,6 +160,9 @@
 
 	# generate the utils db_berkeley
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) utils include_modules="db_berkeley"
+
+	# generate the man pages for modules
+	$(MAKE) modules-docbook-man include_modules="$(ALL_MODULES)"
 
 	touch build-stamp
 
@@ -159,8 +175,8 @@
 	# Add here commands to clean up after the build process.
 	$(MAKE) TLS=$(TLS) include_modules="$(ALL_MODULES)" proper
 	rm -f cfg.tab.h
-	rm -f utils/openserunix/openserunix.o utils/openserunix/openserunix
-	rm -f utils/db_berkeley/bdb_recover.o utils/db_berkeley/bdb_recover
+	rm -f utils/kamunix/kamunix.o utils/kamunix/kamunix
+	rm -f utils/db_berkeley/kambdb_recover.o utils/db_berkeley/kambdb_recover
 
 	dh_clean
 
@@ -180,7 +196,7 @@
 		doc-dir=share/doc/kamailio
 
 	find $(CURDIR)/debian/kamailio/etc/kamailio -type f -exec chmod -x {} \;
-	sed -i -e "s/^PATH.*//" $(CURDIR)/debian/kamailio/usr/sbin/openserctl
+	sed -i -e "s/^PATH.*//" $(CURDIR)/debian/kamailio/usr/sbin/kamctl
 
 	# install only the mysql module
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(MYSQL_MOD_PATH)"  \
@@ -230,9 +246,6 @@
 		cfg-target=/etc/kamailio/ \
 		doc-dir=share/doc/kamailio-radius-modules
 
-	mkdir -p $(CURDIR)/debian/kamailio-radius-modules/etc/kamailio/
-	mv $(CURDIR)/debian/kamailio/etc/kamailio/dictionary.radius $(CURDIR)/debian/kamailio-radius-modules/etc/kamailio/
-
 	# install only the presence modules
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(PRESENCE_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/kamailio-presence-modules \
@@ -296,6 +309,30 @@
 		cfg-prefix=$(CURDIR)/debian/kamailio-ldap-modules \
 		cfg-target=/etc/kamailio/ \
 		doc-dir=share/doc/kamailio-ldap-modules
+
+	# install only the utils modules
+	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(UTILS_MOD_PATH)"  \
+		basedir=$(CURDIR)/debian/kamailio-utils-module \
+		prefix=/usr \
+		cfg-prefix=$(CURDIR)/debian/kamailio-utils-module \
+		cfg-target=/etc/kamailio/ \
+		doc-dir=share/doc/kamailio-utils-module
+
+	# install only the regex modules
+	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(REGEX_MOD_PATH)"  \
+		basedir=$(CURDIR)/debian/kamailio-regex-modules \
+		prefix=/usr \
+		cfg-prefix=$(CURDIR)/debian/kamailio-regex-modules \
+		cfg-target=/etc/kamailio/ \
+		doc-dir=share/doc/kamailio-regex-modules
+
+	# install only the purple modules
+	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(PURPLE_MOD_PATH)"  \
+		basedir=$(CURDIR)/debian/kamailio-purple-module \
+		prefix=/usr \
+		cfg-prefix=$(CURDIR)/debian/kamailio-purple-module \
+		cfg-target=/etc/kamailio/ \
+		doc-dir=share/doc/kamailio-purple-module
 
 ifneq (,$(OSP))
 	# install only the OSP module

More information about the Pkg-voip-commits mailing list