merge from trunk

apps/app_voicemail.c

@@ -2526,15 +2526,15 @@ static void copy_file(char *sdir, int smsg, char *ddir, int dmsg, char *dmailbox
 	char msgnums[20];
 	char msgnumd[20];
 	struct odbc_obj *obj;
-	char *argv[] = { ddir, msgnumd, dmailboxuser, dmailboxcontext, sdir, msgnums };
-	struct generic_prepare_struct gps = { .sql = sql, .argc = 6, .argv = argv };
+	char *argv[] = { ddir, msgnumd, dmailboxcontext, sdir, msgnums };
+	struct generic_prepare_struct gps = { .sql = sql, .argc = 5, .argv = argv };
 
 	delete_file(ddir, dmsg);
 	obj = ast_odbc_request_obj(odbc_database, 0);
 	if (obj) {
 		snprintf(msgnums, sizeof(msgnums), "%d", smsg);
 		snprintf(msgnumd, sizeof(msgnumd), "%d", dmsg);
-		snprintf(sql, sizeof(sql), "INSERT INTO %s (dir, msgnum, context, macrocontext, callerid, origtime, duration, recording, mailboxuser, mailboxcontext) SELECT ?,?,context,macrocontext,callerid,origtime,duration,recording,?,? FROM %s WHERE dir=? AND msgnum=?",odbc_table,odbc_table);
+		snprintf(sql, sizeof(sql), "INSERT INTO %s (dir, msgnum, context, macrocontext, callerid, origtime, duration, recording, mailboxuser, mailboxcontext) SELECT ?,?,context,macrocontext,callerid,origtime,duration,recording,mailboxuser,? FROM %s WHERE dir=? AND msgnum=?",odbc_table,odbc_table);
 		stmt = ast_odbc_prepare_and_execute(obj, generic_prepare, &gps);
 		if (!stmt)
 			ast_log(LOG_WARNING, "SQL Execute error!\n[%s] (You probably don't have MySQL 4.1 or later installed)\n\n", sql);
@@ -4370,7 +4370,7 @@ static int save_to_folder(struct ast_vm_user *vmu, struct vm_state *vms, int msg
 	}
 #else
 	char *dir = vms->curdir;
-	char *username = vms->username;
+	char *username = vmu->mailbox;
 	char *context = vmu->context;
 	char sfn[PATH_MAX];
 	char dfn[PATH_MAX];

debian/asterisk.init

@@ -64,16 +64,17 @@ fi
 # Use the LSB standar functions for services management
 . /lib/lsb/init-functions
 
+
+status() {
+        status_of_proc  "$DAEMON" "$NAME" && return 0 || return $?
+}
+
 case "$1" in
   start)
-	# Check if Asterisk is already running.  If it is, then bug out, because
-	# starting up Asterisk when Asterisk is already running is very bad.
-	VERSION=`${DAEMON} -rx 'core show version' || ${TRUE}`
-	if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
-		echo "Asterisk is already running.  $0 will exit now."
-		exit 1
-	fi
-
+	if status > /dev/null; then
+                echo "$DESC is already running. Use restart."
+                exit 0
+        fi
 	log_begin_msg "Starting $DESC: $NAME"
         if [ $AST_USER ] ; then
                 ASTARGS="-U $AST_USER"
@@ -81,6 +82,7 @@ case "$1" in
         if [ $AST_GROUP ] ; then
                 ASTARGS="$ASTARGS -G $AST_GROUP"
         fi
+	ASTARGS="$ASTARGS -n"
 	# "start-stop-daemon --oknodo" returns 0 even if Asterisk was already running (as LSB expects):
 	start-stop-daemon --start --oknodo --exec $DAEMON -- $ASTARGS
 	log_end_msg $?
@@ -93,7 +95,7 @@ case "$1" in
 	;;
   reload)
 	echo "Reloading $DESC configuration files."
-	$DAEMON -rx 'reload' > /dev/null 2> /dev/null
+	$DAEMON -nrx 'reload' > /dev/null 2> /dev/null
 	;;
   restart|force-reload)
 	$0 stop
@@ -102,7 +104,8 @@ case "$1" in
 	# "restart|force-reload" starts Asterisk and returns 0 even if Asterisk was stopped (as LSB expects).
 	;;
   status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+        status
+        exit $?
        ;;
   *)
 	N=/etc/init.d/$NAME

debian/changelog

@@ -1,3 +1,19 @@
+ngcp-asterisk (1.4.24.1-rsp+svn4100.4) unstable; urgency=low
+
+  [ agranig ]
+  * voicemail: Fix bug in copying msg between folders within IVR.
+  * Use UUID as mailboxuser instead of the phone number.
+  *Supress console coloring when exec Ast-CLI commands.
+
+  [ Michael Prokop ]
+  * wrap and sort items in Debian packaging files
+  * Bump Standards-Version to 3.9.3
+
+  [ jbonilla ]
+  * Remove lsb uncompliant code
+
+ -- Andreas Granig <agranig@sipwise.com>  Thu, 23 Aug 2012 16:49:49 +0200
+
 ngcp-asterisk (1.4.24.1-rsp+svn4100.3) unstable; urgency=low
 
   [ jbonilla ]

debian/control

@@ -2,11 +2,20 @@ Source: ngcp-asterisk
 Section: comm
 Priority: extra
 Maintainer: Sipwise Development Team <support@sipwise.com>
-Build-Depends: debhelper (>= 7), autotools-dev, libssl-dev, libncurses-dev, libltdl-dev, unixodbc-dev
-Standards-Version: 3.9.2
+Build-Depends: autotools-dev,
+               debhelper (>= 7),
+               libltdl-dev,
+               libncurses-dev,
+               libssl-dev,
+               unixodbc-dev
+Standards-Version: 3.9.3
 
 Package: ngcp-asterisk
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, unixodbc, ngcp-asterisk-sounds, libmyodbc
+Depends: libmyodbc,
+         ngcp-asterisk-sounds,
+         unixodbc,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Sipwise's custom asterisk for NGCP platforms.
  This package provides Asterisk 1.4.24.1 with Sipwise and asterisk-es-rsp.org patches.