[Pkg-voip-commits] r6029 - in /ser/trunk/debian: changelog patches/default-ctrl-socket-dir patches/series sercmd.8
marcusb-guest at alioth.debian.org
marcusb-guest at alioth.debian.org
Tue Aug 12 12:36:27 UTC 2008
Author: marcusb-guest
Date: Tue Aug 12 12:36:27 2008
New Revision: 6029
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6029
Log:
Move control socket and FIFO from /tmp to /var/run/ser.
Added:
ser/trunk/debian/patches/default-ctrl-socket-dir
Modified:
ser/trunk/debian/changelog
ser/trunk/debian/patches/series
ser/trunk/debian/sercmd.8
Modified: ser/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/ser/trunk/debian/changelog?rev=6029&op=diff
==============================================================================
--- ser/trunk/debian/changelog (original)
+++ ser/trunk/debian/changelog Tue Aug 12 12:36:27 2008
@@ -24,8 +24,9 @@
shared libraries.
* Bump compat version to 5.
* Build with hardening-wrapper for improved security.
-
- -- Marcus Better <marcus at better.se> Tue, 12 Aug 2008 12:22:40 +0000
+ * Move control socket and FIFO from /tmp to /var/run/ser.
+
+ -- Marcus Better <marcus at better.se> Tue, 12 Aug 2008 12:36:12 +0000
ser (0.9.7-1) unstable; urgency=low
Added: ser/trunk/debian/patches/default-ctrl-socket-dir
URL: http://svn.debian.org/wsvn/pkg-voip/ser/trunk/debian/patches/default-ctrl-socket-dir?rev=6029&op=file
==============================================================================
--- ser/trunk/debian/patches/default-ctrl-socket-dir (added)
+++ ser/trunk/debian/patches/default-ctrl-socket-dir Tue Aug 12 12:36:27 2008
@@ -1,0 +1,146 @@
+--- a/doc/presence/cfg/ps.cfg
++++ b/doc/presence/cfg/ps.cfg
+@@ -120,11 +120,11 @@ modparam("gflags", "load_global_attrs",
+ modparam("domain", "load_domain_attrs", 1)
+
+ # -- ctl params --
+-# by default ctl listens on unixs:/tmp/ser_ctl if no other address is
++# by default ctl listens on unixs:/var/run/ser/ser_ctl if no other address is
+ # specified in modparams; this is also the default for sercmd
+-modparam("ctl", "binrpc", "unixs:/tmp/ser_ctl")
++modparam("ctl", "binrpc", "unixs:/var/run/ser/ser_ctl")
+ # listen on the "standard" fifo for backward compatibility
+-modparam("ctl", "fifo", "fifo:/tmp/ser_fifo")
++modparam("ctl", "fifo", "fifo:/var/run/ser/ser_fifo")
+ # listen on tcp, localhost
+ #modparam("ctl", "binrpc", "tcp:localhost:2046")
+
+--- a/etc/ser-basic.cfg
++++ b/etc/ser-basic.cfg
+@@ -55,11 +55,11 @@ modparam("usrloc", "db_mode", 0)
+ modparam("rr", "enable_full_lr", 1)
+
+ # ctl params
+-# by default ctl listens on unixs:/tmp/ser_ctl if no other address is
++# by default ctl listens on unixs:/var/run/ser/ser_ctl if no other address is
+ # specified in modparams; this is also the default for sercmd
+-modparam("ctl", "binrpc", "unixs:/tmp/ser_ctl")
++modparam("ctl", "binrpc", "unixs:/var/run/ser/ser_ctl")
+ # listen on the "standard" fifo for backward compatibility
+-modparam("ctl", "fifo", "fifo:/tmp/ser_fifo")
++modparam("ctl", "fifo", "fifo:/var/run/ser/ser_fifo")
+ # listen on tcp, localhost
+ #modparam("ctl", "binrpc", "tcp:localhost:2046")
+
+--- a/etc/ser-oob.cfg
++++ b/etc/ser-oob.cfg
+@@ -325,11 +325,11 @@ modparam("domain", "load_domain_attrs",
+
+ # -- ctl --
+
+-# By default, ctl listens on unixs:/tmp/ser_ctl if no other address is
++# By default, ctl listens on unixs:/var/run/ser/ser_ctl if no other address is
+ # specified in modparams; this is also the default for sercmd.
+-modparam("ctl", "binrpc", "unixs:/tmp/ser_ctl")
++modparam("ctl", "binrpc", "unixs:/var/run/ser/ser_ctl")
+ # Listen on the "standard" fifo for backward compatibility.
+-modparam("ctl", "fifo", "fifo:/tmp/ser_fifo")
++modparam("ctl", "fifo", "fifo:/var/run/ser/ser_fifo")
+ # listen on TCP on localhost.
+ #modparam("ctl", "binrpc", "tcp:localhost:2046")
+
+--- a/etc/ser.cfg
++++ b/etc/ser.cfg
+@@ -118,11 +118,11 @@ modparam("gflags", "load_global_attrs",
+ modparam("domain", "load_domain_attrs", 1)
+
+ # -- ctl params --
+-# by default ctl listens on unixs:/tmp/ser_ctl if no other address is
++# by default ctl listens on unixs:/var/run/ser/ser_ctl if no other address is
+ # specified in modparams; this is also the default for sercmd
+-modparam("ctl", "binrpc", "unixs:/tmp/ser_ctl")
++modparam("ctl", "binrpc", "unixs:/var/run/ser/ser_ctl")
+ # listen on the "standard" fifo for backward compatibility
+-modparam("ctl", "fifo", "fifo:/tmp/ser_fifo")
++modparam("ctl", "fifo", "fifo:/var/run/ser/ser_fifo")
+ # listen on tcp, localhost
+ #modparam("ctl", "binrpc", "tcp:localhost:2046")
+
+--- a/modules/ctl/ctl.cfg
++++ b/modules/ctl/ctl.cfg
+@@ -29,27 +29,27 @@ rev_dns=off # (cmd. line: -R)
+ # for more info: sip_router -h
+ alias=iptel.org
+ alias="foo.bar"
+-#fifo="/tmp/ser_fifo"
++#fifo="/var/run/ser/ser_fifo"
+
+ #modules
+
+ loadmodule "modules/ctl/ctl.so"
+ # optional listen addresses, if no one is specified,
+-# ctl will listen on unixs:/tmp/ser_ctl
+-modparam("ctl", "binrpc", "unix:/tmp/ser_ctl") # default
++# ctl will listen on unixs:/var/run/ser/ser_ctl
++modparam("ctl", "binrpc", "unix:/var/run/ser/ser_ctl") # default
+ modparam("ctl", "binrpc", "udp:localhost:2046")
+ modparam("ctl", "binrpc", "tcp:localhost:2046")
+-modparam("ctl", "binrpc", "unixd:/tmp/unix_dgram") # unix datagram
+-modparam("ctl", "binrpc", "unixs:/tmp/unix_stream") # unix stream
+-modparam("ctl", "binrpc", "unix:/tmp/unix_default") # unix stream
+-modparam("ctl", "binrpc", "/tmp/unix_test") # unix stream
++modparam("ctl", "binrpc", "unixd:/var/run/ser/unix_dgram") # unix datagram
++modparam("ctl", "binrpc", "unixs:/var/run/ser/unix_stream") # unix stream
++modparam("ctl", "binrpc", "unix:/var/run/ser/unix_default") # unix stream
++modparam("ctl", "binrpc", "/var/run/ser/unix_test") # unix stream
+ modparam("ctl", "binrpc", "localhost:3000") # udp
+ modparam("ctl", "binrpc", "tcp:3012") # tcp any , port 3012
+ modparam("ctl", "binrpc", "udp:*:3012") # udp any , port 3012
+
+ # old fifo support
+-modparam("ctl", "fifo", "fifo:/tmp/ser_fifo") # clasic fifo
+-modparam("ctl", "fifo", "/tmp/ser_fifo2")
++modparam("ctl", "fifo", "fifo:/var/run/ser/ser_fifo") # clasic fifo
++modparam("ctl", "fifo", "/var/run/ser/ser_fifo2")
+ modparam("ctl", "fifo", "udp:*:2050") # fifo protocol over udp
+ modparam("ctl", "fifo", "tcp:*:2050") # fifo over tcp
+
+--- a/modules/ctl/ctl_defaults.h
++++ b/modules/ctl/ctl_defaults.h
+@@ -4,7 +4,7 @@
+ #ifndef __ctl_defaults_h
+ #define __ctl_defaults_h
+ /*listen by default on: */
+-#define DEFAULT_CTL_SOCKET "unixs:/tmp/ser_ctl"
++#define DEFAULT_CTL_SOCKET "unixs:/var/run/ser/ser_ctl"
+ /* port used by default for tcp/udp if no port is explicitely specified */
+ #define DEFAULT_CTL_PORT 2049
+
+--- a/utils/sercmd/sercmd.c
++++ b/utils/sercmd/sercmd.c
+@@ -97,14 +97,14 @@ Options:\n\
+ -h This help message\n\
+ address:\n\
+ [proto:]name[:port] where proto is one of tcp, udp, unixs or unixd\n\
+- e.g.: tcp:localhost:2048 , unixs:/tmp/ser_ctl\n\
++ e.g.: tcp:localhost:2048 , unixs:/var/run/ser/ser_ctl\n\
+ cmd:\n\
+ method [arg1 [arg2...]]\n\
+ arg:\n\
+ string or number; to force a number to be interpreted as string \n\
+ prefix it by \"s:\", e.g. s:1\n\
+ Examples:\n\
+- " NAME " -s unixs:/tmp/ser_unix system.listMethods\n\
++ " NAME " -s unixs:/var/run/ser/ser_unix system.listMethods\n\
+ " NAME " -f \"pid: %v desc: %v\\n\" -s udp:localhost:2047 core.ps \n\
+ " NAME " ps # uses default ctl socket \n\
+ " NAME " # enters interactive mode on the default socket \n\
+@@ -377,7 +377,7 @@ int connect_unix_sock(char* name, int ty
+ /* we must bind so that we can receive replies */
+ if (reply_socket==0){
+ if (sock_dir==0)
+- sock_dir="/tmp";
++ sock_dir="/var/run/ser";
+ retry:
+ ret=snprintf(mysun.sun_path, UNIX_PATH_MAX, "%s/" NAME "_%d",
+ sock_dir, rand());
Modified: ser/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/ser/trunk/debian/patches/series?rev=6029&op=diff
==============================================================================
--- ser/trunk/debian/patches/series (original)
+++ ser/trunk/debian/patches/series Tue Aug 12 12:36:27 2008
@@ -2,3 +2,4 @@
stop-build-on-error
fix-osptk-lib-path
initgroups
+default-ctrl-socket-dir
Modified: ser/trunk/debian/sercmd.8
URL: http://svn.debian.org/wsvn/pkg-voip/ser/trunk/debian/sercmd.8?rev=6029&op=diff
==============================================================================
--- ser/trunk/debian/sercmd.8 (original)
+++ ser/trunk/debian/sercmd.8 Tue Aug 12 12:36:27 2008
@@ -36,7 +36,7 @@
.SS "address:"
.TP
[proto:]name[:port]
-where proto is one of tcp, udp, unixs or unixd, e.g., tcp:localhost:2048 , unixs:/tmp/ser_ctl
+where proto is one of tcp, udp, unixs or unixd, e.g., tcp:localhost:2048 , unixs:/var/run/ser/ser_ctl
.SS "cmd:"
.TP
method
@@ -47,7 +47,7 @@
prefix it by "s:", e.g. s:1
.SH EXAMPLES
.nf
-sercmd \fB\-s\fR unixs:/tmp/ser_unix system.listMethods
+sercmd \fB\-s\fR unixs:/var/run/ser/ser_unix system.listMethods
sercmd \fB\-f\fR "pid: %v desc: %v\en" \fB\-s\fR udp:localhost:2047 core.ps
sercmd ps # uses default ctl socket
sercmd # enters interactive mode on the default socket
More information about the Pkg-voip-commits
mailing list