[Pkg-voip-commits] r2169 - in asterisk/branches/sarge/debian: .
patches
Kilian Krause
kilian at costa.debian.org
Thu Aug 3 10:07:05 UTC 2006
Author: kilian
Date: 2006-08-03 10:07:03 +0000 (Thu, 03 Aug 2006)
New Revision: 2169
Added:
asterisk/branches/sarge/debian/asterisk.postrm
asterisk/branches/sarge/debian/asterisk_fix
asterisk/branches/sarge/debian/patches/patch.CVE-2006-2898.dpatch
Removed:
asterisk/branches/sarge/debian/asterisk-bristuff.postinst
asterisk/branches/sarge/debian/asterisk-bristuff.postrm
asterisk/branches/sarge/debian/asterisk-classic.postinst
asterisk/branches/sarge/debian/asterisk-classic.postrm
asterisk/branches/sarge/debian/asterisk-config.postinst
Modified:
asterisk/branches/sarge/debian/NEWS.Debian
asterisk/branches/sarge/debian/asterisk.init
asterisk/branches/sarge/debian/changelog
asterisk/branches/sarge/debian/control
asterisk/branches/sarge/debian/copyright
asterisk/branches/sarge/debian/patches/00list
asterisk/branches/sarge/debian/patches/bristuff.dpatch
asterisk/branches/sarge/debian/rules
Log:
backport 1.2.10 to sarge
Modified: asterisk/branches/sarge/debian/NEWS.Debian
===================================================================
--- asterisk/branches/sarge/debian/NEWS.Debian 2006-08-03 08:45:50 UTC (rev 2168)
+++ asterisk/branches/sarge/debian/NEWS.Debian 2006-08-03 10:07:03 UTC (rev 2169)
@@ -5,3 +5,6 @@
incompatible with the Debian Free Software Guildlines
<http://www.debian.org/social_contract#guidelines>. Please drop your alternative
Music on Hold into the directory /usr/share/asterisk/mohmp3/
+
+The iLBC codec library code has been removed from the Debian asterisk
+package as it does not conform with the DFSG.
Deleted: asterisk/branches/sarge/debian/asterisk-bristuff.postinst
===================================================================
--- asterisk/branches/sarge/debian/asterisk-bristuff.postinst 2006-08-03 08:45:50 UTC (rev 2168)
+++ asterisk/branches/sarge/debian/asterisk-bristuff.postinst 2006-08-03 10:07:03 UTC (rev 2169)
@@ -1,67 +0,0 @@
-#! /bin/sh
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-
-case "$1" in
- configure)
-
- if (getent passwd asterisk >/dev/null);then
- if [ "`getent passwd asterisk|awk -F: '{print $6}'`" = "/var/run/asterisk" ];then
- usermod -d /var/lib/asterisk asterisk
- fi
- else
- adduser --system --group --home /var/lib/asterisk --gecos "Asterisk PBX daemon" asterisk
- adduser asterisk audio
- adduser asterisk dialout
- fi
- if (groups asterisk | grep -w -q -v asterisk); then
- adduser asterisk dialout
- fi
-
- for cdrdir in csv custom; do
- if [ ! -d /var/log/asterisk/cdr-$cdrdir ];then
- mkdir -p /var/log/asterisk/cdr-$cdrdir
- fi
- done
- test -d /var/log/asterisk/ || mkdir -p /var/log/asterisk/
- test -d /var/spool/asterisk/voicemail || mkdir -p /var/spool/asterisk/voicemail
- test -d /var/spool/asterisk/meetme || mkdir -p /var/spool/asterisk/meetme
- test -d /var/lib/asterisk || mkdir -p /var/lib/asterisk
- test -d /etc/asterisk || mkdir -p /etc/asterisk
- chown -R asterisk.asterisk /var/log/asterisk /var/run/asterisk \
- /var/spool/asterisk /var/lib/asterisk /etc/asterisk
- chmod 0660 /etc/asterisk/*.conf
-
- # doing web-vmail foo...
- chown asterisk:www-data /etc/asterisk/voicemail.conf
- chmod 0640 /etc/asterisk/voicemail.conf
-
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
Deleted: asterisk/branches/sarge/debian/asterisk-bristuff.postrm
===================================================================
--- asterisk/branches/sarge/debian/asterisk-bristuff.postrm 2006-08-03 08:45:50 UTC (rev 2168)
+++ asterisk/branches/sarge/debian/asterisk-bristuff.postrm 2006-08-03 10:07:03 UTC (rev 2169)
@@ -1,9 +0,0 @@
-#! /bin/sh -e
-
-if [ "$1" = purge ]; then
- userdel -r asterisk 2>/dev/null || true
- rm -fR /var/log/asterisk
-
-fi
-
-#DEBHELPER#
Deleted: asterisk/branches/sarge/debian/asterisk-classic.postinst
===================================================================
--- asterisk/branches/sarge/debian/asterisk-classic.postinst 2006-08-03 08:45:50 UTC (rev 2168)
+++ asterisk/branches/sarge/debian/asterisk-classic.postinst 2006-08-03 10:07:03 UTC (rev 2169)
@@ -1,67 +0,0 @@
-#! /bin/sh
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-
-case "$1" in
- configure)
-
- if (getent passwd asterisk >/dev/null);then
- if [ "`getent passwd asterisk|awk -F: '{print $6}'`" = "/var/run/asterisk" ];then
- usermod -d /var/lib/asterisk asterisk
- fi
- else
- adduser --system --group --home /var/lib/asterisk --gecos "Asterisk PBX daemon" asterisk
- adduser asterisk audio
- adduser asterisk dialout
- fi
- if (groups asterisk | grep -w -q -v asterisk); then
- adduser asterisk dialout
- fi
-
- for cdrdir in csv custom; do
- if [ ! -d /var/log/asterisk/cdr-$cdrdir ];then
- mkdir -p /var/log/asterisk/cdr-$cdrdir
- fi
- done
- test -d /var/log/asterisk/ || mkdir -p /var/log/asterisk/
- test -d /var/spool/asterisk/voicemail || mkdir -p /var/spool/asterisk/voicemail
- test -d /var/spool/asterisk/meetme || mkdir -p /var/spool/asterisk/meetme
- test -d /var/lib/asterisk || mkdir -p /var/lib/asterisk
- test -d /etc/asterisk || mkdir -p /etc/asterisk
- chown -R asterisk.asterisk /var/log/asterisk /var/run/asterisk \
- /var/spool/asterisk /var/lib/asterisk /etc/asterisk
- chmod 0660 /etc/asterisk/*.conf
-
- # doing web-vmail foo...
- chown asterisk:www-data /etc/asterisk/voicemail.conf
- chmod 0640 /etc/asterisk/voicemail.conf
-
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
Deleted: asterisk/branches/sarge/debian/asterisk-classic.postrm
===================================================================
--- asterisk/branches/sarge/debian/asterisk-classic.postrm 2006-08-03 08:45:50 UTC (rev 2168)
+++ asterisk/branches/sarge/debian/asterisk-classic.postrm 2006-08-03 10:07:03 UTC (rev 2169)
@@ -1,9 +0,0 @@
-#! /bin/sh -e
-
-if [ "$1" = purge ]; then
- userdel -r asterisk 2>/dev/null || true
- rm -fR /var/log/asterisk
-
-fi
-
-#DEBHELPER#
Deleted: asterisk/branches/sarge/debian/asterisk-config.postinst
===================================================================
--- asterisk/branches/sarge/debian/asterisk-config.postinst 2006-08-03 08:45:50 UTC (rev 2168)
+++ asterisk/branches/sarge/debian/asterisk-config.postinst 2006-08-03 10:07:03 UTC (rev 2169)
@@ -1,61 +0,0 @@
-#! /bin/sh
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-
-case "$1" in
- configure)
-
- if (getent passwd asterisk >/dev/null);then
- if [ "`getent passwd asterisk|awk -F: '{print $6}'`" = "/var/run/asterisk" ];then
- usermod -d /var/lib/asterisk asterisk
- fi
- else
- adduser --system --group --home /var/lib/asterisk --gecos "Asterisk PBX daemon" asterisk
- adduser asterisk audio
- adduser asterisk dialout
- fi
- if (groups asterisk | grep -w -q -v asterisk); then
- adduser asterisk dialout
- fi
-
- test -d /var/log/asterisk || mkdir -p /var/log/asterisk
- test -d /var/lib/asterisk || mkdir -p /var/lib/asterisk
- test -d /etc/asterisk || mkdir -p /etc/asterisk
- test -d /var/spool/asterisk/ || mkdir -p /var/spool/asterisk/
- chown -R asterisk.asterisk /var/log/asterisk /var/run/asterisk \
- /var/spool/asterisk /var/lib/asterisk /etc/asterisk
- chmod 0660 /etc/asterisk/*.conf
-
- # doing web-vmail foo...
- [ -f /etc/asterisk/voicemail.conf ] && chown asterisk:www-data /etc/asterisk/voicemail.conf
- [ -f /etc/asterisk/voicemail.conf ] && chmod 0640 /etc/asterisk/voicemail.conf
-
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
Modified: asterisk/branches/sarge/debian/asterisk.init
===================================================================
--- asterisk/branches/sarge/debian/asterisk.init 2006-08-03 08:45:50 UTC (rev 2168)
+++ asterisk/branches/sarge/debian/asterisk.init 2006-08-03 10:07:03 UTC (rev 2169)
@@ -24,12 +24,11 @@
DESC="Asterisk PBX"
PIDFILE="/var/run/asterisk/asterisk.pid"
ASTSAFE_PIDFILE="/var/run/asterisk/asterisk_safe.pid"
-UMASK=007 # by default
# by default: use real-time priority
PARAMS=""
AST_REALTIME="yes"
-RUNASTERISK="yes"
+RUNASTERISK="no"
if [ -r /etc/default/$NAME ]; then . /etc/default/$NAME; fi
if [ "$RUNASTERISK" != "yes" ];then
@@ -47,7 +46,7 @@
echo "Error: empty USER name"
exit 1
fi
-if [ "`id -u "$USER"`" = 0 ]
+if [ `id -u "$USER"` = 0 ]
then
echo "Starting as root not supported."
exit 1
@@ -68,11 +67,6 @@
test -x $DAEMON || exit 0
-if [ "$UMASK" != '' ]
-then
- umask $UMASK
-fi
-
set -e
status() {
@@ -176,8 +170,7 @@
;;
*)
N=/etc/init.d/$NAME
- # echo "Usage: $N {start|stop|restart|reload|logger-reload|extensions-reload|force-reload}" >&2
- echo "Usage: $N {start|stop|status|debug|restart|force-reload|zaptel-fix}" >&2
+ echo "Usage: $N {start|stop|restart|reload|status|debug|logger-reload|extensions-reload|force-reload}" >&2
exit 1
;;
esac
Added: asterisk/branches/sarge/debian/asterisk.postrm
===================================================================
--- asterisk/branches/sarge/debian/asterisk.postrm 2006-08-03 08:45:50 UTC (rev 2168)
+++ asterisk/branches/sarge/debian/asterisk.postrm 2006-08-03 10:07:03 UTC (rev 2169)
@@ -0,0 +1,9 @@
+#! /bin/sh -e
+
+if [ "$1" = purge ]; then
+ userdel -r asterisk 2>/dev/null || true
+ rm -fR /var/log/asterisk
+
+fi
+
+#DEBHELPER#
Added: asterisk/branches/sarge/debian/asterisk_fix
===================================================================
--- asterisk/branches/sarge/debian/asterisk_fix 2006-08-03 08:45:50 UTC (rev 2168)
+++ asterisk/branches/sarge/debian/asterisk_fix 2006-08-03 10:07:03 UTC (rev 2169)
@@ -0,0 +1,53 @@
+#! /bin/sh -x
+
+if getent passwd asterisk >/dev/null ;then
+ # Some halfbaked Sarge versions needed their home dir fixed:
+ if [ "`getent passwd asterisk|awk -F: '{print $6}'`" = \
+ "/var/run/asterisk" ];then
+ usermod -d /var/lib/asterisk asterisk
+ fi
+else
+ adduser --system --group --home /var/lib/asterisk \
+ --gecos "Asterisk PBX daemon" asterisk
+fi
+
+for group in dialout audio; do
+ if groups asterisk | grep -w -q -v $group; then
+ adduser asterisk $group
+ fi
+done
+
+test -d /var/log/asterisk || mkdir -p /var/log/asterisk
+test -d /var/lib/asterisk || mkdir -p /var/lib/asterisk
+test -d /etc/asterisk || mkdir -p /etc/asterisk
+test -d /var/spool/asterisk/ || mkdir -p /var/spool/asterisk/
+chown -R asterisk.asterisk \
+ /var/log/asterisk \
+ /var/run/asterisk \
+ /var/spool/asterisk \
+ /var/lib/asterisk \
+ /etc/asterisk
+
+# files need to be RW by the group
+# dirs need to a+rx
+#chmod -R 0664 /etc/asterisk/
+#find /etc/asterisk/ -type d | xargs chmod a+rx
+#chmod +t /etc/asterisk/
+
+# this is needed because othewise sqlite cannot write to the DB
+#chmod -R 0660 /var/lib/asterisk/
+
+####################################
+# TODO:
+#
+# the real setup should be :
+# if asterisk is not running - start it (restart can deal with that)
+# otherwise reload.
+# reload may fail, but start should not (it will be run on fist install only)
+#
+# Some changes are not fixed by a reload: e.g: adding/removing modules.
+# However a restart disconnects all calls in the pbx
+#
+# for simplicity, we just restart it by force right now.
+# may fail if the package asterisk is not yet configured.
+invoke-rc.d asterisk restart || true
Property changes on: asterisk/branches/sarge/debian/asterisk_fix
___________________________________________________________________
Name: svn:executable
+ *
Modified: asterisk/branches/sarge/debian/changelog
===================================================================
--- asterisk/branches/sarge/debian/changelog 2006-08-03 08:45:50 UTC (rev 2168)
+++ asterisk/branches/sarge/debian/changelog 2006-08-03 10:07:03 UTC (rev 2169)
@@ -1,10 +1,36 @@
-asterisk (1:1.2.9.1.dfsg-1) UNRELEASED; urgency=high
+asterisk (1:1.2.10.dfsg-3) UNRELEASED; urgency=low
- * NOT RELEASED YET
- * Sarge backport.
- * New upstream release. [CVE-2006-2898]
+ * Unofficial pkg-voip Sarge backport
+ -- Kilian Krause <kilian at debian.org> Thu, 3 Aug 2006 12:04:00 +0200
+
+asterisk (1:1.2.10.dfsg-2) unstable; urgency=high
+
+ * IAX2 channel driver security patch [CVE-2006-2898]
+ - CVE-2006-2898: Denial of service in Asterisk (Closes: #380054)
+
+ -- Mark Purcell <msp at debian.org> Thu, 27 Jul 2006 08:09:47 +0100
+
+asterisk (1:1.2.10.dfsg-1) unstable; urgency=low
+
+ [ Tzafrir Cohen ]
+ * New upstream release.
+ * bristuff.dpatch updated for the new version.
+ * dfsg tarball also removes ilbc.
+ * Cleanups to asterisk_fix
+
[ Mark Purcell ]
+ * Build-Depends: libpri-dev (>= 1.2.3-1)
+ * Fixes:
+ - Please package version 1.2.9.1 (Closes: #372527)
+
+ -- Mark Purcell <msp at debian.org> Mon, 17 Jul 2006 21:15:50 +0100
+
+asterisk (1:1.2.9.1.dfsg-1) unstable; urgency=high
+
+ * New upstream release. [CVE-2006-2898]
+
+ [ Mark Purcell ]
* Update debian/watch for numeric upstream versions
[ Kilian Krause ]
@@ -19,15 +45,25 @@
* bristuff 0.3.0-PRE1q (gsm functionality missing: needs libgstam)
* sys_readline.dpatch: Realine support in the CLI. TODO: tab completion
* sys_editline.dpatch: alternativly, simply use the system version of
- editline (not used).
+ editline (not used).
* func_odbc_12.dpatch: backport of func_odbc (Closes: #364633)
* brazilian_syntax.dpatch (using "pt_BR")
* vm_he.dpatch: Hebrew in app_voicemail
* The data_dir patch also moves agi-bin/ and firmware/
* option_detach: using -F instead of -D (the same as upstream)
+ * asterisk.init: added "zaptel-fix" to unload and reload zaptel modules
- -- Kilian Krause <kilian at debian.org> Sat, 10 Jun 2006 15:12:11 +0200
+ -- Kilian Krause <kilian at debian.org> Fri, 16 Jun 2006 18:04:50 +0000
+asterisk (1:1.2.7.1.dfsg-3) unstable; urgency=high
+
+ * Urgency high as this is a security fix [CVE-2006-2898]
+ * Added 99_CVE-2006-2898.dpatch from Joey Schulze
+ - Fixes: Bug in the IAX2 channel allows remote attackers to craft
+ a denial of service.
+
+ -- Mark Purcell <msp at debian.org> Tue, 13 Jun 2006 05:11:44 +0100
+
asterisk (1:1.2.7.1.dfsg-2) unstable; urgency=high
[ Kilian Krause ]
Modified: asterisk/branches/sarge/debian/control
===================================================================
--- asterisk/branches/sarge/debian/control 2006-08-03 08:45:50 UTC (rev 2168)
+++ asterisk/branches/sarge/debian/control 2006-08-03 10:07:03 UTC (rev 2169)
@@ -4,7 +4,7 @@
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Simon Richter <sjr at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libgtk1.2-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libzap-dev, libtonezone-dev (>= 1:1.2.3-1), bison, libasound2-dev, postgresql-dev, unixodbc-dev, libpri-dev (>= 1.2.2-1), dpatch (>= 2.0.10), zaptel-source (>= 1:1.2.3-1), autotools-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl3-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1)
+Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libgtk1.2-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libzap-dev, libtonezone-dev (>= 1:1.2.3-1), bison, libasound2-dev, postgresql-dev, unixodbc-dev, libpri-dev (>= 1.2.3-1), dpatch (>= 2.0.10), zaptel-source (>= 1:1.2.3-1), autotools-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl3-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1)
Package: asterisk
Architecture: all
Modified: asterisk/branches/sarge/debian/copyright
===================================================================
--- asterisk/branches/sarge/debian/copyright 2006-08-03 08:45:50 UTC (rev 2168)
+++ asterisk/branches/sarge/debian/copyright 2006-08-03 10:07:03 UTC (rev 2169)
@@ -9,11 +9,14 @@
Debian asterisk-xxx.dfsg.tar.gz
===============================
-The Debian version of the upstream asterisk source has had the fpm Music on Hold
-removed as this music has only been licenced for use within asterisk which is
-incompatible with the Debian Free Software Guildlines
+The Debian version of the upstream asterisk source has had the fpm Music
+on Hold removed as this music has only been licenced for use within
+asterisk which is incompatible with the Debian Free Software Guildlines (DFSG)
<http://www.debian.org/social_contract#guidelines>.
+The iLBC codec library code has been removed from the Debian asterisk
+package as it does not conform with the DFSG.
+
Copyright:
Copyright (C) 2001-2004 Digium and others....
Modified: asterisk/branches/sarge/debian/patches/00list
===================================================================
--- asterisk/branches/sarge/debian/patches/00list 2006-08-03 08:45:50 UTC (rev 2168)
+++ asterisk/branches/sarge/debian/patches/00list 2006-08-03 10:07:03 UTC (rev 2169)
@@ -1,3 +1,4 @@
+patch.CVE-2006-2898.dpatch
# ukcid probably conflicts with bristuff
ukcid
option_detach
Modified: asterisk/branches/sarge/debian/patches/bristuff.dpatch
===================================================================
--- asterisk/branches/sarge/debian/patches/bristuff.dpatch 2006-08-03 08:45:50 UTC (rev 2168)
+++ asterisk/branches/sarge/debian/patches/bristuff.dpatch 2006-08-03 10:07:03 UTC (rev 2169)
@@ -10,8 +10,8 @@
--- asterisk-1.2.9.1.orig/.version 2006-06-06 18:19:31.000000000 +0200
+++ asterisk-1.2.9.1/.version 2006-06-09 10:25:16.000000000 +0200
@@ -1 +1 @@
--1.2.9.1
-+1.2.9.1-BRIstuffed-0.3.0-PRE-1q
+-1.2.10
++1.2.10-BRIstuffed-0.3.0-PRE-1q
diff -urN asterisk-1.2.9.1.orig/HARDWARE asterisk-1.2.9.1/HARDWARE
--- asterisk-1.2.9.1.orig/HARDWARE 2005-11-29 19:24:39.000000000 +0100
+++ asterisk-1.2.9.1/HARDWARE 2006-06-09 10:25:04.000000000 +0200
@@ -6039,13 +6039,14 @@
/*! \brief sip_do_history: Enable SIP History logging (CLI) ---*/
static int sip_do_history(int fd, int argc, char *argv[])
{
-@@ -9597,12 +9759,13 @@
+@@ -9597,13 +9759,14 @@
check_pendings(p);
ast_set_flag(p, SIP_CAN_BYE);
break;
+ case 183:
case 180: /* 180 Ringing */
- sip_cancel_destroy(p);
+ if (!ignore)
+ sip_cancel_destroy(p);
if (!ignore && p->owner) {
ast_queue_control(p->owner, AST_CONTROL_RINGING);
if (p->owner->_state != AST_STATE_UP)
@@ -6054,12 +6055,13 @@
}
if (find_sdp(req)) {
process_sdp(p, req);
-@@ -9616,21 +9779,6 @@
+@@ -9616,22 +9779,6 @@
check_pendings(p);
ast_set_flag(p, SIP_CAN_BYE);
break;
- case 183: /* Session progress */
-- sip_cancel_destroy(p);
+- if (!ignore)
+- sip_cancel_destroy(p);
- /* Ignore 183 Session progress without SDP */
- if (find_sdp(req)) {
- process_sdp(p, req);
@@ -6074,8 +6076,8 @@
- ast_set_flag(p, SIP_CAN_BYE);
- break;
case 200: /* 200 OK on invite - someone's answering our call */
- sip_cancel_destroy(p);
- p->authtries = 0;
+ if (!ignore)
+ sip_cancel_destroy(p);
@@ -10424,9 +10572,18 @@
/* This is a call to ourself. Send ourselves an error code and stop
processing immediately, as SIP really has no good mechanism for
@@ -6109,10 +6111,10 @@
@@ -10666,9 +10824,74 @@
res = get_refer_info(p, req);
if (res < 0)
- transmit_response_with_allow(p, "404 Not Found", req, 1);
+ transmit_response(p, "603 Declined", req);
- else if (res > 0)
+ else if (res == 1)
- transmit_response_with_allow(p, "484 Address Incomplete", req, 1);
+ transmit_response(p, "484 Address Incomplete", req);
- else {
+ else if (res == 2) {
+ transmit_response(p, "202 Accepted", req);
@@ -7728,9 +7730,9 @@
}
+ // ast_log(LOG_NOTICE, "name = %s condition = %d index = %d (%d) zfd = %d res = %d\n",chan->name, condition, index, SUB_REAL, p->subs[index].zfd, res);
+
- #if 0
- printf("nextidle: %d, haveidles: %d, minunsed: %d\n",
- nextidle, haveidles, minunused);
+ if (nextidle > -1) {
+ if (ast_tvdiff_ms(ast_tvnow(), lastidle) > 1000) {
+ /* Don't create a new idle call more than once per second */
@@ -8209,9 +8822,36 @@
if (x == ZT_EVENT_ALARM) {
pri->dchanavail[which] &= ~(DCHAN_NOTINALARM | DCHAN_UP);
Added: asterisk/branches/sarge/debian/patches/patch.CVE-2006-2898.dpatch
===================================================================
--- asterisk/branches/sarge/debian/patches/patch.CVE-2006-2898.dpatch 2006-08-03 08:45:50 UTC (rev 2168)
+++ asterisk/branches/sarge/debian/patches/patch.CVE-2006-2898.dpatch 2006-08-03 10:07:03 UTC (rev 2169)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_CVE-2006-2898.dpatch by Joey Schulze <joey at debian.org>
+##
+## DP: Bug in the IAX2 channel allows remote attackers to craft
+## DP: a denial of service.
+
+ at DPATCH@
+diff -urNad asterisk-1.2.10.dfsg~/channels/chan_iax2.c asterisk-1.2.10.dfsg/channels/chan_iax2.c
+--- asterisk-1.2.10.dfsg~/channels/chan_iax2.c 2006-07-12 16:23:59.000000000 +0100
++++ asterisk-1.2.10.dfsg/channels/chan_iax2.c 2006-07-27 08:17:52.000000000 +0100
+@@ -6531,7 +6531,7 @@
+ if (iaxdebug && (res >= sizeof(*fh)))
+ iax_showframe(NULL, fh, 1, &sin, res - sizeof(*fh));
+ #endif
+- if (ntohs(mh->callno) & IAX_FLAG_FULL) {
++ if ((res >= sizeof(*fh)) && ntohs(mh->callno) & IAX_FLAG_FULL) {
+ if (res < sizeof(*fh)) {
+ ast_log(LOG_WARNING, "Rejecting packet from '%s.%d' that is flagged as a full frame but is too short\n", ast_inet_ntoa(iabuf, sizeof(iabuf), sin.sin_addr), ntohs(sin.sin_port));
+ return 1;
Modified: asterisk/branches/sarge/debian/rules
===================================================================
--- asterisk/branches/sarge/debian/rules 2006-08-03 08:45:50 UTC (rev 2168)
+++ asterisk/branches/sarge/debian/rules 2006-08-03 10:07:03 UTC (rev 2169)
@@ -19,7 +19,7 @@
export PROC := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-MAKEFLAGS = OPTIMIZE=-O2
+MAKEFLAGS = OPTIMIZE=-O2 MAKECMDGOALS=dont-optimize
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
@@ -104,7 +104,9 @@
# It's ok not to do anything here, if you don't need to build
# anything for this package.
#/usr/bin/docbook-to-man debian/asterisk.sgml > asterisk.1
+ifndef ASTERISK_NO_DOCS
$(MAKE) progdocs
+endif
touch $@
@@ -222,6 +224,7 @@
@@cd ../tarballs/asterisk-$(UPVERSION).tmp ; \
tar xfz ../$(UPFILENAME)
@@find ../tarballs/asterisk-$(UPVERSION).tmp -type f -name 'fpm-*.mp3'|xargs -r rm
+ @@rm -rf ../tarballs/asterisk-$(UPVERSION).tmp/asterisk-$(UPVERSION)/codecs/ilbc
@@cd ../tarballs/asterisk-$(UPVERSION).tmp ; \
tar cfz ../$(FILENAME) *
@@echo Cleaning up...
More information about the Pkg-voip-commits
mailing list