packages: asterisk/FHS-paths.patch, asterisk/asterisk.spec, asterisk/extern...

arekm arekm at pld-linux.org
Fri Jan 22 22:00:10 CET 2010 

Author: arekm                        Date: Fri Jan 22 21:00:10 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.6.2.1

---- Files affected:
packages/asterisk:
   FHS-paths.patch (1.1 -> 1.2) , asterisk.spec (1.163 -> 1.164) , external-libedit.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/asterisk/FHS-paths.patch
diff -u packages/asterisk/FHS-paths.patch:1.1 packages/asterisk/FHS-paths.patch:1.2
--- packages/asterisk/FHS-paths.patch:1.1	Tue Dec 29 18:22:46 2009
+++ packages/asterisk/FHS-paths.patch	Fri Jan 22 22:00:04 2010
@@ -545,40 +545,26 @@
 ===================================================================
 --- configs/phoneprov.conf.sample	(revision 222649)
 +++ configs/phoneprov.conf.sample	(working copy)
-@@ -57,4 +57,4 @@
- ${TOLOWER(${MAC})}-phone.cfg => 000000000000-phone.cfg   ; (relative to AST_DATA_DIR/phoneprov)
- config/${TOLOWER(${MAC})} => polycom.xml                 ; Dynamic Filename => template file 
- ${TOLOWER(${MAC})}-directory.xml => 000000000000-directory.xml
+@@ -114,4 +114,4 @@
+ ${MAC}-phone.cfg => 000000000000-phone.cfg   ; (relative to AST_DATA_DIR/phoneprov)
+ config/${MAC} => polycom.xml                 ; Dynamic Filename => template file 
+ ${MAC}-directory.xml => 000000000000-directory.xml
 -setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
 +setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
 Index: configs/musiconhold.conf.sample
 ===================================================================
 --- configs/musiconhold.conf.sample	(revision 222649)
 +++ configs/musiconhold.conf.sample	(working copy)
-@@ -39,11 +39,11 @@
- 
- [default]
- mode=files
--directory=/var/lib/asterisk/moh
-+directory=/usr/share/asterisk/moh
+@@ -32,7 +32,7 @@
+ ; The path specified can be either an absolute path (starts with '/'),
+ ; or a relative path; relative paths are interpreted as being relative
+ ; to the 'astvarlibdir' in asterisk.conf, which defaults to
+-; /var/lib/asterisk.
++; /usr/share/asterisk.
  ;
- ;[native-random]
- ;mode=files
--;directory=/var/lib/asterisk/moh
-+;directory=/usr/share/asterisk/moh
- ;digit=#        ; If this option is set for a class, then when callers are
- ;               ; listening to music on hold, they can press this digit, and
- ;               ; they will switch to listening to this music class.
-@@ -51,7 +51,7 @@
- 
- ;[native-alphabetical]
- ;mode=files
--;directory=/var/lib/asterisk/moh
-+;directory=/usr/share/asterisk/moh
- ;sort=alpha     ; Sort the files in alphabetical order.  If this option is
- ;               ; not specified, the sort order is undefined.
- 
-@@ -63,7 +63,7 @@
+ ; NOTE:
+ ; If you are not using "autoload" in modules.conf, then you
+@@ -68,7 +68,7 @@
  ;mode=custom
  ; Note that with mode=custom, a directory is not required, such as when reading
  ; from a stream.
@@ -587,7 +573,7 @@
  ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
  
  ;[ulawstream]
-@@ -75,5 +75,5 @@
+@@ -80,5 +80,5 @@
  ; choice
  ;[solaris]
  ;mode=custom
@@ -609,10 +595,10 @@
  ;
  ; Specify the private key file name.  
  ; If this parameter is unspecified or not present, the default name will be the 
-Index: configs/res_config_sqlite.conf
+Index: configs/res_config_sqlite.conf.sample
 ===================================================================
---- configs/res_config_sqlite.conf	(revision 222649)
-+++ configs/res_config_sqlite.conf	(working copy)
+--- configs/res_config_sqlite.conf.sample	(revision 222649)
++++ configs/res_config_sqlite.conf.sample	(working copy)
 @@ -1,7 +1,7 @@
  [general]
  

================================================================
Index: packages/asterisk/asterisk.spec
diff -u packages/asterisk/asterisk.spec:1.163 packages/asterisk/asterisk.spec:1.164
--- packages/asterisk/asterisk.spec:1.163	Fri Jan 22 21:22:15 2010
+++ packages/asterisk/asterisk.spec	Fri Jan 22 22:00:04 2010
@@ -32,16 +32,16 @@
 %bcond_without	verbose		# verbose build
 
 %define		spandsp_version 0.0.2pre26
-%define		rel	0.45
+%define		rel	1
 Summary:	Asterisk PBX
 Summary(pl.UTF-8):	Centralka (PBX) Asterisk
 Name:		asterisk
-Version:	1.6.1.12
+Version:	1.6.2.1
 Release:	%{rel}%{?with_bristuff:.bristuff}
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	d6bc1448b8fa274a2acaef1b15f4d485
+# Source0-md5:	8fbc60f9d80e686c749ae95292e225d8
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source5:	%{name}.logrotate
@@ -989,7 +989,6 @@
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_clioriginate.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_convert.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_crypto.so
-%attr(755,root,root) %{_libdir}/asterisk/modules/res_indications.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_limit.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_monitor.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_musiconhold.so
@@ -1280,6 +1279,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.164  2010/01/22 21:00:04  arekm
+- up to 1.6.2.1
+
 Revision 1.163  2010/01/22 20:22:15  arekm
 - revert ptlib
 

================================================================
Index: packages/asterisk/external-libedit.patch
diff -u packages/asterisk/external-libedit.patch:1.1 packages/asterisk/external-libedit.patch:1.2
--- packages/asterisk/external-libedit.patch:1.1	Tue Dec 29 18:22:46 2009
+++ packages/asterisk/external-libedit.patch	Fri Jan 22 22:00:05 2010
@@ -14,14 +14,14 @@
 ===================================================================
 --- configure.ac	(revision 226061)
 +++ configure.ac	(working copy)
-@@ -232,6 +232,7 @@
+@@ -267,6 +267,7 @@
  AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
  AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
  AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
 +AST_EXT_LIB_SETUP([LIBEDIT], [NetBSD Editline library], [libedit])
+ AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2])
  AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
  AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
- AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
 @@ -1593,6 +1594,27 @@
  AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL_image.h], [${SDL_LIB}], [${SDL_INCLUDE}])
  AST_EXT_LIB_CHECK([FFMPEG], [avcodec], [sws_getContext], [ffmpeg/avcodec.h], [-lpthread -lz -lm])
@@ -105,11 +105,12 @@
 ===================================================================
 --- makeopts.in	(revision 226061)
 +++ makeopts.in	(working copy)
-@@ -246,3 +246,7 @@
- 
+@@ -263,3 +263,8 @@
  # if poll is not present, let the makefile know.
  POLL_AVAILABLE=@HAS_POLL@
+ TIMERFD_INCLUDE=@TIMERFD_INCLUDE@
 +
 +LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@
 +LIBEDIT_LIB=@LIBEDIT_LIB@
 +LIBEDIT_OBJ=@LIBEDIT_OBJ@
++
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/FHS-paths.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/asterisk.spec?r1=1.163&r2=1.164&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/external-libedit.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list