[Pkg-voip-commits] r1642 - in asterisk: branches/sarge/debian branches/sarge/debian/patches trunk/debian

Kilian Krause kilian at costa.debian.org
Fri Apr 21 20:47:10 UTC 2006 

Author: kilian
Date: 2006-04-21 20:47:09 +0000 (Fri, 21 Apr 2006)
New Revision: 1642

Removed:
   asterisk/branches/sarge/debian/TODO.Debian
   asterisk/branches/sarge/debian/patches/60_debian-libopenh323.dpatch
   asterisk/branches/sarge/debian/patches/70_debian-libpe-fe.dpatch
   asterisk/branches/sarge/debian/patches/Makefile_install_no1234.dpatch
   asterisk/branches/sarge/debian/patches/app_queue.memleakfix.dpatch
   asterisk/branches/sarge/debian/patches/chan-modem.dpatch
Modified:
   asterisk/branches/sarge/debian/NEWS.Debian
   asterisk/branches/sarge/debian/README.Debian
   asterisk/branches/sarge/debian/asterisk-bristuff.postinst
   asterisk/branches/sarge/debian/asterisk-classic.asterisk.init
   asterisk/branches/sarge/debian/asterisk-classic.postinst
   asterisk/branches/sarge/debian/asterisk-config.postinst
   asterisk/branches/sarge/debian/changelog
   asterisk/branches/sarge/debian/control
   asterisk/branches/sarge/debian/patches/00list
   asterisk/branches/sarge/debian/patches/95_conf_sample.dpatch
   asterisk/trunk/debian/changelog
Log:
include #36419 acknowledge and update sarge backports


Modified: asterisk/branches/sarge/debian/NEWS.Debian
===================================================================
--- asterisk/branches/sarge/debian/NEWS.Debian	2006-04-21 17:26:49 UTC (rev 1641)
+++ asterisk/branches/sarge/debian/NEWS.Debian	2006-04-21 20:47:09 UTC (rev 1642)
@@ -1,9 +1,3 @@
-H.323 support moved towards asterisk-oh323
-==========================================
-The asterisk source package no longer includes support for H323, but only for
-SIP and IAX (v1 and v2). The H323 support was reported to be mostly broken
-anyway, so please try asterisk-oh323 as a replacement for chan_h323.
-
 Debian asterisk-xxx.dfsg.tar.gz
 ===============================
 The Debian version of the upstream asterisk source has had the fpm Music on Hold

Modified: asterisk/branches/sarge/debian/README.Debian
===================================================================
--- asterisk/branches/sarge/debian/README.Debian	2006-04-21 17:26:49 UTC (rev 1641)
+++ asterisk/branches/sarge/debian/README.Debian	2006-04-21 20:47:09 UTC (rev 1642)
@@ -41,21 +41,6 @@
 files first.
 
 
-External Libraries
-==================
-The package no longer includes support for H.323, but for SIP and IAX (v1 and
-v2). The H.323 support was often reported to be mostly broken, so please try
-asterisk-oh323 for your asterisk configuration.
-
-
-Enabling bristuff support
-=========================
-If you wish to enable the bristuff support (when rebuilding this package
-from source), unrem the patches bristuff and libpri_bristuffed in 
-debian/patches/00list. Also rem-out option_detach in the same file, as it
-conflicts with bristuff (both want to change the getopts line).
-
-
 Getting started with config and more features
 =============================================
 Of course the default config is far from a plug'n'play for every environment.

