[Pkg-voip-commits] r8011 - in /asterisk/trunk/debian: changelog patches/series patches/sound_files rules

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Wed Feb  3 23:20:36 2010
New Revision: 8011

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8011
Log:
* Patch sound_files: configure asterisk not to download the new MoH files.
* Move sound files tarball to a safe place, as the patch we used to
  protect them is aparantly not in effect at clean time.

Added:
    asterisk/trunk/debian/patches/sound_files
Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/series
    asterisk/trunk/debian/rules

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=8011&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Wed Feb  3 23:20:36 2010
@@ -6,8 +6,11 @@
 
   [ Tzafrir Cohen ]
   * New upstream release. Fixes CVE-2010-0441 (AST-2010-001).
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Tue, 12 Jan 2010 17:08:17 +0200
+  * Patch sound_files: configure asterisk not to download the new MoH files.
+  * Move sound files tarball to a safe place, as the patch we used to
+    protect them is aparantly not in effect at clean time.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 04 Feb 2010 01:09:32 +0200
 
 asterisk (1:1.6.2.0-1) unstable; urgency=low
 

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=8011&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Wed Feb  3 23:20:36 2010
@@ -16,3 +16,4 @@
 dahdi-fxsks-hookstate
 dahdi_ptmp_nt
 dahdi_pri_debug_spannums
+sound_files

Added: asterisk/trunk/debian/patches/sound_files
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/sound_files?rev=8011&op=file
==============================================================================
--- asterisk/trunk/debian/patches/sound_files (added)
+++ asterisk/trunk/debian/patches/sound_files Wed Feb  3 23:20:36 2010
@@ -1,0 +1,24 @@
+Subject: Avoid downloading extra sound files
+From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Forwarded: no
+Last-Update: 2010-02-03
+
+Asterisk configures several sound files to be installed that are not
+included in the distribution tarball. Those files are downloaded by the
+'install' target.
+
+The exact files to be downloaded is configurable. Here we change the
+default to avoid downloading any. We believe those should be part of
+a separate source package (as they rarely change, and have their own
+versioning).
+
+--- a/sounds/sounds.xml
++++ b/sounds/sounds.xml
+@@ -57,7 +57,6 @@
+ 	</category>
+ 	<category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
+ 		<member name="MOH-OPSOUND-WAV" displayname="opsound.org Music On Hold Files, WAV format" >
+-			<defaultenabled>yes</defaultenabled>
+ 		</member>
+ 		<member name="MOH-OPSOUND-ULAW" displayname="opsound.org Music On Hold Files, mu-Law format" >
+ 		</member>

Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=8011&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Wed Feb  3 23:20:36 2010
@@ -86,7 +86,11 @@
 	dh_testdir
 	dh_testroot
 	
+	# The clean target seems to be run before patches are applied.
+	# A brute-force fix to keep the tarball from getting deleted:
+	mv sounds/asterisk-core-sounds-en-gsm-1.4.17.tar.gz debian/
 	GREP=grep AWK=awk $(MAKE) distclean
+	mv debian/asterisk-core-sounds-en-gsm-1.4.17.tar.gz sounds/
 	-$(RM) -rf debian/build
 
 	if [ -r configure.debian_sav ]; then mv configure.debian_sav configure; fi