Bug#305624: Patch and NMU

Paul Cupis "Paul Cupis" <paul@cupis.co.uk>, 305624@bugs.debian.org
Sun, 08 May 2005 11:34:58 +0100


This is a multi-part MIME message sent by reportbug.

--===============1668130696==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: asterisk-app-dtmftotext
Followup-For: Bug #305624

I will be NMU-ing this package with the attached patch, modelled on
http://lists.digium.com/pipermail/asterisk-cvs/2004-April/001736.html


-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (910, 'unstable'), (900, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.11-1-k7
Locale: LANG=en_GB, LC_CTYPE=en_GB (charmap=ISO-8859-1)

--===============1668130696==
Content-Type: text/x-c; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="305624.patch"

diff -Naur asterisk-spandsp-plugins-0.0.20050203.orig/app_dtmftotext.c asterisk-spandsp-plugins-0.0.20050203/app_dtmftotext.c
--- asterisk-spandsp-plugins-0.0.20050203.orig/app_dtmftotext.c	2004-03-16 17:18:13.000000000 +0000
+++ asterisk-spandsp-plugins-0.0.20050203/app_dtmftotext.c	2005-05-08 11:12:54.000000000 +0100
@@ -20,6 +20,7 @@
 #include <asterisk/pbx.h>
 #include <asterisk/md5.h>
 #include <asterisk/config.h>
+#include <asterisk/utils.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -306,6 +307,7 @@
 	struct localuser *u;
  	struct sockaddr_in serv_addr;
 	struct hostent *serverhost;
+	struct ast_hostent astserverhost;
 	int fd;
 	FILE *fs;
 	char *host;
@@ -392,7 +394,7 @@
     if ((serv_addr.sin_addr.s_addr = inet_addr(host)) == -1)
     {
         /* its a name rather than an ipnum */
-        serverhost = gethostbyname(host);
+        serverhost = ast_gethostbyname(host, &astserverhost);
         if (serverhost == (struct hostent *) 0)
         {
             ast_log(LOG_WARNING, "festival_client: gethostbyname failed\n");
diff -Naur asterisk-spandsp-plugins-0.0.20050203.orig/debian/changelog asterisk-spandsp-plugins-0.0.20050203/debian/changelog
--- asterisk-spandsp-plugins-0.0.20050203.orig/debian/changelog	2005-05-08 11:28:12.000000000 +0100
+++ asterisk-spandsp-plugins-0.0.20050203/debian/changelog	2005-05-08 11:14:04.000000000 +0100
@@ -1,3 +1,10 @@
+asterisk-spandsp-plugins (0.0.20050203-2.1) unstable; urgency=low
+
+  * Replace gethostbyname in app_dtmftotext.c with ast_gethostbyname
+    as the former is not re-entrant. (closes: #305624)
+
+ -- Paul Cupis <paul@cupis.co.uk>  Sun,  8 May 2005 11:12:58 +0100
+
 asterisk-spandsp-plugins (0.0.20050203-2) unstable; urgency=low
 
   * debian/control: fixed overrides.

--===============1668130696==--