[Pkg-voip-commits] r878 - in siproxd/tags: . 1:0.5.10+cvs20050423-1
1:0.5.10+cvs20050423-1/debian 1:0.5.10+cvs20050423-1/debian/man
1:0.5.10+cvs20050423-1/debian/patches
Mark Purcell
msp at costa.debian.org
Sun Oct 30 12:54:06 UTC 2005
Author: msp
Date: 2005-10-30 12:54:05 +0000 (Sun, 30 Oct 2005)
New Revision: 878
Added:
siproxd/tags/1:0.5.10+cvs20050423-1/
siproxd/tags/1:0.5.10+cvs20050423-1/debian/
siproxd/tags/1:0.5.10+cvs20050423-1/debian/changelog
siproxd/tags/1:0.5.10+cvs20050423-1/debian/compat
siproxd/tags/1:0.5.10+cvs20050423-1/debian/control
siproxd/tags/1:0.5.10+cvs20050423-1/debian/copyright
siproxd/tags/1:0.5.10+cvs20050423-1/debian/man/
siproxd/tags/1:0.5.10+cvs20050423-1/debian/man/siproxd.yo
siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/
siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/amd64.diff
siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/debian-user-1.diff
siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/openlogger-2.diff
siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/openlogger.diff
siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/pidopt.diff
siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/series
siproxd/tags/1:0.5.10+cvs20050423-1/debian/rules
siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.NEWS
siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.README.Debian
siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.default
siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.dirs
siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.docs
siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.examples
siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.init
siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.postinst
siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.postrm
siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.preinst
Log:
Add cvs upload to tags
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/changelog
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/changelog 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/changelog 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,170 @@
+siproxd (1:0.5.10+cvs20050423-1) unstable; urgency=low
+
+ * New upstream release
+ * CVS head release fixes segfaulting issue (closes: #304691)
+
+ -- Dan Weber <dan at mirrorlynx.com> Sat, 23 Apr 2005 22:09:55 -0400
+
+siproxd (1:0.5.10-2) unstable; urgency=low
+
+ * Fixed building on amd64 with gcc-4.0 (Closes: #300938)
+
+ -- Kilian Krause <kk at verfaction.de> Tue, 22 Mar 2005 21:28:19 +0100
+
+siproxd (1:0.5.10-1) unstable; urgency=low
+
+ * New upstream release (closes: #279717)
+ * Epoch change to 1 to work with the new version schema
+ * Can now depend on libosip2 2.0.9 directly (closes: #285178)
+ * Since the build system before debian is buggy, and deletes its own
+ specfile, this is not a bug of the package and no longer occurs with this
+ upstream release (closes: #273013)
+ * Cleaned out arch directories in source builds (closes: #271885)
+
+ -- Dan Weber <dan at mirrorlynx.com> Sat, 19 Mar 2005 10:27:15 -0500
+
+siproxd (0.57.snap040720-2) unstable; urgency=low
+
+ * Purged all that crap from NMU. I removed all the debconf stuff because
+ that is absolutely ridiculous.
+ * siproxd_passwd.cfg is now optional and no longer directly supported. A
+ NEWS.Debian entry has been added for all those who still use it.
+
+ -- Dan Weber <dan at mirrorlynx.com> Thu, 23 Sep 2004 20:06:11 -0400
+
+siproxd (0.57.snap040720-1.1) unstable; urgency=high
+
+ * NMU
+ * Fix filepermission of /etc/siproxd_passwd.cfg (closes: #271715)
+ urgency high, as we have world readable passwords.
+ * added dependency on ${misc:Depends} to get debconf
+ * added german translation of debconf message.
+
+ -- Martin Zobel-Helas <mhelas at helas.net> Thu, 23 Sep 2004 11:54:11 +0200
+
+siproxd (0.57.snap040720-1) unstable; urgency=low
+
+ * New Upstream Release
+ * Added missing build dependency on automake1.7 and autotools-dev
+ * Added another missing build-dep on autoconf
+
+ -- Dan Weber <dan at mirrorlynx.com> Mon, 19 Jul 2004 21:55:08 -0400
+
+siproxd (0.57.snap040710-3) unstable; urgency=low
+
+ * Added Uploaders section for VoIP team
+ * Changed Maintainer to VoIP team
+
+ -- Dan Weber <dan at mirrorlynx.com> Sat, 17 Jul 2004 16:28:36 -0400
+
+siproxd (0.57.snap040710-2) unstable; urgency=low
+
+ * Fixed the pidfile functions again (upstream screwed up big time)
+ * Pidfile is now created outside chroot
+ * Logger only logs to daemon.log now
+ * Upload sponsored by Norbert Tretkowski <nobse at debian.org>
+
+ -- Dan Weber <dan at mirrorlynx.com> Sun, 11 Jul 2004 18:00:31 -0400
+
+siproxd (0.57.snap040710-1) unstable; urgency=low
+
+ * New upstream release
+ * Fixes chroot problems with handling dns and register
+ requests. (closes: #258195)
+ * Opens logger on start before chroot. (closes: #258194)
+ * New Package Description
+ * Cleaned up README.Debian
+
+ -- Dan Weber <dan at mirrorlynx.com> Sun, 11 Jul 2004 00:25:47 -0400
+
+siproxd (0.57.snap040702-3) unstable; urgency=low
+
+ * Integrated upstream fixes which fixes a bug where it was overwriting
+ firewall data.
+ * Modification to initscript: stop now does nothing if there is no
+ pidfile.
+
+ -- Marco d'Itri <md at linux.it> Tue, 6 Jul 2004 20:43:38 +0200
+
+siproxd (0.57.snap040702-2) unstable; urgency=low
+
+ * Quick rebuild to not pollute the archive with SIProxd instead of siproxd
+ * Cleaned chroot and now linked with libgcc_s
+ * Now loads siproxd_passwd.cfg on start, thanks Marco d'Itri who found this bug
+ * This release should upgrade cleanly if you had a broken release before
+
+ -- Dan Weber <dan at mirrorlynx.com> Mon, 5 Jul 2004 19:45:48 -0400
+
+siproxd (0.57.snap040702-1) unstable; urgency=low
+
+ * New upstream release
+ * Fixed permissions on /etc/siproxd_passwd.cfg (closes: #257470)
+ * Added a function to create a pidfile, removed existing code
+ * Default install is to use a chroot jail
+ * New init script
+ * Builds chroot on postinst run
+
+ -- Dan Weber <dan at mirrorlynx.com> Mon, 5 Jul 2004 13:13:35 -0400
+
+siproxd (0.55.snap040427-1) unstable; urgency=low
+
+ * New upstream release from CVS (closes: #232971)
+ * Upload sponsored by Norbert Tretkowski <nobse at debian.org>
+
+ -- Dan Weber <dan at mirrorlynx.com> Tue, 27 Apr 2004 13:45:59 -0400
+
+siproxd (0.53.snap040222-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Dan Weber <dan at mirrorlynx.com> Sun, 22 Feb 2004 12:47:08 -0500
+
+siproxd (0.53.snap040216-1) unstable; urgency=low
+
+ * Fixed Versioning scheme
+
+ -- Dan Weber <dan at mirrorlynx.com> Fri, 20 Feb 2004 21:04:06 -0500
+
+siproxd (0.53+16Feb2004-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Dan Weber <dan at mirrorlynx.com> Mon, 16 Feb 2004 14:10:46 -0500
+
+siproxd (0.53+15Feb2004-6) unstable; urgency=low
+
+ * Added spacing after Description in control file so apt-repos don't get
+ messed up
+
+ -- Dan Weber <dan at mirrorlynx.com> Mon, 16 Feb 2004 13:44:03 -0500
+
+siproxd (0.53+15Feb2004-5) unstable; urgency=low
+
+ * Fixed manpage number
+
+ -- Dan Weber <dan at mirrorlynx.com> Sun, 15 Feb 2004 23:02:37 -0500
+
+siproxd (0.53+15Feb2004-4) unstable; urgency=low
+
+ * Fixed permissions
+
+ -- Dan Weber <dan at mirrorlynx.com> Sun, 15 Feb 2004 21:10:12 -0500
+
+siproxd (0.53+15Feb2004-3) unstable; urgency=low
+
+ * More init scripts problems addressed
+
+ -- Dan Weber <dan at mirrorlynx.com> Sun, 15 Feb 2004 14:26:24 -0500
+
+siproxd (0.53+15Feb2004-2) unstable; urgency=low
+
+ * Fixed init scripts
+
+ -- Dan Weber <dan at mirrorlynx.com> Sun, 15 Feb 2004 14:02:29 -0500
+
+siproxd (0.53+15Feb2004-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Dan Weber <dan at mirrorlynx.com> Sun, 15 Feb 2004 11:09:36 -0500
+
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/compat
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/compat 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/compat 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1 @@
+4
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/control
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/control 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/control 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,20 @@
+Source: siproxd
+Section: net
+Priority: optional
+Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
+Build-Depends: debhelper (>= 4.1.0), cdbs, libosip2-dev, yodl, quilt (>= 0.30-4), automake1.7, autotools-dev, autoconf
+Build-Conflicts: libosip0-dev
+Standards-Version: 3.6.1.0
+Uploaders: Dan Weber <dan at mirrorlynx.com>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>
+
+Package: siproxd
+Architecture: any
+Depends: ${shlibs:Depends}, adduser (>= 3.56)
+Suggests: linphone | kphone | asterisk
+Description: SIP proxy/redirect/registrar
+ Siproxd is a proxy/masquerading daemon for the SIP protocol.
+ It handles registrations of SIP clients on a private IP network
+ and performs rewriting of the SIP message bodies to make SIP
+ connections possible via an masquerading firewall.
+ It allows SIP clients (like kphone, linphone) to work behind
+ an IP masquerading firewall or router.
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/copyright
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/copyright 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/copyright 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,12 @@
+This package was debianized by Dan Weber <dan at mirrorlynx.com> on
+Sun, 15 Feb 2004 11:09:36 -0500.
+
+It was downloaded from http://www.ries.ch.vu/siproxd/
+
+Upstream Author: Thomas Ries <tries at users.sourceforge.net>
+
+Copyright:
+
+This is copyrighted 100% percent under the GPL.
+The license can be found on any debian system located
+in /usr/share/common-licenses/GPL
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/man/siproxd.yo
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/man/siproxd.yo 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/man/siproxd.yo 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,38 @@
+manpage(siproxd)(8)(2004-02-15)(MirrorLynx)(Debian Distribution)
+
+manpagename(siproxd)(SIP Registrar/Proxy/Redirect Server)
+
+manpagesynopsis()
+
+siproxd [OPTIONS]
+
+manpageoptions()
+startdit()
+ dit(-h, --help) Help Display
+ dit(-d, --debug <pattern>) Debugging
+ dit(-c, --config <configuration file>) Use specified Config file
+ dit(-p, --pid-file <pidfile>) Create specified pidfile (overwrites if exists)
+enddit()
+manpagedescription()
+ This program is generally used to handle SIP telephony. It works well behind for clients behind a nat and can proxy for them. It can also be used as a sip registrar for internet telephony.
+
+manpagefiles()
+startdit()
+
+ dit(bf(/etc/siproxd.conf)) General Configuration File
+ dit(bf(/etc/siproxd_passwd.cfg)) Password file
+ dit(bf(siproxd)) Sip Server
+
+enddit()
+manpageseealso()
+
+To bf(ENABLE) siproxd change the 0 to a 1 in /etc/default/siproxd.
+bf(kphone(1)), bf(linphone(1))
+
+manpagebugs()
+Contact nemail(Thomas Ries)(tries at users.sourceforge.net) or nemail(Dan Weber)(dan at mirrorlynx.com), for any bugs with this program.
+
+manpageauthor()
+This manpage was written by nemail(Dan Weber)(dan at mirrorlynx.com), 2004
+
+
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/amd64.diff
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/amd64.diff 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/amd64.diff 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,93 @@
+diff -urN ../tmp-orig/siproxd-0.5.10/src/proxy.c ./src/proxy.c
+--- ../tmp-orig/siproxd-0.5.10/src/proxy.c 2005-01-24 20:12:40.000000000 +0100
++++ ./src/proxy.c 2005-03-22 16:53:40.606097320 +0100
+@@ -516,7 +516,7 @@
+ * RFC 3261, Section 16.6 step 10
+ * Proxy Behavior - Forward the new request
+ */
+- sts = osip_message_to_str(request, &buffer);
++ sts = osip_message_to_str(request, &buffer, strlen(buffer));
+ if (sts != 0) {
+ ERROR("proxy_request: osip_message_to_str failed");
+ return STS_FAILURE;
+@@ -910,7 +910,7 @@
+ }
+ }
+
+- sts = osip_message_to_str(response, &buffer);
++ sts = osip_message_to_str(response, &buffer, strlen(buffer));
+ if (sts != 0) {
+ ERROR("proxy_response: osip_message_to_str failed");
+ return STS_FAILURE;
+@@ -966,7 +966,7 @@
+ }
+ }
+
+- sts = osip_body_to_str(body, &bodybuff);
++ sts = osip_body_to_str(body, &bodybuff, strlen(&bodybuff));
+ sts = sdp_message_init(&sdp);
+ sts = sdp_message_parse (sdp, bodybuff);
+ osip_free(bodybuff);
+@@ -981,7 +981,7 @@
+ { /* just dump the buffer */
+ char *tmp, *tmp2;
+ sts = osip_message_get_body(mymsg, 0, &body);
+- sts = osip_body_to_str(body, &tmp);
++ sts = osip_body_to_str(body, &tmp, strlen(tmp));
+ osip_content_length_to_str(mymsg->content_length, &tmp2);
+ DEBUG("Body before rewrite (clen=%s, strlen=%i):\n%s\n----",
+ tmp2, strlen(tmp), tmp);
+@@ -1210,7 +1210,7 @@
+ sdp_message_free(sdp);
+
+ /* include new body */
+- osip_message_set_body(mymsg, bodybuff);
++ osip_message_set_body(mymsg, bodybuff, strlen(bodybuff));
+
+ /* free content length resource and include new one*/
+ osip_content_length_free(mymsg->content_length);
+@@ -1225,7 +1225,7 @@
+ { /* just dump the buffer */
+ char *tmp, *tmp2;
+ sts = osip_message_get_body(mymsg, 0, &body);
+- sts = osip_body_to_str(body, &tmp);
++ sts = osip_body_to_str(body, &tmp, strlen(&tmp));
+ osip_content_length_to_str(mymsg->content_length, &tmp2);
+ DEBUG("Body after rewrite (clen=%s, strlen=%i):\n%s\n----",
+ tmp2, strlen(tmp), tmp);
+diff -urN ../tmp-orig/siproxd-0.5.10/src/register.c ./src/register.c
+--- ../tmp-orig/siproxd-0.5.10/src/register.c 2005-01-08 11:05:12.000000000 +0100
++++ ./src/register.c 2005-03-22 16:53:57.293874812 +0100
+@@ -550,7 +550,7 @@
+ }
+ }
+
+- sts = osip_message_to_str(response, &buffer);
++ sts = osip_message_to_str(response, &buffer, strlen(&buffer));
+ if (sts != 0) {
+ ERROR("register_response: msg_2char failed");
+ return STS_FAILURE;
+diff -urN ../tmp-orig/siproxd-0.5.10/src/sip_utils.c ./src/sip_utils.c
+--- ../tmp-orig/siproxd-0.5.10/src/sip_utils.c 2005-01-08 11:05:13.000000000 +0100
++++ ./src/sip_utils.c 2005-03-22 16:54:44.297798071 +0100
+@@ -563,7 +563,7 @@
+ }
+ }
+
+- sts = osip_message_to_str(response, &buffer);
++ sts = osip_message_to_str(response, &buffer, strlen(&buffer));
+ if (sts != 0) {
+ ERROR("sip_gen_response: msg_2char failed");
+ return STS_FAILURE;
+diff -urN ../tmp-orig/siproxd-0.5.10/src/siproxd.c ./src/siproxd.c
+--- ../tmp-orig/siproxd-0.5.10/src/siproxd.c 2005-01-08 11:41:46.000000000 +0100
++++ ./src/siproxd.c 2005-03-22 16:51:10.871011947 +0100
+@@ -321,7 +321,7 @@
+ * Proxy Behavior - Request Validation - Reasonable Syntax
+ * (parse the received message)
+ */
+- sts=osip_message_parse(ticket.sipmsg, buff);
++ sts=osip_message_parse(ticket.sipmsg, buff, strlen(buff));
+ if (sts != 0) {
+ ERROR("osip_message_parse() failed... this is not good");
+ DUMP_BUFFER(-1, buff, i);
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/debian-user-1.diff
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/debian-user-1.diff 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/debian-user-1.diff 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,43 @@
+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 @@
+ ######################################################################
+ # Shall we daemonize?
+ #
++# Disabling this will break the debian init script
+ daemonize = 1
+
+ ######################################################################
+@@ -69,8 +70,8 @@
+ # Secure Enviroment settings:
+ # user: uid/gid to switch to after startup
+ # chrootjail: path to chroot to (chroot jail)
+-user = nobody
+-#chrootjail = /var/lib/siproxd/
++user = siproxd
++chrootjail = /var/lib/siproxd/
+
+ ######################################################################
+ # Registration file:
+@@ -83,7 +84,8 @@
+ # PID file:
+ # Where to create the PID file.
+ # This file holds the PID of the main thread of siproxd.
+-pid_file = /var/run/siproxd/siproxd.pid
++# Let Debian init handle this
++# pid_file = /var/run/siproxd/siproxd.pid
+
+ ######################################################################
+ # global switch to control the RTP proxy behaviour
+@@ -91,7 +93,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
+
+ ######################################################################
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/openlogger-2.diff
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/openlogger-2.diff 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/openlogger-2.diff 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,31 @@
+Index: siproxd-0.5.10/src/log.c
+===================================================================
+--- siproxd-0.5.10.orig/src/log.c 2005-01-08 05:41:46.000000000 -0500
++++ siproxd-0.5.10/src/log.c 2005-03-19 10:15:16.512847656 -0500
+@@ -235,7 +235,7 @@
+ } else if (silence_level < 1) {
+ /* running as daemon - log via SYSLOG facility */
+ vsnprintf(string, sizeof(string), format, ap);
+- syslog(LOG_USER|LOG_DEBUG, "%s:%i %s", file, line, string);
++ syslog(LOG_DAEMON|LOG_DEBUG, "%s:%i %s", file, line, string);
+ }
+ /*
+ * Log to TCP
+@@ -337,7 +337,7 @@
+ if (silence_level < 3) {
+ /* running as daemon - log via SYSLOG facility */
+ vsnprintf(string, sizeof(string), format, ap);
+- syslog(LOG_USER|LOG_NOTICE, "%s:%i WARNING:%s", file, line, string);
++ syslog(LOG_DAEMON|LOG_NOTICE, "%s:%i WARNING:%s", file, line, string);
+ }
+ /*
+ * Log to TCP
+@@ -388,7 +388,7 @@
+ if (silence_level < 2) {
+ /* running as daemon - log via SYSLOG facility */
+ vsnprintf(string, sizeof(string), format, ap);
+- syslog(LOG_USER|LOG_NOTICE, "%s:%i INFO:%s", file, line, string);
++ syslog(LOG_DAEMON|LOG_NOTICE, "%s:%i INFO:%s", file, line, string);
+ }
+ /*
+ * Log to TCP
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/openlogger.diff
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/openlogger.diff 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/openlogger.diff 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,21 @@
+Index: siproxd-0.57.snap040710/src/siproxd.c
+===================================================================
+--- siproxd-0.57.snap040710.orig/src/siproxd.c
++++ siproxd-0.57.snap040710/src/siproxd.c
+@@ -28,6 +28,7 @@
+ #include <signal.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
++#include <syslog.h>
+
+ #ifdef HAVE_GETOPT_H
+ #include <getopt.h>
+@@ -125,6 +126,8 @@
+ siproxd_passwordfile = NULL;
+ }
+
++ // Open Log at beginning so it can still be accessed in the chroot
++ openlog(NULL,LOG_NDELAY|LOG_PID,LOG_DAEMON);
+ /*
+ * parse command line
+ */
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/pidopt.diff
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/pidopt.diff 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/pidopt.diff 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,113 @@
+Index: siproxd-0.5.10/src/siproxd.c
+===================================================================
+--- siproxd-0.5.10.orig/src/siproxd.c 2005-03-19 10:15:16.392865896 -0500
++++ siproxd-0.5.10/src/siproxd.c 2005-03-19 10:15:16.563839904 -0500
+@@ -47,6 +47,24 @@
+ /* Global File instance on pw file */
+ FILE *siproxd_passwordfile;
+
++int createpidfile(char* pidfilename)
++{
++ FILE *f = NULL;
++ DEBUGC(DBCLASS_CONFIG,"creating PID file [%s]", pidfilename);
++ if ((f=fopen(pidfilename, "w")))
++ {
++ fprintf(f,"%i\n",(int)getpid());
++ fclose(f);
++ }
++ else
++ {
++ WARN("couldn't create new PID file: %s", strerror(errno));
++ return(1);
++ }
++ return(0);
++}
++
++
+ /* -h help option text */
+ static const char str_helpmsg[] =
+ PACKAGE "-" VERSION "-" BUILDSTR " (c) 2002-2005 Thomas Ries\n"
+@@ -93,7 +111,6 @@
+ char configfile[64]="siproxd"; /* basename of configfile */
+ int config_search=1; /* search the config file */
+ int cmdline_debuglevel=0;
+- char *pidfilename=NULL;
+ struct sigaction act;
+
+ log_set_stderr(1);
+@@ -203,9 +220,6 @@
+ log_set_pattern(configuration.debuglevel);
+ log_set_listen_port(configuration.debugport);
+
+- /* change user and group IDs */
+- secure_enviroment();
+-
+ /* daemonize if requested to */
+ if (configuration.daemonize) {
+ DEBUGC(DBCLASS_CONFIG,"daemonizing");
+@@ -215,27 +229,18 @@
+
+ log_set_stderr(0);
+ INFO("daemonized, pid=%i", getpid());
++ /* change user, group and chroot */
++ secure_enviroment();
++
+ }
++ else
++ secure_enviroment();
+
+ /* write PID file of main thread */
+- if (pidfilename == NULL) pidfilename = configuration.pid_file;
+- if (pidfilename) {
+- FILE *pidfile;
+- DEBUGC(DBCLASS_CONFIG,"creating PID file [%s]", pidfilename);
+- sts=unlink(configuration.pid_file);
+- if ((sts==0) ||(errno == ENOENT)) {
+- if ((pidfile=fopen(pidfilename, "w"))) {
+- fprintf(pidfile,"%i\n",(int)getpid());
+- fclose(pidfile);
+- } else {
+- WARN("couldn't create new PID file: %s", strerror(errno));
+- }
+- } else {
+- WARN("couldn't delete old PID file: %s", strerror(errno));
+- }
+- }
+-
+- /* initialize the RTP proxy */
++ if ((configuration.pid_file) && (!pidfilename))
++ createpidfile(configuration.pid_file);
++
++ /* Start the RTP proxy */
+ sts=rtpproxy_init();
+ if (sts != STS_SUCCESS) {
+ ERROR("unable to initialize RTP proxy - aborting");
+Index: siproxd-0.5.10/src/utils.c
+===================================================================
+--- siproxd-0.5.10.orig/src/utils.c 2005-01-08 05:05:13.000000000 -0500
++++ siproxd-0.5.10/src/utils.c 2005-03-19 10:15:16.564839752 -0500
+@@ -240,6 +240,12 @@
+ if (configuration.user) passwd=getpwnam(configuration.user);
+
+ /*
++ * Make pidfile outside of chroot
++ */
++ if (pidfilename)
++ createpidfile(pidfilename);
++
++ /*
+ * change root directory into chroot jail
+ */
+ if (configuration.chrootjail) {
+Index: siproxd-0.5.10/src/siproxd.h
+===================================================================
+--- siproxd-0.5.10.orig/src/siproxd.h 2005-01-08 05:05:13.000000000 -0500
++++ siproxd-0.5.10/src/siproxd.h 2005-03-19 10:15:16.564839752 -0500
+@@ -258,3 +258,7 @@
+ #ifndef satoi
+ #define satoi atoi /* used in libosips MSG_TEST_CODE macro ... */
+ #endif
++
++// Lets make sure the pidfilename gets all the way to utils.c
++int createpidfile(char* pidfilename);
++char* pidfilename;
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/series
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/series 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/patches/series 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,4 @@
+openlogger.diff
+debian-user-1.diff
+openlogger-2.diff
+pidopt.diff
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/rules
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/rules 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/rules 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+
+#Copyright Dan Weber <dan at mirrorlynx.com> 2004
+
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+export DH_VERBOSE=1
+DEB_CONFIGURE_EXTRA_FLAGS :=--with-libosip-prefix=/usr
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lgcc_s -lnss_dns"
+
+clean::
+ dh_clean debian/man/siproxd.8
+
+install/siproxd::
+ yodl2man debian/man/siproxd.yo
+ mv debian/man/siproxd.man debian/man/siproxd.8
+ dh_installman -psiproxd debian/man/siproxd.8
+ mv debian/siproxd/etc/siproxd.conf.example debian/siproxd/etc/siproxd.conf
+ chmod 644 -v debian/siproxd/etc/siproxd.conf
+ rm -f debian/siproxd/etc/siproxd_passwd.cfg
Property changes on: siproxd/tags/1:0.5.10+cvs20050423-1/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.NEWS
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.NEWS 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.NEWS 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,16 @@
+siproxd (0.57.snap040720-2) unstable; urgency=low
+
+ * siproxd_passwd.cfg is no longer supported. It is now an
+ example for those who wish to use it. For everyone else who
+ has already implemented it, the permissions are now set 600
+ to fix a security hole.
+
+ -- Dan Weber <dan at mirrorlynx.com> Thu, 23 Sep 2004 20:02:56 -0400
+
+siproxd (0.57.snap040702-2) unstable; urgency=low
+
+ * It is recommended that the SIProxd user is purged if you have
+ one. It is now deprecated.
+
+ -- Dan Weber <dan at mirrorlynx.com> Mon, 5 Jul 2004 20:44:56 -0400
+
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.README.Debian
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.README.Debian 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.README.Debian 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,15 @@
+
+[siproxd]
+
+Provided you are having issues with upgrading from previous versions
+of this package, some information is provided on handling this.
+
+For all previous versions, please use the new configuration files
+which dpkg has asked to upgrade. If you declined to switch to
+maintainer version, dpkg will provide them in respective
+$file.dpkg-new.
+
+The upgrade should only affect your siproxd.conf.
+
+
+ -- Dan Weber <dan at mirrorlynx.com>, Sun Jul 11 00:18:53 2004
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.default
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.default 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.default 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,5 @@
+
+# Enabled boolean 1 or 0
+
+ENABLED=0
+
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.dirs
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.dirs 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.dirs 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1 @@
+var/run/siproxd
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.docs
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.docs 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.docs 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,7 @@
+doc/FAQ
+doc/KNOWN_BUGS
+doc/FLI4L_HOWTO.txt
+doc/RFC3261_compliance.txt
+doc/sample_cfg_budgetone.txt
+doc/sample_cfg_x-lite.txt
+
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.examples
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.examples 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.examples 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,2 @@
+doc/siproxd_passwd.cfg
+
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.init
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.init 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.init 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,73 @@
+#! /bin/sh
+
+# Modified for use with Siproxd by Dan Weber <dan at mirrorlynx.com>
+# Author: Miquel van Smoorenburg <miquels at cistron.nl>.
+# Ian Murdock <imurdock at gnu.ai.mit.edu>.
+#
+# You may remove the "Author" lines above and replace them
+# with your own name if you copy and modify this script.
+#
+# Version: @(#)skeleton 1.9.4 21-Mar-2004 miquels at cistron.nl
+#
+
+set -e
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/siproxd
+NAME=siproxd
+DESC="SIP proxy"
+ENABLED=0
+PIDFILE=/var/run/$NAME/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Gracefully exit if the package has been removed.
+test -x $DAEMON || exit 0
+
+# Read config file if it is present.
+if [ -r /etc/default/$NAME ]
+then
+ . /etc/default/$NAME
+fi
+
+if [ "$ENABLED" = "0" ]
+then
+ echo "To enable siproxd, the sip proxy, modify /etc/default/siproxd"
+ exit 0
+fi
+
+start()
+{
+ echo -n "Starting $DESC: $NAME"
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --exec $DAEMON -- -p $PIDFILE
+ echo "."
+}
+
+stop()
+{
+ echo -n "Stopping $DESC: $NAME"
+ if test -e $PIDFILE; then
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE
+ fi
+ echo "."
+ rm -f $PIDFILE
+}
+
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart|force-reload)
+ stop
+ start
+ ;;
+ *)
+ echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.postinst
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.postinst 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.postinst 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+
+case "$1" in
+ configure)
+
+ if ! getent passwd siproxd > /dev/null ; then
+ echo 'Adding system-user for siproxd' 1>&2
+ adduser --system --group --home /var/run/siproxd --no-create-home \
+ --disabled-login --force-badname siproxd > /dev/null
+ fi
+
+ if dpkg --compare-versions "$2" le "0.57.snap040720-2"; then
+ chown root:siproxd /etc/siproxd.conf /etc/siproxd_passwd.cfg
+ chmod 600 /etc/siproxd_passwd.cfg
+ fi
+ ;;
+
+esac
+
+# Create directories for log etc
+# install also fixes permissions.
+# Bad naming f0llowing the exim4 example ;)
+install -d -o siproxd -g siproxd /var/lib/siproxd/var/lib/siproxd
+chown -R siproxd:siproxd /var/lib/siproxd
+chown siproxd:siproxd /var/run/siproxd
+
+
+#DEBHELPER#
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.postrm
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.postrm 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.postrm 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+rm -rf /var/lib/siproxd
+
+#DEBHELPER#
Added: siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.preinst
===================================================================
--- siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.preinst 2005-10-30 12:38:19 UTC (rev 877)
+++ siproxd/tags/1:0.5.10+cvs20050423-1/debian/siproxd.preinst 2005-10-30 12:54:05 UTC (rev 878)
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+if [ "$1" = upgrade -a "$2" = "0.57.snap040702-1" ]; then
+ if getent passwd SIProxd > /dev/null ; then
+ echo "It's recommended you remove the user SIProxd."
+ echo "This is now deprecated and can not be automated on removal of this package"
+# deluser SIProxd
+ perl -pi -e 's/SIProxd/siproxd/g' /etc/siproxd.conf
+ fi
+fi
+
+rm -rf /var/lib/siproxd /var/run/siproxd
+
+#DEBHELPER#
More information about the Pkg-voip-commits
mailing list