Deleted: asterisk/branches/sarge/debian/TODO.Debian
===================================================================
--- asterisk/branches/sarge/debian/TODO.Debian	2006-04-21 17:26:49 UTC (rev 1641)
+++ asterisk/branches/sarge/debian/TODO.Debian	2006-04-21 20:47:09 UTC (rev 1642)
@@ -1,24 +0,0 @@
-Asterisk/Zaptel/ libpri Debian versioning roadmap
-=================================================
-Thu Oct 20 18:19:18 BST 2005
-
-asterisk:
-1:1.2.0-beta1.dfsg-1	-> experimental
-1:1.2.0-beta1.dfsg-2	-> experimental (if debian makes changes)
-1:1.2.0-beta2.dfsg-1	-> experimental (if upstream beta release)
-1:1.2.0-rc1.dfsg-1	-> experimental (if upstream RC release)
-1:1.2.0-rc2.dfsg-1	-> experimental
-[...]
-1:1.2.0.dfsg-1		-> unstable (when upstream final release)
-1:1.2.0.dfsg-2		-> unstable (when debian release)
-
-zaptel/ libpri:
-1.2.0-0beta1-1		-> already uploaded to expiermenal
-1.2.0-0beta1-2		-> experimental (next debian release)
-1.2.0-beta2-1		-> experimental (upstream next beta release)
-1.2.0-rc1-1		-> experimental (upstream RC release)
-[...]
-1.2.0-1			-> unstable (-b when upstream makes final release)
-1.2.0-cvs2005xxxx-1	-> experimental (to fixup versioning)
-
-Mark Purcell <msp at debian.org>

Modified: asterisk/branches/sarge/debian/asterisk-bristuff.postinst
===================================================================
--- asterisk/branches/sarge/debian/asterisk-bristuff.postinst	2006-04-21 17:26:49 UTC (rev 1641)
+++ asterisk/branches/sarge/debian/asterisk-bristuff.postinst	2006-04-21 20:47:09 UTC (rev 1642)
@@ -27,11 +27,12 @@
 		adduser asterisk dialout
 	fi
 
-	for cdrdir in cvs custom; do 
+	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

Modified: asterisk/branches/sarge/debian/asterisk-classic.asterisk.init
===================================================================
--- asterisk/branches/sarge/debian/asterisk-classic.asterisk.init	2006-04-21 17:26:49 UTC (rev 1641)
+++ asterisk/branches/sarge/debian/asterisk-classic.asterisk.init	2006-04-21 20:47:09 UTC (rev 1642)
@@ -32,7 +32,7 @@
 
 if [ "$RUNASTERISK" != "yes" ];then
 	echo "Asterisk not yet configured. Edit /etc/default/asterisk first."
-	exit 1
+	exit 0
 fi
 
 if [ "$AST_REALTIME" != "no" ]

Modified: asterisk/branches/sarge/debian/asterisk-classic.postinst
===================================================================
--- asterisk/branches/sarge/debian/asterisk-classic.postinst	2006-04-21 17:26:49 UTC (rev 1641)
+++ asterisk/branches/sarge/debian/asterisk-classic.postinst	2006-04-21 20:47:09 UTC (rev 1642)
@@ -27,11 +27,12 @@
 		adduser asterisk dialout
 	fi
 
-	for cdrdir in cvs custom; do 
+	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

Modified: asterisk/branches/sarge/debian/asterisk-config.postinst
===================================================================
--- asterisk/branches/sarge/debian/asterisk-config.postinst	2006-04-21 17:26:49 UTC (rev 1641)
+++ asterisk/branches/sarge/debian/asterisk-config.postinst	2006-04-21 20:47:09 UTC (rev 1642)
@@ -27,8 +27,10 @@
 		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

Modified: asterisk/branches/sarge/debian/changelog
===================================================================
--- asterisk/branches/sarge/debian/changelog	2006-04-21 17:26:49 UTC (rev 1641)
+++ asterisk/branches/sarge/debian/changelog	2006-04-21 20:47:09 UTC (rev 1642)
@@ -1,6 +1,17 @@
-asterisk (1:1.2.7.1.dfsg-1) UNRELEASED; urgency=low
+asterisk (1:1.2.7.1.dfsg-2) UNRELEASED; urgency=high
 
