packages (AC-branch): asterisk/asterisk-libprihack.patch, asterisk/asterisk...

[marcus]

Author: marcus                       Date: Fri Aug 28 20:57:06 2009 GMT
Module: packages                      Tag: AC-branch
---- Log message:
- up to 1.2.34, AST-2009-005, libpri hack solved.

---- Files affected:
packages/asterisk:
   asterisk-libprihack.patch (1.1 -> 1.1.2.1) , asterisk.spec (1.74.2.25 -> 1.74.2.26) 

---- Diffs:

================================================================
Index: packages/asterisk/asterisk-libprihack.patch
diff -u packages/asterisk/asterisk-libprihack.patch:1.1 packages/asterisk/asterisk-libprihack.patch:1.1.2.1
--- packages/asterisk/asterisk-libprihack.patch:1.1	Mon Sep  4 17:20:41 2006
+++ packages/asterisk/asterisk-libprihack.patch	Fri Aug 28 22:57:00 2009
@@ -5,7 +5,7 @@
  endif
  
 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/buildhack-libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/buildhack-libpri.so.1),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1.0)$(wildcard $(CROSS_COMPILE_TARGET)/usr/lib64/libpri.so.1.0),)
    CFLAGS+=-DZAPATA_PRI
    ZAPPRI=-lpri
  endif

================================================================
Index: packages/asterisk/asterisk.spec
diff -u packages/asterisk/asterisk.spec:1.74.2.25 packages/asterisk/asterisk.spec:1.74.2.26
--- packages/asterisk/asterisk.spec:1.74.2.25	Tue Jun  9 11:38:41 2009
+++ packages/asterisk/asterisk.spec	Fri Aug 28 22:57:00 2009
@@ -17,12 +17,12 @@
 Summary:	Asterisk PBX
 Summary(pl):	Centralka (PBX) Asterisk
 Name:		asterisk
-Version:	1.2.33
+Version:	1.2.34
 Release:	1
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	c062e237427b7ae587b76a252ce4c499
+# Source0-md5:	407d0313e16f3806a79ad14fb613699f
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 #Patch0:	%{name}-openh323-makefile.patch
@@ -48,6 +48,7 @@
 Patch12:	%{name}-zaptel.h.patch
 URL:		http://www.asterisk.org/
 BuildRequires:	bison
+BuildRequires:	curl-devel
 BuildRequires:	freetds >= 0.63
 BuildRequires:	gawk
 BuildRequires:	libpri-devel >= 1.2.4
@@ -214,9 +215,7 @@
 %dir /var/lib/asterisk/images
 %dir /var/lib/asterisk/keys
 %dir /var/lib/asterisk/mohmp3
-/var/lib/asterisk/mohmp3/fpm-calm-river.mp3
-/var/lib/asterisk/mohmp3/fpm-sunshine.mp3
-/var/lib/asterisk/mohmp3/fpm-world-mix.mp3
+/var/lib/asterisk/mohmp3/*.mp3
 %dir /var/lib/asterisk/sounds
 %dir /var/lib/asterisk/sounds/digits
 %dir /var/lib/asterisk/sounds/dictate
@@ -267,6 +266,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.74.2.26  2009/08/28 20:57:00  marcus
+- up to 1.2.34, AST-2009-005, libpri hack solved.
+
 Revision 1.74.2.25  2009/06/09 09:38:41  dzeus
 - up to 1.2.33 (fixes CVE-2009-0041)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/asterisk-libprihack.patch?r1=1.1&r2=1.1.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/asterisk.spec?r1=1.74.2.25&r2=1.74.2.26&f=u