Merge branch 'master' of ssh://git.sip-router.org/sip-router

* 'master' of ssh://git.sip-router.org/sip-router:
  core: handle '\r' as end of included file name
  pkg/kamailio/(centos|fedora): turned on MEMDBG for development builds

cfg.lex

@@ -1341,7 +1341,7 @@ IMPORTFILE      "import_file"
 <SELECT>.               { unput(yytext[0]); state = INITIAL_S; BEGIN(INITIAL); } /* Rescan the token in INITIAL state */
 
 <INCLF>[ \t]*      /* eat the whitespace */
-<INCLF>[^ \t\n]+   { /* get the include file name */
+<INCLF>[^ \t\r\n]+   { /* get the include file name */
 				memset(&s_buf, 0, sizeof(s_buf));
 				addstr(&s_buf, yytext, yyleng);
 				r = pp_subst_run(&s_buf.s);
@@ -1355,7 +1355,7 @@ IMPORTFILE      "import_file"
 }
 
 <IMPTF>[ \t]*      /* eat the whitespace */
-<IMPTF>[^ \t\n]+   { /* get the import file name */
+<IMPTF>[^ \t\r\n]+   { /* get the import file name */
 				memset(&s_buf, 0, sizeof(s_buf));
 				addstr(&s_buf, yytext, yyleng);
 				r = pp_subst_run(&s_buf.s);

pkg/kamailio/fedora/16/kamailio.spec

@@ -1,6 +1,6 @@
 %define name    kamailio
 %define ver     3.4.0
-%define rel     dev5%{dist}
+%define rel     dev5.1%{dist}
 
 
 
@@ -358,7 +358,7 @@ Max Mind GeoIP real-time query support for Kamailio.
 %build
 make FLAVOUR=kamailio cfg prefix=/usr cfg_prefix=$RPM_BUILD_ROOT\
 	basedir=$RPM_BUILD_ROOT cfg_target=/%{_sysconfdir}/kamailio/\
-	modules_dirs="modules modules_k" SCTP=1 STUN=1
+	modules_dirs="modules modules_k" SCTP=1 STUN=1 MEMDBG=1
 make
 %if 0%{?fedora}
 make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\