[Pkg-voip-commits] r4819 - /siproxd/trunk/debian/patches/debian-user-1.diff

[kilian at alioth.debian.org]

Author: kilian
Date: Thu Nov  8 13:43:13 2007
New Revision: 4819

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4819
Log:
fix patch applying.

Modified:
    siproxd/trunk/debian/patches/debian-user-1.diff

Modified: siproxd/trunk/debian/patches/debian-user-1.diff
URL: http://svn.debian.org/wsvn/pkg-voip/siproxd/trunk/debian/patches/debian-user-1.diff?rev=4819&op=diff
==============================================================================
--- siproxd/trunk/debian/patches/debian-user-1.diff (original)
+++ siproxd/trunk/debian/patches/debian-user-1.diff Thu Nov  8 13:43:13 2007
@@ -1,8 +1,6 @@
-Index: siproxd-0.57.snap040702/doc/siproxd.conf.example
-===================================================================
---- siproxd-0.57.snap040702.orig/doc/siproxd.conf.example
-+++ siproxd-0.57.snap040702/doc/siproxd.conf.example
-@@ -48,6 +48,7 @@
+--- siproxd-0.6.0.orig/doc/siproxd.conf.example
++++ siproxd-0.6.0/doc/siproxd.conf.example
+@@ -62,6 +62,7 @@
  ######################################################################
  # Shall we daemonize?
  #
@@ -10,7 +8,7 @@
  daemonize = 1
  
  ######################################################################
-@@ -69,8 +70,8 @@
+@@ -83,8 +84,8 @@
  # Secure Enviroment settings:
  #   user:	uid/gid to switch to after startup
  #   chrootjail:	path to chroot to (chroot jail)
@@ -21,22 +19,20 @@
  
  ######################################################################
  # Registration file:
-@@ -83,7 +84,8 @@
- # PID file:
- #   Where to create the PID file.
+@@ -106,7 +107,8 @@
  #   This file holds the PID of the main thread of siproxd.
+ #   Note: If running in chroot jail, this path starts relative
+ #         to the jail.
 -pid_file = /var/run/siproxd/siproxd.pid
 +# Let Debian init handle this
-+# pid_file = /var/run/siproxd/siproxd.pid
++#pid_file = /var/run/siproxd/siproxd.pid
  
  ######################################################################
  # global switch to control the RTP proxy behaviour
-@@ -91,7 +93,8 @@
+@@ -114,7 +116,8 @@
  #       1 - RTP proxy (UDP relay of siproxd)
  #
  # Note: IPCHAINS and IPTABLES(netfilter) support is no longer present!
--#    
-+#
 +# RECOMMENDED for users who are behind nats    
  rtp_proxy_enable = 1