[Pkg-voip-commits] r9466 - in /siproxd/trunk/debian: changelog patches/debian-user-1.diff patches/non-empty-dependency_libs-in-la-file.diff patches/series siproxd.init

msp at alioth.debian.org msp at alioth.debian.org
Fri Feb 3 23:10:24 UTC 2012 

Author: msp
Date: Fri Feb  3 23:10:23 2012
New Revision: 9466

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9466
Log:
* Fix "issues with debian packaging (conf and init)" (Closes: #658504)
  - PIDFILE=/var/run/$NAME/$NAME.pid
  - Refresh debian-user-1.diff 
  - non-empty-dependency_libs-in-la-file.diff - .la files in .conf

Added:
    siproxd/trunk/debian/patches/non-empty-dependency_libs-in-la-file.diff
Modified:
    siproxd/trunk/debian/changelog
    siproxd/trunk/debian/patches/debian-user-1.diff
    siproxd/trunk/debian/patches/series
    siproxd/trunk/debian/siproxd.init

Modified: siproxd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/siproxd/trunk/debian/changelog?rev=9466&op=diff
==============================================================================
--- siproxd/trunk/debian/changelog (original)
+++ siproxd/trunk/debian/changelog Fri Feb  3 23:10:23 2012
@@ -1,3 +1,12 @@
+siproxd (1:0.8.1-3) UNRELASED; urgency=low
+
+  * Fix "issues with debian packaging (conf and init)" (Closes: #658504)
+    - PIDFILE=/var/run/$NAME/$NAME.pid
+    - Refresh debian-user-1.diff 
+    - non-empty-dependency_libs-in-la-file.diff - .la files in .conf
+
+ -- Mark Purcell <msp at debian.org>  Sat, 04 Feb 2012 10:09:47 +1100
+
 siproxd (1:0.8.1-2) unstable; urgency=low
 
   * Add siproxd-libtool-2.4.patch - Thanks to Chí-Thanh Christopher

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=9466&op=diff
==============================================================================
--- siproxd/trunk/debian/patches/debian-user-1.diff (original)
+++ siproxd/trunk/debian/patches/debian-user-1.diff Fri Feb  3 23:10:23 2012
@@ -1,6 +1,7 @@
-diff -urN siproxd.old/doc/siproxd.conf.example siproxd-0.6.0/doc/siproxd.conf.example
---- siproxd.old/doc/siproxd.conf.example	2007-08-16 20:57:27.000000000 +0200
-+++ siproxd-0.6.0/doc/siproxd.conf.example	2007-11-08 14:46:37.000000000 +0100
+Index: siproxd-0.8.1/doc/siproxd.conf.example
+===================================================================
+--- siproxd-0.8.1.orig/doc/siproxd.conf.example	2011-06-21 06:25:27.000000000 +1000
++++ siproxd-0.8.1/doc/siproxd.conf.example	2012-02-04 09:51:30.000000000 +1100
 @@ -62,6 +62,7 @@
  ######################################################################
  # Shall we daemonize?
@@ -9,7 +10,7 @@
  daemonize = 1
  
  ######################################################################
-@@ -83,8 +84,8 @@
+@@ -78,8 +79,8 @@
  # Secure Enviroment settings:
  #   user:	uid/gid to switch to after startup
  #   chrootjail:	path to chroot to (chroot jail)
@@ -19,8 +20,8 @@
 +chrootjail = /var/lib/siproxd/
  
  ######################################################################
- # Registration file:
-@@ -106,7 +107,8 @@
+ # Memory settings
+@@ -113,7 +114,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.
@@ -30,7 +31,7 @@
  
  ######################################################################
  # global switch to control the RTP proxy behaviour
-@@ -115,6 +117,7 @@
+@@ -122,6 +124,7 @@
  #
  # Note: IPCHAINS and IPTABLES(netfilter) support is no longer present!
  #    

Added: siproxd/trunk/debian/patches/non-empty-dependency_libs-in-la-file.diff
URL: http://svn.debian.org/wsvn/pkg-voip/siproxd/trunk/debian/patches/non-empty-dependency_libs-in-la-file.diff?rev=9466&op=file
==============================================================================
--- siproxd/trunk/debian/patches/non-empty-dependency_libs-in-la-file.diff (added)
+++ siproxd/trunk/debian/patches/non-empty-dependency_libs-in-la-file.diff Fri Feb  3 23:10:23 2012
@@ -1,0 +1,30 @@
+Index: siproxd-0.8.1/doc/siproxd.conf.example
+===================================================================
+--- siproxd-0.8.1.orig/doc/siproxd.conf.example	2011-06-21 06:25:27.000000000 +1000
++++ siproxd-0.8.1/doc/siproxd.conf.example	2012-02-04 10:08:38.000000000 +1100
+@@ -326,14 +326,17 @@
+ plugindir=/usr/lib/siproxd/
+ #
+ # List of plugins to load. MUST use the .la file extension!
+-#load_plugin=plugin_demo.la
+-#load_plugin=plugin_shortdial.la
+-load_plugin=plugin_logcall.la
+-#load_plugin=plugin_defaulttarget.la
+-#load_plugin=plugin_fix_bogus_via.la
+-#load_plugin=plugin_stun.la
+-#load_plugin=plugin_prefix.la
+-#load_plugin=plugin_regex.la
++# Debian changes to use the .so extensions
++# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=633224
++
++#load_plugin=plugin_demo.so
++#load_plugin=plugin_shortdial.so
++load_plugin=plugin_logcall.so
++#load_plugin=plugin_defaulttarget.so
++#load_plugin=plugin_fix_bogus_via.so
++#load_plugin=plugin_stun.so
++#load_plugin=plugin_prefix.so
++#load_plugin=plugin_regex.so
+ 
+ 
+ ######################################################################

Modified: siproxd/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/siproxd/trunk/debian/patches/series?rev=9466&op=diff
==============================================================================
--- siproxd/trunk/debian/patches/series (original)
+++ siproxd/trunk/debian/patches/series Fri Feb  3 23:10:23 2012
@@ -1,1 +1,3 @@
+non-empty-dependency_libs-in-la-file.diff
 siproxd-libtool-2.4.patch
+debian-user-1.diff

Modified: siproxd/trunk/debian/siproxd.init
URL: http://svn.debian.org/wsvn/pkg-voip/siproxd/trunk/debian/siproxd.init?rev=9466&op=diff
==============================================================================
--- siproxd/trunk/debian/siproxd.init (original)
+++ siproxd/trunk/debian/siproxd.init Fri Feb  3 23:10:23 2012
@@ -25,11 +25,11 @@
 set -e
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/siproxd
 NAME=siproxd
+DAEMON=/usr/sbin/$NAME
 DESC="SIP proxy"
 ENABLED=0
-PIDFILE=/var/run/$NAME.pid
+PIDFILE=/var/run/$NAME/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
 # Gracefully exit if the package has been removed.

More information about the Pkg-voip-commits mailing list