Merge remote-tracking branch 'mfischer/slang' into next

[people/pmueller/ipfire-2.x.git] / config / rootfiles / packages / asterisk

diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk
index 0fab2ea61d1a0c38421c10a23dcccaad4b49cb0b..6654621a20c889b459ae09cbc8e988fdef2ed8a6 100755 (executable)
--- a/config/rootfiles/packages/asterisk
+++ b/config/rootfiles/packages/asterisk
@@ -1,6 +1,6 @@
-#usr/lib/libsrtp.a
 etc/asterisk
-etc/fcron.minutely/wakeup.sh
+etc/logrotate.d/asterisk
+etc/rc.d/init.d/asterisk
 etc/rc.d/rc0.d/K30asterisk
 etc/rc.d/rc3.d/S30asterisk
 etc/rc.d/rc6.d/K30asterisk
@@ -156,38 +156,6 @@ etc/rc.d/rc6.d/K30asterisk
 #usr/include/asterisk/xml.h
 #usr/include/asterisk/xmldoc.h
 #usr/include/asterisk/xmpp.h
-#usr/include/srtp
-#usr/include/srtp/aes.h
-#usr/include/srtp/aes_cbc.h
-#usr/include/srtp/aes_icm.h
-#usr/include/srtp/alloc.h
-#usr/include/srtp/auth.h
-#usr/include/srtp/cipher.h
-#usr/include/srtp/config.h
-#usr/include/srtp/crypto.h
-#usr/include/srtp/crypto_kernel.h
-#usr/include/srtp/crypto_math.h
-#usr/include/srtp/crypto_types.h
-#usr/include/srtp/cryptoalg.h
-#usr/include/srtp/datatypes.h
-#usr/include/srtp/err.h
-#usr/include/srtp/gf2_8.h
-#usr/include/srtp/hmac.h
-#usr/include/srtp/integers.h
-#usr/include/srtp/kernel_compat.h
-#usr/include/srtp/key.h
-#usr/include/srtp/null_auth.h
-#usr/include/srtp/null_cipher.h
-#usr/include/srtp/prng.h
-#usr/include/srtp/rand_source.h
-#usr/include/srtp/rdb.h
-#usr/include/srtp/rdbx.h
-#usr/include/srtp/rtp.h
-#usr/include/srtp/sha1.h
-#usr/include/srtp/srtp.h
-#usr/include/srtp/stat.h
-#usr/include/srtp/ut_sim.h
-#usr/include/srtp/xfm.h
 #usr/lib/asterisk
 #usr/lib/asterisk/modules
 usr/lib/asterisk/modules/app_adsiprog.so
@@ -298,7 +266,6 @@ usr/lib/asterisk/modules/format_h263.so
 usr/lib/asterisk/modules/format_h264.so
 usr/lib/asterisk/modules/format_ilbc.so
 usr/lib/asterisk/modules/format_jpeg.so
-#usr/lib/asterisk/modules/format_ogg_vorbis.so
 usr/lib/asterisk/modules/format_pcm.so
 usr/lib/asterisk/modules/format_siren14.so
 usr/lib/asterisk/modules/format_siren7.so
@@ -370,7 +337,6 @@ usr/lib/asterisk/modules/res_convert.so
 usr/lib/asterisk/modules/res_crypto.so
 usr/lib/asterisk/modules/res_curl.so
 usr/lib/asterisk/modules/res_fax.so
-#usr/lib/asterisk/modules/res_fax_spandsp.so
 usr/lib/asterisk/modules/res_format_attr_celt.so
 usr/lib/asterisk/modules/res_format_attr_h263.so
 usr/lib/asterisk/modules/res_format_attr_h264.so
@@ -393,7 +359,6 @@ usr/lib/asterisk/modules/res_timing_pthread.so
 usr/lib/asterisk/modules/res_timing_timerfd.so
 usr/lib/libasteriskssl.so
 usr/lib/libasteriskssl.so.1
-#usr/lib/libsrtp.a
 #usr/lib/pkgconfig/asterisk.pc
 usr/sbin/astcanary
 usr/sbin/astdb2bdb
@@ -420,7 +385,7 @@ var/ipfire/asterisk/app_mysql.conf
 var/ipfire/asterisk/app_skel.conf
 var/ipfire/asterisk/asterisk.adsi
 var/ipfire/asterisk/asterisk.conf
-#var/ipfire/asterisk/asterisk.makeopts
+var/ipfire/asterisk/asterisk.logrotate
 var/ipfire/asterisk/calendar.conf
 var/ipfire/asterisk/ccss.conf
 var/ipfire/asterisk/cdr.conf
@@ -512,11 +477,6 @@ var/ipfire/asterisk/unistim.conf
 var/ipfire/asterisk/users.conf
 var/ipfire/asterisk/voicemail.conf
 var/ipfire/asterisk/vpb.conf
-#var/ipfire/asterisk/wakeup
-#var/ipfire/asterisk/wakeup/source
-var/ipfire/asterisk/wakeup/source/536.call
-var/ipfire/asterisk/wakeup/source/bsp.call.tpl
-var/ipfire/asterisk/wakeup/wakeup.sh
 var/ipfire/asterisk/xmpp.conf
 var/ipfire/backup/addons/includes/asterisk
 #var/lib/asterisk
@@ -875,16 +835,16 @@ var/lib/asterisk/sounds/digits/de/xh-8x.gsm
 var/lib/asterisk/sounds/digits/de/xh-9x.gsm
 var/lib/asterisk/sounds/digits/de/yesterday.gsm
 var/lib/asterisk/sounds/en
-var/lib/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.25
-var/lib/asterisk/sounds/en/.asterisk-extra-sounds-en-gsm-1.4.14
+var/lib/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.26
+var/lib/asterisk/sounds/en/.asterisk-extra-sounds-en-gsm-1.4.15
 var/lib/asterisk/sounds/en/1-for-am-2-for-pm.gsm
 var/lib/asterisk/sounds/en/1-yes-2-no.gsm
-var/lib/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.25
-var/lib/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.14
-var/lib/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.25
-var/lib/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.14
-var/lib/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.25
-var/lib/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.14
+#var/lib/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.26
+#var/lib/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.15
+#var/lib/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.26
+#var/lib/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.15
+#var/lib/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.26
+#var/lib/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.15
 var/lib/asterisk/sounds/en/OfficeSpace.gsm
 var/lib/asterisk/sounds/en/Randulo-allison.gsm
 var/lib/asterisk/sounds/en/SIP_Test_Failure.gsm
@@ -2895,6 +2855,3 @@ var/spool/asterisk/voicemail/default/1234/INBOX
 var/spool/asterisk/voicemail/default/1234/en
 var/spool/asterisk/voicemail/default/1234/en/busy.gsm
 var/spool/asterisk/voicemail/default/1234/en/unavail.gsm
-etc/rc.d/init.d/asterisk
-srv/web/ipfire/cgi-bin/asterisk
-var/ipfire/menu.d/EX-asterisk.menu