[Pkg-voip-commits] r1724 - in asterisk/trunk/debian: . patches

[Tzafrir Cohen]

Author: tzafrir-guest
Date: 2006-05-07 11:10:44 +0000 (Sun, 07 May 2006)
New Revision: 1724

Added:
   asterisk/trunk/debian/patches/correct_pid_display.dpatch
Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/patches/00list
Log:
Re-apply correct_pid_display.dpatch, as its problem was not fixed

Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2006-05-07 10:59:16 UTC (rev 1723)
+++ asterisk/trunk/debian/changelog	2006-05-07 11:10:44 UTC (rev 1724)
@@ -12,6 +12,7 @@
 
   [ Tzafrir Cohen ]
   * reunite init.d and logrotate scripts in the package asterisk
+  * Re-add correct_pid_display.dpatch
 
  -- Mark Purcell <msp at debian.org>  Sat,  6 May 2006 11:24:21 +0100
 

Modified: asterisk/trunk/debian/patches/00list
===================================================================
--- asterisk/trunk/debian/patches/00list	2006-05-07 10:59:16 UTC (rev 1723)
+++ asterisk/trunk/debian/patches/00list	2006-05-07 11:10:44 UTC (rev 1724)
@@ -10,6 +10,7 @@
 nomarch
 nooptimize
 chanzap_disable_r2.dpatch
+correct_pid_display
 arm
 zap_restart
 backport_playdtmf

Added: asterisk/trunk/debian/patches/correct_pid_display.dpatch
===================================================================
--- asterisk/trunk/debian/patches/correct_pid_display.dpatch	2006-05-07 10:59:16 UTC (rev 1723)
+++ asterisk/trunk/debian/patches/correct_pid_display.dpatch	2006-05-07 11:10:44 UTC (rev 1724)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## correct_ps_display.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Display the correct pid in the asterisk console. Closes: 338646
+## DP: Upstream bug: http://bugs.digium.com/view.php?id=7098
+ at DPATCH@
+diff -Naur asterisk-1.2.1.dfsg.1/asterisk.c asterisk-1.2.1.dfsg.1.patched/asterisk.c
+--- asterisk-1.2.1.dfsg.1/asterisk.c	2005-11-16 13:36:55.308985128 -0600
++++ asterisk-1.2.1.dfsg.1.patched/asterisk.c	2005-11-16 13:37:10.426686888 -0600
+@@ -2170,11 +2170,12 @@
+ 
+ 	if (!option_verbose && !option_debug && !option_nofork && !option_console) {
+ 		daemon(0,0);
++		ast_mainpid = getpid();
+ 		/* Blindly re-write pid file since we are forking */
+ 		unlink((char *)ast_config_AST_PID);
+ 		f = fopen((char *)ast_config_AST_PID, "w");
+ 		if (f) {
+-			fprintf(f, "%d\n", (int)getpid());
++			fprintf(f, "%d\n", ast_mainpid);
+ 			fclose(f);
+ 		} else
+ 			ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", (char *)ast_config_AST_PID, strerror(errno));