Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	package/nspr/Makefile

2 files changed, 22 insertions, 17 deletions

diff --git a/package/opensips/Makefile b/package/opensips/Makefile
index dd48a61de..77e9ed905 100644
--- a/package/opensips/Makefile
+++ b/package/opensips/Makefile
@@ -4,14 +4,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		opensips
-PKG_VERSION:=		1.5.1
+PKG_VERSION:=		1.6.1
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		openssl
-PKG_MD5SUM:=		87c6fe40c143775d6a1be1beb75c3eb2
+PKG_MD5SUM:=		e7e59910183ca8a213c76a7a80789ea1
 PKG_DESCR:=		a high-performance, configurable, free SIP server
 PKG_SECTION:=		net
 PKG_MULTI:=		1
 PKG_VARIANT:=		tls
+PKG_DEPENDS:=		libopenssl
+PKG_BUILDDEP+=		openssl
 PKG_URL:=		http://opensips.org
 PKG_SITES:=		http://opensips.org/pub/opensips/$(PKG_VERSION)/src/
 
@@ -52,7 +53,6 @@ $(eval $(call PKG_template,OPENSIPS_MOD_SMS,opensips-mod-sms,$(PKG_VERSION)-${PK
 $(eval $(call PKG_template,OPENSIPS_MOD_UAC,opensips-mod-uac,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,OPENSIPS_MOD_UAC_REDIRECT,opensips-mod-uac-redirect,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,OPENSIPS_MOD_URI,opensips-mod-uri,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,OPENSIPS_MOD_URI_DB,opensips-mod-uri-db,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,OPENSIPS_MOD_XLOG,opensips-mod-xlog,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 $(eval $(call PKG_mod_template,OPENSIPS_MOD_ACCOUNTING,acc))
@@ -76,15 +76,18 @@ $(eval $(call PKG_mod_template,OPENSIPS_MOD_SPEEDIAL,speeddial))
 $(eval $(call PKG_mod_template,OPENSIPS_MOD_UAC,uac))
 $(eval $(call PKG_mod_template,OPENSIPS_MOD_UAC_REDIRECT,uac_redirect))
 $(eval $(call PKG_mod_template,OPENSIPS_MOD_URI,uri))
-$(eval $(call PKG_mod_template,OPENSIPS_MOD_URI_DB,uri_db))
 $(eval $(call PKG_mod_template,OPENSIPS_MOD_XLOG,xlog))
 
-# Select here the modules for the ipk package
-OPENSIPS_MODULES:=	sl tm rr maxfwd usrloc registrar db_text textops exec mi_fifo
+# Select here the modules for the main package
+OPENSIPS_MODULES:=	sl tm rr maxfwd usrloc registrar db_text textops exec mi_fifo signaling
 
 OPENSIPS_MODULE_FILES:=	$(foreach module,$(OPENSIPS_MODULES),modules/$(module)/$(module).so)
 OPENSIPS_MODULES:=	$(patsubst %,modules/%,$(OPENSIPS_MODULES))
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 do-build:
 	$(MAKE) -C $(WRKBUILD) \
 		prefix=/ \
@@ -105,7 +108,8 @@ do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 	${INSTALL_DIR} $(IDIR_OPENSIPS)/usr/lib/opensips/modules
 	$(CP) $(WRKBUILD)/$(PKG_NAME) $(IDIR_OPENSIPS)/usr/sbin/
 	(cd $(WRKBUILD);\
-		$(CP) $(OPENSIPS_MODULE_FILES) $(IDIR_OPENSIPS)/usr/lib/opensips/modules/; \
+		$(CP) $(OPENSIPS_MODULE_FILES) \
+		$(IDIR_OPENSIPS)/usr/lib/opensips/modules/; \
 	)
 	$(CP) ./files/opensips.cfg $(IDIR_OPENSIPS)/etc/opensips/
 
diff --git a/package/opensips/files/opensips.cfg b/package/opensips/files/opensips.cfg
index e94262ebe..cc1b91bd2 100644
--- a/package/opensips/files/opensips.cfg
+++ b/package/opensips/files/opensips.cfg
@@ -1,7 +1,7 @@
 #
 #
 # simple quick-start config script
-# Please refer to the Core CookBook at http://www.openser.org/dokuwiki/doku.php
+# Please refer to the Core CookBook at http://www.opensips.org/dokuwiki/doku.php
 # for a explanation of possible statements, functions and parameters.
 #
 
@@ -20,24 +20,25 @@ children=4
 port=5060
 
 # uncomment the following lines for TLS support
-#disable_tls = 0
+disable_tls = 1
 #listen = tls:your_IP:5061
 #tls_verify_server = 1
 #tls_verify_client = 1
 #tls_require_client_certificate = 0
 #tls_method = TLSv1
-#tls_certificate = "/usr/local/etc/openser/tls/user/user-cert.pem"
-#tls_private_key = "/usr/local/etc/openser/tls/user/user-privkey.pem"
-#tls_ca_list = "/usr/local/etc/openser/tls/user/user-calist.pem"
+#tls_certificate = "/usr/local/etc/opensips/tls/user/user-cert.pem"
+#tls_private_key = "/usr/local/etc/opensips/tls/user/user-privkey.pem"
+#tls_ca_list = "/usr/local/etc/opensips/tls/user/user-calist.pem"
 
 # ------------------ module loading ----------------------------------
 
 #set module path
-mpath="/usr/lib/openser/modules/"
+mpath="/usr/lib/opensips/modules/"
 
 # Uncomment this if you want to use SQL database
 #loadmodule "mysql.so"
 
+loadmodule "signaling.so"
 loadmodule "sl.so"
 loadmodule "tm.so"
 loadmodule "rr.so"
@@ -56,7 +57,7 @@ loadmodule "mi_fifo.so"
 
 # -- mi_fifo params --
 
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
+modparam("mi_fifo", "fifo_name", "/tmp/opensips_fifo")
 
 # -- usrloc params --
 
@@ -135,8 +136,8 @@ route{
 		if (method=="REGISTER") {
 
 			# Uncomment this if you want to use digest authentication
-			#if (!www_authorize("openser.org", "subscriber")) {
-			#	www_challenge("openser.org", "0");
+			#if (!www_authorize("opensips.org", "subscriber")) {
+			#	www_challenge("opensips.org", "0");
 			#	exit;
 			#};