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

[Kilian Krause]

Author: kilian
Date: 2006-01-02 11:05:50 +0000 (Mon, 02 Jan 2006)
New Revision: 1120

Added:
   asterisk/trunk/debian/patches/correct_pid_display.dpatch
Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/patches/00list
Log:
include patch to fix PID display on the console.


Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2006-01-02 00:35:46 UTC (rev 1119)
+++ asterisk/trunk/debian/changelog	2006-01-02 11:05:50 UTC (rev 1120)
@@ -1,3 +1,9 @@
+asterisk (1:1.2.1.dfsg-4) UNRELEASED; urgency=low
+
+  * Fix PID display (Closes: #338646)
+
+ -- Kilian Krause <kilian at debian.org>  Mon,  2 Jan 2006 11:04:54 +0000
+
 asterisk (1:1.2.1.dfsg-3) unstable; urgency=low
 
   * Remove -msoft-float from compile flags to fix compilation on arm.

Modified: asterisk/trunk/debian/patches/00list
===================================================================
--- asterisk/trunk/debian/patches/00list	2006-01-02 00:35:46 UTC (rev 1119)
+++ asterisk/trunk/debian/patches/00list	2006-01-02 11:05:50 UTC (rev 1120)
@@ -21,3 +21,4 @@
 nooptimize
 chanzap_disable_r2.dpatch
 arm
+correct_pid_display

Added: asterisk/trunk/debian/patches/correct_pid_display.dpatch
===================================================================
--- asterisk/trunk/debian/patches/correct_pid_display.dpatch	2006-01-02 00:35:46 UTC (rev 1119)
+++ asterisk/trunk/debian/patches/correct_pid_display.dpatch	2006-01-02 11:05:50 UTC (rev 1120)
@@ -0,0 +1,23 @@
+#! /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
+ 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", 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));