pkg/kamailio/deb: new kamailio-extra-modules package.

Adding gzcompress, uuid and ev modules to extra.

pkg/kamailio/deb/debian/control

@@ -12,8 +12,10 @@ Build-Depends: bison,
                libconfuse-dev,
                libcurl4-openssl-dev,
                libdb-dev (>= 4.6.19),
+               libev-dev,
                libevent-dev,
                libexpat1-dev,
+               libfreeradius-client-dev,
                libgcj12-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
@@ -28,7 +30,6 @@ Build-Depends: bison,
                libperl-dev,
                libpq-dev,
                libpurple-dev,
-               libfreeradius-client-dev,
                libreadline-dev,
                libsasl2-dev,
                libsctp-dev,
@@ -42,6 +43,7 @@ Build-Depends: bison,
                python,
                python-dev,
                unixodbc-dev,
+               uuid-dev,
                xsltproc
 Standards-Version: 3.9.5
 Homepage: http://www.kamailio.org/
@@ -532,6 +534,18 @@ Description: authentication using ephemeral credentials module for Kamailio
  .
  This package provides the ephemeral module for Kamailio.
 
+Package: kamailio-extra-modules
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: extra modules 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: gzcompress uuid ev
+
 Package: kamailio-nth
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}

pkg/kamailio/deb/debian/rules

@@ -42,6 +42,9 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
 			   sqlite json mono ims sctp java \
 			   purple tls outbound websocket autheph dnssec
 
+# module groups to be packaged onto kamailio-extra-modules
+EXTRA_GROUPS=gzcompress uuid ev
+
 # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)
 LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
 
@@ -56,7 +59,7 @@ mod_name=$(subst db_,,$(lastword $(subst /, ,$(1))))
 
 define PACKAGE_GRP_BUILD_template
 	# package all the modules in PACKAGE_GROUPS in separate packages
-	$(foreach grp,$(PACKAGE_GROUPS),\
+	$(foreach grp,$(PACKAGE_GROUPS EXTRA_GROUPS),\
 		$(MAKE) every-module group_include="k$(grp)"
 	)
 endef
@@ -80,6 +83,23 @@ define PACKAGE_GRP_INSTALL_template
 	)
 endef
 
+define PACKAGE_EXTRA_INSTALL_template
+	$(foreach grp,$(EXTRA_GROUPS),\
+		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
+		basedir=$(CURDIR)/debian/kamailio-extra-modules \
+		cfg_prefix=$(CURDIR)/debian/kamailio-extra-modules \
+		doc-dir=share/doc/kamailio-extra-modules
+	)
+	# eliminate duplicate libs
+	-for d in $(DUP_LIBS_DIRS); do \
+		test "$$d" != "$(CURDIR)/debian/kamailio-extra-modules/usr/$(LIBDIR)/kamailio" &&\
+		for r in `find $$d -name 'lib*'|xargs`; do \
+			echo "removing extra lib `basename $$r` present also in $$d";\
+			rm -f $(CURDIR)/debian/kamailio-extra-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \
+		done ; \
+	done
+	find $(CURDIR)/debian/kamailio-extra-modules -depth -empty -type d -exec rmdir {} \;
+endef
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -116,8 +136,6 @@ build-stamp: configure-stamp
 	$(MAKE) all
 	# make groups
 	$(call PACKAGE_GRP_BUILD_template)
-	# make single-module packages
-	$(call PACKAGE_MODULE_BUILD_template)
 	touch build-stamp
 
 clean:
@@ -137,6 +155,7 @@ install: build
 	$(MAKE) install LIBDIR=$(LIBDIR) group_include="kstandard"
 	# make group packages
 	$(call PACKAGE_GRP_INSTALL_template)
+	$(call PACKAGE_EXTRA_INSTALL_template)
 	mv $(CURDIR)/debian/kamailio-berkeley-modules/usr/sbin/kambdb_recover \
 		$(CURDIR)/debian/kamailio-berkeley-bin/usr/sbin/kambdb_recover
 	# install /etc/default/kamailio file

