Commits

paravoid  committed fa5cdfa Draft

* New upstream release.
- Fixes CVE-2009-2726 aka AST-2009-005.
- Ship CC BY-SA 3.0 licensed music-on-hold sounds, replacing the old
non-free FreePlay Music that were never distributed by Debian.
- Removed patches/makefile_appdocs_dtd (merged upstream) and
patches/disable_moh (obsoleted, see above).

  • Participants
  • Parent commits 3f67e83

Comments (0)

Files changed (8)

File debian/changelog

-asterisk (1:1.6.2.0~dfsg~beta4-1) UNRELEASED; urgency=low
+asterisk (1:1.6.2.0~dfsg~rc1-1) UNRELEASED; urgency=low
 
   [ Faidon Liambotis ]
+  * New upstream release.
+    - Fixes CVE-2009-2726 aka AST-2009-005.
+    - Ship CC BY-SA 3.0 licensed music-on-hold sounds, replacing the old
+      non-free FreePlay Music that were never distributed by Debian.
+    - Removed patches/makefile_appdocs_dtd (merged upstream) and
+      patches/disable_moh (obsoleted, see above).
   * Fix FTBFS on armel. (Closes: #532971)
 
   [ Tzafrir Cohen ]
-  * New upstream beta.
   * Patch hardware_dtmf_mute_fix removed: Applied upstream.
   * No need for a separate app_directory_odbc (will use app_voicemail_odbc).
   * Fix name of voicemail 'openssl' dep. (Thomas Renard) (Closes: #539150)
 
- -- Tzafrir Cohen <tzafrir.cohen@xorcom.com>  Tue, 11 Aug 2009 21:26:43 +0300
+ -- Faidon Liambotis <paravoid@debian.org>  Mon, 31 Aug 2009 21:50:05 +0300
 
 asterisk (1:1.6.2.0~dfsg~beta3-1) unstable; urgency=low
 

File debian/copyright

 
 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 (DFSG)
-<http://www.debian.org/social_contract#guidelines>.
-
  * The contrib/firmware/iax/iaxy.bin binary firmware without source has been
  removed.
 
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+
+Contents of sounds/asterisk-moh-opsound-wav.tar.gz tarball:
+
+  These files are distributed under the Creative Commons Attribution-ShareAlike
+  3.0 license through explicit permission from their authors.
+  
+  The license can be found at:
+  http://creativecommons.org/licenses/by-sa/3.0/

File debian/patches/app-osplookup-osptk-3.4

-This is upstream's r190830 reverted (but with r196072 applied).
+This is upstream's r190830 reverted (but with r196072 and r211580 applied).
 
 Upstream ported app_osplookup to OSP Toolkit 3.5; however, 3.5 broke API and
 Debian at the time of this writing still has 3.4.2.
  
  #include "asterisk.h"
  
--ASTERISK_FILE_VERSION(__FILE__, "$Revision: 190985 $")
+-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 211580 $")
 +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 178870 $")
  
  #include <osp/osp.h>

File debian/patches/configure-armel

 
 --- a/configure
 +++ b/configure
-@@ -4173,6 +4173,9 @@ case "${host_os}" in
+@@ -4317,6 +4317,9 @@ case "${host_os}" in
       OSARCH=cygwin
       PBX_WINARCH=1
       ;;
       *)
       OSARCH=${host_os}
       ;;
-@@ -20354,7 +20357,7 @@ _ACEOF
+@@ -21250,7 +21253,7 @@ _ACEOF
  fi
  
  
  
  if test "x${PBX_CAP}" != "x1" -a "${USE_CAP}" != "no"; then
     pbxlibdir=""
-@@ -33706,7 +33709,7 @@ _ACEOF
-    fi
- fi
- 
--if test "${host_os}" != "linux-gnu" ; then
-+if test "${OSARCH}" != "linux-gnu" ; then
- 
- if test "x${PBX_ICONV}" != "x1" -a "${USE_ICONV}" != "no"; then
-    pbxlibdir=""
 --- a/configure.ac
 +++ b/configure.ac
-@@ -109,6 +109,9 @@ case "${host_os}" in
+@@ -115,6 +115,9 @@ case "${host_os}" in
       OSARCH=cygwin
       PBX_WINARCH=1
       ;;
       *)
       OSARCH=${host_os}
       ;;
