[Pkg-voip-commits] r7462 - in /asterisk/trunk/debian/patches: allow-tilde-destdir dahdi-fxsks-hookstate dahdi_pri_debug_spannums dahdi_ptmp_nt debian-banner disable_moh hack-multiple-app-voicemail hardware_dtmf_mute_fix make-clean-fixes safe_asterisk-config
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Mon Jul 27 21:02:47 UTC 2009
Author: paravoid
Date: Mon Jul 27 21:02:46 2009
New Revision: 7462
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7462
Log:
Do a quilt refresh on all patches
Modified:
asterisk/trunk/debian/patches/allow-tilde-destdir
asterisk/trunk/debian/patches/dahdi-fxsks-hookstate
asterisk/trunk/debian/patches/dahdi_pri_debug_spannums
asterisk/trunk/debian/patches/dahdi_ptmp_nt
asterisk/trunk/debian/patches/debian-banner
asterisk/trunk/debian/patches/disable_moh
asterisk/trunk/debian/patches/hack-multiple-app-voicemail
asterisk/trunk/debian/patches/hardware_dtmf_mute_fix
asterisk/trunk/debian/patches/make-clean-fixes
asterisk/trunk/debian/patches/safe_asterisk-config
Modified: asterisk/trunk/debian/patches/allow-tilde-destdir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/allow-tilde-destdir?rev=7462&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/allow-tilde-destdir (original)
+++ asterisk/trunk/debian/patches/allow-tilde-destdir Mon Jul 27 21:02:46 2009
@@ -10,7 +10,7 @@
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:
Modified: asterisk/trunk/debian/patches/dahdi-fxsks-hookstate
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/dahdi-fxsks-hookstate?rev=7462&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/dahdi-fxsks-hookstate (original)
+++ asterisk/trunk/debian/patches/dahdi-fxsks-hookstate Mon Jul 27 21:02:46 2009
@@ -12,7 +12,7 @@
--- 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... */
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=7462&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/dahdi_pri_debug_spannums (original)
+++ asterisk/trunk/debian/patches/dahdi_pri_debug_spannums Mon Jul 27 21:02:46 2009
@@ -6,7 +6,7 @@
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);
@@ -15,7 +15,7 @@
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);
Modified: asterisk/trunk/debian/patches/dahdi_ptmp_nt
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/dahdi_ptmp_nt?rev=7462&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/dahdi_ptmp_nt (original)
+++ asterisk/trunk/debian/patches/dahdi_ptmp_nt Mon Jul 27 21:02:46 2009
@@ -6,7 +6,7 @@
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")) {
Modified: asterisk/trunk/debian/patches/debian-banner
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/debian-banner?rev=7462&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/debian-banner (original)
+++ asterisk/trunk/debian/patches/debian-banner Mon Jul 27 21:02:46 2009
@@ -3,7 +3,7 @@
--- 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" \
Modified: asterisk/trunk/debian/patches/disable_moh
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/disable_moh?rev=7462&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/disable_moh (original)
+++ asterisk/trunk/debian/patches/disable_moh Mon Jul 27 21:02:46 2009
@@ -5,7 +5,7 @@
Tzafrir Cohen <tzafrir.cohen at 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" >
Modified: asterisk/trunk/debian/patches/hack-multiple-app-voicemail
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/hack-multiple-app-voicemail?rev=7462&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/hack-multiple-app-voicemail (original)
+++ asterisk/trunk/debian/patches/hack-multiple-app-voicemail Mon Jul 27 21:02:46 2009
@@ -56,7 +56,7 @@
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),)
Modified: asterisk/trunk/debian/patches/hardware_dtmf_mute_fix
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/hardware_dtmf_mute_fix?rev=7462&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/hardware_dtmf_mute_fix (original)
+++ asterisk/trunk/debian/patches/hardware_dtmf_mute_fix Mon Jul 27 21:02:46 2009
@@ -5,7 +5,7 @@
--- 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
Modified: asterisk/trunk/debian/patches/make-clean-fixes
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/make-clean-fixes?rev=7462&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/make-clean-fixes (original)
+++ asterisk/trunk/debian/patches/make-clean-fixes Mon Jul 27 21:02:46 2009
@@ -8,15 +8,15 @@
--- 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
@@ -25,5 +25,5 @@
+ @$(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
Modified: asterisk/trunk/debian/patches/safe_asterisk-config
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/safe_asterisk-config?rev=7462&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/safe_asterisk-config (original)
+++ asterisk/trunk/debian/patches/safe_asterisk-config Mon Jul 27 21:02:46 2009
@@ -22,8 +22,8 @@
+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
- 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=""
@@ -32,7 +32,7 @@
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
@@ -40,4 +40,4 @@
+ 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}
More information about the Pkg-voip-commits
mailing list