pkg/kamailio/deb/jessie/control

@@ -12,8 +12,10 @@ Build-Depends: bison,
                libconfuse-dev,
                libcurl4-openssl-dev,
                libdb-dev (>= 4.6.19),
+               libev-dev,
                libevent-dev,
                libexpat1-dev,
+               libfreeradius-client-dev,
                libgcj12-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
@@ -28,7 +30,6 @@ Build-Depends: bison,
                libperl-dev,
                libpq-dev,
                libpurple-dev,
-               libfreeradius-client-dev,
                libreadline-dev,
                libsasl2-dev,
                libsctp-dev,
@@ -41,6 +42,7 @@ Build-Depends: bison,
                python,
                python-dev,
                unixodbc-dev,
+               uuid-dev,
                xsltproc
 Standards-Version: 3.9.5
 Homepage: http://www.kamailio.org/
@@ -531,6 +533,18 @@ Description: authentication using ephemeral credentials module for Kamailio
  .
  This package provides the ephemeral module for Kamailio.
 
+Package: kamailio-extra-modules
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: extra modules 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: gzcompress uuid ev
+
 Package: kamailio-nth
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}

pkg/kamailio/deb/jessie/rules

@@ -42,6 +42,9 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
 			   sqlite json mono ims sctp java \
 			   purple tls outbound websocket autheph dnssec
 
+# module groups to be packaged onto kamailio-extra-modules
+EXTRA_GROUPS=gzcompress uuid ev
+
 # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)
 LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
 
@@ -56,7 +59,7 @@ mod_name=$(subst db_,,$(lastword $(subst /, ,$(1))))
 
 define PACKAGE_GRP_BUILD_template
 	# package all the modules in PACKAGE_GROUPS in separate packages
-	$(foreach grp,$(PACKAGE_GROUPS),\
+	$(foreach grp,$(PACKAGE_GROUPS EXTRA_GROUPS),\
 		$(MAKE) every-module group_include="k$(grp)"
 	)
 endef
@@ -80,6 +83,23 @@ define PACKAGE_GRP_INSTALL_template
 	)
 endef
 
+define PACKAGE_EXTRA_INSTALL_template
+	$(foreach grp,$(EXTRA_GROUPS),\
+		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
+		basedir=$(CURDIR)/debian/kamailio-extra-modules \
+		cfg_prefix=$(CURDIR)/debian/kamailio-extra-modules \
+		doc-dir=share/doc/kamailio-extra-modules
+	)
+	# eliminate duplicate libs
+	-for d in $(DUP_LIBS_DIRS); do \
+		test "$$d" != "$(CURDIR)/debian/kamailio-extra-modules/usr/$(LIBDIR)/kamailio" &&\
+		for r in `find $$d -name 'lib*'|xargs`; do \
+			echo "removing extra lib `basename $$r` present also in $$d";\
+			rm -f $(CURDIR)/debian/kamailio-extra-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \
+		done ; \
+	done
+	find $(CURDIR)/debian/kamailio-extra-modules -depth -empty -type d -exec rmdir {} \;
+endef
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -116,8 +136,6 @@ build-stamp: configure-stamp
 	$(MAKE) all
 	# make groups
 	$(call PACKAGE_GRP_BUILD_template)
-	# make single-module packages
-	$(call PACKAGE_MODULE_BUILD_template)
 	touch build-stamp
 
 clean:
@@ -137,6 +155,7 @@ install: build
 	$(MAKE) install LIBDIR=$(LIBDIR) group_include="kstandard"
 	# make group packages
 	$(call PACKAGE_GRP_INSTALL_template)
+	$(call PACKAGE_EXTRA_INSTALL_template)
 	mv $(CURDIR)/debian/kamailio-berkeley-modules/usr/sbin/kambdb_recover \
 		$(CURDIR)/debian/kamailio-berkeley-bin/usr/sbin/kambdb_recover
 	# install /etc/default/kamailio file