-@@ -640,7 +643,7 @@ AST_EXT_LIB_CHECK([ALSA], [asound], [snd
+@@ -650,7 +653,7 @@ AST_EXT_LIB_CHECK([ALSA], [asound], [snd
  
  AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
  
    AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h])
  fi
  
-@@ -767,7 +770,7 @@ if test "${USE_GSM}" != "no"; then
-    fi
- fi
- 
--if test "${host_os}" != "linux-gnu" ; then
-+if test "${OSARCH}" != "linux-gnu" ; then
-   AST_EXT_LIB_CHECK([ICONV], [iconv], [iconv_open], [iconv.h])
- else
-   PBX_ICONV=1

File debian/patches/disable_moh

-Make the FreePlay on-hold music not enabled by-default. 
-This implies that it is disabled. This is needed as we remove it
-from the tarball of Debian due to license issues.
-
-  Tzafrir Cohen <tzafrir.cohen@xorcom.com>
---- 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-FREEPLAY-WAV" displayname="FreePlay Music On Hold Files, WAV format" >
--			<defaultenabled>yes</defaultenabled>
- 		</member>
- 		<member name="MOH-FREEPLAY-ULAW" displayname="FreePlay Music On Hold Files, mu-Law format" >
- 		</member>

File debian/patches/makefile_appdocs_dtd

-Install the Asterisk documentation DTD to the documentation directory
-(rather than trying to place it under ASTVARLIBDIR)
-
-Upstream issue: https://issues.asterisk.org/view.php?id=15344
-
---- a/Makefile
-+++ b/Makefile
-@@ -576,7 +576,7 @@ bininstall: _all installdirs $(SUBDIRS_I
- 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
- 	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
- 	$(INSTALL) -m 644 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
--	$(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTVARLIBDIR)/documentation
-+	$(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
- 	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
- 	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
- 	$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8

File debian/patches/series

 astgenkey-security
 
 # bugfixes on top of everything
-disable_moh
 dahdi-fxsks-hookstate
 dahdi_ptmp_nt
 dahdi_pri_debug_spannums
-
-makefile_appdocs_dtd

File debian/rules

 	@@mkdir -p ../tarballs/asterisk-$(UPVERSION).tmp/
 	@@cd ../tarballs/asterisk-$(UPVERSION).tmp ; \
 	tar xfz ../$(UPFILENAME) 
-	@@rm -f  $(TMP_TARBALL_TOP)/sounds/fpm-*.mp3
-	@@rm -f  $(TMP_TARBALL_TOP)/sounds/asterisk-moh-freeplay-wav.tar.gz
-	@@rm -rf $(TMP_TARBALL_TOP)/codecs/ilbc/*
 	# in case the tarball is not clean:
 	@@rm -rf $(TMP_TARBALL_TOP)/*/.makeopts
 	@@rm -rf $(TMP_TARBALL_TOP)/*/.*.makeopts
 	@@rm -rf $(TMP_TARBALL_TOP)/*/.moduleinfo
 	@@rm -rf $(TMP_TARBALL_TOP)/*/.*.moduleinfo
 	@@rm -rf $(TMP_TARBALL_TOP)/menuselect-tree
-	@@printf "all:\nclean:\n.PHONY: all clean\n" > \
-		$(TMP_TARBALL_TOP)/codecs/ilbc/Makefile
-	@@rm -f  $(TMP_TARBALL_TOP)/codecs/codec_ilbc.c
 	@@rm -rf $(TMP_TARBALL_TOP)/contrib/firmware/
 	@@cd ../tarballs/asterisk-$(UPVERSION).tmp ; \
 	tar cfz ../$(FILENAME) *