[Pkg-voip-commits] r8247 - in /asterisk/trunk/debian/patches: allow-tilde-destdir dahdi_pri_debug_spannums dahdi_ptmp_nt h323-no-deps-on-asterisk make-clean-fixes safe_asterisk-nobg settings_show_dirs

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Wed Mar 31 10:06:57 UTC 2010 

Author: tzafrir-guest
Date: Wed Mar 31 10:06:51 2010
New Revision: 8247

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8247
Log:
refresh patches

Modified:
    asterisk/trunk/debian/patches/allow-tilde-destdir
    asterisk/trunk/debian/patches/dahdi_pri_debug_spannums
    asterisk/trunk/debian/patches/dahdi_ptmp_nt
    asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
    asterisk/trunk/debian/patches/make-clean-fixes
    asterisk/trunk/debian/patches/safe_asterisk-nobg
    asterisk/trunk/debian/patches/settings_show_dirs

Modified: asterisk/trunk/debian/patches/allow-tilde-destdir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/allow-tilde-destdir?rev=8247&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/allow-tilde-destdir (original)
+++ asterisk/trunk/debian/patches/allow-tilde-destdir Wed Mar 31 10:06:51 2010
@@ -14,7 +14,7 @@
 
 --- a/Makefile
 +++ b/Makefile
-@@ -609,7 +609,7 @@ oldmodcheck:
+@@ -616,7 +616,7 @@ oldmodcheck:
  	fi
  
  badshell:

Modified: asterisk/trunk/debian/patches/dahdi_pri_debug_spannums
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/dahdi_pri_debug_spannums?rev=8247&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/dahdi_pri_debug_spannums (original)
+++ asterisk/trunk/debian/patches/dahdi_pri_debug_spannums Wed Mar 31 10:06:51 2010
@@ -7,9 +7,11 @@
 This allows tracing ("pri debug" / "pri set debug") more than one span at
 a time in a sane manner.
 
+Fix included in Asterisk 1.8 but not in 1.6.2 .
+
 --- a/channels/chan_dahdi.c
 +++ b/channels/chan_dahdi.c
-@@ -12207,6 +12207,8 @@ static void dahdi_pri_message(struct pri
+@@ -12237,6 +12237,8 @@ static void dahdi_pri_message(struct pri
  		}
  		if (dchancount > 1 && (span > -1))
  			ast_verbose("[Span %d D-Channel %d]%s", span, dchan, s);
@@ -18,7 +20,7 @@
  		else
  			ast_verbose("%s", s);
  	} else
-@@ -12248,6 +12250,8 @@ static void dahdi_pri_error(struct pri *
+@@ -12278,6 +12280,8 @@ static void dahdi_pri_error(struct pri *
  		}
  		if ((dchancount > 1) && (span > -1))
  			ast_log(LOG_ERROR, "[Span %d D-Channel %d] PRI: %s", span, dchan, s);

Modified: asterisk/trunk/debian/patches/dahdi_ptmp_nt
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/dahdi_ptmp_nt?rev=8247&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/dahdi_ptmp_nt (original)
+++ asterisk/trunk/debian/patches/dahdi_ptmp_nt Wed Mar 31 10:06:51 2010
@@ -12,7 +12,7 @@
 
 --- a/channels/chan_dahdi.c
 +++ b/channels/chan_dahdi.c
-@@ -16510,7 +16510,8 @@ static int process_dahdi(struct dahdi_ch
+@@ -16540,7 +16540,8 @@ static int process_dahdi(struct dahdi_ch
  					confp->chan.sig = SIG_BRI_PTMP;
  					confp->pri.nodetype = PRI_CPE;
  				} else if (!strcasecmp(v->value, "bri_net_ptmp")) {

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=8247&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/h323-no-deps-on-asterisk (original)
+++ asterisk/trunk/debian/patches/h323-no-deps-on-asterisk Wed Mar 31 10:06:51 2010
@@ -13,7 +13,7 @@
 
 --- a/main/Makefile
 +++ b/main/Makefile
-@@ -143,13 +143,6 @@ AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED
+@@ -153,13 +153,6 @@ AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED
  AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))
  OBJS:=$(sort $(OBJS))
  
@@ -27,7 +27,7 @@
  ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
  MAIN_TGT:=asterisk.dll
  asterisk: cygload
-@@ -167,11 +160,7 @@ endif
+@@ -177,11 +170,7 @@ endif
  $(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
  	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
  	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"

Modified: asterisk/trunk/debian/patches/make-clean-fixes
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/make-clean-fixes?rev=8247&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/make-clean-fixes (original)
+++ asterisk/trunk/debian/patches/make-clean-fixes Wed Mar 31 10:06:51 2010
@@ -5,7 +5,7 @@
 
 --- a/Makefile
 +++ b/Makefile
-@@ -459,7 +459,6 @@ dist-clean: distclean
+@@ -466,7 +466,6 @@ dist-clean: distclean
  
  distclean: $(SUBDIRS_DIST_CLEAN) _clean
  	@$(MAKE) -C menuselect dist-clean
@@ -13,7 +13,7 @@
  	rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
  	rm -f makeopts.embed_rules
  	rm -f config.log config.status config.cache
-@@ -469,6 +468,10 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
+@@ -476,6 +475,10 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
  	rm -rf doc/api
  	rm -f build_tools/menuselect-deps
  

Modified: asterisk/trunk/debian/patches/safe_asterisk-nobg
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/safe_asterisk-nobg?rev=8247&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/safe_asterisk-nobg (original)
+++ asterisk/trunk/debian/patches/safe_asterisk-nobg Wed Mar 31 10:06:51 2010
@@ -12,7 +12,7 @@
 
 --- a/contrib/scripts/safe_asterisk
 +++ b/contrib/scripts/safe_asterisk
-@@ -18,6 +18,7 @@ SLEEPSECS=4
+@@ -14,6 +14,7 @@ SLEEPSECS=4
  ASTSBINDIR=__ASTERISK_SBIN_DIR__
  ASTVARRUNDIR=__ASTERISK_VARRUN_DIR__
  ASTPIDFILE=${ASTVARRUNDIR}/asterisk.pid
@@ -20,7 +20,7 @@
  
  # comment this line out to have this script _not_ kill all mpg123 processes when
  # asterisk exits
-@@ -207,4 +208,8 @@ run_asterisk()
+@@ -197,4 +198,8 @@ run_asterisk()
  	done
  }
  

Modified: asterisk/trunk/debian/patches/settings_show_dirs
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/settings_show_dirs?rev=8247&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/settings_show_dirs (original)
+++ asterisk/trunk/debian/patches/settings_show_dirs Wed Mar 31 10:06:51 2010
@@ -9,11 +9,9 @@
 Included in trunk (to be 1.8). Not included in upstream 1.6.2 but applies
 cleanly.
 
-diff --git a/main/asterisk.c b/main/asterisk.c
-index 3b0c7c9..93d52c0 100644
 --- a/main/asterisk.c
 +++ b/main/asterisk.c
-@@ -482,6 +482,13 @@ static char *handle_show_settings(struct ast_cli_entry *e, int cmd, struct ast_c
+@@ -481,6 +481,13 @@ static char *handle_show_settings(struct
  	ast_cli(a->fd, "  Module directory:            %s\n", ast_config_AST_MODULE_DIR);
  	ast_cli(a->fd, "  Spool directory:             %s\n", ast_config_AST_SPOOL_DIR);
  	ast_cli(a->fd, "  Log directory:               %s\n", ast_config_AST_LOG_DIR);

More information about the Pkg-voip-commits mailing list