[Pkg-voip-commits] r2355 - in openser/trunk/debian: . patches

[Julien Blache]

Author: jblache
Date: 2006-09-08 12:53:30 +0000 (Fri, 08 Sep 2006)
New Revision: 2355

Added:
   openser/trunk/debian/patches/02_openser.cfg.dpatch
Modified:
   openser/trunk/debian/changelog
   openser/trunk/debian/openser.README.Debian
   openser/trunk/debian/patches/00list
Log:
Remove C-style comment block from the default openser.cfg file, as it contains
a fork=no which triggers the init script check for fork=no.

Document the init script behaviour wrt fork=no.


Modified: openser/trunk/debian/changelog
===================================================================
--- openser/trunk/debian/changelog	2006-09-08 09:55:47 UTC (rev 2354)
+++ openser/trunk/debian/changelog	2006-09-08 12:53:30 UTC (rev 2355)
@@ -1,15 +1,19 @@
-openser (1.1.0-3) UNRELEASED; urgency=low
+openser (1.1.0-3) unstable; urgency=low
 
-  * NOT RELEASED YET
-
   * debian/rules:
     + Remove DH_COMPAT 4 compatibility code which was introduced only for
       Sarge backward-compatiblity in the upstream CVS; there's now a
       packaging directory dedicated to Sarge.
   * debian/control:
     + Build-Depends cleanup.
+  * debian/patches/02_openser.cfg.dpatch:
+    + Remove the C-style comment block containing fork=no, otherwise the
+      default config file will trigger the test for fork=no in the
+      initscript (closes: #386464).
+  * debian/openser.README.Debian:
+    + Document initscript behaviour wrt fork=no.
 
- -- Julien BLACHE <jblache at debian.org>  Sat, 12 Aug 2006 17:41:00 +0200
+ -- Julien BLACHE <jblache at debian.org>  Fri,  8 Sep 2006 14:47:28 +0200
 
 openser (1.1.0-2) unstable; urgency=low
 

Modified: openser/trunk/debian/openser.README.Debian
===================================================================
--- openser/trunk/debian/openser.README.Debian	2006-09-08 09:55:47 UTC (rev 2354)
+++ openser/trunk/debian/openser.README.Debian	2006-09-08 12:53:30 UTC (rev 2355)
@@ -1,6 +1,22 @@
 OpenSER for Debian
 ------------------
 
+* init script check for fork=no
+-------------------------------
+
+The OpenSER init script will not start OpenSER on boot if fork=no is
+specified in the config file. The check in the initscript will match
+any occurrence of fork=no in the file, even inside C-style comments.
+
+You can disable this check in the init script if you wish; just comment
+out the calls to the check_fork function in the script. Your changes to
+the init script will be preserved upon upgrade, as the file is tagged
+as a conffile.
+
+
+* OpenSER setup
+---------------
+
 To setup OpenSER, you need to:
  - configure OpenSER properly to suit your needs
  - edit /etc/default/openser, adjust the MEMORY parameter and set
@@ -9,7 +25,7 @@
 If you are building an HA cluster using heartbeat or similar, you'll want
 to disable the init script by running:
 
-  update-rc.d remove
+  update-rc.d openser remove
 
 so that OpenSER will not be launched at system startup. You still need
 to set RUN_OPENSER to "yes" if you want to use the /etc/init.d/openser init
@@ -19,4 +35,4 @@
 get a core dump in case OpenSER crashes. The debug symbols for OpenSER are
 provided by the openser-dbg package.
 
--- Julien BLACHE <jblache at debian.org>, Fri, 30 Jun 2006 21:28:43 +0200
+-- Julien BLACHE <jblache at debian.org>, Fri, 08 Sep 2006 14:43:21 +0200

Modified: openser/trunk/debian/patches/00list
===================================================================
--- openser/trunk/debian/patches/00list	2006-09-08 09:55:47 UTC (rev 2354)
+++ openser/trunk/debian/patches/00list	2006-09-08 12:53:30 UTC (rev 2355)
@@ -1,4 +1,5 @@
 01_sourced_scripts
+02_openser.cfg
 10_no_lib64_on_64_bits
 11_always_smp
 

Added: openser/trunk/debian/patches/02_openser.cfg.dpatch
===================================================================
--- openser/trunk/debian/patches/02_openser.cfg.dpatch	                        (rev 0)
+++ openser/trunk/debian/patches/02_openser.cfg.dpatch	2006-09-08 12:53:30 UTC (rev 2355)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_openser.cfg.dpatch by  <jblache at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove C-style commented fork-no, otherwise the default config
+## DP: file will trigger the test for fork=no in the initscript.
+
+ at DPATCH@
+diff -urNad openser-1.1.0~/etc/openser.cfg openser-1.1.0/etc/openser.cfg
+--- openser-1.1.0~/etc/openser.cfg	2006-02-15 19:23:46.000000000 +0100
++++ openser-1.1.0/etc/openser.cfg	2006-09-08 14:37:46.165753127 +0200
+@@ -7,13 +7,8 @@
+ # ----------- global configuration parameters ------------------------
+ 
+ debug=3            # debug level (cmd line: -dddddddddd)
+-fork=yes
+-log_stderror=no    # (cmd line: -E)
+-
+-/* Uncomment these lines to enter debugging mode 
+-fork=no
+-log_stderror=yes
+-*/
++fork=yes           # Set to no to enter debugging mode
++log_stderror=no    # (cmd line: -E) Set to yes to enter debugging mode
+ 
+ check_via=no	# (cmd. line: -v)
+ dns=no          # (cmd. line: -r)


Property changes on: openser/trunk/debian/patches/02_openser.cfg.dpatch
___________________________________________________________________
Name: svn:executable
   + *