- 1.8.1.1

Changed files:
    FHS-paths.patch -> 1.4
    asterisk.spec -> 1.189

diff --git a/FHS-paths.patch b/FHS-paths.patch
index 4d5b8a58557ee02e19f1ce58709837895bbcaf5a..b9ef9b38d867cdaeefe2d0aa865803be31557bbb 100644 (file)
--- a/FHS-paths.patch
+++ b/FHS-paths.patch
@@ -383,114 +383,6 @@ Index: apps/app_rpt.c
  #define       NODENAMES "rpt/nodenames"
  #define       PARROTFILE "/tmp/parrot_%s_%u"
  
-Index: doc/osp.txt
-===================================================================
---- doc/osp.txt        (revision 222649)
-+++ doc/osp.txt        (working copy)
-@@ -136,7 +136,7 @@
- Compilation is successful if there are no errors in the compiler output. The enroll program is now located in the OSP Toolkit/bin directory (example: /usr/src/ TK-3_3_6-20060303/bin). 
- 
- 2.2 Obtain Crypto Files
--The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /var/lib/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /var/lib/asterisk/keys directory.  
-+The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /usr/share/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /usr/share/asterisk/keys directory.  
- 
- Note: The osptestserver.transnexus.com is configured only for sending and receiving non-SSL messages, and issuing signed tokens. If you need help, post a message on the OSP mailing list at https://lists.sourceforge.net/lists/listinfo/osp-toolkit-client..
- 
-@@ -183,7 +183,7 @@
- verify return:1
- The certificate request was successful.
- Error Code returned from localcert command : 0
--The files generated should be copied to the /var/lib/asterisk/keys directory. 
-+The files generated should be copied to the /usr/share/asterisk/keys directory. 
- Note: The script enroll.sh requires AT&T korn shell (ksh) or any of its compatible variants. The /usr/src/TK-3_3_6-20060303/bin directory should be in the PATH variable. Otherwise, enroll.sh cannot find the enroll file.
- 
- 3 Asterisk
-@@ -247,9 +247,9 @@
- source=[host IP]
- ;
- ; Define path and file name of crypto files.
--; The default path for crypto file is /var/lib/asterisk/keys.  If no
-+; The default path for crypto file is /usr/share/asterisk/keys.  If no
- ; path is defined, crypto files should be in  
--; /var/lib/asterisk/keys directory.
-+; /usr/share/asterisk/keys directory.
- ;
- ; Specify the private key file name.  
- ; If this parameter is unspecified or not present, the default name 
-Index: doc/tex/phoneprov.tex
-===================================================================
---- doc/tex/phoneprov.tex      (revision 222649)
-+++ doc/tex/phoneprov.tex      (working copy)
-@@ -58,7 +58,7 @@
- [polycom]
- staticdir => configs/
- mime_type => text/xml
--setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg
-+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg
- static_file => bootrom.ld,application/octet-stream
- static_file => bootrom.ver,plain/text
- static_file => sip.ld,application/octet-stream
-Index: doc/tex/ael.tex
-===================================================================
---- doc/tex/ael.tex    (revision 222649)
-+++ doc/tex/ael.tex    (working copy)
-@@ -1167,7 +1167,7 @@
-       the application that would set that variable is not called in
-       the same extension. This is a warning only...
-     \item Calls to applications not in the "applist" database (installed
--      in \path{/var/lib/asterisk/applist}" on most systems).
-+      in \path{/usr/share/asterisk/applist}" on most systems).
-     \item In an assignment statement, if the assignment is to a function,
-       the function name used is checked to see if it one of the
-       currently known functions. A warning is issued if it is not.
-Index: doc/tex/asterisk-conf.tex
-===================================================================
---- doc/tex/asterisk-conf.tex  (revision 222649)
-+++ doc/tex/asterisk-conf.tex  (working copy)
-@@ -18,10 +18,10 @@
- astmoddir => /usr/lib/asterisk/modules
- 
- ; Where additional 'library' elements (scripts, etc.) are located
--astvarlibdir => /var/lib/asterisk
-+astvarlibdir => /usr/share/asterisk
- 
- ; Where AGI scripts/programs are located
--astagidir => /var/lib/asterisk/agi-bin
-+astagidir => /usr/share/asterisk/agi-bin
- 
- ; Where spool directories are located
- ; Voicemail, monitor, dictation and other apps will create files here
-Index: doc/tex/privacy.tex
-===================================================================
---- doc/tex/privacy.tex        (revision 222649)
-+++ doc/tex/privacy.tex        (working copy)
-@@ -210,7 +210,7 @@
- 
- When there is no CallerID, P and p options will always record an intro
- for the incoming caller. This intro will be stored temporarily in the
--\path{/var/lib/asterisk/sounds/priv-callerintros} dir, under the name
-+\path{/usr/share/asterisk/sounds/priv-callerintros} dir, under the name
- NOCALLERID\_$<$extension$>$ $<$channelname$>$ and will be erased after the
- callee decides what to do with the call.
- 
-@@ -245,7 +245,7 @@
- \subsubsection{Introductions}
- Unless instructed to not save introductions (see the 'n' option above),
- the screening modes will save the recordings of the caller's names in
--the directory \path{/var/lib/asterisk/sounds/priv-callerintros}, if they have
-+the directory \path{/usr/share/asterisk/sounds/priv-callerintros}, if they have
- a CallerID.  Just the 10-digit callerid numbers are used as filenames,
- with a ".gsm" at the end.
- 
-@@ -260,7 +260,7 @@
- 
- \begin{astlisting}
- \begin{verbatim}
--exten => s,6,Set(PATH=/var/lib/asterisk/sounds/priv-callerintros)
-+exten => s,6,Set(PATH=/usr/share/asterisk/sounds/priv-callerintros)
- exten => s,7,System(/usr/bin/play ${PATH}/${CALLERID(num)}.gsm&,0)
- \end{verbatim}
- \end{astlisting}
 Index: configs/iax.conf.sample
 ===================================================================
 --- configs/iax.conf.sample    (revision 222649)

diff --git a/asterisk.spec b/asterisk.spec
index 54d197bdafaead18efdb07dd43f99821e7e4b0ef..33aab2247b02f79781c5e3e9653e692f9e695f64 100644 (file)
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -38,12 +38,12 @@
 Summary:       Asterisk PBX
 Summary(pl.UTF-8):     Centralka (PBX) Asterisk
 Name:          asterisk
-Version:       1.8.0
+Version:       1.8.1.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: 83203b43aaf12f36bdc953d6b04d18a4
+# Source0-md5: 489440fe1172af8c06323f470d600670
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source5:       %{name}.logrotate
@@ -70,7 +70,6 @@ Patch15:      %{name}-bristuff-libpri.patch
 Patch16:       lpc10-system.patch
 Patch17:       gsm-libpoison.patch
 Patch18:       Fix-history-loading-when-using-external-libedit.patch
-Patch19:       %{name}-misdn-locale_t.patch
 URL:           http://www.asterisk.org/
 BuildRequires: OSPToolkit-devel >= 3.6.1
 BuildRequires: SDL_image-devel
@@ -539,7 +538,7 @@ API documentation for Asterisk.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p0
-%patch6 -p0
+#%patch6 -p0
 %patch7 -p0
 %patch8 -p1
 %patch9 -p1
@@ -562,7 +561,6 @@ cp %{SOURCE11} .
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
-%patch19 -p1
 
 # Fixup makefile so sound archives aren't downloaded/installed
 %{__sed} -i -e 's/^all:.*$/all:/' sounds/Makefile
@@ -727,8 +725,6 @@ install -D -p apps/app_voicemail_plain.so $RPM_BUILD_ROOT%{_libdir}/asterisk/mod
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 cp -a %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
-install -D -p doc/asterisk-mib.txt $RPM_BUILD_ROOT%{_datadir}/mibs/ASTERISK-MIB.txt
-install -D -p doc/digium-mib.txt $RPM_BUILD_ROOT%{_datadir}/mibs/DIGIUM-MIB.txt
 
 # create some directories that need to be packaged
 install -d $RPM_BUILD_ROOT%{_datadir}/asterisk/moh
@@ -768,6 +764,10 @@ find doc/api/html -name '*.map' -size 0 -delete
 rm $RPM_BUILD_ROOT%{_datadir}/asterisk/documentation/appdocsxml.dtd
 rm $RPM_BUILD_ROOT%{_datadir}/asterisk/documentation/core-en_US.xml
 
+#fixme
+rm  $RPM_BUILD_ROOT/etc/asterisk/{app_mysql,calendar,cdr_mysql,chan_mobile,chan_ooh323,h323,res_config_mysql,res_pktccops}.conf
+rm -fr $RPM_BUILD_ROOT/usr/include/asterisk/doxygen
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -802,8 +802,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %files
 %defattr(644,root,root,755)
 %doc README *.txt ChangeLog BUGS CREDITS configs
-%doc doc/{asterisk.sgml,PEERING} doc/{backtrace,callfiles,externalivr,macroexclusive,manager_1_1,modules,queue}.txt
-%doc doc/{rtp-packetization,siptls,smdi,sms,speechrec,ss7,video}.txt
+%doc doc/asterisk.sgml
 
 #%attr(755,root,root) %{_sbindir}/aelparse
 %attr(755,root,root) %{_sbindir}/astcanary
@@ -1030,7 +1029,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_ael_share.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_agi.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_calendar.so
-%attr(755,root,root) %{_libdir}/asterisk/modules/res_calendar_ews.so
+#%attr(755,root,root) %{_libdir}/asterisk/modules/res_calendar_ews.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_clialiases.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_clioriginate.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_convert.so
@@ -1084,7 +1083,6 @@ chown -R asterisk:asterisk /var/lib/asterisk
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/{CODING-GUIDELINES,{datastores,modules,valgrind}.txt}
 %dir %{_includedir}/asterisk
 %{_includedir}/asterisk/*.h
 %{_includedir}/asterisk.h
@@ -1174,8 +1172,6 @@ chown -R asterisk:asterisk /var/lib/asterisk
 
 %files jabber
 %defattr(644,root,root,755)
-%doc doc/jabber.txt
-%doc doc/jingle.txt
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/gtalk.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/jabber.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/jingle.conf
@@ -1194,7 +1190,6 @@ chown -R asterisk:asterisk /var/lib/asterisk
 
 %files ldap
 %defattr(644,root,root,755)
-%doc doc/ldap.txt
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_ldap.conf
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_config_ldap.so
 
@@ -1274,13 +1269,8 @@ chown -R asterisk:asterisk /var/lib/asterisk
 
 %files snmp
 %defattr(644,root,root,755)
-%doc doc/asterisk-mib.txt
-%doc doc/digium-mib.txt
-%doc doc/snmp.txt
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_snmp.conf
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_snmp.so
-%{_datadir}/mibs/ASTERISK-MIB.txt
-%{_datadir}/mibs/DIGIUM-MIB.txt
 
 %files speex
 %defattr(644,root,root,755)
@@ -1306,7 +1296,6 @@ chown -R asterisk:asterisk /var/lib/asterisk
 
 %files unistim
 %defattr(644,root,root,755)
-%doc doc/unistim.txt
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/unistim.conf
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_unistim.so
 
@@ -1327,7 +1316,6 @@ chown -R asterisk:asterisk /var/lib/asterisk
 
 %files voicemail-odbc
 %defattr(644,root,root,755)
-%doc doc/voicemail_odbc_postgresql.txt
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_directory_odbc.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_voicemail_odbc.so