pkg/kamailio/deb/precise/control

@@ -12,8 +12,10 @@ Build-Depends: bison,
                libconfuse-dev,
                libcurl4-openssl-dev,
                libdb-dev (>= 4.6.19),
+               libev-dev,
                libevent-dev,
                libexpat1-dev,
+               libradiusclient-ng-dev,
                libgcj12-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
@@ -28,7 +30,6 @@ Build-Depends: bison,
                libperl-dev,
                libpq-dev,
                libpurple-dev,
-               libradiusclient-ng-dev,
                libreadline-dev,
                libsasl2-dev,
                libsctp-dev,
@@ -40,6 +41,7 @@ Build-Depends: bison,
                python,
                python-dev,
                unixodbc-dev,
+               uuid-dev,
                xsltproc
 Standards-Version: 3.9.5
 Homepage: http://www.kamailio.org/
@@ -518,6 +520,18 @@ Description: authentication using ephemeral credentials module for Kamailio
  .
  This package provides the ephemeral module for Kamailio.
 
+Package: kamailio-extra-modules
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: extra modules 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: gzcompress uuid ev
+
 Package: kamailio-nth
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}

pkg/kamailio/deb/precise/rules

@@ -41,6 +41,9 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
 			   sqlite json mono ims sctp java \
 			   purple tls outbound websocket autheph 
 
+# module groups to be packaged onto kamailio-extra-modules
+EXTRA_GROUPS=gzcompress uuid ev
+
 # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)
 LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
 
@@ -55,7 +58,7 @@ mod_name=$(subst db_,,$(lastword $(subst /, ,$(1))))
 
 define PACKAGE_GRP_BUILD_template
 	# package all the modules in PACKAGE_GROUPS in separate packages
-	$(foreach grp,$(PACKAGE_GROUPS),\
+	$(foreach grp,$(PACKAGE_GROUPS EXTRA_GROUPS),\
 		$(MAKE) every-module group_include="k$(grp)"
 	)
 endef
@@ -79,6 +82,23 @@ define PACKAGE_GRP_INSTALL_template
 	)
 endef
 
+define PACKAGE_EXTRA_INSTALL_template
+	$(foreach grp,$(EXTRA_GROUPS),\
+		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
+		basedir=$(CURDIR)/debian/kamailio-extra-modules \
+		cfg_prefix=$(CURDIR)/debian/kamailio-extra-modules \
+		doc-dir=share/doc/kamailio-extra-modules
+	)
+	# eliminate duplicate libs
+	-for d in $(DUP_LIBS_DIRS); do \
+		test "$$d" != "$(CURDIR)/debian/kamailio-extra-modules/usr/$(LIBDIR)/kamailio" &&\
+		for r in `find $$d -name 'lib*'|xargs`; do \
+			echo "removing extra lib `basename $$r` present also in $$d";\
+			rm -f $(CURDIR)/debian/kamailio-extra-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \
+		done ; \
+	done
+	find $(CURDIR)/debian/kamailio-extra-modules -depth -empty -type d -exec rmdir {} \;
+endef
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -115,8 +135,6 @@ build-stamp: configure-stamp
 	$(MAKE) all
 	# make groups
 	$(call PACKAGE_GRP_BUILD_template)
-	# make single-module packages
-	$(call PACKAGE_MODULE_BUILD_template)
 	touch build-stamp
 
 clean:
@@ -136,6 +154,7 @@ install: build
 	$(MAKE) install LIBDIR=$(LIBDIR) group_include="kstandard"
 	# make group packages
 	$(call PACKAGE_GRP_INSTALL_template)
+	$(call PACKAGE_EXTRA_INSTALL_template)
 	mv $(CURDIR)/debian/kamailio-berkeley-modules/usr/sbin/kambdb_recover \
 		$(CURDIR)/debian/kamailio-berkeley-bin/usr/sbin/kambdb_recover
 	# install /etc/default/kamailio file

