Commits

Anonymous committed f3cbc6f Draft

Do a quilt refresh on all patches

Comments (0)

Files changed (10)

debian/patches/allow-tilde-destdir

 Upstream issue: http://issues.asterisk.org/view.php?id=14718
 --- a/Makefile
 +++ b/Makefile
-@@ -575,7 +575,7 @@ oldmodcheck:
+@@ -609,7 +609,7 @@ oldmodcheck:
  	fi
  
  badshell:

debian/patches/dahdi-fxsks-hookstate

 
 --- a/channels/chan_dahdi.c
 +++ b/channels/chan_dahdi.c
-@@ -9295,12 +9295,16 @@ static inline int available(struct dahdi
+@@ -10617,12 +10617,16 @@ static inline int available(struct dahdi
  				/* When "onhook" that means no battery on the line, and thus
  				  it is out of service..., if it's on a TDM card... If it's a channel
  				  bank, there is no telling... */

debian/patches/dahdi_pri_debug_spannums

 Upstream issue: http://issues.asterisk.org/view.php?id=15054
 --- a/channels/chan_dahdi.c
 +++ b/channels/chan_dahdi.c
-@@ -10682,6 +10682,8 @@ static void dahdi_pri_message(struct pri
+@@ -12133,6 +12133,8 @@ static void dahdi_pri_message(struct pri
  		}
  		if (dchancount > 1 && (span > -1))
  			ast_verbose("[Span %d D-Channel %d]%s", span, dchan, s);
  		else
  			ast_verbose("%s", s);
  	} else
-@@ -10721,6 +10723,8 @@ static void dahdi_pri_error(struct pri *
+@@ -12174,6 +12176,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);

debian/patches/dahdi_ptmp_nt

 http://issues.asterisk.org/view.php?id=15048
 --- a/channels/chan_dahdi.c
 +++ b/channels/chan_dahdi.c
-@@ -14582,7 +14582,8 @@ static int process_dahdi(struct dahdi_ch
+@@ -16410,7 +16410,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")) {

debian/patches/debian-banner

 
 --- a/main/asterisk.c
 +++ b/main/asterisk.c
-@@ -142,6 +142,9 @@ int daemon(int, int);  /* defined in lib
+@@ -159,6 +159,9 @@ int daemon(int, int);  /* defined in lib
                  "This is free software, with components licensed under the GNU General Public\n" \
                  "License version 2 and other licenses; you are welcome to redistribute it under\n" \
                  "certain conditions. Type 'core show license' for details.\n" \

debian/patches/disable_moh

   Tzafrir Cohen <tzafrir.cohen@xorcom.com>
 --- a/sounds/sounds.xml
 +++ b/sounds/sounds.xml
-@@ -45,7 +45,6 @@
+@@ -57,7 +57,6 @@
  	</category>
  	<category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
  		<member name="MOH-FREEPLAY-WAV" displayname="FreePlay Music On Hold Files, WAV format" >

debian/patches/hack-multiple-app-voicemail

  ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
 --- a/Makefile.moddir_rules
 +++ b/Makefile.moddir_rules
-@@ -43,7 +43,7 @@ include $(ASTTOPDIR)/Makefile.rules
+@@ -37,7 +37,7 @@ include $(ASTTOPDIR)/Makefile.rules
  # Use MODULE_EXCLUDE to specify additional modules to exclude.
  
  ifneq ($(MODULE_PREFIX),)

debian/patches/hardware_dtmf_mute_fix

 
 --- a/channels/chan_dahdi.c
 +++ b/channels/chan_dahdi.c
-@@ -4710,6 +4710,7 @@ static struct ast_frame *dahdi_handle_ev
+@@ -5717,6 +5717,7 @@ static struct ast_frame *dahdi_handle_ev
  			/* absorb event */
  		} else {
  #endif

debian/patches/make-clean-fixes

 
 --- a/Makefile
 +++ b/Makefile
-@@ -389,7 +389,6 @@ dist-clean: distclean
+@@ -461,7 +461,6 @@ dist-clean: distclean
  
- distclean: $(SUBDIRS_DIST_CLEAN) clean
+ distclean: $(SUBDIRS_DIST_CLEAN) _clean
  	@$(MAKE) -C menuselect dist-clean
 -	@$(MAKE) -C sounds dist-clean
  	rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
  	rm -f makeopts.embed_rules
- 	rm -f config.log config.status
-@@ -399,6 +398,10 @@ distclean: $(SUBDIRS_DIST_CLEAN) clean
+ 	rm -f config.log config.status config.cache
+@@ -471,6 +470,10 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
  	rm -rf doc/api
  	rm -f build_tools/menuselect-deps
  
 +	@$(MAKE) -C sounds dist-clean
 +
  datafiles: _all
- 	if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+ 	if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" bash build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
  # Should static HTTP be installed during make samples or even with its own target ala

debian/patches/safe_asterisk-config

 +CONSOLE=${ASTSAFE_CONSOLE:-yes}         	# Whether or not you want a console
  #NOTIFY=ben@alkaloid.net	# Who to notify about crashes
  #EXEC=/path/to/somescript	# Run this command if Asterisk crashes
- MACHINE=`hostname`			# To specify which machine has crashed when getting the mail
-@@ -85,7 +89,7 @@ ulimit -c unlimited
+ #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 [ -c /dev/tty${TTY} ]; then
  		TTY=tty${TTY}
  	elif [ -c /dev/vc/${TTY} ]; then
-@@ -125,7 +129,7 @@ run_asterisk()
+@@ -152,7 +156,7 @@ run_asterisk()
  {
  	while :; do 
  
 +		if [ "$TTY" != "no" ]; then
  			cd /tmp
  			stty sane < /dev/${TTY}
- 			nice -n $PRIORITY ${ASTSBINDIR}/asterisk -f ${CLIARGS} ${ASTARGS} >& /dev/${TTY} < /dev/${TTY}
+ 			nice -n $PRIORITY ${ASTSBINDIR}/asterisk -f ${CLIARGS} ${ASTARGS} > /dev/${TTY} 2>&1 < /dev/${TTY}