[Pkg-voip-commits] r8049 - in /asterisk/trunk/debian: changelog patches/h323-fix-makefile patches/h323-no-deps-on-asterisk patches/safe_asterisk-config patches/series

Sun Feb 14 17:01:40 UTC 2010

Author: tzafrir-guest
Date: Sun Feb 14 17:01:37 2010
New Revision: 8049

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8049
Log:
* New upstream RC: 1.6.2.3-rc2
* Patch h323-fix-makefile dropped: merged upstream.
* Patch safe_asterisk-config: Mostly merged upstream.
* Patch safe_asterisk-config: minor update.

Removed:
    asterisk/trunk/debian/patches/h323-fix-makefile
Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
    asterisk/trunk/debian/patches/safe_asterisk-config
    asterisk/trunk/debian/patches/series

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=8049&op=diff
==============================================================================

--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Sun Feb 14 17:01:37 2010
@@ -1,3 +1,11 @@
+asterisk (1:1.6.2.3~rc2-1) unstable; urgency=low
+
+  * New upstream RC.
+  * Patch h323-fix-makefile dropped: merged upstream.
+  * Patch safe_asterisk-config: Mostly merged upstream. 
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 14 Feb 2010 18:48:54 +0200
+
 asterisk (1:1.6.2.2-1) unstable; urgency=medium
 
   [ Faidon Liambotis ]

Modified: asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/h323-no-deps-on-asterisk?rev=8049&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/h323-no-deps-on-asterisk (original)
+++ asterisk/trunk/debian/patches/h323-no-deps-on-asterisk Sun Feb 14 17:01:37 2010
@@ -1,7 +1,7 @@
 Subject: Avoid linking the asterisk binary with the H.323 libraries
 Author: Faidon Liambotis <paravoid at debian.org>
 Forwarded: no
-Last-Update: 2009-12-19
+Last-Update: 2010-02-14
 
 Don't link the Asterisk binary with the H.323 libraries since they are only
 used by separate shared object, chan_h323.so. (Closes: #433884)
@@ -32,9 +32,9 @@
  	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
  	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 -ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
- 	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
+ 	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
 -else
--	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
+-	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
 -endif
  	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
  

Modified: asterisk/trunk/debian/patches/safe_asterisk-config
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/safe_asterisk-config?rev=8049&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/safe_asterisk-config (original)
+++ asterisk/trunk/debian/patches/safe_asterisk-config Sun Feb 14 17:01:37 2010
@@ -1,44 +1,28 @@
 Subject: use /etc/default/settings for configuring safe_asterisk (vendor specific)
 Author: Faidon Liambotis <paravoid at debian.org>
 Bug-Debian: http://bugs.debian.org/381786
-Last-Update: 2009-12-19
+Last-Update: 2010-02-14
 
 Use ASTSAFE_TTY and ASTSAFE_CONSOLE from /etc/default/asterisk to configure
 safe_asterisk.
 
 --- a/contrib/scripts/safe_asterisk
 +++ b/contrib/scripts/safe_asterisk
-@@ -1,9 +1,13 @@
- #!/bin/sh
- # vim:textwidth=80:tabstop=4:shiftwidth=4:smartindent:autoindent
- 
-+if [ -f /etc/default/asterisk ]; then
-+	. /etc/default/asterisk;
-+fi
-+
- CLIARGS="$*"				# Grab any args passed to safe_asterisk
--TTY=9						# TTY (if you want one) for Asterisk to run on
--CONSOLE=yes					# Whether or not you want a console
-+TTY=${ASTSAFE_TTY:-9}                   	# TTY (if you want one) for Asterisk to run on
-+CONSOLE=${ASTSAFE_CONSOLE:-yes}         	# Whether or not you want a console
- #NOTIFY=ben at alkaloid.net	# Who to notify about crashes
- #EXEC=/path/to/somescript	# Run this command if Asterisk crashes
- #LOGFILE=/path/to/logfile	# Where to place the normal logfile (disabled if blank)
 @@ -112,7 +116,7 @@ ulimit -c unlimited
  # Don't fork when running "safely"
  #
  ASTARGS=""
--if [ "$TTY" != "" ]; then
-+if [ "$TTY" != "no" ]; then
- 	if [ -c /dev/tty${TTY} ]; then
+-if test "x$TTY" != "x" ; then
++if test "x$TTY" != "xno" ; then
+ 	if test -c /dev/tty${TTY} ; then
  		TTY=tty${TTY}
- 	elif [ -c /dev/vc/${TTY} ]; then
+ 	elif test -c /dev/vc/${TTY} ; then
 @@ -152,7 +156,7 @@ run_asterisk()
  {
  	while :; do 
  
--		if [ "$TTY" != "" ]; then
-+		if [ "$TTY" != "no" ]; then
+-		if test "x$TTY" != "x" ; then
++		if test "x$TTY" != "xno" ; then
  			cd /tmp
  			stty sane < /dev/${TTY}
  			nice -n $PRIORITY ${ASTSBINDIR}/asterisk -f ${CLIARGS} ${ASTARGS} > /dev/${TTY} 2>&1 < /dev/${TTY}

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=8049&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Sun Feb 14 17:01:37 2010
@@ -7,7 +7,6 @@
 safe_asterisk-nobg
 
 h323-no-deps-on-asterisk
-h323-fix-makefile
 h323-workaround-openh323-segfault
 
 astgenkey-security