-  * NOT RELEASED YET (unofficial sarge backport for pkg-voip)
+  [ Mark Purcell ]
+  * NOT RELEASED YET
+
+  [ Kilian Krause ]
+  * Urgency bumped since 1.2.7 is a security update [CVE-2006-1827]
+    (Closes: #364195)
+
+ -- Kilian Krause <kilian at debian.org>  Fri, 21 Apr 2006 22:41:40 +0200
+
+asterisk (1:1.2.7.1.dfsg-1) unstable; urgency=low
+
+  [ Tzafrir Cohen ]
   * New upstream release.
   * nomarch.dpatch: removed the patching to internal libgsm, as we don't use
     it (and it broke in this version)
@@ -13,8 +24,26 @@
   * backport_playdtmf.dpatch: a harmless backport (no impact if not used)
   * completed the merge of logrotate and init.d scripts
 
- -- Kilian Krause <kilian at debian.org>  Fri, 14 Apr 2006 12:41:33 +0200
+  [ Lionel Elie Mamane ]
+  * When not running asterisk, do it successfully, not by failure.
+    (closes: #360234)
+  * Create /var/log/asterisk/cdr-csv, not cdr-cvs.
 
+  [ Mark Purcell ]
+  * Update debian/control for asterisk-h323 package description
+  * Create /var/spool/asterisk & /var/lib/asterisk in debian/*.postinst
+  * New upstream release. Fixes:
+    - Version 1.2.5 is out (Closes: #355299)
+    - since 1.2.0 no chan_modem (Closes: #343232)
+    - Undefined symbol in chan_zap.so (Closes: #339559)
+    - Unapplying patches fail (Closes: #345676)
+    - utils.c:619 tvfix: warning negative timestamp... (Closes: #347929)
+    - creates /.asterisk_history on reboot (Closes: #307218)
+  * h323 modules can be unstable so dont load my default
+  * Cleanup debian/patches to remove obsolete/ old patches
+
+ -- Mark Purcell <msp at debian.org>  Fri, 21 Apr 2006 17:33:31 +0100
+
 asterisk (1:1.2.6.dfsg-1) unstable; urgency=low
 
   * New upstream release. (Closes: #355299)

Modified: asterisk/branches/sarge/debian/control
===================================================================
--- asterisk/branches/sarge/debian/control	2006-04-21 17:26:49 UTC (rev 1641)
+++ asterisk/branches/sarge/debian/control	2006-04-21 20:47:09 UTC (rev 1642)
@@ -104,8 +104,7 @@
  This package provided h323 support for the Asterisk Open Source PBX system.
  .
  It was separated out into its own package to avoid having the main package
- depend on the many openh323 dependencies. For now asterisk-oh323 replaces this
- version until chan_h323 does support the current OpenH323 version again.
+ depend on the many openh323 dependencies.
 
 Package: asterisk-doc
 Recommends: asterisk

Modified: asterisk/branches/sarge/debian/patches/00list
===================================================================
--- asterisk/branches/sarge/debian/patches/00list	2006-04-21 17:26:49 UTC (rev 1641)
+++ asterisk/branches/sarge/debian/patches/00list	2006-04-21 20:47:09 UTC (rev 1642)
@@ -1,21 +1,11 @@
-#bristuff
-#libpri_bristuffed
 # ukcid probably conflicts with bristuff
 ukcid
-#Makefile_install_no1234
 option_detach
 30_ast-data-dir.dpatch
 40_initgroups.dpatch
 50_debian-libgsm.dpatch
-# needs to be resorected:
-#60_debian-libopenh323.dpatch
-# app_sql_postgres seems "obsolete" and not used by default:
-#70_debian-libpe-fe.dpatch
 95_conf_sample.dpatch
 98_fpm-sounds.dpatch
-##08_debian-zaptel.dpatch
-#chan-modem.dpatch
-#app_queue.memleakfix.dpatch
 pubkey_jnctn
 nomarch
 nooptimize

Deleted: asterisk/branches/sarge/debian/patches/60_debian-libopenh323.dpatch
===================================================================
--- asterisk/branches/sarge/debian/patches/60_debian-libopenh323.dpatch	2006-04-21 17:26:49 UTC (rev 1641)
+++ asterisk/branches/sarge/debian/patches/60_debian-libopenh323.dpatch	2006-04-21 20:47:09 UTC (rev 1642)
@@ -1,69 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## channels_Makefile.dpatch by Jose Carlos Garcia Sogo <jsogo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad asterisk-1.0.2/channels/Makefile /tmp/dpep.rfBy0Q/asterisk-1.0.2/channels/Makefile
---- asterisk-1.0.2/channels/Makefile	2004-08-31 18:33:00.000000000 +0200
-+++ /tmp/dpep.rfBy0Q/asterisk-1.0.2/channels/Makefile	2005-01-04 21:32:54.000000000 +0100
-@@ -14,9 +14,6 @@
- # the GNU General Public License
- #
- 
--OSARCH=$(shell uname -s)
--PROC=$(shell uname -m)
--
- USE_MYSQL_FRIENDS=0
- USE_SIP_MYSQL_FRIENDS=0
- 
-@@ -46,8 +43,8 @@
- endif
- ifeq (${OSARCH},Linux)
- MYSQLLIB=-L/usr/lib/mysql -lmysqlclient
--PTLIB=-lpt_linux_x86_r
--H323LIB=-lh323_linux_x86_r
-+PTLIB=-lpt
-+H323LIB=-lopenh323
- CHANH323LIB=-ldl
- 
- ifeq ($(PROC),sparc64)
-diff -urNad asterisk-1.0.2/channels/h323/Makefile /tmp/dpep.a59vmL/asterisk-1.0.2/channels/h323/Makefile
---- asterisk-1.0.2/channels/h323/Makefile	2004-08-31 15:32:11.000000000 +0200
-+++ /tmp/dpep.a59vmL/asterisk-1.0.2/channels/h323/Makefile	2005-01-04 21:30:30.000000000 +0100
-@@ -1,5 +1,9 @@
- # include the Makefile of OpenH323 
- 
-+OPENH323DIR=/usr/share/openh323
-+PWLIBDIR=/usr/share/pwlib
-+
-+
- ifndef OPENH323DIR
- OPENH323DIR=$(HOME)/openh323
- endif
-@@ -22,7 +26,7 @@
- OSARCH=$(shell uname -s)
- ifneq (${OSARCH},FreeBSD)
- ifneq (${OSARCH},NetBSD)
--CFLAGS += -march=$(shell uname -m)
-+CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1;)
- endif
- endif
- CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
-@@ -59,10 +63,11 @@
- CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
- CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
- CFLAGS += -I../../include
--CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include
--CFLAGS += -I$(OPENH323DIR)/include
--CFLAGS += -Wno-missing-prototypes -Wno-missing-declarations
--LIBS+= -lcrypto -lssl -lexpat
-+CFLAGS += -I/usr/include/pwlib -I/usr/share/pwlib/include -I/usr/include/openh323
-+#CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include
-+#CFLAGS += -I$(OPENH323DIR)/include
-+#CFLAGS += -Wno-missing-prototypes -Wno-missing-declarations
-+LIBS+= -lcrypto -lssl -lexpat -lpt -lopenh323
- 
- all:   	libchanh323.a
- 

Deleted: asterisk/branches/sarge/debian/patches/70_debian-libpe-fe.dpatch
===================================================================
--- asterisk/branches/sarge/debian/patches/70_debian-libpe-fe.dpatch	2006-04-21 17:26:49 UTC (rev 1641)
+++ asterisk/branches/sarge/debian/patches/70_debian-libpe-fe.dpatch	2006-04-21 20:47:09 UTC (rev 1642)
@@ -1,53 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## app_sql_postgres.dpatch by Jose Carlos Garcia Sogo <jsogo at debian.org>
-##   30/6/05 Mark Purcell <msp at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Setup for postgresql under Debian (autoconf would be nicer)
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./apps/Makefile /tmp/dpep-work.ZD5tj4/asterisk-1.0.9.dfsg/apps/Makefile
---- ./apps/Makefile	2005-07-04 01:09:46.199583056 +0100
-+++ /tmp/dpep-work.ZD5tj4/asterisk-1.0.9.dfsg/apps/Makefile	2005-07-04 01:11:03.511484541 +0100
-@@ -43,6 +43,17 @@
- APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
- APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi)
- 
-+#
-+## PGSQL stuff...  Autoconf anyone??
-+#
-+CFLAGS+=$(shell if [ -d /usr/local/pgsql/include ]; then echo "-I/usr/local/pgsql/include"; fi)
-+CFLAGS+=$(shell if [ -d /usr/include/pgsql ]; then echo "-I/usr/include/pgsql"; fi)
-+CFLAGS+=$(shell if [ -d /usr/include/postgresql ]; then echo "-I/usr/include/postgresql"; fi)
-+CFLAGS+=$(shell if [ -d /usr/local/include/pgsql ]; then echo "-I/usr/local/include/pgsql"; fi)
-+CFLAGS+=$(shell if [ -d /opt/pgsql/include ]; then echo "-I/opt/pgsql/include"; fi)
-+#CFLAGS+=$(shell if [ -f /usr/include/libpq-fe.h ]; then echo "-I/usr/include"; fi)
-+CFLAGS+=$(shell if [ -f /usr/include/postgresql/8.0/libpq-fe.h ]; then echo "-I/usr/include/postgresql/8.0"; fi)
-+
- CFLAGS+=-fPIC -DPIC
- 
- ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
-diff -urNad --exclude=CVS --exclude=.svn ./cdr/Makefile /tmp/dpep-work.ZD5tj4/asterisk-1.0.9.dfsg/cdr/Makefile
---- ./cdr/Makefile	2005-07-04 01:09:46.200582848 +0100
-+++ /tmp/dpep-work.ZD5tj4/asterisk-1.0.9.dfsg/cdr/Makefile	2005-07-04 01:09:49.153967870 +0100
-@@ -56,6 +56,7 @@
- CFLAGS+=$(shell if [ -d /usr/local/include/pgsql ]; then echo "-I/usr/local/include/pgsql"; fi)
- CFLAGS+=$(shell if [ -d /opt/pgsql/include ]; then echo "-I/opt/pgsql/include"; fi)
- #CFLAGS+=$(shell if [ -f /usr/include/libpq-fe.h ]; then echo "-I/usr/include"; fi)
-+CFLAGS+=$(shell if [ -f /usr/include/postgresql/8.0/libpq-fe.h ]; then echo "-I/usr/include/postgresql/8.0"; fi)
- MLFLAGS=
- MLFLAGS+=$(shell if [ -d /usr/lib/pgsql ]; then echo "-L/usr/lib/pgsql"; fi)
- MLFLAGS+=$(shell if [ -d /usr/local/pgsql/lib ]; then echo "-L/usr/local/pgsql/lib"; fi)
-diff -urNad asterisk-1.0.3/cdr/Makefile /tmp/dpep.FJ3Q8L/asterisk-1.0.3/cdr/Makefile
---- asterisk-1.0.3/cdr/Makefile 2005-01-15 18:28:29.000000000 +0100
-+++ /tmp/dpep.FJ3Q8L/asterisk-1.0.3/cdr/Makefile        2005-01-15 18:28:29.000000000 +0100
-@@ -12,7 +12,7 @@
- #
-
- #ADD cdr_pgsql.so to MODS= to include PostgreSQL support: REQUIRES PostgreSQL libs
--MODS=cdr_csv.so cdr_manager.so
-+MODS=cdr_csv.so cdr_manager.so cdr_pgsql.so
-
-
- CFLAGS+=-fPIC -DPIC
-:

Modified: asterisk/branches/sarge/debian/patches/95_conf_sample.dpatch
===================================================================
--- asterisk/branches/sarge/debian/patches/95_conf_sample.dpatch	2006-04-21 17:26:49 UTC (rev 1641)
+++ asterisk/branches/sarge/debian/patches/95_conf_sample.dpatch	2006-04-21 20:47:09 UTC (rev 1642)
@@ -5,15 +5,18 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad asterisk-1.0.2/configs/modules.conf.sample /tmp/dpep.lTPo9n/asterisk-1.0.2/configs/modules.conf.sample
---- asterisk-1.0.2/configs/modules.conf.sample	2003-06-26 20:57:54.000000000 +0200
-+++ /tmp/dpep.lTPo9n/asterisk-1.0.2/configs/modules.conf.sample	2005-01-04 21:38:11.000000000 +0100
-@@ -30,7 +30,7 @@
+diff -urNad asterisk-1.2.7.1.dfsg~/configs/modules.conf.sample asterisk-1.2.7.1.dfsg/configs/modules.conf.sample
+--- asterisk-1.2.7.1.dfsg~/configs/modules.conf.sample	2005-11-29 18:24:39.000000000 +0000
++++ asterisk-1.2.7.1.dfsg/configs/modules.conf.sample	2006-04-21 17:28:48.000000000 +0100
+@@ -45,7 +45,10 @@
  ; By default, load OSS only (automatically) and do not load ALSA
  ;
  noload => chan_alsa.so
 -;noload => chan_oss.so
 +noload => chan_oss.so
++;
++; h323 modules can be unstable so don't load by default
++noload => chan_h323.so
  ;
  ; Module names listed in "global" section will have symbols globally
  ; exported to modules loaded after them.

Deleted: asterisk/branches/sarge/debian/patches/Makefile_install_no1234.dpatch
===================================================================
--- asterisk/branches/sarge/debian/patches/Makefile_install_no1234.dpatch	2006-04-21 17:26:49 UTC (rev 1641)
+++ asterisk/branches/sarge/debian/patches/Makefile_install_no1234.dpatch	2006-04-21 20:47:09 UTC (rev 1642)
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Makefile_install_no1234.dpatch by  <tzafrir at localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad asterisk-1.2.0.dfsg.1-0beta1/Makefile /tmp/dpep.dngaXR/asterisk-1.2.0.dfsg.1-0beta1/Makefile
---- asterisk-1.2.0.dfsg.1-0beta1/Makefile	2005-08-26 22:55:11.000000000 +0300
-+++ /tmp/dpep.dngaXR/asterisk-1.2.0.dfsg.1-0beta1/Makefile	2005-09-21 08:02:49.859994381 +0300
-@@ -683,15 +683,6 @@
- 		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
- 	done
- 	rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
--	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
--	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
--		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
--	done
--	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm
--	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isonphone; do \
--		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm ; \
--	done
- 
- webvmail:
- 	@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )

Deleted: asterisk/branches/sarge/debian/patches/app_queue.memleakfix.dpatch
===================================================================
--- asterisk/branches/sarge/debian/patches/app_queue.memleakfix.dpatch	2006-04-21 17:26:49 UTC (rev 1641)
+++ asterisk/branches/sarge/debian/patches/app_queue.memleakfix.dpatch	2006-04-21 20:47:09 UTC (rev 1642)
@@ -1,42 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## app_queue.debian.leakfix.patch by Kiss Karoly <karcsi at tvnetwork.hu>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: backports memleak fix http://bugs.digium.com/view.php?id=4318
-
- at DPATCH@
---- apps/app_queue.c.orig	2005-08-30 10:55:15.000000000 +0200
-+++ apps/app_queue.c	2005-08-30 10:55:24.000000000 +0200
-@@ -861,21 +861,30 @@
- 			if (!f || ((f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_HANGUP))) {
- 				/* Got hung up */
- 				*to=-1;
-+				if ( f )
-+					ast_frfree(f);
- 				return NULL;
- 			}
--			if (f && (f->frametype == AST_FRAME_DTMF) && allowdisconnect_out && (f->subclass == '*')) {
-+			if ((f->frametype == AST_FRAME_DTMF) && allowdisconnect_out && (f->subclass == '*')) {
- 			    if (option_verbose > 3)
- 					ast_verbose(VERBOSE_PREFIX_3 "User hit %c to disconnect call.\n", f->subclass);
- 				*to=0;
-+				if ( f )
-+					ast_frfree(f);
- 				return NULL;
- 			}
--			if (f && (f->frametype == AST_FRAME_DTMF) && (f->subclass != '*') && valid_exit(qe, f->subclass)) {
-+			if ((f->frametype == AST_FRAME_DTMF) && (f->subclass != '*') && valid_exit(qe, f->subclass)) {
- 				if (option_verbose > 3)
- 					ast_verbose(VERBOSE_PREFIX_3 "User pressed digit: %c", f->subclass);
- 				*to=0;
- 				*digit=f->subclass;
-+				if ( f )
-+					ast_frfree(f);
- 				return NULL;
- 			}
-+			if ( f )
-+				ast_frfree(f);
-+
- 		}
- 		if (!*to && (option_verbose > 2))
- 			ast_verbose( VERBOSE_PREFIX_3 "Nobody picked up in %d ms\n", orig);

Deleted: asterisk/branches/sarge/debian/patches/chan-modem.dpatch
===================================================================
--- asterisk/branches/sarge/debian/patches/chan-modem.dpatch	2006-04-21 17:26:49 UTC (rev 1641)
+++ asterisk/branches/sarge/debian/patches/chan-modem.dpatch	2006-04-21 20:47:09 UTC (rev 1642)
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## chan-modem.dpatch by  Simon Peter <dn.tlp at gmx.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: chan_modem.c should set default read & write format
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./channels/chan_modem.c /tmp/dpep-work.H6ITFA/asterisk-1.0.9.dfsg/channels/chan_modem.c
---- ./channels/chan_modem.c	2004-10-24 22:15:23.000000000 +0100
-+++ /tmp/dpep-work.H6ITFA/asterisk-1.0.9.dfsg/channels/chan_modem.c	2005-08-09 21:33:36.000000000 +0100
-@@ -524,12 +524,15 @@
- struct ast_channel *ast_modem_new(struct ast_modem_pvt *i, int state)
- {
- 	struct ast_channel *tmp;
-+	int fmt = ast_best_codec(i->mc->formats);
- 	tmp = ast_channel_alloc(1);
- 	if (tmp) {
- 		snprintf(tmp->name, sizeof(tmp->name), "Modem[%s]/%s", i->mc->name, i->dev + 5);
- 		tmp->type = type;
- 		tmp->fds[0] = i->fd;
- 		tmp->nativeformats = i->mc->formats;
-+		tmp->readformat = fmt;
-+		tmp->writeformat = fmt;
- 		ast_setstate(tmp, state);
- 		if (state == AST_STATE_RING)
- 			tmp->rings = 1;

Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2006-04-21 17:26:49 UTC (rev 1641)
+++ asterisk/trunk/debian/changelog	2006-04-21 20:47:09 UTC (rev 1642)
@@ -1,9 +1,14 @@
-asterisk (1:1.2.7.1.dfsg-2) UNRELEASED; urgency=low
+asterisk (1:1.2.7.1.dfsg-2) UNRELEASED; urgency=high
 
+  [ Mark Purcell ]
   * NOT RELEASED YET
 
- -- Mark Purcell <msp at debian.org>  Fri, 21 Apr 2006 18:26:09 +0100
+  [ Kilian Krause ]
+  * Urgency bumped since 1.2.7 is a security update [CVE-2006-1827]
+    (Closes: #364195)
 
+ -- Kilian Krause <kilian at debian.org>  Fri, 21 Apr 2006 22:41:40 +0200
+
 asterisk (1:1.2.7.1.dfsg-1) unstable; urgency=low
 
   [ Tzafrir Cohen ]

More information about the Pkg-voip-commits mailing list