pkg/kamailio/deb/squeeze/control

@@ -11,8 +11,10 @@ Build-Depends: bison,
                libconfuse-dev,
                libcurl4-openssl-dev,
                libdb-dev (>= 4.6.19),
+               libev-dev,
                libevent-dev,
                libexpat1-dev,
+               libradiusclient-ng-dev,
                libgeoip-dev (>= 1.4.5),
                libjson0-dev,
                libldap2-dev,
@@ -23,7 +25,6 @@ Build-Depends: bison,
                libpcre3-dev,
                libperl-dev,
                libpq-dev,
-               libradiusclient-ng-dev,
                libreadline-dev,
                libsasl2-dev,
                libsnmp-dev,
@@ -35,6 +36,7 @@ Build-Depends: bison,
                python,
                python-dev,
                unixodbc-dev,
+               uuid-dev,
                xsltproc
 Standards-Version: 3.9.5
 Homepage: http://www.kamailio.org/
@@ -419,6 +421,17 @@ Description: authentication using ephemeral credentials module for Kamailio
  .
  This package provides the ephemeral module for Kamailio.
 
+Package: kamailio-extra-modules
+Architecture: linux-any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: extra modules 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: gzcompress uuid ev
+
 Package: kamailio-nth
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}

pkg/kamailio/deb/squeeze/rules

@@ -40,6 +40,9 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
 			   sqlite json ims \
 			   tls outbound websocket autheph 
 
+# module groups to be packaged onto kamailio-extra-modules
+EXTRA_GROUPS=gzcompress uuid ev
+
 # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)
 LIBDIR ?= lib
 
@@ -54,7 +57,7 @@ mod_name=$(subst db_,,$(lastword $(subst /, ,$(1))))
 
 define PACKAGE_GRP_BUILD_template
 	# package all the modules in PACKAGE_GROUPS in separate packages
-	$(foreach grp,$(PACKAGE_GROUPS),\
+	$(foreach grp,$(PACKAGE_GROUPS EXTRA_GROUPS),\
 		$(MAKE) every-module group_include="k$(grp)"
 	)
 endef
@@ -78,6 +81,23 @@ define PACKAGE_GRP_INSTALL_template
 	)
 endef
 
+define PACKAGE_EXTRA_INSTALL_template
+	$(foreach grp,$(EXTRA_GROUPS),\
+		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
+		basedir=$(CURDIR)/debian/kamailio-extra-modules \
+		cfg_prefix=$(CURDIR)/debian/kamailio-extra-modules \
+		doc-dir=share/doc/kamailio-extra-modules
+	)
+	# eliminate duplicate libs
+	-for d in $(DUP_LIBS_DIRS); do \
+		test "$$d" != "$(CURDIR)/debian/kamailio-extra-modules/usr/$(LIBDIR)/kamailio" &&\
+		for r in `find $$d -name 'lib*'|xargs`; do \
+			echo "removing extra lib `basename $$r` present also in $$d";\
+			rm -f $(CURDIR)/debian/kamailio-extra-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \
+		done ; \
+	done
+	find $(CURDIR)/debian/kamailio-extra-modules -depth -empty -type d -exec rmdir {} \;
+endef
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -113,8 +133,6 @@ build-stamp: configure-stamp
 	$(MAKE) all
 	# make groups
 	$(call PACKAGE_GRP_BUILD_template)
-	# make single-module packages
-	$(call PACKAGE_MODULE_BUILD_template)
 	touch build-stamp
 
 clean:
@@ -134,6 +152,7 @@ install: build
 	$(MAKE) install LIBDIR=$(LIBDIR) group_include="kstandard"
 	# make group packages
 	$(call PACKAGE_GRP_INSTALL_template)
+	$(call PACKAGE_EXTRA_INSTALL_template)
 	mv $(CURDIR)/debian/kamailio-berkeley-modules/usr/sbin/kambdb_recover \
 		$(CURDIR)/debian/kamailio-berkeley-bin/usr/sbin/kambdb_recover
 	# install /etc/default/kamailio file

