[Pkg-voip-commits] r7549 - in /asterisk/trunk/debian: changelog copyright patches/app-osplookup-osptk-3.4 patches/configure-armel patches/disable_moh patches/makefile_appdocs_dtd patches/series rules
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Mon Aug 31 18:52:05 UTC 2009
Author: paravoid
Date: Mon Aug 31 18:52:04 2009
New Revision: 7549
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7549
Log:
* 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).
Removed:
asterisk/trunk/debian/patches/disable_moh
asterisk/trunk/debian/patches/makefile_appdocs_dtd
Modified:
asterisk/trunk/debian/changelog
asterisk/trunk/debian/copyright
asterisk/trunk/debian/patches/app-osplookup-osptk-3.4
asterisk/trunk/debian/patches/configure-armel
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=7549&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Mon Aug 31 18:52:04 2009
@@ -1,15 +1,20 @@
-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 at xorcom.com> Tue, 11 Aug 2009 21:26:43 +0300
+ -- Faidon Liambotis <paravoid at debian.org> Mon, 31 Aug 2009 21:50:05 +0300
asterisk (1:1.6.2.0~dfsg~beta3-1) unstable; urgency=low
Modified: asterisk/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/copyright?rev=7549&op=diff
==============================================================================
--- asterisk/trunk/debian/copyright (original)
+++ asterisk/trunk/debian/copyright Mon Aug 31 18:52:04 2009
@@ -10,11 +10,6 @@
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.
@@ -314,3 +309,11 @@
* 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/
Modified: asterisk/trunk/debian/patches/app-osplookup-osptk-3.4
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/app-osplookup-osptk-3.4?rev=7549&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/app-osplookup-osptk-3.4 (original)
+++ asterisk/trunk/debian/patches/app-osplookup-osptk-3.4 Mon Aug 31 18:52:04 2009
@@ -1,4 +1,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.
@@ -11,7 +11,7 @@
#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>
Modified: asterisk/trunk/debian/patches/configure-armel
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/configure-armel?rev=7549&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/configure-armel (original)
+++ asterisk/trunk/debian/patches/configure-armel Mon Aug 31 18:52:04 2009
@@ -9,7 +9,7 @@
--- 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
;;
@@ -19,7 +19,7 @@
*)
OSARCH=${host_os}
;;
-@@ -20354,7 +20357,7 @@ _ACEOF
+@@ -21250,7 +21253,7 @@ _ACEOF
fi
@@ -28,18 +28,9 @@
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
;;
@@ -49,7 +40,7 @@
*)
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])
@@ -58,12 +49,3 @@
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
Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=7549&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Mon Aug 31 18:52:04 2009
@@ -17,9 +17,6 @@
astgenkey-security
# bugfixes on top of everything
-disable_moh
dahdi-fxsks-hookstate
dahdi_ptmp_nt
dahdi_pri_debug_spannums
-
-makefile_appdocs_dtd
Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=7549&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Mon Aug 31 18:52:04 2009
@@ -204,18 +204,12 @@
@@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) *
More information about the Pkg-voip-commits
mailing list