[Pkg-voip-commits] r1135 - in stun/trunk/debian: . patches

Wed Jan 4 14:32:33 UTC 2006

Author: kilian
Date: 2006-01-04 14:32:33 +0000 (Wed, 04 Jan 2006)
New Revision: 1135

Added:
   stun/trunk/debian/patches/daemon_noverbose.dpatch
   stun/trunk/debian/stun.default
Removed:
   stun/trunk/debian/stun-default
Modified:
   stun/trunk/debian/control
   stun/trunk/debian/dirs
   stun/trunk/debian/init.d
   stun/trunk/debian/patches/00list
   stun/trunk/debian/rules
Log:
ready for shipping except the stop target doesn't work as there's no pidfile from the deamon after the fork...


Modified: stun/trunk/debian/control
===================================================================

--- stun/trunk/debian/control	2006-01-04 13:35:37 UTC (rev 1134)
+++ stun/trunk/debian/control	2006-01-04 14:32:33 UTC (rev 1135)
@@ -4,7 +4,7 @@
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>
 Build-Depends: debhelper (>= 4.0.0), dpatch
-Standards-Version: 3.6.1
+Standards-Version: 3.6.2
 
 Package: stun
 Architecture: any

Modified: stun/trunk/debian/dirs
===================================================================
--- stun/trunk/debian/dirs	2006-01-04 13:35:37 UTC (rev 1134)
+++ stun/trunk/debian/dirs	2006-01-04 14:32:33 UTC (rev 1135)
@@ -1,2 +1,3 @@
+etc/default
 usr/bin
 usr/sbin

Modified: stun/trunk/debian/init.d
===================================================================
--- stun/trunk/debian/init.d	2006-01-04 13:35:37 UTC (rev 1134)
+++ stun/trunk/debian/init.d	2006-01-04 14:32:33 UTC (rev 1135)
@@ -11,7 +11,7 @@
 #
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/stun
+DAEMON=/usr/sbin/stund
 NAME=stun
 DESC=stun
 
@@ -20,28 +20,28 @@
 # Include stun defaults if available
 if [ -f /etc/default/stun ] ; then
 	. /etc/default/stun
-	if [ -z $PRIMARY_IP ];then
-		echo "No primary IP given. Exiting."
-		exit 1
-	fi
-	if [ -z $SECONDARY_IP ];then
-		echo "No secondary IP given. Exiting."
-		exit 1
-	fi
-	if [ -z $PRIMARY_PORT ];then
-		echo "No primary port given. Using default."
-		PRIMARY_PORT=3478
-	fi
-	if [ -z $SECONDARY_PORT ];then
-		echo "No secondary port given. Using default."
-		SECONDARY_PORT=3479
-	fi
-	if [ -z $DAEMON_USER ];then
-		DAEMON_USER=nobody
-	fi
 fi
+if [ -z $PRIMARY_IP ];then
+	echo "No primary IP given. Exiting."
+	exit 1
+fi
+if [ -z $SECONDARY_IP ];then
+	echo "No secondary IP given. Exiting."
+	exit 1
+fi
+if [ -z $PRIMARY_PORT ];then
+	echo "No primary port given. Using default."
+	PRIMARY_PORT=3478
+fi
+if [ -z $SECONDARY_PORT ];then
+	echo "No secondary port given. Using default."
+	SECONDARY_PORT=3479
+fi
+if [ -z $DAEMON_USER ];then
+	DAEMON_USER=nobody
+fi
 
-DAEMON_OPTS += "-b -h $PRIMARY_IP -a $SECONDARY_IP -p $PRIMARY_PORT -o $SECONDARY_PORT"
+DAEMON_OPTS="$DAEMON_OPTS -b -h $PRIMARY_IP -a $SECONDARY_IP -p $PRIMARY_PORT -o $SECONDARY_PORT"
 
 set -e
 
@@ -49,7 +49,7 @@
   start)
 	echo -n "Starting $DESC: "
 	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-		--user $DAMEON_USER --exec $DAEMON -- $DAEMON_OPTS
+		--user $DAEMON_USER --exec $DAEMON -- $DAEMON_OPTS
 	echo "$NAME."
 	;;
   stop)

Modified: stun/trunk/debian/patches/00list
===================================================================
--- stun/trunk/debian/patches/00list	2006-01-04 13:35:37 UTC (rev 1134)
+++ stun/trunk/debian/patches/00list	2006-01-04 14:32:33 UTC (rev 1135)
@@ -1 +1,2 @@
 fix_non_i386
+daemon_noverbose

Added: stun/trunk/debian/patches/daemon_noverbose.dpatch
===================================================================
--- stun/trunk/debian/patches/daemon_noverbose.dpatch	2006-01-04 13:35:37 UTC (rev 1134)
+++ stun/trunk/debian/patches/daemon_noverbose.dpatch	2006-01-04 14:32:33 UTC (rev 1135)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## daemon_noverbose.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad stun-0.96~/server.cxx stun-0.96/server.cxx
+--- stun-0.96~/server.cxx	2005-08-13 20:19:29.000000000 +0000
++++ stun-0.96/server.cxx	2006-01-04 14:18:02.000000000 +0000
+@@ -223,7 +223,8 @@
+          c++;
+          if ( c%1000 == 0 ) 
+          {
+-            clog << "*";
++	    if ( verbose )
++	       clog << "*";
+          }
+       }
+       // Notreached


Property changes on: stun/trunk/debian/patches/daemon_noverbose.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: stun/trunk/debian/rules
===================================================================
--- stun/trunk/debian/rules	2006-01-04 13:35:37 UTC (rev 1134)
+++ stun/trunk/debian/rules	2006-01-04 14:32:33 UTC (rev 1135)
@@ -51,6 +51,7 @@
 	install -m 755 server $(CURDIR)/debian/stun/usr/sbin/stund
 	#install -m 755 tlsServer $(CURDIR)/debian/stun/usr/sbin/
 	install -m 755 client $(CURDIR)/debian/stun/usr/bin/stun
+	install -m 644 debian/stun.default $(CURDIR)/debian/stun/etc/default/stun
 
 
 # Build architecture-independent files here.

Deleted: stun/trunk/debian/stun-default
===================================================================
--- stun/trunk/debian/stun-default	2006-01-04 13:35:37 UTC (rev 1134)
+++ stun/trunk/debian/stun-default	2006-01-04 14:32:33 UTC (rev 1135)
@@ -1,18 +0,0 @@
-# Defaults for stun initscript
-# sourced by /etc/init.d/stun
-# installed at /etc/default/stun by the maintainer scripts
-
-#
-# This is a POSIX shell fragment
-#
-
-# Additional options that are passed to the Daemon.
-DAEMON_OPTS=""
-
-PRIMARY_IP=""
-SECONDARY_IP=""
-PRIMARY_PORT=3478
-SECONDARY_PORT=3479
-
-# whom the daemons should run as
-DAEMON_USER=nobody

Copied: stun/trunk/debian/stun.default (from rev 1134, stun/trunk/debian/stun-default)