pkg/kamailio/deb/wheezy/control

@@ -12,8 +12,10 @@ Build-Depends: bison,
                libconfuse-dev,
                libcurl4-openssl-dev,
                libdb-dev (>= 4.6.19),
+               libev-dev,
                libevent-dev,
                libexpat1-dev,
+               libradiusclient-ng-dev,
                libgcj12-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
@@ -27,7 +29,6 @@ Build-Depends: bison,
                libpcre3-dev,
                libperl-dev,
                libpq-dev,
-               libradiusclient-ng-dev,
                libreadline-dev,
                libsasl2-dev,
                libsctp-dev,
@@ -39,6 +40,7 @@ Build-Depends: bison,
                python,
                python-dev,
                unixodbc-dev,
+               uuid-dev,
                xsltproc
 Standards-Version: 3.9.5
 Homepage: http://www.kamailio.org/
@@ -504,6 +506,18 @@ Description: authentication using ephemeral credentials module for Kamailio
  .
  This package provides the ephemeral module for Kamailio.
 
+Package: kamailio-extra-modules
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: extra modules 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: gzcompress uuid ev
+
 Package: kamailio-nth
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}

pkg/kamailio/deb/wheezy/rules

@@ -41,6 +41,9 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
 			   sqlite json mono ims sctp java \
 			   tls outbound websocket autheph 
 
+# module groups to be packaged onto kamailio-extra-modules
+EXTRA_GROUPS=gzcompress uuid ev
+
 # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)
 LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
 
@@ -55,7 +58,7 @@ mod_name=$(subst db_,,$(lastword $(subst /, ,$(1))))
 
 define PACKAGE_GRP_BUILD_template
 	# package all the modules in PACKAGE_GROUPS in separate packages
-	$(foreach grp,$(PACKAGE_GROUPS),\
+	$(foreach grp,$(PACKAGE_GROUPS EXTRA_GROUPS),\
 		$(MAKE) every-module group_include="k$(grp)"
 	)
 endef
@@ -79,6 +82,23 @@ define PACKAGE_GRP_INSTALL_template
 	)
 endef
 
+define PACKAGE_EXTRA_INSTALL_template
+	$(foreach grp,$(EXTRA_GROUPS),\
+		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
+		basedir=$(CURDIR)/debian/kamailio-extra-modules \
+		cfg_prefix=$(CURDIR)/debian/kamailio-extra-modules \
+		doc-dir=share/doc/kamailio-extra-modules
+	)
+	# eliminate duplicate libs
+	-for d in $(DUP_LIBS_DIRS); do \
+		test "$$d" != "$(CURDIR)/debian/kamailio-extra-modules/usr/$(LIBDIR)/kamailio" &&\
+		for r in `find $$d -name 'lib*'|xargs`; do \
+			echo "removing extra lib `basename $$r` present also in $$d";\
+			rm -f $(CURDIR)/debian/kamailio-extra-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \
+		done ; \
+	done
+	find $(CURDIR)/debian/kamailio-extra-modules -depth -empty -type d -exec rmdir {} \;
+endef
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -115,8 +135,6 @@ build-stamp: configure-stamp
 	$(MAKE) all
 	# make groups
 	$(call PACKAGE_GRP_BUILD_template)
-	# make single-module packages
-	$(call PACKAGE_MODULE_BUILD_template)
 	touch build-stamp
 
 clean:
@@ -136,6 +154,7 @@ install: build
 	$(MAKE) install LIBDIR=$(LIBDIR) group_include="kstandard"
 	# make group packages
 	$(call PACKAGE_GRP_INSTALL_template)
+	$(call PACKAGE_EXTRA_INSTALL_template)
 	mv $(CURDIR)/debian/kamailio-berkeley-modules/usr/sbin/kambdb_recover \
 		$(CURDIR)/debian/kamailio-berkeley-bin/usr/sbin/kambdb_recover
 	# install /etc/default/kamailio file